@1presence/bridge 0.23.0 → 0.25.0

package/dist/accumulator.js

@@ -7,15 +7,25 @@ function makeBridgeAccumulator() {
         assistantText: '',
         toolCalls: [],
         toolResults: {},
+        turns: [],
     };
-    let textEmitted = false;
-    let turnTextEmitted = false;
+    // Returns the current open API-turn bucket, creating one lazily if a text
+    // event arrives before any `{type:'assistant'}` event (shouldn't normally
+    // happen with Claude Code's stream-json, but keep it robust).
+    function currentTurn() {
+        if (state.turns.length === 0)
+            state.turns.push({ text: '', toolUseIds: [] });
+        return state.turns[state.turns.length - 1];
+    }
     function appendText(text) {
-        if (textEmitted && !turnTextEmitted)
+        const turn = currentTurn();
+        turn.text += text;
+        // Mirror to the flat string with `\n\n` between turns for convenience.
+        if (state.assistantText && state.turns.length > 1 && turn.text === text) {
+            // First text emission of a new turn — separate from prior turn.
             state.assistantText += '\n\n';
+        }
         state.assistantText += text;
-        turnTextEmitted = true;
-        textEmitted = true;
     }
     return {
         consume(event) {
@@ -27,9 +37,9 @@ function makeBridgeAccumulator() {
                 return;
             }
             if (type === 'assistant') {
-                // New API turn — reset the per-turn flag so the next text emission
-                // gets a `\n\n` separator iff text was already emitted in a prior turn.
-                turnTextEmitted = false;
+                // New API turn — open a fresh bucket. All text and tool_use blocks
+                // in this `assistant` event belong to this single API turn.
+                state.turns.push({ text: '', toolUseIds: [] });
                 const msg = event['message'];
                 const content = msg?.['content'];
                 if (!Array.isArray(content))
@@ -48,6 +58,7 @@ function makeBridgeAccumulator() {
                             continue;
                         const bareName = name.replace(/^mcp__1presence__/, '');
                         state.toolCalls.push({ id, name: bareName, input });
+                        currentTurn().toolUseIds.push(id);
                         if (bareName === 'set_conversation_title') {
                             const raw = String(input['title'] ?? '').trim();
                             if (raw)
@@ -95,6 +106,7 @@ async function postSaveTurn(gatewayHttp, token, record) {
                 assistantText: record.assistantText,
                 toolCalls: record.toolCalls,
                 toolResults: record.toolResults,
+                ...(record.apiTurns ? { apiTurns: record.apiTurns } : {}),
                 ...(record.title ? { title: record.title } : {}),
                 ...(record.usage ? { usage: record.usage } : {}),
             }),

package/dist/claude.js

@@ -232,7 +232,18 @@ function spawnClaude(params) {
                             // --setting-sources "") are supposed to make this unreachable. If we see a
                             // non-1Presence tool here anyway, something has bypassed those guards — kill
                             // immediately so any side effect already in flight is the only damage done.
-                            if (!toolName.startsWith('mcp__1presence__')) {
+                            //
+                            // Valid forms:
+                            //   mcp__1presence__<name>  — namespaced MCP form
+                            //   <snake_case_name>       — bare form; Claude Code may omit the prefix in
+                            //                            stream-json output. Safe because --strict-mcp-config
+                            //                            limits MCP to the 1presence server only.
+                            // Invalid (real violations):
+                            //   PascalCase (Bash, Read, Write, …) — Claude Code built-ins
+                            //   mcp__<other>__*         — tools from a different MCP server
+                            const isMcp1presence = toolName.startsWith('mcp__1presence__');
+                            const isBareName = /^[a-z][a-z0-9_]*$/.test(toolName);
+                            if (!isMcp1presence && !isBareName) {
                                 killedForViolation = true;
                                 const violation = `bridge tool violation: ${toolName} is not allowed in Local Mode`;
                                 process.stderr.write(`[bridge] FATAL ${violation} — killing\n`);

package/dist/index.js

@@ -188,6 +188,7 @@ async function handleMessage(conversationId, text, sessionId, history, auth, vau
             assistantText: s.assistantText,
             toolCalls: s.toolCalls,
             toolResults: s.toolResults,
+            apiTurns: s.turns,
             ...(s.title ? { title: s.title } : {}),
             usage: usage
                 ? { ...usage, ...(model ? { model } : {}) }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1presence/bridge",
-  "version": "0.23.0",
+  "version": "0.25.0",
   "description": "Run 1Presence on your Mac and use your Claude.ai Pro subscription from any device",
   "bin": {
     "1presence-bridge": "dist/index.js"