@bunny-agent/runner-cli 0.9.59-beta.6 → 0.9.59-beta.8

package/dist/bundle.mjs

@@ -330,6 +330,16 @@ var createLegacyAgentTurnInput = (userInput) => ({
   execution: {}
 });
 
+// ../../packages/manager/dist/approval-file.js
+import { createHash } from "node:crypto";
+var LEGACY_APPROVAL_FILE_STEM_MAX_BYTES = 200;
+var SAFE_APPROVAL_FILE_STEM = /^[A-Za-z0-9._-]+$/;
+function approvalFileName(toolCallId) {
+  const useLegacyName = SAFE_APPROVAL_FILE_STEM.test(toolCallId) && Buffer.byteLength(toolCallId, "utf8") <= LEGACY_APPROVAL_FILE_STEM_MAX_BYTES;
+  const stem = useLegacyName ? toolCallId : `hashed-${createHash("sha256").update(toolCallId).digest("hex")}`;
+  return `${stem}.json`;
+}
+
 // src/env-payload.ts
 function takeAgentInputFromEnv(env = process.env) {
   const raw = env.BUNNY_AGENT_INPUT_JSON;
@@ -14716,6 +14726,9 @@ function errorResult(text) {
 }
 
 // ../../packages/runner-claude/dist/claude-runner.js
+var DEFAULT_ASK_USER_QUESTION_TIMEOUT_MS = 6e4;
+var ASK_USER_QUESTION_TIMEOUT_ANSWER_KEY = "__bunny_agent_timeout__";
+var ASK_USER_QUESTION_TIMEOUT_MESSAGE = "The user did not answer before the interactive question timed out. Continue the original task without waiting, using reasonable assumptions when safe, and provide a user-visible response. Do not call AskUserQuestion again during this turn.";
 function buildUserMessage(userInput) {
   const parsedContent = typeof userInput === "string" ? userInput : buildStructuredClaudeContent(userInput);
   return {
@@ -14749,8 +14762,20 @@ async function* buildSDKUserMessageIterable(userInput) {
   yield buildUserMessage(userInput);
 }
 function createCanUseToolCallback(claudeOptions) {
+  let questionTimedOut = false;
   return async (toolName, input, options) => {
     const { toolUseID } = options;
+    if (toolName === "AskUserQuestion" && questionTimedOut) {
+      return {
+        behavior: "allow",
+        updatedInput: {
+          questions: input?.questions,
+          answers: {
+            [ASK_USER_QUESTION_TIMEOUT_ANSWER_KEY]: ASK_USER_QUESTION_TIMEOUT_MESSAGE
+          }
+        }
+      };
+    }
     if (claudeOptions.yolo && toolName !== "AskUserQuestion") {
       return {
         behavior: "allow",
@@ -14762,7 +14787,7 @@ function createCanUseToolCallback(claudeOptions) {
       const fs3 = await import("node:fs");
       const path3 = await import("node:path");
       const approvalDir = path3.join(cwd, ".bunny-agent", "approvals");
-      const approvalFile = path3.join(approvalDir, `${toolUseID}.json`);
+      const approvalFile = path3.join(approvalDir, approvalFileName(toolUseID));
       fs3.mkdirSync(approvalDir, { recursive: true });
       if (!fs3.existsSync(approvalFile)) {
         fs3.writeFileSync(approvalFile, JSON.stringify({
@@ -14773,7 +14798,10 @@ function createCanUseToolCallback(claudeOptions) {
           answers: {}
         }));
       }
-      while (true) {
+      const timeoutMs = toolName === "AskUserQuestion" ? claudeOptions.askUserQuestionTimeoutMs ?? DEFAULT_ASK_USER_QUESTION_TIMEOUT_MS : Number.POSITIVE_INFINITY;
+      const deadline = Date.now() + Math.max(0, timeoutMs);
+      let lastApproval = null;
+      while (Date.now() < deadline) {
         if (options.signal?.aborted) {
           try {
             fs3.unlinkSync(approvalFile);
@@ -14787,6 +14815,7 @@ function createCanUseToolCallback(claudeOptions) {
         try {
           const data = fs3.readFileSync(approvalFile, "utf-8");
           const approval = JSON.parse(data);
+          lastApproval = approval;
           if (approval.status === "completed") {
             try {
               fs3.unlinkSync(approvalFile);
@@ -14804,6 +14833,21 @@ function createCanUseToolCallback(claudeOptions) {
         }
         await new Promise((resolve5) => setTimeout(resolve5, 500));
       }
+      try {
+        fs3.unlinkSync(approvalFile);
+      } catch {
+      }
+      questionTimedOut = true;
+      return {
+        behavior: "allow",
+        updatedInput: {
+          questions: lastApproval?.questions ?? input?.questions,
+          answers: {
+            ...lastApproval?.answers ?? {},
+            [ASK_USER_QUESTION_TIMEOUT_ANSWER_KEY]: ASK_USER_QUESTION_TIMEOUT_MESSAGE
+          }
+        }
+      };
     } catch (error48) {
       console.error("Failed to handle approval flow:", error48);
       return {
@@ -20951,6 +20995,11 @@ function getUsageFromAgentEndMessages(messages) {
 }
 
 // ../../packages/runner-pi/dist/stream-converter.js
+var ASK_USER_QUESTION_TOOL_NAMES = /* @__PURE__ */ new Set([
+  "AskUserQuestion",
+  "ask_user_question"
+]);
+var ASK_USER_QUESTION_TIMEOUT_ANSWER_KEY2 = "__bunny_agent_timeout__";
 function emitStreamError(errorText) {
   const errorLine = "data: " + JSON.stringify({ type: "error", errorText }) + "\n\n";
   const finishLine = "data: " + JSON.stringify({ type: "finish", finishReason: "error" }) + "\n\n";
@@ -20973,6 +21022,23 @@ function extractToolResultText(result) {
     return String(result);
   }
 }
+function extractAskUserQuestionOutput(toolName, result) {
+  if (!ASK_USER_QUESTION_TOOL_NAMES.has(toolName))
+    return void 0;
+  if (result === null || typeof result !== "object")
+    return void 0;
+  const details = result.details;
+  if (details === null || typeof details !== "object" || Array.isArray(details)) {
+    return void 0;
+  }
+  const answers = details.answers;
+  if (answers === null || typeof answers !== "object" || Array.isArray(answers)) {
+    return void 0;
+  }
+  return {
+    answers: Object.fromEntries(Object.entries(answers).filter(([key]) => key !== ASK_USER_QUESTION_TIMEOUT_ANSWER_KEY2))
+  };
+}
 function sseData4(obj) {
   return "data: " + JSON.stringify(obj) + "\n\n";
 }
@@ -21034,7 +21100,7 @@ var PiAISDKStreamConverter = class {
       return chunks;
     }
     if (event.type === "tool_execution_end") {
-      const output = this.options.normalizeToolOutput(event.result);
+      const textOutput = this.options.normalizeToolOutput(event.result);
       const raw = event.result?.details?.usage?.raw;
       if (raw != null)
         accumulateToolUsage(this.toolUsageTally, raw);
@@ -21042,11 +21108,12 @@ var PiAISDKStreamConverter = class {
         chunks.push(sseData4({
           type: "tool-output-error",
           toolCallId: event.toolCallId,
-          errorText: output,
+          errorText: textOutput,
           dynamic: true,
           providerExecuted: true
         }));
       } else {
+        const output = extractAskUserQuestionOutput(event.toolName, event.result) ?? textOutput;
         chunks.push(sseData4({
           type: "tool-output-available",
           toolCallId: event.toolCallId,
@@ -23753,10 +23820,17 @@ __export(type_exports2, {
 var Type = type_exports2;
 
 // ../../packages/runner-pi/dist/tool-approval.js
-var ASK_USER_QUESTION_TOOL_NAME = "AskUserQuestion";
+var ASK_USER_QUESTION_TOOL_NAME = "ask_user_question";
+var LEGACY_ASK_USER_QUESTION_TOOL_NAME = "AskUserQuestion";
+var DEFAULT_ASK_USER_QUESTION_TIMEOUT_MS2 = 6e4;
+var ASK_USER_QUESTION_TIMEOUT_ANSWER_KEY3 = "__bunny_agent_timeout__";
+var ASK_USER_QUESTION_TIMEOUT_MESSAGE2 = "The user did not answer before the interactive question timed out. Do not call ask_user_question again during this turn.";
+function isAskUserQuestionToolName(toolName) {
+  return toolName === ASK_USER_QUESTION_TOOL_NAME || toolName === LEGACY_ASK_USER_QUESTION_TOOL_NAME;
+}
 var DEFAULT_POLL_INTERVAL_MS = 500;
 function approvalFilePath(cwd, toolCallId) {
-  return path2.join(cwd, ".bunny-agent", "approvals", `${toolCallId}.json`);
+  return path2.join(cwd, ".bunny-agent", "approvals", approvalFileName(toolCallId));
 }
 async function waitForApproval(options) {
   const { cwd, toolCallId, toolName, input, signal, pollIntervalMs = DEFAULT_POLL_INTERVAL_MS, timeoutMs } = options;
@@ -23774,7 +23848,7 @@ async function waitForApproval(options) {
         status: "pending",
         toolName,
         input,
-        questions: toolName === ASK_USER_QUESTION_TOOL_NAME ? input?.questions : void 0,
+        questions: isAskUserQuestionToolName(toolName) ? input?.questions : void 0,
         answers: {}
       }));
     }
@@ -23807,12 +23881,15 @@ async function waitForApproval(options) {
       await sleepWithAbort(pollIntervalMs, signal);
     }
     cleanup();
-    if (lastApproval && Object.keys(lastApproval.answers ?? {}).length > 0) {
+    if (isAskUserQuestionToolName(toolName)) {
       return {
         behavior: "allow",
         updatedInput: {
-          questions: lastApproval.questions,
-          answers: lastApproval.answers
+          questions: lastApproval?.questions ?? input?.questions,
+          answers: {
+            ...lastApproval?.answers ?? {},
+            [ASK_USER_QUESTION_TIMEOUT_ANSWER_KEY3]: ASK_USER_QUESTION_TIMEOUT_MESSAGE2
+          }
         }
       };
     }
@@ -23852,13 +23929,46 @@ var askUserQuestionParameters = Type.Object({
     }))
   }), { description: "Questions to present to the user." })
 });
+function formatAskUserQuestionResult(updatedInput) {
+  if (ASK_USER_QUESTION_TIMEOUT_ANSWER_KEY3 in updatedInput.answers) {
+    const availableAnswers = Object.fromEntries(Object.entries(updatedInput.answers).filter(([key]) => key !== ASK_USER_QUESTION_TIMEOUT_ANSWER_KEY3));
+    return [
+      ASK_USER_QUESTION_TIMEOUT_MESSAGE2,
+      `Available answers: ${JSON.stringify(availableAnswers)}`,
+      "Continue the original task without waiting. Use any available answers, make reasonable assumptions when safe, and provide a user-visible response. Do not call ask_user_question again during this turn."
+    ].join("\n");
+  }
+  return [
+    "The user answered the interactive questions.",
+    `Answers: ${JSON.stringify(updatedInput.answers)}`,
+    "Continue the original task using these answers and provide a user-visible response. Do not end the turn with an empty response."
+  ].join("\n");
+}
 function buildAskUserQuestionTool(options) {
+  let questionTimedOut = false;
   return {
     name: ASK_USER_QUESTION_TOOL_NAME,
     label: "Ask User Question",
     description: "Ask the user one or more questions and wait for their answers. Use this when you need clarification, a decision between options, or missing information required to continue the task.",
     parameters: askUserQuestionParameters,
     async execute(toolCallId, params, signal) {
+      if (questionTimedOut) {
+        const updatedInput = {
+          questions: params?.questions,
+          answers: {
+            [ASK_USER_QUESTION_TIMEOUT_ANSWER_KEY3]: ASK_USER_QUESTION_TIMEOUT_MESSAGE2
+          }
+        };
+        return {
+          content: [
+            {
+              type: "text",
+              text: formatAskUserQuestionResult(updatedInput)
+            }
+          ],
+          details: updatedInput
+        };
+      }
       const decision = await waitForApproval({
         cwd: options.cwd,
         toolCallId,
@@ -23866,19 +23976,20 @@ function buildAskUserQuestionTool(options) {
         input: params,
         signal: signal ?? options.fallbackSignal,
         pollIntervalMs: options.pollIntervalMs,
-        timeoutMs: options.timeoutMs
+        timeoutMs: options.timeoutMs ?? DEFAULT_ASK_USER_QUESTION_TIMEOUT_MS2
       });
       if (decision.behavior === "deny") {
         throw new Error(decision.message);
       }
+      questionTimedOut = ASK_USER_QUESTION_TIMEOUT_ANSWER_KEY3 in decision.updatedInput.answers;
       return {
         content: [
           {
             type: "text",
-            text: JSON.stringify(decision.updatedInput)
+            text: formatAskUserQuestionResult(decision.updatedInput)
           }
         ],
-        details: void 0
+        details: decision.updatedInput
       };
     }
   };
@@ -24542,6 +24653,13 @@ function applyAllowedTools(tools, allowedTools) {
   const allowed = new Set(allowedTools);
   return tools.filter((tool) => allowed.has(tool.name));
 }
+function normalizeAllowedTools(allowedTools) {
+  if (!allowedTools)
+    return void 0;
+  return [
+    ...new Set(allowedTools.map((toolName) => toolName === LEGACY_ASK_USER_QUESTION_TOOL_NAME ? ASK_USER_QUESTION_TOOL_NAME : toolName))
+  ];
+}
 function shouldStripLLMThoughtSignaturesForModel(model) {
   const id = (model.id ?? "").toLowerCase();
   return !id.includes("gemini");
@@ -24792,6 +24910,7 @@ function createPiRunner(options = {}) {
           const apiKey = auth?.auth.apiKey ?? "";
           customTools.push(buildImageGenerateTool(cwd, imageModelName, model.baseUrl, apiKey), buildImageEditTool(cwd, imageModelName, model.baseUrl, apiKey));
         }
+        const allowedTools = normalizeAllowedTools(options.allowedTools);
         const toolRefDefinitions = options.toolRefs && options.toolRefs.length > 0 ? buildToolDefinitionsFromRefs(options.toolRefs) : [];
         const isRoot = typeof process.getuid === "function" && process.getuid() === 0;
         const bypassApproval = Boolean(options.yolo) || isRoot;
@@ -24800,12 +24919,12 @@ function createPiRunner(options = {}) {
           fallbackSignal: options.abortController?.signal
         };
         let regularTools = [
-          ...applyAllowedTools(customTools, options.allowedTools),
+          ...applyAllowedTools(customTools, allowedTools),
           ...toolRefDefinitions
         ];
         if (!bypassApproval) {
           const overriddenNames = new Set(regularTools.map((tool) => tool.name));
-          const builtinTools = applyAllowedTools(createCodingTools(cwd), options.allowedTools).filter((tool) => !overriddenNames.has(tool.name));
+          const builtinTools = applyAllowedTools(createCodingTools(cwd), allowedTools).filter((tool) => !overriddenNames.has(tool.name));
           regularTools = [...regularTools, ...builtinTools];
         }
         const gatedTools = gateToolsForApproval(regularTools, bypassApproval, approvalGate);
@@ -24816,8 +24935,14 @@ function createPiRunner(options = {}) {
           modelRuntime,
           resourceLoader,
           thinkingLevel: options.effort ? options.effort : void 0,
-          tools: options.allowedTools,
-          customTools: [...gatedTools, buildAskUserQuestionTool(approvalGate)]
+          tools: allowedTools,
+          customTools: [
+            ...gatedTools,
+            buildAskUserQuestionTool({
+              ...approvalGate,
+              timeoutMs: options.askUserQuestionTimeoutMs ?? DEFAULT_ASK_USER_QUESTION_TIMEOUT_MS2
+            })
+          ]
         });
         try {
           await session.bindExtensions({ mode: "print" });
@@ -25009,7 +25134,8 @@ function createRunner(options) {
     resume,
     yolo: options.yolo,
     env,
-    abortController
+    abortController,
+    askUserQuestionTimeoutMs: options.askUserQuestionTimeoutMs
   };
   const input = options.input ? parseAgentTurnInputV1(options.input) : createLegacyAgentTurnInput(options.userInput ?? "");
   const rawStream = dispatchRunner(options.runner, base, cwd, options, input);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bunny-agent/runner-cli",
-  "version": "0.9.59-beta.6",
+  "version": "0.9.59-beta.8",
   "description": "BunnyAgent Runner CLI - Like gemini-cli or claude-code, runs in your local terminal with AI SDK UI streaming",
   "type": "module",
   "bin": {
@@ -59,15 +59,15 @@
     "esbuild": "^0.27.2",
     "typescript": "^5.3.0",
     "vitest": "^1.6.1",
-    "@bunny-agent/manager": "0.9.59-beta.6",
+    "@bunny-agent/apply-patch": "0.1.0",
+    "@bunny-agent/manager": "0.9.59-beta.8",
     "@bunny-agent/runner-claude": "0.6.2",
     "@bunny-agent/runner-copilot": "0.1.0",
     "@bunny-agent/runner-codex": "0.6.2",
-    "@bunny-agent/apply-patch": "0.1.0",
-    "@bunny-agent/runner-gemini": "0.6.2",
-    "@bunny-agent/runner-harness": "0.1.1-beta.0",
+    "@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-harness": "0.1.1-beta.0",
+    "@bunny-agent/runner-gemini": "0.6.2"
   },
   "scripts": {
     "build": "tsc && pnpm bundle",