@botbuddy/cli 1.8.8 → 1.9.1

package/package.json

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

package/src/botbuddy-release-repair.json

@@ -1 +1 @@
-{"schema_version":1,"source_version":"1.8.7","source_identity":"e6b611000678281287808866482334e5a40e265ef3c0328c4e85f53a5bf23cd0"}
+{"schema_version":1,"source_version":"1.9.0","source_identity":"70b96a360d9dd5bd637dc6378a4cae6542cb0a508990f28d26c842946e6fb694"}

package/src/test-lane.mjs

@@ -26,12 +26,19 @@ import { callToolJson } from "./api.mjs";
 export const EXIT_TEST = Object.freeze({ ...EXIT, TIMEOUT: 2 });
 export const WAITS_URL = "https://app.bot-buddy.ai/waits";
 const KNOWN_RUNNERS = new Set(["playwright", "generic"]);
+// BOT-1549: mirror of the DB enum public.test_lane_kind (BOT-1547) and
+// supabase/functions/_shared/test-adapters.ts LANE_KINDS. A lane declares its
+// kind in .botbuddy/lanes.json; an unknown value (config or --lane-kind) is a
+// hard, named failure — never a guessed default (gate 9).
+export const LANE_KINDS = Object.freeze(["smoke", "regression", "diagnostics", "e2e", "unit", "integration", "other"]);
+const LANE_KIND_SET = new Set(LANE_KINDS);
 
 export function parseTestArgs(argv, { env = process.env } = {}) {
   const opts = {
     sessionId: env.BOTBUDDY_SESSION_ID ?? null,
     environment: "local",
     ticket: null, pr: null, repo: null,
+    laneKind: null,
     wait: false, json: false,
   };
   const errors = [];
@@ -49,6 +56,7 @@ export function parseTestArgs(argv, { env = process.env } = {}) {
       case "--ticket": opts.ticket = value(flag, i); i++; break;
       case "--pr": { const raw = value(flag, i); i++; opts.pr = raw == null ? null : Number(raw); if (raw != null && !Number.isInteger(opts.pr)) errors.push("--pr must be an integer"); break; }
       case "--repo": opts.repo = value(flag, i); i++; break;
+      case "--lane-kind": opts.laneKind = value(flag, i); i++; break;
       case "--wait": opts.wait = true; break;
       case "--json": opts.json = true; break;
       default:
@@ -88,7 +96,12 @@ export function resolveLane(laneName, { cwd = process.cwd(), readFileImpl = read
   const lane = lanes[laneName];
   if (!Array.isArray(lane.command) || lane.command.length === 0) return { ok: false, error: "invalid", path, root, detail: `lane "${laneName}" has no command` };
   if (!KNOWN_RUNNERS.has(lane.runner)) return { ok: false, error: "invalid", path, root, detail: `lane "${laneName}" runner must be playwright|generic` };
-  return { ok: true, appSlug: config.app_slug ?? null, lane, path, root };
+  // BOT-1549: an optional per-lane `kind` must be a known lane_kind — a bad
+  // value is rejected here, never coerced or defaulted (gate 9).
+  if (lane.kind != null && !LANE_KIND_SET.has(lane.kind)) {
+    return { ok: false, error: "invalid", path, root, detail: `lane "${laneName}" lane_kind must be one of ${LANE_KINDS.join("|")} (got "${lane.kind}")` };
+  }
+  return { ok: true, appSlug: config.app_slug ?? null, lane, laneKind: lane.kind ?? null, path, root };
 }
 
 // Best-effort git/gh context. Every field falls back to null — never fabricated
@@ -151,8 +164,18 @@ export async function launchTestLane(argv, {
     if (resolved.error === "missing") process.stderr.write(`botbuddy test: no lane config — create ${resolved.path}\n`);
     else if (resolved.error === "unknown") process.stderr.write(`botbuddy test: unknown lane "${laneName}". Available: ${resolved.available.join(", ") || "(none)"}\n`);
     else process.stderr.write(`botbuddy test: invalid lane config (${resolved.detail}) at ${resolved.path}\n`);
-    return { exitCode: EXIT_TEST.INVALID, line: JSON.stringify({ outcome: "rejected", error: resolved.error, path: resolved.path }) };
+    return { exitCode: EXIT_TEST.INVALID, line: JSON.stringify({ outcome: "rejected", error: resolved.error, path: resolved.path, detail: resolved.detail }) };
+  }
+
+  // BOT-1549: resolve the effective lane kind — a --lane-kind flag overrides
+  // the lane's config kind for this run. An invalid flag value is rejected
+  // before any run is created (gate 9), mirroring the config-side check.
+  if (opts.laneKind != null && !LANE_KIND_SET.has(opts.laneKind)) {
+    const detail = `invalid lane_kind: --lane-kind must be one of ${LANE_KINDS.join("|")} (got "${opts.laneKind}")`;
+    process.stderr.write(`botbuddy test: ${detail}\n`);
+    return { exitCode: EXIT_TEST.INVALID, line: JSON.stringify({ outcome: "rejected", error: "invalid", detail }) };
   }
+  const laneKind = opts.laneKind ?? resolved.laneKind ?? null;
 
   const git = gitInfo({ cwd, ticket: opts.ticket, pr: opts.pr, repo: opts.repo });
   const sha7 = (git.sha ?? "").slice(0, 7) || "nosha";
@@ -167,6 +190,8 @@ export async function launchTestLane(argv, {
     commit_sha: git.sha ?? undefined, branch_name: git.branch ?? undefined,
     pr_number: git.prNumber ?? undefined, pr_url: git.prUrl ?? undefined,
     source_kind: "cli-lane", source_id: laneRunId,
+    // BOT-1549: stamp the resolved lane kind on the run; absent ⇒ omitted (NULL).
+    lane_kind: laneKind ?? undefined,
   };
   const created = await call("create_test_run", createArgs);
   const testRunId = created?.ok && !created.isError ? created.data?.id ?? null : null;
@@ -183,6 +208,15 @@ export async function launchTestLane(argv, {
 
   // Step 3: launch the lane under the durable worker, telemetry env in the child.
   const childEnv = { BOTBUDDY_LANE: laneName };
+  // BOT-1549: carry the lane kind to the child so uploaded executions
+  // (test-ingest / playwright-upload) can stamp lane_kind too. ALWAYS set the
+  // key: runWorker spawns the child with `{ ...process.env, ...child_env }`
+  // (run.mjs), so a bare `if (laneKind)` would let a stale BOTBUDDY_LANE_KIND
+  // already in the environment leak into the child even though this run's
+  // lane_kind is NULL — making child-uploaded executions disagree with their
+  // run (Codex P2). Setting "" when there is no effective kind deterministically
+  // clears any inherited value; empty ⇒ unset by parseLaneKind's contract.
+  childEnv.BOTBUDDY_LANE_KIND = laneKind ?? "";
   if (testRunId) { childEnv.BOTBUDDY_TEST_RUN_ID = testRunId; childEnv.BOTBUDDY_TEST_RUN_EVENTS = eventsPath; }
   const testRun = testRunId
     ? { test_run_id: testRunId, events_path: eventsPath, lane: laneName, runner: resolved.lane.runner, git_sha: git.sha ?? null, branch: git.branch ?? null }
@@ -248,7 +282,7 @@ function laneList(cwd) {
 }
 
 function testHelp() {
-  console.log(`botbuddy test <lane> [--session-id <uuid>] [--environment local] [--ticket <KEY>] [--pr <n>] [--repo <owner/repo>] [--wait] [--json] [-- <extra args>]
+  console.log(`botbuddy test <lane> [--session-id <uuid>] [--environment local] [--ticket <KEY>] [--pr <n>] [--repo <owner/repo>] [--lane-kind <${LANE_KINDS.join("|")}>] [--wait] [--json] [-- <extra args>]
 botbuddy test list      List the lanes configured in .botbuddy/lanes.json
 botbuddy test help      Show this help
 

package/src/wait-core.mjs

@@ -611,6 +611,63 @@ export function foldFeedLag(degraded, lagging) {
   return degraded;
 }
 
+// ---------------------------------------------------------------------------
+// BOT-1539 — arm-time outstanding-review notice.
+//
+// `pr-review` / `pr-state` are edge-triggered: they wake only on a review event
+// delivered AFTER arm. When the relay reports (via `pr_review_snapshot` on the
+// register receipt) that a PR ALREADY has an outstanding review, warn the
+// operator on stderr so a silent park isn't mistaken for "no review yet". The
+// existing review will NOT re-wake this wait.
+// ---------------------------------------------------------------------------
+
+// Compact, human relative age (e.g. "27m ago", "3h ago", "2d ago"). Returns
+// null when the timestamp is absent or unparseable, so callers can omit the
+// phrase entirely.
+function relativeAge(iso, now) {
+  if (!iso) return null;
+  const then = Date.parse(iso);
+  if (!Number.isFinite(then)) return null;
+  const secs = Math.max(0, Math.round((now - then) / 1000));
+  if (secs < 60) return `${secs}s ago`;
+  const mins = Math.round(secs / 60);
+  if (mins < 60) return `${mins}m ago`;
+  const hours = Math.round(mins / 60);
+  if (hours < 48) return `${hours}h ago`;
+  return `${Math.round(hours / 24)}d ago`;
+}
+
+/**
+ * Build one stderr warning line per OUTSTANDING pr-review snapshot entry.
+ * Clean (not-outstanding) entries and empty/absent input yield no lines.
+ *
+ * @param {Array<{repo:string,pr:number,unresolved_threads:number,review_decision:string,pr_updated_at:string|null,existing_review_outstanding:boolean}>|null|undefined} snapshot
+ * @param {number} [now] epoch ms, for deterministic age formatting
+ * @returns {string[]}
+ */
+export function formatPrReviewSnapshotWarnings(snapshot, now = Date.now()) {
+  if (!Array.isArray(snapshot)) return [];
+  const lines = [];
+  for (const e of snapshot) {
+    if (!e || e.existing_review_outstanding !== true) continue;
+    const threads = typeof e.unresolved_threads === "number" ? e.unresolved_threads : 0;
+    const parts = [`pr-review armed: ${e.repo}#${e.pr} already has a review outstanding`];
+    if (threads > 0) {
+      parts.push(`${threads} unresolved review thread${threads === 1 ? "" : "s"}`);
+    }
+    if (e.review_decision && e.review_decision !== "unknown") {
+      parts.push(`review_decision=${e.review_decision}`);
+    }
+    const age = relativeAge(e.pr_updated_at, now);
+    if (age) parts.push(`last update ${age}`);
+    lines.push(
+      `${parts.join(" · ")}. This wait fires only on the NEXT review event; ` +
+      `the existing review will not re-wake it.`,
+    );
+  }
+  return lines;
+}
+
 // ---------------------------------------------------------------------------
 // Matching — does a spine signal frame satisfy a condition?
 // ---------------------------------------------------------------------------

package/src/wait.mjs

@@ -13,7 +13,7 @@
 // Usage:  botbuddy wait [--any] <condition>... [options]
 // Run     botbuddy wait --help for the condition grammar.
 
-import { EXIT, parseConditions, parseSseFrames, runWaitLoop, normalizeSince, truncateReceipt } from "./wait-core.mjs";
+import { EXIT, parseConditions, parseSseFrames, runWaitLoop, normalizeSince, truncateReceipt, formatPrReviewSnapshotWarnings } from "./wait-core.mjs";
 import { resolveAgentProfile, withPrincipalReceipt } from "./wait-profile.mjs";
 import { VERSION } from "./version.mjs";
 import { fileURLToPath } from "node:url";
@@ -52,7 +52,12 @@ CONDITIONS  (TYPE:key=val,key=val — repeat for several; --any wakes on the fir
                                       flip sets payload.mergeable_changed (no new condition).
   pr-review:repo=<owner/repo>[,pr=<n>]
                                       a new review comment, or a thread resolved/re-opened
-                                      (payload carries the unresolved-thread count)
+                                      (payload carries the unresolved-thread count).
+                                      Edge-triggered: it wakes only on review activity AFTER
+                                      arm. If the PR ALREADY has an outstanding review at arm,
+                                      bb-wait prints a one-line stderr notice (unresolved count,
+                                      review_decision, age) so a silent park isn't mistaken for
+                                      "no review yet" — the existing review will not re-wake it.
   test-run:id=<run_id>                a test run reaching a terminal status (owner-scoped)
   lease:id=<lease_id>                 a batch stack lease (BOT-1218) leaving the queue /
                                       becoming active — the zero-poll wake for a parked
@@ -334,6 +339,10 @@ async function registerWait(opts, conditions, deadlineIso) {
     // echoes session_agent_id only when it overrode the profile agent).
     sessionId: body.session_id ?? null,
     sessionAgentId: body.session_agent_id ?? null,
+    // 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".
+    prReviewSnapshot: Array.isArray(body.pr_review_snapshot) ? body.pr_review_snapshot : null,
   };
 }
 
@@ -618,6 +627,12 @@ export async function runWait(argv) {
       registeredAgentId = reg.agentId;
       registeredSessionAgentId = reg.sessionAgentId;
       registeredSessionId = reg.sessionId;
+      // BOT-1539: if any pr-review/pr-state target already has an outstanding
+      // review, tell the operator now (stderr, one line per PR). Purely
+      // informational — it does not change arming or exit semantics.
+      for (const line of formatPrReviewSnapshotWarnings(reg.prReviewSnapshot)) {
+        process.stderr.write(`bb-wait: ${line}\n`);
+      }
       // BOT-1184: adopt the server's canonical host for each lock condition so the
       // local matcher builds the same subject_key the availability/claim-grant
       // signals carry (armed under an alias like 'jono-mac', the signal uses the