@1presence/bridge 0.60.0 → 0.61.0

package/dist/claude.js

@@ -195,6 +195,35 @@ function joinErrorDetail(...parts) {
 // Lines the SDK/CLI writes to its own stderr that look like a failure — surfaced
 // even outside verbose mode so a turn that dies upstream leaves a trail.
 const SDK_STDERR_ERROR_RE = /\b(error|exception|fail(?:ed|ure)?|invalid|unauthor|forbidden|refus|denied|40[0-9]|429|5\d\d|overloaded|rate.?limit)\b/i;
+// The remote 1Presence MCP server's key (matches index.ts writeMcpConfig +
+// the `mcp__1presence__*` allowlist). reconnectMcpServer() takes this name.
+const REMOTE_MCP_SERVER_NAME = '1presence';
+// Signature of a dropped remote MCP session. The pod binds each MCP session to a
+// single long-lived SSE `GET /mcp` stream held in its memory; if that stream
+// drops mid-run (transient network blip on a long workflow stage), the pod
+// deletes the session and every later `POST /mcp/message?sessionId=…` returns
+// HTTP 404 "session not found or expired". The SDK does NOT auto-retry an
+// expired MCP session (sdk.d.ts: "Session expiry is not retried automatically;
+// callers can mcp_reconnect and retry") — it surfaces the 404 as a tool_result
+// error to the model, which then dead-loops calling tools against the same dead
+// session for the rest of the turn. Detecting this lets us reconnect the server
+// so the model's next attempt re-handshakes a fresh session and recovers.
+const MCP_SESSION_EXPIRED_RE = /session not found or expired|Error POSTing to endpoint \(HTTP 404\)/i;
+// Pull every text fragment out of a tool_result `content` (string OR the MCP
+// block-array shape `[{type:'text',text:'…'}]`) so we can scan it for the
+// session-expiry signature above.
+function toolResultText(content) {
+    if (typeof content === 'string')
+        return content;
+    if (Array.isArray(content)) {
+        return content
+            .map((b) => (b && typeof b === 'object' && typeof b.text === 'string'
+            ? b.text
+            : ''))
+            .join(' ');
+    }
+    return '';
+}
 /**
  * Copy for an actionable rate-limit notice. The SDK emits `rate_limit_event`
  * whenever rate-limit info CHANGES — including the routine `allowed` case on
@@ -649,8 +678,28 @@ export function spawnClaude(params) {
             ...(pinnedModel ? { model: pinnedModel } : {}),
         };
         const promptMessages = buildPromptMessages(history);
+        // Throttle remote-MCP reconnects: a single dropped session produces a burst
+        // of 404 tool_results (the model keeps trying), so reconnect at most once per
+        // window to avoid a reconnect storm. A reconnect is in-flight guard too.
+        let lastMcpReconnectAt = 0;
+        let mcpReconnecting = false;
+        const MCP_RECONNECT_THROTTLE_MS = 10_000;
+        const maybeReconnectRemoteMcp = (q) => {
+            const now = Date.now();
+            if (mcpReconnecting || now - lastMcpReconnectAt < MCP_RECONNECT_THROTTLE_MS)
+                return;
+            mcpReconnecting = true;
+            lastMcpReconnectAt = now;
+            process.stderr.write(paint(SECTION_COLORS.result, '[bridge] remote MCP session expired — reconnecting and retrying') + '\n');
+            onNotice?.('Reconnecting to 1Presence tools…');
+            void q.reconnectMcpServer(REMOTE_MCP_SERVER_NAME)
+                .then(() => process.stderr.write(paint(SECTION_COLORS.result, '[bridge] remote MCP reconnected') + '\n'))
+                .catch((err) => process.stderr.write(paint(SECTION_COLORS.result, `[bridge] remote MCP reconnect failed: ${err.message}`) + '\n'))
+                .finally(() => { mcpReconnecting = false; });
+        };
         try {
-            for await (const m of query({ prompt: promptStream(promptMessages), options })) {
+            const q = query({ prompt: promptStream(promptMessages), options });
+            for await (const m of q) {
                 // Skip echoed input replays — they would double-count in the accumulator
                 // and re-stream prior turns to the PWA.
                 if (m.isReplay)
@@ -716,6 +765,19 @@ export function spawnClaude(params) {
                     }
                     case 'user': {
                         const um = m;
+                        // Detect a dropped remote-MCP session in any tool_result and re-handshake
+                        // so the model's next tool call lands on a live session instead of
+                        // 404-looping for the rest of the turn (the SDK won't auto-retry it).
+                        const content = um.message?.['content'];
+                        if (Array.isArray(content)) {
+                            for (const block of content) {
+                                if (block && typeof block === 'object' && block['type'] === 'tool_result'
+                                    && MCP_SESSION_EXPIRED_RE.test(toolResultText(block['content']))) {
+                                    maybeReconnectRemoteMcp(q);
+                                    break;
+                                }
+                            }
+                        }
                         const event = { type: 'user', message: um.message };
                         if (handleEvent(event))
                             onEvent(event);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1presence/bridge",
-  "version": "0.60.0",
+  "version": "0.61.0",
   "description": "Run 1Presence on your Mac and use your Claude.ai Pro subscription from any device",
   "type": "module",
   "bin": {