From 4b762db5f0e26a9c4c897a65fcb07624b840697e Mon Sep 17 00:00:00 2001 From: usrnk1 <7547651+usrnk1@users.noreply.github.com> Date: Tue, 10 Nov 2026 14:36:35 +0100 Subject: [PATCH] feat(app): queue a follow-up first with Alt+Enter (#63109) --- .../app/e2e/regression/session-queue.spec.ts | 28 +++++++++ packages/app/src/composer/adapter.ts | 2 + .../src/composer/composer-touch.stories.tsx | 1 + .../app/src/composer/composer.stories.tsx | 1 + packages/app/src/composer/composer.tsx | 2 + packages/app/src/composer/editor/editor.tsx | 41 ++++++++++++- .../app/src/composer/editor/interaction.ts | 4 +- packages/app/src/composer/machine.ts | 14 ++++- packages/app/src/composer/model.ts | 1 + packages/app/src/composer/submit.ts | 20 +++++-- packages/app/src/runtime/i18n/en.ts | 1 + .../session/composer/queue-machine.test.ts | 50 ++++++++++++++++ .../app/src/session/composer/queue-machine.ts | 57 ++++++++++++++++--- packages/app/src/session/composer/queue.ts | 1 + 14 files changed, 202 insertions(+), 21 deletions(-) diff --git a/packages/app/e2e/regression/session-queue.spec.ts b/packages/app/e2e/regression/session-queue.spec.ts index e032f7c5597..e4a38bd0d9d 100644 --- a/packages/app/e2e/regression/session-queue.spec.ts +++ b/packages/app/e2e/regression/session-queue.spec.ts @@ -236,6 +236,34 @@ test("follow-up preference controls Enter while Mod+Enter uses the alternate del await expect(view.input).toHaveText("") }) +test("Alt+Enter queues a follow-up first without steering, regardless of the follow-up preference", async ({ + page, +}) => { + const mock = createQueueMock(["Follow-up A", "Follow-up B"]) + + const view = await openQueue(page, mock, "steer") + + await view.input.fill("Follow-up C") + await view.input.press("Alt+Enter") + await expect(view.rows.locator('[data-action="session-queue-edit"]')).toHaveText([ + "Follow-up C", + "Follow-up A", + "Follow-up B", + ]) + await expect + .poll(() => mock.rows.map((row) => [row.payload.text, row.delivery])) + .toEqual([ + ["Follow-up C", "queue"], + ["Follow-up A", "queue"], + ["Follow-up B", "queue"], + ]) + await expect(view.input).toHaveText("") + expect(mock.changes.every((change) => change.action === "cancel")).toBe(true) + await view.input.fill("Another follow-up") + await view.composer.locator('[data-action="composer-alternate-delivery"]').hover() + await expect(page.getByRole("tooltip")).toContainText("Queue first") +}) + test("a blank Enter leaves the running session alone while Stop still interrupts it, as in the TUI", async ({ page, }) => { diff --git a/packages/app/src/composer/adapter.ts b/packages/app/src/composer/adapter.ts index a676e1451ef..0effd79cf90 100644 --- a/packages/app/src/composer/adapter.ts +++ b/packages/app/src/composer/adapter.ts @@ -51,6 +51,8 @@ export type ComposerQueue = { cancelEdit: () => void // Loads the first queued prompt into the composer. Returns false when the queue is empty. editFirst: () => boolean + // Moves an admitted follow-up ahead of the queued prompts, using the queue's serialized reorder. + first: (inboxID: string) => void } export type ComposerSession = { diff --git a/packages/app/src/composer/composer-touch.stories.tsx b/packages/app/src/composer/composer-touch.stories.tsx index 90ac150b05b..e1a7a22a049 100644 --- a/packages/app/src/composer/composer-touch.stories.tsx +++ b/packages/app/src/composer/composer-touch.stories.tsx @@ -123,6 +123,7 @@ function TouchComposer(props: { state: State }) { confirmEdit: (delivery: "steer" | "queue") => record(`Edited queued prompt, ${delivery}`), cancelEdit: () => record("Cancelled the edit"), editFirst: () => false, + first() {}, } const editor = createComposerEditor({ diff --git a/packages/app/src/composer/composer.stories.tsx b/packages/app/src/composer/composer.stories.tsx index 0c0c181b8c9..16c734e3525 100644 --- a/packages/app/src/composer/composer.stories.tsx +++ b/packages/app/src/composer/composer.stories.tsx @@ -241,6 +241,7 @@ function ComposerStory(props: { undoing: () => false, cancelEdit() {}, editFirst: () => false, + first() {}, } : undefined, onSubmit: () => { diff --git a/packages/app/src/composer/composer.tsx b/packages/app/src/composer/composer.tsx index 7de793f1281..f469517a9dc 100644 --- a/packages/app/src/composer/composer.tsx +++ b/packages/app/src/composer/composer.tsx @@ -67,6 +67,8 @@ export function Composer(props: { attachKeybind={command.keybindParts("file.attach")} attachShortcut={command.keybind("file.attach")} alternateKeybind={[formatKeybind("mod", language.t), "↵"]} + queueFirstKeybind={[formatKeybind("alt", language.t), "↵"]} + queueFirstLabel={language.t("session.queue.first")} exitShellKeybind={[formatKeybind("esc", language.t)]} suggestionBoundary={props.suggestionBoundary} modelControl={ diff --git a/packages/app/src/composer/editor/editor.tsx b/packages/app/src/composer/editor/editor.tsx index 9aceeaf59fc..c1843b8b663 100644 --- a/packages/app/src/composer/editor/editor.tsx +++ b/packages/app/src/composer/editor/editor.tsx @@ -93,6 +93,8 @@ export type ComposerEditorProps = { attachKeybind?: string[] attachShortcut?: string alternateKeybind?: string[] + queueFirstKeybind?: string[] + queueFirstLabel?: string exitShellKeybind?: string[] suggestionBoundary?: () => HTMLElement | undefined } @@ -381,7 +383,13 @@ export function ComposerEditor(props: ComposerEditorProps) { if (event.repeat) return // On touch, Cmd+Return is the touch bar's primary action, since plain Return cannot send. - props.controller.submit(mod && !touch() ? { alternate: true } : undefined) + props.controller.submit( + !touch() && event.altKey && !mod + ? { first: true } + : mod && !touch() + ? { alternate: true } + : undefined, + ) } }} // The editor holds one flat run of text, mentions and
s. A touch keyboard's Return arrives as a @@ -506,6 +514,8 @@ export function ComposerEditor(props: ComposerEditorProps) { @@ -1438,7 +1448,12 @@ function composerSuggestionMaxHeight(boundaryHeight: number, search: boolean, hi // delivery opposite to what plain Enter does. Visible only while the queue // exposes an alternate (turn running and composer holding a value), so it // disappears on its own when the current turn ends. -function ComposerEditorAlternateDelivery(props: { controller: ComposerEditorModel; keybind: string[] }) { +function ComposerEditorAlternateDelivery(props: { + controller: ComposerEditorModel + keybind: string[] + firstKeybind: string[] + firstLabel?: string +}) { const i18n = useI18n() const view = props.controller.view @@ -1456,7 +1471,27 @@ function ComposerEditorAlternateDelivery(props: { controller: ComposerEditorMode return ( {(delivery) => ( - + +
+
+ {delivery === "steer" ? i18n.t("ui.promptInput.steer") : i18n.t("ui.promptInput.queue")} + +
+
+ {props.firstLabel} + +
+
+
+ } + >