@sleds/cli 0.1.45 → 0.1.46

package/dist/sleds.mjs

@@ -11131,7 +11131,7 @@ function beatBody(state, flags, host = {}, cap = {}) {
     name: flags.name,
     os: host.os ?? process.platform,
     runner: flags.runner,
-    version: host.version ?? "0.1.45" ?? "dev",
+    version: host.version ?? "0.1.46" ?? "dev",
     running: live.length,
     items: live.slice(0, BEAT_ITEMS).map((r) => `${r.item}/${r.node}`),
     ...cap.atOnce !== undefined ? { atOnce: cap.atOnce } : {},
@@ -12322,21 +12322,17 @@ async function readProfile(client) {
 }
 function nextPickup(r, o) {
   const mine = Array.isArray(r.mine) ? r.mine.filter(isObject8) : [];
-  let running = 0;
   for (const row of mine) {
     const route = row.route;
-    if (isObject8(route) && route.drafting === true)
-      running++;
-    if (!isObject8(route) || !isObject8(route.armed))
+    if (!isObject8(route) || !armedFor(route.armed, o.engine))
       continue;
     const states = isObject8(route.states) ? route.states : {};
-    running += keysIn(states, "running").length;
-    if (!armedFor(route.armed, o.engine) || statesLanded(states))
+    if (statesLanded(states))
       continue;
     if (strings(route.ready).length > 0)
       return null;
   }
-  if (running >= o.atOnce)
+  if (sledRunning(mine) >= o.atOnce)
     return null;
   for (const row of mine) {
     const route = row.route;
@@ -12352,6 +12348,33 @@ function nextPickup(r, o) {
   }
   return null;
 }
+function sledRunning(r) {
+  const mine = Array.isArray(r) ? r : Array.isArray(r.mine) ? r.mine.filter(isObject8) : [];
+  let running = 0;
+  for (const row of mine) {
+    const route = row.route;
+    if (isObject8(route) && route.drafting === true)
+      running++;
+    if (!isObject8(route) || !isObject8(route.armed))
+      continue;
+    running += keysIn(isObject8(route.states) ? route.states : {}, "running").length;
+  }
+  return running;
+}
+function armedDrafts(r, engine) {
+  const mine = Array.isArray(r.mine) ? r.mine.filter(isObject8) : [];
+  return mine.filter((row) => {
+    const route = row.route;
+    if (!isObject8(route) || !armedFor(route.armed, engine) || route.implicit !== true)
+      return false;
+    if (route.drafting === true || route.proposed === true || route.draftParked)
+      return false;
+    if (strings(route.needsRoute).length === 0 || isPrMirror(row.source))
+      return false;
+    const states = isObject8(route.states) ? route.states : {};
+    return !statesLanded(states) && keysIn(states, "running").length === 0;
+  });
+}
 function redraftDue(route) {
   return isObject8(route) && isObject8(route.redraft) && route.drafting !== true && route.proposed !== true;
 }
@@ -12365,14 +12388,15 @@ function routeText(route, states) {
 }
 function sledsSource(client, o) {
   const routeOf = (q) => client.get(`/proxy/route?q=${encodeURIComponent(q)}`);
-  async function pickup(sled) {
+  async function pickup(sled, drafted) {
     const engine = o.engine;
     const profile = await readProfile(client);
     if (profile?.pickup !== "auto")
       return null;
     if (profile.engine && !sameEngine(profile.engine, engine))
       return null;
-    const row = nextPickup(sled, { atOnce: o.atOnce ?? profile.atOnce ?? 1, engine });
+    const atOnce = (o.atOnce ?? profile.atOnce ?? 1) - drafted;
+    const row = nextPickup(sled, { atOnce, engine });
     if (!row)
       return null;
     const item = str6(row.key) ?? String(row.project);
@@ -12400,7 +12424,7 @@ function sledsSource(client, o) {
       ...armedTerms(armed)
     };
   }
-  async function draft(row, item, why) {
+  async function draft(row, item, why, started = false) {
     const project = str6(row.project) ?? item;
     const pending = isObject8(row.route) && isObject8(row.route.redraft) ? row.route.redraft : null;
     const runner = typeof o.runner === "function" ? o.runner() : o.runner;
@@ -12412,7 +12436,7 @@ function sledsSource(client, o) {
       ...o.leaseMin !== undefined ? { leaseMin: o.leaseMin } : {}
     });
     if (!r || r.status >= 300 || !r.json || r.json.ok === false) {
-      o.log?.(`${pending ? `${item}: could not claim the re-draft` : `Pickup: Auto could not claim ${item} for drafting`} — ${r ? serverMessage(r) : UNREACHABLE2}`);
+      o.log?.(`${pending ? `${item}: could not claim the re-draft` : started ? `${item}: Start could not claim it for drafting` : `Pickup: Auto could not claim ${item} for drafting`} — ${r ? serverMessage(r) : UNREACHABLE2}`);
       return null;
     }
     const j = r.json;
@@ -12434,7 +12458,7 @@ function sledsSource(client, o) {
         route: routeText(brief, isObject8(row.route) ? row.route.states : null)
       };
     }
-    o.log?.(redraft ? `${item}: re-drafting the route from ${redraft.by}'s answer — it waits for a yes` : `Pickup: Auto is drafting ${item}'s route first (${why.join(", ")}) — it waits for a yes`);
+    o.log?.(redraft ? `${item}: re-drafting the route from ${redraft.by}'s answer — it waits for a yes` : `${started ? `${item}: Start` : "Pickup: Auto"} is drafting ${started ? "its" : `${item}'s`} route first (${why.join(", ")}) — it waits for a yes`);
     const leaseUntil = num5(j.leaseUntil);
     const claim = {
       item,
@@ -12474,7 +12498,28 @@ function sledsSource(client, o) {
           if (claimed?.draft && it)
             it.draft = claimed.draft;
         }
-        const picked = await pickup(r);
+        const waiting = armedDrafts(r, o.engine);
+        let drafted = 0;
+        if (waiting.length > 0) {
+          const cap = o.atOnce ?? (await readProfile(client))?.atOnce ?? 1;
+          let room = cap - sledRunning(r);
+          for (const row of waiting) {
+            const item = str6(row.key) ?? String(row.project);
+            const it = items.find((x) => x.item === item);
+            if (it)
+              it.ready = [];
+            if (room <= 0)
+              continue;
+            const route = isObject8(row.route) ? row.route : {};
+            const claimed = await draft(row, item, strings(route.needsRoute), true);
+            if (claimed?.draft && it) {
+              it.draft = claimed.draft;
+              drafted++;
+              room--;
+            }
+          }
+        }
+        const picked = await pickup(r, drafted);
         if (picked)
           items.push(picked);
       }
@@ -17001,7 +17046,7 @@ async function driveEngine(o, flags, deps, until = {}) {
     runner: deps.runner.name,
     atOnce: flags.atOnce,
     interval: flags.interval,
-    cliVersion: "0.1.45"
+    cliVersion: "0.1.46"
   };
   const beat = (checkedAt) => {
     const m = deps.machine;
@@ -19138,7 +19183,7 @@ async function driveEngine2(o, flags, deps, until = {}) {
     runner: deps.runner.name,
     atOnce: flags.atOnce,
     interval: flags.interval,
-    cliVersion: "0.1.45"
+    cliVersion: "0.1.46"
   };
   const beat = (checkedAt) => {
     const m = deps.machine;
@@ -25790,7 +25835,7 @@ ${renderHelpText(argv[1])}`);
     case "version":
     case "--version":
     case "-v":
-      console.log("sleds 0.1.45");
+      console.log("sleds 0.1.46");
       return 0;
     default:
       console.error(`unknown command: ${cmd}

package/package.json

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