The best way to control Claude Code, Codex and more from any computer or phone
fix(web): T3 Connect sign-in offers Retry after Clerk fails to load (#23620)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Julius Marminge committed
Nov 13, 2026 at 13:48 UTC
1219f628454ad5c601019b61fd677942a80c1c59
8 files changed
+79
-6
apps/web/src/components/HostedEmptyState.tsx
+7
-1
@@ -10,6 +10,7 @@ import { isElectron } from "../env";
10
import { isLocalEnvironmentDisabled } from "../localEnvironment";
11
import { useRelayEnvironmentDiscovery } from "../state/environments";
12
import { InstallT3Commands } from "./InstallT3Commands";
13
+import { retryClerkLoad, useClerkLoadFailed } from "./clerk/clerkLoadFailure";
14
import { useT3ConnectAuthPrompt } from "./clerk/useT3ConnectAuthPrompt";
15
import { CloudEnvironmentConnectRows } from "./cloud/CloudEnvironmentConnectList";
16
import { Button } from "./ui/button";
@@ -65,6 +66,7 @@ export function HostedEmptyState() {
66
67
function T3ConnectSteps() {
68
const { isLoaded, isSignedIn } = useAuth({ treatPendingAsSignedOut: false });
69
+ const loadFailed = useClerkLoadFailed();
70
const { openAuthPrompt } = useT3ConnectAuthPrompt();
71
// Adding the first computer unmounts this screen. Wait for all health checks
72
// so every compatible registration is queued before that happens.
@@ -76,7 +78,11 @@ function T3ConnectSteps() {
78
return (
79
<>
80
<SetupStep number={1}>
79
- {isSignedIn ? (
81
+ {loadFailed ? (
82
+ <Button size="sm" onClick={retryClerkLoad}>
83
+ Retry sign-in
84
+ </Button>
85
+ ) : isSignedIn ? (
86
<p className="flex items-center gap-1.5 text-muted-foreground">
87
<CheckIcon className="size-4" />
88
Signed in
apps/web/src/components/auth/ApproveAgentSurface.tsx
+17
@@ -13,6 +13,7 @@ import { type ReactNode, useEffect, useEffectEvent, useRef, useState } from "rea
13
import { isElectron } from "../../env";
14
import { runConnectMcpApproval } from "../../state/connectMcpApproval";
15
import { resolveClerkSignInProps } from "../clerk/authRedirect";
16
+import { retryClerkLoad, useClerkLoadFailed } from "../clerk/clerkLoadFailure";
17
import { Button } from "../ui/button";
18
import { Spinner } from "../ui/spinner";
19
import { StandalonePage, StandalonePageHeader } from "../ui/standalone-page";
@@ -86,6 +87,7 @@ export function ApproveAgentSurface() {
87
);
88
const clerk = useClerk();
89
const { isLoaded, isSignedIn } = useAuth();
90
+ const loadFailed = useClerkLoadFailed();
91
const session = useAtomValue(managedRelaySessionAtom);
92
const signInOpened = useRef(false);
93
@@ -118,6 +120,21 @@ export function ApproveAgentSurface() {
120
);
121
}
122
123
+ if (loadFailed) {
124
+ return (
125
+ <Message
126
+ title="Could not load sign-in"
127
+ description="T3 Connect sign-in did not load. Check your connection, then try again."
128
+ >
129
+ <div className="mt-6">
130
+ <Button type="button" onClick={retryClerkLoad}>
131
+ Retry sign-in
132
+ </Button>
133
+ </div>
134
+ </Message>
135
+ );
136
+ }
137
+
138
if (!isLoaded || (isSignedIn && session === null)) {
139
return (
140
<StandalonePage>
apps/web/src/components/clerk/T3ConnectSidebarSignIn.tsx
+15
-1
@@ -1,8 +1,9 @@
1
import { UserButton, useAuth } from "@clerk/react";
2
-import { LogInIcon } from "lucide-react";
2
+import { LogInIcon, RotateCwIcon } from "lucide-react";
3
4
import { hasCloudPublicConfig } from "../../cloud/publicConfig";
5
import { SidebarMenu, SidebarMenuButton, SidebarMenuItem } from "../ui/sidebar";
6
+import { retryClerkLoad, useClerkLoadFailed } from "./clerkLoadFailure";
7
import { T3_CONNECT_ACCOUNT_PAGES } from "./T3ConnectAccountPages";
8
import { useT3ConnectAuthPrompt } from "./useT3ConnectAuthPrompt";
9
@@ -49,8 +50,21 @@ function ConfiguredT3ConnectSidebarAvatar() {
50
51
function ConfiguredT3ConnectSidebarSignIn() {
52
const { isLoaded, isSignedIn } = useAuth();
53
+ const loadFailed = useClerkLoadFailed();
54
const { openAuthPrompt } = useT3ConnectAuthPrompt();
55
56
+ if (loadFailed) {
57
+ return (
58
+ <SidebarMenu>
59
+ <SidebarMenuItem>
60
+ <SidebarMenuButton onClick={retryClerkLoad}>
61
+ <RotateCwIcon />
62
+ <span>Retry T3 Connect</span>
63
+ </SidebarMenuButton>
64
+ </SidebarMenuItem>
65
+ </SidebarMenu>
66
+ );
67
+ }
68
if (!isLoaded || isSignedIn) return null;
69
70
return (
apps/web/src/components/clerk/clerkLoadFailure.ts
new
+11
@@ -0,0 +1,11 @@
1
+import { useClerk } from "@clerk/react";
2
+
3
+export function useClerkLoadFailed() {
4
+ return useClerk().status === "error";
5
+}
6
+
7
+export function retryClerkLoad() {
8
+ // Clerk caches its failed script load for the life of the page and never
9
+ // retries, so a reload is the only recovery.
10
+ window.location.reload();
11
+}
apps/web/src/components/clerk/useT3ConnectAuthPrompt.tsx
+5
@@ -2,10 +2,15 @@ import { useClerk } from "@clerk/react";
2
3
import { isElectron } from "../../env";
4
import { resolveClerkSignInProps } from "./authRedirect";
5
+import { retryClerkLoad } from "./clerkLoadFailure";
6
7
export function useT3ConnectAuthPrompt() {
8
const clerk = useClerk();
9
const openAuthPrompt = () => {
10
+ if (clerk.status === "error") {
11
+ retryClerkLoad();
12
+ return;
13
+ }
14
clerk.openSignIn(resolveClerkSignInProps(window.location.href, isElectron));
15
};
16
return { openAuthPrompt };
apps/web/src/components/cloud/ConnectCliAuthSurface.tsx
+9
-1
@@ -9,6 +9,7 @@ import {
9
import { isElectron } from "../../env";
10
import { StandalonePage, StandalonePageHeader } from "../ui/standalone-page";
11
import { resolveClerkSignInProps } from "../clerk/authRedirect";
12
+import { retryClerkLoad, useClerkLoadFailed } from "../clerk/clerkLoadFailure";
13
import { Button } from "../ui/button";
14
15
const invalidLinkMessage = {
@@ -22,6 +23,7 @@ export function ConnectCliAuthorizeSurface() {
23
const [request] = useState(() => readConnectAuthorizeRequest(new URL(window.location.href)));
24
const clerk = useClerk();
25
const { isLoaded, isSignedIn } = useAuth();
26
+ const loadFailed = useClerkLoadFailed();
27
const signInOpened = useRef(false);
28
const redirecting = useRef(false);
29
@@ -77,7 +79,13 @@ export function ConnectCliAuthorizeSurface() {
79
: "Sign in to continue authorizing T3 Connect for your CLI."
80
}
81
/>
80
- {isLoaded && !isSignedIn ? (
82
+ {loadFailed ? (
83
+ <div className="mt-6">
84
+ <Button type="button" onClick={retryClerkLoad}>
85
+ Retry sign-in
86
+ </Button>
87
+ </div>
88
+ ) : isLoaded && !isSignedIn ? (
89
<div className="mt-6">
90
<Button type="button" onClick={openSignIn}>
91
Sign in
apps/web/src/components/onboarding/WelcomePage.import.browser.test.tsx
+4
@@ -67,6 +67,10 @@ vi.mock(import("@clerk/react"), async (original) => ({
67
...(await original()),
68
useAuth: (() => state.auth) as never,
69
}));
70
+vi.mock(import("../clerk/clerkLoadFailure"), async (original) => ({
71
+ ...(await original()),
72
+ useClerkLoadFailed: () => false,
73
+}));
74
vi.mock(import("../clerk/useT3ConnectAuthPrompt"), async (original) => ({
75
...(await original()),
76
useT3ConnectAuthPrompt: (() => ({ openAuthPrompt: () => {} })) as never,
apps/web/src/components/onboarding/WelcomePage.tsx
+11
-3
@@ -48,6 +48,7 @@ import { useCloudLinkState } from "../../cloud/cloudLinkState";
48
import { hasCloudPublicConfig } from "../../cloud/publicConfig";
49
import { PRIVACY_POLICY_URL } from "../../legalLinks";
50
import { workspaceAreaProps } from "../../lib/workspaceFocus";
51
+import { retryClerkLoad, useClerkLoadFailed } from "../clerk/clerkLoadFailure";
52
import { useT3ConnectAuthPrompt } from "../clerk/useT3ConnectAuthPrompt";
53
import { completeOnboarding } from "../../onboarding/firstRun";
54
import {
@@ -961,6 +962,7 @@ function PhoneStep({ step, children }: { readonly step: number; readonly childre
962
963
function PhoneConnectLink({ environmentId }: { readonly environmentId: EnvironmentId }) {
964
const { isLoaded, isSignedIn, userId } = useAuth({ treatPendingAsSignedOut: false });
965
+ const loadFailed = useClerkLoadFailed();
966
const { openAuthPrompt } = useT3ConnectAuthPrompt();
967
const linkState = useCloudLinkState(environmentId);
968
const refreshLinkState = useEffectEvent(linkState.refresh);
@@ -1029,9 +1031,15 @@ function PhoneConnectLink({ environmentId }: { readonly environmentId: Environme
1031
<p className="text-sm text-foreground">
1032
Sign in to T3 Connect here, then in the app with the same account.
1033
</p>
1032
- <Button variant="outline" size="xs" disabled={!isLoaded} onClick={openAuthPrompt}>
1033
- Sign in to T3 Connect
1034
- </Button>
1034
+ {loadFailed ? (
1035
+ <Button variant="outline" size="xs" onClick={retryClerkLoad}>
1036
+ Retry sign-in
1037
+ </Button>
1038
+ ) : (
1039
+ <Button variant="outline" size="xs" disabled={!isLoaded} onClick={openAuthPrompt}>
1040
+ Sign in to T3 Connect
1041
+ </Button>
1042
+ )}
1043
</>
1044
);
1045
}