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

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

@@ -9,6 +9,7 @@ import {
 } from "../../protocols/index.mjs";
 import { getCapturesFromError, withRawResponseCapture } from "../../protocols/rawResponseCapture.mjs";
 import { defaultStoryboardResponseProjection, executeStoryboardTask } from "./task-map.mjs";
+import { applyFunctionalRequestSigning } from "./request-signing/functional-dispatch.mjs";
 import {
   extractContextWithProvenance,
   injectContext,
@@ -667,6 +668,10 @@ async function runStoryboard(agentUrlOrUrls, storyboard, options = {}) {
   return withMCPConnectionScope(
     async () => {
       options = applyStoryboardVersionOptions(storyboard, options);
+      options = applyFunctionalRequestSigning(options, {
+        ...options.complianceDir && { complianceDir: options.complianceDir },
+        ...options.adcpVersion && { version: options.adcpVersion }
+      });
       options = resolveDeclaredTestKit(storyboard, options);
       options = { ...options, transport: normalizeTransportOptions(options.transport) };
       const schemaRoot = getRunSchemaRoot(options);
@@ -2495,6 +2500,10 @@ async function runStoryboardStep(agentUrl, storyboard, stepId, options = {}) {
     async () => {
       validateStoryboardShape(storyboard);
       options = applyStoryboardVersionOptions(storyboard, options);
+      options = applyFunctionalRequestSigning(options, {
+        ...options.complianceDir && { complianceDir: options.complianceDir },
+        ...options.adcpVersion && { version: options.adcpVersion }
+      });
       options = resolveDeclaredTestKit(storyboard, options);
       const schemaRoot = getRunSchemaRoot(options);
       if (schemaRoot) {
@@ -3094,7 +3103,7 @@ async function executeStep(client, step, storyboardId, phaseId, context, allStep
     runState.agentProfile?.raw_capabilities,
     "request_signing.required_for"
   );
-  if (taskResult?.adcp_error?.code === "request_signature_required" && Array.isArray(requiredForSigning) && requiredForSigning.includes(effectiveStep.task) && runState.storyboardRequiresRequestSigner !== true) {
+  if (taskResult?.adcp_error?.code === "request_signature_required" && Array.isArray(requiredForSigning) && requiredForSigning.includes(effectiveStep.task) && options.functional_request_signing === void 0 && runState.storyboardRequiresRequestSigner !== true) {
     const next2 = getNextStepPreview(step.id, allSteps, context, runState.runnerVars);
     const detail = `Agent declared request_signing.required_for includes "${effectiveStep.task}" and rejected the unsigned request with request_signature_required; storyboard "${storyboardId}" does not require request_signer.`;
     return {
@@ -4581,13 +4590,14 @@ function parseLastA2aMessageSendCapture(captures) {
   const cap = captures[idx];
   const envelope = tryParseJsonRpcEnvelope(cap.body);
   if (!envelope) return void 0;
-  const redactedResult = envelope.result !== void 0 ? redactSecrets(envelope.result) : null;
+  const redactedWireResult = envelope.result !== void 0 ? redactSecrets(envelope.result) : null;
+  const redactedResult = normalizeCapturedA2AResult(redactedWireResult);
   return {
     result: redactedResult,
     envelope: {
       ...envelope.jsonrpc !== void 0 && { jsonrpc: envelope.jsonrpc },
       ...envelope.id !== void 0 && { id: envelope.id },
-      ...envelope.result !== void 0 && { result: redactedResult },
+      ...envelope.result !== void 0 && { result: redactedWireResult },
       ...envelope.error !== void 0 && { error: redactSecrets(envelope.error) }
     },
     http_status: cap.status
@@ -4607,7 +4617,16 @@ function tryParseJsonRpcEnvelope(body) {
   return envelope;
 }
 function isTaskShape(result) {
-  return result != null && typeof result === "object" && !Array.isArray(result) && result.kind === "task";
+  if (result == null || typeof result !== "object" || Array.isArray(result)) return false;
+  const record = result;
+  if (record.kind === "task") return true;
+  if (record.task != null && typeof record.task === "object" && !Array.isArray(record.task)) return true;
+  return typeof record.id === "string" && record.status != null && typeof record.status === "object";
+}
+function normalizeCapturedA2AResult(result) {
+  if (result == null || typeof result !== "object" || Array.isArray(result)) return result;
+  const record = result;
+  return record.task != null && typeof record.task === "object" && !Array.isArray(record.task) ? record.task : result;
 }
 function phaseContainsOauthMetadataProbe(phase) {
   return phase.steps.some((s) => s.task === "protected_resource_metadata" || s.task === "oauth_auth_server_metadata");
@@ -4799,9 +4818,14 @@ function applyBrandInvariant(request, options, taskName, stepFlags) {
       const acct = existingAccount;
       const isNaturalKeyVariant = "brand" in acct || "operator" in acct;
       if (isNaturalKeyVariant) {
-        const merged = { ...acct, brand };
-        if (typeof merged.operator !== "string" && typeof brand.domain === "string") {
-          merged.operator = brand.domain;
+        const preserveWholesaleAccountBrand = taskName === "get_products" && request.buying_mode === "wholesale" && acct.brand !== void 0;
+        const merged = {
+          ...acct,
+          brand: preserveWholesaleAccountBrand ? acct.brand : brand
+        };
+        const accountBrand = merged.brand;
+        if (typeof merged.operator !== "string" && typeof accountBrand?.domain === "string") {
+          merged.operator = accountBrand.domain;
         }
         result.account = merged;
       }