@adcp/sdk 16.0.0-beta.1 → 16.0.0-beta.3

package/dist/lib/substitution/translate.mjs

@@ -1,14 +1,43 @@
 import { encodeUnreserved } from "./rfc3986.mjs";
-const UNIVERSAL_MACRO = /\{[A-Z][A-Z0-9_]*\}/g;
-const NATIVE_TOKEN_SHAPE = /^(?:%%.+%%|\{\{.+\}\}|\$\{.+\}|\[[A-Z][A-Z0-9_]*\])$/;
-const CONSENT_MACROS = /* @__PURE__ */ new Set([
-  "{GDPR}",
-  "{GDPR_CONSENT}",
-  "{US_PRIVACY}",
-  "{GPP_STRING}",
-  "{GPP_SID}",
-  "{LIMIT_AD_TRACKING}"
-]);
+import { isConsentMacro, isVendorScopedConsentMacro } from "./consent-macros.mjs";
+function* macroTokens(text) {
+  const missingClosers = /* @__PURE__ */ new Set();
+  let cursor = 0;
+  while (cursor < text.length) {
+    let end = -1;
+    let native = true;
+    const close = text.startsWith("%%", cursor) ? "%%" : text.startsWith("{{", cursor) ? "}}" : text.startsWith("${", cursor) ? "}" : null;
+    if (close && !missingClosers.has(close)) {
+      const closer = text.indexOf(close, cursor + 2);
+      if (closer === -1) missingClosers.add(close);
+      else end = closer + close.length;
+    }
+    if (end === -1 && (text[cursor] === "{" || text[cursor] === "[")) {
+      let nameEnd = cursor + 1;
+      if (/[A-Z]/.test(text[nameEnd] ?? "")) {
+        nameEnd += 1;
+        while (/[A-Z0-9_]/.test(text[nameEnd] ?? "")) nameEnd += 1;
+        if (text[nameEnd] === (text[cursor] === "{" ? "}" : "]")) {
+          end = nameEnd + 1;
+          native = text[cursor] === "[";
+        }
+      }
+    }
+    if (end === -1) {
+      cursor += 1;
+      continue;
+    }
+    yield { text: text.slice(cursor, end), start: cursor, end, native };
+    cursor = end;
+  }
+}
+function hasNativeTokenSyntax(value) {
+  for (const token of macroTokens(value)) {
+    const minimumLength = token.text.startsWith("${") ? 3 : token.text.startsWith("[") ? 2 : 4;
+    if (token.native && token.text.length > minimumLength) return true;
+  }
+  return false;
+}
 const UNSAFE_NATIVE_CHARACTER = /[\u0000-\u001F\u007F]/;
 class UnsafeNativeMappingError extends Error {
   code = "unsafe_native_mapping";
@@ -22,6 +51,83 @@ class UnsafeNativeMappingError extends Error {
     this.macro = macro;
   }
 }
+class MultipleVendorConsentMacrosError extends Error {
+  code = "multiple_vendor_consent_macros";
+  macro;
+  constructor(macro) {
+    super(`Multiple vendor-scoped consent macros; second token is ${JSON.stringify(macro)}`);
+    this.name = "MultipleVendorConsentMacrosError";
+    this.macro = macro;
+  }
+}
+function overlappingRange(ranges, candidate) {
+  let low = 0;
+  let high = ranges.length;
+  while (low < high) {
+    const middle = Math.floor((low + high) / 2);
+    if (ranges[middle].end <= candidate.start) low = middle + 1;
+    else high = middle;
+  }
+  const range = ranges[low];
+  return range && range.start < candidate.end ? range : void 0;
+}
+function assertSingleScopedConsent(spans, mapping) {
+  const url = spans.map((span) => span.text).join("");
+  const concrete = [];
+  const sources = [];
+  let offset = 0;
+  for (const span of spans) {
+    const range = { start: offset, end: offset + span.text.length };
+    if (span.concrete && range.start < range.end) {
+      const previous = concrete[concrete.length - 1];
+      if (previous?.end === range.start) previous.end = range.end;
+      else concrete.push(range);
+    }
+    if (span.scopedSource && span.text.length > 0) sources.push({ ...range, macro: span.scopedSource });
+    offset = range.end;
+  }
+  const occurrences = [];
+  const shells = [];
+  for (const token of macroTokens(url)) {
+    const range = { start: token.start, end: token.end };
+    shells.push(range);
+    const canonical = token.text.startsWith("${") ? token.text.slice(1) : token.text;
+    if (isVendorScopedConsentMacro(canonical)) {
+      occurrences.push({ ...range, macro: canonical });
+    }
+  }
+  const aliases = [];
+  for (const [macro, entry] of Object.entries(mapping)) {
+    if (!isVendorScopedConsentMacro(macro) || !("native" in entry) || entry.native.length === 0) continue;
+    let start = url.indexOf(entry.native);
+    while (start !== -1) {
+      const range = { start, end: start + entry.native.length };
+      const shell = overlappingRange(shells, range);
+      const completeShell = shell?.start === range.start && shell.end === range.end;
+      const insideShell = shell && shell.start <= range.start && range.end <= shell.end && !completeShell;
+      const data = overlappingRange(concrete, range);
+      const entirelyConcrete = data && data.start <= range.start && range.end <= data.end;
+      if (!insideShell && (completeShell || !entirelyConcrete) && !overlappingRange(occurrences, range)) {
+        aliases.push({ ...range, macro });
+      }
+      start = url.indexOf(entry.native, range.end);
+    }
+  }
+  aliases.sort((a, b) => a.start - b.start || b.end - a.end);
+  const selectedAliases = [];
+  for (const alias of aliases) {
+    const previous = selectedAliases[selectedAliases.length - 1];
+    if (!previous || previous.end <= alias.start) selectedAliases.push(alias);
+  }
+  for (const alias of selectedAliases) occurrences.push(alias);
+  occurrences.sort((a, b) => a.start - b.start);
+  const unmatchedSources = sources.filter((source) => !overlappingRange(occurrences, source));
+  for (const source of unmatchedSources) occurrences.push(source);
+  occurrences.sort((a, b) => a.start - b.start);
+  const second = occurrences[1];
+  if (second) throw new MultipleVendorConsentMacrosError(second.macro);
+  return url;
+}
 function translateUniversalMacros(input_pixel_url, mapping) {
   const suspect_native_values = [];
   const suspectSeen = /* @__PURE__ */ new Set();
@@ -34,11 +140,11 @@ function translateUniversalMacros(input_pixel_url, mapping) {
       }
       continue;
     }
-    if (CONSENT_MACROS.has(macro) && !frozenConsentSeen.has(macro)) {
+    if (isConsentMacro(macro) && !frozenConsentSeen.has(macro)) {
       frozenConsentSeen.add(macro);
       frozen_consent_macros.push(macro);
     }
-    if (NATIVE_TOKEN_SHAPE.test(entry.value) && !suspectSeen.has(macro)) {
+    if (hasNativeTokenSyntax(entry.value) && !suspectSeen.has(macro)) {
       suspectSeen.add(macro);
       suspect_native_values.push(macro);
     }
@@ -49,7 +155,7 @@ function translateUniversalMacros(input_pixel_url, mapping) {
   const queryIdx = withoutFragment.indexOf("?");
   if (queryIdx === -1) {
     return {
-      url: input_pixel_url,
+      url: assertSingleScopedConsent([{ text: input_pixel_url }], mapping),
       dropped_params: [],
       unmapped_macros: [],
       dropped_consent_macros: [],
@@ -69,12 +175,12 @@ function translateUniversalMacros(input_pixel_url, mapping) {
     const eqIdx = rawParam.indexOf("=");
     const key = eqIdx === -1 ? rawParam : rawParam.slice(0, eqIdx);
     const value = eqIdx === -1 ? "" : rawParam.slice(eqIdx + 1);
-    const tokens = value.match(UNIVERSAL_MACRO);
-    if (!tokens) {
-      outputParts.push(rawParam);
+    const tokens = [...macroTokens(value)].filter((token) => !token.native);
+    if (tokens.length === 0) {
+      outputParts.push([{ text: rawParam }]);
       continue;
     }
-    const missing = tokens.filter((t) => !(t in mapping));
+    const missing = tokens.map((token) => token.text).filter((token) => !(token in mapping));
     if (missing.length > 0) {
       dropped_params.push(key);
       for (const m of missing) {
@@ -82,24 +188,38 @@ function translateUniversalMacros(input_pixel_url, mapping) {
           unmappedSeen.add(m);
           unmapped_macros.push(m);
         }
-        if (CONSENT_MACROS.has(m) && !consentSeen.has(m)) {
+        if (isConsentMacro(m) && !consentSeen.has(m)) {
           consentSeen.add(m);
           dropped_consent_macros.push(m);
         }
       }
       continue;
     }
-    const translated = value.replace(UNIVERSAL_MACRO, (token) => {
+    const translated = [{ text: `${key}=` }];
+    let cursor = 0;
+    for (const match of tokens) {
+      const token = match.text;
+      translated.push({ text: value.slice(cursor, match.start) });
       const entry = mapping[token];
-      if (!entry) {
-        return token;
+      if ("native" in entry) {
+        translated.push({
+          text: entry.native,
+          ...isVendorScopedConsentMacro(token) ? { scopedSource: token } : {}
+        });
+      } else {
+        translated.push({ text: encodeUnreserved(entry.value), concrete: true });
       }
-      return "native" in entry ? entry.native : encodeUnreserved(entry.value);
-    });
-    outputParts.push(`${key}=${translated}`);
+      cursor = match.end;
+    }
+    translated.push({ text: value.slice(cursor) });
+    outputParts.push(translated);
   }
-  const newQuery = outputParts.join("&");
-  const url = newQuery ? `${base}?${newQuery}${fragment}` : `${base}${fragment}`;
+  const querySpans = outputParts.flatMap((part, index) => index === 0 ? part : [{ text: "&" }, ...part]);
+  const hasQuery = querySpans.some((span) => span.text.length > 0);
+  const url = assertSingleScopedConsent(
+    [{ text: base }, ...hasQuery ? [{ text: "?" }, ...querySpans] : [], { text: fragment }],
+    mapping
+  );
   return {
     url,
     dropped_params,
@@ -110,6 +230,7 @@ function translateUniversalMacros(input_pixel_url, mapping) {
   };
 }
 export {
+  MultipleVendorConsentMacrosError,
   UnsafeNativeMappingError,
   translateUniversalMacros
 };

package/dist/lib/testing/client.js

@@ -55,6 +55,7 @@ var import_protocols = require('../protocols/index.js');
 var import_node_crypto = require("node:crypto");
 var import_node_async_hooks = require("node:async_hooks");
 var import_client_hooks = require('../validation/client-hooks.js');
+var import_schema_loader = require('../validation/schema-loader.js');
 var import_error_extraction = require('../utils/error-extraction.js');
 var import_client = require('../signing/client.js');
 var import_storage_registry = require('../auth/oauth/storage-registry.js');
@@ -534,7 +535,7 @@ async function discoverAgentProfile(client, signal, schemaAdcpVersion) {
           caps.data,
           "strict",
           void 0,
-          schemaAdcpVersion ?? client.getAdcpVersion()
+          (0, import_schema_loader.resolveServedValidationVersion)(caps.data, schemaAdcpVersion ?? client.getAdcpVersion())
         );
         if (!validation.valid) {
           profile.capabilities_schema_issues = validation.issues.map((issue) => ({

package/dist/lib/testing/client.mjs

@@ -12,6 +12,7 @@ import { normalizeTransportOptions } from "../protocols/index.mjs";
 import { createHmac, hkdfSync, randomBytes } from "node:crypto";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { validateIncomingResponse } from "../validation/client-hooks.mjs";
+import { resolveServedValidationVersion } from "../validation/schema-loader.mjs";
 import { extractVersionUnsupportedDetails } from "../utils/error-extraction.mjs";
 import { buildAgentSigningContext } from "../signing/client.mjs";
 import { bindAgentStorage } from "../auth/oauth/storage-registry.mjs";
@@ -491,7 +492,7 @@ async function discoverAgentProfile(client, signal, schemaAdcpVersion) {
           caps.data,
           "strict",
           void 0,
-          schemaAdcpVersion ?? client.getAdcpVersion()
+          resolveServedValidationVersion(caps.data, schemaAdcpVersion ?? client.getAdcpVersion())
         );
         if (!validation.valid) {
           profile.capabilities_schema_issues = validation.issues.map((issue) => ({

package/dist/lib/testing/scenarios/capabilities.js

@@ -239,7 +239,7 @@ function crossValidateProtocolsAndTools(capabilities, tools) {
     creative: import_capabilities.CREATIVE_TOOLS,
     sponsored_intelligence: import_capabilities.SPONSORED_INTELLIGENCE_TOOLS,
     trusted_match: import_capabilities.TRUSTED_MATCH_TOOLS,
-    compliance: import_capabilities.COMPLIANCE_TOOLS
+    compliance_testing: import_capabilities.COMPLIANCE_TOOLS
   };
   const perProtocolDiffs = {};
   for (const protocol of capabilities.protocols) {

package/dist/lib/testing/scenarios/capabilities.mjs

@@ -225,7 +225,7 @@ function crossValidateProtocolsAndTools(capabilities, tools) {
     creative: CREATIVE_TOOLS,
     sponsored_intelligence: SPONSORED_INTELLIGENCE_TOOLS,
     trusted_match: TRUSTED_MATCH_TOOLS,
-    compliance: COMPLIANCE_TOOLS
+    compliance_testing: COMPLIANCE_TOOLS
   };
   const perProtocolDiffs = {};
   for (const protocol of capabilities.protocols) {

package/dist/lib/testing/storyboard/request-signing/builder.js

@@ -24,6 +24,7 @@ __export(builder_exports, {
 });
 module.exports = __toCommonJS(builder_exports);
 var import_crypto = require("crypto");
+var import_crypto2 = require('../../../signing/crypto.js');
 var import_signing = require('../../../signing/index.js');
 var import_vector_loader = require('./vector-loader.js');
 function buildPositiveRequest(vector, keys, options = {}) {
@@ -571,11 +572,7 @@ function formatParamsWithOmissions(components, params, override) {
   return `(${componentList});${pairs.join(";")}`;
 }
 function produceSignature(key, data) {
-  const privateKey = (0, import_crypto.createPrivateKey)({ key: key.privateKey, format: "jwk" });
-  if (key.alg === "ed25519") {
-    return new Uint8Array((0, import_crypto.sign)(null, data, privateKey));
-  }
-  return new Uint8Array((0, import_crypto.sign)("sha256", data, { key: privateKey, dsaEncoding: "ieee-p1363" }));
+  return (0, import_crypto2.signWithPrivateJwk)(key.alg, key.privateKey, data);
 }
 function signerKeyFor(vector, keys) {
   const kid = vector.jwks_ref?.[0];

package/dist/lib/testing/storyboard/request-signing/builder.mjs

@@ -1,4 +1,5 @@
-import { createHash, createPrivateKey, randomBytes, randomUUID, sign as nodeSign } from "crypto";
+import { createHash, randomBytes, randomUUID } from "crypto";
+import { signWithPrivateJwk } from "../../../signing/crypto.mjs";
 import {
   buildSignatureBase,
   computeContentDigest,
@@ -554,11 +555,7 @@ function formatParamsWithOmissions(components, params, override) {
   return `(${componentList});${pairs.join(";")}`;
 }
 function produceSignature(key, data) {
-  const privateKey = createPrivateKey({ key: key.privateKey, format: "jwk" });
-  if (key.alg === "ed25519") {
-    return new Uint8Array(nodeSign(null, data, privateKey));
-  }
-  return new Uint8Array(nodeSign("sha256", data, { key: privateKey, dsaEncoding: "ieee-p1363" }));
+  return signWithPrivateJwk(key.alg, key.privateKey, data);
 }
 function signerKeyFor(vector, keys) {
   const kid = vector.jwks_ref?.[0];

package/dist/lib/testing/storyboard/signer-grader/grader.js

@@ -22,7 +22,7 @@ __export(grader_exports, {
 });
 module.exports = __toCommonJS(grader_exports);
 var import_promises = require("node:fs/promises");
-var import_node_crypto = require("node:crypto");
+var import_crypto = require('../../../signing/crypto.js');
 var import_signing = require('../../../signing/index.js');
 var import_ssrf_fetch = require('../../../net/ssrf-fetch.js');
 var import_content_digest = require('../../../signing/content-digest.js');
@@ -175,12 +175,7 @@ async function keyFileProvider(filePath, kid, algorithm) {
     algorithm,
     fingerprint: `key-file:${kid}`,
     async sign(payload) {
-      const privateKey = (0, import_node_crypto.createPrivateKey)({ key: jwk, format: "jwk" });
-      const data = Buffer.from(payload);
-      if (algorithm === "ed25519") {
-        return new Uint8Array((0, import_node_crypto.sign)(null, data, privateKey));
-      }
-      return new Uint8Array((0, import_node_crypto.sign)("sha256", data, { key: privateKey, dsaEncoding: "ieee-p1363" }));
+      return (0, import_crypto.signWithPrivateJwkAsync)(algorithm, jwk, payload);
     }
   };
 }

package/dist/lib/testing/storyboard/signer-grader/grader.mjs

@@ -1,5 +1,5 @@
 import { readFile } from "node:fs/promises";
-import { createPrivateKey, sign as nodeSign } from "node:crypto";
+import { signWithPrivateJwkAsync } from "../../../signing/crypto.mjs";
 import {
   HttpsJwksResolver,
   InMemoryReplayStore,
@@ -159,12 +159,7 @@ async function keyFileProvider(filePath, kid, algorithm) {
     algorithm,
     fingerprint: `key-file:${kid}`,
     async sign(payload) {
-      const privateKey = createPrivateKey({ key: jwk, format: "jwk" });
-      const data = Buffer.from(payload);
-      if (algorithm === "ed25519") {
-        return new Uint8Array(nodeSign(null, data, privateKey));
-      }
-      return new Uint8Array(nodeSign("sha256", data, { key: privateKey, dsaEncoding: "ieee-p1363" }));
+      return signWithPrivateJwkAsync(algorithm, jwk, payload);
     }
   };
 }

package/dist/lib/testing/storyboard/validations.d.mts

@@ -197,7 +197,7 @@ export interface UpstreamTrafficQueryResult {
  */
 export declare function runValidations(validations: StoryboardValidation[], context: ValidationContext): ValidationResult[];
 /** Capability semver emitted in run summaries and used for advisory expiry. */
-export declare const RUNNER_CAPABILITY_VERSION = "16.0.0-beta.1";
+export declare const RUNNER_CAPABILITY_VERSION = "16.0.0-beta.3";
 /** True when a failed validation contributes to the owning step's grade. */
 export declare function validationFailsStep(result: ValidationResult): boolean;
 /**

package/dist/lib/testing/storyboard/validations.d.ts

@@ -197,7 +197,7 @@ export interface UpstreamTrafficQueryResult {
  */
 export declare function runValidations(validations: StoryboardValidation[], context: ValidationContext): ValidationResult[];
 /** Capability semver emitted in run summaries and used for advisory expiry. */
-export declare const RUNNER_CAPABILITY_VERSION = "16.0.0-beta.1";
+export declare const RUNNER_CAPABILITY_VERSION = "16.0.0-beta.3";
 /** True when a failed validation contributes to the owning step's grade. */
 export declare function validationFailsStep(result: ValidationResult): boolean;
 /**

package/dist/lib/types/enums.generated.d.mts

@@ -98,6 +98,8 @@ export declare const FrequencyCapDurationUnitValues: readonly ["seconds", "minut
 export declare const FrequencyCapMutableFieldValues: readonly ["max_impressions", "per", "window", "suppress"];
 export declare const FrequencyCapScopeValues: readonly ["package"];
 export declare const GenreTaxonomyValues: readonly ["iab_content_3.0", "iab_content_2.2", "gracenote", "eidr", "apple_genres", "google_genres", "roku", "amazon_genres", "custom"];
+export declare const GeographicPlaceIdentifierSystemValues: readonly ["geonames", "google_ads", "microsoft_ads"];
+export declare const GeographicPlaceTypeValues: readonly ["airport", "borough", "city", "city_region", "commune", "county", "district", "municipality", "neighborhood", "post_town", "prefecture", "province", "quarter", "state", "territory", "ward"];
 export declare const GeographicTargetingLevelValues: readonly ["country", "region", "metro", "postal_area"];
 export declare const GOPTypeValues: readonly ["closed", "open"];
 export declare const GovernanceDecisionValues: readonly ["approved", "denied", "conditions"];
@@ -200,6 +202,7 @@ export declare const SortMetricValues: readonly ["impressions", "spend", "clicks
 export declare const SpecialCategoryValues: readonly ["awards", "championship", "concert", "conference", "election", "festival", "gala", "holiday", "premiere", "product_launch", "reunion", "tribute"];
 export declare const SponsoredPlacementTypeValues: readonly ["sponsored_search", "sponsored_display", "sponsored_native"];
 export declare const StandardScopeValues: readonly ["attestation_verifier"];
+export declare const StartTimingValues: readonly ["asap"];
 export declare const StoryboardStatusValues: readonly ["passing", "failing", "partial", "untested", "skipped", "not_selected", "unknown"];
 export declare const TalentRoleValues: readonly ["host", "guest", "creator", "cast", "narrator", "producer", "correspondent", "commentator", "analyst"];
 export declare const TaskStatusValues: readonly ["submitted", "working", "input-required", "completed", "canceled", "failed", "rejected", "auth-required", "unknown"];

package/dist/lib/types/enums.generated.d.ts

@@ -98,6 +98,8 @@ export declare const FrequencyCapDurationUnitValues: readonly ["seconds", "minut
 export declare const FrequencyCapMutableFieldValues: readonly ["max_impressions", "per", "window", "suppress"];
 export declare const FrequencyCapScopeValues: readonly ["package"];
 export declare const GenreTaxonomyValues: readonly ["iab_content_3.0", "iab_content_2.2", "gracenote", "eidr", "apple_genres", "google_genres", "roku", "amazon_genres", "custom"];
+export declare const GeographicPlaceIdentifierSystemValues: readonly ["geonames", "google_ads", "microsoft_ads"];
+export declare const GeographicPlaceTypeValues: readonly ["airport", "borough", "city", "city_region", "commune", "county", "district", "municipality", "neighborhood", "post_town", "prefecture", "province", "quarter", "state", "territory", "ward"];
 export declare const GeographicTargetingLevelValues: readonly ["country", "region", "metro", "postal_area"];
 export declare const GOPTypeValues: readonly ["closed", "open"];
 export declare const GovernanceDecisionValues: readonly ["approved", "denied", "conditions"];
@@ -200,6 +202,7 @@ export declare const SortMetricValues: readonly ["impressions", "spend", "clicks
 export declare const SpecialCategoryValues: readonly ["awards", "championship", "concert", "conference", "election", "festival", "gala", "holiday", "premiere", "product_launch", "reunion", "tribute"];
 export declare const SponsoredPlacementTypeValues: readonly ["sponsored_search", "sponsored_display", "sponsored_native"];
 export declare const StandardScopeValues: readonly ["attestation_verifier"];
+export declare const StartTimingValues: readonly ["asap"];
 export declare const StoryboardStatusValues: readonly ["passing", "failing", "partial", "untested", "skipped", "not_selected", "unknown"];
 export declare const TalentRoleValues: readonly ["host", "guest", "creator", "cast", "narrator", "producer", "correspondent", "commentator", "analyst"];
 export declare const TaskStatusValues: readonly ["submitted", "working", "input-required", "completed", "canceled", "failed", "rejected", "auth-required", "unknown"];

package/dist/lib/types/enums.generated.js

@@ -121,6 +121,8 @@ __export(enums_generated_exports, {
   FrequencyCapScopeValues: () => FrequencyCapScopeValues,
   GOPTypeValues: () => GOPTypeValues,
   GenreTaxonomyValues: () => GenreTaxonomyValues,
+  GeographicPlaceIdentifierSystemValues: () => GeographicPlaceIdentifierSystemValues,
+  GeographicPlaceTypeValues: () => GeographicPlaceTypeValues,
   GeographicTargetingLevelValues: () => GeographicTargetingLevelValues,
   GovernanceDecisionValues: () => GovernanceDecisionValues,
   GovernanceDomainValues: () => GovernanceDomainValues,
@@ -223,6 +225,7 @@ __export(enums_generated_exports, {
   SpecialCategoryValues: () => SpecialCategoryValues,
   SponsoredPlacementTypeValues: () => SponsoredPlacementTypeValues,
   StandardScopeValues: () => StandardScopeValues,
+  StartTimingValues: () => StartTimingValues,
   StoryboardStatusValues: () => StoryboardStatusValues,
   TMPResponseTypeValues: () => TMPResponseTypeValues,
   TalentRoleValues: () => TalentRoleValues,
@@ -354,6 +357,8 @@ const FrequencyCapDurationUnitValues = ["seconds", "minutes", "hours", "days", "
 const FrequencyCapMutableFieldValues = ["max_impressions", "per", "window", "suppress"];
 const FrequencyCapScopeValues = ["package"];
 const GenreTaxonomyValues = ["iab_content_3.0", "iab_content_2.2", "gracenote", "eidr", "apple_genres", "google_genres", "roku", "amazon_genres", "custom"];
+const GeographicPlaceIdentifierSystemValues = ["geonames", "google_ads", "microsoft_ads"];
+const GeographicPlaceTypeValues = ["airport", "borough", "city", "city_region", "commune", "county", "district", "municipality", "neighborhood", "post_town", "prefecture", "province", "quarter", "state", "territory", "ward"];
 const GeographicTargetingLevelValues = ["country", "region", "metro", "postal_area"];
 const GOPTypeValues = ["closed", "open"];
 const GovernanceDecisionValues = ["approved", "denied", "conditions"];
@@ -455,6 +460,7 @@ const SortMetricValues = ["impressions", "spend", "clicks", "ctr", "views", "com
 const SpecialCategoryValues = ["awards", "championship", "concert", "conference", "election", "festival", "gala", "holiday", "premiere", "product_launch", "reunion", "tribute"];
 const SponsoredPlacementTypeValues = ["sponsored_search", "sponsored_display", "sponsored_native"];
 const StandardScopeValues = ["attestation_verifier"];
+const StartTimingValues = ["asap"];
 const StoryboardStatusValues = ["passing", "failing", "partial", "untested", "skipped", "not_selected", "unknown"];
 const TalentRoleValues = ["host", "guest", "creator", "cast", "narrator", "producer", "correspondent", "commentator", "analyst"];
 const TaskStatusValues = ["submitted", "working", "input-required", "completed", "canceled", "failed", "rejected", "auth-required", "unknown"];
@@ -712,6 +718,8 @@ const RequestSigningErrorCodeMetadata = Object.freeze(requestSigningErrorCodeMet
   FrequencyCapScopeValues,
   GOPTypeValues,
   GenreTaxonomyValues,
+  GeographicPlaceIdentifierSystemValues,
+  GeographicPlaceTypeValues,
   GeographicTargetingLevelValues,
   GovernanceDecisionValues,
   GovernanceDomainValues,
@@ -814,6 +822,7 @@ const RequestSigningErrorCodeMetadata = Object.freeze(requestSigningErrorCodeMet
   SpecialCategoryValues,
   SponsoredPlacementTypeValues,
   StandardScopeValues,
+  StartTimingValues,
   StoryboardStatusValues,
   TMPResponseTypeValues,
   TalentRoleValues,

package/dist/lib/types/enums.generated.mjs

@@ -98,6 +98,8 @@ const FrequencyCapDurationUnitValues = ["seconds", "minutes", "hours", "days", "
 const FrequencyCapMutableFieldValues = ["max_impressions", "per", "window", "suppress"];
 const FrequencyCapScopeValues = ["package"];
 const GenreTaxonomyValues = ["iab_content_3.0", "iab_content_2.2", "gracenote", "eidr", "apple_genres", "google_genres", "roku", "amazon_genres", "custom"];
+const GeographicPlaceIdentifierSystemValues = ["geonames", "google_ads", "microsoft_ads"];
+const GeographicPlaceTypeValues = ["airport", "borough", "city", "city_region", "commune", "county", "district", "municipality", "neighborhood", "post_town", "prefecture", "province", "quarter", "state", "territory", "ward"];
 const GeographicTargetingLevelValues = ["country", "region", "metro", "postal_area"];
 const GOPTypeValues = ["closed", "open"];
 const GovernanceDecisionValues = ["approved", "denied", "conditions"];
@@ -199,6 +201,7 @@ const SortMetricValues = ["impressions", "spend", "clicks", "ctr", "views", "com
 const SpecialCategoryValues = ["awards", "championship", "concert", "conference", "election", "festival", "gala", "holiday", "premiere", "product_launch", "reunion", "tribute"];
 const SponsoredPlacementTypeValues = ["sponsored_search", "sponsored_display", "sponsored_native"];
 const StandardScopeValues = ["attestation_verifier"];
+const StartTimingValues = ["asap"];
 const StoryboardStatusValues = ["passing", "failing", "partial", "untested", "skipped", "not_selected", "unknown"];
 const TalentRoleValues = ["host", "guest", "creator", "cast", "narrator", "producer", "correspondent", "commentator", "analyst"];
 const TaskStatusValues = ["submitted", "working", "input-required", "completed", "canceled", "failed", "rejected", "auth-required", "unknown"];
@@ -455,6 +458,8 @@ export {
   FrequencyCapScopeValues,
   GOPTypeValues,
   GenreTaxonomyValues,
+  GeographicPlaceIdentifierSystemValues,
+  GeographicPlaceTypeValues,
   GeographicTargetingLevelValues,
   GovernanceDecisionValues,
   GovernanceDomainValues,
@@ -557,6 +562,7 @@ export {
   SpecialCategoryValues,
   SponsoredPlacementTypeValues,
   StandardScopeValues,
+  StartTimingValues,
   StoryboardStatusValues,
   TMPResponseTypeValues,
   TalentRoleValues,

package/dist/lib/v2/projection/catalog-snapshot.js

@@ -25,6 +25,7 @@ __export(catalog_snapshot_exports, {
 module.exports = __toCommonJS(catalog_snapshot_exports);
 var import_resolve_agent_properties = require('../../discovery/resolve-agent-properties.js');
 var import_canonical_properties = require('./canonical-properties.js');
+var import_legacy_routes = require('./legacy-routes.js');
 const compiledSnapshotCache = /* @__PURE__ */ new WeakMap();
 function normalizedAgentUrl(value) {
   return (0, import_resolve_agent_properties.canonicalizeAgentUrl)(value) ?? value;
@@ -202,7 +203,7 @@ function legacyFormatConverterFromCatalogSnapshots(snapshots, fallback) {
 function canonicalFormatLegacyResolverFromCatalogSnapshots(snapshots, fallback) {
   if (!snapshots || snapshots.length === 0) return fallback;
   const compiled = compileProjectionCatalogSnapshots(snapshots);
-  return (context) => {
+  const resolver = (context) => {
     const refs = resolutionContextFormatOptionRefs(context);
     if (refs.length === 0) return fallback?.(context);
     const resolved = [];
@@ -225,6 +226,7 @@ function canonicalFormatLegacyResolverFromCatalogSnapshots(snapshots, fallback)
     }
     return [...new Map(resolved.map((ref) => [legacyRefKey(ref), ref])).values()];
   };
+  return (0, import_legacy_routes.carryFormatOptionOrigins)(resolver, fallback);
 }
 function assertBidirectionalProjectionCatalogs(snapshots) {
   const routeByCanonicalOption = /* @__PURE__ */ new Map();

package/dist/lib/v2/projection/catalog-snapshot.mjs

@@ -1,5 +1,6 @@
 import { canonicalizeAgentUrl } from "../../discovery/resolve-agent-properties.mjs";
 import { isCanonicalV1Translatable } from "./canonical-properties.mjs";
+import { carryFormatOptionOrigins } from "./legacy-routes.mjs";
 const compiledSnapshotCache = /* @__PURE__ */ new WeakMap();
 function normalizedAgentUrl(value) {
   return canonicalizeAgentUrl(value) ?? value;
@@ -177,7 +178,7 @@ function legacyFormatConverterFromCatalogSnapshots(snapshots, fallback) {
 function canonicalFormatLegacyResolverFromCatalogSnapshots(snapshots, fallback) {
   if (!snapshots || snapshots.length === 0) return fallback;
   const compiled = compileProjectionCatalogSnapshots(snapshots);
-  return (context) => {
+  const resolver = (context) => {
     const refs = resolutionContextFormatOptionRefs(context);
     if (refs.length === 0) return fallback?.(context);
     const resolved = [];
@@ -200,6 +201,7 @@ function canonicalFormatLegacyResolverFromCatalogSnapshots(snapshots, fallback)
     }
     return [...new Map(resolved.map((ref) => [legacyRefKey(ref), ref])).values()];
   };
+  return carryFormatOptionOrigins(resolver, fallback);
 }
 function assertBidirectionalProjectionCatalogs(snapshots) {
   const routeByCanonicalOption = /* @__PURE__ */ new Map();

package/dist/lib/v2/projection/creative-delivery.d.mts

@@ -78,16 +78,38 @@ export type CanonicalCreateMediaBuyRequest = Omit<CanonicalCreativeResponse<Crea
     packages?: CanonicalPackageRequest[];
 };
 type CanonicalReportingWebhook = NonNullable<CanonicalCreateMediaBuyRequest['reporting_webhook']>;
-type ReportingWebhookPreferences = Omit<CanonicalReportingWebhook, 'url' | 'authentication' | 'reporting_frequency'> & {
-    reporting_frequency?: CanonicalReportingWebhook['reporting_frequency'];
+/**
+ * Client-facing form of a wire reporting webhook `W`. Every field is optional:
+ * the SDK can supply the callback `url`, `reporting_frequency` and the
+ * `authentication` block from client configuration.
+ *
+ * `authentication` is optional even with a caller-supplied `url`. AdCP 3.3
+ * makes it optional on the wire when the seller signs webhooks under its
+ * profile (`webhook_signing.supported`), and the experimental 3.3 client sends
+ * the registration without it once it has negotiated that. Below 3.3 the wire
+ * still requires it: with `webhookUrlTemplate` configured the client throws
+ * rather than send a caller URL without credentials (it never pairs its own
+ * `webhookSecret` with a caller-controlled host), and request validation
+ * reports the missing field otherwise.
+ *
+ * Derived from `W` rather than restating its fields, so it accepts every
+ * reporting webhook the pinned schemas generate, whether they declare
+ * `authentication` required (3.2) or optional (3.3).
+ *
+ * Exported for the type tests only; not re-exported from the package root.
+ */
+export type ClientReportingWebhookInputFor<W extends {
+    url: string;
+    reporting_frequency: unknown;
+}> = Omit<W, 'url' | 'authentication' | 'reporting_frequency'> & {
+    url?: W['url'];
+    reporting_frequency?: W['reporting_frequency'];
+    /** Atomic: `schemes` and `credentials` always come from the same source. */
+    authentication?: W extends {
+        authentication?: infer A;
+    } ? (unknown extends A ? never : A) : never;
 };
-type ClientReportingWebhookInput = (ReportingWebhookPreferences & {
-    url?: never;
-    authentication?: CanonicalReportingWebhook['authentication'];
-}) | (ReportingWebhookPreferences & {
-    url: CanonicalReportingWebhook['url'];
-    authentication: CanonicalReportingWebhook['authentication'];
-});
+type ClientReportingWebhookInput = ClientReportingWebhookInputFor<CanonicalReportingWebhook>;
 /**
  * Client-facing create request. The SDK may supply the reporting callback URL
  * and its complete authentication block from client configuration; the wire