@adcp/sdk 14.0.0-beta.12 → 14.0.0-beta.13

package/dist/lib/testing/storyboard/runner.mjs

@@ -69,6 +69,7 @@ import { readBrandJsonUrl } from "../../signing/agent-resolver/capabilities-type
 import { selectAgentByUrl } from "../../signing/agent-resolver/select-agent.mjs";
 import { resolveDeclaredTestKit, selectProbeTask, validateTestKit } from "./test-kit.mjs";
 import { validateStoryboardShape } from "./loader.mjs";
+import { evaluatePhaseCondition, phaseConditionUsesContext } from "./phase-condition.mjs";
 import { trustedStoryboardComplianceRoot } from "./provenance.mjs";
 import { probeRequestSigningVector } from "./request-signing/probe-dispatch.mjs";
 import { createWebhookReceiver } from "./webhook-receiver.mjs";
@@ -1580,9 +1581,10 @@ async function executeStoryboardPass(agentUrls, storyboard, options, dispatchOff
     storyboard,
     phaseCapabilitySkipDetails
   );
-  const capabilitySkippedPhaseIds = /* @__PURE__ */ new Set([
+  const preflightExcludedPhaseIds = /* @__PURE__ */ new Set([
     ...phaseCapabilitySkipDetails.keys(),
-    ...storyboard.phases.filter((phase) => shouldSkipPhase(phase, options)).map((phase) => phase.id)
+    ...storyboard.phases.filter((phase) => shouldSkipPhaseBeforeRun(phase, options)).map((phase) => phase.id),
+    ...storyboard.phases.filter((phase) => phaseUsesRuntimeContext(phase)).map((phase) => phase.id)
   ]);
   let creativeAssetFixtureGap = preflightRemainingCreativeAssetDirectives(
     allSteps,
@@ -1605,7 +1607,7 @@ async function executeStoryboardPass(agentUrls, storyboard, options, dispatchOff
       storyboardRequiresRequestSigner: allRequires.includes("request_signer"),
       storyboardRequiresPublisherAuthRunner: storyboard.requires?.includes("trusted_match_publisher_auth_runner") === true
     },
-    capabilitySkippedPhaseIds
+    preflightExcludedPhaseIds
   );
   let creativeAssetFixtureGapRecorded = false;
   if (!hasExecutableSteps) {
@@ -1737,7 +1739,7 @@ async function executeStoryboardPass(agentUrls, storyboard, options, dispatchOff
       context,
       options,
       buildExecutionState(),
-      capabilitySkippedPhaseIds
+      preflightExcludedPhaseIds
     );
   }
   for (const phase of storyboard.phases) {
@@ -1816,7 +1818,7 @@ async function executeStoryboardPass(agentUrls, storyboard, options, dispatchOff
     const phaseStatefulStepIds = phase.steps.filter((s) => s.stateful).map((s) => s.id);
     let phaseAbsent = false;
     let presenceDetected = false;
-    if (shouldSkipPhase(phase, options)) {
+    if (shouldSkipPhase(phase, options, context)) {
       phaseResults.push({
         phase_id: phase.id,
         phase_title: phase.title,
@@ -1827,6 +1829,41 @@ async function executeStoryboardPass(agentUrls, storyboard, options, dispatchOff
       });
       continue;
     }
+    if (phaseUsesRuntimeContext(phase)) {
+      preflightExcludedPhaseIds.delete(phase.id);
+      const firstPhaseStepIndex = allSteps.find((target) => target.phaseId === phase.id)?.globalIndex ?? 0;
+      creativeAssetFixtureGap = preflightRemainingCreativeAssetDirectives(
+        allSteps,
+        firstPhaseStepIndex - 1,
+        context,
+        options,
+        buildExecutionState(),
+        preflightExcludedPhaseIds
+      );
+      if (creativeAssetFixtureGap?.target.phaseId === phase.id) {
+        const gapStep = buildCreativeAssetFixtureUnavailableStep(
+          creativeAssetFixtureGap.target.step,
+          phase.id,
+          context,
+          allSteps,
+          buildExecutionState(),
+          creativeAssetFixtureGap.failure
+        );
+        gapStep.storyboard_id = storyboard.id;
+        priorStepResults.set(gapStep.step_id, gapStep);
+        skippedCount++;
+        creativeAssetFixtureGapRecorded = true;
+        phaseResults.push({
+          phase_id: phase.id,
+          phase_title: phase.title,
+          passed: true,
+          steps: [gapStep],
+          duration_ms: Date.now() - phaseStart
+        });
+        priorPhaseIds.push(phase.id);
+        continue;
+      }
+    }
     if (!phaseAbsent && phaseContainsOauthMetadataProbe(phase) && !agentAdvertisesOauth(profile)) {
       phaseAbsent = true;
     }
@@ -2111,7 +2148,7 @@ async function executeStoryboardPass(agentUrls, storyboard, options, dispatchOff
             context,
             options,
             stepExecutionState,
-            capabilitySkippedPhaseIds
+            preflightExcludedPhaseIds
           );
         }
         if (creativeAssetFixtureGap) {
@@ -2325,7 +2362,8 @@ async function runMultiPass(agentUrls, storyboard, options) {
   );
   const preSeedExcludedPhaseIds = /* @__PURE__ */ new Set([
     ...phaseCapabilitySkipDetails.keys(),
-    ...storyboard.phases.filter((phase) => shouldSkipPhase(phase, options)).map((phase) => phase.id)
+    ...storyboard.phases.filter((phase) => shouldSkipPhaseBeforeRun(phase, options)).map((phase) => phase.id),
+    ...storyboard.phases.filter((phase) => phaseUsesRuntimeContext(phase)).map((phase) => phase.id)
   ]);
   const preSeedFixtureGap = preflightRemainingCreativeAssetDirectives(
     flattenSteps(storyboard),
@@ -4640,23 +4678,19 @@ function agentAdvertisesOauth(profile) {
   const endpoint = resolveCapabilityPath(rawCaps, "account.authorization_endpoint");
   return typeof endpoint === "string" && endpoint.length > 0;
 }
-function shouldSkipPhase(phase, options) {
+function shouldSkipPhase(phase, options, context) {
   const expr = phase.skip_if?.trim();
   if (!expr) return false;
-  const match = /^(!?)test_kit\.([a-zA-Z0-9_.]+)$/.exec(expr);
-  if (!match) return false;
-  const negated = match[1] === "!";
-  const path = match[2].split(".");
-  let value = options.test_kit;
-  for (const segment of path) {
-    if (value == null || typeof value !== "object") {
-      value = void 0;
-      break;
-    }
-    value = value[segment];
-  }
-  const truthy = Boolean(value);
-  return negated ? !truthy : truthy;
+  return evaluatePhaseCondition(expr, { context, test_kit: options.test_kit });
+}
+function shouldSkipPhaseBeforeRun(phase, options) {
+  const expr = phase.skip_if?.trim();
+  if (!expr || phaseConditionUsesContext(expr)) return false;
+  return evaluatePhaseCondition(expr, { test_kit: options.test_kit });
+}
+function phaseUsesRuntimeContext(phase) {
+  const expr = phase.skip_if?.trim();
+  return expr ? phaseConditionUsesContext(expr) : false;
 }
 function resolveTaskName(step, options) {
   if (!step.task.startsWith("$test_kit.")) return step.task;
@@ -4818,7 +4852,7 @@ function applyBrandInvariant(request, options, taskName, stepFlags) {
       const acct = existingAccount;
       const isNaturalKeyVariant = "brand" in acct || "operator" in acct;
       if (isNaturalKeyVariant) {
-        const preserveWholesaleAccountBrand = taskName === "get_products" && request.buying_mode === "wholesale" && acct.brand !== void 0;
+        const preserveWholesaleAccountBrand = (taskName === "get_products" && request.buying_mode === "wholesale" || taskName === "get_signals" && request.discovery_mode === "wholesale") && acct.brand !== void 0;
         const merged = {
           ...acct,
           brand: preserveWholesaleAccountBrand ? acct.brand : brand