Merge upstream: Add WebSocket disconnect recovery and slow RPC toast UX (#1730)

apps/web/src/components/ChatView.browser.tsx

@@ -1138,7 +1138,7 @@ describe("ChatView timeline estimator parity (full app)", () => {
         return [];
       },
     });
-    __resetNativeApiForTests();
+    await __resetNativeApiForTests();
     await setViewport(DEFAULT_VIEWPORT);
     localStorage.clear();
     document.body.innerHTML = "";

apps/web/src/components/ChatView.tsx

@@ -197,6 +197,7 @@ import {
   useServerConfig,
   useServerKeybindings,
 } from "~/rpc/serverState";
+import { sanitizeThreadErrorMessage } from "~/rpc/transportError";
 
 const ATTACHMENT_PREVIEW_HANDOFF_TTL_MS = 5000;
 const IMAGE_SIZE_LIMIT_LABEL = `${Math.round(PROVIDER_SEND_TURN_MAX_IMAGE_BYTES / (1024 * 1024))}MB`;
@@ -1620,17 +1621,18 @@ export default function ChatView({ threadId }: ChatViewProps) {
   const setThreadError = useCallback(
     (targetThreadId: ThreadId | null, error: string | null) => {
       if (!targetThreadId) return;
+      const nextError = sanitizeThreadErrorMessage(error);
       if (useStore.getState().threads.some((thread) => thread.id === targetThreadId)) {
-        setStoreThreadError(targetThreadId, error);
+        setStoreThreadError(targetThreadId, nextError);
         return;
       }
       setLocalDraftErrorsByThreadId((existing) => {
-        if ((existing[targetThreadId] ?? null) === error) {
+        if ((existing[targetThreadId] ?? null) === nextError) {
           return existing;
         }
         return {
           ...existing,
-          [targetThreadId]: error,
+          [targetThreadId]: nextError,
         };
       });
     },
@@ -3173,14 +3175,14 @@ export default function ChatView({ threadId }: ChatViewProps) {
           createdAt: new Date().toISOString(),
         })
         .catch((err: unknown) => {
-          setStoreThreadError(
+          setThreadError(
             activeThreadId,
             err instanceof Error ? err.message : "Failed to submit approval decision.",
           );
         });
       setRespondingRequestIds((existing) => existing.filter((id) => id !== requestId));
     },
-    [activeThreadId, setStoreThreadError],
+    [activeThreadId, setThreadError],
   );
 
   const onRespondToUserInput = useCallback(
@@ -3201,14 +3203,14 @@ export default function ChatView({ threadId }: ChatViewProps) {
           createdAt: new Date().toISOString(),
         })
         .catch((err: unknown) => {
-          setStoreThreadError(
+          setThreadError(
             activeThreadId,
             err instanceof Error ? err.message : "Failed to submit user input.",
           );
         });
       setRespondingUserInputRequestIds((existing) => existing.filter((id) => id !== requestId));
     },
-    [activeThreadId, setStoreThreadError],
+    [activeThreadId, setThreadError],
   );
 
   const setActivePendingUserInputQuestionIndex = useCallback(

apps/web/src/components/KeybindingsToast.browser.tsx

@@ -328,7 +328,7 @@ describe("Keybindings update toast", () => {
         return [];
       },
     });
-    __resetNativeApiForTests();
+    await __resetNativeApiForTests();
     localStorage.clear();
     document.body.innerHTML = "";
     useComposerDraftStore.setState({

apps/web/src/components/WebSocketConnectionSurface.logic.test.ts

@@ -0,0 +1,83 @@
+import { describe, expect, it } from "vitest";
+
+import type { WsConnectionStatus } from "../rpc/wsConnectionState";
+import { shouldAutoReconnect } from "./WebSocketConnectionSurface";
+
+function makeStatus(overrides: Partial<WsConnectionStatus> = {}): WsConnectionStatus {
+  return {
+    attemptCount: 0,
+    closeCode: null,
+    closeReason: null,
+    connectedAt: null,
+    disconnectedAt: null,
+    hasConnected: false,
+    lastError: null,
+    lastErrorAt: null,
+    nextRetryAt: null,
+    online: true,
+    phase: "idle",
+    reconnectAttemptCount: 0,
+    reconnectMaxAttempts: 8,
+    reconnectPhase: "idle",
+    socketUrl: null,
+    ...overrides,
+  };
+}
+
+describe("WebSocketConnectionSurface.logic", () => {
+  it("forces reconnect on online when the app was offline", () => {
+    expect(
+      shouldAutoReconnect(
+        makeStatus({
+          disconnectedAt: "2026-04-03T20:00:00.000Z",
+          online: false,
+          phase: "disconnected",
+        }),
+        "online",
+      ),
+    ).toBe(true);
+  });
+
+  it("forces reconnect on focus only for previously connected disconnected states", () => {
+    expect(
+      shouldAutoReconnect(
+        makeStatus({
+          hasConnected: true,
+          online: true,
+          phase: "disconnected",
+          reconnectAttemptCount: 3,
+          reconnectPhase: "waiting",
+        }),
+        "focus",
+      ),
+    ).toBe(true);
+
+    expect(
+      shouldAutoReconnect(
+        makeStatus({
+          hasConnected: false,
+          online: true,
+          phase: "disconnected",
+          reconnectAttemptCount: 1,
+          reconnectPhase: "waiting",
+        }),
+        "focus",
+      ),
+    ).toBe(false);
+  });
+
+  it("forces reconnect on focus for exhausted reconnect loops", () => {
+    expect(
+      shouldAutoReconnect(
+        makeStatus({
+          hasConnected: true,
+          online: true,
+          phase: "disconnected",
+          reconnectAttemptCount: 8,
+          reconnectPhase: "exhausted",
+        }),
+        "focus",
+      ),
+    ).toBe(true);
+  });
+});