feat(ui/renderer): question navigation and flush

Author: sudo-tee

lua/opencode/ui/dialog.lua

@@ -232,36 +232,24 @@ function Dialog:format_legend(output, options)
     end
 
     if keymaps.up and #keymaps.up > 0 and keymaps.down and #keymaps.down > 0 then
-      local line = output:add_line(string.format('Move: j/k or %s/%s', '↑', '↓'))
-      output:add_extmark(line - 1, { start_col = 6, end_col = 9, hl_group = 'OpencodeQuestionKeyHint' } --[[@as OutputExtmark]])
-      output:add_extmark(line - 1, { start_col = 13, end_col = 16, hl_group = 'OpencodeQuestionKeyHint' } --[[@as OutputExtmark]])
+      local line = output:add_line('Move: `j/k` or `↑/↓`')
     end
 
     if keymaps.left and #keymaps.left > 0 and keymaps.right and #keymaps.right > 0 then
-      local line = output:add_line('Question: h/l or <-/->')
-      output:add_extmark(line - 1, { start_col = 10, end_col = 13, hl_group = 'OpencodeQuestionKeyHint' } --[[@as OutputExtmark]])
-      output:add_extmark(line - 1, { start_col = 17, end_col = 23, hl_group = 'OpencodeQuestionKeyHint' } --[[@as OutputExtmark]])
+      local line = output:add_line('Question: `h/l` or `<-/->`')
     end
 
     if keymaps.select and keymaps.select ~= '' then
-      local select_text = 'Select: <CR>'
+      local select_text = 'Select: `<CR>`'
       if keymaps.number_shortcuts and option_count > 0 then
         local max_shortcut = math.min(option_count, 9)
-        select_text = select_text .. string.format(' or 1-%d', max_shortcut)
+        select_text = select_text .. string.format(' or `1-%d`', max_shortcut)
       end
       local line = output:add_line(select_text)
-      output:add_extmark(line - 1, { start_col = 8, end_col = 12, hl_group = 'OpencodeQuestionKeyHint' } --[[@as OutputExtmark]])
-      if keymaps.number_shortcuts and option_count > 0 then
-        local max_shortcut = math.min(option_count, 9)
-        local suffix = string.format('1-%d', max_shortcut)
-        local start_col = #select_text - #suffix
-        output:add_extmark(line - 1, { start_col = start_col, end_col = #select_text, hl_group = 'OpencodeQuestionKeyHint' } --[[@as OutputExtmark]])
-      end
     end
 
     if keymaps.dismiss and keymaps.dismiss ~= '' then
-      local line = output:add_line('Close: <Esc>')
-      output:add_extmark(line - 1, { start_col = 7, end_col = 12, hl_group = 'OpencodeQuestionKeyHint' } --[[@as OutputExtmark]])
+      local line = output:add_line('Close: `<Esc>`')
     end
   else
     local message = options.unfocused_message or 'Focus Opencode window to interact'

lua/opencode/ui/question_window.lua

@@ -159,7 +159,10 @@ local function get_question_part(question_request)
 
   if question_request and question_request.sessionID and question_request.sessionID ~= '' then
     local render_state = require('opencode.ui.renderer.ctx').render_state
-    return find_matching_question_part(render_state:get_child_session_parts(question_request.sessionID), question_request)
+    return find_matching_question_part(
+      render_state:get_child_session_parts(question_request.sessionID),
+      question_request
+    )
   end
 end
 
@@ -226,14 +229,16 @@ function M.restore_pending_question(session_id)
     M.clear_question()
   end
 
-  return state.api_client:list_questions()
+  return state.api_client
+    :list_questions()
     :and_then(function(requests)
       if not requests or type(requests) ~= 'table' then
         return
       end
 
       for _, request in ipairs(requests) do
-        if request
+        if
+          request
           and request.questions
           and #request.questions > 0
           and M.belongs_to_active_session(request)
@@ -385,8 +390,8 @@ local function format_question_tabs(output)
     local label = question.header ~= '' and question.header or ('Q' .. i)
     local is_active = i == M._current_question_index
     local is_done = get_answer_for_index(i) ~= nil
-    local marker = is_done and 'x' or ' '
-    local segment = string.format(' %d [%s] %s ', i, marker, label)
+    local marker = is_done and icons.get('completed') or ' '
+    local segment = string.format(' %d [%s] %s ', i, label, marker)
 
     if #line > 0 then
       line = line .. ' '

lua/opencode/ui/renderer/ctx.lua

@@ -67,4 +67,17 @@ function ctx:bulk_reset()
   self.bulk_folds = {}
 end
 
+---@param pending? RendererCtx['pending']
+---@return boolean
+function ctx:has_pending_work(pending)
+  pending = pending or self.pending
+
+  return self.flush_scheduled
+    or self.bulk_mode
+    or #pending.dirty_message_order > 0
+    or #pending.dirty_part_order > 0
+    or #pending.removed_part_order > 0
+    or #pending.removed_message_order > 0
+end
+
 return ctx

lua/opencode/ui/renderer/flush.lua

@@ -402,10 +402,7 @@ local function apply_pending(pending)
     return false
   end
 
-  local has_updates = #pending.removed_part_order > 0
-    or #pending.removed_message_order > 0
-    or #pending.dirty_message_order > 0
-    or #pending.dirty_part_order > 0
+  local has_updates = ctx:has_pending_work(pending)
 
   if not has_updates then
     return false