@sleds/cli 0.1.55 → 0.1.56

package/dist/sleds.mjs

@@ -2565,9 +2565,18 @@ ${rows.map((r) => statusLine(r, now)).join(`
 
 `)}${more}`;
 }
+function mineSection(rows, now, count) {
+  if (rows.length === 0)
+    return null;
+  return `On your sled (${count ?? rows.length}):
+
+${rows.map((r) => statusLine(r, now)).join(`
+
+`)}`;
+}
 function sledText(s, now) {
   const parts = [
-    section("On your sled", s.mine, now),
+    mineSection(s.mine, now, s.mineCount),
     section("Proposed to you", s.proposed, now, s.proposedCount),
     section("Sent to you", s.sent, now)
   ].filter((p) => p !== null);
@@ -3519,6 +3528,7 @@ async function sledTool(ctx, args) {
   return {
     text: sledText({
       mine: rows("mine"),
+      ...typeof r.mineCount === "number" ? { mineCount: r.mineCount } : {},
       proposed: rows("proposed"),
       ...typeof r.proposedCount === "number" ? { proposedCount: r.proposedCount } : {},
       sent: rows("sent")
@@ -11536,7 +11546,7 @@ function beatBody(state, flags, host = {}, cap = {}) {
     name: flags.name,
     os: host.os ?? process.platform,
     runner: flags.runner,
-    version: host.version ?? "0.1.55" ?? "dev",
+    version: host.version ?? "0.1.56" ?? "dev",
     running: live.length,
     items: live.slice(0, BEAT_ITEMS).map((r) => `${r.item}/${r.node}`),
     ...cap.atOnce !== undefined ? { atOnce: cap.atOnce } : {},
@@ -11937,6 +11947,7 @@ function parsePrView(stdout) {
     authorFeedback: 0,
     draft: o.isDraft === true,
     updatedAt: typeof o.updatedAt === "string" ? o.updatedAt : "",
+    queued: typeof o.autoMergeRequest === "object" && o.autoMergeRequest !== null,
     ...mock ? { mock } : {},
     ...typeof o.headRefOid === "string" && o.headRefOid ? { head: o.headRefOid } : {},
     ...typeof mergeCommit === "string" && mergeCommit ? { mergeCommit } : {}
@@ -11985,6 +11996,27 @@ function prFeedback(exec, repoPath, url, author) {
   }
   return total;
 }
+var MERGE_QUEUE_QUERY = "query($url: URI!) { resource(url: $url) { ... on PullRequest { mergeQueueEntry { state } } } }";
+function prInMergeQueue(exec, repoPath, url) {
+  try {
+    const r = exec("gh", [
+      "api",
+      "graphql",
+      "-f",
+      `query=${MERGE_QUEUE_QUERY}`,
+      "-f",
+      `url=${url}`,
+      "--jq",
+      ".data.resource.mergeQueueEntry != null"
+    ], { cwd: repoPath });
+    if (r.status !== 0)
+      return null;
+    const out = r.stdout.trim();
+    return out === "true" ? true : out === "false" ? false : null;
+  } catch {
+    return null;
+  }
+}
 function prView(exec, repoPath, url, last) {
   try {
     const r = exec("gh", [
@@ -11992,11 +12024,13 @@ function prView(exec, repoPath, url, last) {
       "view",
       url,
       "--json",
-      "state,author,statusCheckRollup,reviewDecision,headRefOid,mergeable,baseRefName,mergeCommit,isDraft,body,updatedAt"
+      "state,author,statusCheckRollup,reviewDecision,headRefOid,mergeable,baseRefName,mergeCommit,isDraft,body,updatedAt,autoMergeRequest"
     ], { cwd: repoPath });
-    const view = r.status === 0 ? parsePrView(r.stdout) : null;
-    if (!view || view.state !== "OPEN")
-      return view;
+    const parsed = r.status === 0 ? parsePrView(r.stdout) : null;
+    if (!parsed || parsed.state !== "OPEN")
+      return parsed;
+    const ready = !parsed.queued && parsed.failing.length === 0 && parsed.pending === 0 && parsed.reviewDecision === "APPROVED";
+    const view = ready && prInMergeQueue(exec, repoPath, url) === true ? { ...parsed, queued: true } : parsed;
     let read = view.updatedAt && last?.updatedAt === view.updatedAt ? last : undefined;
     if (!read) {
       const f = prFeedback(exec, repoPath, url, view.author);
@@ -15589,16 +15623,22 @@ async function follow(d, state, run, claim, runner, finished, attention, changes
   pr.failing = view.failing;
   pr.feedback = Math.max(pr.feedback, view.feedback);
   pr.authorFeedback = Math.max(pr.authorFeedback ?? 0, view.authorFeedback) || undefined;
-  const clear = view.failing.length === 0 && view.pending === 0 && view.reviewDecision === "APPROVED";
+  const queued = view.queued;
+  if (queued && !pr.queued)
+    d.log(`${ref(run)}: ${pr.url} is queued to merge`);
+  else if (!queued && pr.queued)
+    d.log(`${ref(run)}: ${pr.url} left the merge queue`);
+  pr.queued = queued || undefined;
+  const clear = view.failing.length === 0 && view.pending === 0 && view.reviewDecision === "APPROVED" && !queued;
   if (clear && !pr.clear) {
     d.log(`${ref(run)}: ${pr.url} is green and approved — ready for your merge call`);
     attention.push({ ...at, what: "green and approved: ready for a merge" });
   }
   pr.clear = clear;
   const prRead = d.source.prRead;
-  const posted = `${ci}|${review}|${clear}`;
+  const posted = `${ci}|${review}|${clear}|${queued}`;
   if (prRead && posted !== pr.posted) {
-    const read = { ci, ...review ? { review } : {}, clear };
+    const read = { ci, ...review ? { review } : {}, clear, queued };
     if (await prRead.call(d.source, run.item, run.node, read))
       pr.posted = posted;
   }
@@ -17514,7 +17554,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.55";
+  const running = o.running ?? "0.1.56";
   if (!publicKey)
     return { ok: false, why: "no release key yet" };
   if (!VERSION_RE2.test(o.version))
@@ -19099,7 +19139,7 @@ function engineClient(o, org, breaker) {
       ...src,
       ...breaker ? { fetchFn: breaker.fetch } : {},
       timeoutMs: ENGINE_TIMEOUT_MS,
-      version: "0.1.55"
+      version: "0.1.56"
     });
   const asked = org?.trim() || env.SLEDS_ORG?.trim();
   if (asked && !selectOrg(readConfig(o.home), org, env).seat)
@@ -19390,7 +19430,7 @@ async function driveEngine(o, flags, deps, until = {}) {
     runner: deps.runner.name,
     atOnce: flags.atOnce,
     interval: flags.interval,
-    cliVersion: "0.1.55"
+    cliVersion: "0.1.56"
   };
   const beat = (checkedAt) => {
     const m = deps.machine;
@@ -21257,7 +21297,7 @@ function engineClient2(o, org, breaker) {
       ...src,
       ...breaker ? { fetchFn: breaker.fetch } : {},
       timeoutMs: ENGINE_TIMEOUT_MS2,
-      version: "0.1.55"
+      version: "0.1.56"
     });
   const asked = org?.trim() || env.SLEDS_ORG?.trim();
   if (asked && !selectOrg(readConfig(o.home), org, env).seat)
@@ -21583,7 +21623,7 @@ async function driveEngine2(o, flags, deps, until = {}) {
     runner: deps.runner.name,
     atOnce: flags.atOnce,
     interval: flags.interval,
-    cliVersion: "0.1.55"
+    cliVersion: "0.1.56"
   };
   const beat = (checkedAt) => {
     const m = deps.machine;
@@ -22782,6 +22822,7 @@ function engineStatus(i) {
         failing: r.pr.failing,
         ...opt("review", r.pr.review || undefined),
         mergeable: r.pr.clear === true,
+        queued: r.pr.queued === true,
         ...opt("conflict", conflictOf(r, i.state.decisions, i.watchOf))
       });
       continue;
@@ -22859,7 +22900,7 @@ function statusLines(s, now) {
     lines.push(`  ${r.item}/${r.node}  ${r.title}  · ${r.answerer ? `parked, the decider answers${r.answerer.model ? ` on ${r.answerer.model}` : ""}${r.answerer.effort ? ` · ${r.answerer.effort}` : ""}` : r.parked ? "parked, waiting for your answer" : ago(r.startedAt)} · watch: ${r.watch}`);
   lines.push(`following ${s.following.length}`);
   for (const f of s.following) {
-    lines.push(`  ${f.item}/${f.node}  ${f.pr}${f.checks ? `  checks ${f.checks}` : ""}${f.review ? ` · ${f.review}` : ""}${f.mergeable ? " · ready for your merge" : ""}`);
+    lines.push(`  ${f.item}/${f.node}  ${f.pr}${f.checks ? `  checks ${f.checks}` : ""}${f.review ? ` · ${f.review}` : ""}${f.mergeable ? " · ready for your merge" : ""}${f.queued ? " · queued to merge" : ""}`);
     const c = f.conflict;
     if (c)
       lines.push(`    conflict on ${c.files.join(", ")}${c.cause ? ` · ${c.cause}` : ""} · ${CONFLICT_STAGE[c.stage]} · since ${ago(c.since)} ago${c.watch ? ` · watch: ${c.watch}` : ""}`);
@@ -23685,7 +23726,7 @@ function contextFor(deps) {
     ...src,
     fetchFn: deps.fetchFn,
     timeoutMs: deps.timeoutMs,
-    version: "0.1.55"
+    version: "0.1.56"
   }), deps.home, now) : null;
   return {
     channel: "code",
@@ -27803,7 +27844,7 @@ var realPidAlive4 = (pid) => {
 };
 function machineClient(home, env) {
   const src = meterSource(home, undefined, { env });
-  return src ? fetchClient({ ...src, version: "0.1.55" }) : null;
+  return src ? fetchClient({ ...src, version: "0.1.56" }) : null;
 }
 async function noteAnswer2(home, a, now) {
   try {
@@ -28663,7 +28704,7 @@ var main = async (argv) => {
     now: Date.now(),
     stderr: (line) => console.error(line),
     isTTY: !!process.stderr.isTTY,
-    version: "0.1.55"
+    version: "0.1.56"
   });
   switch (cmd) {
     case "update":
@@ -28896,7 +28937,7 @@ ${renderHelpText(argv[1])}`);
     case "version":
     case "--version":
     case "-v":
-      console.log("sleds 0.1.55");
+      console.log("sleds 0.1.56");
       return 0;
     default:
       console.error(`unknown command: ${cmd}

package/package.json

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