@adcp/sdk 13.0.0-rc.7 → 13.0.0-rc.8

package/dist/lib/core/SingleAgentClient.mjs

@@ -10,6 +10,7 @@ import { A2AClient as A2AClientImpl } from "@a2a-js/sdk/client";
 const A2AClient = A2AClientImpl;
 import { TaskExecutor } from "./TaskExecutor.mjs";
 import { attachMatch } from "./match.mjs";
+import { withTaskDeadline } from "./task-deadline.mjs";
 import { createMCPAuthHeaders } from "../auth/index.mjs";
 import { isAbortOrTimeoutError } from "../protocols/abort.mjs";
 import {
@@ -900,7 +901,8 @@ class SingleAgentClient {
       await ensureClientCredentialsTokens(this.normalizedAgent, {
         storage: getAgentStorage(this.normalizedAgent),
         allowPrivateIp: isLikelyPrivateUrl(this.normalizedAgent.agent_uri),
-        fetch: transport?.fetchFn
+        fetch: transport?.fetchFn,
+        signal: options?.signal
       });
     }
     const discoveredEndpoint = await this.discoverMCPEndpoint(this.normalizedAgent.agent_uri, options);
@@ -949,7 +951,8 @@ class SingleAgentClient {
       await ensureClientCredentialsTokens(this.normalizedAgent, {
         storage: getAgentStorage(this.normalizedAgent),
         allowPrivateIp: isLikelyPrivateUrl(this.normalizedAgent.agent_uri),
-        fetch: transport?.fetchFn
+        fetch: transport?.fetchFn,
+        signal: options?.signal
       });
     }
     const canonicalUrl = await this.fetchA2ACanonicalUrl(this.normalizedAgent.agent_uri, options);
@@ -1023,16 +1026,21 @@ class SingleAgentClient {
       if (is401Error(error, got401)) {
         const requirements = await discoverAuthorizationRequirements(agentUri, {
           allowPrivateIp: isLikelyPrivateUrl(agentUri),
-          fetchFn: transport?.fetchFn
+          fetchFn: transport?.fetchFn,
+          signal: readOptions?.signal
         });
         if (requirements) {
           throw new NeedsAuthorizationError(requirements);
         }
         const challenge = await probeAuthChallenge(agentUri, {
           allowPrivateIp: isLikelyPrivateUrl(agentUri),
-          fetchFn: transport?.fetchFn
+          fetchFn: transport?.fetchFn,
+          signal: readOptions?.signal
+        });
+        const oauthMetadata = await discoverOAuthMetadata(agentUri, {
+          fetch: transport?.fetchFn,
+          signal: readOptions?.signal
         });
-        const oauthMetadata = await discoverOAuthMetadata(agentUri, { fetch: transport?.fetchFn });
         throw new AuthenticationRequiredError(agentUri, oauthMetadata || void 0, void 0, challenge ?? void 0);
       }
       throw error;
@@ -1156,17 +1164,20 @@ class SingleAgentClient {
     if (got401) {
       const requirements = await discoverAuthorizationRequirements(providedUri, {
         allowPrivateIp: isLikelyPrivateUrl(providedUri),
-        fetchFn: options?.transport?.fetchFn ?? this.config.transport?.fetchFn
+        fetchFn: options?.transport?.fetchFn ?? this.config.transport?.fetchFn,
+        signal: options?.signal
       });
       if (requirements) {
         throw new NeedsAuthorizationError(requirements);
       }
       const challenge = await probeAuthChallenge(providedUri, {
         allowPrivateIp: isLikelyPrivateUrl(providedUri),
-        fetchFn: options?.transport?.fetchFn ?? this.config.transport?.fetchFn
+        fetchFn: options?.transport?.fetchFn ?? this.config.transport?.fetchFn,
+        signal: options?.signal
       });
       const oauthMetadata = await discoverOAuthMetadata(providedUri, {
-        fetch: options?.transport?.fetchFn ?? this.config.transport?.fetchFn
+        fetch: options?.transport?.fetchFn ?? this.config.transport?.fetchFn,
+        signal: options?.signal
       });
       throw new AuthenticationRequiredError(providedUri, oauthMetadata || void 0, void 0, challenge ?? void 0);
     }
@@ -1770,6 +1781,21 @@ Hint: this usually means agent_uri does not include the MCP endpoint path. The S
    * Automatically adapts requests for v2 servers and normalizes responses.
    */
   async executeAndHandle(taskType, handlerName, params, inputHandler, options, transformCompletedResponse, legacyFormatConverter, canonicalRequest) {
+    return withTaskDeadline(
+      options,
+      (effectiveOptions) => this.executeAndHandleWithinDeadline(
+        taskType,
+        handlerName,
+        params,
+        inputHandler,
+        effectiveOptions,
+        transformCompletedResponse,
+        legacyFormatConverter,
+        canonicalRequest
+      )
+    );
+  }
+  async executeAndHandleWithinDeadline(taskType, handlerName, params, inputHandler, options, transformCompletedResponse, legacyFormatConverter, canonicalRequest) {
     throwIfAborted(options?.signal);
     let normalizedParams = normalizeRequestParams(taskType, params, {
       skipIdempotencyAutoInject: options?.skipIdempotencyAutoInject,
@@ -1787,14 +1813,18 @@ Hint: this usually means agent_uri does not include the MCP endpoint path. The S
       this.validateRequest(taskType, normalizedParams);
     }
     await this.validateTaskFeatures(taskType, options);
+    throwIfAborted(options?.signal);
     if (this.config.requireV3ForMutations && isMutatingTask(taskType)) {
       await this.requireSupportedMajor(taskType, options);
+      throwIfAborted(options?.signal);
     }
     const earlyResult = await this.getEarlyResultForUnsupportedFeatures(taskType, normalizedParams, options);
+    throwIfAborted(options?.signal);
     if (earlyResult) {
       return attachMatch(earlyResult);
     }
     const agent = await this.ensureEndpointDiscovered(options);
+    throwIfAborted(options?.signal);
     if (!options?.skipIdempotencyAutoInject && !options?.skipAccountValidation) {
       this.executor.validateRequest(taskType, normalizedParams);
     }
@@ -1804,6 +1834,7 @@ Hint: this usually means agent_uri does not include the MCP endpoint path. The S
       [CAPABILITY_DISCOVERY_CONTEXT]: capabilityDiscoveryContext
     };
     const serverVersion = await this.detectServerVersion(detectionOptions);
+    throwIfAborted(options?.signal);
     const inputSchemaStripLogs = [];
     const { params: adaptedParams, driftLogs: adaptDriftLogs } = this.adaptRequest(
       taskType,
@@ -1829,6 +1860,7 @@ Hint: this usually means agent_uri does not include the MCP endpoint path. The S
         serverVersion
       )
     );
+    throwIfAborted(effectiveOptions?.signal);
     const postAdapterLogs = [...inputSchemaStripLogs, ...v25DriftLogs];
     if (postAdapterLogs.length > 0) {
       result.debug_logs = [...result.debug_logs ?? [], ...postAdapterLogs];
@@ -1842,6 +1874,7 @@ Hint: this usually means agent_uri does not include the MCP endpoint path. The S
     }
     this.rememberLegacyFormatConverter(taskType, legacyFormatConverter, result, options);
     result = await this.applyProductPropertyPolicy(result, taskType, normalizedParams);
+    throwIfAborted(effectiveOptions?.signal);
     if (CANONICAL_CREATIVE_ACTIVITY_TASKS.has(taskType)) {
       const routingSnapshot = canonicalCreativeRoutingSnapshot(taskType, canonicalRequest ?? normalizedParams);
       result = this.canonicalizeCreativeTaskResult(result, taskType, transformCompletedResponse, legacyFormatConverter);
@@ -1859,6 +1892,7 @@ Hint: this usually means agent_uri does not include the MCP endpoint path. The S
     if (result.status === "completed" && result.success && this.asyncHandler) {
       const handler = this.config.handlers?.[handlerName];
       if (handler) {
+        throwIfAborted(effectiveOptions?.signal);
         const metadata = {
           operation_id: options?.contextId || "sync",
           context_id: options?.contextId,
@@ -1869,6 +1903,7 @@ Hint: this usually means agent_uri does not include the MCP endpoint path. The S
           timestamp: (/* @__PURE__ */ new Date()).toISOString()
         };
         await handler(result.data, metadata);
+        throwIfAborted(effectiveOptions?.signal);
       }
     }
     return result;
@@ -2749,6 +2784,12 @@ Hint: this usually means agent_uri does not include the MCP endpoint path. The S
    * @param options - Task execution options
    */
   async createMediaBuy(params, inputHandler, options) {
+    return withTaskDeadline(
+      options,
+      (effectiveOptions) => this.createMediaBuyWithinDeadline(params, inputHandler, effectiveOptions)
+    );
+  }
+  async createMediaBuyWithinDeadline(params, inputHandler, options) {
     const { legacyFormatConverter, projectionCatalogs, canonicalFormatLegacyResolver, ...taskOptions } = options ?? {};
     const effectiveLegacyFormatConverter = this.resolveLegacyFormatConverter(
       legacyFormatConverter,
@@ -2839,6 +2880,12 @@ Hint: this usually means agent_uri does not include the MCP endpoint path. The S
    * @param options - Task execution options
    */
   async updateMediaBuy(params, inputHandler, options) {
+    return withTaskDeadline(
+      options,
+      (effectiveOptions) => this.updateMediaBuyWithinDeadline(params, inputHandler, effectiveOptions)
+    );
+  }
+  async updateMediaBuyWithinDeadline(params, inputHandler, options) {
     const { legacyFormatConverter, projectionCatalogs, canonicalFormatLegacyResolver, ...taskOptions } = options ?? {};
     const effectiveLegacyFormatConverter = this.resolveLegacyFormatConverter(
       legacyFormatConverter,
@@ -2891,6 +2938,12 @@ Hint: this usually means agent_uri does not include the MCP endpoint path. The S
    * @param options - Task execution options
    */
   async syncCreatives(params, inputHandler, options) {
+    return withTaskDeadline(
+      options,
+      (effectiveOptions) => this.syncCreativesWithinDeadline(params, inputHandler, effectiveOptions)
+    );
+  }
+  async syncCreativesWithinDeadline(params, inputHandler, options) {
     const {
       creativeFormatProjection,
       legacyFormatConverter,
@@ -3177,14 +3230,25 @@ Hint: this usually means agent_uri does not include the MCP endpoint path. The S
    *
    * Use this when a task returned status 'submitted' or 'working' and
    * later resolves via polling or webhooks. The checkId is available
-   * on the original TaskResult at result.governance.checkId.
+   * on the original TaskResult at result.governance.checkId. After a
+   * TaskTimeoutError during governance postflight, pass the error's
+   * governanceRecovery.outcomeIdempotencyKey in `options` to safely retry.
    */
-  async reportGovernanceOutcome(checkId, outcome, governanceContext, sellerResponse, error) {
+  async reportGovernanceOutcome(checkId, outcome, governanceContext, sellerResponse, error, options) {
     const middleware = this.executor.getGovernanceMiddleware();
     if (!middleware) {
       throw new Error("No governance middleware configured. Set config.governance.campaign to enable governance.");
     }
-    return middleware.reportOutcome(checkId, outcome, sellerResponse, error, [], governanceContext);
+    return middleware.reportOutcome(
+      checkId,
+      outcome,
+      sellerResponse,
+      error,
+      [],
+      governanceContext,
+      options?.signal,
+      options?.outcomeIdempotencyKey
+    );
   }
   getGovernanceAgent() {
     const agent = this.config.governance?.campaign?.agent;
@@ -3204,6 +3268,12 @@ Hint: this usually means agent_uri does not include the MCP endpoint path. The S
    * @param options - Task execution options
    */
   async getAdcpCapabilities(params, inputHandler, options) {
+    return withTaskDeadline(
+      options,
+      (effectiveOptions) => this.getAdcpCapabilitiesWithinDeadline(params, inputHandler, effectiveOptions)
+    );
+  }
+  async getAdcpCapabilitiesWithinDeadline(params, inputHandler, options) {
     const agent = await this.ensureEndpointDiscovered(options);
     this.executor.validateRequest("get_adcp_capabilities", params);
     return this.executor.executeTask(
@@ -3479,6 +3549,12 @@ Hint: this usually means agent_uri does not include the MCP endpoint path. The S
     return this.executeTaskUnprojected(taskName, params, inputHandler, options);
   }
   async executeTaskUnprojected(taskName, params, inputHandler, options) {
+    return withTaskDeadline(
+      options,
+      (effectiveOptions) => this.executeTaskUnprojectedWithinDeadline(taskName, params, inputHandler, effectiveOptions)
+    );
+  }
+  async executeTaskUnprojectedWithinDeadline(taskName, params, inputHandler, options) {
     throwIfAborted(options?.signal);
     const startTime = Date.now();
     try {
@@ -3991,7 +4067,8 @@ Hint: this usually means agent_uri does not include the MCP endpoint path. The S
       await ensureClientCredentialsTokens(this.normalizedAgent, {
         storage: getAgentStorage(this.normalizedAgent),
         allowPrivateIp: isLikelyPrivateUrl(this.normalizedAgent.agent_uri),
-        fetch: transport?.fetchFn
+        fetch: transport?.fetchFn,
+        signal: options?.signal
       });
       return this.normalizedAgent.oauth_tokens?.access_token;
     };