@adcp/sdk 9.3.0 → 9.5.0

package/dist/lib/protocols/mcp-tasks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-tasks.d.ts","sourceRoot":"","sources":["../../../src/lib/protocols/mcp-tasks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,SAAS,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAI1D,OAAO,EAAyB,KAAK,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAGpF,OAAO,EAA4B,KAAK,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AASjG,UAAU,sBAAsB;IAC9B,SAAS,CAAC,EAAE;QAAE,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1C,mBAAmB,CAAC,EAAE,wBAAwB,CAAC;IAC/C,wBAAwB,CAAC,EAAE;QACzB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;CACH;AAoBD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAG9D;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAe1D;AA+ED;;;;;;;;;;GAUG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,SAAS,CAAC,EAAE,MAAM,EAClB,SAAS,GAAE,aAAa,EAAO,EAC/B,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACtC,OAAO,CAAC,EAAE;IAAE,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,mBAAmB,CAAA;CAAE,GAC1E,OAAO,CAAC,OAAO,CAAC,CAyClB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,qBAAqB,CACzC,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,SAAS,GAAE,aAAa,EAAO,EAC/B,OAAO,CAAC,EAAE;IAAE,cAAc,CAAC,EAAE,MAAM,CAAA;CAAE,GACpC,OAAO,CAAC,OAAO,CAAC,CAOlB;AAiKD;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,EAClB,SAAS,GAAE,aAAa,EAAO,EAC/B,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,QAAQ,CAAC,CAuBnB;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,EAClB,SAAS,GAAE,aAAa,EAAO,GAC9B,OAAO,CAAC,OAAO,CAAC,CAalB;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,EAClB,SAAS,GAAE,aAAa,EAAO,EAC/B,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAyBrB;AAED;;GAEG;AACH,wBAAsB,aAAa,CACjC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,EAClB,SAAS,GAAE,aAAa,EAAO,GAC9B,OAAO,CAAC,IAAI,CAAC,CAYf"}
+{"version":3,"file":"mcp-tasks.d.ts","sourceRoot":"","sources":["../../../src/lib/protocols/mcp-tasks.ts"],"names":[],"mappings":"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"}

package/dist/lib/protocols/mcp-tasks.js

@@ -25,6 +25,7 @@ const client_1 = require("../signing/client");
 const idempotency_1 = require("../utils/idempotency");
 const responseSizeLimit_1 = require("./responseSizeLimit");
 const transportDiagnostics_1 = require("./transportDiagnostics");
+const abort_1 = require("./abort");
 /**
  * Track which MCP clients have had listTools() called.
  * The SDK's isToolTask() needs tool metadata from listTools() to determine
@@ -36,10 +37,13 @@ const toolsListedClients = new WeakSet();
  * Ensure tool metadata is cached in the SDK so isToolTask() works.
  * Called once per client connection when tasks are supported.
  */
-async function ensureToolsListed(client) {
+async function ensureToolsListed(client, signal, requestTimeoutMs) {
     if (toolsListedClients.has(client))
         return;
-    await client.listTools();
+    await client.listTools(undefined, {
+        ...(signal && { signal }),
+        ...(requestTimeoutMs !== undefined && { timeout: requestTimeoutMs }),
+    });
     toolsListedClients.add(client);
 }
 /**
@@ -172,7 +176,7 @@ async function callMCPToolWithTasks(agentUrl, toolName, args, authToken, debugLo
                 timestamp: new Date().toISOString(),
             });
         }
-        return (0, mcp_1.withCachedConnection)(agentUrl, authToken, authHeaders, debugLogs, toolName, client => callToolOnClient(client, toolName, args, debugLogs, workingTimeout));
+        return (0, mcp_1.withCachedConnection)(agentUrl, authToken, authHeaders, debugLogs, toolName, client => callToolOnClient(client, toolName, args, debugLogs, workingTimeout, options?.signal, options?.requestTimeoutMs), undefined, { signal: options?.signal, requestTimeoutMs: options?.requestTimeoutMs });
     }));
 }
 /**
@@ -192,21 +196,26 @@ async function callMCPToolWithClient(mcpClient, toolName, args, debugLogs = [],
         message: `MCP: Calling tool ${toolName} (in-process) with args: ${JSON.stringify(redactArgsForLog(args))}`,
         timestamp: new Date().toISOString(),
     });
-    return callToolOnClient(mcpClient, toolName, args, debugLogs, options?.workingTimeout ?? 120_000);
+    return callToolOnClient(mcpClient, toolName, args, debugLogs, options?.workingTimeout ?? 120_000, options?.signal, options?.requestTimeoutMs);
 }
 /**
  * Inner dispatch logic shared by `callMCPToolWithTasks` (URL path) and
  * `callMCPToolWithClient` (in-process path). Both paths converge here once
  * a connected `MCPClient` is in hand.
  */
-async function callToolOnClient(client, toolName, args, debugLogs, workingTimeout) {
+async function callToolOnClient(client, toolName, args, debugLogs, workingTimeout, signal, requestTimeoutMs) {
+    const resolvedRequestTimeoutMs = (0, abort_1.resolveClientRequestTimeoutMs)(requestTimeoutMs);
+    const requestOptions = {
+        ...(signal && { signal }),
+        ...(resolvedRequestTimeoutMs !== undefined && { timeout: resolvedRequestTimeoutMs }),
+    };
     if (!serverSupportsTasks(client)) {
         debugLogs.push({
             type: 'info',
             message: `MCP Tasks: Server does not support tasks, using standard callTool for ${toolName}`,
             timestamp: new Date().toISOString(),
         });
-        const response = (await client.callTool({ name: toolName, arguments: args }));
+        const response = (await client.callTool({ name: toolName, arguments: args }, undefined, requestOptions));
         debugLogs.push({
             type: response?.isError ? 'error' : 'success',
             message: `MCP: Tool ${toolName} response received (${response?.isError ? 'error' : 'success'})`,
@@ -218,7 +227,7 @@ async function callToolOnClient(client, toolName, args, debugLogs, workingTimeou
     // Ensure tool metadata is cached so the SDK's isToolTask() works correctly.
     // Without this, callToolStream silently skips task creation for tools that
     // declare taskSupport: 'optional' | 'required'.
-    await ensureToolsListed(client);
+    await ensureToolsListed(client, signal, resolvedRequestTimeoutMs);
     debugLogs.push({
         type: 'info',
         message: `MCP Tasks: Server supports tasks, using callToolStream for ${toolName}`,
@@ -226,8 +235,9 @@ async function callToolOnClient(client, toolName, args, debugLogs, workingTimeou
     });
     // Use callToolStream which handles the full task lifecycle
     const stream = client.experimental.tasks.callToolStream({ name: toolName, arguments: args }, undefined, {
-        timeout: workingTimeout,
+        timeout: resolvedRequestTimeoutMs ?? workingTimeout,
         resetTimeoutOnProgress: true,
+        ...(signal && { signal }),
     });
     let capturedTaskId;
     let capturedTask;
@@ -271,7 +281,7 @@ async function callToolOnClient(client, toolName, args, debugLogs, workingTimeou
                     // and return it as a proper isError response for downstream unwrapping.
                     if (capturedTaskId) {
                         try {
-                            const taskResult = await client.experimental.tasks.getTaskResult(capturedTaskId);
+                            const taskResult = await client.experimental.tasks.getTaskResult(capturedTaskId, undefined, requestOptions);
                             const content = taskResult?.content;
                             if (content) {
                                 return {
@@ -291,9 +301,12 @@ async function callToolOnClient(client, toolName, args, debugLogs, workingTimeou
         }
     }
     catch (error) {
+        if (signal?.aborted && (0, abort_1.isAbortOrTimeoutError)(error)) {
+            throw error;
+        }
         // If we timed out but have a taskId, return a working status
         // so the caller can poll via getMCPTaskStatus/getMCPTaskResult
-        if (capturedTaskId && error instanceof Error && error.message.includes('Timeout')) {
+        if (capturedTaskId && error instanceof Error && /timeout|timed out/i.test(error.message)) {
             debugLogs.push({
                 type: 'info',
                 message: `MCP Tasks: Timeout for ${toolName}, returning working status with taskId ${capturedTaskId}`,
@@ -307,6 +320,9 @@ async function callToolOnClient(client, toolName, args, debugLogs, workingTimeou
                 },
             };
         }
+        if ((0, abort_1.isAbortOrTimeoutError)(error)) {
+            throw error;
+        }
         // Servers may return a synchronous tool error (e.g. VERSION_UNSUPPORTED)
         // rather than creating a task. The Tasks SDK rejects these with a Zod
         // validation error about a missing `task` field. When no task was
@@ -319,7 +335,7 @@ async function callToolOnClient(client, toolName, args, debugLogs, workingTimeou
                 message: `MCP Tasks: Server returned synchronous response for ${toolName}, falling back to callTool`,
                 timestamp: new Date().toISOString(),
             });
-            return (await client.callTool({ name: toolName, arguments: args }));
+            return (await client.callTool({ name: toolName, arguments: args }, undefined, requestOptions));
         }
         throw error;
     }

package/dist/lib/protocols/mcp-tasks.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-tasks.js","sourceRoot":"","sources":["../../../src/lib/protocols/mcp-tasks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp-tasks.js","sourceRoot":"","sources":["../../../src/lib/protocols/mcp-tasks.ts"],"names":[],"mappings":"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"}

package/dist/lib/protocols/mcp.d.ts

@@ -36,6 +36,10 @@ export interface MCPCallOptions {
     customHeaders?: Record<string, string>;
     /** RFC 9421 signing context — when set, the transport signs outbound ops per seller capability. */
     signingContext?: AgentSigningContext;
+    /** Caller-owned cancellation signal for connect and callTool. */
+    signal?: AbortSignal;
+    /** Optional per-request timeout for connect and callTool. */
+    requestTimeoutMs?: number;
 }
 /**
  * Result of an MCP connection attempt
@@ -58,8 +62,14 @@ export interface MCPConnectionResult {
  * The returned client is connected and ready for use. Callers are responsible for
  * calling client.close() when done.
  */
-export declare function connectMCPWithFallback(url: URL, authHeaders: Record<string, string>, debugLogs?: DebugLogEntry[], label?: string, transportFetch?: typeof fetch): Promise<MCPClient>;
-export declare function callMCPTool(agentUrl: string, toolName: string, args: Record<string, unknown>, authToken?: string, debugLogs?: DebugLogEntry[], customHeaders?: Record<string, string>, signingContext?: AgentSigningContext, transportFetch?: typeof fetch): Promise<unknown>;
+export declare function connectMCPWithFallback(url: URL, authHeaders: Record<string, string>, debugLogs?: DebugLogEntry[], label?: string, transportFetch?: typeof fetch, requestOptions?: {
+    signal?: AbortSignal;
+    requestTimeoutMs?: number;
+}): Promise<MCPClient>;
+export declare function callMCPTool(agentUrl: string, toolName: string, args: Record<string, unknown>, authToken?: string, debugLogs?: DebugLogEntry[], customHeaders?: Record<string, string>, signingContext?: AgentSigningContext, transportFetch?: typeof fetch, requestOptions?: {
+    signal?: AbortSignal;
+    requestTimeoutMs?: number;
+}): Promise<unknown>;
 /**
  * Call an MCP tool and return the raw CallToolResult (with isError, content, structuredContent).
  * Raw MCP tool call — returns the CallToolResult directly, including isError responses.
@@ -106,6 +116,8 @@ export declare function connectMCP(options: {
     debugLogs?: DebugLogEntry[];
     customHeaders?: Record<string, string>;
     signingContext?: AgentSigningContext;
+    signal?: AbortSignal;
+    requestTimeoutMs?: number;
 }): Promise<MCPConnectionResult>;
 /**
  * Call an MCP tool with OAuth support.

package/dist/lib/protocols/mcp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../../src/lib/protocols/mcp.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../../src/lib/protocols/mcp.ts"],"names":[],"mappings":"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"}

package/dist/lib/protocols/mcp.js

@@ -24,6 +24,7 @@ const idempotency_1 = require("../utils/idempotency");
 const rawResponseCapture_1 = require("./rawResponseCapture");
 const responseSizeLimit_1 = require("./responseSizeLimit");
 const transportDiagnostics_1 = require("./transportDiagnostics");
+const abort_1 = require("./abort");
 /**
  * Module-level connection cache keyed by agent URL + auth token hash.
  * Reuses MCP connections across tool calls to avoid TCP connection exhaustion
@@ -69,7 +70,7 @@ function trackStreamableHTTPUrl(url) {
     }
 }
 /**
- * Build the connection-cache key for a (URL, credential, signing-context)
+ * Build the connection-cache key for a (URL, credential/header, signing-context)
  * triple.
  *
  * Two credential paths feed this cache. The bearer path supplies `authToken`
@@ -83,16 +84,21 @@ function trackStreamableHTTPUrl(url) {
  * behalf of N principals would silently leak credentials across the
  * connection boundary.
  *
- * Fix: when `authToken` is unset, derive the fingerprint from the
- * `Authorization` header on `authHeaders` (case-insensitive lookup, since
- * header keys vary by call site). The shared `createSha256Prefix` helper
- * keeps both paths byte-equivalent for compatibility with existing cache
- * entries.
+ * Also include non-trace custom headers in the key. Tenant/routing headers can
+ * select a different upstream seller or credential context even when the bearer
+ * token is identical.
  */
 function connectionCacheKey(agentUrl, authToken, signingCacheKey, authHeaders) {
+    const parts = [agentUrl];
     const fingerprint = authToken ?? extractAuthHeader(authHeaders);
-    const base = fingerprint ? `${agentUrl}::${cacheDisambiguator(fingerprint)}` : agentUrl;
-    return signingCacheKey ? `${base}::${signingCacheKey}` : base;
+    if (fingerprint)
+        parts.push(cacheDisambiguator(fingerprint));
+    const headersKey = headersCacheDisambiguator(authHeaders);
+    if (headersKey)
+        parts.push(`headers:${headersKey}`);
+    if (signingCacheKey)
+        parts.push(signingCacheKey);
+    return parts.join('::');
 }
 /**
  * Produce a stable 64-bit Map-key disambiguator from credential material.
@@ -130,6 +136,16 @@ function extractAuthHeader(headers) {
     }
     return undefined;
 }
+function headersCacheDisambiguator(headers) {
+    const entries = Object.entries(headers ?? {})
+        .filter(([key]) => {
+        const lower = key.toLowerCase();
+        return lower !== 'traceparent' && lower !== 'tracestate' && lower !== 'baggage';
+    })
+        .map(([key, value]) => [key.toLowerCase(), value])
+        .sort(([a], [b]) => a.localeCompare(b));
+    return entries.length > 0 ? cacheDisambiguator(JSON.stringify(entries)) : undefined;
+}
 /** Get a cached connection, refreshing its LRU position. */
 function getCachedConnection(key) {
     const client = connectionCache.get(key);
@@ -202,14 +218,14 @@ async function closeMCPConnections() {
  * Concurrent callers for the same key share a single in-flight connection
  * attempt via the pendingConnections map, preventing duplicate connections.
  */
-async function getOrCreateConnection(cacheKey, baseUrl, authHeaders, debugLogs, label) {
+async function getOrCreateConnection(cacheKey, baseUrl, authHeaders, debugLogs, label, requestOptions = {}) {
     const cached = getCachedConnection(cacheKey);
     if (cached)
         return cached;
     const pending = pendingConnections.get(cacheKey);
     if (pending)
         return pending;
-    const promise = connectMCPWithFallback(baseUrl, authHeaders, debugLogs, label)
+    const promise = connectMCPWithFallback(baseUrl, authHeaders, debugLogs, label, undefined, requestOptions)
         .then(client => {
         connectionCache.set(cacheKey, client);
         evictLeastRecentlyUsed();
@@ -230,11 +246,7 @@ function getOAuthProviderDisambiguator(authProvider) {
     return id;
 }
 function customHeadersDisambiguator(customHeaders) {
-    const entries = Object.entries(customHeaders ?? {})
-        .filter(([key]) => key.toLowerCase() !== 'authorization')
-        .map(([key, value]) => [key.toLowerCase(), value])
-        .sort(([a], [b]) => a.localeCompare(b));
-    return entries.length > 0 ? cacheDisambiguator(JSON.stringify(entries)) : undefined;
+    return headersCacheDisambiguator(customHeaders);
 }
 function oauthConnectionCacheKey(agentUrl, authProvider, signingCacheKey, customHeaders) {
     const parts = [`${agentUrl}::oauth:${getOAuthProviderDisambiguator(authProvider)}`];
@@ -275,6 +287,20 @@ async function getOrCreateOAuthConnection(cacheKey, options) {
 }
 async function withCachedOAuthConnection(options, label, fn) {
     const cacheKey = oauthConnectionCacheKey(options.agentUrl, options.authProvider, options.signingContext?.cacheKey, options.customHeaders);
+    if (options.signal || options.requestTimeoutMs !== undefined) {
+        const { client } = await connectMCP(options);
+        try {
+            return await fn(client);
+        }
+        finally {
+            try {
+                await client.close();
+            }
+            catch {
+                /* ignore */
+            }
+        }
+    }
     const mcpClient = await getOrCreateOAuthConnection(cacheKey, options);
     try {
         return await fn(mcpClient);
@@ -302,6 +328,9 @@ async function withCachedOAuthConnection(options, label, fn) {
             });
             throw error;
         }
+        if ((0, abort_1.isAbortOrTimeoutError)(error)) {
+            throw error;
+        }
         oauthConnectionCache.delete(cacheKey);
         try {
             await mcpClient.close();
@@ -332,11 +361,11 @@ async function withCachedOAuthConnection(options, label, fn) {
  * @internal Used by mcp-tasks.ts for protocol-level task operations.
  * Not part of the public API — do not import from outside the protocols directory.
  */
-async function withCachedConnection(agentUrl, authToken, authHeaders, debugLogs, label, fn, transportFetch) {
+async function withCachedConnection(agentUrl, authToken, authHeaders, debugLogs, label, fn, transportFetch, requestOptions = {}) {
     const signingContext = client_1.signingContextStorage.getStore();
     const baseUrl = new URL(agentUrl);
-    if (transportFetch) {
-        const guardedClient = await connectMCPWithFallback(baseUrl, authHeaders, debugLogs, label, transportFetch);
+    if (transportFetch || requestOptions.signal || requestOptions.requestTimeoutMs !== undefined) {
+        const guardedClient = await connectMCPWithFallback(baseUrl, authHeaders, debugLogs, label, transportFetch, requestOptions);
         try {
             return await fn(guardedClient);
         }
@@ -350,7 +379,7 @@ async function withCachedConnection(agentUrl, authToken, authHeaders, debugLogs,
         }
     }
     const cacheKey = connectionCacheKey(agentUrl, authToken, signingContext?.cacheKey, authHeaders);
-    const mcpClient = await getOrCreateConnection(cacheKey, baseUrl, authHeaders, debugLogs, label);
+    const mcpClient = await getOrCreateConnection(cacheKey, baseUrl, authHeaders, debugLogs, label, requestOptions);
     try {
         return await fn(mcpClient);
     }
@@ -378,6 +407,9 @@ async function withCachedConnection(agentUrl, authToken, authHeaders, debugLogs,
             });
             throw error;
         }
+        if ((0, abort_1.isAbortOrTimeoutError)(error)) {
+            throw error;
+        }
         // Evict stale connection and retry once with a fresh connection
         connectionCache.delete(cacheKey);
         try {
@@ -386,7 +418,7 @@ async function withCachedConnection(agentUrl, authToken, authHeaders, debugLogs,
         catch {
             /* ignore */
         }
-        const retryClient = await getOrCreateConnection(cacheKey, baseUrl, authHeaders, debugLogs, `${label} (retry)`);
+        const retryClient = await getOrCreateConnection(cacheKey, baseUrl, authHeaders, debugLogs, `${label} (retry)`, requestOptions);
         try {
             return await fn(retryClient);
         }
@@ -413,21 +445,28 @@ async function withCachedConnection(agentUrl, authToken, authHeaders, debugLogs,
  * The returned client is connected and ready for use. Callers are responsible for
  * calling client.close() when done.
  */
-async function connectMCPWithFallback(url, authHeaders, debugLogs = [], label = 'connection', transportFetch) {
+async function connectMCPWithFallback(url, authHeaders, debugLogs = [], label = 'connection', transportFetch, requestOptions = {}) {
     return (0, tracing_1.withSpan)('adcp.mcp.connect', {
         'http.url': url.toString(),
         'adcp.connection_label': label,
     }, async () => {
-        return connectMCPWithFallbackImpl(url, authHeaders, debugLogs, label, transportFetch);
+        return connectMCPWithFallbackImpl(url, authHeaders, debugLogs, label, transportFetch, requestOptions);
     });
 }
-async function connectMCPWithFallbackImpl(url, authHeaders, debugLogs = [], label = 'connection', transportFetch) {
+async function connectMCPWithFallbackImpl(url, authHeaders, debugLogs = [], label = 'connection', transportFetch, requestOptions = {}) {
     const signingContext = client_1.signingContextStorage.getStore();
     // Wrap order (innermost → outermost): network → size-limit → signing → capture.
     // Size-limit applies to the raw network response so signing/capture see a
     // bounded body (capture clones via `response.clone()`, which would otherwise
     // buffer a hostile reply in memory).
-    const networkFetch = transportFetch ?? ((input, init) => fetch(input, init));
+    const requestTimeoutMs = (0, abort_1.resolveRequestTimeoutMs)(requestOptions.requestTimeoutMs);
+    const clientRequestTimeoutMs = (0, abort_1.resolveClientRequestTimeoutMs)(requestOptions.requestTimeoutMs);
+    const mcpRequestOptions = {
+        ...(requestOptions.signal && { signal: requestOptions.signal }),
+        ...(clientRequestTimeoutMs !== undefined && { timeout: clientRequestTimeoutMs }),
+    };
+    const rawNetworkFetch = transportFetch ?? ((input, init) => fetch(input, init));
+    const networkFetch = (input, init) => (0, abort_1.withAbortSignal)([requestOptions.signal, init?.signal], requestTimeoutMs, signal => rawNetworkFetch(input, { ...init, signal }));
     const sizeLimited = (0, responseSizeLimit_1.wrapFetchWithSizeLimit)(networkFetch);
     const diagnosticFetch = (0, transportDiagnostics_1.wrapFetchWithTransportDiagnostics)(sizeLimited);
     const baseFetch = signingContext
@@ -450,7 +489,7 @@ async function connectMCPWithFallbackImpl(url, authHeaders, debugLogs = [], labe
             message: `MCP: Attempting StreamableHTTP ${label} to ${url}`,
             timestamp: new Date().toISOString(),
         });
-        await client.connect(new streamableHttp_js_1.StreamableHTTPClientTransport(url, transportOptions));
+        await client.connect(new streamableHttp_js_1.StreamableHTTPClientTransport(url, transportOptions), mcpRequestOptions);
         failedClient = undefined;
         trackStreamableHTTPUrl(url.toString());
         debugLogs.push({
@@ -479,6 +518,9 @@ async function connectMCPWithFallbackImpl(url, authHeaders, debugLogs = [], labe
             timestamp: new Date().toISOString(),
             error,
         });
+        if ((0, abort_1.isAbortOrTimeoutError)(error)) {
+            throw error;
+        }
         // Retry StreamableHTTP once on any transient connect failure — network blips,
         // JSON parse errors on half-buffered responses, and mid-handshake proxy
         // disconnects all surface as generic Error or McpError, not StreamableHTTPError.
@@ -491,7 +533,7 @@ async function connectMCPWithFallbackImpl(url, authHeaders, debugLogs = [], labe
             });
             const retryClient = new index_js_1.Client({ name: 'AdCP-Client', version: '1.0.0' });
             try {
-                await retryClient.connect(new streamableHttp_js_1.StreamableHTTPClientTransport(url, transportOptions));
+                await retryClient.connect(new streamableHttp_js_1.StreamableHTTPClientTransport(url, transportOptions), mcpRequestOptions);
                 trackStreamableHTTPUrl(url.toString());
                 debugLogs.push({
                     type: 'success',
@@ -512,6 +554,9 @@ async function connectMCPWithFallbackImpl(url, authHeaders, debugLogs = [], labe
                     message: `MCP: StreamableHTTP retry also failed for ${label}: ${retryError instanceof Error ? retryError.message : String(retryError)}`,
                     timestamp: new Date().toISOString(),
                 });
+                if ((0, abort_1.isAbortOrTimeoutError)(retryError)) {
+                    throw retryError;
+                }
                 // Fall through to SSE fallback below
             }
         }
@@ -538,10 +583,21 @@ async function connectMCPWithFallbackImpl(url, authHeaders, debugLogs = [], labe
             timestamp: new Date().toISOString(),
         });
         const client = new index_js_1.Client({ name: 'AdCP-Client', version: '1.0.0' });
-        await client.connect(new sse_js_1.SSEClientTransport(url, {
-            requestInit: { headers: authHeaders, ...(transportFetch ? { redirect: 'manual' } : {}) },
-            fetch: (0, rawResponseCapture_1.wrapFetchWithCapture)(baseFetch),
-        }));
+        try {
+            await client.connect(new sse_js_1.SSEClientTransport(url, {
+                requestInit: { headers: authHeaders, ...(transportFetch ? { redirect: 'manual' } : {}) },
+                fetch: (0, rawResponseCapture_1.wrapFetchWithCapture)(baseFetch),
+            }), mcpRequestOptions);
+        }
+        catch (sseError) {
+            try {
+                await client.close();
+            }
+            catch {
+                /* ignore */
+            }
+            throw sseError;
+        }
         debugLogs.push({
             type: 'success',
             message: `MCP: Connected via SSE transport for ${label}`,
@@ -550,12 +606,12 @@ async function connectMCPWithFallbackImpl(url, authHeaders, debugLogs = [], labe
         return client;
     }
 }
-async function callMCPTool(agentUrl, toolName, args, authToken, debugLogs = [], customHeaders, signingContext, transportFetch) {
+async function callMCPTool(agentUrl, toolName, args, authToken, debugLogs = [], customHeaders, signingContext, transportFetch, requestOptions) {
     return (0, tracing_1.withSpan)('adcp.mcp.call_tool', {
         'adcp.tool': toolName,
         'http.url': agentUrl,
     }, async () => {
-        return client_1.signingContextStorage.run(signingContext, () => callMCPToolImpl(agentUrl, toolName, args, authToken, debugLogs, customHeaders, transportFetch));
+        return client_1.signingContextStorage.run(signingContext, () => callMCPToolImpl(agentUrl, toolName, args, authToken, debugLogs, customHeaders, transportFetch, requestOptions));
     });
 }
 /**
@@ -565,7 +621,7 @@ async function callMCPTool(agentUrl, toolName, args, authToken, debugLogs = [],
 async function callMCPToolRaw(agentUrl, toolName, args, authToken, debugLogs = [], customHeaders, signingContext, transportFetch) {
     return client_1.signingContextStorage.run(signingContext, () => callMCPToolRawImpl(agentUrl, toolName, args, authToken, debugLogs, customHeaders, transportFetch));
 }
-async function callMCPToolImpl(agentUrl, toolName, args, authToken, debugLogs = [], customHeaders, transportFetch) {
+async function callMCPToolImpl(agentUrl, toolName, args, authToken, debugLogs = [], customHeaders, transportFetch, requestOptions) {
     // Inject trace context headers for distributed tracing
     const traceHeaders = (0, tracing_1.injectTraceHeaders)();
     // Merge: custom < trace < auth (auth always wins)
@@ -595,7 +651,11 @@ async function callMCPToolImpl(agentUrl, toolName, args, authToken, debugLogs =
             timestamp: new Date().toISOString(),
         });
     }
-    const response = await withCachedConnection(agentUrl, authToken, authHeaders, debugLogs, toolName, client => client.callTool({ name: toolName, arguments: args }), transportFetch);
+    const resolvedRequestTimeoutMs = (0, abort_1.resolveClientRequestTimeoutMs)(requestOptions?.requestTimeoutMs);
+    const response = await withCachedConnection(agentUrl, authToken, authHeaders, debugLogs, toolName, client => client.callTool({ name: toolName, arguments: args }, undefined, {
+        ...(requestOptions?.signal && { signal: requestOptions.signal }),
+        ...(resolvedRequestTimeoutMs !== undefined && { timeout: resolvedRequestTimeoutMs }),
+    }), transportFetch, requestOptions);
     debugLogs.push({
         type: response?.isError ? 'error' : 'success',
         message: `MCP: Tool ${toolName} response received (${response?.isError ? 'error' : 'success'})`,
@@ -651,7 +711,7 @@ async function callMCPToolRawImpl(agentUrl, toolName, args, authToken, debugLogs
  * ```
  */
 async function connectMCP(options) {
-    const { agentUrl, authToken, authProvider, debugLogs = [], customHeaders, signingContext } = options;
+    const { agentUrl, authToken, authProvider, debugLogs = [], customHeaders, signingContext, signal, requestTimeoutMs: configuredRequestTimeoutMs, } = options;
     const baseUrl = new URL(agentUrl);
     debugLogs.push({
         type: 'info',
@@ -714,7 +774,13 @@ async function connectMCP(options) {
     // headers the SDK assembled (including any OAuth-issued Authorization) and
     // decides per outbound request whether to sign. Size-limit sits innermost so
     // the response body is bounded before signing/capture observe it.
-    const sizeLimited = (0, responseSizeLimit_1.wrapFetchWithSizeLimit)((input, init) => fetch(input, init));
+    const requestTimeoutMs = (0, abort_1.resolveRequestTimeoutMs)(configuredRequestTimeoutMs);
+    const clientRequestTimeoutMs = (0, abort_1.resolveClientRequestTimeoutMs)(configuredRequestTimeoutMs);
+    const requestOptions = {
+        ...(signal && { signal }),
+        ...(clientRequestTimeoutMs !== undefined && { timeout: clientRequestTimeoutMs }),
+    };
+    const sizeLimited = (0, responseSizeLimit_1.wrapFetchWithSizeLimit)((input, init) => (0, abort_1.withAbortSignal)([signal, init?.signal], requestTimeoutMs, linkedSignal => fetch(input, { ...init, signal: linkedSignal })));
     const diagnosticFetch = (0, transportDiagnostics_1.wrapFetchWithTransportDiagnostics)(sizeLimited);
     const signedFetch = signingContext
         ? (0, client_1.buildAgentSigningFetch)({
@@ -726,7 +792,7 @@ async function connectMCP(options) {
     transportOptions.fetch = (0, rawResponseCapture_1.wrapFetchWithCapture)(signedFetch);
     const transport = new streamableHttp_js_1.StreamableHTTPClientTransport(baseUrl, transportOptions);
     try {
-        await mcpClient.connect(transport);
+        await mcpClient.connect(transport, requestOptions);
         debugLogs.push({
             type: 'success',
             message: 'MCP: Connected successfully',
@@ -802,10 +868,18 @@ async function connectMCP(options) {
  * @throws UnauthorizedError if OAuth is required (with transport attached)
  */
 async function callMCPToolWithOAuth(options) {
-    const { agentUrl, toolName, args, authToken, authProvider, debugLogs = [], customHeaders, signingContext } = options;
+    const { agentUrl, toolName, args, authToken, authProvider, debugLogs = [], customHeaders, signingContext, signal, requestTimeoutMs, } = options;
+    const resolvedRequestTimeoutMs = (0, abort_1.resolveClientRequestTimeoutMs)(requestTimeoutMs);
+    const requestOptions = {
+        ...(signal && { signal }),
+        ...(resolvedRequestTimeoutMs !== undefined && { timeout: resolvedRequestTimeoutMs }),
+    };
     // If no OAuth provider, use the legacy function
     if (!authProvider) {
-        return callMCPTool(agentUrl, toolName, args, authToken, debugLogs, customHeaders, signingContext);
+        return callMCPTool(agentUrl, toolName, args, authToken, debugLogs, customHeaders, signingContext, undefined, {
+            signal,
+            requestTimeoutMs,
+        });
     }
     const response = await withCachedOAuthConnection({
         agentUrl,
@@ -813,16 +887,15 @@ async function callMCPToolWithOAuth(options) {
         debugLogs,
         customHeaders,
         signingContext,
+        signal,
+        requestTimeoutMs,
     }, toolName, async (client) => {
         debugLogs.push({
             type: 'info',
             message: `MCP: Calling tool ${toolName}`,
             timestamp: new Date().toISOString(),
         });
-        const response = await client.callTool({
-            name: toolName,
-            arguments: args,
-        });
+        const response = await client.callTool({ name: toolName, arguments: args }, undefined, requestOptions);
         debugLogs.push({
             type: response?.isError ? 'error' : 'success',
             message: `MCP: Tool ${toolName} response received`,