From 9f230420c4fd55ee60c900e713e7f8032ab4bc5a Mon Sep 17 00:00:00 2001
From: Victor Vogel <satsdev@only21mil.xyz>
Date: Sat, 31 Oct 2026 22:03:28 +0000
Subject: [PATCH 1/2] fix(web): pending-question digit shortcuts ignore
 dialogs, menus and selects

While a question was pending, pressing 1-9 with focus in a dialog, a menu (including the web fallback context menu), a select/combobox popup or a native select picked an answer (single-select could auto-advance and submit) and swallowed the key from the focused control.

The document keydown handler now also skips targets inside select, [role="dialog"], [aria-modal="true"], [role="menu"] and [data-slot$="popup"], matching the usage and settings shortcut guards.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 ...oserPendingUserInputPanel.browser.test.tsx | 93 +++++++++++++++++++
 .../chat/ComposerPendingUserInputPanel.tsx    |  4 +-
 2 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 apps/web/src/components/chat/ComposerPendingUserInputPanel.browser.test.tsx

diff --git a/apps/web/src/components/chat/ComposerPendingUserInputPanel.browser.test.tsx b/apps/web/src/components/chat/ComposerPendingUserInputPanel.browser.test.tsx
new file mode 100644
index 0000000000000..963502d753c70
--- /dev/null
+++ b/apps/web/src/components/chat/ComposerPendingUserInputPanel.browser.test.tsx
@@ -0,0 +1,93 @@
+import { EnvironmentId, RuntimeRequestId, ThreadId } from "@t3tools/contracts";
+import type { ReactNode } from "react";
+import { expect, it, vi } from "vite-plus/test";
+import { userEvent } from "vite-plus/test/browser";
+
+import { render } from "../../../test/render";
+import type { PendingUserInput } from "../../session-logic";
+import { ComposerPendingUserInputPanel } from "./ComposerPendingUserInputPanel";
+
+const threadRef = { environmentId: EnvironmentId.make("env"), threadId: ThreadId.make("thread") };
+
+const prompt: PendingUserInput = {
+  requestId: RuntimeRequestId.make("question-shortcuts"),
+  createdAt: "2026-10-31T00:00:00.000Z",
+  dismissible: false,
+  responseCapability: "live",
+  questions: [
+    {
+      id: "question",
+      header: "Rollout",
+      question: "How should this ship?",
+      options: [{ label: "Incremental", description: "One module at a time" }],
+      multiSelect: true,
+    },
+  ],
+};
+
+it.each<{ focus: string; control: ReactNode; toggles: boolean }>([
+  { focus: "a page button", control: <button type="button" aria-label="Focused" />, toggles: true },
+  {
+    focus: "a dialog",
+    control: (
+      <div role="dialog">
+        <button type="button" aria-label="Focused" />
+      </div>
+    ),
+    toggles: false,
+  },
+  {
+    focus: "a popup",
+    control: (
+      <div data-slot="menu-popup">
+        <button type="button" aria-label="Focused" />
+      </div>
+    ),
+    toggles: false,
+  },
+  {
+    focus: "a menu",
+    control: (
+      <div role="menu">
+        <button type="button" role="menuitem" aria-label="Focused" />
+      </div>
+    ),
+    toggles: false,
+  },
+  {
+    focus: "a select",
+    control: (
+      <select aria-label="Focused">
+        <option>One</option>
+      </select>
+    ),
+    toggles: false,
+  },
+])(
+  "digit shortcut with focus in $focus toggles an option: $toggles",
+  async ({ control, toggles }) => {
+    const onToggleOption = vi.fn();
+    await using screen = await render(
+      <>
+        {control}
+        <ComposerPendingUserInputPanel
+          pendingUserInputs={[prompt]}
+          cwd={undefined}
+          threadRef={threadRef}
+          respondingRequestIds={[]}
+          answers={{}}
+          questionIndex={0}
+          onToggleOption={onToggleOption}
+          onAdvance={vi.fn()}
+          onDismiss={vi.fn()}
+        />
+      </>,
+    );
+    await expect.element(screen.getByText("Incremental")).toBeVisible();
+    screen.getByLabelText("Focused").element().focus();
+
+    await userEvent.keyboard("1");
+
+    expect(onToggleOption.mock.calls).toEqual(toggles ? [["question", "Incremental"]] : []);
+  },
+);
diff --git a/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx b/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx
index 37a002e2c2708..263c87ae94809 100644
--- a/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx
+++ b/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx
@@ -158,7 +158,9 @@ const ComposerPendingUserInputCard = memo(function ComposerPendingUserInputCard(
       }
       if (
         target instanceof HTMLElement &&
-        target.closest('[contenteditable]:not([contenteditable="false"])')
+        target.closest(
+          'select, [contenteditable]:not([contenteditable="false"]), [role="dialog"], [aria-modal="true"], [role="menu"], [data-slot$="popup"]',
+        )
       ) {
         return;
       }

From beb79f74f37cfc64a27c406cc295db10620ce8f5 Mon Sep 17 00:00:00 2001
From: Victor Vogel <satsdev@only21mil.xyz>
Date: Sat, 31 Oct 2026 23:11:56 +0000
Subject: [PATCH 2/2] fix(web): pending-question digit shortcuts also ignore
 closed select triggers

A closed Base UI select trigger (role="combobox", e.g. the browser device preset picker) still let 1-9 pick and auto-advance a pending answer. The guard now also skips [role="combobox"] targets.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../ComposerPendingUserInputPanel.browser.test.tsx     | 10 ++++++++++
 .../components/chat/ComposerPendingUserInputPanel.tsx  |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/web/src/components/chat/ComposerPendingUserInputPanel.browser.test.tsx b/apps/web/src/components/chat/ComposerPendingUserInputPanel.browser.test.tsx
index 963502d753c70..40022b45bc845 100644
--- a/apps/web/src/components/chat/ComposerPendingUserInputPanel.browser.test.tsx
+++ b/apps/web/src/components/chat/ComposerPendingUserInputPanel.browser.test.tsx
@@ -5,6 +5,7 @@ import { userEvent } from "vite-plus/test/browser";
 
 import { render } from "../../../test/render";
 import type { PendingUserInput } from "../../session-logic";
+import { Select, SelectTrigger } from "../ui/select";
 import { ComposerPendingUserInputPanel } from "./ComposerPendingUserInputPanel";
 
 const threadRef = { environmentId: EnvironmentId.make("env"), threadId: ThreadId.make("thread") };
@@ -63,6 +64,15 @@ it.each<{ focus: string; control: ReactNode; toggles: boolean }>([
     ),
     toggles: false,
   },
+  {
+    focus: "a closed select menu",
+    control: (
+      <Select>
+        <SelectTrigger aria-label="Focused" />
+      </Select>
+    ),
+    toggles: false,
+  },
 ])(
   "digit shortcut with focus in $focus toggles an option: $toggles",
   async ({ control, toggles }) => {
diff --git a/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx b/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx
index 263c87ae94809..3177cb34658b6 100644
--- a/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx
+++ b/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx
@@ -159,7 +159,7 @@ const ComposerPendingUserInputCard = memo(function ComposerPendingUserInputCard(
       if (
         target instanceof HTMLElement &&
         target.closest(
-          'select, [contenteditable]:not([contenteditable="false"]), [role="dialog"], [aria-modal="true"], [role="menu"], [data-slot$="popup"]',
+          'select, [contenteditable]:not([contenteditable="false"]), [role="dialog"], [aria-modal="true"], [role="menu"], [role="combobox"], [data-slot$="popup"]',
         )
       ) {
         return;