@1presence/bridge 0.24.0 → 0.26.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

@@ -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/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.24.0",
+  "version": "0.26.0",
   "description": "Run 1Presence on your Mac and use your Claude.ai Pro subscription from any device",
   "bin": {
     "1presence-bridge": "dist/index.js"