@1presence/bridge 0.26.0 → 0.28.0

package/dist/accumulator.js

@@ -9,6 +9,14 @@ function makeBridgeAccumulator() {
         toolResults: {},
         turns: [],
     };
+    // A new API turn bucket only opens when a user event (tool_results) has
+    // arrived since the last assistant event — mirrors the gateway translator
+    // logic. The CLI splits a single model emission's text and tool_use blocks
+    // into separate `{type:'assistant'}` events; without this guard each split
+    // creates a stored assistant message and produces consecutive same-role
+    // rows that the read-side merger has to repair. Init true so the very first
+    // assistant event opens turn 0.
+    let sawUserSinceLastAssistant = true;
     // 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).
@@ -37,9 +45,14 @@ function makeBridgeAccumulator() {
                 return;
             }
             if (type === 'assistant') {
-                // 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: [] });
+                // Only open a fresh bucket when a user event has arrived since the
+                // last assistant event. Otherwise treat this as a continuation of
+                // the current API turn (CLI splits text and tool_use into separate
+                // assistant events within one model emission).
+                if (sawUserSinceLastAssistant) {
+                    state.turns.push({ text: '', toolUseIds: [] });
+                    sawUserSinceLastAssistant = false;
+                }
                 const msg = event['message'];
                 const content = msg?.['content'];
                 if (!Array.isArray(content))
@@ -69,6 +82,8 @@ function makeBridgeAccumulator() {
                 return;
             }
             if (type === 'user') {
+                // Flip the flag so the next assistant event opens a new API turn.
+                sawUserSinceLastAssistant = true;
                 const msg = event['message'];
                 const content = msg?.['content'];
                 if (!Array.isArray(content))

package/dist/claude.js

@@ -147,7 +147,16 @@ function spawnClaude(params) {
             throw new Error('claude stdin is null — spawn must use stdio[0]="pipe"');
         }
         for (const msg of history) {
-            const wrapped = { type: msg.role, message: { role: msg.role, content: msg.content } };
+            // Normalise to array-of-blocks: Claude Code's stream-json input parser
+            // iterates `content` directly. A string slips into a `"tool_use_id" in
+            // <char>` check inside the CLI and aborts the process with `W is not an
+            // Object` (JSC) / exit 1 mid-turn. The gateway also normalises before
+            // sending, so a current gateway + any bridge version is safe; this guard
+            // covers older gateways and ad-hoc local replay tests.
+            const content = Array.isArray(msg.content)
+                ? msg.content
+                : [{ type: 'text', text: typeof msg.content === 'string' ? msg.content : '' }];
+            const wrapped = { type: msg.role, message: { role: msg.role, content } };
             stdin.write(JSON.stringify(wrapped) + '\n');
         }
         stdin.end();

package/package.json

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