cruo-agent 0.1.11 → 0.1.13

package/dist/VERSION

@@ -1 +1 @@
-0.1.11
+0.1.13

package/dist/cli.js

@@ -36895,12 +36895,13 @@ async function delegatedSessionFor(config3, principal) {
     workspaceName: principal.workspaceName
   };
 }
-async function fetchDelegatedSession(endpoint, token) {
+async function fetchDelegatedSession(endpoint, token, options2 = {}) {
   let response;
   try {
     response = await fetch(endpoint, {
       method: "POST",
-      headers: { authorization: `Bearer ${token}`, accept: "application/json" }
+      headers: { authorization: `Bearer ${token}`, accept: "application/json" },
+      signal: options2.signal
     });
   } catch (error51) {
     throw new Error(`Could not reach ${endpoint}: ${error51 instanceof Error ? error51.message : String(error51)}`);
@@ -46116,6 +46117,22 @@ function entryKindOf(token) {
   if (!OWN_PACKAGE_MARKERS.some((marker) => normalised.includes(marker))) return null;
   return isCliFile ? "cli" : "supervisor";
 }
+function entryPosition(tokens) {
+  const first = tokens[0];
+  if (!first) return null;
+  const direct = entryKindOf(first);
+  if (direct) return { at: 0, kind: direct };
+  const normalised = first.replace(/\\/g, "/");
+  const program = normalised.slice(normalised.lastIndexOf("/") + 1);
+  if (!/^(node|nodejs)(\d+)?$/.test(program)) return null;
+  let i = 1;
+  while (i < tokens.length && tokens[i].startsWith("-")) {
+    i += NODE_FLAGS_WITH_VALUE.has(tokens[i]) ? 2 : 1;
+  }
+  const script = tokens[i];
+  const kind = script ? entryKindOf(script) : null;
+  return kind ? { at: i, kind } : null;
+}
 function parsePsLine(line) {
   const m = /^\s*(\d+)\s+(\d+)\s+(.*)$/.exec(line);
   return m ? { pid: Number(m[1]), uid: Number(m[2]), args: m[3] } : null;
@@ -46148,16 +46165,9 @@ async function findSupervisorProcesses() {
     const parsed = parsePsLine(line);
     if (!parsed || parsed.uid !== uid || parsed.pid === process.pid) continue;
     const tokens = parsed.args.trim().split(/\s+/).filter(Boolean);
-    let scriptAt = -1;
-    let kind = null;
-    for (let i = 0; i < tokens.length; i++) {
-      kind = entryKindOf(tokens[i]);
-      if (kind) {
-        scriptAt = i;
-        break;
-      }
-    }
-    if (!kind) continue;
+    const entry = entryPosition(tokens);
+    if (!entry) continue;
+    const { at: scriptAt, kind } = entry;
     if (kind === "cli") {
       const next = tokens[scriptAt + 1];
       const isSubcommand = next !== void 0 && !next.startsWith("-") && NON_LOOPING_CLI_COMMANDS.includes(next);
@@ -46198,7 +46208,7 @@ function since(iso) {
   if (ms2 < 864e5) return `${Math.round(ms2 / 36e5)}h`;
   return `${Math.round(ms2 / 864e5)}d`;
 }
-var exec, runDir, logDir, recordPath, CLI_BIN_NAMES, SUPERVISOR_BIN_NAMES, OWN_PACKAGE_MARKERS, NON_LOOPING_CLI_COMMANDS, SIGNALS;
+var exec, runDir, logDir, recordPath, CLI_BIN_NAMES, SUPERVISOR_BIN_NAMES, OWN_PACKAGE_MARKERS, NON_LOOPING_CLI_COMMANDS, NODE_FLAGS_WITH_VALUE, SIGNALS;
 var init_process = __esm({
   "src/process.ts"() {
     "use strict";
@@ -46211,6 +46221,7 @@ var init_process = __esm({
     SUPERVISOR_BIN_NAMES = /* @__PURE__ */ new Set(["cruo-supervisor"]);
     OWN_PACKAGE_MARKERS = ["@cruo/mcp", "cruo-agent", "apps/mcp", "packages/cli"];
     NON_LOOPING_CLI_COMMANDS = CRUO_COMMANDS.filter((c) => c !== "run");
+    NODE_FLAGS_WITH_VALUE = /* @__PURE__ */ new Set(["--import", "--require", "-r", "--loader", "--experimental-loader"]);
     SIGNALS = {
       stop: "SIGTERM",
       pause: "SIGUSR1",
@@ -48180,15 +48191,21 @@ async function writeConfig(config3) {
   await writeFile3(CONFIG_PATH, JSON.stringify(config3, null, 2) + "\n", { mode: 384 });
   await chmod(CONFIG_PATH, 384);
 }
-async function identify2(token) {
+async function lookup(token, timeoutMs = 5e3) {
   const endpoint = process.env.CRUO_SESSION_URL?.trim() || CRUO_CLOUD.sessionUrl;
   try {
-    const session = await fetchDelegatedSession(endpoint, token);
-    return { email: session.email, workspace: session.workspaceName };
-  } catch {
-    return null;
+    const session = await fetchDelegatedSession(endpoint, token, {
+      signal: AbortSignal.timeout(timeoutMs)
+    });
+    return { state: "known", who: { email: session.email, workspace: session.workspaceName } };
+  } catch (error51) {
+    return error51 instanceof TokenRefused ? { state: "refused" } : { state: "unreachable" };
   }
 }
+async function identify2(token) {
+  const found = await lookup(token);
+  return found.state === "known" ? found.who : null;
+}
 async function login(token, as) {
   if (!token.startsWith("cruo_pat_")) {
     console.error(`
@@ -48196,7 +48213,7 @@ That does not look like a Cruo token \u2014 they begin "cruo_pat_".
 `);
     process.exit(2);
   }
-  const who = as ? null : await identify2(token);
+  const who = await identify2(token);
   const name = as ?? (who ? nameFromEmail(who.email) : null);
   if (!name) {
     console.error(
@@ -48294,12 +48311,32 @@ No tokens stored. \`cruo login <token>\` to add one.
 `);
     return;
   }
+  const found = await Promise.all(names.map((n2) => lookup(config3.agents[n2].token)));
+  let changed = false;
+  found.forEach((f, i) => {
+    if (f.state !== "known") return;
+    const a = config3.agents[names[i]];
+    if (a.email !== f.who.email || a.workspace !== f.who.workspace) {
+      a.email = f.who.email;
+      a.workspace = f.who.workspace;
+      changed = true;
+    }
+  });
+  if (changed) await writeConfig(config3);
   console.log("");
-  for (const name of names) {
+  names.forEach((name, i) => {
     const a = config3.agents[name];
     const mark = config3.default === name ? "*" : " ";
     const who = a.email ? ` \u2014 ${a.email}${a.workspace ? ` in ${a.workspace}` : ""}` : "";
-    console.log(` ${mark} ${name}${who}`);
+    const note = found[i].state === "refused" ? "   (token refused \u2014 revoked? `cruo login` a new one)" : "";
+    console.log(` ${mark} ${name}${who}${note}`);
+  });
+  const unchecked = found.filter((f) => f.state === "unreachable").length;
+  if (unchecked > 0) {
+    console.log(
+      `
+ (${unchecked === names.length ? "Could not reach Cruo" : `${unchecked} could not be checked`} just now \u2014 showing what was stored.)`
+    );
   }
   console.log(`
  * is what \`cruo run\` runs. Use \`--as <name>\` for another.

package/dist/index.js

@@ -43087,12 +43087,13 @@ async function sessionFor(config3, principal) {
   return attempt;
 }
 var DELEGATED_SESSION_ENV = "CRUO_SESSION";
-async function fetchDelegatedSession(endpoint, token) {
+async function fetchDelegatedSession(endpoint, token, options = {}) {
   let response;
   try {
     response = await fetch(endpoint, {
       method: "POST",
-      headers: { authorization: `Bearer ${token}`, accept: "application/json" }
+      headers: { authorization: `Bearer ${token}`, accept: "application/json" },
+      signal: options.signal
     });
   } catch (error51) {
     throw new Error(`Could not reach ${endpoint}: ${error51 instanceof Error ? error51.message : String(error51)}`);

package/package.json

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