refactor(question-window): replace question picker

- Replace question picker with a custom dialog in the chat window

Author: sudo-tee

lua/opencode/api.lua

@@ -935,6 +935,21 @@ function M.permission_deny(permission)
   M.respond_to_permission('reject', permission)
 end
 
+function M.question_answer()
+  local question_window = require('opencode.ui.question_window')
+  local question_info = question_window.get_current_question_info()
+  if question_info and question_info.options and question_info.options[1] then
+    question_window._answer_with_option(1)
+  end
+end
+
+function M.question_other()
+  local question_window = require('opencode.ui.question_window')
+  if question_window.has_question() then
+    question_window._answer_with_custom()
+  end
+end
+
 function M.toggle_tool_output()
   local action_text = config.ui.output.tools.show_output and 'Hiding' or 'Showing'
   vim.notify(action_text .. ' tool output display', vim.log.levels.INFO)

lua/opencode/types.lua

@@ -208,8 +208,8 @@
 ---@field quick_chat OpencodeQuickChatConfig
 
 ---@class MessagePartState
----@field input TaskToolInput|BashToolInput|FileToolInput|TodoToolInput|GlobToolInput|GrepToolInput|WebFetchToolInput|ListToolInput Input data for the tool
----@field metadata TaskToolMetadata|ToolMetadataBase|WebFetchToolMetadata|BashToolMetadata|FileToolMetadata|GlobToolMetadata|GrepToolMetadata|ListToolMetadata Metadata about the tool execution
+---@field input TaskToolInput|BashToolInput|FileToolInput|TodoToolInput|GlobToolInput|GrepToolInput|WebFetchToolInput|ListToolInput|QuestionToolInput Input data for the tool
+---@field metadata TaskToolMetadata|ToolMetadataBase|WebFetchToolMetadata|BashToolMetadata|FileToolMetadata|GlobToolMetadata|GrepToolMetadata|ListToolMetadata|QuestionToolMetadata Metadata about the tool execution
 ---@field time { start: number, end: number } Timestamps for tool use
 ---@field status string Status of the tool use (e.g., 'running', 'completed', 'failed')
 ---@field title string Title of the tool use
@@ -307,6 +307,13 @@
 ---@field questions OpencodeQuestionInfo[] Questions to ask
 ---@field tool? { messageID: string, callID: string }
 
+---@class QuestionToolInput
+---@field questions OpencodeQuestionInfo[] Questions that were asked
+
+---@class QuestionToolMetadata: ToolMetadataBase
+---@field answers string[][] Array of answer arrays (one per question)
+---@field truncated boolean Whether the results were truncated
+
 ---@class MessageTokenCount
 ---@field reasoning number
 ---@field input number

lua/opencode/ui/formatter.lua

@@ -608,6 +608,30 @@ function M._format_list_tool(output, input, metadata, tool_output)
   end
 end
 
+---@param output Output Output object to write to
+---@param input QuestionToolInput Question tool input data
+---@param metadata QuestionToolMetadata Question tool metadata
+---@param status string Status of the tool execution
+function M._format_question_tool(output, input, metadata, status)
+  M.format_action(output, icons.get('question') .. ' question', '')
+  output:add_empty_line()
+  if not config.ui.output.tools.show_output or status ~= 'completed' then
+    return
+  end
+
+  local questions = input and input.questions or {}
+  local answers = metadata and metadata.answers or {}
+
+  for i, question in ipairs(questions) do
+    output:add_line(string.format('**Q%d:** %s', i, question.question or question.header or ''))
+    local answer = answers[i] and answers[i][1] or 'No answer'
+    output:add_line(string.format('**A%d:** %s', i, answer))
+    if i < #questions then
+      output:add_line('')
+    end
+  end
+end
+
 ---@param output Output Output object to write to
 ---@param part OpencodeMessagePart
 function M._format_tool(output, part)
@@ -637,6 +661,13 @@ function M._format_tool(output, part)
     M._format_webfetch_tool(output, input --[[@as WebFetchToolInput]])
   elseif tool == 'task' then
     M._format_task_tool(output, input --[[@as TaskToolInput]], metadata --[[@as TaskToolMetadata]], tool_output)
+  elseif tool == 'question' then
+    M._format_question_tool(
+      output,
+      input --[[@as QuestionToolInput]],
+      metadata --[[@as QuestionToolMetadata]],
+      part.state.status
+    )
   else
     M.format_action(output, icons.get('tool') .. ' tool', tool)
   end
@@ -849,6 +880,10 @@ function M.format_part(part, message, is_last_part)
     if part.type == 'permissions-display' then
       permission_window.format_display(output)
       content_added = true
+    elseif part.type == 'questions-display' then
+      local question_window = require('opencode.ui.question_window')
+      question_window.format_display(output)
+      content_added = true
     end
   end
 

lua/opencode/ui/highlight.lua

@@ -40,6 +40,10 @@ function M.setup()
     vim.api.nvim_set_hl(0, 'OpencodeReference', { fg = '#1976D2', default = true })
     vim.api.nvim_set_hl(0, 'OpencodeReasoningText', { link = 'Comment', default = true })
     vim.api.nvim_set_hl(0, 'OpencodePermissionTitle', { fg = '#FF9E3B', default = true })
+    vim.api.nvim_set_hl(0, 'OpencodeQuestionOption', { link = 'Normal', default = true })
+    vim.api.nvim_set_hl(0, 'OpencodeQuestionOptionHover', { bg = '#E3F2FD', fg = '#1976D2', default = true })
+    vim.api.nvim_set_hl(0, 'OpencodeQuestionBorder', { fg = '#E3F2FD', default = true })
+    vim.api.nvim_set_hl(0, 'OpencodeQuestionTitle', { link = '@label', bold = true, default = true })
   else
     vim.api.nvim_set_hl(0, 'OpencodeBorder', { fg = '#616161', default = true })
     vim.api.nvim_set_hl(0, 'OpencodeBackground', { link = 'Normal', default = true })
@@ -76,6 +80,10 @@ function M.setup()
     vim.api.nvim_set_hl(0, 'OpencodeReference', { fg = '#7AA2F7', default = true })
     vim.api.nvim_set_hl(0, 'OpencodeReasoningText', { link = 'Comment', default = true })
     vim.api.nvim_set_hl(0, 'OpencodePermissionTitle', { fg = '#FF9E3B', default = true })
+    vim.api.nvim_set_hl(0, 'OpencodeQuestionOption', { link = 'Normal', default = true })
+    vim.api.nvim_set_hl(0, 'OpencodeQuestionOptionHover', { bg = '#2B3A5A', fg = '#61AFEF', default = true })
+    vim.api.nvim_set_hl(0, 'OpencodeQuestionBorder', { fg = '#2B3A5A', default = true })
+    vim.api.nvim_set_hl(0, 'OpencodeQuestionTitle', { link = '@label', bold = true, default = true })
   end
 end