@sleds/cli 0.1.53 → 0.1.55

package/dist/sleds.mjs

@@ -8557,8 +8557,8 @@ function parseParked(v) {
   return {
     question: v.question,
     at: v.at,
-    ...typeof v.screen === "string" ? { screen: v.screen } : {},
-    ...v.still === true ? { still: true } : {},
+    ...typeof v.words === "string" ? { words: v.words, ...v.still === true ? { still: true } : {} } : {},
+    ...typeof v.seatFull === "string" && v.seatFull ? { seatFull: v.seatFull } : {},
     ...answerer ? { answerer } : {}
   };
 }
@@ -8603,6 +8603,7 @@ function parseRun(v) {
         ...v.permission.onScreen === true ? { onScreen: true } : {},
         ...typeof v.permission.dialog === "string" ? { dialog: v.permission.dialog } : {},
         ...typeof v.permission.pressedAt === "number" ? { pressedAt: v.permission.pressedAt } : {},
+        ...typeof v.permission.pressedOn === "string" ? { pressedOn: v.permission.pressedOn } : {},
         ...typeof v.permission.presses === "number" ? { presses: v.permission.presses } : {},
         ...v.permission.gaveUp === true ? { gaveUp: true } : {}
       }
@@ -11535,7 +11536,7 @@ function beatBody(state, flags, host = {}, cap = {}) {
     name: flags.name,
     os: host.os ?? process.platform,
     runner: flags.runner,
-    version: host.version ?? "0.1.53" ?? "dev",
+    version: host.version ?? "0.1.55" ?? "dev",
     running: live.length,
     items: live.slice(0, BEAT_ITEMS).map((r) => `${r.item}/${r.node}`),
     ...cap.atOnce !== undefined ? { atOnce: cap.atOnce } : {},
@@ -13207,9 +13208,12 @@ function sledsSource(client, o) {
       if (r.status >= 300 || !r.json || r.json.ok === false)
         throw new Error(serverMessage(r));
       const leaseUntil = typeof r.json.leaseUntil === "number" ? r.json.leaseUntil : undefined;
+      const resumed = r.json.resumed === true;
+      const seatFull = !resumed && typeof r.json.seatFull === "string" ? r.json.seatFull : "";
       return {
-        resumed: r.json.resumed === true,
-        ...leaseUntil !== undefined ? { leaseUntil } : {}
+        resumed,
+        ...leaseUntil !== undefined ? { leaseUntil } : {},
+        ...seatFull ? { seatFull } : {}
       };
     },
     async decisionOf(item, decisionId) {
@@ -13733,6 +13737,9 @@ function fingerprint(text) {
   }
   return (h >>> 0).toString(16);
 }
+function wordsPrint(screen) {
+  return fingerprint(stripTuiChrome(screen));
+}
 function sandboxFor(d, name, cwd, allow) {
   if (!d.sandbox)
     return {};
@@ -13877,14 +13884,18 @@ async function tickOnce(d) {
       try {
         open = runner.status(run.handle) === "running";
       } catch {}
-      if (open && await answeredInSession(d, runner, run)) {
-        keep.push(run);
+      if (!open && !liveAnswerer(run)) {
+        d.log(`${ref(run)}: the parked session closed — its answer will start a new one`);
         continue;
       }
-      if (open || liveAnswerer(run))
-        keep.push(run);
-      else
-        d.log(`${ref(run)}: the parked session closed — its answer will start a new one`);
+      if (await parkedBeat(d, run, claim) === "done") {
+        d.log(`${ref(run)}: no longer waits for an answer — its node was skipped`);
+        stopAnswerer(d, run);
+        continue;
+      }
+      if (open)
+        await answeredInSession(d, runner, run);
+      keep.push(run);
       continue;
     }
     if (run.pr) {
@@ -13999,7 +14010,7 @@ async function tickOnce(d) {
       if (beat === "parked") {
         const question = "the session parked itself; the question is on the route";
         d.log(`${ref(run)}: parked with a question — the session waits for the answer (${runner.watchHint(run.handle)})`);
-        holdParked(d, runner, run, question);
+        holdParked(d, runner, run, question, shown);
         finished.push({ item: run.item, node: run.node, outcome: { kind: "park", question } });
         keep.push(run);
         continue;
@@ -14034,7 +14045,7 @@ async function tickOnce(d) {
       }
       d.log(`${ref(run)}: ${why}, tries spent — parked for a person (${runner.watchHint(run.handle)})`);
       run.provider = undefined;
-      holdParked(d, runner, run, question);
+      holdParked(d, runner, run, question, shown);
       finished.push({ item: run.item, node: run.node, outcome });
       keep.push(run);
       continue;
@@ -14055,7 +14066,7 @@ async function tickOnce(d) {
         continue;
       }
       d.log(asked ? `${ref(run)}: stopped on a question with no PR — parked with its last message as the question (${runner.watchHint(run.handle)})` : `${ref(run)}: idle ${d.idleMin} min with no PR — parked with its last message as the question (${runner.watchHint(run.handle)})`);
-      holdParked(d, runner, run, question);
+      holdParked(d, runner, run, question, shown);
       finished.push({ item: run.item, node: run.node, outcome });
       keep.push(run);
       continue;
@@ -14081,7 +14092,25 @@ async function tickOnce(d) {
     state.decisions = kept;
     save();
   }
-  const items = await d.source.read();
+  let items;
+  try {
+    items = await d.source.read();
+  } catch (e) {
+    if (e instanceof SeatTokenError)
+      throw e;
+    save();
+    return {
+      started: [],
+      finished,
+      ...counts(state),
+      attention,
+      done: false,
+      items: [],
+      changes,
+      decisions: decided,
+      readFailed: message(e)
+    };
+  }
   const takeNone = seat.gone;
   for (const it of items)
     if (it.draft && !takeNone && !startsHeld(d))
@@ -14322,18 +14351,23 @@ async function tickOnce(d) {
     started.push({ item: claim.item, node: claim.node, watch, watchTarget: watchTarget(handle) });
   }
   const done = items.length > 0 && items.every((i) => i.landed) && state.runs.length === 0;
-  const following = state.runs.filter((r) => r.pr).length;
-  const parked = state.runs.filter((r) => r.parked).length;
   return {
     started,
     finished,
-    running: state.runs.length - following - parked,
-    following,
+    ...counts(state),
     attention,
     done,
     items,
     changes,
-    decisions: decided,
+    decisions: decided
+  };
+}
+function counts(state) {
+  const following = state.runs.filter((r) => r.pr).length;
+  const parked = state.runs.filter((r) => r.parked).length;
+  return {
+    running: state.runs.length - following - parked,
+    following,
     followed: state.runs.flatMap((r) => r.pr ? [{ item: r.item, node: r.node, url: r.pr.url, ...r.pr.ci ? { ci: r.pr.ci } : {} }] : [])
   };
 }
@@ -14409,7 +14443,7 @@ async function settlePermission(d, runner, run, shown) {
   const dialog = runner.readsSession ? permissionDialog(shown) : null;
   const p = run.permission;
   if (p) {
-    const gone = runner.readsSession && (p.onScreen ? !dialog || p.dialog !== undefined && dialogPrint(dialog) !== p.dialog : (run.seenAt ?? 0) > (p.pressedAt ?? p.at));
+    const gone = runner.readsSession && (p.onScreen ? !dialog || p.dialog !== undefined && dialogPrint(dialog) !== p.dialog || p.pressedOn !== undefined && fingerprint(shown) !== p.pressedOn : (run.seenAt ?? 0) > (p.pressedAt ?? p.at));
     const answered = () => {
       run.permission = undefined;
       run.answeredAt = d.now();
@@ -14440,7 +14474,12 @@ async function settlePermission(d, runner, run, shown) {
           if (!pressed)
             return true;
           if (pressed === "key") {
-            run.permission = { ...p, pressedAt: d.now(), presses: 1 };
+            run.permission = {
+              ...p,
+              pressedAt: d.now(),
+              pressedOn: fingerprint(shown),
+              presses: 1
+            };
             return true;
           }
         }
@@ -14467,7 +14506,12 @@ async function settlePermission(d, runner, run, shown) {
         return true;
       }
       if (pressAnswer(d, runner, run, p.options, now.answer) === "key")
-        run.permission = { ...p, pressedAt: d.now(), presses: presses + 1 };
+        run.permission = {
+          ...p,
+          pressedAt: d.now(),
+          pressedOn: fingerprint(shown),
+          presses: presses + 1
+        };
       return true;
     }
     if (now?.state !== "open" && now?.state !== "escalated") {
@@ -14776,8 +14820,12 @@ function stopOpen(d, run, runner) {
     d.log(`${ref(run)}: could not stop the left-open session: ${message(e)}`);
   }
 }
-function holdParked(d, runner, run, question) {
-  run.parked = { question, at: d.now(), ...run.seen ? { screen: run.seen } : {} };
+function holdParked(d, runner, run, question, shown) {
+  run.parked = {
+    question,
+    at: d.now(),
+    ...runner.readsSession ? { words: wordsPrint(shown) } : {}
+  };
   run.leaseUntil = undefined;
   setLane(d, runner, run.handle, "parked");
 }
@@ -14786,21 +14834,27 @@ async function answeredInSession(d, runner, run) {
   const resumes = resumesOf(d.source);
   if (!resumes || !runner.readsSession || !run.runId)
     return false;
-  let print;
+  let shown;
   try {
-    print = fingerprint(runner.read(run.handle));
+    shown = runner.read(run.handle);
   } catch {
     return false;
   }
-  if (print === parked.screen) {
-    parked.still = true;
-    return false;
+  const words = wordsPrint(shown);
+  const waiting = parked.seatFull !== undefined;
+  if (waiting) {
+    parked.words = words;
+  } else {
+    if (words === parked.words) {
+      parked.still = true;
+      return false;
+    }
+    const moved = parked.still === true;
+    parked.words = words;
+    parked.still = false;
+    if (!moved)
+      return false;
   }
-  const moved = parked.still === true;
-  parked.screen = print;
-  parked.still = false;
-  if (!moved)
-    return false;
   let r;
   try {
     r = await resumes.resumeParked(run.runId, "answered in the session", d.engine, d.leaseMin);
@@ -14808,14 +14862,21 @@ async function answeredInSession(d, runner, run) {
     d.log(`${ref(run)}: the parked session moved on, but SLEDS did not hear it: ${message(e)}`);
     return false;
   }
+  if (!r.resumed && r.seatFull) {
+    if (!waiting)
+      d.log(`${ref(run)}: answered in the session, but ${r.seatFull} — stays in Needs you until a slot frees`);
+    parked.seatFull = r.seatFull;
+    return false;
+  }
   if (!r.resumed) {
+    parked.seatFull = undefined;
     d.log(`${ref(run)}: the parked session moved on, but the node is no longer parked on its run`);
     return false;
   }
   stopAnswerer(d, run);
   const now = d.now();
   run.parked = undefined;
-  run.seen = print;
+  run.seen = fingerprint(shown);
   run.seenAt = now;
   run.seenTicks = 0;
   run.answeredAt = now;
@@ -15185,6 +15246,14 @@ async function endUnposted(d, answers, a, runner, at, over) {
     return false;
   }
 }
+async function parkedBeat(d, run, claim) {
+  try {
+    return await d.source.heartbeat(claim);
+  } catch (e) {
+    d.log(`${ref(run)}: heartbeat failed, retrying next tick: ${message(e)}`);
+    return "running";
+  }
+}
 function stopAnswerer(d, run) {
   const a = liveAnswerer(run);
   if (!a)
@@ -16287,6 +16356,41 @@ async function settleEvent(d, events, state, dec, attention, decided) {
 
 // src/commands/engine.ts
 init_machine();
+
+// src/engine/sledsBreaker.ts
+var SLEDS_DOWN_ERROR = "SledsDownError";
+function why(e) {
+  const name = e instanceof Error ? e.name : "";
+  return name === "TimeoutError" || name === "AbortError" ? "timed out" : "could not be reached";
+}
+function sledsBreaker(fetchFn = fetch) {
+  let down = null;
+  let pass = 0;
+  return {
+    async fetch(input, init) {
+      if (down !== null) {
+        const e = new Error(`skipped — SLEDS ${down} earlier this tick`);
+        e.name = SLEDS_DOWN_ERROR;
+        throw e;
+      }
+      const started = pass;
+      try {
+        return await fetchFn(input, init);
+      } catch (e) {
+        if (started === pass && down === null)
+          down = why(e);
+        throw e;
+      }
+    },
+    reset() {
+      down = null;
+      pass++;
+    },
+    tripped: () => down
+  };
+}
+
+// src/commands/engine.ts
 init_state();
 init_meter();
 
@@ -17410,7 +17514,7 @@ async function fetchVersion(o) {
   const platform = o.platform ?? process.platform;
   const arch = o.arch ?? process.arch;
   const publicKey = o.publicKey ?? RELEASE_PUBLIC_KEY;
-  const running = o.running ?? "0.1.53";
+  const running = o.running ?? "0.1.55";
   if (!publicKey)
     return { ok: false, why: "no release key yet" };
   if (!VERSION_RE2.test(o.version))
@@ -18985,7 +19089,7 @@ async function withProfile(client, flags, given, home, retry) {
 }
 var NOT_SET_UP2 = "SLEDS is not set up on this machine. Run `sleds init` first.";
 var ENGINE_TIMEOUT_MS = 15000;
-function engineClient(o, org) {
+function engineClient(o, org, breaker) {
   if (o.client)
     return o.client;
   const env = o.env ?? process.env;
@@ -18993,8 +19097,9 @@ function engineClient(o, org) {
   if (src)
     return fetchClient({
       ...src,
+      ...breaker ? { fetchFn: breaker.fetch } : {},
       timeoutMs: ENGINE_TIMEOUT_MS,
-      version: "0.1.53"
+      version: "0.1.55"
     });
   const asked = org?.trim() || env.SLEDS_ORG?.trim();
   if (asked && !selectOrg(readConfig(o.home), org, env).seat)
@@ -19012,9 +19117,9 @@ function engineOrg(o, flag) {
   known.delete(slug);
   return { slug, seated: Boolean(cfg.orgs?.[slug]), sole: known.size === 0 };
 }
-function orgClient(o, flag) {
+function orgClient(o, flag, breaker) {
   const org = engineOrg(o, flag);
-  return engineClient(o, org.seated ? org.slug ?? undefined : flag);
+  return engineClient(o, org.seated ? org.slug ?? undefined : flag, breaker);
 }
 function realPidAlive2(pid) {
   try {
@@ -19285,7 +19390,7 @@ async function driveEngine(o, flags, deps, until = {}) {
     runner: deps.runner.name,
     atOnce: flags.atOnce,
     interval: flags.interval,
-    cliVersion: "0.1.53"
+    cliVersion: "0.1.55"
   };
   const beat = (checkedAt) => {
     const m = deps.machine;
@@ -19366,35 +19471,42 @@ async function drive(o, flags, deps, until, beat) {
   await until.beforeFirstTick?.();
   for (;; ) {
     let report = null;
+    let why;
+    until.breaker?.reset();
     try {
       report = await tick(deps);
+      why = report.readFailed;
     } catch (e) {
+      why = e instanceof Error ? e.message : String(e);
+    }
+    if (why !== undefined) {
       down++;
-      const why = e instanceof Error ? e.message : String(e);
       if (down === 1 || flags.once)
         event({
           kind: "sleds-down",
           text: why,
           ...flags.once ? {} : { aside: `· retrying every ${flags.interval} s` }
         });
-      if (flags.once)
+      if (flags.once && !report)
         return 1;
     }
     beat(now());
-    const leave = await until.afterTick?.(report !== null);
+    const leave = await until.afterTick?.(report !== null && !report.readFailed);
     if (typeof leave === "number") {
       if (statusShown)
         write("\r\x1B[2K");
       return leave;
     }
     if (report) {
-      if (down > 0)
-        event({
-          kind: "sleds-back",
-          text: "back",
-          aside: `after ${down} failed ${down === 1 ? "read" : "reads"}`
-        });
-      down = 0;
+      if (!report.readFailed) {
+        if (down > 0)
+          event({
+            kind: "sleds-back",
+            text: "back",
+            aside: `after ${down} failed ${down === 1 ? "read" : "reads"}`
+          });
+        down = 0;
+      }
       running = report.running;
       if (report.seatChanged || report.tokenChanged) {
         if (statusShown)
@@ -19444,6 +19556,8 @@ async function drive(o, flags, deps, until, beat) {
           pr: a.url
         });
       }
+      if (flags.once && report.readFailed)
+        return 1;
       if (until.done && report.done) {
         if (statusShown)
           write("\r\x1B[2K");
@@ -21133,7 +21247,7 @@ async function withProfile2(client, flags, given, home, retry) {
 }
 var NOT_SET_UP3 = "SLEDS is not set up on this machine. Run `sleds init` first.";
 var ENGINE_TIMEOUT_MS2 = 15000;
-function engineClient2(o, org) {
+function engineClient2(o, org, breaker) {
   if (o.client)
     return o.client;
   const env = o.env ?? process.env;
@@ -21141,8 +21255,9 @@ function engineClient2(o, org) {
   if (src)
     return fetchClient({
       ...src,
+      ...breaker ? { fetchFn: breaker.fetch } : {},
       timeoutMs: ENGINE_TIMEOUT_MS2,
-      version: "0.1.53"
+      version: "0.1.55"
     });
   const asked = org?.trim() || env.SLEDS_ORG?.trim();
   if (asked && !selectOrg(readConfig(o.home), org, env).seat)
@@ -21160,9 +21275,9 @@ function engineOrg2(o, flag) {
   known.delete(slug);
   return { slug, seated: Boolean(cfg.orgs?.[slug]), sole: known.size === 0 };
 }
-function orgClient2(o, flag) {
+function orgClient2(o, flag, breaker) {
   const org = engineOrg2(o, flag);
-  return engineClient2(o, org.seated ? org.slug ?? undefined : flag);
+  return engineClient2(o, org.seated ? org.slug ?? undefined : flag, breaker);
 }
 async function jiraWritesAtStart(gate, epic) {
   const no = await gate.ask({
@@ -21468,7 +21583,7 @@ async function driveEngine2(o, flags, deps, until = {}) {
     runner: deps.runner.name,
     atOnce: flags.atOnce,
     interval: flags.interval,
-    cliVersion: "0.1.53"
+    cliVersion: "0.1.55"
   };
   const beat = (checkedAt) => {
     const m = deps.machine;
@@ -21549,35 +21664,42 @@ async function drive2(o, flags, deps, until, beat) {
   await until.beforeFirstTick?.();
   for (;; ) {
     let report = null;
+    let why;
+    until.breaker?.reset();
     try {
       report = await tick(deps);
+      why = report.readFailed;
     } catch (e) {
+      why = e instanceof Error ? e.message : String(e);
+    }
+    if (why !== undefined) {
       down++;
-      const why = e instanceof Error ? e.message : String(e);
       if (down === 1 || flags.once)
         event({
           kind: "sleds-down",
           text: why,
           ...flags.once ? {} : { aside: `· retrying every ${flags.interval} s` }
         });
-      if (flags.once)
+      if (flags.once && !report)
         return 1;
     }
     beat(now());
-    const leave = await until.afterTick?.(report !== null);
+    const leave = await until.afterTick?.(report !== null && !report.readFailed);
     if (typeof leave === "number") {
       if (statusShown)
         write("\r\x1B[2K");
       return leave;
     }
     if (report) {
-      if (down > 0)
-        event({
-          kind: "sleds-back",
-          text: "back",
-          aside: `after ${down} failed ${down === 1 ? "read" : "reads"}`
-        });
-      down = 0;
+      if (!report.readFailed) {
+        if (down > 0)
+          event({
+            kind: "sleds-back",
+            text: "back",
+            aside: `after ${down} failed ${down === 1 ? "read" : "reads"}`
+          });
+        down = 0;
+      }
       running = report.running;
       if (report.seatChanged || report.tokenChanged) {
         if (statusShown)
@@ -21627,6 +21749,8 @@ async function drive2(o, flags, deps, until, beat) {
           pr: a.url
         });
       }
+      if (flags.once && report.readFailed)
+        return 1;
       if (until.done && report.done) {
         if (statusShown)
           write("\r\x1B[2K");
@@ -21702,17 +21826,22 @@ var engineCmd = async (o) => {
     error(kept.refused);
     return 1;
   }
+  const breaker = sledsBreaker(o.fetch);
   let client;
   let pickup;
   if (!flags.jira && (o.client || !o.source)) {
-    const c = orgClient2(o, given);
+    const c = orgClient2(o, given, breaker);
     if ("error" in c) {
       error(c.error);
       return 1;
     }
     client = c;
+    const sleep = o.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
     const p = await withProfile2(c, flags, parsed.given, o.home, {
-      sleep: o.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)))
+      sleep: async (ms) => {
+        await sleep(ms);
+        breaker.reset();
+      }
     });
     flags = p.flags;
     pickup = p.pickup;
@@ -21748,7 +21877,7 @@ var engineCmd = async (o) => {
       error(missing);
       return 1;
     }
-    const c = o.client ?? orgClient2(o, given);
+    const c = o.client ?? orgClient2(o, given, breaker);
     if ("error" in c) {
       error(`--jira asks SLEDS before every write to Jira (spec 39), so it needs a seat: ${c.error}`);
       return 1;
@@ -21881,7 +22010,7 @@ var engineCmd = async (o) => {
     };
   }
   try {
-    return await driveEngine2(o, flags, deps, { afterTick, beforeFirstTick });
+    return await driveEngine2(o, flags, deps, { afterTick, beforeFirstTick, breaker });
   } finally {
     watch.stop();
   }
@@ -23556,7 +23685,7 @@ function contextFor(deps) {
     ...src,
     fetchFn: deps.fetchFn,
     timeoutMs: deps.timeoutMs,
-    version: "0.1.53"
+    version: "0.1.55"
   }), deps.home, now) : null;
   return {
     channel: "code",
@@ -26281,7 +26410,7 @@ function parseSeatRevokeArgs(argv) {
   }
   return { box, yes, json };
 }
-function why(j, status) {
+function why2(j, status) {
   if (typeof j?.reason === "string")
     return j.reason;
   if (typeof j?.error === "string")
@@ -26319,7 +26448,7 @@ async function seatRevokeCmd(o) {
     return ok ? 0 : 1;
   }
   if (!ok) {
-    error(clean(`nothing revoked — ${why(r.json, r.status)}`));
+    error(clean(`nothing revoked — ${why2(r.json, r.status)}`));
     return 1;
   }
   const label = typeof r.json?.label === "string" ? r.json.label : a.box ? `box:${a.box}` : "";
@@ -27674,7 +27803,7 @@ var realPidAlive4 = (pid) => {
 };
 function machineClient(home, env) {
   const src = meterSource(home, undefined, { env });
-  return src ? fetchClient({ ...src, version: "0.1.53" }) : null;
+  return src ? fetchClient({ ...src, version: "0.1.55" }) : null;
 }
 async function noteAnswer2(home, a, now) {
   try {
@@ -28534,7 +28663,7 @@ var main = async (argv) => {
     now: Date.now(),
     stderr: (line) => console.error(line),
     isTTY: !!process.stderr.isTTY,
-    version: "0.1.53"
+    version: "0.1.55"
   });
   switch (cmd) {
     case "update":
@@ -28767,7 +28896,7 @@ ${renderHelpText(argv[1])}`);
     case "version":
     case "--version":
     case "-v":
-      console.log("sleds 0.1.53");
+      console.log("sleds 0.1.55");
       return 0;
     default:
       console.error(`unknown command: ${cmd}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sleds/cli",
-  "version": "0.1.53",
+  "version": "0.1.55",
   "description": "SLEDS CLI — the cost and limits of AI agent work, decided at the wall. Point Claude Code at a SLEDS proxy; estimate before you run; hold, switch model, or run overnight when you hit a limit.",
   "license": "UNLICENSED",
   "type": "module",