From 2c5eb7076935a95f0c4c8e091ebb0bb03694a380 Mon Sep 17 00:00:00 2001 From: Wout Stiens <71498452+StiensWout@users.noreply.github.com> Date: Fri, 20 Nov 2026 08:28:51 +0100 Subject: [PATCH 1/5] Cover ChatGPT setup dismissal during account creation Co-authored-by: GPT 6.2 Sol --- .../AddCodexAccountDialog.browser.test.tsx | 27 ++++++- ...ng-chatgpt-account-keeps-setup-open.e2e.ts | 80 +++++++++++++++++++ 2 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 scripts/scenarios/adding-chatgpt-account-keeps-setup-open.e2e.ts diff --git a/apps/web/src/components/settings/AddCodexAccountDialog.browser.test.tsx b/apps/web/src/components/settings/AddCodexAccountDialog.browser.test.tsx index c7c223c656e37..218fc2695c05d 100644 --- a/apps/web/src/components/settings/AddCodexAccountDialog.browser.test.tsx +++ b/apps/web/src/components/settings/AddCodexAccountDialog.browser.test.tsx @@ -13,7 +13,7 @@ import { act, render } from "../../../test/render"; import { AppAtomRegistryProvider, appAtomRegistry as registry } from "../../rpc/atomRegistry"; const setup = vi.hoisted(() => ({ - update: vi.fn(async () => ({ _tag: "Success" as const })), + update: vi.fn(async (): Promise<{ _tag: "Success" | "Failure" }> => ({ _tag: "Success" })), })); const providersAtom = vi.hoisted(() => ({ current: null as unknown })); @@ -96,7 +96,32 @@ function Owner({ } describe("AddCodexAccountDialog", () => { + it("hides the header Close button only while saving the account", async () => { + providersAtom.current = Atom.make | null>([]); + const save = Promise.withResolvers>>(); + setup.update.mockImplementationOnce(() => save.promise); + await using _screen = await render( + + {}} onAccountCreated={() => {}} /> + , + ); + + const close = page.getByRole("button", { name: "Close", exact: true }); + try { + await userEvent.click(page.getByRole("button", { name: "Continue" })); + await expect.element(page.getByRole("button", { name: "Adding account…" })).toBeDisabled(); + expect(close.query()).toBeNull(); + } finally { + await act(() => save.resolve({ _tag: "Failure" })); + } + + await expect.element(close).toBeVisible(); + await userEvent.keyboard("{Escape}"); + await expect.element(page.getByRole("dialog")).not.toBeInTheDocument(); + }); + it("plays its close animation before the owner unmounts it once the account connects", async () => { + setup.update.mockClear(); const atom = Atom.make | null>([]).pipe(Atom.keepAlive); providersAtom.current = atom; const onClose = vi.fn(); diff --git a/scripts/scenarios/adding-chatgpt-account-keeps-setup-open.e2e.ts b/scripts/scenarios/adding-chatgpt-account-keeps-setup-open.e2e.ts new file mode 100644 index 0000000000000..e530372c8880f --- /dev/null +++ b/scripts/scenarios/adding-chatgpt-account-keeps-setup-open.e2e.ts @@ -0,0 +1,80 @@ +/// +import { expect } from "e2e"; + +import { test, WEB } from "./t3.ts"; + +declare global { + interface Window { + chatGptAccountSave?: { + readonly started: Promise; + readonly release: () => void; + }; + } +} + +test( + "Escape leaves ChatGPT account setup open while the account is being added", + WEB, + async ({ t3, app, browser, screen }) => { + await t3.project("demo"); + await browser.addInitScript(() => { + const gate = Promise.withResolvers(); + const started = Promise.withResolvers(); + window.chatGptAccountSave = { started: started.promise, release: gate.resolve }; + const send = WebSocket.prototype.send; + WebSocket.prototype.send = function (data) { + if (typeof data !== "string") return send.call(this, data); + const parsed = JSON.parse(data); + const messages = [parsed].flat(); + const accountSave = (message: { + _tag?: string; + tag?: string; + payload?: { patch?: { providerInstances?: Record } }; + }) => + message?._tag === "Request" && + message.tag === "server.updateSettings" && + Object.values(message.payload?.patch?.providerInstances ?? {}).some( + (instance) => instance.displayName === "ChatGPT - Slow account", + ); + const saves = messages.filter(accountSave); + if (saves.length === 0) return send.call(this, data); + const other = messages.filter((message) => !saves.includes(message)); + if (other.length > 0) send.call(this, JSON.stringify(other)); + started.resolve(); + void gate.promise.then(() => + send.call(this, Array.isArray(parsed) ? JSON.stringify(saves) : data), + ); + }; + }); + await t3.open("/settings/providers?instanceId=codex"); + await screen.getByRole("button", "Add provider", { exact: true }).first().tap(); + const addProvider = screen.getByRole("dialog", "Add provider", { exact: true }); + await addProvider.getByRole("radio", "Codex", { exact: true }).tap(); + await addProvider.getByRole("button", "Continue with ChatGPT", { exact: true }).tap(); + + const setup = screen.getByRole("dialog", "Add ChatGPT account", { exact: true }); + await setup.getByRole("textbox", "Account name", { exact: true }).fill("Slow account"); + try { + await setup.getByRole("button", "Continue", { exact: true }).tap(); + const adding = browser + .locator('[data-slot="dialog-popup"][data-open]') + .getByRole("button", "Adding account…", { exact: true }); + await adding.waitFor(); + await browser.evaluate(async () => { + await window.chatGptAccountSave!.started; + return null; + }); + await browser.keyboard.press("Escape"); + await app.screenshot("escape-during-account-creation"); + expect( + await adding.isVisible(), + "ChatGPT account setup stays open while adding the account", + ).toBe(true); + } finally { + await browser.evaluate(() => { + window.chatGptAccountSave?.release(); + return null; + }); + } + }, +); From 2b707e06e17555037af4d6b411402cac6e7cb1e6 Mon Sep 17 00:00:00 2001 From: Wout Stiens <71498452+StiensWout@users.noreply.github.com> Date: Fri, 20 Nov 2026 08:29:21 +0100 Subject: [PATCH 2/5] Keep ChatGPT setup open while saving the account Co-authored-by: GPT 6.2 Sol --- .../web/src/components/settings/AddCodexAccountDialog.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/web/src/components/settings/AddCodexAccountDialog.tsx b/apps/web/src/components/settings/AddCodexAccountDialog.tsx index 5eb3c749540c4..5dd4b8d9ad735 100644 --- a/apps/web/src/components/settings/AddCodexAccountDialog.tsx +++ b/apps/web/src/components/settings/AddCodexAccountDialog.tsx @@ -85,14 +85,16 @@ export function AddCodexAccountDialog({ return ( { - if (!open) onClose(); + onOpenChange={(open, eventDetails) => { + if (open) return; + if (pending) return eventDetails.cancel(); + onClose(); }} onOpenChangeComplete={(open) => { if (!open && connected) onClose(); }} > - + Date: Fri, 20 Nov 2026 08:42:02 +0100 Subject: [PATCH 3/5] Test Escape during ChatGPT account creation Co-authored-by: GPT 6.2 Sol --- .../components/settings/AddCodexAccountDialog.browser.test.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/web/src/components/settings/AddCodexAccountDialog.browser.test.tsx b/apps/web/src/components/settings/AddCodexAccountDialog.browser.test.tsx index 218fc2695c05d..8d574f3da7b36 100644 --- a/apps/web/src/components/settings/AddCodexAccountDialog.browser.test.tsx +++ b/apps/web/src/components/settings/AddCodexAccountDialog.browser.test.tsx @@ -111,6 +111,8 @@ describe("AddCodexAccountDialog", () => { await userEvent.click(page.getByRole("button", { name: "Continue" })); await expect.element(page.getByRole("button", { name: "Adding account…" })).toBeDisabled(); expect(close.query()).toBeNull(); + await userEvent.keyboard("{Escape}"); + await expect.element(page.getByRole("dialog")).toBeVisible(); } finally { await act(() => save.resolve({ _tag: "Failure" })); } From 8aa2ef1500228ed4a9dd271249090c965fb029de Mon Sep 17 00:00:00 2001 From: Wout Stiens <71498452+StiensWout@users.noreply.github.com> Date: Fri, 20 Nov 2026 08:43:14 +0100 Subject: [PATCH 4/5] chore: credit the models that worked on this change Co-authored-by: Claude Opus 5.5 From 39906f1a9f3ed1e2f7c9249224ae806c02a50308 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Fri, 20 Nov 2026 08:05:08 +0000 Subject: [PATCH 5/5] refactor(web): guard ChatGPT setup dismissal like sibling settings dialogs Co-Authored-By: Claude Opus 5.5 --- apps/web/src/components/settings/AddCodexAccountDialog.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/web/src/components/settings/AddCodexAccountDialog.tsx b/apps/web/src/components/settings/AddCodexAccountDialog.tsx index 5dd4b8d9ad735..0dd255b902fad 100644 --- a/apps/web/src/components/settings/AddCodexAccountDialog.tsx +++ b/apps/web/src/components/settings/AddCodexAccountDialog.tsx @@ -85,10 +85,8 @@ export function AddCodexAccountDialog({ return ( { - if (open) return; - if (pending) return eventDetails.cancel(); - onClose(); + onOpenChange={(open) => { + if (!open && !pending) onClose(); }} onOpenChangeComplete={(open) => { if (!open && connected) onClose();