From a6e87a45894a943b47e7c5054280a64210f59080 Mon Sep 17 00:00:00 2001
From: Maharshi Patel <maharshi365@gmail.com>
Date: Sun, 12 Jul 2026 15:04:58 -0400
Subject: [PATCH] fix(tui): resolve keyboard deadlock in question mode

---
 packages/tui/src/routes/session/index.tsx    | 12 +++++++-----
 packages/tui/src/routes/session/question.tsx | 12 ++++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/packages/tui/src/routes/session/index.tsx b/packages/tui/src/routes/session/index.tsx
index 6d77b0ea58fd..44aadf2a05b5 100644
--- a/packages/tui/src/routes/session/index.tsx
+++ b/packages/tui/src/routes/session/index.tsx
@@ -1286,11 +1286,13 @@ export function Session() {
                     directory={sync.session.get(permissions()[0].sessionID)?.directory}
                   />
                 </Show>
-                <Show when={permissions().length === 0 && questions().length > 0}>
-                  <QuestionPrompt
-                    request={questions()[0]}
-                    directory={sync.session.get(questions()[0].sessionID)?.directory}
-                  />
+                <Show when={permissions().length === 0 ? questions()[0] : undefined} keyed>
+                  {(request) => (
+                    <QuestionPrompt
+                      request={request}
+                      directory={sync.session.get(request.sessionID)?.directory}
+                    />
+                  )}
                 </Show>
                 <Show when={session()?.parentID}>
                   <SubagentFooter />
diff --git a/packages/tui/src/routes/session/question.tsx b/packages/tui/src/routes/session/question.tsx
index 191d0a936a91..fc51ef590456 100644
--- a/packages/tui/src/routes/session/question.tsx
+++ b/packages/tui/src/routes/session/question.tsx
@@ -100,6 +100,7 @@ export function QuestionPrompt(props: { request: QuestionRequest; directory?: st
   function selectTab(index: number) {
     setStore("tab", index)
     setStore("selected", 0)
+    setStore("editing", false)
   }
 
   function selectOption() {
@@ -133,6 +134,7 @@ export function QuestionPrompt(props: { request: QuestionRequest; directory?: st
   useBindings(() => ({
     mode: QUESTION_MODE,
     enabled: store.editing && !confirm(),
+    priority: 1,
     commands: [
       {
         name: "prompt.clear",
@@ -147,6 +149,14 @@ export function QuestionPrompt(props: { request: QuestionRequest; directory?: st
           textarea?.setText("")
         },
       },
+      {
+        name: "app.exit",
+        title: "Reject question",
+        category: "Question",
+        run() {
+          reject()
+        },
+      },
     ],
     bindings: [
       {
@@ -158,6 +168,7 @@ export function QuestionPrompt(props: { request: QuestionRequest; directory?: st
         },
       },
       ...tuiConfig.keybinds.get("prompt.clear"),
+      ...tuiConfig.keybinds.get("app.exit"),
       {
         key: "return",
         desc: "Submit answer edit",
@@ -214,6 +225,7 @@ export function QuestionPrompt(props: { request: QuestionRequest; directory?: st
     return {
       mode: QUESTION_MODE,
       enabled: !store.editing,
+      priority: 1,
       commands: [
         {
           name: "app.exit",