cruo-agent 0.1.6 → 0.1.7

package/dist/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

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);
@@ -46978,11 +47000,22 @@ 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 args = [
     "-p",
     userPrompt(hit),
     "--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.
@@ -47416,6 +47449,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,
@@ -47962,7 +48011,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 +48034,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 +48201,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.7",
   "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",