@bunny-agent/runner-cli 0.9.50-beta.4 → 0.9.50-beta.6

package/dist/bundle.mjs

@@ -210,15 +210,39 @@ var BUNNY_AGENT_SYSTEM_PROMPT = [
   "If the answer is a number, give only the number. If it's a name, give the exact name as it appears in the source."
 ].join("\n");
 
+// ../../packages/runner-harness/dist/prompt.js
+import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
+import { dirname as dirname2, join as join2 } from "node:path";
+var PROMPT_FILES = ["CLAUDE.md", "AGENTS.md"];
+function loadSystemPrompt(cwd) {
+  let dir = cwd;
+  for (let i = 0; i < 5; i++) {
+    for (const name of PROMPT_FILES) {
+      const p = join2(dir, name);
+      if (existsSync2(p)) {
+        try {
+          return readFileSync2(p, "utf8").trim() || void 0;
+        } catch {
+        }
+      }
+    }
+    const parent = dirname2(dir);
+    if (parent === dir)
+      break;
+    dir = parent;
+  }
+  return void 0;
+}
+
 // ../../packages/runner-claude/dist/ai-sdk-stream.js
-import { appendFileSync, existsSync as existsSync2, unlinkSync } from "node:fs";
-import { join as join2 } from "node:path";
+import { appendFileSync, existsSync as existsSync3, unlinkSync } from "node:fs";
+import { join as join3 } from "node:path";
 function trace(data, reset = false) {
   if (process.env.DEBUG !== "true")
     return;
   try {
-    const file = join2(process.cwd(), "claude-message-stream-debug.json");
-    if (reset && existsSync2(file))
+    const file = join3(process.cwd(), "claude-message-stream-debug.json");
+    if (reset && existsSync3(file))
       unlinkSync(file);
     const entry = {
       _t: (/* @__PURE__ */ new Date()).toISOString(),
@@ -1276,107 +1300,14 @@ function createOpenCodeRunner(options = {}) {
   };
 }
 
-// ../../packages/runner-pi/dist/fork.js
-import { SessionManager as SessionManager2 } from "@earendil-works/pi-coding-agent";
-
-// ../../packages/runner-pi/dist/session-utils.js
-import { closeSync, fstatSync, openSync, readdirSync as readdirSync2, readSync, statSync as statSync2 } from "node:fs";
-import { join as join4 } from "node:path";
-import { SessionManager } from "@earendil-works/pi-coding-agent";
-var MAX_SESSION_FILE_BYTES = Number(process.env.SANDAGENT_MAX_SESSION_BYTES) || 10 * 1024 * 1024;
-function resolveSessionPathById(cwd, sessionIdOrPath) {
-  if (sessionIdOrPath.includes("/"))
-    return sessionIdOrPath;
-  const tempMgr = SessionManager.create(cwd);
-  const sessionsDir = tempMgr.getSessionDir();
-  try {
-    const suffix = `_${sessionIdOrPath}.jsonl`;
-    const match = readdirSync2(sessionsDir).find((f) => f.endsWith(suffix));
-    return match ? join4(sessionsDir, match) : void 0;
-  } catch {
-    return void 0;
-  }
-}
-function isSessionFileTooLarge(sessionPath2) {
-  try {
-    return statSync2(sessionPath2).size > MAX_SESSION_FILE_BYTES;
-  } catch {
-    return false;
-  }
-}
-function readTailEntries(sessionPath2, tailBytes = 1024 * 1024) {
-  let fd;
-  try {
-    fd = openSync(sessionPath2, "r");
-  } catch {
-    return [];
-  }
-  try {
-    const fileSize = fstatSync(fd).size;
-    const readStart = Math.max(0, fileSize - tailBytes);
-    const readLen = fileSize - readStart;
-    const buf = Buffer.alloc(readLen);
-    readSync(fd, buf, 0, readLen, readStart);
-    const tail = buf.toString("utf8");
-    const entries = [];
-    for (const line of tail.split("\n")) {
-      const trimmed = line.trim();
-      if (!trimmed)
-        continue;
-      try {
-        entries.push(JSON.parse(trimmed));
-      } catch {
-      }
-    }
-    return entries;
-  } finally {
-    closeSync(fd);
-  }
-}
-function extractSessionContext(sessionPath2) {
-  const entries = readTailEntries(sessionPath2);
-  if (entries.length === 0)
-    return void 0;
-  for (let i = entries.length - 1; i >= 0; i--) {
-    const e = entries[i];
-    if (e.type === "compaction" && typeof e.summary === "string") {
-      return e.summary;
-    }
-  }
-  const recentMessages = [];
-  const MAX_MESSAGES = 6;
-  for (let i = entries.length - 1; i >= 0 && recentMessages.length < MAX_MESSAGES; i--) {
-    const e = entries[i];
-    if (e.type !== "message")
-      continue;
-    const msg = e.message;
-    if (!msg)
-      continue;
-    if (msg.role !== "user" && msg.role !== "assistant")
-      continue;
-    let text = "";
-    if (typeof msg.content === "string") {
-      text = msg.content;
-    } else if (Array.isArray(msg.content)) {
-      text = msg.content.filter((c) => c.type === "text" && c.text).map((c) => c.text).join("\n");
-    }
-    if (text) {
-      recentMessages.unshift(`[${msg.role}]: ${text}`);
-    }
-  }
-  if (recentMessages.length === 0)
-    return void 0;
-  return "## Previous Session Context (auto-extracted)\n\nThe following is the tail of the previous conversation:\n\n" + recentMessages.join("\n\n");
-}
-
 // ../../packages/runner-pi/dist/pi-runner.js
-import { appendFileSync as appendFileSync2, existsSync as existsSync4, unlinkSync as unlinkSync3 } from "node:fs";
-import { join as join7 } from "node:path";
+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 { AuthStorage, createAgentSession, ModelRegistry, SessionManager as SessionManager3 } from "@earendil-works/pi-coding-agent";
+import { AuthStorage, createAgentSession, ModelRegistry, SessionManager as SessionManager2 } from "@earendil-works/pi-coding-agent";
 
 // ../../packages/runner-pi/dist/bunny-agent-resource-loader.js
-import { existsSync as existsSync3 } from "node:fs";
+import { existsSync as existsSync4 } from "node:fs";
 import { homedir } from "node:os";
 import { isAbsolute, join as join5, resolve as resolve2 } from "node:path";
 import { DefaultResourceLoader, loadSkills } from "@earendil-works/pi-coding-agent";
@@ -1390,7 +1321,7 @@ function logSkillLoad(cwd, agentDir, skillPaths, result) {
   ];
   for (const raw of skillPaths) {
     const abs = isAbsolute(raw) ? raw : resolve2(cwd, raw);
-    lines.push(`    ${raw} -> ${abs} (exists: ${existsSync3(abs) ? "yes" : "no"})`);
+    lines.push(`    ${raw} -> ${abs} (exists: ${existsSync4(abs) ? "yes" : "no"})`);
   }
   lines.push(`  loaded skills: ${result.skills.length}`);
   if (result.skills.length > 0) {
@@ -1466,7 +1397,7 @@ var BunnyAgentResourceLoader = class {
 
 // ../../packages/runner-pi/dist/image-tools.js
 import { mkdirSync as mkdirSync2, writeFileSync as writeFileSync3 } from "node:fs";
-import { dirname as dirname2, extname, join as join6 } from "node:path";
+import { dirname as dirname3, extname, join as join6 } from "node:path";
 var generateImageSchema = {
   type: "object",
   properties: {
@@ -1699,7 +1630,7 @@ async function saveImageItem(item, filePath, apiKey) {
   const b64 = await resolveB64(item, apiKey);
   if (!b64)
     return void 0;
-  mkdirSync2(dirname2(filePath), { recursive: true });
+  mkdirSync2(dirname3(filePath), { recursive: true });
   writeFileSync3(filePath, Buffer.from(b64, "base64"));
   return filePath;
 }
@@ -1997,6 +1928,96 @@ function buildImageEditTool(cwd, imageModelId, baseUrl, apiKey) {
   };
 }
 
+// ../../packages/runner-pi/dist/session-utils.js
+import { closeSync, fstatSync, openSync, readdirSync as readdirSync2, readSync, statSync as statSync2 } from "node:fs";
+import { join as join7 } from "node:path";
+import { SessionManager } from "@earendil-works/pi-coding-agent";
+var MAX_SESSION_FILE_BYTES = Number(process.env.SANDAGENT_MAX_SESSION_BYTES) || 10 * 1024 * 1024;
+function resolveSessionPathById(cwd, sessionIdOrPath) {
+  if (sessionIdOrPath.includes("/"))
+    return sessionIdOrPath;
+  const tempMgr = SessionManager.create(cwd);
+  const sessionsDir = tempMgr.getSessionDir();
+  try {
+    const suffix = `_${sessionIdOrPath}.jsonl`;
+    const match = readdirSync2(sessionsDir).find((f) => f.endsWith(suffix));
+    return match ? join7(sessionsDir, match) : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function isSessionFileTooLarge(sessionPath2) {
+  try {
+    return statSync2(sessionPath2).size > MAX_SESSION_FILE_BYTES;
+  } catch {
+    return false;
+  }
+}
+function readTailEntries(sessionPath2, tailBytes = 1024 * 1024) {
+  let fd;
+  try {
+    fd = openSync(sessionPath2, "r");
+  } catch {
+    return [];
+  }
+  try {
+    const fileSize = fstatSync(fd).size;
+    const readStart = Math.max(0, fileSize - tailBytes);
+    const readLen = fileSize - readStart;
+    const buf = Buffer.alloc(readLen);
+    readSync(fd, buf, 0, readLen, readStart);
+    const tail = buf.toString("utf8");
+    const entries = [];
+    for (const line of tail.split("\n")) {
+      const trimmed = line.trim();
+      if (!trimmed)
+        continue;
+      try {
+        entries.push(JSON.parse(trimmed));
+      } catch {
+      }
+    }
+    return entries;
+  } finally {
+    closeSync(fd);
+  }
+}
+function extractSessionContext(sessionPath2) {
+  const entries = readTailEntries(sessionPath2);
+  if (entries.length === 0)
+    return void 0;
+  for (let i = entries.length - 1; i >= 0; i--) {
+    const e = entries[i];
+    if (e.type === "compaction" && typeof e.summary === "string") {
+      return e.summary;
+    }
+  }
+  const recentMessages = [];
+  const MAX_MESSAGES = 6;
+  for (let i = entries.length - 1; i >= 0 && recentMessages.length < MAX_MESSAGES; i--) {
+    const e = entries[i];
+    if (e.type !== "message")
+      continue;
+    const msg = e.message;
+    if (!msg)
+      continue;
+    if (msg.role !== "user" && msg.role !== "assistant")
+      continue;
+    let text = "";
+    if (typeof msg.content === "string") {
+      text = msg.content;
+    } else if (Array.isArray(msg.content)) {
+      text = msg.content.filter((c) => c.type === "text" && c.text).map((c) => c.text).join("\n");
+    }
+    if (text) {
+      recentMessages.unshift(`[${msg.role}]: ${text}`);
+    }
+  }
+  if (recentMessages.length === 0)
+    return void 0;
+  return "## Previous Session Context (auto-extracted)\n\nThe following is the tail of the previous conversation:\n\n" + recentMessages.join("\n\n");
+}
+
 // ../../packages/runner-pi/dist/usage-metadata.js
 function usageToMessageMetadata(usage) {
   return {
@@ -5328,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(":");
@@ -5388,8 +5476,8 @@ function traceRawMessage(debugCwd, data, reset = false, optionsEnv) {
   if (!enabled)
     return;
   try {
-    const file = join7(debugCwd, "pi-message-stream-debug.json");
-    if (reset && existsSync4(file))
+    const file = join8(debugCwd, "pi-message-stream-debug.json");
+    if (reset && existsSync5(file))
       unlinkSync3(file);
     const type = data !== null && typeof data === "object" ? data.type : void 0;
     let payload = data;
@@ -5461,7 +5549,7 @@ function createPiRunner(options = {}) {
             if (!sourcePath) {
               throw new Error(`Pi runner: forkFrom source session not found: ${forkFrom}`);
             }
-            return SessionManager3.forkFrom(sourcePath, cwd);
+            return SessionManager2.forkFrom(sourcePath, cwd);
           }
           if (resume) {
             const sessionPath2 = resolveSessionPathById(cwd, resume);
@@ -5470,19 +5558,20 @@ function createPiRunner(options = {}) {
               if (isSessionFileTooLarge(sessionPath2)) {
                 const context = extractSessionContext(sessionPath2);
                 console.error(`${LOG_PREFIX2} session file too large, starting fresh${context ? " (with context)" : ""}`);
-                const newMgr = SessionManager3.create(cwd);
+                const newMgr = SessionManager2.create(cwd);
                 if (context) {
                   const firstId = newMgr.getEntries()[0]?.id ?? "";
                   newMgr.appendCompaction(context, firstId, 0);
                 }
                 return newMgr;
               }
-              return SessionManager3.open(sessionPath2);
+              return SessionManager2.open(sessionPath2);
             }
-            return SessionManager3.create(cwd);
+            return SessionManager2.create(cwd);
           }
-          return SessionManager3.create(cwd);
+          return SessionManager2.create(cwd);
         })();
+        stripLLMThoughtSignaturesFromSessionManager(sessionManager, model);
         const resourceLoader = options.skillPaths ? new BunnyAgentResourceLoader({
           cwd,
           skillPaths: options.skillPaths,
@@ -5610,30 +5699,6 @@ function createPiRunner(options = {}) {
   };
 }
 
-// ../../packages/runner-harness/dist/prompt.js
-import { existsSync as existsSync5, readFileSync as readFileSync2 } from "node:fs";
-import { dirname as dirname3, join as join8 } from "node:path";
-var PROMPT_FILES = ["CLAUDE.md", "AGENTS.md"];
-function loadSystemPrompt(cwd) {
-  let dir = cwd;
-  for (let i = 0; i < 5; i++) {
-    for (const name of PROMPT_FILES) {
-      const p = join8(dir, name);
-      if (existsSync5(p)) {
-        try {
-          return readFileSync2(p, "utf8").trim() || void 0;
-        } catch {
-        }
-      }
-    }
-    const parent = dirname3(dir);
-    if (parent === dir)
-      break;
-    dir = parent;
-  }
-  return void 0;
-}
-
 // ../../packages/runner-harness/dist/session.js
 import { existsSync as existsSync6, mkdirSync as mkdirSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync4 } from "node:fs";
 import { join as join9 } from "node:path";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bunny-agent/runner-cli",
-  "version": "0.9.50-beta.4",
+  "version": "0.9.50-beta.6",
   "description": "BunnyAgent Runner CLI - Like gemini-cli or claude-code, runs in your local terminal with AI SDK UI streaming",
   "type": "module",
   "bin": {
@@ -54,11 +54,11 @@
     "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-gemini": "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"
+    "@bunny-agent/runner-opencode": "0.6.2",
+    "@bunny-agent/runner-pi": "0.6.4-beta.0",
+    "@bunny-agent/runner-gemini": "0.6.2",
+    "@bunny-agent/runner-harness": "0.1.1-beta.0"
   },
   "scripts": {
     "build": "tsc && pnpm bundle",