@botbuddy/cli 1.36.0 → 1.36.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botbuddy/cli",
-  "version": "1.36.0",
+  "version": "1.36.1",
   "description": "BotBuddy — Swarm coordination CLI for multi-agent workflows",
   "type": "module",
   "bin": {

package/src/stack.mjs

@@ -1587,19 +1587,24 @@ export async function cmdUp(opts, {
   }), opts, EXIT.OK);
 }
 
-async function cmdStatus(leaseId, opts, { rpc = retryingStackCall() } = {}) {
+export async function cmdStatus(leaseId, opts, { rpc = retryingStackCall(), emitResult = emit } = {}) {
   const auth = await rpc.init();
-  if (!auth) return emit(buildReceipt({ command: "status", outcome: "error", lease_id: leaseId, error: "not authenticated — run `botbuddy login`" }), opts, EXIT.AUTH);
+  if (!auth) return emitResult(buildReceipt({ command: "status", outcome: "error", lease_id: leaseId, error: "not authenticated — run `botbuddy login`" }), opts, EXIT.AUTH);
   const got = await rpc.call("get_stack_lease", { lease_id: leaseId });
   if (!got.ok) return got.auth
-    ? emit(buildReceipt({ command: "status", outcome: "error", lease_id: leaseId, error: got.error }), opts, EXIT.AUTH)
-    : emit(buildReceipt({ command: "status", outcome: "error", lease_id: leaseId, error: got.error }), opts, EXIT.BACKEND);
+    ? emitResult(buildReceipt({ command: "status", outcome: "error", lease_id: leaseId, error: got.error }), opts, EXIT.AUTH)
+    : emitResult(buildReceipt({ command: "status", outcome: "error", lease_id: leaseId, error: got.error }), opts, EXIT.BACKEND);
   const g = got.data;
-  if (!g.success) return emit(buildReceipt({ command: "status", outcome: "error", lease_id: leaseId, code: g.code, error: g.code }), opts, EXIT.BACKEND);
-  return emit(buildReceipt({
+  if (!g.success) return emitResult(buildReceipt({ command: "status", outcome: "error", lease_id: leaseId, code: g.code, error: g.code }), opts, EXIT.BACKEND);
+  return emitResult(buildReceipt({
     command: "status", outcome: g.state, lease_id: leaseId, state: g.state,
     host_key: g.host_key, slot: g.slot, connection: g.connection,
     queue_position: g.queue_position, idle_ttl_secs: g.idle_ttl_secs, queued: g.queued,
+    // BOT-1960: a lease fenced in `reaping` says since when, and — once the server gave up
+    // retrying its failed reap — that it is reap_failed and why.
+    ...(g.reap_requested_at ? { reap_requested_at: g.reap_requested_at } : {}),
+    ...(g.reap_failed_at ? { reap_failed: true, reap_failed_at: g.reap_failed_at } : {}),
+    ...(g.state === "reaping" && g.error ? { error: g.error } : {}),
   }), opts, EXIT.OK);
 }
 
@@ -1803,7 +1808,27 @@ export async function cmdDone(leaseId, opts, {
     if (fin.ok && fin.data?.success) state = fin.data.state;
     else process.stderr.write(`${yellow("⚠")} stack: finalize failed (${fin.error || fin.data?.code}); the reaper will reconcile.\n`);
   }
+  // BOT-1960: on a lease fenced in `reaping` by a FAILED reap, the server re-enqueues the
+  // reap (the first time also resetting its retry budget) — or, once that budget is spent,
+  // refuses. Say which, instead of a `released` that changed nothing.
+  const retry = r.data.reap_retry;
+  if (state === "reaping" && retry?.code === "REAP_RETRY_BUDGET_SPENT") {
+    const since = r.data.reap_failed_at ? ` (since ${r.data.reap_failed_at})` : "";
+    return emitResult(buildReceipt({ command: "done", outcome: "reap_failed", lease_id: leaseId, state, disposition,
+      reap_failed_at: r.data.reap_failed_at ?? null, reap_retry: { enqueued: false, code: retry.code },
+      error: `the reap failed on every retry${since}; no retries left — the lease stays reaping and its slot stays fenced. ` +
+        "Remove the project's leftover containers (operator / `botbuddy docker hygiene`); the container census then finalizes the lease.",
+    }), opts, EXIT.LEASE_FAILED);
+  }
+  const retried = retry?.code === "REAP_RETRY_ENQUEUED"
+    ? {
+      reap_retry: { enqueued: true, attempt: retry.attempt, budget_reset: retry.budget_reset === true },
+      note: `the previous reap failed; a new reap job (attempt ${retry.attempt}) was enqueued` +
+        (retry.budget_reset === true ? " and the reap retry budget was reset" : ""),
+    }
+    : {};
   return emitResult(buildReceipt({ command: "done", outcome: "released", lease_id: leaseId, state, disposition,
+    ...retried,
     ...(helperTeardown ? { teardown: "helper" } : {}),
     ...(legacyTargetProof ? { legacy_target_proof: legacyTargetProof } : {}) }), opts, EXIT.OK);
 }