beecork 2.4.1 → 2.4.2

package/README.md

@@ -79,8 +79,9 @@ main conversation clean. It cannot modify anything, run commands, or recurse.
 
 ### Status line
 
-A live bar on the terminal's bottom row shows `model · effort · git branch · ~tokens · background tasks`,
-refreshed every couple seconds. Disable with `STATUSLINE=0`.
+An optional bar on the terminal's bottom row shows `model · effort · git branch · ~tokens · background
+tasks`. It's **off by default** while a proper pinned-input version is built; opt into the interim one
+with `STATUSLINE=1`.
 
 ### Skipping permissions (danger)
 

package/dist/index.js

@@ -114,9 +114,10 @@ var config = {
   // Sub-agent (explore tool)
   subAgentMaxSteps: num("SUBAGENT_MAX_STEPS", 15),
   // child explorer's step budget (bounds cost/latency)
-  // Live status line (bottom row: model · effort · git branch · ~tokens · bg tasks)
-  statuslineEnabled: !["0", "false", "off", "no"].includes((process.env.STATUSLINE ?? "").trim().toLowerCase()),
-  // default on; STATUSLINE=0 disables
+  // Live status line (bottom row: model · effort · git branch · ~tokens · bg tasks). DEFAULT OFF —
+  // the interim scroll-region version clashes with the inline input (banner loss / flicker); it's
+  // being replaced by a proper pinned-input UI. Opt in with STATUSLINE=1.
+  statuslineEnabled: ["1", "true", "on", "yes"].includes((process.env.STATUSLINE ?? "").trim().toLowerCase()),
   statuslineRefreshMs: num("STATUSLINE_REFRESH_MS", 2e3),
   // bar refresh interval
   // Integrations / modes
@@ -1249,7 +1250,7 @@ import { homedir as homedir3 } from "node:os";
 import { basename } from "node:path";
 function pathGuard(args) {
   const { abs, inRoot } = resolveInRoot(String(args.path ?? "."));
-  return inRoot ? {} : { needsApproval: true, reason: `path is outside the project root: ${abs}` };
+  return inRoot ? {} : { needsApproval: true, reason: `path is outside the project root: ${abs}`, cacheKey: `path:${abs}` };
 }
 var SECRET_FILE = /(^|\/)(\.env(\.[\w.-]+)?|[\w.-]*\.(env|pem|key|secret|pfx|p12|jks|keystore)|id_(rsa|ed25519|ecdsa|dsa)|credentials|\.git-credentials|\.pgpass|\.npmrc|\.netrc)$/i;
 function isSecretPath(userPath) {
@@ -2388,7 +2389,7 @@ async function callModel(messages, includeTools = true, signal, opts) {
         stopSpinner();
         if (!quiet) {
           if (!printedText) {
-            process.stdout.write("\n" + color.cyan("bee: "));
+            process.stdout.write((printedReasoning ? "\n\n" : "\n") + color.cyan("bee: "));
             printedText = true;
           }
           const safe = stripControl(ev.content);
@@ -2796,7 +2797,7 @@ var SYSTEM_PROMPT = `You are beecork, a coding assistant working in a terminal o
 # Safety
 - Be careful with anything that deletes or overwrites. Don't do destructive things unless the user clearly asked.
 - Don't commit or push to git, publish, deploy, or take other outward or hard-to-undo actions unless the user explicitly asked.`;
-async function askApproval(ask, call, reason) {
+async function askApproval(ask, call, reason, offerAlways = true) {
   let args = {};
   try {
     args = JSON.parse(call.function.arguments);
@@ -2818,8 +2819,9 @@ async function askApproval(ask, call, reason) {
   } else {
     console.log(color.yellow(`   ${stripControl(call.function.arguments)}`));
   }
-  const answer = (await ask(color.yellow("   allow? [y]es / [n]o / [a]lways: "))).trim().toLowerCase();
-  if (answer === "a" || answer === "always") return "always";
+  const prompt = offerAlways ? "   allow? [y]es / [n]o / [a]lways: " : "   allow? [y]es / [n]o: ";
+  const answer = (await ask(color.yellow(prompt))).trim().toLowerCase();
+  if (offerAlways && (answer === "a" || answer === "always")) return "always";
   if (answer === "y" || answer === "yes") return "once";
   return "deny";
 }
@@ -2830,8 +2832,9 @@ function decideApproval(tool, args, ctx) {
   if (ctx.dangerouslySkip) return { action: "run" };
   const guard = tool?.guard?.(args);
   if (guard?.needsApproval) {
+    if (guard.cacheKey && ctx.approvedGuardKeys?.has(guard.cacheKey)) return { action: "run" };
     if (ctx.autoApprove) return { action: "deny", kind: "headless", reason: guard.reason ?? "blocked" };
-    return { action: "ask", cacheable: false, reason: guard.reason };
+    return guard.cacheKey ? { action: "ask", cacheable: true, reason: guard.reason, guardKey: guard.cacheKey } : { action: "ask", cacheable: false, reason: guard.reason };
   }
   if (tool?.needsApproval && !ctx.autoApprove && ctx.mode !== "auto") {
     if (tool.alwaysAsk) return { action: "ask", cacheable: false };
@@ -2867,7 +2870,7 @@ async function handleAskUser(args) {
   return askUserMessage(question, choice, true);
 }
 async function handleToolCall(call, messages, step, deps) {
-  const { approvedTools, callCounts, ask, signal } = deps;
+  const { approvedTools, approvedGuardKeys, callCounts, ask, signal } = deps;
   const pushTool = (content) => messages.push({ role: "tool", tool_call_id: call.id, content });
   const sig = `${call.function.name}:${call.function.arguments}`;
   const seen = (callCounts.get(sig) ?? 0) + 1;
@@ -2892,6 +2895,7 @@ async function handleToolCall(call, messages, step, deps) {
     mode: state.mode,
     autoApprove: config.autoApprove,
     approvedTools,
+    approvedGuardKeys,
     toolName: call.function.name,
     dangerouslySkip: config.dangerouslySkipPermissions
   });
@@ -2906,15 +2910,19 @@ async function handleToolCall(call, messages, step, deps) {
     return;
   }
   if (decision.action === "ask") {
-    const answer = await askApproval(ask, call, decision.cacheable ? void 0 : decision.reason);
+    const answer = await askApproval(ask, call, decision.reason, decision.cacheable);
     if (answer === "deny") {
       console.log(color.red("   \u21B3 denied") + "\n");
-      pushTool(decision.cacheable ? "The user DENIED permission to run this tool. Do not retry it." : `The user DENIED this (${decision.reason}). Do not retry, and do not route around it with run_bash/cat or another tool.`);
+      pushTool(decision.reason ? `The user DENIED this (${decision.reason}). Do not retry, and do not route around it with run_bash/cat or another tool.` : "The user DENIED permission to run this tool. Do not retry it.");
       return;
     }
-    if (decision.cacheable && answer === "always") {
-      approvedTools.add(call.function.name);
-      void addProjectApproval(call.function.name);
+    if (answer === "always" && decision.cacheable) {
+      if (decision.guardKey) {
+        approvedGuardKeys.add(decision.guardKey);
+      } else {
+        approvedTools.add(call.function.name);
+        void addProjectApproval(call.function.name);
+      }
     }
   }
   if (config.traceFile) trace.push({ tool: call.function.name, args: call.function.arguments, step });
@@ -2970,13 +2978,13 @@ ${content}` }];
   }
   return [...messages, { role: "user", content }];
 }
-async function runTurn(messages, userInput, ask, approvedTools, signal, steering) {
+async function runTurn(messages, userInput, ask, approvedTools, approvedGuardKeys, signal, steering) {
   messages.push({ role: "user", content: userInput });
   const snapshot = messages.slice();
   try {
     let answered = false;
     const callCounts = /* @__PURE__ */ new Map();
-    const deps = { approvedTools, callCounts, ask, signal };
+    const deps = { approvedTools, approvedGuardKeys, callCounts, ask, signal };
     for (let step = 0; step < config.maxSteps && !answered && !signal?.aborted; step++) {
       try {
         messages = await compactIfNeeded(messages, signal);
@@ -3469,6 +3477,7 @@ ${instr.trusted}`;
   }
   let messages = [{ role: "system", content: systemContent }];
   const approvedTools = /* @__PURE__ */ new Set();
+  const approvedGuardKeys = /* @__PURE__ */ new Set();
   for (const t of settings.alwaysAllow) approvedTools.add(t);
   for (const t of projectApprovals) approvedTools.add(t);
   let saved = false;
@@ -3641,7 +3650,7 @@ ${instr.trusted}`;
     }) : () => {
     };
     try {
-      messages = await runTurn(messages, userInput, ask, approvedTools, activeTurn.signal, steering);
+      messages = await runTurn(messages, userInput, ask, approvedTools, approvedGuardKeys, activeTurn.signal, steering);
     } finally {
       restoreKeys();
       setSteeringActive(false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "beecork",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "beecork — a from-scratch CLI coding agent: multi-model (OpenRouter), BYOK, path-confined tools, built part by part.",
   "type": "module",
   "bin": {