fix: cursor position when switching terminal sessions

Add jobresize() calls to notify the terminal job of window dimensions
when switching between sessions. This fixes the cursor appearing in
the wrong position and line shifting after session switch.

The terminal job needs to know its window dimensions to correctly
calculate cursor position and line wrapping. Without this, the
terminal renders based on stale window state from the previous session.

Author: Snir Turgeman

lua/claudecode/init.lua

@@ -1197,11 +1197,64 @@ function M.show_session_picker()
   end
 end
 
----Try to use an enhanced picker (fzf-lua)
+---Try to use an enhanced picker (Snacks or fzf-lua)
 ---@param items table[] Items to pick from
 ---@param on_select function Callback when item is selected
 ---@return boolean success Whether an enhanced picker was used
 function M._try_picker(items, on_select)
+  -- Try Snacks picker first
+  local snacks_ok, Snacks = pcall(require, "snacks")
+  if snacks_ok and Snacks and Snacks.picker then
+    local picker_items = {}
+    for _, item in ipairs(items) do
+      table.insert(picker_items, {
+        text = item.display,
+        item = item,
+      })
+    end
+
+    Snacks.picker.pick({
+      source = "claude_sessions",
+      items = picker_items,
+      format = function(item)
+        return { { item.text } }
+      end,
+      layout = {
+        preview = false,
+      },
+      confirm = function(picker, item)
+        picker:close()
+        if item and item.item then
+          on_select(item.item)
+        end
+      end,
+      actions = {
+        close_session = function(picker, item)
+          if item and item.item and item.item.session then
+            local terminal_mod = require("claudecode.terminal")
+            terminal_mod.close_session(item.item.session.id)
+            vim.notify("Closed session: " .. item.item.session.name, vim.log.levels.INFO)
+            picker:close()
+          end
+        end,
+      },
+      win = {
+        input = {
+          keys = {
+            ["<C-x>"] = { "close_session", mode = { "i", "n" }, desc = "Close session" },
+          },
+        },
+        list = {
+          keys = {
+            ["<C-x>"] = { "close_session", mode = { "n" }, desc = "Close session" },
+          },
+        },
+      },
+      title = "Claude Sessions (Ctrl-X: close)",
+    })
+    return true
+  end
+
   -- Try fzf-lua
   local fzf_ok, fzf = pcall(require, "fzf-lua")
   if fzf_ok and fzf then
@@ -1223,6 +1276,23 @@ function M._try_picker(items, on_select)
             end
           end
         end,
+        ["ctrl-x"] = {
+          fn = function(selected)
+            if selected and selected[1] then
+              local item = item_map[selected[1]]
+              if item and item.session then
+                local terminal_mod = require("claudecode.terminal")
+                terminal_mod.close_session(item.session.id)
+                vim.notify("Closed session: " .. item.session.name, vim.log.levels.INFO)
+              end
+            end
+          end,
+          -- Close picker after action since session list changed
+          exec_silent = true,
+        },
+      },
+      fzf_opts = {
+        ["--header"] = "Enter: switch | Ctrl-X: close session",
       },
     })
     return true

lua/claudecode/terminal/native.lua

@@ -712,6 +712,12 @@ local function show_hidden_session_terminal_impl(session_id, effective_config, f
   vim.api.nvim_win_set_buf(new_winid, state.bufnr)
   state.winid = new_winid
 
+  -- Notify terminal of window dimensions to fix cursor position after session switch
+  local chan = vim.bo[state.bufnr].channel
+  if chan and chan > 0 then
+    pcall(vim.fn.jobresize, chan, width, full_height)
+  end
+
   if focus then
     vim.api.nvim_set_current_win(new_winid)
     vim.cmd("startinsert")
@@ -777,6 +783,17 @@ function M.focus_session(session_id, effective_config)
     return
   end
 
+  -- Notify terminal of window dimensions to fix cursor position after session switch
+  local state = terminals[session_id]
+  if state and state.bufnr and vim.api.nvim_buf_is_valid(state.bufnr) then
+    local chan = vim.bo[state.bufnr].channel
+    if chan and chan > 0 then
+      local width = vim.api.nvim_win_get_width(win)
+      local height = vim.api.nvim_win_get_height(win)
+      pcall(vim.fn.jobresize, chan, width, height)
+    end
+  end
+
   vim.api.nvim_set_current_win(win)
   vim.cmd("startinsert")
 end

lua/claudecode/terminal/snacks.lua

@@ -498,6 +498,14 @@ function M.focus_session(session_id, config)
   local term_buf_id = term_instance.buf
   if term_buf_id and vim.api.nvim_buf_get_option(term_buf_id, "buftype") == "terminal" then
     if term_instance.win and vim.api.nvim_win_is_valid(term_instance.win) then
+      -- Notify terminal of window dimensions to fix cursor position after session switch
+      local chan = vim.bo[term_buf_id].channel
+      if chan and chan > 0 then
+        local width = vim.api.nvim_win_get_width(term_instance.win)
+        local height = vim.api.nvim_win_get_height(term_instance.win)
+        pcall(vim.fn.jobresize, chan, width, height)
+      end
+
       vim.api.nvim_win_call(term_instance.win, function()
         vim.cmd("startinsert")
       end)