From d48f2a44070ea19fecab397641242f72adc0a8e7 Mon Sep 17 00:00:00 2001
From: Idris Gadi <idris.gadi01@gmail.com>
Date: Sat, 31 Jan 2026 19:58:07 +0530
Subject: [PATCH] feat: use space toggle answers in multi-select and enter for
 submit

---
 .../cli/cmd/tui/routes/session/question.tsx   | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/question.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/question.tsx
index 88e99c6ea8..1eb50bdf91 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/question.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/question.tsx
@@ -237,11 +237,22 @@ export function QuestionPrompt(props: { request: QuestionRequest }) {
         moveTo((store.selected + 1) % total)
       }
 
-      if (evt.name === "return") {
+      if (evt.name === "space" && multi()) {
         evt.preventDefault()
         selectOption()
       }
 
+      if (evt.name === "return") {
+        evt.preventDefault()
+        if (multi()) {
+          setStore("tab", store.tab + 1)
+          setStore("selected", 0)
+          return
+        }
+        selectOption()
+        return
+      }
+
       if (evt.name === "escape" || keybind.match("app_exit", evt)) {
         evt.preventDefault()
         reject()
@@ -436,10 +447,15 @@ export function QuestionPrompt(props: { request: QuestionRequest }) {
               {"↑↓"} <span style={{ fg: theme.textMuted }}>select</span>
             </text>
           </Show>
+          <Show when={multi() && !confirm()}>
+            <text fg={theme.text}>
+              space <span style={{ fg: theme.textMuted }}>toggle</span>
+            </text>
+          </Show>
           <text fg={theme.text}>
             enter{" "}
             <span style={{ fg: theme.textMuted }}>
-              {confirm() ? "submit" : multi() ? "toggle" : single() ? "submit" : "confirm"}
+              {confirm() || single() ? "submit" : "confirm"}
             </span>
           </text>