@1presence/bridge 0.25.0 → 0.27.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

@@ -70,14 +70,17 @@ function spawnClaude(params) {
         existing.kill('SIGTERM');
         active.delete(conversationId);
     }
-    const ctxParts = [];
-    if (vaultFileOpen)
-        ctxParts.push(`vault_file_open: ${vaultFileOpen}`);
-    if (clientCapabilities?.length)
-        ctxParts.push(`client_capabilities: ${clientCapabilities.join(', ')}`);
-    if (syncedFolders?.length)
-        ctxParts.push(`synced_folders: ${syncedFolders.join(', ')}`);
-    const userMessageText = ctxParts.length > 0 ? `[${ctxParts.join(' | ')}]\n\n${text}` : text;
+    // Note: ephemeral context (vault_file_open / client_capabilities / synced_folders)
+    // is injected into the last user message by the gateway BEFORE history is
+    // sent over the WS. The bridge no longer constructs `userMessageText` —
+    // `history` is the authoritative stream and already contains the new user
+    // prompt with prefix prepended. The `text`, `vaultFileOpen`,
+    // `clientCapabilities`, `syncedFolders` SpawnParams are retained for
+    // backward-compatible logging / spool correlation only.
+    void vaultFileOpen;
+    void clientCapabilities;
+    void syncedFolders;
+    void text;
     // Lockdown rationale:
     // - `--tools ""` disables ALL built-in tools (Bash/Read/Write/Edit/Glob/Grep/
     //   WebFetch/etc.). MCP tools are not "built-in" so the 1Presence MCP surface
@@ -130,11 +133,14 @@ function spawnClaude(params) {
         stdio: ['pipe', 'pipe', 'pipe'],
     });
     active.set(conversationId, proc);
-    // Feed prior turns + the new user message via stdin as stream-json.
-    // Each line is a JSON object: `{ type, message: { role, content } }`.
-    // Sanitisation (orphan tool_use stripping, displayOnly filtering) already
-    // happened on the gateway via @presence/shared.toModelMessages — replay
-    // the history verbatim and append the fresh user turn.
+    // Feed the full conversation via stdin as stream-json. The gateway's
+    // early-save committed the new user message to Firestore BEFORE building
+    // `history`, so `history` already ends with the new user prompt (with the
+    // ephemeral context prefix prepended by the gateway). The bridge no longer
+    // appends a separate `newTurn` — doing so would duplicate the user prompt.
+    // Sanitisation (orphan tool_use stripping, displayOnly filtering, consecutive
+    // same-role merging) already happened on the gateway via
+    // @presence/shared.toModelMessages — replay the history verbatim.
     try {
         const stdin = proc.stdin;
         if (!stdin) {
@@ -144,8 +150,6 @@ function spawnClaude(params) {
             const wrapped = { type: msg.role, message: { role: msg.role, content: msg.content } };
             stdin.write(JSON.stringify(wrapped) + '\n');
         }
-        const newTurn = { type: 'user', message: { role: 'user', content: userMessageText } };
-        stdin.write(JSON.stringify(newTurn) + '\n');
         stdin.end();
     }
     catch (err) {

package/package.json

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