@botbuddy/cli 1.59.7 → 1.59.9

package/src/wait-core.mjs

@@ -80,6 +80,7 @@ function managedAllocationFailureDetail(signal, condition) {
 // own-session terminal branch because its wait_session_id differs) would otherwise match
 // that raw event condition and exit an unrelated wait as an ordinary match (Codex P2).
 export const WAIT_SUPERSEDED_SIGNAL_TYPE = "wait_superseded";
+const HOST_APPROVAL_HOST_KEY_RE = /^bbh-[0-9a-f]{24}$/;
 
 // The USER-ARMABLE spine signal_type allowlist, for the `event:` escape hatch. The full
 // public.agent_signal_type enum is these PLUS the control types above
@@ -99,6 +100,11 @@ export const SIGNAL_TYPES = Object.freeze([
   "snapshot",
   "ticket_unblocked",
   "stack_lease",
+  // BOT-2324: emitted only once the exact public host approval predicate is
+  // true (owner-bound active settings + policy + live tenant subscription).
+  // It is intentionally consumed through the existing raw `event:` escape
+  // hatch rather than adding another parallel wait grammar.
+  "host_approval",
 ]);
 
 const LOCK_SUBTYPES = Object.freeze(["playwright_lane", "vite_port", "backend_port", "supabase_local"]);
@@ -281,9 +287,10 @@ const VALIDATORS = {
   // BOT-1507 — scope=next adds a fourth, LIVE-ONLY selector: it names no run or PR
   // (they must already exist at arm time) and wakes on the first terminal CI run for
   // the repo delivered AFTER the wait was armed — the post-merge / cron train case.
-  // Optional branch=/workflow= filter that first run; branch is valid only with
-  // scope=next. A workflow also pins a level-triggered sha= recovery to one
-  // canonical workflow identity.
+  // Optional branch=/workflow=/workflow_id=/workflow_path= filters narrow that
+  // first run; branch and stable workflow identities are valid only with
+  // scope=next. The legacy display-name filter also pins a level-triggered
+  // sha= recovery to one historical workflow.
   // BOT-1685 — scope=next also accepts an optional sha= FILTER (distinct from the
   // level-triggered sha= selector): a wait armed BEFORE re-dispatching a run for a
   // known commit then wakes on the NEXT terminal run for THAT commit, instead of
@@ -303,9 +310,13 @@ const VALIDATORS = {
     }
     const hasBranchFilter = p.branch !== undefined;
     const hasWorkflowFilter = p.workflow !== undefined;
+    const hasWorkflowIdFilter = p.workflow_id !== undefined;
+    const hasWorkflowPathFilter = p.workflow_path !== undefined;
     if (p.scope !== undefined) {
       if (p.scope === "latest") {
-        if (hasBranchFilter || hasWorkflowFilter) throw new Error("ci branch=/workflow= are only valid with scope=next");
+        if (hasBranchFilter || hasWorkflowFilter || hasWorkflowIdFilter || hasWorkflowPathFilter) {
+          throw new Error("ci branch=/workflow=/workflow_id=/workflow_path= are only valid with scope=next");
+        }
         if (p.pr === undefined || !/^\d+$/.test(String(p.pr).trim())) {
           throw new Error("ci scope=latest needs pr=<number>");
         }
@@ -323,12 +334,23 @@ const VALIDATORS = {
           if (v === "") throw new Error(`ci ${key}= must be non-empty`);
           return v;
         };
-        return { repo, scope: "next", branch: filter("branch"), workflow: filter("workflow"), sha: filter("sha"), pr: null };
+        const workflowId = filter("workflow_id");
+        const workflowPath = filter("workflow_path");
+        return {
+          repo,
+          scope: "next",
+          branch: filter("branch"),
+          workflow: filter("workflow"),
+          ...(workflowId == null ? {} : { workflowId }),
+          ...(workflowPath == null ? {} : { workflowPath }),
+          sha: filter("sha"),
+          pr: null,
+        };
       }
       throw new Error("ci scope must be 'latest' or 'next' (or use run_id=/sha=)");
     }
-    if (hasBranchFilter || (hasWorkflowFilter && p.sha === undefined)) {
-      throw new Error("ci branch= is only valid with scope=next; workflow= also accepts an exact sha selector");
+    if (hasBranchFilter || hasWorkflowIdFilter || hasWorkflowPathFilter || (hasWorkflowFilter && p.sha === undefined)) {
+      throw new Error("ci branch=/workflow_id=/workflow_path= are only valid with scope=next; legacy workflow= also accepts an exact sha selector");
     }
     if (p.run_id !== undefined) {
       if (!String(p.run_id).trim()) throw new Error("ci run_id must be non-empty");
@@ -337,7 +359,13 @@ const VALIDATORS = {
     if (!String(p.sha).trim()) throw new Error("ci sha must be non-empty");
     const workflow = p.workflow === undefined ? null : String(p.workflow).trim();
     if (p.workflow !== undefined && workflow === "") throw new Error("ci workflow= must be non-empty");
-    return { repo, scope: "sha", sha: String(p.sha).trim(), workflow, pr: p.pr != null ? String(p.pr).trim() : null };
+    return {
+      repo,
+      scope: "sha",
+      sha: String(p.sha).trim(),
+      workflow,
+      pr: p.pr != null ? String(p.pr).trim() : null,
+    };
   },
   "staging-green"(p) {
     const repo = p.repo != null ? String(p.repo).trim() : null;
@@ -406,7 +434,15 @@ const VALIDATORS = {
     if (!SIGNAL_TYPES.includes(p.type)) {
       throw new Error(`event type must be a known signal_type (${SIGNAL_TYPES.join(", ")})`);
     }
-    return { type: p.type, subject: p.subject !== undefined ? String(p.subject) : null };
+    const subject = p.subject !== undefined ? String(p.subject).trim() : null;
+    // BOT-2324: unlike the generic raw escape hatch, this approval condition
+    // has one narrow public identity grammar. The service independently checks
+    // it for direct JSON callers; keeping the CLI equally strict prevents an
+    // impossible-to-match wait from being armed locally.
+    if (p.type === "host_approval" && (!subject || !HOST_APPROVAL_HOST_KEY_RE.test(subject))) {
+      throw new Error("event:type=host_approval needs subject=<canonical bbh- host key>");
+    }
+    return { type: p.type, subject };
   },
 };
 
@@ -999,7 +1035,7 @@ export function formatUnknownWorkflowGuidance(detail, candidates) {
   const named = Array.isArray(candidates) ? candidates.filter((c) => typeof c === "string" && c.trim() !== "") : [];
   if (named.length === 0) return lines;
   lines.push("closest workflow names this repo has actually reported:");
-  for (const name of named) lines.push(`  workflow=${name}`);
+  for (const name of named) lines.push(`  ${name.includes("=") ? name : `workflow=${name}`}`);
   return lines;
 }
 
@@ -1138,16 +1174,20 @@ function conditionMatchesSignal(condition, signal, waitSessionId) {
       if (params.scope === "run_id") return String(signal.payload?.run_id) === params.runId;
       if (params.scope === "sha") {
         if (signal.payload?.head_sha !== params.sha) return false;
-        if (params.workflow == null) return true;
-        const workflow = signal.payload?.workflow_name;
-        return typeof workflow === "string" && workflow.trim().toLowerCase() === params.workflow.trim().toLowerCase();
+        if (params.workflow != null) {
+          const workflow = signal.payload?.workflow_name;
+          if (typeof workflow !== "string" || workflow.trim().toLowerCase() !== params.workflow.trim().toLowerCase()) return false;
+        }
+        if (params.workflowId != null && String(signal.payload?.workflow_id ?? "").trim() !== params.workflowId) return false;
+        if (params.workflowPath != null && String(signal.payload?.workflow_path ?? "").trim() !== params.workflowPath) return false;
+        return true;
       }
       if (params.scope === "next") {
         // BOT-1507 — live-only: the first TERMINAL run for the repo. Never keys on
         // subject_key (it is run:<id> for post-merge runs and owner/repo#n for PR
         // runs — both are legitimate wakes); a null/empty conclusion is an
         // in-progress signal and never terminal. Optional branch/workflow filters:
-        // branch is exact, workflow is the GitHub display name (case/space-insensitive).
+        // branch/path/id are exact; the display name is case/space-insensitive.
         const conclusion = signal.payload?.conclusion;
         if (typeof conclusion !== "string" || conclusion.trim() === "") return false;
         // BOT-1685: an optional sha filter pins scope=next to a commit, so a
@@ -1160,6 +1200,8 @@ function conditionMatchesSignal(condition, signal, waitSessionId) {
             return false;
           }
         }
+        if (params.workflowId != null && String(signal.payload?.workflow_id ?? "").trim() !== params.workflowId) return false;
+        if (params.workflowPath != null && String(signal.payload?.workflow_path ?? "").trim() !== params.workflowPath) return false;
         return true;
       }
       // scope=latest: the PR's run (by subject owner/repo#pr or payload pr_number).
@@ -1237,10 +1279,13 @@ function conditionMatchesSignal(condition, signal, waitSessionId) {
 // wake the wrong workspace. This centralizes what BOT-1247's `unblocked` matcher did
 // per-type (that per-type check stays as belt-and-braces). Tenantless signals
 // (host-shared lock_availability/container_capacity, owner/recipient-scoped
-// chat/pr_state/test_run/guidance) are NEVER blocked — they keep today's semantics
-// for any session (AC-5). `sessionTenant === undefined` opts a caller out of the
-// central guard: a pure unit test asserting a per-type matcher in isolation. The CLI
-// always threads the server-resolved tenant, so the guard is live for every real wait.
+  // chat/pr_state/test_run/guidance) are NEVER blocked — they keep today's semantics
+  // for any session (AC-5). `host_approval` is the deliberate exception: it is
+  // owner-visible AND tenant-bound, so the relay stamps scope=owner_tenant and we
+  // retain this tenant fence after its owner gate. `sessionTenant === undefined`
+  // opts a caller out of the central guard: a pure unit test asserting a per-type
+  // matcher in isolation. The CLI always threads the server-resolved tenant, so
+  // the guard is live for every real wait.
 export function signalTenantBlocked(signal, sessionTenant) {
   if (sessionTenant === undefined) return false;
   if (signal.tenant_id == null) return false;

package/src/wait.mjs

@@ -153,7 +153,10 @@ CONDITIONS  (TYPE:key=val,key=val — repeat for several; --any wakes on the fir
                                       Wakes only after a complete non-vacuous workflow success;
                                       manual resolutions, overrides, skipped, and neutral runs do not match.
   event:type=<signal_type>[,subject=<key>]
-                                      raw signal-spine match (escape hatch)
+                                      raw signal-spine match (escape hatch). Host setup uses
+                                      event:type=host_approval,subject=bbh-<24 lowercase hex>;
+                                      it wakes only for the authenticated owner's one bound
+                                      tenant after current server-side approval revalidation.
 
 OPTIONS
   --any                 wake on the first matching condition (default; only mode in v1)