@bivy/bivy 0.10.1-staging.359 → 0.10.1-staging.360

package/bin/codex-app-server-shim.mjs

@@ -185,6 +185,9 @@ function handleCompletedItem(params) {
   if (!item || typeof item !== "object" || !itemId) return;
   switch (item.type) {
     case "agentMessage":
+      // Child-thread prose belongs to the delegated agent, not the parent's
+      // answer stream. Its lifecycle is represented by the collaboration items.
+      if (params?.threadId && threadId && params.threadId !== threadId) return;
       if (!agentMessageItems.has(itemId) && item.text) {
         agentMessageItems.add(itemId);
         bivy({ type: "message.delta", text: String(item.text) });
@@ -317,20 +320,29 @@ function onServerRequest(m) {
 
 function onNotification(m) {
   const { method, params } = m;
+  // Codex publishes child-thread prose on the same app-server connection as the
+  // parent. It is not a continuation of the parent's assistant message: folding
+  // both token streams together produces character-level corruption whenever a
+  // delegated agent answers concurrently. Child lifecycle remains visible via
+  // collabAgentToolCall/subAgentActivity; only prose/reasoning is scoped here.
+  const fromCurrentThread = !params?.threadId || !threadId || params.threadId === threadId;
   switch (method) {
-    case "item/agentMessage/delta":
-      if (typeof params.delta === "string" && params.delta) {
-        const itemId = paramsItemId(params);
-        if (itemId) agentMessageItems.add(itemId);
+    case "item/agentMessage/delta": {
+      const itemId = paramsItemId(params);
+      // Remember ignored child items too so their later item/completed echo is
+      // not mistaken for a parent message and replayed wholesale.
+      if (itemId) agentMessageItems.add(itemId);
+      if (fromCurrentThread && typeof params.delta === "string" && params.delta) {
         bivy({ type: "message.delta", text: params.delta });
       }
       return;
+    }
     case "item/plan/delta":
-      emitReasoning(paramsItemId(params), params.delta);
+      if (fromCurrentThread) emitReasoning(paramsItemId(params), params.delta);
       return;
     case "item/reasoning/summaryTextDelta":
     case "item/reasoning/textDelta":
-      emitReasoning(paramsItemId(params), params.delta);
+      if (fromCurrentThread) emitReasoning(paramsItemId(params), params.delta);
       return;
     case "item/commandExecution/outputDelta": {
       const itemId = paramsItemId(params);

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.232";
+export const CLAUDE_TESTED_VERSION = "0.3.233";
 const CLAUDE_CAPABILITIES = withExactCapabilitySurface({
     toolInterception: true,
     modelSelection: true,

package/dist/agents/pi/runtime.js

@@ -484,7 +484,15 @@ export class PiRuntime {
         return this.build(sessionManager, options);
     }
     openSession(options) {
-        const sessionManager = SessionManager.open(options.sessionFile, this.options.sessionsDir);
+        // Pi intentionally defers writing a new transcript until the first assistant
+        // response. A named empty session can therefore outlive its in-memory host
+        // (restart/detach) while its metadata path does not exist yet. Recreate that
+        // empty shell with Bivy's canonical id instead of letting SessionManager.open
+        // assign a new id, which would duplicate the sidebar row. Existing files keep
+        // Pi's normal full-fidelity resume path.
+        const sessionManager = !fs.existsSync(options.sessionFile) && options.canonicalId
+            ? SessionManager.create(options.workspace, this.options.sessionsDir, { id: options.canonicalId })
+            : SessionManager.open(options.sessionFile, this.options.sessionsDir);
         return this.build(sessionManager, options);
     }
     /**

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.232", capabilities: ["toolInterception", "modelSelection", "resume"] },
+        { id: "claude-code-sdk", status: "active", executionMode: "protocol", pinnedVersion: "0.3.233", capabilities: ["toolInterception", "modelSelection", "resume"] },
         { id: "codex-approvals", status: "active", executionMode: "protocol", pinnedVersion: "0.147.0", capabilities: ["toolInterception", "modelSelection", "resume"] },
         { id: "pi", status: "active", executionMode: "protocol", pinnedVersion: "0.84.2", capabilities: ["toolInterception", "modelSelection", "resume"] },
         { id: "opencode", status: "active", executionMode: "protocol", pinnedVersion: "1.18.18", capabilities: ["toolInterception", "modelSelection", "resume"] },

package/dist/server.js

@@ -101,7 +101,7 @@ import { createGithubCommands } from "./controllers/github-commands.js";
 import { createCredentialCommands } from "./controllers/credential-commands.js";
 import { createCustomModelCommands } from "./controllers/custom-model-commands.js";
 import { MetadataStore } from "./metadata.js";
-import { resolveResumeRef, resumeRefFor } from "./session-ref.js";
+import { resolveResumeRef, resumeRefFor, storedResumeRef } from "./session-ref.js";
 import { materializeFork } from "./session/fork.js";
 import { applyDirtyPatch } from "./session/fork-dirty.js";
 import { normalizeMessages } from "./session/transcript-normal.js";
@@ -7719,9 +7719,17 @@ async function createSession(workspace = defaultWorkspace, sessionFile, opts = {
     // made Claude Code (and any id-based runtime) sessions un-resumable with
     // "Session file is outside the sessions directory".
     const requestedRef = typeof sessionFile === "string" && sessionFile.trim() ? sessionFile.trim() : undefined;
-    const refRuntimeId = opts.runtimeId ?? (requestedRef ? metadata.getSession(requestedRef)?.runtimeId : undefined);
-    const requestedSessionFile = requestedRef
-        ? resolveResumeRef({ ref: requestedRef, resumesByPath: runtimeResumesByPath(refRuntimeId), sessionsDir })
+    const requestedMeta = requestedRef ? metadata.getSession(requestedRef) : undefined;
+    const refRuntimeId = opts.runtimeId ?? requestedMeta?.runtimeId;
+    // Some callers (notably the local CLI HTTP API) name a closed session by its
+    // Bivy id and enter createSession directly rather than resolveOrResumeSession.
+    // Translate that id to the owning runtime's durable ref before applying the
+    // path guard/opening it. Without this, a valid empty Pi session was interpreted
+    // as a relative filename and rejected as outside pi/sessions; id-based native
+    // refs could likewise resume the wrong id. Explicit path refs remain unchanged.
+    const durableRef = requestedRef ? storedResumeRef(requestedRef, requestedMeta) : undefined;
+    const requestedSessionFile = durableRef
+        ? resolveResumeRef({ ref: durableRef, resumesByPath: runtimeResumesByPath(refRuntimeId), sessionsDir })
         : undefined;
     const storedMeta = requestedSessionFile ? metadata.getSession(requestedSessionFile) : undefined;
     const restoredWorktree = requestedSessionFile ? restoredWorktreeFromMetadata(storedMeta) : undefined;

package/dist/session-ref.js

@@ -40,6 +40,20 @@ export function resolveResumeRef(opts) {
     }
     return resolved;
 }
+/**
+ * Replace a client-supplied session id with the runtime resume ref stored for
+ * that exact metadata row. Callers that already supply a path keep that path:
+ * metadata stores are commonly indexed by both id and path, and treating a path
+ * lookup as an id lookup would make an explicit ref unexpectedly change.
+ *
+ * This is intentionally runtime-neutral. Pi stores a transcript path, while
+ * Codex/OpenCode can store a provider-native thread id; both are opaque refs at
+ * this layer.
+ */
+export function storedResumeRef(requestedRef, meta) {
+    const stored = meta?.path?.trim();
+    return meta?.id === requestedRef && stored ? stored : requestedRef;
+}
 /**
  * Decide what to resume a client-named session from when the node isn't holding
  * it in memory (a restart, an idle close, or a session this process never

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bivy/bivy",
-  "version": "0.10.1-staging.359",
+  "version": "0.10.1-staging.360",
   "type": "module",
   "license": "AGPL-3.0-only",
   "description": "Run coding agents on machines you own. Open-source, self-hostable agent workspace.",
@@ -38,7 +38,7 @@
     "postinstall": "node bin/patch-pi-dependencies.mjs"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "0.3.232",
+    "@anthropic-ai/claude-agent-sdk": "0.3.233",
     "@earendil-works/pi-ai": "0.84.2",
     "@earendil-works/pi-coding-agent": "0.84.2",
     "@modelcontextprotocol/sdk": "1.30.0",