@tablation/crew 0.100.1 → 0.100.3

package/dist/cli.js

@@ -18451,6 +18451,16 @@ function describeRelayProbe(url, p) {
   return p.ok ? `relay control:     OK ${url}/control/status (${p.status}, ${p.latencyMs} ms)` : `relay control:     FAILED ${url}/control/status \u2014 ${p.error}`;
 }
 
+// src/ship-status.ts
+function shipIdentityJson(s) {
+  return {
+    id: s.id,
+    kind: s.kind ?? null,
+    instanceClass: s.instance_class ?? null,
+    relayUrl: s.relay_url ?? null
+  };
+}
+
 // src/passenger-containers.ts
 import { execFileSync as execFileSync9 } from "child_process";
 import { createHash as createHash7 } from "crypto";
@@ -19188,6 +19198,7 @@ import { randomBytes as randomBytes2 } from "crypto";
 var DEFAULT_FLOOR_MS = 5e3;
 var DEFAULT_CEILING_MS = INTERVAL_SECONDS * 1e3;
 var ALLOWANCE_PAUSE_MS = 5 * 60 * 1e3;
+var RELOAD_WARN_MS = 10 * 60 * 1e3;
 var defaultSleep = (ms3) => new Promise((resolve7) => setTimeout(resolve7, ms3));
 async function runDaemonLoop(o) {
   const floor = o.floorMs ?? DEFAULT_FLOOR_MS;
@@ -19198,6 +19209,20 @@ async function runDaemonLoop(o) {
   const now = o.now ?? Date.now;
   let transientRun = 0;
   let downSince = 0;
+  const staleStop = async () => {
+    const since2 = now();
+    let warned = false;
+    while (o.inFlight && o.inFlight.size > 0) {
+      if (o.signal?.aborted) return false;
+      if (!warned || now() - since2 >= RELOAD_WARN_MS) {
+        o.onStaleDeferred?.({ runs: o.inFlight.size, waitedMs: now() - since2 });
+        warned = true;
+      }
+      const drained = Promise.all([...o.inFlight].map((p) => p.catch(() => void 0))).then(() => void 0);
+      await Promise.race([drained, sleep(RELOAD_WARN_MS)]);
+    }
+    return true;
+  };
   for (; ; ) {
     if (o.signal?.aborted) return "aborted";
     let result;
@@ -19234,12 +19259,13 @@ async function runDaemonLoop(o) {
       backoff = floor;
       o.onPass?.(result, 0);
       if (o.maxPasses !== void 0 && passes >= o.maxPasses) return "maxPasses";
+      if (o.checkStale?.() && await staleStop()) return "stale";
       continue;
     }
     o.onPass?.(result, backoff);
     if (o.maxPasses !== void 0 && passes >= o.maxPasses) return "maxPasses";
     if (o.signal?.aborted) return "aborted";
-    if (o.checkStale?.()) return "stale";
+    if (o.checkStale?.() && await staleStop()) return "stale";
     await sleep(backoff);
     backoff = Math.min(backoff * 2, ceiling);
   }
@@ -19269,6 +19295,13 @@ function makeStaleChecker(paths, opts = {}) {
 function reloadSentinelFor(stateDir) {
   return join42(stateDir, "reload-requested");
 }
+function readReloadRequestedAt(stateDir) {
+  try {
+    return statSync12(reloadSentinelFor(stateDir)).mtimeMs;
+  } catch {
+    return null;
+  }
+}
 function daemonStampFor(stateDir) {
   return join42(stateDir, "daemon.started");
 }
@@ -19443,12 +19476,12 @@ async function runOnePassUnguarded(o) {
         live.delete(role);
         continue;
       }
-      started.push(role);
-      let ready = () => {
+      let settle = () => {
       };
       const settled = new Promise((resolve7) => {
-        ready = resolve7;
+        settle = resolve7;
       });
+      const ready = (tookTicket2) => settle(tookTicket2);
       const run2 = spawn9(role, decision, ctx, { ready }).then(() => {
         breaker.recordSuccess(role);
         clearShipAttention(o.state, `role_parked:${role}`);
@@ -19494,18 +19527,20 @@ async function runOnePassUnguarded(o) {
         }
       }).finally(() => {
         lock.release();
-        ready(false);
+        settle(void 0);
       });
       if (o.inFlight) {
         const set = o.inFlight;
         set.add(run2);
         void run2.finally(() => set.delete(run2));
       }
+      const reported = TICKET_ROLES.has(role) ? await settled : true;
+      const tookTicket = reported !== false;
+      if (tookTicket) started.push(role);
       if (roleCap(role) <= 1) {
         live.delete(role);
         continue;
       }
-      const tookTicket = await settled;
       if (tookTicket && count + 1 < roleCap(role)) live.set(role, count + 1);
       else live.delete(role);
     }
@@ -19735,6 +19770,8 @@ async function runRoleAgentLocked(role, decision, ctx, hooks, held) {
         );
         return;
       }
+    } else {
+      hooks?.ready(true);
     }
   }
   const plan = planAgentRun({
@@ -21238,6 +21275,7 @@ function findSyncRoute(c, name) {
 function daemonConfigPaths(c) {
   const files = [c.configFile];
   for (const r of c.routes) if (r.apiKeyFile && !files.includes(r.apiKeyFile)) files.push(r.apiKeyFile);
+  for (const r of c.routes) files.push(resolvedPathFor(c.ship.stateDir, r.route));
   return files;
 }
 var STATE_WRITING_COMMANDS = /* @__PURE__ */ new Set(["connect", "provision", "disconnect", "install", "uninstall", "reload", "release", "merge", "deploy"]);
@@ -22975,8 +23013,14 @@ ${cu.tail.trimEnd()}
         log: (m) => emit.warn(m)
       });
       if (controlServer) emit.emit(`control API listening on ${controlServer.path}`);
+      const inFlight = /* @__PURE__ */ new Set();
       const stopReason = await runDaemonLoop({
+        inFlight,
+        onStaleDeferred: ({ runs, waitedMs }) => emit.warn(
+          `reload or update pending for ${Math.round(waitedMs / 1e3)}s \u2014 waiting for ${runs} agent run(s) to end before relaunching (\`crew reload --now\` forces it)`
+        ),
         runPass: () => runOnePass({
+          inFlight,
           route: route2,
           ship: cfg.ship,
           state,
@@ -25365,7 +25409,9 @@ ${where.join("\n")}`);
       mkdirSync28(cfg.ship.stateDir, { recursive: true });
       writeFileSync30(sentinel, `${(/* @__PURE__ */ new Date()).toISOString()}
 `);
-      process.stdout.write("crew reload: requested \u2014 the daemon finishes its in-flight pass, then relaunches with the new config\n");
+      process.stdout.write(
+        "crew reload: requested \u2014 the daemon relaunches with the new config once its running agents end (it starts no new work meanwhile); if it is busy, `crew reload --now` forces the relaunch and interrupts them\n"
+      );
       if (flag("now") && control?.stopCommand && control.startCommand) {
         for (const cmd of [control.stopCommand, control.startCommand]) {
           const res = spawnSync8(cmd[0], cmd.slice(1), { cwd: CREW_HOME, encoding: "utf8" });
@@ -25699,7 +25745,9 @@ ${where.join("\n")}`);
             rowName: nameSync.rowName ?? null,
             nameDrift: nameSync.drift,
             // Additive (CREW-2803): the relay URL this route's tunnel is reachable at, or null.
-            relayUrl: routeRelayUrl(route2)
+            relayUrl: routeRelayUrl(route2),
+            // Additive (CREW-2887): when a `crew reload` request was written and not yet honored, else null.
+            reloadRequestedAt: ((at) => at === null ? null : new Date(at).toISOString())(readReloadRequestedAt(cfg.ship.stateDir))
           },
           // Additive (CREW-1402): what the operator owes. `version` stays 1.
           todo: todo.map((i) => ({ ticket: displayKey(i.ticket), title: i.ticket.title ?? null, reasons: i.reasons })),
@@ -25763,6 +25811,7 @@ ${where.join("\n")}`);
             waiting: waiting ? { ticket: waiting.ticket, since: waiting.since, streak: fairness.streak() } : null
           },
           ships: shipRows.map((s) => ({
+            ...shipIdentityJson(s),
             name: s.name ?? null,
             lastSeen: s.last_seen ?? null,
             engaged: !!s.engaged,
@@ -25798,6 +25847,11 @@ watermark:  ${state.watermark()}
       );
       for (const r of ["dev", "design", "qa"]) {
         if (state.isRolePaused(r)) process.stdout.write(`role ${r}: paused
+`);
+      }
+      const reloadWaitingAt = readReloadRequestedAt(cfg.ship.stateDir);
+      if (reloadWaitingAt !== null) {
+        process.stdout.write(`reload:     requested ${Math.max(0, Math.round((Date.now() - reloadWaitingAt) / 1e3))}s ago, not yet honored \u2014 \`crew reload --now\` forces it
 `);
       }
       if (projects.length) process.stdout.write(`projects:   ${projects.map((p) => p.label).join(", ")}
@@ -25970,6 +26024,13 @@ routes:            ${cfg.routes.map((c) => c.route).join(", ")}
           );
         }
       }
+      const reloadAt = readReloadRequestedAt(cfg.ship.stateDir);
+      if (reloadAt !== null) {
+        process.stdout.write(
+          `reload request:    WARN pending for ${Math.max(0, Math.round((Date.now() - reloadAt) / 1e3))}s \u2014 the daemon is waiting for its running agents to end; \`crew reload --now\` forces it
+`
+        );
+      }
       const daemonStartedAt = readDaemonStarted(cfg.ship.stateDir);
       if (daemonStartedAt !== null) {
         const changed2 = configChangedAfter(daemonConfigPaths(cfg), daemonStartedAt);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tablation/crew",
-  "version": "0.100.1",
+  "version": "0.100.3",
   "description": "A standing team of headless agents that picks work off a Tablation board, does it on a machine you control, and reports back.",
   "type": "module",
   "license": "MIT",