fix(renderer): actions off by one when inserting

Caused by the double newline we keep at the end.

Also, standardize on api-indexing (0 based line numbers) for actions.

Author: cameronr

lua/opencode/ui/contextual_actions.lua

@@ -1,5 +1,4 @@
 local state = require('opencode.state')
-local keymap = require('opencode.keymap')
 local output_window = require('opencode.ui.output_window')
 
 local M = {}
@@ -26,6 +25,13 @@ function M.setup_contextual_actions(windows)
     callback = function()
       vim.schedule(function()
         local line_num = vim.api.nvim_win_get_cursor(0)[1]
+
+        if not line_num or line_num <= 0 or not state.windows or not state.windows.output_buf then
+          return
+        end
+
+        line_num = line_num - 1 -- need api-indexing (e.g. 0 based line #), win_get_cursor returns 1 based line #
+
         local actions = require('opencode.ui.renderer').get_actions_for_line(line_num)
         last_line_num = line_num
 
@@ -34,7 +40,7 @@ function M.setup_contextual_actions(windows)
 
         if actions and #actions > 0 then
           dirty = true
-          M.show_contextual_actions_menu(state.windows.output_buf, line_num, actions, ns_id)
+          M.show_contextual_actions_menu(state.windows.output_buf, actions, ns_id)
         end
       end)
     end,
@@ -48,6 +54,7 @@ function M.setup_contextual_actions(windows)
         if not output_window.mounted() then
           return
         end
+        ---@cast state.windows { output_buf: integer}
         local line_num = vim.api.nvim_win_get_cursor(0)[1]
         if last_line_num == line_num and not dirty then
           return
@@ -61,15 +68,17 @@ function M.setup_contextual_actions(windows)
     group = augroup,
     buffer = windows.output_buf,
     callback = function()
-      vim.api.nvim_buf_clear_namespace(state.windows.output_buf, ns_id, 0, -1)
-      clear_keymaps(state.windows.output_buf)
+      if state.windows and state.windows.output_buf then
+        vim.api.nvim_buf_clear_namespace(state.windows.output_buf, ns_id, 0, -1)
+        clear_keymaps(state.windows.output_buf)
+      end
       last_line_num = nil
       dirty = false
     end,
   })
 end
 
-function M.show_contextual_actions_menu(buf, line_num, actions, ns_id)
+function M.show_contextual_actions_menu(buf, actions, ns_id)
   clear_keymaps(buf)
 
   for _, action in ipairs(actions) do
@@ -80,7 +89,7 @@ function M.show_contextual_actions_menu(buf, line_num, actions, ns_id)
       hl_mode = 'combine',
     }
 
-    vim.api.nvim_buf_set_extmark(buf, ns_id, action.display_line - 1, 0, mark)
+    vim.api.nvim_buf_set_extmark(buf, ns_id, action.display_line, 0, mark --[[@as vim.api.keyset.set_extmark]])
   end
   -- Setup key mappings for actions
   for _, action in ipairs(actions) do

lua/opencode/ui/formatter.lua

@@ -155,6 +155,7 @@ function M._format_revert_message(session_data, start_idx)
 end
 
 local function add_action(output, text, action_type, args, key, line)
+  -- actions use api-indexing (e.g. 0 indexed)
   line = (line or output:get_line_count()) - 1
   output:add_action({
     text = text,

lua/opencode/ui/render_state.lua

@@ -119,7 +119,7 @@ function RenderState:get_message_at_line(line)
 end
 
 ---Get actions at specific line
----@param line integer Line number (1-indexed)
+---@param line integer Line number (0-indexed)
 ---@return table[] List of actions at that line
 function RenderState:get_actions_at_line(line)
   self:_ensure_line_index()

lua/opencode/ui/renderer.lua

@@ -275,10 +275,6 @@ function M._write_formatted_data(formatted_data, part_id, start_line)
     return nil
   end
 
-  if part_id and formatted_data.actions then
-    M._render_state:add_actions(part_id, formatted_data.actions, target_line)
-  end
-
   if is_insertion then
     output_window.set_lines(new_lines, target_line, target_line)
   else
@@ -287,6 +283,15 @@ function M._write_formatted_data(formatted_data, part_id, start_line)
     target_line = target_line - 1
     output_window.set_lines(extra_newline, target_line)
   end
+
+  -- update actions and extmarks after the insertion because that may
+  -- adjust target_line (e.g. when we we're replacing the double newline at
+  -- the end)
+
+  if part_id and formatted_data.actions then
+    M._render_state:add_actions(part_id, formatted_data.actions, target_line)
+  end
+
   output_window.set_extmarks(extmarks, target_line)
 
   return {
@@ -959,7 +964,7 @@ function M.on_session_changed(_, new, _)
 end
 
 ---Get all actions available at a specific line
----@param line integer 1-indexed line number
+---@param line integer 0-indexed line number
 ---@return table[] List of actions available at that line
 function M.get_actions_for_line(line)
   return M._render_state:get_actions_at_line(line)