feat: implement question tool UI with submit/dismiss actions

- Add question.asked/replied/rejected SSE event translation to item/tool/requestUserInput
- Transform question answers to OpenCode's array-of-arrays format
- Add Dismiss button and Enter/Esc keyboard shortcuts
- Disable composer input while question UI is active
- Wire up onUserInputCompleted for state cleanup on question reply/reject

Author: jacobjmc

src-tauri/src/backend/event_translator.rs

@@ -835,12 +835,12 @@ pub(crate) async fn send_user_message_core<E: EventSink>(
     let parts = build_rest_prompt_parts(text, images, app_mentions).await?;
     let _prompt_guard = session.prompt_lock.lock().await;
 
-    // Synthesize turn ID and prepare translation state.
+    // Synthesize turn ID and prepare translation state for this session.
     let turn_n = TURN_COUNTER.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
     let turn_id = format!("turn_{turn_n}");
     {
         let mut ts = session.translation_state.lock().await;
-        ts.start_turn(turn_id.clone());
+        ts.start_turn(thread_id.clone(), turn_id.clone());
     }
 
     // Emit synthetic turn/started.
@@ -1130,7 +1130,7 @@ pub(crate) async fn model_list_core(
 }
 
 // ---------------------------------------------------------------------------
-// Permission response (REST: POST /session/:sid/permissions/:pid)
+// Permission / Question response
 // ---------------------------------------------------------------------------
 
 pub(crate) async fn respond_to_server_request_core(
@@ -1141,24 +1141,51 @@ pub(crate) async fn respond_to_server_request_core(
 ) -> Result<(), String> {
     let session = get_session_clone(sessions, &workspace_id).await?;
 
-    // request_id is "sessionId:permissionId" composite string.
     let composite = request_id.as_str().unwrap_or_default();
-    let (_session_id, permission_id) = composite
-        .split_once(':')
-        .unwrap_or((composite, ""));
-
-    let accept = result
-        .get("decision")
-        .and_then(|v| v.as_str())
-        .map(|d| d == "accept")
-        .unwrap_or(true);
+    let (_session_id, resource_id) = composite.split_once(':').unwrap_or((composite, ""));
+
+    if let Some(answers) = result.get("answers") {
+        let answers_array = transform_question_answers(answers);
+        let body = json!({ "answers": answers_array });
+        let path = format!("/question/{resource_id}/reply");
+        session.rest_post_bool(&path, body).await?;
+    } else if result.get("reject").and_then(|v| v.as_bool()).unwrap_or(false) {
+        // Question rejection: POST /question/:id/reject
+        let path = format!("/question/{resource_id}/reject");
+        session.rest_post_bool(&path, json!({})).await?;
+    } else {
+        // Permission response: POST /permission/:id/reply
+        let accept = result
+            .get("decision")
+            .and_then(|v| v.as_str())
+            .map(|d| d == "accept")
+            .unwrap_or(true);
+        let body = event_translator::build_permission_response(accept);
+        let path = format!("/permission/{resource_id}/reply");
+        session.rest_post_bool(&path, body).await?;
+    }
 
-    let body = event_translator::build_permission_response(accept);
-    let path = format!("/permission/{permission_id}/reply");
-    session.rest_post_bool(&path, body).await?;
     Ok(())
 }
 
+fn transform_question_answers(answers: &Value) -> Value {
+    let Some(obj) = answers.as_object() else {
+        return Value::Array(vec![]);
+    };
+
+    let mut entries: Vec<(usize, Vec<Value>)> = obj
+        .iter()
+        .filter_map(|(key, val)| {
+            let idx = key.parse::<usize>().ok()?;
+            let inner = val.get("answers")?.as_array()?;
+            Some((idx, inner.clone()))
+        })
+        .collect();
+
+    entries.sort_by_key(|(idx, _)| *idx);
+    Value::Array(entries.into_iter().map(|(_, arr)| Value::Array(arr)).collect())
+}
+
 // ---------------------------------------------------------------------------
 // Account / login stubs (unchanged)
 // ---------------------------------------------------------------------------

src-tauri/src/shared/codex_core.rs

@@ -559,6 +559,7 @@ function MainApp() {
     handleApprovalDecision,
     handleApprovalRemember,
     handleUserInputSubmit,
+    handleUserInputDismiss,
     refreshAccountInfo,
     refreshAccountRateLimits,
   } = useThreads({
@@ -1751,6 +1752,7 @@ function MainApp() {
     handleApprovalDecision,
     handleApprovalRemember,
     handleUserInputSubmit,
+    handleUserInputDismiss,
     onPlanAccept: handlePlanAccept,
     onPlanSubmitChanges: handlePlanSubmitChanges,
     onOpenSettings: () => openSettings(),

src/App.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import type {
   RequestUserInputRequest,
   RequestUserInputResponse,
@@ -12,6 +12,7 @@ type RequestUserInputMessageProps = {
     request: RequestUserInputRequest,
     response: RequestUserInputResponse,
   ) => void;
+  onDismiss: (request: RequestUserInputRequest) => void;
 };
 
 type SelectionState = Record<string, number | null>;
@@ -22,6 +23,7 @@ export function RequestUserInputMessage({
   activeThreadId,
   activeWorkspaceId,
   onSubmit,
+  onDismiss,
 }: RequestUserInputMessageProps) {
   const activeRequests = useMemo(
     () =>
@@ -39,7 +41,10 @@ export function RequestUserInputMessage({
       }),
     [requests, activeThreadId, activeWorkspaceId],
   );
-  const activeRequest = activeRequests[0];
+  const activeRequest = activeRequests[0] ?? null;
+  const questions = activeRequest?.params.questions ?? [];
+  const totalRequests = activeRequests.length;
+
   const [selections, setSelections] = useState<SelectionState>({});
   const [notes, setNotes] = useState<NotesState>({});
 
@@ -60,14 +65,7 @@ export function RequestUserInputMessage({
     setNotes(nextNotes);
   }, [activeRequest]);
 
-  if (!activeRequest) {
-    return null;
-  }
-
-  const { questions } = activeRequest.params;
-  const totalRequests = activeRequests.length;
-
-  const buildAnswers = () => {
+  const buildAnswers = useCallback(() => {
     const answers: RequestUserInputResponse["answers"] = {};
     questions.forEach((question, index) => {
       if (!question.id) {
@@ -97,19 +95,53 @@ export function RequestUserInputMessage({
       answers[question.id] = { answers: answerList };
     });
     return answers;
-  };
+  }, [questions, selections, notes]);
 
-  const handleSelect = (questionId: string, optionIndex: number) => {
+  const handleSelect = useCallback((questionId: string, optionIndex: number) => {
     setSelections((current) => ({ ...current, [questionId]: optionIndex }));
-  };
+  }, []);
 
-  const handleNotesChange = (questionId: string, value: string) => {
+  const handleNotesChange = useCallback((questionId: string, value: string) => {
     setNotes((current) => ({ ...current, [questionId]: value }));
-  };
+  }, []);
 
-  const handleSubmit = () => {
+  const handleSubmit = useCallback(() => {
+    if (!activeRequest) return;
     onSubmit(activeRequest, { answers: buildAnswers() });
-  };
+  }, [activeRequest, onSubmit, buildAnswers]);
+
+  const handleDismiss = useCallback(() => {
+    if (!activeRequest) return;
+    onDismiss(activeRequest);
+  }, [activeRequest, onDismiss]);
+
+  useEffect(() => {
+    if (!activeRequest) return;
+
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (event.target instanceof HTMLTextAreaElement) {
+        if (event.key === "Enter" && (event.metaKey || event.ctrlKey)) {
+          event.preventDefault();
+          handleSubmit();
+        }
+        return;
+      }
+      if (event.key === "Enter") {
+        event.preventDefault();
+        handleSubmit();
+      } else if (event.key === "Escape") {
+        event.preventDefault();
+        handleDismiss();
+      }
+    };
+
+    window.addEventListener("keydown", handleKeyDown);
+    return () => window.removeEventListener("keydown", handleKeyDown);
+  }, [activeRequest, handleSubmit, handleDismiss]);
+
+  if (!activeRequest) {
+    return null;
+  }
 
   return (
     <div className="message request-user-input-message">
@@ -192,6 +224,13 @@ export function RequestUserInputMessage({
           <button className="primary" onClick={handleSubmit}>
             Submit
           </button>
+          <button className="secondary" onClick={handleDismiss}>
+            Dismiss
+          </button>
+          <div className="request-user-input-shortcuts">
+            <span><kbd>Enter</kbd> Submit</span>
+            <span><kbd>Esc</kbd> Dismiss</span>
+          </div>
         </div>
       </div>
     </div>

src/features/app/components/RequestUserInputMessage.tsx

@@ -44,6 +44,7 @@ type AppServerEventHandlers = {
   ) => void;
   onApprovalRequest?: (request: ApprovalRequest) => void;
   onRequestUserInput?: (request: RequestUserInputRequest) => void;
+  onUserInputCompleted?: (requestId: string | number, workspaceId: string) => void;
   onAgentMessageDelta?: (event: AgentDelta) => void;
   onAgentMessageCompleted?: (event: AgentCompleted) => void;
   onAppServerEvent?: (event: AppServerEvent) => void;
@@ -112,6 +113,7 @@ export const METHODS_ROUTED_IN_USE_APP_SERVER_EVENTS = [
   "item/reasoning/textDelta",
   "item/started",
   "item/tool/requestUserInput",
+  "item/tool/userInputCompleted",
   "thread/name/updated",
   "thread/started",
   "thread/tokenUsage/updated",
@@ -213,6 +215,15 @@ export function useAppServerEvents(handlers: AppServerEventHandlers) {
         return;
       }
 
+      if (method === "item/tool/userInputCompleted") {
+        const requestId = params.requestId as string | number | undefined;
+        const workspaceId = String(params.workspaceId ?? workspace_id ?? "");
+        if (requestId !== undefined) {
+          currentHandlers.onUserInputCompleted?.(requestId, workspaceId);
+        }
+        return;
+      }
+
       if (method === "item/agentMessage/delta") {
         const threadId = String(params.threadId ?? params.thread_id ?? "");
         const itemId = String(params.itemId ?? params.item_id ?? "");

src/features/app/hooks/useAppServerEvents.ts

@@ -31,6 +31,15 @@ export function buildPrimaryNodes(options: LayoutNodesOptions): PrimaryLayoutNod
     ? options.threadStatusById[options.activeThreadId] ?? null
     : null;
 
+  const hasActiveUserInputRequest = Boolean(
+    options.activeThreadId &&
+      options.userInputRequests.some(
+        (req) =>
+          req.params.thread_id === options.activeThreadId &&
+          (!options.activeWorkspace?.id || req.workspace_id === options.activeWorkspace.id),
+      ),
+  );
+
   const sidebarNode = (
     <Sidebar
       workspaces={options.workspaces}
@@ -102,6 +111,7 @@ export function buildPrimaryNodes(options: LayoutNodesOptions): PrimaryLayoutNod
       showMessageFilePath={options.showMessageFilePath}
       userInputRequests={options.userInputRequests}
       onUserInputSubmit={options.handleUserInputSubmit}
+      onUserInputDismiss={options.handleUserInputDismiss}
       onPlanAccept={options.onPlanAccept}
       onPlanSubmitChanges={options.onPlanSubmitChanges}
       onOpenThreadLink={options.onOpenThreadLink}
@@ -122,7 +132,7 @@ export function buildPrimaryNodes(options: LayoutNodesOptions): PrimaryLayoutNod
       onQueue={options.onQueue}
       onStop={options.onStop}
       canStop={options.canStop}
-      disabled={options.isReviewing}
+      disabled={options.isReviewing || hasActiveUserInputRequest}
       isConnected={options.activeWorkspace?.connected ?? false}
       onFileAutocompleteActiveChange={options.onFileAutocompleteActiveChange}
       contextUsage={options.activeTokenUsage}

src/features/layout/hooks/layoutNodes/buildPrimaryNodes.tsx

@@ -141,6 +141,7 @@ export type LayoutNodesOptions = {
     request: RequestUserInputRequest,
     response: RequestUserInputResponse,
   ) => void;
+  handleUserInputDismiss: (request: RequestUserInputRequest) => void;
   onPlanAccept?: () => void;
   onPlanSubmitChanges?: (changes: string) => void;
   onOpenSettings: () => void;

src/features/layout/hooks/layoutNodes/types.ts

@@ -1089,6 +1089,7 @@ describe("Messages", () => {
           },
         ]}
         onUserInputSubmit={vi.fn()}
+        onUserInputDismiss={vi.fn()}
         onPlanAccept={onPlanAccept}
         onPlanSubmitChanges={onPlanSubmitChanges}
       />,

src/features/messages/components/Messages.test.tsx

@@ -55,6 +55,7 @@ type MessagesProps = {
     request: RequestUserInputRequest,
     response: RequestUserInputResponse,
   ) => void;
+  onUserInputDismiss?: (request: RequestUserInputRequest) => void;
   onPlanAccept?: () => void;
   onPlanSubmitChanges?: (changes: string) => void;
   onOpenThreadLink?: (threadId: string) => void;
@@ -75,6 +76,7 @@ export const Messages = memo(function Messages({
   showMessageFilePath = true,
   userInputRequests = [],
   onUserInputSubmit,
+  onUserInputDismiss,
   onPlanAccept,
   onPlanSubmitChanges,
   onOpenThreadLink,
@@ -273,14 +275,16 @@ export const Messages = memo(function Messages({
   const groupedItems = useMemo(() => buildToolGroups(visibleItems), [visibleItems]);
 
   const hasActiveUserInputRequest = activeUserInputRequestId !== null;
-  const hasVisibleUserInputRequest = hasActiveUserInputRequest && Boolean(onUserInputSubmit);
+  const hasVisibleUserInputRequest =
+    hasActiveUserInputRequest && Boolean(onUserInputSubmit) && Boolean(onUserInputDismiss);
   const userInputNode =
-    hasActiveUserInputRequest && onUserInputSubmit ? (
+    hasActiveUserInputRequest && onUserInputSubmit && onUserInputDismiss ? (
       <RequestUserInputMessage
         requests={userInputRequests}
         activeThreadId={threadId}
         activeWorkspaceId={workspaceId}
         onSubmit={onUserInputSubmit}
+        onDismiss={onUserInputDismiss}
       />
     ) : null;
 

src/features/messages/components/Messages.tsx

@@ -64,7 +64,7 @@ export function useThreadEventHandlers({
     dispatch,
     approvalAllowlistRef,
   });
-  const onRequestUserInput = useThreadUserInputEvents({ dispatch });
+  const { onRequestUserInput, onUserInputCompleted } = useThreadUserInputEvents({ dispatch });
 
   const {
     onAgentMessageDelta,
@@ -145,6 +145,7 @@ export function useThreadEventHandlers({
       onWorkspaceConnected,
       onApprovalRequest,
       onRequestUserInput,
+      onUserInputCompleted,
       onBackgroundThreadAction,
       onAppServerEvent,
       onAgentMessageDelta,
@@ -172,6 +173,7 @@ export function useThreadEventHandlers({
       onWorkspaceConnected,
       onApprovalRequest,
       onRequestUserInput,
+      onUserInputCompleted,
       onBackgroundThreadAction,
       onAppServerEvent,
       onAgentMessageDelta,