hub-runner 0.2.3 → 0.2.5

package/main.mjs

@@ -127,29 +127,29 @@ var require_polyfills = __commonJS({
         })(fs.rename);
       }
       fs.read = typeof fs.read !== "function" ? fs.read : (function(fs$read) {
-        function read(fd, buffer, offset, length, position, callback_) {
+        function read(fd, buffer, offset, length, position2, callback_) {
           var callback;
           if (callback_ && typeof callback_ === "function") {
             var eagCounter = 0;
             callback = function(er, _, __) {
               if (er && er.code === "EAGAIN" && eagCounter < 10) {
                 eagCounter++;
-                return fs$read.call(fs, fd, buffer, offset, length, position, callback);
+                return fs$read.call(fs, fd, buffer, offset, length, position2, callback);
               }
               callback_.apply(this, arguments);
             };
           }
-          return fs$read.call(fs, fd, buffer, offset, length, position, callback);
+          return fs$read.call(fs, fd, buffer, offset, length, position2, callback);
         }
         if (Object.setPrototypeOf) Object.setPrototypeOf(read, fs$read);
         return read;
       })(fs.read);
       fs.readSync = typeof fs.readSync !== "function" ? fs.readSync : /* @__PURE__ */ (function(fs$readSync) {
-        return function(fd, buffer, offset, length, position) {
+        return function(fd, buffer, offset, length, position2) {
           var eagCounter = 0;
           while (true) {
             try {
-              return fs$readSync.call(fs, fd, buffer, offset, length, position);
+              return fs$readSync.call(fs, fd, buffer, offset, length, position2);
             } catch (er) {
               if (er.code === "EAGAIN" && eagCounter < 10) {
                 eagCounter++;
@@ -461,10 +461,10 @@ var require_graceful_fs = __commonJS({
     }
     function noop() {
     }
-    function publishQueue(context, queue2) {
+    function publishQueue(context, queue4) {
       Object.defineProperty(context, gracefulQueue, {
         get: function() {
-          return queue2;
+          return queue4;
         }
       });
     }
@@ -478,8 +478,8 @@ var require_graceful_fs = __commonJS({
         console.error(m);
       };
     if (!fs[gracefulQueue]) {
-      queue = global[gracefulQueue] || [];
-      publishQueue(fs, queue);
+      queue3 = global[gracefulQueue] || [];
+      publishQueue(fs, queue3);
       fs.close = (function(fs$close) {
         function close(fd, cb) {
           return fs$close.call(fs, fd, function(err) {
@@ -496,14 +496,14 @@ var require_graceful_fs = __commonJS({
         return close;
       })(fs.close);
       fs.closeSync = (function(fs$closeSync) {
-        function closeSync3(fd) {
+        function closeSync4(fd) {
           fs$closeSync.apply(fs, arguments);
           resetQueue();
         }
-        Object.defineProperty(closeSync3, previousSymbol, {
+        Object.defineProperty(closeSync4, previousSymbol, {
           value: fs$closeSync
         });
-        return closeSync3;
+        return closeSync4;
       })(fs.closeSync);
       if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || "")) {
         process.on("exit", function() {
@@ -512,7 +512,7 @@ var require_graceful_fs = __commonJS({
         });
       }
     }
-    var queue;
+    var queue3;
     if (!global[gracefulQueue]) {
       publishQueue(global, fs[gracefulQueue]);
     }
@@ -1619,7 +1619,7 @@ import { randomUUID } from "node:crypto";
 import { existsSync as existsSync11, mkdirSync as mkdirSync7, readFileSync as readFileSync10, realpathSync as realpathSync4, writeFileSync as writeFileSync7 } from "node:fs";
 import { join as join16 } from "node:path";
 
-// ../../lib/clean-env.mjs
+// ../../hosted-hub/lib/clean-env.mjs
 var INHERITED_ENV = /^(EVE_|WORKFLOW_)/;
 function cleanEnv(env = process.env) {
   return Object.fromEntries(Object.entries(env).filter(([key]) => !INHERITED_ENV.test(key)));
@@ -1629,12 +1629,12 @@ function cleanGitEnv(env = process.env) {
   return Object.fromEntries(Object.entries(env).filter(([key]) => !GIT_REPO_ENV.test(key)));
 }
 
-// ../../lib/processes.mjs
-import { spawn, execFile, execFileSync } from "node:child_process";
-import { closeSync, existsSync as existsSync2, mkdirSync as mkdirSync2, openSync, readFileSync as readFileSync2, readSync, renameSync, rmSync, readdirSync as readdirSync2, statSync, writeFileSync as writeFileSync2, writeSync } from "node:fs";
+// ../../hosted-hub/lib/processes.mjs
+import { spawn } from "node:child_process";
+import { closeSync as closeSync2, existsSync as existsSync2, mkdirSync as mkdirSync2, openSync as openSync2, readFileSync as readFileSync2, renameSync, rmSync, readdirSync as readdirSync2, statSync as statSync2, writeFileSync as writeFileSync2, writeSync } from "node:fs";
 import { join as join2 } from "node:path";
 
-// ../../lib/fingerprint.mjs
+// ../../hosted-hub/lib/fingerprint.mjs
 import { createHash, createHmac, randomBytes } from "node:crypto";
 import { existsSync, mkdirSync, readdirSync, readFileSync, realpathSync, writeFileSync } from "node:fs";
 import { join, relative } from "node:path";
@@ -1675,23 +1675,23 @@ function botFingerprint({ stateDir, workspace, name, env, argv, shared }) {
   const envKeys = Object.fromEntries(
     Object.keys(env ?? {}).filter((k) => !VOLATILE_ENV.test(k)).sort().map((k) => [k, short(createHmac("sha256", key).update(`${k}\0${env[k]}`).digest("hex"))])
   );
-  const parts = {
+  const parts2 = {
     env: short(sha(JSON.stringify(envKeys))),
     command: short(sha(JSON.stringify(argv))),
     config: configDigest(workspace, name),
     ...shared
   };
-  const hash = short(sha(JSON.stringify(Object.keys(parts).sort().map((k) => [k, parts[k]]))));
-  return { hash, parts, envKeys };
+  const hash = short(sha(JSON.stringify(Object.keys(parts2).sort().map((k) => [k, parts2[k]]))));
+  return { hash, parts: parts2, envKeys };
 }
 function fingerprintDiff(recorded, current) {
   if (!recorded?.hash) return "it was started without a fingerprint (by an older registry)";
   if (recorded.hash === current.hash) return null;
-  const parts = Object.keys({ ...recorded.parts, ...current.parts }).filter((k) => recorded.parts?.[k] !== current.parts[k]);
+  const parts2 = Object.keys({ ...recorded.parts, ...current.parts }).filter((k) => recorded.parts?.[k] !== current.parts[k]);
   const out = [];
-  for (const part of parts) {
-    if (part !== "env" || !recorded.envKeys) {
-      out.push(part);
+  for (const part2 of parts2) {
+    if (part2 !== "env" || !recorded.envKeys) {
+      out.push(part2);
       continue;
     }
     const keys = [.../* @__PURE__ */ new Set([...Object.keys(recorded.envKeys), ...Object.keys(current.envKeys)])].filter((k) => recorded.envKeys[k] !== current.envKeys[k]).sort();
@@ -1701,22 +1701,44 @@ function fingerprintDiff(recorded, current) {
 }
 var BUILD_SKIP = /* @__PURE__ */ new Set([...TREE_SKIP, ".eve", ".output"]);
 
-// ../../lib/processes.mjs
-var num = (key, fallback) => {
-  const raw = process.env[key];
-  return raw === void 0 || raw === "" || !Number.isFinite(Number(raw)) ? fallback : Number(raw);
-};
+// ../../hosted-hub/lib/log-tail.mjs
+import { closeSync, openSync, readSync, statSync } from "node:fs";
+function createLogTail(log2) {
+  const tails = /* @__PURE__ */ new Map();
+  function follow(name, file, offset) {
+    tails.set(name, { file, offset, carry: "", prefix: `[${name}]`.padEnd(20) });
+  }
+  function pump() {
+    for (const tail of tails.values()) {
+      let size;
+      try {
+        size = statSync(tail.file).size;
+      } catch {
+        continue;
+      }
+      if (size < tail.offset) tail.offset = 0;
+      if (size === tail.offset) continue;
+      const length = Math.min(size - tail.offset, 1e6);
+      const buffer = Buffer.alloc(length);
+      const fd = openSync(tail.file, "r");
+      try {
+        readSync(fd, buffer, 0, length, tail.offset);
+      } finally {
+        closeSync(fd);
+      }
+      tail.offset += length;
+      const lines = (tail.carry + buffer.toString("utf8")).split("\n");
+      tail.carry = lines.pop();
+      for (const line of lines) if (line.trim() && !line.startsWith("Migration file of version")) log2(`${tail.prefix} ${line}`);
+    }
+  }
+  return { follow, pump };
+}
+
+// ../../hosted-hub/lib/process-tree.mjs
+import { execFile, execFileSync } from "node:child_process";
 var sleep = (ms) => new Promise((r) => setTimeout(r, ms));
-var CRASH_LIMIT = num("ROSTER_CRASH_LIMIT", 5);
-var CRASH_WINDOW_MS = num("ROSTER_CRASH_WINDOW_MS", 10 * 6e4);
-var BACKOFF_BASE_MS = num("ROSTER_BACKOFF_BASE_MS", 1e3);
-var BACKOFF_MAX_MS = num("ROSTER_BACKOFF_MAX_MS", 6e4);
-var HEALTH_TIMEOUT_MS = num("ROSTER_START_HEALTH_TIMEOUT_MS", 12e4);
-var PORT_RECHECK_MS = num("ROSTER_PORT_RECHECK_MS", 5e3);
 var KILL_GRACE_MS = 3e3;
-var WATCH_MS = 1e3;
-var TREE_MS = 5e3;
-var LOG_ROTATE_BYTES = 2e7;
 function groupAlive(pgid) {
   if (!(pgid > 1)) return false;
   try {
@@ -1739,7 +1761,7 @@ var C = { ...process.env, LC_ALL: "C" };
 var SLOW_MS = 1e3;
 function slow(what, started2) {
   const ms = Date.now() - started2;
-  if (ms >= SLOW_MS) console.warn(`[registry] ${what} took ${ms}ms`);
+  if (ms >= SLOW_MS) console.warn(`[runner] ${what} took ${ms}ms`);
 }
 var LSTART = String.raw`(\w{3}\s+\w{3}\s+\d+\s+[\d:]+\s+\d{4})`;
 function table() {
@@ -1755,17 +1777,17 @@ function table() {
 }
 function treeOf(pid, rows) {
   const byPid = new Map(rows.map((r) => [r.pid, r]));
-  const children = /* @__PURE__ */ new Map();
-  for (const r of rows) (children.get(r.ppid) ?? children.set(r.ppid, []).get(r.ppid)).push(r);
+  const children2 = /* @__PURE__ */ new Map();
+  for (const r of rows) (children2.get(r.ppid) ?? children2.set(r.ppid, []).get(r.ppid)).push(r);
   const out = [];
-  const queue = byPid.has(pid) ? [byPid.get(pid)] : [];
+  const queue3 = byPid.has(pid) ? [byPid.get(pid)] : [];
   const seen = /* @__PURE__ */ new Set();
-  while (queue.length) {
-    const r = queue.shift();
+  while (queue3.length) {
+    const r = queue3.shift();
     if (seen.has(r.pid)) continue;
     seen.add(r.pid);
     out.push({ pid: r.pid, pgid: r.pgid, startedAt: r.startedAt });
-    queue.push(...children.get(r.pid) ?? []);
+    queue3.push(...children2.get(r.pid) ?? []);
   }
   return out;
 }
@@ -1802,6 +1824,73 @@ async function healthy(port, ms = 1e3) {
   }
 }
 var merge = (...lists) => [...new Map(lists.flat().map((m) => [m.pid, m])).values()];
+var treeAlive = (pgid, tree) => groupAlive(pgid) || liveMembers(tree, table()).length > 0;
+async function untilTreeGone(pgid, tree, ms) {
+  const deadline = Date.now() + ms;
+  while (treeAlive(pgid, tree)) {
+    if (Date.now() >= deadline) return false;
+    await sleep(200);
+  }
+  return true;
+}
+function killTree(pgid, tree) {
+  signalGroup(pgid, "SIGKILL");
+  for (const g of new Set(liveMembers(tree, table()).map((m) => m.pgid))) signalGroup(g, "SIGKILL");
+}
+async function stopTree(pgid, tree, { name, timeoutMs, warn }) {
+  if (!treeAlive(pgid, tree)) return true;
+  let membersTermed = false;
+  const termMembers = () => {
+    membersTermed = true;
+    for (const g of new Set(liveMembers(tree, table()).map((m) => m.pgid))) if (g !== pgid) signalGroup(g, "SIGTERM");
+  };
+  if (groupAlive(pgid)) signalGroup(pgid, "SIGTERM");
+  else termMembers();
+  const deadline = Date.now() + timeoutMs;
+  let gone = true;
+  while (treeAlive(pgid, tree)) {
+    if (!membersTermed && !groupAlive(pgid)) termMembers();
+    if (Date.now() >= deadline) {
+      gone = false;
+      break;
+    }
+    await sleep(200);
+  }
+  if (gone) return true;
+  warn(`[runner] ${name} didn't stop within ${timeoutMs / 1e3}s of SIGTERM; sending SIGKILL`);
+  killTree(pgid, tree);
+  return untilTreeGone(pgid, tree, KILL_GRACE_MS);
+}
+function ownsLeader(record, rows, signature) {
+  if (!(record.pid > 1) || record.pgid !== record.pid) return false;
+  const row = rows.find((r) => r.pid === record.pid);
+  if (!row || row.pgid !== record.pgid) return false;
+  if (!` ${row.command} `.includes(signature)) return false;
+  const member = record.tree?.find((m) => m.pid === record.pid);
+  if (member) return member.startedAt === row.startedAt;
+  const recorded = Date.parse(record.startedAt);
+  return !(Number.isFinite(row.startedAt) && Number.isFinite(recorded) && Math.abs(row.startedAt - recorded) > 5e3);
+}
+function ourTree(record, rows, signature) {
+  const leader = ownsLeader(record, rows, signature);
+  return { leader, tree: merge(leader ? treeOf(record.pid, rows) : [], liveMembers(record.tree, rows)) };
+}
+
+// ../../hosted-hub/lib/processes.mjs
+var num = (key, fallback) => {
+  const raw = process.env[key];
+  return raw === void 0 || raw === "" || !Number.isFinite(Number(raw)) ? fallback : Number(raw);
+};
+var sleep2 = (ms) => new Promise((r) => setTimeout(r, ms));
+var CRASH_LIMIT = num("ROSTER_CRASH_LIMIT", 5);
+var CRASH_WINDOW_MS = num("ROSTER_CRASH_WINDOW_MS", 10 * 6e4);
+var BACKOFF_BASE_MS = num("ROSTER_BACKOFF_BASE_MS", 1e3);
+var BACKOFF_MAX_MS = num("ROSTER_BACKOFF_MAX_MS", 6e4);
+var HEALTH_TIMEOUT_MS = num("ROSTER_START_HEALTH_TIMEOUT_MS", 12e4);
+var PORT_RECHECK_MS = num("ROSTER_PORT_RECHECK_MS", 5e3);
+var WATCH_MS = 1e3;
+var TREE_MS = 5e3;
+var LOG_ROTATE_BYTES = 2e7;
 function createSupervisor({
   root,
   // the workspace: eve dev's cwd
@@ -1814,18 +1903,12 @@ function createSupervisor({
   isCurrent = () => true,
   // is this agent object still on the roster?
   // ({ agent, env, argv }) -> what a server spawned now runs with
-  // (lib/fingerprint.mjs), or null. A previous registry's server is
+  // (lib/fingerprint.mjs), or null. A previous runner's server is
   // adopted only if its recorded fingerprint matches.
   fingerprint = null,
   onChange = () => {
   },
   // status changed (broadcast)
-  onUsage = () => {
-  },
-  // a running tree's memory changed (status() reports rssKb)
-  onRecovered = () => {
-  },
-  // healthy again after a crash restart
   onUp = () => {
   },
   // a server is serving: adopted, spawned, or respawned ({ startedAt, adopted, recovered })
@@ -1853,10 +1936,7 @@ function createSupervisor({
       status: e.status,
       ...e.tree?.length ? { tree: e.tree } : {},
       ...e.lastExit ? { lastExit: e.lastExit } : {},
-      ...e.fingerprint ? { fingerprint: e.fingerprint } : {},
-      // The daemon token it was spawned with (HUB_INSTANCE): an adopted bot
-      // keeps its spawner's, and lib/daemon.mjs selfStopRefusal checks it here.
-      ...e.instance ? { instance: e.instance } : {}
+      ...e.fingerprint ? { fingerprint: e.fingerprint } : {}
     }));
     mkdirSync2(stateDir, { recursive: true });
     const tmp = `${recordsPath}.${process.pid}.tmp`;
@@ -1877,34 +1957,7 @@ function createSupervisor({
     persist();
     onChange(entry.name);
   }
-  const tails = /* @__PURE__ */ new Map();
-  function follow(name, file, offset) {
-    tails.set(name, { file, offset, carry: "", prefix: `[${name}]`.padEnd(20) });
-  }
-  function pump() {
-    for (const tail of tails.values()) {
-      let size;
-      try {
-        size = statSync(tail.file).size;
-      } catch {
-        continue;
-      }
-      if (size < tail.offset) tail.offset = 0;
-      if (size === tail.offset) continue;
-      const length = Math.min(size - tail.offset, 1e6);
-      const buffer = Buffer.alloc(length);
-      const fd = openSync(tail.file, "r");
-      try {
-        readSync(fd, buffer, 0, length, tail.offset);
-      } finally {
-        closeSync(fd);
-      }
-      tail.offset += length;
-      const lines = (tail.carry + buffer.toString("utf8")).split("\n");
-      tail.carry = lines.pop();
-      for (const line of lines) if (line.trim() && !line.startsWith("Migration file of version")) log2(`${tail.prefix} ${line}`);
-    }
-  }
+  const { follow, pump } = createLogTail(log2);
   const pumpTimer = setInterval(pump, 250);
   pumpTimer.unref();
   function refreshTree(entry, rows = table()) {
@@ -1912,10 +1965,8 @@ function createSupervisor({
     const before = JSON.stringify(entry.tree ?? []);
     entry.tree = merge(treeOf(entry.pid, rows), liveMembers(entry.tree, rows));
     const own = rows.filter((r) => r.pid === entry.pid || r.ppid === entry.pid);
-    const rss = entry.rssKb;
     if (own.length) entry.rssKb = own.reduce((sum, r) => sum + (r.rssKb || 0), 0);
     if (JSON.stringify(entry.tree) !== before) persist();
-    if (entry.rssKb !== rss) onUsage(entry.name);
   }
   const treeTimer = setInterval(() => {
     const live = [...entries.values()].filter((e) => e.pid && !e.stopping);
@@ -1924,45 +1975,8 @@ function createSupervisor({
     for (const e of live) refreshTree(e, rows);
   }, TREE_MS);
   treeTimer.unref();
-  const treeAlive = (pgid, tree) => groupAlive(pgid) || liveMembers(tree, table()).length > 0;
-  async function untilTreeGone(pgid, tree, ms) {
-    const deadline = Date.now() + ms;
-    while (treeAlive(pgid, tree)) {
-      if (Date.now() >= deadline) return false;
-      await sleep(200);
-    }
-    return true;
-  }
-  function killTree(pgid, tree) {
-    signalGroup(pgid, "SIGKILL");
-    for (const g of new Set(liveMembers(tree, table()).map((m) => m.pgid))) signalGroup(g, "SIGKILL");
-  }
-  async function stopTree(pgid, tree, name) {
-    if (!treeAlive(pgid, tree)) return true;
-    let membersTermed = false;
-    const termMembers = () => {
-      membersTermed = true;
-      for (const g of new Set(liveMembers(tree, table()).map((m) => m.pgid))) if (g !== pgid) signalGroup(g, "SIGTERM");
-    };
-    if (groupAlive(pgid)) signalGroup(pgid, "SIGTERM");
-    else termMembers();
-    const deadline = Date.now() + stopTimeoutMs;
-    let gone = true;
-    while (treeAlive(pgid, tree)) {
-      if (!membersTermed && !groupAlive(pgid)) termMembers();
-      if (Date.now() >= deadline) {
-        gone = false;
-        break;
-      }
-      await sleep(200);
-    }
-    if (gone) return true;
-    warn(`[registry] ${name} didn't stop within ${stopTimeoutMs / 1e3}s of SIGTERM; sending SIGKILL`);
-    killTree(pgid, tree);
-    return untilTreeGone(pgid, tree, KILL_GRACE_MS);
-  }
   const logFile = (name) => join2(logDir, `${name}.log`);
-  const sizeOf = (file) => existsSync2(file) ? statSync(file).size : 0;
+  const sizeOf = (file) => existsSync2(file) ? statSync2(file).size : 0;
   function entryFor(agent) {
     let entry = entries.get(agent.name);
     if (!entry) {
@@ -1973,33 +1987,19 @@ function createSupervisor({
     entry.port = agent.port;
     return entry;
   }
-  function ownsLeader(record, rows) {
-    if (!(record.pid > 1) || record.pgid !== record.pid) return false;
-    const row = rows.find((r) => r.pid === record.pid);
-    if (!row || row.pgid !== record.pgid) return false;
-    if (!` ${row.command} `.includes(signature(record.agent, record.port))) return false;
-    const member = record.tree?.find((m) => m.pid === record.pid);
-    if (member) return member.startedAt === row.startedAt;
-    const recorded = Date.parse(record.startedAt);
-    return !(Number.isFinite(row.startedAt) && Number.isFinite(recorded) && Math.abs(row.startedAt - recorded) > 5e3);
-  }
-  function ourTree(record, rows) {
-    const leader = ownsLeader(record, rows);
-    return { leader, tree: merge(leader ? treeOf(record.pid, rows) : [], liveMembers(record.tree, rows)) };
-  }
   async function killStale(record, why) {
     const rows = table();
-    const { leader, tree } = ourTree(record, rows);
+    const { leader, tree } = ourTree(record, rows, signature(record.agent, record.port));
     if (!leader && !tree.length) {
-      if (groupAlive(record.pgid)) warn(`[registry] ! ${record.agent}: process group ${record.pgid} from processes.json is no longer its server; leaving it alone`);
+      if (groupAlive(record.pgid)) warn(`[runner] ! ${record.agent}: process group ${record.pgid} from processes.json is no longer its server; leaving it alone`);
       return true;
     }
-    warn(`[registry] ${record.agent}: stopping its stale server (pid ${record.pid}): ${why}`);
-    return stopTree(leader ? record.pgid : null, tree, record.agent);
+    warn(`[runner] ${record.agent}: stopping its stale server (pid ${record.pid}): ${why}`);
+    return stopTree(leader ? record.pgid : null, tree, { name: record.agent, timeoutMs: stopTimeoutMs, warn });
   }
   async function vetAdoption(agent, record) {
     const rows = table();
-    const { leader, tree } = ourTree(record, rows);
+    const { leader, tree } = ourTree(record, rows, signature(record.agent, record.port));
     if (!leader && !tree.length) return { adopted: false };
     if (!leader) return { adopted: false, stale: true, why: "its leader is gone" };
     if (record.port !== agent.port) return { adopted: false, stale: true, why: `its port moved from ${record.port} to ${agent.port}` };
@@ -2031,7 +2031,7 @@ function createSupervisor({
     const { tree } = vetted;
     if (closed) return carry(agent, record, tree);
     const entry = entryFor(agent);
-    Object.assign(entry, { pid: record.pid, pgid: record.pgid, startedAt: record.startedAt, restarts: record.restarts ?? 0, status: "up", adopted: true, child: null, stopping: false, error: void 0, tree, fingerprint: record.fingerprint, instance: record.instance, rssKb: void 0 });
+    Object.assign(entry, { pid: record.pid, pgid: record.pgid, startedAt: record.startedAt, restarts: record.restarts ?? 0, status: "up", adopted: true, child: null, stopping: false, error: void 0, tree, fingerprint: record.fingerprint, rssKb: void 0 });
     const gen = ++entry.gen;
     follow(agent.name, logFile(agent.name), sizeOf(logFile(agent.name)));
     entry.watch = setInterval(() => {
@@ -2042,14 +2042,14 @@ function createSupervisor({
       }
     }, WATCH_MS);
     entry.watch.unref();
-    log2(`[registry] adopted ${agent.name} (pid ${record.pid}, port ${agent.port})`);
+    log2(`[runner] adopted ${agent.name} (pid ${record.pid}, port ${agent.port})`);
     changed(entry);
     onUp(agent, { startedAt: entry.startedAt, adopted: true, recovered: false });
     return { adopted: true };
   }
   function carry(agent, record, tree = record.tree ?? []) {
     const entry = entryFor(agent);
-    Object.assign(entry, { pid: record.pid, pgid: record.pgid, startedAt: record.startedAt, restarts: record.restarts ?? 0, status: record.status ?? "up", adopted: true, child: null, stopping: false, tree, fingerprint: record.fingerprint, instance: record.instance });
+    Object.assign(entry, { pid: record.pid, pgid: record.pgid, startedAt: record.startedAt, restarts: record.restarts ?? 0, status: record.status ?? "up", adopted: true, child: null, stopping: false, tree, fingerprint: record.fingerprint });
     entry.gen++;
     return { adopted: true, carried: true };
   }
@@ -2075,7 +2075,7 @@ function createSupervisor({
         return spawnAgent(entry, { recovered });
       }
       const error = `port ${port} is held by another process (${holders.map((pid) => describe(pid, rows)).join("; ")}), not by ${name}'s server; not touching it. ${name} starts once the port is free.`;
-      if (entry.error !== error || entry.status !== "blocked") warn(`[registry] ! ${error}`);
+      if (entry.error !== error || entry.status !== "blocked") warn(`[runner] ! ${error}`);
       Object.assign(entry, { status: "blocked", error, pid: null, pgid: null });
       entry.timer = setTimeout(() => spawnAgent(entry, { recovered }), PORT_RECHECK_MS);
       entry.timer.unref();
@@ -2084,7 +2084,7 @@ function createSupervisor({
     mkdirSync2(logDir, { recursive: true });
     const file = logFile(name);
     if (sizeOf(file) > LOG_ROTATE_BYTES) renameSync(file, `${file}.1`);
-    const fd = openSync(file, "a");
+    const fd = openSync2(file, "a");
     writeSync(fd, `
 --- ${(/* @__PURE__ */ new Date()).toISOString()} hub: starting ${name} on port ${port}
 `);
@@ -2094,7 +2094,7 @@ function createSupervisor({
     try {
       fp = fingerprintFor(agent, spawnEnv);
     } catch (error) {
-      warn(`[registry] ! ${name}: couldn't fingerprint its inputs (${error.message}); the next registry respawns it instead of adopting it`);
+      warn(`[runner] ! ${name}: couldn't fingerprint its inputs (${error.message}); the next runner respawns it instead of adopting it`);
     }
     let child;
     try {
@@ -2102,17 +2102,17 @@ function createSupervisor({
         cwd: root,
         env: spawnEnv,
         detached: true,
-        // own process group; survives the registry
+        // own process group; survives the runner
         stdio: ["ignore", fd, fd]
       });
     } finally {
-      closeSync(fd);
+      closeSync2(fd);
     }
     const gen = ++entry.gen;
-    Object.assign(entry, { child, pid: child.pid ?? null, pgid: child.pid ?? null, startedAt: (/* @__PURE__ */ new Date()).toISOString(), status: "starting", adopted: false, stopping: false, error: void 0, nextRestartAt: void 0, tree: [], slowWarned: false, fingerprint: fp ?? void 0, instance: spawnEnv?.HUB_INSTANCE || void 0, rssKb: void 0 });
+    Object.assign(entry, { child, pid: child.pid ?? null, pgid: child.pid ?? null, startedAt: (/* @__PURE__ */ new Date()).toISOString(), status: "starting", adopted: false, stopping: false, error: void 0, nextRestartAt: void 0, tree: [], slowWarned: false, fingerprint: fp ?? void 0, rssKb: void 0 });
     follow(name, file, sizeOf(file));
     child.once("error", (error) => {
-      warn(`[registry] ! couldn't start ${name}: ${error.message}`);
+      warn(`[runner] ! couldn't start ${name}: ${error.message}`);
       exited(entry, gen, { code: null, signal: null, error: error.message });
     });
     child.once("exit", (code, signal) => exited(entry, gen, { code, signal }));
@@ -2137,15 +2137,14 @@ function createSupervisor({
           entry.status = "up";
           changed(entry);
           onUp(entry.agent, { startedAt: entry.startedAt, adopted: false, recovered });
-          if (recovered) onRecovered(entry.agent);
           return;
         }
       }
       if (Date.now() - started2 > HEALTH_TIMEOUT_MS && !entry.slowWarned) {
-        warn(`[registry] ! ${entry.name} isn't healthy ${HEALTH_TIMEOUT_MS / 1e3}s after starting; see ${logFile(entry.name)}`);
+        warn(`[runner] ! ${entry.name} isn't healthy ${HEALTH_TIMEOUT_MS / 1e3}s after starting; see ${logFile(entry.name)}`);
         entry.slowWarned = true;
       }
-      await sleep(500);
+      await sleep2(500);
     }
   }
   function exited(entry, gen, { code, signal, error }) {
@@ -2171,13 +2170,13 @@ function createSupervisor({
     if (entry.crashes.length >= CRASH_LIMIT) {
       entry.status = "crashed";
       entry.error = `exited ${entry.crashes.length} times within ${Math.round(CRASH_WINDOW_MS / 6e4)} min (last: ${how}); not restarting until restart_agent. Log: ${logFile(entry.name)}`;
-      warn(`[registry] ! ${entry.name} crashed: ${entry.error}`);
+      warn(`[runner] ! ${entry.name} crashed: ${entry.error}`);
       return changed(entry);
     }
     const delay3 = Math.min(BACKOFF_BASE_MS * 2 ** (entry.crashes.length - 1), BACKOFF_MAX_MS);
     entry.status = "down";
     entry.nextRestartAt = new Date(now + delay3).toISOString();
-    warn(`[registry] ${entry.name} exited unexpectedly (${how}); restarting in ${delay3 / 1e3}s`);
+    warn(`[runner] ${entry.name} exited unexpectedly (${how}); restarting in ${delay3 / 1e3}s`);
     entry.timer = setTimeout(async () => {
       await untilTreeGone(pgid, tree, KILL_GRACE_MS);
       if (entry.status !== "down" || entry.stopping) return;
@@ -2189,7 +2188,7 @@ function createSupervisor({
     changed(entry);
   }
   return {
-    // Startup: adopt what's still running from a previous registry, start the rest.
+    // Startup: adopt what's still running from a previous runner, start the rest.
     startAll(agents) {
       starting = (async () => {
         const records = readRecords();
@@ -2207,7 +2206,7 @@ function createSupervisor({
               const result = results.get(agent.name);
               if (result.adopted) return;
               if (closed && !result.superseded) {
-                if (ourTree(record, table()).tree.length) carry(agent, record);
+                if (ourTree(record, table(), signature(record.agent, record.port)).tree.length) carry(agent, record);
                 return;
               }
               await killStale(record, result.why ?? "it isn't serving");
@@ -2251,7 +2250,7 @@ function createSupervisor({
       }
       entry.status = "stopping";
       changed(entry);
-      const gone = await stopTree(pgid, tree, agent.name);
+      const gone = await stopTree(pgid, tree, { name: agent.name, timeoutMs: stopTimeoutMs, warn });
       if (gone) {
         if (entry.pgid === pgid) {
           entry.gen++;
@@ -2273,42 +2272,6 @@ function createSupervisor({
       pump();
       persist();
     },
-    // Exit without stopping any bot (a `hub restart` that keeps them): nothing
-    // new starts, pending (re)starts are cancelled, each tree is re-read and
-    // saved, and no signal is sent. The next registry vets every record
-    // (vetAdoption) and adopts what still matches. Returns the bots left running.
-    async detach() {
-      closed = true;
-      await starting.catch(() => {
-      });
-      clearInterval(pumpTimer);
-      clearInterval(treeTimer);
-      const rows = table();
-      for (const e of entries.values()) {
-        clearTimeout(e.timer);
-        e.timer = void 0;
-        e.claim = (e.claim ?? 0) + 1;
-        clearInterval(e.watch);
-        e.gen++;
-        if (e.pid) refreshTree(e, rows);
-      }
-      pump();
-      persist();
-      return [...entries.values()].filter((e) => e.pid).map((e) => ({ name: e.name, pid: e.pid }));
-    },
-    // Drop a removed bot's record (after its server is confirmed down).
-    forget(name) {
-      const entry = entries.get(name);
-      if (entry) {
-        clearTimeout(entry.timer);
-        clearInterval(entry.watch);
-        entry.gen++;
-        entry.claim = (entry.claim ?? 0) + 1;
-      }
-      entries.delete(name);
-      tails.delete(name);
-      persist();
-    },
     // Resolves true once the bot is up (spawned by us and healthy); false
     // once it can't be: it crashed, left the roster, or this supervisor closed.
     async waitUp(agent, timeoutMs) {
@@ -2318,21 +2281,10 @@ function createSupervisor({
         if (closed || !isCurrent(agent)) return false;
         if (entry?.agent === agent && entry.status === "up") return true;
         if (entry?.status === "crashed") return false;
-        await sleep(250);
+        await sleep2(250);
       }
       return false;
     },
-    // A running bot's memory as of the last tree refresh (eve dev + its
-    // server) and its uptime (an adopted one keeps its start). Kept out of
-    // status(): that's in every state snapshot, and these change constantly.
-    usage(name) {
-      const e = entries.get(name);
-      if (!e?.pid || e.status !== "up") return void 0;
-      return {
-        ...e.rssKb ? { rssMb: Math.round(e.rssKb / 1024) } : {},
-        ...e.startedAt ? { uptimeS: Math.max(0, Math.round((Date.now() - Date.parse(e.startedAt)) / 1e3)) } : {}
-      };
-    },
     status(name) {
       const e = entries.get(name);
       if (!e) return null;
@@ -2606,7 +2558,7 @@ var status = (state, extra = {}) => {
   console.log(JSON.stringify({ state, ...extra }));
 };
 
-// ../../lib/v26-facts.mjs
+// ../../hosted-hub/lib/v26-facts.mjs
 function isV26Boundary(event) {
   const type = event?.type;
   return type === "session.waiting" || type === "session.completed" || type === "session.failed";
@@ -2663,9 +2615,9 @@ function committedOf(type, data, deliveryIds) {
     case "message.received": {
       const turnId = str(data.turnId);
       if (turnId === void 0) return [];
-      const parts = userParts(data);
+      const parts2 = userParts(data);
       const ids = deliveryIds.length ? deliveryIds : [deliveryIdOf(data)];
-      return ids.map((deliveryId) => fact("delivery.consumed", { deliveryId, turnId, parts }, data));
+      return ids.map((deliveryId) => fact("delivery.consumed", { deliveryId, turnId, parts: parts2 }, data));
     }
     case "step.started": {
       const runId = runIdOf(data), turnId = str(data.turnId);
@@ -2830,7 +2782,8 @@ function fact(type, data, source) {
 }
 var NO_RUN_SCOPE = /* @__PURE__ */ new Set(["context.started", "context.settled", "interaction.opened", "interaction.settled", "response.submitted", "response.settled"]);
 function content(data, kind, phase, value) {
-  return fact("content.completed", { partId: partIdOf(data, kind), runId: runIdOf(data), kind, phase, value }, data);
+  const run4 = typeof data.stepIndex === "number" ? { runId: runIdOf(data) } : {};
+  return fact("content.completed", { partId: partIdOf(data, kind), ...run4, kind, phase, value }, data);
 }
 function turnSettled(data, settled) {
   const turnId = str(data.turnId);
@@ -2849,12 +2802,12 @@ function sessionStarted(data) {
 }
 function userParts(data) {
   if (Array.isArray(data.parts)) {
-    return data.parts.flatMap((part) => {
-      if (!isRecord(part)) return [];
-      if (part.type === "text" && typeof part.text === "string") return [{ kind: "text", text: part.text }];
-      if (part.type === "file" && typeof part.mediaType === "string") {
-        const url = str(part.url);
-        return [{ kind: "file", mediaType: part.mediaType, ...str(part.filename) === void 0 ? {} : { filename: part.filename }, ...typeof part.size === "number" ? { size: part.size } : {}, ...url === void 0 ? { unavailable: true } : { url } }];
+    return data.parts.flatMap((part2) => {
+      if (!isRecord(part2)) return [];
+      if (part2.type === "text" && typeof part2.text === "string") return [{ kind: "text", text: part2.text }];
+      if (part2.type === "file" && typeof part2.mediaType === "string") {
+        const url = str(part2.url);
+        return [{ kind: "file", mediaType: part2.mediaType, ...str(part2.filename) === void 0 ? {} : { filename: part2.filename }, ...typeof part2.size === "number" ? { size: part2.size } : {}, ...url === void 0 ? { unavailable: true } : { url } }];
       }
       return [];
     });
@@ -2923,13 +2876,13 @@ function signInRequest(data) {
 function signInOutcome(outcome) {
   return outcome === "authorized" ? "accepted" : outcome === "declined" ? "declined" : outcome === "timed-out" ? "expired" : "failed";
 }
-function usageOf(usage) {
+function usageOf(usage2) {
   return {
-    inputTokens: num2(usage.inputTokens),
-    outputTokens: num2(usage.outputTokens),
-    cacheReadTokens: num2(usage.cacheReadTokens),
-    cacheWriteTokens: num2(usage.cacheWriteTokens),
-    ...typeof usage.costUsd === "number" ? { costUsd: usage.costUsd } : {}
+    inputTokens: num2(usage2.inputTokens),
+    outputTokens: num2(usage2.outputTokens),
+    cacheReadTokens: num2(usage2.cacheReadTokens),
+    cacheWriteTokens: num2(usage2.cacheWriteTokens),
+    ...typeof usage2.costUsd === "number" ? { costUsd: usage2.costUsd } : {}
   };
 }
 function errorOf(data) {
@@ -2940,7 +2893,7 @@ var str = (value) => typeof value === "string" ? value : void 0;
 var num2 = (value) => typeof value === "number" && Number.isFinite(value) ? value : 0;
 var isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 
-// ../../lib/session-stream.mjs
+// ../../hosted-hub/lib/session-stream.mjs
 async function* readSessionLines(body, startIndex) {
   let line = startIndex;
   let lastAt = null;
@@ -3021,16 +2974,26 @@ async function* streamLines(eve, sessionId, o) {
       query.set("follow", "false");
       query.set("includeTailIndex", "1");
     }
-    const idle = new AbortController(), signal = o.signal ? AbortSignal.any([o.signal, idle.signal]) : idle.signal;
-    let timer = setTimeout(() => idle.abort(), idleMs);
+    const idle3 = new AbortController(), signal = o.signal ? AbortSignal.any([o.signal, idle3.signal]) : idle3.signal;
+    let timer = setTimeout(() => idle3.abort(), idleMs);
+    const opened = Date.now();
+    let firstByte = false, lineAt = opened;
     const quiet = () => {
       clearTimeout(timer);
-      timer = setTimeout(() => idle.abort(), idleMs);
+      timer = setTimeout(() => idle3.abort(), idleMs);
+      if (!firstByte) {
+        firstByte = true;
+        console.log(JSON.stringify({ event: "hub.stream_first_byte", sessionId, startIndex: next, ms: Date.now() - opened }));
+      }
+      if (Date.now() - lineAt >= idleMs) {
+        console.log(JSON.stringify({ event: "hub.stream_no_lines", sessionId, next, ms: Date.now() - lineAt }));
+        lineAt = Date.now();
+      }
     };
     let renewed = false;
     try {
       const res = await fetchFn(`${eve.url}/v1/session/${encodeURIComponent(sessionId)}/stream?${query}`, { headers: eve.headers, cache: "no-store", redirect: "error", signal }).catch((error) => {
-        if (o.signal?.aborted || idle.signal.aborted) return void 0;
+        if (o.signal?.aborted || idle3.signal.aborted) return void 0;
         throw error;
       });
       if (o.signal?.aborted) return;
@@ -3053,12 +3016,13 @@ async function* streamLines(eve, sessionId, o) {
               break;
             }
             yield record;
+            lineAt = Date.now();
             next = record.line + 1;
             reopens = o.reopens ?? 3;
           }
         } catch (error) {
           if (o.signal?.aborted) return;
-          if (!idle.signal.aborted) throw error;
+          if (!idle3.signal.aborted) throw error;
         }
       }
     } finally {
@@ -3075,7 +3039,16 @@ async function* watched(body, onBytes) {
   }
 }
 
+// ../../hosted-hub/node_modules/eve/dist/src/protocol/session-events/catalog.js
+var FACT_CATALOG = { "call.requested": { family: `call`, idField: `callId`, role: `introduces` }, "call.settled": { family: `call`, idField: `callId`, role: `terminal` }, "call.started": { family: `call`, idField: `callId`, role: `updates` }, "child.opened": { family: `child`, idField: `sessionId`, role: `introduces` }, "child.sent": { family: `child`, idField: `sessionId`, role: `record` }, "content.completed": { family: `content`, idField: `partId`, role: `complete` }, "context.settled": { family: `context`, idField: `changeId`, role: `terminal` }, "context.started": { family: `context`, idField: `changeId`, role: `introduces` }, "delivery.admitted": { family: `delivery`, idField: `deliveryId`, role: `introduces` }, "delivery.consumed": { family: `delivery`, idField: `deliveryId`, role: `updates` }, "delivery.settled": { family: `delivery`, idField: `deliveryId`, role: `terminal` }, "interaction.opened": { family: `interaction`, idField: `interactionId`, role: `introduces` }, "interaction.settled": { family: `interaction`, idField: `interactionId`, role: `terminal` }, "model.requested": { family: `model`, idField: `runId`, role: `introduces` }, "model.retried": { family: `model`, idField: `runId`, role: `updates` }, "model.settled": { family: `model`, idField: `runId`, role: `terminal` }, "model.started": { family: `model`, idField: `runId`, role: `updates` }, "response.admitted": { family: `response`, idField: `responseId`, role: `updates` }, "response.settled": { family: `response`, idField: `responseId`, role: `terminal` }, "response.submitted": { family: `response`, idField: `responseId`, role: `introduces` }, "session.ended": { family: `session`, idField: ``, role: `terminal` }, "session.started": { family: `session`, idField: ``, role: `introduces` }, "task.ended": { family: `task`, idField: `taskId`, role: `terminal` }, "task.started": { family: `task`, idField: `taskId`, role: `introduces` }, "turn.paused": { family: `turn`, idField: `turnId`, role: `updates` }, "turn.settled": { family: `turn`, idField: `turnId`, role: `terminal` }, "turn.started": { family: `turn`, idField: `turnId`, role: `introduces` }, "usage.recorded": { family: `usage`, idField: ``, role: `record` } };
+
+// ../../hosted-hub/node_modules/eve/dist/src/protocol/session-projection/session-view.js
+var KEY = /* @__PURE__ */ Symbol.for(`eve.session-view-registry.v1`);
+var snapshots = globalThis[KEY] ??= /* @__PURE__ */ new WeakMap();
+
 // ../../hosted-hub/src/store/facts.ts
+var PROGRESS_TYPES2 = ["call.input", "call.progress", "content.delta"];
+var V27_TYPES = /* @__PURE__ */ new Set([...Object.keys(FACT_CATALOG), ...PROGRESS_TYPES2]);
 var TURN_SETTLED = "turn.settled";
 var SESSION_ENDED = "session.ended";
 var TURN_PAUSED = "turn.paused";
@@ -3192,7 +3165,7 @@ async function downloadWorkspace(res, dir2) {
 }
 
 // ../../hosted-hub/runner/bot-state.ts
-import { closeSync as closeSync2, openSync as openSync2, readSync as readSync2, statSync as statSync2 } from "node:fs";
+import { closeSync as closeSync3, openSync as openSync3, readSync as readSync2, statSync as statSync3 } from "node:fs";
 var MARKER = "hub: starting";
 var WINDOW = 16 * 1024;
 var LINES = 5;
@@ -3200,13 +3173,13 @@ var CHARS = 500;
 function latestRun(file) {
   let text;
   try {
-    const size = statSync2(file).size, fd = openSync2(file, "r");
+    const size = statSync3(file).size, fd = openSync3(file, "r");
     try {
       const buf = Buffer.alloc(Math.min(size, WINDOW));
       readSync2(fd, buf, 0, buf.length, size - buf.length);
       text = buf.toString("utf8");
     } finally {
-      closeSync2(fd);
+      closeSync3(fd);
     }
   } catch {
     return void 0;
@@ -3363,7 +3336,7 @@ async function diskUsage(path) {
 
 // ../../workspaces/snapshot.mjs
 import { randomBytes as randomBytes3 } from "node:crypto";
-import { existsSync as existsSync5, lstatSync as lstatSync2, readdirSync as readdirSync4, readFileSync as readFileSync5, statSync as statSync3 } from "node:fs";
+import { existsSync as existsSync5, lstatSync as lstatSync2, readdirSync as readdirSync4, readFileSync as readFileSync5, statSync as statSync4 } from "node:fs";
 import { copyFile, mkdir, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { dirname as dirname2, join as join6, relative as relative2, resolve as resolve2, sep } from "node:path";
@@ -3471,7 +3444,7 @@ async function saveCheckout(info, { threadId, name, snapshotRoot, root, label =
     const target = existsSync5(bundle) ? bundle.replace(/\.bundle$/, `-${sha2.slice(0, 8)}.bundle`) : bundle;
     await git(checkout, ["bundle", "create", "-q", target, tmpRef, "--branches", "--not", "--remotes"]);
     await git(checkout, ["bundle", "verify", "-q", target]);
-    return { checkout, kind: "bundle", bundle: target, bytes: statSync3(target).size, sha: sha2, dirty: info.dirty, unsaved: info.unsaved };
+    return { checkout, kind: "bundle", bundle: target, bytes: statSync4(target).size, sha: sha2, dirty: info.dirty, unsaved: info.unsaved };
   } finally {
     await git(checkout, ["update-ref", "-d", tmpRef], { allowFail: true });
   }
@@ -3811,28 +3784,28 @@ function createWorkspaceManager({
     } else if (!snapshotRoot) throw new Error("purge needs a snapshotRoot");
     const bytes = await sizeOf(rec.path) ?? 0;
     if (dryRun) return { purged: true, dryRun, bytes, record: rec };
-    let snapshots = [];
+    let snapshots2 = [];
     if (lossless) {
       if (!await stillEligible()) return no("ineligible");
       const r = await repoOp(rec.repo, () => git(rec.repo, ["worktree", "remove", rec.path], { allowFail: true }));
       if (r.code !== 0) return no("remove-failed", { error: r.stderr.trim() });
     } else {
       try {
-        snapshots = await saveAll(rec.path, { threadId: rec.threadId, name: rec.agent, snapshotRoot });
+        snapshots2 = await saveAll(rec.path, { threadId: rec.threadId, name: rec.agent, snapshotRoot });
       } catch (error) {
         return no("snapshot-failed", { error: error.message, bytes });
       }
-      if (!await stillEligible()) return no("ineligible", { snapshots });
+      if (!await stillEligible()) return no("ineligible", { snapshots: snapshots2 });
       const nested = [...new Set(linkedWorktrees(rec.path).map((w) => w.common).filter((r) => r && normPath(r) !== normPath(rec.repo) && !normPath(r).startsWith(normPath(rec.path) + "/")))];
       await rm2(rec.path, { recursive: true, force: true });
       await repoOp(rec.repo, () => git(rec.repo, ["worktree", "prune"], { allowFail: true }));
       for (const repo of nested) await git(repo, ["worktree", "prune"], { allowFail: true });
-      rec.purged = { at: now(), bytes, snapshots: snapshots.map(({ kind, repo, ref, bundle, bytes: b, sha: sha2, dirty, unsaved }) => ({ kind, repo, ref, bundle, bytes: b, sha: sha2, dirty, unsaved })) };
+      rec.purged = { at: now(), bytes, snapshots: snapshots2.map(({ kind, repo, ref, bundle, bytes: b, sha: sha2, dirty, unsaved }) => ({ kind, repo, ref, bundle, bytes: b, sha: sha2, dirty, unsaved })) };
     }
     rec.state = "released";
     rec.headSha = head;
     rec.releasedAt = now();
-    return { purged: true, bytes, snapshots, record: await put(rec) };
+    return { purged: true, bytes, snapshots: snapshots2, record: await put(rec) };
   }
   async function purge(ref, opts) {
     const r = await refFrom(ref);
@@ -3938,11 +3911,11 @@ function fileRecords(dir2) {
 }
 
 // ../../workspaces/bare-guard.mjs
-import { existsSync as existsSync7, readFileSync as readFileSync6, statSync as statSync4 } from "node:fs";
+import { existsSync as existsSync7, readFileSync as readFileSync6, statSync as statSync5 } from "node:fs";
 import { join as join9 } from "node:path";
 async function repairBareFlag(repo) {
   const dotgit = join9(repo, ".git");
-  if (!existsSync7(dotgit) || !statSync4(dotgit).isDirectory()) return false;
+  if (!existsSync7(dotgit) || !statSync5(dotgit).isDirectory()) return false;
   const file = join9(dotgit, "config");
   try {
     const text = readFileSync6(file, "utf8");
@@ -4336,7 +4309,7 @@ var MODEL_AUTH = ["project", "user", "codex"];
 var KINDS = ["coordinator", "planner", "builder", "reviewer", "git-ops", "demo"];
 var WorkspaceError = class extends Error {
 };
-var isObject = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
+var isObject2 = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
 var fail = (file, message) => {
   throw new WorkspaceError(`${file}: ${message}`);
 };
@@ -4346,13 +4319,13 @@ function agentRunsOn(parsed, name) {
   return agent.runsOn ?? parsed.runsOn ?? "hosted";
 }
 function parseWorkspace(data, file = WORKSPACE_FILE) {
-  if (!isObject(data)) fail(file, 'must be a JSON object with an "agents" array');
+  if (!isObject2(data)) fail(file, 'must be a JSON object with an "agents" array');
   if (!Array.isArray(data.agents)) fail(file, '"agents" must be an array');
   const seen = /* @__PURE__ */ new Set();
   const ports = /* @__PURE__ */ new Set();
   const agents = data.agents.map((agent, i) => {
     const at = `agents[${i}]`;
-    if (!isObject(agent)) fail(file, `${at} must be an object`);
+    if (!isObject2(agent)) fail(file, `${at} must be an object`);
     if (typeof agent.name !== "string" || !NAME2.test(agent.name)) fail(file, `${at}.name must be a lowercase handle like deep-diver (got ${JSON.stringify(agent.name)})`);
     const label = `${at} (${agent.name})`;
     if (seen.has(agent.name)) fail(file, `${label}: duplicate name`);
@@ -4362,13 +4335,13 @@ function parseWorkspace(data, file = WORKSPACE_FILE) {
     }
     if (agent.color !== void 0 && (typeof agent.color !== "string" || !COLOR.test(agent.color))) fail(file, `${label}.color must be a hex color like #a78bfa`);
     if (agent.subagents !== void 0) {
-      if (!isObject(agent.subagents)) fail(file, `${label}.subagents must be an object of { name: { model?, reasoning? } }`);
+      if (!isObject2(agent.subagents)) fail(file, `${label}.subagents must be an object of { name: { model?, reasoning? } }`);
       for (const [sub, spec] of Object.entries(agent.subagents)) {
-        if (!isObject(spec)) fail(file, `${label}.subagents.${sub} must be an object`);
+        if (!isObject2(spec)) fail(file, `${label}.subagents.${sub} must be an object`);
         if (spec.when !== void 0 && (typeof spec.when !== "string" || !spec.when.trim() || /\n/.test(spec.when.trim()))) fail(file, `${label}.subagents.${sub}.when must be a one-line string`);
       }
     }
-    if (agent.subagentCap !== void 0 && !isObject(agent.subagentCap)) fail(file, `${label}.subagentCap must be an object`);
+    if (agent.subagentCap !== void 0 && !isObject2(agent.subagentCap)) fail(file, `${label}.subagentCap must be an object`);
     if (agent.limits !== void 0 && limitsError(agent.limits)) fail(file, `${label}.limits${limitsError(agent.limits)}`);
     if (agent.port !== void 0) {
       if (!Number.isInteger(agent.port) || agent.port < 1024 || agent.port > 65535) fail(file, `${label}.port must be an integer between 1024 and 65535`);
@@ -4394,14 +4367,14 @@ function parseWorkspace(data, file = WORKSPACE_FILE) {
   if (data.humans !== void 0) {
     if (!Array.isArray(data.humans) || !data.humans.length) fail(file, '"humans" must be a non-empty array');
     out.humans = data.humans.map((h, i) => {
-      if (!isObject(h) || typeof h.name !== "string" || !HUMAN_NAME.test(h.name)) fail(file, `humans[${i}].name must be a lowercase handle like alice`);
+      if (!isObject2(h) || typeof h.name !== "string" || !HUMAN_NAME.test(h.name)) fail(file, `humans[${i}].name must be a lowercase handle like alice`);
       if (seen.has(h.name)) fail(file, `humans[${i}] (${h.name}) has the same name as an agent`);
       if (h.color !== void 0 && (typeof h.color !== "string" || !COLOR.test(h.color))) fail(file, `humans[${i}].color must be a hex color`);
       return { ...h };
     });
   }
   if (data.subagentCap !== void 0) {
-    if (!isObject(data.subagentCap)) fail(file, '"subagentCap" must be an object');
+    if (!isObject2(data.subagentCap)) fail(file, '"subagentCap" must be an object');
     out.subagentCap = data.subagentCap;
   }
   if (data.limits !== void 0) {
@@ -4561,8 +4534,8 @@ function heldReports(send, failed) {
     if (reason) told.set(bot, reason);
     else told.delete(bot);
   });
-  return (waiting, why) => {
-    for (const bot of /* @__PURE__ */ new Set([...waiting, ...told.keys()])) {
+  return (waiting3, why) => {
+    for (const bot of /* @__PURE__ */ new Set([...waiting3, ...told.keys()])) {
       const reason = why(bot);
       if (now(bot) !== reason) tell(bot, reason).catch(failed);
     }
@@ -4710,15 +4683,15 @@ async function run3(config, bots = realBots) {
   async function retireDead(name, work) {
     const open = work.sessions.filter((s) => s.bot === name);
     for (const s of open) {
-      const res = await cancelTurn(net, eve(name, work.human), s.eveSessionId);
-      if (!res.ok) throw new Error(`cancel ${s.sessionId}: HTTP ${res.status}`);
+      const res = await cancelTurn(net, eve(name, work.human), s.eveSessionId), body = res.ok ? "" : await res.text();
+      if (!res.ok && !sessionEnded(res.status, body)) throw new Error(`cancel ${s.sessionId}: HTTP ${res.status} ${body.slice(0, 200)}`);
     }
-    for (const s of open) await upload(s, name, work.human, s.foldedIndex + 1, { toTail: true });
+    return retireEnded(open, name, work.human, "started afresh");
+  }
+  async function retireEnded(open, name, human, why) {
+    for (const s of open) await upload(s, name, human, s.foldedIndex + 1, { toTail: true });
     const sessionIds = open.map((s) => s.sessionId);
-    if (sessionIds.length) {
-      const { retired } = await hubJson("/api/local-runner/lost", { method: "POST", body: JSON.stringify({ sessionIds }) });
-      log(name, "started afresh: retired", String(retired), "session(s) its last run left open");
-    }
+    if (sessionIds.length) log(name, `${why}: retired`, String((await hubJson("/api/local-runner/lost", { method: "POST", body: JSON.stringify({ sessionIds }) })).retired), "session(s)");
     return sessionIds;
   }
   const worktrees = runnerWorktrees(config.dir, () => workspace);
@@ -4787,7 +4760,7 @@ async function run3(config, bots = realBots) {
   }
   async function upload({ sessionId, eveSessionId }, bot, human, from, { toTail = false, signal } = {}) {
     const { url, headers } = eve(bot, human);
-    let pending = [], posting = Promise.resolve(), failure, dropped = false;
+    let pending = [], posting = Promise.resolve(), failure3, dropped = false;
     const halt = new AbortController();
     const post = (expired = false) => posting = posting.then(async () => {
       const lines = pending;
@@ -4809,7 +4782,7 @@ async function run3(config, bots = realBots) {
         pending.push({ line: line.line, at: line.at ?? void 0, events: line.v26 ? [line.v26] : line.facts });
         const flushed = post();
         flushed.catch((e) => {
-          failure ??= e;
+          failure3 ??= e;
           halt.abort();
         });
         const end = !toTail && boundaryOf(line.facts, line.v26, 0);
@@ -4820,7 +4793,7 @@ async function run3(config, bots = realBots) {
     } catch (error) {
       await posting.catch(() => {
       });
-      if (failure) throw failure;
+      if (failure3) throw failure3;
       if (dropped) return;
       if (toTail && error instanceof StreamError && error.status === 404) return;
       if (!ended(error)) throw error;
@@ -4846,8 +4819,13 @@ async function run3(config, bots = realBots) {
   }
   async function cancel(s, human) {
     for (const turnId of s.cancel) {
-      const res = await cancelTurn(net, eve(s.bot, human), s.eveSessionId, turnId);
-      if (!res.ok) throw new Error(`cancel ${s.sessionId}: HTTP ${res.status}`);
+      const res = await cancelTurn(net, eve(s.bot, human), s.eveSessionId, turnId), body = res.ok ? "" : await res.text();
+      if (sessionEnded(res.status, body)) {
+        await retireEnded([s], s.bot, human, "stop");
+        wake();
+        return;
+      }
+      if (!res.ok) throw new Error(`cancel ${s.sessionId}: HTTP ${res.status} ${body.slice(0, 200)}`);
     }
   }
   const restarting = /* @__PURE__ */ new Map();