@kernelonpanic/kitcode 1.3.1 → 1.3.2

package/dist/index.js

@@ -62,8 +62,7 @@ var themeSchema = z.object({
 var langSchema = z.enum(["en", "ru"]);
 var budgetSchema = z.object({
   maxTokensPerTurn: z.number().int().min(0).max(1e7).default(1e7),
-  maxCostUsdPerTurn: z.number().nonnegative().max(1e3).default(0),
-  maxSubagentsPerTurn: z.number().int().min(0).max(16).default(3)
+  maxCostUsdPerTurn: z.number().nonnegative().max(1e3).default(0)
 });
 var diagnosticsSchema = z.object({
   autoRun: z.boolean().default(true),
@@ -79,8 +78,7 @@ var configSchema = z.object({
   maxTokens: z.number().int().positive().max(2e5).default(64e3),
   budget: budgetSchema.default({
     maxTokensPerTurn: 1e7,
-    maxCostUsdPerTurn: 0,
-    maxSubagentsPerTurn: 3
+    maxCostUsdPerTurn: 0
   }),
   diagnostics: diagnosticsSchema.default({ autoRun: true, commands: [] }),
   providers: z.record(providerIdSchema, providerConfigSchema).default({}),
@@ -1814,8 +1812,23 @@ var MAX_PAUSE_RESUMES = 5;
 var MAX_RETRIES2 = 3;
 var INITIAL_BACKOFF_MS = 1e3;
 var MAX_TURN_STEPS = 64;
-var MAX_TOOL_CALLS_PER_STEP = 32;
+function createExecutionLane() {
+  let tail2 = Promise.resolve();
+  return {
+    run(operation) {
+      const result = tail2.then(operation);
+      tail2 = result.then(() => void 0, () => void 0);
+      return result;
+    }
+  };
+}
 async function runTurn(cfg, history, hooks, signal) {
+  const permissionLane = cfg.permissionLane ?? createExecutionLane();
+  const originalHooks = hooks;
+  hooks = {
+    ...hooks,
+    requestPermission: (request) => permissionLane.run(async () => signal.aborted ? "deny" : originalHooks.requestPermission(request))
+  };
   let messages = [...history];
   let pauses = 0;
   let steps = 0;
@@ -1833,40 +1846,35 @@ async function runTurn(cfg, history, hooks, signal) {
       hooks.onEvent({ type: "turn_end", stopReason: "max_tokens" });
       return messages;
     }
-    const budgetDecision = cfg.budget?.beforeRequest({
-      modelRef: cfg.modelRef,
-      maxOutputTokens: cfg.maxTokens,
-      estimatedInputTokens: estimateRequestTokens(cfg, messages)
-    });
-    if (budgetDecision && !budgetDecision.allowed) {
-      hooks.onEvent({ type: "notice", level: "warn", text: budgetDecision.reason });
-      hooks.onEvent({ type: "turn_end", stopReason: "max_tokens" });
-      return messages;
-    }
-    hooks.onEvent({ type: "turn_start" });
-    const outcome = await consumeStream(
-      cfg,
-      messages,
-      hooks,
-      signal,
-      budgetDecision?.maxOutputTokens ?? cfg.maxTokens
-    );
+    const request = async () => {
+      if (signal.aborted) return { content: [], stopReason: "aborted" };
+      const budgetDecision = cfg.budget?.beforeRequest({
+        modelRef: cfg.modelRef,
+        maxOutputTokens: cfg.maxTokens,
+        estimatedInputTokens: estimateRequestTokens(cfg, messages)
+      });
+      if (budgetDecision && !budgetDecision.allowed) {
+        hooks.onEvent({ type: "notice", level: "warn", text: budgetDecision.reason });
+        hooks.onEvent({ type: "turn_end", stopReason: "max_tokens" });
+        return null;
+      }
+      hooks.onEvent({ type: "turn_start" });
+      return consumeStream(
+        cfg,
+        messages,
+        hooks,
+        signal,
+        budgetDecision?.maxOutputTokens ?? cfg.maxTokens
+      );
+    };
+    const outcome = await (cfg.modelRequestLane?.run(request) ?? request());
+    if (!outcome) return messages;
     messages.push({ role: "assistant", content: outcome.content });
     if (outcome.stopReason === "aborted") {
       hooks.onEvent({ type: "turn_end", stopReason: "aborted" });
       return sanitizeHistory(messages);
     }
     if (outcome.stopReason === "tool_use") {
-      const callCount = outcome.content.filter((block) => block.type === "tool_use").length;
-      if (callCount > MAX_TOOL_CALLS_PER_STEP) {
-        hooks.onEvent({
-          type: "notice",
-          level: "warn",
-          text: `The model returned ${callCount} tool calls at once; the limit is ${MAX_TOOL_CALLS_PER_STEP}. None were run. Ask it to split the work into smaller batches.`
-        });
-        hooks.onEvent({ type: "turn_end", stopReason: "max_tokens" });
-        return sanitizeHistory(messages);
-      }
       const results = await runToolCalls(cfg, outcome.content, hooks, signal);
       if (results.length > 0) messages.push({ role: "user", content: results });
       if (signal.aborted) {
@@ -2054,10 +2062,32 @@ function estimateRequestTokens(cfg, messages) {
 async function runToolCalls(cfg, content, hooks, signal) {
   const calls = content.filter((block) => block.type === "tool_use");
   const results = [];
-  for (const call of calls) results.push(await runOneCall(cfg, call, hooks, signal));
+  const run = (call) => {
+    const operation = () => runOneCall(cfg, call, hooks, signal);
+    return call.name !== "task" && cfg.executionLane ? cfg.executionLane.run(operation) : operation();
+  };
+  for (let index = 0; index < calls.length; ) {
+    const call = calls[index];
+    if (call.name !== "task") {
+      results.push(await run(call));
+      index += 1;
+      continue;
+    }
+    const batch = [];
+    while (calls[index]?.name === "task") {
+      batch.push(run(calls[index]));
+      index += 1;
+    }
+    const settled = await Promise.allSettled(batch);
+    for (const result of settled) {
+      if (result.status === "rejected") throw result.reason;
+      results.push(result.value);
+    }
+  }
   return results;
 }
 async function runOneCall(cfg, call, hooks, signal) {
+  if (signal.aborted) return toolError(call.id, "Interrupted by the user before this tool ran.");
   const tool = cfg.tools.get(call.name);
   if (!tool) {
     return toolError(call.id, `Unknown tool "${call.name}". Use only the tools provided.`);
@@ -2076,26 +2106,31 @@ async function runOneCall(cfg, call, hooks, signal) {
     }) !== "deny"
   };
   const requestedPermission = requestedPermissionFor(tool, call.input, ctx);
-  const gate = cfg.permissions.decide(tool, requestedPermission);
-  if (gate === "deny") {
-    return toolError(
-      call.id,
-      cfg.permissions.denyReason?.(tool, requestedPermission) ?? `Tool "${tool.name}" is disabled by the user's configuration. Do not retry it; find another way or ask.`
-    );
-  }
-  if (gate === "ask") {
-    const decision = await hooks.requestPermission({
-      toolName: tool.name,
-      summary: summary2,
-      input: call.input,
-      display: await previewCall(tool, call.input, ctx),
-      allowAlways: canAlwaysApprove(tool)
-    });
-    if (decision === "deny") {
-      return toolError(call.id, "The user declined this call. Do not retry it; ask how to proceed.");
+  const permission = async () => {
+    const gate = cfg.permissions.decide(tool, requestedPermission);
+    if (gate === "deny") {
+      return toolError(
+        call.id,
+        cfg.permissions.denyReason?.(tool, requestedPermission) ?? `Tool "${tool.name}" is disabled by the user's configuration. Do not retry it; find another way or ask.`
+      );
     }
-    if (decision === "always") cfg.permissions.grantForSession(tool.name);
-  }
+    if (gate === "ask") {
+      const decision = await hooks.requestPermission({
+        toolName: tool.name,
+        summary: summary2,
+        input: call.input,
+        display: await previewCall(tool, call.input, ctx),
+        allowAlways: canAlwaysApprove(tool)
+      });
+      if (decision === "deny") {
+        return toolError(call.id, "The user declined this call. Do not retry it; ask how to proceed.");
+      }
+      if (decision === "always") cfg.permissions.grantForSession(tool.name);
+    }
+    return void 0;
+  };
+  const permissionResult = await permission();
+  if (permissionResult) return permissionResult;
   if (signal.aborted) {
     return toolError(call.id, "Interrupted by the user before this tool ran.");
   }
@@ -2191,6 +2226,7 @@ function createTurnBudget(limits, resolvePricing = pricingFor) {
     costUsd
   });
   return {
+    hasLimits: limits.maxTokensPerTurn > 0 || limits.maxCostUsdPerTurn > 0,
     beforeRequest(request) {
       const current = snapshot();
       if (limits.maxTokensPerTurn > 0 && current.tokens >= limits.maxTokensPerTurn) {
@@ -3667,6 +3703,9 @@ var SUBAGENT_SYSTEM = [
   'Your final message is the return value \u2014 it is the only thing the caller ever sees. End with the answer itself: the findings, the file paths, the conclusion. Never end with "I will now..." or a recap of the steps you took. Carry over every concrete detail the caller needs (paths, names, line numbers) and leave out the narration of how you found them.'
 ].join("\n");
 function createSubagentRunner(makeConfig, tools) {
+  const permissionLane = createExecutionLane();
+  const executionLane = createExecutionLane();
+  const modelRequestLane = createExecutionLane();
   return {
     async run(request) {
       if (request.signal.aborted) return SUBAGENT_CANCELLED;
@@ -3674,6 +3713,9 @@ function createSubagentRunner(makeConfig, tools) {
       const base = makeConfig(SUBAGENT_SYSTEM, tools);
       const cfg = {
         ...base,
+        permissionLane,
+        executionLane,
+        modelRequestLane: base.budget?.hasLimits ? modelRequestLane : void 0,
         provider: {
           id: base.provider.id,
           kind: base.provider.kind,
@@ -3898,7 +3940,7 @@ function clip(value) {
 // package.json
 var package_default = {
   name: "@kernelonpanic/kitcode",
-  version: "1.3.1",
+  version: "1.3.2",
   description: "Terminal coding agent with a config you never have to write by hand",
   type: "module",
   license: "MIT",
@@ -3966,7 +4008,7 @@ var package_default = {
 
 // src/version.ts
 var KITCODE_VERSION = package_default.version;
-var KITCODE_COMMIT = true ? "4320a2bd340f59e42397dd4afbfde0051ddfeb27" : "development";
+var KITCODE_COMMIT = true ? "993d55335487da4915fa49660911ba6e69aa3685" : "development";
 
 // src/mcp/client.ts
 var clientInfo = { name: "kitcode", version: KITCODE_VERSION };
@@ -6309,16 +6351,15 @@ function unknownSkill(name, available) {
 // src/tools/task.ts
 import { randomBytes as randomBytes3 } from "crypto";
 var MAX_PROGRESS_LINES = 10;
-var MAX_SUBAGENTS_PER_TURN = 3;
 var DESCRIPTION = [
   "Hand one self-contained sub-task to a subagent that works in its own fresh context and reports back a single summary.",
   "Use it when the task is genuinely independent and its intermediate output would be long or noisy: a wide search across the repository, reading many files to answer one question, tracing where something is used.",
   "Do not use it for work that is a couple of tool calls, and do not use it when you already have what you need \u2014 call the tools yourself instead.",
   'The subagent shares this filesystem and working directory but has NO memory of this conversation and cannot ask you anything, so "prompt" must stand alone: the goal, the constraints, and exactly what to report back.',
+  "For multiple independent tasks, issue consecutive task calls in the same response so they can run concurrently. Do not delegate overlapping file edits.",
   "It runs to completion and you receive only its final message."
 ].join(" ");
-function createTaskTool(runner, maxSubagents = MAX_SUBAGENTS_PER_TURN) {
-  const spawnsPerTurn = /* @__PURE__ */ new WeakMap();
+function createTaskTool(runner) {
   return {
     name: TASK_TOOL_NAME,
     description: DESCRIPTION,
@@ -6340,14 +6381,6 @@ function createTaskTool(runner, maxSubagents = MAX_SUBAGENTS_PER_TURN) {
       if (instruction === "") {
         return { content: "task needs a prompt: the full instruction for the subagent.", isError: true };
       }
-      const spawned = (spawnsPerTurn.get(ctx.signal) ?? 0) + 1;
-      spawnsPerTurn.set(ctx.signal, spawned);
-      if (spawned > maxSubagents) {
-        return {
-          content: `Already delegated ${maxSubagents} subagents while answering this message, which is the limit. Do the remaining work yourself with the tools you have.`,
-          isError: true
-        };
-      }
       const progress = [];
       const subagentId = `sa${randomBytes3(4).toString("hex")}`;
       const description = field(input, "description") || "subagent";
@@ -6675,7 +6708,7 @@ async function boot(options) {
     }
   };
   tools.register([
-    createTaskTool(wrappedRunner, config.budget.maxSubagentsPerTurn)
+    createTaskTool(wrappedRunner)
   ]);
   let persistQueue = Promise.resolve();
   let configQueue = Promise.resolve();
@@ -8815,9 +8848,6 @@ var PromptInput = memo(function PromptInput2({
       Box8,
       {
         width: "100%",
-        borderStyle: "round",
-        borderColor: disabled ? theme.warn : theme.accent,
-        borderDimColor: disabled,
         paddingX: 1,
         children: [
           /* @__PURE__ */ jsx8(Text8, { color: disabled ? "gray" : theme.accent, children: "\u203A " }),
@@ -9153,9 +9183,9 @@ import { createContext as createContext3, Fragment as Fragment4, useContext as u
 import stringWidth from "string-width";
 import { jsx as jsx11, jsxs as jsxs10 } from "react/jsx-runtime";
 var DimContext = createContext3(false);
-function Text10({ dimColor, ...props }) {
+function Text10({ dimColor, color, ...props }) {
   const dim = useContext3(DimContext);
-  return /* @__PURE__ */ jsx11(InkText, { ...props, dimColor: dimColor ?? dim });
+  return /* @__PURE__ */ jsx11(InkText, { ...props, color: dim ? void 0 : color, dimColor: dimColor ?? dim });
 }
 function Markdown({ children, dim = false }) {
   const blocks = useMemo3(() => extractBlocks(children), [children]);
@@ -10344,7 +10374,6 @@ function App({
       const command = (firstSpace === -1 ? body : body.slice(0, firstSpace)).toLowerCase();
       const rawRest = firstSpace === -1 ? "" : body.slice(firstSpace).trim();
       const rest = rawRest ? rawRest.split(/\s+/) : [];
-      setInput("");
       switch (command) {
         case "help":
           notice(
@@ -11302,7 +11331,9 @@ Rename the file if you want a different name.`);
       const text = raw.trim();
       const submitSlash = () => {
         if (!detachedInput) setInput("");
-        if (busyRef.current || slashPendingRef.current > 0) {
+        const command = text.slice(1).trim().split(/\s+/)[0]?.toLowerCase();
+        const liveCommand = ["help", "usage", "subagents", "config", "exit", "quit"].includes(command ?? "");
+        if (busyRef.current && !liveCommand || slashPendingRef.current > 0) {
           queueRef.current = [...queueRef.current, { kind: "command", line: text }];
           setPendingCount(queueRef.current.length);
           return;