@adcp/sdk 16.0.0-beta.9 → 16.1.0

package/dist/lib/signing/web-bot-auth.d.ts

@@ -8,8 +8,8 @@ export declare const WEB_BOT_AUTH_PROFILE: "web-bot-auth";
 export declare const WEB_BOT_AUTH_DRAFT_REVISION: "draft-ietf-webbotauth-httpsig-protocol-00";
 export declare const SIGNATURE_DIRECTORY_PATH = "/.well-known/http-message-signatures-directory";
 export declare const SIGNATURE_DIRECTORY_MEDIA_TYPE = "application/http-message-signatures-directory+json";
-/** The profile's signature algorithms (wba-profile.mdx "Profile rules"). ES256 is RFC 9421 profile only. */
-export declare const WEB_BOT_AUTH_ALGORITHMS: readonly ["ed25519", "rsa-pss-sha512"];
+/** The profile's signature algorithm: Ed25519 only. ES256 is RFC 9421 profile only. */
+export declare const WEB_BOT_AUTH_ALGORITHMS: readonly ["ed25519"];
 /**
  * The profile's `Accept-Signature` member (RFC 9421 §5.1): the label, the
  * components the profile requires, and its parameters. A replay challenge
@@ -73,7 +73,12 @@ export declare function jwkThumbprint(jwk: Partial<Pick<AdcpJsonWebKey, 'kty' |
  * time rather than on the first request.
  */
 export declare function assertWebBotAuthSigningKey(key: WebBotSigningKey): void;
-/** Reject authority normalization differentials on received identifiers. */
+/**
+ * A received identity origin, which must be exactly the canonical https
+ * origin string (WBA §5.2.1): lowercase host, no default port, and no path,
+ * trailing `/`, query, fragment, or userinfo. The string is compared as
+ * received, never normalized first.
+ */
 export declare function receivedAgentOrigin(value: string): string;
 export declare function getWebBotAuthLegacyOriginGate(resolver: Function | undefined): ((origin: string) => Promise<void>) | undefined;
 export interface WebBotAuthAuthorizationFailure {
@@ -136,8 +141,9 @@ export interface VerifyWebBotAuthOptions {
 /**
  * Verify a Web Bot Auth request (wba-profile.mdx "Verification"). Resolves to
  * exactly one verified signer: the profile takes one `web-bot-auth` signature
- * and one `Signature-Agent` member per request. The array shape is kept for
- * principal resolvers written against earlier drafts.
+ * and one `Signature-Agent` member per request, and does not read signatures
+ * with other tags. The array shape is kept for principal resolvers written
+ * against earlier drafts.
  */
 export declare function verifyWebBotAuth(request: RequestLike, options: VerifyWebBotAuthOptions): Promise<VerifiedWebBotSigner[]>;
 export interface VerifiedSignatureDirectory {
@@ -151,11 +157,13 @@ export interface VerifiedSignatureDirectory {
 }
 /**
  * Verify a key directory response (wba-profile.mdx "Key directories", WBA
- * Appendix B.1). The response must be signed once per key, each signature
- * covering `"@authority";req` and `content-digest` with `created`, `expires`,
- * the key's thumbprint as `keyid` and `tag="http-message-signatures-directory"`,
- * and verifying under the key the directory itself provides. An unsigned
- * directory is a discovery failure.
+ * Appendix B.1). The response must be signed once per usable key, each
+ * signature covering `"@authority";req` and `content-digest` with `created`,
+ * `expires`, the key's thumbprint as `keyid` and
+ * `tag="http-message-signatures-directory"`, and verifying under the key the
+ * directory itself provides. Keys the profile cannot use, and their
+ * signatures, are ignored. An unsigned directory, or one without a usable
+ * key, is a discovery failure.
  */
 export declare function verifyKeyDirectory(response: ResponseLike, now?: number, options?: {
     allowTestKeys?: boolean;

package/dist/lib/signing/web-bot-auth.js

@@ -70,8 +70,9 @@ const WEB_BOT_AUTH_PROFILE = "web-bot-auth";
 const WEB_BOT_AUTH_DRAFT_REVISION = "draft-ietf-webbotauth-httpsig-protocol-00";
 const SIGNATURE_DIRECTORY_PATH = "/.well-known/http-message-signatures-directory";
 const SIGNATURE_DIRECTORY_MEDIA_TYPE = "application/http-message-signatures-directory+json";
-const WEB_BOT_AUTH_ALGORITHMS = Object.freeze(["ed25519", "rsa-pss-sha512"]);
+const WEB_BOT_AUTH_ALGORITHMS = Object.freeze(["ed25519"]);
 const DIRECTORY_TAG = "http-message-signatures-directory";
+const PRIVATE_JWK_MEMBERS = /* @__PURE__ */ new Set(["d", "p", "q", "dp", "dq", "qi", "oth", "k"]);
 const CLOCK_SKEW_SECONDS = 60;
 const MAX_LIFETIME_SECONDS = 300;
 const REQUIRED_PARAMETERS = ["created", "expires", "nonce", "keyid", "alg", "tag"];
@@ -182,26 +183,37 @@ function jwkThumbprint(jwk) {
   else return denied("unsupported_key");
   return (0, import_crypto.createHash)("sha256").update(JSON.stringify(fields)).digest("base64url");
 }
-function algorithm(jwk) {
-  if (jwk.kty === "OKP" && jwk.crv === "Ed25519") return "ed25519";
-  if (jwk.kty === "RSA" && typeof jwk.n === "string" && jwk.e === "AQAB") {
-    const bytes = Buffer.from(jwk.n, "base64url").length;
-    if (bytes >= 256 && bytes <= 512) return "rsa-pss-sha512";
+function keyAlgorithm(jwk) {
+  return jwk.kty === "OKP" && jwk.crv === "Ed25519" ? "ed25519" : void 0;
+}
+function importable(jwk) {
+  try {
+    (0, import_crypto2.jwkToPublicKey)(jwk);
+    return true;
+  } catch {
+    return false;
   }
-  return denied("unsupported_key");
+}
+function algorithm(jwk) {
+  return keyAlgorithm(jwk) ?? denied("unsupported_key");
 }
 function signingAlgorithm(jwk) {
   try {
     return algorithm(jwk);
   } catch {
-    throw new TypeError(
-      "Web Bot Auth signs with Ed25519 or RSA-PSS-SHA512 (2048-4096 bit, e=65537) keys only; ES256 remains on the AdCP RFC 9421 profile"
-    );
+    throw new TypeError("Web Bot Auth signs with Ed25519 keys only; ES256 remains on the AdCP RFC 9421 profile");
   }
 }
 function assertWebBotAuthSigningKey(key) {
   signingAlgorithm("privateKey" in key ? key.privateKey : key.publicKey);
 }
+function signingOrigin(value) {
+  try {
+    return receivedAgentOrigin((0, import_canonicalize.canonicalAgentOrigin)(value));
+  } catch {
+    throw new TypeError("Web Bot Auth signs as an https origin only (WBA section 5.2.1)");
+  }
+}
 function inputs(headers, limit) {
   const members = dictionary((0, import_canonicalize2.getHeaderValue)(headers, "signature-input"), "Signature-Input");
   if (members.size > limit) bad("signature_input");
@@ -214,6 +226,7 @@ function inputs(headers, limit) {
   });
 }
 function receivedAgentOrigin(value) {
+  if (!value.startsWith("https://")) return denied("agent_origin");
   try {
     (0, import_select_agent.canonicalAgentUrl)(value);
     const origin = (0, import_canonicalize.canonicalAgentOrigin)(value);
@@ -436,8 +449,10 @@ async function verifyWebBotAuth(request, options) {
       if (!(member2[0] instanceof ArrayBuffer) || member2[1].size !== 0) bad("signature");
     for (const member2 of agents?.values() ?? []) if (typeof member2[0] !== "string") bad("signature_agent");
     if (!inputMembers || !signatureMembers) return denied("headers_missing");
-    if (inputMembers.size !== 1 || signatureMembers.size !== 1) denied("signature_count");
-    label = inputMembers.keys().next().value;
+    const tagged = [...inputMembers].filter(([, member2]) => member2[1].get("tag") === WEB_BOT_AUTH_PROFILE);
+    if (tagged.length === 0) denied("profile");
+    if (tagged.length > 1) denied("signature_count");
+    label = tagged[0][0];
     if (!signatureMembers.has(label)) denied("signature_label");
     try {
       (0, import_parser.parseSignature)(signatureHeader, label, "rfc8941-base64");
@@ -450,7 +465,6 @@ async function verifyWebBotAuth(request, options) {
     } catch {
       return denied("parameters");
     }
-    if (input.params.tag !== WEB_BOT_AUTH_PROFILE) denied("profile");
     if (!agents || agents.size !== 1) denied(agents ? "agent_count" : "agent_missing");
     const agentMember = `signature-agent;key="${label}"`;
     const agentComponents = input.components.filter((c) => c.startsWith("signature-agent;"));
@@ -458,7 +472,7 @@ async function verifyWebBotAuth(request, options) {
     const member = agents.get(label);
     if (!member) denied("agent_not_covered");
     const type = member[1].get("type");
-    if (type !== void 0 && type !== "directory") denied("agent_type");
+    if (type !== void 0 && String(type) !== "directory") denied("agent_type");
     const origin = receivedAgentOrigin(member[0]);
     const { created, expires, nonce, keyid, alg } = input.params;
     if ([created, expires, nonce, keyid, alg].some((value) => value === void 0)) denied("parameters_missing");
@@ -582,25 +596,26 @@ async function verifyKeyDirectory(response, now = Date.now() / 1e3, options = {}
     let expires = Infinity;
     for (const raw of document.keys) {
       if (!raw || typeof raw !== "object") denied("directory_key");
+      if (Object.keys(raw).some((k) => PRIVATE_JWK_MEMBERS.has(k.toLowerCase()) || k.startsWith("_private")))
+        denied("directory_key");
+      if (!keyAlgorithm(raw) || !importable(raw)) continue;
       const thumbprint = jwkThumbprint(raw);
       const key = { ...raw, kid: raw.kid ?? thumbprint };
-      if (key.kid !== thumbprint || kids.has(key.kid) || key.d !== void 0 || Object.keys(key).some((k) => k.startsWith("_private")) || key.adcp_use !== void 0 || !testKeysAllowed(options.allowTestKeys) && TEST_KIDS.has(key.kid))
+      if (key.kid !== thumbprint || kids.has(key.kid) || key.adcp_use !== void 0 || !testKeysAllowed(options.allowTestKeys) && TEST_KIDS.has(key.kid))
         denied("directory_key");
-      algorithm(key);
       kids.add(key.kid);
-      keys.push(key);
       const proof = signatures.find((input) => input.params.keyid === key.kid && input.params.tag === DIRECTORY_TAG);
       if (!proof || !proof.components.includes("@authority;req") || !proof.components.includes("content-digest") || !Number.isSafeInteger(proof.params.created) || !Number.isSafeInteger(proof.params.expires) || proof.params.expires <= now || proof.params.expires <= proof.params.created)
-        denied("directory_proof");
+        continue;
       const proofComponents = [(0, import_http_message_sig.component)("@authority", { req: true }), (0, import_http_message_sig.component)("content-digest")];
       let covered;
       try {
         covered = proof.components.map(componentDescriptor);
       } catch {
-        return denied("directory_proof");
+        continue;
       }
       const requestHeaders = response.request.headers ?? {};
-      await verifyWithLibrary(
+      const proven = await verifyWithLibrary(
         {
           kind: "response",
           status: response.status,
@@ -626,9 +641,18 @@ async function verifyKeyDirectory(response, now = Date.now() / 1e3, options = {}
         // The library rejects a proof whose `created` is in the future (beyond skew).
         { requiredComponents: proofComponents, requiredParameters: ["created", "expires", "keyid", "tag"], now },
         async () => keyVerifier(key)
+      ).then(
+        () => true,
+        (error) => {
+          if (error instanceof WebBotAuthError) return false;
+          throw error;
+        }
       );
+      if (!proven) continue;
+      keys.push(key);
       expires = Math.min(expires, proof.params.expires);
     }
+    if (!keys.length) denied("directory_keys");
     return { keys, expires, signed: true, proof: response };
   } catch (error) {
     if (error instanceof WebBotAuthError) {
@@ -758,7 +782,7 @@ async function signWebBotAuth(request, key, options) {
     throw new TypeError(
       "Web Bot Auth relays were removed from the profile (adcp#7894): an intermediary signs as itself with one signature"
     );
-  const origin = (0, import_canonicalize.canonicalAgentOrigin)(options.origin);
+  const origin = signingOrigin(options.origin);
   const label = options.label ?? "sig1";
   if (!/^[a-z][a-z0-9_.*-]*$/.test(label)) throw new TypeError("Invalid signature label");
   const jwk = "privateKey" in key ? key.privateKey : key.publicKey;
@@ -813,7 +837,7 @@ async function signWebBotAuth(request, key, options) {
   return headers;
 }
 async function createSignedSignatureDirectory(originUrl, signingKeys, options = {}) {
-  const origin = (0, import_canonicalize.canonicalAgentOrigin)(originUrl);
+  const origin = signingOrigin(originUrl);
   const now = Math.floor((options.now ?? (() => Date.now() / 1e3))());
   const lifetime = options.lifetimeSeconds ?? 86400;
   if (!Number.isFinite(now) || !Number.isSafeInteger(lifetime) || lifetime < 1 || !Number.isSafeInteger(now + lifetime))
@@ -822,12 +846,7 @@ async function createSignedSignatureDirectory(originUrl, signingKeys, options =
   const keys = signingKeys.map((key) => {
     const jwk = "privateKey" in key ? key.privateKey : key.publicKey;
     signingAlgorithm(jwk);
-    return {
-      kty: jwk.kty,
-      ...jwk.kty === "RSA" ? { n: jwk.n, e: jwk.e } : { crv: jwk.crv, x: jwk.x },
-      kid: jwkThumbprint(jwk),
-      use: "sig"
-    };
+    return { kty: jwk.kty, crv: jwk.crv, x: jwk.x, kid: jwkThumbprint(jwk), use: "sig" };
   });
   if (new Set(keys.map((k) => k.kid)).size !== keys.length) throw new TypeError("Duplicate directory key");
   const body = JSON.stringify({ keys });
@@ -873,6 +892,7 @@ async function createSignedSignatureDirectory(originUrl, signingKeys, options =
 }
 function createWebBotAuthFetch(upstream, key, options) {
   assertWebBotAuthSigningKey(key);
+  signingOrigin(options.origin);
   return async (input, init) => {
     const url = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
     if (options.shouldSign && !options.shouldSign(url, init)) return upstream(input, init);

package/dist/lib/signing/web-bot-auth.mjs

@@ -16,7 +16,7 @@ import { canonicalAgentUrl } from "./agent-resolver/select-agent.mjs";
 import { parseStrictJson } from "./agent-resolver/strict-json.mjs";
 import { getHeaderValue } from "./canonicalize.mjs";
 import { computeContentDigest, contentDigestMatches, contentDigestUsesEncoding } from "./content-digest.mjs";
-import { signWithPrivateJwkAsync, verifySignatureAsync } from "./crypto.mjs";
+import { jwkToPublicKey, signWithPrivateJwkAsync, verifySignatureAsync } from "./crypto.mjs";
 import {
   parseSignature,
   parseSignatureInputMember,
@@ -26,8 +26,9 @@ const WEB_BOT_AUTH_PROFILE = "web-bot-auth";
 const WEB_BOT_AUTH_DRAFT_REVISION = "draft-ietf-webbotauth-httpsig-protocol-00";
 const SIGNATURE_DIRECTORY_PATH = "/.well-known/http-message-signatures-directory";
 const SIGNATURE_DIRECTORY_MEDIA_TYPE = "application/http-message-signatures-directory+json";
-const WEB_BOT_AUTH_ALGORITHMS = Object.freeze(["ed25519", "rsa-pss-sha512"]);
+const WEB_BOT_AUTH_ALGORITHMS = Object.freeze(["ed25519"]);
 const DIRECTORY_TAG = "http-message-signatures-directory";
+const PRIVATE_JWK_MEMBERS = /* @__PURE__ */ new Set(["d", "p", "q", "dp", "dq", "qi", "oth", "k"]);
 const CLOCK_SKEW_SECONDS = 60;
 const MAX_LIFETIME_SECONDS = 300;
 const REQUIRED_PARAMETERS = ["created", "expires", "nonce", "keyid", "alg", "tag"];
@@ -138,26 +139,37 @@ function jwkThumbprint(jwk) {
   else return denied("unsupported_key");
   return createHash("sha256").update(JSON.stringify(fields)).digest("base64url");
 }
-function algorithm(jwk) {
-  if (jwk.kty === "OKP" && jwk.crv === "Ed25519") return "ed25519";
-  if (jwk.kty === "RSA" && typeof jwk.n === "string" && jwk.e === "AQAB") {
-    const bytes = Buffer.from(jwk.n, "base64url").length;
-    if (bytes >= 256 && bytes <= 512) return "rsa-pss-sha512";
+function keyAlgorithm(jwk) {
+  return jwk.kty === "OKP" && jwk.crv === "Ed25519" ? "ed25519" : void 0;
+}
+function importable(jwk) {
+  try {
+    jwkToPublicKey(jwk);
+    return true;
+  } catch {
+    return false;
   }
-  return denied("unsupported_key");
+}
+function algorithm(jwk) {
+  return keyAlgorithm(jwk) ?? denied("unsupported_key");
 }
 function signingAlgorithm(jwk) {
   try {
     return algorithm(jwk);
   } catch {
-    throw new TypeError(
-      "Web Bot Auth signs with Ed25519 or RSA-PSS-SHA512 (2048-4096 bit, e=65537) keys only; ES256 remains on the AdCP RFC 9421 profile"
-    );
+    throw new TypeError("Web Bot Auth signs with Ed25519 keys only; ES256 remains on the AdCP RFC 9421 profile");
   }
 }
 function assertWebBotAuthSigningKey(key) {
   signingAlgorithm("privateKey" in key ? key.privateKey : key.publicKey);
 }
+function signingOrigin(value) {
+  try {
+    return receivedAgentOrigin(canonicalAgentOrigin(value));
+  } catch {
+    throw new TypeError("Web Bot Auth signs as an https origin only (WBA section 5.2.1)");
+  }
+}
 function inputs(headers, limit) {
   const members = dictionary(getHeaderValue(headers, "signature-input"), "Signature-Input");
   if (members.size > limit) bad("signature_input");
@@ -170,6 +182,7 @@ function inputs(headers, limit) {
   });
 }
 function receivedAgentOrigin(value) {
+  if (!value.startsWith("https://")) return denied("agent_origin");
   try {
     canonicalAgentUrl(value);
     const origin = canonicalAgentOrigin(value);
@@ -392,8 +405,10 @@ async function verifyWebBotAuth(request, options) {
       if (!(member2[0] instanceof ArrayBuffer) || member2[1].size !== 0) bad("signature");
     for (const member2 of agents?.values() ?? []) if (typeof member2[0] !== "string") bad("signature_agent");
     if (!inputMembers || !signatureMembers) return denied("headers_missing");
-    if (inputMembers.size !== 1 || signatureMembers.size !== 1) denied("signature_count");
-    label = inputMembers.keys().next().value;
+    const tagged = [...inputMembers].filter(([, member2]) => member2[1].get("tag") === WEB_BOT_AUTH_PROFILE);
+    if (tagged.length === 0) denied("profile");
+    if (tagged.length > 1) denied("signature_count");
+    label = tagged[0][0];
     if (!signatureMembers.has(label)) denied("signature_label");
     try {
       parseSignature(signatureHeader, label, "rfc8941-base64");
@@ -406,7 +421,6 @@ async function verifyWebBotAuth(request, options) {
     } catch {
       return denied("parameters");
     }
-    if (input.params.tag !== WEB_BOT_AUTH_PROFILE) denied("profile");
     if (!agents || agents.size !== 1) denied(agents ? "agent_count" : "agent_missing");
     const agentMember = `signature-agent;key="${label}"`;
     const agentComponents = input.components.filter((c) => c.startsWith("signature-agent;"));
@@ -414,7 +428,7 @@ async function verifyWebBotAuth(request, options) {
     const member = agents.get(label);
     if (!member) denied("agent_not_covered");
     const type = member[1].get("type");
-    if (type !== void 0 && type !== "directory") denied("agent_type");
+    if (type !== void 0 && String(type) !== "directory") denied("agent_type");
     const origin = receivedAgentOrigin(member[0]);
     const { created, expires, nonce, keyid, alg } = input.params;
     if ([created, expires, nonce, keyid, alg].some((value) => value === void 0)) denied("parameters_missing");
@@ -538,25 +552,26 @@ async function verifyKeyDirectory(response, now = Date.now() / 1e3, options = {}
     let expires = Infinity;
     for (const raw of document.keys) {
       if (!raw || typeof raw !== "object") denied("directory_key");
+      if (Object.keys(raw).some((k) => PRIVATE_JWK_MEMBERS.has(k.toLowerCase()) || k.startsWith("_private")))
+        denied("directory_key");
+      if (!keyAlgorithm(raw) || !importable(raw)) continue;
       const thumbprint = jwkThumbprint(raw);
       const key = { ...raw, kid: raw.kid ?? thumbprint };
-      if (key.kid !== thumbprint || kids.has(key.kid) || key.d !== void 0 || Object.keys(key).some((k) => k.startsWith("_private")) || key.adcp_use !== void 0 || !testKeysAllowed(options.allowTestKeys) && TEST_KIDS.has(key.kid))
+      if (key.kid !== thumbprint || kids.has(key.kid) || key.adcp_use !== void 0 || !testKeysAllowed(options.allowTestKeys) && TEST_KIDS.has(key.kid))
         denied("directory_key");
-      algorithm(key);
       kids.add(key.kid);
-      keys.push(key);
       const proof = signatures.find((input) => input.params.keyid === key.kid && input.params.tag === DIRECTORY_TAG);
       if (!proof || !proof.components.includes("@authority;req") || !proof.components.includes("content-digest") || !Number.isSafeInteger(proof.params.created) || !Number.isSafeInteger(proof.params.expires) || proof.params.expires <= now || proof.params.expires <= proof.params.created)
-        denied("directory_proof");
+        continue;
       const proofComponents = [component("@authority", { req: true }), component("content-digest")];
       let covered;
       try {
         covered = proof.components.map(componentDescriptor);
       } catch {
-        return denied("directory_proof");
+        continue;
       }
       const requestHeaders = response.request.headers ?? {};
-      await verifyWithLibrary(
+      const proven = await verifyWithLibrary(
         {
           kind: "response",
           status: response.status,
@@ -582,9 +597,18 @@ async function verifyKeyDirectory(response, now = Date.now() / 1e3, options = {}
         // The library rejects a proof whose `created` is in the future (beyond skew).
         { requiredComponents: proofComponents, requiredParameters: ["created", "expires", "keyid", "tag"], now },
         async () => keyVerifier(key)
+      ).then(
+        () => true,
+        (error) => {
+          if (error instanceof WebBotAuthError) return false;
+          throw error;
+        }
       );
+      if (!proven) continue;
+      keys.push(key);
       expires = Math.min(expires, proof.params.expires);
     }
+    if (!keys.length) denied("directory_keys");
     return { keys, expires, signed: true, proof: response };
   } catch (error) {
     if (error instanceof WebBotAuthError) {
@@ -714,7 +738,7 @@ async function signWebBotAuth(request, key, options) {
     throw new TypeError(
       "Web Bot Auth relays were removed from the profile (adcp#7894): an intermediary signs as itself with one signature"
     );
-  const origin = canonicalAgentOrigin(options.origin);
+  const origin = signingOrigin(options.origin);
   const label = options.label ?? "sig1";
   if (!/^[a-z][a-z0-9_.*-]*$/.test(label)) throw new TypeError("Invalid signature label");
   const jwk = "privateKey" in key ? key.privateKey : key.publicKey;
@@ -769,7 +793,7 @@ async function signWebBotAuth(request, key, options) {
   return headers;
 }
 async function createSignedSignatureDirectory(originUrl, signingKeys, options = {}) {
-  const origin = canonicalAgentOrigin(originUrl);
+  const origin = signingOrigin(originUrl);
   const now = Math.floor((options.now ?? (() => Date.now() / 1e3))());
   const lifetime = options.lifetimeSeconds ?? 86400;
   if (!Number.isFinite(now) || !Number.isSafeInteger(lifetime) || lifetime < 1 || !Number.isSafeInteger(now + lifetime))
@@ -778,12 +802,7 @@ async function createSignedSignatureDirectory(originUrl, signingKeys, options =
   const keys = signingKeys.map((key) => {
     const jwk = "privateKey" in key ? key.privateKey : key.publicKey;
     signingAlgorithm(jwk);
-    return {
-      kty: jwk.kty,
-      ...jwk.kty === "RSA" ? { n: jwk.n, e: jwk.e } : { crv: jwk.crv, x: jwk.x },
-      kid: jwkThumbprint(jwk),
-      use: "sig"
-    };
+    return { kty: jwk.kty, crv: jwk.crv, x: jwk.x, kid: jwkThumbprint(jwk), use: "sig" };
   });
   if (new Set(keys.map((k) => k.kid)).size !== keys.length) throw new TypeError("Duplicate directory key");
   const body = JSON.stringify({ keys });
@@ -829,6 +848,7 @@ async function createSignedSignatureDirectory(originUrl, signingKeys, options =
 }
 function createWebBotAuthFetch(upstream, key, options) {
   assertWebBotAuthSigningKey(key);
+  signingOrigin(options.origin);
   return async (input, init) => {
     const url = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
     if (options.shouldSign && !options.shouldSign(url, init)) return upstream(input, init);

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.9";
+export declare const RUNNER_CAPABILITY_VERSION = "16.1.0";
 /** 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.9";
+export declare const RUNNER_CAPABILITY_VERSION = "16.1.0";
 /** True when a failed validation contributes to the owning step's grade. */
 export declare function validationFailsStep(result: ValidationResult): boolean;
 /**

package/dist/lib/v2/projection/catalog.d.mts

@@ -70,6 +70,10 @@ export interface V1FormatDefinition {
         required?: boolean;
         asset_type?: string;
         requirements?: Record<string, unknown>;
+        /** Reference-catalog extension used to match pixel-tracker slots. */
+        event?: string;
+        /** Caller-defined tracker extension; required to match a custom event. */
+        custom_event_name?: string;
     }>;
     /**
      * v2 canonical projection. Always object-shaped per
@@ -87,6 +91,12 @@ interface CatalogIndex {
     byUniqueId: Map<string, V1FormatDefinition | null>;
     entries: V1FormatDefinition[];
 }
+/**
+ * True when `agentUrl` names the AAO reference format agent (including its
+ * folded historical hosts). Ids under any other agent URL belong to that
+ * agent, so AAO naming conventions say nothing about what they mean.
+ */
+export declare function isAaoAgentUrl(agentUrl: string): boolean;
 /**
  * Load the catalog from a known path. Resolution order:
  *

package/dist/lib/v2/projection/catalog.d.ts

@@ -70,6 +70,10 @@ export interface V1FormatDefinition {
         required?: boolean;
         asset_type?: string;
         requirements?: Record<string, unknown>;
+        /** Reference-catalog extension used to match pixel-tracker slots. */
+        event?: string;
+        /** Caller-defined tracker extension; required to match a custom event. */
+        custom_event_name?: string;
     }>;
     /**
      * v2 canonical projection. Always object-shaped per
@@ -87,6 +91,12 @@ interface CatalogIndex {
     byUniqueId: Map<string, V1FormatDefinition | null>;
     entries: V1FormatDefinition[];
 }
+/**
+ * True when `agentUrl` names the AAO reference format agent (including its
+ * folded historical hosts). Ids under any other agent URL belong to that
+ * agent, so AAO naming conventions say nothing about what they mean.
+ */
+export declare function isAaoAgentUrl(agentUrl: string): boolean;
 /**
  * Load the catalog from a known path. Resolution order:
  *

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

@@ -30,6 +30,7 @@ var catalog_exports = {};
 __export(catalog_exports, {
   _resetCatalogCache: () => _resetCatalogCache,
   findCatalogEntryByCanonicalAndSize: () => findCatalogEntryByCanonicalAndSize,
+  isAaoAgentUrl: () => isAaoAgentUrl,
   loadCatalog: () => loadCatalog,
   lookupUniqueV1FormatById: () => lookupUniqueV1FormatById,
   lookupV1Format: () => lookupV1Format,
@@ -52,6 +53,9 @@ function normalizeAgentUrl(u) {
   if (canonical === null) return void 0;
   return AAO_LEGACY_AGENT_URL_ALIASES.has(canonical) ? import_constants.AAO_CANONICAL_AGENT_URL : canonical;
 }
+function isAaoAgentUrl(agentUrl) {
+  return normalizeAgentUrl(agentUrl) === import_constants.AAO_CANONICAL_AGENT_URL;
+}
 function indexKey(agentUrl, id) {
   const normalized = normalizeAgentUrl(agentUrl);
   return normalized === void 0 ? void 0 : `${normalized}::${id}`;
@@ -136,6 +140,7 @@ function findCatalogEntryByCanonicalAndSize(canonical, width, height, agentUrl,
 0 && (module.exports = {
   _resetCatalogCache,
   findCatalogEntryByCanonicalAndSize,
+  isAaoAgentUrl,
   loadCatalog,
   lookupUniqueV1FormatById,
   lookupV1Format,

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

@@ -19,6 +19,9 @@ function normalizeAgentUrl(u) {
   if (canonical === null) return void 0;
   return AAO_LEGACY_AGENT_URL_ALIASES.has(canonical) ? AAO_CANONICAL_AGENT_URL : canonical;
 }
+function isAaoAgentUrl(agentUrl) {
+  return normalizeAgentUrl(agentUrl) === AAO_CANONICAL_AGENT_URL;
+}
 function indexKey(agentUrl, id) {
   const normalized = normalizeAgentUrl(agentUrl);
   return normalized === void 0 ? void 0 : `${normalized}::${id}`;
@@ -102,6 +105,7 @@ function findCatalogEntryByCanonicalAndSize(canonical, width, height, agentUrl,
 export {
   _resetCatalogCache,
   findCatalogEntryByCanonicalAndSize,
+  isAaoAgentUrl,
   loadCatalog,
   lookupUniqueV1FormatById,
   lookupV1Format,

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

@@ -4,6 +4,7 @@ import type { CanonicalFormatLegacyResolver } from './v2-to-v1.mjs';
 import type { CanonicalFormatKind, ProjectionDiagnostic, V1FormatId } from './types.mjs';
 import type { CanonicalFormatDeclaration } from './legacy-metadata.mjs';
 import type { UndeclaredFormatOptionSelector } from './legacy-routes.mjs';
+import { type V1FormatDefinition } from './catalog.mjs';
 type DistributiveOmit<T, K extends PropertyKey> = T extends unknown ? Omit<T, Extract<keyof T, K>> : never;
 /**
  * Primary SDK creative shape. Spell out the named fields rather than using
@@ -276,15 +277,20 @@ export declare class CreativeFormatCapabilityError extends Error {
     readonly code = "ADCP_CREATIVE_FORMAT_CAPABILITY_CONTRADICTION";
     constructor(message: string);
 }
-export declare function projectCreativeForDelivery<T extends CreativeAsset>(creative: T, selectorContainer: CreativeFormatSelectorContainer, wireMode?: 'canonical', operation?: string, legacyFormatConverter?: LegacyFormatConverter, canonicalFormatLegacyResolver?: CanonicalFormatLegacyResolver): CanonicalProjectedCreative<T>;
-export declare function projectCreativeForDelivery<T extends CreativeAsset>(creative: T, selectorContainer: CreativeFormatSelectorContainer, wireMode: 'legacy' | 'unknown', operation?: string, legacyFormatConverter?: LegacyFormatConverter, canonicalFormatLegacyResolver?: CanonicalFormatLegacyResolver): LegacyProjectedCreative<T>;
-export declare function projectCreativeForDelivery<T extends CreativeAsset>(creative: T, selectorContainer: CreativeFormatSelectorContainer, wireMode: CreativeFormatWireMode, operation?: string, legacyFormatConverter?: LegacyFormatConverter, canonicalFormatLegacyResolver?: CanonicalFormatLegacyResolver): CanonicalProjectedCreative<T> | LegacyProjectedCreative<T>;
-export declare function projectMediaBuyCreativesForDelivery<T>(request: T, wireMode: 'canonical', operation?: 'create_media_buy' | 'update_media_buy', legacyFormatConverter?: LegacyFormatConverter, canonicalFormatLegacyResolver?: CanonicalFormatLegacyResolver): ProjectedMediaBuyCreativeRequest<T, 'canonical'>;
-export declare function projectMediaBuyCreativesForDelivery<T>(request: T, wireMode: 'legacy' | 'unknown', operation?: 'create_media_buy' | 'update_media_buy', legacyFormatConverter?: LegacyFormatConverter, canonicalFormatLegacyResolver?: CanonicalFormatLegacyResolver): ProjectedMediaBuyCreativeRequest<T, 'legacy'>;
-export declare function projectMediaBuyCreativesForDelivery<T>(request: T, wireMode: CreativeFormatWireMode, operation?: 'create_media_buy' | 'update_media_buy', legacyFormatConverter?: LegacyFormatConverter, canonicalFormatLegacyResolver?: CanonicalFormatLegacyResolver): ProjectedMediaBuyCreativeRequest<T, 'canonical'> | ProjectedMediaBuyCreativeRequest<T, 'legacy'>;
-export declare function projectSyncCreativesForDelivery<T>(request: T, selectorContainers: ReadonlyArray<CreativeFormatSelectorContainer>, wireMode: 'canonical', legacyFormatConverter?: LegacyFormatConverter, canonicalFormatLegacyResolver?: CanonicalFormatLegacyResolver): ProjectedSyncCreativeRequest<T, 'canonical'>;
-export declare function projectSyncCreativesForDelivery<T>(request: T, selectorContainers: ReadonlyArray<CreativeFormatSelectorContainer>, wireMode: 'legacy' | 'unknown', legacyFormatConverter?: LegacyFormatConverter, canonicalFormatLegacyResolver?: CanonicalFormatLegacyResolver): ProjectedSyncCreativeRequest<T, 'legacy'>;
-export declare function projectSyncCreativesForDelivery<T>(request: T, selectorContainers: ReadonlyArray<CreativeFormatSelectorContainer>, wireMode: CreativeFormatWireMode, legacyFormatConverter?: LegacyFormatConverter, canonicalFormatLegacyResolver?: CanonicalFormatLegacyResolver): ProjectedSyncCreativeRequest<T, 'canonical'> | ProjectedSyncCreativeRequest<T, 'legacy'>;
+/**
+ * Project identity and asset keys for the selected wire mode. Optional
+ * `legacyFormatDefinitions` override bundled definitions by exact format owner
+ * and ID; ambiguous definitions leave asset keys unchanged.
+ */
+export declare function projectCreativeForDelivery<T extends CreativeAsset>(creative: T, selectorContainer: CreativeFormatSelectorContainer, wireMode?: 'canonical', operation?: string, legacyFormatConverter?: LegacyFormatConverter, canonicalFormatLegacyResolver?: CanonicalFormatLegacyResolver, legacyFormatDefinitions?: readonly V1FormatDefinition[]): CanonicalProjectedCreative<T>;
+export declare function projectCreativeForDelivery<T extends CreativeAsset>(creative: T, selectorContainer: CreativeFormatSelectorContainer, wireMode: 'legacy' | 'unknown', operation?: string, legacyFormatConverter?: LegacyFormatConverter, canonicalFormatLegacyResolver?: CanonicalFormatLegacyResolver, legacyFormatDefinitions?: readonly V1FormatDefinition[]): LegacyProjectedCreative<T>;
+export declare function projectCreativeForDelivery<T extends CreativeAsset>(creative: T, selectorContainer: CreativeFormatSelectorContainer, wireMode: CreativeFormatWireMode, operation?: string, legacyFormatConverter?: LegacyFormatConverter, canonicalFormatLegacyResolver?: CanonicalFormatLegacyResolver, legacyFormatDefinitions?: readonly V1FormatDefinition[]): CanonicalProjectedCreative<T> | LegacyProjectedCreative<T>;
+export declare function projectMediaBuyCreativesForDelivery<T>(request: T, wireMode: 'canonical', operation?: 'create_media_buy' | 'update_media_buy', legacyFormatConverter?: LegacyFormatConverter, canonicalFormatLegacyResolver?: CanonicalFormatLegacyResolver, legacyFormatDefinitions?: readonly V1FormatDefinition[]): ProjectedMediaBuyCreativeRequest<T, 'canonical'>;
+export declare function projectMediaBuyCreativesForDelivery<T>(request: T, wireMode: 'legacy' | 'unknown', operation?: 'create_media_buy' | 'update_media_buy', legacyFormatConverter?: LegacyFormatConverter, canonicalFormatLegacyResolver?: CanonicalFormatLegacyResolver, legacyFormatDefinitions?: readonly V1FormatDefinition[]): ProjectedMediaBuyCreativeRequest<T, 'legacy'>;
+export declare function projectMediaBuyCreativesForDelivery<T>(request: T, wireMode: CreativeFormatWireMode, operation?: 'create_media_buy' | 'update_media_buy', legacyFormatConverter?: LegacyFormatConverter, canonicalFormatLegacyResolver?: CanonicalFormatLegacyResolver, legacyFormatDefinitions?: readonly V1FormatDefinition[]): ProjectedMediaBuyCreativeRequest<T, 'canonical'> | ProjectedMediaBuyCreativeRequest<T, 'legacy'>;
+export declare function projectSyncCreativesForDelivery<T>(request: T, selectorContainers: ReadonlyArray<CreativeFormatSelectorContainer>, wireMode: 'canonical', legacyFormatConverter?: LegacyFormatConverter, canonicalFormatLegacyResolver?: CanonicalFormatLegacyResolver, legacyFormatDefinitions?: readonly V1FormatDefinition[]): ProjectedSyncCreativeRequest<T, 'canonical'>;
+export declare function projectSyncCreativesForDelivery<T>(request: T, selectorContainers: ReadonlyArray<CreativeFormatSelectorContainer>, wireMode: 'legacy' | 'unknown', legacyFormatConverter?: LegacyFormatConverter, canonicalFormatLegacyResolver?: CanonicalFormatLegacyResolver, legacyFormatDefinitions?: readonly V1FormatDefinition[]): ProjectedSyncCreativeRequest<T, 'legacy'>;
+export declare function projectSyncCreativesForDelivery<T>(request: T, selectorContainers: ReadonlyArray<CreativeFormatSelectorContainer>, wireMode: CreativeFormatWireMode, legacyFormatConverter?: LegacyFormatConverter, canonicalFormatLegacyResolver?: CanonicalFormatLegacyResolver, legacyFormatDefinitions?: readonly V1FormatDefinition[]): ProjectedSyncCreativeRequest<T, 'canonical'> | ProjectedSyncCreativeRequest<T, 'legacy'>;
 export type { UndeclaredFormatOptionSelector } from './legacy-routes.mjs';
 /**
  * Looks up a format option the SDK derived from a seller's legacy `format_ids`.