hub-runner 0.2.4 → 0.2.6

package/lib/launchd.mjs

@@ -1,9 +1,9 @@
 // The runner's launchd job: a plist in the user's LaunchAgents, loaded in the GUI domain, so it starts at login and
 // outlives every app. `RunAtLoad` without `KeepAlive`: a crash waits for `hub-runner start`.
 import { execFileSync, spawnSync } from 'node:child_process';
-import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
-import { dirname } from 'node:path';
-import { LABEL, credentialsFile, logFile, mainFile, plistFile, runnerDir, version } from './paths.mjs';
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { LABEL, appHome, credentialsFile, logFile, mainFile, plistFile, runnerDir, version } from './paths.mjs';
 import { deviceName } from './device.mjs';
 
 const xml = (s) => String(s).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
@@ -31,9 +31,19 @@ function bootout() {
   }
 }
 
-export function plist({ takeOver }) {
+/** What the job runs: the app's install through its `current` symlink, or this npm install with the shell's pnpm. */
+function program(home) {
+  if (home) {
+    const bin = join(home, 'bin');
+    return { node: join(bin, 'node'), main: join(home, 'hub-runner', 'main.mjs'), pnpm: join(bin, 'pnpm'), path: `${bin}:${process.env.PATH}`, build: readFileSync(join(home, 'build'), 'utf8').trim() };
+  }
   const pnpm = execFileSync('/bin/sh', ['-c', 'command -v pnpm'], { encoding: 'utf8' }).trim();
-  const env = { HUB_PNPM: pnpm, PATH: process.env.PATH, HUB_RUNNER_DIR: runnerDir(), HUB_RUNNER_BUILD: version(), HUB_DEVICE_NAME: deviceName(), ...(takeOver ? { HUB_RUNNER_TAKE_OVER: '1' } : {}) };
+  return { node: process.execPath, main: mainFile(), pnpm, path: process.env.PATH, build: version() };
+}
+
+export function plist({ takeOver }) {
+  const run = program(appHome());
+  const env = { HUB_PNPM: run.pnpm, PATH: run.path, HUB_RUNNER_DIR: runnerDir(), HUB_RUNNER_BUILD: run.build, HUB_DEVICE_NAME: deviceName(), ...(takeOver ? { HUB_RUNNER_TAKE_OVER: '1' } : {}) };
   return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -42,8 +52,8 @@ export function plist({ takeOver }) {
   <string>${LABEL}</string>
   <key>ProgramArguments</key>
   <array>
-    <string>${xml(process.execPath)}</string>
-    <string>${xml(mainFile())}</string>
+    <string>${xml(run.node)}</string>
+    <string>${xml(run.main)}</string>
   </array>
   <key>WorkingDirectory</key>
   <string>${xml(runnerDir())}</string>
@@ -77,9 +87,11 @@ export function stop() {
   if (loaded()) bootout();
 }
 
-/** Starts the loaded job again, or loads it from the plist the last `start` wrote. */
+/** Starts the loaded job again, or loads it from the plist the last `start` wrote. The app's install writes the plist
+ * again first, because its `HUB_RUNNER_BUILD` names the version `current` points at now. */
 export function kickstart() {
-  if (loaded()) launchctl(['kickstart', '-k', `${domain()}/${LABEL}`]);
+  if (appHome()) start();
+  else if (loaded()) launchctl(['kickstart', '-k', `${domain()}/${LABEL}`]);
   else if (existsSync(plistFile())) launchctl(['bootstrap', domain(), plistFile()]);
   else throw new Error('not started yet: run `hub-runner start`');
 }

package/lib/paths.mjs

@@ -10,3 +10,6 @@ export const logFile = () => join(runnerDir(), 'runner.log');
 export const plistFile = () => join(homedir(), 'Library', 'LaunchAgents', `${LABEL}.plist`);
 export const mainFile = () => new URL('../main.mjs', import.meta.url).pathname;
 export const version = () => JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version;
+// The Hub app's own install (native/Sources/HubCore/RunnerInstall.swift): Node, pnpm and this package under the
+// `current` symlink the app moves on each update, so the launchd job always runs the version the app installed last.
+export const appHome = () => process.env.HUB_RUNNER_HOME || null;

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) {
@@ -512,7 +512,7 @@ var require_graceful_fs = __commonJS({
         });
       }
     }
-    var queue;
+    var queue3;
     if (!global[gracefulQueue]) {
       publishQueue(global, fs[gracefulQueue]);
     }
@@ -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();
@@ -1777,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;
 }
@@ -2615,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);
@@ -2802,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 [];
     });
@@ -2876,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) {
@@ -2974,13 +2974,13 @@ 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 }));
@@ -2993,7 +2993,7 @@ async function* streamLines(eve, sessionId, o) {
     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;
@@ -3022,7 +3022,7 @@ async function* streamLines(eve, sessionId, o) {
           }
         } catch (error) {
           if (o.signal?.aborted) return;
-          if (!idle.signal.aborted) throw error;
+          if (!idle3.signal.aborted) throw error;
         }
       }
     } finally {
@@ -3039,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";
@@ -3775,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);
@@ -4300,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}`);
 };
@@ -4310,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`);
@@ -4326,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`);
@@ -4358,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) {
@@ -4525,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);
     }
@@ -4674,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 && !sessionEnded(res.status, await res.text())) 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);
@@ -4751,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;
@@ -4773,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);
@@ -4784,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;
@@ -4810,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();
@@ -4991,6 +5005,7 @@ var deviceFile = join16(dir, "device-id");
 if (!existsSync11(deviceFile)) writeFileSync7(deviceFile, randomUUID());
 var device = readFileSync10(deviceFile, "utf8").trim();
 var credentials = process.env.HUB_URL || process.env.HUB_SESSION ? { hubUrl: need("HUB_URL"), session: need("HUB_SESSION"), bypass: process.env.HUB_PROTECTION_BYPASS || void 0 } : JSON.parse(readFileSync10(join16(dir, "credentials.json"), "utf8"));
+if ("workspace" in credentials && credentials.workspace) status("starting", { workspace: credentials.workspace });
 var deviceName = process.env.HUB_DEVICE_NAME || device;
 var started = await run3({
   hubUrl: credentials.hubUrl.replace(/\/$/, ""),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hub-runner",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "license": "Apache-2.0",
   "description": "Runs a hub workspace's Mac bots on this Mac under launchd, with no app needed.",
   "type": "module",