fix: resolve hidden terminal visibility issue for @ mentions

- Fix snacks provider to detect and show hidden terminals when focus=false
- Add hidden terminal logic to native provider using show_hidden_terminal()
- Both providers now properly handle the case where terminal buffer exists but has no window
- Clean up debug logging after identifying and resolving the issue
- Preserve user window context when focus=false in both providers

This resolves the issue where @ mentions wouldn't show the terminal when it was hidden in the background.

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

Author: ThomasK33

lua/claudecode/terminal/native.lua

@@ -196,18 +196,22 @@ local function hide_terminal()
   end
 end
 
-local function show_hidden_terminal(effective_config)
+local function show_hidden_terminal(effective_config, focus)
   -- Show an existing hidden terminal buffer in a new window
   if not bufnr or not vim.api.nvim_buf_is_valid(bufnr) then
     return false
   end
 
   -- Check if it's already visible
   if is_terminal_visible() then
-    focus_terminal()
+    if focus then
+      focus_terminal()
+    end
     return true
   end
 
+  local original_win = vim.api.nvim_get_current_win()
+
   -- Create a new window for the existing buffer
   local width = math.floor(vim.o.columns * effective_config.split_width_percentage)
   local full_height = vim.o.lines
@@ -227,8 +231,14 @@ local function show_hidden_terminal(effective_config)
   vim.api.nvim_win_set_buf(new_winid, bufnr)
   winid = new_winid
 
-  vim.api.nvim_set_current_win(winid)
-  vim.cmd("startinsert")
+  if focus then
+    -- Focus the terminal: switch to terminal window and enter insert mode
+    vim.api.nvim_set_current_win(winid)
+    vim.cmd("startinsert")
+  else
+    -- Preserve user context: return to the window they were in before showing terminal
+    vim.api.nvim_set_current_win(original_win)
+  end
 
   logger.debug("terminal", "Showed hidden terminal in new window")
   return true
@@ -269,8 +279,15 @@ function M.open(cmd_string, env_table, effective_config, focus)
   focus = utils.normalize_focus(focus)
 
   if is_valid() then
-    if focus then
-      focus_terminal()
+    -- Check if terminal exists but is hidden (no window)
+    if not winid or not vim.api.nvim_win_is_valid(winid) then
+      -- Terminal is hidden, show it by calling show_hidden_terminal
+      show_hidden_terminal(effective_config, focus)
+    else
+      -- Terminal is already visible
+      if focus then
+        focus_terminal()
+      end
     end
   else
     -- Check if there's an existing Claude terminal we lost track of
@@ -313,7 +330,7 @@ function M.simple_toggle(cmd_string, env_table, effective_config)
     -- Terminal is not visible
     if has_buffer then
       -- Terminal process exists but is hidden, show it
-      if show_hidden_terminal(effective_config) then
+      if show_hidden_terminal(effective_config, true) then
         logger.debug("terminal", "Showing hidden terminal")
       else
         logger.error("terminal", "Failed to show hidden terminal")
@@ -360,7 +377,7 @@ function M.focus_toggle(cmd_string, env_table, effective_config)
       end
     else
       -- Terminal process exists but is hidden, show it
-      if show_hidden_terminal(effective_config) then
+      if show_hidden_terminal(effective_config, true) then
         logger.debug("terminal", "Showing hidden terminal")
       else
         logger.error("terminal", "Failed to show hidden terminal")

lua/claudecode/terminal/snacks.lua

@@ -80,15 +80,33 @@ function M.open(cmd_string, env_table, config, focus)
   focus = utils.normalize_focus(focus)
 
   if terminal and terminal:buf_valid() then
-    if focus then
-      terminal:focus()
-      local term_buf_id = terminal.buf
-      if term_buf_id and vim.api.nvim_buf_get_option(term_buf_id, "buftype") == "terminal" then
-        -- Check if window is valid before calling nvim_win_call
-        if terminal.win and vim.api.nvim_win_is_valid(terminal.win) then
-          vim.api.nvim_win_call(terminal.win, function()
-            vim.cmd("startinsert")
-          end)
+    -- Check if terminal exists but is hidden (no window)
+    if not terminal.win or not vim.api.nvim_win_is_valid(terminal.win) then
+      -- Terminal is hidden, show it using snacks toggle
+      terminal:toggle()
+      if focus then
+        terminal:focus()
+        local term_buf_id = terminal.buf
+        if term_buf_id and vim.api.nvim_buf_get_option(term_buf_id, "buftype") == "terminal" then
+          if terminal.win and vim.api.nvim_win_is_valid(terminal.win) then
+            vim.api.nvim_win_call(terminal.win, function()
+              vim.cmd("startinsert")
+            end)
+          end
+        end
+      end
+    else
+      -- Terminal is already visible
+      if focus then
+        terminal:focus()
+        local term_buf_id = terminal.buf
+        if term_buf_id and vim.api.nvim_buf_get_option(term_buf_id, "buftype") == "terminal" then
+          -- Check if window is valid before calling nvim_win_call
+          if terminal.win and vim.api.nvim_win_is_valid(terminal.win) then
+            vim.api.nvim_win_call(terminal.win, function()
+              vim.cmd("startinsert")
+            end)
+          end
         end
       end
     end