Fix onboarding request drop on effect rerun and surface web discovery failures alongside rows

Author: cursoragent

apps/mobile/src/features/cloud/CloudAuthProvider.tsx

@@ -57,6 +57,7 @@ function CloudAuthBridge(props: { readonly children: ReactNode }) {
   } | null>(null);
   const observedAccountRef = useRef<string | null | undefined>(undefined);
   const accountTransitionRef = useRef<Promise<void> | null>(null);
+  const pendingOnboardingAccountRef = useRef<string | null>(null);
 
   useEffect(() => {
     let cancelled = false;
@@ -77,8 +78,15 @@ function CloudAuthBridge(props: { readonly children: ReactNode }) {
     // environments; sign-out drops any not-yet-presented request instead.
     const isAccountTransition =
       previousObservedAccount !== undefined && previousObservedAccount !== nextAccount;
-    if (isAccountTransition && nextAccount === null) {
-      clearConnectOnboardingRequest();
+    if (isAccountTransition) {
+      // The pending request lives in a ref rather than this run's closure: a
+      // rerun with the same account (e.g. a new getToken identity) cancels the
+      // run that observed the transition, and its activation must still
+      // request onboarding.
+      pendingOnboardingAccountRef.current = nextAccount;
+      if (nextAccount === null) {
+        clearConnectOnboardingRequest();
+      }
     }
 
     const queueAccountCleanup = (
@@ -128,7 +136,8 @@ function CloudAuthBridge(props: { readonly children: ReactNode }) {
       }
       previousTokenProviderRef.current = { userId, provider: tokenProvider };
       activateCloudRelayAccount(userId, tokenProvider);
-      if (isAccountTransition) {
+      if (pendingOnboardingAccountRef.current === userId) {
+        pendingOnboardingAccountRef.current = null;
         requestConnectOnboarding(userId);
       }
     };

apps/web/src/components/cloud/CloudEnvironmentConnectList.tsx

@@ -135,34 +135,36 @@ export function CloudEnvironmentConnectRows({
     return <RemoteEnvironmentRowsSkeleton />;
   }
 
+  // A failed or offline discovery is not "no environments" — misreporting it
+  // as empty would read as the user's devices having disappeared. The card is
+  // also rendered alongside any already-discovered rows, so a failed refresh
+  // never hides behind an otherwise-healthy list.
+  const discoveryProblem = environmentsState.offline
+    ? "You appear to be offline."
+    : (Option.getOrNull(environmentsState.error)?.message ?? null);
+  const discoveryFailure =
+    discoveryProblem !== null && !environmentsState.refreshing ? (
+      <div className={ITEM_ROW_CLASSNAME}>
+        <p className="text-sm font-medium text-destructive">
+          Could not load T3 Connect environments
+        </p>
+        <p className="mt-1 text-xs text-muted-foreground">{discoveryProblem}</p>
+        <Button
+          size="sm"
+          variant="outline"
+          className="mt-3"
+          onClick={() => void refreshRelayEnvironments()}
+        >
+          Try again
+        </Button>
+      </div>
+    ) : null;
+
   if (standalone && visibleEnvironments.length === 0) {
-    // A failed or offline discovery is not "no environments" — misreporting it
-    // as empty would read as the user's devices having disappeared.
-    const discoveryProblem = environmentsState.offline
-      ? "You appear to be offline."
-      : (Option.getOrNull(environmentsState.error)?.message ?? null);
-    if (discoveryProblem !== null && !environmentsState.refreshing) {
-      return (
-        <div className={ITEM_ROW_CLASSNAME}>
-          <p className="text-sm font-medium text-destructive">
-            Could not load T3 Connect environments
-          </p>
-          <p className="mt-1 text-xs text-muted-foreground">{discoveryProblem}</p>
-          <Button
-            size="sm"
-            variant="outline"
-            className="mt-3"
-            onClick={() => void refreshRelayEnvironments()}
-          >
-            Try again
-          </Button>
-        </div>
-      );
-    }
-    return empty;
+    return discoveryFailure ?? empty;
   }
 
-  return visibleEnvironments.map(({ environment, availability, error }) => {
+  const rows = visibleEnvironments.map(({ environment, availability, error }) => {
     const alreadyConnected = savedIds.has(environment.environmentId);
     return (
       <div key={environment.environmentId} className={ITEM_ROW_CLASSNAME}>
@@ -224,4 +226,11 @@ export function CloudEnvironmentConnectRows({
       </div>
     );
   });
+
+  return (
+    <>
+      {rows}
+      {discoveryFailure}
+    </>
+  );
 }