@sleds/cli 0.1.52 → 0.1.53

package/dist/sleds.mjs

@@ -8601,6 +8601,7 @@ function parseRun(v) {
         options: Array.isArray(v.permission.options) ? v.permission.options.filter((x) => typeof x === "string") : [],
         at: v.permission.at,
         ...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.presses === "number" ? { presses: v.permission.presses } : {},
         ...v.permission.gaveUp === true ? { gaveUp: true } : {}
@@ -8615,12 +8616,21 @@ function parseRun(v) {
         feedback: typeof v.pr.feedback === "number" ? v.pr.feedback : 0,
         ...typeof v.pr.authorFeedback === "number" ? { authorFeedback: v.pr.authorFeedback } : {},
         ...typeof v.pr.selfNudges === "number" ? { selfNudges: v.pr.selfNudges } : {},
+        ...isObject8(v.pr.feedbackRead) && typeof v.pr.feedbackRead.updatedAt === "string" && typeof v.pr.feedbackRead.all === "number" && typeof v.pr.feedbackRead.author === "number" && typeof v.pr.feedbackRead.at === "number" ? {
+          feedbackRead: {
+            updatedAt: v.pr.feedbackRead.updatedAt,
+            all: v.pr.feedbackRead.all,
+            author: v.pr.feedbackRead.author,
+            at: v.pr.feedbackRead.at
+          }
+        } : {},
         ...v.pr.clear === true ? { clear: true } : {},
         ...typeof v.pr.ci === "string" ? { ci: v.pr.ci } : {},
         ...typeof v.pr.review === "string" ? { review: v.pr.review } : {},
         ...typeof v.pr.posted === "string" ? { posted: v.pr.posted } : {},
         ...Array.isArray(v.pr.failedHeads) ? { failedHeads: v.pr.failedHeads.filter((x) => typeof x === "string") } : {},
         ...typeof v.pr.conflict === "string" ? { conflict: v.pr.conflict } : {},
+        ...isObject8(v.pr.conflictCheck) && typeof v.pr.conflictCheck.head === "string" && typeof v.pr.conflictCheck.at === "number" ? { conflictCheck: { head: v.pr.conflictCheck.head, at: v.pr.conflictCheck.at } } : {},
         ...typeof v.pr.resolving === "string" ? { resolving: v.pr.resolving } : {},
         ...conflicted ? { conflicted } : {},
         ...typeof v.pr.reviewed === "string" ? { reviewed: v.pr.reviewed } : {},
@@ -10759,15 +10769,36 @@ var claudeAddDirFlag = (mainCheckout) => mainCheckout ? ` --add-dir=${shq(mainCh
 var shq = (s) => `'${s.replace(/'/g, `'\\''`)}'`;
 
 // src/runners/exec.ts
+var EXEC_TIMEOUT_MS = 2 * 60000;
+var EXEC_TIMEOUT_STATUS = 124;
+var timedOut = (r) => r.error?.code === "ETIMEDOUT";
+var logTimeouts = (exec, log) => (cmd, args, o) => {
+  const r = exec(cmd, args, o);
+  if (r.status === EXEC_TIMEOUT_STATUS && isTimeout(r.stderr))
+    log(`exec timed out: ${[cmd, ...args].join(" ")} — ${r.stderr.split(`
+`)[0]}`);
+  return r;
+};
 var defaultExec = (cmd, args, o) => {
+  const timeoutMs = o?.timeoutMs ?? EXEC_TIMEOUT_MS;
   const r = spawnSync3(cmd, [...args], {
     cwd: o?.cwd,
     input: o?.input,
     env: o?.env ? { ...process.env, ...o.env } : undefined,
     encoding: "utf8",
     shell: false,
-    maxBuffer: 16 * 1024 * 1024
+    maxBuffer: 16 * 1024 * 1024,
+    timeout: timeoutMs,
+    killSignal: "SIGKILL"
   });
+  if (timedOut(r)) {
+    return {
+      status: EXEC_TIMEOUT_STATUS,
+      stdout: r.stdout ?? "",
+      stderr: `${cmd}: timed out after ${timeoutMs / 1000}s and was killed${r.stderr ? `
+${r.stderr}` : ""}`
+    };
+  }
   if (r.error) {
     return { status: 127, stdout: r.stdout ?? "", stderr: `${cmd}: ${r.error.message}` };
   }
@@ -11436,14 +11467,7 @@ ${r.stdout}`) };
     sendKey(h, key) {
       if (!isRunnerKey(key))
         throw new Error(`orca terminal send ${h.id}: no key ${JSON.stringify(key)}`);
-      const what = `orca terminal send ${h.id} (key ${key})`;
-      const send = (args) => orca(["terminal", "send", "--terminal", h.id, ...args, "--json"], what);
-      if (key === "esc") {
-        send(["--text", ESC]);
-        return;
-      }
-      send(["--text", key]);
-      send(["--enter"]);
+      orca(["terminal", "send", "--terminal", h.id, "--text", key === "esc" ? ESC : key, "--json"], `orca terminal send ${h.id} (key ${key})`);
     },
     stop(h) {
       exec("orca", ["terminal", "close", "--terminal", h.id]);
@@ -11511,7 +11535,7 @@ function beatBody(state, flags, host = {}, cap = {}) {
     name: flags.name,
     os: host.os ?? process.platform,
     runner: flags.runner,
-    version: host.version ?? "0.1.52" ?? "dev",
+    version: host.version ?? "0.1.53" ?? "dev",
     running: live.length,
     items: live.slice(0, BEAT_ITEMS).map((r) => `${r.item}/${r.node}`),
     ...cap.atOnce !== undefined ? { atOnce: cap.atOnce } : {},
@@ -11911,6 +11935,7 @@ function parsePrView(stdout) {
     feedback: 0,
     authorFeedback: 0,
     draft: o.isDraft === true,
+    updatedAt: typeof o.updatedAt === "string" ? o.updatedAt : "",
     ...mock ? { mock } : {},
     ...typeof o.headRefOid === "string" && o.headRefOid ? { head: o.headRefOid } : {},
     ...typeof mergeCommit === "string" && mergeCommit ? { mergeCommit } : {}
@@ -11959,20 +11984,24 @@ function prFeedback(exec, repoPath, url, author) {
   }
   return total;
 }
-function prView(exec, repoPath, url) {
+function prView(exec, repoPath, url, last) {
   try {
     const r = exec("gh", [
       "pr",
       "view",
       url,
       "--json",
-      "state,author,statusCheckRollup,reviewDecision,comments,reviews,headRefOid,mergeable,baseRefName,mergeCommit,isDraft,body"
+      "state,author,statusCheckRollup,reviewDecision,headRefOid,mergeable,baseRefName,mergeCommit,isDraft,body,updatedAt"
     ], { cwd: repoPath });
     const view = r.status === 0 ? parsePrView(r.stdout) : null;
     if (!view || view.state !== "OPEN")
       return view;
-    const feedback = prFeedback(exec, repoPath, url, view.author);
-    return feedback === null ? view : { ...view, feedback: feedback.all, authorFeedback: feedback.author };
+    let read = view.updatedAt && last?.updatedAt === view.updatedAt ? last : undefined;
+    if (!read) {
+      const f = prFeedback(exec, repoPath, url, view.author);
+      read = f && { ...f, updatedAt: view.updatedAt };
+    }
+    return read ? { ...view, feedback: read.all, authorFeedback: read.author, read } : view;
   } catch {
     return null;
   }
@@ -13011,26 +13040,28 @@ function sledsSource(client, o) {
       });
       if (r?.status !== 409)
         return "running";
+      let route;
+      try {
+        route = await routeOf(claim.item);
+      } catch {
+        route = null;
+      }
+      if (!isObject8(route))
+        return "running";
       if (claim.kind === "draft") {
-        try {
-          const route = await routeOf(claim.item);
-          const filed = Array.isArray(route?.nodes) && route.nodes.length > 0;
-          if (filed || isObject8(route?.proposed))
-            return "done";
-          if (isObject8(route?.draftParked))
-            return "parked";
-        } catch {}
+        const filed = Array.isArray(route.nodes) && route.nodes.length > 0;
+        if (filed || isObject8(route.proposed))
+          return "done";
+        if (isObject8(route.draftParked))
+          return "parked";
         return "lost";
       }
-      try {
-        const route = await routeOf(claim.item);
-        const nodes = Array.isArray(route?.nodes) ? route.nodes.filter(isObject8) : [];
-        const state = nodes.find((n) => n.key === claim.node)?.state;
-        if (state === "parked")
-          return "parked";
-        if (state === "pr" || state === "landed" || state === "skipped")
-          return "done";
-      } catch {}
+      const nodes = Array.isArray(route.nodes) ? route.nodes.filter(isObject8) : [];
+      const state = nodes.find((n) => n.key === claim.node)?.state;
+      if (state === "parked")
+        return "parked";
+      if (state === "pr" || state === "landed" || state === "skipped")
+        return "done";
       return "lost";
     },
     async report(claim, outcome, by) {
@@ -13526,6 +13557,7 @@ function fastForwardUntouched(exec, path, base, log) {
     log?.(`${path}: fast-forwarded to origin/${base}`);
   return true;
 }
+var INSTALL_TIMEOUT_MS = 15 * 60000;
 var MANAGERS = new Set(["pnpm", "npm", "yarn", "bun"]);
 var INSTALL_VERBS = new Set(["install", "i", "ci"]);
 function installArgv(command) {
@@ -13617,7 +13649,7 @@ function ensureInstalled(exec, path, fs, o = {}) {
     return null;
   const [cmd, ...args] = argv;
   o.log?.(`${path}: no node_modules — running ${argv.join(" ")}`);
-  const r = exec(cmd, args, { cwd: path });
+  const r = exec(cmd, args, { cwd: path, timeoutMs: INSTALL_TIMEOUT_MS });
   const ok = r.status === 0;
   if (!ok)
     o.log?.(`${path}: ${argv.join(" ")} failed (exit ${r.status}) — the session starts anyway: ${(r.stderr || r.stdout).trim().split(`
@@ -14364,6 +14396,10 @@ function permissionKey(answer) {
   const m = /^\s*(\d|esc)\s*·/i.exec(answer);
   return m ? m[1].toLowerCase() : null;
 }
+function dialogPrint(dialog) {
+  return [dialog.text, ...dialog.options.map((o) => `${o.key} · ${o.label}`)].join(`
+`);
+}
 async function settlePermission(d, runner, run, shown) {
   const perms = permissionsOf(d.source);
   if (!perms || !run.runId)
@@ -14373,19 +14409,20 @@ 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 : (run.seenAt ?? 0) > (p.pressedAt ?? p.at));
+    const gone = runner.readsSession && (p.onScreen ? !dialog || p.dialog !== undefined && dialogPrint(dialog) !== p.dialog : (run.seenAt ?? 0) > (p.pressedAt ?? p.at));
     const answered = () => {
       run.permission = undefined;
       run.answeredAt = d.now();
       if (markFile)
         clearPermissionMark(markFile);
     };
+    const next = (held) => dialog ? settlePermission(d, runner, run, shown) : held;
     if (p.gaveUp) {
       if (!gone)
         return true;
       d.log(`${at}: the permission dialog was answered in the terminal`);
       answered();
-      return false;
+      return next(false);
     }
     let now;
     try {
@@ -14408,13 +14445,13 @@ async function settlePermission(d, runner, run, shown) {
           }
         }
         answered();
-        return true;
+        return gone ? next(true) : true;
       }
       const key = permissionKey(now.answer) ?? now.answer;
       if (gone) {
         d.log(`${at}: the permission is answered — pressed ${key}; the session goes on`);
         answered();
-        return false;
+        return next(false);
       }
       const presses = p.presses ?? 1;
       if (presses >= PRESS_TRIES) {
@@ -14447,7 +14484,7 @@ async function settlePermission(d, runner, run, shown) {
     }
     d.log(`${at}: the permission dialog closed before an answer — cleared`);
     run.permission = undefined;
-    return false;
+    return next(false);
   }
   let mark = markFile ? readPermissionMark(markFile) : null;
   if (mark && markFile && (!isToolPermission(mark.message) || runner.readsSession && choicePicker(shown))) {
@@ -14473,7 +14510,7 @@ async function settlePermission(d, runner, run, shown) {
     decisionId: opened.decisionId,
     options,
     at: d.now(),
-    ...dialog ? { onScreen: true } : {}
+    ...dialog ? { onScreen: true, dialog: dialogPrint(dialog) } : {}
   };
   if (markFile)
     clearPermissionMark(markFile);
@@ -15361,6 +15398,8 @@ function ciNudge(url, failing) {
   return `CI failed on your PR (${failing.join(", ")}): ${url}. Read the failing logs (gh pr checks ${url}), fix the cause, run the repo's gate, and push to the same branch.`;
 }
 var SELF_NUDGES = 2;
+var FEEDBACK_REREAD_MS = 10 * 60000;
+var CONFLICT_RECHECK_MS = 10 * 60000;
 function reviewNudge(url, count) {
   return `New review feedback on your PR (${count} ${count === 1 ? "comment" : "comments"} from people so far): ${url}. Read all of it (gh pr view ${url} --comments, and the inline threads), answer each comment on its own thread with the fix or a reasoned reply, push, and leave the threads for the reviewer to resolve. End every comment and reply you post on the PR with the line ${ENGINE_MARK} so the engine knows it is yours and not the reviewer's.`;
 }
@@ -15401,9 +15440,12 @@ async function judgeLook(d, run, view) {
 }
 async function follow(d, state, run, claim, runner, finished, attention, changes, decided) {
   const pr = run.pr;
-  const view = d.prView(d.exec, run.repoPath, pr.url);
+  const last = pr.feedbackRead && d.now() - pr.feedbackRead.at < FEEDBACK_REREAD_MS ? pr.feedbackRead : undefined;
+  const view = d.prView(d.exec, run.repoPath, pr.url, last);
   if (!view)
     return true;
+  if (view.read && view.read !== last)
+    pr.feedbackRead = { ...view.read, at: d.now() };
   await judgeLook(d, run, view);
   if (view.state === "MERGED") {
     await dropPermission(d, run, "the PR merged");
@@ -15457,6 +15499,7 @@ async function follow(d, state, run, claim, runner, finished, attention, changes
   else if (view.mergeable === "MERGEABLE") {
     pr.resolving = undefined;
     pr.conflicted = undefined;
+    pr.conflictCheck = undefined;
   }
   if (view.feedback > pr.feedback) {
     const what = `${view.feedback - pr.feedback} new review comment(s)`;
@@ -15696,10 +15739,15 @@ async function judgeConflict(d, state, run, view, attention, decided) {
   const pr = run.pr;
   if (!d.mergeTree)
     return;
+  const check = pr.conflictCheck;
+  if (view.head && check?.head === view.head && !pr.resolving && d.now() - check.at < CONFLICT_RECHECK_MS)
+    return;
   const base = view.base || d.defaultBranch(d.exec, run.repoPath);
   const mt = d.mergeTree(d.exec, run.repoPath, base, run.branch);
   if (!mt)
     return;
+  if (view.head)
+    pr.conflictCheck = { head: view.head, at: d.now() };
   if (pr.resolving === mt.sha && mt.files.length > 0 && !sessionRuns(d, run.handle)) {
     pr.resolving = undefined;
     const what = `${pr.url} still conflicts with ${base} on ${mt.files.join(", ")} after its session had the brief`;
@@ -17362,7 +17410,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.52";
+  const running = o.running ?? "0.1.53";
   if (!publicKey)
     return { ok: false, why: "no release key yet" };
   if (!VERSION_RE2.test(o.version))
@@ -18946,7 +18994,7 @@ function engineClient(o, org) {
     return fetchClient({
       ...src,
       timeoutMs: ENGINE_TIMEOUT_MS,
-      version: "0.1.52"
+      version: "0.1.53"
     });
   const asked = org?.trim() || env.SLEDS_ORG?.trim();
   if (asked && !selectOrg(readConfig(o.home), org, env).seat)
@@ -19011,10 +19059,10 @@ function engineToken(o, org) {
 }
 var withToken = (token, now) => token ? { token, tokenNow: now } : {};
 function engineDeps(o, flags, source, runner, stateName) {
-  const exec = guardGit(o.exec ?? defaultExec);
+  const log = o.log ?? console.log;
+  const exec = logTimeouts(guardGit(o.exec ?? defaultExec), log);
   const cwd = o.cwd ?? process.cwd();
   const exists = o.exists ?? realExists;
-  const log = o.log ?? console.log;
   const stateDir = engineStateDir(o, flags.org, flags.seat);
   const file = statePath(stateDir, stateName);
   const mcpOrg = flags.org && engineOrg(o, flags.org).seated ? flags.org : undefined;
@@ -19237,7 +19285,7 @@ async function driveEngine(o, flags, deps, until = {}) {
     runner: deps.runner.name,
     atOnce: flags.atOnce,
     interval: flags.interval,
-    cliVersion: "0.1.52"
+    cliVersion: "0.1.53"
   };
   const beat = (checkedAt) => {
     const m = deps.machine;
@@ -19429,7 +19477,7 @@ async function drive(o, flags, deps, until, beat) {
 var SEAT_CHANGED_EXIT = 3;
 function engineRunner(o, flags) {
   const runnerFor = o.runnerFor ?? runnerFor2;
-  return runnerFor(flags.runner, guardGit(o.exec ?? defaultExec), {
+  return runnerFor(flags.runner, logTimeouts(guardGit(o.exec ?? defaultExec), o.log ?? console.log), {
     ...flags.runnerCmd ? { command: flags.runnerCmd } : {}
   });
 }
@@ -21094,7 +21142,7 @@ function engineClient2(o, org) {
     return fetchClient({
       ...src,
       timeoutMs: ENGINE_TIMEOUT_MS2,
-      version: "0.1.52"
+      version: "0.1.53"
     });
   const asked = org?.trim() || env.SLEDS_ORG?.trim();
   if (asked && !selectOrg(readConfig(o.home), org, env).seat)
@@ -21181,10 +21229,10 @@ function engineCredential(o) {
   })?.kind;
 }
 function engineDeps2(o, flags, source, runner, stateName) {
-  const exec = guardGit(o.exec ?? defaultExec);
+  const log = o.log ?? console.log;
+  const exec = logTimeouts(guardGit(o.exec ?? defaultExec), log);
   const cwd = o.cwd ?? process.cwd();
   const exists = o.exists ?? realExists2;
-  const log = o.log ?? console.log;
   const stateDir = engineStateDir2(o, flags.org, flags.seat);
   const file = statePath(stateDir, stateName);
   const mcpOrg = flags.org && engineOrg2(o, flags.org).seated ? flags.org : undefined;
@@ -21420,7 +21468,7 @@ async function driveEngine2(o, flags, deps, until = {}) {
     runner: deps.runner.name,
     atOnce: flags.atOnce,
     interval: flags.interval,
-    cliVersion: "0.1.52"
+    cliVersion: "0.1.53"
   };
   const beat = (checkedAt) => {
     const m = deps.machine;
@@ -21612,7 +21660,7 @@ async function drive2(o, flags, deps, until, beat) {
 var SEAT_CHANGED_EXIT2 = 3;
 function engineRunner2(o, flags) {
   const runnerFor = o.runnerFor ?? runnerFor2;
-  return runnerFor(flags.runner, guardGit(o.exec ?? defaultExec), {
+  return runnerFor(flags.runner, logTimeouts(guardGit(o.exec ?? defaultExec), o.log ?? console.log), {
     ...flags.runnerCmd ? { command: flags.runnerCmd } : {}
   });
 }
@@ -23508,7 +23556,7 @@ function contextFor(deps) {
     ...src,
     fetchFn: deps.fetchFn,
     timeoutMs: deps.timeoutMs,
-    version: "0.1.52"
+    version: "0.1.53"
   }), deps.home, now) : null;
   return {
     channel: "code",
@@ -26095,14 +26143,17 @@ async function sledOff(client, key, json, log, error) {
     return 0;
   }
   const k = typeof r.json?.key === "string" ? r.json.key : key;
+  const why = typeof r.json?.why === "string" && r.json.why.trim() ? r.json.why : null;
   if (r.json?.changed === false) {
-    log(`${k} was not on a sled`);
-    return 0;
+    error(why ?? `${k} was not on a sled`);
+    return 1;
   }
   log(`${k} is off your sled — back in the pool`);
   const running = typeof r.json?.running === "number" ? r.json.running : 0;
   if (running > 0)
     log(`${running} running node${running === 1 ? "" : "s"} stopped`);
+  if (why)
+    log(why);
   return 0;
 }
 
@@ -27623,7 +27674,7 @@ var realPidAlive4 = (pid) => {
 };
 function machineClient(home, env) {
   const src = meterSource(home, undefined, { env });
-  return src ? fetchClient({ ...src, version: "0.1.52" }) : null;
+  return src ? fetchClient({ ...src, version: "0.1.53" }) : null;
 }
 async function noteAnswer2(home, a, now) {
   try {
@@ -28093,15 +28144,29 @@ var readConfig2 = (home) => {
 
 // src/runners/exec.ts
 import { spawn as spawn3, spawnSync as spawnSync10 } from "node:child_process";
+var EXEC_TIMEOUT_MS2 = 2 * 60000;
+var EXEC_TIMEOUT_STATUS2 = 124;
+var timedOut2 = (r) => r.error?.code === "ETIMEDOUT";
 var defaultExec4 = (cmd, args, o) => {
+  const timeoutMs = o?.timeoutMs ?? EXEC_TIMEOUT_MS2;
   const r = spawnSync10(cmd, [...args], {
     cwd: o?.cwd,
     input: o?.input,
     env: o?.env ? { ...process.env, ...o.env } : undefined,
     encoding: "utf8",
     shell: false,
-    maxBuffer: 16 * 1024 * 1024
+    maxBuffer: 16 * 1024 * 1024,
+    timeout: timeoutMs,
+    killSignal: "SIGKILL"
   });
+  if (timedOut2(r)) {
+    return {
+      status: EXEC_TIMEOUT_STATUS2,
+      stdout: r.stdout ?? "",
+      stderr: `${cmd}: timed out after ${timeoutMs / 1000}s and was killed${r.stderr ? `
+${r.stderr}` : ""}`
+    };
+  }
   if (r.error) {
     return { status: 127, stdout: r.stdout ?? "", stderr: `${cmd}: ${r.error.message}` };
   }
@@ -28469,7 +28534,7 @@ var main = async (argv) => {
     now: Date.now(),
     stderr: (line) => console.error(line),
     isTTY: !!process.stderr.isTTY,
-    version: "0.1.52"
+    version: "0.1.53"
   });
   switch (cmd) {
     case "update":
@@ -28702,7 +28767,7 @@ ${renderHelpText(argv[1])}`);
     case "version":
     case "--version":
     case "-v":
-      console.log("sleds 0.1.52");
+      console.log("sleds 0.1.53");
       return 0;
     default:
       console.error(`unknown command: ${cmd}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sleds/cli",
-  "version": "0.1.52",
+  "version": "0.1.53",
   "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",