refactor: replace close_buffer_by_name with close_tab tool and apply code formatting

Change-Id: I6c0ef979b3c5ac8328e398d827d47dfd642c8274
Signed-off-by: Thomas Kosiewski <[email protected]>

Author: ThomasK33

findings.md

@@ -237,14 +237,40 @@ The lock file contains a JSON object with the following structure:
 
 The extension registers various tools with the MCP server:
 
-1. **openDiff**: Open a diff view between two files
+1. **openDiff**: Open a diff view between two files and wait for user action
 
    - Parameters:
      - `old_file_path`: Path to the original file (REQUIRED)
      - `new_file_path`: Path to the new file (REQUIRED)
      - `new_file_contents`: Contents of the new file (REQUIRED)
      - `tab_name`: Name for the diff tab (REQUIRED)
-   - Returns: Information about diff acceptance or rejection
+   - Behavior: This tool is **blocking** - it opens the diff view and waits for user interaction before returning
+   - Returns: One of three possible responses based on user action:
+
+     ```json
+     // User saved the file (accepted changes)
+     {
+       "content": [
+         { "type": "text", "text": "FILE_SAVED" },
+         { "type": "text", "text": "final file contents" }
+       ]
+     }
+
+     // User closed the diff tab or explicitly rejected
+     {
+       "content": [
+         { "type": "text", "text": "DIFF_REJECTED" },
+         { "type": "text", "text": "tab_name" }
+       ]
+     }
+     ```
+
+   - Implementation Notes:
+     - Creates temporary file providers for both old and new files
+     - Monitors for tab close events, file save events, and diff acceptance/rejection
+     - Automatically closes any existing Claude Code diff tabs with the same name
+     - Uses `Promise.race()` to wait for the first of: tab closed, diff accepted, or file saved
+     - If autoSave is disabled, also waits for manual save events
 
 2. **getDiagnostics**: Get language diagnostics from VS Code
 

lua/claudecode/diff.lua

@@ -120,27 +120,39 @@ function M._cleanup_temp_file(tmp_file)
     if vim.fs and type(vim.fs.remove) == "function" then
       local ok_file, err_file = pcall(vim.fs.remove, tmp_file)
       if not ok_file then
-        vim.notify("ClaudeCode: Error removing temp file " .. tmp_file .. ": " .. tostring(err_file), vim.log.levels.WARN)
+        vim.notify(
+          "ClaudeCode: Error removing temp file " .. tmp_file .. ": " .. tostring(err_file),
+          vim.log.levels.WARN
+        )
       end
 
       local ok_dir, err_dir = pcall(vim.fs.remove, tmp_dir)
       if not ok_dir then
-        vim.notify("ClaudeCode: Error removing temp directory " .. tmp_dir .. ": " .. tostring(err_dir), vim.log.levels.INFO)
+        vim.notify(
+          "ClaudeCode: Error removing temp directory " .. tmp_dir .. ": " .. tostring(err_dir),
+          vim.log.levels.INFO
+        )
       end
     else
       local reason = "vim.fs.remove is not a function"
       if not vim.fs then
         reason = "vim.fs is nil"
       end
       vim.notify(
-        "ClaudeCode: Cannot perform standard cleanup: " .. reason .. ". Affected file: " .. tmp_file ..
-        ". Please check your Neovim setup or report this issue.",
+        "ClaudeCode: Cannot perform standard cleanup: "
+          .. reason
+          .. ". Affected file: "
+          .. tmp_file
+          .. ". Please check your Neovim setup or report this issue.",
         vim.log.levels.ERROR
       )
       -- Fallback to os.remove for the file.
       local os_ok, os_err = pcall(os.remove, tmp_file)
       if not os_ok then
-         vim.notify("ClaudeCode: Fallback os.remove also failed for file " .. tmp_file .. ": " .. tostring(os_err), vim.log.levels.ERROR)
+        vim.notify(
+          "ClaudeCode: Fallback os.remove also failed for file " .. tmp_file .. ": " .. tostring(os_err),
+          vim.log.levels.ERROR
+        )
       end
     end
   end

lua/claudecode/server/init.lua

@@ -208,6 +208,13 @@ function M.register_handlers()
     end,
 
     ["tools/call"] = function(client, params)
+      logger.debug(
+        "server",
+        "Received tools/call. Tool: ",
+        params and params.name,
+        " Arguments: ",
+        vim.inspect(params and params.arguments)
+      )
       local result_or_error_table = tools.handle_invoke(client, params)
 
       if result_or_error_table.error then

lua/claudecode/tools/close_buffer_by_name.lua

@@ -0,0 +1,101 @@
+--- Tool implementation for closing a buffer by its name.
+
+local schema = {
+  description = "Close a tab/buffer by its tab name",
+  inputSchema = {
+    type = "object",
+    properties = {
+      tab_name = {
+        type = "string",
+        description = "Name of the tab to close",
+      },
+    },
+    required = { "tab_name" },
+    additionalProperties = false,
+    ["$schema"] = "http://json-schema.org/draft-07/schema#",
+  },
+}
+
+--- Handles the close_tab tool invocation.
+-- Closes a tab/buffer by its tab name.
+-- @param params table The input parameters for the tool.
+-- @field params.tab_name string Name of the tab to close.
+-- @return table A result message indicating success.
+-- @error table A table with code, message, and data for JSON-RPC error if failed.
+local function handler(params)
+  local log_module_ok, log = pcall(require, "claudecode.logger")
+  if not log_module_ok then
+    return {
+      code = -32603, -- Internal error
+      message = "Internal error",
+      data = "Failed to load logger module",
+    }
+  end
+
+  log.debug("close_tab handler called with params: " .. vim.inspect(params))
+
+  if not params.tab_name then
+    log.error("Missing required parameter: tab_name")
+    return {
+      code = -32602, -- Invalid params
+      message = "Invalid params",
+      data = "Missing required parameter: tab_name",
+    }
+  end
+
+  -- Extract the actual file name from the tab name
+  -- Tab name format: "✻ [Claude Code] README.md (e18e1e) ⧉"
+  -- We need to extract "README.md" or the full path
+  local tab_name = params.tab_name
+  log.debug("Attempting to close tab: " .. tab_name)
+
+  -- Try to find buffer by the tab name first
+  local bufnr = vim.fn.bufnr(tab_name)
+
+  if bufnr == -1 then
+    -- If not found, try to extract filename from the tab name
+    -- Look for pattern like "filename.ext" in the tab name
+    local filename = tab_name:match("([%w%.%-_]+%.[%w]+)")
+    if filename then
+      log.debug("Extracted filename from tab name: " .. filename)
+      -- Try to find buffer by filename
+      for _, buf in ipairs(vim.api.nvim_list_bufs()) do
+        local buf_name = vim.api.nvim_buf_get_name(buf)
+        if buf_name:match(filename .. "$") then
+          bufnr = buf
+          log.debug("Found buffer by filename match: " .. buf_name)
+          break
+        end
+      end
+    end
+  end
+
+  if bufnr == -1 then
+    log.error("Buffer not found for tab: " .. tab_name)
+    return {
+      code = -32000,
+      message = "Buffer operation error",
+      data = "Buffer not found for tab: " .. tab_name,
+    }
+  end
+
+  local success, err = pcall(vim.api.nvim_buf_delete, bufnr, { force = false })
+
+  if not success then
+    log.error("Failed to close buffer: " .. tostring(err))
+    return {
+      code = -32000,
+      message = "Buffer operation error",
+      data = "Failed to close buffer for tab " .. tab_name .. ": " .. tostring(err),
+    }
+  end
+
+  log.info("Successfully closed tab: " .. tab_name)
+  return { message = "Tab closed: " .. tab_name }
+end
+
+return {
+  name = "close_tab",
+  schema = schema,
+  handler = handler,
+}

lua/claudecode/tools/close_tab.lua

@@ -82,29 +82,75 @@ _G.vim = { ---@type vim_global_api
   cmd = function() end, ---@type fun(command: string):nil
   api = {}, ---@type table
   fn = { ---@type vim_fn_table
-    mode = function() return "n" end,
-    delete = function(_, _) return 0 end,
-    filereadable = function(_) return 1 end,
-    fnamemodify = function(fname, _) return fname end,
-    expand = function(s, _) return s end,
-    getcwd = function() return "/mock/cwd" end,
-    mkdir = function(_, _, _) return 1 end,
-    buflisted = function(_) return 1 end,
-    bufname = function(_) return "mockbuffer" end,
-    bufnr = function(_) return 1 end,
-    win_getid = function() return 1 end,
-    win_gotoid = function(_) return true end,
-    line = function(_) return 1 end,
-    col = function(_) return 1 end,
-    virtcol = function(_) return 1 end,
-    getpos = function(_) return {0,1,1,0} end,
-    setpos = function(_,_) return true end,
-    tempname = function() return "/tmp/mocktemp" end,
-    globpath = function(_,_) return "" end,
-    termopen = function(_, _) return 0 end,
-    stdpath = function(_) return "/mock/stdpath" end,
-    json_encode = function(_) return "{}" end,
-    json_decode = function(_) return {} end,
+    mode = function()
+      return "n"
+    end,
+    delete = function(_, _)
+      return 0
+    end,
+    filereadable = function(_)
+      return 1
+    end,
+    fnamemodify = function(fname, _)
+      return fname
+    end,
+    expand = function(s, _)
+      return s
+    end,
+    getcwd = function()
+      return "/mock/cwd"
+    end,
+    mkdir = function(_, _, _)
+      return 1
+    end,
+    buflisted = function(_)
+      return 1
+    end,
+    bufname = function(_)
+      return "mockbuffer"
+    end,
+    bufnr = function(_)
+      return 1
+    end,
+    win_getid = function()
+      return 1
+    end,
+    win_gotoid = function(_)
+      return true
+    end,
+    line = function(_)
+      return 1
+    end,
+    col = function(_)
+      return 1
+    end,
+    virtcol = function(_)
+      return 1
+    end,
+    getpos = function(_)
+      return { 0, 1, 1, 0 }
+    end,
+    setpos = function(_, _)
+      return true
+    end,
+    tempname = function()
+      return "/tmp/mocktemp"
+    end,
+    globpath = function(_, _)
+      return ""
+    end,
+    termopen = function(_, _)
+      return 0
+    end,
+    stdpath = function(_)
+      return "/mock/stdpath"
+    end,
+    json_encode = function(_)
+      return "{}"
+    end,
+    json_decode = function(_)
+      return {}
+    end,
   },
   fs = { remove = function() end }, ---@type vim_fs_module
 }