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

package/dist/lib/core/TaskExecutor.d.mts

@@ -95,6 +95,7 @@ interface WebhookManager {
     registerWebhook(agent: AgentConfig, taskId: string, webhookUrl: string): Promise<void>;
     processWebhook(token: string, body: any): Promise<void>;
 }
+type AdcpTaskStatusTool = 'get_task_status' | 'tasks_get' | 'tasks/get';
 /**
  * Core task execution engine that handles the conversation loop with agents
  */
@@ -210,6 +211,11 @@ export declare class TaskExecutor {
          * dispatches. Per-call options can override individual fields.
          */
         transport?: import('../protocols/index.mjs').TransportOptions;
+        /** Resolve the advertised AdCP work-status tool using the client's scoped discovery evidence. */
+        resolveTaskStatusTool?: (agent: AgentConfig, options: {
+            transport?: import('../protocols/index.mjs').TransportOptions;
+            signal?: AbortSignal;
+        }) => Promise<AdcpTaskStatusTool>;
     });
     /**
      * Access the governance middleware for direct outcome reporting (async tasks).
@@ -328,6 +334,7 @@ export declare class TaskExecutor {
      * Task tracking methods (PR #78)
      */
     listTasks(agent: AgentConfig, transport?: import('../protocols/index.mjs').TransportOptions): Promise<TaskInfo[]>;
+    private resolveTaskStatusTool;
     private getTaskStatusWithRawResponse;
     getTaskStatus(agent: AgentConfig, taskId: string, transport?: import('../protocols/index.mjs').TransportOptions, signal?: AbortSignal, wireOptions?: {
         wireAdcpVersion?: string;

package/dist/lib/core/TaskExecutor.d.ts

@@ -95,6 +95,7 @@ interface WebhookManager {
     registerWebhook(agent: AgentConfig, taskId: string, webhookUrl: string): Promise<void>;
     processWebhook(token: string, body: any): Promise<void>;
 }
+type AdcpTaskStatusTool = 'get_task_status' | 'tasks_get' | 'tasks/get';
 /**
  * Core task execution engine that handles the conversation loop with agents
  */
@@ -210,6 +211,11 @@ export declare class TaskExecutor {
          * dispatches. Per-call options can override individual fields.
          */
         transport?: import('../protocols').TransportOptions;
+        /** Resolve the advertised AdCP work-status tool using the client's scoped discovery evidence. */
+        resolveTaskStatusTool?: (agent: AgentConfig, options: {
+            transport?: import('../protocols').TransportOptions;
+            signal?: AbortSignal;
+        }) => Promise<AdcpTaskStatusTool>;
     });
     /**
      * Access the governance middleware for direct outcome reporting (async tasks).
@@ -328,6 +334,7 @@ export declare class TaskExecutor {
      * Task tracking methods (PR #78)
      */
     listTasks(agent: AgentConfig, transport?: import('../protocols').TransportOptions): Promise<TaskInfo[]>;
+    private resolveTaskStatusTool;
     private getTaskStatusWithRawResponse;
     getTaskStatus(agent: AgentConfig, taskId: string, transport?: import('../protocols').TransportOptions, signal?: AbortSignal, wireOptions?: {
         wireAdcpVersion?: string;

package/dist/lib/core/TaskExecutor.js

@@ -733,6 +733,8 @@ class TaskExecutor {
       status: args.status
     };
     const taskState = this.activeTasks.get(args.taskId);
+    const wireAdcpVersion = taskState?.wireAdcpVersion ?? this.config.wireAdcpVersion;
+    if (wireAdcpVersion !== void 0) meta.wireAdcpVersion = wireAdcpVersion;
     if (taskState?.serverVersion !== void 0) meta.serverVersion = taskState.serverVersion;
     if (taskState?.serverVersionSynthetic !== void 0) {
       meta.serverVersionSynthetic = taskState.serverVersionSynthetic;
@@ -826,6 +828,7 @@ class TaskExecutor {
     }
     const taskState = {
       taskId,
+      wireAdcpVersion: wireAdcpVersion ?? options.negotiatedAdcpVersion ?? options.selectedAdcpVersion,
       taskName,
       params,
       status: "pending",
@@ -1096,7 +1099,7 @@ class TaskExecutor {
         () => import_protocols.ProtocolClient.callTool(agent, taskName, dispatchParams, callOptions)
       );
       (0, import_abort.throwIfAborted)(postDispatchOptions.signal);
-      const respStatus = this.responseParser.getStatus(response);
+      const respStatus = this.responseParser.getStatus(response, taskName);
       taskState.serverTaskId = this.responseParser.getTaskId(response);
       await this.config.onActivity?.({
         type: "protocol_response",
@@ -1279,7 +1282,7 @@ class TaskExecutor {
     };
   }
   async handleAsyncResponse(agent, taskId, taskName, params, response, messages, inputHandler, options = {}, debugLogs = [], startTime = Date.now(), deferTerminalTaskStatus = false, persistPausedContinuation = true, serverVersion = "v3", deferredClientContext, requireDeferredSettlementResumeAuthorization = false, refinementServedVersion) {
-    const status = this.responseParser.getStatus(response);
+    const status = this.responseParser.getStatus(response, taskName);
     const serverTaskId = this.responseParser.getTaskId(response);
     const task = this.activeTasks.get(taskId);
     if (task && serverTaskId) task.serverTaskId = serverTaskId;
@@ -2531,8 +2534,15 @@ class TaskExecutor {
       }
     });
   }
-  async getTaskStatusWithRawResponse(agent, taskId, transport, signal, expectedTaskType, serverVersion, wireAdcpVersion, versionEnvelope, operationId) {
-    const toolName = agent.protocol === "mcp" ? "tasks_get" : "tasks/get";
+  async resolveTaskStatusTool(agent, transport, signal) {
+    if (this.config.resolveTaskStatusTool) {
+      return this.config.resolveTaskStatusTool(agent, { transport: transport ?? this.config.transport, signal });
+    }
+    return agent.protocol === "mcp" ? "tasks_get" : "tasks/get";
+  }
+  async getTaskStatusWithRawResponse(agent, taskId, transport, signal, expectedTaskType, serverVersion, wireAdcpVersion, versionEnvelope, operationId, pollingTool) {
+    const toolName = pollingTool ?? await this.resolveTaskStatusTool(agent, transport, signal);
+    (0, import_abort.throwIfAborted)(signal);
     const response = await import_protocols.ProtocolClient.callTool(
       agent,
       toolName,
@@ -2591,6 +2601,7 @@ class TaskExecutor {
     }
     const pollStartTime = Date.now();
     const correlationId = metadataTaskId ?? taskId;
+    let pollingTool;
     const withServerTaskId = (metadata) => ({
       ...metadata,
       serverTaskId: taskId
@@ -2631,6 +2642,7 @@ class TaskExecutor {
       let status;
       let rawResponse;
       try {
+        pollingTool ??= await this.resolveTaskStatusTool(agent, transportSnapshot, signal);
         const pollResult = await this.getTaskStatusWithRawResponse(
           agent,
           taskId,
@@ -2640,7 +2652,8 @@ class TaskExecutor {
           serverVersion,
           wireAdcpVersion,
           versionEnvelope,
-          metadataTaskId
+          metadataTaskId,
+          pollingTool
         );
         status = pollResult.task;
         rawResponse = pollResult.rawResponse;

package/dist/lib/core/TaskExecutor.mjs

@@ -719,6 +719,8 @@ class TaskExecutor {
       status: args.status
     };
     const taskState = this.activeTasks.get(args.taskId);
+    const wireAdcpVersion = taskState?.wireAdcpVersion ?? this.config.wireAdcpVersion;
+    if (wireAdcpVersion !== void 0) meta.wireAdcpVersion = wireAdcpVersion;
     if (taskState?.serverVersion !== void 0) meta.serverVersion = taskState.serverVersion;
     if (taskState?.serverVersionSynthetic !== void 0) {
       meta.serverVersionSynthetic = taskState.serverVersionSynthetic;
@@ -812,6 +814,7 @@ class TaskExecutor {
     }
     const taskState = {
       taskId,
+      wireAdcpVersion: wireAdcpVersion ?? options.negotiatedAdcpVersion ?? options.selectedAdcpVersion,
       taskName,
       params,
       status: "pending",
@@ -1082,7 +1085,7 @@ class TaskExecutor {
         () => ProtocolClient.callTool(agent, taskName, dispatchParams, callOptions)
       );
       throwIfAborted(postDispatchOptions.signal);
-      const respStatus = this.responseParser.getStatus(response);
+      const respStatus = this.responseParser.getStatus(response, taskName);
       taskState.serverTaskId = this.responseParser.getTaskId(response);
       await this.config.onActivity?.({
         type: "protocol_response",
@@ -1265,7 +1268,7 @@ class TaskExecutor {
     };
   }
   async handleAsyncResponse(agent, taskId, taskName, params, response, messages, inputHandler, options = {}, debugLogs = [], startTime = Date.now(), deferTerminalTaskStatus = false, persistPausedContinuation = true, serverVersion = "v3", deferredClientContext, requireDeferredSettlementResumeAuthorization = false, refinementServedVersion) {
-    const status = this.responseParser.getStatus(response);
+    const status = this.responseParser.getStatus(response, taskName);
     const serverTaskId = this.responseParser.getTaskId(response);
     const task = this.activeTasks.get(taskId);
     if (task && serverTaskId) task.serverTaskId = serverTaskId;
@@ -2517,8 +2520,15 @@ class TaskExecutor {
       }
     });
   }
-  async getTaskStatusWithRawResponse(agent, taskId, transport, signal, expectedTaskType, serverVersion, wireAdcpVersion, versionEnvelope, operationId) {
-    const toolName = agent.protocol === "mcp" ? "tasks_get" : "tasks/get";
+  async resolveTaskStatusTool(agent, transport, signal) {
+    if (this.config.resolveTaskStatusTool) {
+      return this.config.resolveTaskStatusTool(agent, { transport: transport ?? this.config.transport, signal });
+    }
+    return agent.protocol === "mcp" ? "tasks_get" : "tasks/get";
+  }
+  async getTaskStatusWithRawResponse(agent, taskId, transport, signal, expectedTaskType, serverVersion, wireAdcpVersion, versionEnvelope, operationId, pollingTool) {
+    const toolName = pollingTool ?? await this.resolveTaskStatusTool(agent, transport, signal);
+    throwIfAborted(signal);
     const response = await ProtocolClient.callTool(
       agent,
       toolName,
@@ -2577,6 +2587,7 @@ class TaskExecutor {
     }
     const pollStartTime = Date.now();
     const correlationId = metadataTaskId ?? taskId;
+    let pollingTool;
     const withServerTaskId = (metadata) => ({
       ...metadata,
       serverTaskId: taskId
@@ -2617,6 +2628,7 @@ class TaskExecutor {
       let status;
       let rawResponse;
       try {
+        pollingTool ??= await this.resolveTaskStatusTool(agent, transportSnapshot, signal);
         const pollResult = await this.getTaskStatusWithRawResponse(
           agent,
           taskId,
@@ -2626,7 +2638,8 @@ class TaskExecutor {
           serverVersion,
           wireAdcpVersion,
           versionEnvelope,
-          metadataTaskId
+          metadataTaskId,
+          pollingTool
         );
         status = pollResult.task;
         rawResponse = pollResult.rawResponse;

package/dist/lib/core/task-status.d.mts

@@ -31,3 +31,5 @@ export declare function extractAdcpTaskStatusFromPayload(payload: unknown): ADCP
  * back to the transport-layer status.
  */
 export declare function extractAdcpStatusFromA2aTaskResult(result: unknown): ADCPStatus | undefined;
+/** A status query describes another task; its status/error are data, not the query's lifecycle. */
+export declare function isTaskStatusResponse(value: unknown, toolName?: string): boolean;

package/dist/lib/core/task-status.d.ts

@@ -31,3 +31,5 @@ export declare function extractAdcpTaskStatusFromPayload(payload: unknown): ADCP
  * back to the transport-layer status.
  */
 export declare function extractAdcpStatusFromA2aTaskResult(result: unknown): ADCPStatus | undefined;
+/** A status query describes another task; its status/error are data, not the query's lifecycle. */
+export declare function isTaskStatusResponse(value: unknown, toolName?: string): boolean;

package/dist/lib/core/task-status.js

@@ -22,7 +22,8 @@ __export(task_status_exports, {
   TASK_ENVELOPE_FIELDS: () => TASK_ENVELOPE_FIELDS,
   extractAdcpStatusFromA2aTaskResult: () => extractAdcpStatusFromA2aTaskResult,
   extractAdcpTaskStatusFromPayload: () => extractAdcpTaskStatusFromPayload,
-  isAdcpStatus: () => isAdcpStatus
+  isAdcpStatus: () => isAdcpStatus,
+  isTaskStatusResponse: () => isTaskStatusResponse
 });
 module.exports = __toCommonJS(task_status_exports);
 var import_a2a_artifacts = require('../utils/a2a-artifacts.js');
@@ -80,11 +81,19 @@ function extractAdcpStatusFromA2aTaskResult(result) {
   const extracted = (0, import_a2a_artifacts.getLatestA2ADataPartFromTask)(result);
   return extractAdcpTaskStatusFromPayload(extracted?.data);
 }
+function isTaskStatusResponse(value, toolName) {
+  if (toolName !== "get_task_status" || !value || typeof value !== "object" || Array.isArray(value)) return false;
+  const record = value;
+  return ["task_id", "task_type", "protocol", "status", "created_at", "updated_at"].every(
+    (field) => typeof record[field] === "string"
+  ) && record.adcp_error === void 0 && record.errors === void 0;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ADCP_STATUS,
   TASK_ENVELOPE_FIELDS,
   extractAdcpStatusFromA2aTaskResult,
   extractAdcpTaskStatusFromPayload,
-  isAdcpStatus
+  isAdcpStatus,
+  isTaskStatusResponse
 });

package/dist/lib/core/task-status.mjs

@@ -53,10 +53,18 @@ function extractAdcpStatusFromA2aTaskResult(result) {
   const extracted = getLatestA2ADataPartFromTask(result);
   return extractAdcpTaskStatusFromPayload(extracted?.data);
 }
+function isTaskStatusResponse(value, toolName) {
+  if (toolName !== "get_task_status" || !value || typeof value !== "object" || Array.isArray(value)) return false;
+  const record = value;
+  return ["task_id", "task_type", "protocol", "status", "created_at", "updated_at"].every(
+    (field) => typeof record[field] === "string"
+  ) && record.adcp_error === void 0 && record.errors === void 0;
+}
 export {
   ADCP_STATUS,
   TASK_ENVELOPE_FIELDS,
   extractAdcpStatusFromA2aTaskResult,
   extractAdcpTaskStatusFromPayload,
-  isAdcpStatus
+  isAdcpStatus,
+  isTaskStatusResponse
 };

package/dist/lib/identity-3.3/trust.d.mts

@@ -149,10 +149,7 @@ export interface DemandGrantAuthorization {
 export interface DemandGrantOptions {
     evaluator: TrustEvaluator;
     now?: () => number;
-    /**
-     * Only evaluated for uncovered claims, never fetch failures, and never for a scope an
-     * `exclusive_grants: true` record names in any grant.
-     */
+    /** Only evaluated for uncovered claims against a record without `exclusive_grants: true`; never fetch failures. */
     sellerAuthorization?: (claim: DemandGrantClaim) => Promise<boolean>;
     /** Only for authoritative absence; never after a 200 or an exclusive record. */
     legacyAuthorization?: (claim: DemandGrantClaim) => Promise<boolean>;

package/dist/lib/identity-3.3/trust.d.ts

@@ -149,10 +149,7 @@ export interface DemandGrantAuthorization {
 export interface DemandGrantOptions {
     evaluator: TrustEvaluator;
     now?: () => number;
-    /**
-     * Only evaluated for uncovered claims, never fetch failures, and never for a scope an
-     * `exclusive_grants: true` record names in any grant.
-     */
+    /** Only evaluated for uncovered claims against a record without `exclusive_grants: true`; never fetch failures. */
     sellerAuthorization?: (claim: DemandGrantClaim) => Promise<boolean>;
     /** Only for authoritative absence; never after a 200 or an exclusive record. */
     legacyAuthorization?: (claim: DemandGrantClaim) => Promise<boolean>;

package/dist/lib/identity-3.3/trust.js

@@ -47,7 +47,7 @@ var import_etld = require('../signing/agent-resolver/etld.js');
 var import_strict_json = require('../signing/agent-resolver/strict-json.js');
 var import_tldts = require("tldts");
 var import_schemas = __toESM(require('./schemas.draft.js'));
-const ajv = new import_ajv.default({ strict: false, allErrors: false });
+const ajv = new import_ajv.default({ inlineRefs: false, strict: false, allErrors: false });
 (0, import_ajv_formats.default)(ajv);
 for (const schema of import_schemas.default) ajv.addSchema(schema);
 function validateIdentity33Schema(id, value) {
@@ -100,6 +100,13 @@ function failure(cause) {
   if (cause !== void 0) Object.defineProperty(error, "cause", { value: cause });
   throw error;
 }
+function claimRegistrableDomain(domain) {
+  try {
+    return (0, import_etld.eTldPlusOne)(domain);
+  } catch (cause) {
+    return failure(cause);
+  }
+}
 function validateTrustRecord(value) {
   if (!validateIdentity33Schema("trust/v1/trust", value)) failure();
   const record = value;
@@ -335,13 +342,16 @@ function authorityGroup(operator) {
   const provider = (0, import_tldts.parse)(operator).domain;
   return `private:${provider ?? operator}`;
 }
+const INTERMEDIARY_FETCH_CONCURRENCY = 8;
 function grantsScope(grant, scope) {
   return grant.scopes.some(
     (granted) => granted === "*" || granted === scope || granted === "adcp:all" && scope.startsWith("adcp:")
   );
 }
 function grantMatches(grant, target, claim, now) {
-  if (registrableGrantee(grant.grantee) !== target) return false;
+  return registrableGrantee(grant.grantee) === target && grantCovers(grant, claim, now);
+}
+function grantCovers(grant, claim, now) {
   if (!grantsScope(grant, claim.scope)) return false;
   if (grant.agents && !grant.agents.some((agent) => grantAgentOrigin(agent.url) === (0, import_canonicalize.canonicalAgentOrigin)(claim.signerOrigin)))
     return false;
@@ -358,7 +368,7 @@ async function authorizeDemandGrant(claim, options) {
   const now = (options.now ?? (() => Date.now() / 1e3))();
   const signer = await options.evaluator.match(claim.signerOrigin, "adcp:buying", claim.brand.countries);
   if (signer.agent.countries && !claim.brand.countries?.length) failure();
-  const brand = (0, import_etld.eTldPlusOne)(claim.brand.domain), account = (0, import_etld.eTldPlusOne)(claim.accountOperator), operator = signer.operator;
+  const brand = claimRegistrableDomain(claim.brand.domain), account = claimRegistrableDomain(claim.accountOperator), operator = signer.operator;
   const result = (source, chain, grants = []) => ({
     source,
     chain,
@@ -367,7 +377,6 @@ async function authorizeDemandGrant(claim, options) {
     ...grants.some((g) => g.valid_until) ? { expiresAt: Math.min(...grants.map((g) => g.valid_until ? Date.parse(g.valid_until) / 1e3 : Infinity)) } : {}
   });
   if (brand === operator && account === operator) return result("implicit", [brand]);
-  if (brand === operator && account !== operator) throw new IdentityAuthorizationError("grant_absent");
   let house;
   try {
     house = await options.resolveBrandHouse?.(claim.brand);
@@ -376,34 +385,45 @@ async function authorizeDemandGrant(claim, options) {
       throw cause;
     unavailable(cause);
   }
-  const authoritativeBrand = house ? (0, import_etld.eTldPlusOne)(house.domain) : brand;
-  if (authoritativeBrand === operator && account === operator) return result("implicit", [brand, operator]);
+  const authoritativeBrand = house ? claimRegistrableDomain(house.domain) : brand;
+  const self = /* @__PURE__ */ new Set([brand, authoritativeBrand]);
+  if (self.has(account) && self.has(operator)) return result("implicit", [.../* @__PURE__ */ new Set([brand, account, operator])]);
   const grantClaim = house ? { ...claim, brand: { ...claim.brand, brand_id: house.brand_id } } : claim;
   const record = await options.evaluator.get(authoritativeBrand);
   if (record.status === "absent") {
     if (await options.legacyAuthorization?.(claim)) return result("legacy", [brand, account, operator]);
     throw new IdentityAuthorizationError("grant_absent");
   }
-  const first = (record.record.grants ?? []).filter((g) => grantMatches(g, account, grantClaim, now));
-  if (account === operator && first.length) return result("trust", [brand, operator], [first[0]]);
-  const selfOperated = account === brand || account === authoritativeBrand;
-  if (selfOperated && account !== operator) {
-    const direct = (record.record.grants ?? []).find((g) => grantMatches(g, operator, grantClaim, now));
-    if (direct) return result("trust", [brand, operator], [direct]);
+  const firsts = [];
+  for (const grant of record.record.grants ?? []) {
+    const grantee = registrableGrantee(grant.grantee);
+    if (grantee === void 0 || !grantCovers(grant, grantClaim, now)) continue;
+    if (!self.has(account) && account !== grantee) continue;
+    if (grantee === operator) return result("trust", [brand, operator], [grant]);
+    firsts.push({ grant, grantee });
+  }
+  const grantees = [...new Set(firsts.map((f) => f.grantee))];
+  const records = /* @__PURE__ */ new Map();
+  for (let i = 0; i < grantees.length; i += INTERMEDIARY_FETCH_CONCURRENCY) {
+    const batch = grantees.slice(i, i + INTERMEDIARY_FETCH_CONCURRENCY);
+    const settled = await Promise.allSettled(batch.map((grantee) => options.evaluator.get(grantee)));
+    settled.forEach(
+      (outcome, j) => records.set(batch[j], outcome.status === "fulfilled" ? outcome.value : { failed: outcome.reason })
+    );
   }
-  if (account !== operator && account !== brand && first.length) {
-    const intermediary = await options.evaluator.get(account);
-    if (intermediary.status === "present") {
-      const second = (intermediary.record.grants ?? []).find((g) => grantMatches(g, operator, grantClaim, now));
-      if (second) return result("trust", [brand, account, operator], [first[0], second]);
+  let outage;
+  for (const { grant: first, grantee } of firsts) {
+    const intermediary = records.get(grantee);
+    if ("failed" in intermediary) {
+      outage ??= intermediary.failed;
+      continue;
     }
+    if (intermediary.status !== "present") continue;
+    const second = (intermediary.record.grants ?? []).find((g) => grantMatches(g, operator, grantClaim, now));
+    if (second) return result("trust", [brand, grantee, operator], [first, second]);
   }
-  const covered = (record.record.grants ?? []).some((g) => {
-    const grantee = registrableGrantee(g.grantee);
-    return grantee !== void 0 && (grantee === account || selfOperated && grantee === operator) && grantsScope(g, claim.scope);
-  });
-  const exclusive = record.record.exclusive_grants === true && (record.record.grants ?? []).some((g) => grantsScope(g, claim.scope));
-  if (!covered && !exclusive && await options.sellerAuthorization?.(claim))
+  if (outage !== void 0) throw outage;
+  if (record.record.exclusive_grants !== true && await options.sellerAuthorization?.(claim))
     return result("seller", [brand, account, operator]);
   throw new IdentityAuthorizationError("grant_absent");
 }

package/dist/lib/identity-3.3/trust.mjs

@@ -6,7 +6,7 @@ import { eTldPlusOne } from "../signing/agent-resolver/etld.mjs";
 import { parseStrictJson } from "../signing/agent-resolver/strict-json.mjs";
 import { parse as parseDomain } from "tldts";
 import schemas from "./schemas.draft.mjs";
-const ajv = new Ajv({ strict: false, allErrors: false });
+const ajv = new Ajv({ inlineRefs: false, strict: false, allErrors: false });
 addFormats(ajv);
 for (const schema of schemas) ajv.addSchema(schema);
 function validateIdentity33Schema(id, value) {
@@ -59,6 +59,13 @@ function failure(cause) {
   if (cause !== void 0) Object.defineProperty(error, "cause", { value: cause });
   throw error;
 }
+function claimRegistrableDomain(domain) {
+  try {
+    return eTldPlusOne(domain);
+  } catch (cause) {
+    return failure(cause);
+  }
+}
 function validateTrustRecord(value) {
   if (!validateIdentity33Schema("trust/v1/trust", value)) failure();
   const record = value;
@@ -294,13 +301,16 @@ function authorityGroup(operator) {
   const provider = parseDomain(operator).domain;
   return `private:${provider ?? operator}`;
 }
+const INTERMEDIARY_FETCH_CONCURRENCY = 8;
 function grantsScope(grant, scope) {
   return grant.scopes.some(
     (granted) => granted === "*" || granted === scope || granted === "adcp:all" && scope.startsWith("adcp:")
   );
 }
 function grantMatches(grant, target, claim, now) {
-  if (registrableGrantee(grant.grantee) !== target) return false;
+  return registrableGrantee(grant.grantee) === target && grantCovers(grant, claim, now);
+}
+function grantCovers(grant, claim, now) {
   if (!grantsScope(grant, claim.scope)) return false;
   if (grant.agents && !grant.agents.some((agent) => grantAgentOrigin(agent.url) === canonicalAgentOrigin(claim.signerOrigin)))
     return false;
@@ -317,7 +327,7 @@ async function authorizeDemandGrant(claim, options) {
   const now = (options.now ?? (() => Date.now() / 1e3))();
   const signer = await options.evaluator.match(claim.signerOrigin, "adcp:buying", claim.brand.countries);
   if (signer.agent.countries && !claim.brand.countries?.length) failure();
-  const brand = eTldPlusOne(claim.brand.domain), account = eTldPlusOne(claim.accountOperator), operator = signer.operator;
+  const brand = claimRegistrableDomain(claim.brand.domain), account = claimRegistrableDomain(claim.accountOperator), operator = signer.operator;
   const result = (source, chain, grants = []) => ({
     source,
     chain,
@@ -326,7 +336,6 @@ async function authorizeDemandGrant(claim, options) {
     ...grants.some((g) => g.valid_until) ? { expiresAt: Math.min(...grants.map((g) => g.valid_until ? Date.parse(g.valid_until) / 1e3 : Infinity)) } : {}
   });
   if (brand === operator && account === operator) return result("implicit", [brand]);
-  if (brand === operator && account !== operator) throw new IdentityAuthorizationError("grant_absent");
   let house;
   try {
     house = await options.resolveBrandHouse?.(claim.brand);
@@ -335,34 +344,45 @@ async function authorizeDemandGrant(claim, options) {
       throw cause;
     unavailable(cause);
   }
-  const authoritativeBrand = house ? eTldPlusOne(house.domain) : brand;
-  if (authoritativeBrand === operator && account === operator) return result("implicit", [brand, operator]);
+  const authoritativeBrand = house ? claimRegistrableDomain(house.domain) : brand;
+  const self = /* @__PURE__ */ new Set([brand, authoritativeBrand]);
+  if (self.has(account) && self.has(operator)) return result("implicit", [.../* @__PURE__ */ new Set([brand, account, operator])]);
   const grantClaim = house ? { ...claim, brand: { ...claim.brand, brand_id: house.brand_id } } : claim;
   const record = await options.evaluator.get(authoritativeBrand);
   if (record.status === "absent") {
     if (await options.legacyAuthorization?.(claim)) return result("legacy", [brand, account, operator]);
     throw new IdentityAuthorizationError("grant_absent");
   }
-  const first = (record.record.grants ?? []).filter((g) => grantMatches(g, account, grantClaim, now));
-  if (account === operator && first.length) return result("trust", [brand, operator], [first[0]]);
-  const selfOperated = account === brand || account === authoritativeBrand;
-  if (selfOperated && account !== operator) {
-    const direct = (record.record.grants ?? []).find((g) => grantMatches(g, operator, grantClaim, now));
-    if (direct) return result("trust", [brand, operator], [direct]);
+  const firsts = [];
+  for (const grant of record.record.grants ?? []) {
+    const grantee = registrableGrantee(grant.grantee);
+    if (grantee === void 0 || !grantCovers(grant, grantClaim, now)) continue;
+    if (!self.has(account) && account !== grantee) continue;
+    if (grantee === operator) return result("trust", [brand, operator], [grant]);
+    firsts.push({ grant, grantee });
+  }
+  const grantees = [...new Set(firsts.map((f) => f.grantee))];
+  const records = /* @__PURE__ */ new Map();
+  for (let i = 0; i < grantees.length; i += INTERMEDIARY_FETCH_CONCURRENCY) {
+    const batch = grantees.slice(i, i + INTERMEDIARY_FETCH_CONCURRENCY);
+    const settled = await Promise.allSettled(batch.map((grantee) => options.evaluator.get(grantee)));
+    settled.forEach(
+      (outcome, j) => records.set(batch[j], outcome.status === "fulfilled" ? outcome.value : { failed: outcome.reason })
+    );
   }
-  if (account !== operator && account !== brand && first.length) {
-    const intermediary = await options.evaluator.get(account);
-    if (intermediary.status === "present") {
-      const second = (intermediary.record.grants ?? []).find((g) => grantMatches(g, operator, grantClaim, now));
-      if (second) return result("trust", [brand, account, operator], [first[0], second]);
+  let outage;
+  for (const { grant: first, grantee } of firsts) {
+    const intermediary = records.get(grantee);
+    if ("failed" in intermediary) {
+      outage ??= intermediary.failed;
+      continue;
     }
+    if (intermediary.status !== "present") continue;
+    const second = (intermediary.record.grants ?? []).find((g) => grantMatches(g, operator, grantClaim, now));
+    if (second) return result("trust", [brand, grantee, operator], [first, second]);
   }
-  const covered = (record.record.grants ?? []).some((g) => {
-    const grantee = registrableGrantee(g.grantee);
-    return grantee !== void 0 && (grantee === account || selfOperated && grantee === operator) && grantsScope(g, claim.scope);
-  });
-  const exclusive = record.record.exclusive_grants === true && (record.record.grants ?? []).some((g) => grantsScope(g, claim.scope));
-  if (!covered && !exclusive && await options.sellerAuthorization?.(claim))
+  if (outage !== void 0) throw outage;
+  if (record.record.exclusive_grants !== true && await options.sellerAuthorization?.(claim))
     return result("seller", [brand, account, operator]);
   throw new IdentityAuthorizationError("grant_absent");
 }

package/dist/lib/identity-3.3/validation.js

@@ -34,6 +34,7 @@ module.exports = __toCommonJS(validation_exports);
 var import_ajv = __toESM(require("ajv"));
 var import_ajv_formats = __toESM(require("ajv-formats"));
 var import_schema_loader = require('../validation/schema-loader.js');
+var import_compact_schema = require('../validation/compact-schema.js');
 var import_schemas = __toESM(require('./schemas.draft.js'));
 const validators = /* @__PURE__ */ new WeakMap();
 function validateIdentity33Payload(tool, direction, payload, version) {
@@ -79,14 +80,15 @@ function validateIdentity33Payload(tool, direction, payload, version) {
       for (const [k, value] of Object.entries(object)) if (k !== "$id") walk2(value, k);
     };
     var walk = walk2;
-    const schema = structuredClone(stable.schema);
+    const document = (0, import_schema_loader.getToolSchemaDocument)(tool, direction === "request" ? "request" : "sync", version)?.schema ?? stable.schema;
+    const schema = structuredClone(direction === "response" ? (0, import_schema_loader.relaxResponseRoot)(document) : document);
     const relationship = import_schemas.default.find((s) => s.$id === "/schemas/core/principal-relationship.json");
     const onboarding = import_schemas.default.find((s) => s.$id === "/schemas/core/agent-onboarding.json");
     walk2(schema);
-    const ajv = new import_ajv.default({ strict: false, allErrors: true });
+    const ajv = new import_ajv.default({ inlineRefs: false, strict: false, allErrors: true });
     (0, import_ajv_formats.default)(ajv);
     for (const draft of import_schemas.default) ajv.addSchema({ ...draft, $id: "https://adcontextprotocol.org" + draft.$id });
-    validator = ajv.compile(schema);
+    validator = ajv.compile((0, import_compact_schema.compactSchemaForValidation)(schema));
     cache.set(key, validator);
   }
   let valid = validator(payload) === true;

package/dist/lib/identity-3.3/validation.mjs

@@ -1,6 +1,7 @@
 import Ajv from "ajv";
 import addFormats from "ajv-formats";
-import { getValidator } from "../validation/schema-loader.mjs";
+import { getValidator, getToolSchemaDocument, relaxResponseRoot } from "../validation/schema-loader.mjs";
+import { compactSchemaForValidation } from "../validation/compact-schema.mjs";
 import schemas from "./schemas.draft.mjs";
 const validators = /* @__PURE__ */ new WeakMap();
 function validateIdentity33Payload(tool, direction, payload, version) {
@@ -46,14 +47,15 @@ function validateIdentity33Payload(tool, direction, payload, version) {
       for (const [k, value] of Object.entries(object)) if (k !== "$id") walk2(value, k);
     };
     var walk = walk2;
-    const schema = structuredClone(stable.schema);
+    const document = getToolSchemaDocument(tool, direction === "request" ? "request" : "sync", version)?.schema ?? stable.schema;
+    const schema = structuredClone(direction === "response" ? relaxResponseRoot(document) : document);
     const relationship = schemas.find((s) => s.$id === "/schemas/core/principal-relationship.json");
     const onboarding = schemas.find((s) => s.$id === "/schemas/core/agent-onboarding.json");
     walk2(schema);
-    const ajv = new Ajv({ strict: false, allErrors: true });
+    const ajv = new Ajv({ inlineRefs: false, strict: false, allErrors: true });
     addFormats(ajv);
     for (const draft of schemas) ajv.addSchema({ ...draft, $id: "https://adcontextprotocol.org" + draft.$id });
-    validator = ajv.compile(schema);
+    validator = ajv.compile(compactSchemaForValidation(schema));
     cache.set(key, validator);
   }
   let valid = validator(payload) === true;