@1presence/bridge 0.42.0 → 0.44.0

package/dist/claude.js

@@ -82,6 +82,26 @@ function debugBlock(label, colorCode, body) {
     const rule = `── ${label} `.padEnd(64, '─');
     process.stderr.write(`\n${paint(colorCode, rule)}\n${body.trimEnd()}\n`);
 }
+// Strip confabulated tool-call XML out of assistant text. Real tool calls arrive
+// as structured tool_use blocks, never as text — so when assistant text contains
+// <function_calls>/<function_results>/<invoke>, the model is role-playing the tool
+// protocol because it had no callable tools, and that raw XML (often invented
+// internal-looking content) must never reach the user. Kept as a tiny local copy
+// rather than importing @presence/shared so the published bridge stays decoupled.
+const TOOL_CALL_XML_RE = /<function_calls\b|<function_results\b|<invoke\b/i;
+function stripToolCallXml(text) {
+    if (!text || !TOOL_CALL_XML_RE.test(text))
+        return text;
+    let out = text
+        .replace(/<function_calls>[\s\S]*?<\/function_calls>/gi, '')
+        .replace(/<function_results>[\s\S]*?<\/function_results>/gi, '')
+        .replace(/<invoke\b[\s\S]*?<\/invoke>/gi, '');
+    // Truncated / unclosed opener: drop from the first stray opener to the end.
+    out = out.replace(/<function_calls\b[\s\S]*$/i, '')
+        .replace(/<function_results\b[\s\S]*$/i, '')
+        .replace(/<invoke\b[\s\S]*$/i, '');
+    return out.trim();
+}
 // Render one replayed-history content block as a single readable line for the
 // debug transcript. Tool calls and results are inlined so a history turn shows
 // exactly what the model received — text, the tools it ran, and what they
@@ -348,7 +368,19 @@ export function spawnClaude(params) {
                         }
                     }
                     else if (block['type'] === 'text') {
-                        const blockText = block['text'];
+                        let blockText = block['text'];
+                        // Drop confabulated tool-call XML before this event is forwarded to
+                        // the gateway (onEvent forwards THIS object, so mutate it in place).
+                        // Happens when a turn ran with no callable tools and the model
+                        // role-played the protocol in prose. See vault/Bugs.md 2026-05-28.
+                        if (blockText && TOOL_CALL_XML_RE.test(blockText)) {
+                            const cleaned = stripToolCallXml(blockText);
+                            if (cleaned !== blockText) {
+                                process.stderr.write(paint(SECTION_COLORS.result, `[bridge] suppressed confabulated tool-call XML in assistant text`) + '\n');
+                                block['text'] = cleaned;
+                                blockText = cleaned;
+                            }
+                        }
                         if (blockText) {
                             // The CLI/SDK can report auth/API failures as a synthetic assistant
                             // text turn whose wording varies. Detect by the structured signal
@@ -414,6 +446,11 @@ export function spawnClaude(params) {
                 if (!apiErrorText && typeof event['result'] === 'string') {
                     apiErrorText = event['result'].trim();
                 }
+                // Operator visibility — a result-borne error would otherwise reach the
+                // user as a chat error with NOTHING in the bridge logs (the failure
+                // mode that made the empty-content `invalid_request` regression so hard
+                // to diagnose). Mechanical log only; no product logic.
+                process.stderr.write(paint(SECTION_COLORS.result, `[bridge] result error${status ? ` (${status})` : ''}: ${apiErrorText || 'unknown'}`) + '\n');
             }
         }
         return true;
@@ -440,7 +477,10 @@ export function spawnClaude(params) {
             settingSources: [], // no user/project settings or memory
             allowedTools: ['mcp__1presence__*'], // auto-approve our MCP surface (no prompt)
             canUseTool, // hard deny anything else
-            extraArgs: { tools: '' }, // disable ALL built-in tools (= CLI --tools "")
+            tools: [], // disable ALL built-in tools; MCP tools come via mcpServers and survive.
+            // (The old `extraArgs: { tools: '' }` passed a malformed --tools "" that
+            //  cleared the whole tool surface — including MCP — so the model had no
+            //  callable tools and confabulated tool calls as text. See vault/Bugs.md.)
             cwd: BRIDGE_CWD,
             abortController: abort,
             includePartialMessages: false, // whole messages, matching the old non-partial path

package/dist/config.js

@@ -78,12 +78,13 @@ function detectClaudeDefaultModel() {
 // `--model` flag passed to the subprocess).
 const MODEL_OPTIONS = [
     { num: 1, model: null, label: 'Use Claude Code default' },
-    { num: 2, model: 'claude-opus-4-7', label: 'claude-opus-4-7' },
-    { num: 3, model: 'claude-sonnet-4-6', label: 'claude-sonnet-4-6' },
-    { num: 4, model: 'claude-haiku-4-5', label: 'claude-haiku-4-5' },
+    { num: 2, model: 'claude-opus-4-8', label: 'claude-opus-4-8' },
+    { num: 3, model: 'claude-opus-4-7', label: 'claude-opus-4-7' },
+    { num: 4, model: 'claude-sonnet-4-6', label: 'claude-sonnet-4-6' },
+    { num: 5, model: 'claude-haiku-4-5', label: 'claude-haiku-4-5' },
 ];
 const PROMPT_TIMEOUT_MS = 10_000;
-const DEFAULT_OPTION_NUM = 1;
+const DEFAULT_OPTION_NUM = 2;
 function promptForModel(defaultModel) {
     return new Promise((resolve) => {
         const initialIdx = Math.max(0, MODEL_OPTIONS.findIndex((o) => o.num === DEFAULT_OPTION_NUM));

package/dist/index.js

@@ -182,6 +182,12 @@ function writeMcpConfig(auth) {
                 type: 'sse',
                 url: `${GATEWAY_HTTP}/mcp`,
                 headers: { Authorization: `Bearer ${token}` },
+                // Force every 1Presence tool into the prompt from turn 1. Without this the
+                // SDK defers MCP tools behind tool-search, so the model sees tool *names*
+                // (from the system prompt) but has nothing callable and confabulates the
+                // call + result as text. Also blocks the turn until the MCP server connects
+                // (5s cap) — a loud failure beats a silent tool-less run. See vault/Bugs.md.
+                alwaysLoad: true,
             },
         },
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1presence/bridge",
-  "version": "0.42.0",
+  "version": "0.44.0",
   "description": "Run 1Presence on your Mac and use your Claude.ai Pro subscription from any device",
   "type": "module",
   "bin": {
@@ -25,7 +25,7 @@
   "devDependencies": {
     "@types/node": "^20.0.0",
     "@types/ws": "^8.18.1",
-    "tsx": "^4.19.0",
+    "tsx": "^4.22.3",
     "typescript": "^5.5.0"
   }
 }