@botbuddy/cli 1.6.0 → 1.6.2

package/package.json

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

package/src/botbuddy-release-repair.json

@@ -0,0 +1 @@
+{"schema_version":1,"source_version":"1.6.1","source_identity":"9cc6a78baeb0da589214386daad729a2e8909936a2407da801777f9902e8667f"}

package/src/profile-bootstrap.mjs

@@ -3,6 +3,7 @@ import { randomUUID } from "node:crypto";
 
 import { ensureProfileCredentialBackend, readProfileIdentity, readProfileRetryIdentity, recordProfileRetryIdentity, installProfileCredential, profileCredentialEnvironment } from "./agent-credential-store.mjs";
 import { callToolJson } from "./api.mjs";
+import { latestPublicCliCommand } from "./public-invocation.mjs";
 
 const PROFILES = Object.freeze({
   "botbuddy-dev": Object.freeze({ tenant: "botbuddy" }),
@@ -92,7 +93,7 @@ export async function bootstrapProfile(profileName, {
     tenant_id: profile.tenant,
     agent_id: data.agent_id,
     credential_source: "keychain_profile_slot",
-    shell_refresh: `source <(npx --yes @botbuddy/cli@latest profile env ${profileName})`,
+    shell_refresh: `source <(${latestPublicCliCommand(`profile env ${profileName}`)})`,
     gui_refresh: "$HOME/.local/bin/botbuddy-mcp-env.sh",
   };
 }

package/src/public-invocation.mjs

@@ -0,0 +1,7 @@
+// BOT-1425: npm cannot infer a package executable once @botbuddy/cli exposes
+// both botbuddy and bb-pw. Keep every installation-free command explicit.
+export const LATEST_PUBLIC_CLI_PREFIX = "npm exec --yes --package=@botbuddy/cli@latest -- botbuddy";
+
+export function latestPublicCliCommand(command = "") {
+  return command ? `${LATEST_PUBLIC_CLI_PREFIX} ${command}` : LATEST_PUBLIC_CLI_PREFIX;
+}

package/src/stack.mjs

@@ -11,7 +11,7 @@
 // The canonical batch flow is:  stack up  →  test → break → fix → test  →  stack done.
 //
 // Design contract (matches bb-wait):
-//   * Dependency-free (Node stdlib only) so `npx @botbuddy/cli stack` cold-starts fast.
+//   * Dependency-free (Node stdlib only) so an explicit `npm exec --package` invocation cold-starts fast.
 //   * Exactly ONE single-line JSON receipt to stdout; all diagnostics go to stderr.
 //   * Receipt ≤ 10 KB (documented, --receipt-max-bytes overridable).
 //   * Documented, meaningful exit codes.

package/src/wait-core.mjs

@@ -228,6 +228,35 @@ const VALIDATORS = {
     }
     return { repo };
   },
+  // BOT-1458 — staging-release: wake when the first staging release train whose
+  // head commit CONTAINS this PR's merge commit reaches a terminal conclusion
+  // (success OR failure). Unlike `staging-green` this is PR-scoped and reports
+  // the train's outcome, never a health verdict. Inclusion is decided server-side
+  // by git ancestry (GitHub compare API), never by wall-clock ordering, so the
+  // condition only names the repo + PR; the relay stamps the resolved
+  // merge_commit_sha and workspace at registration. Optional
+  // `after_run=<run_id>[:<attempt>]` lets a wait re-armed from a failure receipt
+  // skip the run it already saw and park for the NEXT train.
+  "staging-release"(p) {
+    const { repo, number } = parsePrTarget(p, "staging-release");
+    if (number == null) {
+      throw new Error("staging-release needs pr=<number> (or pr=<owner/repo#number>)");
+    }
+    const out = { repo, pr: number };
+    if (p.after_run !== undefined) {
+      const raw = String(p.after_run).trim();
+      const m = /^(\d+)(?::(\d+))?$/.exec(raw);
+      if (!m) throw new Error("staging-release after_run must be <run_id>[:<attempt>]");
+      out.afterRunId = m[1];
+      if (m[2] !== undefined) out.afterRunAttempt = Number(m[2]);
+    }
+    const allowed = new Set(["repo", "pr", "number", "after_run"]);
+    const extras = Object.keys(p).filter((key) => !allowed.has(key));
+    if (extras.length > 0) {
+      throw new Error(`staging-release accepts only repo=<owner/repo>, pr=<number>, after_run=<run_id>[:<attempt>] (got: ${extras.join(", ")})`);
+    }
+    return out;
+  },
   // BOT-1247 — unblocked: wake when a ticket's LAST open blocker clears (its
   // open-blocker count transitions >0 → 0). Level-triggered: a ticket already
   // unblocked (or never blocked) at registration is granted immediately with
@@ -666,6 +695,27 @@ function conditionMatchesSignal(condition, signal, waitSessionId) {
         payload.gate_open === false &&
         payload.operational_status === "healthy";
     }
+    case "staging-release": {
+      // BOT-1458: a PR-scoped staging release train reached a terminal conclusion
+      // and its head commit contains this PR's merge (`includes_pr:true`, decided
+      // server-side by ancestry). The signal is tenant-scoped, so the central
+      // guard already fenced foreign workspaces. Subject is `<owner/repo>#<pr>`.
+      if (signal.signal_type !== "staging_release") return false;
+      const payload = signal.payload ?? {};
+      const subject = typeof signal.subject_key === "string" ? signal.subject_key.toLowerCase() : "";
+      if (subject !== `${params.repo}#${params.pr}`.toLowerCase()) return false;
+      if (payload.includes_pr !== true) return false;
+      // AC-9: a wait re-armed with after_run ignores the run it already saw — that
+      // run id, and (when an attempt was named) that attempt or lower — so a
+      // re-registration after a failure receipt parks for the NEXT train instead
+      // of instantly replaying the same failure via `--since`.
+      if (params.afterRunId != null && String(payload.workflow_run_id) === String(params.afterRunId)) {
+        if (params.afterRunAttempt == null) return false;
+        const attempt = Number(payload.workflow_run_attempt);
+        if (Number.isFinite(attempt) && attempt <= params.afterRunAttempt) return false;
+      }
+      return true;
+    }
     case "unblocked": {
       // Wakes on the ticket_unblocked spine signal for this ticket (the server emits both
       // the genuine >0→0 transition and the level-triggered `already_unblocked` echo).

package/src/wait.mjs

@@ -17,12 +17,13 @@ import { EXIT, parseConditions, parseSseFrames, runWaitLoop, normalizeSince, tru
 import { resolveAgentProfile, withPrincipalReceipt } from "./wait-profile.mjs";
 import { VERSION } from "./version.mjs";
 import { fileURLToPath } from "node:url";
+import { latestPublicCliCommand } from "./public-invocation.mjs";
 
 // A protocol is deliberately distinct from package semver: compatible pinned
 // clients keep working until the server raises this minimum, while a stale
 // implementation gets a typed, safe upgrade instruction.
 export const WAIT_PROTOCOL_VERSION = 1;
-const CLI_UPGRADE_COMMAND = "npx --yes @botbuddy/cli@latest wait";
+const CLI_UPGRADE_COMMAND = latestPublicCliCommand("wait");
 const MIN_RECEIPT_MAX_BYTES = 512;
 
 const HELP = `botbuddy wait — one wait command instead of a polling loop (BOT-989)
@@ -458,7 +459,7 @@ function emit(receipt, { versioned = false, maxBytes = null } = {}) {
 }
 
 function profileRecovery(profile) {
-  return `npx --yes @botbuddy/cli@latest profile setup ${profile.name}`;
+  return latestPublicCliCommand(`profile setup ${profile.name}`);
 }
 
 function typedProfileError(errorCode) {