@bivy/bivy 0.16.1-staging.5 → 0.16.1-staging.6

package/dist/agents/claude-code/integration.js

@@ -4,7 +4,7 @@ import { defineAgentIntegration } from "../definition.js";
 import { withExactCapabilitySurface } from "../../runtime/types.js";
 import { createCredentialStore } from "../../runtime/credentials.js";
 import { ClaudeCodeRuntime, claudeRuntimeFromEnv, claudeSdkInstalled, } from "./runtime.js";
-export const CLAUDE_TESTED_VERSION = "0.3.251";
+export const CLAUDE_TESTED_VERSION = "0.3.252";
 const CLAUDE_CAPABILITIES = withExactCapabilitySurface({
     toolInterception: true,
     modelSelection: true,

package/dist/certification/generated.js

@@ -3,7 +3,7 @@
 export const CERTIFICATION_MATRIX = {
     schemaVersion: 1,
     agents: [
-        { id: "claude-code-sdk", status: "active", executionMode: "protocol", pinnedVersion: "0.3.251", capabilities: ["toolInterception", "modelSelection", "resume"] },
+        { id: "claude-code-sdk", status: "active", executionMode: "protocol", pinnedVersion: "0.3.252", capabilities: ["toolInterception", "modelSelection", "resume"] },
         { id: "codex-approvals", status: "active", executionMode: "protocol", pinnedVersion: "0.151.0", capabilities: ["toolInterception", "modelSelection", "resume"] },
         { id: "pi", status: "active", executionMode: "protocol", pinnedVersion: "0.84.4", capabilities: ["toolInterception", "modelSelection", "resume"] },
         { id: "opencode", status: "active", executionMode: "protocol", pinnedVersion: "1.18.25", capabilities: ["toolInterception", "modelSelection", "resume"] },

package/dist/runtime/cli-parsers.js

@@ -90,6 +90,12 @@ class TurnAccumulator {
     textFlushed = "";
     out = [];
     details = new Map();
+    // Not every CLI includes a stable id on both halves of a tool exchange.
+    // Keep a small FIFO of open calls so the universal parser can still pair an
+    // anonymous result with its call instead of creating a second, forever-running
+    // card in the transcript.
+    openToolIds = [];
+    anonymousToolId = 0;
     flushPendingText() {
         const pending = this.text.slice(this.textFlushed.length);
         this.textFlushed = this.text;
@@ -131,25 +137,35 @@ class TurnAccumulator {
         events.push({ type: "message_update", message: { role: "assistant", content: this.text } });
     }
     addToolUse(id, name, input, events) {
-        traceToolPayload({ phase: "call", context: this.toolContext, name, callId: id, payload: input });
+        const callId = id || `cli-tool-${++this.anonymousToolId}`;
+        this.openToolIds.push(callId);
+        traceToolPayload({ phase: "call", context: this.toolContext, name, callId, payload: input });
         // Attach a normalized ToolCallDetail (display-only) so the PWA renders this
         // call the same way it renders every other agent's equivalent call. Absent
         // when unrecognized — the block stays opaque and renders as before.
         const detail = mapToolCall(name, input, this.toolContext);
-        if (detail && id)
-            this.details.set(id, detail);
+        if (detail)
+            this.details.set(callId, detail);
         this.flushPendingText();
-        this.content.push({ type: "tool_use", id, name, input: input ?? {}, ...(detail ? { detail } : {}) });
-        events.push({ type: "tool_call", toolName: name, input, toolCallId: id, ...(detail ? { detail } : {}) });
+        this.content.push({ type: "tool_use", id: callId, name, input: input ?? {}, ...(detail ? { detail } : {}) });
+        events.push({ type: "tool_call", toolName: name, input, toolCallId: callId, ...(detail ? { detail } : {}) });
     }
     addToolResult(toolUseId, name, content, events, isError = false) {
-        traceToolPayload({ phase: "result", context: this.toolContext, name, callId: toolUseId, payload: content });
-        const prior = this.details.get(toolUseId);
+        // Prefer the explicit id. Otherwise close the oldest open call, which is
+        // the only generally safe correlation available from an id-less stream.
+        const callId = toolUseId || this.openToolIds.shift() || `cli-tool-result-${++this.anonymousToolId}`;
+        if (toolUseId) {
+            const index = this.openToolIds.indexOf(toolUseId);
+            if (index >= 0)
+                this.openToolIds.splice(index, 1);
+        }
+        traceToolPayload({ phase: "result", context: this.toolContext, name, callId, payload: content });
+        const prior = this.details.get(callId);
         const detail = prior ? { ...prior, result: mapToolResult(content, isError) } : undefined;
         if (detail)
-            this.details.set(toolUseId, detail);
-        this.toolResults.push({ type: "tool_result", tool_use_id: toolUseId, content: content ?? "", ...(detail ? { detail } : {}) });
-        events.push({ type: "tool_result", toolName: name, result: { toolCallId: toolUseId, content }, ...(detail ? { detail } : {}) });
+            this.details.set(callId, detail);
+        this.toolResults.push({ type: "tool_result", tool_use_id: callId, content: content ?? "", ...(detail ? { detail } : {}) });
+        events.push({ type: "tool_result", toolName: name, result: { toolCallId: callId, content }, ...(detail ? { detail } : {}) });
     }
     /** Finalize the turn: emit message_end/turn_end/agent_end and record history. */
     finish(events) {

package/dist/runtime/protocol.js

@@ -193,6 +193,25 @@ class ProtocolSession {
     // toolCallId -> the node's normalized classification, so a later tool.result
     // (or tool.update) can attach/refresh `detail` on the already-pushed block.
     toolDetailsByCallId = new Map();
+    openToolIds = [];
+    anonymousToolId = 0;
+    /** Protocol is intentionally agent-neutral: if an upstream omits ids, give
+     * the exchange a local identity so live and persisted views can still pair it. */
+    resolveToolId(raw, result = false) {
+        if (raw) {
+            if (result) {
+                const index = this.openToolIds.indexOf(raw);
+                if (index >= 0)
+                    this.openToolIds.splice(index, 1);
+            }
+            return raw;
+        }
+        if (result)
+            return this.openToolIds.shift() || `protocol-tool-result-${++this.anonymousToolId}`;
+        const id = `protocol-tool-${++this.anonymousToolId}`;
+        this.openToolIds.push(id);
+        return id;
+    }
     constructor(runtimeOptions, cwd, capabilitiesRef, toolInterceptor, 
     // When resuming, the agent's own session ref (e.g. a Codex thread id). Passed
     // back to the shim via the generic session.resume primitive so it reconnects
@@ -686,6 +705,7 @@ class ProtocolSession {
             this.turnTextFlushed = "";
             this.turnToolResults = [];
             this.toolDetailsByCallId.clear();
+            this.openToolIds = [];
             this.emit({ type: "agent_end" });
             return;
         }
@@ -696,12 +716,13 @@ class ProtocolSession {
             this.turnTextFlushed = "";
             this.turnToolResults = [];
             this.toolDetailsByCallId.clear();
+            this.openToolIds = [];
             this.emit({ type: "session.error", error: String(msg.error || "Protocol agent error") });
             this.emit({ type: "agent_end" });
             return;
         }
         if (type === "tool.call" || type === "tool.observe") {
-            const toolCallId = String(msg.toolCallId || msg.id || "");
+            const toolCallId = this.resolveToolId(String(msg.toolCallId || msg.id || ""));
             const toolName = String(msg.name || "tool");
             const detail = mapToolCall(toolName, msg.input, { provider: this.runtimeOptions.id || "acp", protocol: "protocol" });
             if (detail)
@@ -763,7 +784,7 @@ class ProtocolSession {
             return;
         }
         if (type === "tool.result") {
-            const toolCallId = String(msg.toolCallId || msg.tool_use_id || msg.id || "");
+            const toolCallId = this.resolveToolId(String(msg.toolCallId || msg.tool_use_id || msg.id || ""), true);
             const result = msg.result ?? msg.output ?? msg.content ?? msg.text ?? msg.summary ?? "";
             const isError = Boolean(msg.isError || msg.is_error);
             this.turnToolResults.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bivy/bivy",
-  "version": "0.16.1-staging.5",
+  "version": "0.16.1-staging.6",
   "type": "module",
   "license": "AGPL-3.0-only",
   "description": "Run coding agents on machines you own. Open-source, self-hostable agent workspace.",
@@ -50,7 +50,7 @@
     "zod": "^4.0.0"
   },
   "optionalDependencies": {
-    "@anthropic-ai/claude-agent-sdk": "0.3.251",
+    "@anthropic-ai/claude-agent-sdk": "0.3.252",
     "@earendil-works/pi-ai": "0.84.4",
     "@earendil-works/pi-coding-agent": "0.84.4",
     "node-pty": "^1.1.0"