@bunny-agent/runner-cli 0.9.50 → 0.9.51-beta.2

package/dist/bundle.mjs

@@ -700,7 +700,11 @@ function createSDKOptions(options) {
     ],
     cwd: options.cwd,
     env: options.env,
-    resume: options.resume,
+    // forkFrom snapshot-clones the source session into a new session id;
+    // plain resume continues the same session.
+    resume: options.forkFrom ?? options.resume,
+    forkSession: options.forkFrom != null ? true : void 0,
+    ...options.skills ? { skills: options.skills } : {},
     settingSources: ["project", "user"],
     canUseTool: createCanUseToolCallback(options),
     permissionMode: isRoot || options.yolo ? "bypassPermissions" : "default",
@@ -894,18 +898,33 @@ function toToolEndPayload(event) {
   }
   return null;
 }
-function toAssistantText(event) {
-  if (event.type === "item.completed" && event.item.type === "agent_message") {
-    return event.item.text;
-  }
-  if (event.type === "item.completed" && event.item.type === "reasoning") {
-    return `[Reasoning] ${event.item.text}`;
+function sseData(obj) {
+  return `data: ${JSON.stringify(obj)}
+
+`;
+}
+var ItemTextTracker = class {
+  emittedLength = /* @__PURE__ */ new Map();
+  started = /* @__PURE__ */ new Set();
+  /** Returns the new delta for this item, or empty string if nothing new. */
+  delta(itemId, fullText) {
+    const emitted = this.emittedLength.get(itemId) ?? 0;
+    if (fullText.length <= emitted)
+      return "";
+    this.emittedLength.set(itemId, fullText.length);
+    return fullText.slice(emitted);
+  }
+  /** Returns true the first time an item id is seen (caller emits text-start). */
+  markStarted(itemId) {
+    if (this.started.has(itemId))
+      return false;
+    this.started.add(itemId);
+    return true;
   }
-  if (event.type === "item.completed" && event.item.type === "error") {
-    return `[Error] ${event.item.message}`;
+  isStarted(itemId) {
+    return this.started.has(itemId);
   }
-  return null;
-}
+};
 function createCodexRunner(options) {
   const codex = new Codex({
     apiKey: process.env.CODEX_API_KEY || process.env.OPENAI_API_KEY,
@@ -954,62 +973,170 @@ function createCodexRunner(options) {
         }
       } catch (_e) {
       }
+      if (options.systemPrompt && !options.resume) {
+        if (typeof inputToCodex === "string") {
+          inputToCodex = `${options.systemPrompt}
+
+${inputToCodex}`;
+        } else {
+          inputToCodex = [
+            { type: "text", text: options.systemPrompt },
+            ...inputToCodex
+          ];
+        }
+      }
       const streamedTurn = await thread.runStreamed(inputToCodex, {
         signal: options.abortController?.signal
       });
+      let sessionId = options.resume ?? void 0;
+      let startEmitted = false;
+      let finished = false;
+      const textTracker = new ItemTextTracker();
+      const reasoningTracker = new ItemTextTracker();
+      const ensureStart = () => {
+        if (startEmitted)
+          return [];
+        startEmitted = true;
+        return [
+          sseData({ type: "start" }),
+          sseData({
+            type: "message-metadata",
+            messageMetadata: { sessionId: sessionId ?? thread.id ?? void 0 }
+          })
+        ];
+      };
       for await (const event of streamedTurn.events) {
-        const assistantText = toAssistantText(event);
-        if (assistantText) {
-          yield `data: ${JSON.stringify({ type: "text-delta", delta: assistantText })}
-
-`;
+        if (event.type === "thread.started") {
+          sessionId = event.thread_id;
+          yield* ensureStart();
+          continue;
+        }
+        yield* ensureStart();
+        if ((event.type === "item.started" || event.type === "item.updated" || event.type === "item.completed") && event.item.type === "agent_message") {
+          const item = event.item;
+          if (textTracker.markStarted(item.id)) {
+            yield sseData({ type: "text-start", id: item.id });
+          }
+          const delta = textTracker.delta(item.id, item.text);
+          if (delta) {
+            yield sseData({ type: "text-delta", id: item.id, delta });
+          }
+          if (event.type === "item.completed") {
+            yield sseData({ type: "text-end", id: item.id });
+          }
+          continue;
+        }
+        if ((event.type === "item.updated" || event.type === "item.completed") && event.item.type === "reasoning") {
+          const delta = reasoningTracker.delta(event.item.id, event.item.text);
+          if (delta) {
+            yield sseData({ type: "reasoning", text: delta });
+          }
+          continue;
+        }
+        if (event.type === "item.completed" && event.item.type === "error") {
+          const id = `error-item-${event.item.id}`;
+          yield sseData({ type: "text-start", id });
+          yield sseData({
+            type: "text-delta",
+            id,
+            delta: `[Error] ${event.item.message}`
+          });
+          yield sseData({ type: "text-end", id });
+          continue;
+        }
+        if (event.type === "item.completed" && event.item.type === "file_change") {
+          const item = event.item;
+          yield sseData({
+            type: "tool-input-start",
+            toolCallId: item.id,
+            toolName: "apply_patch"
+          });
+          yield sseData({
+            type: "tool-input-available",
+            toolCallId: item.id,
+            toolName: "apply_patch",
+            input: { changes: item.changes }
+          });
+          yield sseData({
+            type: "tool-output-available",
+            toolCallId: item.id,
+            output: { status: item.status, changes: item.changes },
+            isError: item.status === "failed"
+          });
+          continue;
         }
         const toolStart = toToolStartPayload(event);
         if (toolStart) {
-          yield `data: ${JSON.stringify({ type: "tool-input-start", toolCallId: toolStart.toolCallId, toolName: toolStart.toolName })}
-
-`;
-          yield `data: ${JSON.stringify({ type: "tool-input-available", toolCallId: toolStart.toolCallId, toolName: toolStart.toolName, input: toolStart.args })}
-
-`;
+          yield sseData({
+            type: "tool-input-start",
+            toolCallId: toolStart.toolCallId,
+            toolName: toolStart.toolName
+          });
+          yield sseData({
+            type: "tool-input-available",
+            toolCallId: toolStart.toolCallId,
+            toolName: toolStart.toolName,
+            input: toolStart.args
+          });
         }
         const toolEnd = toToolEndPayload(event);
         if (toolEnd) {
-          yield `data: ${JSON.stringify({ type: "tool-output-available", toolCallId: toolEnd.toolCallId, output: toolEnd.result, isError: toolEnd.isError })}
-
-`;
+          yield sseData({
+            type: "tool-output-available",
+            toolCallId: toolEnd.toolCallId,
+            output: toolEnd.result,
+            isError: toolEnd.isError
+          });
         }
         if (event.type === "turn.completed") {
-          yield `data: ${JSON.stringify({ type: "finish", finishReason: "stop", usage: event.usage })}
-
-`;
+          yield sseData({
+            type: "finish",
+            finishReason: "stop",
+            messageMetadata: {
+              sessionId: sessionId ?? thread.id ?? void 0,
+              usage: {
+                input_tokens: event.usage.input_tokens,
+                output_tokens: event.usage.output_tokens,
+                cache_read_input_tokens: event.usage.cached_input_tokens
+              }
+            }
+          });
           yield `data: [DONE]
 
 `;
+          finished = true;
         }
         if (event.type === "turn.failed") {
-          yield `data: ${JSON.stringify({ type: "error", errorText: event.error.message })}
-
-`;
-          yield `data: ${JSON.stringify({ type: "finish", finishReason: "error" })}
-
-`;
+          yield sseData({ type: "error", errorText: event.error.message });
+          yield sseData({ type: "finish", finishReason: "error" });
           yield `data: [DONE]
 
 `;
+          finished = true;
         }
         if (event.type === "error") {
-          yield `data: ${JSON.stringify({ type: "error", errorText: stringifyUnknown(event.message) })}
-
-`;
-          yield `data: ${JSON.stringify({ type: "finish", finishReason: "error" })}
-
-`;
+          yield sseData({
+            type: "error",
+            errorText: stringifyUnknown(event.message)
+          });
+          yield sseData({ type: "finish", finishReason: "error" });
           yield `data: [DONE]
 
 `;
+          finished = true;
         }
       }
+      if (!finished) {
+        yield* ensureStart();
+        yield sseData({
+          type: "error",
+          errorText: "Codex stream ended unexpectedly before completing."
+        });
+        yield sseData({ type: "finish", finishReason: "error" });
+        yield `data: [DONE]
+
+`;
+      }
       for (const tmpFile of tempFiles) {
         try {
           fs.unlinkSync(tmpFile);
@@ -1303,7 +1430,7 @@ function createOpenCodeRunner(options = {}) {
 // ../../packages/runner-pi/dist/pi-runner.js
 import { appendFileSync as appendFileSync2, existsSync as existsSync5, unlinkSync as unlinkSync3 } from "node:fs";
 import { join as join8 } from "node:path";
-import { getModel } from "@earendil-works/pi-ai";
+import { getBuiltinModel } from "@earendil-works/pi-ai/providers/all";
 import { AuthStorage, createAgentSession, ModelRegistry, SessionManager as SessionManager2 } from "@earendil-works/pi-coding-agent";
 
 // ../../packages/runner-pi/dist/bunny-agent-resource-loader.js
@@ -2077,7 +2204,7 @@ function extractToolResultText(result) {
     return String(result);
   }
 }
-function sseData(obj) {
+function sseData2(obj) {
   return "data: " + JSON.stringify(obj) + "\n\n";
 }
 var PiAISDKStreamConverter = class {
@@ -2121,13 +2248,13 @@ var PiAISDKStreamConverter = class {
     }
     if (event.type === "tool_execution_start") {
       chunks.push(...this.endTextStreamIfOpen());
-      chunks.push(sseData({
+      chunks.push(sseData2({
         type: "tool-input-start",
         toolCallId: event.toolCallId,
         toolName: event.toolName,
         dynamic: true,
         providerExecuted: true
-      }), sseData({
+      }), sseData2({
         type: "tool-input-available",
         toolCallId: event.toolCallId,
         toolName: event.toolName,
@@ -2143,7 +2270,7 @@ var PiAISDKStreamConverter = class {
       if (raw != null)
         accumulateToolUsage(this.toolUsageTally, raw);
       if (event.isError) {
-        chunks.push(sseData({
+        chunks.push(sseData2({
           type: "tool-output-error",
           toolCallId: event.toolCallId,
           errorText: output,
@@ -2151,7 +2278,7 @@ var PiAISDKStreamConverter = class {
           providerExecuted: true
         }));
       } else {
-        chunks.push(sseData({
+        chunks.push(sseData2({
           type: "tool-output-available",
           toolCallId: event.toolCallId,
           output,
@@ -2180,8 +2307,8 @@ var PiAISDKStreamConverter = class {
       return [];
     this.hasStarted = true;
     return [
-      sseData({ type: "start", messageId: this.messageId }),
-      sseData({
+      sseData2({ type: "start", messageId: this.messageId }),
+      sseData2({
         type: "message-metadata",
         messageMetadata: { sessionId: this.options.sessionId }
       })
@@ -2192,7 +2319,7 @@ var PiAISDKStreamConverter = class {
   }
   openTextStream() {
     this.activeTextPartId = this.newTextPartId();
-    return [sseData({ type: "text-start", id: this.activeTextPartId })];
+    return [sseData2({ type: "text-start", id: this.activeTextPartId })];
   }
   emitTextDelta(rawDelta) {
     if (!rawDelta)
@@ -2200,7 +2327,7 @@ var PiAISDKStreamConverter = class {
     const startChunk = this.activeTextPartId == null ? this.openTextStream() : [];
     return [
       ...startChunk,
-      sseData({
+      sseData2({
         type: "text-delta",
         id: this.activeTextPartId,
         delta: rawDelta
@@ -2212,7 +2339,7 @@ var PiAISDKStreamConverter = class {
       return [];
     const id = this.activeTextPartId;
     this.activeTextPartId = null;
-    return [sseData({ type: "text-end", id })];
+    return [sseData2({ type: "text-end", id })];
   }
   finishSuccess(usage) {
     const chunks = [...this.endTextStreamIfOpen()];
@@ -2236,7 +2363,7 @@ var PiAISDKStreamConverter = class {
     if (usage) {
       finishPayload.messageMetadata = { usage: { ...chatUsage, raw } };
     }
-    chunks.push(sseData(finishPayload), "data: [DONE]\n\n");
+    chunks.push(sseData2(finishPayload), "data: [DONE]\n\n");
     this.hasFinished = true;
     return chunks;
   }
@@ -5349,12 +5476,79 @@ function serializeResult(result) {
 
 // ../../packages/runner-pi/dist/pi-runner.js
 var LOG_PREFIX2 = "[bunny-agent:pi]";
+var LLM_THOUGHT_SIGNATURE_SEPARATOR = "__thought__";
 function applyAllowedTools(tools, allowedTools) {
   if (!allowedTools)
     return tools;
   const allowed = new Set(allowedTools);
   return tools.filter((tool) => allowed.has(tool.name));
 }
+function shouldStripLLMThoughtSignaturesForModel(model) {
+  const id = (model.id ?? "").toLowerCase();
+  return !id.includes("gemini");
+}
+function stripLLMThoughtSignatureFromId(id) {
+  const separatorIndex = id.indexOf(LLM_THOUGHT_SIGNATURE_SEPARATOR);
+  if (separatorIndex === -1)
+    return id;
+  return id.slice(0, separatorIndex);
+}
+function stripLLMThoughtSignaturesFromSessionManager(sessionManager, model) {
+  if (!shouldStripLLMThoughtSignaturesForModel(model))
+    return;
+  const manager = sessionManager;
+  const entries = manager.getEntries?.();
+  if (Array.isArray(entries)) {
+    for (const entry of entries) {
+      if (entry == null || typeof entry !== "object")
+        continue;
+      const message = entry.message;
+      if (entry.type === "message") {
+        stripLLMThoughtSignaturesFromMessage(message);
+      }
+    }
+    return;
+  }
+  const context = sessionManager.buildSessionContext?.();
+  const messages = context?.messages;
+  if (!Array.isArray(messages))
+    return;
+  for (const message of messages) {
+    stripLLMThoughtSignaturesFromMessage(message);
+  }
+}
+function stripLLMThoughtSignaturesFromMessage(message) {
+  if (message == null || typeof message !== "object")
+    return;
+  const msg = message;
+  if (typeof msg.toolCallId === "string") {
+    msg.toolCallId = stripLLMThoughtSignatureFromId(msg.toolCallId);
+  }
+  if (typeof msg.tool_call_id === "string") {
+    msg.tool_call_id = stripLLMThoughtSignatureFromId(msg.tool_call_id);
+  }
+  if (!Array.isArray(msg.content))
+    return;
+  for (const block of msg.content) {
+    if (block == null || typeof block !== "object")
+      continue;
+    const contentBlock = block;
+    if (contentBlock.type !== "toolCall")
+      continue;
+    if (typeof contentBlock.id === "string") {
+      contentBlock.id = stripLLMThoughtSignatureFromId(contentBlock.id);
+    }
+    if (typeof contentBlock.toolCallId === "string") {
+      contentBlock.toolCallId = stripLLMThoughtSignatureFromId(contentBlock.toolCallId);
+    }
+    if (typeof contentBlock.tool_call_id === "string") {
+      contentBlock.tool_call_id = stripLLMThoughtSignatureFromId(contentBlock.tool_call_id);
+    }
+    if (typeof contentBlock.call_id === "string") {
+      contentBlock.call_id = stripLLMThoughtSignatureFromId(contentBlock.call_id);
+    }
+  }
+}
 function parseModelSpec(model) {
   const trimmed = model.trim();
   const separator = trimmed.indexOf(":");
@@ -5434,7 +5628,7 @@ function createPiRunner(options = {}) {
   const apiKeyEnvKey = `${provider.toUpperCase().replace(/-/g, "_")}_API_KEY`;
   const inlineApiKey = typeof options.env?.[apiKeyEnvKey] === "string" && options.env[apiKeyEnvKey].length > 0 ? options.env[apiKeyEnvKey] : void 0;
   const modelRegistry = ModelRegistry.inMemory(AuthStorage.create());
-  const defaultModel = getModel(provider, modelName);
+  const defaultModel = getBuiltinModel(provider, modelName);
   let model = defaultModel ?? modelRegistry.find(provider, modelName);
   if (model == null) {
     const baseUrlEnvKey = `${provider.toUpperCase().replace(/-/g, "_")}_BASE_URL`;
@@ -5504,7 +5698,8 @@ function createPiRunner(options = {}) {
           }
           return SessionManager2.create(cwd);
         })();
-        const resourceLoader = options.skillPaths ? new BunnyAgentResourceLoader({
+        stripLLMThoughtSignaturesFromSessionManager(sessionManager, model);
+        const resourceLoader = options.skillPaths || options.systemPrompt ? new BunnyAgentResourceLoader({
           cwd,
           skillPaths: options.skillPaths,
           appendSystemPrompt: options.systemPrompt
@@ -5537,7 +5732,9 @@ function createPiRunner(options = {}) {
           ]
         });
         const eventQueue = [];
-        let isComplete = false;
+        let promptSettled = false;
+        let promptError;
+        let finalAgentEnd;
         let aborted = false;
         let wakeConsumer = null;
         const notify = () => {
@@ -5546,15 +5743,11 @@ function createPiRunner(options = {}) {
         };
         const unsubscribe = session.subscribe((e) => {
           eventQueue.push(e);
-          if (e.type === "agent_end") {
-            isComplete = true;
-          }
           notify();
         });
         const abortSignal = options.abortController?.signal;
         const abortHandler = () => {
           aborted = true;
-          isComplete = true;
           void session.abort();
           notify();
         };
@@ -5568,6 +5761,14 @@ function createPiRunner(options = {}) {
           traceRawMessage(cwd, null, true, options.env);
           const promptText = userInput;
           const promptPromise = session.prompt(promptText);
+          void promptPromise.then(() => {
+            promptSettled = true;
+            notify();
+          }, (error) => {
+            promptError = error;
+            promptSettled = true;
+            notify();
+          });
           const streamConverter = new PiAISDKStreamConverter({
             sessionId: session.sessionId,
             model,
@@ -5575,10 +5776,14 @@ function createPiRunner(options = {}) {
             getUsageFromAgentEndMessages,
             getErrorFromAgentEndMessages
           });
-          while (!isComplete || eventQueue.length > 0) {
+          while (!promptSettled && !aborted || eventQueue.length > 0) {
             while (eventQueue.length > 0) {
               const event = eventQueue.shift();
               traceRawMessage(cwd, event, false, options.env);
+              if (event.type === "agent_end") {
+                finalAgentEnd = event;
+                continue;
+              }
               const chunks = streamConverter.handleEvent(event, aborted);
               for (const chunk of chunks) {
                 yield chunk;
@@ -5590,30 +5795,35 @@ function createPiRunner(options = {}) {
               }
               break;
             }
-            if (!isComplete && eventQueue.length === 0) {
+            if (!promptSettled && !aborted && eventQueue.length === 0) {
               await new Promise((resolve4) => {
                 wakeConsumer = resolve4;
               });
             }
           }
-          if (streamConverter.finished) {
+          if (aborted) {
             return;
           }
-          try {
-            await promptPromise;
-          } catch (error) {
-            if (!streamConverter.finished) {
-              const message = error instanceof Error ? error.message : "Pi agent run failed.";
-              for (const chunk of streamConverter.forceError(message)) {
-                yield chunk;
-              }
+          if (promptError !== void 0) {
+            const message = promptError instanceof Error ? promptError.message : "Pi agent run failed.";
+            for (const chunk of streamConverter.forceError(message)) {
+              yield chunk;
             }
             return;
           }
-          if (!streamConverter.finished && session.agent.state.errorMessage) {
+          if (finalAgentEnd) {
+            const chunks = streamConverter.handleEvent(finalAgentEnd, false);
+            for (const chunk of chunks) {
+              yield chunk;
+            }
+          } else if (session.agent.state.errorMessage) {
             for (const chunk of streamConverter.forceError(session.agent.state.errorMessage)) {
               yield chunk;
             }
+          } else {
+            for (const chunk of streamConverter.forceError("Pi agent run completed without an agent_end event.")) {
+              yield chunk;
+            }
           }
         } finally {
           if (abortSignal) {
@@ -5707,10 +5917,21 @@ function dispatchRunner(runner, base, cwd, options) {
   const _env = base.env;
   switch (runner) {
     case "claude":
-      return createClaudeRunner(base).run(options.userInput);
+      return createClaudeRunner({
+        ...base,
+        cwd,
+        forkFrom: options.forkFrom
+      }).run(options.userInput);
     case "codex": {
       const { outputFormat: _of, ...codexBase } = base;
-      return createCodexRunner({ ...codexBase, cwd }).run(options.userInput);
+      const codexEfforts = ["minimal", "low", "medium", "high", "xhigh"];
+      return createCodexRunner({
+        ...codexBase,
+        cwd,
+        ...options.effort && codexEfforts.includes(options.effort) ? {
+          modelReasoningEffort: options.effort
+        } : {}
+      }).run(options.userInput);
     }
     case "gemini":
       return createGeminiRunner({
@@ -5756,7 +5977,8 @@ async function* captureSessionId(stream, cwd) {
             writeSessionId(cwd, sessionId);
           }
         }
-      } catch {
+      } catch (error) {
+        console.debug("[captureSessionId] failed to parse chunk", error);
       }
     }
     yield chunk;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bunny-agent/runner-cli",
-  "version": "0.9.50",
+  "version": "0.9.51-beta.2",
   "description": "BunnyAgent Runner CLI - Like gemini-cli or claude-code, runs in your local terminal with AI SDK UI streaming",
   "type": "module",
   "bin": {
@@ -40,11 +40,12 @@
     "anthropic"
   ],
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "0.2.70",
-    "@earendil-works/pi-agent-core": "0.78.0",
-    "@earendil-works/pi-ai": "0.78.0",
-    "@earendil-works/pi-coding-agent": "0.78.0",
-    "@openai/codex-sdk": "^0.110.0",
+    "@anthropic-ai/claude-agent-sdk": "0.3.211",
+    "@anthropic-ai/sdk": "0.111.0",
+    "@earendil-works/pi-agent-core": "0.80.7",
+    "@earendil-works/pi-ai": "0.80.7",
+    "@earendil-works/pi-coding-agent": "0.80.7",
+    "@openai/codex-sdk": "^0.144.5",
     "dotenv": "^17.3.1",
     "zod": "^4.0.0"
   },
@@ -53,11 +54,11 @@
     "esbuild": "^0.27.2",
     "typescript": "^5.3.0",
     "vitest": "^1.6.1",
+    "@bunny-agent/runner-claude": "0.6.2",
+    "@bunny-agent/runner-codex": "0.6.2",
     "@bunny-agent/runner-harness": "0.1.1-beta.0",
     "@bunny-agent/runner-gemini": "0.6.2",
-    "@bunny-agent/runner-claude": "0.6.2",
     "@bunny-agent/runner-opencode": "0.6.2",
-    "@bunny-agent/runner-codex": "0.6.2",
     "@bunny-agent/runner-pi": "0.6.4-beta.0"
   },
   "scripts": {