fix(input): prevent cursor jumps on context completion trigger (#274)

Avoid restoring saved input cursor position when triggering # context completion

Author: disrupted

lua/opencode/api.lua

@@ -364,7 +364,7 @@ end
 
 function M.context_items()
   local char = config.get_key_for_function('input_window', 'context_items')
-  ui.focus_input({ restore_position = true, start_insert = true })
+  ui.focus_input({ restore_position = false, start_insert = true })
   require('opencode.ui.completion').trigger_completion(char)()
 end
 

lua/opencode/ui/ui.lua

@@ -136,8 +136,11 @@ function M.focus_input(opts)
     return
   end
 
+  local was_input_focused = vim.api.nvim_get_current_win() == windows.input_win
+
   if input_window.is_hidden() then
     input_window._show()
+    was_input_focused = false
   end
 
   if not windows.input_win then
@@ -146,7 +149,7 @@ function M.focus_input(opts)
 
   vim.api.nvim_set_current_win(windows.input_win)
 
-  if opts.restore_position and state.last_input_window_position then
+  if opts.restore_position and not was_input_focused and state.last_input_window_position then
     pcall(vim.api.nvim_win_set_cursor, 0, state.last_input_window_position)
   end
   if vim.api.nvim_get_current_win() == windows.input_win and opts.start_insert then

tests/unit/api_spec.lua

@@ -146,6 +146,40 @@ describe('opencode.api', function()
     end)
   end)
 
+  describe('completion triggers', function()
+    it('does not restore cursor position for context_items', function()
+      local config = require('opencode.config')
+      local original_get_key_for_function = config.get_key_for_function
+      local original_completion = package.loaded['opencode.ui.completion']
+
+      config.get_key_for_function = function(scope, function_name)
+        if scope == 'input_window' and function_name == 'context_items' then
+          return '#'
+        end
+        return original_get_key_for_function(scope, function_name)
+      end
+
+      local trigger_char = nil
+      package.loaded['opencode.ui.completion'] = {
+        trigger_completion = function(char)
+          return function()
+            trigger_char = char
+          end
+        end,
+      }
+
+      stub(ui, 'focus_input')
+
+      api.context_items()
+
+      config.get_key_for_function = original_get_key_for_function
+      package.loaded['opencode.ui.completion'] = original_completion
+
+      assert.stub(ui.focus_input).was_called_with({ restore_position = false, start_insert = true })
+      assert.equal('#', trigger_char)
+    end)
+  end)
+
   describe('run command argument parsing', function()
     it('parses agent prefix and passes to send_message', function()
       api.commands.run.fn({ 'agent=plan', 'analyze', 'this', 'code' }):wait()

tests/unit/cursor_tracking_spec.lua

@@ -1,5 +1,6 @@
 local state = require('opencode.state')
 local config = require('opencode.config')
+local ui = require('opencode.ui.ui')
 
 describe('cursor persistence (state)', function()
   before_each(function()
@@ -239,3 +240,47 @@ describe('renderer.scroll_to_bottom', function()
     config.values.ui.output.always_scroll_to_bottom = false
   end)
 end)
+
+describe('ui.focus_input', function()
+  local input_buf, output_buf, input_win, output_win
+
+  before_each(function()
+    input_buf = vim.api.nvim_create_buf(false, true)
+    output_buf = vim.api.nvim_create_buf(false, true)
+    vim.api.nvim_buf_set_lines(input_buf, 0, -1, false, { 'abcde' })
+    vim.api.nvim_buf_set_lines(output_buf, 0, -1, false, { 'output' })
+
+    output_win = vim.api.nvim_open_win(output_buf, true, {
+      relative = 'editor', width = 40, height = 5, row = 0, col = 0,
+    })
+    input_win = vim.api.nvim_open_win(input_buf, true, {
+      relative = 'editor', width = 40, height = 5, row = 6, col = 0,
+    })
+
+    state.windows = {
+      input_win = input_win,
+      output_win = output_win,
+      input_buf = input_buf,
+      output_buf = output_buf,
+    }
+    state.last_input_window_position = { 1, 4 }
+  end)
+
+  after_each(function()
+    pcall(vim.api.nvim_win_close, input_win, true)
+    pcall(vim.api.nvim_win_close, output_win, true)
+    pcall(vim.api.nvim_buf_delete, input_buf, { force = true })
+    pcall(vim.api.nvim_buf_delete, output_buf, { force = true })
+    state.windows = nil
+    state.last_input_window_position = nil
+  end)
+
+  it('does not restore cursor when already focused in input window', function()
+    vim.api.nvim_set_current_win(input_win)
+    vim.api.nvim_win_set_cursor(input_win, { 1, 2 })
+
+    ui.focus_input({ restore_position = true, start_insert = false })
+
+    assert.same({ 1, 2 }, vim.api.nvim_win_get_cursor(input_win))
+  end)
+end)