fix(ui): keep inline input within panel lifecycle

Author: jensenojs

lua/opencode/keymap.lua

@@ -44,7 +44,8 @@ end
 ---@param keymap_config table The keymap configuration table
 ---@param default_modes table Default modes for these keymaps
 ---@param base_opts table Base options to use for all keymaps
-local function process_keymap_entry(keymap_config, default_modes, base_opts)
+---@param preserve_existing? boolean
+local function process_keymap_entry(keymap_config, default_modes, base_opts, preserve_existing)
   local command_defs = commands.get_commands()
 
   for key_binding, config_entry in pairs(keymap_config) do
@@ -56,10 +57,26 @@ local function process_keymap_entry(keymap_config, default_modes, base_opts)
       local callback = resolve_callback(func_name, func_args)
 
       local modes = config_entry.mode or default_modes
+      if preserve_existing and base_opts.buffer then
+        local missing_modes = {}
+        for _, mode in ipairs(type(modes) == 'table' and modes or { modes }) do
+          local exists = false
+          for _, mapping in ipairs(vim.api.nvim_buf_get_keymap(base_opts.buffer, mode)) do
+            if mapping.lhs == key_binding then
+              exists = true
+              break
+            end
+          end
+          if not exists then
+            table.insert(missing_modes, mode)
+          end
+        end
+        modes = missing_modes
+      end
       local opts = vim.tbl_deep_extend('force', {}, base_opts)
       opts.desc = config_entry.desc or vim.tbl_get(command_defs, func_name, 'desc') or ''
 
-      if callback then
+      if callback and #modes > 0 then
         if config_entry.defer_to_completion then
           callback = wrap_with_completion_check(key_binding, callback)
         end
@@ -78,12 +95,13 @@ end
 
 ---@param keymap_config table Window keymap configuration
 ---@param buf_id integer Buffer ID to set keymaps for
-function M.setup_window_keymaps(keymap_config, buf_id)
+---@param preserve_existing? boolean
+function M.setup_window_keymaps(keymap_config, buf_id, preserve_existing)
   if not vim.api.nvim_buf_is_valid(buf_id) then
     return
   end
 
-  process_keymap_entry(keymap_config or {}, { 'n' }, { silent = true, buffer = buf_id })
+  process_keymap_entry(keymap_config or {}, { 'n' }, { silent = true, buffer = buf_id }, preserve_existing)
 end
 
 return M

lua/opencode/ui/inline_input.lua

@@ -18,7 +18,9 @@ local M = {}
 function M.open(opts)
   local anchor = vim.fn.screenpos(opts.win, opts.row + 1, opts.col + 1)
   local width = math.max(1, math.min(50, vim.o.columns - anchor.col - 1))
-  local max_height = math.max(1, vim.o.lines - anchor.row - 2)
+  local col_shift = math.max(0, anchor.col + width + 1 - vim.o.columns)
+  local row_shift = math.max(0, anchor.row + 2 - vim.o.lines)
+  local max_height = math.max(1, vim.o.lines - anchor.row + row_shift - 2)
   local initial_lines = opts.initial_text and vim.split(opts.initial_text, '\n', { plain = true }) or nil
 
   local buf = vim.api.nvim_create_buf(false, true)
@@ -34,6 +36,8 @@ function M.open(opts)
     relative = 'win',
     win = opts.win,
     bufpos = { opts.row, opts.col },
+    row = 1 - row_shift,
+    col = -col_shift,
     width = width,
     height = 1,
     style = 'minimal',
@@ -57,11 +61,20 @@ function M.open(opts)
   resize_height()
 
   local closed = false
+  local win_closed_autocmd
+  local function delete_win_closed_autocmd()
+    if win_closed_autocmd then
+      pcall(vim.api.nvim_del_autocmd, win_closed_autocmd)
+      win_closed_autocmd = nil
+    end
+  end
+
   local function close()
     if closed then
       return
     end
     closed = true
+    delete_win_closed_autocmd()
     if vim.api.nvim_win_is_valid(win) then
       vim.api.nvim_win_close(win, true)
     end
@@ -106,13 +119,18 @@ function M.open(opts)
     end,
   })
 
-  vim.api.nvim_create_autocmd('WinClosed', {
-    pattern = tostring(win),
-    callback = function()
+  win_closed_autocmd = vim.api.nvim_create_autocmd('WinClosed', {
+    pattern = { tostring(opts.win), tostring(win) },
+    callback = function(event)
       if closed then
         return
       end
+      if tonumber(event.match) == opts.win then
+        cancel_with_draft()
+        return
+      end
       closed = true
+      delete_win_closed_autocmd()
       if vim.api.nvim_win_is_valid(opts.win) then
         vim.api.nvim_set_current_win(opts.win)
       end

lua/opencode/ui/output_window.lua

@@ -300,7 +300,6 @@ function M.setup(windows)
   M.update_dimensions(windows)
   M.reset_scroll_tracking(windows.output_win)
   M._last_visible_bottom_by_win[windows.output_win] = M.get_visible_bottom_line(windows.output_win)
-  M.setup_keymaps(windows)
 end
 
 ---@param windows OpencodeWindowState?
@@ -681,18 +680,30 @@ function M.close()
 end
 
 ---@param windows OpencodeWindowState
-function M.setup_keymaps(windows)
+---@param preserve_existing? boolean
+function M.setup_keymaps(windows, preserve_existing)
   local keymap = require('opencode.keymap')
-  keymap.setup_window_keymaps(config.keymap.output_window, windows.output_buf)
+  keymap.setup_window_keymaps(config.keymap.output_window, windows.output_buf, preserve_existing)
 
   -- When lazy-render is active, gg only reaches the top of rendered content.
   -- Load all messages first so gg reaches the true start of history.
-  vim.keymap.set('n', 'gg', function()
-    local renderer = require('opencode.ui.renderer')
-    renderer.load_all_messages()
-    pcall(vim.cmd, [[noau normal! m']])
-    vim.api.nvim_win_set_cursor(0, { 1, 0 })
-  end, { buffer = windows.output_buf })
+  local has_gg = false
+  if preserve_existing then
+    for _, mapping in ipairs(vim.api.nvim_buf_get_keymap(windows.output_buf, 'n')) do
+      if mapping.lhs == 'gg' then
+        has_gg = true
+        break
+      end
+    end
+  end
+  if not has_gg then
+    vim.keymap.set('n', 'gg', function()
+      local renderer = require('opencode.ui.renderer')
+      renderer.load_all_messages()
+      pcall(vim.cmd, [[noau normal! m']])
+      vim.api.nvim_win_set_cursor(0, { 1, 0 })
+    end, { buffer = windows.output_buf })
+  end
 end
 
 ---@param windows OpencodeWindowState

lua/opencode/ui/question_window.lua

@@ -222,7 +222,7 @@ function M.show_question(question_request)
 end
 
 ---@return boolean
-function M.restore_active_question_ui()
+local function restore_active_question_ui()
   local question = M._current_question
   if
     not question
@@ -246,7 +246,7 @@ function M.restore_pending_question(session_id)
 
   if M.has_question() and session_scope.belongs_to_active_session(M._current_question) then
     if not is_resolved_question_request(M._current_question) then
-      M.restore_active_question_ui()
+      restore_active_question_ui()
       return Promise.new():resolve(nil)
     end
 

lua/opencode/ui/ui.lua

@@ -246,6 +246,7 @@ function M.restore_hidden_windows()
 
   input_window.setup(windows)
   output_window.setup(windows)
+  output_window.setup_keymaps(windows, true)
   footer.setup(windows)
   if state.api_client and type(state.api_client.list_providers) == 'function' then
     topbar.setup()
@@ -281,7 +282,6 @@ function M.restore_hidden_windows()
   end)
 
   require('opencode.ui.contextual_actions').setup_contextual_actions(windows)
-  require('opencode.ui.question_window').restore_active_question_ui()
 
   return true
 end
@@ -400,6 +400,7 @@ function M.create_windows()
 
   input_window.setup(windows)
   output_window.setup(windows)
+  output_window.setup_keymaps(windows)
   footer.setup(windows)
   topbar.setup()
 

tests/unit/inline_input_spec.lua

@@ -23,7 +23,7 @@ describe('inline_input', function()
 
   after_each(function()
     if vim.api.nvim_win_is_valid(anchor_win) then
-      vim.api.nvim_win_close(anchor_win, true)
+      pcall(vim.api.nvim_win_close, anchor_win, true)
     end
     if vim.api.nvim_buf_is_valid(anchor_buf) then
       vim.api.nvim_buf_delete(anchor_buf, { force = true })
@@ -45,6 +45,17 @@ describe('inline_input', function()
     return input
   end
 
+  local function use_regular_anchor()
+    vim.api.nvim_win_close(anchor_win, true)
+    anchor_win = vim.api.nvim_get_current_win()
+    vim.api.nvim_win_set_buf(anchor_win, anchor_buf)
+    vim.wo[anchor_win].wrap = false
+    vim.wo[anchor_win].signcolumn = 'no'
+    vim.wo[anchor_win].foldcolumn = '0'
+    vim.wo[anchor_win].number = false
+    vim.wo[anchor_win].relativenumber = false
+  end
+
   local function change_text(input, text, expected_height)
     vim.api.nvim_buf_set_lines(input.buf, 0, 1, false, { text })
     vim.api.nvim_exec_autocmds('TextChangedI', { buffer = input.buf, modeline = false })
@@ -162,13 +173,15 @@ describe('inline_input', function()
   end)
 
   it('shrinks its opening width before the right border reaches the editor edge', function()
+    use_regular_anchor()
     local col = vim.api.nvim_win_get_width(anchor_win) - 2
     local input = open_input(0, col)
     local anchor = vim.fn.screenpos(anchor_win, 1, col + 1)
     local width = vim.api.nvim_win_get_config(input.win).width
+    local position = vim.api.nvim_win_get_position(input.win)
 
-    assert.equals(math.min(50, vim.o.columns - anchor.col - 1), width)
-    assert.is_true(anchor.col + width + 1 <= vim.o.columns)
+    assert.equals(math.max(1, math.min(50, vim.o.columns - anchor.col - 1)), width)
+    assert.is_true(position[2] + width + 2 <= vim.o.columns)
     input.close()
   end)
 
@@ -185,6 +198,43 @@ describe('inline_input', function()
     input.close()
   end)
 
+  it('keeps its rounded border inside the editor at the bottom-right edge', function()
+    vim.api.nvim_win_close(anchor_win, true)
+    vim.cmd('botright 10vnew')
+    vim.cmd('botright 2new')
+    anchor_win = vim.api.nvim_get_current_win()
+    vim.api.nvim_win_set_buf(anchor_win, anchor_buf)
+    vim.wo[anchor_win].wrap = false
+    vim.wo[anchor_win].signcolumn = 'no'
+    vim.wo[anchor_win].foldcolumn = '0'
+
+    local input = open_input(0, vim.api.nvim_win_get_width(anchor_win) - 3)
+    local position = vim.api.nvim_win_get_position(input.win)
+    local window_config = vim.api.nvim_win_get_config(input.win)
+
+    assert.is_true(
+      position[2] + window_config.width + 2 <= vim.o.columns,
+      vim.inspect({ position = position, config = window_config, columns = vim.o.columns, lines = vim.o.lines })
+    )
+    assert.is_true(
+      position[1] + window_config.height + 2 <= vim.o.lines,
+      vim.inspect({ position = position, config = window_config, columns = vim.o.columns, lines = vim.o.lines })
+    )
+    input.close()
+    vim.cmd('only')
+  end)
+
+  it('removes its WinClosed watcher after closing', function()
+    local before = #vim.api.nvim_get_autocmds({ event = 'WinClosed' })
+
+    for _ = 1, 5 do
+      local input = open_input(0, 0)
+      input.close()
+    end
+
+    assert.equals(before, #vim.api.nvim_get_autocmds({ event = 'WinClosed' }))
+  end)
+
   it('resizes after multiline text changes outside insert mode', function()
     local input = open_input(0, 0)
     local lines = {
@@ -230,6 +280,34 @@ describe('inline_input', function()
     assert.equals(1, cancelled)
   end)
 
+  it('returns the draft and closes when its anchor window closes', function()
+    local draft
+    local cancelled = 0
+    local input = inline_input.open({
+      win = anchor_win,
+      row = 0,
+      col = 0,
+      on_submit = function() end,
+      on_cancel = function()
+        cancelled = cancelled + 1
+      end,
+      on_leave = function(text)
+        draft = text
+      end,
+    })
+    assert.is_true(vim.wait(50, function()
+      return vim.api.nvim_get_current_win() == input.win
+    end))
+
+    local lines = { 'first line', 'second line' }
+    vim.api.nvim_buf_set_lines(input.buf, 0, -1, false, lines)
+    vim.api.nvim_win_close(anchor_win, true)
+
+    assert.is_false(vim.api.nvim_win_is_valid(input.win))
+    assert.equals(table.concat(lines, '\n'), draft)
+    assert.equals(1, cancelled)
+  end)
+
   it('submits every character from a wrapped mixed-language line', function()
     local submitted
     local text = 'English 中文 mixed ' .. string.rep('长文本', 40)

tests/unit/persist_state_spec.lua

@@ -353,7 +353,21 @@ describe('persist_state', function()
       })
       require('opencode.ui.renderer.flush').flush()
 
+      question_window._dialog:set_selection(2)
+      question_window._dialog:select()
+      assert.is_true(vim.wait(100, function()
+        return question_window._inline_input ~= nil
+      end))
+      local inline_win = question_window._inline_input.win
+      local draft_lines = { 'first line', 'second line' }
+      vim.api.nvim_buf_set_lines(question_window._inline_input.buf, 0, -1, false, draft_lines)
+
       toggle_wait('hidden')
+
+      assert.is_false(vim.api.nvim_win_is_valid(inline_win))
+      assert.is_nil(question_window._inline_input)
+      assert.equals(table.concat(draft_lines, '\n'), question_window._other_input_drafts[1])
+
       toggle_wait('visible')
 
       local enter_mapping
@@ -365,9 +379,44 @@ describe('persist_state', function()
       end
 
       assert.equals('Dialog: select option', enter_mapping and enter_mapping.desc)
+      assert.equals(2, question_window._dialog:get_selection())
+
+      question_window._dialog:select()
+      assert.is_true(vim.wait(100, function()
+        return question_window._inline_input ~= nil
+      end))
+      assert.are.same(draft_lines, vim.api.nvim_buf_get_lines(question_window._inline_input.buf, 0, -1, false))
       question_window.clear_question()
     end)
 
+    it('restores missing base mappings without replacing preserved mappings', function()
+      setup_ui()
+      config.keymap.output_window.a = { function() end, desc = 'Base A' }
+      create_code_file()
+      toggle_wait('visible')
+
+      local output_buf = state.windows.output_buf
+      local contextual_actions = require('opencode.ui.contextual_actions')
+      contextual_actions.show_contextual_actions_menu(output_buf, {
+        { key = 'a', text = 'Temporary A', display_line = 0 },
+      }, vim.api.nvim_create_namespace('persist-state-mapping-test'))
+
+      local function mapping_description(lhs)
+        for _, mapping in ipairs(vim.api.nvim_buf_get_keymap(output_buf, 'n')) do
+          if mapping.lhs == lhs then
+            return mapping.desc
+          end
+        end
+      end
+
+      assert.equals('Temporary A', mapping_description('a'))
+      toggle_wait('hidden')
+      assert.is_nil(mapping_description('a'))
+
+      toggle_wait('visible')
+      assert.equals('Base A', mapping_description('a'))
+    end)
+
     it('fully closes when persist_state=false', function()
       setup_ui({ persist_state = false })
       create_code_file()