@shipster/cli 0.5.2 → 0.5.3

package/dist/cli.js

@@ -18414,6 +18414,26 @@ function parseDesired(input) {
   }
 }
 
+// ../../shared/types/src/tier-plan.ts
+function ladder(rungs) {
+  if (rungs === 3) return DIFFICULTIES.map((d) => ({ tier: tierForDifficulty(d), difficulty: [d] }));
+  return [{ tier: "cheap", difficulty: ["small", "standard"] }, { tier: "sensitive", difficulty: ["large"] }];
+}
+function planWriterTiers(models) {
+  if (models.some((m) => m.trim() === "")) throw new Error("writer models: an empty model name");
+  if (new Set(models).size !== models.length) throw new Error("writer models: a repeated model");
+  if (models.length > 3) throw new Error("writer models: at most three, one per difficulty");
+  if (models.length < 2) return { pools: [{ tier: "all", ...models[0] ? { model: models[0] } : {} }], poolOrder: null };
+  const pools = ladder(models.length).map((rung, i) => ({ tier: rung.tier, model: models[i], difficulty: rung.difficulty }));
+  return { pools, poolOrder: pools.map((p) => p.tier) };
+}
+function planReviewerSeat(writer, available) {
+  const other = available.find((r) => r !== writer.runtime);
+  if (other !== void 0) return { runtime: other, separation: "runtime" };
+  const top = writer.models.at(-1);
+  return { runtime: writer.runtime, ...top ? { model: top } : {}, separation: writer.models.length > 1 ? "model" : "none" };
+}
+
 // ../../shared/types/src/secret-patterns.ts
 var SECRET_PATTERNS = [
   /\bsk-/,
@@ -18473,6 +18493,14 @@ function isDifficulty(value) {
 function difficultyRung(d) {
   return DIFFICULTIES.indexOf(d);
 }
+var TIER_OF_DIFFICULTY = {
+  small: "cheap",
+  standard: "standard",
+  large: "sensitive"
+};
+function tierForDifficulty(d) {
+  return TIER_OF_DIFFICULTY[d];
+}
 var DEFAULT_UNSTARTED_AFTER_MS = 4 * 60 * 60 * 1e3;
 var DEFAULT_REVIEW_SILENT_MS = 40 * 60 * 1e3;
 var POOL_STOPPED_REASON = "pool member stopped by pitboss node";
@@ -24883,95 +24911,12 @@ var DEFAULT_SESSION_MAX_MS = 90 * 6e4;
 var VALID_SPECIALIZATIONS = ["reviewer", "architect", "writer", "tester", "devops"];
 
 // src/node/onboard.ts
-import { join as join18, resolve as resolve6 } from "node:path";
-var MAX_POOL = 30;
-var GITHUB = /^(?:https:\/\/github\.com\/|ssh:\/\/git@github\.com\/|git@github\.com:)([\w.-]+)\/([\w.-]+?)(?:\.git)?\/?$/;
-function runtimeBinary(runtime, env3) {
-  switch (runtime) {
-    case "claude":
-      return env3.CLAUDE_BIN ?? "claude";
-    case "cursor":
-      return env3.CURSOR_BIN ?? "cursor-agent";
-    case "copilot":
-      return env3.COPILOT_BIN ?? "copilot";
-    case "codex":
-      return env3.CODEX_BIN ?? "codex";
-  }
-}
-function githubRepo(url) {
-  const match = GITHUB.exec(url.trim());
-  if (!match) throw new Error(`${url} is not a GitHub repo URL (https://github.com/<owner>/<repo> or git@github.com:<owner>/<repo>)`);
-  return { owner: match[1], name: match[2] };
-}
-function planOnboard(url, opts) {
-  const { owner, name } = githubRepo(url);
-  for (const role of ["architect", "writer", "reviewer"]) {
-    if (opts[role] === void 0) throw new Error(`no ${role} runtime: pass --${role} <runtime> (have: ${RUNTIMES3.join(", ")})`);
-  }
-  const architectRuntime = opts.architect;
-  const writer = opts.writer;
-  const reviewer = opts.reviewer;
-  for (const r of [architectRuntime, writer, reviewer]) {
-    if (!RUNTIMES3.includes(r)) throw new Error(`runtime "${r}" is not supported (have: ${RUNTIMES3.join(", ")})`);
-  }
-  const warnings = reviewer === writer ? [`the reviewer and the writers both run ${writer}: a same-vendor reviewer shares the writers' blind spots`] : [];
-  const poolMax = opts.poolMax ?? 2;
-  if (!Number.isInteger(poolMax) || poolMax < 1 || poolMax > MAX_POOL) {
-    throw new Error(`pool size must be a whole number from 1 to ${MAX_POOL}, so the architect, reviewer and writers fit one approval`);
-  }
-  const id = name.replace(/^[^A-Za-z0-9]+/, "").slice(0, 40).replace(/[^A-Za-z0-9]+$/, "") || "repo";
-  const parent = resolve6(opts.parent ?? join18(opts.home, "github"));
-  const base2 = join18(parent, name);
-  const nodeDir2 = join18(parent, `${name}-node`);
-  const architectWorktree = join18(parent, `${name}-architect`);
-  const review = join18(parent, `${name}-reviewer`);
-  return {
-    owner,
-    name,
-    warnings,
-    cloneUrl: `https://github.com/${owner}/${name}.git`,
-    base: base2,
-    nodeDir: nodeDir2,
-    specPath: join18(nodeDir2, "spec.json"),
-    configDir: join18(opts.home, ".config", "pitboss-repos", owner.toLowerCase(), name.toLowerCase()),
-    worktrees: [architectWorktree, review],
-    spec: {
-      api: DEFAULT_API_URL,
-      agents: [
-        { name: `${id}-architect`, runtime: architectRuntime, worktree: `../${name}-architect`, specialization: "architect", tier: 2 },
-        { name: `${id}-reviewer`, runtime: reviewer, worktree: `../${name}-reviewer`, specialization: "reviewer" },
-        {
-          pool: `${id}-pool`,
-          runtime: writer,
-          base: `../${name}`,
-          worktreeRoot: `../${name}-pool`,
-          specialization: "writer",
-          min: 0,
-          max: poolMax
-        }
-      ]
-    }
-  };
-}
-function onboardOperations(plan2, account) {
-  const oneLine2 = (v) => v.length > 0 && v.length <= 300 && !/[\r\n]/.test(v);
-  return {
-    ...account ? { githubAccount: account } : {},
-    ...oneLine2(plan2.configDir) ? { nodeConfigDir: plan2.configDir } : {},
-    ...oneLine2(plan2.specPath) ? { nodeSpecPath: plan2.specPath } : {}
-  };
-}
-function originHost(origin) {
-  const url = /^[a-z][a-z0-9+.-]*:\/\/(?:[^@/]+@)?([^/:]+)/i.exec(origin.trim());
-  if (url) return url[1].toLowerCase();
-  const scp = /^(?:[^@/]+@)?([^/:]+):/.exec(origin.trim());
-  return scp ? scp[1].toLowerCase() : null;
-}
+import { join as join19, resolve as resolve7 } from "node:path";
 
 // src/node/spec.ts
 import { existsSync as existsSync11, realpathSync as realpathSync4, statSync as statSync2 } from "node:fs";
 import { homedir as homedir5 } from "node:os";
-import { join as join19, parse as parsePath, resolve as resolve7, sep as sep2 } from "node:path";
+import { join as join18, parse as parsePath, resolve as resolve6, sep as sep2 } from "node:path";
 var MAX_POOL_SIZE = 32;
 var MAX_ENV_GRANTS2 = 16;
 var NAME2 = /^[A-Za-z0-9][A-Za-z0-9_.-]{0,63}$/;
@@ -24984,7 +24929,7 @@ var canonical = (p) => {
   try {
     return realpathSync4(p);
   } catch {
-    return resolve7(p);
+    return resolve6(p);
   }
 };
 function janitorRootsOf(raw, specDir, agents, pools, homeDir) {
@@ -24995,7 +24940,7 @@ function janitorRootsOf(raw, specDir, agents, pools, homeDir) {
   const skipped = [];
   raw.forEach((entry, i) => {
     if (typeof entry !== "string" || entry === "" || entry.includes("\0")) throw new Error(`janitorRoots[${i}] must be a directory path`);
-    const asked = resolve7(specDir, entry);
+    const asked = resolve6(specDir, entry);
     let real3;
     try {
       real3 = realpathSync4(asked);
@@ -25010,7 +24955,7 @@ function janitorRootsOf(raw, specDir, agents, pools, homeDir) {
     if (real3 === parsePath(real3).root) throw new Error(`janitorRoots[${i}] ${real3} is the filesystem root`);
     if (real3 === home) throw new Error(`janitorRoots[${i}] ${real3} is the home directory`);
     if (isWithin(home, real3)) throw new Error(`janitorRoots[${i}] ${real3} contains the home directory`);
-    if (existsSync11(join19(real3, ".git"))) throw new Error(`janitorRoots[${i}] ${real3} is a git work tree; list the directory that holds worktrees, not a checkout`);
+    if (existsSync11(join18(real3, ".git"))) throw new Error(`janitorRoots[${i}] ${real3} is a git work tree; list the directory that holds worktrees, not a checkout`);
     for (const a of allAgents({ api: "", agents, pools })) {
       if (isWithin(real3, canonical(a.worktree))) {
         throw new Error(`janitorRoots[${i}] ${real3} is or sits inside the worktree of agent "${a.name}"`);
@@ -25044,7 +24989,7 @@ function poolMembers(pool) {
     return {
       name,
       runtime: pool.runtime,
-      worktree: join19(pool.worktreeRoot, name),
+      worktree: join18(pool.worktreeRoot, name),
       specialization: pool.specialization,
       ...pool.ownerPool ? { ownerPool: true } : {},
       ...pool.tier ? { tier: pool.tier } : {},
@@ -25206,11 +25151,11 @@ function parsePool(a, i, specDir, platform2) {
     }
     burstMax = a.burstMax;
   }
-  const worktreeRoot = resolve7(specDir, a.worktreeRoot);
+  const worktreeRoot = resolve6(specDir, a.worktreeRoot);
   if (ownerPool) {
     return { pool: a.pool, runtime, ownerPool: true, worktreeRoot, specialization, ...modelOf(a, i), ...isolateOf(a, i, runtime), ...relayOf(a, i), ...poolSeatKindOf(a, i, platform2, max), ...difficultyOf(a, i), min, max, ...burstMax !== void 0 ? { burstMax } : {} };
   }
-  const base2 = resolve7(specDir, a.base);
+  const base2 = resolve6(specDir, a.base);
   if (isWithin(worktreeRoot, base2)) throw new Error(`agents[${i}].worktreeRoot ${worktreeRoot} is inside base ${base2}; pool worktrees never go inside your checkout`);
   return { pool: a.pool, runtime, base: base2, worktreeRoot, specialization, ...tierOf(a, i, specialization), ...modelOf(a, i), ...isolateOf(a, i, runtime), ...relayOf(a, i), ...envOf(a, i), ...poolSeatKindOf(a, i, platform2, max), ...difficultyOf(a, i), min, max, ...burstMax !== void 0 ? { burstMax } : {} };
 }
@@ -25247,7 +25192,7 @@ function parseSpec(text, specDir, opts = {}) {
     }
     const specialization = specializationOf(a, i);
     if (ownerPool) ownerPoolSpecializationCheck(a.name, specialization, "agents");
-    agents.push({ name: a.name, runtime, worktree: resolve7(specDir, a.worktree), specialization, ...ownerPool ? { ownerPool: true } : tierOf(a, i, specialization), ...modelOf(a, i), ...isolateOf(a, i, runtime), ...relayOf(a, i), ...envOf(a, i), ...seatKindOf(a, i, platform2) });
+    agents.push({ name: a.name, runtime, worktree: resolve6(specDir, a.worktree), specialization, ...ownerPool ? { ownerPool: true } : tierOf(a, i, specialization), ...modelOf(a, i), ...isolateOf(a, i, runtime), ...relayOf(a, i), ...envOf(a, i), ...seatKindOf(a, i, platform2) });
   });
   const entries = [
     ...agents.map((a) => ({ label: `agent "${a.name}"`, ownerPool: a.ownerPool === true, seated: a.runAs !== void 0 })),
@@ -25291,6 +25236,115 @@ function parseSpec(text, specDir, opts = {}) {
   };
 }
 
+// src/node/onboard.ts
+var MAX_POOL = 30;
+var GITHUB = /^(?:https:\/\/github\.com\/|ssh:\/\/git@github\.com\/|git@github\.com:)([\w.-]+)\/([\w.-]+?)(?:\.git)?\/?$/;
+function runtimeBinary(runtime, env3) {
+  switch (runtime) {
+    case "claude":
+      return env3.CLAUDE_BIN ?? "claude";
+    case "cursor":
+      return env3.CURSOR_BIN ?? "cursor-agent";
+    case "copilot":
+      return env3.COPILOT_BIN ?? "copilot";
+    case "codex":
+      return env3.CODEX_BIN ?? "codex";
+  }
+}
+function githubRepo(url) {
+  const match = GITHUB.exec(url.trim());
+  if (!match) throw new Error(`${url} is not a GitHub repo URL (https://github.com/<owner>/<repo> or git@github.com:<owner>/<repo>)`);
+  return { owner: match[1], name: match[2] };
+}
+function planOnboard(url, opts) {
+  const { owner, name } = githubRepo(url);
+  for (const role of ["architect", "writer", "reviewer"]) {
+    if (opts[role] === void 0) throw new Error(`no ${role} runtime: pass --${role} <runtime> (have: ${RUNTIMES3.join(", ")})`);
+  }
+  const architectRuntime = opts.architect;
+  const writer = opts.writer;
+  const reviewer = opts.reviewer;
+  for (const r of [architectRuntime, writer, reviewer]) {
+    if (!RUNTIMES3.includes(r)) throw new Error(`runtime "${r}" is not supported (have: ${RUNTIMES3.join(", ")})`);
+  }
+  const sameVendor = `the reviewer and the writers both run ${writer}: a same-vendor reviewer shares the writers' blind spots`;
+  const warnings = reviewer === writer ? [sameVendor] : [];
+  const poolMax = opts.poolMax ?? 2;
+  if (!Number.isInteger(poolMax) || poolMax < 1 || poolMax > MAX_POOL) {
+    throw new Error(`pool size must be a whole number from 1 to ${MAX_POOL}, so the architect, reviewer and writers fit one approval`);
+  }
+  const id = name.replace(/^[^A-Za-z0-9]+/, "").slice(0, 40).replace(/[^A-Za-z0-9]+$/, "") || "repo";
+  const parent = resolve7(opts.parent ?? join19(opts.home, "github"));
+  const base2 = join19(parent, name);
+  const nodeDir2 = join19(parent, `${name}-node`);
+  const architectWorktree = join19(parent, `${name}-architect`);
+  const review = join19(parent, `${name}-reviewer`);
+  const writerPool = { runtime: writer, base: `../${name}`, specialization: "writer", min: 0, max: poolMax };
+  const architect = { name: `${id}-architect`, runtime: architectRuntime, worktree: `../${name}-architect`, specialization: "architect", tier: 2 };
+  const tiers = opts.writerModels ? planWriterTiers(opts.writerModels) : null;
+  const poolName = (tier) => `${id}-${tier === "all" ? "pool" : tier}`;
+  if (tiers && tiers.pools.length * poolMax > MAX_POOL) {
+    throw new Error(`${tiers.pools.length} writer pools of ${poolMax} do not fit one approval of ${MAX_POOL + 2} agents with the architect and reviewer; lower --pool-max`);
+  }
+  const seat = tiers ? planReviewerSeat({ runtime: writer, models: opts.writerModels }, [reviewer]) : null;
+  const tierAgents = tiers && seat && [
+    architect,
+    ...tiers.pools.map((p) => ({
+      pool: poolName(p.tier),
+      ...writerPool,
+      worktreeRoot: `../${name}-${p.tier === "all" ? "pool" : p.tier}`,
+      ...p.model ? { model: p.model } : {},
+      ...p.difficulty ? { difficulty: p.difficulty } : {}
+    })),
+    {
+      pool: `${id}-reviewer`,
+      runtime: seat.runtime,
+      base: `../${name}`,
+      worktreeRoot: `../${name}-reviewer-pool`,
+      specialization: "reviewer",
+      ...seat.model ? { model: seat.model } : {},
+      min: 0,
+      max: 1
+    }
+  ];
+  const spec = {
+    api: DEFAULT_API_URL,
+    agents: tierAgents || [
+      architect,
+      { name: `${id}-reviewer`, runtime: reviewer, worktree: `../${name}-reviewer`, specialization: "reviewer" },
+      { pool: `${id}-pool`, ...writerPool, worktreeRoot: `../${name}-pool` }
+    ]
+  };
+  parseSpec(JSON.stringify(spec), nodeDir2);
+  return {
+    owner,
+    name,
+    warnings,
+    cloneUrl: `https://github.com/${owner}/${name}.git`,
+    base: base2,
+    nodeDir: nodeDir2,
+    specPath: join19(nodeDir2, "spec.json"),
+    configDir: join19(opts.home, ".config", "pitboss-repos", owner.toLowerCase(), name.toLowerCase()),
+    worktrees: tierAgents ? [architectWorktree] : [architectWorktree, review],
+    poolOrder: tiers?.poolOrder?.map(poolName) ?? null,
+    spec
+  };
+}
+function onboardOperations(plan2, account) {
+  const oneLine2 = (v) => v.length > 0 && v.length <= 300 && !/[\r\n]/.test(v);
+  return {
+    ...account ? { githubAccount: account } : {},
+    ...oneLine2(plan2.configDir) ? { nodeConfigDir: plan2.configDir } : {},
+    ...oneLine2(plan2.specPath) ? { nodeSpecPath: plan2.specPath } : {}
+  };
+}
+function originHost(origin) {
+  const url = /^[a-z][a-z0-9+.-]*:\/\/(?:[^@/]+@)?([^/:]+)/i.exec(origin.trim());
+  if (url) return url[1].toLowerCase();
+  const scp = /^(?:[^@/]+@)?([^/:]+):/.exec(origin.trim());
+  return scp ? scp[1].toLowerCase() : null;
+}
+
 // src/node/store.ts
 import { existsSync as existsSync12, mkdirSync as mkdirSync10, readdirSync as readdirSync4, readFileSync as readFileSync15, renameSync as renameSync5, rmSync as rmSync6, writeFileSync as writeFileSync12 } from "node:fs";
 import { dirname as dirname10, join as join20 } from "node:path";
@@ -25392,7 +25446,7 @@ function reconcilePool({ pending, members, min, max, idleStopMs }) {
   };
   for (const m of stopped) {
     if (count >= max) break;
-    if (m.inProgress > 0 || m.readyAssigned > 0) take(m);
+    if (m.inProgress > 0 || m.readyAssigned > 0 || (m.owedReviews ?? 0) > 0) take(m);
   }
   const spare = () => stopped.filter((m) => !start.includes(m.name)).sort((a, b) => Number(isIdle(b)) - Number(isIdle(a)));
   let demand = pending - running.filter(isIdle).length;
@@ -25415,7 +25469,7 @@ function reconcilePool({ pending, members, min, max, idleStopMs }) {
     count--;
   }
   if (stop.length > 0) return { start: [], stop, why };
-  const blockedOwners = stopped.filter((m) => m.inProgress - (m.verifyingOwn ?? 0) > 0 || m.readyAssigned > 0).length;
+  const blockedOwners = stopped.filter((m) => m.inProgress - (m.verifyingOwn ?? 0) > 0 || m.readyAssigned > 0 || (m.owedReviews ?? 0) > 0).length;
   const freed = [];
   if (blockedOwners > 0 && count >= max) {
     for (const m of running.filter(isIdle)) {
@@ -25891,7 +25945,8 @@ async function onboardCommand(url, opts) {
       architect: roles.architect,
       writer: roles.writer,
       reviewer: roles.reviewer,
-      poolMax: opts.poolMax === void 0 ? void 0 : Number(opts.poolMax)
+      poolMax: opts.poolMax === void 0 ? void 0 : Number(opts.poolMax),
+      writerModels: opts.writerModels === void 0 ? void 0 : opts.writerModels.split(",").map((m) => m.trim())
     });
     for (const warning of plan2.warnings) console.log(source_default.yellow(`  ${warning}`));
     const env3 = { ...process.env };
@@ -25970,6 +26025,8 @@ async function onboardCommand(url, opts) {
   Start it when you want it running (long-running, foreground):`);
     console.log(source_default.cyan(`    cd ${shellQuote(plan2.nodeDir)} && PITBOSS_CONFIG_DIR=${shellQuote(plan2.configDir)} pitboss node up spec.json`));
     if (opts.account) console.log(source_default.dim(`    with GH_TOKEN from \`gh auth token --user ${opts.account}\` in that shell`));
+    if (plan2.poolOrder) console.log(`
+  Tiers route once the owner or its top-level agent sets each pool's difficulties (set_pool_size) and the pool order (set_pool_order): ${plan2.poolOrder.join(", ")}`);
   } catch (err) {
     console.error(source_default.red(`  \u2715 ${err instanceof Error ? err.message : String(err)}`));
     process.exitCode = 1;
@@ -31620,6 +31677,28 @@ function startActivityLoop(agents, sup, ownerPool = false) {
   const timer = setInterval(() => void tick(), ACTIVITY_REPORT_MS);
   return () => clearInterval(timer);
 }
+var SHUTDOWN_MARK_BOUND_MS = 3e3;
+async function markPoolsStopped(loops, boundMs = SHUTDOWN_MARK_BOUND_MS) {
+  let timer;
+  const bound = new Promise((resolve19) => {
+    timer = setTimeout(() => {
+      console.log(`${(/* @__PURE__ */ new Date()).toISOString()}  node: shutdown marking pool members unavailable timed out after ${boundMs}ms`);
+      resolve19();
+    }, boundMs);
+  });
+  try {
+    await Promise.race([Promise.all(loops.map((l) => l.markRunningStopped().catch(() => void 0))), bound]);
+  } finally {
+    clearTimeout(timer);
+  }
+}
+async function shutdownNode(opts) {
+  for (const stop of opts.stops) stop();
+  console.log(source_default.dim("\n  stopping agents\u2026"));
+  const marking = markPoolsStopped(opts.poolLoops, opts.boundMs);
+  await Promise.all([opts.sup.stop(), marking]);
+  opts.exit(0);
+}
 function startPoolLoop(run4, sup, record, account) {
   const { pool, members } = run4;
   const { reconcileMs, idleStopMs } = poolTimings();
@@ -31640,6 +31719,7 @@ function startPoolLoop(run4, sup, record, account) {
     }
   };
   let busy = false;
+  let closed = false;
   const markStopped = async (member) => {
     try {
       await setAvailable(member.creds, false);
@@ -31735,12 +31815,17 @@ function startPoolLoop(run4, sup, record, account) {
             if (pool.ownerPool) resetOwnerPoolSlot(member.agent.worktree, member.agent.runAs);
             else resetWorktree(member.agent.worktree);
           }
+          if (closed) return;
           await setAvailable(member.creds, true);
           markedAt.delete(name);
         } catch (err) {
           log(`not starting ${name}: ${err instanceof Error ? err.message : String(err)}`);
           continue;
         }
+        if (closed) {
+          await markStopped(member);
+          return;
+        }
         lastBusy.set(name, Date.now());
         sup.startAgent(name);
         log(`started ${name} (ready ${summary2.ready})`);
@@ -31766,9 +31851,25 @@ function startPoolLoop(run4, sup, record, account) {
       busy = false;
     }
   };
-  void tick();
-  const timer = setInterval(() => void tick(), reconcileMs);
-  return () => clearInterval(timer);
+  let inflight = null;
+  const schedule = () => {
+    if (inflight) return;
+    inflight = tick().finally(() => {
+      inflight = null;
+    });
+  };
+  schedule();
+  const timer = setInterval(schedule, reconcileMs);
+  const stop = (() => {
+    closed = true;
+    clearInterval(timer);
+  });
+  stop.markRunningStopped = async () => {
+    closed = true;
+    const running = members.filter((m) => sup.isActive(m.agent.name));
+    await Promise.all([inflight, ...running.map((m) => markStopped(m))]);
+  };
+  return stop;
 }
 var MODEL_REFRESH_MS = 15e3;
 function desiredIdentity(api, root, nodeToken, log) {
@@ -31854,10 +31955,12 @@ async function nodeUpDesired() {
     sup.start();
     const identity = createIdentityRefresher(capacityDir());
     const loops = [];
+    const poolLoops = [];
     const stopAll = [];
     let rebuild = null;
     const rebuildLoops = () => {
       for (const stop of loops.splice(0)) stop();
+      poolLoops.splice(0);
       const runnable = allAgents(latest).filter((a) => sup.has(a.name));
       const credsOf = (a) => readCreds(a.name);
       const byRepo = /* @__PURE__ */ new Map();
@@ -31875,10 +31978,12 @@ async function nodeUpDesired() {
         });
         if (members.length === 0) continue;
         poolStates[pool.pool] = poolStates[pool.pool] ?? { members: members.map((m) => m.agent.name), min: pool.min, max: pool.max, ready: null, checkedAt: null };
-        loops.push(startPoolLoop({ pool, members, ...pool.ownerPool ? { bases: ownerBases } : {} }, sup, (name, state) => {
+        const loop = startPoolLoop({ pool, members, ...pool.ownerPool ? { bases: ownerBases } : {} }, sup, (name, state) => {
           poolStates[name] = state;
           writeState({ ...base2, agents: sup.snapshot(), pools: poolStates });
-        }, () => identity.current()));
+        }, () => identity.current());
+        loops.push(loop);
+        poolLoops.push(loop);
       }
       for (const name of Object.keys(poolStates)) if (!latest.pools.some((p) => p.pool === name)) delete poolStates[name];
     };
@@ -31957,10 +32062,7 @@ async function nodeUpDesired() {
     }, 6e4);
     const shutdown = async () => {
       clearInterval(keepAlive);
-      for (const stop of [...loops, ...stopAll, stopHeartbeat, janitor.stop]) stop();
-      console.log(source_default.dim("\n  stopping agents\u2026"));
-      await sup.stop();
-      process.exit(0);
+      await shutdownNode({ stops: [...loops, ...stopAll, stopHeartbeat, janitor.stop], sup, poolLoops: [...poolLoops], exit: (code) => process.exit(code) });
     };
     const janitor = startJanitorService({ roots: [root], managed: () => managedOfSpec(latest), nodeId: node2.nodeId, log: (line) => console.log(source_default.dim(`  ${line}`)) });
     const stopHeartbeat = startNodeHeartbeat(
@@ -32094,14 +32196,12 @@ async function nodeUpCommand(specFile, opts = {}) {
 `));
     const stopLoops = [];
     const ownerBases = createOwnerPoolBases(ownerPoolBasesDepsFor(opts));
+    const poolLoops = [];
     let stopping = false;
     const shutdown = async () => {
       if (stopping) return;
       stopping = true;
-      for (const stopLoop of stopLoops) stopLoop();
-      console.log(source_default.dim("\n  stopping agents\u2026"));
-      await sup.stop();
-      process.exit(0);
+      await shutdownNode({ stops: stopLoops, sup, poolLoops, exit: (code) => process.exit(code) });
     };
     process.on("SIGINT", shutdown);
     process.on("SIGTERM", shutdown);
@@ -32146,10 +32246,12 @@ async function nodeUpCommand(specFile, opts = {}) {
         continue;
       }
       poolStates[pool.pool] = { members: ready.map((m) => m.agent.name), min: pool.min, max: pool.max, ready: null, checkedAt: null, ...pool.ownerPool ? { ownerPool: true } : {} };
-      stopLoops.push(startPoolLoop({ pool, members: ready, ...pool.ownerPool ? { bases: ownerBases } : {} }, sup, (name, state) => {
+      const loop = startPoolLoop({ pool, members: ready, ...pool.ownerPool ? { bases: ownerBases } : {} }, sup, (name, state) => {
         poolStates[name] = state;
         writeState({ ...base2, agents: sup.snapshot(), pools: poolStates });
-      }, () => identity.current()));
+      }, () => identity.current());
+      stopLoops.push(loop);
+      poolLoops.push(loop);
     }
   } catch (err) {
     console.error(source_default.red(`
@@ -33964,7 +34066,7 @@ var token = program2.command("token").description("Manage your agent's API token
 token.command("rotate").description("Issue a new token, revoke the old one, and list the configs that still hold it").action(tokenRotateCommand);
 token.command("list").description("List your agent's tokens, live and revoked, and mark the one in use").action(tokenListCommand);
 token.command("revoke <tokenId>").description("Revoke a specific token id").action(tokenRevokeCommand);
-program2.command("onboard <github-url>").description("Set a GitHub repo up for Shipster: clone it, write a node spec (tier-2 architect, reviewer, writer pool) and print one device code that grants every agent. Starts nothing").option("--account <login>", "GitHub account to clone and work as, from `gh auth` (for example a personal account)").option("--dir <path>", "Parent directory for the clone, worktrees and spec (default ~/github)").option("--architect <runtime>", "Runtime for the tier-2 architect (asked for when there is a terminal and no flag)").option("--writer <runtime>", "Runtime for the writer pool (asked for when there is a terminal and no flag)").option("--reviewer <runtime>", "Runtime for the reviewer; may match the writers, with a warning (asked for when there is a terminal and no flag)").option("--pool-max <n>", "Writer pool size (default 2)").option("--force", "Replace an existing spec with different contents").action(onboardCommand);
+program2.command("onboard <github-url>").description("Set a GitHub repo up for Shipster: clone it, write a node spec (tier-2 architect, reviewer, writer pool) and print one device code that grants every agent. Starts nothing").option("--account <login>", "GitHub account to clone and work as, from `gh auth` (for example a personal account)").option("--dir <path>", "Parent directory for the clone, worktrees and spec (default ~/github)").option("--architect <runtime>", "Runtime for the tier-2 architect (asked for when there is a terminal and no flag)").option("--writer <runtime>", "Runtime for the writer pool (asked for when there is a terminal and no flag)").option("--reviewer <runtime>", "Runtime for the reviewer; may match the writers, with a warning (asked for when there is a terminal and no flag)").option("--pool-max <n>", "Writer pool size (default 2)").option("--writer-models <list>", "One to three writer models, cheapest first, comma-separated: one writer pool per tier and a reviewer pool, all scaling to zero").option("--force", "Replace an existing spec with different contents").action(onboardCommand);
 var node = program2.command("node").description("Run this machine's agents headless and keep them running");
 node.command("up [spec]").description("Start every agent in a spec file and restart any that exit (foreground; Ctrl-C stops them). With no spec file, follows the desired state the dashboard holds for this enrolled node").option(
   "--invite <name=code>",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipster/cli",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "private": false,
   "description": "Connect your coding agents to a pitboss instance",
   "keywords": [