@adcp/sdk 13.0.2 → 13.0.4

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

@@ -2,7 +2,7 @@ import { prepareResponseForSchemaValidation, TOOL_RESPONSE_SCHEMAS } from "../..
 import { injectLegacyEnvelopeStatus } from "../../utils/envelope-status-compat.mjs";
 import { TRANSPORT_SUFFIX_REGEX } from "../../utils/a2a-discovery.mjs";
 import { validateResponse } from "../../validation/schema-validator.mjs";
-import { hasSchemaBundle } from "../../validation/schema-loader.mjs";
+import { hasSchemaBundle, isExternalSchemaRootActive } from "../../validation/schema-loader.mjs";
 import { ADCP_VERSION, LIBRARY_VERSION } from "../../version.mjs";
 import { isPre31AdcpVersion } from "../../utils/adcp-version-config.mjs";
 import { gte as semverGte, valid as validSemver } from "semver";
@@ -175,10 +175,10 @@ function resolveTarget(ctx) {
   return { success: false, data: void 0 };
 }
 const SCHEMA_URL_BASE = "https://adcontextprotocol.org";
-function resolveSchemaIdentity(schemaRef) {
+function resolveSchemaIdentity(schemaRef, adcpVersion = ADCP_VERSION) {
   if (!schemaRef) return { schema_id: null, schema_url: null };
   const trimmed = schemaRef.replace(/^\/+/, "");
-  const schemaId = `/schemas/${ADCP_VERSION}/${trimmed}`;
+  const schemaId = `/schemas/${adcpVersion}/${trimmed}`;
   const schemaUrl = `${SCHEMA_URL_BASE}${schemaId}`;
   return { schema_id: schemaId, schema_url: schemaUrl };
 }
@@ -231,34 +231,54 @@ function mapZodIssueToSchemaKeyword(issue) {
 }
 function validateResponseSchema(validation, ctx, taskResult) {
   const taskName = ctx.taskName;
-  const { schema_id, schema_url } = resolveSchemaIdentity(ctx.responseSchemaRef);
-  const schema = TOOL_RESPONSE_SCHEMAS[taskName];
-  if (!schema) {
-    return {
-      check: "response_schema",
-      passed: false,
-      description: validation.description,
-      error: `No schema registered for task "${taskName}"`,
-      json_pointer: null,
-      expected: schema_id ?? `response schema for ${taskName}`,
-      // The runner failed before observing the agent — distinguish that from
-      // "agent returned null" so implementors don't chase a phantom agent bug.
-      actual: { reason: "no_schema_registered", task: taskName },
-      schema_id,
-      schema_url
-    };
-  }
+  const schemaIdentityVersion = ctx.adcpVersion ?? ctx.responseAdcpVersion ?? ADCP_VERSION;
+  const { schema_id, schema_url } = resolveSchemaIdentity(ctx.responseSchemaRef, schemaIdentityVersion);
   const rawData = taskResult.data ?? {};
   const dataWithoutMessage = Array.isArray(rawData) ? rawData : (() => {
     const { _message, ...rest } = rawData;
     return rest;
   })();
+  const schema = TOOL_RESPONSE_SCHEMAS[taskName];
   const dataForValidation = Array.isArray(dataWithoutMessage) ? dataWithoutMessage : injectLegacyEnvelopeStatus(dataWithoutMessage, { toolName: taskName });
   const responseAdcpVersion = ctx.responseAdcpVersion ?? ctx.adcpVersion;
-  const parseResult = schema.safeParse(
+  const parseResult = schema?.safeParse(
     prepareResponseForSchemaValidation(taskName, dataForValidation, responseAdcpVersion)
   );
-  const strict = computeStrictVerdict(taskName, dataWithoutMessage, ctx.adcpVersion, ctx.responseAdcpVersion);
+  const computedStrict = computeStrictVerdict(taskName, dataWithoutMessage, ctx.adcpVersion, ctx.responseAdcpVersion);
+  const strict = computedStrict ? { ...computedStrict, lenient_valid: parseResult?.success ?? null } : void 0;
+  const externalSchemaIsAuthoritative = isExternalResponseSchemaAuthoritative(ctx);
+  if (externalSchemaIsAuthoritative && strict) {
+    if (strict.valid) {
+      const base = {
+        check: "response_schema",
+        passed: true,
+        description: validation.description,
+        schema_id,
+        schema_url,
+        strict
+      };
+      const warning = buildStrictWarning(strict);
+      return warning ? { ...base, warning } : base;
+    }
+    const issues2 = strict.issues ?? [];
+    const firstIssue2 = issues2[0];
+    return {
+      check: "response_schema",
+      passed: false,
+      description: validation.description,
+      error: issues2.length > 0 ? issues2.slice(0, 5).map((issue) => `${issue.instance_path || "/"}: ${issue.message}`).join("; ") : `External JSON Schema rejected the ${taskName} response`,
+      json_pointer: firstIssue2?.instance_path || null,
+      expected: schema_id ?? `response schema for ${taskName}`,
+      actual: issues2,
+      schema_id,
+      schema_url,
+      strict
+    };
+  }
+  if (!schema) {
+    return noResponseSchemaResult(validation, taskName, schema_id, schema_url, strict);
+  }
+  if (!parseResult) return noResponseSchemaResult(validation, taskName, schema_id, schema_url, strict);
   if (parseResult.success) {
     const base = {
       check: "response_schema",
@@ -267,6 +287,19 @@ function validateResponseSchema(validation, ctx, taskResult) {
       schema_id,
       schema_url
     };
+    if (strict && !strict.valid && ctx.strictResponseSchemaValidation === true) {
+      const issues2 = strict.issues ?? [];
+      const firstIssue2 = issues2[0];
+      return {
+        ...base,
+        passed: false,
+        error: issues2.length > 0 ? issues2.slice(0, 5).map((issue) => `${issue.instance_path || "/"}: ${issue.message}`).join("; ") : `Strict JSON Schema rejected the ${taskName} response`,
+        json_pointer: firstIssue2?.instance_path || null,
+        expected: schema_id ?? `response schema for ${taskName}`,
+        actual: issues2,
+        strict
+      };
+    }
     const warning = strict ? buildStrictWarning(strict) : void 0;
     if (!strict && !warning) return base;
     if (!strict) return { ...base, warning };
@@ -289,9 +322,34 @@ function validateResponseSchema(validation, ctx, taskResult) {
   };
   return strict ? { ...failed, strict } : failed;
 }
+function isExternalResponseSchemaAuthoritative(ctx) {
+  const validationVersion = responseSchemaValidationVersion(ctx.adcpVersion, ctx.responseAdcpVersion);
+  return validationVersion !== void 0 && isExternalSchemaRootActive(validationVersion);
+}
+function responseSchemaValidationVersion(adcpVersion, responseAdcpVersion) {
+  if (adcpVersion && isExternalSchemaRootActive(adcpVersion)) return adcpVersion;
+  return responseAdcpVersion && hasSchemaBundle(responseAdcpVersion) ? responseAdcpVersion : adcpVersion;
+}
+function noResponseSchemaResult(validation, taskName, schema_id, schema_url, strict) {
+  const result = {
+    check: "response_schema",
+    passed: false,
+    description: validation.description,
+    error: `No schema registered for task "${taskName}"`,
+    json_pointer: null,
+    expected: schema_id ?? `response schema for ${taskName}`,
+    // The runner failed before observing the agent — distinguish that from
+    // "agent returned null" so implementors don't chase a phantom agent bug.
+    actual: { reason: "no_schema_registered", task: taskName },
+    schema_id,
+    schema_url
+  };
+  return strict ? { ...result, strict } : result;
+}
 function computeStrictVerdict(taskName, payload, adcpVersion, responseAdcpVersion) {
-  const validationVersion = responseAdcpVersion && hasSchemaBundle(responseAdcpVersion) ? responseAdcpVersion : adcpVersion;
-  if (responseAdcpVersion && isPre31AdcpVersion(responseAdcpVersion) && !hasSchemaBundle(responseAdcpVersion)) {
+  const externalVersionSelected = adcpVersion !== void 0 && isExternalSchemaRootActive(adcpVersion);
+  const validationVersion = responseSchemaValidationVersion(adcpVersion, responseAdcpVersion);
+  if (!externalVersionSelected && responseAdcpVersion && isPre31AdcpVersion(responseAdcpVersion) && !hasSchemaBundle(responseAdcpVersion)) {
     return void 0;
   }
   const payloadForValidation = prepareResponseForSchemaValidation(taskName, payload, responseAdcpVersion);
@@ -2538,6 +2596,7 @@ export {
   RUNNER_CAPABILITY_VERSION,
   decorateValidationResult,
   detectShapeDriftHint,
+  isExternalResponseSchemaAuthoritative,
   resolvePath2 as resolvePath,
   runValidations,
   validationFailsStep