beecork 2.8.2 → 2.8.3

package/dist/index.js

@@ -60,6 +60,13 @@ function normalizeEffort(raw) {
   const v = (raw ?? "").trim().toLowerCase();
   return EFFORTS.includes(v) ? v : void 0;
 }
+function normalizeProviderSort(raw) {
+  if (raw == null) return "latency";
+  const v = raw.trim().toLowerCase();
+  if (v === "latency" || v === "price" || v === "throughput") return v;
+  if (["", "off", "none", "default", "0", "false", "no"].includes(v)) return "";
+  return "latency";
+}
 function parseExtra(raw) {
   if (!raw || !raw.trim()) return {};
   try {
@@ -95,6 +102,10 @@ var config = {
   // transient API failures
   apiTimeoutMs: num("API_TIMEOUT_MS", 18e4),
   // per-attempt model-call timeout (generous for reasoning models)
+  // Run a batch's independent, read-only tool calls (read_file/search/list_dir/web_fetch/…) CONCURRENTLY
+  // instead of one-at-a-time — the model is told to batch independent calls, so this cashes in the win
+  // (N web_fetches take ~1× instead of N×). Mutating/approval/interactive tools always stay serial.
+  parallelTools: !["0", "false", "off", "no"].includes((process.env.PARALLEL_TOOLS ?? "").trim().toLowerCase()),
   // Tool operational limits
   execTimeoutMs: num("EXEC_TIMEOUT_MS", 3e4),
   // run_bash command timeout
@@ -115,6 +126,11 @@ var config = {
   // startup default; changed live via /effort
   openRouterExtra: parseExtra(process.env.OPENROUTER_EXTRA),
   // advanced: extra request-body params (sampling, provider routing, …)
+  // Provider routing (overridable by a `provider` block in OPENROUTER_EXTRA). The same model is served
+  // by many OpenRouter backends with very different time-to-first-token; "latency" (the default) routes
+  // to the fastest-responding one so replies start streaming right away instead of stalling on a slow
+  // provider. Set OPENROUTER_PROVIDER_SORT=off to fall back to OpenRouter's default load-balanced routing.
+  providerSort: normalizeProviderSort(process.env.OPENROUTER_PROVIDER_SORT),
   // Background tasks (run_bash background:true → check_task / stop_task)
   maxBackgroundTasks: num("MAX_BG_TASKS", 5),
   // per-session cap on concurrent background commands
@@ -1072,6 +1088,9 @@ function loadCatalog() {
   }).catch(() => {
   });
 }
+function primeCatalog() {
+  loadCatalog();
+}
 var baseId = (slug) => slug.split(":")[0];
 function shouldSendReasoning(model) {
   loadCatalog();
@@ -2815,7 +2834,7 @@ function parseSSELine(line) {
   return out3;
 }
 function buildRequestBody(opts) {
-  const { model, messages, includeTools, effort, reasoningSupported, extra, tools } = opts;
+  const { model, messages, includeTools, effort, reasoningSupported, extra, tools, providerSort } = opts;
   const body = { ...extra };
   body.model = model;
   body.messages = messages;
@@ -2824,6 +2843,7 @@ function buildRequestBody(opts) {
   if (reasoningSupported && !("reasoning" in extra)) {
     body.reasoning = effort === "off" ? { enabled: false } : { effort };
   }
+  if (providerSort && !("provider" in extra)) body.provider = { sort: providerSort };
   return body;
 }
 function pruneReasoningForSend(messages) {
@@ -2849,7 +2869,8 @@ async function callModel(messages, includeTools = true, signal, opts) {
     effort: state.reasoningEffort,
     reasoningSupported: shouldSendReasoning(state.model),
     extra: config.openRouterExtra,
-    tools: opts?.tools
+    tools: opts?.tools,
+    providerSort: config.providerSort
   });
   const tries = config.retryAttempts;
   for (let attempt = 1; attempt <= tries; attempt++) {
@@ -3428,7 +3449,69 @@ async function handleAskUser(args) {
   if (choice) console.log(color.green(`  \u2192 ${stripControl(choice.label)}`) + "\n");
   return askUserMessage(question, choice, true);
 }
-async function handleToolCall(call, messages, step, deps) {
+var PARALLEL_SAFE = /* @__PURE__ */ new Set([
+  "read_file",
+  "search",
+  "list_dir",
+  "read_skill",
+  "web_fetch",
+  "web_search",
+  "read_dev_signals",
+  "check_task"
+]);
+function lastMutationIndex(calls) {
+  return calls.reduce((acc, c, i) => c.function.name === "write_file" || c.function.name === "edit_file" ? i : acc, -1);
+}
+function isParallelSafe(call, deps) {
+  if (!config.parallelTools) return false;
+  if (!PARALLEL_SAFE.has(call.function.name)) return false;
+  const tool = toolsByName.get(call.function.name);
+  if (!tool) return false;
+  let args;
+  try {
+    args = JSON.parse(call.function.arguments);
+  } catch {
+    return false;
+  }
+  const decision = decideApproval(tool, args, {
+    mode: state.mode,
+    autoApprove: config.autoApprove,
+    approvedTools: deps.approvedTools,
+    approvedGuardKeys: deps.approvedGuardKeys,
+    toolName: call.function.name,
+    dangerouslySkip: config.dangerouslySkipPermissions
+  });
+  return decision.action === "run";
+}
+async function runReadOnlyBatch(block, messages, step, deps) {
+  const { callCounts, signal } = deps;
+  const parts = await Promise.all(block.map(async (call) => {
+    const sig = `${call.function.name}:${call.function.arguments}`;
+    const seen = (callCounts.get(sig) ?? 0) + 1;
+    callCounts.set(sig, seen);
+    if (seen >= config.loopRepeatLimit) {
+      return { call, out: color.yellow(`   \u21B3 skipped \u2014 repeated identical call ${seen}\xD7`), content: "You have already called this exact tool with these exact arguments several times; it is not making progress. Stop repeating it \u2014 try a different approach or give your final answer." };
+    }
+    let callArgs = {};
+    try {
+      callArgs = JSON.parse(call.function.arguments);
+    } catch {
+    }
+    if (config.traceFile) trace.push({ tool: call.function.name, args: call.function.arguments, step });
+    let result = await runTool(call, signal);
+    const summary = summarizeResult(call.function.name, callArgs, result);
+    if (result.length > config.maxToolResultChars) {
+      result = result.slice(0, config.maxToolResultChars) + `
+\u2026[truncated ${result.length - config.maxToolResultChars} chars]`;
+    }
+    return { call, out: "  " + renderToolCall(call.function.name, callArgs) + summary, content: result };
+  }));
+  for (const p of parts) {
+    process.stdout.write(p.out + "\n");
+    messages.push({ role: "tool", tool_call_id: p.call.id, content: p.content });
+  }
+}
+async function handleToolCall(call, messages, step, deps, verifyThisCall = true) {
   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}`;
@@ -3503,7 +3586,7 @@ async function handleToolCall(call, messages, step, deps) {
   }
   const summary = summarizeResult(call.function.name, callArgs, result);
   let verifyOut = "";
-  if (config.verifyCommand && (call.function.name === "write_file" || call.function.name === "edit_file")) {
+  if (verifyThisCall && config.verifyCommand && (call.function.name === "write_file" || call.function.name === "edit_file")) {
     verifyOut = await runVerify(signal);
     result += `
 
@@ -3560,9 +3643,21 @@ async function runTurn(messages, userInput, ask, approvedTools, approvedGuardKey
         break;
       }
       if (message.tool_calls && message.tool_calls.length > 0) {
-        for (const call of message.tool_calls) {
-          if (signal?.aborted) break;
-          await handleToolCall(call, messages, step, deps);
+        const calls = message.tool_calls;
+        const lastMutationIdx = lastMutationIndex(calls);
+        let i = 0;
+        while (i < calls.length && !signal?.aborted) {
+          if (isParallelSafe(calls[i], deps)) {
+            let j = i + 1;
+            while (j < calls.length && isParallelSafe(calls[j], deps)) j++;
+            if (j - i > 1) {
+              await runReadOnlyBatch(calls.slice(i, j), messages, step, deps);
+              i = j;
+              continue;
+            }
+          }
+          await handleToolCall(calls[i], messages, step, deps, i === lastMutationIdx);
+          i++;
         }
       } else {
         answered = !steering2?.length;
@@ -4414,6 +4509,7 @@ ${instr.trusted}`;
     process.exit(1);
   }
   state.apiKey = apiKey;
+  primeCatalog();
   const ask = tty ? (q) => readChoice(q) : (q) => rl.question(q);
   let activeTurn = null;
   let userTurns = 0;

package/package.json

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