From c9433128f261f077c709a96f63928ac83a2e287a Mon Sep 17 00:00:00 2001
From: dbpolito <danielbpolito@gmail.com>
Date: Sun, 14 Dec 2025 11:34:58 -0300
Subject: [PATCH 01/17] Ask Tool

---
 .../opencode/src/cli/cmd/tui/context/sdk.tsx  |   2 +-
 .../opencode/src/cli/cmd/tui/context/sync.tsx |  45 +-
 .../src/cli/cmd/tui/routes/session/footer.tsx |  10 +
 .../src/cli/cmd/tui/routes/session/index.tsx  |  94 +++
 .../src/cli/cmd/tui/ui/dialog-question.tsx    | 689 ++++++++++++++++++
 .../src/cli/cmd/tui/ui/dialog-select.tsx      |  85 ++-
 .../opencode/src/cli/cmd/tui/ui/dialog.tsx    |  17 +
 packages/opencode/src/id/id.ts                |   1 +
 packages/opencode/src/question/index.ts       | 175 +++++
 packages/opencode/src/server/server.ts        |  71 ++
 packages/opencode/src/session/prompt.ts       |   2 +
 .../opencode/src/session/prompt/anthropic.txt |  10 +
 .../opencode/src/session/prompt/beast.txt     |   3 +
 .../opencode/src/session/prompt/gemini.txt    |   1 +
 packages/opencode/src/session/prompt/qwen.txt |   3 +
 packages/opencode/src/tool/ask.ts             |  59 ++
 packages/opencode/src/tool/ask.txt            |  21 +
 packages/opencode/src/tool/registry.ts        |   2 +
 specs/ask-tool.md                             | 651 +++++++++++++++++
 19 files changed, 1916 insertions(+), 25 deletions(-)
 create mode 100644 packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
 create mode 100644 packages/opencode/src/question/index.ts
 create mode 100644 packages/opencode/src/tool/ask.ts
 create mode 100644 packages/opencode/src/tool/ask.txt
 create mode 100644 specs/ask-tool.md

diff --git a/packages/opencode/src/cli/cmd/tui/context/sdk.tsx b/packages/opencode/src/cli/cmd/tui/context/sdk.tsx
index b283f672f0f..08bc3385b0c 100644
--- a/packages/opencode/src/cli/cmd/tui/context/sdk.tsx
+++ b/packages/opencode/src/cli/cmd/tui/context/sdk.tsx
@@ -70,6 +70,6 @@ export const { use: useSDK, provider: SDKProvider } = createSimpleContext({
       abort.abort()
     })
 
-    return { client: sdk, event: emitter }
+    return { client: sdk, event: emitter, baseUrl: props.url }
   },
 })
diff --git a/packages/opencode/src/cli/cmd/tui/context/sync.tsx b/packages/opencode/src/cli/cmd/tui/context/sync.tsx
index f74f787db8c..6b835f85c95 100644
--- a/packages/opencode/src/cli/cmd/tui/context/sync.tsx
+++ b/packages/opencode/src/cli/cmd/tui/context/sync.tsx
@@ -16,6 +16,9 @@ import type {
   ProviderAuthMethod,
   VcsInfo,
 } from "@opencode-ai/sdk/v2"
+import type { Question as QuestionNamespace } from "@/question"
+
+type Question = QuestionNamespace.Info
 import { createStore, produce, reconcile } from "solid-js/store"
 import { useSDK } from "@tui/context/sdk"
 import { Binary } from "@opencode-ai/util/binary"
@@ -40,6 +43,9 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
       permission: {
         [sessionID: string]: Permission[]
       }
+      question: {
+        [sessionID: string]: Question[]
+      }
       config: Config
       session: Session[]
       session_status: {
@@ -75,6 +81,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
       status: "loading",
       agent: [],
       permission: {},
+      question: {},
       command: [],
       provider: [],
       provider_default: {},
@@ -94,7 +101,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
     const sdk = useSDK()
 
     sdk.event.listen((e) => {
-      const event = e.details
+      const event = e.details as any
       switch (event.type) {
         case "permission.updated": {
           const permissions = store.permission[event.properties.sessionID]
@@ -131,6 +138,42 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
           break
         }
 
+        case "question.updated": {
+          const questions = store.question[event.properties.sessionID]
+          if (!questions) {
+            setStore("question", event.properties.sessionID, [event.properties as Question])
+            break
+          }
+          const match = Binary.search(questions, event.properties.id, (q) => q.id)
+          setStore(
+            "question",
+            event.properties.sessionID,
+            produce((draft) => {
+              if (match.found) {
+                draft[match.index] = event.properties as Question
+                return
+              }
+              draft.push(event.properties as Question)
+            }),
+          )
+          break
+        }
+
+        case "question.replied": {
+          const questions = store.question[event.properties.sessionID]
+          if (!questions) break
+          const match = Binary.search(questions, event.properties.questionID, (q) => q.id)
+          if (!match.found) break
+          setStore(
+            "question",
+            event.properties.sessionID,
+            produce((draft) => {
+              draft.splice(match.index, 1)
+            }),
+          )
+          break
+        }
+
         case "todo.updated":
           setStore("todo", event.properties.sessionID, event.properties.todos)
           break
diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/footer.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/footer.tsx
index 69082c870ba..68e1a7a6572 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/footer.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/footer.tsx
@@ -17,6 +17,10 @@ export function Footer() {
     if (route.data.type !== "session") return []
     return sync.data.permission[route.data.sessionID] ?? []
   })
+  const questions = createMemo(() => {
+    if (route.data.type !== "session") return []
+    return sync.data.question[route.data.sessionID] ?? []
+  })
   const directory = useDirectory()
   const connected = useConnected()
 
@@ -63,6 +67,12 @@ export function Footer() {
                 {permissions().length > 1 ? "s" : ""}
               </text>
             </Show>
+            <Show when={questions().length > 0}>
+              <text fg={theme.accent}>
+                <span style={{ fg: theme.accent }}>◉</span> {questions().length} Question
+                {questions().length > 1 ? "s" : ""}
+              </text>
+            </Show>
             <text fg={theme.text}>
               <span style={{ fg: theme.success }}>•</span> {lsp().length} LSP
             </text>
diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index 1c1e4b65ec1..da31aeb88bb 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -8,6 +8,7 @@ import {
   on,
   Show,
   Switch,
+  untrack,
   useContext,
   type Component,
 } from "solid-js"
@@ -34,6 +35,7 @@ import type { WriteTool } from "@/tool/write"
 import { BashTool } from "@/tool/bash"
 import type { GlobTool } from "@/tool/glob"
 import { TodoWriteTool } from "@/tool/todo"
+import type { AskTool } from "@/tool/ask"
 import type { GrepTool } from "@/tool/grep"
 import type { ListTool } from "@/tool/ls"
 import type { EditTool } from "@/tool/edit"
@@ -52,6 +54,7 @@ import type { PromptInfo } from "../../component/prompt/history"
 import { iife } from "@/util/iife"
 import { DialogConfirm } from "@tui/ui/dialog-confirm"
 import { DialogPrompt } from "@tui/ui/dialog-prompt"
+import { DialogQuestion } from "@tui/ui/dialog-question"
 import { DialogTimeline } from "./dialog-timeline"
 import { DialogSessionRename } from "../../component/dialog-session-rename"
 import { Sidebar } from "./sidebar"
@@ -104,6 +107,7 @@ export function Session() {
   const session = createMemo(() => sync.session.get(route.sessionID)!)
   const messages = createMemo(() => sync.data.message[route.sessionID] ?? [])
   const permissions = createMemo(() => sync.data.permission[route.sessionID] ?? [])
+  const questions = createMemo(() => sync.data.question[route.sessionID] ?? [])
 
   const pending = createMemo(() => {
     return messages().findLast((x) => x.role === "assistant" && !x.time.completed)?.id
@@ -185,6 +189,41 @@ export function Session() {
     }
   })
 
+  // Auto-open question dialog when question arrives
+  let currentQuestionID: string | null = null
+  createEffect(() => {
+    const pendingQuestions = questions()
+    if (pendingQuestions.length === 0) {
+      currentQuestionID = null
+      return
+    }
+
+    const question = pendingQuestions[0]
+    // Already showing this question
+    if (currentQuestionID === question.id) return
+    // Another dialog is open - use untrack to avoid making this reactive
+    if (untrack(() => dialog.stack.length > 0)) return
+
+    currentQuestionID = question.id
+    DialogQuestion.show(dialog, question as any).then(({ answers, cancelled }) => {
+      currentQuestionID = null
+      const baseUrl = sdk.baseUrl
+      if (cancelled) {
+        // User cancelled - reject the question
+        fetch(`${baseUrl}/session/${route.sessionID}/questions/${question.id}/reject`, {
+          method: "POST",
+        })
+      } else {
+        // User submitted answers
+        fetch(`${baseUrl}/session/${route.sessionID}/questions/${question.id}`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ answers }),
+        })
+      }
+    })
+  })
+
   let scroll: ScrollBoxRenderable
   let prompt: PromptRef
   const keybind = useKeybind()
@@ -1683,6 +1722,61 @@ ToolRegistry.register<typeof TodoWriteTool>({
   },
 })
 
+ToolRegistry.register<typeof AskTool>({
+  name: "ask",
+  container: "block",
+  render(props) {
+    const { theme } = useTheme()
+    const questions = createMemo(() => props.input.questions ?? [])
+    const answers = createMemo(() => (props.metadata.answers ?? {}) as Record<string, { value: any; comment?: string }>)
+    const pending = createMemo(() => !props.output)
+
+    return (
+      <>
+        <ToolTitle icon="?" fallback="Asking questions..." when={questions().length > 0}>
+          {pending() ? "Asking" : "Asked"} {questions().length} question{questions().length !== 1 ? "s" : ""}
+        </ToolTitle>
+        <Show when={!pending() && questions().length > 0}>
+          <box>
+            <For each={questions()}>
+              {(q) => {
+                const answer = createMemo(() => answers()[q.id])
+                return (
+                  <box>
+                    <text fg={theme.textMuted}>Q: {q.question}</text>
+                    <Show when={answer()}>
+                      <text fg={theme.text}>
+                        A:{" "}
+                        {typeof answer()!.value === "boolean"
+                          ? answer()!.value
+                            ? "Yes"
+                            : "No"
+                          : Array.isArray(answer()!.value)
+                            ? answer()!.value.join(", ")
+                            : answer()!.value}
+                      </text>
+                      <Show when={answer()!.comment}>
+                        <text fg={theme.textMuted}>
+                          <i>"{answer()!.comment}"</i>
+                        </text>
+                      </Show>
+                    </Show>
+                    <Show when={!answer()}>
+                      <text fg={theme.textMuted}>
+                        <i>(skipped)</i>
+                      </text>
+                    </Show>
+                  </box>
+                )
+              }}
+            </For>
+          </box>
+        </Show>
+      </>
+    )
+  },
+})
+
 function normalizePath(input?: string) {
   if (!input) return ""
   if (path.isAbsolute(input)) {
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
new file mode 100644
index 00000000000..188eb5f9926
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
@@ -0,0 +1,689 @@
+import { TextareaRenderable, TextAttributes } from "@opentui/core"
+import { useTheme, selectedForeground } from "@tui/context/theme"
+import { createEffect, createMemo, createSignal, onMount, Show } from "solid-js"
+import { createStore } from "solid-js/store"
+import { useKeyboard } from "@opentui/solid"
+import { useDialog, type DialogContext } from "@tui/ui/dialog"
+import { DialogSelect, type DialogSelectOption } from "@tui/ui/dialog-select"
+import type { Question } from "@/question"
+
+// Types
+interface Answer {
+  value: string | string[] | boolean | null
+  comment?: string
+}
+
+type Answers = Record<string, Answer>
+
+interface QuestionDialogProps {
+  question: Question.Info
+  onSubmit: (answers: Answers) => void
+  onCancel: () => void
+}
+
+interface SingleQuestionProps {
+  item: Question.QuestionItem
+  currentAnswer?: Answer
+  onAnswer: (answer: Answer) => void
+  onCancel: () => void
+  onSubmitAll: (answer: Answer) => void
+}
+
+// Main DialogQuestion - shows list of all questions
+export function DialogQuestion(props: QuestionDialogProps) {
+  const dialog = useDialog()
+  const [answers, setAnswers] = createStore<Answers>({})
+
+  const questions = () => props.question.questions
+  const answeredCount = () =>
+    Object.keys(answers).filter((k) => answers[k]?.value !== undefined && answers[k]?.value !== null).length
+
+  console.log("[DialogQuestion] Mounting with", questions().length, "questions")
+
+  onMount(() => {
+    console.log("[DialogQuestion] onMount called")
+    dialog.setSize("medium")
+  })
+
+  function openQuestion(item: Question.QuestionItem) {
+    const Component = {
+      select: DialogQuestionSelect,
+      "multi-select": DialogQuestionMultiSelect,
+      confirm: DialogQuestionConfirm,
+      text: DialogQuestionText,
+    }[item.type]
+
+    dialog.push(() => (
+      <Component
+        item={item}
+        currentAnswer={answers[item.id]}
+        onAnswer={(answer) => {
+          setAnswers(item.id, answer)
+          dialog.pop()
+        }}
+        onCancel={() => dialog.pop()}
+        onSubmitAll={(answer) => {
+          setAnswers(item.id, answer)
+          submit({ ...answers, [item.id]: answer })
+        }}
+      />
+    ))
+  }
+
+  function submit(finalAnswers?: Answers) {
+    props.onSubmit(finalAnswers ?? answers)
+  }
+
+  // Convert questions to DialogSelect options
+  const selectOptions = createMemo<DialogSelectOption<Question.QuestionItem>[]>(() =>
+    questions().map((item) => {
+      const answer = answers[item.id]
+      const answerPreview = formatAnswerPreview(item, answer)
+      const comment = answer?.comment ? ` 💬 "${truncate(answer.comment, 30)}"` : ""
+
+      return {
+        title: item.question,
+        value: item,
+        description: answerPreview + comment,
+        onSelect: () => openQuestion(item),
+      }
+    }),
+  )
+
+  // Handle submission with ctrl+enter keybind
+  useKeyboard((evt) => {
+    if (questions().length === 1) return
+    if (evt.ctrl && evt.name === "return") {
+      submit()
+      evt.preventDefault()
+    }
+  })
+
+  return (
+    <DialogSelect
+      title={`Questions (${answeredCount()}/${questions().length} answered)`}
+      options={selectOptions()}
+      onSelect={(option) => option.onSelect?.(dialog)}
+      hideSearch={true}
+    />
+  )
+}
+
+// Single Select Question Dialog
+function DialogQuestionSelect(props: SingleQuestionProps) {
+  const dialog = useDialog()
+  const { theme } = useTheme()
+  const [comment, setComment] = createSignal<string | undefined>(props.currentAnswer?.comment)
+
+  // Sort options with recommended first
+  const sortedOptions = createMemo(() => {
+    const opts = props.item.options ?? []
+    return [...opts].sort((a, b) => (b.recommended ? 1 : 0) - (a.recommended ? 1 : 0))
+  })
+
+  // Find current selection value
+  const currentValue = createMemo(() => props.currentAnswer?.value)
+
+  onMount(() => {
+    dialog.setSize("medium")
+  })
+
+  function openComment() {
+    dialog.push(() => (
+      <DialogQuestionComment
+        value={comment()}
+        onSave={(c) => {
+          setComment(c)
+          dialog.pop()
+        }}
+        onCancel={() => dialog.pop()}
+      />
+    ))
+  }
+
+  function confirmSelection(option: { value: string; label: string; recommended?: boolean }) {
+    props.onAnswer({ value: option.value, comment: comment() })
+  }
+
+  function submitAll(option: { value: string; label: string; recommended?: boolean }) {
+    props.onSubmitAll({ value: option.value, comment: comment() })
+  }
+
+  // Convert options to DialogSelectOption format
+  const selectOptions = createMemo<DialogSelectOption<{ value: string; label: string; recommended?: boolean }>[]>(() =>
+    sortedOptions().map((option) => ({
+      title: option.label,
+      value: option,
+      footer: option.recommended ? "(Recommended)" : undefined,
+      onSelect: () => confirmSelection(option),
+    })),
+  )
+
+  // Show default as hint if present
+  const defaultHint = createMemo(() => {
+    if (typeof props.item.default === "string") {
+      const opt = props.item.options?.find((o) => o.value === props.item.default)
+      return opt?.label
+    }
+    return undefined
+  })
+
+  return (
+    <>
+      <Show when={defaultHint()}>
+        <box paddingLeft={4} paddingRight={4} paddingTop={1}>
+          <text fg={theme.textMuted}>Default: {defaultHint()}</text>
+        </box>
+      </Show>
+      <DialogSelect
+        title={props.item.question}
+        options={selectOptions()}
+        current={sortedOptions().find((o) => o.value === currentValue())}
+        hideSearch={true}
+        keybind={[
+          {
+            keybind: { name: "m", ctrl: false, meta: false, shift: false, super: false, leader: false },
+            title: "add comment",
+            onTrigger: () => openComment(),
+          },
+          {
+            keybind: { name: "s", ctrl: false, meta: false, shift: false, super: false, leader: false },
+            title: "submit all",
+            onTrigger: (option) => submitAll(option.value),
+          },
+        ]}
+      />
+      <Show when={comment()}>
+        <box paddingLeft={4} paddingRight={4}>
+          <text fg={theme.textMuted}>💬 "{truncate(comment()!, 40)}"</text>
+        </box>
+      </Show>
+    </>
+  )
+}
+
+// Multi-Select Question Dialog
+function DialogQuestionMultiSelect(props: SingleQuestionProps) {
+  const dialog = useDialog()
+  const { theme } = useTheme()
+  const [checked, setChecked] = createStore<Record<string, boolean>>({})
+  const [comment, setComment] = createSignal<string | undefined>(props.currentAnswer?.comment)
+
+  // Sort options with recommended first
+  const sortedOptions = createMemo(() => {
+    const opts = props.item.options ?? []
+    return [...opts].sort((a, b) => (b.recommended ? 1 : 0) - (a.recommended ? 1 : 0))
+  })
+
+  // Initialize checked state from current answer
+  createEffect(() => {
+    if (Array.isArray(props.currentAnswer?.value)) {
+      for (const v of props.currentAnswer.value) {
+        setChecked(v, true)
+      }
+    }
+  })
+
+  onMount(() => {
+    dialog.setSize("medium")
+  })
+
+  function openComment() {
+    dialog.push(() => (
+      <DialogQuestionComment
+        value={comment()}
+        onSave={(c) => {
+          setComment(c)
+          dialog.pop()
+        }}
+        onCancel={() => dialog.pop()}
+      />
+    ))
+  }
+
+  function getSelectedValues(): string[] {
+    return sortedOptions()
+      .filter((o) => checked[o.value])
+      .map((o) => o.value)
+  }
+
+  function confirmSelection() {
+    props.onAnswer({ value: getSelectedValues(), comment: comment() })
+  }
+
+  function submitAll() {
+    props.onSubmitAll({ value: getSelectedValues(), comment: comment() })
+  }
+
+  // Convert options to DialogSelectOption format
+  const selectOptions = createMemo<DialogSelectOption<{ value: string; label: string; recommended?: boolean }>[]>(() =>
+    sortedOptions().map((option) => ({
+      title: option.label,
+      value: option,
+      footer: checked[option.value] ? "☑" : "☐",
+      onSelect: () => {}, // Don't close on select
+    })),
+  )
+
+  const selectedCount = createMemo(() => getSelectedValues().length)
+
+  return (
+    <>
+      <box paddingLeft={4} paddingRight={4} paddingTop={1}>
+        <text fg={theme.textMuted}>{selectedCount()} selected</text>
+      </box>
+      <DialogSelect
+        title={props.item.question}
+        options={selectOptions()}
+        hideSearch={true}
+        onSelect={() => confirmSelection()}
+        keybind={[
+          {
+            keybind: { name: "space", ctrl: false, meta: false, shift: false, super: false, leader: false },
+            title: "toggle",
+            onTrigger: (option) => setChecked(option.value.value, !checked[option.value.value]),
+          },
+          {
+            keybind: { name: "m", ctrl: false, meta: false, shift: false, super: false, leader: false },
+            title: "add comment",
+            onTrigger: () => openComment(),
+          },
+          {
+            keybind: { name: "s", ctrl: false, meta: false, shift: false, super: false, leader: false },
+            title: "submit all",
+            onTrigger: () => submitAll(),
+          },
+        ]}
+      />
+      <Show when={comment()}>
+        <box paddingLeft={4} paddingRight={4}>
+          <text fg={theme.textMuted}>💬 "{truncate(comment()!, 40)}"</text>
+        </box>
+      </Show>
+    </>
+  )
+
+
+  function openComment() {
+    dialog.push(() => (
+      <DialogQuestionComment
+        value={comment()}
+        onSave={(c) => {
+          setComment(c)
+          dialog.pop()
+        }}
+        onCancel={() => dialog.pop()}
+      />
+    ))
+  }
+
+  function getSelectedValues(): string[] {
+    return sortedOptions()
+      .filter((o) => checked[o.value])
+      .map((o) => o.value)
+  }
+
+  function confirmSelection() {
+    props.onAnswer({ value: getSelectedValues(), comment: comment() })
+  }
+
+  function submitAll() {
+    props.onSubmitAll({ value: getSelectedValues(), comment: comment() })
+  }
+
+  function CheckboxStatus(props: { value: string }) {
+    const isChecked = () => checked[props.value]
+    return <text fg={isChecked() ? theme.success : theme.textMuted}>{isChecked() ? "☑" : "☐"}</text>
+  }
+
+}
+
+// Confirm (Yes/No) Question Dialog
+function DialogQuestionConfirm(props: SingleQuestionProps) {
+  const dialog = useDialog()
+  const { theme } = useTheme()
+  const [selected, setSelected] = createSignal<boolean | null>(
+    typeof props.currentAnswer?.value === "boolean" ? props.currentAnswer.value : null,
+  )
+  const [comment, setComment] = createSignal<string | undefined>(props.currentAnswer?.comment)
+
+  onMount(() => {
+    dialog.setSize("medium")
+  })
+
+  function openComment() {
+    dialog.push(() => (
+      <DialogQuestionComment
+        value={comment()}
+        onSave={(c) => {
+          setComment(c)
+          dialog.pop()
+        }}
+        onCancel={() => dialog.pop()}
+      />
+    ))
+  }
+
+  function confirmSelection() {
+    if (selected() !== null) {
+      props.onAnswer({ value: selected(), comment: comment() })
+    }
+  }
+
+  function submitAll() {
+    if (selected() !== null) {
+      props.onSubmitAll({ value: selected(), comment: comment() })
+    }
+  }
+
+  useKeyboard((evt) => {
+    if (evt.name === "up" || evt.name === "left" || (evt.ctrl && evt.name === "p")) {
+      setSelected(true)
+      evt.preventDefault()
+    }
+    if (evt.name === "down" || evt.name === "right" || (evt.ctrl && evt.name === "n")) {
+      setSelected(false)
+      evt.preventDefault()
+    }
+    if (evt.name === "return" && !evt.ctrl) {
+      confirmSelection()
+      evt.preventDefault()
+    }
+    if (evt.ctrl && evt.name === "return") {
+      submitAll()
+      evt.preventDefault()
+    }
+    if (evt.name === "c" && !evt.ctrl) {
+      openComment()
+      evt.preventDefault()
+    }
+    if (evt.name === "y") {
+      setSelected(true)
+      evt.preventDefault()
+    }
+    if (evt.name === "n") {
+      setSelected(false)
+      evt.preventDefault()
+    }
+  })
+
+  // Show default as hint
+  const defaultHint = createMemo(() => {
+    if (typeof props.item.default === "boolean") {
+      return props.item.default ? "Yes" : "No"
+    }
+    return undefined
+  })
+
+  return (
+    <box gap={1} paddingBottom={1}>
+      <box paddingLeft={4} paddingRight={4}>
+        <box flexDirection="row" justifyContent="space-between">
+          <text fg={theme.text} attributes={TextAttributes.BOLD}>
+            {props.item.question}
+          </text>
+          <text fg={theme.textMuted}>esc</text>
+        </box>
+        <Show when={defaultHint()}>
+          <text fg={theme.textMuted}>Default: {defaultHint()}</text>
+        </Show>
+      </box>
+      <box paddingLeft={3} paddingRight={3} flexDirection="row" gap={2}>
+        <box
+          paddingLeft={2}
+          paddingRight={2}
+          backgroundColor={selected() === true ? theme.primary : undefined}
+          onMouseUp={() => {
+            setSelected(true)
+            confirmSelection()
+          }}
+        >
+          <text
+            fg={selected() === true ? selectedForeground(theme) : theme.text}
+            attributes={selected() === true ? TextAttributes.BOLD : undefined}
+          >
+            Yes
+          </text>
+        </box>
+        <box
+          paddingLeft={2}
+          paddingRight={2}
+          backgroundColor={selected() === false ? theme.primary : undefined}
+          onMouseUp={() => {
+            setSelected(false)
+            confirmSelection()
+          }}
+        >
+          <text
+            fg={selected() === false ? selectedForeground(theme) : theme.text}
+            attributes={selected() === false ? TextAttributes.BOLD : undefined}
+          >
+            No
+          </text>
+        </box>
+      </box>
+      <Show when={comment()}>
+        <box paddingLeft={4} paddingRight={4}>
+          <text fg={theme.textMuted}>
+            {"\uD83D\uDCAC"} "{truncate(comment()!, 40)}"
+          </text>
+        </box>
+      </Show>
+      <box paddingRight={2} paddingLeft={4} flexDirection="row" gap={2} flexShrink={0} paddingTop={1}>
+        <text>
+          <span style={{ fg: theme.text }}>
+            <b>y/n</b>{" "}
+          </span>
+          <span style={{ fg: theme.textMuted }}>select</span>
+        </text>
+        <text>
+          <span style={{ fg: theme.text }}>
+            <b>enter</b>{" "}
+          </span>
+          <span style={{ fg: theme.textMuted }}>confirm</span>
+        </text>
+        <text>
+          <span style={{ fg: theme.text }}>
+            <b>c</b>{" "}
+          </span>
+          <span style={{ fg: theme.textMuted }}>comment</span>
+        </text>
+      </box>
+    </box>
+  )
+}
+
+// Text Input Question Dialog
+function DialogQuestionText(props: SingleQuestionProps) {
+  const dialog = useDialog()
+  const { theme } = useTheme()
+  let textarea: TextareaRenderable
+
+  onMount(() => {
+    dialog.setSize("medium")
+    setTimeout(() => {
+      textarea.focus()
+    }, 1)
+  })
+
+  function confirmText() {
+    const value = textarea.plainText.trim()
+    props.onAnswer({ value: value || null })
+  }
+
+  function submitAll() {
+    const value = textarea.plainText.trim()
+    props.onSubmitAll({ value: value || null })
+  }
+
+  useKeyboard((evt) => {
+    if (evt.ctrl && evt.name === "return") {
+      submitAll()
+      evt.preventDefault()
+    }
+  })
+
+  // Show default as placeholder
+  const placeholder = createMemo(() => {
+    if (typeof props.item.default === "string") {
+      return props.item.default
+    }
+    return "Enter your response..."
+  })
+
+  return (
+    <box paddingLeft={2} paddingRight={2} gap={1}>
+      <box flexDirection="row" justifyContent="space-between">
+        <text attributes={TextAttributes.BOLD} fg={theme.text}>
+          {props.item.question}
+        </text>
+        <text fg={theme.textMuted}>esc</text>
+      </box>
+      <box gap={1}>
+        <textarea
+          onSubmit={confirmText}
+          height={5}
+          keyBindings={[{ name: "return", action: "submit" }]}
+          ref={(val: TextareaRenderable) => (textarea = val)}
+          initialValue={typeof props.currentAnswer?.value === "string" ? props.currentAnswer.value : ""}
+          placeholder={placeholder()}
+          textColor={theme.text}
+          focusedTextColor={theme.text}
+          cursorColor={theme.text}
+        />
+      </box>
+      <box paddingBottom={1} gap={1} flexDirection="row">
+        <text>
+          <span style={{ fg: theme.text }}>
+            <b>enter</b>{" "}
+          </span>
+          <span style={{ fg: theme.textMuted }}>submit</span>
+        </text>
+        <text>
+          <span style={{ fg: theme.text }}>
+            <b>ctrl+enter</b>{" "}
+          </span>
+          <span style={{ fg: theme.textMuted }}>submit all</span>
+        </text>
+      </box>
+    </box>
+  )
+}
+
+// Comment Dialog (nested)
+function DialogQuestionComment(props: { value?: string; onSave: (comment: string) => void; onCancel: () => void }) {
+  const dialog = useDialog()
+  const { theme } = useTheme()
+  let textarea: TextareaRenderable
+
+  onMount(() => {
+    dialog.setSize("medium")
+    setTimeout(() => {
+      textarea.focus()
+      textarea.gotoLineEnd()
+    }, 1)
+  })
+
+  return (
+    <box paddingLeft={2} paddingRight={2} gap={1}>
+      <box flexDirection="row" justifyContent="space-between">
+        <text attributes={TextAttributes.BOLD} fg={theme.text}>
+          Add Comment
+        </text>
+        <text fg={theme.textMuted}>esc</text>
+      </box>
+      <box gap={1}>
+        <text fg={theme.textMuted}>Add additional context to your answer:</text>
+        <textarea
+          onSubmit={() => props.onSave(textarea.plainText)}
+          height={4}
+          keyBindings={[{ name: "return", action: "submit" }]}
+          ref={(val: TextareaRenderable) => (textarea = val)}
+          initialValue={props.value ?? ""}
+          placeholder="Optional comment..."
+          textColor={theme.text}
+          focusedTextColor={theme.text}
+          cursorColor={theme.text}
+        />
+      </box>
+      <box paddingBottom={1} gap={1} flexDirection="row">
+        <text>
+          <span style={{ fg: theme.text }}>
+            <b>enter</b>{" "}
+          </span>
+          <span style={{ fg: theme.textMuted }}>save</span>
+        </text>
+      </box>
+    </box>
+  )
+}
+
+// Static method to show the dialog
+DialogQuestion.show = (
+  dialog: DialogContext,
+  question: Question.Info,
+): Promise<{ answers: Answers; cancelled: boolean }> => {
+  console.log("[DialogQuestion.show] Called with question:", question.id, "questions count:", question.questions.length)
+  return new Promise((resolve) => {
+    dialog.replace(
+      () => (
+        <DialogQuestion
+          question={question}
+          onSubmit={(answers) => {
+            console.log("[DialogQuestion.show] onSubmit called")
+            dialog.clear()
+            resolve({ answers, cancelled: false })
+          }}
+          onCancel={() => {
+            console.log("[DialogQuestion.show] onCancel called")
+            dialog.clear()
+            resolve({ answers: {}, cancelled: true })
+          }}
+        />
+      ),
+      () => {
+        console.log("[DialogQuestion.show] onClose callback called")
+        resolve({ answers: {}, cancelled: true })
+      },
+    )
+  })
+}
+
+// Helper functions
+function formatAnswerPreview(item: Question.QuestionItem, answer?: Answer): string {
+  if (!answer || answer.value === undefined || answer.value === null) {
+    return "(not answered)"
+  }
+
+  if (item.type === "confirm") {
+    return answer.value ? "Yes" : "No"
+  }
+
+  if (item.type === "multi-select" && Array.isArray(answer.value)) {
+    if (answer.value.length === 0) return "(none selected)"
+    const labels = answer.value
+      .map((v) => item.options?.find((o) => o.value === v)?.label ?? v)
+      .slice(0, 2)
+      .join(", ")
+    if (answer.value.length > 2) {
+      return `${labels} +${answer.value.length - 2} more`
+    }
+    return labels
+  }
+
+  if (item.type === "select" && typeof answer.value === "string") {
+    const option = item.options?.find((o) => o.value === answer.value)
+    return option?.label ?? answer.value
+  }
+
+  if (typeof answer.value === "string") {
+    return truncate(answer.value, 40)
+  }
+
+  return String(answer.value)
+}
+
+function truncate(str: string, maxLength: number): string {
+  if (str.length <= maxLength) return str
+  return str.slice(0, maxLength - 3) + "..."
+}
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
index 3f49a7c3219..2c7cc458438 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
@@ -26,6 +26,7 @@ export interface DialogSelectProps<T> {
     onTrigger: (option: DialogSelectOption<T>) => void
   }[]
   current?: T
+  hideSearch?: boolean
 }
 
 export interface DialogSelectOption<T = any> {
@@ -139,17 +140,43 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
 
   const keybind = useKeybind()
   useKeyboard((evt) => {
-    if (evt.name === "up" || (evt.ctrl && evt.name === "p")) move(-1)
-    if (evt.name === "down" || (evt.ctrl && evt.name === "n")) move(1)
-    if (evt.name === "pageup") move(-10)
-    if (evt.name === "pagedown") move(10)
+    // Always prevent propagation of navigation keys
+    const isNavigationKey =
+      evt.name === "up" ||
+      evt.name === "down" ||
+      evt.name === "pageup" ||
+      evt.name === "pagedown" ||
+      evt.name === "return" ||
+      (evt.ctrl && evt.name === "p") ||
+      (evt.ctrl && evt.name === "n")
+
+    if (isNavigationKey) {
+      evt.preventDefault()
+    }
+
+    if (evt.name === "up" || (evt.ctrl && evt.name === "p")) {
+      move(-1)
+      return
+    }
+    if (evt.name === "down" || (evt.ctrl && evt.name === "n")) {
+      move(1)
+      return
+    }
+    if (evt.name === "pageup") {
+      move(-10)
+      return
+    }
+    if (evt.name === "pagedown") {
+      move(10)
+      return
+    }
     if (evt.name === "return") {
       const option = selected()
       if (option) {
-        // evt.preventDefault()
         if (option.onSelect) option.onSelect(dialog)
         props.onSelect?.(option)
       }
+      return
     }
 
     for (const item of props.keybind ?? []) {
@@ -186,24 +213,36 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
           </text>
           <text fg={theme.textMuted}>esc</text>
         </box>
-        <box paddingTop={1} paddingBottom={1}>
-          <input
-            onInput={(e) => {
-              batch(() => {
-                setStore("filter", e)
-                props.onFilter?.(e)
-              })
-            }}
-            focusedBackgroundColor={theme.backgroundPanel}
-            cursorColor={theme.primary}
-            focusedTextColor={theme.textMuted}
-            ref={(r) => {
-              input = r
-              setTimeout(() => input.focus(), 1)
-            }}
-            placeholder={props.placeholder ?? "Search"}
-          />
-        </box>
+        {!props.hideSearch ? (
+          <box paddingTop={1} paddingBottom={1}>
+            <input
+              onInput={(e) => {
+                batch(() => {
+                  setStore("filter", e)
+                  props.onFilter?.(e)
+                })
+              }}
+              focusedBackgroundColor={theme.backgroundPanel}
+              cursorColor={theme.primary}
+              focusedTextColor={theme.textMuted}
+              ref={(r) => {
+                input = r
+                setTimeout(() => input.focus(), 1)
+              }}
+              placeholder={props.placeholder ?? "Search"}
+            />
+          </box>
+        ) : (
+          <box height={0} overflow="hidden" position="absolute" top={-9999}>
+            <input
+              onInput={() => {}}
+              ref={(r) => {
+                input = r
+                setTimeout(() => input.focus(), 1)
+              }}
+            />
+          </box>
+        )}
       </box>
       <scrollbox
         paddingLeft={1}
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog.tsx
index 9b773111c35..ed322cb0cd9 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog.tsx
@@ -111,6 +111,23 @@ function init() {
         },
       ])
     },
+    push(input: any, onClose?: () => void) {
+      if (store.stack.length === 0) {
+        focus = renderer.currentFocusedRenderable
+      }
+      setStore("stack", [
+        ...store.stack,
+        {
+          element: input,
+          onClose,
+        },
+      ])
+    },
+    pop() {
+      if (store.stack.length === 0) return
+      setStore("stack", store.stack.slice(0, -1))
+      if (store.stack.length === 0) refocus()
+    },
     get stack() {
       return store.stack
     },
diff --git a/packages/opencode/src/id/id.ts b/packages/opencode/src/id/id.ts
index ad6e22e1bee..2fddd2d6543 100644
--- a/packages/opencode/src/id/id.ts
+++ b/packages/opencode/src/id/id.ts
@@ -6,6 +6,7 @@ export namespace Identifier {
     session: "ses",
     message: "msg",
     permission: "per",
+    question: "qst",
     user: "usr",
     part: "prt",
     pty: "pty",
diff --git a/packages/opencode/src/question/index.ts b/packages/opencode/src/question/index.ts
new file mode 100644
index 00000000000..0f3178b9b55
--- /dev/null
+++ b/packages/opencode/src/question/index.ts
@@ -0,0 +1,175 @@
+import { BusEvent } from "@/bus/bus-event"
+import { Bus } from "@/bus"
+import z from "zod"
+import { Log } from "../util/log"
+import { Identifier } from "../id/id"
+import { Instance } from "../project/instance"
+
+export namespace Question {
+  const log = Log.create({ service: "question" })
+
+  export const Option = z.object({
+    value: z.string(),
+    label: z.string(),
+    recommended: z.boolean().optional(),
+  })
+  export type Option = z.infer<typeof Option>
+
+  export const QuestionItem = z.object({
+    id: z.string(),
+    type: z.enum(["select", "multi-select", "confirm", "text"]),
+    question: z.string(),
+    options: z.array(Option).optional(),
+    default: z.union([z.string(), z.array(z.string()), z.boolean()]).optional(),
+  })
+  export type QuestionItem = z.infer<typeof QuestionItem>
+
+  export const Answer = z.object({
+    value: z.union([z.string(), z.array(z.string()), z.boolean(), z.null()]),
+    comment: z.string().optional(),
+  })
+  export type Answer = z.infer<typeof Answer>
+
+  export const Answers = z.record(z.string(), Answer)
+  export type Answers = z.infer<typeof Answers>
+
+  export const Info = z
+    .object({
+      id: z.string(),
+      sessionID: z.string(),
+      messageID: z.string(),
+      callID: z.string().optional(),
+      questions: z.array(QuestionItem),
+      time: z.object({
+        created: z.number(),
+      }),
+    })
+    .meta({
+      ref: "Question",
+    })
+  export type Info = z.infer<typeof Info>
+
+  export const Event = {
+    Updated: BusEvent.define("question.updated", Info),
+    Replied: BusEvent.define(
+      "question.replied",
+      z.object({
+        sessionID: z.string(),
+        questionID: z.string(),
+        answers: Answers,
+      }),
+    ),
+  }
+
+  interface PendingQuestion {
+    info: Info
+    resolve: (answers: Answers) => void
+    reject: (e: Error) => void
+  }
+
+  const state = Instance.state(
+    () => {
+      const pending: {
+        [sessionID: string]: {
+          [questionID: string]: PendingQuestion
+        }
+      } = {}
+
+      return { pending }
+    },
+    async (state) => {
+      for (const pending of Object.values(state.pending)) {
+        for (const item of Object.values(pending)) {
+          item.reject(new RejectedError(item.info.sessionID, item.info.id, item.info.callID))
+        }
+      }
+    },
+  )
+
+  export function pending() {
+    return state().pending
+  }
+
+  export async function ask(input: {
+    sessionID: Info["sessionID"]
+    messageID: Info["messageID"]
+    callID?: Info["callID"]
+    questions: Info["questions"]
+  }): Promise<Answers> {
+    const { pending } = state()
+    log.info("asking", {
+      sessionID: input.sessionID,
+      messageID: input.messageID,
+      callID: input.callID,
+      questionCount: input.questions.length,
+    })
+
+    const info: Info = {
+      id: Identifier.ascending("question"),
+      sessionID: input.sessionID,
+      messageID: input.messageID,
+      callID: input.callID,
+      questions: input.questions,
+      time: {
+        created: Date.now(),
+      },
+    }
+
+    pending[input.sessionID] = pending[input.sessionID] || {}
+    return new Promise<Answers>((resolve, reject) => {
+      pending[input.sessionID][info.id] = {
+        info,
+        resolve,
+        reject,
+      }
+      Bus.publish(Event.Updated, info)
+    })
+  }
+
+  export function respond(input: { sessionID: Info["sessionID"]; questionID: Info["id"]; answers: Answers }) {
+    log.info("response", input)
+    const { pending } = state()
+    const match = pending[input.sessionID]?.[input.questionID]
+    if (!match) return
+    delete pending[input.sessionID][input.questionID]
+    Bus.publish(Event.Replied, {
+      sessionID: input.sessionID,
+      questionID: input.questionID,
+      answers: input.answers,
+    })
+    match.resolve(input.answers)
+  }
+
+  export function reject(input: { sessionID: Info["sessionID"]; questionID: Info["id"] }) {
+    log.info("reject", input)
+    const { pending } = state()
+    const match = pending[input.sessionID]?.[input.questionID]
+    if (!match) return
+    delete pending[input.sessionID][input.questionID]
+    Bus.publish(Event.Replied, {
+      sessionID: input.sessionID,
+      questionID: input.questionID,
+      answers: {},
+    })
+    match.reject(new RejectedError(input.sessionID, input.questionID, match.info.callID))
+  }
+
+  export function rejectAll(sessionID: string) {
+    const { pending } = state()
+    const questions = pending[sessionID]
+    if (!questions) return
+    for (const questionID of Object.keys(questions)) {
+      reject({ sessionID, questionID })
+    }
+  }
+
+  export class RejectedError extends Error {
+    constructor(
+      public readonly sessionID: string,
+      public readonly questionID: string,
+      public readonly callID?: string,
+    ) {
+      super("The user cancelled the question. You may ask again if needed.")
+    }
+  }
+}
diff --git a/packages/opencode/src/server/server.ts b/packages/opencode/src/server/server.ts
index f1485ec0150..158fa54ab47 100644
--- a/packages/opencode/src/server/server.ts
+++ b/packages/opencode/src/server/server.ts
@@ -21,6 +21,7 @@ import { Format } from "../format"
 import { MessageV2 } from "../session/message-v2"
 import { TuiRoute } from "./tui"
 import { Permission } from "../permission"
+import { Question } from "../question"
 import { Instance } from "../project/instance"
 import { Vcs } from "../project/vcs"
 import { Agent } from "../agent/agent"
@@ -1413,6 +1414,76 @@ export namespace Server {
           return c.json(true)
         },
       )
+      .post(
+        "/session/:sessionID/questions/:questionID",
+        describeRoute({
+          summary: "Respond to question",
+          description: "Submit answers to a question asked by the AI assistant.",
+          operationId: "question.respond",
+          responses: {
+            200: {
+              description: "Question answered successfully",
+              content: {
+                "application/json": {
+                  schema: resolver(z.boolean()),
+                },
+              },
+            },
+            ...errors(400, 404),
+          },
+        }),
+        validator(
+          "param",
+          z.object({
+            sessionID: z.string(),
+            questionID: z.string(),
+          }),
+        ),
+        validator("json", z.object({ answers: Question.Answers })),
+        async (c) => {
+          const params = c.req.valid("param")
+          Question.respond({
+            sessionID: params.sessionID,
+            questionID: params.questionID,
+            answers: c.req.valid("json").answers,
+          })
+          return c.json(true)
+        },
+      )
+      .post(
+        "/session/:sessionID/questions/:questionID/reject",
+        describeRoute({
+          summary: "Reject question",
+          description: "Cancel a question asked by the AI assistant.",
+          operationId: "question.reject",
+          responses: {
+            200: {
+              description: "Question rejected successfully",
+              content: {
+                "application/json": {
+                  schema: resolver(z.boolean()),
+                },
+              },
+            },
+            ...errors(400, 404),
+          },
+        }),
+        validator(
+          "param",
+          z.object({
+            sessionID: z.string(),
+            questionID: z.string(),
+          }),
+        ),
+        async (c) => {
+          const params = c.req.valid("param")
+          Question.reject({
+            sessionID: params.sessionID,
+            questionID: params.questionID,
+          })
+          return c.json(true)
+        },
+      )
       .get(
         "/command",
         describeRoute({
diff --git a/packages/opencode/src/session/prompt.ts b/packages/opencode/src/session/prompt.ts
index c9e24f8ca04..d42c7a193f3 100644
--- a/packages/opencode/src/session/prompt.ts
+++ b/packages/opencode/src/session/prompt.ts
@@ -48,6 +48,7 @@ import { Config } from "../config/config"
 import { NamedError } from "@opencode-ai/util/error"
 import { fn } from "@/util/fn"
 import { SessionProcessor } from "./processor"
+import { Question } from "../question"
 import { TaskTool } from "@/tool/task"
 import { SessionStatus } from "./status"
 import { Shell } from "@/shell/shell"
@@ -230,6 +231,7 @@ export namespace SessionPrompt {
     for (const item of match.callbacks) {
       item.reject()
     }
+    Question.rejectAll(sessionID)
     delete s[sessionID]
     SessionStatus.set(sessionID, { type: "idle" })
     return
diff --git a/packages/opencode/src/session/prompt/anthropic.txt b/packages/opencode/src/session/prompt/anthropic.txt
index 43b11250acc..5d51d3f8ad2 100644
--- a/packages/opencode/src/session/prompt/anthropic.txt
+++ b/packages/opencode/src/session/prompt/anthropic.txt
@@ -95,6 +95,16 @@ assistant: [Uses the Task tool]
 
 IMPORTANT: Always use the TodoWrite tool to plan and track tasks throughout the conversation.
 
+# Asking the User Questions
+
+When you encounter ambiguous requirements, multiple valid approaches, or need user input before proceeding, use the Ask tool to gather the information you need. This is especially useful when:
+- Requirements are unclear and making an assumption could lead to incorrect implementation
+- There are multiple valid solutions and user preference matters
+- You need to confirm important architectural or design decisions
+- Additional context would significantly improve the quality of your response
+
+Keep questions concise and actionable. Group related questions together in a single Ask call when appropriate. The user can skip any question, so design your workflow to handle partial or missing responses gracefully.
+
 # Code References
 
 When referencing specific functions or pieces of code include the pattern `file_path:line_number` to allow the user to easily navigate to the source code location.
diff --git a/packages/opencode/src/session/prompt/beast.txt b/packages/opencode/src/session/prompt/beast.txt
index 21db5dcb59c..285bf288372 100644
--- a/packages/opencode/src/session/prompt/beast.txt
+++ b/packages/opencode/src/session/prompt/beast.txt
@@ -94,6 +94,9 @@ Carefully read the issue and think hard about a plan to solve it before coding.
 - Revisit your assumptions if unexpected behavior occurs.
 
 
+# Asking the User Questions
+When you encounter ambiguous requirements or need user input before proceeding, use the Ask tool. This is useful for clarifying unclear requirements, choosing between multiple valid approaches, or confirming important decisions. Keep questions concise and actionable.
+
 # Communication Guidelines
 Always communicate clearly and concisely in a casual, friendly yet professional tone. 
 <examples>
diff --git a/packages/opencode/src/session/prompt/gemini.txt b/packages/opencode/src/session/prompt/gemini.txt
index 87fe422bc75..4ca6fb70131 100644
--- a/packages/opencode/src/session/prompt/gemini.txt
+++ b/packages/opencode/src/session/prompt/gemini.txt
@@ -9,6 +9,7 @@ You are opencode, an interactive CLI agent specializing in software engineering
 - **Comments:** Add code comments sparingly. Focus on *why* something is done, especially for complex logic, rather than *what* is done. Only add high-value comments if necessary for clarity or if requested by the user. Do not edit comments that are separate from the code you are changing. *NEVER* talk to the user or describe your changes through comments.
 - **Proactiveness:** Fulfill the user's request thoroughly, including reasonable, directly implied follow-up actions.
 - **Confirm Ambiguity/Expansion:** Do not take significant actions beyond the clear scope of the request without confirming with the user. If asked *how* to do something, explain first, don't just do it.
+- **Asking Questions:** When you need clarification or user input before proceeding, use the Ask tool. This is useful for clarifying ambiguous requirements, choosing between approaches, or confirming important decisions.
 - **Explaining Changes:** After completing a code modification or file operation *do not* provide summaries unless asked.
 - **Path Construction:** Before using any file system tool (e.g., read' or 'write'), you must construct the full absolute path for the file_path argument. Always combine the absolute path of the project's root directory with the file's path relative to the root. For example, if the project root is /path/to/project/ and the file is foo/bar/baz.txt, the final path you must use is /path/to/project/foo/bar/baz.txt. If the user provides a relative path, you must resolve it against the root directory to create an absolute path.
 - **Do Not revert changes:** Do not revert changes to the codebase unless asked to do so by the user. Only revert changes made by you if they have resulted in an error or if the user has explicitly asked you to revert the changes.
diff --git a/packages/opencode/src/session/prompt/qwen.txt b/packages/opencode/src/session/prompt/qwen.txt
index a34fdb01a05..3e45baae831 100644
--- a/packages/opencode/src/session/prompt/qwen.txt
+++ b/packages/opencode/src/session/prompt/qwen.txt
@@ -69,6 +69,9 @@ You are allowed to be proactive, but only when the user asks you to do something
 For example, if the user asks you how to approach something, you should do your best to answer their question first, and not immediately jump into taking actions.
 3. Do not add additional code explanation summary unless requested by the user. After working on a file, just stop, rather than providing an explanation of what you did.
 
+# Asking Questions
+When you need clarification or user input before proceeding, use the Ask tool. This is useful for clarifying ambiguous requirements, choosing between approaches, or confirming important decisions. Keep questions concise.
+
 # Following conventions
 When making changes to files, first understand the file's code conventions. Mimic code style, use existing libraries and utilities, and follow existing patterns.
 - NEVER assume that a given library is available, even if it is well known. Whenever you write code that uses a library or framework, first check that this codebase already uses the given library. For example, you might look at neighboring files, or check the package.json (or cargo.toml, and so on depending on the language).
diff --git a/packages/opencode/src/tool/ask.ts b/packages/opencode/src/tool/ask.ts
new file mode 100644
index 00000000000..6c1d1cc50ac
--- /dev/null
+++ b/packages/opencode/src/tool/ask.ts
@@ -0,0 +1,59 @@
+import z from "zod"
+import { Tool } from "./tool"
+import { Question } from "../question"
+import DESCRIPTION from "./ask.txt"
+
+export const AskTool = Tool.define("ask", {
+  description: DESCRIPTION,
+  parameters: z.object({
+    questions: z
+      .array(
+        z.object({
+          id: z.string().describe("Unique identifier for this question"),
+          type: z.enum(["select", "multi-select", "confirm", "text"]).describe("The type of question"),
+          question: z.string().describe("The question to ask the user"),
+          options: z
+            .array(
+              z.object({
+                value: z.string().describe("The value returned when this option is selected"),
+                label: z.string().describe("The label shown to the user"),
+                recommended: z.boolean().optional().describe("Mark this as the recommended option"),
+              }),
+            )
+            .optional()
+            .describe("Options for select/multi-select types"),
+          default: z
+            .union([z.string(), z.array(z.string()), z.boolean()])
+            .optional()
+            .describe("Default value shown as hint (not pre-selected)"),
+        }),
+      )
+      .min(1)
+      .describe("The questions to ask"),
+  }),
+  async execute(params, ctx) {
+    ctx.metadata({
+      title: `Asking ${params.questions.length} question${params.questions.length !== 1 ? "s" : ""}...`,
+      metadata: {
+        questions: params.questions,
+        answers: {},
+      },
+    })
+
+    const answers = await Question.ask({
+      sessionID: ctx.sessionID,
+      messageID: ctx.messageID,
+      callID: ctx.callID,
+      questions: params.questions,
+    })
+
+    return {
+      title: `Asked ${params.questions.length} question${params.questions.length !== 1 ? "s" : ""}`,
+      metadata: {
+        questions: params.questions,
+        answers,
+      },
+      output: JSON.stringify(answers, null, 2),
+    }
+  },
+})
diff --git a/packages/opencode/src/tool/ask.txt b/packages/opencode/src/tool/ask.txt
new file mode 100644
index 00000000000..2f13ba90dab
--- /dev/null
+++ b/packages/opencode/src/tool/ask.txt
@@ -0,0 +1,21 @@
+Ask the user one or more questions when you need clarification or input before proceeding.
+
+Use this tool when:
+- You need to clarify ambiguous requirements
+- There are multiple valid approaches and user preference matters
+- You need additional context or information to proceed
+- You want to confirm important decisions before implementing
+
+Question types:
+- "select": Single selection from a list of options
+- "multi-select": Multiple selections from a list of options  
+- "confirm": Yes/No question
+- "text": Free-form text input
+
+Guidelines:
+- Each question needs a unique `id` to identify it in the response
+- For select/multi-select, provide clear `options` with `value` and `label`
+- Mark the recommended option with `recommended: true` when appropriate
+- Use `default` to suggest a value (shown as hint, not pre-selected)
+- Keep questions concise and actionable
+- Group related questions in a single call when possible
diff --git a/packages/opencode/src/tool/registry.ts b/packages/opencode/src/tool/registry.ts
index 7e440a78aa5..8e1316069ce 100644
--- a/packages/opencode/src/tool/registry.ts
+++ b/packages/opencode/src/tool/registry.ts
@@ -1,3 +1,4 @@
+import { AskTool } from "./ask"
 import { BashTool } from "./bash"
 import { EditTool } from "./edit"
 import { GlobTool } from "./glob"
@@ -86,6 +87,7 @@ export namespace ToolRegistry {
 
     return [
       InvalidTool,
+      AskTool,
       BashTool,
       ReadTool,
       GlobTool,
diff --git a/specs/ask-tool.md b/specs/ask-tool.md
new file mode 100644
index 00000000000..a97ef2fb055
--- /dev/null
+++ b/specs/ask-tool.md
@@ -0,0 +1,651 @@
+# AskUserQuestion Feature Implementation Plan
+
+## Overview
+
+This document outlines the implementation plan for adding an `ask` tool to OpenCode, allowing Claude to ask users questions during a session rather than making assumptions. This is inspired by Claude Code's AskUserQuestion feature but implemented in the "OpenCode way" using dialogs and the existing TUI architecture.
+
+## Feature Summary
+
+The `ask` tool enables Claude to:
+- Ask single or multiple questions in one tool call
+- Support different question types (select, multi-select, confirm, text)
+- Mark recommended options
+- Receive user answers with optional comments for additional context
+
+## Design
+
+### Question Types
+
+| Type | Description | UI Component |
+|------|-------------|--------------|
+| `select` | Single selection from options | DialogQuestionSelect |
+| `multi-select` | Multiple selections from options | DialogQuestionMultiSelect |
+| `confirm` | Yes/No question | DialogQuestionConfirm |
+| `text` | Free-form text input | DialogQuestionText |
+
+### Multi-Question Flow
+
+When multiple questions are asked, users see a list view:
+
+```
+┌─────────────────────────────────────────────┐
+│ Questions (2/3 answered)                esc │
+├─────────────────────────────────────────────┤
+│                                             │
+│  ● What framework do you prefer?            │
+│    → React (Recommended)                    │
+│                                             │
+│  ● Do you want TypeScript?                  │
+│    → Yes                                    │
+│    💬 "We already use TS everywhere..."     │
+│                                             │
+│  ○ Package manager?                         │
+│    → (not answered)                         │
+│                                             │
+├─────────────────────────────────────────────┤
+│ enter open  ctrl+enter submit           esc │
+└─────────────────────────────────────────────┘
+```
+
+Pressing `enter` on a question opens a nested dialog for that question type.
+
+### Single Question Optimization
+
+When only 1 question is asked, skip the list view and open the question dialog directly.
+
+### Nested Dialogs
+
+Questions use nested dialogs:
+- Main dialog shows question list
+- Selecting a question opens its specific dialog (select, text, etc.)
+- ESC returns to list without saving changes
+- Comments open another nested dialog layer
+
+### Comments
+
+Any question can have an optional comment added via the `c` key, providing additional context to the answer.
+
+### Keybindings
+
+**In Question List:**
+| Key | Action |
+|-----|--------|
+| `enter` | Open question dialog |
+| `ctrl+enter` | Submit all answers |
+| `esc` | Cancel entire flow (reject) |
+| `up/down` | Navigate questions |
+
+**In Question Dialog (Select/Multi-Select/Confirm):**
+| Key | Action |
+|-----|--------|
+| `enter` | Confirm selection, return to list |
+| `space` | Toggle selection (multi-select only) |
+| `c` | Add/edit comment |
+| `ctrl+enter` | Confirm and submit all answers |
+| `esc` | Cancel edit, return to list (no change) |
+
+**In Text Dialog:**
+| Key | Action |
+|-----|--------|
+| `enter` | Submit text, return to list |
+| `ctrl+enter` | Submit and submit all answers |
+| `esc` | Cancel, return to list |
+
+### Tool Schema
+
+```typescript
+parameters: z.object({
+  questions: z.array(z.object({
+    id: z.string().describe("Unique identifier for this question"),
+    type: z.enum(["select", "multi-select", "confirm", "text"]),
+    question: z.string().describe("The question to ask the user"),
+    options: z.array(z.object({
+      value: z.string(),
+      label: z.string(),
+      recommended: z.boolean().optional(),
+    })).optional().describe("Options for select/multi-select types"),
+    default: z.union([z.string(), z.array(z.string()), z.boolean()]).optional()
+      .describe("Default value shown as hint (not pre-selected)"),
+  })).min(1),
+})
+```
+
+### Response Schema
+
+```typescript
+{
+  [questionId: string]: {
+    value: string | string[] | boolean | null  // null if skipped
+    comment?: string  // optional additional context
+  }
+}
+```
+
+### Tool Output (shown in message stream)
+
+After questions are answered, display a summary:
+
+```
+? Asked 3 questions
+  • Framework: React
+    💬 "We already use React in other projects"
+  • TypeScript: Yes
+  • Package manager: (skipped)
+```
+
+### Abort Handling
+
+If the session is aborted while a question is pending, auto-reject the question. The user can ask again if needed.
+
+## Architecture
+
+### File Structure
+
+```
+packages/opencode/src/
+├── question/
+│   └── index.ts                    # Question namespace (state, events, ask/respond)
+├── tool/
+│   ├── ask.ts                      # AskTool definition
+│   └── registry.ts                 # Register AskTool
+├── server/
+│   └── server.ts                   # Add /question/respond route
+└── cli/cmd/tui/
+    ├── ui/
+    │   ├── dialog.tsx              # Add push() method for nested dialogs
+    │   └── dialog-question.tsx     # Question components
+    ├── context/
+    │   └── sync.tsx                # Add question state
+    └── routes/session/
+        ├── index.tsx               # Question handling integration
+        └── footer.tsx              # Question indicator
+```
+
+### Question Namespace (question/index.ts)
+
+Similar pattern to Permission namespace:
+
+```typescript
+export namespace Question {
+  // Zod schemas
+  export const QuestionItem = z.object({
+    id: z.string(),
+    type: z.enum(["select", "multi-select", "confirm", "text"]),
+    question: z.string(),
+    options: z.array(z.object({
+      value: z.string(),
+      label: z.string(),
+      recommended: z.boolean().optional(),
+    })).optional(),
+    default: z.union([z.string(), z.array(z.string()), z.boolean()]).optional(),
+  })
+
+  export const Answer = z.object({
+    value: z.union([z.string(), z.array(z.string()), z.boolean(), z.null()]),
+    comment: z.string().optional(),
+  })
+
+  export const Info = z.object({
+    id: z.string(),
+    sessionID: z.string(),
+    messageID: z.string(),
+    callID: z.string().optional(),
+    questions: z.array(QuestionItem),
+    time: z.object({ created: z.number() }),
+  })
+
+  // Events
+  export const Event = {
+    Updated: BusEvent.define("question.updated", Info),
+    Replied: BusEvent.define("question.replied", z.object({
+      sessionID: z.string(),
+      questionID: z.string(),
+      answers: z.record(z.string(), Answer),
+    })),
+  }
+
+  // State management (similar to Permission)
+  const state = Instance.state(() => ({
+    pending: {} as { [sessionID: string]: { [questionID: string]: PendingQuestion } },
+  }), async (state) => {
+    // Reject all pending on dispose
+  })
+
+  // Core functions
+  export async function ask(input: {...}): Promise<Record<string, Answer>>
+  export function respond(input: {...}): void
+
+  // Error class
+  export class RejectedError extends Error {...}
+}
+```
+
+### Dialog System Update (dialog.tsx)
+
+Add `push` method for nested dialogs:
+
+```typescript
+// Existing
+replace(input: JSX.Element, onClose?: () => void) {
+  // Clears stack and adds single dialog
+}
+
+// New
+push(input: JSX.Element, onClose?: () => void) {
+  if (store.stack.length === 0) {
+    focus = renderer.currentFocusedRenderable
+  }
+  setStore("stack", [...store.stack, { element: input, onClose }])
+}
+
+pop() {
+  if (store.stack.length === 0) return
+  const current = store.stack.at(-1)
+  current?.onClose?.()
+  setStore("stack", store.stack.slice(0, -1))
+  if (store.stack.length === 0) refocus()
+}
+```
+
+Update ESC handler to use `pop()` instead of clearing entire stack.
+
+### Sync Context Update (sync.tsx)
+
+Add question state:
+
+```typescript
+const [store, setStore] = createStore<{
+  // ... existing
+  question: {
+    [sessionID: string]: Question[]
+  }
+}>({
+  // ... existing
+  question: {},
+})
+
+// Handle events
+case "question.updated": {
+  // Add/update question in store
+}
+case "question.replied": {
+  // Remove question from store
+}
+```
+
+### Server Route (server.ts)
+
+```typescript
+.post(
+  "/question/respond",
+  describeRoute({ description: "Respond to a pending question" }),
+  validator("json", z.object({
+    sessionID: z.string(),
+    questionID: z.string(),
+    answers: z.record(z.string(), Question.Answer),
+  })),
+  async (c) => {
+    const body = c.req.valid("json")
+    Question.respond(body)
+    return c.json({ success: true })
+  }
+)
+```
+
+### SDK Types
+
+Add to SDK v2 types:
+
+```typescript
+export type QuestionItem = {
+  id: string
+  type: "select" | "multi-select" | "confirm" | "text"
+  question: string
+  options?: { value: string; label: string; recommended?: boolean }[]
+  default?: string | string[] | boolean
+}
+
+export type QuestionAnswer = {
+  value: string | string[] | boolean | null
+  comment?: string
+}
+
+export type Question = {
+  id: string
+  sessionID: string
+  messageID: string
+  callID?: string
+  questions: QuestionItem[]
+  time: { created: number }
+}
+```
+
+## Implementation Phases
+
+### Phase 1: Core Infrastructure
+
+| # | Task | File(s) | Description |
+|---|------|---------|-------------|
+| 1 | Add push/pop to dialog | `ui/dialog.tsx` | Enable nested dialog support |
+| 2 | Create Question namespace | `question/index.ts` | State, events, ask/respond functions |
+| 3 | Add server routes | `server/server.ts` | POST /question/respond endpoint |
+| 4 | Add SDK types | `packages/sdk/...` | Question, QuestionItem, QuestionAnswer types |
+| 5 | Add sync state | `context/sync.tsx` | Question state and event handling |
+
+### Phase 2: Tool Implementation
+
+| # | Task | File(s) | Description |
+|---|------|---------|-------------|
+| 6 | Create AskTool | `tool/ask.ts` | Tool definition with full schema |
+| 7 | Register tool | `tool/registry.ts` | Add AskTool to built-in tools |
+
+### Phase 3: TUI Components
+
+| # | Task | File(s) | Description |
+|---|------|---------|-------------|
+| 8 | DialogQuestion | `ui/dialog-question.tsx` | Main question list component |
+| 9 | DialogQuestionSelect | `ui/dialog-question.tsx` | Single select dialog |
+| 10 | DialogQuestionMultiSelect | `ui/dialog-question.tsx` | Multi-select with checkboxes |
+| 11 | DialogQuestionText | `ui/dialog-question.tsx` | Text input dialog |
+| 12 | DialogQuestionConfirm | `ui/dialog-question.tsx` | Yes/No dialog |
+| 13 | DialogQuestionComment | `ui/dialog-question.tsx` | Comment input overlay |
+
+### Phase 4: Integration
+
+| # | Task | File(s) | Description |
+|---|------|---------|-------------|
+| 14 | Session integration | `routes/session/index.tsx` | Auto-open dialog, keyboard handling |
+| 15 | Footer indicator | `routes/session/footer.tsx` | Show "◉ 1 Question" like permissions |
+| 16 | Tool renderer | `routes/session/index.tsx` | Show Q&A summary in message stream |
+| 17 | Abort handling | `question/index.ts` | Auto-reject on session abort |
+| 18 | Single question opt | `ui/dialog-question.tsx` | Skip list for single question |
+
+### Phase 5: Documentation
+
+| # | Task | File(s) | Description |
+|---|------|---------|-------------|
+| 19 | System prompt | TBD | Document ask tool usage for Claude |
+
+## Component Details
+
+### DialogQuestion (List View)
+
+```typescript
+interface DialogQuestionProps {
+  question: Question.Info
+  onSubmit: (answers: Record<string, Question.Answer>) => void
+  onCancel: () => void
+}
+
+function DialogQuestion(props: DialogQuestionProps) {
+  const [answers, setAnswers] = createStore<Record<string, Question.Answer>>({})
+  const dialog = useDialog()
+
+  // Count answered questions
+  const answeredCount = () => Object.keys(answers).filter(k => answers[k]?.value !== null).length
+
+  // Open specific question dialog
+  function openQuestion(item: Question.QuestionItem) {
+    const Component = {
+      "select": DialogQuestionSelect,
+      "multi-select": DialogQuestionMultiSelect,
+      "confirm": DialogQuestionConfirm,
+      "text": DialogQuestionText,
+    }[item.type]
+
+    dialog.push(() => (
+      <Component
+        item={item}
+        currentAnswer={answers[item.id]}
+        onAnswer={(answer) => {
+          setAnswers(item.id, answer)
+          dialog.pop()
+        }}
+        onCancel={() => dialog.pop()}
+        onSubmitAll={(answer) => {
+          setAnswers(item.id, answer)
+          props.onSubmit(answers)
+        }}
+      />
+    ))
+  }
+
+  // Render list...
+}
+```
+
+### DialogQuestionSelect
+
+```typescript
+interface DialogQuestionSelectProps {
+  item: Question.QuestionItem
+  currentAnswer?: Question.Answer
+  onAnswer: (answer: Question.Answer) => void
+  onCancel: () => void
+  onSubmitAll: (answer: Question.Answer) => void
+}
+
+function DialogQuestionSelect(props: DialogQuestionSelectProps) {
+  const dialog = useDialog()
+  const [selected, setSelected] = createSignal<string | null>(null)
+  const [comment, setComment] = createSignal<string | undefined>(props.currentAnswer?.comment)
+
+  // Sort options: recommended first
+  const sortedOptions = () => {
+    const opts = props.item.options ?? []
+    return [...opts].sort((a, b) => (b.recommended ? 1 : 0) - (a.recommended ? 1 : 0))
+  }
+
+  function openComment() {
+    dialog.push(() => (
+      <DialogQuestionComment
+        value={comment()}
+        onSave={(c) => { setComment(c); dialog.pop() }}
+        onCancel={() => dialog.pop()}
+      />
+    ))
+  }
+
+  // Handle keyboard: enter, c, ctrl+enter, esc
+  // Render options with recommended indicator...
+}
+```
+
+### DialogQuestionMultiSelect
+
+Similar to DialogQuestionSelect but:
+- Uses checkboxes (☑/☐) instead of radio buttons
+- `space` toggles selection
+- `enter` confirms all selections
+- Stores array of selected values
+
+### DialogQuestionConfirm
+
+```typescript
+function DialogQuestionConfirm(props: DialogQuestionConfirmProps) {
+  const [selected, setSelected] = createSignal<boolean | null>(null)
+  const [comment, setComment] = createSignal<string | undefined>()
+
+  // Two options: Yes / No
+  // enter confirms, c opens comment, esc cancels
+}
+```
+
+### DialogQuestionText
+
+```typescript
+function DialogQuestionText(props: DialogQuestionTextProps) {
+  let textarea: TextareaRenderable
+
+  // Show default as placeholder hint
+  // enter submits, esc cancels
+  // No separate comment - the text IS the answer
+}
+```
+
+### DialogQuestionComment
+
+```typescript
+function DialogQuestionComment(props: {
+  value?: string
+  onSave: (comment: string) => void
+  onCancel: () => void
+}) {
+  // Simple textarea dialog
+  // enter saves, esc cancels
+}
+```
+
+## Tool Renderer
+
+Register a renderer for the ask tool in the session:
+
+```typescript
+ToolRegistry.register<typeof AskTool>({
+  name: "ask",
+  container: "block",
+  render(props) {
+    const questions = props.metadata.questions ?? []
+    const answers = props.metadata.answers ?? {}
+
+    return (
+      <>
+        <ToolTitle icon="?" fallback="Asking questions...">
+          Asked {questions.length} question{questions.length !== 1 ? "s" : ""}
+        </ToolTitle>
+        <Show when={props.output}>
+          <For each={questions}>
+            {(q) => {
+              const answer = answers[q.id]
+              return (
+                <box paddingLeft={2}>
+                  <text>
+                    • {q.question}: {formatAnswer(answer)}
+                  </text>
+                  <Show when={answer?.comment}>
+                    <text fg={theme.textMuted}>
+                      💬 "{truncate(answer.comment, 50)}"
+                    </text>
+                  </Show>
+                </box>
+              )
+            }}
+          </For>
+        </Show>
+      </>
+    )
+  }
+})
+```
+
+## Testing Plan
+
+### Manual Testing Scenarios
+
+1. **Single select question** - One question with 4 options, one recommended
+2. **Multi-select question** - Select multiple features
+3. **Confirm question** - Yes/No with comment
+4. **Text question** - Free-form input with default hint
+5. **Multiple questions** - 3+ questions of mixed types
+6. **Single question optimization** - Verify direct dialog open
+7. **Comments** - Add comments to various question types
+8. **Skip questions** - Submit without answering all
+9. **Cancel flow** - ESC at various levels
+10. **Abort session** - Verify auto-reject
+11. **Nested dialog navigation** - ESC returns to correct level
+
+### Edge Cases
+
+- Empty options array for select
+- Very long question text
+- Very long option labels
+- Many options (scrolling)
+- Many questions (scrolling)
+- Unicode in questions/options/comments
+- Rapid navigation
+
+## Future Enhancements (Out of Scope)
+
+- Conditional questions (show question B only if A is answered X)
+- Question groups/sections
+- File picker question type
+- Date/time picker question type
+- Numeric input with validation
+- Saving answer templates
+- Question history/recall
+
+## Dependencies
+
+No new external dependencies required. Uses existing:
+- Solid.js for reactivity
+- OpenTUI for rendering
+- Zod for schema validation
+- Existing dialog infrastructure
+
+## Risks & Mitigations
+
+| Risk | Mitigation |
+|------|------------|
+| Nested dialogs complex state | Keep state local to DialogQuestion, use solid-js/store |
+| ESC key conflicts | Check stack depth before handling |
+| Long questions overflow | Use wrapMode and scrolling |
+| Focus management in nested | Leverage existing dialog focus save/restore |
+
+---
+
+## Appendix: Example Usage
+
+### Tool Call (from Claude)
+```json
+{
+  "name": "ask",
+  "parameters": {
+    "questions": [
+      {
+        "id": "framework",
+        "type": "select",
+        "question": "What frontend framework do you prefer?",
+        "options": [
+          { "value": "react", "label": "React", "recommended": true },
+          { "value": "vue", "label": "Vue" },
+          { "value": "svelte", "label": "Svelte" },
+          { "value": "angular", "label": "Angular" }
+        ]
+      },
+      {
+        "id": "features",
+        "type": "multi-select",
+        "question": "Which features do you need?",
+        "options": [
+          { "value": "auth", "label": "Authentication", "recommended": true },
+          { "value": "db", "label": "Database" },
+          { "value": "api", "label": "REST API" },
+          { "value": "graphql", "label": "GraphQL" }
+        ]
+      },
+      {
+        "id": "typescript",
+        "type": "confirm",
+        "question": "Do you want to use TypeScript?",
+        "default": true
+      },
+      {
+        "id": "description",
+        "type": "text",
+        "question": "Briefly describe your project",
+        "default": "A web application that..."
+      }
+    ]
+  }
+}
+```
+
+### Tool Response (to Claude)
+```json
+{
+  "framework": { "value": "react", "comment": "We already use React in other projects" },
+  "features": { "value": ["auth", "db", "api"] },
+  "typescript": { "value": true },
+  "description": { "value": "An e-commerce platform for selling handmade crafts" }
+}
+```

From 838b73496b74ebdbbfacb092d26cbea1fdf9b16b Mon Sep 17 00:00:00 2001
From: dbpolito <danielbpolito@gmail.com>
Date: Mon, 15 Dec 2025 08:12:40 -0300
Subject: [PATCH 02/17] Refactor

---
 .../src/cli/cmd/tui/ui/dialog-question.tsx    | 691 +-----------------
 .../dialog-question-comment.tsx               |  57 ++
 .../dialog-question-confirm.tsx               | 161 ++++
 .../dialog-question-multi-select.tsx          | 106 +++
 .../dialog-question-select.tsx                |  95 +++
 .../dialog-question/dialog-question-text.tsx  |  81 ++
 .../cli/cmd/tui/ui/dialog-question/index.tsx  | 119 +++
 .../cli/cmd/tui/ui/dialog-question/types.ts   |  22 +
 .../cli/cmd/tui/ui/dialog-question/utils.ts   |  40 +
 9 files changed, 683 insertions(+), 689 deletions(-)
 create mode 100644 packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-comment.tsx
 create mode 100644 packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-confirm.tsx
 create mode 100644 packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-multi-select.tsx
 create mode 100644 packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-select.tsx
 create mode 100644 packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-text.tsx
 create mode 100644 packages/opencode/src/cli/cmd/tui/ui/dialog-question/index.tsx
 create mode 100644 packages/opencode/src/cli/cmd/tui/ui/dialog-question/types.ts
 create mode 100644 packages/opencode/src/cli/cmd/tui/ui/dialog-question/utils.ts

diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
index 188eb5f9926..9f1b72073be 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
@@ -1,689 +1,2 @@
-import { TextareaRenderable, TextAttributes } from "@opentui/core"
-import { useTheme, selectedForeground } from "@tui/context/theme"
-import { createEffect, createMemo, createSignal, onMount, Show } from "solid-js"
-import { createStore } from "solid-js/store"
-import { useKeyboard } from "@opentui/solid"
-import { useDialog, type DialogContext } from "@tui/ui/dialog"
-import { DialogSelect, type DialogSelectOption } from "@tui/ui/dialog-select"
-import type { Question } from "@/question"
-
-// Types
-interface Answer {
-  value: string | string[] | boolean | null
-  comment?: string
-}
-
-type Answers = Record<string, Answer>
-
-interface QuestionDialogProps {
-  question: Question.Info
-  onSubmit: (answers: Answers) => void
-  onCancel: () => void
-}
-
-interface SingleQuestionProps {
-  item: Question.QuestionItem
-  currentAnswer?: Answer
-  onAnswer: (answer: Answer) => void
-  onCancel: () => void
-  onSubmitAll: (answer: Answer) => void
-}
-
-// Main DialogQuestion - shows list of all questions
-export function DialogQuestion(props: QuestionDialogProps) {
-  const dialog = useDialog()
-  const [answers, setAnswers] = createStore<Answers>({})
-
-  const questions = () => props.question.questions
-  const answeredCount = () =>
-    Object.keys(answers).filter((k) => answers[k]?.value !== undefined && answers[k]?.value !== null).length
-
-  console.log("[DialogQuestion] Mounting with", questions().length, "questions")
-
-  onMount(() => {
-    console.log("[DialogQuestion] onMount called")
-    dialog.setSize("medium")
-  })
-
-  function openQuestion(item: Question.QuestionItem) {
-    const Component = {
-      select: DialogQuestionSelect,
-      "multi-select": DialogQuestionMultiSelect,
-      confirm: DialogQuestionConfirm,
-      text: DialogQuestionText,
-    }[item.type]
-
-    dialog.push(() => (
-      <Component
-        item={item}
-        currentAnswer={answers[item.id]}
-        onAnswer={(answer) => {
-          setAnswers(item.id, answer)
-          dialog.pop()
-        }}
-        onCancel={() => dialog.pop()}
-        onSubmitAll={(answer) => {
-          setAnswers(item.id, answer)
-          submit({ ...answers, [item.id]: answer })
-        }}
-      />
-    ))
-  }
-
-  function submit(finalAnswers?: Answers) {
-    props.onSubmit(finalAnswers ?? answers)
-  }
-
-  // Convert questions to DialogSelect options
-  const selectOptions = createMemo<DialogSelectOption<Question.QuestionItem>[]>(() =>
-    questions().map((item) => {
-      const answer = answers[item.id]
-      const answerPreview = formatAnswerPreview(item, answer)
-      const comment = answer?.comment ? ` 💬 "${truncate(answer.comment, 30)}"` : ""
-
-      return {
-        title: item.question,
-        value: item,
-        description: answerPreview + comment,
-        onSelect: () => openQuestion(item),
-      }
-    }),
-  )
-
-  // Handle submission with ctrl+enter keybind
-  useKeyboard((evt) => {
-    if (questions().length === 1) return
-    if (evt.ctrl && evt.name === "return") {
-      submit()
-      evt.preventDefault()
-    }
-  })
-
-  return (
-    <DialogSelect
-      title={`Questions (${answeredCount()}/${questions().length} answered)`}
-      options={selectOptions()}
-      onSelect={(option) => option.onSelect?.(dialog)}
-      hideSearch={true}
-    />
-  )
-}
-
-// Single Select Question Dialog
-function DialogQuestionSelect(props: SingleQuestionProps) {
-  const dialog = useDialog()
-  const { theme } = useTheme()
-  const [comment, setComment] = createSignal<string | undefined>(props.currentAnswer?.comment)
-
-  // Sort options with recommended first
-  const sortedOptions = createMemo(() => {
-    const opts = props.item.options ?? []
-    return [...opts].sort((a, b) => (b.recommended ? 1 : 0) - (a.recommended ? 1 : 0))
-  })
-
-  // Find current selection value
-  const currentValue = createMemo(() => props.currentAnswer?.value)
-
-  onMount(() => {
-    dialog.setSize("medium")
-  })
-
-  function openComment() {
-    dialog.push(() => (
-      <DialogQuestionComment
-        value={comment()}
-        onSave={(c) => {
-          setComment(c)
-          dialog.pop()
-        }}
-        onCancel={() => dialog.pop()}
-      />
-    ))
-  }
-
-  function confirmSelection(option: { value: string; label: string; recommended?: boolean }) {
-    props.onAnswer({ value: option.value, comment: comment() })
-  }
-
-  function submitAll(option: { value: string; label: string; recommended?: boolean }) {
-    props.onSubmitAll({ value: option.value, comment: comment() })
-  }
-
-  // Convert options to DialogSelectOption format
-  const selectOptions = createMemo<DialogSelectOption<{ value: string; label: string; recommended?: boolean }>[]>(() =>
-    sortedOptions().map((option) => ({
-      title: option.label,
-      value: option,
-      footer: option.recommended ? "(Recommended)" : undefined,
-      onSelect: () => confirmSelection(option),
-    })),
-  )
-
-  // Show default as hint if present
-  const defaultHint = createMemo(() => {
-    if (typeof props.item.default === "string") {
-      const opt = props.item.options?.find((o) => o.value === props.item.default)
-      return opt?.label
-    }
-    return undefined
-  })
-
-  return (
-    <>
-      <Show when={defaultHint()}>
-        <box paddingLeft={4} paddingRight={4} paddingTop={1}>
-          <text fg={theme.textMuted}>Default: {defaultHint()}</text>
-        </box>
-      </Show>
-      <DialogSelect
-        title={props.item.question}
-        options={selectOptions()}
-        current={sortedOptions().find((o) => o.value === currentValue())}
-        hideSearch={true}
-        keybind={[
-          {
-            keybind: { name: "m", ctrl: false, meta: false, shift: false, super: false, leader: false },
-            title: "add comment",
-            onTrigger: () => openComment(),
-          },
-          {
-            keybind: { name: "s", ctrl: false, meta: false, shift: false, super: false, leader: false },
-            title: "submit all",
-            onTrigger: (option) => submitAll(option.value),
-          },
-        ]}
-      />
-      <Show when={comment()}>
-        <box paddingLeft={4} paddingRight={4}>
-          <text fg={theme.textMuted}>💬 "{truncate(comment()!, 40)}"</text>
-        </box>
-      </Show>
-    </>
-  )
-}
-
-// Multi-Select Question Dialog
-function DialogQuestionMultiSelect(props: SingleQuestionProps) {
-  const dialog = useDialog()
-  const { theme } = useTheme()
-  const [checked, setChecked] = createStore<Record<string, boolean>>({})
-  const [comment, setComment] = createSignal<string | undefined>(props.currentAnswer?.comment)
-
-  // Sort options with recommended first
-  const sortedOptions = createMemo(() => {
-    const opts = props.item.options ?? []
-    return [...opts].sort((a, b) => (b.recommended ? 1 : 0) - (a.recommended ? 1 : 0))
-  })
-
-  // Initialize checked state from current answer
-  createEffect(() => {
-    if (Array.isArray(props.currentAnswer?.value)) {
-      for (const v of props.currentAnswer.value) {
-        setChecked(v, true)
-      }
-    }
-  })
-
-  onMount(() => {
-    dialog.setSize("medium")
-  })
-
-  function openComment() {
-    dialog.push(() => (
-      <DialogQuestionComment
-        value={comment()}
-        onSave={(c) => {
-          setComment(c)
-          dialog.pop()
-        }}
-        onCancel={() => dialog.pop()}
-      />
-    ))
-  }
-
-  function getSelectedValues(): string[] {
-    return sortedOptions()
-      .filter((o) => checked[o.value])
-      .map((o) => o.value)
-  }
-
-  function confirmSelection() {
-    props.onAnswer({ value: getSelectedValues(), comment: comment() })
-  }
-
-  function submitAll() {
-    props.onSubmitAll({ value: getSelectedValues(), comment: comment() })
-  }
-
-  // Convert options to DialogSelectOption format
-  const selectOptions = createMemo<DialogSelectOption<{ value: string; label: string; recommended?: boolean }>[]>(() =>
-    sortedOptions().map((option) => ({
-      title: option.label,
-      value: option,
-      footer: checked[option.value] ? "☑" : "☐",
-      onSelect: () => {}, // Don't close on select
-    })),
-  )
-
-  const selectedCount = createMemo(() => getSelectedValues().length)
-
-  return (
-    <>
-      <box paddingLeft={4} paddingRight={4} paddingTop={1}>
-        <text fg={theme.textMuted}>{selectedCount()} selected</text>
-      </box>
-      <DialogSelect
-        title={props.item.question}
-        options={selectOptions()}
-        hideSearch={true}
-        onSelect={() => confirmSelection()}
-        keybind={[
-          {
-            keybind: { name: "space", ctrl: false, meta: false, shift: false, super: false, leader: false },
-            title: "toggle",
-            onTrigger: (option) => setChecked(option.value.value, !checked[option.value.value]),
-          },
-          {
-            keybind: { name: "m", ctrl: false, meta: false, shift: false, super: false, leader: false },
-            title: "add comment",
-            onTrigger: () => openComment(),
-          },
-          {
-            keybind: { name: "s", ctrl: false, meta: false, shift: false, super: false, leader: false },
-            title: "submit all",
-            onTrigger: () => submitAll(),
-          },
-        ]}
-      />
-      <Show when={comment()}>
-        <box paddingLeft={4} paddingRight={4}>
-          <text fg={theme.textMuted}>💬 "{truncate(comment()!, 40)}"</text>
-        </box>
-      </Show>
-    </>
-  )
-
-
-  function openComment() {
-    dialog.push(() => (
-      <DialogQuestionComment
-        value={comment()}
-        onSave={(c) => {
-          setComment(c)
-          dialog.pop()
-        }}
-        onCancel={() => dialog.pop()}
-      />
-    ))
-  }
-
-  function getSelectedValues(): string[] {
-    return sortedOptions()
-      .filter((o) => checked[o.value])
-      .map((o) => o.value)
-  }
-
-  function confirmSelection() {
-    props.onAnswer({ value: getSelectedValues(), comment: comment() })
-  }
-
-  function submitAll() {
-    props.onSubmitAll({ value: getSelectedValues(), comment: comment() })
-  }
-
-  function CheckboxStatus(props: { value: string }) {
-    const isChecked = () => checked[props.value]
-    return <text fg={isChecked() ? theme.success : theme.textMuted}>{isChecked() ? "☑" : "☐"}</text>
-  }
-
-}
-
-// Confirm (Yes/No) Question Dialog
-function DialogQuestionConfirm(props: SingleQuestionProps) {
-  const dialog = useDialog()
-  const { theme } = useTheme()
-  const [selected, setSelected] = createSignal<boolean | null>(
-    typeof props.currentAnswer?.value === "boolean" ? props.currentAnswer.value : null,
-  )
-  const [comment, setComment] = createSignal<string | undefined>(props.currentAnswer?.comment)
-
-  onMount(() => {
-    dialog.setSize("medium")
-  })
-
-  function openComment() {
-    dialog.push(() => (
-      <DialogQuestionComment
-        value={comment()}
-        onSave={(c) => {
-          setComment(c)
-          dialog.pop()
-        }}
-        onCancel={() => dialog.pop()}
-      />
-    ))
-  }
-
-  function confirmSelection() {
-    if (selected() !== null) {
-      props.onAnswer({ value: selected(), comment: comment() })
-    }
-  }
-
-  function submitAll() {
-    if (selected() !== null) {
-      props.onSubmitAll({ value: selected(), comment: comment() })
-    }
-  }
-
-  useKeyboard((evt) => {
-    if (evt.name === "up" || evt.name === "left" || (evt.ctrl && evt.name === "p")) {
-      setSelected(true)
-      evt.preventDefault()
-    }
-    if (evt.name === "down" || evt.name === "right" || (evt.ctrl && evt.name === "n")) {
-      setSelected(false)
-      evt.preventDefault()
-    }
-    if (evt.name === "return" && !evt.ctrl) {
-      confirmSelection()
-      evt.preventDefault()
-    }
-    if (evt.ctrl && evt.name === "return") {
-      submitAll()
-      evt.preventDefault()
-    }
-    if (evt.name === "c" && !evt.ctrl) {
-      openComment()
-      evt.preventDefault()
-    }
-    if (evt.name === "y") {
-      setSelected(true)
-      evt.preventDefault()
-    }
-    if (evt.name === "n") {
-      setSelected(false)
-      evt.preventDefault()
-    }
-  })
-
-  // Show default as hint
-  const defaultHint = createMemo(() => {
-    if (typeof props.item.default === "boolean") {
-      return props.item.default ? "Yes" : "No"
-    }
-    return undefined
-  })
-
-  return (
-    <box gap={1} paddingBottom={1}>
-      <box paddingLeft={4} paddingRight={4}>
-        <box flexDirection="row" justifyContent="space-between">
-          <text fg={theme.text} attributes={TextAttributes.BOLD}>
-            {props.item.question}
-          </text>
-          <text fg={theme.textMuted}>esc</text>
-        </box>
-        <Show when={defaultHint()}>
-          <text fg={theme.textMuted}>Default: {defaultHint()}</text>
-        </Show>
-      </box>
-      <box paddingLeft={3} paddingRight={3} flexDirection="row" gap={2}>
-        <box
-          paddingLeft={2}
-          paddingRight={2}
-          backgroundColor={selected() === true ? theme.primary : undefined}
-          onMouseUp={() => {
-            setSelected(true)
-            confirmSelection()
-          }}
-        >
-          <text
-            fg={selected() === true ? selectedForeground(theme) : theme.text}
-            attributes={selected() === true ? TextAttributes.BOLD : undefined}
-          >
-            Yes
-          </text>
-        </box>
-        <box
-          paddingLeft={2}
-          paddingRight={2}
-          backgroundColor={selected() === false ? theme.primary : undefined}
-          onMouseUp={() => {
-            setSelected(false)
-            confirmSelection()
-          }}
-        >
-          <text
-            fg={selected() === false ? selectedForeground(theme) : theme.text}
-            attributes={selected() === false ? TextAttributes.BOLD : undefined}
-          >
-            No
-          </text>
-        </box>
-      </box>
-      <Show when={comment()}>
-        <box paddingLeft={4} paddingRight={4}>
-          <text fg={theme.textMuted}>
-            {"\uD83D\uDCAC"} "{truncate(comment()!, 40)}"
-          </text>
-        </box>
-      </Show>
-      <box paddingRight={2} paddingLeft={4} flexDirection="row" gap={2} flexShrink={0} paddingTop={1}>
-        <text>
-          <span style={{ fg: theme.text }}>
-            <b>y/n</b>{" "}
-          </span>
-          <span style={{ fg: theme.textMuted }}>select</span>
-        </text>
-        <text>
-          <span style={{ fg: theme.text }}>
-            <b>enter</b>{" "}
-          </span>
-          <span style={{ fg: theme.textMuted }}>confirm</span>
-        </text>
-        <text>
-          <span style={{ fg: theme.text }}>
-            <b>c</b>{" "}
-          </span>
-          <span style={{ fg: theme.textMuted }}>comment</span>
-        </text>
-      </box>
-    </box>
-  )
-}
-
-// Text Input Question Dialog
-function DialogQuestionText(props: SingleQuestionProps) {
-  const dialog = useDialog()
-  const { theme } = useTheme()
-  let textarea: TextareaRenderable
-
-  onMount(() => {
-    dialog.setSize("medium")
-    setTimeout(() => {
-      textarea.focus()
-    }, 1)
-  })
-
-  function confirmText() {
-    const value = textarea.plainText.trim()
-    props.onAnswer({ value: value || null })
-  }
-
-  function submitAll() {
-    const value = textarea.plainText.trim()
-    props.onSubmitAll({ value: value || null })
-  }
-
-  useKeyboard((evt) => {
-    if (evt.ctrl && evt.name === "return") {
-      submitAll()
-      evt.preventDefault()
-    }
-  })
-
-  // Show default as placeholder
-  const placeholder = createMemo(() => {
-    if (typeof props.item.default === "string") {
-      return props.item.default
-    }
-    return "Enter your response..."
-  })
-
-  return (
-    <box paddingLeft={2} paddingRight={2} gap={1}>
-      <box flexDirection="row" justifyContent="space-between">
-        <text attributes={TextAttributes.BOLD} fg={theme.text}>
-          {props.item.question}
-        </text>
-        <text fg={theme.textMuted}>esc</text>
-      </box>
-      <box gap={1}>
-        <textarea
-          onSubmit={confirmText}
-          height={5}
-          keyBindings={[{ name: "return", action: "submit" }]}
-          ref={(val: TextareaRenderable) => (textarea = val)}
-          initialValue={typeof props.currentAnswer?.value === "string" ? props.currentAnswer.value : ""}
-          placeholder={placeholder()}
-          textColor={theme.text}
-          focusedTextColor={theme.text}
-          cursorColor={theme.text}
-        />
-      </box>
-      <box paddingBottom={1} gap={1} flexDirection="row">
-        <text>
-          <span style={{ fg: theme.text }}>
-            <b>enter</b>{" "}
-          </span>
-          <span style={{ fg: theme.textMuted }}>submit</span>
-        </text>
-        <text>
-          <span style={{ fg: theme.text }}>
-            <b>ctrl+enter</b>{" "}
-          </span>
-          <span style={{ fg: theme.textMuted }}>submit all</span>
-        </text>
-      </box>
-    </box>
-  )
-}
-
-// Comment Dialog (nested)
-function DialogQuestionComment(props: { value?: string; onSave: (comment: string) => void; onCancel: () => void }) {
-  const dialog = useDialog()
-  const { theme } = useTheme()
-  let textarea: TextareaRenderable
-
-  onMount(() => {
-    dialog.setSize("medium")
-    setTimeout(() => {
-      textarea.focus()
-      textarea.gotoLineEnd()
-    }, 1)
-  })
-
-  return (
-    <box paddingLeft={2} paddingRight={2} gap={1}>
-      <box flexDirection="row" justifyContent="space-between">
-        <text attributes={TextAttributes.BOLD} fg={theme.text}>
-          Add Comment
-        </text>
-        <text fg={theme.textMuted}>esc</text>
-      </box>
-      <box gap={1}>
-        <text fg={theme.textMuted}>Add additional context to your answer:</text>
-        <textarea
-          onSubmit={() => props.onSave(textarea.plainText)}
-          height={4}
-          keyBindings={[{ name: "return", action: "submit" }]}
-          ref={(val: TextareaRenderable) => (textarea = val)}
-          initialValue={props.value ?? ""}
-          placeholder="Optional comment..."
-          textColor={theme.text}
-          focusedTextColor={theme.text}
-          cursorColor={theme.text}
-        />
-      </box>
-      <box paddingBottom={1} gap={1} flexDirection="row">
-        <text>
-          <span style={{ fg: theme.text }}>
-            <b>enter</b>{" "}
-          </span>
-          <span style={{ fg: theme.textMuted }}>save</span>
-        </text>
-      </box>
-    </box>
-  )
-}
-
-// Static method to show the dialog
-DialogQuestion.show = (
-  dialog: DialogContext,
-  question: Question.Info,
-): Promise<{ answers: Answers; cancelled: boolean }> => {
-  console.log("[DialogQuestion.show] Called with question:", question.id, "questions count:", question.questions.length)
-  return new Promise((resolve) => {
-    dialog.replace(
-      () => (
-        <DialogQuestion
-          question={question}
-          onSubmit={(answers) => {
-            console.log("[DialogQuestion.show] onSubmit called")
-            dialog.clear()
-            resolve({ answers, cancelled: false })
-          }}
-          onCancel={() => {
-            console.log("[DialogQuestion.show] onCancel called")
-            dialog.clear()
-            resolve({ answers: {}, cancelled: true })
-          }}
-        />
-      ),
-      () => {
-        console.log("[DialogQuestion.show] onClose callback called")
-        resolve({ answers: {}, cancelled: true })
-      },
-    )
-  })
-}
-
-// Helper functions
-function formatAnswerPreview(item: Question.QuestionItem, answer?: Answer): string {
-  if (!answer || answer.value === undefined || answer.value === null) {
-    return "(not answered)"
-  }
-
-  if (item.type === "confirm") {
-    return answer.value ? "Yes" : "No"
-  }
-
-  if (item.type === "multi-select" && Array.isArray(answer.value)) {
-    if (answer.value.length === 0) return "(none selected)"
-    const labels = answer.value
-      .map((v) => item.options?.find((o) => o.value === v)?.label ?? v)
-      .slice(0, 2)
-      .join(", ")
-    if (answer.value.length > 2) {
-      return `${labels} +${answer.value.length - 2} more`
-    }
-    return labels
-  }
-
-  if (item.type === "select" && typeof answer.value === "string") {
-    const option = item.options?.find((o) => o.value === answer.value)
-    return option?.label ?? answer.value
-  }
-
-  if (typeof answer.value === "string") {
-    return truncate(answer.value, 40)
-  }
-
-  return String(answer.value)
-}
-
-function truncate(str: string, maxLength: number): string {
-  if (str.length <= maxLength) return str
-  return str.slice(0, maxLength - 3) + "..."
-}
+export { DialogQuestion } from "./dialog-question/index"
+export type { Answer, Answers, QuestionDialogProps, SingleQuestionProps } from "./dialog-question/types"
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-comment.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-comment.tsx
new file mode 100644
index 00000000000..70c5e41a054
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-comment.tsx
@@ -0,0 +1,57 @@
+import { TextareaRenderable, TextAttributes } from "@opentui/core"
+import { useTheme } from "@tui/context/theme"
+import { onMount } from "solid-js"
+import { useDialog } from "@tui/ui/dialog"
+
+interface DialogQuestionCommentProps {
+  value?: string
+  onSave: (comment: string) => void
+  onCancel: () => void
+}
+
+export function DialogQuestionComment(props: DialogQuestionCommentProps) {
+  const dialog = useDialog()
+  const { theme } = useTheme()
+  let textarea: TextareaRenderable
+
+  onMount(() => {
+    dialog.setSize("medium")
+    setTimeout(() => {
+      textarea.focus()
+      textarea.gotoLineEnd()
+    }, 1)
+  })
+
+  return (
+    <box paddingLeft={2} paddingRight={2} gap={1}>
+      <box flexDirection="row" justifyContent="space-between">
+        <text attributes={TextAttributes.BOLD} fg={theme.text}>
+          Add Comment
+        </text>
+        <text fg={theme.textMuted}>esc</text>
+      </box>
+      <box gap={1}>
+        <text fg={theme.textMuted}>Add additional context to your answer:</text>
+        <textarea
+          onSubmit={() => props.onSave(textarea.plainText)}
+          height={4}
+          keyBindings={[{ name: "return", action: "submit" }]}
+          ref={(val: TextareaRenderable) => (textarea = val)}
+          initialValue={props.value ?? ""}
+          placeholder="Optional comment..."
+          textColor={theme.text}
+          focusedTextColor={theme.text}
+          cursorColor={theme.text}
+        />
+      </box>
+      <box paddingBottom={1} gap={1} flexDirection="row">
+        <text>
+          <span style={{ fg: theme.text }}>
+            <b>enter</b>{" "}
+          </span>
+          <span style={{ fg: theme.textMuted }}>save</span>
+        </text>
+      </box>
+    </box>
+  )
+}
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-confirm.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-confirm.tsx
new file mode 100644
index 00000000000..945e0b2ec45
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-confirm.tsx
@@ -0,0 +1,161 @@
+import { TextAttributes } from "@opentui/core"
+import { useTheme, selectedForeground } from "@tui/context/theme"
+import { createMemo, createSignal, onMount, Show } from "solid-js"
+import { useKeyboard } from "@opentui/solid"
+import { useDialog } from "@tui/ui/dialog"
+import { DialogQuestionComment } from "./dialog-question-comment"
+import { truncate } from "./utils"
+import type { SingleQuestionProps } from "./types"
+
+export function DialogQuestionConfirm(props: SingleQuestionProps) {
+  const dialog = useDialog()
+  const { theme } = useTheme()
+  const [selected, setSelected] = createSignal<boolean | null>(
+    typeof props.currentAnswer?.value === "boolean" ? props.currentAnswer.value : null,
+  )
+  const [comment, setComment] = createSignal<string | undefined>(props.currentAnswer?.comment)
+
+  onMount(() => {
+    dialog.setSize("medium")
+  })
+
+  function openComment() {
+    dialog.push(() => (
+      <DialogQuestionComment
+        value={comment()}
+        onSave={(c) => {
+          setComment(c)
+          dialog.pop()
+        }}
+        onCancel={() => dialog.pop()}
+      />
+    ))
+  }
+
+  function confirmSelection() {
+    if (selected() !== null) {
+      props.onAnswer({ value: selected(), comment: comment() })
+    }
+  }
+
+  function submitAll() {
+    if (selected() !== null) {
+      props.onSubmitAll({ value: selected(), comment: comment() })
+    }
+  }
+
+  useKeyboard((evt) => {
+    if (evt.name === "up" || evt.name === "left" || (evt.ctrl && evt.name === "p")) {
+      setSelected(true)
+      evt.preventDefault()
+    }
+    if (evt.name === "down" || evt.name === "right" || (evt.ctrl && evt.name === "n")) {
+      setSelected(false)
+      evt.preventDefault()
+    }
+    if (evt.name === "return" && !evt.ctrl) {
+      confirmSelection()
+      evt.preventDefault()
+    }
+    if (evt.ctrl && evt.name === "return") {
+      submitAll()
+      evt.preventDefault()
+    }
+    if (evt.name === "c" && !evt.ctrl) {
+      openComment()
+      evt.preventDefault()
+    }
+    if (evt.name === "y") {
+      setSelected(true)
+      evt.preventDefault()
+    }
+    if (evt.name === "n") {
+      setSelected(false)
+      evt.preventDefault()
+    }
+  })
+
+  const defaultHint = createMemo(() => {
+    if (typeof props.item.default === "boolean") {
+      return props.item.default ? "Yes" : "No"
+    }
+    return undefined
+  })
+
+  return (
+    <box gap={1} paddingBottom={1}>
+      <box paddingLeft={4} paddingRight={4}>
+        <box flexDirection="row" justifyContent="space-between">
+          <text fg={theme.text} attributes={TextAttributes.BOLD}>
+            {props.item.question}
+          </text>
+          <text fg={theme.textMuted}>esc</text>
+        </box>
+        <Show when={defaultHint()}>
+          <text fg={theme.textMuted}>Default: {defaultHint()}</text>
+        </Show>
+      </box>
+      <box paddingLeft={3} paddingRight={3} flexDirection="row" gap={2}>
+        <box
+          paddingLeft={2}
+          paddingRight={2}
+          backgroundColor={selected() === true ? theme.primary : undefined}
+          onMouseUp={() => {
+            setSelected(true)
+            confirmSelection()
+          }}
+        >
+          <text
+            fg={selected() === true ? selectedForeground(theme) : theme.text}
+            attributes={selected() === true ? TextAttributes.BOLD : undefined}
+          >
+            Yes
+          </text>
+        </box>
+        <box
+          paddingLeft={2}
+          paddingRight={2}
+          backgroundColor={selected() === false ? theme.primary : undefined}
+          onMouseUp={() => {
+            setSelected(false)
+            confirmSelection()
+          }}
+        >
+          <text
+            fg={selected() === false ? selectedForeground(theme) : theme.text}
+            attributes={selected() === false ? TextAttributes.BOLD : undefined}
+          >
+            No
+          </text>
+        </box>
+      </box>
+      <Show when={comment()}>
+        <box paddingLeft={4} paddingRight={4}>
+          <text fg={theme.textMuted}>
+            {"\uD83D\uDCAC"} "{truncate(comment()!, 40)}"
+          </text>
+        </box>
+      </Show>
+      <box paddingRight={2} paddingLeft={4} flexDirection="row" gap={2} flexShrink={0} paddingTop={1}>
+        <text>
+          <span style={{ fg: theme.text }}>
+            <b>y/n</b>{" "}
+          </span>
+          <span style={{ fg: theme.textMuted }}>select</span>
+        </text>
+        <text>
+          <span style={{ fg: theme.text }}>
+            <b>enter</b>{" "}
+          </span>
+          <span style={{ fg: theme.textMuted }}>confirm</span>
+        </text>
+        <text>
+          <span style={{ fg: theme.text }}>
+            <b>c</b>{" "}
+          </span>
+          <span style={{ fg: theme.textMuted }}>comment</span>
+        </text>
+      </box>
+    </box>
+  )
+}
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-multi-select.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-multi-select.tsx
new file mode 100644
index 00000000000..c787e6b5537
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-multi-select.tsx
@@ -0,0 +1,106 @@
+import { useTheme } from "@tui/context/theme"
+import { createEffect, createMemo, createSignal, onMount, Show } from "solid-js"
+import { createStore } from "solid-js/store"
+import { useDialog } from "@tui/ui/dialog"
+import { DialogSelect, type DialogSelectOption } from "@tui/ui/dialog-select"
+import { DialogQuestionComment } from "./dialog-question-comment"
+import { truncate } from "./utils"
+import type { SingleQuestionProps } from "./types"
+
+export function DialogQuestionMultiSelect(props: SingleQuestionProps) {
+  const dialog = useDialog()
+  const { theme } = useTheme()
+  const [checked, setChecked] = createStore<Record<string, boolean>>({})
+  const [comment, setComment] = createSignal<string | undefined>(props.currentAnswer?.comment)
+
+  const sortedOptions = createMemo(() => {
+    const opts = props.item.options ?? []
+    return [...opts].sort((a, b) => (b.recommended ? 1 : 0) - (a.recommended ? 1 : 0))
+  })
+
+  createEffect(() => {
+    if (Array.isArray(props.currentAnswer?.value)) {
+      for (const v of props.currentAnswer.value) {
+        setChecked(v, true)
+      }
+    }
+  })
+
+  onMount(() => {
+    dialog.setSize("medium")
+  })
+
+  function openComment() {
+    dialog.push(() => (
+      <DialogQuestionComment
+        value={comment()}
+        onSave={(c) => {
+          setComment(c)
+          dialog.pop()
+        }}
+        onCancel={() => dialog.pop()}
+      />
+    ))
+  }
+
+  function getSelectedValues(): string[] {
+    return sortedOptions()
+      .filter((o) => checked[o.value])
+      .map((o) => o.value)
+  }
+
+  function confirmSelection() {
+    props.onAnswer({ value: getSelectedValues(), comment: comment() })
+  }
+
+  function submitAll() {
+    props.onSubmitAll({ value: getSelectedValues(), comment: comment() })
+  }
+
+  const selectOptions = createMemo<DialogSelectOption<{ value: string; label: string; recommended?: boolean }>[]>(() =>
+    sortedOptions().map((option) => ({
+      title: option.label,
+      value: option,
+      footer: checked[option.value] ? "☑" : "☐",
+      onSelect: () => {},
+    })),
+  )
+
+  const selectedCount = createMemo(() => getSelectedValues().length)
+
+  return (
+    <>
+      <box paddingLeft={4} paddingRight={4} paddingTop={1}>
+        <text fg={theme.textMuted}>{selectedCount()} selected</text>
+      </box>
+      <DialogSelect
+        title={props.item.question}
+        options={selectOptions()}
+        hideSearch={true}
+        onSelect={() => confirmSelection()}
+        keybind={[
+          {
+            keybind: { name: "space", ctrl: false, meta: false, shift: false, super: false, leader: false },
+            title: "toggle",
+            onTrigger: (option) => setChecked(option.value.value, !checked[option.value.value]),
+          },
+          {
+            keybind: { name: "m", ctrl: false, meta: false, shift: false, super: false, leader: false },
+            title: "add comment",
+            onTrigger: () => openComment(),
+          },
+          {
+            keybind: { name: "s", ctrl: false, meta: false, shift: false, super: false, leader: false },
+            title: "submit all",
+            onTrigger: () => submitAll(),
+          },
+        ]}
+      />
+      <Show when={comment()}>
+        <box paddingLeft={4} paddingRight={4}>
+          <text fg={theme.textMuted}>💬 "{truncate(comment()!, 40)}"</text>
+        </box>
+      </Show>
+    </>
+  )
+}
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-select.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-select.tsx
new file mode 100644
index 00000000000..85e6cf3cbad
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-select.tsx
@@ -0,0 +1,95 @@
+import { useTheme } from "@tui/context/theme"
+import { createMemo, createSignal, onMount, Show } from "solid-js"
+import { useDialog } from "@tui/ui/dialog"
+import { DialogSelect, type DialogSelectOption } from "@tui/ui/dialog-select"
+import { DialogQuestionComment } from "./dialog-question-comment"
+import { truncate } from "./utils"
+import type { SingleQuestionProps } from "./types"
+
+export function DialogQuestionSelect(props: SingleQuestionProps) {
+  const dialog = useDialog()
+  const { theme } = useTheme()
+  const [comment, setComment] = createSignal<string | undefined>(props.currentAnswer?.comment)
+
+  const sortedOptions = createMemo(() => {
+    const opts = props.item.options ?? []
+    return [...opts].sort((a, b) => (b.recommended ? 1 : 0) - (a.recommended ? 1 : 0))
+  })
+
+  const currentValue = createMemo(() => props.currentAnswer?.value)
+
+  onMount(() => {
+    dialog.setSize("medium")
+  })
+
+  function openComment() {
+    dialog.push(() => (
+      <DialogQuestionComment
+        value={comment()}
+        onSave={(c) => {
+          setComment(c)
+          dialog.pop()
+        }}
+        onCancel={() => dialog.pop()}
+      />
+    ))
+  }
+
+  function confirmSelection(option: { value: string; label: string; recommended?: boolean }) {
+    props.onAnswer({ value: option.value, comment: comment() })
+  }
+
+  function submitAll(option: { value: string; label: string; recommended?: boolean }) {
+    props.onSubmitAll({ value: option.value, comment: comment() })
+  }
+
+  const selectOptions = createMemo<DialogSelectOption<{ value: string; label: string; recommended?: boolean }>[]>(() =>
+    sortedOptions().map((option) => ({
+      title: option.label,
+      value: option,
+      footer: option.recommended ? "(Recommended)" : undefined,
+      onSelect: () => confirmSelection(option),
+    })),
+  )
+
+  const defaultHint = createMemo(() => {
+    if (typeof props.item.default === "string") {
+      const opt = props.item.options?.find((o) => o.value === props.item.default)
+      return opt?.label
+    }
+    return undefined
+  })
+
+  return (
+    <>
+      <Show when={defaultHint()}>
+        <box paddingLeft={4} paddingRight={4} paddingTop={1}>
+          <text fg={theme.textMuted}>Default: {defaultHint()}</text>
+        </box>
+      </Show>
+      <DialogSelect
+        title={props.item.question}
+        options={selectOptions()}
+        current={sortedOptions().find((o) => o.value === currentValue())}
+        hideSearch={true}
+        keybind={[
+          {
+            keybind: { name: "m", ctrl: false, meta: false, shift: false, super: false, leader: false },
+            title: "add comment",
+            onTrigger: () => openComment(),
+          },
+          {
+            keybind: { name: "s", ctrl: false, meta: false, shift: false, super: false, leader: false },
+            title: "submit all",
+            onTrigger: (option) => submitAll(option.value),
+          },
+        ]}
+      />
+      <Show when={comment()}>
+        <box paddingLeft={4} paddingRight={4}>
+          <text fg={theme.textMuted}>💬 "{truncate(comment()!, 40)}"</text>
+        </box>
+      </Show>
+    </>
+  )
+}
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-text.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-text.tsx
new file mode 100644
index 00000000000..bfb19bccdfb
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-text.tsx
@@ -0,0 +1,81 @@
+import { TextareaRenderable, TextAttributes } from "@opentui/core"
+import { useTheme } from "@tui/context/theme"
+import { createMemo, onMount } from "solid-js"
+import { useKeyboard } from "@opentui/solid"
+import { useDialog } from "@tui/ui/dialog"
+import type { SingleQuestionProps } from "./types"
+
+export function DialogQuestionText(props: SingleQuestionProps) {
+  const dialog = useDialog()
+  const { theme } = useTheme()
+  let textarea: TextareaRenderable
+
+  onMount(() => {
+    dialog.setSize("medium")
+    setTimeout(() => {
+      textarea.focus()
+    }, 1)
+  })
+
+  function confirmText() {
+    const value = textarea.plainText.trim()
+    props.onAnswer({ value: value || null })
+  }
+
+  function submitAll() {
+    const value = textarea.plainText.trim()
+    props.onSubmitAll({ value: value || null })
+  }
+
+  useKeyboard((evt) => {
+    if (evt.ctrl && evt.name === "return") {
+      submitAll()
+      evt.preventDefault()
+    }
+  })
+
+  const placeholder = createMemo(() => {
+    if (typeof props.item.default === "string") {
+      return props.item.default
+    }
+    return "Enter your response..."
+  })
+
+  return (
+    <box paddingLeft={2} paddingRight={2} gap={1}>
+      <box flexDirection="row" justifyContent="space-between">
+        <text attributes={TextAttributes.BOLD} fg={theme.text}>
+          {props.item.question}
+        </text>
+        <text fg={theme.textMuted}>esc</text>
+      </box>
+      <box gap={1}>
+        <textarea
+          onSubmit={confirmText}
+          height={5}
+          keyBindings={[{ name: "return", action: "submit" }]}
+          ref={(val: TextareaRenderable) => (textarea = val)}
+          initialValue={typeof props.currentAnswer?.value === "string" ? props.currentAnswer.value : ""}
+          placeholder={placeholder()}
+          textColor={theme.text}
+          focusedTextColor={theme.text}
+          cursorColor={theme.text}
+        />
+      </box>
+      <box paddingBottom={1} gap={1} flexDirection="row">
+        <text>
+          <span style={{ fg: theme.text }}>
+            <b>enter</b>{" "}
+          </span>
+          <span style={{ fg: theme.textMuted }}>submit</span>
+        </text>
+        <text>
+          <span style={{ fg: theme.text }}>
+            <b>ctrl+enter</b>{" "}
+          </span>
+          <span style={{ fg: theme.textMuted }}>submit all</span>
+        </text>
+      </box>
+    </box>
+  )
+}
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/index.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/index.tsx
new file mode 100644
index 00000000000..d25020412ed
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/index.tsx
@@ -0,0 +1,119 @@
+import { createMemo, onMount } from "solid-js"
+import { createStore } from "solid-js/store"
+import { useKeyboard } from "@opentui/solid"
+import { useDialog, type DialogContext } from "@tui/ui/dialog"
+import { DialogSelect, type DialogSelectOption } from "@tui/ui/dialog-select"
+import type { Question } from "@/question"
+import { DialogQuestionSelect } from "./dialog-question-select"
+import { DialogQuestionMultiSelect } from "./dialog-question-multi-select"
+import { DialogQuestionConfirm } from "./dialog-question-confirm"
+import { DialogQuestionText } from "./dialog-question-text"
+import { formatAnswerPreview, truncate } from "./utils"
+import type { QuestionDialogProps, Answers } from "./types"
+
+export function DialogQuestion(props: QuestionDialogProps) {
+  const dialog = useDialog()
+  const [answers, setAnswers] = createStore<Answers>({})
+
+  const questions = () => props.question.questions
+  const answeredCount = () =>
+    Object.keys(answers).filter((k) => answers[k]?.value !== undefined && answers[k]?.value !== null).length
+
+  console.log("[DialogQuestion] Mounting with", questions().length, "questions")
+
+  onMount(() => {
+    console.log("[DialogQuestion] onMount called")
+    dialog.setSize("medium")
+  })
+
+  function openQuestion(item: Question.QuestionItem) {
+    const Component = {
+      select: DialogQuestionSelect,
+      "multi-select": DialogQuestionMultiSelect,
+      confirm: DialogQuestionConfirm,
+      text: DialogQuestionText,
+    }[item.type]
+
+    dialog.push(() => (
+      <Component
+        item={item}
+        currentAnswer={answers[item.id]}
+        onAnswer={(answer) => {
+          setAnswers(item.id, answer)
+          dialog.pop()
+        }}
+        onCancel={() => dialog.pop()}
+        onSubmitAll={(answer) => {
+          setAnswers(item.id, answer)
+          submit({ ...answers, [item.id]: answer })
+        }}
+      />
+    ))
+  }
+
+  function submit(finalAnswers?: Answers) {
+    props.onSubmit(finalAnswers ?? answers)
+  }
+
+  const selectOptions = createMemo<DialogSelectOption<Question.QuestionItem>[]>(() =>
+    questions().map((item) => {
+      const answer = answers[item.id]
+      const answerPreview = formatAnswerPreview(item, answer)
+      const comment = answer?.comment ? ` 💬 "${truncate(answer.comment, 30)}"` : ""
+
+      return {
+        title: item.question,
+        value: item,
+        description: answerPreview + comment,
+        onSelect: () => openQuestion(item),
+      }
+    }),
+  )
+
+  useKeyboard((evt) => {
+    if (questions().length === 1) return
+    if (evt.ctrl && evt.name === "return") {
+      submit()
+      evt.preventDefault()
+    }
+  })
+
+  return (
+    <DialogSelect
+      title={`Questions (${answeredCount()}/${questions().length} answered)`}
+      options={selectOptions()}
+      onSelect={(option) => option.onSelect?.(dialog)}
+      hideSearch={true}
+    />
+  )
+}
+
+DialogQuestion.show = (
+  dialog: DialogContext,
+  question: Question.Info,
+): Promise<{ answers: Answers; cancelled: boolean }> => {
+  console.log("[DialogQuestion.show] Called with question:", question.id, "questions count:", question.questions.length)
+  return new Promise((resolve) => {
+    dialog.replace(
+      () => (
+        <DialogQuestion
+          question={question}
+          onSubmit={(answers) => {
+            console.log("[DialogQuestion.show] onSubmit called")
+            dialog.clear()
+            resolve({ answers, cancelled: false })
+          }}
+          onCancel={() => {
+            console.log("[DialogQuestion.show] onCancel called")
+            dialog.clear()
+            resolve({ answers: {}, cancelled: true })
+          }}
+        />
+      ),
+      () => {
+        console.log("[DialogQuestion.show] onClose callback called")
+        resolve({ answers: {}, cancelled: true })
+      },
+    )
+  })
+}
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/types.ts b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/types.ts
new file mode 100644
index 00000000000..a4a5b5e0bcb
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/types.ts
@@ -0,0 +1,22 @@
+import type { Question } from "@/question"
+
+export interface Answer {
+  value: string | string[] | boolean | null
+  comment?: string
+}
+
+export type Answers = Record<string, Answer>
+
+export interface QuestionDialogProps {
+  question: Question.Info
+  onSubmit: (answers: Answers) => void
+  onCancel: () => void
+}
+
+export interface SingleQuestionProps {
+  item: Question.QuestionItem
+  currentAnswer?: Answer
+  onAnswer: (answer: Answer) => void
+  onCancel: () => void
+  onSubmitAll: (answer: Answer) => void
+}
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/utils.ts b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/utils.ts
new file mode 100644
index 00000000000..b7bcd383614
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/utils.ts
@@ -0,0 +1,40 @@
+import type { Question } from "@/question"
+import type { Answer } from "./types"
+
+export function formatAnswerPreview(item: Question.QuestionItem, answer?: Answer): string {
+  if (!answer || answer.value === undefined || answer.value === null) {
+    return "(not answered)"
+  }
+
+  if (item.type === "confirm") {
+    return answer.value ? "Yes" : "No"
+  }
+
+  if (item.type === "multi-select" && Array.isArray(answer.value)) {
+    if (answer.value.length === 0) return "(none selected)"
+    const labels = answer.value
+      .map((v) => item.options?.find((o) => o.value === v)?.label ?? v)
+      .slice(0, 2)
+      .join(", ")
+    if (answer.value.length > 2) {
+      return `${labels} +${answer.value.length - 2} more`
+    }
+    return labels
+  }
+
+  if (item.type === "select" && typeof answer.value === "string") {
+    const option = item.options?.find((o) => o.value === answer.value)
+    return option?.label ?? answer.value
+  }
+
+  if (typeof answer.value === "string") {
+    return truncate(answer.value, 40)
+  }
+
+  return String(answer.value)
+}
+
+export function truncate(str: string, maxLength: number): string {
+  if (str.length <= maxLength) return str
+  return str.slice(0, maxLength - 3) + "..."
+}

From e5bb595abd46431612123e8747fd13c0d5699439 Mon Sep 17 00:00:00 2001
From: dbpolito <danielbpolito@gmail.com>
Date: Mon, 15 Dec 2025 09:11:43 -0300
Subject: [PATCH 03/17] WIP

---
 .../src/cli/cmd/tui/ui/dialog-question.tsx    | 645 +++++++++++++++++-
 .../dialog-question-comment.tsx               |  57 --
 .../dialog-question-confirm.tsx               | 161 -----
 .../dialog-question-multi-select.tsx          | 106 ---
 .../dialog-question-select.tsx                |  95 ---
 .../dialog-question/dialog-question-text.tsx  |  81 ---
 .../cli/cmd/tui/ui/dialog-question/index.tsx  | 119 ----
 .../cli/cmd/tui/ui/dialog-question/types.ts   |  22 -
 .../cli/cmd/tui/ui/dialog-question/utils.ts   |  40 --
 9 files changed, 643 insertions(+), 683 deletions(-)
 delete mode 100644 packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-comment.tsx
 delete mode 100644 packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-confirm.tsx
 delete mode 100644 packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-multi-select.tsx
 delete mode 100644 packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-select.tsx
 delete mode 100644 packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-text.tsx
 delete mode 100644 packages/opencode/src/cli/cmd/tui/ui/dialog-question/index.tsx
 delete mode 100644 packages/opencode/src/cli/cmd/tui/ui/dialog-question/types.ts
 delete mode 100644 packages/opencode/src/cli/cmd/tui/ui/dialog-question/utils.ts

diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
index 9f1b72073be..f098c6e68d1 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
@@ -1,2 +1,643 @@
-export { DialogQuestion } from "./dialog-question/index"
-export type { Answer, Answers, QuestionDialogProps, SingleQuestionProps } from "./dialog-question/types"
+import { TextareaRenderable, TextAttributes } from "@opentui/core"
+import { useTheme, selectedForeground } from "@tui/context/theme"
+import { createEffect, createMemo, createSignal, onMount, Show } from "solid-js"
+import { createStore } from "solid-js/store"
+import { useKeyboard } from "@opentui/solid"
+import { useDialog, type DialogContext } from "@tui/ui/dialog"
+import { DialogSelect, type DialogSelectOption } from "@tui/ui/dialog-select"
+import { DialogPrompt } from "@tui/ui/dialog-prompt"
+import type { Question } from "@/question"
+
+// Types
+interface Answer {
+  value: string | string[] | boolean | null
+  comment?: string
+}
+
+type Answers = Record<string, Answer>
+
+interface QuestionDialogProps {
+  question: Question.Info
+  onSubmit: (answers: Answers) => void
+  onCancel: () => void
+  initialAnswers?: Answers
+}
+
+interface SingleQuestionProps {
+  item: Question.QuestionItem
+  currentAnswer?: Answer
+  onAnswer: (answer: Answer) => void
+  onCancel: () => void
+  onSubmitAll: (answer: Answer) => void
+}
+
+// Main DialogQuestion - shows list of all questions
+export function DialogQuestion(props: QuestionDialogProps) {
+  const dialog = useDialog()
+  const { theme } = useTheme()
+  const [answers, setAnswers] = createStore<Answers>(props.initialAnswers ?? {})
+
+  const questions = () => props.question.questions
+  const answeredCount = () =>
+    Object.keys(answers).filter((k) => answers[k]?.value !== undefined && answers[k]?.value !== null).length
+
+  console.log("[DialogQuestion] Component CREATED/RENDERED with", questions().length, "questions")
+  console.log("[DialogQuestion] Current answers store:", answers)
+
+  onMount(() => {
+    console.log("[DialogQuestion] onMount called")
+    dialog.setSize("medium")
+  })
+
+  function openQuestion(item: Question.QuestionItem) {
+    console.log("[openQuestion] Opening question:", item.id, "current stack length:", dialog.stack.length)
+    const Component = {
+      select: DialogQuestionSelect,
+      "multi-select": DialogQuestionMultiSelect,
+      confirm: DialogQuestionConfirm,
+      text: DialogQuestionText,
+    }[item.type]
+
+    dialog.push(() => (
+      <Component
+        item={item}
+        currentAnswer={answers[item.id]}
+        onAnswer={(answer) => {
+          console.log(`[onAnswer] Setting answer for ${item.id}:`, answer)
+          setAnswers(item.id, answer)
+          // Sync to initialAnswers if provided
+          if (props.initialAnswers) {
+            props.initialAnswers[item.id] = answer
+          }
+          console.log("[onAnswer] After setAnswers, answers:", answers, "keys:", Object.keys(answers))
+          console.log("[onAnswer] About to pop dialog, current stack length:", dialog.stack.length)
+          dialog.pop()
+          console.log("[onAnswer] After pop, stack length:", dialog.stack.length)
+        }}
+        onCancel={() => dialog.pop()}
+        onSubmitAll={(answer) => {
+          setAnswers(item.id, answer)
+          submit({ ...answers, [item.id]: answer })
+        }}
+      />
+    ))
+    console.log("[openQuestion] After push, stack length:", dialog.stack.length)
+  }
+
+  function submit(finalAnswers?: Answers) {
+    props.onSubmit(finalAnswers ?? answers)
+  }
+
+  // Convert questions to DialogSelect options
+  const selectOptions = createMemo<DialogSelectOption<Question.QuestionItem>[]>(() => {
+    // Access all keys to subscribe to any changes
+    const answerKeys = Object.keys(answers)
+    console.log("[selectOptions] memo running, answerKeys:", answerKeys, "answers:", answers)
+
+    return questions().map((item) => {
+      const answer = answers[item.id]
+      const answerPreview = formatAnswerPreview(item, answer)
+      const comment = answer?.comment ? ` 💬 "${truncate(answer.comment, 30)}"` : ""
+      console.log(`[selectOptions] item ${item.id}: answer=${JSON.stringify(answer)}, preview="${answerPreview}"`)
+
+      return {
+        title: item.question,
+        value: item,
+        description: answerPreview + comment,
+        onSelect: (ctx) => openQuestion(item),
+      }
+    })
+  })
+
+  // Handle submission with ctrl+enter keybind
+  useKeyboard((evt) => {
+    if (evt.ctrl && evt.name === "return") {
+      console.log("[DialogQuestion] Ctrl+Enter pressed, submitting answers:", answers)
+      submit()
+      evt.preventDefault()
+    }
+  })
+
+  return (
+    <DialogSelect
+      title={`Questions (${answeredCount()}/${questions().length} answered)`}
+      options={selectOptions()}
+      hideSearch={true}
+      keybind={[
+        {
+          keybind: { name: "return", ctrl: false, meta: false, shift: false, super: false, leader: false },
+          title: "open question",
+          onTrigger: (option) => {
+            if (option.onSelect) option.onSelect(dialog)
+          },
+        },
+        {
+          keybind: { name: "return", ctrl: true, meta: false, shift: false, super: false, leader: false },
+          title: "submit",
+          onTrigger: () => {
+            console.log("[DialogQuestion] Submit keybind triggered")
+            submit()
+          },
+        },
+      ]}
+    />
+  )
+}
+
+// Single Select Question Dialog
+function DialogQuestionSelect(props: SingleQuestionProps) {
+  const dialog = useDialog()
+  const { theme } = useTheme()
+  const [comment, setComment] = createSignal<string | undefined>(props.currentAnswer?.comment)
+
+  // Sort options with recommended first
+  const sortedOptions = createMemo(() => {
+    const opts = props.item.options ?? []
+    return [...opts].sort((a, b) => (b.recommended ? 1 : 0) - (a.recommended ? 1 : 0))
+  })
+
+  // Find current selection value
+  const currentValue = createMemo(() => props.currentAnswer?.value)
+
+  onMount(() => {
+    dialog.setSize("medium")
+  })
+
+  function openComment() {
+    dialog.push(() => (
+      <DialogQuestionComment
+        value={comment()}
+        onSave={(c) => {
+          setComment(c)
+          dialog.pop()
+        }}
+        onCancel={() => dialog.pop()}
+      />
+    ))
+  }
+
+  function confirmSelection(option: { value: string; label: string; recommended?: boolean }) {
+    props.onAnswer({ value: option.value, comment: comment() })
+  }
+
+  function submitAll(option: { value: string; label: string; recommended?: boolean }) {
+    props.onSubmitAll({ value: option.value, comment: comment() })
+  }
+
+  // Convert options to DialogSelectOption format
+  const selectOptions = createMemo<DialogSelectOption<{ value: string; label: string; recommended?: boolean }>[]>(() =>
+    sortedOptions().map((option) => ({
+      title: option.label,
+      value: option,
+      footer: option.recommended ? "(Recommended)" : undefined,
+      onSelect: () => confirmSelection(option),
+    })),
+  )
+
+  // Show default as hint if present
+  const defaultHint = createMemo(() => {
+    if (typeof props.item.default === "string") {
+      const opt = props.item.options?.find((o) => o.value === props.item.default)
+      return opt?.label
+    }
+    return undefined
+  })
+
+  return (
+    <>
+      <Show when={defaultHint()}>
+        <box paddingLeft={4} paddingRight={4} paddingTop={1}>
+          <text fg={theme.textMuted}>Default: {defaultHint()}</text>
+        </box>
+      </Show>
+      <DialogSelect
+        title={props.item.question}
+        options={selectOptions()}
+        current={sortedOptions().find((o) => o.value === currentValue())}
+        hideSearch={true}
+        keybind={[
+          {
+            keybind: { name: "m", ctrl: false, meta: false, shift: false, super: false, leader: false },
+            title: "add comment",
+            onTrigger: () => openComment(),
+          },
+          {
+            keybind: { name: "s", ctrl: false, meta: false, shift: false, super: false, leader: false },
+            title: "submit all",
+            onTrigger: (option) => submitAll(option.value),
+          },
+        ]}
+      />
+      <Show when={comment()}>
+        <box paddingLeft={4} paddingRight={4}>
+          <text fg={theme.textMuted}>💬 "{truncate(comment()!, 40)}"</text>
+        </box>
+      </Show>
+    </>
+  )
+}
+
+// Multi-Select Question Dialog
+function DialogQuestionMultiSelect(props: SingleQuestionProps) {
+  const dialog = useDialog()
+  const { theme } = useTheme()
+  const [checked, setChecked] = createStore<Record<string, boolean>>({})
+  const [comment, setComment] = createSignal<string | undefined>(props.currentAnswer?.comment)
+
+  // Sort options with recommended first
+  const sortedOptions = createMemo(() => {
+    const opts = props.item.options ?? []
+    return [...opts].sort((a, b) => (b.recommended ? 1 : 0) - (a.recommended ? 1 : 0))
+  })
+
+  // Initialize checked state from current answer
+  createEffect(() => {
+    if (Array.isArray(props.currentAnswer?.value)) {
+      for (const v of props.currentAnswer.value) {
+        setChecked(v, true)
+      }
+    }
+  })
+
+  onMount(() => {
+    dialog.setSize("medium")
+  })
+
+  function openComment() {
+    dialog.push(() => (
+      <DialogQuestionComment
+        value={comment()}
+        onSave={(c) => {
+          setComment(c)
+          dialog.pop()
+        }}
+        onCancel={() => dialog.pop()}
+      />
+    ))
+  }
+
+  function getSelectedValues(): string[] {
+    return sortedOptions()
+      .filter((o) => checked[o.value])
+      .map((o) => o.value)
+  }
+
+  function confirmSelection() {
+    props.onAnswer({ value: getSelectedValues(), comment: comment() })
+  }
+
+  function submitAll() {
+    props.onSubmitAll({ value: getSelectedValues(), comment: comment() })
+  }
+
+  // Convert options to DialogSelectOption format
+  const selectOptions = createMemo<DialogSelectOption<{ value: string; label: string; recommended?: boolean }>[]>(() =>
+    sortedOptions().map((option) => ({
+      title: option.label,
+      value: option,
+      footer: checked[option.value] ? "☑" : "☐",
+      onSelect: () => {}, // Don't close on select
+    })),
+  )
+
+  const selectedCount = createMemo(() => getSelectedValues().length)
+
+  return (
+    <>
+      <box paddingLeft={4} paddingRight={4} paddingTop={1}>
+        <text fg={theme.textMuted}>{selectedCount()} selected</text>
+      </box>
+      <DialogSelect
+        title={props.item.question}
+        options={selectOptions()}
+        hideSearch={true}
+        onSelect={() => confirmSelection()}
+        keybind={[
+          {
+            keybind: { name: "space", ctrl: false, meta: false, shift: false, super: false, leader: false },
+            title: "toggle",
+            onTrigger: (option) => setChecked(option.value.value, !checked[option.value.value]),
+          },
+          {
+            keybind: { name: "m", ctrl: false, meta: false, shift: false, super: false, leader: false },
+            title: "add comment",
+            onTrigger: () => openComment(),
+          },
+          {
+            keybind: { name: "s", ctrl: false, meta: false, shift: false, super: false, leader: false },
+            title: "submit all",
+            onTrigger: () => submitAll(),
+          },
+        ]}
+      />
+      <Show when={comment()}>
+        <box paddingLeft={4} paddingRight={4}>
+          <text fg={theme.textMuted}>💬 "{truncate(comment()!, 40)}"</text>
+        </box>
+      </Show>
+    </>
+  )
+
+  function openComment() {
+    dialog.push(() => (
+      <DialogQuestionComment
+        value={comment()}
+        onSave={(c) => {
+          setComment(c)
+          dialog.pop()
+        }}
+        onCancel={() => dialog.pop()}
+      />
+    ))
+  }
+
+  function getSelectedValues(): string[] {
+    return sortedOptions()
+      .filter((o) => checked[o.value])
+      .map((o) => o.value)
+  }
+
+  function confirmSelection() {
+    props.onAnswer({ value: getSelectedValues(), comment: comment() })
+  }
+
+  function submitAll() {
+    props.onSubmitAll({ value: getSelectedValues(), comment: comment() })
+  }
+
+  function CheckboxStatus(props: { value: string }) {
+    const isChecked = () => checked[props.value]
+    return <text fg={isChecked() ? theme.success : theme.textMuted}>{isChecked() ? "☑" : "☐"}</text>
+  }
+}
+
+// Confirm (Yes/No) Question Dialog
+function DialogQuestionConfirm(props: SingleQuestionProps) {
+  const dialog = useDialog()
+  const { theme } = useTheme()
+  const [selected, setSelected] = createSignal<boolean | null>(
+    typeof props.currentAnswer?.value === "boolean" ? props.currentAnswer.value : null,
+  )
+  const [comment, setComment] = createSignal<string | undefined>(props.currentAnswer?.comment)
+
+  onMount(() => {
+    dialog.setSize("medium")
+  })
+
+  function openComment() {
+    dialog.push(() => (
+      <DialogQuestionComment
+        value={comment()}
+        onSave={(c) => {
+          setComment(c)
+          dialog.pop()
+        }}
+        onCancel={() => dialog.pop()}
+      />
+    ))
+  }
+
+  function confirmSelection() {
+    if (selected() !== null) {
+      props.onAnswer({ value: selected(), comment: comment() })
+    }
+  }
+
+  function submitAll() {
+    if (selected() !== null) {
+      props.onSubmitAll({ value: selected(), comment: comment() })
+    }
+  }
+
+  useKeyboard((evt) => {
+    if (evt.name === "up" || evt.name === "left" || (evt.ctrl && evt.name === "p")) {
+      setSelected(true)
+      evt.preventDefault()
+    }
+    if (evt.name === "down" || evt.name === "right" || (evt.ctrl && evt.name === "n")) {
+      setSelected(false)
+      evt.preventDefault()
+    }
+    if (evt.name === "return" && !evt.ctrl) {
+      confirmSelection()
+      evt.preventDefault()
+    }
+    if (evt.ctrl && evt.name === "return") {
+      submitAll()
+      evt.preventDefault()
+    }
+    if (evt.name === "c" && !evt.ctrl) {
+      openComment()
+      evt.preventDefault()
+    }
+    if (evt.name === "y") {
+      setSelected(true)
+      evt.preventDefault()
+    }
+    if (evt.name === "n") {
+      setSelected(false)
+      evt.preventDefault()
+    }
+  })
+
+  // Show default as hint
+  const defaultHint = createMemo(() => {
+    if (typeof props.item.default === "boolean") {
+      return props.item.default ? "Yes" : "No"
+    }
+    return undefined
+  })
+
+  return (
+    <box gap={1} paddingBottom={1}>
+      <box paddingLeft={4} paddingRight={4}>
+        <box flexDirection="row" justifyContent="space-between">
+          <text fg={theme.text} attributes={TextAttributes.BOLD}>
+            {props.item.question}
+          </text>
+          <text fg={theme.textMuted}>esc</text>
+        </box>
+        <Show when={defaultHint()}>
+          <text fg={theme.textMuted}>Default: {defaultHint()}</text>
+        </Show>
+      </box>
+      <box paddingLeft={3} paddingRight={3} flexDirection="row" gap={2}>
+        <box
+          paddingLeft={2}
+          paddingRight={2}
+          backgroundColor={selected() === true ? theme.primary : undefined}
+          onMouseUp={() => {
+            setSelected(true)
+            confirmSelection()
+          }}
+        >
+          <text
+            fg={selected() === true ? selectedForeground(theme) : theme.text}
+            attributes={selected() === true ? TextAttributes.BOLD : undefined}
+          >
+            Yes
+          </text>
+        </box>
+        <box
+          paddingLeft={2}
+          paddingRight={2}
+          backgroundColor={selected() === false ? theme.primary : undefined}
+          onMouseUp={() => {
+            setSelected(false)
+            confirmSelection()
+          }}
+        >
+          <text
+            fg={selected() === false ? selectedForeground(theme) : theme.text}
+            attributes={selected() === false ? TextAttributes.BOLD : undefined}
+          >
+            No
+          </text>
+        </box>
+      </box>
+      <Show when={comment()}>
+        <box paddingLeft={4} paddingRight={4}>
+          <text fg={theme.textMuted}>
+            {"\uD83D\uDCAC"} "{truncate(comment()!, 40)}"
+          </text>
+        </box>
+      </Show>
+      <box paddingRight={2} paddingLeft={4} flexDirection="row" gap={2} flexShrink={0} paddingTop={1}>
+        <text>
+          <span style={{ fg: theme.text }}>
+            <b>y/n</b>{" "}
+          </span>
+          <span style={{ fg: theme.textMuted }}>select</span>
+        </text>
+        <text>
+          <span style={{ fg: theme.text }}>
+            <b>enter</b>{" "}
+          </span>
+          <span style={{ fg: theme.textMuted }}>confirm</span>
+        </text>
+        <text>
+          <span style={{ fg: theme.text }}>
+            <b>c</b>{" "}
+          </span>
+          <span style={{ fg: theme.textMuted }}>comment</span>
+        </text>
+      </box>
+    </box>
+  )
+}
+
+// Text Input Question Dialog
+function DialogQuestionText(props: SingleQuestionProps) {
+  const placeholder = typeof props.item.default === "string" ? props.item.default : "Enter your response..."
+  const initialValue = typeof props.currentAnswer?.value === "string" ? props.currentAnswer.value : ""
+
+  return (
+    <DialogPrompt
+      title={props.item.question}
+      placeholder={placeholder}
+      value={initialValue}
+      onConfirm={(value) => {
+        const trimmedValue = value.trim()
+        props.onAnswer({ value: trimmedValue || null })
+      }}
+      onCancel={() => props.onCancel()}
+    />
+  )
+}
+
+// Comment Dialog (nested)
+function DialogQuestionComment(props: { value?: string; onSave: (comment: string) => void; onCancel: () => void }) {
+  const { theme } = useTheme()
+
+  return (
+    <DialogPrompt
+      title="Add Comment"
+      description={() => <text fg={theme.textMuted}>Add additional context to your answer:</text>}
+      placeholder="Optional comment..."
+      value={props.value}
+      onConfirm={(value) => props.onSave(value)}
+      onCancel={() => props.onCancel()}
+    />
+  )
+}
+
+// Static method to show the dialog
+DialogQuestion.show = (
+  dialog: DialogContext,
+  question: Question.Info,
+): Promise<{ answers: Answers; cancelled: boolean }> => {
+  console.log("[DialogQuestion.show] Called with question:", question.id, "questions count:", question.questions.length)
+  console.log("[DialogQuestion.show] Current stack length:", dialog.stack.length)
+
+  // Create a persistent answers object that will be shared across re-renders
+  const persistentAnswers: Answers = {}
+
+  return new Promise((resolve) => {
+    console.log("[DialogQuestion.show] About to call dialog.replace")
+    dialog.replace(
+      () => {
+        console.log("[DialogQuestion.show] Render function called! Stack length:", dialog.stack.length)
+        return (
+          <DialogQuestion
+            question={question}
+            initialAnswers={persistentAnswers}
+            onSubmit={(answers) => {
+              console.log("[DialogQuestion.show] onSubmit called")
+              dialog.clear()
+              resolve({ answers, cancelled: false })
+            }}
+            onCancel={() => {
+              console.log("[DialogQuestion.show] onCancel called")
+              dialog.clear()
+              resolve({ answers: {}, cancelled: true })
+            }}
+          />
+        )
+      },
+      () => {
+        console.log("[DialogQuestion.show] onClose callback called")
+        resolve({ answers: {}, cancelled: true })
+      },
+    )
+    console.log("[DialogQuestion.show] After dialog.replace, stack length:", dialog.stack.length)
+  })
+}
+
+// Helper functions
+function formatAnswerPreview(item: Question.QuestionItem, answer?: Answer): string {
+  if (!answer || answer.value === undefined || answer.value === null) {
+    return "(not answered)"
+  }
+
+  if (item.type === "confirm") {
+    return answer.value ? "Yes" : "No"
+  }
+
+  if (item.type === "multi-select" && Array.isArray(answer.value)) {
+    if (answer.value.length === 0) return "(none selected)"
+    const labels = answer.value
+      .map((v) => item.options?.find((o) => o.value === v)?.label ?? v)
+      .slice(0, 2)
+      .join(", ")
+    if (answer.value.length > 2) {
+      return `${labels} +${answer.value.length - 2} more`
+    }
+    return labels
+  }
+
+  if (item.type === "select" && typeof answer.value === "string") {
+    const option = item.options?.find((o) => o.value === answer.value)
+    return option?.label ?? answer.value
+  }
+
+  if (typeof answer.value === "string") {
+    return truncate(answer.value, 40)
+  }
+
+  return String(answer.value)
+}
+
+function truncate(str: string, maxLength: number): string {
+  if (str.length <= maxLength) return str
+  return str.slice(0, maxLength - 3) + "..."
+}
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-comment.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-comment.tsx
deleted file mode 100644
index 70c5e41a054..00000000000
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-comment.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { TextareaRenderable, TextAttributes } from "@opentui/core"
-import { useTheme } from "@tui/context/theme"
-import { onMount } from "solid-js"
-import { useDialog } from "@tui/ui/dialog"
-
-interface DialogQuestionCommentProps {
-  value?: string
-  onSave: (comment: string) => void
-  onCancel: () => void
-}
-
-export function DialogQuestionComment(props: DialogQuestionCommentProps) {
-  const dialog = useDialog()
-  const { theme } = useTheme()
-  let textarea: TextareaRenderable
-
-  onMount(() => {
-    dialog.setSize("medium")
-    setTimeout(() => {
-      textarea.focus()
-      textarea.gotoLineEnd()
-    }, 1)
-  })
-
-  return (
-    <box paddingLeft={2} paddingRight={2} gap={1}>
-      <box flexDirection="row" justifyContent="space-between">
-        <text attributes={TextAttributes.BOLD} fg={theme.text}>
-          Add Comment
-        </text>
-        <text fg={theme.textMuted}>esc</text>
-      </box>
-      <box gap={1}>
-        <text fg={theme.textMuted}>Add additional context to your answer:</text>
-        <textarea
-          onSubmit={() => props.onSave(textarea.plainText)}
-          height={4}
-          keyBindings={[{ name: "return", action: "submit" }]}
-          ref={(val: TextareaRenderable) => (textarea = val)}
-          initialValue={props.value ?? ""}
-          placeholder="Optional comment..."
-          textColor={theme.text}
-          focusedTextColor={theme.text}
-          cursorColor={theme.text}
-        />
-      </box>
-      <box paddingBottom={1} gap={1} flexDirection="row">
-        <text>
-          <span style={{ fg: theme.text }}>
-            <b>enter</b>{" "}
-          </span>
-          <span style={{ fg: theme.textMuted }}>save</span>
-        </text>
-      </box>
-    </box>
-  )
-}
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-confirm.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-confirm.tsx
deleted file mode 100644
index 945e0b2ec45..00000000000
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-confirm.tsx
+++ /dev/null
@@ -1,161 +0,0 @@
-import { TextAttributes } from "@opentui/core"
-import { useTheme, selectedForeground } from "@tui/context/theme"
-import { createMemo, createSignal, onMount, Show } from "solid-js"
-import { useKeyboard } from "@opentui/solid"
-import { useDialog } from "@tui/ui/dialog"
-import { DialogQuestionComment } from "./dialog-question-comment"
-import { truncate } from "./utils"
-import type { SingleQuestionProps } from "./types"
-
-export function DialogQuestionConfirm(props: SingleQuestionProps) {
-  const dialog = useDialog()
-  const { theme } = useTheme()
-  const [selected, setSelected] = createSignal<boolean | null>(
-    typeof props.currentAnswer?.value === "boolean" ? props.currentAnswer.value : null,
-  )
-  const [comment, setComment] = createSignal<string | undefined>(props.currentAnswer?.comment)
-
-  onMount(() => {
-    dialog.setSize("medium")
-  })
-
-  function openComment() {
-    dialog.push(() => (
-      <DialogQuestionComment
-        value={comment()}
-        onSave={(c) => {
-          setComment(c)
-          dialog.pop()
-        }}
-        onCancel={() => dialog.pop()}
-      />
-    ))
-  }
-
-  function confirmSelection() {
-    if (selected() !== null) {
-      props.onAnswer({ value: selected(), comment: comment() })
-    }
-  }
-
-  function submitAll() {
-    if (selected() !== null) {
-      props.onSubmitAll({ value: selected(), comment: comment() })
-    }
-  }
-
-  useKeyboard((evt) => {
-    if (evt.name === "up" || evt.name === "left" || (evt.ctrl && evt.name === "p")) {
-      setSelected(true)
-      evt.preventDefault()
-    }
-    if (evt.name === "down" || evt.name === "right" || (evt.ctrl && evt.name === "n")) {
-      setSelected(false)
-      evt.preventDefault()
-    }
-    if (evt.name === "return" && !evt.ctrl) {
-      confirmSelection()
-      evt.preventDefault()
-    }
-    if (evt.ctrl && evt.name === "return") {
-      submitAll()
-      evt.preventDefault()
-    }
-    if (evt.name === "c" && !evt.ctrl) {
-      openComment()
-      evt.preventDefault()
-    }
-    if (evt.name === "y") {
-      setSelected(true)
-      evt.preventDefault()
-    }
-    if (evt.name === "n") {
-      setSelected(false)
-      evt.preventDefault()
-    }
-  })
-
-  const defaultHint = createMemo(() => {
-    if (typeof props.item.default === "boolean") {
-      return props.item.default ? "Yes" : "No"
-    }
-    return undefined
-  })
-
-  return (
-    <box gap={1} paddingBottom={1}>
-      <box paddingLeft={4} paddingRight={4}>
-        <box flexDirection="row" justifyContent="space-between">
-          <text fg={theme.text} attributes={TextAttributes.BOLD}>
-            {props.item.question}
-          </text>
-          <text fg={theme.textMuted}>esc</text>
-        </box>
-        <Show when={defaultHint()}>
-          <text fg={theme.textMuted}>Default: {defaultHint()}</text>
-        </Show>
-      </box>
-      <box paddingLeft={3} paddingRight={3} flexDirection="row" gap={2}>
-        <box
-          paddingLeft={2}
-          paddingRight={2}
-          backgroundColor={selected() === true ? theme.primary : undefined}
-          onMouseUp={() => {
-            setSelected(true)
-            confirmSelection()
-          }}
-        >
-          <text
-            fg={selected() === true ? selectedForeground(theme) : theme.text}
-            attributes={selected() === true ? TextAttributes.BOLD : undefined}
-          >
-            Yes
-          </text>
-        </box>
-        <box
-          paddingLeft={2}
-          paddingRight={2}
-          backgroundColor={selected() === false ? theme.primary : undefined}
-          onMouseUp={() => {
-            setSelected(false)
-            confirmSelection()
-          }}
-        >
-          <text
-            fg={selected() === false ? selectedForeground(theme) : theme.text}
-            attributes={selected() === false ? TextAttributes.BOLD : undefined}
-          >
-            No
-          </text>
-        </box>
-      </box>
-      <Show when={comment()}>
-        <box paddingLeft={4} paddingRight={4}>
-          <text fg={theme.textMuted}>
-            {"\uD83D\uDCAC"} "{truncate(comment()!, 40)}"
-          </text>
-        </box>
-      </Show>
-      <box paddingRight={2} paddingLeft={4} flexDirection="row" gap={2} flexShrink={0} paddingTop={1}>
-        <text>
-          <span style={{ fg: theme.text }}>
-            <b>y/n</b>{" "}
-          </span>
-          <span style={{ fg: theme.textMuted }}>select</span>
-        </text>
-        <text>
-          <span style={{ fg: theme.text }}>
-            <b>enter</b>{" "}
-          </span>
-          <span style={{ fg: theme.textMuted }}>confirm</span>
-        </text>
-        <text>
-          <span style={{ fg: theme.text }}>
-            <b>c</b>{" "}
-          </span>
-          <span style={{ fg: theme.textMuted }}>comment</span>
-        </text>
-      </box>
-    </box>
-  )
-}
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-multi-select.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-multi-select.tsx
deleted file mode 100644
index c787e6b5537..00000000000
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-multi-select.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import { useTheme } from "@tui/context/theme"
-import { createEffect, createMemo, createSignal, onMount, Show } from "solid-js"
-import { createStore } from "solid-js/store"
-import { useDialog } from "@tui/ui/dialog"
-import { DialogSelect, type DialogSelectOption } from "@tui/ui/dialog-select"
-import { DialogQuestionComment } from "./dialog-question-comment"
-import { truncate } from "./utils"
-import type { SingleQuestionProps } from "./types"
-
-export function DialogQuestionMultiSelect(props: SingleQuestionProps) {
-  const dialog = useDialog()
-  const { theme } = useTheme()
-  const [checked, setChecked] = createStore<Record<string, boolean>>({})
-  const [comment, setComment] = createSignal<string | undefined>(props.currentAnswer?.comment)
-
-  const sortedOptions = createMemo(() => {
-    const opts = props.item.options ?? []
-    return [...opts].sort((a, b) => (b.recommended ? 1 : 0) - (a.recommended ? 1 : 0))
-  })
-
-  createEffect(() => {
-    if (Array.isArray(props.currentAnswer?.value)) {
-      for (const v of props.currentAnswer.value) {
-        setChecked(v, true)
-      }
-    }
-  })
-
-  onMount(() => {
-    dialog.setSize("medium")
-  })
-
-  function openComment() {
-    dialog.push(() => (
-      <DialogQuestionComment
-        value={comment()}
-        onSave={(c) => {
-          setComment(c)
-          dialog.pop()
-        }}
-        onCancel={() => dialog.pop()}
-      />
-    ))
-  }
-
-  function getSelectedValues(): string[] {
-    return sortedOptions()
-      .filter((o) => checked[o.value])
-      .map((o) => o.value)
-  }
-
-  function confirmSelection() {
-    props.onAnswer({ value: getSelectedValues(), comment: comment() })
-  }
-
-  function submitAll() {
-    props.onSubmitAll({ value: getSelectedValues(), comment: comment() })
-  }
-
-  const selectOptions = createMemo<DialogSelectOption<{ value: string; label: string; recommended?: boolean }>[]>(() =>
-    sortedOptions().map((option) => ({
-      title: option.label,
-      value: option,
-      footer: checked[option.value] ? "☑" : "☐",
-      onSelect: () => {},
-    })),
-  )
-
-  const selectedCount = createMemo(() => getSelectedValues().length)
-
-  return (
-    <>
-      <box paddingLeft={4} paddingRight={4} paddingTop={1}>
-        <text fg={theme.textMuted}>{selectedCount()} selected</text>
-      </box>
-      <DialogSelect
-        title={props.item.question}
-        options={selectOptions()}
-        hideSearch={true}
-        onSelect={() => confirmSelection()}
-        keybind={[
-          {
-            keybind: { name: "space", ctrl: false, meta: false, shift: false, super: false, leader: false },
-            title: "toggle",
-            onTrigger: (option) => setChecked(option.value.value, !checked[option.value.value]),
-          },
-          {
-            keybind: { name: "m", ctrl: false, meta: false, shift: false, super: false, leader: false },
-            title: "add comment",
-            onTrigger: () => openComment(),
-          },
-          {
-            keybind: { name: "s", ctrl: false, meta: false, shift: false, super: false, leader: false },
-            title: "submit all",
-            onTrigger: () => submitAll(),
-          },
-        ]}
-      />
-      <Show when={comment()}>
-        <box paddingLeft={4} paddingRight={4}>
-          <text fg={theme.textMuted}>💬 "{truncate(comment()!, 40)}"</text>
-        </box>
-      </Show>
-    </>
-  )
-}
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-select.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-select.tsx
deleted file mode 100644
index 85e6cf3cbad..00000000000
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-select.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import { useTheme } from "@tui/context/theme"
-import { createMemo, createSignal, onMount, Show } from "solid-js"
-import { useDialog } from "@tui/ui/dialog"
-import { DialogSelect, type DialogSelectOption } from "@tui/ui/dialog-select"
-import { DialogQuestionComment } from "./dialog-question-comment"
-import { truncate } from "./utils"
-import type { SingleQuestionProps } from "./types"
-
-export function DialogQuestionSelect(props: SingleQuestionProps) {
-  const dialog = useDialog()
-  const { theme } = useTheme()
-  const [comment, setComment] = createSignal<string | undefined>(props.currentAnswer?.comment)
-
-  const sortedOptions = createMemo(() => {
-    const opts = props.item.options ?? []
-    return [...opts].sort((a, b) => (b.recommended ? 1 : 0) - (a.recommended ? 1 : 0))
-  })
-
-  const currentValue = createMemo(() => props.currentAnswer?.value)
-
-  onMount(() => {
-    dialog.setSize("medium")
-  })
-
-  function openComment() {
-    dialog.push(() => (
-      <DialogQuestionComment
-        value={comment()}
-        onSave={(c) => {
-          setComment(c)
-          dialog.pop()
-        }}
-        onCancel={() => dialog.pop()}
-      />
-    ))
-  }
-
-  function confirmSelection(option: { value: string; label: string; recommended?: boolean }) {
-    props.onAnswer({ value: option.value, comment: comment() })
-  }
-
-  function submitAll(option: { value: string; label: string; recommended?: boolean }) {
-    props.onSubmitAll({ value: option.value, comment: comment() })
-  }
-
-  const selectOptions = createMemo<DialogSelectOption<{ value: string; label: string; recommended?: boolean }>[]>(() =>
-    sortedOptions().map((option) => ({
-      title: option.label,
-      value: option,
-      footer: option.recommended ? "(Recommended)" : undefined,
-      onSelect: () => confirmSelection(option),
-    })),
-  )
-
-  const defaultHint = createMemo(() => {
-    if (typeof props.item.default === "string") {
-      const opt = props.item.options?.find((o) => o.value === props.item.default)
-      return opt?.label
-    }
-    return undefined
-  })
-
-  return (
-    <>
-      <Show when={defaultHint()}>
-        <box paddingLeft={4} paddingRight={4} paddingTop={1}>
-          <text fg={theme.textMuted}>Default: {defaultHint()}</text>
-        </box>
-      </Show>
-      <DialogSelect
-        title={props.item.question}
-        options={selectOptions()}
-        current={sortedOptions().find((o) => o.value === currentValue())}
-        hideSearch={true}
-        keybind={[
-          {
-            keybind: { name: "m", ctrl: false, meta: false, shift: false, super: false, leader: false },
-            title: "add comment",
-            onTrigger: () => openComment(),
-          },
-          {
-            keybind: { name: "s", ctrl: false, meta: false, shift: false, super: false, leader: false },
-            title: "submit all",
-            onTrigger: (option) => submitAll(option.value),
-          },
-        ]}
-      />
-      <Show when={comment()}>
-        <box paddingLeft={4} paddingRight={4}>
-          <text fg={theme.textMuted}>💬 "{truncate(comment()!, 40)}"</text>
-        </box>
-      </Show>
-    </>
-  )
-}
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-text.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-text.tsx
deleted file mode 100644
index bfb19bccdfb..00000000000
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/dialog-question-text.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import { TextareaRenderable, TextAttributes } from "@opentui/core"
-import { useTheme } from "@tui/context/theme"
-import { createMemo, onMount } from "solid-js"
-import { useKeyboard } from "@opentui/solid"
-import { useDialog } from "@tui/ui/dialog"
-import type { SingleQuestionProps } from "./types"
-
-export function DialogQuestionText(props: SingleQuestionProps) {
-  const dialog = useDialog()
-  const { theme } = useTheme()
-  let textarea: TextareaRenderable
-
-  onMount(() => {
-    dialog.setSize("medium")
-    setTimeout(() => {
-      textarea.focus()
-    }, 1)
-  })
-
-  function confirmText() {
-    const value = textarea.plainText.trim()
-    props.onAnswer({ value: value || null })
-  }
-
-  function submitAll() {
-    const value = textarea.plainText.trim()
-    props.onSubmitAll({ value: value || null })
-  }
-
-  useKeyboard((evt) => {
-    if (evt.ctrl && evt.name === "return") {
-      submitAll()
-      evt.preventDefault()
-    }
-  })
-
-  const placeholder = createMemo(() => {
-    if (typeof props.item.default === "string") {
-      return props.item.default
-    }
-    return "Enter your response..."
-  })
-
-  return (
-    <box paddingLeft={2} paddingRight={2} gap={1}>
-      <box flexDirection="row" justifyContent="space-between">
-        <text attributes={TextAttributes.BOLD} fg={theme.text}>
-          {props.item.question}
-        </text>
-        <text fg={theme.textMuted}>esc</text>
-      </box>
-      <box gap={1}>
-        <textarea
-          onSubmit={confirmText}
-          height={5}
-          keyBindings={[{ name: "return", action: "submit" }]}
-          ref={(val: TextareaRenderable) => (textarea = val)}
-          initialValue={typeof props.currentAnswer?.value === "string" ? props.currentAnswer.value : ""}
-          placeholder={placeholder()}
-          textColor={theme.text}
-          focusedTextColor={theme.text}
-          cursorColor={theme.text}
-        />
-      </box>
-      <box paddingBottom={1} gap={1} flexDirection="row">
-        <text>
-          <span style={{ fg: theme.text }}>
-            <b>enter</b>{" "}
-          </span>
-          <span style={{ fg: theme.textMuted }}>submit</span>
-        </text>
-        <text>
-          <span style={{ fg: theme.text }}>
-            <b>ctrl+enter</b>{" "}
-          </span>
-          <span style={{ fg: theme.textMuted }}>submit all</span>
-        </text>
-      </box>
-    </box>
-  )
-}
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/index.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/index.tsx
deleted file mode 100644
index d25020412ed..00000000000
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/index.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import { createMemo, onMount } from "solid-js"
-import { createStore } from "solid-js/store"
-import { useKeyboard } from "@opentui/solid"
-import { useDialog, type DialogContext } from "@tui/ui/dialog"
-import { DialogSelect, type DialogSelectOption } from "@tui/ui/dialog-select"
-import type { Question } from "@/question"
-import { DialogQuestionSelect } from "./dialog-question-select"
-import { DialogQuestionMultiSelect } from "./dialog-question-multi-select"
-import { DialogQuestionConfirm } from "./dialog-question-confirm"
-import { DialogQuestionText } from "./dialog-question-text"
-import { formatAnswerPreview, truncate } from "./utils"
-import type { QuestionDialogProps, Answers } from "./types"
-
-export function DialogQuestion(props: QuestionDialogProps) {
-  const dialog = useDialog()
-  const [answers, setAnswers] = createStore<Answers>({})
-
-  const questions = () => props.question.questions
-  const answeredCount = () =>
-    Object.keys(answers).filter((k) => answers[k]?.value !== undefined && answers[k]?.value !== null).length
-
-  console.log("[DialogQuestion] Mounting with", questions().length, "questions")
-
-  onMount(() => {
-    console.log("[DialogQuestion] onMount called")
-    dialog.setSize("medium")
-  })
-
-  function openQuestion(item: Question.QuestionItem) {
-    const Component = {
-      select: DialogQuestionSelect,
-      "multi-select": DialogQuestionMultiSelect,
-      confirm: DialogQuestionConfirm,
-      text: DialogQuestionText,
-    }[item.type]
-
-    dialog.push(() => (
-      <Component
-        item={item}
-        currentAnswer={answers[item.id]}
-        onAnswer={(answer) => {
-          setAnswers(item.id, answer)
-          dialog.pop()
-        }}
-        onCancel={() => dialog.pop()}
-        onSubmitAll={(answer) => {
-          setAnswers(item.id, answer)
-          submit({ ...answers, [item.id]: answer })
-        }}
-      />
-    ))
-  }
-
-  function submit(finalAnswers?: Answers) {
-    props.onSubmit(finalAnswers ?? answers)
-  }
-
-  const selectOptions = createMemo<DialogSelectOption<Question.QuestionItem>[]>(() =>
-    questions().map((item) => {
-      const answer = answers[item.id]
-      const answerPreview = formatAnswerPreview(item, answer)
-      const comment = answer?.comment ? ` 💬 "${truncate(answer.comment, 30)}"` : ""
-
-      return {
-        title: item.question,
-        value: item,
-        description: answerPreview + comment,
-        onSelect: () => openQuestion(item),
-      }
-    }),
-  )
-
-  useKeyboard((evt) => {
-    if (questions().length === 1) return
-    if (evt.ctrl && evt.name === "return") {
-      submit()
-      evt.preventDefault()
-    }
-  })
-
-  return (
-    <DialogSelect
-      title={`Questions (${answeredCount()}/${questions().length} answered)`}
-      options={selectOptions()}
-      onSelect={(option) => option.onSelect?.(dialog)}
-      hideSearch={true}
-    />
-  )
-}
-
-DialogQuestion.show = (
-  dialog: DialogContext,
-  question: Question.Info,
-): Promise<{ answers: Answers; cancelled: boolean }> => {
-  console.log("[DialogQuestion.show] Called with question:", question.id, "questions count:", question.questions.length)
-  return new Promise((resolve) => {
-    dialog.replace(
-      () => (
-        <DialogQuestion
-          question={question}
-          onSubmit={(answers) => {
-            console.log("[DialogQuestion.show] onSubmit called")
-            dialog.clear()
-            resolve({ answers, cancelled: false })
-          }}
-          onCancel={() => {
-            console.log("[DialogQuestion.show] onCancel called")
-            dialog.clear()
-            resolve({ answers: {}, cancelled: true })
-          }}
-        />
-      ),
-      () => {
-        console.log("[DialogQuestion.show] onClose callback called")
-        resolve({ answers: {}, cancelled: true })
-      },
-    )
-  })
-}
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/types.ts b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/types.ts
deleted file mode 100644
index a4a5b5e0bcb..00000000000
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/types.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import type { Question } from "@/question"
-
-export interface Answer {
-  value: string | string[] | boolean | null
-  comment?: string
-}
-
-export type Answers = Record<string, Answer>
-
-export interface QuestionDialogProps {
-  question: Question.Info
-  onSubmit: (answers: Answers) => void
-  onCancel: () => void
-}
-
-export interface SingleQuestionProps {
-  item: Question.QuestionItem
-  currentAnswer?: Answer
-  onAnswer: (answer: Answer) => void
-  onCancel: () => void
-  onSubmitAll: (answer: Answer) => void
-}
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/utils.ts b/packages/opencode/src/cli/cmd/tui/ui/dialog-question/utils.ts
deleted file mode 100644
index b7bcd383614..00000000000
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-question/utils.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import type { Question } from "@/question"
-import type { Answer } from "./types"
-
-export function formatAnswerPreview(item: Question.QuestionItem, answer?: Answer): string {
-  if (!answer || answer.value === undefined || answer.value === null) {
-    return "(not answered)"
-  }
-
-  if (item.type === "confirm") {
-    return answer.value ? "Yes" : "No"
-  }
-
-  if (item.type === "multi-select" && Array.isArray(answer.value)) {
-    if (answer.value.length === 0) return "(none selected)"
-    const labels = answer.value
-      .map((v) => item.options?.find((o) => o.value === v)?.label ?? v)
-      .slice(0, 2)
-      .join(", ")
-    if (answer.value.length > 2) {
-      return `${labels} +${answer.value.length - 2} more`
-    }
-    return labels
-  }
-
-  if (item.type === "select" && typeof answer.value === "string") {
-    const option = item.options?.find((o) => o.value === answer.value)
-    return option?.label ?? answer.value
-  }
-
-  if (typeof answer.value === "string") {
-    return truncate(answer.value, 40)
-  }
-
-  return String(answer.value)
-}
-
-export function truncate(str: string, maxLength: number): string {
-  if (str.length <= maxLength) return str
-  return str.slice(0, maxLength - 3) + "..."
-}

From ae25fc7929c36e9a22fe60699898a4643d355cf6 Mon Sep 17 00:00:00 2001
From: dbpolito <danielbpolito@gmail.com>
Date: Mon, 15 Dec 2025 09:18:47 -0300
Subject: [PATCH 04/17] WIP

---
 .../src/cli/cmd/tui/ui/dialog-question.tsx    | 34 ++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
index f098c6e68d1..eefedd84cbb 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
@@ -85,6 +85,9 @@ export function DialogQuestion(props: QuestionDialogProps) {
   }
 
   function submit(finalAnswers?: Answers) {
+    console.log("[submit] Called with finalAnswers:", finalAnswers)
+    console.log("[submit] Current answers:", answers)
+    console.log("[submit] Will submit:", finalAnswers ?? answers)
     props.onSubmit(finalAnswers ?? answers)
   }
 
@@ -113,8 +116,9 @@ export function DialogQuestion(props: QuestionDialogProps) {
   useKeyboard((evt) => {
     if (evt.ctrl && evt.name === "return") {
       console.log("[DialogQuestion] Ctrl+Enter pressed, submitting answers:", answers)
-      submit()
       evt.preventDefault()
+      submit()
+      return
     }
   })
 
@@ -134,9 +138,10 @@ export function DialogQuestion(props: QuestionDialogProps) {
         {
           keybind: { name: "return", ctrl: true, meta: false, shift: false, super: false, leader: false },
           title: "submit",
-          onTrigger: () => {
-            console.log("[DialogQuestion] Submit keybind triggered")
+          onTrigger: (option) => {
+            console.log("[DialogQuestion] Submit keybind triggered, preventing default")
             submit()
+            return false
           },
         },
       ]}
@@ -573,6 +578,8 @@ DialogQuestion.show = (
   const persistentAnswers: Answers = {}
 
   return new Promise((resolve) => {
+    let resolved = false
+
     console.log("[DialogQuestion.show] About to call dialog.replace")
     dialog.replace(
       () => {
@@ -582,12 +589,24 @@ DialogQuestion.show = (
             question={question}
             initialAnswers={persistentAnswers}
             onSubmit={(answers) => {
-              console.log("[DialogQuestion.show] onSubmit called")
-              dialog.clear()
+              console.log("[DialogQuestion.show] onSubmit called with answers:", answers)
+              if (resolved) {
+                console.log("[DialogQuestion.show] Already resolved, skipping")
+                return
+              }
+              resolved = true
+              console.log("[DialogQuestion.show] Resolving with cancelled: false")
               resolve({ answers, cancelled: false })
+              // Clear dialog after resolving to prevent onClose from firing
+              setTimeout(() => dialog.clear(), 0)
             }}
             onCancel={() => {
               console.log("[DialogQuestion.show] onCancel called")
+              if (resolved) {
+                console.log("[DialogQuestion.show] Already resolved, skipping")
+                return
+              }
+              resolved = true
               dialog.clear()
               resolve({ answers: {}, cancelled: true })
             }}
@@ -596,6 +615,11 @@ DialogQuestion.show = (
       },
       () => {
         console.log("[DialogQuestion.show] onClose callback called")
+        if (resolved) {
+          console.log("[DialogQuestion.show] Already resolved, skipping onClose")
+          return
+        }
+        resolved = true
         resolve({ answers: {}, cancelled: true })
       },
     )

From aaafdc143749f0a57004dffd0a54a014bfb15442 Mon Sep 17 00:00:00 2001
From: dbpolito <danielbpolito@gmail.com>
Date: Mon, 15 Dec 2025 09:30:55 -0300
Subject: [PATCH 05/17] WIP

---
 .../src/cli/cmd/tui/ui/dialog-question.tsx    | 166 +++++++-----------
 1 file changed, 62 insertions(+), 104 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
index eefedd84cbb..296b1a99777 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
@@ -36,21 +36,17 @@ export function DialogQuestion(props: QuestionDialogProps) {
   const dialog = useDialog()
   const { theme } = useTheme()
   const [answers, setAnswers] = createStore<Answers>(props.initialAnswers ?? {})
+  const [selectRef, setSelectRef] = createSignal<any>()
 
   const questions = () => props.question.questions
   const answeredCount = () =>
     Object.keys(answers).filter((k) => answers[k]?.value !== undefined && answers[k]?.value !== null).length
 
-  console.log("[DialogQuestion] Component CREATED/RENDERED with", questions().length, "questions")
-  console.log("[DialogQuestion] Current answers store:", answers)
-
   onMount(() => {
-    console.log("[DialogQuestion] onMount called")
     dialog.setSize("medium")
   })
 
   function openQuestion(item: Question.QuestionItem) {
-    console.log("[openQuestion] Opening question:", item.id, "current stack length:", dialog.stack.length)
     const Component = {
       select: DialogQuestionSelect,
       "multi-select": DialogQuestionMultiSelect,
@@ -63,16 +59,12 @@ export function DialogQuestion(props: QuestionDialogProps) {
         item={item}
         currentAnswer={answers[item.id]}
         onAnswer={(answer) => {
-          console.log(`[onAnswer] Setting answer for ${item.id}:`, answer)
           setAnswers(item.id, answer)
           // Sync to initialAnswers if provided
           if (props.initialAnswers) {
             props.initialAnswers[item.id] = answer
           }
-          console.log("[onAnswer] After setAnswers, answers:", answers, "keys:", Object.keys(answers))
-          console.log("[onAnswer] About to pop dialog, current stack length:", dialog.stack.length)
           dialog.pop()
-          console.log("[onAnswer] After pop, stack length:", dialog.stack.length)
         }}
         onCancel={() => dialog.pop()}
         onSubmitAll={(answer) => {
@@ -81,13 +73,9 @@ export function DialogQuestion(props: QuestionDialogProps) {
         }}
       />
     ))
-    console.log("[openQuestion] After push, stack length:", dialog.stack.length)
   }
 
   function submit(finalAnswers?: Answers) {
-    console.log("[submit] Called with finalAnswers:", finalAnswers)
-    console.log("[submit] Current answers:", answers)
-    console.log("[submit] Will submit:", finalAnswers ?? answers)
     props.onSubmit(finalAnswers ?? answers)
   }
 
@@ -95,13 +83,11 @@ export function DialogQuestion(props: QuestionDialogProps) {
   const selectOptions = createMemo<DialogSelectOption<Question.QuestionItem>[]>(() => {
     // Access all keys to subscribe to any changes
     const answerKeys = Object.keys(answers)
-    console.log("[selectOptions] memo running, answerKeys:", answerKeys, "answers:", answers)
 
     return questions().map((item) => {
       const answer = answers[item.id]
       const answerPreview = formatAnswerPreview(item, answer)
       const comment = answer?.comment ? ` 💬 "${truncate(answer.comment, 30)}"` : ""
-      console.log(`[selectOptions] item ${item.id}: answer=${JSON.stringify(answer)}, preview="${answerPreview}"`)
 
       return {
         title: item.question,
@@ -115,7 +101,6 @@ export function DialogQuestion(props: QuestionDialogProps) {
   // Handle submission with ctrl+enter keybind
   useKeyboard((evt) => {
     if (evt.ctrl && evt.name === "return") {
-      console.log("[DialogQuestion] Ctrl+Enter pressed, submitting answers:", answers)
       evt.preventDefault()
       submit()
       return
@@ -139,7 +124,6 @@ export function DialogQuestion(props: QuestionDialogProps) {
           keybind: { name: "return", ctrl: true, meta: false, shift: false, super: false, leader: false },
           title: "submit",
           onTrigger: (option) => {
-            console.log("[DialogQuestion] Submit keybind triggered, preventing default")
             submit()
             return false
           },
@@ -221,6 +205,17 @@ function DialogQuestionSelect(props: SingleQuestionProps) {
         current={sortedOptions().find((o) => o.value === currentValue())}
         hideSearch={true}
         keybind={[
+          {
+            keybind: { name: "escape", ctrl: false, meta: false, shift: false, super: false, leader: false },
+            title: "back",
+            onTrigger: () => {
+              if (props.currentAnswer) {
+                props.onAnswer(props.currentAnswer)
+              } else {
+                props.onCancel()
+              }
+            },
+          },
           {
             keybind: { name: "m", ctrl: false, meta: false, shift: false, super: false, leader: false },
             title: "add comment",
@@ -318,6 +313,14 @@ function DialogQuestionMultiSelect(props: SingleQuestionProps) {
         hideSearch={true}
         onSelect={() => confirmSelection()}
         keybind={[
+          {
+            keybind: { name: "escape", ctrl: false, meta: false, shift: false, super: false, leader: false },
+            title: "back",
+            onTrigger: () => {
+              const currentAnswer = { value: getSelectedValues(), comment: comment() }
+              props.onAnswer(currentAnswer)
+            },
+          },
           {
             keybind: { name: "space", ctrl: false, meta: false, shift: false, super: false, leader: false },
             title: "toggle",
@@ -342,38 +345,6 @@ function DialogQuestionMultiSelect(props: SingleQuestionProps) {
       </Show>
     </>
   )
-
-  function openComment() {
-    dialog.push(() => (
-      <DialogQuestionComment
-        value={comment()}
-        onSave={(c) => {
-          setComment(c)
-          dialog.pop()
-        }}
-        onCancel={() => dialog.pop()}
-      />
-    ))
-  }
-
-  function getSelectedValues(): string[] {
-    return sortedOptions()
-      .filter((o) => checked[o.value])
-      .map((o) => o.value)
-  }
-
-  function confirmSelection() {
-    props.onAnswer({ value: getSelectedValues(), comment: comment() })
-  }
-
-  function submitAll() {
-    props.onSubmitAll({ value: getSelectedValues(), comment: comment() })
-  }
-
-  function CheckboxStatus(props: { value: string }) {
-    const isChecked = () => checked[props.value]
-    return <text fg={isChecked() ? theme.success : theme.textMuted}>{isChecked() ? "☑" : "☐"}</text>
-  }
 }
 
 // Confirm (Yes/No) Question Dialog
@@ -415,31 +386,32 @@ function DialogQuestionConfirm(props: SingleQuestionProps) {
   }
 
   useKeyboard((evt) => {
-    if (evt.name === "up" || evt.name === "left" || (evt.ctrl && evt.name === "p")) {
+    if (evt.name === "escape") {
+      if (selected() !== null) {
+        props.onAnswer({ value: selected(), comment: comment() })
+      } else {
+        props.onCancel()
+      }
+      evt.preventDefault()
+    } else if (evt.name === "up" || evt.name === "left" || (evt.ctrl && evt.name === "p")) {
       setSelected(true)
       evt.preventDefault()
-    }
-    if (evt.name === "down" || evt.name === "right" || (evt.ctrl && evt.name === "n")) {
+    } else if (evt.name === "down" || evt.name === "right" || (evt.ctrl && evt.name === "n")) {
       setSelected(false)
       evt.preventDefault()
-    }
-    if (evt.name === "return" && !evt.ctrl) {
+    } else if (evt.name === "return" && !evt.ctrl) {
       confirmSelection()
       evt.preventDefault()
-    }
-    if (evt.ctrl && evt.name === "return") {
+    } else if (evt.ctrl && evt.name === "return") {
       submitAll()
       evt.preventDefault()
-    }
-    if (evt.name === "c" && !evt.ctrl) {
+    } else if (evt.name === "c" && !evt.ctrl) {
       openComment()
       evt.preventDefault()
-    }
-    if (evt.name === "y") {
+    } else if (evt.name === "y") {
       setSelected(true)
       evt.preventDefault()
-    }
-    if (evt.name === "n") {
+    } else if (evt.name === "n") {
       setSelected(false)
       evt.preventDefault()
     }
@@ -545,7 +517,14 @@ function DialogQuestionText(props: SingleQuestionProps) {
         const trimmedValue = value.trim()
         props.onAnswer({ value: trimmedValue || null })
       }}
-      onCancel={() => props.onCancel()}
+      onCancel={() => {
+        // Save current value on escape if we have one
+        if (props.currentAnswer?.value) {
+          props.onAnswer(props.currentAnswer)
+        } else {
+          props.onCancel()
+        }
+      }}
     />
   )
 }
@@ -571,59 +550,38 @@ DialogQuestion.show = (
   dialog: DialogContext,
   question: Question.Info,
 ): Promise<{ answers: Answers; cancelled: boolean }> => {
-  console.log("[DialogQuestion.show] Called with question:", question.id, "questions count:", question.questions.length)
-  console.log("[DialogQuestion.show] Current stack length:", dialog.stack.length)
-
   // Create a persistent answers object that will be shared across re-renders
   const persistentAnswers: Answers = {}
 
   return new Promise((resolve) => {
     let resolved = false
 
-    console.log("[DialogQuestion.show] About to call dialog.replace")
     dialog.replace(
+      () => (
+        <DialogQuestion
+          question={question}
+          initialAnswers={persistentAnswers}
+          onSubmit={(answers) => {
+            if (resolved) return
+            resolved = true
+            resolve({ answers, cancelled: false })
+            // Clear dialog after resolving to prevent onClose from firing
+            setTimeout(() => dialog.clear(), 0)
+          }}
+          onCancel={() => {
+            if (resolved) return
+            resolved = true
+            dialog.clear()
+            resolve({ answers: {}, cancelled: true })
+          }}
+        />
+      ),
       () => {
-        console.log("[DialogQuestion.show] Render function called! Stack length:", dialog.stack.length)
-        return (
-          <DialogQuestion
-            question={question}
-            initialAnswers={persistentAnswers}
-            onSubmit={(answers) => {
-              console.log("[DialogQuestion.show] onSubmit called with answers:", answers)
-              if (resolved) {
-                console.log("[DialogQuestion.show] Already resolved, skipping")
-                return
-              }
-              resolved = true
-              console.log("[DialogQuestion.show] Resolving with cancelled: false")
-              resolve({ answers, cancelled: false })
-              // Clear dialog after resolving to prevent onClose from firing
-              setTimeout(() => dialog.clear(), 0)
-            }}
-            onCancel={() => {
-              console.log("[DialogQuestion.show] onCancel called")
-              if (resolved) {
-                console.log("[DialogQuestion.show] Already resolved, skipping")
-                return
-              }
-              resolved = true
-              dialog.clear()
-              resolve({ answers: {}, cancelled: true })
-            }}
-          />
-        )
-      },
-      () => {
-        console.log("[DialogQuestion.show] onClose callback called")
-        if (resolved) {
-          console.log("[DialogQuestion.show] Already resolved, skipping onClose")
-          return
-        }
+        if (resolved) return
         resolved = true
         resolve({ answers: {}, cancelled: true })
       },
     )
-    console.log("[DialogQuestion.show] After dialog.replace, stack length:", dialog.stack.length)
   })
 }
 

From 7a4185bac14f3f8c58574ebe58f67bef14eef716 Mon Sep 17 00:00:00 2001
From: dbpolito <danielbpolito@gmail.com>
Date: Mon, 15 Dec 2025 09:42:33 -0300
Subject: [PATCH 06/17] WIP

---
 .../src/cli/cmd/tui/ui/dialog-question.tsx    | 39 +------------------
 .../opencode/src/cli/cmd/tui/ui/dialog.tsx    |  2 +-
 2 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
index 296b1a99777..742652b20c4 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
@@ -34,9 +34,7 @@ interface SingleQuestionProps {
 // Main DialogQuestion - shows list of all questions
 export function DialogQuestion(props: QuestionDialogProps) {
   const dialog = useDialog()
-  const { theme } = useTheme()
   const [answers, setAnswers] = createStore<Answers>(props.initialAnswers ?? {})
-  const [selectRef, setSelectRef] = createSignal<any>()
 
   const questions = () => props.question.questions
   const answeredCount = () =>
@@ -205,17 +203,6 @@ function DialogQuestionSelect(props: SingleQuestionProps) {
         current={sortedOptions().find((o) => o.value === currentValue())}
         hideSearch={true}
         keybind={[
-          {
-            keybind: { name: "escape", ctrl: false, meta: false, shift: false, super: false, leader: false },
-            title: "back",
-            onTrigger: () => {
-              if (props.currentAnswer) {
-                props.onAnswer(props.currentAnswer)
-              } else {
-                props.onCancel()
-              }
-            },
-          },
           {
             keybind: { name: "m", ctrl: false, meta: false, shift: false, super: false, leader: false },
             title: "add comment",
@@ -313,14 +300,6 @@ function DialogQuestionMultiSelect(props: SingleQuestionProps) {
         hideSearch={true}
         onSelect={() => confirmSelection()}
         keybind={[
-          {
-            keybind: { name: "escape", ctrl: false, meta: false, shift: false, super: false, leader: false },
-            title: "back",
-            onTrigger: () => {
-              const currentAnswer = { value: getSelectedValues(), comment: comment() }
-              props.onAnswer(currentAnswer)
-            },
-          },
           {
             keybind: { name: "space", ctrl: false, meta: false, shift: false, super: false, leader: false },
             title: "toggle",
@@ -386,14 +365,7 @@ function DialogQuestionConfirm(props: SingleQuestionProps) {
   }
 
   useKeyboard((evt) => {
-    if (evt.name === "escape") {
-      if (selected() !== null) {
-        props.onAnswer({ value: selected(), comment: comment() })
-      } else {
-        props.onCancel()
-      }
-      evt.preventDefault()
-    } else if (evt.name === "up" || evt.name === "left" || (evt.ctrl && evt.name === "p")) {
+    if (evt.name === "up" || evt.name === "left" || (evt.ctrl && evt.name === "p")) {
       setSelected(true)
       evt.preventDefault()
     } else if (evt.name === "down" || evt.name === "right" || (evt.ctrl && evt.name === "n")) {
@@ -517,14 +489,7 @@ function DialogQuestionText(props: SingleQuestionProps) {
         const trimmedValue = value.trim()
         props.onAnswer({ value: trimmedValue || null })
       }}
-      onCancel={() => {
-        // Save current value on escape if we have one
-        if (props.currentAnswer?.value) {
-          props.onAnswer(props.currentAnswer)
-        } else {
-          props.onCancel()
-        }
-      }}
+      onCancel={() => props.onCancel()}
     />
   )
 }
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog.tsx
index ed322cb0cd9..6e7fdbb3770 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog.tsx
@@ -62,7 +62,7 @@ function init() {
       current.onClose?.()
       setStore("stack", store.stack.slice(0, -1))
       evt.preventDefault()
-      refocus()
+      if (store.stack.length === 0) refocus()
     }
   })
 

From 82ce6b43bb4690e0bf489b7dbbc43043d4c14076 Mon Sep 17 00:00:00 2001
From: dbpolito <danielbpolito@gmail.com>
Date: Mon, 15 Dec 2025 10:02:31 -0300
Subject: [PATCH 07/17] WIP

---
 .../src/cli/cmd/tui/ui/dialog-question.tsx    | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
index 742652b20c4..cbc3c193671 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
@@ -155,8 +155,14 @@ function DialogQuestionSelect(props: SingleQuestionProps) {
       <DialogQuestionComment
         value={comment()}
         onSave={(c) => {
-          setComment(c)
-          dialog.pop()
+          const trimmedComment = c.trim() || undefined
+          setComment(trimmedComment)
+          // Save comment to store immediately, keeping current value
+          props.onAnswer({
+            value: props.currentAnswer?.value ?? null,
+            comment: trimmedComment,
+          })
+          // dialog.pop()
         }}
         onCancel={() => dialog.pop()}
       />
@@ -255,8 +261,14 @@ function DialogQuestionMultiSelect(props: SingleQuestionProps) {
       <DialogQuestionComment
         value={comment()}
         onSave={(c) => {
-          setComment(c)
-          dialog.pop()
+          const trimmedComment = c.trim() || undefined
+          setComment(trimmedComment)
+          // Update comment in store without closing the question dialog
+          props.onAnswer({
+            value: props.currentAnswer?.value ?? [],
+            comment: trimmedComment,
+          })
+          // dialog.pop()
         }}
         onCancel={() => dialog.pop()}
       />
@@ -344,8 +356,14 @@ function DialogQuestionConfirm(props: SingleQuestionProps) {
       <DialogQuestionComment
         value={comment()}
         onSave={(c) => {
-          setComment(c)
-          dialog.pop()
+          const trimmedComment = c.trim() || undefined
+          setComment(trimmedComment)
+          // Update comment in store without closing the question dialog
+          props.onAnswer({
+            value: props.currentAnswer?.value ?? null,
+            comment: trimmedComment,
+          })
+          // dialog.pop()
         }}
         onCancel={() => dialog.pop()}
       />

From 0843be3c9b1b90075f7947cae439d4ef00837cd4 Mon Sep 17 00:00:00 2001
From: dbpolito <danielbpolito@gmail.com>
Date: Mon, 15 Dec 2025 10:10:00 -0300
Subject: [PATCH 08/17] WIP

---
 .../src/cli/cmd/tui/ui/dialog-question.tsx    | 88 ++++++-------------
 1 file changed, 28 insertions(+), 60 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
index cbc3c193671..94af9984c70 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
@@ -26,9 +26,8 @@ interface QuestionDialogProps {
 interface SingleQuestionProps {
   item: Question.QuestionItem
   currentAnswer?: Answer
-  onAnswer: (answer: Answer) => void
+  onAnswer: (answer: Partial<Answer>) => void // Merges with current answer
   onCancel: () => void
-  onSubmitAll: (answer: Answer) => void
 }
 
 // Main DialogQuestion - shows list of all questions
@@ -56,19 +55,19 @@ export function DialogQuestion(props: QuestionDialogProps) {
       <Component
         item={item}
         currentAnswer={answers[item.id]}
-        onAnswer={(answer) => {
-          setAnswers(item.id, answer)
+        onAnswer={(partialAnswer) => {
+          // Merge partial answer with existing answer
+          const mergedAnswer = {
+            ...answers[item.id],
+            ...partialAnswer,
+          }
+          setAnswers(item.id, mergedAnswer)
           // Sync to initialAnswers if provided
           if (props.initialAnswers) {
-            props.initialAnswers[item.id] = answer
+            props.initialAnswers[item.id] = mergedAnswer
           }
-          dialog.pop()
         }}
         onCancel={() => dialog.pop()}
-        onSubmitAll={(answer) => {
-          setAnswers(item.id, answer)
-          submit({ ...answers, [item.id]: answer })
-        }}
       />
     ))
   }
@@ -157,12 +156,9 @@ function DialogQuestionSelect(props: SingleQuestionProps) {
         onSave={(c) => {
           const trimmedComment = c.trim() || undefined
           setComment(trimmedComment)
-          // Save comment to store immediately, keeping current value
-          props.onAnswer({
-            value: props.currentAnswer?.value ?? null,
-            comment: trimmedComment,
-          })
-          // dialog.pop()
+          // Update just the comment, merging with existing answer
+          props.onAnswer({ comment: trimmedComment })
+          dialog.pop()
         }}
         onCancel={() => dialog.pop()}
       />
@@ -170,11 +166,8 @@ function DialogQuestionSelect(props: SingleQuestionProps) {
   }
 
   function confirmSelection(option: { value: string; label: string; recommended?: boolean }) {
-    props.onAnswer({ value: option.value, comment: comment() })
-  }
-
-  function submitAll(option: { value: string; label: string; recommended?: boolean }) {
-    props.onSubmitAll({ value: option.value, comment: comment() })
+    props.onAnswer({ value: option.value })
+    dialog.pop()
   }
 
   // Convert options to DialogSelectOption format
@@ -210,15 +203,10 @@ function DialogQuestionSelect(props: SingleQuestionProps) {
         hideSearch={true}
         keybind={[
           {
-            keybind: { name: "m", ctrl: false, meta: false, shift: false, super: false, leader: false },
+            keybind: { name: "c", ctrl: false, meta: false, shift: false, super: false, leader: false },
             title: "add comment",
             onTrigger: () => openComment(),
           },
-          {
-            keybind: { name: "s", ctrl: false, meta: false, shift: false, super: false, leader: false },
-            title: "submit all",
-            onTrigger: (option) => submitAll(option.value),
-          },
         ]}
       />
       <Show when={comment()}>
@@ -263,12 +251,9 @@ function DialogQuestionMultiSelect(props: SingleQuestionProps) {
         onSave={(c) => {
           const trimmedComment = c.trim() || undefined
           setComment(trimmedComment)
-          // Update comment in store without closing the question dialog
-          props.onAnswer({
-            value: props.currentAnswer?.value ?? [],
-            comment: trimmedComment,
-          })
-          // dialog.pop()
+          // Update just the comment, merging with existing answer
+          props.onAnswer({ comment: trimmedComment })
+          dialog.pop()
         }}
         onCancel={() => dialog.pop()}
       />
@@ -282,11 +267,8 @@ function DialogQuestionMultiSelect(props: SingleQuestionProps) {
   }
 
   function confirmSelection() {
-    props.onAnswer({ value: getSelectedValues(), comment: comment() })
-  }
-
-  function submitAll() {
-    props.onSubmitAll({ value: getSelectedValues(), comment: comment() })
+    props.onAnswer({ value: getSelectedValues() })
+    dialog.pop()
   }
 
   // Convert options to DialogSelectOption format
@@ -318,15 +300,10 @@ function DialogQuestionMultiSelect(props: SingleQuestionProps) {
             onTrigger: (option) => setChecked(option.value.value, !checked[option.value.value]),
           },
           {
-            keybind: { name: "m", ctrl: false, meta: false, shift: false, super: false, leader: false },
+            keybind: { name: "c", ctrl: false, meta: false, shift: false, super: false, leader: false },
             title: "add comment",
             onTrigger: () => openComment(),
           },
-          {
-            keybind: { name: "s", ctrl: false, meta: false, shift: false, super: false, leader: false },
-            title: "submit all",
-            onTrigger: () => submitAll(),
-          },
         ]}
       />
       <Show when={comment()}>
@@ -358,12 +335,9 @@ function DialogQuestionConfirm(props: SingleQuestionProps) {
         onSave={(c) => {
           const trimmedComment = c.trim() || undefined
           setComment(trimmedComment)
-          // Update comment in store without closing the question dialog
-          props.onAnswer({
-            value: props.currentAnswer?.value ?? null,
-            comment: trimmedComment,
-          })
-          // dialog.pop()
+          // Update just the comment, merging with existing answer
+          props.onAnswer({ comment: trimmedComment })
+          dialog.pop()
         }}
         onCancel={() => dialog.pop()}
       />
@@ -372,13 +346,8 @@ function DialogQuestionConfirm(props: SingleQuestionProps) {
 
   function confirmSelection() {
     if (selected() !== null) {
-      props.onAnswer({ value: selected(), comment: comment() })
-    }
-  }
-
-  function submitAll() {
-    if (selected() !== null) {
-      props.onSubmitAll({ value: selected(), comment: comment() })
+      props.onAnswer({ value: selected() })
+      dialog.pop()
     }
   }
 
@@ -392,9 +361,6 @@ function DialogQuestionConfirm(props: SingleQuestionProps) {
     } else if (evt.name === "return" && !evt.ctrl) {
       confirmSelection()
       evt.preventDefault()
-    } else if (evt.ctrl && evt.name === "return") {
-      submitAll()
-      evt.preventDefault()
     } else if (evt.name === "c" && !evt.ctrl) {
       openComment()
       evt.preventDefault()
@@ -495,6 +461,7 @@ function DialogQuestionConfirm(props: SingleQuestionProps) {
 
 // Text Input Question Dialog
 function DialogQuestionText(props: SingleQuestionProps) {
+  const dialog = useDialog()
   const placeholder = typeof props.item.default === "string" ? props.item.default : "Enter your response..."
   const initialValue = typeof props.currentAnswer?.value === "string" ? props.currentAnswer.value : ""
 
@@ -506,6 +473,7 @@ function DialogQuestionText(props: SingleQuestionProps) {
       onConfirm={(value) => {
         const trimmedValue = value.trim()
         props.onAnswer({ value: trimmedValue || null })
+        dialog.pop()
       }}
       onCancel={() => props.onCancel()}
     />

From fec3b4ca8758084a8bf58f451623366f49218be3 Mon Sep 17 00:00:00 2001
From: dbpolito <danielbpolito@gmail.com>
Date: Mon, 15 Dec 2025 10:24:01 -0300
Subject: [PATCH 09/17] WIP

---
 .../src/cli/cmd/tui/ui/dialog-question.tsx    | 181 +++++-------------
 1 file changed, 49 insertions(+), 132 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
index 94af9984c70..41d62405158 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
@@ -152,6 +152,7 @@ function DialogQuestionSelect(props: SingleQuestionProps) {
   function openComment() {
     dialog.push(() => (
       <DialogQuestionComment
+        question={props.item.question}
         value={comment()}
         onSave={(c) => {
           const trimmedComment = c.trim() || undefined
@@ -180,22 +181,8 @@ function DialogQuestionSelect(props: SingleQuestionProps) {
     })),
   )
 
-  // Show default as hint if present
-  const defaultHint = createMemo(() => {
-    if (typeof props.item.default === "string") {
-      const opt = props.item.options?.find((o) => o.value === props.item.default)
-      return opt?.label
-    }
-    return undefined
-  })
-
   return (
     <>
-      <Show when={defaultHint()}>
-        <box paddingLeft={4} paddingRight={4} paddingTop={1}>
-          <text fg={theme.textMuted}>Default: {defaultHint()}</text>
-        </box>
-      </Show>
       <DialogSelect
         title={props.item.question}
         options={selectOptions()}
@@ -210,7 +197,7 @@ function DialogQuestionSelect(props: SingleQuestionProps) {
         ]}
       />
       <Show when={comment()}>
-        <box paddingLeft={4} paddingRight={4}>
+        <box paddingLeft={4} paddingRight={4} paddingTop={1} paddingBottom={1}>
           <text fg={theme.textMuted}>💬 "{truncate(comment()!, 40)}"</text>
         </box>
       </Show>
@@ -247,6 +234,7 @@ function DialogQuestionMultiSelect(props: SingleQuestionProps) {
   function openComment() {
     dialog.push(() => (
       <DialogQuestionComment
+        question={props.item.question}
         value={comment()}
         onSave={(c) => {
           const trimmedComment = c.trim() || undefined
@@ -281,13 +269,8 @@ function DialogQuestionMultiSelect(props: SingleQuestionProps) {
     })),
   )
 
-  const selectedCount = createMemo(() => getSelectedValues().length)
-
   return (
     <>
-      <box paddingLeft={4} paddingRight={4} paddingTop={1}>
-        <text fg={theme.textMuted}>{selectedCount()} selected</text>
-      </box>
       <DialogSelect
         title={props.item.question}
         options={selectOptions()}
@@ -307,7 +290,7 @@ function DialogQuestionMultiSelect(props: SingleQuestionProps) {
         ]}
       />
       <Show when={comment()}>
-        <box paddingLeft={4} paddingRight={4}>
+        <box paddingLeft={4} paddingRight={4} paddingTop={1} paddingBottom={1}>
           <text fg={theme.textMuted}>💬 "{truncate(comment()!, 40)}"</text>
         </box>
       </Show>
@@ -319,11 +302,11 @@ function DialogQuestionMultiSelect(props: SingleQuestionProps) {
 function DialogQuestionConfirm(props: SingleQuestionProps) {
   const dialog = useDialog()
   const { theme } = useTheme()
-  const [selected, setSelected] = createSignal<boolean | null>(
-    typeof props.currentAnswer?.value === "boolean" ? props.currentAnswer.value : null,
-  )
   const [comment, setComment] = createSignal<string | undefined>(props.currentAnswer?.comment)
 
+  // Find current selection value
+  const currentValue = createMemo(() => props.currentAnswer?.value)
+
   onMount(() => {
     dialog.setSize("medium")
   })
@@ -331,6 +314,7 @@ function DialogQuestionConfirm(props: SingleQuestionProps) {
   function openComment() {
     dialog.push(() => (
       <DialogQuestionComment
+        question={props.item.question}
         value={comment()}
         onSave={(c) => {
           const trimmedComment = c.trim() || undefined
@@ -344,118 +328,46 @@ function DialogQuestionConfirm(props: SingleQuestionProps) {
     ))
   }
 
-  function confirmSelection() {
-    if (selected() !== null) {
-      props.onAnswer({ value: selected() })
-      dialog.pop()
-    }
+  function confirmSelection(value: boolean) {
+    props.onAnswer({ value })
+    dialog.pop()
   }
 
-  useKeyboard((evt) => {
-    if (evt.name === "up" || evt.name === "left" || (evt.ctrl && evt.name === "p")) {
-      setSelected(true)
-      evt.preventDefault()
-    } else if (evt.name === "down" || evt.name === "right" || (evt.ctrl && evt.name === "n")) {
-      setSelected(false)
-      evt.preventDefault()
-    } else if (evt.name === "return" && !evt.ctrl) {
-      confirmSelection()
-      evt.preventDefault()
-    } else if (evt.name === "c" && !evt.ctrl) {
-      openComment()
-      evt.preventDefault()
-    } else if (evt.name === "y") {
-      setSelected(true)
-      evt.preventDefault()
-    } else if (evt.name === "n") {
-      setSelected(false)
-      evt.preventDefault()
-    }
-  })
-
-  // Show default as hint
-  const defaultHint = createMemo(() => {
-    if (typeof props.item.default === "boolean") {
-      return props.item.default ? "Yes" : "No"
-    }
-    return undefined
-  })
+  // Yes/No options
+  const options = createMemo<DialogSelectOption<boolean>[]>(() => [
+    {
+      title: "Yes",
+      value: true,
+      onSelect: () => confirmSelection(true),
+    },
+    {
+      title: "No",
+      value: false,
+      onSelect: () => confirmSelection(false),
+    },
+  ])
 
   return (
-    <box gap={1} paddingBottom={1}>
-      <box paddingLeft={4} paddingRight={4}>
-        <box flexDirection="row" justifyContent="space-between">
-          <text fg={theme.text} attributes={TextAttributes.BOLD}>
-            {props.item.question}
-          </text>
-          <text fg={theme.textMuted}>esc</text>
-        </box>
-        <Show when={defaultHint()}>
-          <text fg={theme.textMuted}>Default: {defaultHint()}</text>
-        </Show>
-      </box>
-      <box paddingLeft={3} paddingRight={3} flexDirection="row" gap={2}>
-        <box
-          paddingLeft={2}
-          paddingRight={2}
-          backgroundColor={selected() === true ? theme.primary : undefined}
-          onMouseUp={() => {
-            setSelected(true)
-            confirmSelection()
-          }}
-        >
-          <text
-            fg={selected() === true ? selectedForeground(theme) : theme.text}
-            attributes={selected() === true ? TextAttributes.BOLD : undefined}
-          >
-            Yes
-          </text>
-        </box>
-        <box
-          paddingLeft={2}
-          paddingRight={2}
-          backgroundColor={selected() === false ? theme.primary : undefined}
-          onMouseUp={() => {
-            setSelected(false)
-            confirmSelection()
-          }}
-        >
-          <text
-            fg={selected() === false ? selectedForeground(theme) : theme.text}
-            attributes={selected() === false ? TextAttributes.BOLD : undefined}
-          >
-            No
-          </text>
-        </box>
-      </box>
+    <>
+      <DialogSelect
+        title={props.item.question}
+        options={options()}
+        current={typeof currentValue() === "boolean" ? currentValue() : undefined}
+        hideSearch={true}
+        keybind={[
+          {
+            keybind: { name: "c", ctrl: false, meta: false, shift: false, super: false, leader: false },
+            title: "add comment",
+            onTrigger: () => openComment(),
+          },
+        ]}
+      />
       <Show when={comment()}>
-        <box paddingLeft={4} paddingRight={4}>
-          <text fg={theme.textMuted}>
-            {"\uD83D\uDCAC"} "{truncate(comment()!, 40)}"
-          </text>
+        <box paddingLeft={4} paddingRight={4} paddingTop={1} paddingBottom={1}>
+          <text fg={theme.textMuted}>💬 "{truncate(comment()!, 40)}"</text>
         </box>
       </Show>
-      <box paddingRight={2} paddingLeft={4} flexDirection="row" gap={2} flexShrink={0} paddingTop={1}>
-        <text>
-          <span style={{ fg: theme.text }}>
-            <b>y/n</b>{" "}
-          </span>
-          <span style={{ fg: theme.textMuted }}>select</span>
-        </text>
-        <text>
-          <span style={{ fg: theme.text }}>
-            <b>enter</b>{" "}
-          </span>
-          <span style={{ fg: theme.textMuted }}>confirm</span>
-        </text>
-        <text>
-          <span style={{ fg: theme.text }}>
-            <b>c</b>{" "}
-          </span>
-          <span style={{ fg: theme.textMuted }}>comment</span>
-        </text>
-      </box>
-    </box>
+    </>
   )
 }
 
@@ -481,13 +393,18 @@ function DialogQuestionText(props: SingleQuestionProps) {
 }
 
 // Comment Dialog (nested)
-function DialogQuestionComment(props: { value?: string; onSave: (comment: string) => void; onCancel: () => void }) {
+function DialogQuestionComment(props: {
+  question: string
+  value?: string
+  onSave: (comment: string) => void
+  onCancel: () => void
+}) {
   const { theme } = useTheme()
 
   return (
     <DialogPrompt
-      title="Add Comment"
-      description={() => <text fg={theme.textMuted}>Add additional context to your answer:</text>}
+      title={props.question}
+      description={() => <text fg={theme.textMuted}>Add comment</text>}
       placeholder="Optional comment..."
       value={props.value}
       onConfirm={(value) => props.onSave(value)}

From 5dfb7a7cb16ff7b257d16ca7759df8e803320f7c Mon Sep 17 00:00:00 2001
From: dbpolito <danielbpolito@gmail.com>
Date: Mon, 15 Dec 2025 10:42:11 -0300
Subject: [PATCH 10/17] WIP

---
 .../src/cli/cmd/tui/ui/dialog-question.tsx    | 130 +++++++++---------
 .../src/cli/cmd/tui/ui/dialog-select.tsx      |  30 ++--
 2 files changed, 83 insertions(+), 77 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
index 41d62405158..003dfff0187 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-question.tsx
@@ -182,26 +182,26 @@ function DialogQuestionSelect(props: SingleQuestionProps) {
   )
 
   return (
-    <>
-      <DialogSelect
-        title={props.item.question}
-        options={selectOptions()}
-        current={sortedOptions().find((o) => o.value === currentValue())}
-        hideSearch={true}
-        keybind={[
-          {
-            keybind: { name: "c", ctrl: false, meta: false, shift: false, super: false, leader: false },
-            title: "add comment",
-            onTrigger: () => openComment(),
-          },
-        ]}
-      />
-      <Show when={comment()}>
-        <box paddingLeft={4} paddingRight={4} paddingTop={1} paddingBottom={1}>
-          <text fg={theme.textMuted}>💬 "{truncate(comment()!, 40)}"</text>
-        </box>
-      </Show>
-    </>
+    <DialogSelect
+      title={props.item.question}
+      options={selectOptions()}
+      current={sortedOptions().find((o) => o.value === currentValue())}
+      hideSearch={true}
+      beforeFooter={
+        comment() ? (
+          <box paddingLeft={4} paddingRight={4}>
+            <text fg={theme.textMuted}>💬 "{truncate(comment()!, 40)}"</text>
+          </box>
+        ) : undefined
+      }
+      keybind={[
+        {
+          keybind: { name: "c", ctrl: false, meta: false, shift: false, super: false, leader: false },
+          title: "add comment",
+          onTrigger: () => openComment(),
+        },
+      ]}
+    />
   )
 }
 
@@ -270,31 +270,31 @@ function DialogQuestionMultiSelect(props: SingleQuestionProps) {
   )
 
   return (
-    <>
-      <DialogSelect
-        title={props.item.question}
-        options={selectOptions()}
-        hideSearch={true}
-        onSelect={() => confirmSelection()}
-        keybind={[
-          {
-            keybind: { name: "space", ctrl: false, meta: false, shift: false, super: false, leader: false },
-            title: "toggle",
-            onTrigger: (option) => setChecked(option.value.value, !checked[option.value.value]),
-          },
-          {
-            keybind: { name: "c", ctrl: false, meta: false, shift: false, super: false, leader: false },
-            title: "add comment",
-            onTrigger: () => openComment(),
-          },
-        ]}
-      />
-      <Show when={comment()}>
-        <box paddingLeft={4} paddingRight={4} paddingTop={1} paddingBottom={1}>
-          <text fg={theme.textMuted}>💬 "{truncate(comment()!, 40)}"</text>
-        </box>
-      </Show>
-    </>
+    <DialogSelect
+      title={props.item.question}
+      options={selectOptions()}
+      hideSearch={true}
+      onSelect={() => confirmSelection()}
+      beforeFooter={
+        comment() ? (
+          <box paddingLeft={4} paddingRight={4}>
+            <text fg={theme.textMuted}>💬 "{truncate(comment()!, 40)}"</text>
+          </box>
+        ) : undefined
+      }
+      keybind={[
+        {
+          keybind: { name: "space", ctrl: false, meta: false, shift: false, super: false, leader: false },
+          title: "toggle",
+          onTrigger: (option) => setChecked(option.value.value, !checked[option.value.value]),
+        },
+        {
+          keybind: { name: "c", ctrl: false, meta: false, shift: false, super: false, leader: false },
+          title: "add comment",
+          onTrigger: () => openComment(),
+        },
+      ]}
+    />
   )
 }
 
@@ -348,26 +348,26 @@ function DialogQuestionConfirm(props: SingleQuestionProps) {
   ])
 
   return (
-    <>
-      <DialogSelect
-        title={props.item.question}
-        options={options()}
-        current={typeof currentValue() === "boolean" ? currentValue() : undefined}
-        hideSearch={true}
-        keybind={[
-          {
-            keybind: { name: "c", ctrl: false, meta: false, shift: false, super: false, leader: false },
-            title: "add comment",
-            onTrigger: () => openComment(),
-          },
-        ]}
-      />
-      <Show when={comment()}>
-        <box paddingLeft={4} paddingRight={4} paddingTop={1} paddingBottom={1}>
-          <text fg={theme.textMuted}>💬 "{truncate(comment()!, 40)}"</text>
-        </box>
-      </Show>
-    </>
+    <DialogSelect
+      title={props.item.question}
+      options={options()}
+      current={typeof currentValue() === "boolean" ? currentValue() : undefined}
+      hideSearch={true}
+      beforeFooter={
+        comment() ? (
+          <box paddingLeft={4} paddingRight={4}>
+            <text fg={theme.textMuted}>💬 "{truncate(comment()!, 40)}"</text>
+          </box>
+        ) : undefined
+      }
+      keybind={[
+        {
+          keybind: { name: "c", ctrl: false, meta: false, shift: false, super: false, leader: false },
+          title: "add comment",
+          onTrigger: () => openComment(),
+        },
+      ]}
+    />
   )
 }
 
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
index 2c7cc458438..b4dfeb07ac3 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
@@ -27,6 +27,7 @@ export interface DialogSelectProps<T> {
   }[]
   current?: T
   hideSearch?: boolean
+  beforeFooter?: JSX.Element
 }
 
 export interface DialogSelectOption<T = any> {
@@ -299,18 +300,23 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
           )}
         </For>
       </scrollbox>
-      <Show when={keybinds().length} fallback={<box flexShrink={0} />}>
-        <box paddingRight={2} paddingLeft={4} flexDirection="row" gap={2} flexShrink={0} paddingTop={1}>
-          <For each={keybinds()}>
-            {(item) => (
-              <text>
-                <span style={{ fg: theme.text }}>
-                  <b>{item.title}</b>{" "}
-                </span>
-                <span style={{ fg: theme.textMuted }}>{Keybind.toString(item.keybind)}</span>
-              </text>
-            )}
-          </For>
+      <Show when={props.beforeFooter || keybinds().length} fallback={<box flexShrink={0} />}>
+        <box paddingTop={1}>
+          <Show when={props.beforeFooter}>{props.beforeFooter}</Show>
+          <Show when={keybinds().length} fallback={<box flexShrink={0} />}>
+            <box paddingRight={2} paddingLeft={4} flexDirection="row" gap={2} flexShrink={0}>
+              <For each={keybinds()}>
+                {(item) => (
+                  <text>
+                    <span style={{ fg: theme.text }}>
+                      <b>{item.title}</b>{" "}
+                    </span>
+                    <span style={{ fg: theme.textMuted }}>{Keybind.toString(item.keybind)}</span>
+                  </text>
+                )}
+              </For>
+            </box>
+          </Show>
         </box>
       </Show>
     </box>

From 234fc2da8c69113094c7e2c18f45a96d63762f96 Mon Sep 17 00:00:00 2001
From: dbpolito <danielbpolito@gmail.com>
Date: Mon, 15 Dec 2025 11:10:24 -0300
Subject: [PATCH 11/17] WIP

---
 .../src/cli/cmd/tui/ui/dialog-select.tsx      | 34 +++----------------
 1 file changed, 4 insertions(+), 30 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
index b4dfeb07ac3..d3564c354c8 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
@@ -141,36 +141,10 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
 
   const keybind = useKeybind()
   useKeyboard((evt) => {
-    // Always prevent propagation of navigation keys
-    const isNavigationKey =
-      evt.name === "up" ||
-      evt.name === "down" ||
-      evt.name === "pageup" ||
-      evt.name === "pagedown" ||
-      evt.name === "return" ||
-      (evt.ctrl && evt.name === "p") ||
-      (evt.ctrl && evt.name === "n")
-
-    if (isNavigationKey) {
-      evt.preventDefault()
-    }
-
-    if (evt.name === "up" || (evt.ctrl && evt.name === "p")) {
-      move(-1)
-      return
-    }
-    if (evt.name === "down" || (evt.ctrl && evt.name === "n")) {
-      move(1)
-      return
-    }
-    if (evt.name === "pageup") {
-      move(-10)
-      return
-    }
-    if (evt.name === "pagedown") {
-      move(10)
-      return
-    }
+    if (evt.name === "up" || (evt.ctrl && evt.name === "p")) move(-1)
+    if (evt.name === "down" || (evt.ctrl && evt.name === "n")) move(1)
+    if (evt.name === "pageup") move(-10)
+    if (evt.name === "pagedown") move(10)
     if (evt.name === "return") {
       const option = selected()
       if (option) {

From f355c693467ff9037eb03fa11196b44fed21a95c Mon Sep 17 00:00:00 2001
From: dbpolito <danielbpolito@gmail.com>
Date: Mon, 15 Dec 2025 11:14:16 -0300
Subject: [PATCH 12/17] WIP

---
 .../dialog-question-comment.tsx               |  24 +++
 .../dialog-question-confirm.tsx               |  79 +++++++++
 .../dialog-question-multi-select.tsx          | 100 ++++++++++++
 .../dialog-question-select.tsx                |  81 ++++++++++
 .../dialog-question/dialog-question-text.tsx  |  23 +++
 .../dialog-question/dialog-question.tsx       | 152 ++++++++++++++++++
 .../tui/component/dialog-question/helpers.ts  |  40 +++++
 .../tui/component/dialog-question/index.tsx   |   8 +
 .../tui/component/dialog-question/types.ts    |  23 +++
 .../src/cli/cmd/tui/routes/session/index.tsx  |   2 +-
 10 files changed, 531 insertions(+), 1 deletion(-)
 create mode 100644 packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-comment.tsx
 create mode 100644 packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-confirm.tsx
 create mode 100644 packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-multi-select.tsx
 create mode 100644 packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-select.tsx
 create mode 100644 packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-text.tsx
 create mode 100644 packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question.tsx
 create mode 100644 packages/opencode/src/cli/cmd/tui/component/dialog-question/helpers.ts
 create mode 100644 packages/opencode/src/cli/cmd/tui/component/dialog-question/index.tsx
 create mode 100644 packages/opencode/src/cli/cmd/tui/component/dialog-question/types.ts

diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-comment.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-comment.tsx
new file mode 100644
index 00000000000..2506f02e5b7
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-comment.tsx
@@ -0,0 +1,24 @@
+import { useTheme } from "@tui/context/theme"
+import { DialogPrompt } from "@tui/ui/dialog-prompt"
+
+interface DialogQuestionCommentProps {
+  question: string
+  value?: string
+  onSave: (comment: string) => void
+  onCancel: () => void
+}
+
+export function DialogQuestionComment(props: DialogQuestionCommentProps) {
+  const { theme } = useTheme()
+
+  return (
+    <DialogPrompt
+      title={props.question}
+      description={() => <text fg={theme.textMuted}>Add comment</text>}
+      placeholder="Optional comment..."
+      value={props.value}
+      onConfirm={(value) => props.onSave(value)}
+      onCancel={() => props.onCancel()}
+    />
+  )
+}
diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-confirm.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-confirm.tsx
new file mode 100644
index 00000000000..25a50a1edf0
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-confirm.tsx
@@ -0,0 +1,79 @@
+import { createMemo, createSignal, onMount } from "solid-js"
+import { useTheme } from "@tui/context/theme"
+import { useDialog } from "@tui/ui/dialog"
+import { DialogSelect, type DialogSelectOption } from "@tui/ui/dialog-select"
+import { DialogQuestionComment } from "./dialog-question-comment"
+import { truncate } from "./helpers"
+import type { SingleQuestionProps } from "./types"
+
+export function DialogQuestionConfirm(props: SingleQuestionProps) {
+  const dialog = useDialog()
+  const { theme } = useTheme()
+  const [comment, setComment] = createSignal<string | undefined>(props.currentAnswer?.comment)
+
+  // Find current selection value
+  const currentValue = createMemo(() => props.currentAnswer?.value)
+
+  onMount(() => {
+    dialog.setSize("medium")
+  })
+
+  function openComment() {
+    dialog.push(() => (
+      <DialogQuestionComment
+        question={props.item.question}
+        value={comment()}
+        onSave={(c) => {
+          const trimmedComment = c.trim() || undefined
+          setComment(trimmedComment)
+          // Update just the comment, merging with existing answer
+          props.onAnswer({ comment: trimmedComment })
+          dialog.pop()
+        }}
+        onCancel={() => dialog.pop()}
+      />
+    ))
+  }
+
+  function confirmSelection(value: boolean) {
+    props.onAnswer({ value })
+    dialog.pop()
+  }
+
+  // Yes/No options
+  const options = createMemo<DialogSelectOption<boolean>[]>(() => [
+    {
+      title: "Yes",
+      value: true,
+      onSelect: () => confirmSelection(true),
+    },
+    {
+      title: "No",
+      value: false,
+      onSelect: () => confirmSelection(false),
+    },
+  ])
+
+  return (
+    <DialogSelect
+      title={props.item.question}
+      options={options()}
+      current={typeof currentValue() === "boolean" ? currentValue() : undefined}
+      hideSearch={true}
+      beforeFooter={
+        comment() ? (
+          <box paddingLeft={4} paddingRight={4}>
+            <text fg={theme.textMuted}>💬 "{truncate(comment()!, 40)}"</text>
+          </box>
+        ) : undefined
+      }
+      keybind={[
+        {
+          keybind: { name: "c", ctrl: false, meta: false, shift: false, super: false, leader: false },
+          title: "add comment",
+          onTrigger: () => openComment(),
+        },
+      ]}
+    />
+  )
+}
diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-multi-select.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-multi-select.tsx
new file mode 100644
index 00000000000..c1090755307
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-multi-select.tsx
@@ -0,0 +1,100 @@
+import { createEffect, createMemo, createSignal, onMount } from "solid-js"
+import { createStore } from "solid-js/store"
+import { useTheme } from "@tui/context/theme"
+import { useDialog } from "@tui/ui/dialog"
+import { DialogSelect, type DialogSelectOption } from "@tui/ui/dialog-select"
+import { DialogQuestionComment } from "./dialog-question-comment"
+import { truncate } from "./helpers"
+import type { SingleQuestionProps } from "./types"
+
+export function DialogQuestionMultiSelect(props: SingleQuestionProps) {
+  const dialog = useDialog()
+  const { theme } = useTheme()
+  const [checked, setChecked] = createStore<Record<string, boolean>>({})
+  const [comment, setComment] = createSignal<string | undefined>(props.currentAnswer?.comment)
+
+  // Sort options with recommended first
+  const sortedOptions = createMemo(() => {
+    const opts = props.item.options ?? []
+    return [...opts].sort((a, b) => (b.recommended ? 1 : 0) - (a.recommended ? 1 : 0))
+  })
+
+  // Initialize checked state from current answer
+  createEffect(() => {
+    if (Array.isArray(props.currentAnswer?.value)) {
+      for (const v of props.currentAnswer.value) {
+        setChecked(v, true)
+      }
+    }
+  })
+
+  onMount(() => {
+    dialog.setSize("medium")
+  })
+
+  function openComment() {
+    dialog.push(() => (
+      <DialogQuestionComment
+        question={props.item.question}
+        value={comment()}
+        onSave={(c) => {
+          const trimmedComment = c.trim() || undefined
+          setComment(trimmedComment)
+          // Update just the comment, merging with existing answer
+          props.onAnswer({ comment: trimmedComment })
+          dialog.pop()
+        }}
+        onCancel={() => dialog.pop()}
+      />
+    ))
+  }
+
+  function getSelectedValues(): string[] {
+    return sortedOptions()
+      .filter((o) => checked[o.value])
+      .map((o) => o.value)
+  }
+
+  function confirmSelection() {
+    props.onAnswer({ value: getSelectedValues() })
+    dialog.pop()
+  }
+
+  // Convert options to DialogSelectOption format
+  const selectOptions = createMemo<DialogSelectOption<{ value: string; label: string; recommended?: boolean }>[]>(() =>
+    sortedOptions().map((option) => ({
+      title: option.label,
+      value: option,
+      footer: checked[option.value] ? "☑" : "☐",
+      onSelect: () => {}, // Don't close on select
+    })),
+  )
+
+  return (
+    <DialogSelect
+      title={props.item.question}
+      options={selectOptions()}
+      hideSearch={true}
+      onSelect={() => confirmSelection()}
+      beforeFooter={
+        comment() ? (
+          <box paddingLeft={4} paddingRight={4}>
+            <text fg={theme.textMuted}>💬 "{truncate(comment()!, 40)}"</text>
+          </box>
+        ) : undefined
+      }
+      keybind={[
+        {
+          keybind: { name: "space", ctrl: false, meta: false, shift: false, super: false, leader: false },
+          title: "toggle",
+          onTrigger: (option) => setChecked(option.value.value, !checked[option.value.value]),
+        },
+        {
+          keybind: { name: "c", ctrl: false, meta: false, shift: false, super: false, leader: false },
+          title: "add comment",
+          onTrigger: () => openComment(),
+        },
+      ]}
+    />
+  )
+}
diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-select.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-select.tsx
new file mode 100644
index 00000000000..e26be467d6b
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-select.tsx
@@ -0,0 +1,81 @@
+import { createMemo, createSignal, onMount } from "solid-js"
+import { useTheme } from "@tui/context/theme"
+import { useDialog } from "@tui/ui/dialog"
+import { DialogSelect, type DialogSelectOption } from "@tui/ui/dialog-select"
+import { DialogQuestionComment } from "./dialog-question-comment"
+import { truncate } from "./helpers"
+import type { SingleQuestionProps } from "./types"
+
+export function DialogQuestionSelect(props: SingleQuestionProps) {
+  const dialog = useDialog()
+  const { theme } = useTheme()
+  const [comment, setComment] = createSignal<string | undefined>(props.currentAnswer?.comment)
+
+  // Sort options with recommended first
+  const sortedOptions = createMemo(() => {
+    const opts = props.item.options ?? []
+    return [...opts].sort((a, b) => (b.recommended ? 1 : 0) - (a.recommended ? 1 : 0))
+  })
+
+  // Find current selection value
+  const currentValue = createMemo(() => props.currentAnswer?.value)
+
+  onMount(() => {
+    dialog.setSize("medium")
+  })
+
+  function openComment() {
+    dialog.push(() => (
+      <DialogQuestionComment
+        question={props.item.question}
+        value={comment()}
+        onSave={(c) => {
+          const trimmedComment = c.trim() || undefined
+          setComment(trimmedComment)
+          // Update just the comment, merging with existing answer
+          props.onAnswer({ comment: trimmedComment })
+          dialog.pop()
+        }}
+        onCancel={() => dialog.pop()}
+      />
+    ))
+  }
+
+  function confirmSelection(option: { value: string; label: string; recommended?: boolean }) {
+    props.onAnswer({ value: option.value })
+    dialog.pop()
+  }
+
+  // Convert options to DialogSelectOption format
+  const selectOptions = createMemo<DialogSelectOption<{ value: string; label: string; recommended?: boolean }>[]>(() =>
+    sortedOptions().map((option) => ({
+      title: option.label,
+      value: option,
+      footer: option.recommended ? "(Recommended)" : undefined,
+      onSelect: () => confirmSelection(option),
+    })),
+  )
+
+  return (
+    <DialogSelect
+      title={props.item.question}
+      options={selectOptions()}
+      current={sortedOptions().find((o) => o.value === currentValue())}
+      hideSearch={true}
+      beforeFooter={
+        comment() ? (
+          <box paddingLeft={4} paddingRight={4}>
+            <text fg={theme.textMuted}>💬 "{truncate(comment()!, 40)}"</text>
+          </box>
+        ) : undefined
+      }
+      keybind={[
+        {
+          keybind: { name: "c", ctrl: false, meta: false, shift: false, super: false, leader: false },
+          title: "add comment",
+          onTrigger: () => openComment(),
+        },
+      ]}
+    />
+  )
+}
diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-text.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-text.tsx
new file mode 100644
index 00000000000..31d6ba1bd5b
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-text.tsx
@@ -0,0 +1,23 @@
+import { useDialog } from "@tui/ui/dialog"
+import { DialogPrompt } from "@tui/ui/dialog-prompt"
+import type { SingleQuestionProps } from "./types"
+
+export function DialogQuestionText(props: SingleQuestionProps) {
+  const dialog = useDialog()
+  const placeholder = typeof props.item.default === "string" ? props.item.default : "Enter your response..."
+  const initialValue = typeof props.currentAnswer?.value === "string" ? props.currentAnswer.value : ""
+
+  return (
+    <DialogPrompt
+      title={props.item.question}
+      placeholder={placeholder}
+      value={initialValue}
+      onConfirm={(value) => {
+        const trimmedValue = value.trim()
+        props.onAnswer({ value: trimmedValue || null })
+        dialog.pop()
+      }}
+      onCancel={() => props.onCancel()}
+    />
+  )
+}
diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question.tsx
new file mode 100644
index 00000000000..87e77200ae9
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question.tsx
@@ -0,0 +1,152 @@
+import { createMemo, onMount } from "solid-js"
+import { createStore } from "solid-js/store"
+import { useKeyboard } from "@opentui/solid"
+import { useDialog, type DialogContext } from "@tui/ui/dialog"
+import { DialogSelect, type DialogSelectOption } from "@tui/ui/dialog-select"
+import type { Question } from "@/question"
+import { DialogQuestionSelect } from "./dialog-question-select"
+import { DialogQuestionMultiSelect } from "./dialog-question-multi-select"
+import { DialogQuestionConfirm } from "./dialog-question-confirm"
+import { DialogQuestionText } from "./dialog-question-text"
+import { formatAnswerPreview, truncate } from "./helpers"
+import type { Answers, QuestionDialogProps } from "./types"
+
+// Main DialogQuestion - shows list of all questions
+export function DialogQuestion(props: QuestionDialogProps) {
+  const dialog = useDialog()
+  const [answers, setAnswers] = createStore<Answers>(props.initialAnswers ?? {})
+
+  const questions = () => props.question.questions
+  const answeredCount = () =>
+    Object.keys(answers).filter((k) => answers[k]?.value !== undefined && answers[k]?.value !== null).length
+
+  onMount(() => {
+    dialog.setSize("medium")
+  })
+
+  function openQuestion(item: Question.QuestionItem) {
+    const Component = {
+      select: DialogQuestionSelect,
+      "multi-select": DialogQuestionMultiSelect,
+      confirm: DialogQuestionConfirm,
+      text: DialogQuestionText,
+    }[item.type]
+
+    dialog.push(() => (
+      <Component
+        item={item}
+        currentAnswer={answers[item.id]}
+        onAnswer={(partialAnswer) => {
+          // Merge partial answer with existing answer
+          const mergedAnswer = {
+            ...answers[item.id],
+            ...partialAnswer,
+          }
+          setAnswers(item.id, mergedAnswer)
+          // Sync to initialAnswers if provided
+          if (props.initialAnswers) {
+            props.initialAnswers[item.id] = mergedAnswer
+          }
+        }}
+        onCancel={() => dialog.pop()}
+      />
+    ))
+  }
+
+  function submit(finalAnswers?: Answers) {
+    props.onSubmit(finalAnswers ?? answers)
+  }
+
+  // Convert questions to DialogSelect options
+  const selectOptions = createMemo<DialogSelectOption<Question.QuestionItem>[]>(() => {
+    // Access all keys to subscribe to any changes
+    Object.keys(answers)
+
+    return questions().map((item) => {
+      const answer = answers[item.id]
+      const answerPreview = formatAnswerPreview(item, answer)
+      const comment = answer?.comment ? ` 💬 "${truncate(answer.comment, 30)}"` : ""
+
+      return {
+        title: item.question,
+        value: item,
+        description: answerPreview + comment,
+        onSelect: () => openQuestion(item),
+      }
+    })
+  })
+
+  // Handle submission with ctrl+enter keybind
+  useKeyboard((evt) => {
+    if (evt.ctrl && evt.name === "return") {
+      evt.preventDefault()
+      submit()
+      return
+    }
+  })
+
+  return (
+    <DialogSelect
+      title={`Questions (${answeredCount()}/${questions().length} answered)`}
+      options={selectOptions()}
+      hideSearch={true}
+      keybind={[
+        {
+          keybind: { name: "return", ctrl: false, meta: false, shift: false, super: false, leader: false },
+          title: "open question",
+          onTrigger: (option) => {
+            if (option.onSelect) option.onSelect(dialog)
+          },
+        },
+        {
+          keybind: { name: "return", ctrl: true, meta: false, shift: false, super: false, leader: false },
+          title: "submit",
+          onTrigger: () => {
+            submit()
+            return false
+          },
+        },
+      ]}
+    />
+  )
+}
+
+// Static method to show the dialog
+DialogQuestion.show = (
+  dialog: DialogContext,
+  question: Question.Info,
+): Promise<{ answers: Answers; cancelled: boolean }> => {
+  // Create a persistent answers object that will be shared across re-renders
+  const persistentAnswers: Answers = {}
+
+  return new Promise((resolve) => {
+    let resolved = false
+
+    dialog.replace(
+      () => (
+        <DialogQuestion
+          question={question}
+          initialAnswers={persistentAnswers}
+          onSubmit={(answers) => {
+            if (resolved) return
+            resolved = true
+            resolve({ answers, cancelled: false })
+            // Clear dialog after resolving to prevent onClose from firing
+            setTimeout(() => dialog.clear(), 0)
+          }}
+          onCancel={() => {
+            if (resolved) return
+            resolved = true
+            dialog.clear()
+            resolve({ answers: {}, cancelled: true })
+          }}
+        />
+      ),
+      () => {
+        if (resolved) return
+        resolved = true
+        resolve({ answers: {}, cancelled: true })
+      },
+    )
+  })
+}
diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-question/helpers.ts b/packages/opencode/src/cli/cmd/tui/component/dialog-question/helpers.ts
new file mode 100644
index 00000000000..b7bcd383614
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/tui/component/dialog-question/helpers.ts
@@ -0,0 +1,40 @@
+import type { Question } from "@/question"
+import type { Answer } from "./types"
+
+export function formatAnswerPreview(item: Question.QuestionItem, answer?: Answer): string {
+  if (!answer || answer.value === undefined || answer.value === null) {
+    return "(not answered)"
+  }
+
+  if (item.type === "confirm") {
+    return answer.value ? "Yes" : "No"
+  }
+
+  if (item.type === "multi-select" && Array.isArray(answer.value)) {
+    if (answer.value.length === 0) return "(none selected)"
+    const labels = answer.value
+      .map((v) => item.options?.find((o) => o.value === v)?.label ?? v)
+      .slice(0, 2)
+      .join(", ")
+    if (answer.value.length > 2) {
+      return `${labels} +${answer.value.length - 2} more`
+    }
+    return labels
+  }
+
+  if (item.type === "select" && typeof answer.value === "string") {
+    const option = item.options?.find((o) => o.value === answer.value)
+    return option?.label ?? answer.value
+  }
+
+  if (typeof answer.value === "string") {
+    return truncate(answer.value, 40)
+  }
+
+  return String(answer.value)
+}
+
+export function truncate(str: string, maxLength: number): string {
+  if (str.length <= maxLength) return str
+  return str.slice(0, maxLength - 3) + "..."
+}
diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-question/index.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-question/index.tsx
new file mode 100644
index 00000000000..2110d278d58
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/tui/component/dialog-question/index.tsx
@@ -0,0 +1,8 @@
+export { DialogQuestion } from "./dialog-question"
+export { DialogQuestionSelect } from "./dialog-question-select"
+export { DialogQuestionMultiSelect } from "./dialog-question-multi-select"
+export { DialogQuestionConfirm } from "./dialog-question-confirm"
+export { DialogQuestionText } from "./dialog-question-text"
+export { DialogQuestionComment } from "./dialog-question-comment"
+export { formatAnswerPreview, truncate } from "./helpers"
+export type { Answer, Answers, QuestionDialogProps, SingleQuestionProps } from "./types"
diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-question/types.ts b/packages/opencode/src/cli/cmd/tui/component/dialog-question/types.ts
new file mode 100644
index 00000000000..5094a57979a
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/tui/component/dialog-question/types.ts
@@ -0,0 +1,23 @@
+import type { Question } from "@/question"
+
+// Types
+export interface Answer {
+  value: string | string[] | boolean | null
+  comment?: string
+}
+
+export type Answers = Record<string, Answer>
+
+export interface QuestionDialogProps {
+  question: Question.Info
+  onSubmit: (answers: Answers) => void
+  onCancel: () => void
+  initialAnswers?: Answers
+}
+
+export interface SingleQuestionProps {
+  item: Question.QuestionItem
+  currentAnswer?: Answer
+  onAnswer: (answer: Partial<Answer>) => void // Merges with current answer
+  onCancel: () => void
+}
diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index da31aeb88bb..c6d9d8c5b38 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -54,7 +54,7 @@ import type { PromptInfo } from "../../component/prompt/history"
 import { iife } from "@/util/iife"
 import { DialogConfirm } from "@tui/ui/dialog-confirm"
 import { DialogPrompt } from "@tui/ui/dialog-prompt"
-import { DialogQuestion } from "@tui/ui/dialog-question"
+import { DialogQuestion } from "@tui/component/dialog-question"
 import { DialogTimeline } from "./dialog-timeline"
 import { DialogSessionRename } from "../../component/dialog-session-rename"
 import { Sidebar } from "./sidebar"

From 99e03cd306b1627c9b7bc3dfe33193c6787b6935 Mon Sep 17 00:00:00 2001
From: dbpolito <danielbpolito@gmail.com>
Date: Mon, 15 Dec 2025 11:54:35 -0300
Subject: [PATCH 13/17] WIP

---
 .../dialog-question-confirm.tsx               |   7 +-
 .../dialog-question-multi-select.tsx          |  58 +++-----
 .../dialog-question-select.tsx                |   2 +-
 .../dialog-question/dialog-question-text.tsx  |  12 +-
 .../src/cli/cmd/tui/ui/dialog-select.tsx      |  33 ++---
 .../opencode/src/cli/cmd/tui/ui/dialog.tsx    |   3 +
 specs/ask-tool.md                             | 125 ++++++++++--------
 7 files changed, 125 insertions(+), 115 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-confirm.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-confirm.tsx
index 25a50a1edf0..35e8d1d1763 100644
--- a/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-confirm.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-confirm.tsx
@@ -45,12 +45,10 @@ export function DialogQuestionConfirm(props: SingleQuestionProps) {
     {
       title: "Yes",
       value: true,
-      onSelect: () => confirmSelection(true),
     },
     {
       title: "No",
       value: false,
-      onSelect: () => confirmSelection(false),
     },
   ])
 
@@ -60,6 +58,11 @@ export function DialogQuestionConfirm(props: SingleQuestionProps) {
       options={options()}
       current={typeof currentValue() === "boolean" ? currentValue() : undefined}
       hideSearch={true}
+      onSelect={(option) => {
+        if (typeof option.value === "boolean") {
+          confirmSelection(option.value)
+        }
+      }}
       beforeFooter={
         comment() ? (
           <box paddingLeft={4} paddingRight={4}>
diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-multi-select.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-multi-select.tsx
index c1090755307..2d99cdb6560 100644
--- a/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-multi-select.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-multi-select.tsx
@@ -1,8 +1,7 @@
-import { createEffect, createMemo, createSignal, onMount } from "solid-js"
-import { createStore } from "solid-js/store"
+import { createMemo, createSignal, onMount } from "solid-js"
 import { useTheme } from "@tui/context/theme"
 import { useDialog } from "@tui/ui/dialog"
-import { DialogSelect, type DialogSelectOption } from "@tui/ui/dialog-select"
+import { DialogMultiSelect, type DialogMultiSelectOption } from "@tui/ui/dialog-multiselect"
 import { DialogQuestionComment } from "./dialog-question-comment"
 import { truncate } from "./helpers"
 import type { SingleQuestionProps } from "./types"
@@ -10,7 +9,6 @@ import type { SingleQuestionProps } from "./types"
 export function DialogQuestionMultiSelect(props: SingleQuestionProps) {
   const dialog = useDialog()
   const { theme } = useTheme()
-  const [checked, setChecked] = createStore<Record<string, boolean>>({})
   const [comment, setComment] = createSignal<string | undefined>(props.currentAnswer?.comment)
 
   // Sort options with recommended first
@@ -19,15 +17,6 @@ export function DialogQuestionMultiSelect(props: SingleQuestionProps) {
     return [...opts].sort((a, b) => (b.recommended ? 1 : 0) - (a.recommended ? 1 : 0))
   })
 
-  // Initialize checked state from current answer
-  createEffect(() => {
-    if (Array.isArray(props.currentAnswer?.value)) {
-      for (const v of props.currentAnswer.value) {
-        setChecked(v, true)
-      }
-    }
-  })
-
   onMount(() => {
     dialog.setSize("medium")
   })
@@ -49,33 +38,35 @@ export function DialogQuestionMultiSelect(props: SingleQuestionProps) {
     ))
   }
 
-  function getSelectedValues(): string[] {
-    return sortedOptions()
-      .filter((o) => checked[o.value])
-      .map((o) => o.value)
-  }
-
-  function confirmSelection() {
-    props.onAnswer({ value: getSelectedValues() })
-    dialog.pop()
-  }
-
-  // Convert options to DialogSelectOption format
-  const selectOptions = createMemo<DialogSelectOption<{ value: string; label: string; recommended?: boolean }>[]>(() =>
+  // Convert options to DialogMultiSelectOption format
+  const selectOptions = createMemo<DialogMultiSelectOption<string>[]>(() =>
     sortedOptions().map((option) => ({
       title: option.label,
-      value: option,
-      footer: checked[option.value] ? "☑" : "☐",
-      onSelect: () => {}, // Don't close on select
+      value: option.value,
+      footer: option.recommended ? "(Recommended)" : undefined,
     })),
   )
 
+  // Get current values as array
+  const currentValues = createMemo(() => {
+    if (Array.isArray(props.currentAnswer?.value)) {
+      return props.currentAnswer.value
+    }
+    return []
+  })
+
+  function confirmSelection(selected: string[]) {
+    props.onAnswer({ value: selected })
+    dialog.pop()
+  }
+
   return (
-    <DialogSelect
+    <DialogMultiSelect
       title={props.item.question}
       options={selectOptions()}
+      current={currentValues()}
       hideSearch={true}
-      onSelect={() => confirmSelection()}
+      onSelect={confirmSelection}
       beforeFooter={
         comment() ? (
           <box paddingLeft={4} paddingRight={4}>
@@ -84,11 +75,6 @@ export function DialogQuestionMultiSelect(props: SingleQuestionProps) {
         ) : undefined
       }
       keybind={[
-        {
-          keybind: { name: "space", ctrl: false, meta: false, shift: false, super: false, leader: false },
-          title: "toggle",
-          onTrigger: (option) => setChecked(option.value.value, !checked[option.value.value]),
-        },
         {
           keybind: { name: "c", ctrl: false, meta: false, shift: false, super: false, leader: false },
           title: "add comment",
diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-select.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-select.tsx
index e26be467d6b..677669c53e7 100644
--- a/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-select.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-select.tsx
@@ -52,7 +52,6 @@ export function DialogQuestionSelect(props: SingleQuestionProps) {
       title: option.label,
       value: option,
       footer: option.recommended ? "(Recommended)" : undefined,
-      onSelect: () => confirmSelection(option),
     })),
   )
 
@@ -62,6 +61,7 @@ export function DialogQuestionSelect(props: SingleQuestionProps) {
       options={selectOptions()}
       current={sortedOptions().find((o) => o.value === currentValue())}
       hideSearch={true}
+      onSelect={(option) => confirmSelection(option.value)}
       beforeFooter={
         comment() ? (
           <box paddingLeft={4} paddingRight={4}>
diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-text.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-text.tsx
index 31d6ba1bd5b..2dec5abe578 100644
--- a/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-text.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question-text.tsx
@@ -7,16 +7,18 @@ export function DialogQuestionText(props: SingleQuestionProps) {
   const placeholder = typeof props.item.default === "string" ? props.item.default : "Enter your response..."
   const initialValue = typeof props.currentAnswer?.value === "string" ? props.currentAnswer.value : ""
 
+  function confirmText(value: string) {
+    const trimmedValue = value.trim()
+    props.onAnswer({ value: trimmedValue || null })
+    dialog.pop()
+  }
+
   return (
     <DialogPrompt
       title={props.item.question}
       placeholder={placeholder}
       value={initialValue}
-      onConfirm={(value) => {
-        const trimmedValue = value.trim()
-        props.onAnswer({ value: trimmedValue || null })
-        dialog.pop()
-      }}
+      onConfirm={confirmText}
       onCancel={() => props.onCancel()}
     />
   )
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
index d3564c354c8..e71c15cf54c 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
@@ -140,28 +140,31 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
   }
 
   const keybind = useKeybind()
+  const allKeybinds = createMemo(() => [
+    ...(props.keybind ?? []),
+    {
+      keybind: { name: "return", ctrl: false, meta: false, shift: false, super: false, leader: false },
+      title: "select",
+      disabled: false,
+      onTrigger: (option?: DialogSelectOption<T>) => {
+        if (option) {
+          props.onSelect?.(option)
+        }
+      },
+    },
+  ])
+
   useKeyboard((evt) => {
     if (evt.name === "up" || (evt.ctrl && evt.name === "p")) move(-1)
     if (evt.name === "down" || (evt.ctrl && evt.name === "n")) move(1)
     if (evt.name === "pageup") move(-10)
     if (evt.name === "pagedown") move(10)
-    if (evt.name === "return") {
-      const option = selected()
-      if (option) {
-        if (option.onSelect) option.onSelect(dialog)
-        props.onSelect?.(option)
-      }
-      return
-    }
 
-    for (const item of props.keybind ?? []) {
+    for (const item of allKeybinds()) {
       if (item.disabled) continue
       if (Keybind.match(item.keybind, keybind.parse(evt))) {
-        const s = selected()
-        if (s) {
-          evt.preventDefault()
-          item.onTrigger(s)
-        }
+        evt.preventDefault()
+        item.onTrigger(selected())
       }
     }
   })
@@ -177,7 +180,7 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
   }
   props.ref?.(ref)
 
-  const keybinds = createMemo(() => props.keybind?.filter((x) => !x.disabled) ?? [])
+  const keybinds = createMemo(() => allKeybinds().filter((x) => !x.disabled))
 
   return (
     <box gap={1} paddingBottom={1}>
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog.tsx
index 6e7fdbb3770..306ac154609 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog.tsx
@@ -97,6 +97,7 @@ function init() {
       refocus()
     },
     replace(input: any, onClose?: () => void) {
+      console.log("replace dialog", store.stack.length)
       if (store.stack.length === 0) {
         focus = renderer.currentFocusedRenderable
       }
@@ -112,6 +113,7 @@ function init() {
       ])
     },
     push(input: any, onClose?: () => void) {
+      console.log("push dialog", store.stack.length)
       if (store.stack.length === 0) {
         focus = renderer.currentFocusedRenderable
       }
@@ -124,6 +126,7 @@ function init() {
       ])
     },
     pop() {
+      console.log("popping dialog", store.stack.length)
       if (store.stack.length === 0) return
       setStore("stack", store.stack.slice(0, -1))
       if (store.stack.length === 0) refocus()
diff --git a/specs/ask-tool.md b/specs/ask-tool.md
index a97ef2fb055..4f92ab722c4 100644
--- a/specs/ask-tool.md
+++ b/specs/ask-tool.md
@@ -7,6 +7,7 @@ This document outlines the implementation plan for adding an `ask` tool to OpenC
 ## Feature Summary
 
 The `ask` tool enables Claude to:
+
 - Ask single or multiple questions in one tool call
 - Support different question types (select, multi-select, confirm, text)
 - Mark recommended options
@@ -16,12 +17,12 @@ The `ask` tool enables Claude to:
 
 ### Question Types
 
-| Type | Description | UI Component |
-|------|-------------|--------------|
-| `select` | Single selection from options | DialogQuestionSelect |
+| Type           | Description                      | UI Component              |
+| -------------- | -------------------------------- | ------------------------- |
+| `select`       | Single selection from options    | DialogQuestionSelect      |
 | `multi-select` | Multiple selections from options | DialogQuestionMultiSelect |
-| `confirm` | Yes/No question | DialogQuestionConfirm |
-| `text` | Free-form text input | DialogQuestionText |
+| `confirm`      | Yes/No question                  | DialogQuestionConfirm     |
+| `text`         | Free-form text input             | DialogQuestionText        |
 
 ### Multi-Question Flow
 
@@ -56,6 +57,7 @@ When only 1 question is asked, skip the list view and open the question dialog d
 ### Nested Dialogs
 
 Questions use nested dialogs:
+
 - Main dialog shows question list
 - Selecting a question opens its specific dialog (select, text, etc.)
 - ESC returns to list without saving changes
@@ -95,18 +97,29 @@ Any question can have an optional comment added via the `c` key, providing addit
 
 ```typescript
 parameters: z.object({
-  questions: z.array(z.object({
-    id: z.string().describe("Unique identifier for this question"),
-    type: z.enum(["select", "multi-select", "confirm", "text"]),
-    question: z.string().describe("The question to ask the user"),
-    options: z.array(z.object({
-      value: z.string(),
-      label: z.string(),
-      recommended: z.boolean().optional(),
-    })).optional().describe("Options for select/multi-select types"),
-    default: z.union([z.string(), z.array(z.string()), z.boolean()]).optional()
-      .describe("Default value shown as hint (not pre-selected)"),
-  })).min(1),
+  questions: z
+    .array(
+      z.object({
+        id: z.string().describe("Unique identifier for this question"),
+        type: z.enum(["select", "multi-select", "confirm", "text"]),
+        question: z.string().describe("The question to ask the user"),
+        options: z
+          .array(
+            z.object({
+              value: z.string(),
+              label: z.string(),
+              recommended: z.boolean().optional(),
+            }),
+          )
+          .optional()
+          .describe("Options for select/multi-select types"),
+        default: z
+          .union([z.string(), z.array(z.string()), z.boolean()])
+          .optional()
+          .describe("Default value shown as hint (not pre-selected)"),
+      }),
+    )
+    .min(1),
 })
 ```
 
@@ -324,47 +337,47 @@ export type Question = {
 
 ### Phase 1: Core Infrastructure
 
-| # | Task | File(s) | Description |
-|---|------|---------|-------------|
-| 1 | Add push/pop to dialog | `ui/dialog.tsx` | Enable nested dialog support |
-| 2 | Create Question namespace | `question/index.ts` | State, events, ask/respond functions |
-| 3 | Add server routes | `server/server.ts` | POST /question/respond endpoint |
-| 4 | Add SDK types | `packages/sdk/...` | Question, QuestionItem, QuestionAnswer types |
-| 5 | Add sync state | `context/sync.tsx` | Question state and event handling |
+| #   | Task                      | File(s)             | Description                                  |
+| --- | ------------------------- | ------------------- | -------------------------------------------- |
+| 1   | Add push/pop to dialog    | `ui/dialog.tsx`     | Enable nested dialog support                 |
+| 2   | Create Question namespace | `question/index.ts` | State, events, ask/respond functions         |
+| 3   | Add server routes         | `server/server.ts`  | POST /question/respond endpoint              |
+| 4   | Add SDK types             | `packages/sdk/...`  | Question, QuestionItem, QuestionAnswer types |
+| 5   | Add sync state            | `context/sync.tsx`  | Question state and event handling            |
 
 ### Phase 2: Tool Implementation
 
-| # | Task | File(s) | Description |
-|---|------|---------|-------------|
-| 6 | Create AskTool | `tool/ask.ts` | Tool definition with full schema |
-| 7 | Register tool | `tool/registry.ts` | Add AskTool to built-in tools |
+| #   | Task           | File(s)            | Description                      |
+| --- | -------------- | ------------------ | -------------------------------- |
+| 6   | Create AskTool | `tool/ask.ts`      | Tool definition with full schema |
+| 7   | Register tool  | `tool/registry.ts` | Add AskTool to built-in tools    |
 
 ### Phase 3: TUI Components
 
-| # | Task | File(s) | Description |
-|---|------|---------|-------------|
-| 8 | DialogQuestion | `ui/dialog-question.tsx` | Main question list component |
-| 9 | DialogQuestionSelect | `ui/dialog-question.tsx` | Single select dialog |
-| 10 | DialogQuestionMultiSelect | `ui/dialog-question.tsx` | Multi-select with checkboxes |
-| 11 | DialogQuestionText | `ui/dialog-question.tsx` | Text input dialog |
-| 12 | DialogQuestionConfirm | `ui/dialog-question.tsx` | Yes/No dialog |
-| 13 | DialogQuestionComment | `ui/dialog-question.tsx` | Comment input overlay |
+| #   | Task                      | File(s)                  | Description                  |
+| --- | ------------------------- | ------------------------ | ---------------------------- |
+| 8   | DialogQuestion            | `ui/dialog-question.tsx` | Main question list component |
+| 9   | DialogQuestionSelect      | `ui/dialog-question.tsx` | Single select dialog         |
+| 10  | DialogQuestionMultiSelect | `ui/dialog-question.tsx` | Multi-select with checkboxes |
+| 11  | DialogQuestionText        | `ui/dialog-question.tsx` | Text input dialog            |
+| 12  | DialogQuestionConfirm     | `ui/dialog-question.tsx` | Yes/No dialog                |
+| 13  | DialogQuestionComment     | `ui/dialog-question.tsx` | Comment input overlay        |
 
 ### Phase 4: Integration
 
-| # | Task | File(s) | Description |
-|---|------|---------|-------------|
-| 14 | Session integration | `routes/session/index.tsx` | Auto-open dialog, keyboard handling |
-| 15 | Footer indicator | `routes/session/footer.tsx` | Show "◉ 1 Question" like permissions |
-| 16 | Tool renderer | `routes/session/index.tsx` | Show Q&A summary in message stream |
-| 17 | Abort handling | `question/index.ts` | Auto-reject on session abort |
-| 18 | Single question opt | `ui/dialog-question.tsx` | Skip list for single question |
+| #   | Task                | File(s)                     | Description                          |
+| --- | ------------------- | --------------------------- | ------------------------------------ |
+| 14  | Session integration | `routes/session/index.tsx`  | Auto-open dialog, keyboard handling  |
+| 15  | Footer indicator    | `routes/session/footer.tsx` | Show "◉ 1 Question" like permissions |
+| 16  | Tool renderer       | `routes/session/index.tsx`  | Show Q&A summary in message stream   |
+| 17  | Abort handling      | `question/index.ts`         | Auto-reject on session abort         |
+| 18  | Single question opt | `ui/dialog-question.tsx`    | Skip list for single question        |
 
 ### Phase 5: Documentation
 
-| # | Task | File(s) | Description |
-|---|------|---------|-------------|
-| 19 | System prompt | TBD | Document ask tool usage for Claude |
+| #   | Task          | File(s) | Description                        |
+| --- | ------------- | ------- | ---------------------------------- |
+| 19  | System prompt | TBD     | Document ask tool usage for Claude |
 
 ## Component Details
 
@@ -454,6 +467,7 @@ function DialogQuestionSelect(props: DialogQuestionSelectProps) {
 ### DialogQuestionMultiSelect
 
 Similar to DialogQuestionSelect but:
+
 - Uses checkboxes (☑/☐) instead of radio buttons
 - `space` toggles selection
 - `enter` confirms all selections
@@ -486,11 +500,7 @@ function DialogQuestionText(props: DialogQuestionTextProps) {
 ### DialogQuestionComment
 
 ```typescript
-function DialogQuestionComment(props: {
-  value?: string
-  onSave: (comment: string) => void
-  onCancel: () => void
-}) {
+function DialogQuestionComment(props: { value?: string; onSave: (comment: string) => void; onCancel: () => void }) {
   // Simple textarea dialog
   // enter saves, esc cancels
 }
@@ -577,6 +587,7 @@ ToolRegistry.register<typeof AskTool>({
 ## Dependencies
 
 No new external dependencies required. Uses existing:
+
 - Solid.js for reactivity
 - OpenTUI for rendering
 - Zod for schema validation
@@ -584,18 +595,19 @@ No new external dependencies required. Uses existing:
 
 ## Risks & Mitigations
 
-| Risk | Mitigation |
-|------|------------|
+| Risk                         | Mitigation                                             |
+| ---------------------------- | ------------------------------------------------------ |
 | Nested dialogs complex state | Keep state local to DialogQuestion, use solid-js/store |
-| ESC key conflicts | Check stack depth before handling |
-| Long questions overflow | Use wrapMode and scrolling |
-| Focus management in nested | Leverage existing dialog focus save/restore |
+| ESC key conflicts            | Check stack depth before handling                      |
+| Long questions overflow      | Use wrapMode and scrolling                             |
+| Focus management in nested   | Leverage existing dialog focus save/restore            |
 
 ---
 
 ## Appendix: Example Usage
 
 ### Tool Call (from Claude)
+
 ```json
 {
   "name": "ask",
@@ -641,6 +653,7 @@ No new external dependencies required. Uses existing:
 ```
 
 ### Tool Response (to Claude)
+
 ```json
 {
   "framework": { "value": "react", "comment": "We already use React in other projects" },

From 4b8ac51f5d646e468e43a6426b0a593396b0bcae Mon Sep 17 00:00:00 2001
From: dbpolito <danielbpolito@gmail.com>
Date: Mon, 15 Dec 2025 11:57:29 -0300
Subject: [PATCH 14/17] WIP

---
 .../src/cli/cmd/tui/ui/dialog-multiselect.tsx | 353 ++++++++++++++++++
 1 file changed, 353 insertions(+)
 create mode 100644 packages/opencode/src/cli/cmd/tui/ui/dialog-multiselect.tsx

diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-multiselect.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-multiselect.tsx
new file mode 100644
index 00000000000..0df99161691
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-multiselect.tsx
@@ -0,0 +1,353 @@
+import { InputRenderable, RGBA, ScrollBoxRenderable, TextAttributes } from "@opentui/core"
+import { useTheme, selectedForeground } from "@tui/context/theme"
+import { entries, filter, flatMap, groupBy, pipe } from "remeda"
+import { batch, createEffect, createMemo, For, Show, type JSX } from "solid-js"
+import { createStore } from "solid-js/store"
+import { useKeyboard, useTerminalDimensions } from "@opentui/solid"
+import * as fuzzysort from "fuzzysort"
+import { isDeepEqual } from "remeda"
+import { useDialog } from "@tui/ui/dialog"
+import { useKeybind } from "@tui/context/keybind"
+import { Keybind } from "@/util/keybind"
+import { Locale } from "@/util/locale"
+
+export interface DialogMultiSelectProps<T> {
+  title: string
+  placeholder?: string
+  options: DialogMultiSelectOption<T>[]
+  ref?: (ref: DialogMultiSelectRef<T>) => void
+  onMove?: (option: DialogMultiSelectOption<T>) => void
+  onFilter?: (query: string) => void
+  onSelect?: (selected: T[]) => void
+  keybind?: {
+    keybind: Keybind.Info
+    title: string
+    disabled?: boolean
+    onTrigger: (option?: DialogMultiSelectOption<T>) => void
+  }[]
+  current?: T[]
+  hideSearch?: boolean
+  beforeFooter?: JSX.Element
+}
+
+export interface DialogMultiSelectOption<T = any> {
+  title: string
+  value: T
+  description?: string
+  footer?: JSX.Element | string
+  category?: string
+  disabled?: boolean
+  bg?: RGBA
+  gutter?: JSX.Element
+}
+
+export type DialogMultiSelectRef<T> = {
+  filter: string
+  filtered: DialogMultiSelectOption<T>[]
+}
+
+export function DialogMultiSelect<T>(props: DialogMultiSelectProps<T>) {
+  const dialog = useDialog()
+  const { theme } = useTheme()
+  const [store, setStore] = createStore({
+    selected: 0,
+    filter: "",
+  })
+  const [selectedValues, setSelectedValues] = createStore<Record<string, boolean>>({})
+
+  // Initialize selected values from current array
+  createEffect(() => {
+    if (props.current && props.current.length > 0) {
+      const newSelected: Record<string, boolean> = {}
+      for (const val of props.current) {
+        newSelected[JSON.stringify(val)] = true
+      }
+      setSelectedValues(newSelected)
+    }
+  })
+
+  const isSelected = (value: T) => selectedValues[JSON.stringify(value)] ?? false
+
+  let input: InputRenderable
+
+  const filtered = createMemo(() => {
+    const needle = store.filter.toLowerCase()
+    const result = pipe(
+      props.options,
+      filter((x) => x.disabled !== true),
+      (x) => (!needle ? x : fuzzysort.go(needle, x, { keys: ["title", "category"] }).map((x) => x.obj)),
+    )
+    return result
+  })
+
+  const grouped = createMemo(() => {
+    const result = pipe(
+      filtered(),
+      groupBy((x) => x.category ?? ""),
+      entries(),
+    )
+    return result
+  })
+
+  const flat = createMemo(() => {
+    return pipe(
+      grouped(),
+      flatMap(([_, options]) => options),
+    )
+  })
+
+  const dimensions = useTerminalDimensions()
+  const height = createMemo(() =>
+    Math.min(flat().length + grouped().length * 2 - 1, Math.floor(dimensions().height / 2) - 6),
+  )
+
+  const selected = createMemo(() => flat()[store.selected])
+
+  createEffect(() => {
+    store.filter
+    if (store.filter.length > 0) {
+      setStore("selected", 0)
+    }
+    scroll.scrollTo(0)
+  })
+
+  function move(direction: number) {
+    let next = store.selected + direction
+    if (next < 0) next = flat().length - 1
+    if (next >= flat().length) next = 0
+    moveTo(next)
+  }
+
+  function moveTo(next: number) {
+    setStore("selected", next)
+    props.onMove?.(selected()!)
+    const target = scroll.getChildren().find((child) => {
+      return child.id === JSON.stringify(selected()?.value)
+    })
+    if (!target) return
+    const y = target.y - scroll.y
+    if (y >= scroll.height) {
+      scroll.scrollBy(y - scroll.height + 1)
+    }
+    if (y < 0) {
+      scroll.scrollBy(y)
+      if (isDeepEqual(flat()[0].value, selected()?.value)) {
+        scroll.scrollTo(0)
+      }
+    }
+  }
+
+  function toggleSelection() {
+    const option = selected()
+    if (option) {
+      const key = JSON.stringify(option.value)
+      setSelectedValues(key, !selectedValues[key])
+    }
+  }
+
+  function getSelectedValues(): T[] {
+    return flat()
+      .filter((opt) => isSelected(opt.value))
+      .map((opt) => opt.value)
+  }
+
+  const keybind = useKeybind()
+  const allKeybinds = createMemo(() => [
+    ...(props.keybind ?? []),
+    {
+      keybind: { name: "space", ctrl: false, meta: false, shift: false, super: false, leader: false },
+      title: "toggle",
+      disabled: false,
+      onTrigger: () => toggleSelection(),
+    },
+    {
+      keybind: { name: "return", ctrl: false, meta: false, shift: false, super: false, leader: false },
+      title: "select",
+      disabled: false,
+      onTrigger: () => props.onSelect?.(getSelectedValues()),
+    },
+  ])
+
+  useKeyboard((evt) => {
+    if (evt.name === "up" || (evt.ctrl && evt.name === "p")) move(-1)
+    if (evt.name === "down" || (evt.ctrl && evt.name === "n")) move(1)
+    if (evt.name === "pageup") move(-10)
+    if (evt.name === "pagedown") move(10)
+
+    for (const item of allKeybinds()) {
+      if (item.disabled) continue
+      if (Keybind.match(item.keybind, keybind.parse(evt))) {
+        evt.preventDefault()
+        item.onTrigger(selected())
+      }
+    }
+  })
+
+  let scroll: ScrollBoxRenderable
+  const ref: DialogMultiSelectRef<T> = {
+    get filter() {
+      return store.filter
+    },
+    get filtered() {
+      return filtered()
+    },
+  }
+  props.ref?.(ref)
+
+  const keybinds = createMemo(() => allKeybinds().filter((x) => !x.disabled))
+
+  return (
+    <box gap={1} paddingBottom={1}>
+      <box paddingLeft={4} paddingRight={4}>
+        <box flexDirection="row" justifyContent="space-between">
+          <text fg={theme.text} attributes={TextAttributes.BOLD}>
+            {props.title}
+          </text>
+          <text fg={theme.textMuted}>esc</text>
+        </box>
+        {!props.hideSearch ? (
+          <box paddingTop={1} paddingBottom={1}>
+            <input
+              onInput={(e) => {
+                batch(() => {
+                  setStore("filter", e)
+                  props.onFilter?.(e)
+                })
+              }}
+              focusedBackgroundColor={theme.backgroundPanel}
+              cursorColor={theme.primary}
+              focusedTextColor={theme.textMuted}
+              ref={(r) => {
+                input = r
+                setTimeout(() => input.focus(), 1)
+              }}
+              placeholder={props.placeholder ?? "Search"}
+            />
+          </box>
+        ) : (
+          <box height={0} overflow="hidden" position="absolute" top={-9999}>
+            <input
+              onInput={() => {}}
+              ref={(r) => {
+                input = r
+                setTimeout(() => input.focus(), 1)
+              }}
+            />
+          </box>
+        )}
+      </box>
+      <scrollbox
+        paddingLeft={1}
+        paddingRight={1}
+        scrollbarOptions={{ visible: false }}
+        ref={(r: ScrollBoxRenderable) => (scroll = r)}
+        maxHeight={height()}
+      >
+        <For each={grouped()}>
+          {([category, options], index) => (
+            <>
+              <Show when={category}>
+                <box paddingTop={index() > 0 ? 1 : 0} paddingLeft={3}>
+                  <text fg={theme.accent} attributes={TextAttributes.BOLD}>
+                    {category}
+                  </text>
+                </box>
+              </Show>
+              <For each={options}>
+                {(option) => {
+                  const active = createMemo(() => isDeepEqual(option.value, selected()?.value))
+                  const checked = createMemo(() => isSelected(option.value))
+                  return (
+                    <box
+                      id={JSON.stringify(option.value)}
+                      flexDirection="row"
+                      onMouseUp={() => {
+                        const key = JSON.stringify(option.value)
+                        setSelectedValues(key, !selectedValues[key])
+                      }}
+                      onMouseOver={() => {
+                        const index = filtered().findIndex((x) => isDeepEqual(x.value, option.value))
+                        if (index === -1) return
+                        moveTo(index)
+                      }}
+                      backgroundColor={active() ? (option.bg ?? theme.primary) : RGBA.fromInts(0, 0, 0, 0)}
+                      paddingLeft={1}
+                      paddingRight={3}
+                      gap={1}
+                    >
+                      <MultiSelectOption
+                        title={option.title}
+                        footer={option.footer}
+                        description={option.description !== category ? option.description : undefined}
+                        active={active()}
+                        checked={checked()}
+                        gutter={option.gutter}
+                      />
+                    </box>
+                  )
+                }}
+              </For>
+            </>
+          )}
+        </For>
+      </scrollbox>
+      <Show when={props.beforeFooter || keybinds().length} fallback={<box flexShrink={0} />}>
+        <box paddingTop={1}>
+          <Show when={props.beforeFooter}>{props.beforeFooter}</Show>
+          <Show when={keybinds().length} fallback={<box flexShrink={0} />}>
+            <box paddingRight={2} paddingLeft={4} flexDirection="row" gap={2} flexShrink={0}>
+              <For each={keybinds()}>
+                {(item) => (
+                  <text>
+                    <span style={{ fg: theme.text }}>
+                      <b>{item.title}</b>{" "}
+                    </span>
+                    <span style={{ fg: theme.textMuted }}>{Keybind.toString(item.keybind)}</span>
+                  </text>
+                )}
+              </For>
+            </box>
+          </Show>
+        </box>
+      </Show>
+    </box>
+  )
+}
+
+function MultiSelectOption(props: {
+  title: string
+  description?: string
+  active?: boolean
+  checked?: boolean
+  footer?: JSX.Element | string
+  gutter?: JSX.Element
+}) {
+  const { theme } = useTheme()
+  const fg = selectedForeground(theme)
+
+  return (
+    <>
+      <text flexShrink={0} fg={props.checked ? (props.active ? fg : theme.primary) : "transparent"} marginRight={0.5}>
+        ●
+      </text>
+      <text
+        flexGrow={1}
+        fg={props.active ? fg : theme.text}
+        attributes={props.active ? TextAttributes.BOLD : undefined}
+        overflow="hidden"
+        wrapMode="word"
+        paddingLeft={3}
+      >
+        {Locale.truncate(props.title, 62)}
+        <Show when={props.description}>
+          <span style={{ fg: props.active ? fg : theme.textMuted }}> {props.description}</span>
+        </Show>
+      </text>
+      <Show when={props.footer}>
+        <box flexShrink={0}>
+          <text fg={props.active ? fg : theme.textMuted}>{props.footer}</text>
+        </box>
+      </Show>
+    </>
+  )
+}

From 7c49face931dfb305ea1c7f1f84030f2509a0b75 Mon Sep 17 00:00:00 2001
From: dbpolito <danielbpolito@gmail.com>
Date: Mon, 15 Dec 2025 12:07:57 -0300
Subject: [PATCH 15/17] WIP

---
 .../cmd/tui/component/dialog-question/dialog-question.tsx  | 7 -------
 .../opencode/src/cli/cmd/tui/ui/dialog-multiselect.tsx     | 2 +-
 packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx     | 3 ++-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question.tsx
index 87e77200ae9..8bfb6facc26 100644
--- a/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/dialog-question/dialog-question.tsx
@@ -91,13 +91,6 @@ export function DialogQuestion(props: QuestionDialogProps) {
       options={selectOptions()}
       hideSearch={true}
       keybind={[
-        {
-          keybind: { name: "return", ctrl: false, meta: false, shift: false, super: false, leader: false },
-          title: "open question",
-          onTrigger: (option) => {
-            if (option.onSelect) option.onSelect(dialog)
-          },
-        },
         {
           keybind: { name: "return", ctrl: true, meta: false, shift: false, super: false, leader: false },
           title: "submit",
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-multiselect.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-multiselect.tsx
index 0df99161691..92e416f824c 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-multiselect.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-multiselect.tsx
@@ -153,7 +153,6 @@ export function DialogMultiSelect<T>(props: DialogMultiSelectProps<T>) {
 
   const keybind = useKeybind()
   const allKeybinds = createMemo(() => [
-    ...(props.keybind ?? []),
     {
       keybind: { name: "space", ctrl: false, meta: false, shift: false, super: false, leader: false },
       title: "toggle",
@@ -166,6 +165,7 @@ export function DialogMultiSelect<T>(props: DialogMultiSelectProps<T>) {
       disabled: false,
       onTrigger: () => props.onSelect?.(getSelectedValues()),
     },
+    ...(props.keybind ?? []),
   ])
 
   useKeyboard((evt) => {
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
index e71c15cf54c..31229fd597a 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
@@ -141,17 +141,18 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
 
   const keybind = useKeybind()
   const allKeybinds = createMemo(() => [
-    ...(props.keybind ?? []),
     {
       keybind: { name: "return", ctrl: false, meta: false, shift: false, super: false, leader: false },
       title: "select",
       disabled: false,
       onTrigger: (option?: DialogSelectOption<T>) => {
         if (option) {
+          option.onSelect?.(dialog)
           props.onSelect?.(option)
         }
       },
     },
+    ...(props.keybind ?? []),
   ])
 
   useKeyboard((evt) => {

From d7d163c67dbaf54fb65c7dedb631f6fba00101ca Mon Sep 17 00:00:00 2001
From: dbpolito <danielbpolito@gmail.com>
Date: Mon, 15 Dec 2025 16:15:08 -0300
Subject: [PATCH 16/17] Fix CI

---
 packages/sdk/js/src/v2/gen/sdk.gen.ts   |  84 ++++++
 packages/sdk/js/src/v2/gen/types.gen.ts | 117 ++++++++
 packages/sdk/openapi.json               | 341 ++++++++++++++++++++++++
 3 files changed, 542 insertions(+)

diff --git a/packages/sdk/js/src/v2/gen/sdk.gen.ts b/packages/sdk/js/src/v2/gen/sdk.gen.ts
index 16fe07ae4a8..04ffe49457a 100644
--- a/packages/sdk/js/src/v2/gen/sdk.gen.ts
+++ b/packages/sdk/js/src/v2/gen/sdk.gen.ts
@@ -71,6 +71,10 @@ import type {
   PtyRemoveResponses,
   PtyUpdateErrors,
   PtyUpdateResponses,
+  QuestionRejectErrors,
+  QuestionRejectResponses,
+  QuestionRespondErrors,
+  QuestionRespondResponses,
   SessionAbortErrors,
   SessionAbortResponses,
   SessionChildrenErrors,
@@ -1527,6 +1531,84 @@ export class Permission extends HeyApiClient {
   }
 }
 
+export class Question extends HeyApiClient {
+  /**
+   * Respond to question
+   *
+   * Submit answers to a question asked by the AI assistant.
+   */
+  public respond<ThrowOnError extends boolean = false>(
+    parameters: {
+      sessionID: string
+      questionID: string
+      directory?: string
+      answers?: {
+        [key: string]: {
+          value: string | Array<string> | boolean | null
+          comment?: string
+        }
+      }
+    },
+    options?: Options<never, ThrowOnError>,
+  ) {
+    const params = buildClientParams(
+      [parameters],
+      [
+        {
+          args: [
+            { in: "path", key: "sessionID" },
+            { in: "path", key: "questionID" },
+            { in: "query", key: "directory" },
+            { in: "body", key: "answers" },
+          ],
+        },
+      ],
+    )
+    return (options?.client ?? this.client).post<QuestionRespondResponses, QuestionRespondErrors, ThrowOnError>({
+      url: "/session/{sessionID}/questions/{questionID}",
+      ...options,
+      ...params,
+      headers: {
+        "Content-Type": "application/json",
+        ...options?.headers,
+        ...params.headers,
+      },
+    })
+  }
+
+  /**
+   * Reject question
+   *
+   * Cancel a question asked by the AI assistant.
+   */
+  public reject<ThrowOnError extends boolean = false>(
+    parameters: {
+      sessionID: string
+      questionID: string
+      directory?: string
+    },
+    options?: Options<never, ThrowOnError>,
+  ) {
+    const params = buildClientParams(
+      [parameters],
+      [
+        {
+          args: [
+            { in: "path", key: "sessionID" },
+            { in: "path", key: "questionID" },
+            { in: "query", key: "directory" },
+          ],
+        },
+      ],
+    )
+    return (options?.client ?? this.client).post<QuestionRejectResponses, QuestionRejectErrors, ThrowOnError>({
+      url: "/session/{sessionID}/questions/{questionID}/reject",
+      ...options,
+      ...params,
+    })
+  }
+}
+
 export class Command extends HeyApiClient {
   /**
    * List commands
@@ -2590,6 +2672,8 @@ export class OpencodeClient extends HeyApiClient {
 
   permission = new Permission({ client: this.client })
 
+  question = new Question({ client: this.client })
+
   command = new Command({ client: this.client })
 
   provider = new Provider({ client: this.client })
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index a9270956140..a20e7c45535 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -476,6 +476,46 @@ export type EventPermissionReplied = {
   }
 }
 
+export type Question = {
+  id: string
+  sessionID: string
+  messageID: string
+  callID?: string
+  questions: Array<{
+    id: string
+    type: "select" | "multi-select" | "confirm" | "text"
+    question: string
+    options?: Array<{
+      value: string
+      label: string
+      recommended?: boolean
+    }>
+    default?: string | Array<string> | boolean
+  }>
+  time: {
+    created: number
+  }
+}
+
+export type EventQuestionUpdated = {
+  type: "question.updated"
+  properties: Question
+}
+
+export type EventQuestionReplied = {
+  type: "question.replied"
+  properties: {
+    sessionID: string
+    questionID: string
+    answers: {
+      [key: string]: {
+        value: string | Array<string> | boolean | null
+        comment?: string
+      }
+    }
+  }
+}
+
 export type EventFileEdited = {
   type: "file.edited"
   properties: {
@@ -746,6 +786,8 @@ export type Event =
   | EventMessagePartRemoved
   | EventPermissionUpdated
   | EventPermissionReplied
+  | EventQuestionUpdated
+  | EventQuestionReplied
   | EventFileEdited
   | EventTodoUpdated
   | EventSessionStatus
@@ -3135,6 +3177,81 @@ export type PermissionRespondResponses = {
 
 export type PermissionRespondResponse = PermissionRespondResponses[keyof PermissionRespondResponses]
 
+export type QuestionRespondData = {
+  body?: {
+    answers: {
+      [key: string]: {
+        value: string | Array<string> | boolean | null
+        comment?: string
+      }
+    }
+  }
+  path: {
+    sessionID: string
+    questionID: string
+  }
+  query?: {
+    directory?: string
+  }
+  url: "/session/{sessionID}/questions/{questionID}"
+}
+
+export type QuestionRespondErrors = {
+  /**
+   * Bad request
+   */
+  400: BadRequestError
+  /**
+   * Not found
+   */
+  404: NotFoundError
+}
+
+export type QuestionRespondError = QuestionRespondErrors[keyof QuestionRespondErrors]
+
+export type QuestionRespondResponses = {
+  /**
+   * Question answered successfully
+   */
+  200: boolean
+}
+
+export type QuestionRespondResponse = QuestionRespondResponses[keyof QuestionRespondResponses]
+
+export type QuestionRejectData = {
+  body?: never
+  path: {
+    sessionID: string
+    questionID: string
+  }
+  query?: {
+    directory?: string
+  }
+  url: "/session/{sessionID}/questions/{questionID}/reject"
+}
+
+export type QuestionRejectErrors = {
+  /**
+   * Bad request
+   */
+  400: BadRequestError
+  /**
+   * Not found
+   */
+  404: NotFoundError
+}
+
+export type QuestionRejectError = QuestionRejectErrors[keyof QuestionRejectErrors]
+
+export type QuestionRejectResponses = {
+  /**
+   * Question rejected successfully
+   */
+  200: boolean
+}
+
+export type QuestionRejectResponse = QuestionRejectResponses[keyof QuestionRejectResponses]
+
 export type CommandListData = {
   body?: never
   path?: never
diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json
index 5a978c69c61..e20504997d1 100644
--- a/packages/sdk/openapi.json
+++ b/packages/sdk/openapi.json
@@ -2673,6 +2673,192 @@
         ]
       }
     },
+    "/session/{sessionID}/questions/{questionID}": {
+      "post": {
+        "operationId": "question.respond",
+        "parameters": [
+          {
+            "in": "query",
+            "name": "directory",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "sessionID",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "in": "path",
+            "name": "questionID",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          }
+        ],
+        "summary": "Respond to question",
+        "description": "Submit answers to a question asked by the AI assistant.",
+        "responses": {
+          "200": {
+            "description": "Question answered successfully",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/BadRequestError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/NotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "answers": {
+                    "type": "object",
+                    "propertyNames": {
+                      "type": "string"
+                    },
+                    "additionalProperties": {
+                      "type": "object",
+                      "properties": {
+                        "value": {
+                          "anyOf": [
+                            {
+                              "type": "string"
+                            },
+                            {
+                              "type": "array",
+                              "items": {
+                                "type": "string"
+                              }
+                            },
+                            {
+                              "type": "boolean"
+                            },
+                            {
+                              "type": "null"
+                            }
+                          ]
+                        },
+                        "comment": {
+                          "type": "string"
+                        }
+                      },
+                      "required": ["value"]
+                    }
+                  }
+                },
+                "required": ["answers"]
+              }
+            }
+          }
+        },
+        "x-codeSamples": [
+          {
+            "lang": "js",
+            "source": "import { createOpencodeClient } from \"@opencode-ai/sdk\n\nconst client = createOpencodeClient()\nawait client.question.respond({\n  ...\n})"
+          }
+        ]
+      }
+    },
+    "/session/{sessionID}/questions/{questionID}/reject": {
+      "post": {
+        "operationId": "question.reject",
+        "parameters": [
+          {
+            "in": "query",
+            "name": "directory",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "sessionID",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "in": "path",
+            "name": "questionID",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          }
+        ],
+        "summary": "Reject question",
+        "description": "Cancel a question asked by the AI assistant.",
+        "responses": {
+          "200": {
+            "description": "Question rejected successfully",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/BadRequestError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/NotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "x-codeSamples": [
+          {
+            "lang": "js",
+            "source": "import { createOpencodeClient } from \"@opencode-ai/sdk\n\nconst client = createOpencodeClient()\nawait client.question.reject({\n  ...\n})"
+          }
+        ]
+      }
+    },
     "/command": {
       "get": {
         "operationId": "command.list",
@@ -6156,6 +6342,155 @@
         },
         "required": ["type", "properties"]
       },
+      "Question": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "sessionID": {
+            "type": "string"
+          },
+          "messageID": {
+            "type": "string"
+          },
+          "callID": {
+            "type": "string"
+          },
+          "questions": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "id": {
+                  "type": "string"
+                },
+                "type": {
+                  "type": "string",
+                  "enum": ["select", "multi-select", "confirm", "text"]
+                },
+                "question": {
+                  "type": "string"
+                },
+                "options": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "value": {
+                        "type": "string"
+                      },
+                      "label": {
+                        "type": "string"
+                      },
+                      "recommended": {
+                        "type": "boolean"
+                      }
+                    },
+                    "required": ["value", "label"]
+                  }
+                },
+                "default": {
+                  "anyOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "type": "array",
+                      "items": {
+                        "type": "string"
+                      }
+                    },
+                    {
+                      "type": "boolean"
+                    }
+                  ]
+                }
+              },
+              "required": ["id", "type", "question"]
+            }
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              }
+            },
+            "required": ["created"]
+          }
+        },
+        "required": ["id", "sessionID", "messageID", "questions", "time"]
+      },
+      "Event.question.updated": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "const": "question.updated"
+          },
+          "properties": {
+            "$ref": "#/components/schemas/Question"
+          }
+        },
+        "required": ["type", "properties"]
+      },
+      "Event.question.replied": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "const": "question.replied"
+          },
+          "properties": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string"
+              },
+              "questionID": {
+                "type": "string"
+              },
+              "answers": {
+                "type": "object",
+                "propertyNames": {
+                  "type": "string"
+                },
+                "additionalProperties": {
+                  "type": "object",
+                  "properties": {
+                    "value": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "array",
+                          "items": {
+                            "type": "string"
+                          }
+                        },
+                        {
+                          "type": "boolean"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "comment": {
+                      "type": "string"
+                    }
+                  },
+                  "required": ["value"]
+                }
+              }
+            },
+            "required": ["sessionID", "questionID", "answers"]
+          }
+        },
+        "required": ["type", "properties"]
+      },
       "Event.file.edited": {
         "type": "object",
         "properties": {
@@ -6890,6 +7225,12 @@
           {
             "$ref": "#/components/schemas/Event.permission.replied"
           },
+          {
+            "$ref": "#/components/schemas/Event.question.updated"
+          },
+          {
+            "$ref": "#/components/schemas/Event.question.replied"
+          },
           {
             "$ref": "#/components/schemas/Event.file.edited"
           },

From ec076fc6984e2a259bdafc5f27361699149c1fc2 Mon Sep 17 00:00:00 2001
From: dbpolito <danielbpolito@gmail.com>
Date: Tue, 16 Dec 2025 11:54:47 -0300
Subject: [PATCH 17/17] Remove spec file

---
 specs/ask-tool.md | 664 ----------------------------------------------
 1 file changed, 664 deletions(-)
 delete mode 100644 specs/ask-tool.md

diff --git a/specs/ask-tool.md b/specs/ask-tool.md
deleted file mode 100644
index 4f92ab722c4..00000000000
--- a/specs/ask-tool.md
+++ /dev/null
@@ -1,664 +0,0 @@
-# AskUserQuestion Feature Implementation Plan
-
-## Overview
-
-This document outlines the implementation plan for adding an `ask` tool to OpenCode, allowing Claude to ask users questions during a session rather than making assumptions. This is inspired by Claude Code's AskUserQuestion feature but implemented in the "OpenCode way" using dialogs and the existing TUI architecture.
-
-## Feature Summary
-
-The `ask` tool enables Claude to:
-
-- Ask single or multiple questions in one tool call
-- Support different question types (select, multi-select, confirm, text)
-- Mark recommended options
-- Receive user answers with optional comments for additional context
-
-## Design
-
-### Question Types
-
-| Type           | Description                      | UI Component              |
-| -------------- | -------------------------------- | ------------------------- |
-| `select`       | Single selection from options    | DialogQuestionSelect      |
-| `multi-select` | Multiple selections from options | DialogQuestionMultiSelect |
-| `confirm`      | Yes/No question                  | DialogQuestionConfirm     |
-| `text`         | Free-form text input             | DialogQuestionText        |
-
-### Multi-Question Flow
-
-When multiple questions are asked, users see a list view:
-
-```
-┌─────────────────────────────────────────────┐
-│ Questions (2/3 answered)                esc │
-├─────────────────────────────────────────────┤
-│                                             │
-│  ● What framework do you prefer?            │
-│    → React (Recommended)                    │
-│                                             │
-│  ● Do you want TypeScript?                  │
-│    → Yes                                    │
-│    💬 "We already use TS everywhere..."     │
-│                                             │
-│  ○ Package manager?                         │
-│    → (not answered)                         │
-│                                             │
-├─────────────────────────────────────────────┤
-│ enter open  ctrl+enter submit           esc │
-└─────────────────────────────────────────────┘
-```
-
-Pressing `enter` on a question opens a nested dialog for that question type.
-
-### Single Question Optimization
-
-When only 1 question is asked, skip the list view and open the question dialog directly.
-
-### Nested Dialogs
-
-Questions use nested dialogs:
-
-- Main dialog shows question list
-- Selecting a question opens its specific dialog (select, text, etc.)
-- ESC returns to list without saving changes
-- Comments open another nested dialog layer
-
-### Comments
-
-Any question can have an optional comment added via the `c` key, providing additional context to the answer.
-
-### Keybindings
-
-**In Question List:**
-| Key | Action |
-|-----|--------|
-| `enter` | Open question dialog |
-| `ctrl+enter` | Submit all answers |
-| `esc` | Cancel entire flow (reject) |
-| `up/down` | Navigate questions |
-
-**In Question Dialog (Select/Multi-Select/Confirm):**
-| Key | Action |
-|-----|--------|
-| `enter` | Confirm selection, return to list |
-| `space` | Toggle selection (multi-select only) |
-| `c` | Add/edit comment |
-| `ctrl+enter` | Confirm and submit all answers |
-| `esc` | Cancel edit, return to list (no change) |
-
-**In Text Dialog:**
-| Key | Action |
-|-----|--------|
-| `enter` | Submit text, return to list |
-| `ctrl+enter` | Submit and submit all answers |
-| `esc` | Cancel, return to list |
-
-### Tool Schema
-
-```typescript
-parameters: z.object({
-  questions: z
-    .array(
-      z.object({
-        id: z.string().describe("Unique identifier for this question"),
-        type: z.enum(["select", "multi-select", "confirm", "text"]),
-        question: z.string().describe("The question to ask the user"),
-        options: z
-          .array(
-            z.object({
-              value: z.string(),
-              label: z.string(),
-              recommended: z.boolean().optional(),
-            }),
-          )
-          .optional()
-          .describe("Options for select/multi-select types"),
-        default: z
-          .union([z.string(), z.array(z.string()), z.boolean()])
-          .optional()
-          .describe("Default value shown as hint (not pre-selected)"),
-      }),
-    )
-    .min(1),
-})
-```
-
-### Response Schema
-
-```typescript
-{
-  [questionId: string]: {
-    value: string | string[] | boolean | null  // null if skipped
-    comment?: string  // optional additional context
-  }
-}
-```
-
-### Tool Output (shown in message stream)
-
-After questions are answered, display a summary:
-
-```
-? Asked 3 questions
-  • Framework: React
-    💬 "We already use React in other projects"
-  • TypeScript: Yes
-  • Package manager: (skipped)
-```
-
-### Abort Handling
-
-If the session is aborted while a question is pending, auto-reject the question. The user can ask again if needed.
-
-## Architecture
-
-### File Structure
-
-```
-packages/opencode/src/
-├── question/
-│   └── index.ts                    # Question namespace (state, events, ask/respond)
-├── tool/
-│   ├── ask.ts                      # AskTool definition
-│   └── registry.ts                 # Register AskTool
-├── server/
-│   └── server.ts                   # Add /question/respond route
-└── cli/cmd/tui/
-    ├── ui/
-    │   ├── dialog.tsx              # Add push() method for nested dialogs
-    │   └── dialog-question.tsx     # Question components
-    ├── context/
-    │   └── sync.tsx                # Add question state
-    └── routes/session/
-        ├── index.tsx               # Question handling integration
-        └── footer.tsx              # Question indicator
-```
-
-### Question Namespace (question/index.ts)
-
-Similar pattern to Permission namespace:
-
-```typescript
-export namespace Question {
-  // Zod schemas
-  export const QuestionItem = z.object({
-    id: z.string(),
-    type: z.enum(["select", "multi-select", "confirm", "text"]),
-    question: z.string(),
-    options: z.array(z.object({
-      value: z.string(),
-      label: z.string(),
-      recommended: z.boolean().optional(),
-    })).optional(),
-    default: z.union([z.string(), z.array(z.string()), z.boolean()]).optional(),
-  })
-
-  export const Answer = z.object({
-    value: z.union([z.string(), z.array(z.string()), z.boolean(), z.null()]),
-    comment: z.string().optional(),
-  })
-
-  export const Info = z.object({
-    id: z.string(),
-    sessionID: z.string(),
-    messageID: z.string(),
-    callID: z.string().optional(),
-    questions: z.array(QuestionItem),
-    time: z.object({ created: z.number() }),
-  })
-
-  // Events
-  export const Event = {
-    Updated: BusEvent.define("question.updated", Info),
-    Replied: BusEvent.define("question.replied", z.object({
-      sessionID: z.string(),
-      questionID: z.string(),
-      answers: z.record(z.string(), Answer),
-    })),
-  }
-
-  // State management (similar to Permission)
-  const state = Instance.state(() => ({
-    pending: {} as { [sessionID: string]: { [questionID: string]: PendingQuestion } },
-  }), async (state) => {
-    // Reject all pending on dispose
-  })
-
-  // Core functions
-  export async function ask(input: {...}): Promise<Record<string, Answer>>
-  export function respond(input: {...}): void
-
-  // Error class
-  export class RejectedError extends Error {...}
-}
-```
-
-### Dialog System Update (dialog.tsx)
-
-Add `push` method for nested dialogs:
-
-```typescript
-// Existing
-replace(input: JSX.Element, onClose?: () => void) {
-  // Clears stack and adds single dialog
-}
-
-// New
-push(input: JSX.Element, onClose?: () => void) {
-  if (store.stack.length === 0) {
-    focus = renderer.currentFocusedRenderable
-  }
-  setStore("stack", [...store.stack, { element: input, onClose }])
-}
-
-pop() {
-  if (store.stack.length === 0) return
-  const current = store.stack.at(-1)
-  current?.onClose?.()
-  setStore("stack", store.stack.slice(0, -1))
-  if (store.stack.length === 0) refocus()
-}
-```
-
-Update ESC handler to use `pop()` instead of clearing entire stack.
-
-### Sync Context Update (sync.tsx)
-
-Add question state:
-
-```typescript
-const [store, setStore] = createStore<{
-  // ... existing
-  question: {
-    [sessionID: string]: Question[]
-  }
-}>({
-  // ... existing
-  question: {},
-})
-
-// Handle events
-case "question.updated": {
-  // Add/update question in store
-}
-case "question.replied": {
-  // Remove question from store
-}
-```
-
-### Server Route (server.ts)
-
-```typescript
-.post(
-  "/question/respond",
-  describeRoute({ description: "Respond to a pending question" }),
-  validator("json", z.object({
-    sessionID: z.string(),
-    questionID: z.string(),
-    answers: z.record(z.string(), Question.Answer),
-  })),
-  async (c) => {
-    const body = c.req.valid("json")
-    Question.respond(body)
-    return c.json({ success: true })
-  }
-)
-```
-
-### SDK Types
-
-Add to SDK v2 types:
-
-```typescript
-export type QuestionItem = {
-  id: string
-  type: "select" | "multi-select" | "confirm" | "text"
-  question: string
-  options?: { value: string; label: string; recommended?: boolean }[]
-  default?: string | string[] | boolean
-}
-
-export type QuestionAnswer = {
-  value: string | string[] | boolean | null
-  comment?: string
-}
-
-export type Question = {
-  id: string
-  sessionID: string
-  messageID: string
-  callID?: string
-  questions: QuestionItem[]
-  time: { created: number }
-}
-```
-
-## Implementation Phases
-
-### Phase 1: Core Infrastructure
-
-| #   | Task                      | File(s)             | Description                                  |
-| --- | ------------------------- | ------------------- | -------------------------------------------- |
-| 1   | Add push/pop to dialog    | `ui/dialog.tsx`     | Enable nested dialog support                 |
-| 2   | Create Question namespace | `question/index.ts` | State, events, ask/respond functions         |
-| 3   | Add server routes         | `server/server.ts`  | POST /question/respond endpoint              |
-| 4   | Add SDK types             | `packages/sdk/...`  | Question, QuestionItem, QuestionAnswer types |
-| 5   | Add sync state            | `context/sync.tsx`  | Question state and event handling            |
-
-### Phase 2: Tool Implementation
-
-| #   | Task           | File(s)            | Description                      |
-| --- | -------------- | ------------------ | -------------------------------- |
-| 6   | Create AskTool | `tool/ask.ts`      | Tool definition with full schema |
-| 7   | Register tool  | `tool/registry.ts` | Add AskTool to built-in tools    |
-
-### Phase 3: TUI Components
-
-| #   | Task                      | File(s)                  | Description                  |
-| --- | ------------------------- | ------------------------ | ---------------------------- |
-| 8   | DialogQuestion            | `ui/dialog-question.tsx` | Main question list component |
-| 9   | DialogQuestionSelect      | `ui/dialog-question.tsx` | Single select dialog         |
-| 10  | DialogQuestionMultiSelect | `ui/dialog-question.tsx` | Multi-select with checkboxes |
-| 11  | DialogQuestionText        | `ui/dialog-question.tsx` | Text input dialog            |
-| 12  | DialogQuestionConfirm     | `ui/dialog-question.tsx` | Yes/No dialog                |
-| 13  | DialogQuestionComment     | `ui/dialog-question.tsx` | Comment input overlay        |
-
-### Phase 4: Integration
-
-| #   | Task                | File(s)                     | Description                          |
-| --- | ------------------- | --------------------------- | ------------------------------------ |
-| 14  | Session integration | `routes/session/index.tsx`  | Auto-open dialog, keyboard handling  |
-| 15  | Footer indicator    | `routes/session/footer.tsx` | Show "◉ 1 Question" like permissions |
-| 16  | Tool renderer       | `routes/session/index.tsx`  | Show Q&A summary in message stream   |
-| 17  | Abort handling      | `question/index.ts`         | Auto-reject on session abort         |
-| 18  | Single question opt | `ui/dialog-question.tsx`    | Skip list for single question        |
-
-### Phase 5: Documentation
-
-| #   | Task          | File(s) | Description                        |
-| --- | ------------- | ------- | ---------------------------------- |
-| 19  | System prompt | TBD     | Document ask tool usage for Claude |
-
-## Component Details
-
-### DialogQuestion (List View)
-
-```typescript
-interface DialogQuestionProps {
-  question: Question.Info
-  onSubmit: (answers: Record<string, Question.Answer>) => void
-  onCancel: () => void
-}
-
-function DialogQuestion(props: DialogQuestionProps) {
-  const [answers, setAnswers] = createStore<Record<string, Question.Answer>>({})
-  const dialog = useDialog()
-
-  // Count answered questions
-  const answeredCount = () => Object.keys(answers).filter(k => answers[k]?.value !== null).length
-
-  // Open specific question dialog
-  function openQuestion(item: Question.QuestionItem) {
-    const Component = {
-      "select": DialogQuestionSelect,
-      "multi-select": DialogQuestionMultiSelect,
-      "confirm": DialogQuestionConfirm,
-      "text": DialogQuestionText,
-    }[item.type]
-
-    dialog.push(() => (
-      <Component
-        item={item}
-        currentAnswer={answers[item.id]}
-        onAnswer={(answer) => {
-          setAnswers(item.id, answer)
-          dialog.pop()
-        }}
-        onCancel={() => dialog.pop()}
-        onSubmitAll={(answer) => {
-          setAnswers(item.id, answer)
-          props.onSubmit(answers)
-        }}
-      />
-    ))
-  }
-
-  // Render list...
-}
-```
-
-### DialogQuestionSelect
-
-```typescript
-interface DialogQuestionSelectProps {
-  item: Question.QuestionItem
-  currentAnswer?: Question.Answer
-  onAnswer: (answer: Question.Answer) => void
-  onCancel: () => void
-  onSubmitAll: (answer: Question.Answer) => void
-}
-
-function DialogQuestionSelect(props: DialogQuestionSelectProps) {
-  const dialog = useDialog()
-  const [selected, setSelected] = createSignal<string | null>(null)
-  const [comment, setComment] = createSignal<string | undefined>(props.currentAnswer?.comment)
-
-  // Sort options: recommended first
-  const sortedOptions = () => {
-    const opts = props.item.options ?? []
-    return [...opts].sort((a, b) => (b.recommended ? 1 : 0) - (a.recommended ? 1 : 0))
-  }
-
-  function openComment() {
-    dialog.push(() => (
-      <DialogQuestionComment
-        value={comment()}
-        onSave={(c) => { setComment(c); dialog.pop() }}
-        onCancel={() => dialog.pop()}
-      />
-    ))
-  }
-
-  // Handle keyboard: enter, c, ctrl+enter, esc
-  // Render options with recommended indicator...
-}
-```
-
-### DialogQuestionMultiSelect
-
-Similar to DialogQuestionSelect but:
-
-- Uses checkboxes (☑/☐) instead of radio buttons
-- `space` toggles selection
-- `enter` confirms all selections
-- Stores array of selected values
-
-### DialogQuestionConfirm
-
-```typescript
-function DialogQuestionConfirm(props: DialogQuestionConfirmProps) {
-  const [selected, setSelected] = createSignal<boolean | null>(null)
-  const [comment, setComment] = createSignal<string | undefined>()
-
-  // Two options: Yes / No
-  // enter confirms, c opens comment, esc cancels
-}
-```
-
-### DialogQuestionText
-
-```typescript
-function DialogQuestionText(props: DialogQuestionTextProps) {
-  let textarea: TextareaRenderable
-
-  // Show default as placeholder hint
-  // enter submits, esc cancels
-  // No separate comment - the text IS the answer
-}
-```
-
-### DialogQuestionComment
-
-```typescript
-function DialogQuestionComment(props: { value?: string; onSave: (comment: string) => void; onCancel: () => void }) {
-  // Simple textarea dialog
-  // enter saves, esc cancels
-}
-```
-
-## Tool Renderer
-
-Register a renderer for the ask tool in the session:
-
-```typescript
-ToolRegistry.register<typeof AskTool>({
-  name: "ask",
-  container: "block",
-  render(props) {
-    const questions = props.metadata.questions ?? []
-    const answers = props.metadata.answers ?? {}
-
-    return (
-      <>
-        <ToolTitle icon="?" fallback="Asking questions...">
-          Asked {questions.length} question{questions.length !== 1 ? "s" : ""}
-        </ToolTitle>
-        <Show when={props.output}>
-          <For each={questions}>
-            {(q) => {
-              const answer = answers[q.id]
-              return (
-                <box paddingLeft={2}>
-                  <text>
-                    • {q.question}: {formatAnswer(answer)}
-                  </text>
-                  <Show when={answer?.comment}>
-                    <text fg={theme.textMuted}>
-                      💬 "{truncate(answer.comment, 50)}"
-                    </text>
-                  </Show>
-                </box>
-              )
-            }}
-          </For>
-        </Show>
-      </>
-    )
-  }
-})
-```
-
-## Testing Plan
-
-### Manual Testing Scenarios
-
-1. **Single select question** - One question with 4 options, one recommended
-2. **Multi-select question** - Select multiple features
-3. **Confirm question** - Yes/No with comment
-4. **Text question** - Free-form input with default hint
-5. **Multiple questions** - 3+ questions of mixed types
-6. **Single question optimization** - Verify direct dialog open
-7. **Comments** - Add comments to various question types
-8. **Skip questions** - Submit without answering all
-9. **Cancel flow** - ESC at various levels
-10. **Abort session** - Verify auto-reject
-11. **Nested dialog navigation** - ESC returns to correct level
-
-### Edge Cases
-
-- Empty options array for select
-- Very long question text
-- Very long option labels
-- Many options (scrolling)
-- Many questions (scrolling)
-- Unicode in questions/options/comments
-- Rapid navigation
-
-## Future Enhancements (Out of Scope)
-
-- Conditional questions (show question B only if A is answered X)
-- Question groups/sections
-- File picker question type
-- Date/time picker question type
-- Numeric input with validation
-- Saving answer templates
-- Question history/recall
-
-## Dependencies
-
-No new external dependencies required. Uses existing:
-
-- Solid.js for reactivity
-- OpenTUI for rendering
-- Zod for schema validation
-- Existing dialog infrastructure
-
-## Risks & Mitigations
-
-| Risk                         | Mitigation                                             |
-| ---------------------------- | ------------------------------------------------------ |
-| Nested dialogs complex state | Keep state local to DialogQuestion, use solid-js/store |
-| ESC key conflicts            | Check stack depth before handling                      |
-| Long questions overflow      | Use wrapMode and scrolling                             |
-| Focus management in nested   | Leverage existing dialog focus save/restore            |
-
----
-
-## Appendix: Example Usage
-
-### Tool Call (from Claude)
-
-```json
-{
-  "name": "ask",
-  "parameters": {
-    "questions": [
-      {
-        "id": "framework",
-        "type": "select",
-        "question": "What frontend framework do you prefer?",
-        "options": [
-          { "value": "react", "label": "React", "recommended": true },
-          { "value": "vue", "label": "Vue" },
-          { "value": "svelte", "label": "Svelte" },
-          { "value": "angular", "label": "Angular" }
-        ]
-      },
-      {
-        "id": "features",
-        "type": "multi-select",
-        "question": "Which features do you need?",
-        "options": [
-          { "value": "auth", "label": "Authentication", "recommended": true },
-          { "value": "db", "label": "Database" },
-          { "value": "api", "label": "REST API" },
-          { "value": "graphql", "label": "GraphQL" }
-        ]
-      },
-      {
-        "id": "typescript",
-        "type": "confirm",
-        "question": "Do you want to use TypeScript?",
-        "default": true
-      },
-      {
-        "id": "description",
-        "type": "text",
-        "question": "Briefly describe your project",
-        "default": "A web application that..."
-      }
-    ]
-  }
-}
-```
-
-### Tool Response (to Claude)
-
-```json
-{
-  "framework": { "value": "react", "comment": "We already use React in other projects" },
-  "features": { "value": ["auth", "db", "api"] },
-  "typescript": { "value": true },
-  "description": { "value": "An e-commerce platform for selling handmade crafts" }
-}
-```