cruo-agent 0.1.6 → 0.1.8

package/dist/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.8

package/dist/cli.js

@@ -45905,6 +45905,14 @@ function stripTokenFlag(argv2) {
   if (at < 0) return [...argv2];
   return [...argv2.slice(0, at), ...argv2.slice(at + 2)];
 }
+function isKnownCommandWord(first) {
+  if (first === void 0) return true;
+  if (first.startsWith("-")) return true;
+  return CRUO_COMMANDS.includes(first);
+}
+function nearestCommands(first) {
+  return CRUO_COMMANDS.filter((k) => k[0] === first[0]).slice(0, 3);
+}
 function numericIn(argv2, name, spec = {}) {
   const i = argv2.indexOf(`--${name}`);
   if (i < 0) return spec.fallback;
@@ -45939,10 +45947,24 @@ function requiredNumericIn(argv2, name, fallback, spec = {}) {
 function secondsIn(argv2, name, fallbackSeconds) {
   return requiredNumericIn(argv2, name, fallbackSeconds, { unit: "seconds" }) * 1e3;
 }
-var OptionError, flagIn, optIn;
+var CRUO_COMMANDS, OptionError, flagIn, optIn;
 var init_options = __esm({
   "src/options.ts"() {
     "use strict";
+    CRUO_COMMANDS = [
+      "login",
+      "logout",
+      "agents",
+      "whoami",
+      "usage",
+      "help",
+      "start",
+      "ps",
+      "stop",
+      "pause",
+      "resume",
+      "logs"
+    ];
     OptionError = class extends Error {
       constructor(message) {
         super(message);
@@ -46206,7 +46228,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;
@@ -46220,6 +46247,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();
@@ -46231,11 +46268,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) {
@@ -46268,8 +46306,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)}`
       );
     }
   }
@@ -46296,6 +46338,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({
@@ -46349,6 +46420,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 {
@@ -46466,6 +46560,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";
@@ -46658,6 +46763,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 [];
@@ -46692,6 +46803,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}`,
@@ -46978,11 +47095,24 @@ async function invokeHarness(ctx, identity, hit, worktree) {
   const cwd = worktree?.path ?? options.cwd;
   const { path: mcpConfig, cleanup } = await writeMcpConfig();
   const streaming = options.usage === true;
+  const builtinTools = [
+    ...new Set(
+      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
+    // inherits the operator's settings, and without `--tools` it keeps every
+    // built-in that `--restricted` does not itself remove.
+    "--restricted",
+    "--tools",
+    builtinTools,
     // Only the server we just described. Without this the harness would also
     // load the developer's own .mcp.json — including, on this machine, a Cruo
     // token belonging to a human.
@@ -46990,7 +47120,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
@@ -47012,6 +47142,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);
       };
@@ -47030,6 +47161,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");
@@ -47053,13 +47185,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");
@@ -47072,7 +47208,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
         });
       });
     });
@@ -47174,6 +47313,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,
@@ -47190,7 +47339,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;
@@ -47281,6 +47435,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();
@@ -47303,6 +47458,7 @@ async function tick(ctx, identity, deadTicks, allowance) {
         );
       }
     } finally {
+      stopBusyBeat();
       await release(ctx, hit);
     }
     const code = run.code;
@@ -47416,6 +47572,22 @@ async function main() {
   installControls();
   const runName = identityName();
   if (!options.once && !options.dryRun) {
+    const existing = await liveness(runName, true);
+    if (existing.state === "running") {
+      console.error(
+        `
+${runName} is already running here (pid ${existing.record.pid}, up ${since(existing.record.startedAt)}).
+
+Two supervisors for one agent share a token, a queue and a heartbeat,
+and the second would take over the first one's record \u2014 leaving the
+first with no way to be stopped except by pid.
+
+  stop it     cruo stop ${runName}
+  look at it  cruo ps
+`
+      );
+      process.exit(2);
+    }
     await writeRecord({
       agent: runName,
       pid: process.pid,
@@ -47522,6 +47694,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);
@@ -47962,7 +48135,19 @@ ${name} is not running. Start it with \`cruo start --as ${name}\`.
 async function startDetached(argv2, asName) {
   const { spawn: spawn2 } = await import("node:child_process");
   const { open, mkdir: mkdir4 } = await import("node:fs/promises");
-  const name = await targetName(null, asName);
+  const positional = argv2[1] && !argv2[1].startsWith("--") ? argv2[1] : null;
+  if (positional && asName && safeName(positional) !== safeName(asName)) {
+    console.error(
+      `
+Two different agents named: \`${positional}\` and \`--as ${asName}\`.
+
+Say one:  cruo start ${positional} \u2026
+      or  cruo start --as ${asName} \u2026
+`
+    );
+    process.exit(2);
+  }
+  const name = await targetName(positional, asName);
   const already = await liveness(name, true);
   if (already.state === "running") {
     console.error(
@@ -47973,10 +48158,30 @@ Stop it first, or use --as <name> to run a different agent.
     );
     process.exit(1);
   }
+  const config3 = await readConfig2();
+  const storedKey = Object.keys(config3.agents).find((k) => safeName(k) === name) ?? null;
+  const hasToken = Boolean(process.env.CRUO_TOKEN?.trim()) || argv2.includes("--token") || storedKey !== null;
+  if (!hasToken) {
+    const stored = Object.keys(config3.agents);
+    console.error(
+      `
+Nothing stored for \`${name}\`, so there is no token to run it with.
+
+` + (stored.length > 0 ? `Stored: ${stored.join(", ")}
+Either \`cruo start ${stored[0]}\`, or add this one:
+` : `Nothing is stored at all. Add one:
+`) + `  cruo login <token>
+`
+    );
+    process.exit(2);
+  }
   await mkdir4(logDir(), { recursive: true });
   const logPath = join4(logDir(), `${name}.log`);
   const handle = await open(logPath, "a");
-  const forwarded = argv2.slice(1).filter((a) => a !== "--all");
+  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 child = spawn2(process.execPath, [process.argv[1], ...forwarded], {
     detached: true,
     stdio: ["ignore", handle.fd, handle.fd],
@@ -48120,6 +48325,20 @@ Usage: cruo login <token> [--as <name>]
     console.log(USAGE);
     return;
   }
+  if (!isKnownCommandWord(first)) {
+    const near = nearestCommands(first);
+    console.error(
+      `
+\`${first}\` is not a cruo command.
+
+` + (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
+`
+    );
+    process.exit(2);
+  }
   if (first === "start") return startDetached(argv2, flagValue("--as"));
   const flagIndex = argv2.indexOf("--token");
   const fromFlag = flagIndex >= 0 ? argv2[flagIndex + 1] : void 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cruo-agent",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "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",