@corenel/cli 0.4.7 → 0.4.9

package/dist/main.js

@@ -13488,7 +13488,7 @@ var require_filters = __commonJS({
     function striptags(input, preserveLinebreaks) {
       input = normalize(input, "");
       var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>|<!--[\s\S]*?-->/gi;
-      var trimmedInput = trim(input.replace(tags, ""));
+      var trimmedInput = trim2(input.replace(tags, ""));
       var res = "";
       if (preserveLinebreaks) {
         res = trimmedInput.replace(/^ +| +$/gm, "").replace(/ +/g, " ").replace(/(\r\n)/g, "\n").replace(/\n\n\n+/g, "\n\n");
@@ -13506,10 +13506,10 @@ var require_filters = __commonJS({
       return r.copySafeness(str, words.join(" "));
     }
     _exports.title = title;
-    function trim(str) {
+    function trim2(str) {
       return r.copySafeness(str, str.replace(/^\s*|\s*$/g, ""));
     }
-    _exports.trim = trim;
+    _exports.trim = trim2;
     function truncate2(input, length, killwords, end) {
       var orig = input;
       input = normalize(input, "");
@@ -22722,6 +22722,26 @@ function selfDirectionBlock(def) {
   return readConfigSyncRendered(SELF_DIRECTION_BLOCK, { consequence });
 }
 
+// ../crew/triggerMatch.ts
+var RUN_STATUS_VALUES = ["ok", "aborted", "budget", "stalled", "policy", "stuck", "max_turns", "error"];
+var RUN_STATUS_ALIASES = [
+  ["stop", "ok"],
+  ["tool_calls", "ok"],
+  ["function_call", "ok"],
+  ["end_turn", "ok"],
+  ["stop_sequence", "ok"],
+  ["tool_use", "ok"],
+  ["length", "stuck"],
+  ["max_tokens", "stuck"],
+  ["refusal", "policy"],
+  ["content_filter", "policy"],
+  ["interrupted", "aborted"]
+];
+var RUN_STATUS_BY_RAW = new Map([
+  ...RUN_STATUS_VALUES.map((v) => [v, v]),
+  ...RUN_STATUS_ALIASES
+]);
+
 // ../crew/memory.ts
 import { makeFactStore } from "@corenel/harness/memory/store";
 function agentMemoryRoot(crewRoot, agentName) {
@@ -23081,6 +23101,12 @@ function helpText(version2) {
     "  --allow-mutations  allow write/shell/other mutating tools (run/run-agent refuse them",
     "                     outright without this; interactively it skips the per-command",
     "                     prompt instead). --allow-shell still works as an alias.",
+    "  --max-usd <n>      stop `corenel run` once it has spent this much. Needs a model the",
+    "                     catalog prices -- refused up front rather than metering $0 and",
+    "                     never firing",
+    "  --max-tokens <n>   stop `corenel run` after this many tokens",
+    "  --max-ms <n>       stop `corenel run` after this long",
+    "  --on-budget <what> what a passed ceiling does: stop (the default) or warn",
     "  --no-tui           plain line-by-line mode (automatic when output is piped)",
     "  --tui              force the full terminal face, and fail if it cannot start",
     "  --resume [id]      reopen the last conversation, or the one named",
@@ -23103,6 +23129,9 @@ function helpText(version2) {
     "     unresolvable --policy, or an unknown command",
     "  3  the policy asked to park an unattended action, but a one-shot run",
     "     has no one to park it with -- refused before the turn started",
+    "  4  a --max-usd/--max-tokens/--max-ms ceiling stopped the run. Distinct from",
+    '     1 so the script that set the cap can tell "I capped this" apart from',
+    '     "the run broke"',
     ""
   ].join("\n");
 }
@@ -23953,6 +23982,104 @@ function currentFaceEnv(argv) {
   };
 }
 
+// src/budgetFlags.ts
+var BudgetFlagError = class extends Error {
+  constructor(flagName, detail) {
+    super(`${flagName} ${detail}`);
+    this.flagName = flagName;
+    this.name = "BudgetFlagError";
+  }
+};
+var CEILINGS = [
+  { name: "max-usd", key: "maxUsd", unit: "an amount in dollars, e.g. --max-usd 2.50" },
+  { name: "max-tokens", key: "maxTokens", unit: "a token count, e.g. --max-tokens 100000" },
+  { name: "max-ms", key: "maxMs", unit: "a duration in milliseconds, e.g. --max-ms 600000" }
+];
+function ceiling(argv, name, unit) {
+  if (!hasValueFlag(argv, name)) return void 0;
+  const raw = flag(argv, name, "");
+  const n = Number(raw);
+  if (!Number.isFinite(n)) throw new BudgetFlagError(`--${name}`, `needs ${unit} -- got "${raw}"`);
+  if (n <= 0) throw new BudgetFlagError(`--${name}`, `must be greater than zero -- got "${raw}"`);
+  return n;
+}
+var ACTIONS = ["stop", "warn"];
+function breachAction(argv) {
+  if (!hasValueFlag(argv, "on-budget")) return void 0;
+  const raw = flag(argv, "on-budget", "");
+  if (raw === "ask") {
+    throw new BudgetFlagError("--on-budget", 'cannot be "ask": a one-shot run has nobody to ask. Use stop or warn.');
+  }
+  if (raw === "degrade") {
+    throw new BudgetFlagError("--on-budget", 'cannot be "degrade": `run` has no cheaper-model picker. Use stop or warn.');
+  }
+  if (!ACTIONS.includes(raw)) {
+    throw new BudgetFlagError("--on-budget", `must be stop or warn -- got "${raw}"`);
+  }
+  return raw;
+}
+function budgetConstraintsFrom(argv) {
+  const limits = {};
+  for (const c of CEILINGS) {
+    const v = ceiling(argv, c.name, c.unit);
+    if (v !== void 0) limits[c.key] = v;
+  }
+  const action = breachAction(argv);
+  const hasLimit = Object.keys(limits).length > 0;
+  if (!hasLimit) {
+    if (action !== void 0) {
+      throw new BudgetFlagError("--on-budget", "needs a budget to act on -- add --max-usd, --max-tokens or --max-ms.");
+    }
+    return void 0;
+  }
+  return { ...limits, onBreach: action ?? "stop" };
+}
+
+// src/runBudget.ts
+import { BudgetMeter as BudgetMeter2 } from "@corenel/harness/core/budget";
+import { priceUsageWith, pricedForUsd } from "@corenel/harness/core/pricing";
+var UnpriceableBudgetError = class extends Error {
+  constructor(model) {
+    super(`--max-usd cannot be enforced: no price is known for model "${model}", so spend would always read $0. Use --max-tokens or --max-ms instead, or run a model the catalog prices.`);
+    this.model = model;
+    this.name = "UnpriceableBudgetError";
+  }
+};
+function makeRunBudget(deps) {
+  const { constraints, rates, model, onStop, onWarn } = deps;
+  if (constraints.maxUsd != null && !pricedForUsd(rates)) throw new UnpriceableBudgetError(model);
+  const meter = new BudgetMeter2(constraints, deps.now ?? (() => Date.now()));
+  let fired = false;
+  return {
+    onUsage(usage) {
+      if (fired) return;
+      meter.add({
+        inTok: usage.promptTokens,
+        outTok: usage.completionTokens,
+        // `?? 0` is safe ONLY because an unenforceable usd cap was refused
+        // above: with no maxUsd, cost is irrelevant to every other ceiling.
+        cost: priceUsageWith(usage, rates) ?? 0
+      });
+      const breach = meter.breach();
+      if (!breach) return;
+      fired = true;
+      const message = describeBreach(breach);
+      if (constraints.onBreach === "warn") onWarn(message);
+      else onStop(message);
+    }
+  };
+}
+function describeBreach(b) {
+  return `budget ${b.kind} ${trim(b.spent)} > ${trim(b.limit)}`;
+}
+function trim(v) {
+  if (Number.isInteger(v)) return String(v);
+  return v.toFixed(4).replace(/0+$/, "").replace(/\.$/, "");
+}
+
+// src/cli.ts
+import { hydratePrices } from "@corenel/harness/core/pricing";
+
 // src/runOutcome.ts
 function isFailedTurn(outcome) {
   if (outcome.text !== "") return false;
@@ -24130,6 +24257,7 @@ async function resolvePolicy(opts) {
 
 // src/cli.ts
 var EXIT_POLICY_PARK_REFUSED = 3;
+var EXIT_BUDGET_EXCEEDED = 4;
 async function agentSetup(argv) {
   setGatewayBase2(await apiBase(flag(argv, "base", "")));
   const token = await nodeAuthToken().getToken();
@@ -24182,12 +24310,13 @@ async function agentSetup(argv) {
 async function run(argv) {
   const prompt = promptOf(argv);
   if (!prompt) {
-    process.stderr.write('usage: corenel run "<prompt>" [--model M] [--base URL] [--session ID] [--allow-mutations]\n');
+    process.stderr.write('usage: corenel run "<prompt>" [--model M] [--base URL] [--session ID] [--allow-mutations]\n                  [--max-usd N] [--max-tokens N] [--max-ms N] [--on-budget stop|warn]\n');
     process.exit(2);
   }
+  const budget = budgetConstraintsFrom(argv);
   const session = flag(argv, "session", "");
   if (session) {
-    if (hasAllowMutationsFlag(argv) || hasValueFlag(argv, "model") || hasValueFlag(argv, "base")) {
+    if (hasAllowMutationsFlag(argv) || hasValueFlag(argv, "model") || hasValueFlag(argv, "base") || budget) {
       process.stderr.write("corenel: note: --session ignores every other flag on this line -- the sandboxed run uses its own defaults.\n");
     }
     const ext = findExtension("sessions");
@@ -24202,6 +24331,26 @@ async function run(argv) {
   }
   async function runOnce() {
     const ac = new AbortController();
+    let budgetStopped = false;
+    let meter = null;
+    if (budget) {
+      const rates = budget.maxUsd != null ? (await hydratePrices(await apiBase(flag(argv, "base", "")), nodeAuthToken().getToken)).get(model) ?? null : null;
+      meter = makeRunBudget({
+        constraints: budget,
+        rates,
+        model,
+        onStop: (m) => {
+          budgetStopped = true;
+          process.stderr.write(`corenel: ${m} -- stopping the run.
+`);
+          ac.abort();
+        },
+        onWarn: (m) => {
+          process.stderr.write(`corenel: ${m} -- continuing, because --on-budget is warn.
+`);
+        }
+      });
+    }
     const allowMutations = hasAllowMutationsFlag(argv);
     const unattended = policy.unattended ?? "deny";
     const unattendedReasons = [];
@@ -24240,10 +24389,17 @@ async function run(argv) {
         spawn: { tools, client, defaultModel: model, permission }
       }),
       signal: ac.signal,
+      // The meter is fed from the SAME event stream, one `usage` per model call.
       onEvent: (e) => {
         if (e.type === "error") lastError = e.message;
+        else if (e.type === "usage") meter?.onUsage(e.usage);
       }
     });
+    if (budgetStopped) {
+      process.stderr.write("corenel: the run stopped at its budget.\n");
+      process.exitCode = EXIT_BUDGET_EXCEEDED;
+      return;
+    }
     if (isFailedTurn({ stopReason: result.stopReason, text: result.text, errorEmitted: lastError !== "" })) {
       process.stderr.write(`corenel: ${friendlyError(lastError || `the run ended without an answer (${result.stopReason})`)}
 `);
@@ -24263,6 +24419,12 @@ async function interactive(argv) {
   async function runInteractive() {
     const approveAll = hasAllowMutationsFlag(argv);
     const cwd = process.cwd();
+    let modelRates = null;
+    const priceBase = await apiBase(flag(argv, "base", ""));
+    void hydratePrices(priceBase, nodeAuthToken().getToken).then((table) => {
+      modelRates = table.get(model) ?? null;
+    }).catch(() => {
+    });
     const files = new NodeFileService(cwd);
     const persistence = createSessionPersistence(files);
     const toolDefs = tools.map((t) => ({ name: t.name, description: t.description }));
@@ -24296,6 +24458,7 @@ async function interactive(argv) {
         process.exitCode = await runTui({
           cwd,
           model,
+          rates: () => modelRates,
           system: systemSource,
           client,
           tools,
@@ -24330,6 +24493,7 @@ async function interactive(argv) {
     process.exitCode = await runRepl({
       client,
       model,
+      rates: () => modelRates,
       system: systemSource,
       tools,
       // The readline face attaches its own PermissionService too (repl.ts) and
@@ -24452,6 +24616,20 @@ Logged in. Token saved to ${authTokenPath()}
       process.exitCode = 2;
       return;
     }
+    if (e instanceof BudgetFlagError) {
+      process.stderr.write(`corenel: ${e.message}
+
+`);
+      process.stderr.write(helpText(version()));
+      process.exitCode = 2;
+      return;
+    }
+    if (e instanceof UnpriceableBudgetError) {
+      process.stderr.write(`corenel: ${e.message}
+`);
+      process.exitCode = 2;
+      return;
+    }
     if (e instanceof InvalidApiBaseError) {
       process.stderr.write(`corenel: ${e.message}
 `);
@@ -24483,5 +24661,6 @@ main().catch((e) => {
   bail.unref();
 });
 export {
+  EXIT_BUDGET_EXCEEDED,
   EXIT_POLICY_PARK_REFUSED
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corenel/cli",
-  "version": "0.4.7",
+  "version": "0.4.9",
   "type": "module",
   "description": "Corenel CLI — runs the harness in node, in-proc, no transport. The headless proof the kernel is host-agnostic. (corenel run/ask/chat/login + start --sidecar to follow.)",
   "bin": {
@@ -9,9 +9,9 @@
   "dependencies": {
     "openai": "^4.77.0",
     "ws": "^8.18.0",
-    "@corenel/harness": "0.7.2",
-    "@corenel/protocol": "0.7.1",
-    "@corenel/term": "0.2.6"
+    "@corenel/term": "0.2.8",
+    "@corenel/protocol": "0.7.3",
+    "@corenel/harness": "0.7.4"
   },
   "devDependencies": {
     "esbuild": "^0.21.5",
@@ -20,7 +20,7 @@
     "tsx": "^4.19.2",
     "typescript": "^5.9.3",
     "@corenel/crew": "0.0.0",
-    "@corenel/tools-node": "0.3.4"
+    "@corenel/tools-node": "0.3.6"
   },
   "publishConfig": {
     "access": "public"