@devries-cameron20 / t3code-1 / commits / 810e8f62f0
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

fix(desktop): an abandoned browser sign-in no longer blocks T3 Connect for 3 minutes (#22903)

On desktop, an abandoned browser sign-in blocked every T3 Connect sign-in for 3 minutes. A new attempt now replaces the stale Clerk flow, and a Cancel bar resets the sheet. Takeover of #22708. Co-authored-by: steve-ai-vibe <steve.ai.vibe@gmail.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Theo Browne committed Oct 21, 2026 at 06:30 UTC 810e8f62f0eff2f3b6ae4602f781d9bb80607913
9 files changed +258 -4
apps/desktop/src/clerkOAuthCancel.test.ts new
+58
@@ -0,0 +1,58 @@
1 +import { assert, describe, it } from "@effect/vitest";
2 +
3 +import { createClerkOAuthCancel } from "./clerkOAuthCancel.ts";
4 +
5 +const deferredOpen = () => {
6 + const resolvers: Array<(value: { callbackUrl: string }) => void> = [];
7 + const opened: Array<Promise<{ callbackUrl: string }>> = [];
8 + const open = (_url: string) => {
9 + const promise = new Promise<{ callbackUrl: string }>((resolve) => {
10 + resolvers.push(resolve);
11 + });
12 + opened.push(promise);
13 + return promise;
14 + };
15 + return { open, resolvers, opened };
16 +};
17 +
18 +const outcome = (promise: Promise<{ callbackUrl: string }>) =>
19 + promise.then(
20 + ({ callbackUrl }) => `resolved ${callbackUrl}`,
21 + (error: Error) => `rejected ${error.message}`,
22 + );
23 +
24 +describe("createClerkOAuthCancel", () => {
25 + it("cancel rejects the pending flow and reports it is no longer pending", async () => {
26 + const oauth = createClerkOAuthCancel();
27 + const changes: boolean[] = [];
28 + oauth.onPendingChange((pending) => changes.push(pending));
29 + const { open } = deferredOpen();
30 +
31 + const flow = outcome(oauth.wrapOpen(open)("https://accounts.example/a"));
32 + assert.isTrue(oauth.isPending());
33 + oauth.cancel();
34 +
35 + assert.strictEqual(await flow, "rejected Clerk: OAuth flow was cancelled.");
36 + assert.isFalse(oauth.isPending());
37 + assert.deepStrictEqual(changes, [true, false]);
38 + });
39 +
40 + it("a new attempt replaces the pending one, and the old result cannot clear it", async () => {
41 + const oauth = createClerkOAuthCancel();
42 + const { open, resolvers, opened } = deferredOpen();
43 + const wrapped = oauth.wrapOpen(open);
44 +
45 + const first = outcome(wrapped("https://accounts.example/a"));
46 + const second = outcome(wrapped("https://accounts.example/b"));
47 + assert.strictEqual(await first, "rejected Clerk: OAuth flow was cancelled.");
48 +
49 + resolvers[0]?.({ callbackUrl: "t3code://app/?a" });
50 + // Two hops, so the wrapper's own `.then().finally()` on this result has run.
51 + await opened[0]?.then(() => undefined).then(() => undefined);
52 + assert.isTrue(oauth.isPending());
53 +
54 + resolvers[1]?.({ callbackUrl: "t3code://app/?b" });
55 + assert.strictEqual(await second, "resolved t3code://app/?b");
56 + assert.isFalse(oauth.isPending());
57 + });
58 +});
apps/desktop/src/clerkOAuthCancel.ts new
+46
@@ -0,0 +1,46 @@
1 +type OAuthOpen = (url: string) => Promise<{ callbackUrl: string }>;
2 +
3 +/**
4 + * Lets the app cancel the Clerk OAuth flow the renderer is waiting on. The
5 + * system browser never reports a closed tab, so an abandoned sign-in would
6 + * otherwise keep Clerk's sheet spinning until Clerk's 180s timeout.
7 + *
8 + * Pass `wrapOpen` to `exposeClerkBridge` as `wrapOAuthOpen`. Cancelling only
9 + * rejects the renderer's promise; the patched main process replaces the stale
10 + * flow when the next attempt starts.
11 + */
12 +export function createClerkOAuthCancel() {
13 + let cancelPending: (() => void) | null = null;
14 + const listeners = new Set<(pending: boolean) => void>();
15 + const setCancelPending = (cancel: (() => void) | null) => {
16 + cancelPending = cancel;
17 + for (const listener of listeners) listener(cancel !== null);
18 + };
19 +
20 + return {
21 + wrapOpen:
22 + (open: OAuthOpen): OAuthOpen =>
23 + (url) => {
24 + cancelPending?.();
25 + return new Promise((resolve, reject) => {
26 + const settle = () => {
27 + if (cancelPending === cancel) setCancelPending(null);
28 + };
29 + const cancel = () => {
30 + settle();
31 + reject(new Error("Clerk: OAuth flow was cancelled."));
32 + };
33 + setCancelPending(cancel);
34 + open(url).then(resolve, reject).finally(settle);
35 + });
36 + },
37 + isPending: () => cancelPending !== null,
38 + onPendingChange: (listener: (pending: boolean) => void) => {
39 + listeners.add(listener);
40 + return () => {
41 + listeners.delete(listener);
42 + };
43 + },
44 + cancel: () => cancelPending?.(),
45 + };
46 +}
apps/desktop/src/preload.ts
+6 -1
@@ -10,6 +10,7 @@ import type {
10 import { exposeClerkBridge } from "@clerk/electron/preload";
11 import { contextBridge, ipcRenderer, webFrame, webUtils } from "electron";
12
13 +import { createClerkOAuthCancel } from "./clerkOAuthCancel.ts";
14 import * as IpcChannels from "./ipc/channels.ts";
15 import { mergeLegacyLocalStorage } from "./legacyLocalStorageMerge.ts";
16
@@ -30,7 +31,8 @@ function isSnapShotEvent(value: unknown): value is DesktopSnapShotEvent {
31 );
32 }
33
33 -exposeClerkBridge({ passkeys: true });
34 +const clerkOAuthCancel = createClerkOAuthCancel();
35 +exposeClerkBridge({ passkeys: true, wrapOAuthOpen: clerkOAuthCancel.wrapOpen });
36
37 // Runs before any app script reads localStorage. See DesktopLegacyLocalStorage.
38 try {
@@ -251,6 +253,9 @@ contextBridge.exposeInMainWorld("desktopBridge", {
253 ipcRenderer.removeListener(IpcChannels.QUIT_SHORTCUT_CHANNEL, wrappedListener);
254 };
255 },
256 + isClerkOAuthPending: clerkOAuthCancel.isPending,
257 + onClerkOAuthPendingChange: clerkOAuthCancel.onPendingChange,
258 + cancelClerkOAuth: clerkOAuthCancel.cancel,
259 getWindowFullscreenState: () =>
260 ipcRenderer.sendSync(IpcChannels.GET_WINDOW_FULLSCREEN_STATE_CHANNEL) === true,
261 getWindowZoomFactor: () => webFrame.getZoomFactor(),
apps/web/src/components/clerk/ClerkOAuthPendingBar.tsx new
+35
@@ -0,0 +1,35 @@
1 +import { useSyncExternalStore } from "react";
2 +import { createPortal } from "react-dom";
3 +
4 +import { Button } from "../ui/button";
5 +
6 +function subscribeToClerkOAuthPending(onChange: () => void): () => void {
7 + return window.desktopBridge?.onClerkOAuthPendingChange?.(() => onChange()) ?? (() => {});
8 +}
9 +
10 +function readClerkOAuthPending(): boolean {
11 + return window.desktopBridge?.isClerkOAuthPending?.() ?? false;
12 +}
13 +
14 +export function ClerkOAuthPendingBar() {
15 + const pending = useSyncExternalStore(subscribeToClerkOAuthPending, readClerkOAuthPending);
16 + if (!pending) return null;
17 + return createPortal(
18 + <div className="pointer-events-none fixed inset-x-0 bottom-6 z-10001 flex justify-center px-4">
19 + <div
20 + role="status"
21 + className="pointer-events-auto flex items-center gap-3 rounded-lg border bg-popover py-2 pr-2 pl-4 text-sm text-popover-foreground shadow-xl"
22 + >
23 + Finish signing in in your browser.
24 + <Button
25 + size="sm"
26 + variant="outline"
27 + onClick={() => window.desktopBridge?.cancelClerkOAuth?.()}
28 + >
29 + Cancel
30 + </Button>
31 + </div>
32 + </div>,
33 + document.body,
34 + );
35 +}
apps/web/src/components/clerk/ElectronManagedAuthShell.tsx
+2
@@ -3,6 +3,7 @@ import { ClerkProvider } from "@clerk/electron/react";
3 import type { ReactNode } from "react";
4
5 import { ManagedRelayAuthProvider } from "../../cloud/managedAuth";
6 +import { ClerkOAuthPendingBar } from "./ClerkOAuthPendingBar";
7 import { clerkAppearance } from "./clerkAppearance";
8
9 /**
@@ -21,6 +22,7 @@ export default function ElectronManagedAuthShell({
22 return (
23 <ClerkProvider appearance={clerkAppearance} publishableKey={publishableKey} passkeys={passkeys}>
24 <ManagedRelayAuthProvider>{children}</ManagedRelayAuthProvider>
25 + <ClerkOAuthPendingBar />
26 </ClerkProvider>
27 );
28 }
packages/contracts/src/ipc.ts
+3
@@ -1125,6 +1125,9 @@ export interface DesktopBridge {
1125 onMenuAction: (listener: (action: string) => void) => () => void;
1126 onSnapShotEvent?: (listener: (event: DesktopSnapShotEvent) => void) => () => void;
1127 onQuitShortcut?: (listener: (event: QuitShortcutHintEvent) => void) => () => void;
1128 + isClerkOAuthPending?: () => boolean;
1129 + onClerkOAuthPendingChange?: (listener: (pending: boolean) => void) => () => void;
1130 + cancelClerkOAuth?: () => void;
1131 getWindowFullscreenState: () => boolean;
1132 onWindowFullscreenStateChange: (listener: (fullscreen: boolean) => void) => () => void;
1133 /** App window zoom; older desktop shells omit this method. */
patches/@clerk__electron@0.1.1.patch new
+103
@@ -0,0 +1,103 @@
1 +diff --git a/dist/cjs/index.js b/dist/cjs/index.js
2 +index 97a5a25d58584c9bf04997fcec67e29923a0cf76..8fa6d6422188dc720e6de3672ba77e79617526bd 100644
3 +--- a/dist/cjs/index.js
4 ++++ b/dist/cjs/index.js
5 +@@ -95,8 +95,8 @@ function setupOAuthTransportIpcHandlers(options) {
6 + });
7 + electron.ipcMain.handle(require_ipc.OAUTH_TRANSPORT_CHANNELS.open, async (event, url) => {
8 + if (!isMainFrameEvent(event)) throw new Error("Clerk: OAuth request did not originate from a window's main frame.");
9 +- if (pendingOAuthFlow) throw new Error("Clerk: an OAuth flow is already pending.");
10 + assertExternalOAuthUrl(url);
11 ++ disposePendingOAuthFlow(new Error("Clerk: OAuth flow was replaced by a new one."));
12 + const window = electron.BrowserWindow.fromWebContents(event.sender);
13 + const callbackPromise = new Promise((resolve, reject) => {
14 + pendingOAuthFlow = {
15 +@@ -109,10 +109,13 @@ function setupOAuthTransportIpcHandlers(options) {
16 + window
17 + };
18 + });
19 ++ const flow = pendingOAuthFlow;
20 ++ // A newer flow can reject this one before it is returned below.
21 ++ callbackPromise.catch(() => {});
22 + try {
23 + await electron.shell.openExternal(url);
24 + } catch (err) {
25 +- disposePendingOAuthFlow(err instanceof Error ? err : new Error(String(err)));
26 ++ if (pendingOAuthFlow === flow) disposePendingOAuthFlow(err instanceof Error ? err : new Error(String(err)));
27 + }
28 + return callbackPromise;
29 + });
30 +diff --git a/dist/cjs/preload/index.js b/dist/cjs/preload/index.js
31 +index 310c21a720e7b5da06ee301f6b51597f081a8179..3518d29e786258065bc5ab92b664ea06dc99b659 100644
32 +--- a/dist/cjs/preload/index.js
33 ++++ b/dist/cjs/preload/index.js
34 +@@ -33,7 +33,7 @@ function exposeClerkBridge(options) {
35 + },
36 + oauthTransport: {
37 + getRedirectUrl: () => electron.ipcRenderer.invoke(require_ipc.OAUTH_TRANSPORT_CHANNELS.getRedirectUrl),
38 +- open: (url) => electron.ipcRenderer.invoke(require_ipc.OAUTH_TRANSPORT_CHANNELS.open, url)
39 ++ open: (options?.wrapOAuthOpen ?? ((open) => open))((url) => electron.ipcRenderer.invoke(require_ipc.OAUTH_TRANSPORT_CHANNELS.open, url))
40 + }
41 + };
42 + if (process.contextIsolated) electron.contextBridge.exposeInMainWorld("__clerk_internal_electron", bridge);
43 +diff --git a/dist/esm/index.js b/dist/esm/index.js
44 +index 29284ea0e6325afc72024ec8c2e69ab3cb78ad00..80c64fd8dbaefb4a393cc814a273620f77ca76c6 100644
45 +--- a/dist/esm/index.js
46 ++++ b/dist/esm/index.js
47 +@@ -94,8 +94,8 @@ function setupOAuthTransportIpcHandlers(options) {
48 + });
49 + ipcMain.handle(OAUTH_TRANSPORT_CHANNELS.open, async (event, url) => {
50 + if (!isMainFrameEvent(event)) throw new Error("Clerk: OAuth request did not originate from a window's main frame.");
51 +- if (pendingOAuthFlow) throw new Error("Clerk: an OAuth flow is already pending.");
52 + assertExternalOAuthUrl(url);
53 ++ disposePendingOAuthFlow(new Error("Clerk: OAuth flow was replaced by a new one."));
54 + const window = BrowserWindow.fromWebContents(event.sender);
55 + const callbackPromise = new Promise((resolve, reject) => {
56 + pendingOAuthFlow = {
57 +@@ -108,10 +108,13 @@ function setupOAuthTransportIpcHandlers(options) {
58 + window
59 + };
60 + });
61 ++ const flow = pendingOAuthFlow;
62 ++ // A newer flow can reject this one before it is returned below.
63 ++ callbackPromise.catch(() => {});
64 + try {
65 + await shell.openExternal(url);
66 + } catch (err) {
67 +- disposePendingOAuthFlow(err instanceof Error ? err : new Error(String(err)));
68 ++ if (pendingOAuthFlow === flow) disposePendingOAuthFlow(err instanceof Error ? err : new Error(String(err)));
69 + }
70 + return callbackPromise;
71 + });
72 +diff --git a/dist/esm/preload/index.js b/dist/esm/preload/index.js
73 +index 4a131a7d148fb402fe5e04336ccf7398723501b4..110dab808a7c6a1a7664dc5d9ab254af2fa4c4bc 100644
74 +--- a/dist/esm/preload/index.js
75 ++++ b/dist/esm/preload/index.js
76 +@@ -32,7 +32,7 @@ function exposeClerkBridge(options) {
77 + },
78 + oauthTransport: {
79 + getRedirectUrl: () => ipcRenderer.invoke(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl),
80 +- open: (url) => ipcRenderer.invoke(OAUTH_TRANSPORT_CHANNELS.open, url)
81 ++ open: (options?.wrapOAuthOpen ?? ((open) => open))((url) => ipcRenderer.invoke(OAUTH_TRANSPORT_CHANNELS.open, url))
82 + }
83 + };
84 + if (process.contextIsolated) contextBridge.exposeInMainWorld("__clerk_internal_electron", bridge);
85 +diff --git a/dist/types/shared/types.d.ts b/dist/types/shared/types.d.ts
86 +index ed127cc9e02808600b7f51dd71b278e223180534..96b6cc803a4e245f9966237003511b3cbe2121c8 100644
87 +--- a/dist/types/shared/types.d.ts
88 ++++ b/dist/types/shared/types.d.ts
89 +@@ -40,6 +40,14 @@ export type ExposeClerkBridgeOptions = {
90 + * Exposes the native passkey bridge to the renderer. Requires `createClerkBridge({ passkeys: true })`.
91 + */
92 + passkeys?: boolean;
93 ++ /**
94 ++ * Wraps the renderer's OAuth open call, for example to let the app cancel a pending flow.
95 ++ */
96 ++ wrapOAuthOpen?: (open: (url: string) => Promise<{
97 ++ callbackUrl: string;
98 ++ }>) => (url: string) => Promise<{
99 ++ callbackUrl: string;
100 ++ }>;
101 + };
102 + export type ClerkBridge = {
103 + /**
pnpm-lock.yaml
+4 -3
@@ -327,6 +327,7 @@ packageExtensionsChecksum: sha256-EowbsmlBFaoO0Ypufw901RnvdyjKG5dcdk2FRbc7Dr0=
327 pnpmfileChecksum: sha256-lS/yS+IvX/sj4KLdjVeRsq/hRipJMILKWjIbzIC+czo=
328
329 patchedDependencies:
330 + '@clerk/electron@0.1.1': 6e7944f61680e5d0caa0ed1ec69b43265a76d74733e77ee73a227fe6d6df02e1
331 '@clerk/expo-native-components@0.2.0': 7a808b92da8460750b85818552e13be3fb73d111691c7db76965970351e124e4
332 '@effect/vitest@4.0.5': 2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02
333 '@expo/fingerprint@0.21.5': 8fba80d6bbce46c72de427fe8c7907462d262a0bfe50c6b2b7ee9c4e0c61e5e1
@@ -389,7 +390,7 @@ importers:
390 dependencies:
391 '@clerk/electron':
392 specifier: 0.1.1
392 - version: 0.1.1(@clerk/electron-passkeys@0.0.3)(electron-store@8.2.0)(electron@44.9.3)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
393 + version: 0.1.1(patch_hash=6e7944f61680e5d0caa0ed1ec69b43265a76d74733e77ee73a227fe6d6df02e1)(@clerk/electron-passkeys@0.0.3)(electron-store@8.2.0)(electron@44.9.3)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
394 '@clerk/electron-passkeys':
395 specifier: 0.0.3
396 version: 0.0.3
@@ -984,7 +985,7 @@ importers:
985 version: 6.39.1(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
986 '@clerk/electron':
987 specifier: 0.1.1
987 - version: 0.1.1(@clerk/electron-passkeys@0.0.3)(electron-store@8.2.0)(electron@44.9.3)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
988 + version: 0.1.1(patch_hash=6e7944f61680e5d0caa0ed1ec69b43265a76d74733e77ee73a227fe6d6df02e1)(@clerk/electron-passkeys@0.0.3)(electron-store@8.2.0)(electron@44.9.3)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
989 '@clerk/react':
990 specifier: 6.17.8
991 version: 6.17.8(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
@@ -13603,7 +13604,7 @@ snapshots:
13604 '@clerk/electron-passkeys-win32-arm64-msvc': 0.0.3
13605 '@clerk/electron-passkeys-win32-x64-msvc': 0.0.3
13606
13606 - '@clerk/electron@0.1.1(@clerk/electron-passkeys@0.0.3)(electron-store@8.2.0)(electron@44.9.3)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)':
13607 + '@clerk/electron@0.1.1(patch_hash=6e7944f61680e5d0caa0ed1ec69b43265a76d74733e77ee73a227fe6d6df02e1)(@clerk/electron-passkeys@0.0.3)(electron-store@8.2.0)(electron@44.9.3)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)':
13608 dependencies:
13609 '@clerk/clerk-js': 6.39.1(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
13610 '@clerk/react': 6.17.8(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
pnpm-workspace.yaml
+1
@@ -333,6 +333,7 @@ patchedDependencies:
333 alchemy@2.0.0-beta.80: patches/alchemy@2.0.0-beta.80.patch
334 expo-audio@58.0.9: patches/expo-audio@58.0.9.patch
335 expo-network@58.0.3: patches/expo-network@58.0.3.patch
336 + "@clerk/electron@0.1.1": patches/@clerk__electron@0.1.1.patch
337 "@clerk/expo-native-components@0.2.0": patches/@clerk__expo-native-components@0.2.0.patch
338 "@effect/vitest@4.0.5": patches/@effect__vitest@4.0.5.patch
339 "@expo/metro-config@58.0.14": patches/@expo__metro-config@58.0.14.patch