@botbuddy/cli 1.36.1 → 1.36.2

package/package.json

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

package/src/session-bootstrap.mjs

@@ -43,10 +43,10 @@ export async function saveHarnessSession(session, { cwd = process.cwd() } = {})
     worktree: root,
     minted_at: new Date().toISOString(),
     expires_at: session.expires_at,
-    // BOT-1650 (Codex round-28 P2): mark provenance so a TIMER wait only relays for
-    // a bootstrap-issued cache (the cross-shell receipt-of-principal contract). A
-    // bb setup / self-heal cache shares this schema but omits this marker, so a
-    // plain timer from such a shell stays fully offline.
+    // BOT-1650 (Codex round-28 P2): mark bootstrap provenance. Since BOT-2000 a
+    // TIMER wait relays for ANY runtime cache (bootstrap or bb setup / self-heal),
+    // so this marker no longer gates timer relaying; it still distinguishes a
+    // bootstrap-issued cache for the bootstrap bridge's own reuse checks.
     harness_origin: "bootstrap_agent_session",
     ...(session.session_token_generation ? { session_token_generation: session.session_token_generation } : {}),
   };

package/src/wait.mjs

@@ -19,7 +19,7 @@ import { VERSION } from "./version.mjs";
 import { fileURLToPath } from "node:url";
 import { latestPublicCliCommand } from "./public-invocation.mjs";
 import { AGENT_KEY_RE, readAgentSessionTokenEnv, legacyAgentAliasHint } from "./agent-key.mjs";
-import { clearAgentState, hasBootstrapAgentSession, isRejectedCachedSession, resolveAgentSessionCredential, selfHealAgentSession } from "./agent-session.mjs";
+import { clearAgentState, hasAgentSessionRuntime, isRejectedCachedSession, resolveAgentSessionCredential, selfHealAgentSession } from "./agent-session.mjs";
 import { touchAgentStateExpiry } from "./agent-state.mjs";
 import { SETUP_BLOCK } from "./setup-block.mjs";
 import { createWaitCheckpointStore, WaitCheckpointError } from "./wait-checkpoint.mjs";
@@ -1568,11 +1568,12 @@ export async function runWait(argv, { recoveryLocalWaitId = null } = {}) {
       : new WaitCheckpointError("wait_checkpoint_write_failed", String(error?.message ?? error)));
   }
 
-  // BOT-1650: a plain timer stays offline, but a timer from a bootstrapped harness
-  // registers so its terminal receipt proves the current session principal (the
-  // cross-shell bootstrap contract). Detected without a network self-heal.
+  // BOT-1650 / BOT-2000: a timer from a worktree with any agent-session runtime
+  // file (bootstrap or `bb setup`) registers, so it shows on /waits and its terminal
+  // receipt proves the session principal. Only a credential-less worktree's timer
+  // stays offline. Detected without a network self-heal.
   const needsRelay = conditions.some((c) => c.type !== "timer")
-    || await hasBootstrapAgentSession({ cwd: process.cwd() });
+    || await hasAgentSessionRuntime({ cwd: process.cwd() });
   if (needsRelay) {
     try {
       const credential = await resolveAgentSessionCredential({ argv, env: process.env, cwd: process.cwd() });