cruo-agent 0.1.7 → 0.1.9

package/dist/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.9

package/dist/cli.js

@@ -45913,6 +45913,36 @@ function isKnownCommandWord(first) {
 function nearestCommands(first) {
   return CRUO_COMMANDS.filter((k) => k[0] === first[0]).slice(0, 3);
 }
+function editDistance(a, b) {
+  const row = Array.from({ length: b.length + 1 }, (_, j) => j);
+  for (let i = 1; i <= a.length; i++) {
+    let diagonal = row[0];
+    row[0] = i;
+    for (let j = 1; j <= b.length; j++) {
+      const above = row[j];
+      row[j] = Math.min(row[j] + 1, row[j - 1] + 1, diagonal + (a[i - 1] === b[j - 1] ? 0 : 1));
+      diagonal = above;
+    }
+  }
+  return row[b.length];
+}
+function unknownFlags(argv2, valued = [...SUPERVISOR_VALUED, ...CLI_VALUED], switches = SUPERVISOR_SWITCHES) {
+  const known = [...valued, ...switches];
+  const found = [];
+  for (let i = 0; i < argv2.length; i++) {
+    const arg = argv2[i];
+    if (!arg.startsWith("-")) continue;
+    const name = arg.replace(/^-+/, "");
+    if (valued.includes(name)) {
+      i++;
+      continue;
+    }
+    if (switches.includes(name)) continue;
+    const ranked = known.map((k) => ({ k, d: editDistance(name.split("=")[0], k) })).sort((x, y) => x.d - y.d)[0];
+    found.push({ flag: arg, nearest: ranked && ranked.d <= 2 ? `--${ranked.k}` : null });
+  }
+  return found;
+}
 function numericIn(argv2, name, spec = {}) {
   const i = argv2.indexOf(`--${name}`);
   if (i < 0) return spec.fallback;
@@ -45947,7 +45977,7 @@ function requiredNumericIn(argv2, name, fallback, spec = {}) {
 function secondsIn(argv2, name, fallbackSeconds) {
   return requiredNumericIn(argv2, name, fallbackSeconds, { unit: "seconds" }) * 1e3;
 }
-var CRUO_COMMANDS, OptionError, flagIn, optIn;
+var CRUO_COMMANDS, SUPERVISOR_SWITCHES, SUPERVISOR_VALUED, CLI_VALUED, OptionError, flagIn, optIn;
 var init_options = __esm({
   "src/options.ts"() {
     "use strict";
@@ -45963,8 +45993,32 @@ var init_options = __esm({
       "stop",
       "pause",
       "resume",
-      "logs"
+      "logs",
+      "run",
+      "version",
+      "?"
     ];
+    SUPERVISOR_SWITCHES = ["once", "dry-run", "worktree", "keep-failed", "push", "usage"];
+    SUPERVISOR_VALUED = [
+      "allow",
+      "base",
+      "cwd",
+      "function",
+      "harness",
+      "harness-timeout",
+      "interval",
+      "limit",
+      "max-attempts",
+      "max-interval",
+      "model",
+      "prepare",
+      "prepare-timeout",
+      "project",
+      "push-remote",
+      "repo",
+      "worktree-root"
+    ];
+    CLI_VALUED = ["as", "token"];
     OptionError = class extends Error {
       constructor(message) {
         super(message);
@@ -46228,7 +46282,12 @@ predate cost recording (\`CRA-89\`, 2026-08-29).
     cacheRead: 0,
     cacheWrite: 0,
     cost: 0,
-    measured: 0
+    measured: 0,
+    opening: 0,
+    openingMeasured: 0,
+    sysChars: 0,
+    userChars: 0,
+    charsMeasured: 0
   });
   const fold = (a, r) => {
     a.runs += 1;
@@ -46242,6 +46301,16 @@ predate cost recording (\`CRA-89\`, 2026-08-29).
     a.cacheWrite += n(r.cache_write_tokens);
     a.cost += n(r.cost_usd);
     if (r.input_tokens !== null || r.cost_usd !== null) a.measured += 1;
+    const openingKnown = r.opening_context_input_tokens !== null || r.opening_context_cache_read_tokens !== null || r.opening_context_cache_write_tokens !== null;
+    if (openingKnown) {
+      a.opening += n(r.opening_context_input_tokens) + n(r.opening_context_cache_read_tokens) + n(r.opening_context_cache_write_tokens);
+      a.openingMeasured += 1;
+    }
+    if (r.system_prompt_chars !== null || r.user_prompt_chars !== null) {
+      a.sysChars += n(r.system_prompt_chars);
+      a.userChars += n(r.user_prompt_chars);
+      a.charsMeasured += 1;
+    }
   };
   const byAgent = /* @__PURE__ */ new Map();
   const total = blank();
@@ -46253,11 +46322,12 @@ predate cost recording (\`CRA-89\`, 2026-08-29).
   const w = Math.max(12, ...[...byAgent.keys()].map((id) => nameOf(id).length));
   console.log(
     `
- ${pad("agent", w)} ${rpad("runs", 5)} ${rpad("useful", 7)} ${rpad("dead", 5)} ${rpad("time", 7)} ${rpad("in", 8)} ${rpad("out", 8)} ${rpad("cost", 9)}`
+ ${pad("agent", w)} ${rpad("runs", 5)} ${rpad("useful", 7)} ${rpad("dead", 5)} ${rpad("time", 7)} ${rpad("in", 8)} ${rpad("out", 8)} ${rpad("opening", 8)} ${rpad("cost", 9)}`
   );
   for (const [id, a] of [...byAgent].sort((x, y) => y[1].runs - x[1].runs)) {
+    const openingAvg = a.openingMeasured > 0 ? compact(Math.round(a.opening / a.openingMeasured)) : "\u2014";
     console.log(
-      ` ${pad(nameOf(id), w)} ${rpad(String(a.runs), 5)} ${rpad(String(a.productive), 7)} ${rpad(String(a.neverRan), 5)} ${rpad(duration3(a.ms), 7)} ${rpad(compact(a.input + a.cacheRead), 8)} ${rpad(compact(a.output), 8)} ${rpad(a.cost > 0 ? `$${a.cost.toFixed(2)}` : "\u2014", 9)}`
+      ` ${pad(nameOf(id), w)} ${rpad(String(a.runs), 5)} ${rpad(String(a.productive), 7)} ${rpad(String(a.neverRan), 5)} ${rpad(duration3(a.ms), 7)} ${rpad(compact(a.input + a.cacheRead), 8)} ${rpad(compact(a.output), 8)} ${rpad(openingAvg, 8)} ${rpad(a.cost > 0 ? `$${a.cost.toFixed(2)}` : "\u2014", 9)}`
     );
   }
   if (!opts.issue) {
@@ -46290,8 +46360,12 @@ predate cost recording (\`CRA-89\`, 2026-08-29).
     console.log(`
  run by run`);
     for (const r of rows) {
+      const openingKnown = r.opening_context_input_tokens !== null || r.opening_context_cache_read_tokens !== null || r.opening_context_cache_write_tokens !== null;
+      const opening = openingKnown ? compact(
+        n(r.opening_context_input_tokens) + n(r.opening_context_cache_read_tokens) + n(r.opening_context_cache_write_tokens)
+      ) : "\u2014";
       console.log(
-        ` ${r.started_at.slice(0, 16).replace("T", " ")}  ${pad(r.outcome, 13)} ${rpad(duration3(r.duration_ms), 6)}  ${rpad(compact(n(r.output_tokens)), 7)} out  ${nameOf(r.agent_id)}`
+        ` ${r.started_at.slice(0, 16).replace("T", " ")}  ${pad(r.outcome, 13)} ${rpad(duration3(r.duration_ms), 6)}  ${rpad(compact(n(r.output_tokens)), 7)} out  ${rpad(opening, 7)} opening  ${nameOf(r.agent_id)}`
       );
     }
   }
@@ -46318,6 +46392,35 @@ predate cost recording (\`CRA-89\`, 2026-08-29).
   } else {
     console.log("");
   }
+  if (total.openingMeasured === 0) {
+    console.log(
+      ` No opening-context figure: needs --usage AND a harness that reports
+ per-turn usage on its own events, which is stricter than reporting a
+ final total \u2014 some harnesses do the second and not the first.
+`
+    );
+  } else {
+    const avg = Math.round(total.opening / total.openingMeasured);
+    console.log(
+      ` opening context \u2014 what was loaded before any work happened, not a slice of "in":
+   avg ${compact(avg)} tokens over ${total.openingMeasured} of ${total.runs} run(s) that reported a first turn.`
+    );
+    if (total.charsMeasured > 0) {
+      const sysAvg = Math.round(total.sysChars / total.charsMeasured);
+      const userAvg = Math.round(total.userChars / total.charsMeasured);
+      console.log(
+        `   Known by source: the system prompt averaged ${sysAvg} chars, the user prompt
+   ${userAvg} \u2014 CHARACTERS, not tokens, because no tokenizer runs here, so this is
+   not subtracted from the ${compact(avg)}-token figure above. The rest of the
+   opening context \u2014 CLAUDE.md, the docs it points at, the card and its comments,
+   and the MCP tool schemas \u2014 is read by the harness itself, off a filesystem and
+   a tool list the supervisor cannot see, and is NOT broken down any further.
+`
+      );
+    } else {
+      console.log("");
+    }
+  }
 }
 var n, pad, rpad, duration3;
 var init_usage = __esm({
@@ -46371,6 +46474,29 @@ function usageIn(text) {
   const measured = Object.values(out).some((v) => v !== void 0);
   return measured ? out : null;
 }
+function turnUsageIn(line) {
+  let event;
+  try {
+    event = JSON.parse(line);
+  } catch {
+    return null;
+  }
+  if (typeof event !== "object" || event === null) return null;
+  const e = event;
+  if (e.type !== "assistant") return null;
+  const message = e.message;
+  const usage = message?.usage;
+  if (!usage || typeof usage !== "object") return null;
+  const out = {
+    model: typeof message?.model === "string" ? message.model : void 0,
+    inputTokens: num(usage.input_tokens) ?? num(usage.inputTokens),
+    outputTokens: num(usage.output_tokens) ?? num(usage.outputTokens),
+    cacheReadTokens: num(usage.cache_read_input_tokens) ?? num(usage.cacheReadInputTokens),
+    cacheWriteTokens: num(usage.cache_creation_input_tokens) ?? num(usage.cacheCreationInputTokens)
+  };
+  const measured = Object.values(out).some((v) => v !== void 0);
+  return measured ? out : null;
+}
 function renderEvent(line) {
   let event;
   try {
@@ -46488,6 +46614,17 @@ var init_pacing = __esm({
   }
 });
 
+// src/queries.ts
+function blocksAgentPickup(state) {
+  return state.requires_human === true;
+}
+var init_queries = __esm({
+  "src/queries.ts"() {
+    "use strict";
+    init_dist();
+  }
+});
+
 // src/worktree.ts
 import { execFile as execFile2 } from "node:child_process";
 import { mkdir as mkdir2, readdir as readdir2, rm as rm2, stat } from "node:fs/promises";
@@ -46680,6 +46817,12 @@ async function pollAssigned(ctx) {
     const project = byProject.get(issue2.project_id);
     if (!state || !project) return [];
     if (options.project && project.key !== options.project) return [];
+    if (blocksAgentPickup(state)) {
+      log(
+        `  ${project.key}-${issue2.number} is in ${state.name}, which requires a human \u2014 not starting`
+      );
+      return [];
+    }
     if (state.category === "completed" || state.category === "canceled") return [];
     const said = lastSaid.get(issue2.id);
     if (said && issue2.updated_at && said > issue2.updated_at) return [];
@@ -46714,6 +46857,12 @@ async function poll(ctx, identity) {
     const state = byState.get(issue2.status_id);
     if (!project || !state) return [];
     if (options.project && project.key !== options.project) return [];
+    if (blocksAgentPickup(state)) {
+      log(
+        `  ${project.key}-${issue2.number} is in ${state.name}, which requires a human \u2014 not starting`
+      );
+      return [];
+    }
     return [
       {
         ref: `${project.key}-${issue2.number}`,
@@ -47005,9 +47154,11 @@ async function invokeHarness(ctx, identity, hit, worktree) {
       options.allow.split(",").map((t) => t.trim()).filter((t) => t !== "" && !t.startsWith("mcp__")).map((t) => t.replace(/\(.*$/, ""))
     )
   ].join(",");
+  const userPromptText = userPrompt(hit);
+  const systemPromptText = systemPrompt(ctx, identity, worktree);
   const args = [
     "-p",
-    userPrompt(hit),
+    userPromptText,
     "--mcp-config",
     mcpConfig,
     // Both, always. See the note above: without `--restricted` the harness
@@ -47023,7 +47174,7 @@ async function invokeHarness(ctx, identity, hit, worktree) {
     "--allowedTools",
     options.allow,
     "--system-prompt",
-    systemPrompt(ctx, identity, worktree),
+    systemPromptText,
     ...options.model ? ["--model", options.model] : [],
     // `--verbose` is not optional alongside stream-json: without it the harness
     // emits only the final result and the live view is a blank terminal for the
@@ -47045,6 +47196,7 @@ async function invokeHarness(ctx, identity, hit, worktree) {
       let tail = "";
       let head2 = "";
       let pending = "";
+      let openingContext = null;
       const addHead = (text) => {
         if (head2.length < 2048) head2 += text.slice(0, 2048 - head2.length);
       };
@@ -47063,6 +47215,7 @@ async function invokeHarness(ctx, identity, hit, worktree) {
         for (const line of lines) {
           if (line.trim() === "") continue;
           tail = line;
+          if (openingContext === null) openingContext = turnUsageIn(line);
           const rendered = renderEvent(line);
           if (rendered.text) addHead(rendered.text + "\n");
           if (rendered.show) process.stdout.write(rendered.show + "\n");
@@ -47086,13 +47239,17 @@ async function invokeHarness(ctx, identity, hit, worktree) {
           durationMs: Date.now() - startedAtMs,
           usage: null,
           killed,
-          stdoutHead: headFor(head2)
+          stdoutHead: headFor(head2),
+          openingContext: null,
+          systemPromptChars: systemPromptText.length,
+          userPromptChars: userPromptText.length
         });
       });
       child.on("close", (code) => {
         clearTimeout(timer);
         if (streaming && pending.trim() !== "") {
           tail = pending;
+          if (openingContext === null) openingContext = turnUsageIn(pending);
           const rendered = renderEvent(pending);
           if (rendered.text) addHead(rendered.text + "\n");
           if (rendered.show) process.stdout.write(rendered.show + "\n");
@@ -47105,7 +47262,10 @@ async function invokeHarness(ctx, identity, hit, worktree) {
           durationMs: Date.now() - startedAtMs,
           usage: usageIn(tail),
           killed,
-          stdoutHead: headFor(head2)
+          stdoutHead: headFor(head2),
+          openingContext,
+          systemPromptChars: systemPromptText.length,
+          userPromptChars: userPromptText.length
         });
       });
     });
@@ -47207,6 +47367,16 @@ function announce(status) {
     }
   })();
 }
+function beatWhileBusy(ctx, deadTicks) {
+  const timer = setInterval(() => {
+    void beat(ctx, { holding: lastHolding, deadTicks, intervalMs: options.intervalMs }).catch(
+      () => {
+      }
+    );
+  }, options.intervalMs);
+  timer.unref?.();
+  return () => clearInterval(timer);
+}
 async function recordRun(ctx, hit, run, outcome) {
   const { error: error51 } = await ctx.client.from("harness_runs").insert({
     agent_id: ctx.userId,
@@ -47223,7 +47393,12 @@ async function recordRun(ctx, hit, run, outcome) {
     output_tokens: run.usage?.outputTokens ?? null,
     cache_read_tokens: run.usage?.cacheReadTokens ?? null,
     cache_write_tokens: run.usage?.cacheWriteTokens ?? null,
-    cost_usd: run.usage?.costUsd ?? null
+    cost_usd: run.usage?.costUsd ?? null,
+    opening_context_input_tokens: run.openingContext?.inputTokens ?? null,
+    opening_context_cache_read_tokens: run.openingContext?.cacheReadTokens ?? null,
+    opening_context_cache_write_tokens: run.openingContext?.cacheWriteTokens ?? null,
+    system_prompt_chars: run.systemPromptChars,
+    user_prompt_chars: run.userPromptChars
   });
   if (error51 && !warnedAboutSpendTable) {
     warnedAboutSpendTable = true;
@@ -47314,6 +47489,7 @@ async function tick(ctx, identity, deadTicks, allowance) {
     let run;
     let committed = 0;
     let salvaged = null;
+    const stopBusyBeat = beatWhileBusy(ctx, deadTicks);
     try {
       run = await invokeHarness(ctx, identity, hit, worktree);
       if (worktree) committed = await worktree.commits();
@@ -47336,6 +47512,7 @@ async function tick(ctx, identity, deadTicks, allowance) {
         );
       }
     } finally {
+      stopBusyBeat();
       await release(ctx, hit);
     }
     const code = run.code;
@@ -47571,6 +47748,7 @@ var init_supervisor = __esm({
     init_harness_signal();
     init_process();
     init_pacing();
+    init_queries();
     init_worktree();
     argv = process.argv.slice(2);
     flag = (name) => flagIn(argv, name);
@@ -47705,6 +47883,12 @@ var init_supervisor = __esm({
     });
     options = (() => {
       try {
+        const [unknown2] = unknownFlags(argv, SUPERVISOR_VALUED);
+        if (unknown2) {
+          throw new OptionError(
+            `${unknown2.flag} is not a flag the supervisor reads` + (unknown2.nearest ? ` \u2014 did you mean ${unknown2.nearest}?` : ".") + ` Nothing was started.`
+          );
+        }
         return readOptions();
       } catch (error51) {
         if (error51 instanceof OptionError) {
@@ -47790,8 +47974,10 @@ var USAGE = `cruo \u2014 run a Cruo agent
   cruo agents            list what is remembered (never the tokens)
   cruo usage [--days 7]  what the agents have been spending
   cruo logout [name]     forget one, or --all
-  cruo [options]         run the agent's supervisor, in this terminal
-  cruo --as <name> \u2026     run a particular one
+  cruo run [options]     run the agent's supervisor, in this terminal
+  cruo --as <name> \u2026     run a particular one (flags alone also run it)
+  cruo version           which build this is
+  cruo help              this list (also: cruo, cruo -h, cruo ?)
 
 Running one in the background
   cruo start [options]   same, detached \u2014 survives closing the terminal
@@ -47903,7 +48089,7 @@ ${CONFIG_PATH} is readable only by you.
 
 ` + (config3.default === name ? `Run \`cruo --dry-run\` to see what it would pick up.
 ` : `Run \`cruo --as ${name} --dry-run\` to see what it would pick up.
-A bare \`cruo\` still runs \`${config3.default}\`.
+\`cruo run\` still runs \`${config3.default}\`.
 `)
   );
 }
@@ -47954,7 +48140,7 @@ Nothing stored for \`${which}\`. Stored: ${names.join(", ") || "(none)"}
   await writeConfig(config3);
   console.log(
     `
-Forgot the token for \`${which}\`.` + (config3.default ? ` A bare \`cruo\` now runs \`${config3.default}\`.
+Forgot the token for \`${which}\`.` + (config3.default ? ` \`cruo run\` now runs \`${config3.default}\`.
 ` : ` Nothing is stored now.
 `)
   );
@@ -47976,7 +48162,7 @@ No tokens stored. \`cruo login <token>\` to add one.
     console.log(` ${mark} ${name}${who}`);
   }
   console.log(`
- * is what a bare \`cruo\` runs. Use \`--as <name>\` for another.
+ * is what \`cruo run\` runs. Use \`--as <name>\` for another.
 `);
 }
 async function targetName(explicit, asName) {
@@ -48051,13 +48237,14 @@ Either \`cruo start ${stored[0]}\`, or add this one:
     );
     process.exit(2);
   }
+  refuseUnknownFlags(argv2.slice(positional ? 2 : 1).filter((a) => a !== "--all"));
   await mkdir4(logDir(), { recursive: true });
   const logPath = join4(logDir(), `${name}.log`);
   const handle = await open(logPath, "a");
   const rest = argv2.slice(positional ? 2 : 1).filter((a) => a !== "--all");
   const chosen = storedKey ?? positional ?? asName;
   const withoutAs = rest.filter((a, i, all) => a !== "--as" && all[i - 1] !== "--as");
-  const forwarded = chosen ? ["--as", chosen, ...withoutAs] : withoutAs;
+  const forwarded = ["run", ...chosen ? ["--as", chosen] : [], ...withoutAs];
   const child = spawn2(process.execPath, [process.argv[1], ...forwarded], {
     detached: true,
     stdio: ["ignore", handle.fd, handle.fd],
@@ -48161,6 +48348,26 @@ A detached run writes one; a foreground run prints to its terminal.
   });
   await new Promise((resolve2) => child.on("close", resolve2));
 }
+async function printVersion() {
+  try {
+    const pkg = JSON.parse(await readFile3(new URL("../package.json", import.meta.url), "utf8"));
+    console.log(`${pkg.name} ${pkg.version}`);
+  } catch {
+    console.log("unknown \u2014 no package.json beside this build");
+  }
+}
+function refuseUnknownFlags(argv2) {
+  const unknown2 = unknownFlags(argv2);
+  if (unknown2.length === 0) return;
+  console.error(
+    `
+${unknown2.map((u) => `\`${u.flag}\` is not a cruo flag.` + (u.nearest ? ` Did you mean ${u.nearest}?` : "")).join("\n")}
+
+Nothing was started. Everything it takes:  cruo help
+`
+  );
+  process.exit(2);
+}
 async function main2() {
   const argv2 = process.argv.slice(2);
   const [first] = argv2;
@@ -48197,10 +48404,11 @@ Usage: cruo login <token> [--as <name>]
   }
   if (first === "usage") {
   }
-  if (first === "help" || argv2.includes("--help") || argv2.includes("-h")) {
+  if (first === void 0 || first === "help" || first === "?" || argv2.includes("--help") || argv2.includes("-h")) {
     console.log(USAGE);
     return;
   }
+  if (first === "version" || first === "--version" || first === "-v") return printVersion();
   if (!isKnownCommandWord(first)) {
     const near = nearestCommands(first);
     console.error(
@@ -48209,13 +48417,15 @@ Usage: cruo login <token> [--as <name>]
 
 ` + (near.length > 0 ? `Did you mean:  ${near.map((k) => `cruo ${k}`).join("   ")}
 
-` : "") + `To run the agent, give no command:  cruo [options]
-Everything it takes:                cruo --help
+` : "") + `To run the agent:     cruo run [options]
+Everything it takes:  cruo help
 `
     );
     process.exit(2);
   }
   if (first === "start") return startDetached(argv2, flagValue("--as"));
+  const runArgv = first === "run" ? argv2.slice(1) : argv2;
+  if (first !== "usage") refuseUnknownFlags(runArgv);
   const flagIndex = argv2.indexOf("--token");
   const fromFlag = flagIndex >= 0 ? argv2[flagIndex + 1] : void 0;
   if (fromFlag) {
@@ -48255,7 +48465,7 @@ Get one from Cruo \u2192 Settings \u2192 Members \u2192 Add an agent.
     process.env.CRUO_IDENTITY = asName ?? config3.default ?? "";
   }
   process.env.CRUO_TOKEN = token;
-  const passthrough = stripTokenFlag(argv2).filter((a, i, all) => a !== "--as" && all[i - 1] !== "--as");
+  const passthrough = stripTokenFlag(runArgv).filter((a, i, all) => a !== "--as" && all[i - 1] !== "--as");
   process.argv = [process.argv[0], process.argv[1], ...passthrough];
   if (first === "usage") {
     const { reportUsage: reportUsage2 } = await Promise.resolve().then(() => (init_usage(), usage_exports));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cruo-agent",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Run a Cruo agent: it watches your board, picks up the cards you assign it, and works them.",
   "license": "MIT",
   "homepage": "https://cruo.space/docs#agents",