diff --git a/packages/app/e2e/regression/composer.spec.ts b/packages/app/e2e/regression/composer.spec.ts index 2909de72ff7..e775dbcec59 100644 --- a/packages/app/e2e/regression/composer.spec.ts +++ b/packages/app/e2e/regression/composer.spec.ts @@ -697,3 +697,31 @@ test("shows thinking on hover or a non-default selection while preserving keyboa await page.keyboard.press("Tab") await expect(control).toHaveCSS("opacity", "0") }) + +test("pastes into the composer from the session view but not into other inputs", async ({ page }) => { + const prompts: unknown[] = [] + const { editor } = await openSession(page, { name: "PasteFocus", onPrompt: (input) => void prompts.push(input.body) }) + await editor.fill("hello") + await editor.press("Enter") + await expect.poll(() => prompts.length).toBe(1) + const message = page.locator('[data-timeline-row="UserMessage"]') + await message.click() + await expect(editor).not.toBeFocused() + + await page.evaluate(() => navigator.clipboard.writeText("pasted from the timeline")) + await page.keyboard.press("ControlOrMeta+V") + await expect(editor).toBeFocused() + await expect.poll(() => editor.innerText()).toBe("pasted from the timeline") + + await editor.blur() + await page.evaluate(() => { + const field = document.createElement("input") + field.id = "elsewhere" + document.body.append(field) + field.focus() + }) + await page.keyboard.press("ControlOrMeta+V") + await expect(page.locator("#elsewhere")).toHaveValue("pasted from the timeline") + await expect(page.locator("#elsewhere")).toBeFocused() + await expect.poll(() => editor.innerText()).toBe("pasted from the timeline") +}) diff --git a/packages/app/src/session/composer/region.tsx b/packages/app/src/session/composer/region.tsx index 6c3b6c2d94b..00d0bd3de0d 100644 --- a/packages/app/src/session/composer/region.tsx +++ b/packages/app/src/session/composer/region.tsx @@ -182,7 +182,10 @@ export function createActiveSessionRegion(input: { return } - if (event.key.length !== 1 || event.key === "Unidentified" || event.ctrlKey || event.metaKey) return + // Focusing on the ⌘V keydown makes the browser's paste land in the composer through its normal paste path. + const paste = (event.metaKey || event.ctrlKey) && !event.altKey && event.key.toLowerCase() === "v" + + if (event.key.length !== 1 || event.key === "Unidentified" || ((event.ctrlKey || event.metaKey) && !paste)) return if (state.blocked() || input.session.data.isChild() || !promptRef) return promptRef.focus()