@bivy/bivy 0.16.25-staging.20 → 0.16.25-staging.22

package/bin/acp-shim.mjs

@@ -313,6 +313,13 @@ function onSessionUpdate(params) {
     if (!content) return "";
     if (typeof content === "string") return content;
     if (Array.isArray(content)) return content.map(textOf).join("");
+    // ACP's ToolCallContent wraps a ContentBlock: `{ type: "content", content:
+    // { type: "text", text } }`. Unwrap it (recursively) so a tool's real output
+    // — a command's stdout, a fetched document, a read's text — isn't dropped,
+    // which collapsed the tool_result to the bare status ("completed"). opencode
+    // and most spec-compliant ACP agents deliver tool output in this wrapped
+    // shape, so reading only the bare `{type:"text"}` form lost it in production.
+    if (content.type === "content" && content.content != null) return textOf(content.content);
     if (content.type === "text" && typeof content.text === "string") return content.text;
     if (typeof content.text === "string") return content.text;
     return "";

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

@@ -415,6 +415,16 @@ function onNotification(m) {
       bivy({ type: "session.status", status: "working" });
       return;
     case "turn/completed": {
+      // The completion event is authoritative about a terminal failure: a turn
+      // that hit a usage limit (or any provider error) arrives here as
+      // `status: "failed"` carrying `turn.error`. Capture it directly instead of
+      // depending on a separate `error` notification landing first — otherwise a
+      // completion that omits that notification seals as session.done and the
+      // user sees a silent empty turn (fail loud, never swallow the error).
+      const turnError =
+        params?.turn?.error?.message ||
+        (params?.turn?.status === "failed" ? params?.error?.message || params?.message || "Codex turn failed" : undefined);
+      if (turnError && !sawError) sawError = turnError;
       // Codex 0.147 can publish turn/completed just before the final
       // collabAgentToolCall item/completed notification. Sealing immediately
       // leaves the sub-agent card running forever and drops its persisted

package/dist/worktree.js

@@ -94,7 +94,15 @@ export async function createWorktree(opts) {
         else if (base !== "HEAD" && !(await refExists(repoRoot, base)))
             base = "HEAD";
         // Fail closed on path collisions; never delete an unrelated directory.
-        await exec("git", ["-C", repoRoot, "worktree", "add", "-b", branch, wtPath, base]);
+        if (base === "HEAD" && !(await refExists(repoRoot, "HEAD"))) {
+            // Empty repo (e.g. a freshly created GitHub repo with no commits): HEAD is
+            // unborn, so it can't seed a worktree. Start the branch as an orphan —
+            // the session's first commit becomes the repo's root commit.
+            await exec("git", ["-C", repoRoot, "worktree", "add", "--orphan", "-b", branch, wtPath]);
+        }
+        else {
+            await exec("git", ["-C", repoRoot, "worktree", "add", "-b", branch, wtPath, base]);
+        }
     }
     // Opportunistically reuse a sibling worktree's installed deps (node_modules,
     // target, .venv) via copy-on-write when the filesystem supports it, so a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bivy/bivy",
-  "version": "0.16.25-staging.20",
+  "version": "0.16.25-staging.22",
   "type": "module",
   "license": "AGPL-3.0-only",
   "description": "Run coding agents on machines you own. Open-source, self-hostable agent workspace.",