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

package/dist/bundle.mjs

@@ -5349,12 +5349,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(":");
@@ -5504,6 +5571,7 @@ function createPiRunner(options = {}) {
           }
           return SessionManager2.create(cwd);
         })();
+        stripLLMThoughtSignaturesFromSessionManager(sessionManager, model);
         const resourceLoader = options.skillPaths ? new BunnyAgentResourceLoader({
           cwd,
           skillPaths: options.skillPaths,
@@ -5537,7 +5605,9 @@ function createPiRunner(options = {}) {
           ]
         });
         const eventQueue = [];
-        let isComplete = false;
+        let promptSettled = false;
+        let promptError;
+        let finalAgentEnd = void 0;
         let aborted = false;
         let wakeConsumer = null;
         const notify = () => {
@@ -5546,15 +5616,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 +5634,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 +5649,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 +5668,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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bunny-agent/runner-cli",
-  "version": "0.9.50",
+  "version": "0.9.51-beta.1",
   "description": "BunnyAgent Runner CLI - Like gemini-cli or claude-code, runs in your local terminal with AI SDK UI streaming",
   "type": "module",
   "bin": {
@@ -53,11 +53,11 @@
     "esbuild": "^0.27.2",
     "typescript": "^5.3.0",
     "vitest": "^1.6.1",
+    "@bunny-agent/runner-claude": "0.6.2",
     "@bunny-agent/runner-harness": "0.1.1-beta.0",
+    "@bunny-agent/runner-codex": "0.6.2",
     "@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": {