@botbuddy/cli 1.63.39 → 1.63.41

package/daemon-release/darwin-arm64.json

@@ -1,7 +1,7 @@
 {
-  "release_version": "1.63.39",
-  "source_commit": "d98a90edc6157b66510ab7b5ca58d210cbfc8e3a",
-  "source_sha256": "7594e80018bcbd9014684e4d916376bdc0c8388ed4ccec4afaf52fde3a40c659",
+  "release_version": "1.63.41",
+  "source_commit": "89653c3c1d5a7144abd8bdab27a9496900cdb1d0",
+  "source_sha256": "d524b98618977c153c57ae009f9cbab3da72f0255fb9a0b01e840a7c78550dc3",
   "target": "darwin-arm64",
-  "sha256": "98e622a171da78743c8311ddb4aef4565c2a5e836c143089ab799b23dea01fad"
+  "sha256": "ffee8ba3b0a0b849075f06f5186ca2aa8f14fca124c1460a396f410b95a655d7"
 }

package/daemon-release/linux-x64.json

@@ -1,7 +1,7 @@
 {
-  "release_version": "1.63.39",
-  "source_commit": "d98a90edc6157b66510ab7b5ca58d210cbfc8e3a",
-  "source_sha256": "7594e80018bcbd9014684e4d916376bdc0c8388ed4ccec4afaf52fde3a40c659",
+  "release_version": "1.63.41",
+  "source_commit": "89653c3c1d5a7144abd8bdab27a9496900cdb1d0",
+  "source_sha256": "d524b98618977c153c57ae009f9cbab3da72f0255fb9a0b01e840a7c78550dc3",
   "target": "linux-x64",
-  "sha256": "9fd7c1b2587f0b0abce54f923f87e0229405a5c951cac580ecaefc5f16e384cd"
+  "sha256": "594d96944fbea3354a6d26186d92e989470ee75734fd7fd53f5eb681eab1f43d"
 }

package/daemon-release/manifest.json

@@ -1,21 +1,21 @@
 {
   "schema_version": 1,
-  "release_version": "1.63.39",
-  "source_commit": "d98a90edc6157b66510ab7b5ca58d210cbfc8e3a",
-  "source_sha256": "7594e80018bcbd9014684e4d916376bdc0c8388ed4ccec4afaf52fde3a40c659",
+  "release_version": "1.63.41",
+  "source_commit": "89653c3c1d5a7144abd8bdab27a9496900cdb1d0",
+  "source_sha256": "d524b98618977c153c57ae009f9cbab3da72f0255fb9a0b01e840a7c78550dc3",
   "targets": {
     "darwin-arm64": {
       "goos": "darwin",
       "goarch": "arm64",
       "binary": "daemon/bin/darwin-arm64/botbuddy-daemon",
-      "sha256": "98e622a171da78743c8311ddb4aef4565c2a5e836c143089ab799b23dea01fad",
+      "sha256": "ffee8ba3b0a0b849075f06f5186ca2aa8f14fca124c1460a396f410b95a655d7",
       "mode": "0755"
     },
     "linux-x64": {
       "goos": "linux",
       "goarch": "amd64",
       "binary": "daemon/bin/linux-x64/botbuddy-daemon",
-      "sha256": "9fd7c1b2587f0b0abce54f923f87e0229405a5c951cac580ecaefc5f16e384cd",
+      "sha256": "594d96944fbea3354a6d26186d92e989470ee75734fd7fd53f5eb681eab1f43d",
       "mode": "0755"
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botbuddy/cli",
-  "version": "1.63.39",
+  "version": "1.63.41",
   "description": "BotBuddy \u2014 Swarm coordination CLI for multi-agent workflows",
   "type": "module",
   "bin": {

package/src/pw/staging-auth.mjs

@@ -295,6 +295,8 @@ export async function runStagingAuth({ plan, host, env, deps, socketRun, resolve
   }
   const found = { binding: ctxPool.poolBinding };
   Object.assign(vars, { allowed: Object.keys(found.binding.personas ?? {}), tenant: ctxPool.tenant ?? undefined, poolId: ctxPool.poolId ?? undefined });
+  // BOT-2836: a retry addresses the same pool when one was named (several installed).
+  if (plan.pool) vars.retry = `${authLine} --pool ${ctxPool.poolId}`;
   const { findPersona } = await loadBinding();
   const persona = findPersona(found.binding, plan.persona);
   if (!persona) return refuse(io, "persona_not_allowlisted", 2, {}, vars);
@@ -317,7 +319,10 @@ export async function runStagingAuth({ plan, host, env, deps, socketRun, resolve
       // The refusal's code is the pool's health reason when it is unhealthy (e.g. a
       // count-0 persona is persona_not_configured), so code, message and help agree.
       const reasonCode = typeof error.reason === "string" && error.reason !== "healthy" && isKnownCode(error.reason) ? error.reason : "pool_empty";
-      return refuse(io, reasonCode, 3, Object.fromEntries(["reason", "detail", ...GUIDED_FIELDS].filter((key) => error[key] !== undefined).map((key) => [key, error[key]])), vars);
+      // BOT-2836: a healthy empty pool is the agent's own wait-and-retry, so it is
+      // rendered here with this lane; an unhealthy pool keeps the pool's health guidance.
+      const forwarded = reasonCode === "pool_empty" ? ["reason", "detail"] : ["reason", "detail", ...GUIDED_FIELDS];
+      return refuse(io, reasonCode, 3, Object.fromEntries(forwarded.filter((key) => error[key] !== undefined).map((key) => [key, error[key]])), vars);
     }
     const code = typeof error?.code === "string" && isKnownCode(error.code) ? error.code : "pool_take_failed";
     return refuse(io, code, 3, { detail: String(error?.message ?? error).slice(0, 300) }, vars);

package/src/staging-pool/cli.mjs

@@ -236,6 +236,16 @@ export function resolveInstalledPool({ home = homedir(), poolId = null, tenantHi
   throw Object.assign(new ConfigError(`Several staging session pools are installed: ${installed.map((pool) => pool.poolId).join(", ")}.`, "pool_ambiguous"), { poolIds: installed.map((pool) => pool.poolId) });
 }
 
+// BOT-2836: after a take, ask the installed launchd job to run its tick now, so the
+// pool refills without waiting for the interval or a human `tick`. The job signs in
+// (with its own backoff); the agent never does. No -k: a running tick is never killed.
+// Best effort: an unloaded job surfaces through health, and never fails the take.
+async function requestRefill({ ctx, exec, uid }) {
+  const label = ctx.poolBinding?.launchdLabel;
+  if (!label) return;
+  await createLaunchctl({ exec, uid }).kickstart(label).catch(() => {});
+}
+
 /**
  * Agent path, used by `bb pw … auth`: claim one verified session for a persona
  * (alias or email) of the installed pool. Returns { taken, target, binding,
@@ -263,9 +273,11 @@ export async function takeForLane({
   const pool = buildPool({ ctx, target, now, logger, intervalSeconds, fetchImpl });
   try {
     const taken = await pool.take({ persona: entry.email, owner });
+    await requestRefill({ ctx, exec, uid });
     return { taken, target, binding: ctx.poolBinding, persona: entry, discard: () => pool.discardTaken(taken.slotId) };
   } catch (error) {
     if (!(error instanceof PoolEmptyError)) throw error;
+    await requestRefill({ ctx, exec, uid });
     const health = await assessHealth({ ctx, pool, now, exec, uid, requestedPersona: entry.email });
     let effective = health;
     if (health.ok) {

package/src/staging-pool/errors.mjs

@@ -131,10 +131,12 @@ export const ERROR_CODES = Object.freeze({
     `${AUTH}   # once; if it repeats, report this code and detail`, "retry_once"),
 
   // ── the pool's health (human repairs; agents report once and stop)
-  pool_empty: entry("human", "repair",
+  // BOT-2836: a healthy pool emptied between ticks is a wait, not a repair. The take
+  // already asked the human-installed job to refill now, so the agent waits once and retries.
+  pool_empty: entry("agent", "take",
     "The staging session pool is healthy but has no ready session for {persona}.",
-    "Agents took every ready session since the last tick, or the ready ones were dead or AAL1 (factor rotated) and were discarded.",
-    "{tickCommand}"),
+    "Agents took every ready session since the last tick, or the ready ones were dead or AAL1 (factor rotated) and were discarded; the pool job was asked to refill now.",
+    "bb wait 'timer:duration=60' && {retry}   # once; if it repeats, report this code", "retry_once"),
   job_not_loaded: entry("human", "install",
     "The staging session pool is not installed (or not loaded) on this Mac.",
     "The one-time install has not been run here, or the Mac was migrated.",

package/src/staging-pool/pool.mjs

@@ -30,8 +30,8 @@ import {
 export class PoolEmptyError extends Error {
   constructor(persona, intervalHint) {
     super(
-      `No ready ${persona} session in the pool. The human-owned pool job refills on its next tick${intervalHint}; ` +
-        "report this blocker and its remedy once, then stop; ask the human to check the job. " +
+      `No ready ${persona} session in the pool. The human-owned pool job refills on its next tick${intervalHint} ` +
+        "and was asked to refill now; wait once, retry once, and report it if it repeats. " +
         "Agents never sign in to staging themselves.",
     );
     this.name = "PoolEmptyError";