Fix IDE tool response handling (#274)

Author: ThomasK33

lua/claudecode/server/init.lua

@@ -282,7 +282,6 @@ function M.register_handlers()
         capabilities = {
           logging = vim.empty_dict(), -- Ensure this is an object {} not an array []
           prompts = { listChanged = true },
-          resources = { subscribe = true, listChanged = true },
           tools = { listChanged = true },
         },
         serverInfo = {

lua/claudecode/tools/check_document_dirty.lua

@@ -36,7 +36,7 @@ local function handler(params)
           text = vim.json.encode({
             success = false,
             message = "Document not open: " .. params.filePath,
-          }, { indent = 2 }),
+          }),
         },
       },
     }
@@ -55,7 +55,7 @@ local function handler(params)
           filePath = params.filePath,
           isDirty = is_dirty,
           isUntitled = is_untitled,
-        }, { indent = 2 }),
+        }),
       },
     },
   }

lua/claudecode/tools/get_current_selection.lua

@@ -14,7 +14,7 @@ local schema = {
 ---@param error_context string A description of what failed for error messages
 ---@return string The JSON-encoded string
 local function safe_json_encode(data, error_context)
-  local ok, encoded = pcall(vim.json.encode, data, { indent = 2 })
+  local ok, encoded = pcall(vim.json.encode, data)
   if not ok then
     error({
       code = -32000,

lua/claudecode/tools/get_diagnostics.lua

@@ -1,9 +1,5 @@
 --- Tool implementation for getting diagnostics.
 
--- NOTE: Its important we don't tip off Claude that we're dealing with Neovim LSP diagnostics because it may adjust
--- line and col numbers by 1 on its own (since it knows nvim LSP diagnostics are 0-indexed). By calling these
--- "editor diagnostics" and converting to 1-indexed ourselves we (hopefully) avoid incorrect line and column numbers
--- in Claude's responses.
 local schema = {
   description = "Get language diagnostics (errors, warnings) from the editor",
   inputSchema = {
@@ -19,14 +15,81 @@ local schema = {
   },
 }
 
+local severity_names = {
+  [1] = "Error",
+  [2] = "Warning",
+  [3] = "Info",
+  [4] = "Hint",
+}
+
+local function starts_with(str, prefix)
+  return type(str) == "string" and str:sub(1, #prefix) == prefix
+end
+
+local function path_to_uri(path)
+  if vim.uri_from_fname then
+    return vim.uri_from_fname(path)
+  end
+  return "file://" .. path
+end
+
+local function severity_name(severity)
+  if type(severity) == "string" then
+    return severity
+  end
+  return severity_names[severity] or "Info"
+end
+
+local function diagnostic_range(diagnostic)
+  local start_line = diagnostic.lnum or 0
+  local start_col = diagnostic.col or 0
+  local end_line = diagnostic.end_lnum or start_line
+  local end_col = diagnostic.end_col or (start_col + 1)
+
+  return {
+    start = { line = start_line, character = start_col },
+    ["end"] = { line = end_line, character = end_col },
+  }
+end
+
+local function get_diagnostic_path(diagnostic, fallback_path)
+  if diagnostic.bufnr then
+    local file_path = vim.api.nvim_buf_get_name(diagnostic.bufnr)
+    if file_path and file_path ~= "" then
+      return file_path
+    end
+  end
+  return fallback_path
+end
+
+local function append_diagnostic(files, file_by_uri, file_path, diagnostic)
+  if not file_path or file_path == "" then
+    return
+  end
+
+  local uri = path_to_uri(file_path)
+  local file = file_by_uri[uri]
+  if not file then
+    file = { uri = uri, diagnostics = {} }
+    file_by_uri[uri] = file
+    table.insert(files, file)
+  end
+
+  table.insert(file.diagnostics, {
+    message = diagnostic.message or "",
+    severity = severity_name(diagnostic.severity),
+    range = diagnostic_range(diagnostic),
+    source = diagnostic.source,
+    code = diagnostic.code and tostring(diagnostic.code) or nil,
+  })
+end
+
 ---Handles the getDiagnostics tool invocation.
 ---Retrieves diagnostics from Neovim's diagnostic system.
 ---@param params table The input parameters for the tool
 ---@return table diagnostics MCP-compliant response with diagnostics data
 local function handler(params)
   if not vim.lsp or not vim.diagnostic or not vim.diagnostic.get then
-    -- Returning an empty list or a specific status could be an alternative.
-    -- For now, let's align with the error pattern for consistency if the feature is unavailable.
     error({
       code = -32000,
       message = "Feature unavailable",
@@ -38,58 +101,44 @@ local function handler(params)
 
   logger.debug("getDiagnostics handler called with params: " .. vim.inspect(params))
 
-  -- Extract the uri parameter
   local diagnostics
+  local fallback_path
 
   if not params.uri then
-    -- Get diagnostics for all buffers
     logger.debug("Getting diagnostics for all open buffers")
     diagnostics = vim.diagnostic.get(nil)
   else
     local uri = params.uri
-    local filepath = vim.startswith(uri, "file://") and vim.uri_to_fname(uri) or uri
+    fallback_path = starts_with(uri, "file://") and vim.uri_to_fname(uri) or uri
 
-    -- Get buffer number for the specific file
-    local bufnr = vim.fn.bufnr(filepath)
+    local bufnr = vim.fn.bufnr(fallback_path)
     if bufnr == -1 then
-      -- File is not open in any buffer, throw an error
-      logger.debug("File buffer must be open to get diagnostics: " .. filepath)
+      logger.debug("File buffer must be open to get diagnostics: " .. fallback_path)
       error({
         code = -32001,
         message = "File not open",
-        data = "File must be open to retrieve diagnostics: " .. filepath,
+        data = "File must be open to retrieve diagnostics: " .. fallback_path,
       })
-    else
-      -- Get diagnostics for the specific buffer
-      logger.debug("Getting diagnostics for bufnr: " .. bufnr)
-      diagnostics = vim.diagnostic.get(bufnr)
     end
+
+    logger.debug("Getting diagnostics for bufnr: " .. bufnr)
+    diagnostics = vim.diagnostic.get(bufnr)
   end
 
-  local formatted_diagnostics = {}
-  for _, diagnostic in ipairs(diagnostics) do
-    local file_path = vim.api.nvim_buf_get_name(diagnostic.bufnr)
-    -- Ensure we only include diagnostics with valid file paths
-    if file_path and file_path ~= "" then
-      table.insert(formatted_diagnostics, {
-        type = "text",
-        -- json encode this
-        text = vim.json.encode({
-          -- Use the file path and diagnostic information
-          filePath = file_path,
-          -- Convert line and column to 1-indexed
-          line = diagnostic.lnum + 1,
-          character = diagnostic.col + 1,
-          severity = diagnostic.severity, -- e.g., vim.diagnostic.severity.ERROR
-          message = diagnostic.message,
-          source = diagnostic.source,
-        }),
-      })
-    end
+  local files = {}
+  local file_by_uri = {}
+
+  for _, diagnostic in ipairs(diagnostics or {}) do
+    append_diagnostic(files, file_by_uri, get_diagnostic_path(diagnostic, fallback_path), diagnostic)
   end
 
   return {
-    content = formatted_diagnostics,
+    content = {
+      {
+        type = "text",
+        text = vim.json.encode(files),
+      },
+    },
   }
 end
 

lua/claudecode/tools/get_latest_selection.lua

@@ -30,7 +30,7 @@ local function handler(params)
           text = vim.json.encode({
             success = false,
             message = "No selection available",
-          }, { indent = 2 }),
+          }),
         },
       },
     }
@@ -41,7 +41,7 @@ local function handler(params)
     content = {
       {
         type = "text",
-        text = vim.json.encode(selection, { indent = 2 }),
+        text = vim.json.encode(selection),
       },
     },
   }

lua/claudecode/tools/get_open_editors.lua

@@ -105,7 +105,7 @@ local function handler(params)
     content = {
       {
         type = "text",
-        text = vim.json.encode({ tabs = tabs }, { indent = 2 }),
+        text = vim.json.encode({ tabs = tabs }),
       },
     },
   }

lua/claudecode/tools/get_workspace_folders.lua

@@ -55,7 +55,7 @@ local function handler(params)
           success = true,
           folders = folders,
           rootPath = cwd,
-        }, { indent = 2 }),
+        }),
       },
     },
   }