Merge pull request #31 from coder/thomask33/claudecode-command-args

feat: configurable auto-close and enhanced terminal architecture

Author: ThomasK33

.github/workflows/test.yml

@@ -159,4 +159,4 @@ jobs:
           ln -s "$(pwd)" ~/.local/share/nvim/site/pack/vendor/start/claudecode.nvim
 
       - name: Run integration tests
-        run: nix develop .#ci -c nvim --headless -u tests/minimal_init.lua -c "lua require('plenary.test_harness').test_directory('tests/integration', {minimal_init = 'tests/minimal_init.lua'})"
+        run: nix develop .#ci -c ./scripts/run_integration_tests_individually.sh

README.md

@@ -51,6 +51,8 @@ Using [lazy.nvim](https://github.com/folke/lazy.nvim):
   keys = {
     { "<leader>a", nil, desc = "AI/Claude Code" },
     { "<leader>ac", "<cmd>ClaudeCode<cr>", desc = "Toggle Claude" },
+    { "<leader>ar", "<cmd>ClaudeCode --resume<cr>", desc = "Resume Claude" },
+    { "<leader>aC", "<cmd>ClaudeCode --continue<cr>", desc = "Continue Claude" },
     { "<leader>as", "<cmd>ClaudeCodeSend<cr>", mode = "v", desc = "Send to Claude" },
     {
       "<leader>as",
@@ -78,7 +80,9 @@ That's it! For more configuration options, see [Advanced Setup](#advanced-setup)
 
 ## Commands
 
-- `:ClaudeCode` - Toggle the Claude Code terminal window
+- `:ClaudeCode [arguments]` - Toggle the Claude Code terminal window (arguments are passed to claude command)
+- `:ClaudeCode --resume` - Resume a previous Claude conversation
+- `:ClaudeCode --continue` - Continue Claude conversation
 - `:ClaudeCodeSend` - Send current visual selection to Claude, or add files from tree explorer
 - `:ClaudeCodeTreeAdd` - Add selected file(s) from tree explorer to Claude context (also available via ClaudeCodeSend)
 - `:ClaudeCodeAdd <file-path> [start-line] [end-line]` - Add a specific file or directory to Claude context by path with optional line range
@@ -108,7 +112,7 @@ The `:ClaudeCodeAdd` command allows you to add files or directories directly by
 :ClaudeCodeAdd ~/projects/myproject/
 :ClaudeCodeAdd ./README.md
 :ClaudeCodeAdd src/main.lua 50 100    " Lines 50-100 only
-:ClaudeCodeAdd config.lua 25          " From line 25 to end of file
+:ClaudeCodeAdd config.lua 25          " Only line 25
 ```
 
 #### Features
@@ -132,7 +136,7 @@ The `:ClaudeCodeAdd` command allows you to add files or directories directly by
 
 " Add specific line ranges
 :ClaudeCodeAdd src/main.lua 50 100        " Lines 50 through 100
-:ClaudeCodeAdd config.lua 25              " From line 25 to end of file
+:ClaudeCodeAdd config.lua 25              " Only line 25
 :ClaudeCodeAdd utils.py 1 50              " First 50 lines
 :ClaudeCodeAdd README.md 10 20            " Just lines 10-20
 
@@ -196,6 +200,7 @@ See [DEVELOPMENT.md](./DEVELOPMENT.md) for build instructions and development gu
       split_side = "right",
       split_width_percentage = 0.3,
       provider = "snacks", -- or "native"
+      auto_close = true, -- Auto-close terminal after command completion
     },
 
     -- Diff options
@@ -223,6 +228,29 @@ See [DEVELOPMENT.md](./DEVELOPMENT.md) for build instructions and development gu
 
 </details>
 
+### Terminal Auto-Close Behavior
+
+The `auto_close` option controls what happens when Claude commands finish:
+
+**When `auto_close = true` (default):**
+
+- Terminal automatically closes after command completion
+- Error notifications shown for failed commands (non-zero exit codes)
+- Clean workflow for quick command execution
+
+**When `auto_close = false`:**
+
+- Terminal stays open after command completion
+- Allows reviewing command output and any error messages
+- Useful for debugging or when you want to see detailed output
+
+```lua
+terminal = {
+  provider = "snacks",
+  auto_close = false, -- Keep terminal open to review output
+}
+```
+
 ## Troubleshooting
 
 - **Claude not connecting?** Check `:ClaudeCodeStatus` and verify lock file exists in `~/.claude/ide/`

dev-config.lua

@@ -0,0 +1,46 @@
+-- Development configuration for claudecode.nvim
+-- This is Thomas's personal config for developing claudecode.nvim
+-- Symlink this to your personal Neovim config:
+-- ln -s ~/GitHub/claudecode.nvim/dev-config.lua ~/.config/nvim/lua/plugins/dev-claudecode.lua
+
+return {
+  "coder/claudecode.nvim",
+  dev = true, -- Use local development version
+  dir = "~/GitHub/claudecode.nvim", -- Adjust path as needed
+  keys = {
+    -- AI/Claude Code prefix
+    { "<leader>a", nil, desc = "AI/Claude Code" },
+
+    -- Core Claude commands
+    { "<leader>ac", "<cmd>ClaudeCode<cr>", desc = "Toggle Claude" },
+    { "<leader>ar", "<cmd>ClaudeCode --resume<cr>", desc = "Resume Claude" },
+    { "<leader>aC", "<cmd>ClaudeCode --continue<cr>", desc = "Continue Claude" },
+
+    -- Context sending
+    { "<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" },
+    },
+
+    -- Development helpers
+    { "<leader>ao", "<cmd>ClaudeCodeOpen<cr>", desc = "Open Claude" },
+    { "<leader>aq", "<cmd>ClaudeCodeClose<cr>", desc = "Close Claude" },
+    { "<leader>ai", "<cmd>ClaudeCodeStatus<cr>", desc = "Claude Status" },
+    { "<leader>aS", "<cmd>ClaudeCodeStart<cr>", desc = "Start Claude Server" },
+    { "<leader>aQ", "<cmd>ClaudeCodeStop<cr>", desc = "Stop Claude Server" },
+  },
+
+  -- Development configuration
+  opts = {
+    -- auto_start = true,
+    -- log_level = "debug",
+    -- terminal_cmd = "claude --debug",
+    -- terminal = {
+    --   provider = "native",
+    --   auto_close = false, -- Keep terminals open to see output
+    -- },
+  },
+}

lua/claudecode/init.lua

@@ -648,22 +648,24 @@ function M._create_commands()
 
   local terminal_ok, terminal = pcall(require, "claudecode.terminal")
   if terminal_ok then
-    vim.api.nvim_create_user_command("ClaudeCode", function(_opts)
+    vim.api.nvim_create_user_command("ClaudeCode", function(opts)
       local current_mode = vim.fn.mode()
       if current_mode == "v" or current_mode == "V" or current_mode == "\22" then
         vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes("<Esc>", true, false, true), "n", false)
       end
-      terminal.toggle({})
+      local cmd_args = opts.args and opts.args ~= "" and opts.args or nil
+      terminal.toggle({}, cmd_args)
     end, {
-      nargs = "?",
-      desc = "Toggle the Claude Code terminal window",
+      nargs = "*",
+      desc = "Toggle the Claude Code terminal window with optional arguments",
     })
 
-    vim.api.nvim_create_user_command("ClaudeCodeOpen", function(_opts)
-      terminal.open({})
+    vim.api.nvim_create_user_command("ClaudeCodeOpen", function(opts)
+      local cmd_args = opts.args and opts.args ~= "" and opts.args or nil
+      terminal.open({}, cmd_args)
     end, {
-      nargs = "?",
-      desc = "Open the Claude Code terminal window",
+      nargs = "*",
+      desc = "Open the Claude Code terminal window with optional arguments",
     })
 
     vim.api.nvim_create_user_command("ClaudeCodeClose", function()

lua/claudecode/meta/vim.lua

@@ -79,9 +79,13 @@
 ---@field termopen fun(cmd: string|string[], opts?: table):number For vim.fn.termopen()
 -- Add other vim.fn functions as needed
 
+---@class vim_v_table
+---@field event table Event data containing status and other event information
+
 ---@class vim_global_api
 ---@field notify fun(msg: string | string[], level?: number, opts?: vim_notify_opts):nil
 ---@field log vim_log
+---@field v vim_v_table For vim.v.event access
 ---@field _last_echo table[]? table of tables, e.g. { {"message", "HighlightGroup"} }
 ---@field _last_error string?
 ---@field o vim_options_table For vim.o.option_name

lua/claudecode/server/init.lua

@@ -89,6 +89,11 @@ function M.stop()
 
   tcp_server.stop_server(M.state.server)
 
+  -- CRITICAL: Clear global deferred responses to prevent memory leaks and hanging
+  if _G.claude_deferred_responses then
+    _G.claude_deferred_responses = {}
+  end
+
   M.state.server = nil
   M.state.port = nil
   M.state.clients = {}