@botbuddy/cli 1.63.35 → 1.63.37

package/daemon-release/darwin-arm64.json

@@ -1,7 +1,7 @@
 {
-  "release_version": "1.63.35",
-  "source_commit": "4517f4b0fe820afa3c976ac2a07bbbf02253fb86",
-  "source_sha256": "20ba1366169f553685a44b2ffb1d08b8155f8c91e6a6c215909c5fb0825a5f81",
+  "release_version": "1.63.37",
+  "source_commit": "503ca85897b8b844ee5a841addcbb383c563de68",
+  "source_sha256": "16d04abbbc7838ae352f1cde6e5b7f76d47c2ae3723d47a0d79f3b1ebcc74c63",
   "target": "darwin-arm64",
-  "sha256": "e397a1b045b4ccd213e9a7a7dbc3631b83d8af2e0dff67b90b81c365ed9b1b41"
+  "sha256": "dc1147cf8c4554b973d31c14fe95d2edadf7623b23e9ac9d578d4e9a6de7f975"
 }

package/daemon-release/linux-x64.json

@@ -1,7 +1,7 @@
 {
-  "release_version": "1.63.35",
-  "source_commit": "4517f4b0fe820afa3c976ac2a07bbbf02253fb86",
-  "source_sha256": "20ba1366169f553685a44b2ffb1d08b8155f8c91e6a6c215909c5fb0825a5f81",
+  "release_version": "1.63.37",
+  "source_commit": "503ca85897b8b844ee5a841addcbb383c563de68",
+  "source_sha256": "16d04abbbc7838ae352f1cde6e5b7f76d47c2ae3723d47a0d79f3b1ebcc74c63",
   "target": "linux-x64",
-  "sha256": "c2a2d4b815867bf1e6c4008cbb2eda12d1aecee16e3f11727e445307742a5521"
+  "sha256": "f8c16854c6324625c2284a3707edafa0c4f79a0560a8cc7a97a2f952014b1900"
 }

package/daemon-release/manifest.json

@@ -1,21 +1,21 @@
 {
   "schema_version": 1,
-  "release_version": "1.63.35",
-  "source_commit": "4517f4b0fe820afa3c976ac2a07bbbf02253fb86",
-  "source_sha256": "20ba1366169f553685a44b2ffb1d08b8155f8c91e6a6c215909c5fb0825a5f81",
+  "release_version": "1.63.37",
+  "source_commit": "503ca85897b8b844ee5a841addcbb383c563de68",
+  "source_sha256": "16d04abbbc7838ae352f1cde6e5b7f76d47c2ae3723d47a0d79f3b1ebcc74c63",
   "targets": {
     "darwin-arm64": {
       "goos": "darwin",
       "goarch": "arm64",
       "binary": "daemon/bin/darwin-arm64/botbuddy-daemon",
-      "sha256": "e397a1b045b4ccd213e9a7a7dbc3631b83d8af2e0dff67b90b81c365ed9b1b41",
+      "sha256": "dc1147cf8c4554b973d31c14fe95d2edadf7623b23e9ac9d578d4e9a6de7f975",
       "mode": "0755"
     },
     "linux-x64": {
       "goos": "linux",
       "goarch": "amd64",
       "binary": "daemon/bin/linux-x64/botbuddy-daemon",
-      "sha256": "c2a2d4b815867bf1e6c4008cbb2eda12d1aecee16e3f11727e445307742a5521",
+      "sha256": "f8c16854c6324625c2284a3707edafa0c4f79a0560a8cc7a97a2f952014b1900",
       "mode": "0755"
     }
   }

package/package.json

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

package/src/wait.mjs

@@ -26,6 +26,7 @@ import { SETUP_BLOCK } from "./setup-block.mjs";
 import { createWaitCheckpointStore, WaitCheckpointError } from "./wait-checkpoint.mjs";
 import { realpath } from "node:fs/promises";
 import { deepLinkNotice, safeWebUrl } from "./deep-link.mjs";
+import { redactTelemetry } from "./telemetry-outbox.mjs";
 import { assertWaitObserver, readWaitResult, waitCompletionState, waitObserverId, writeWaitReceipt } from "./wait-result.mjs";
 
 // A protocol is deliberately distinct from package semver: compatible pinned
@@ -489,6 +490,25 @@ async function reserveClaimQueueBoundary(opts, conditions) {
   }
 }
 
+// BOT-2855: the concrete next step for a typed registration refusal, or null when
+// there is none beyond the relay's own detail. Built from the parsed conditions
+// only (repo / PR number), never from a credential.
+export function registerRefusalRecovery(errorCode, conditions) {
+  const release = Array.isArray(conditions) ? conditions.find((c) => c?.type === "staging-release") : null;
+  const repo = release?.params?.repo ?? "<owner/repo>";
+  const pr = release?.params?.pr ?? "<n>";
+  const arm = `bb wait 'staging-release:repo=${repo},pr=${pr}'`;
+  if (errorCode === "pr_not_merged") {
+    return "staging-release arms only after the PR merges. Before the merge, wait for it with "
+      + `bb wait 'pr-state:repo=${repo},pr=${pr}' (or for its CI with bb wait 'ci:repo=${repo},scope=latest,pr=${pr}'), `
+      + `then arm ${arm}`;
+  }
+  if (errorCode === "pr_merge_sha_unresolved") {
+    return `the merge commit is not visible yet; retry ${arm} in a minute`;
+  }
+  return null;
+}
+
 async function registerWait(opts, conditions, deadlineIso) {
   // BOT-1649: a relay wait authenticates from the per-session `bb_sess_` token
   // ($BOTBUDDY_AGENT_SESSION_TOKEN) — the relay derives agent, tenant, and session from it.
@@ -524,15 +544,34 @@ async function registerWait(opts, conditions, deadlineIso) {
     },
     body: JSON.stringify(registerBody),
   });
+  // BOT-2855: read an error body ONCE. Each status branch below inspects it and may
+  // fall through to the generic `!res.ok` error; a second `res.json()` on the consumed
+  // body threw, the catch turned it into `{}`, and the relay's typed reason (e.g.
+  // `pr_not_merged`) collapsed to `register responded 400`. Redact any credential a
+  // relay detail might echo before it can reach stderr or the receipt.
+  let errorBody = null;
+  let errorBodyIsJson = false;
+  const readErrorBody = async () => {
+    if (errorBody) return errorBody;
+    const text = await res.text().catch(() => "");
+    try {
+      const parsed = JSON.parse(text);
+      errorBodyIsJson = Boolean(parsed) && typeof parsed === "object" && !Array.isArray(parsed);
+      errorBody = errorBodyIsJson ? redactTelemetry(parsed) : {};
+    } catch {
+      errorBody = {};
+    }
+    return errorBody;
+  };
   if (res.status === 429) {
-    const body = await res.json().catch(() => ({}));
+    const body = await readErrorBody();
     const err = new Error(body.detail || "wait_session_cap_exceeded");
     err.cap = true;
     err.errorCode = body.error || "wait_session_cap_exceeded";
     throw err;
   }
   if (res.status === 401) {
-    const body = await res.json().catch(() => ({}));
+    const body = await readErrorBody();
     const err = new Error(body.detail || body.message || body.error || "unauthorized agent key");
     err.auth = true;
     err.errorCode = body.error || "unauthorized";
@@ -548,7 +587,7 @@ async function registerWait(opts, conditions, deadlineIso) {
     // A TRANSIENT backend 400 (e.g. `register_failed` from the RPC) is NOT
     // caller-actionable — fall through to the existing live-only fallback so a valid
     // wait still arms (Codex round-7 P2).
-    const body = await res.json().catch(() => ({}));
+    const body = await readErrorBody();
     const INVALID_CONDITION_CODES = new Set([
       "no_signal_source",
       "review_guard_registration_failed",
@@ -593,6 +632,9 @@ async function registerWait(opts, conditions, deadlineIso) {
       // caller-actionable hard stops, not the untracked live-only fallback.
       "chat_not_participant",
       "chat_participant_ambiguous",
+      // BOT-2855: BOT-1458 AC-3 — staging-release arms only for a merged PR. Before the
+      // merge the relay refuses it by design; the caller must wait for the merge first.
+      "pr_not_merged",
       // BOT-2318: command-run targets are authorization-bound to the registering
       // tenant, agent and work session, and the condition cannot be composed.
       // Both refusals require the caller to change its target/conditions; falling
@@ -609,7 +651,7 @@ async function registerWait(opts, conditions, deadlineIso) {
     }
   }
   if (res.status === 404) {
-    const body = await res.json().catch(() => ({}));
+    const body = await readErrorBody();
     if (body.error === "linear_issue_not_found") {
       const err = new Error(body.detail || body.error);
       err.invalidCondition = true;
@@ -632,7 +674,7 @@ async function registerWait(opts, conditions, deadlineIso) {
     }
   }
   if (res.status === 403) {
-    const body = await res.json().catch(() => ({}));
+    const body = await readErrorBody();
     if (new Set(["wait_tenant_unresolved", "wait_cross_tenant", "wait_tenant_mismatch", "wait_resume_identity_mismatch"]).has(body.error)) {
       const err = new Error(body.detail || body.error);
       err.invalidCondition = true;
@@ -655,7 +697,7 @@ async function registerWait(opts, conditions, deadlineIso) {
     throw err;
   }
   if (res.status === 426) {
-    const body = await res.json().catch(() => ({}));
+    const body = await readErrorBody();
     const err = new Error(body.detail || "this wait client is no longer supported");
     err.clientOutdated = true;
     err.errorCode = body.error || "client_outdated";
@@ -669,7 +711,7 @@ async function registerWait(opts, conditions, deadlineIso) {
     // unblocked wait would skip the server's initial evaluation and could resume a
     // coding session on a false already_unblocked. Surface the typed receipt and a
     // concrete exit code (5=backend/retryable, 4=invalid/not-found).
-    const body = await res.json().catch(() => ({}));
+    const body = await readErrorBody();
     if (body.error === "unblocked_projection_unresolved" || body.error === "unblocked_ticket_not_found") {
       const err = new Error(body.detail || body.error);
       err.hydrationRegister = true;
@@ -682,12 +724,20 @@ async function registerWait(opts, conditions, deadlineIso) {
     }
   }
   if (!res.ok) {
-    const body = await res.json().catch(() => ({}));
-    const err = new Error(body.detail || body.message || body.error || `register responded ${res.status}`);
+    const body = await readErrorBody();
+    const typedCode = typeof body.error === "string" && body.error ? body.error : null;
+    const detail = [body.detail, body.message].find((v) => typeof v === "string" && v) ?? null;
+    const err = new Error(detail || typedCode ||
+      `register responded ${res.status}${errorBodyIsJson ? "" : " with a non-JSON body"}`);
+    // BOT-2855: keep the relay's typed reason for the caller and the receipt.
+    err.errorCode = typedCode || "register_failed";
+    err.httpStatus = res.status;
     if (body.error === "initial_eval_failed") {
       err.initialEval = true;
-      err.errorCode = body.error;
       err.detail = body.detail || "initial evaluation failed";
+    } else if (body.error === "pr_merge_sha_unresolved") {
+      // Merged, but neither the projection nor GitHub returned the merge commit yet.
+      err.retryableRegister = true;
     }
     throw err;
   }
@@ -2352,15 +2402,35 @@ export async function runWait(argv, { recoveryLocalWaitId = null } = {}) {
           }
         }
         process.stderr.write(`bb-wait: invalid condition (${err.errorCode}) — ${err.message}\n`);
+        const recovery = registerRefusalRecovery(err.errorCode, conditions);
+        if (recovery) process.stderr.write(`bb-wait: next step: ${recovery}\n`);
         await emitReceipt({
           schema_version: 1,
           outcome: "error",
           error: err.errorCode,
+          error_code: err.errorCode,
           detail: String(err.message),
           ...(Array.isArray(err.candidates) && err.candidates.length > 0 ? { candidates: err.candidates } : {}),
+          ...(recovery ? { recovery } : {}),
         });
         process.exit(EXIT.INVALID);
       }
+      if (err && err.retryableRegister) {
+        // BOT-2855: a merged PR whose merge commit is not visible yet — retryable.
+        const recovery = registerRefusalRecovery(err.errorCode, conditions);
+        process.stderr.write(`bb-wait: wait-session registration failed (${err.errorCode}) — ${err.message}\n`);
+        if (recovery) process.stderr.write(`bb-wait: next step: ${recovery}\n`);
+        await emitReceipt({
+          schema_version: 1,
+          outcome: "error",
+          error: err.errorCode,
+          error_code: err.errorCode,
+          detail: String(err.message),
+          http_status: err.httpStatus ?? null,
+          ...(recovery ? { recovery } : {}),
+        });
+        process.exit(EXIT.BACKEND);
+      }
       if (err && err.initialEval) {
         process.stderr.write(`bb-wait: initial wait evaluation failed (${err.errorCode}) — ${err.detail}\n`);
         await emitReceipt({ schema_version: 1, outcome: "error", error: err.errorCode, detail: String(err.detail) });
@@ -2375,9 +2445,19 @@ export async function runWait(argv, { recoveryLocalWaitId = null } = {}) {
       // BOT-1338/1608: every non-timer wait is a relay-tracked, session-token wait.
       // If registration did not succeed, neither the server nor this client has
       // verified the session's tenant, so there is no safe untracked fallback.
-      process.stderr.write(`bb-wait: wait-session registration failed (failing closed, not arming untracked): ${err && err.message || err}\n`);
+      // BOT-2855: name the relay's typed code (or register_failed when it sent none)
+      // and its status, so the caller can act on it instead of a bare status line.
+      const errorCode = (err && err.errorCode) || "register_failed";
+      process.stderr.write(`bb-wait: wait-session registration failed (${errorCode}) — failing closed, not arming untracked: ${err && err.message || err}\n`);
       await emitReceipt(withPrincipalReceipt(
-        { schema_version: 1, outcome: "error", error: "register_failed", detail: String(err && err.message || err) },
+        {
+          schema_version: 1,
+          outcome: "error",
+          error: "register_failed",
+          error_code: errorCode,
+          detail: String(err && err.message || err),
+          ...(err && Number.isInteger(err.httpStatus) ? { http_status: err.httpStatus } : {}),
+        },
         null,
         { sessionTenant: sessionTenant ?? null, agentId: null },
       ));