cortad 0.4.0 → 0.4.1

package/lib/replay.mjs

@@ -152,7 +152,7 @@ export function makeCapture({ work, keepSecret, onProof = () => {}, writes = nul
     // What your app spent on its model providers since it started, as the hook saw each call. Null
     // when no hook is in your app (an app this command did not start): absent, never zero. With a
     // `turn`, the calls pinned to that turn also say what their model was told.
-    usage: (turn) => { poll(); return alive ? meter.report(TURN.test(turn ?? "") ? turn : undefined) : null; },
+    usage: (turn, totalsOnly = false) => { poll(); return alive ? meter.report(TURN.test(turn ?? "") ? turn : undefined, totalsOnly) : null; },
     // The app's routes as its framework holds them: the table of the process on `port`, else the
     // newest any hooked process wrote. Empty when no hook read one.
     registry: (port) => { poll(); return tables.get(port) ?? newestTable ?? {}; },
@@ -339,14 +339,36 @@ const toldOf = (call) => {
 // The model's words behind a call, and the lines of the app that wrote the reply of the request it
 // was made in, go out with the rows pinned to the turn asked about, as what the model was told does.
 const MODEL_WORDS = 4000, SITES_KEPT = 500;
+function tally(totals, call, count) {
+  const host = call.host.slice(0, 253);
+  const model = String(call.model ?? "").slice(0, 160);
+  const answered = typeof call.answered === "string" && call.answered ? call.answered.slice(0, 160) : undefined;
+  const key = `${host}|${model}`;
+  const t = totals.get(key) ?? { host, model, calls: 0, promptTokens: 0, cachedTokens: 0, completionTokens: 0, unmetered: 0, answered, mixed: false };
+  t.calls += 1;
+  // The model that answered for this one, when every call of it was answered by one other model.
+  if (t.answered !== answered) t.mixed = true;
+  t.promptTokens += count(call.promptTokens);
+  t.cachedTokens += count(call.cachedTokens);
+  t.completionTokens += count(call.completionTokens);
+  // An answered call the provider sent no counts for: it was spent, and what it cost is not known.
+  const status = count(call.status);
+  if (call.usage !== true && status > 0 && status < 400) t.unmetered += 1;
+  totals.set(key, t);
+}
+
 const meter = (() => {
   const rows = [];
   const deps = [];
+  // What the app has spent since it started, per host and model, kept as it goes: the rows are
+  // trimmed to the newest ROWS, and totals summed from them lost every call before those.
+  const totals = new Map();
   const sitesOfEx = new Map();
   const count = (v) => (Number.isInteger(v) && v > 0 ? v : 0);
   return {
     add(call) {
       if (!call || typeof call.host !== "string" || !call.host) return;
+      tally(totals, call, count);
       rows.push({
         at: count(call.at), ms: count(call.ms), host: call.host.slice(0, 253), model: String(call.model ?? "").slice(0, 160), ...(typeof call.answered === "string" && call.answered ? { answered: call.answered.slice(0, 160) } : {}), status: count(call.status),
         promptTokens: count(call.promptTokens), cachedTokens: count(call.cachedTokens), completionTokens: count(call.completionTokens),
@@ -373,24 +395,15 @@ const meter = (() => {
     },
     // `turn`: the rows pinned to it carry what their model was told. The instructions go out with the
     // reply they are read with, never with every call of the run at every turn.
-    report(turn) {
-      const totals = new Map();
-      for (const r of rows) {
-        const key = `${r.host}|${r.model}`;
-        const t = totals.get(key) ?? { host: r.host, model: r.model, calls: 0, promptTokens: 0, cachedTokens: 0, completionTokens: 0, unmetered: 0, answered: r.answered };
-        t.calls += 1;
-        // The model that answered for this one, when every call of it was answered by one other model.
-        if (t.answered !== r.answered) t.answered = undefined;
-        t.promptTokens += r.promptTokens;
-        t.cachedTokens += r.cachedTokens;
-        t.completionTokens += r.completionTokens;
-        // An answered call the provider sent no counts for: it was spent, and what it cost is not known.
-        if (!r.usage && r.status > 0 && r.status < 400) t.unmetered += 1;
-        totals.set(key, t);
-      }
+    // `totalsOnly`: the spend alone, for the meter read while a run plays and at its end. The rows
+    // carry what each call was handed, and on ulaim's run the whole report was 2.9 MB, past what the
+    // server takes, so the bill never arrived.
+    report(turn, totalsOnly = false) {
+      const spent = [...totals.values()].sort((a, b) => b.calls - a.calls).map(({ answered, mixed, ...t }) => (answered && !mixed ? { ...t, answered } : t));
+      if (totalsOnly) return { totals: spent };
       return {
-        totals: [...totals.values()].sort((a, b) => b.calls - a.calls).map(({ answered, ...t }) => (answered ? { ...t, answered } : t)),
-        rows: rows.slice(-REPORTED).reverse().map(({ at, ms, host, model, status, turn: pinned, rules, tools, called, passages, caller, ex, told, said }) => ({ at, ms, host, model, status, ...(pinned ? { turn: pinned } : {}), ...(rules ? { rules } : {}), ...(tools ? { tools } : {}), ...(called ? { called } : {}), ...(passages ? { passages } : {}), ...(caller ? { caller } : {}),
+        totals: spent,
+        rows: rows.slice(-REPORTED).reverse().map(({ at, ms, host, model, status, turn: pinned, rules, tools, called, passages, caller, ex, told, said }) => ({ at, ms, host, model, status, ...(pinned ? { turn: pinned } : {}), ...(rules ? { rules } : {}), ...(tools ? { tools } : {}), ...(called ? { called } : {}), ...(passages && turn !== undefined && pinned === turn ? { passages } : {}), ...(caller ? { caller } : {}),
           ...(turn !== undefined && pinned === turn ? { ...told, ...(said !== undefined ? { said } : {}), ...(sitesOfEx.get(ex)?.length ? { sites: sitesOfEx.get(ex) } : {}) } : {}) })),
         deps: deps.slice(-REPORTED).reverse(),
       };

package/lib/start.mjs

@@ -125,10 +125,11 @@ const KNOWN = ["package.json", "pyproject.toml", "requirements.txt", "manage.py"
 // from its environment whatever folder it runs in; a container, a Go or Java binary does not, and is
 // watched from outside (lib/proxy.mjs). Judged by the command when there is one, else by the folder.
 const HOOKED = /^(?:python3?(?:\.\d+)?|node|nodemon|tsx|ts-node|bun|bunx|deno|npm|npx|pnpm|yarn|uvicorn|gunicorn|hypercorn|flask|fastapi|poetry|uv|pipenv)$/;
-// The program a command runs, past any PORT=3000 in front of it and the quotes or folder around it.
+// The program a command runs, past any PORT=3000 in front of it, an `env` or `exec` that only sets
+// those, and the quotes or folder around it.
 const runtimeOf = (cmd) => {
-  const words = cmd.trim().split(/\s+/).filter((w) => !/^[A-Za-z_][A-Za-z0-9_]*=/.test(w));
-  return (words[0] ?? "").replace(/^["']|["']$/g, "").split("/").pop() ?? "";
+  const words = cmd.trim().split(/\s+/).filter((w) => !/^[A-Za-z_][A-Za-z0-9_]*=/.test(w)).map((w) => w.replace(/^["']|["']$/g, "").split("/").pop() ?? "");
+  return words.find((w) => w !== "env" && w !== "exec" && !w.startsWith("-")) ?? "";
 };
 export const hookable = (dir, cmd = "") => (cmd ? HOOKED.test(runtimeOf(cmd)) : KNOWN.some((f) => existsSync(join(dir, f))));
 

package/local.mjs

@@ -572,7 +572,7 @@ async function verb(job) {
     // calls of the `turn` asked about also say what their model was told.
     // `toolsRecorded: false`: the app was started before the read's list of tools, so a tool that ran
     // was not seen; a run says "not recorded", never that none ran.
-    case "usage": return capture ? { ...JSON.parse(mask(JSON.stringify(capture.usage(b.turn) ?? {}))), ...(launched && toolsKnown() ? { toolsRecorded: toolsRecorded() } : {}) } : {};
+    case "usage": return capture ? { ...JSON.parse(mask(JSON.stringify(capture.usage(b.turn, b.totals === true) ?? {}))), ...(launched && toolsKnown() ? { toolsRecorded: toolsRecorded() } : {}) } : {};
     // Every route your app holds, read by the hook off the app itself, masked like the meter.
     case "routes": return capture ? JSON.parse(mask(JSON.stringify(capture.registry(app?.port)))) : {};
     // A world is ended from this terminal, never from the cloud.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cortad",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Connects the AI app on your machine to Cortad for test conversations, and gives your coding agent the MCP and skill to run them. No dependencies.",
   "bin": {
     "cortad": "local.mjs"