@adcp/sdk 13.0.4 → 13.1.1

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

@@ -1,12 +1,13 @@
 import { createHash, createHmac } from "node:crypto";
 import { existsSync, readFileSync } from "node:fs";
 import { basename, join } from "node:path";
-import { getOrCreateClientResolution, getOrDiscoverProfile, runStep } from "../client.mjs";
 import {
-  closeScopedConnections,
-  normalizeTransportOptions,
-  withMCPConnectionScope
-} from "../../protocols/index.mjs";
+  createTestClient,
+  getOrCreateClientResolution,
+  getOrDiscoverProfile,
+  runStep
+} from "../client.mjs";
+import { closeScopedConnections, withMCPConnectionScope } from "../../protocols/index.mjs";
 import { getCapturesFromError, withRawResponseCapture } from "../../protocols/rawResponseCapture.mjs";
 import { defaultStoryboardResponseProjection, executeStoryboardTask } from "./task-map.mjs";
 import {
@@ -67,6 +68,7 @@ import { readBrandJsonUrl } from "../../signing/agent-resolver/capabilities-type
 import { resolveDeclaredTestKit, validateTestKit } from "./test-kit.mjs";
 import { validateStoryboardShape } from "./loader.mjs";
 import { trustedStoryboardComplianceRoot } from "./provenance.mjs";
+import { applyNativeA2AComplianceTransportOptions } from "./native-a2a-compliance.mjs";
 import { probeRequestSigningVector } from "./request-signing/probe-dispatch.mjs";
 import { createWebhookReceiver } from "./webhook-receiver.mjs";
 import { WEBHOOK_ASSERTION_TASKS, armWebhookAssertions, executeWebhookAssertionStep } from "./webhook-assertions.mjs";
@@ -94,6 +96,7 @@ function withPreparedTrustedMatchPublisherAuth(options, prepared) {
 }
 import {
   buildRoutingContext,
+  buildAgentOptions,
   DiscoveryFailure,
   resolveAgentForStep,
   RoutingError
@@ -177,6 +180,7 @@ function selectionForProbeSkip(reason, detail) {
       return { reason: "explicit_scope_excluded", detail };
     case "not_in_only_vectors":
     case "mcp_mode_flattens_url_edges":
+    case "transport_flattens_url_edges":
     case "capability_profile_mismatch":
     case "transport_ungradable":
       return { reason: "profile_excluded", detail };
@@ -608,12 +612,37 @@ function filterResponseHeaders(headers) {
   }
   return Object.keys(out).length > 0 ? out : void 0;
 }
+function httpProbeResultFromCapture(capture) {
+  if (capture.bodyTruncated) {
+    return {
+      url: capture.url,
+      status: capture.status,
+      headers: Object.fromEntries(Object.entries(capture.headers).map(([name, value]) => [name.toLowerCase(), value])),
+      body: null,
+      error: capture.bodyCaptureError ?? "Raw response capture was incomplete; storyboard validators cannot grade a partial response body"
+    };
+  }
+  const contentType = Object.entries(capture.headers).find(([name]) => name.toLowerCase() === "content-type")?.[1];
+  let body = capture.body;
+  if (contentType?.toLowerCase().includes("json") || /^[\s]*[{[]/.test(capture.body)) {
+    try {
+      body = JSON.parse(capture.body);
+    } catch {
+    }
+  }
+  return {
+    url: capture.url,
+    status: capture.status,
+    headers: Object.fromEntries(Object.entries(capture.headers).map(([name, value]) => [name.toLowerCase(), value])),
+    body
+  };
+}
 async function runStoryboard(agentUrlOrUrls, storyboard, options = {}) {
   return withMCPConnectionScope(
     async () => {
       options = applyStoryboardVersionOptions(storyboard, options);
       options = resolveDeclaredTestKit(storyboard, options);
-      options = { ...options, transport: normalizeTransportOptions(options.transport) };
+      options = applyNativeA2AComplianceTransportOptions(options);
       const schemaRoot = getRunSchemaRoot(options);
       if (schemaRoot) {
         return await withExternalSchemaRoot(
@@ -1657,7 +1686,7 @@ async function executeStoryboardPass(agentUrls, storyboard, options, dispatchOff
       }
     }
   }
-  const buildExecutionState = (agentUrl = agentUrls[0], agentProfile = profile) => ({
+  const buildExecutionState = (agentUrl = agentUrls[0], agentProfile = profile, effectiveOptions = options) => ({
     contributions,
     priorStepResults,
     priorProbes,
@@ -1669,6 +1698,7 @@ async function executeStoryboardPass(agentUrls, storyboard, options, dispatchOff
     stepRequestStarts,
     responseDerivedNotApplicableContextKeys,
     agentProfile,
+    effectiveOptions,
     agentLibraryVersion: agentProfile?.library_version,
     storyboardRequiresRequestSigner: allRequires.includes("request_signer"),
     storyboardRequiresPublisherAuthRunner: storyboard.requires?.includes("trusted_match_publisher_auth_runner") === true,
@@ -1907,7 +1937,11 @@ async function executeStoryboardPass(agentUrls, storyboard, options, dispatchOff
         phasePassed = false;
         continue;
       }
-      const stepExecutionState = buildExecutionState(assignment.agentUrl, assignment.profile);
+      const stepExecutionState = buildExecutionState(
+        assignment.agentUrl,
+        assignment.profile,
+        assignment.effectiveOptions ?? options
+      );
       const rawResult = await executeStep(
         assignment.client,
         step,
@@ -2444,6 +2478,7 @@ async function runStoryboardStep(agentUrl, storyboard, stepId, options = {}) {
       validateStoryboardShape(storyboard);
       options = applyStoryboardVersionOptions(storyboard, options);
       options = resolveDeclaredTestKit(storyboard, options);
+      options = applyNativeA2AComplianceTransportOptions(options);
       const schemaRoot = getRunSchemaRoot(options);
       if (schemaRoot) {
         return await withExternalSchemaRoot(
@@ -2568,14 +2603,21 @@ async function executeStep(client, step, storyboardId, phaseId, context, allStep
     stepRequestStarts: /* @__PURE__ */ new Map(),
     responseDerivedNotApplicableContextKeys: /* @__PURE__ */ new Map()
   };
+  const effectiveOptions = runState.effectiveOptions ?? options;
+  const effectiveProbeOptions = runState.agentProfile ? {
+    ...effectiveOptions,
+    profile: runState.agentProfile,
+    _profile: runState.agentProfile,
+    agentTools: effectiveOptions.agentTools ?? normalizeAgentToolNames(runState.agentProfile.tools)
+  } : effectiveOptions;
   if (TRUSTED_MATCH_PUBLISHER_AUTH_TASKS.has(step.task)) {
     if (runState.storyboardRequiresPublisherAuthRunner !== true) {
       return invalidTrustedMatchPublisherAuthTask(step, phaseId, context, allSteps, runState);
     }
-    return executeProbeStep(client, step, phaseId, context, allSteps, options, runState);
+    return executeProbeStep(client, step, phaseId, context, allSteps, effectiveProbeOptions, runState);
   }
   if (PROBE_TASKS.has(step.task)) {
-    return executeProbeStep(client, step, phaseId, context, allSteps, options, runState);
+    return executeProbeStep(client, step, phaseId, context, allSteps, effectiveProbeOptions, runState);
   }
   if (WEBHOOK_ASSERTION_TASKS.has(step.task)) {
     return executeWebhookAssertionStep(step, phaseId, context, allSteps, options, runState);
@@ -2794,7 +2836,7 @@ async function executeStep(client, step, storyboardId, phaseId, context, allStep
       next: next2,
       ...isPrerequisiteFailure ? { error: detail } : {},
       request: {
-        transport: options.protocol === "a2a" ? "a2a" : "mcp",
+        transport: effectiveOptions.protocol === "a2a" ? "a2a" : "mcp",
         operation: effectiveStep.task,
         payload: redactSecrets(request),
         ...runState.agentUrl ? { url: redactOAuthUrlForOutput(runState.agentUrl) } : {}
@@ -2806,7 +2848,7 @@ async function executeStep(client, step, storyboardId, phaseId, context, allStep
   const testsMissingAccount = step.omit_account === true && effectiveStep.task === "create_media_buy";
   let rawProbeHeaders;
   try {
-    rawProbeHeaders = step.auth !== void 0 ? authHeadersForStep(step.auth, options) : void 0;
+    rawProbeHeaders = step.auth !== void 0 ? authHeadersForStep(step.auth, effectiveOptions) : void 0;
   } catch (err) {
     return {
       step_id: step.id,
@@ -2829,6 +2871,8 @@ async function executeStep(client, step, storyboardId, phaseId, context, allStep
   let responseRecord;
   let a2aEnvelope;
   let crossResponses;
+  let requestUrl = runState.agentUrl;
+  let captureInfrastructureError;
   if (step.parallel_dispatch && !useRawProbe) {
     const contractsInScope = new Set(options.contracts ?? []);
     if (!contractsInScope.has(PARALLEL_DISPATCH_CONTRACT)) {
@@ -2903,39 +2947,87 @@ async function executeStep(client, step, storyboardId, phaseId, context, allStep
   if (useRawProbe) {
     const started = Date.now();
     try {
-      const probe = await rawMcpProbe({
-        agentUrl: runState.agentUrl,
-        toolName: effectiveStep.task,
-        args: request,
-        headers: rawProbeHeaders,
-        allowPrivateIp: options.allow_http === true,
-        fetchFn: options.transport?.trustedFetchFn
-      });
-      httpResult = probe.httpResult;
-      taskResult = probe.taskResult;
-      const durationMs = Date.now() - started;
-      stepResult = {
-        duration_ms: durationMs,
-        passed: !httpResult.error,
-        error: httpResult.error
-      };
-      const filteredHeaders = filterResponseHeaders(httpResult.headers);
-      responseRecord = {
-        transport: "mcp",
-        payload: redactSecrets(httpResult.body),
-        ...typeof httpResult.status === "number" ? { status: httpResult.status } : {},
-        ...filteredHeaders && { headers: filteredHeaders },
-        duration_ms: durationMs
-      };
+      if (effectiveOptions.protocol === "a2a") {
+        const probeClient = createA2AAuthOverrideClient(runState.agentUrl, effectiveOptions, rawProbeHeaders ?? {});
+        const captured = await withRawResponseCapture(
+          () => runStep(
+            step.title,
+            effectiveStep.task,
+            () => executeStoryboardTask(probeClient, effectiveStep.task, request, {
+              skipIdempotencyAutoInject: testsMissingIdempotencyKey,
+              skipAccountValidation: testsMissingAccount,
+              responseProjection: effectiveStep.response_projection ?? defaultStoryboardResponseProjection(effectiveStep.task, effectiveStep.comply_scenario),
+              signal: effectiveOptions.signal
+            })
+          )
+        );
+        taskResult = captured.result.result;
+        stepResult = captured.result.step;
+        caughtError = captured.result.caughtError;
+        const rpcCapture = selectLastA2aSkillCapture(captured.captures, effectiveStep.task);
+        const crossOriginRpcCapture = rpcCapture !== void 0 && new URL(rpcCapture.url).origin !== new URL(runState.agentUrl).origin;
+        if (rpcCapture && !crossOriginRpcCapture && !rpcCapture.bodyTruncated) {
+          httpResult = httpProbeResultFromCapture(rpcCapture);
+          requestUrl = rpcCapture.url;
+          const filteredHeaders = filterResponseHeaders(httpResult.headers);
+          responseRecord = {
+            transport: "a2a",
+            payload: redactSecrets(httpResult.body),
+            status: httpResult.status,
+            ...filteredHeaders && { headers: filteredHeaders },
+            duration_ms: rpcCapture.latencyMs
+          };
+          a2aEnvelope = parseLastA2aMessageSendCapture([rpcCapture]);
+        } else {
+          const error = crossOriginRpcCapture ? "A2A auth probe selected a cross-origin RPC endpoint; credential-isolated responses cannot be graded" : rpcCapture?.bodyTruncated ? rpcCapture.bodyCaptureError ?? "Raw response capture was incomplete; A2A auth validators cannot grade a partial response body" : stepResult.error ?? taskResult?.error ?? "A2A auth probe produced no HTTP response";
+          requestUrl = rpcCapture?.url ?? runState.agentUrl;
+          httpResult = { url: requestUrl, status: 0, headers: {}, body: null, error };
+          captureInfrastructureError = error;
+          stepResult = { ...stepResult, passed: false };
+          responseRecord = {
+            transport: "a2a",
+            payload: null,
+            status: 0,
+            duration_ms: stepResult.duration_ms
+          };
+        }
+      } else {
+        const probe = await rawMcpProbe({
+          agentUrl: runState.agentUrl,
+          toolName: effectiveStep.task,
+          args: request,
+          headers: rawProbeHeaders,
+          allowPrivateIp: effectiveOptions.allow_http === true,
+          fetchFn: effectiveOptions.transport?.trustedFetchFn
+        });
+        httpResult = probe.httpResult;
+        taskResult = probe.taskResult;
+        const durationMs = Date.now() - started;
+        stepResult = {
+          duration_ms: durationMs,
+          passed: !httpResult.error,
+          error: httpResult.error
+        };
+        const filteredHeaders = filterResponseHeaders(httpResult.headers);
+        responseRecord = {
+          transport: "mcp",
+          payload: redactSecrets(httpResult.body),
+          ...typeof httpResult.status === "number" ? { status: httpResult.status } : {},
+          ...filteredHeaders && { headers: filteredHeaders },
+          duration_ms: durationMs
+        };
+      }
     } catch (err) {
+      const error = err instanceof Error ? err.message : String(err);
+      if (effectiveOptions.protocol === "a2a") captureInfrastructureError = error;
       stepResult = {
         duration_ms: Date.now() - started,
         passed: false,
-        error: err instanceof Error ? err.message : String(err)
+        ...captureInfrastructureError ? {} : { error }
       };
     }
   } else {
-    const captureA2a = options.protocol === "a2a";
+    const captureA2a = effectiveOptions.protocol === "a2a";
     let a2aCaptures;
     if (step.parallel_dispatch) {
       const started = Date.now();
@@ -2959,7 +3051,7 @@ async function executeStep(client, step, storyboardId, phaseId, context, allStep
       };
       if (taskResult) {
         responseRecord = {
-          transport: options.protocol === "a2a" ? "a2a" : "mcp",
+          transport: effectiveOptions.protocol === "a2a" ? "a2a" : "mcp",
           payload: redactSecrets(
             taskResult.data ?? (taskResult.adcp_error ? { adcp_error: taskResult.adcp_error } : void 0) ?? taskResult.error ?? null
           ),
@@ -2971,7 +3063,7 @@ async function executeStep(client, step, storyboardId, phaseId, context, allStep
         skipIdempotencyAutoInject: testsMissingIdempotencyKey,
         skipAccountValidation: testsMissingAccount,
         responseProjection: effectiveStep.response_projection ?? defaultStoryboardResponseProjection(effectiveStep.task, effectiveStep.comply_scenario),
-        signal: options.signal
+        signal: effectiveOptions.signal
       });
       const run = await runStep(step.title, effectiveStep.task, async () => {
         if (!captureA2a) return dispatch();
@@ -2988,15 +3080,29 @@ async function executeStep(client, step, storyboardId, phaseId, context, allStep
       taskResult = run.result;
       stepResult = run.step;
       caughtError = run.caughtError;
-      if (caughtError !== void 0 && options.signal?.aborted) {
+      if (caughtError !== void 0 && effectiveOptions.signal?.aborted) {
         throw caughtError;
       }
-      if (captureA2a && a2aCaptures) {
-        a2aEnvelope = parseLastA2aMessageSendCapture(a2aCaptures);
+      if (captureA2a) {
+        const skillCapture = a2aCaptures ? selectLastA2aSkillCapture(a2aCaptures, effectiveStep.task) : void 0;
+        const crossOriginSkillCapture = skillCapture !== void 0 && new URL(skillCapture.url).origin !== new URL(runState.agentUrl).origin;
+        if (!skillCapture) {
+          captureInfrastructureError = "A2A tool dispatch produced no matching HTTP response capture";
+        } else if (crossOriginSkillCapture) {
+          captureInfrastructureError = "A2A tool dispatch selected a cross-origin RPC endpoint; credential-isolated responses cannot be graded";
+        } else if (skillCapture.bodyTruncated) {
+          captureInfrastructureError = skillCapture.bodyCaptureError ?? "Raw response capture was incomplete; A2A validators cannot grade a partial response body";
+        } else {
+          a2aEnvelope = parseLastA2aMessageSendCapture([skillCapture]);
+          if (!a2aEnvelope) {
+            captureInfrastructureError = "A2A matching HTTP response capture could not be parsed for grading";
+          }
+        }
+        if (captureInfrastructureError) stepResult = { ...stepResult, passed: false };
       }
       if (taskResult) {
         responseRecord = {
-          transport: options.protocol === "a2a" ? "a2a" : "mcp",
+          transport: effectiveOptions.protocol === "a2a" ? "a2a" : "mcp",
           payload: redactSecrets(
             taskResult.data ?? (taskResult.adcp_error ? { adcp_error: taskResult.adcp_error } : void 0) ?? taskResult.error ?? null
           ),
@@ -3006,10 +3112,10 @@ async function executeStep(client, step, storyboardId, phaseId, context, allStep
     }
   }
   const requestRecord = {
-    transport: useRawProbe ? "mcp" : options.protocol === "a2a" ? "a2a" : "mcp",
+    transport: effectiveOptions.protocol === "a2a" ? "a2a" : "mcp",
     operation: effectiveStep.task,
     payload: redactSecrets(request),
-    ...runState.agentUrl ? { url: redactOAuthUrlForOutput(runState.agentUrl) } : {}
+    ...requestUrl ? { url: redactOAuthUrlForOutput(requestUrl) } : {}
   };
   const inputSchemaStripNotices = collectInputSchemaFieldStripNotices(
     taskResult?.debug_logs,
@@ -3100,7 +3206,7 @@ async function executeStep(client, step, storyboardId, phaseId, context, allStep
     runState,
     allSteps
   );
-  if (responseDerivedSkip && !step.expect_error) {
+  if (responseDerivedSkip && !step.expect_error && !captureInfrastructureError) {
     for (const key of responseDerivedSkip.contextKeys) {
       runState.responseDerivedNotApplicableContextKeys?.set(key, responseDerivedSkip.detail);
     }
@@ -3136,6 +3242,7 @@ async function executeStep(client, step, storyboardId, phaseId, context, allStep
   } else {
     passed = stepResult.passed && (taskResult?.success ?? false);
   }
+  if (captureInfrastructureError) passed = false;
   const schemaValidationError = caughtError instanceof ResponseSchemaValidationError ? caughtError : void 0;
   const validationTaskResult = taskResult ?? (schemaValidationError ? {
     // ResponseSchemaValidationError is thrown while validating a
@@ -3261,9 +3368,10 @@ async function executeStep(client, step, storyboardId, phaseId, context, allStep
     );
     const schemaResults = decoratedCandidates.length ? decoratedCandidates : [{ ...baseSchemaResult, severity: "required" }];
     schemaRejectionIsAdvisory = schemaResults.every((result) => !validationFailsStep(result));
-    if (schemaRejectionIsAdvisory && !step.expect_error) passed = true;
+    if (schemaRejectionIsAdvisory && !step.expect_error && !captureInfrastructureError) passed = true;
     validations = [...schemaResults, ...validations.filter((result) => result.check !== "response_schema")];
   }
+  if (captureInfrastructureError) passed = false;
   if (a2aEnvelope && runState.priorA2aEnvelopes) {
     runState.priorA2aEnvelopes.set(step.id, a2aEnvelope);
   }
@@ -3382,7 +3490,7 @@ async function executeStep(client, step, storyboardId, phaseId, context, allStep
       context_provenance: Object.fromEntries(runState.contextProvenance)
     },
     ...responseDerivedContextResult(runState),
-    error: step.expect_error || schemaRejectionIsAdvisory ? void 0 : truncateError(stepResult.error || taskResult?.error),
+    error: captureInfrastructureError ? truncateError(captureInfrastructureError) : step.expect_error || schemaRejectionIsAdvisory ? void 0 : truncateError(stepResult.error || taskResult?.error),
     ...!step.expect_error && taskResult?.adcp_error && { adcp_error: taskResult.adcp_error },
     next,
     request: requestRecord,
@@ -4438,26 +4546,38 @@ function findPriorProbe(priorStepResults) {
   }
   return void 0;
 }
+function selectLastA2aSkillCapture(captures, skill) {
+  for (let index = captures.length - 1; index >= 0; index--) {
+    const capture = captures[index];
+    if (capture?.method === "POST" && capture.requestAdcpSkill === skill) return capture;
+  }
+  return void 0;
+}
 function parseLastA2aMessageSendCapture(captures) {
-  let messageSendIdx = -1;
+  let taskFallbackIdx = -1;
   let lastPostIdx = -1;
   for (let i = captures.length - 1; i >= 0; i--) {
-    const cap2 = captures[i];
-    if (!cap2 || cap2.method !== "POST") continue;
+    const cap = captures[i];
+    if (!cap || cap.method !== "POST") continue;
     if (lastPostIdx === -1) lastPostIdx = i;
-    if (messageSendIdx === -1) {
-      const env = tryParseJsonRpcEnvelope(cap2.body);
-      if (env && env.result !== void 0 && isTaskShape(env.result)) {
-        messageSendIdx = i;
+    const isMessageSend = cap.requestJsonRpcMethod === "SendMessage" || cap.requestJsonRpcMethod === "message/send";
+    if (isMessageSend) return cap.bodyTruncated ? void 0 : parseA2aCapture(cap);
+    if (taskFallbackIdx === -1) {
+      const env = tryParseJsonRpcEnvelope(cap.body);
+      if (env && env.result !== void 0 && isTaskShape(normalizeCapturedA2AResult(env.result))) {
+        taskFallbackIdx = i;
       }
     }
   }
-  const idx = messageSendIdx !== -1 ? messageSendIdx : lastPostIdx;
+  const idx = taskFallbackIdx !== -1 ? taskFallbackIdx : lastPostIdx;
   if (idx === -1) return void 0;
-  const cap = captures[idx];
+  const capture = captures[idx];
+  return capture.bodyTruncated ? void 0 : parseA2aCapture(capture);
+}
+function parseA2aCapture(cap) {
   const envelope = tryParseJsonRpcEnvelope(cap.body);
   if (!envelope) return void 0;
-  const redactedResult = envelope.result !== void 0 ? redactSecrets(envelope.result) : null;
+  const redactedResult = envelope.result !== void 0 ? redactSecrets(normalizeCapturedA2AResult(envelope.result)) : null;
   return {
     result: redactedResult,
     envelope: {
@@ -4485,6 +4605,55 @@ function tryParseJsonRpcEnvelope(body) {
 function isTaskShape(result) {
   return result != null && typeof result === "object" && !Array.isArray(result) && result.kind === "task";
 }
+function normalizeCapturedA2AResult(result) {
+  if (result == null || typeof result !== "object" || Array.isArray(result)) return result;
+  const record = result;
+  const task = asRecord(record.task);
+  if (task) return normalizeCapturedTask(task);
+  const message = asRecord(record.message);
+  if (message) return normalizeCapturedMessage(message);
+  return result;
+}
+function normalizeCapturedTask(task) {
+  const status = asRecord(task.status);
+  const artifacts = Array.isArray(task.artifacts) ? task.artifacts.map((artifact) => {
+    const record = asRecord(artifact);
+    return record ? { ...record, parts: normalizeCapturedParts(record.parts) } : artifact;
+  }) : [];
+  return {
+    ...task,
+    kind: "task",
+    ...status ? {
+      status: {
+        ...status,
+        state: normalizeCapturedTaskState(status.state),
+        ...asRecord(status.message) ? { message: normalizeCapturedMessage(asRecord(status.message)) } : {}
+      }
+    } : {},
+    artifacts
+  };
+}
+function normalizeCapturedMessage(message) {
+  return { ...message, kind: "message", parts: normalizeCapturedParts(message.parts) };
+}
+function normalizeCapturedParts(parts) {
+  if (!Array.isArray(parts)) return [];
+  return parts.map((part) => {
+    const record = asRecord(part);
+    if (!record) return part;
+    if ("data" in record) return { ...record, kind: "data" };
+    if ("text" in record) return { ...record, kind: "text" };
+    if ("file" in record) return { ...record, kind: "file" };
+    return record;
+  });
+}
+function normalizeCapturedTaskState(state) {
+  if (typeof state !== "string" || !state.startsWith("TASK_STATE_")) return state;
+  return state.slice("TASK_STATE_".length).toLowerCase().replaceAll("_", "-");
+}
+function asRecord(value) {
+  return value != null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
 function phaseContainsOauthMetadataProbe(phase) {
   return phase.steps.some((s) => s.task === "protected_resource_metadata" || s.task === "oauth_auth_server_metadata");
 }
@@ -4575,6 +4744,28 @@ function authHeadersForStep(directive, options) {
   }
   return { authorization: `Bearer ${value}` };
 }
+function createA2AAuthOverrideClient(agentUrl, options, authHeaders) {
+  const headers = {};
+  let auth;
+  for (const [name, value] of Object.entries(authHeaders)) {
+    const lower = name.toLowerCase();
+    if (lower === "authorization" && /^Bearer\s+/i.test(value)) {
+      auth = { type: "bearer", token: value.replace(/^Bearer\s+/i, "") };
+    } else {
+      headers[name] = value;
+    }
+  }
+  return createTestClient(agentUrl, "a2a", {
+    ...options,
+    protocol: "a2a",
+    auth,
+    headers: Object.keys(headers).length > 0 ? headers : void 0,
+    test_session_id: void 0,
+    userAgent: void 0,
+    test_kit: void 0,
+    _client: void 0
+  });
+}
 function basicAuthHeadersForStep(directive, options) {
   if (directive.value_strategy) {
     if (directive.value_strategy !== "random_invalid") return {};
@@ -4935,7 +5126,8 @@ function createRoutingDispatcher(ctx, options, agents) {
         client,
         agentUrl: url,
         instanceIndex: keyToIndex.get(key) ?? 0,
-        profile
+        profile,
+        effectiveOptions: buildAgentOptions(agents[key], options)
       };
     }
   };
@@ -5025,9 +5217,12 @@ export {
   evaluateCapabilityPredicate,
   getFirstStepPreview,
   listStrictOnlyFailures,
+  normalizeCapturedA2AResult,
+  parseLastA2aMessageSendCapture,
   resolveCapabilityPath,
   runStoryboard,
   runStoryboardStep,
+  selectLastA2aSkillCapture,
   summarizeStrictValidation
 };
 //# sourceMappingURL=runner.mjs.map