fix(ui): preserve structured connect failures

steipete · ruanrrn · steipete · commit b29f8fd8e5ca · 2026-07-06T00:02:13.000-04:00
Co-authored-by: RayRuan &lt;rrnruan@gmail.com&gt;
diff --git a/ui/src/api/gateway.node.test.ts b/ui/src/api/gateway.node.test.ts
@@ -1057,6 +1057,41 @@ describe("GatewayBrowserClient", () => {
     }
   });
 
+  it("preserves structured connect errors for pending requests", async () => {
+    useNodeFakeTimers();
+    const client = new GatewayBrowserClient({
+      url: "ws://127.0.0.1:18789",
+      token: "shared-auth-token",
+    });
+
+    try {
+      const { ws, connectFrame } = await startConnect(client);
+      const pendingRequest = client.request("cron.list", { quiet: true });
+
+      ws.emitMessage({
+        type: "res",
+        id: connectFrame.id,
+        ok: false,
+        error: {
+          code: "INVALID_REQUEST",
+          message: "unauthorized",
+          details: { code: "PAIRING_REQUIRED" },
+        },
+      });
+      await expectSocketClosed(ws);
+      ws.emitClose(4008, "connect failed");
+
+      await expect(pendingRequest).rejects.toMatchObject({
+        name: "GatewayRequestError",
+        gatewayCode: "INVALID_REQUEST",
+        details: { code: "PAIRING_REQUIRED" },
+      });
+    } finally {
+      client.stop();
+      vi.useRealTimers();
+    }
+  });
+
   it("treats IPv6 loopback as trusted for bounded device-token retry", async () => {
     useNodeFakeTimers();
     const { client } = await expectRetriedDeviceTokenConnect({
diff --git a/ui/src/api/gateway.ts b/ui/src/api/gateway.ts
@@ -581,12 +581,15 @@ export class GatewayBrowserClient {
         errorCode: connectError?.code ?? "SOCKET_CLOSED",
       });
       this.ws = null;
+      const closeError = connectError
+        ? new GatewayRequestError(connectError)
+        : new Error(`gateway closed (${ev.code}): ${reason}`);
       if (this.pendingStartupReconnectDelayMs !== null) {
-        this.flushPending(new Error(`gateway closed (${ev.code}): ${reason}`));
+        this.flushPending(closeError);
         this.scheduleReconnect();
         return;
       }
-      this.flushPending(new Error(`gateway closed (${ev.code}): ${reason}`));
+      this.flushPending(closeError);
       const connectErrorCode = resolveGatewayErrorDetailCode(connectError);
       // willRetry drives both the reconnect scheduling below and the app
       // layer's "still reconnecting vs gave up" rendering; keep them in sync.
