hub-runner 0.1.0 → 0.1.1

package/README.md

@@ -3,7 +3,7 @@
 Runs a hub workspace's Mac bots on this Mac. It runs under launchd, so no app has to be open.
 
 ```
-npm i -g hub-runner
+npm i -g hub-runner --min-release-age=0
 hub-runner login
 hub-runner start
 ```
@@ -22,11 +22,13 @@ hub-runner start
 ## Update
 
 ```
-npm i -g hub-runner@latest && hub-runner restart
+npm i -g hub-runner@latest --min-release-age=0 && hub-runner restart
 ```
 
 `restart` lets the turns open now finish, so no bot is cut off.
 
+`--min-release-age=0` lets the newest release install when your npm config holds packages back for a few days (`min-release-age`). It applies to this one install, and hub-runner has no dependencies, so nothing else skips the wait.
+
 ## Notes
 
 - Node 24 or later, and `pnpm` on your PATH when you run `start`: the runner uses both to set the bots up.

package/bin/hub-runner.mjs

@@ -12,7 +12,7 @@ const USAGE = `hub-runner login | start [--take-over] | stop | restart | status
   login      sign in with Vercel and choose the workspace this Mac runs bots for
   start      start the runner under launchd (it starts again at every login); --take-over claims it from another Mac
   stop       stop the runner
-  restart    let the open turns finish, then start the runner again (after \`npm i -g hub-runner@latest\`)
+  restart    let the open turns finish, then start the runner again (after \`npm i -g hub-runner@latest --min-release-age=0\`)
   status     what the runner is doing; exits 1 when it isn't running
   logs       the runner's log; -f follows it
   logout     stop the runner and forget the sign-in`;
@@ -48,6 +48,7 @@ function logs(follow) {
 
 const [command, ...args] = process.argv.slice(2);
 try {
+  if (process.getuid() === 0) throw new Error('run hub-runner without sudo: the runner is a launchd job of your own user, and root has none');
   switch (command) {
     case 'login': await login(); break;
     case 'start': start({ takeOver: args.includes('--take-over') }); console.log('started: see `hub-runner status`'); break;

package/lib/launchd.mjs

@@ -17,6 +17,20 @@ const launchctl = (args, { check = true } = {}) => {
 
 export const loaded = () => launchctl(['print', `${domain()}/${LABEL}`], { check: false });
 
+const EXIT_TIMEOUT_S = 60;
+
+// `bootout` returns while the old runner may still be draining (up to ExitTimeOut), and a `bootstrap` before launchd
+// drops the job fails with error 5. So wait for the job to leave the domain.
+function bootout() {
+  launchctl(['bootout', `${domain()}/${LABEL}`]);
+  const until = Date.now() + (EXIT_TIMEOUT_S + 5) * 1000;
+  const tick = new Int32Array(new SharedArrayBuffer(4));
+  while (loaded()) {
+    if (Date.now() > until) throw new Error(`launchd still holds ${LABEL} ${EXIT_TIMEOUT_S + 5}s after bootout: see \`hub-runner logs\``);
+    Atomics.wait(tick, 0, 0, 250);
+  }
+}
+
 export function plist({ takeOver }) {
   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' } : {}) };
@@ -40,7 +54,7 @@ ${Object.entries(env).map(([k, v]) => `    <key>${k}</key>\n    <string>${xml(v)
   <key>RunAtLoad</key>
   <true/>
   <key>ExitTimeOut</key>
-  <integer>60</integer>
+  <integer>${EXIT_TIMEOUT_S}</integer>
   <key>StandardOutPath</key>
   <string>${xml(logFile())}</string>
   <key>StandardErrorPath</key>
@@ -55,12 +69,12 @@ export function start({ takeOver = false } = {}) {
   mkdirSync(runnerDir(), { recursive: true });
   mkdirSync(dirname(plistFile()), { recursive: true });
   writeFileSync(plistFile(), plist({ takeOver }));
-  if (loaded()) launchctl(['bootout', `${domain()}/${LABEL}`]);
+  if (loaded()) bootout();
   launchctl(['bootstrap', domain(), plistFile()]);
 }
 
 export function stop() {
-  if (loaded()) launchctl(['bootout', `${domain()}/${LABEL}`]);
+  if (loaded()) bootout();
 }
 
 /** Starts the loaded job again, or loads it from the plist the last `start` wrote. */

package/main.mjs

@@ -2463,6 +2463,7 @@ function cancelTurn(fetchFn, eve, sessionId, turnId) {
   );
 }
 var ATTEMPT_MS = 15e3;
+var NOT_READY_WAITS_MS = [250, 500, 1e3, 2e3];
 var COMPACT_MS = 3e4;
 async function compactSession(fetchFn, eve, sessionId) {
   try {
@@ -2487,32 +2488,58 @@ function sessionEnded(status2, body) {
     return false;
   }
 }
+var CreateRefused = class extends Error {
+};
+async function createSession(fetchFn, eve, operationId) {
+  const response = await fetchFn(`${eve.url}/v1/session`, { method: "POST", headers: eve.headers, signal: AbortSignal.timeout(ATTEMPT_MS), body: JSON.stringify({ operationId }) });
+  const text = await response.text();
+  const body = (() => {
+    try {
+      return JSON.parse(text);
+    } catch {
+      return {};
+    }
+  })(), { sessionId } = body;
+  if (definitive(response.status)) throw new CreateRefused(`${response.status} ${body.error ?? body.code ?? text.slice(0, 200)}`);
+  if (!response.ok || !sessionId) throw new Error(`create ${operationId}: HTTP ${response.status} ${text.slice(0, 200)}`);
+  return sessionId;
+}
 async function sendToBot(fetchFn, eve, d3, context, loadImage) {
-  const first = !d3.sessionStarted;
   try {
+    const { eveSessionId } = d3;
     const render = (notes) => [context, messageToYou(d3, notes)].filter(Boolean).join("\n\n");
     const prompt = render("");
-    const fields = { deliveryId: d3.id, turnPolicy: !d3.steer && (d3.authorKind === "agent" || queued(d3.text) !== null) ? "queue" : "steer", ...first ? { sessionId: d3.sessionId } : {} };
+    const fields = { deliveryId: d3.id, turnPolicy: !d3.steer && (d3.authorKind === "agent" || queued(d3.text) !== null) ? "queue" : "steer" };
     const fit = d3.fit ? fitImages(Buffer.byteLength(JSON.stringify({ message: [{ type: "text", text: prompt }], ...fields })), d3.messageId, d3.fit.own, d3.fit.earlier) : void 0;
     const message = await messageWithImages(render, fit ? fit.attachments : d3.attachments, loadImage, fit?.more);
-    const response = await fetchFn(`${eve.url}/v1/session${first ? "" : `/${encodeURIComponent(d3.sessionId)}`}`, {
-      method: "POST",
-      headers: eve.headers,
-      signal: AbortSignal.timeout(ATTEMPT_MS),
-      body: JSON.stringify({ message, ...fields })
-    });
-    const text = await response.text();
-    const body = (() => {
-      try {
-        return JSON.parse(text);
-      } catch {
-        return {};
-      }
-    })();
+    const deadline = Date.now() + ATTEMPT_MS, signal = AbortSignal.timeout(ATTEMPT_MS);
+    const send = async () => {
+      const response2 = await fetchFn(`${eve.url}/v1/session/${encodeURIComponent(eveSessionId)}`, {
+        method: "POST",
+        headers: eve.headers,
+        signal,
+        body: JSON.stringify({ message, ...fields })
+      });
+      const text2 = await response2.text();
+      const body2 = (() => {
+        try {
+          return JSON.parse(text2);
+        } catch {
+          return {};
+        }
+      })();
+      return { response: response2, text: text2, body: body2 };
+    };
+    let { response, text, body } = await send();
+    for (const wait of NOT_READY_WAITS_MS) {
+      if (response.status !== 409 || body.code !== "session_not_ready" || Date.now() + wait >= deadline) break;
+      await new Promise((resolve6) => setTimeout(resolve6, wait));
+      ({ response, text, body } = await send());
+    }
     const answer = (kind, detail) => ({ answer: kind, status: response.status, ...detail ? { detail } : {} });
-    if (response.ok) return body.sessionId === d3.sessionId ? answer({ kind: "accepted" }) : answer({ kind: "unknown" }, `2xx named session ${body.sessionId ?? "none"}, not ${d3.sessionId}`);
+    if (response.ok) return body.sessionId === eveSessionId ? answer({ kind: "accepted" }) : answer({ kind: "unknown" }, `2xx named session ${body.sessionId ?? "none"}, not ${eveSessionId}`);
     console.error("[hosted-hub] bot", response.status, d3.id, text.slice(0, 300));
-    if (sessionEnded(response.status, text) && !first) return answer({ kind: "ended" });
+    if (sessionEnded(response.status, text)) return answer({ kind: "ended" });
     if (response.status === 409 && body.code === "session_not_ready") return answer({ kind: "unknown", notTaken: true }, "session_not_ready");
     if (definitive(response.status))
       return answer({ kind: "refused", error: `${response.status} ${body.error ?? body.code ?? text.slice(0, 200)}` });
@@ -15315,10 +15342,10 @@ async function run3(config, bots = realBots) {
   async function retireDead(name, work) {
     const open = work.sessions.filter((s3) => s3.bot === name);
     for (const s3 of open) {
-      const res = await cancelTurn(net, eve(name, work.human), s3.sessionId);
+      const res = await cancelTurn(net, eve(name, work.human), s3.eveSessionId);
       if (!res.ok) throw new Error(`cancel ${s3.sessionId}: HTTP ${res.status}`);
     }
-    for (const s3 of open) await upload(s3.sessionId, name, work.human, s3.foldedIndex + 1, { toTail: true });
+    for (const s3 of open) await upload(s3, name, work.human, s3.foldedIndex + 1, { toTail: true });
     const sessionIds = open.map((s3) => s3.sessionId);
     if (sessionIds.length) {
       const { retired } = await hubJson("/api/local-runner/lost", { method: "POST", body: JSON.stringify({ sessionIds }) });
@@ -15368,21 +15395,30 @@ async function run3(config, bots = realBots) {
     return { bytes: new Uint8Array(await res.arrayBuffer()), mediaType: res.headers.get("content-type") ?? "" };
   };
   async function deliver([d3], work) {
-    await worktrees.ensure(d3);
     unsettled.add(d3.id);
-    const { answer } = await sendToBot(net, eve(d3.bot, work.human), { ...d3, status: d3.status ?? null }, d3.workspace, loadImage);
+    const created = d3.eveSessionId ?? await createSession(net, eve(d3.bot, work.human), d3.sessionId).catch((error) => {
+      if (error instanceof CreateRefused) return error;
+      throw error;
+    });
+    if (created instanceof CreateRefused) return answered(d3, { kind: "refused", error: created.message });
+    const eveSessionId = d3.eveSessionId ?? (await hubJson(`/api/sessions/${encodeURIComponent(d3.sessionId)}/eve`, { method: "POST", body: JSON.stringify({ eveSessionId: created }) })).eveSessionId;
+    await worktrees.ensure({ ...d3, sessionId: eveSessionId });
+    const { answer } = await sendToBot(net, eve(d3.bot, work.human), { ...d3, status: d3.status ?? null, eveSessionId }, d3.workspace, loadImage);
     if (answer.kind === "ended") {
-      await upload(d3.sessionId, d3.bot, work.human, 0, { toTail: true });
+      await upload({ sessionId: d3.sessionId, eveSessionId }, d3.bot, work.human, 0, { toTail: true });
     }
-    const { stood } = await hubJson(`/api/deliveries/${encodeURIComponent(d3.id)}/answer`, { method: "POST", body: JSON.stringify({ sessionId: d3.sessionId, answer }) });
+    await answered(d3, answer);
+  }
+  async function answered(d3, answer) {
+    const { stood } = await hubJson(`/api/deliveries/${encodeURIComponent(d3.id)}/answer`, { method: "POST", body: JSON.stringify({ sessionId: d3.sessionId, answer: { kind: answer.kind, ...answer.kind === "refused" ? { error: answer.error } : {} } }) });
     log("delivery", d3.id, answer.kind, stood);
     if (stood === "pending") throw new Error(`delivery ${d3.id}: eve's answer settled nothing`);
     unsettled.delete(d3.id);
     wake();
   }
-  async function upload(sessionId, bot, human, from, { toTail = false, signal } = {}) {
+  async function upload({ sessionId, eveSessionId }, bot, human, from, { toTail = false, signal } = {}) {
     const { url, headers } = eve(bot, human);
-    const session = new Client({ host: new URL(url).origin, headers }).sessions.attach(sessionId);
+    const session = new Client({ host: new URL(url).origin, headers }).sessions.attach(eveSessionId);
     let next = from, pending = [], posting = Promise.resolve(), failure, dropped = false;
     const halt = new AbortController();
     const post = (expired = false) => posting = posting.then(async () => {
@@ -15428,7 +15464,7 @@ async function run3(config, bots = realBots) {
     if (following.has(s3.sessionId)) return;
     const abort = new AbortController();
     following.set(s3.sessionId, abort);
-    void upload(s3.sessionId, s3.bot, human, s3.foldedIndex + 1, { signal: abort.signal }).then(
+    void upload({ sessionId: s3.sessionId, eveSessionId: s3.eveSessionId ?? s3.sessionId }, s3.bot, human, s3.foldedIndex + 1, { signal: abort.signal }).then(
       // eve's stream reached a boundary: the next pass re-reads what is still owed.
       () => {
         following.delete(s3.sessionId);
@@ -15442,7 +15478,7 @@ async function run3(config, bots = realBots) {
   }
   async function cancel(s3, human) {
     for (const turnId of s3.cancel) {
-      const res = await cancelTurn(net, eve(s3.bot, human), s3.sessionId, turnId);
+      const res = await cancelTurn(net, eve(s3.bot, human), s3.eveSessionId, turnId);
       if (!res.ok) throw new Error(`cancel ${s3.sessionId}: HTTP ${res.status}`);
     }
   }
@@ -15478,10 +15514,10 @@ async function run3(config, bots = realBots) {
   }
   const compacting = /* @__PURE__ */ new Map();
   const compacted = /* @__PURE__ */ new Map();
-  async function compactOne(sessionId, bot, requestedAt, human) {
+  async function compactOne({ sessionId, eveSessionId, bot, requestedAt }, human) {
     if (compacted.get(sessionId)?.requestedAt !== requestedAt) {
       const agent = running.get(bot);
-      const answer = agent ? await compactSession(net, eve(bot, human), sessionId).then((r2) => ({ status: r2.status, body: typeof r2.body === "string" ? r2.body : JSON.stringify(r2.body) })) : { status: 503, body: "the bot is not running on this Mac" };
+      const answer = agent ? await compactSession(net, eve(bot, human), eveSessionId).then((r2) => ({ status: r2.status, body: typeof r2.body === "string" ? r2.body : JSON.stringify(r2.body) })) : { status: 503, body: "the bot is not running on this Mac" };
       compacted.set(sessionId, { requestedAt, answer, reported: false });
     }
     const entry2 = compacted.get(sessionId);
@@ -15490,9 +15526,9 @@ async function run3(config, bots = realBots) {
   }
   function compact(work) {
     for (const id2 of compacted.keys()) if (!work.compact.some((c3) => c3.sessionId === id2)) compacted.delete(id2);
-    for (const { sessionId, bot, requestedAt } of work.compact) {
-      if (compacting.has(sessionId) || compacted.get(sessionId)?.requestedAt === requestedAt && compacted.get(sessionId).reported) continue;
-      compacting.set(sessionId, compactOne(sessionId, bot, requestedAt, work.human).then(wake, (e9) => failed("compact", e9)).finally(() => compacting.delete(sessionId)));
+    for (const c3 of work.compact) {
+      if (compacting.has(c3.sessionId) || compacted.get(c3.sessionId)?.requestedAt === c3.requestedAt && compacted.get(c3.sessionId).reported) continue;
+      compacting.set(c3.sessionId, compactOne(c3, work.human).then(wake, (e9) => failed("compact", e9)).finally(() => compacting.delete(c3.sessionId)));
     }
   }
   let syncing = null, again = false, drained = null;

package/package.json

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