@botbuddy/cli 1.63.5 → 1.63.7

package/daemon-release/darwin-arm64.json

@@ -1,7 +1,7 @@
 {
-  "release_version": "1.63.5",
-  "source_commit": "fc9bbe22c3fe8840724c30eae63515cfd70cce9d",
-  "source_sha256": "bed3488d03f054f8c30c49d28bb3d5783d081363f2d9c69063164c79cc70feee",
+  "release_version": "1.63.7",
+  "source_commit": "ad1b7a0a46c938f8dfb3f03f80e97849b879e4a2",
+  "source_sha256": "44fb5d94a9794df429bdd315b45b75306e4e25f17e382fdb1f09b40791af2411",
   "target": "darwin-arm64",
-  "sha256": "e6e438fc3e98628a4e5f04a0100c96ba694f75d78210fbebe3623af7b0f085d7"
+  "sha256": "13b8ac4129fbea660ed56afad579f6634f93e5425caf8038f46c28c586c1f858"
 }

package/daemon-release/linux-x64.json

@@ -1,7 +1,7 @@
 {
-  "release_version": "1.63.5",
-  "source_commit": "fc9bbe22c3fe8840724c30eae63515cfd70cce9d",
-  "source_sha256": "bed3488d03f054f8c30c49d28bb3d5783d081363f2d9c69063164c79cc70feee",
+  "release_version": "1.63.7",
+  "source_commit": "ad1b7a0a46c938f8dfb3f03f80e97849b879e4a2",
+  "source_sha256": "44fb5d94a9794df429bdd315b45b75306e4e25f17e382fdb1f09b40791af2411",
   "target": "linux-x64",
-  "sha256": "b224066b8aa6ae1831282fbfd7e60135864dea69847a7187df81bd171674456a"
+  "sha256": "71de432f506d59123e5d46961b6e76c550236767786e1d5b8747ab2f11010d5d"
 }

package/daemon-release/manifest.json

@@ -1,21 +1,21 @@
 {
   "schema_version": 1,
-  "release_version": "1.63.5",
-  "source_commit": "fc9bbe22c3fe8840724c30eae63515cfd70cce9d",
-  "source_sha256": "bed3488d03f054f8c30c49d28bb3d5783d081363f2d9c69063164c79cc70feee",
+  "release_version": "1.63.7",
+  "source_commit": "ad1b7a0a46c938f8dfb3f03f80e97849b879e4a2",
+  "source_sha256": "44fb5d94a9794df429bdd315b45b75306e4e25f17e382fdb1f09b40791af2411",
   "targets": {
     "darwin-arm64": {
       "goos": "darwin",
       "goarch": "arm64",
       "binary": "daemon/bin/darwin-arm64/botbuddy-daemon",
-      "sha256": "e6e438fc3e98628a4e5f04a0100c96ba694f75d78210fbebe3623af7b0f085d7",
+      "sha256": "13b8ac4129fbea660ed56afad579f6634f93e5425caf8038f46c28c586c1f858",
       "mode": "0755"
     },
     "linux-x64": {
       "goos": "linux",
       "goarch": "amd64",
       "binary": "daemon/bin/linux-x64/botbuddy-daemon",
-      "sha256": "b224066b8aa6ae1831282fbfd7e60135864dea69847a7187df81bd171674456a",
+      "sha256": "71de432f506d59123e5d46961b6e76c550236767786e1d5b8747ab2f11010d5d",
       "mode": "0755"
     }
   }

package/package.json

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

package/src/run-delivery.mjs

@@ -467,7 +467,7 @@ export async function runDelivery({
  * small reads. Never throws into the caller's command.
  */
 export async function ensureRunDelivery({
-  home = homedir(), env = process.env, spawnImpl = spawn, isAlive = pidAlive, force = false, cooldownMs = DELIVERY_RESCAN_COOLDOWN_MS,
+  home = homedir(), env = process.env, spawnImpl = spawn, isAlive = pidAlive, force = false, cooldownMs = DELIVERY_RESCAN_COOLDOWN_MS, now = Date.now, stateStat = stat,
 } = {}) {
   try {
     if (env.BOTBUDDY_RUN_DELIVERY === "off") return { started: false, reason: "disabled" };
@@ -480,7 +480,8 @@ export async function ensureRunDelivery({
     // starts us itself (force) when it parks, so otherwise scan at most once
     // per cooldown. Both times are this machine's filesystem clock.
     if (!force && state) {
-      const stateAge = Date.now() - (await stat(deliveryStatePath(home))).mtimeMs;
+      // Date.now() has millisecond precision; APFS mtime may carry fractions.
+      const stateAge = now() - Math.floor((await stateStat(deliveryStatePath(home))).mtimeMs);
       if (stateAge >= 0 && stateAge < cooldownMs) return { started: false, reason: "cooldown" };
     }
     const holder = await readJson(deliveryLockPath(home));

package/src/wait-core.mjs

@@ -501,7 +501,7 @@ function parsePrTarget(p, label) {
 // 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-review": Object.freeze(["repo", "pr", "number", "sha", "reviewer"]),
+  "pr-review": Object.freeze(["repo", "pr", "number", "sha", "reviewer", "stall_minutes"]),
 });
 
 // A GitHub login compared case-insensitively, with the App suffix `[bot]` stripped
@@ -531,14 +531,24 @@ function parsePrCondition(p, label) {
     if (reviewer === "") throw new Error(`${label} reviewer= must be a GitHub login`);
     out.reviewer = reviewer;
   }
+  if (p.stall_minutes !== undefined) {
+    const minutes = Number(p.stall_minutes);
+    if (!/^\d+$/.test(String(p.stall_minutes)) || !Number.isInteger(minutes) || minutes < 10 || minutes > 1440) {
+      throw new Error("pr-review stall_minutes= must be an integer from 10 to 1440");
+    }
+    if (out.number == null || !out.sha || (out.reviewer && out.reviewer !== "chatgpt-codex-connector")) {
+      throw new Error("pr-review stall_minutes= requires pr= and sha= for the Codex reviewer");
+    }
+    out.stall_minutes = minutes;
+  }
   return out;
 }
 
 // Does a spine subject_key (`owner/repo#number`) satisfy a pr target?
 function prSubjectMatches(subjectKey, params) {
   if (typeof subjectKey !== "string") return false;
-  if (params.number != null) return subjectKey === `${params.repo}#${params.number}`;
-  return subjectKey.startsWith(`${params.repo}#`);
+  if (params.number != null) return subjectKey.toLowerCase() === `${params.repo}#${params.number}`.toLowerCase();
+  return subjectKey.toLowerCase().startsWith(`${params.repo}#`.toLowerCase());
 }
 
 // Does a commit field on a signal payload identify the same commit as the
@@ -560,8 +570,13 @@ function prStateFiltersMatch(signal, params) {
 // BOT-1975 / BOT-1972: optional commit + reviewer scoping for pr-review. A
 // `review_unavailable` signal (the Codex usage-limit decline) names no commit, so
 // it always passes the sha filter — the waiter must learn no review is coming.
-function prReviewFiltersMatch(signal, params) {
+function prReviewFiltersMatch(signal, params, guard) {
   const payload = signal.payload ?? {};
+  if (payload.guard_id && guard && (payload.guard_id !== guard.id || !(Date.parse(payload.started_at) >= Date.parse(guard.started_at)))) return false;
+  // Scoped Codex waits use the durable diagnostic. Legacy cron stall notices
+  // are informational and cannot pre-empt a call-specific intervention policy.
+  if (payload.transition === "review_stalled" && params.sha && params.number &&
+      (!params.reviewer || params.reviewer === "chatgpt-codex-connector") && !payload.guard_id) return false;
   if (params.sha != null && payload.transition !== "review_unavailable" &&
       !shaPrefixMatches(payload.commit_sha, params.sha)) {
     return false;
@@ -1123,7 +1138,7 @@ function conditionMatchesSignal(condition, signal, waitSessionId) {
         prStateFiltersMatch(signal, params);
     case "pr-review":
       return signal.signal_type === "pr_review" && prSubjectMatches(signal.subject_key, params) &&
-        prReviewFiltersMatch(signal, params);
+        prReviewFiltersMatch(signal, params, condition.review_guard);
     case "test-run":
       return signal.signal_type === "test_run" && signal.subject_key === `run:${params.runId}`;
     case "stack-run":

package/src/wait.mjs

@@ -105,12 +105,15 @@ CONDITIONS  (TYPE:key=val,key=val — repeat for several; --any wakes on the fir
                                       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.
-  pr-review:repo=<owner/repo>[,pr=<n>][,reviewer=<login>][,sha=<commit>]
+  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
-                                      count), a Codex clean pass (payload.transition=clean_pass)
-                                      or the Codex usage-limit decline (transition=
-                                      review_unavailable — no review is coming).
+                                      count), a Codex clean pass (payload.transition=clean_pass),
+                                      the Codex usage-limit decline (transition=
+                                      review_unavailable — no review is coming) or a Codex
+                                      review needing intervention after one backend diagnostic
+                                      (transition=review_stalled, review_available=false,
+                                      reason + next_action). Initial default: 10 min.
                                       Edge-triggered: it wakes only on review activity AFTER
                                       arm, so arm BEFORE requesting the review. If the PR ALREADY
                                       has an outstanding review at arm, bb-wait prints a one-line
@@ -218,6 +221,12 @@ CONDITIONS  (TYPE:key=val,key=val — repeat for several; --any wakes on the fir
                                       tenant after current server-side approval revalidation.
 
 OPTIONS
+  Review intervention: exact-head Codex waits have a durable one-shot diagnostic.
+  stall_minutes= overrides repository → tenant settings (initial default 10 min).
+  A missing/unbound backend guard is refused as review_guard_unsupported.
+  It needs pr= + sha=. A result wakes immediately; a deadline never means approval.
+  Reconnects/re-arms retain the deadline. This is separate from --timeout below.
+
   --any                 wake on the first matching condition (default; only mode in v1)
   --timeout <seconds>   safety cap (default 86400 = 24 h; hard cap 259200 = 72 h). Timeout is exit 2,
                         not an error. The timeout is a SAFETY CAP measured in hours or days, never a
@@ -528,6 +537,7 @@ async function registerWait(opts, conditions, deadlineIso) {
     const body = await res.json().catch(() => ({}));
     const INVALID_CONDITION_CODES = new Set([
       "no_signal_source",
+      "review_guard_registration_failed",
       "unblocked_cross_tenant",
       "unblocked_requires_tenant",
       "wait_tenant_unresolved",
@@ -662,6 +672,24 @@ async function registerWait(opts, conditions, deadlineIso) {
     throw err;
   }
   const body = await res.json();
+  const guardedReviews = conditions.filter((c) => c.type === "pr-review" && c.params?.sha && (c.params.number || c.params.pr) &&
+    String(c.params.reviewer ?? "chatgpt-codex-connector").toLowerCase().replace(/\[bot\]$/, "") === "chatgpt-codex-connector");
+  for (const condition of guardedReviews) {
+    const params = condition.params;
+    const guard = Array.isArray(body.review_guards) && body.review_guards.find((g) =>
+      typeof g?.repo === "string" && g.repo.toLowerCase() === params.repo.toLowerCase() &&
+      Number(g.pr_number) === Number(params.number ?? params.pr) && typeof g.commit_sha === "string" &&
+      /^[0-9a-f]{7,40}$/i.test(g.commit_sha) &&
+      (g.commit_sha.toLowerCase().startsWith(params.sha) || params.sha.startsWith(g.commit_sha.toLowerCase())));
+    const binding = Array.isArray(body.conditions) ? body.conditions.find((c) => c.id === condition.id)?.review_guard : null;
+    if (!guard || typeof guard.id !== "string" || !guard.id || binding?.id !== guard.id ||
+      !Number.isFinite(Date.parse(binding.started_at)) || !Number.isFinite(Date.parse(guard.started_at)) ||
+      !Number.isFinite(Date.parse(guard.deadline)) || !Number.isInteger(guard.minutes) || guard.minutes < 10 || guard.minutes > 1440 ||
+      !["call", "repository", "tenant"].includes(guard.source)) {
+      const err = new Error("relay did not bind the required review intervention policy; upgrade the backend before using this client");
+      err.invalidCondition = true; err.errorCode = "review_guard_unsupported"; throw err;
+    }
+  }
   // BOT-1572/1608: a session-token wait has no profile to attest; the relay
   // returns the derived session_id + agent_id. Their absence means the relay did
   // not honour the token as a session credential — fail closed.
@@ -694,6 +722,7 @@ async function registerWait(opts, conditions, deadlineIso) {
     // BOT-1539: arm-time snapshot of already-outstanding code review for any
     // pr-review/pr-state target. Report-only — surfaced on stderr so a silent
     // edge-triggered park isn't mistaken for "no review yet".
+    reviewGuards: Array.isArray(body.review_guards) ? body.review_guards : [],
     prReviewSnapshot: Array.isArray(body.pr_review_snapshot) ? body.pr_review_snapshot : null,
     // BOT-2400: how often this session already armed this exact condition set (24 h), and
     // the relay's warning once that reaches 3.
@@ -2101,6 +2130,9 @@ export async function runWait(argv, { recoveryLocalWaitId = null } = {}) {
       for (const line of formatPrReviewSnapshotWarnings(reg.prReviewSnapshot)) {
         process.stderr.write(`bb-wait: ${line}\n`);
       }
+      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`);
+      }
       // BOT-2400: re-arming the same wait again and again burns tokens on every wake.
       if (reg.rearmWarning) process.stderr.write(`bb-wait: ${reg.rearmWarning}\n`);
       // BOT-1837: one line naming the branch's latest run at arm time. Report-only
@@ -2130,7 +2162,9 @@ export async function runWait(argv, { recoveryLocalWaitId = null } = {}) {
         // and refusing a recycled key). No `tenant` is stamped for `linear` — its cross-tenant
         // isolation rides on the central guard's sessionTenant (BOT-1259), not a per-type param.
         const linearScope = new Map();
+        const reviewScope = new Map();
         for (const rc of reg.conditions) {
+          if (rc?.type === "pr-review" && rc.review_guard) reviewScope.set(rc.id, rc.review_guard);
           if (rc && rc.type === "lock" && rc.params && typeof rc.params.host === "string") {
             canonHost.set(rc.id, rc.params.host);
           }
@@ -2142,6 +2176,7 @@ export async function runWait(argv, { recoveryLocalWaitId = null } = {}) {
           }
         }
         for (const c of conditions) {
+          if (c.type === "pr-review" && reviewScope.has(c.id)) c.review_guard = reviewScope.get(c.id);
           if (c.type === "lock" && canonHost.has(c.id)) c.params.host = canonHost.get(c.id);
           if (c.type === "unblocked" && unblockedScope.has(c.id)) {
             const s = unblockedScope.get(c.id);