@1presence/bridge 0.95.0 → 0.97.0

package/dist/claude.js

@@ -140,13 +140,17 @@ export function isPermissionTransportFailure(text) {
 export function isLiveTurnResult(result, producedRealOutput) {
     return producedRealOutput || result.is_error === true;
 }
-const MCP_TOOL_UNREGISTERED_RE = new RegExp(`No such tool available:\\s*(?:${MCP_TOOL_PREFIX}|${LEGACY_MCP_TOOL_PREFIX})`, 'i');
+const MCP_TOOL_UNREGISTERED_RE = new RegExp(`No such tool available:\\s*((?:${MCP_TOOL_PREFIX}|${LEGACY_MCP_TOOL_PREFIX})[A-Za-z0-9_]+)`, 'i');
 export function shouldReconnectRemoteMcp(args) {
-    const { toolName, isError, text } = args;
+    const { toolName, isError, text, served } = args;
     if (MCP_SESSION_EXPIRED_RE.test(text))
         return true;
-    if (MCP_TOOL_UNREGISTERED_RE.test(text))
+    const unregistered = MCP_TOOL_UNREGISTERED_RE.exec(text);
+    if (unregistered) {
+        if (served && served.size > 0 && !served.has(unregistered[1]))
+            return false;
         return true;
+    }
     if (!isError || !isPresenceToolName(toolName))
         return false;
     if (OUTBOUND_NETWORK_TOOLS.has(toolName))
@@ -241,7 +245,9 @@ export function makeGatedPromptStream(messages) {
     };
 }
 export function spawnClaude(params) {
-    const { conversationId, presenceSessionId, text, uid, history, vaultFileOpen, clientCapabilities, syncedFolders, model: perTurnModel, onEvent, onDone, onError, onNotice } = params;
+    const { conversationId, presenceSessionId, chatSessionId, text, uid, history, vaultFileOpen, clientCapabilities, syncedFolders, model: perTurnModel, onEvent, onDone, onError, onNotice } = params;
+    const sessionTag = ` · session ${chatSessionId ?? conversationId}`;
+    const errLine = (text) => paint(SECTION_COLORS.error, `${text}${sessionTag}`);
     const systemPromptPath = join(tmpdir(), `agent-${uid}.md`);
     const mcpConfigPath = join(tmpdir(), `mcp-${uid}.json`);
     if (verbose) {
@@ -266,7 +272,7 @@ export function spawnClaude(params) {
         debugBlock('user · this turn', SECTION_COLORS.user, text);
     }
     else {
-        process.stderr.write(`[bridge] session ${presenceSessionId}\n`);
+        process.stderr.write(`[bridge] session ${chatSessionId ?? '(none)'}  turn ${conversationId}\n`);
     }
     void vaultFileOpen;
     void clientCapabilities;
@@ -388,7 +394,7 @@ export function spawnClaude(params) {
                         if (blockText && TOOL_CALL_XML_RE.test(blockText)) {
                             const cleaned = stripToolCallXml(blockText);
                             if (cleaned !== blockText) {
-                                process.stderr.write(paint(SECTION_COLORS.error, `[bridge] suppressed confabulated tool-call XML in assistant text`) + '\n');
+                                process.stderr.write(errLine(`[bridge] suppressed confabulated tool-call XML in assistant text`) + '\n');
                                 block['text'] = cleaned;
                                 blockText = cleaned;
                             }
@@ -402,7 +408,7 @@ export function spawnClaude(params) {
                                 apiErrorText = blockText.trim();
                                 if (isAuthFailure)
                                     sawAuthFailure = true;
-                                process.stderr.write(paint(SECTION_COLORS.error, `[bridge] ${blockText.replace(/\n+/g, ' ')}`) + '\n');
+                                process.stderr.write(errLine(`[bridge] ${blockText.replace(/\n+/g, ' ')}`) + '\n');
                                 return false;
                             }
                             producedRealOutput = true;
@@ -433,7 +439,7 @@ export function spawnClaude(params) {
                     if (block['is_error']) {
                         const detail = toolResultText(out).replace(/\s+/g, ' ').trim();
                         const shown = detail.length > 400 ? `${detail.slice(0, 400)}…` : detail;
-                        process.stderr.write(paint(SECTION_COLORS.error, `[bridge] ✗ tool error ← ${name}: ${shown || 'no detail'}`) + '\n');
+                        process.stderr.write(errLine(`[bridge] ✗ tool error ← ${name}: ${shown || 'no detail'}`) + '\n');
                     }
                     if (!verbose && !debug)
                         continue;
@@ -460,7 +466,7 @@ export function spawnClaude(params) {
                 const detail = joinErrorDetail(event['result'], event['errors']);
                 apiErrorText = joinErrorDetail(apiErrorText, detail) || apiErrorText;
                 const subtype = event['subtype'] ? ` subtype=${event['subtype']}` : '';
-                process.stderr.write(paint(SECTION_COLORS.error, `[bridge] result error${status != null ? ` (${status})` : ''}${subtype}: ${apiErrorText || 'unknown'}`) + '\n');
+                process.stderr.write(errLine(`[bridge] result error${status != null ? ` (${status})` : ''}${subtype}: ${apiErrorText || 'unknown'}`) + '\n');
                 if (!detail) {
                     let raw;
                     try {
@@ -469,7 +475,7 @@ export function spawnClaude(params) {
                     catch {
                         raw = String(event);
                     }
-                    process.stderr.write(paint(SECTION_COLORS.error, `[bridge] result raw: ${raw.slice(0, 2000)}`) + '\n');
+                    process.stderr.write(errLine(`[bridge] result raw: ${raw.slice(0, 2000)}`) + '\n');
                 }
             }
         }
@@ -541,6 +547,7 @@ export function spawnClaude(params) {
         inputReleaseTimer.unref?.();
         let lastMcpReconnectAt = 0;
         let mcpReconnecting = false;
+        let servedPresenceTools = new Set();
         const MCP_RECONNECT_THROTTLE_MS = 10_000;
         const maybeReconnectRemoteMcp = (q) => {
             const now = Date.now();
@@ -548,11 +555,11 @@ export function spawnClaude(params) {
                 return;
             mcpReconnecting = true;
             lastMcpReconnectAt = now;
-            process.stderr.write(paint(SECTION_COLORS.error, '[bridge] remote MCP connection lost — reconnecting and retrying') + '\n');
+            process.stderr.write(errLine('[bridge] remote MCP connection lost — 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.error, `[bridge] remote MCP reconnect failed: ${err.message}`) + '\n'))
+                .catch((err) => process.stderr.write(errLine(`[bridge] remote MCP reconnect failed: ${err.message}`) + '\n'))
                 .finally(() => { mcpReconnecting = false; });
         };
         try {
@@ -566,9 +573,10 @@ export function spawnClaude(params) {
                         const subtype = m.subtype;
                         if (subtype === 'init') {
                             const init = m;
-                            const event = { type: 'system', subtype: 'init', model: init.model, apiKeySource: init.apiKeySource, claude_code_version: init.claude_code_version };
+                            const event = { type: 'system', subtype: 'init', model: init.model, apiKeySource: init.apiKeySource, claude_code_version: init.claude_code_version, session_id: init.session_id };
                             if (handleEvent(event))
                                 onEvent(event);
+                            servedPresenceTools = new Set((init.tools ?? []).filter((t) => isPresenceToolName(t)));
                             const surface = assessRemoteMcpSurface(m);
                             const surfaceLine = `[bridge] mcp surface: ${REMOTE_MCP_SERVER_NAME}=${surface.status}, ${surface.toolCount} tool(s)`;
                             if (surfaceLine !== lastSurfaceLog) {
@@ -584,9 +592,9 @@ export function spawnClaude(params) {
                                         detail = ` — ${remote.error.replace(/\s+/g, ' ').trim().slice(0, 300)}`;
                                 }
                                 catch { }
-                                process.stderr.write(paint(SECTION_COLORS.error, `[bridge] FATAL no 1Presence tools this turn (${surface.status}) — ending the turn rather than answering blind${detail}`) + '\n');
+                                process.stderr.write(errLine(`[bridge] FATAL no 1Presence tools this turn (${surface.status}) — ending the turn rather than answering blind${detail}`) + '\n');
                                 if (surface.status === 'needs-auth' && !detail) {
-                                    process.stderr.write(paint(SECTION_COLORS.error, '[bridge]   ↳ the server asked for OAuth, which Local Mode does not use — this is NOT a stale local token, and restarting will not clear it. The gateway is rejecting this account\'s token on /mcp.') + '\n');
+                                    process.stderr.write(errLine('[bridge]   ↳ the server asked for OAuth, which Local Mode does not use — this is NOT a stale local token, and restarting will not clear it. The gateway is rejecting this account\'s token on /mcp.') + '\n');
                                 }
                                 active.delete(conversationId);
                                 clearTimeout(inputReleaseTimer);
@@ -598,7 +606,7 @@ export function spawnClaude(params) {
                         }
                         else if (subtype === 'api_retry') {
                             const r = m;
-                            process.stderr.write(paint(SECTION_COLORS.error, `[bridge] api retry ${r.attempt ?? '?'}/${r.max_retries ?? '?'}${r.error_status != null ? ` (${r.error_status})` : ''}: ${r.error ?? 'unknown'}${r.retry_delay_ms != null ? `, next in ${r.retry_delay_ms}ms` : ''}`) + '\n');
+                            process.stderr.write(errLine(`[bridge] api retry ${r.attempt ?? '?'}/${r.max_retries ?? '?'}${r.error_status != null ? ` (${r.error_status})` : ''}: ${r.error ?? 'unknown'}${r.retry_delay_ms != null ? `, next in ${r.retry_delay_ms}ms` : ''}`) + '\n');
                             const attempt = r.attempt ?? 0;
                             if (attempt >= 2 || (r.retry_delay_ms ?? 0) >= 2000) {
                                 onNotice?.(formatRetryNotice(attempt, r.max_retries ?? 0, r.retry_delay_ms));
@@ -623,7 +631,7 @@ export function spawnClaude(params) {
                             const full = joinErrorDetail(`API Error: ${am.error}`, msgText, rid);
                             if (!apiErrorText || /^API Error: \w+$/.test(apiErrorText))
                                 apiErrorText = full;
-                            process.stderr.write(paint(SECTION_COLORS.error, `[bridge] assistant error: ${joinErrorDetail(am.error, msgText, rid)}`) + '\n');
+                            process.stderr.write(errLine(`[bridge] assistant error: ${joinErrorDetail(am.error, msgText, rid)}`) + '\n');
                             break;
                         }
                         const event = { type: 'assistant', message: am.message, error: am.error };
@@ -646,7 +654,7 @@ export function spawnClaude(params) {
                                 const resultText = toolResultText(b['content']);
                                 if (b['is_error'] === true && isPermissionTransportFailure(resultText)) {
                                     const detail = resultText.replace(/\s+/g, ' ').trim().slice(0, 300);
-                                    process.stderr.write(paint(SECTION_COLORS.error, `[bridge] FATAL permission transport lost — ending the turn rather than answering blind: ${detail}`) + '\n');
+                                    process.stderr.write(errLine(`[bridge] FATAL permission transport lost — ending the turn rather than answering blind: ${detail}`) + '\n');
                                     active.delete(conversationId);
                                     clearTimeout(inputReleaseTimer);
                                     input.release();
@@ -658,6 +666,7 @@ export function spawnClaude(params) {
                                     toolName: toolNames.get(b['tool_use_id'] ?? '') ?? '',
                                     isError: b['is_error'] === true,
                                     text: resultText,
+                                    served: servedPresenceTools,
                                 })) {
                                     maybeReconnectRemoteMcp(q);
                                     break;
@@ -735,7 +744,7 @@ export function spawnClaude(params) {
                 return;
             const message = err?.message ?? String(err);
             const stack = err?.stack;
-            process.stderr.write(paint(SECTION_COLORS.error, `[bridge] query() threw: ${stack || message}`) + '\n');
+            process.stderr.write(errLine(`[bridge] query() threw: ${stack || message}`) + '\n');
             if (/40[13]\b|unauthor|invalid (api key|authentication)|please run \/login/i.test(message)) {
                 sawAuthFailure = true;
             }

package/dist/index.js

@@ -280,7 +280,7 @@ async function handleMessage(conversationId, text, sessionId, history, auth, vau
         if (!isTokenValid(auth.token)) {
             const message = 'Authentication expired and refresh failed — please restart the bridge to sign in again.';
             stopTurnTimer();
-            console.error(paint(SECTION_COLORS.error, `[bridge] ${message} (${err.message})`));
+            console.error(paint(SECTION_COLORS.error, `[bridge] ${message} (${err.message}) · session ${sessionId ?? conversationId}`));
             if (currentWs?.readyState === WebSocket.OPEN) {
                 currentWs.send(JSON.stringify({ type: 'error', conversationId, message }));
             }
@@ -294,7 +294,7 @@ async function handleMessage(conversationId, text, sessionId, history, auth, vau
     catch (err) {
         const message = `System prompt refresh failed: ${err.message}`;
         stopTurnTimer();
-        console.error(paint(SECTION_COLORS.error, `[${new Date().toLocaleTimeString()}] ✗ ${message}`));
+        console.error(paint(SECTION_COLORS.error, `[${new Date().toLocaleTimeString()}] ✗ ${message} · session ${sessionId ?? conversationId}`));
         if (currentWs?.readyState === WebSocket.OPEN) {
             currentWs.send(JSON.stringify({ type: 'error', conversationId, message }));
         }
@@ -352,6 +352,7 @@ async function handleMessage(conversationId, text, sessionId, history, auth, vau
     spawnClaude({
         conversationId,
         presenceSessionId: claudePinnedSessionId,
+        chatSessionId: turnSessionId,
         text,
         uid: activeAuth.uid,
         history,
@@ -414,7 +415,7 @@ async function handleMessage(conversationId, text, sessionId, history, auth, vau
         },
         onError: (message, usage, model) => {
             const elapsed = stopTurnTimer();
-            console.error(paint(SECTION_COLORS.error, `[${new Date().toLocaleTimeString()}] ✗ ${message}  (${formatElapsed(elapsed)})`));
+            console.error(paint(SECTION_COLORS.error, `[${new Date().toLocaleTimeString()}] ✗ ${message}  (${formatElapsed(elapsed)}) · session ${turnSessionId}`));
             const mapped = toBridgeUsage(usage);
             if (currentWs?.readyState === WebSocket.OPEN) {
                 currentWs.send(JSON.stringify({
@@ -555,7 +556,7 @@ function connect(auth, retryDelay = 1000) {
         startTurnTimer();
         handleMessage(conversationId, text, sessionId ?? null, hist, auth, vaultFileOpen, clientCapabilities, syncedFolders, agentSlug, model).catch((err) => {
             stopTurnTimer();
-            console.error(paint(SECTION_COLORS.error, `[bridge] handleMessage error: ${err.message}`));
+            console.error(paint(SECTION_COLORS.error, `[bridge] handleMessage error: ${err.message} · session ${sessionId ?? conversationId}`));
         });
     });
     ws.on('close', (code) => {

package/package.json

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