@botbuddy/cli 1.63.38 → 1.63.40

package/daemon-release/darwin-arm64.json

@@ -1,7 +1,7 @@
 {
-  "release_version": "1.63.38",
-  "source_commit": "d4f75d9b654171260fe0abb50b8d3c656b46959b",
-  "source_sha256": "3e988465d360302e88bfe7136d593b6d2942b818de190a2aea36fade6c8dae9f",
+  "release_version": "1.63.40",
+  "source_commit": "6a30ed1a16dc6a97351c3cea5cc2d03918dbe0fc",
+  "source_sha256": "de12a3e513169b3a152a617b48c7e9c4c25c30e47b549854994744c369268ff1",
   "target": "darwin-arm64",
-  "sha256": "36a64ac8effd1df9fcdffe575fc220f3cbf5d20facbda4f4e9bf27e744cf8c5e"
+  "sha256": "9732532ac31d3e184fedafe19089b5efa938b2f3c2c4952cbc95866d86f4b8ae"
 }

package/daemon-release/linux-x64.json

@@ -1,7 +1,7 @@
 {
-  "release_version": "1.63.38",
-  "source_commit": "d4f75d9b654171260fe0abb50b8d3c656b46959b",
-  "source_sha256": "3e988465d360302e88bfe7136d593b6d2942b818de190a2aea36fade6c8dae9f",
+  "release_version": "1.63.40",
+  "source_commit": "6a30ed1a16dc6a97351c3cea5cc2d03918dbe0fc",
+  "source_sha256": "de12a3e513169b3a152a617b48c7e9c4c25c30e47b549854994744c369268ff1",
   "target": "linux-x64",
-  "sha256": "12ed409298d65b59e12c2cef901886aeea622d87130e1694081393b4f0b7e24e"
+  "sha256": "8abdd484047020cb2d96a7adc2a2bacb3b860bafaaf0f56e517eb844bb8550a1"
 }

package/daemon-release/manifest.json

@@ -1,21 +1,21 @@
 {
   "schema_version": 1,
-  "release_version": "1.63.38",
-  "source_commit": "d4f75d9b654171260fe0abb50b8d3c656b46959b",
-  "source_sha256": "3e988465d360302e88bfe7136d593b6d2942b818de190a2aea36fade6c8dae9f",
+  "release_version": "1.63.40",
+  "source_commit": "6a30ed1a16dc6a97351c3cea5cc2d03918dbe0fc",
+  "source_sha256": "de12a3e513169b3a152a617b48c7e9c4c25c30e47b549854994744c369268ff1",
   "targets": {
     "darwin-arm64": {
       "goos": "darwin",
       "goarch": "arm64",
       "binary": "daemon/bin/darwin-arm64/botbuddy-daemon",
-      "sha256": "36a64ac8effd1df9fcdffe575fc220f3cbf5d20facbda4f4e9bf27e744cf8c5e",
+      "sha256": "9732532ac31d3e184fedafe19089b5efa938b2f3c2c4952cbc95866d86f4b8ae",
       "mode": "0755"
     },
     "linux-x64": {
       "goos": "linux",
       "goarch": "amd64",
       "binary": "daemon/bin/linux-x64/botbuddy-daemon",
-      "sha256": "12ed409298d65b59e12c2cef901886aeea622d87130e1694081393b4f0b7e24e",
+      "sha256": "8abdd484047020cb2d96a7adc2a2bacb3b860bafaaf0f56e517eb844bb8550a1",
       "mode": "0755"
     }
   }

package/package.json

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

package/src/wait-core.mjs

@@ -521,7 +521,7 @@ function parsePrTarget(p, label) {
 // it then woke on another head's or another reviewer's signal. Now an unknown key
 // refuses at arm (invalid_conditions, exit 4). `reviewer=` is pr-review only.
 const PR_CONDITION_KEYS = Object.freeze({
-  "pr-state": Object.freeze(["repo", "pr", "number", "sha"]),
+  "pr-state": Object.freeze(["repo", "pr", "number", "sha", "state"]),
   "pr-review": Object.freeze(["repo", "pr", "number", "sha", "reviewer", "stall_minutes"]),
 });
 
@@ -531,6 +531,11 @@ function normalizeReviewerLogin(login) {
   return String(login).trim().toLowerCase().replace(/\[bot\]$/, "");
 }
 
+// BOT-2724: the PR lifecycle values `pr_state.state` carries (prStateMapper's
+// PrLifecycle minus `unknown`). `state=merged` makes a merge watch wake once, on
+// the merge, instead of on every mergeable/check/review flip of the open PR.
+const PR_LIFECYCLE_STATES = Object.freeze(["open", "draft", "merged", "closed"]);
+
 function parsePrCondition(p, label) {
   const allowed = PR_CONDITION_KEYS[label];
   const unknown = Object.keys(p).filter((key) => !allowed.includes(key));
@@ -547,6 +552,13 @@ function parsePrCondition(p, label) {
     }
     out.sha = sha;
   }
+  if (p.state !== undefined) {
+    const states = String(p.state).split("|").map((value) => value.trim().toLowerCase());
+    if (states.some((value) => !PR_LIFECYCLE_STATES.includes(value))) {
+      throw new Error(`${label} state= must be one or more of ${PR_LIFECYCLE_STATES.join(", ")} (|-joined)`);
+    }
+    out.states = [...new Set(states)];
+  }
   if (p.reviewer !== undefined) {
     const reviewer = typeof p.reviewer === "string" ? normalizeReviewerLogin(p.reviewer) : "";
     if (reviewer === "") throw new Error(`${label} reviewer= must be a GitHub login`);
@@ -583,9 +595,59 @@ function shaPrefixMatches(value, sha) {
 
 // BOT-1975: optional head scoping for pr-state. pr_state signals carry the PR
 // head as payload.head_ref_oid; a signal for a previous head does not wake.
+// BOT-2724: optional lifecycle scoping — only a payload in a named state wakes.
 function prStateFiltersMatch(signal, params) {
-  if (params.sha == null) return true;
-  return shaPrefixMatches(signal.payload?.head_ref_oid, params.sha);
+  return prStatePayloadMatches(signal.payload ?? {}, params);
+}
+
+function prStatePayloadMatches(payload, params) {
+  if (params.sha != null && !shaPrefixMatches(payload.head_ref_oid, params.sha)) return false;
+  if (params.states != null) {
+    const state = typeof payload.state === "string" ? payload.state.trim().toLowerCase() : "";
+    if (!params.states.includes(state)) return false;
+  }
+  return true;
+}
+
+/**
+ * BOT-2724 — level-trigger a `pr-state:…,state=` wait at arm. The relay's
+ * BOT-1539 arm snapshot carries each targeted PR's current `pr_state` row; a PR
+ * that is ALREADY in a requested state (merged before the wait armed) would
+ * otherwise never emit that transition again and park the wait to its timeout.
+ * Returns one receipt `matched` entry per granted condition (empty when none).
+ * A snapshot without `state` (an older relay) never grants.
+ *
+ * @param {object[]} conditions parsed conditions
+ * @param {Array<{repo:string,pr:number,state?:string,merged_at?:string|null,head_ref_oid?:string|null}>|null|undefined} snapshot
+ * @returns {object[]}
+ */
+export function prStateArmMatches(conditions, snapshot) {
+  if (!Array.isArray(snapshot)) return [];
+  const matched = [];
+  for (const condition of conditions) {
+    if (condition.type !== "pr-state" || condition.params.states == null || condition.params.number == null) continue;
+    const subjectKey = `${condition.params.repo}#${condition.params.number}`;
+    const entry = snapshot.find((e) => e && typeof e.repo === "string" &&
+      `${e.repo}#${e.pr}`.toLowerCase() === subjectKey.toLowerCase());
+    if (!entry || typeof entry.state !== "string") continue;
+    const payload = {
+      repo: entry.repo,
+      pr_number: entry.pr,
+      state: entry.state,
+      merged_at: entry.merged_at ?? null,
+      head_ref_oid: entry.head_ref_oid ?? null,
+    };
+    if (!prStatePayloadMatches(payload, condition.params)) continue;
+    matched.push({
+      condition_id: condition.id,
+      signal_type: "pr_state",
+      seq: null,
+      subject_key: `${entry.repo}#${entry.pr}`,
+      payload,
+      provenance: "arm_snapshot",
+    });
+  }
+  return matched;
 }
 
 // BOT-1975 / BOT-1972: optional commit + reviewer scoping for pr-review. A
@@ -1622,6 +1684,9 @@ export async function runWaitLoop({
   // `error`, so the receipt itself says what CI was already doing when this wait
   // armed. Purely descriptive — it never changes the outcome or the exit code.
   timeoutError = null,
+  // BOT-2724: matches already proven at arm (prStateArmMatches). Non-empty ends the
+  // wait as matched before any stream is opened.
+  armMatches = null,
 }) {
   const startedAt = typeof originalStartedAt === "string" && Number.isFinite(Date.parse(originalStartedAt))
     ? originalStartedAt : nowIso();
@@ -1934,6 +1999,13 @@ export async function runWaitLoop({
     }
   };
 
+  // An expired-recovery resume must not take a CURRENT-snapshot grant: a PR that
+  // merged after the original deadline would turn a timeout into a match. It
+  // replays the durable pre-deadline signals instead (Codex P2).
+  if (replayOnlyThroughMs == null && Array.isArray(armMatches) && armMatches.length > 0) {
+    return finalize("matched", { exitCode: EXIT.MATCHED, matched: armMatches });
+  }
+
   while (true) {
     // Expired recovery must first replay durable pre-deadline rows. A restored
     // timer or capacity-stale alarm may otherwise win before that replay begins.

package/src/wait.mjs

@@ -13,7 +13,7 @@
 // Usage:  botbuddy wait [--any] <condition>... [options]
 // Run     botbuddy wait --help for the condition grammar.
 
-import { EXIT, describeConditionErrors, parseConditions, parseSseFrames, runWaitLoop, normalizeSince, truncateReceipt, formatPrReviewSnapshotWarnings, formatCiLatestRunNotice, formatUnknownWorkflowGuidance, reviewTimeoutNotice } from "./wait-core.mjs";
+import { EXIT, describeConditionErrors, parseConditions, parseSseFrames, runWaitLoop, normalizeSince, truncateReceipt, formatPrReviewSnapshotWarnings, prStateArmMatches, formatCiLatestRunNotice, formatUnknownWorkflowGuidance, reviewTimeoutNotice } from "./wait-core.mjs";
 import { readAgentBinding, withPrincipalReceipt } from "./wait-profile.mjs";
 import { VERSION } from "./version.mjs";
 import { fileURLToPath } from "node:url";
@@ -64,6 +64,7 @@ USAGE
   Pick the condition that proves the state your NEXT action needs, not a correlated proxy:
     CI finished on the current PR head ......... ci:…,scope=latest,pr=<n>  (or exact sha=)
     review activity (Codex, a human) ........... pr-review:…  (arm BEFORE requesting it)
+    a PR merged (or closed) .................... pr-state:…,pr=<n>,state=merged
     PR merged/closed/conflict/ready flip ........ pr-state:…
     your merged PR reached staging ............. staging-release:…
     staging recovered after an incident ........ staging-green:…
@@ -94,7 +95,7 @@ CONDITIONS  (TYPE:key=val,key=val — repeat for several; --any wakes on the fir
                                       Must be the ONLY condition (use --timeout to bound it); can't be
                                       raced against other conditions. Omit claim to just wait for
                                       availability and acquire it yourself.
-  pr-state:repo=<owner/repo>[,pr=<n>][,sha=<head>]
+  pr-state:repo=<owner/repo>[,pr=<n>][,sha=<head>][,state=<open|draft|merged|closed>]
                                       a PR lifecycle or mergeable flip (draft<->ready, merged,
                                       closed, conflict/clean flip) plus check-rollup, review-
                                       decision and unresolved-thread-count changes, as projected
@@ -105,7 +106,10 @@ CONDITIONS  (TYPE:key=val,key=val — repeat for several; --any wakes on the fir
                                       side may be an abbreviated prefix) wakes only on signals for
                                       that head, so a previous head's check result can't wake you.
                                       A push alone emits nothing — the head rides on the next
-                                      transition.
+                                      transition. state=merged (|-join several, e.g.
+                                      merged|closed) wakes ONLY when the PR is in that lifecycle
+                                      state, ignoring check/review/conflict churn, and matches at
+                                      arm if the PR is already there (provenance arm_snapshot).
   pr-review:repo=<owner/repo>[,pr=<n>][,reviewer=<login>][,sha=<commit>][,stall_minutes=<10-1440>]
                                       a submitted review, a new review comment, a thread
                                       resolved/re-opened (payload carries the unresolved-thread
@@ -316,6 +320,9 @@ EXAMPLES  (concrete values shown — substitute your repo, PR, SHA, ticket and i
   # Codex review of the head you just pushed (arm BEFORE posting @codex review).
   bb wait 'pr-review:repo=bot-buddy/botbuddy-webapp,pr=1234,reviewer=chatgpt-codex-connector[bot],sha=9f3c2a1' --heartbeat
 
+  # Another PR merged (e.g. your blocker's fix): one wake, on the merge only.
+  bb wait 'pr-state:repo=SupplySpark/supplyspark-ent,pr=3803,state=merged' --heartbeat
+
   # The next review comment OR a PR state change (merge, conflict, checks), whichever first.
   bb wait --any 'pr-review:repo=bot-buddy/botbuddy-webapp,pr=1234' \\
                 'pr-state:repo=bot-buddy/botbuddy-webapp,pr=1234,sha=9f3c2a1' --heartbeat
@@ -2092,6 +2099,8 @@ export async function runWait(argv, { recoveryLocalWaitId = null } = {}) {
   // register and reused as the timeout receipt's error. Null when there is
   // nothing to report (no ci scope=next+branch condition, or no run yet).
   let ciArmNotice = null;
+  // BOT-2724: pr-state state= conditions already satisfied when the wait armed.
+  let armMatches = [];
   // BOT-2468: the wait's /waits?wait= deeplink from register; stays undefined when the
   // wait never registered (live-only/offline), so its receipt carries no web_url key.
   let registeredWebUrl;
@@ -2205,6 +2214,7 @@ export async function runWait(argv, { recoveryLocalWaitId = null } = {}) {
       for (const line of formatPrReviewSnapshotWarnings(reg.prReviewSnapshot)) {
         process.stderr.write(`bb-wait: ${line}\n`);
       }
+      armMatches = prStateArmMatches(conditions, reg.prReviewSnapshot);
       for (const guard of reg.reviewGuards ?? []) {
         process.stderr.write(`bb-wait: review intervention ${guard.minutes} min (${guard.source}), deadline ${guard.deadline}${guard.diagnosed ? "; already diagnosed for this request" : ""}\n`);
       }
@@ -2507,6 +2517,7 @@ export async function runWait(argv, { recoveryLocalWaitId = null } = {}) {
       // BOT-1837: a timeout receipt carries the arm-time CI notice, so a caller
       // reading only the receipt learns the run it meant had already finished.
       timeoutError: ciArmNotice,
+      armMatches,
       onCapacitySourceSustained: ({ host_key, stale_since }) => {
         process.stderr.write(`bb-wait: BLOCKED capacity_source_sustained on ${host_key}, stale_since=${stale_since ?? "unknown"}; ask for a Helper check/restart (launchctl print user/$UID/com.botbuddy.helper.worker). The wait remains armed.\n`);
       },