Merge with main

Author: marcinjahn

.luarc.json

@@ -245,8 +245,8 @@ Manual testing with real Neovim configurations in the `fixtures/` directory:
 source fixtures/nvim-aliases.sh
 vv nvim-tree  # Test with nvim-tree integration
 vv oil        # Test with oil.nvim integration
+vv mini-files # Test with mini.files integration
 vv netrw      # Test with built-in netrw
-vv mini-files # Test with built-in mini.files
 
 # Each fixture provides:
 # - Complete Neovim configuration

ARCHITECTURE.md

@@ -51,6 +51,7 @@ The `fixtures/` directory contains test Neovim configurations for verifying plug
 - `netrw` - Tests with Neovim's built-in file explorer
 - `nvim-tree` - Tests with nvim-tree.lua file explorer
 - `oil` - Tests with oil.nvim file explorer
+- `mini-files` - Tests with mini.files file explorer
 
 **Usage**: `source fixtures/nvim-aliases.sh && vv oil` starts Neovim with oil.nvim configuration
 
@@ -274,7 +275,32 @@ Enable detailed authentication logging by setting:
 
 ```lua
 require("claudecode").setup({
-  log_level = "debug"  -- Shows auth token generation, validation, and failures
+  log_level = "debug",  -- Shows auth token generation, validation, and failures
+  diff_opts = {
+    keep_terminal_focus = true,  -- If true, moves focus back to terminal after diff opens
+  },
+})
+```
+
+### Configuration Options
+
+#### Diff Options
+
+The `diff_opts` configuration allows you to customize diff behavior:
+
+- `keep_terminal_focus` (boolean, default: `false`) - When enabled, keeps focus in the Claude Code terminal when a diff opens instead of moving focus to the diff buffer. This allows you to continue using terminal keybindings like `<CR>` for accepting/rejecting diffs without accidentally triggering other mappings.
+
+**Example use case**: If you frequently use `<CR>` or arrow keys in the Claude Code terminal to accept/reject diffs, enable this option to prevent focus from moving to the diff buffer where `<CR>` might trigger unintended actions.
+
+```lua
+require("claudecode").setup({
+  diff_opts = {
+    keep_terminal_focus = true,  -- If true, moves focus back to terminal after diff opens
+    auto_close_on_accept = true,
+    show_diff_stats = true,
+    vertical_split = true,
+    open_in_current_tab = true,
+  },
 })
 ```
 
@@ -315,7 +341,7 @@ Log levels for authentication events:
 ### Integration Support
 
 - Terminal integration supports both snacks.nvim and native Neovim terminal
-- Compatible with popular file explorers (nvim-tree, oil.nvim)
+- Compatible with popular file explorers (nvim-tree, oil.nvim, neo-tree, mini.files)
 - Visual selection tracking across different selection modes
 
 ## Release Process

CLAUDE.md

@@ -148,6 +148,7 @@ source fixtures/nvim-aliases.sh
 # Test with specific integration
 vv nvim-tree  # Start Neovim with nvim-tree configuration
 vv oil        # Start Neovim with oil.nvim configuration
+vv mini-files # Start Neovim with mini.files configuration
 vv netrw      # Start Neovim with built-in netrw configuration
 
 # List available configurations

DEVELOPMENT.md

@@ -40,7 +40,7 @@ When Anthropic released Claude Code, they only supported VS Code and JetBrains.
       "<leader>as",
       "<cmd>ClaudeCodeTreeAdd<cr>",
       desc = "Add file",
-      ft = { "NvimTree", "neo-tree", "oil" },
+      ft = { "NvimTree", "neo-tree", "oil", "minifiles" },
     },
     -- Diff management
     { "<leader>aa", "<cmd>ClaudeCodeDiffAccept<cr>", desc = "Accept diff" },
@@ -182,7 +182,7 @@ Configure the plugin with the detected path:
 1. **Launch Claude**: Run `:ClaudeCode` to open Claude in a split terminal
 2. **Send context**:
    - Select text in visual mode and use `<leader>as` to send it to Claude
-   - In `nvim-tree`/`neo-tree`/`oil.nvim`, press `<leader>as` on a file to add it to Claude's context
+   - In `nvim-tree`/`neo-tree`/`oil.nvim`/`mini.nvim`, press `<leader>as` on a file to add it to Claude's context
 3. **Let Claude work**: Claude can now:
    - See your current file and selections in real-time
    - Open files in your editor
@@ -267,6 +267,7 @@ For deep technical details, see [ARCHITECTURE.md](./ARCHITECTURE.md).
       auto_close_on_accept = true,
       vertical_split = true,
       open_in_current_tab = true,
+      keep_terminal_focus = false, -- If true, moves focus back to terminal after diff opens
     },
   },
   keys = {
@@ -572,6 +573,87 @@ Provides convenient Claude interaction history management and access for enhance
 
 > **Disclaimer**: These community extensions are developed and maintained by independent contributors. The authors and their extensions are not affiliated with Coder. Use at your own discretion and refer to their respective repositories for installation instructions, documentation, and support.
 
+## Auto-Save Plugin Issues
+
+Using auto-save plugins can cause diff windows opened by Claude to immediately accept without waiting for input. You can avoid this using a custom condition:
+
+<details>
+<summary>Pocco81/auto-save.nvim</summary>
+
+```lua
+opts = {
+  -- ... other options
+  condition = function(buf)
+    local fn = vim.fn
+    local utils = require("auto-save.utils.data")
+
+    -- First check the default conditions
+    if not (fn.getbufvar(buf, "&modifiable") == 1 and utils.not_in(fn.getbufvar(buf, "&filetype"), {})) then
+      return false
+    end
+
+    -- Exclude claudecode diff buffers by buffer name patterns
+    local bufname = vim.api.nvim_buf_get_name(buf)
+    if bufname:match("%(proposed%)") or
+       bufname:match("%(NEW FILE %- proposed%)") or
+       bufname:match("%(New%)") then
+      return false
+    end
+
+    -- Exclude by buffer variables (claudecode sets these)
+    if vim.b[buf].claudecode_diff_tab_name or
+       vim.b[buf].claudecode_diff_new_win or
+       vim.b[buf].claudecode_diff_target_win then
+      return false
+    end
+
+    -- Exclude by buffer type (claudecode diff buffers use "acwrite")
+    local buftype = fn.getbufvar(buf, "&buftype")
+    if buftype == "acwrite" then
+      return false
+    end
+
+    return true -- Safe to auto-save
+  end,
+},
+```
+
+</details>
+<details>
+<summary>okuuva/auto-save.nvim</summary>
+
+```lua
+opts = {
+  -- ... other options
+  condition = function(buf)
+    -- Exclude claudecode diff buffers by buffer name patterns
+    local bufname = vim.api.nvim_buf_get_name(buf)
+    if bufname:match('%(proposed%)') or bufname:match('%(NEW FILE %- proposed%)') or bufname:match('%(New%)') then
+      return false
+    end
+
+    -- Exclude by buffer variables (claudecode sets these)
+    if
+      vim.b[buf].claudecode_diff_tab_name
+      or vim.b[buf].claudecode_diff_new_win
+      or vim.b[buf].claudecode_diff_target_win
+    then
+      return false
+    end
+
+    -- Exclude by buffer type (claudecode diff buffers use "acwrite")
+    local buftype = vim.fn.getbufvar(buf, '&buftype')
+    if buftype == 'acwrite' then
+      return false
+    end
+
+    return true -- Safe to auto-save
+  end,
+},
+```
+
+</details>
+
 ## Troubleshooting
 
 - **Claude not connecting?** Check `:ClaudeCodeStatus` and verify lock file exists in `~/.claude/ide/` (or `$CLAUDE_CONFIG_DIR/ide/` if `CLAUDE_CONFIG_DIR` is set)

README.md

@@ -18,13 +18,13 @@ return {
     { "<leader>am", "<cmd>ClaudeCodeSelectModel<cr>", desc = "Select Claude model" },
 
     -- Context sending
-    { "<leader>ab", "<cmd>ClaudeCodeAdd %<cr>", desc = "Add current buffer" },
+    { "<leader>as", "<cmd>ClaudeCodeAdd %<cr>", mode = "n", desc = "Add current buffer" },
     { "<leader>as", "<cmd>ClaudeCodeSend<cr>", mode = "v", desc = "Send to Claude" },
     {
       "<leader>as",
       "<cmd>ClaudeCodeTreeAdd<cr>",
       desc = "Add file from tree",
-      ft = { "NvimTree", "neo-tree", "oil" },
+      ft = { "NvimTree", "neo-tree", "oil", "minifiles" },
     },
 
     -- Development helpers
@@ -62,6 +62,7 @@ return {
     --   show_diff_stats = true,                   -- Show diff statistics
     --   vertical_split = true,                    -- Use vertical split for diffs
     --   open_in_current_tab = true,               -- Open diffs in current tab vs new tab
+    --   keep_terminal_focus = false,              -- If true, moves focus back to terminal after diff opens
     -- },
 
     -- Terminal Configuration

dev-config.lua

@@ -1,6 +1,6 @@
 {
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "nvim-tree.lua": { "branch": "master", "commit": "65bae449224b8a3bc149471b96587b23b13a9946" },
-  "nvim-web-devicons": { "branch": "master", "commit": "4a8369f4c78ef6f6f895f0cec349e48f74330574" },
+  "nvim-tree.lua": { "branch": "master", "commit": "0a7fcdf3f8ba208f4260988a198c77ec11748339" },
+  "nvim-web-devicons": { "branch": "master", "commit": "3362099de3368aa620a8105b19ed04c2053e38c0" },
   "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }
 }

fixtures/nvim-tree/lazy-lock.json

@@ -1,7 +1,12 @@
+---@brief [[
 --- Manages configuration for the Claude Code Neovim integration.
--- Provides default settings, validation, and application of user-defined configurations.
+--- Provides default settings, validation, and application of user-defined configurations.
+---@brief ]]
+---@module 'claudecode.config'
+
 local M = {}
 
+---@type ClaudeCodeConfig
 M.defaults = {
   port_range = { min = 10000, max = 65535 },
   auto_start = true,
@@ -18,20 +23,23 @@ M.defaults = {
     show_diff_stats = true,
     vertical_split = true,
     open_in_current_tab = true, -- Use current tab instead of creating new tab
+    keep_terminal_focus = false, -- If true, moves focus back to terminal after diff opens
   },
   models = {
     { name = "Claude Opus 4 (Latest)", value = "opus" },
     { name = "Claude Sonnet 4 (Latest)", value = "sonnet" },
   },
   terminal = {
-    external_terminal_cmd = nil, -- Command template for external terminal (e.g., "alacritty -e %s")
+    provider_opts = {
+      external_terminal_cmd = nil, -- Command template for external terminal (e.g., "alacritty -e %s")
+    },
   },
 }
 
---- Validates the provided configuration table.
--- @param config table The configuration table to validate.
--- @return boolean true if the configuration is valid.
--- @error string if any configuration option is invalid.
+---Validates the provided configuration table.
+---Throws an error if any validation fails.
+---@param config table The configuration table to validate.
+---@return boolean true if the configuration is valid.
 function M.validate(config)
   assert(
     type(config.port_range) == "table"
@@ -49,15 +57,24 @@ function M.validate(config)
 
   -- Validate terminal config
   assert(type(config.terminal) == "table", "terminal must be a table")
-  assert(
-    config.terminal.external_terminal_cmd == nil or type(config.terminal.external_terminal_cmd) == "string",
-    "terminal.external_terminal_cmd must be nil or a string"
-  )
-  if config.terminal.external_terminal_cmd and config.terminal.external_terminal_cmd ~= "" then
-    assert(
-      config.terminal.external_terminal_cmd:find("%%s"),
-      "terminal.external_terminal_cmd must contain '%s' placeholder for the Claude command"
-    )
+
+  -- Validate provider_opts if present
+  if config.terminal.provider_opts then
+    assert(type(config.terminal.provider_opts) == "table", "terminal.provider_opts must be a table")
+
+    -- Validate external_terminal_cmd in provider_opts
+    if config.terminal.provider_opts.external_terminal_cmd then
+      assert(
+        type(config.terminal.provider_opts.external_terminal_cmd) == "string",
+        "terminal.provider_opts.external_terminal_cmd must be a string"
+      )
+      if config.terminal.provider_opts.external_terminal_cmd ~= "" then
+        assert(
+          config.terminal.provider_opts.external_terminal_cmd:find("%%s"),
+          "terminal.provider_opts.external_terminal_cmd must contain '%s' placeholder for the Claude command"
+        )
+      end
+    end
   end
 
   local valid_log_levels = { "trace", "debug", "info", "warn", "error" }
@@ -94,6 +111,7 @@ function M.validate(config)
   assert(type(config.diff_opts.show_diff_stats) == "boolean", "diff_opts.show_diff_stats must be a boolean")
   assert(type(config.diff_opts.vertical_split) == "boolean", "diff_opts.vertical_split must be a boolean")
   assert(type(config.diff_opts.open_in_current_tab) == "boolean", "diff_opts.open_in_current_tab must be a boolean")
+  assert(type(config.diff_opts.keep_terminal_focus) == "boolean", "diff_opts.keep_terminal_focus must be a boolean")
 
   -- Validate env
   assert(type(config.env) == "table", "env must be a table")
@@ -111,17 +129,34 @@ function M.validate(config)
     assert(type(model.name) == "string" and model.name ~= "", "models[" .. i .. "].name must be a non-empty string")
     assert(type(model.value) == "string" and model.value ~= "", "models[" .. i .. "].value must be a non-empty string")
   end
+
   return true
 end
 
---- Applies user configuration on top of default settings and validates the result.
--- @param user_config table|nil The user-provided configuration table.
--- @return table The final, validated configuration table.
+---Applies user configuration on top of default settings and validates the result.
+---@param user_config table|nil The user-provided configuration table.
+---@return ClaudeCodeConfig config The final, validated configuration table.
 function M.apply(user_config)
   local config = vim.deepcopy(M.defaults)
 
+  -- Lazy-load terminal defaults to avoid circular dependency
+  if config.terminal == nil then
+    local terminal_ok, terminal_module = pcall(require, "claudecode.terminal")
+    if terminal_ok and terminal_module.defaults then
+      config.terminal = terminal_module.defaults
+    end
+  end
+
   if user_config then
-    config = vim.tbl_deep_extend("force", config, user_config)
+    -- Use vim.tbl_deep_extend if available, otherwise simple merge
+    if vim.tbl_deep_extend then
+      config = vim.tbl_deep_extend("force", config, user_config)
+    else
+      -- Simple fallback for testing environment
+      for k, v in pairs(user_config) do
+        config[k] = v
+      end
+    end
   end
 
   M.validate(config)