From 84f66054b41d3aa358ab2ab9d1f09a4812d11065 Mon Sep 17 00:00:00 2001 From: Dax Date: Sat, 31 Oct 2026 19:10:25 -0400 Subject: [PATCH] fix(app): don't interrupt the session on empty Enter (#60977) --- .../app/e2e/regression/session-queue.spec.ts | 29 +++++++++++++++++++ packages/app/src/composer/submit.ts | 7 ++--- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/packages/app/e2e/regression/session-queue.spec.ts b/packages/app/e2e/regression/session-queue.spec.ts index 9d3314da91a..f4eaf1409c7 100644 --- a/packages/app/e2e/regression/session-queue.spec.ts +++ b/packages/app/e2e/regression/session-queue.spec.ts @@ -231,6 +231,35 @@ test("follow-up preference controls Enter while Mod+Enter uses the alternate del await expect(view.input).toHaveText("") }) +test("a blank Enter leaves the running session alone while Stop still interrupts it, as in the TUI", async ({ + page, +}) => { + const mock = createQueueMock([]) + const view = await openQueue(page, mock) + const interrupts: string[] = [] + page.on("request", (request) => { + if (new URL(request.url()).pathname.endsWith(`/${sessionID}/interrupt`)) interrupts.push(request.url()) + }) + const stop = view.composer.getByRole("button", { name: "Stop", exact: true }) + + await expect(stop).toBeVisible() + await view.input.click() + await view.input.press("Enter") + await view.input.press("ControlOrMeta+Enter") + await view.input.pressSequentially(" ") + await view.input.press("Enter") + + const interrupted = page.waitForRequest((request) => + new URL(request.url()).pathname.endsWith(`/${sessionID}/interrupt`), + ) + + await stop.click() + await interrupted + + expect(interrupts).toHaveLength(1) + expect(mock.prompts).toEqual([]) +}) + test("a steer shows as pending in the timeline as the composer clears, before the server admits it", async ({ page, }) => { diff --git a/packages/app/src/composer/submit.ts b/packages/app/src/composer/submit.ts index 4343af00721..5b3d6512dd0 100644 --- a/packages/app/src/composer/submit.ts +++ b/packages/app/src/composer/submit.ts @@ -120,11 +120,8 @@ export function createComposerSubmit(input: ComposerSubmitInput) { return } - if (!read) { - if (input.adapter.working() && input.adapter.kind === "active-session") void input.adapter.interrupt() - - return - } + // Like the TUI, a blank Enter never interrupts; only Stop, Escape and Ctrl+G do. + if (!read) return // Like the TUI, a shell command runs now or not at all; it cannot wait in the queue. if (read.mode === "shell" && read.delivery === "queue") {