@botbuddy/cli 1.60.3 → 1.60.4

package/daemon-release/darwin-arm64.json

@@ -1,7 +1,7 @@
 {
-  "release_version": "1.60.3",
-  "source_commit": "ce15cf76534b99c30468bdd541f2ab8e9340ee08",
-  "source_sha256": "962d9cae75ce935da9306a538440ccb1448270ea80b9c0d4ba76be0c3c3a6707",
+  "release_version": "1.60.4",
+  "source_commit": "06faf46d8438c66ae116ce47eb5f343dfaca0c73",
+  "source_sha256": "9c1d721c1f0cfe90208bbc0960675053901326b324c7014c730769247d9d8c1c",
   "target": "darwin-arm64",
-  "sha256": "989d317d944147c7ec86dc894c74b6a462e95fa85ee709e3e0c562783e231668"
+  "sha256": "ea3ec61a04791ef355abd7bb04e01ff0895f2603e57d9ef6e4a33614a140b12a"
 }

package/daemon-release/linux-x64.json

@@ -1,7 +1,7 @@
 {
-  "release_version": "1.60.3",
-  "source_commit": "ce15cf76534b99c30468bdd541f2ab8e9340ee08",
-  "source_sha256": "962d9cae75ce935da9306a538440ccb1448270ea80b9c0d4ba76be0c3c3a6707",
+  "release_version": "1.60.4",
+  "source_commit": "06faf46d8438c66ae116ce47eb5f343dfaca0c73",
+  "source_sha256": "9c1d721c1f0cfe90208bbc0960675053901326b324c7014c730769247d9d8c1c",
   "target": "linux-x64",
-  "sha256": "90a9017148902699e54e26fddb940abc87d22ca96c3f415a75d4d172614dd281"
+  "sha256": "ebe08409a8d9ea7a7292af476ea9d3d0acf91b8b09834b12e38a6833c0bf2ac5"
 }

package/daemon-release/manifest.json

@@ -1,21 +1,21 @@
 {
   "schema_version": 1,
-  "release_version": "1.60.3",
-  "source_commit": "ce15cf76534b99c30468bdd541f2ab8e9340ee08",
-  "source_sha256": "962d9cae75ce935da9306a538440ccb1448270ea80b9c0d4ba76be0c3c3a6707",
+  "release_version": "1.60.4",
+  "source_commit": "06faf46d8438c66ae116ce47eb5f343dfaca0c73",
+  "source_sha256": "9c1d721c1f0cfe90208bbc0960675053901326b324c7014c730769247d9d8c1c",
   "targets": {
     "darwin-arm64": {
       "goos": "darwin",
       "goarch": "arm64",
       "binary": "daemon/bin/darwin-arm64/botbuddy-daemon",
-      "sha256": "989d317d944147c7ec86dc894c74b6a462e95fa85ee709e3e0c562783e231668",
+      "sha256": "ea3ec61a04791ef355abd7bb04e01ff0895f2603e57d9ef6e4a33614a140b12a",
       "mode": "0755"
     },
     "linux-x64": {
       "goos": "linux",
       "goarch": "amd64",
       "binary": "daemon/bin/linux-x64/botbuddy-daemon",
-      "sha256": "90a9017148902699e54e26fddb940abc87d22ca96c3f415a75d4d172614dd281",
+      "sha256": "ebe08409a8d9ea7a7292af476ea9d3d0acf91b8b09834b12e38a6833c0bf2ac5",
       "mode": "0755"
     }
   }

package/package.json

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

package/src/stack-run-outcome.mjs

@@ -134,13 +134,13 @@ export function buildStackRunOutcomePayload({ fields = {}, exitCode, runId = ran
  * credential the lease calls used); without one there is nothing to authenticate
  * with and nothing is sent. Never throws; resolves within `timeoutMs`.
  */
-export async function reportStackRunOutcome({ fields, exitCode, opts, env = process.env, durationMs = null, channel, timeoutMs = STACK_RUN_OUTCOME_TIMEOUT_MS }) {
+export async function reportStackRunOutcome({ fields, exitCode, runId, opts, env = process.env, durationMs = null, channel, timeoutMs = STACK_RUN_OUTCOME_TIMEOUT_MS }) {
   // Test suites opt out so a spawned real CLI never records a fixture run.
   if (env?.[STACK_RUN_OUTCOME_OPT_OUT_ENV] === "off") return { sent: false, reason: "disabled" };
   if (!channel?.auth || typeof channel.callTool !== "function") return { sent: false, reason: "no_credential" };
   let payload;
   try {
-    payload = buildStackRunOutcomePayload({ fields, exitCode, opts, env, durationMs });
+    payload = buildStackRunOutcomePayload({ fields, exitCode, runId, opts, env, durationMs });
   } catch {
     return { sent: false, reason: "payload_error" };
   }

package/src/stack.mjs

@@ -188,6 +188,8 @@ ${bold("done OPTIONS")}
 ${bold("run OPTIONS")}
   --repo <repo>          Required approved repository name.
   --ticket <BOT-123>     Required ticket for the batch.
+  --run-id <UUID>        Optional caller-chosen run identity. Choose it before dispatch to arm
+                         bb wait 'stack-run:id=<UUID>'; the completion signal carries this run's exit code.
   --stack-path <relative> Optional PREPARED isolated stack dir. Omit it (the norm): run
                          materializes .botbuddy/stacks/<project_id>/ from this worktree's
                          supabase/ tree with a distinct project_id + remapped ports and
@@ -358,7 +360,7 @@ export function parseStackArgs(argv) {
   const childArgv = divider === -1 ? [] : rawRest.slice(divider + 1);
   const opts = {
     slot: null, host: null, repo: null, ticket: null, ticketUrl: null,
-    prId: null, prUrl: null, purpose: null, idleTtl: null, stackPath: ".", stackPathExplicit: false,
+    prId: null, prUrl: null, purpose: null, runId: null, idleTtl: null, stackPath: ".", stackPathExplicit: false,
     timeout: DEFAULT_TIMEOUT_SEC, provisionTimeout: null, reapTimeout: 300, hardTtl: null,
     connectionFile: null, noWait: false, claimOnly: false, localExec: false, keepVolumes: false, waitCapacity: null, holdOnTimeout: null,
     dockerContext: null, dockerEndpoint: null,
@@ -390,6 +392,7 @@ export function parseStackArgs(argv) {
       case "--pr": if (need(a, rest[i + 1])) opts.prId = rest[++i]; break;
       case "--pr-url": if (need(a, rest[i + 1])) opts.prUrl = rest[++i]; break;
       case "--purpose": if (need(a, rest[i + 1])) opts.purpose = rest[++i]; break;
+      case "--run-id": if (need(a, rest[i + 1])) opts.runId = rest[++i]; break;
       case "--stack-path": if (need(a, rest[i + 1])) { opts.stackPath = rest[++i]; opts.stackPathExplicit = true; } break;
       case "--idle-ttl": {
         if (need(a, rest[i + 1])) {
@@ -518,6 +521,15 @@ export function parseStackArgs(argv) {
   } else if (opts.bundleInclude.length && opts.localOnly) {
     errors.push("--bundle-include ships files in the remote-lease bundle, and --local-only builds no bundle; drop one of them");
   }
+  if (opts.runId != null) {
+    if (command !== "run") {
+      errors.push("--run-id is valid only with `stack run`");
+    } else if (!/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(String(opts.runId))) {
+      errors.push("--run-id must be a canonical UUID");
+    } else {
+      opts.runId = String(opts.runId).toLowerCase();
+    }
+  }
   opts.bundleInclude = [...new Set(opts.bundleInclude)];
   opts.execution = opts.remote ? "remote" : opts.localOnly ? "local" : null;
   if (typeof opts.stackPath !== "string" || !opts.stackPath.trim() || opts.stackPath.startsWith("/") ||
@@ -4546,12 +4558,16 @@ export function runReceiptFields(result) {
 export async function cmdRun(opts, childArgv, {
   lifecycle = runStackLifecycle, report = reportStackRunOutcome, now = Date.now, env = process.env,
 } = {}) {
+  // A caller that needs a wait selects this immutable UUID before dispatch.
+  // Ordinary foreground runs still receive a unique telemetry id, but it is not
+  // retrospectively advertised as an armable completion contract.
+  const runId = opts.runId ?? randomUUID();
   const startedAt = now();
   const result = await lifecycle(opts, childArgv);
   const fields = runReceiptFields(result);
   const code = emit(buildReceipt(fields), opts, result.exitCode);
   try {
-    await report({ fields: stackRunOutcomeFields(result), exitCode: code, opts, env, durationMs: now() - startedAt, channel: result?.[OUTCOME_CHANNEL] ?? null });
+    await report({ fields: stackRunOutcomeFields(result), exitCode: code, runId, opts, env, durationMs: now() - startedAt, channel: result?.[OUTCOME_CHANNEL] ?? null });
   } catch { /* best-effort: the receipt and exit code are already final */ }
   return code;
 }
@@ -4600,7 +4616,7 @@ export async function cmdStack(argv, { report = reportStackRunOutcome, outcomeCh
     const code = emit(buildReceipt(fields), opts, EXIT.INVALID);
     // BOT-2467: a refused `stack run` is recorded as an `invocation` outcome (no lease).
     if (command === "run") {
-      try { await report({ fields, exitCode: code, opts, env: process.env, durationMs: 0, channel: await outcomeChannel(argv) }); } catch { /* best-effort */ }
+      try { await report({ fields, exitCode: code, runId: opts.runId ?? undefined, opts, env: process.env, durationMs: 0, channel: await outcomeChannel(argv) }); } catch { /* best-effort */ }
     }
     process.exitCode = code;
     return code;

package/src/wait-core.mjs

@@ -85,9 +85,9 @@ export const WAIT_SUPERSEDED_SIGNAL_TYPE = "wait_superseded";
 const HOST_APPROVAL_HOST_KEY_RE = /^bbh-[0-9a-f]{24}$/;
 
 // The USER-ARMABLE spine signal_type allowlist, for the `event:` escape hatch. The full
-// public.agent_signal_type enum is these PLUS the control types above
-// (WAIT_SUPERSEDED_SIGNAL_TYPE) — control types are intentionally excluded here so they
-// can't be armed on.
+// public.agent_signal_type enum also has control-only and dedicated-grammar types (for
+// example `wait_superseded` and BOT-2629's `stack_run`); they are intentionally excluded
+// here so raw event conditions cannot bypass their narrower matching contracts.
 export const SIGNAL_TYPES = Object.freeze([
   "ci_run",
   "pr_review",
@@ -110,6 +110,7 @@ export const SIGNAL_TYPES = Object.freeze([
 ]);
 
 const LOCK_SUBTYPES = Object.freeze(["playwright_lane", "vite_port", "backend_port", "supabase_local"]);
+const CANONICAL_UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
 
 // ---------------------------------------------------------------------------
 // Condition grammar: `TYPE:key=val,key=val`
@@ -194,6 +195,16 @@ const VALIDATORS = {
     if (!p.id) throw new Error("test-run needs id=<run_id>");
     return { runId: String(p.id) };
   },
+  // BOT-2629: this is deliberately a dedicated condition rather than a raw
+  // event escape hatch. The UUID is chosen before dispatch and the exact subject
+  // prevents another run on the same idle/re-adopted lease waking this waiter.
+  "stack-run": (p) => {
+    const unexpected = Object.keys(p).filter((key) => key !== "id");
+    if (unexpected.length) throw new Error(`stack-run does not accept ${unexpected.join(", ")}`);
+    const id = String(p.id ?? "").trim().toLowerCase();
+    if (!CANONICAL_UUID_RE.test(id)) throw new Error("stack-run needs id=<canonical run UUID>");
+    return { id };
+  },
   // BOT-1063 — guidance: park on a command-post guidance RESPONSE to a request
   // this agent raised (pairs with request_guidance). The signal is
   // recipient-scoped to the requester and keyed by the request id.
@@ -1112,6 +1123,9 @@ function conditionMatchesSignal(condition, signal, waitSessionId) {
         prReviewFiltersMatch(signal, params);
     case "test-run":
       return signal.signal_type === "test_run" && signal.subject_key === `run:${params.runId}`;
+    case "stack-run":
+      return signal.signal_type === "stack_run" && signal.subject_key === `stack-run:${params.id}` &&
+        signal.payload?.run_id === params.id && Number.isInteger(signal.payload?.exit_code);
     case "guidance":
       return signal.signal_type === "guidance_response" && signal.subject_key === params.request;
     case "lease":