@adcp/sdk 12.1.0 → 13.0.0-rc.0

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

@@ -38,8 +38,11 @@ const modernConnections = /* @__PURE__ */ new Map();
 const legacyConnectionExpiresAt = /* @__PURE__ */ new Map();
 const pendingModernConnections = /* @__PURE__ */ new Map();
 const knownLegacyConnections = /* @__PURE__ */ new Map();
+const modernDiscoveries = /* @__PURE__ */ new Map();
+const clientsUsingCachedDiscovery = /* @__PURE__ */ new WeakSet();
 const MAX_CACHED_CONNECTIONS = 20;
 const LEGACY_CLASSIFICATION_TTL_MS = 5 * 60 * 1e3;
+const MODERN_DISCOVERY_TTL_MS = 5 * 60 * 1e3;
 const modernOAuthProviderIds = /* @__PURE__ */ new WeakMap();
 const modernFetchFnIds = /* @__PURE__ */ new WeakMap();
 let nextModernOAuthProviderId = 0;
@@ -100,6 +103,7 @@ function isKnownLegacy(cacheKey) {
   return true;
 }
 function markKnownLegacy(cacheKey) {
+  modernDiscoveries.delete(cacheKey);
   knownLegacyConnections.delete(cacheKey);
   knownLegacyConnections.set(cacheKey, Date.now());
   while (knownLegacyConnections.size > MAX_CACHED_CONNECTIONS) {
@@ -108,6 +112,29 @@ function markKnownLegacy(cacheKey) {
     knownLegacyConnections.delete(oldest);
   }
 }
+function getCachedModernDiscovery(cacheKey) {
+  const cached = modernDiscoveries.get(cacheKey);
+  if (!cached) return void 0;
+  if (cached.expiresAt <= Date.now()) {
+    modernDiscoveries.delete(cacheKey);
+    return void 0;
+  }
+  modernDiscoveries.delete(cacheKey);
+  modernDiscoveries.set(cacheKey, cached);
+  return { kind: "modern", discover: cached.discover };
+}
+function cacheModernDiscovery(cacheKey, discover) {
+  modernDiscoveries.delete(cacheKey);
+  modernDiscoveries.set(cacheKey, {
+    discover,
+    expiresAt: Date.now() + MODERN_DISCOVERY_TTL_MS
+  });
+  while (modernDiscoveries.size > MAX_CACHED_CONNECTIONS) {
+    const oldest = modernDiscoveries.keys().next().value;
+    if (!oldest) break;
+    modernDiscoveries.delete(oldest);
+  }
+}
 function httpStatusOf(error, depth = 0) {
   if (!error || typeof error !== "object" || depth > 4) return void 0;
   const candidate = error;
@@ -150,7 +177,8 @@ function evictLeastRecentlyUsed() {
   void client?.close().catch(() => {
   });
 }
-async function createNegotiatedClient(options, authHeaders) {
+async function createNegotiatedClient(cacheKey, options, authHeaders, useCachedDiscovery = true) {
+  const generation = connectionGeneration;
   const requestTimeoutMs = (0, import_abort.resolveRequestTimeoutMs)(options.requestTimeoutMs);
   const clientRequestTimeoutMs = (0, import_abort.resolveClientRequestTimeoutMs)(options.requestTimeoutMs);
   const rawNetworkFetch = options.fetchFn ?? ((input, init) => fetch(input, init));
@@ -181,17 +209,31 @@ async function createNegotiatedClient(options, authHeaders) {
       }
     }
   );
+  const prior = useCachedDiscovery ? getCachedModernDiscovery(cacheKey) : void 0;
   try {
     await client.connect(transport, {
       ...options.signal && { signal: options.signal },
-      ...clientRequestTimeoutMs !== void 0 && { timeout: clientRequestTimeoutMs }
+      ...clientRequestTimeoutMs !== void 0 && { timeout: clientRequestTimeoutMs },
+      ...prior && { prior }
     });
+    if (prior) clientsUsingCachedDiscovery.add(client);
+    if (!prior) {
+      const discover = client.getDiscoverResult();
+      if (generation === connectionGeneration) {
+        if (client.getProtocolEra() === "modern" && discover) cacheModernDiscovery(cacheKey, discover);
+        else modernDiscoveries.delete(cacheKey);
+      }
+    }
     return client;
   } catch (error) {
+    if (prior) modernDiscoveries.delete(cacheKey);
     try {
       await client.close();
     } catch {
     }
+    if (prior && import_client.SdkError.isInstance(error) && error.code === import_client.SdkErrorCode.EraNegotiationFailed) {
+      return createNegotiatedClient(cacheKey, options, authHeaders, false);
+    }
     throw error;
   }
 }
@@ -201,7 +243,7 @@ async function getOrCreateModernConnection(cacheKey, options, authHeaders) {
   const pending = pendingModernConnections.get(cacheKey);
   if (pending) return pending;
   const generation = connectionGeneration;
-  const promise = createNegotiatedClient(options, authHeaders).then((client) => {
+  const promise = createNegotiatedClient(cacheKey, options, authHeaders).then((client) => {
     if ((client.getProtocolEra() === "modern" || options.handleLegacy === true) && generation === connectionGeneration) {
       modernConnections.set(cacheKey, client);
       if (client.getProtocolEra() === "legacy") {
@@ -244,7 +286,7 @@ async function attemptModernCall(options, toolName, args) {
   const guardedConnection = options.signal !== void 0 || options.requestTimeoutMs !== void 0 || options.fetchFn !== void 0;
   let client;
   try {
-    client = guardedConnection ? await createNegotiatedClient(options, authHeaders) : await getOrCreateModernConnection(cacheKey, options, authHeaders);
+    client = guardedConnection ? await createNegotiatedClient(cacheKey, options, authHeaders) : await getOrCreateModernConnection(cacheKey, options, authHeaders);
   } catch (error) {
     const status = httpStatusOf(error);
     if (status === 404 || status === 405) {
@@ -290,6 +332,7 @@ async function attemptModernCall(options, toolName, args) {
   } catch (error) {
     modernConnections.delete(cacheKey);
     legacyConnectionExpiresAt.delete(cacheKey);
+    modernDiscoveries.delete(cacheKey);
     try {
       await client.close();
     } catch {
@@ -343,11 +386,19 @@ async function probeModernMCPConnection(agentUrl, authToken, customHeaders, opti
     handleLegacy: options.handleLegacy
   };
   const authHeaders = buildAuthHeaders(authToken, customHeaders, options.authProvider);
+  const cacheKey = connectionCacheKey(
+    agentUrl,
+    authHeaders,
+    options.signingContext?.cacheKey,
+    options.authProvider,
+    options.fetchFn
+  );
   let client;
   try {
-    client = await createNegotiatedClient(connectionOptions, authHeaders);
+    client = await createNegotiatedClient(cacheKey, connectionOptions, authHeaders, false);
     return { connected: true, era: client.getProtocolEra() };
   } catch (error) {
+    modernDiscoveries.delete(cacheKey);
     if ((0, import_errors.is401Error)(error) || (0, import_abort.isAbortOrTimeoutError)(error)) throw error;
     const status = httpStatusOf(error);
     if (status === 404 || status === 405) return { connected: false };
@@ -370,21 +421,44 @@ async function tryListModernMCPTools(agentUrl, authToken, customHeaders, options
     fetchFn: options.fetchFn
   };
   const authHeaders = buildAuthHeaders(authToken, customHeaders, options.authProvider);
+  const cacheKey = connectionCacheKey(
+    agentUrl,
+    authHeaders,
+    options.signingContext?.cacheKey,
+    options.authProvider,
+    options.fetchFn
+  );
   let client;
-  try {
-    client = await createNegotiatedClient(connectionOptions, authHeaders);
-    if (client.getProtocolEra() !== "modern") return { handled: false };
+  const listTools = async (connectedClient) => {
+    if (connectedClient.getProtocolEra() !== "modern") return { handled: false };
     const resolvedRequestTimeoutMs = (0, import_abort.resolveClientRequestTimeoutMs)(options.requestTimeoutMs);
-    const result = await client.listTools(void 0, {
+    const result = await connectedClient.listTools(void 0, {
       ...options.signal && { signal: options.signal },
       ...resolvedRequestTimeoutMs !== void 0 && { timeout: resolvedRequestTimeoutMs }
     });
     return { handled: true, tools: result.tools };
+  };
+  try {
+    client = await createNegotiatedClient(cacheKey, connectionOptions, authHeaders);
+    return await listTools(client);
   } catch (error) {
-    if ((0, import_errors.is401Error)(error) || (0, import_abort.isAbortOrTimeoutError)(error)) throw error;
-    const status = httpStatusOf(error);
+    let failure = error;
+    modernDiscoveries.delete(cacheKey);
+    if (!(0, import_errors.is401Error)(failure) && !(0, import_abort.isAbortOrTimeoutError)(failure) && client && clientsUsingCachedDiscovery.has(client)) {
+      await client.close().catch(() => {
+      });
+      try {
+        client = await createNegotiatedClient(cacheKey, connectionOptions, authHeaders, false);
+        return await listTools(client);
+      } catch (retryError) {
+        failure = retryError;
+        modernDiscoveries.delete(cacheKey);
+      }
+    }
+    if ((0, import_errors.is401Error)(failure) || (0, import_abort.isAbortOrTimeoutError)(failure)) throw failure;
+    const status = httpStatusOf(failure);
     if (status === 404 || status === 405) return { handled: false };
-    throw error;
+    throw failure;
   } finally {
     await client?.close().catch(() => {
     });
@@ -402,6 +476,7 @@ async function closeModernMCPConnections() {
   modernConnections.clear();
   legacyConnectionExpiresAt.clear();
   knownLegacyConnections.clear();
+  modernDiscoveries.clear();
   for (const client of clients) {
     try {
       await client.close();

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/protocols/mcp-modern.ts"],"sourcesContent":["/**\n * MCP 2026-07-28 client path.\n *\n * The v2 SDK removed the experimental 2025 Tasks interception API. During the\n * migration window we therefore negotiate with the v2 client first and use it\n * only when the peer selects the modern protocol era. Legacy peers fall back\n * to mcp-tasks.ts, which keeps the existing v1 Tasks behavior intact.\n */\n\nimport {\n  Client,\n  StreamableHTTPClientTransport,\n  type OAuthClientProvider as ModernOAuthClientProvider,\n  type Tool,\n} from '@modelcontextprotocol/client';\nimport { createHmac } from 'node:crypto';\nimport { createMCPAuthHeaders } from '../auth';\nimport { is401Error } from '../errors';\nimport { withSpan, injectTraceHeaders } from '../observability/tracing';\nimport { buildAgentSigningFetch, signingContextStorage, type AgentSigningContext } from '../signing/client';\nimport type { DebugLogEntry } from '../types/adcp';\nimport {\n  isAbortOrTimeoutError,\n  resolveClientRequestTimeoutMs,\n  resolveRequestTimeoutMs,\n  withAbortSignal,\n} from './abort';\nimport { wrapFetchWithCapture } from './rawResponseCapture';\nimport { wrapFetchWithSizeLimit } from './responseSizeLimit';\nimport { wrapFetchWithTransportDiagnostics } from './transportDiagnostics';\n\ntype CallToolResponse = {\n  isError?: boolean;\n  content?: Array<{ type: string; text?: string }>;\n  [key: string]: unknown;\n};\n\nexport type ModernMCPAttempt = { handled: false } | { handled: true; response: CallToolResponse };\nexport type ModernMCPListAttempt = { handled: false } | { handled: true; tools: Tool[] };\n\nexport interface ModernMCPConnectionOptions {\n  signingContext?: AgentSigningContext;\n  authProvider?: object;\n  signal?: AbortSignal;\n  requestTimeoutMs?: number;\n  fetchFn?: typeof fetch;\n  /** Use the v2 SDK's negotiated legacy client instead of handing off to v1. */\n  handleLegacy?: boolean;\n}\n\ninterface ModernConnectionOptions {\n  agentUrl: string;\n  authToken?: string;\n  customHeaders?: Record<string, string>;\n  debugLogs: DebugLogEntry[];\n  signingContext?: AgentSigningContext;\n  authProvider?: object;\n  signal?: AbortSignal;\n  requestTimeoutMs?: number;\n  fetchFn?: typeof fetch;\n  handleLegacy?: boolean;\n}\n\nconst modernConnections = new Map<string, Client>();\nconst legacyConnectionExpiresAt = new Map<string, number>();\nconst pendingModernConnections = new Map<string, Promise<Client>>();\nconst knownLegacyConnections = new Map<string, number>();\nconst MAX_CACHED_CONNECTIONS = 20;\nconst LEGACY_CLASSIFICATION_TTL_MS = 5 * 60 * 1000;\nconst modernOAuthProviderIds = new WeakMap<object, string>();\nconst modernFetchFnIds = new WeakMap<typeof fetch, string>();\nlet nextModernOAuthProviderId = 0;\nlet nextModernFetchFnId = 0;\nlet connectionGeneration = 0;\n\nfunction cacheDisambiguator(value: string): string {\n  return createHmac('sha256', '').update(value).digest('hex');\n}\n\nfunction buildAuthHeaders(\n  authToken: string | undefined,\n  customHeaders: Record<string, string> | undefined,\n  authProvider?: object\n): Record<string, string> {\n  const filteredHeaders =\n    authProvider || authToken\n      ? Object.fromEntries(\n          Object.entries(customHeaders ?? {}).filter(keyValue => {\n            const key = keyValue[0].toLowerCase();\n            return key !== 'authorization' && key !== 'x-adcp-auth';\n          })\n        )\n      : customHeaders;\n  return {\n    ...filteredHeaders,\n    ...(!authProvider && authToken ? createMCPAuthHeaders(authToken) : {}),\n  };\n}\n\nfunction oauthProviderCacheKey(provider: object | undefined): string | undefined {\n  if (!provider) return undefined;\n  let key = modernOAuthProviderIds.get(provider);\n  if (!key) {\n    key = `oauth-provider:${++nextModernOAuthProviderId}`;\n    modernOAuthProviderIds.set(provider, key);\n  }\n  return key;\n}\n\nfunction fetchFnCacheKey(fetchFn: typeof fetch | undefined): string | undefined {\n  if (!fetchFn) return undefined;\n  let key = modernFetchFnIds.get(fetchFn);\n  if (!key) {\n    key = `fetch:${++nextModernFetchFnId}`;\n    modernFetchFnIds.set(fetchFn, key);\n  }\n  return key;\n}\n\nfunction connectionCacheKey(\n  agentUrl: string,\n  headers: Record<string, string>,\n  signingCacheKey?: string,\n  authProvider?: object,\n  fetchFn?: typeof fetch\n): string {\n  const normalizedHeaders = Object.entries(headers)\n    .map(([key, value]) => [key.toLowerCase(), value] as const)\n    .sort(([left], [right]) => left.localeCompare(right));\n  const parts = [agentUrl, `headers:${cacheDisambiguator(JSON.stringify(normalizedHeaders))}`];\n  if (signingCacheKey) parts.push(signingCacheKey);\n  const providerKey = oauthProviderCacheKey(authProvider);\n  if (providerKey) parts.push(providerKey);\n  const fetchKey = fetchFnCacheKey(fetchFn);\n  if (fetchKey) parts.push(fetchKey);\n  return parts.join('::');\n}\n\nfunction isKnownLegacy(cacheKey: string): boolean {\n  const classifiedAt = knownLegacyConnections.get(cacheKey);\n  if (classifiedAt === undefined) return false;\n  if (Date.now() - classifiedAt > LEGACY_CLASSIFICATION_TTL_MS) {\n    knownLegacyConnections.delete(cacheKey);\n    return false;\n  }\n  knownLegacyConnections.delete(cacheKey);\n  knownLegacyConnections.set(cacheKey, classifiedAt);\n  return true;\n}\n\nfunction markKnownLegacy(cacheKey: string): void {\n  knownLegacyConnections.delete(cacheKey);\n  knownLegacyConnections.set(cacheKey, Date.now());\n  while (knownLegacyConnections.size > MAX_CACHED_CONNECTIONS) {\n    const oldest = knownLegacyConnections.keys().next().value;\n    if (!oldest) break;\n    knownLegacyConnections.delete(oldest);\n  }\n}\n\nfunction httpStatusOf(error: unknown, depth = 0): number | undefined {\n  if (!error || typeof error !== 'object' || depth > 4) return undefined;\n  const candidate = error as { status?: unknown; code?: unknown; cause?: unknown; response?: { status?: unknown } };\n  if (typeof candidate.status === 'number') return candidate.status;\n  if (typeof candidate.response?.status === 'number') return candidate.response.status;\n  if (typeof candidate.code === 'number' && candidate.code >= 100 && candidate.code <= 599) return candidate.code;\n  return httpStatusOf(candidate.cause, depth + 1);\n}\n\nfunction withPerRequestTraceHeaders(fetchImpl: typeof fetch): typeof fetch {\n  return (input, init) => {\n    const headers = new Headers(input instanceof Request ? input.headers : undefined);\n    new Headers(init?.headers).forEach((value, key) => headers.set(key, value));\n    for (const [key, value] of Object.entries(injectTraceHeaders())) headers.set(key, value);\n    return fetchImpl(input, { ...init, headers });\n  };\n}\n\nfunction getCachedConnection(cacheKey: string): Client | undefined {\n  const client = modernConnections.get(cacheKey);\n  if (client) {\n    const legacyExpiry = legacyConnectionExpiresAt.get(cacheKey);\n    if (legacyExpiry !== undefined && legacyExpiry <= Date.now()) {\n      modernConnections.delete(cacheKey);\n      legacyConnectionExpiresAt.delete(cacheKey);\n      void client.close().catch(() => {});\n      return undefined;\n    }\n    modernConnections.delete(cacheKey);\n    modernConnections.set(cacheKey, client);\n  }\n  return client;\n}\n\nfunction evictLeastRecentlyUsed(): void {\n  if (modernConnections.size <= MAX_CACHED_CONNECTIONS) return;\n  const oldestKey = modernConnections.keys().next().value;\n  if (!oldestKey) return;\n  const client = modernConnections.get(oldestKey);\n  modernConnections.delete(oldestKey);\n  legacyConnectionExpiresAt.delete(oldestKey);\n  void client?.close().catch(() => {});\n}\n\nasync function createNegotiatedClient(\n  options: ModernConnectionOptions,\n  authHeaders: Record<string, string>\n): Promise<Client> {\n  const requestTimeoutMs = resolveRequestTimeoutMs(options.requestTimeoutMs);\n  const clientRequestTimeoutMs = resolveClientRequestTimeoutMs(options.requestTimeoutMs);\n  const rawNetworkFetch: typeof fetch = options.fetchFn ?? ((input, init) => fetch(input, init));\n  const networkFetch: typeof fetch = (input, init) =>\n    withAbortSignal<Response>([options.signal, init?.signal], requestTimeoutMs, signal =>\n      rawNetworkFetch(input, { ...init, signal })\n    );\n  const diagnosticFetch = wrapFetchWithTransportDiagnostics(wrapFetchWithSizeLimit(networkFetch));\n  const signedFetch: typeof fetch = options.signingContext\n    ? (buildAgentSigningFetch({\n        upstream: diagnosticFetch,\n        signing: options.signingContext.signing,\n        getCapability: options.signingContext.getCapability,\n      }) as typeof fetch)\n    : diagnosticFetch;\n  const transport = new StreamableHTTPClientTransport(new URL(options.agentUrl), {\n    requestInit: { headers: authHeaders, redirect: 'manual' },\n    fetch: wrapFetchWithCapture(withPerRequestTraceHeaders(signedFetch)),\n    ...(options.authProvider && {\n      authProvider: options.authProvider as ModernOAuthClientProvider,\n    }),\n  });\n  const client = new Client(\n    { name: 'AdCP-Client', version: '1.0.0' },\n    {\n      versionNegotiation: {\n        mode: 'auto',\n        ...(clientRequestTimeoutMs !== undefined && { probe: { timeoutMs: clientRequestTimeoutMs } }),\n      },\n    }\n  );\n\n  try {\n    await client.connect(transport, {\n      ...(options.signal && { signal: options.signal }),\n      ...(clientRequestTimeoutMs !== undefined && { timeout: clientRequestTimeoutMs }),\n    });\n    return client;\n  } catch (error) {\n    try {\n      await client.close();\n    } catch {\n      /* ignore close errors */\n    }\n    throw error;\n  }\n}\n\nasync function getOrCreateModernConnection(\n  cacheKey: string,\n  options: ModernConnectionOptions,\n  authHeaders: Record<string, string>\n): Promise<Client> {\n  const cached = getCachedConnection(cacheKey);\n  if (cached) return cached;\n\n  const pending = pendingModernConnections.get(cacheKey);\n  if (pending) return pending;\n\n  const generation = connectionGeneration;\n  const promise = createNegotiatedClient(options, authHeaders)\n    .then(client => {\n      if (\n        (client.getProtocolEra() === 'modern' || options.handleLegacy === true) &&\n        generation === connectionGeneration\n      ) {\n        modernConnections.set(cacheKey, client);\n        if (client.getProtocolEra() === 'legacy') {\n          legacyConnectionExpiresAt.set(cacheKey, Date.now() + LEGACY_CLASSIFICATION_TTL_MS);\n        } else {\n          legacyConnectionExpiresAt.delete(cacheKey);\n        }\n        evictLeastRecentlyUsed();\n      } else if (generation !== connectionGeneration) {\n        void client.close().catch(() => {});\n      }\n      return client;\n    })\n    .finally(() => {\n      if (pendingModernConnections.get(cacheKey) === promise) pendingModernConnections.delete(cacheKey);\n    });\n  pendingModernConnections.set(cacheKey, promise);\n  return promise;\n}\n\nasync function callOnModernClient(\n  client: Client,\n  toolName: string,\n  args: Record<string, unknown>,\n  signal?: AbortSignal,\n  requestTimeoutMs?: number\n): Promise<CallToolResponse> {\n  const resolvedRequestTimeoutMs = resolveClientRequestTimeoutMs(requestTimeoutMs);\n  return (await client.callTool(\n    { name: toolName, arguments: args },\n    {\n      ...(signal && { signal }),\n      ...(resolvedRequestTimeoutMs !== undefined && { timeout: resolvedRequestTimeoutMs }),\n    }\n  )) as CallToolResponse;\n}\n\nasync function attemptModernCall(\n  options: ModernConnectionOptions,\n  toolName: string,\n  args: Record<string, unknown>\n): Promise<ModernMCPAttempt> {\n  const authHeaders = buildAuthHeaders(options.authToken, options.customHeaders, options.authProvider);\n  const cacheKey = connectionCacheKey(\n    options.agentUrl,\n    authHeaders,\n    options.signingContext?.cacheKey,\n    options.authProvider,\n    options.fetchFn\n  );\n  if (isKnownLegacy(cacheKey)) return { handled: false };\n\n  const guardedConnection =\n    options.signal !== undefined || options.requestTimeoutMs !== undefined || options.fetchFn !== undefined;\n  let client: Client;\n  try {\n    client = guardedConnection\n      ? await createNegotiatedClient(options, authHeaders)\n      : await getOrCreateModernConnection(cacheKey, options, authHeaders);\n  } catch (error) {\n    const status = httpStatusOf(error);\n    if (status === 404 || status === 405) {\n      markKnownLegacy(cacheKey);\n      options.debugLogs.push({\n        type: 'info',\n        message: `MCP: Modern Streamable HTTP is unavailable (HTTP ${status}); preserving the v1 transport path`,\n        timestamp: new Date().toISOString(),\n      });\n      return { handled: false };\n    }\n    throw error;\n  }\n\n  if (client.getProtocolEra() !== 'modern') {\n    if (options.handleLegacy === true) {\n      options.debugLogs.push({\n        type: 'info',\n        message: `MCP: v2 client selected the legacy protocol era for ${toolName}`,\n        timestamp: new Date().toISOString(),\n      });\n    } else {\n      markKnownLegacy(cacheKey);\n      try {\n        await client.close();\n      } catch {\n        /* ignore close errors */\n      }\n      options.debugLogs.push({\n        type: 'info',\n        message: `MCP: Server selected the legacy protocol era for ${toolName}; preserving the v1 Tasks path`,\n        timestamp: new Date().toISOString(),\n      });\n      return { handled: false };\n    }\n  }\n\n  options.debugLogs.push({\n    type: 'success',\n    message: `MCP: Negotiated protocol ${client.getNegotiatedProtocolVersion()} for ${toolName}`,\n    timestamp: new Date().toISOString(),\n  });\n\n  try {\n    const response = await callOnModernClient(client, toolName, args, options.signal, options.requestTimeoutMs);\n    return { handled: true, response };\n  } catch (error) {\n    // A tool request may have reached the server even when its response was\n    // lost. Never replay automatically: mutating AdCP tools depend on the\n    // caller's explicit idempotency policy, not transport guesswork.\n    modernConnections.delete(cacheKey);\n    legacyConnectionExpiresAt.delete(cacheKey);\n    try {\n      await client.close();\n    } catch {\n      /* ignore close errors */\n    }\n    throw error;\n  } finally {\n    if (guardedConnection) {\n      try {\n        await client.close();\n      } catch {\n        /* ignore close errors */\n      }\n    }\n  }\n}\n\n/**\n * Try a tool call using the MCP 2026-07-28 protocol era.\n *\n * `handled: false` means the caller must use the existing v1 client. This is\n * deliberately a result rather than an exception because legacy negotiation\n * is normal during the transition window.\n */\nexport async function tryCallModernMCPTool(\n  agentUrl: string,\n  toolName: string,\n  args: Record<string, unknown>,\n  authToken?: string,\n  debugLogs: DebugLogEntry[] = [],\n  customHeaders?: Record<string, string>,\n  options: ModernMCPConnectionOptions = {}\n): Promise<ModernMCPAttempt> {\n  return withSpan('adcp.mcp.negotiate', { 'adcp.tool': toolName, 'http.url': agentUrl }, () =>\n    signingContextStorage.run(options.signingContext, () =>\n      attemptModernCall(\n        {\n          agentUrl,\n          authToken,\n          customHeaders,\n          debugLogs,\n          signingContext: options.signingContext,\n          authProvider: options.authProvider,\n          signal: options.signal,\n          requestTimeoutMs: options.requestTimeoutMs,\n          fetchFn: options.fetchFn,\n          handleLegacy: options.handleLegacy,\n        },\n        toolName,\n        args\n      )\n    )\n  );\n}\n\n/**\n * Probe an endpoint with the official v2 client's auto negotiation.\n * `connected: false` lets endpoint discovery retain its v1 SSE fallback.\n */\nexport async function probeModernMCPConnection(\n  agentUrl: string,\n  authToken?: string,\n  customHeaders?: Record<string, string>,\n  options: ModernMCPConnectionOptions = {}\n): Promise<{ connected: boolean; era?: 'legacy' | 'modern' }> {\n  const connectionOptions: ModernConnectionOptions = {\n    agentUrl,\n    authToken,\n    customHeaders,\n    debugLogs: [],\n    signingContext: options.signingContext,\n    authProvider: options.authProvider,\n    signal: options.signal,\n    requestTimeoutMs: options.requestTimeoutMs,\n    fetchFn: options.fetchFn,\n    handleLegacy: options.handleLegacy,\n  };\n  const authHeaders = buildAuthHeaders(authToken, customHeaders, options.authProvider);\n  let client: Client | undefined;\n  try {\n    client = await createNegotiatedClient(connectionOptions, authHeaders);\n    return { connected: true, era: client.getProtocolEra() };\n  } catch (error) {\n    if (is401Error(error) || isAbortOrTimeoutError(error)) throw error;\n    const status = httpStatusOf(error);\n    if (status === 404 || status === 405) return { connected: false };\n    throw error;\n  } finally {\n    await client?.close().catch(() => {});\n  }\n}\n\n/** List tools when the endpoint selected the modern era; otherwise let the v1 caller continue. */\nexport async function tryListModernMCPTools(\n  agentUrl: string,\n  authToken?: string,\n  customHeaders?: Record<string, string>,\n  options: ModernMCPConnectionOptions = {}\n): Promise<ModernMCPListAttempt> {\n  const connectionOptions: ModernConnectionOptions = {\n    agentUrl,\n    authToken,\n    customHeaders,\n    debugLogs: [],\n    signingContext: options.signingContext,\n    authProvider: options.authProvider,\n    signal: options.signal,\n    requestTimeoutMs: options.requestTimeoutMs,\n    fetchFn: options.fetchFn,\n  };\n  const authHeaders = buildAuthHeaders(authToken, customHeaders, options.authProvider);\n  let client: Client | undefined;\n  try {\n    client = await createNegotiatedClient(connectionOptions, authHeaders);\n    if (client.getProtocolEra() !== 'modern') return { handled: false };\n    const resolvedRequestTimeoutMs = resolveClientRequestTimeoutMs(options.requestTimeoutMs);\n    const result = await client.listTools(undefined, {\n      ...(options.signal && { signal: options.signal }),\n      ...(resolvedRequestTimeoutMs !== undefined && { timeout: resolvedRequestTimeoutMs }),\n    });\n    return { handled: true, tools: result.tools };\n  } catch (error) {\n    if (is401Error(error) || isAbortOrTimeoutError(error)) throw error;\n    const status = httpStatusOf(error);\n    if (status === 404 || status === 405) return { handled: false };\n    throw error;\n  } finally {\n    await client?.close().catch(() => {});\n  }\n}\n\nexport async function closeModernMCPConnections(): Promise<void> {\n  connectionGeneration++;\n  const pending = [...pendingModernConnections.values()];\n  pendingModernConnections.clear();\n  const settled = await Promise.allSettled(pending);\n  const clients = new Set(modernConnections.values());\n  for (const result of settled) {\n    if (result.status === 'fulfilled') clients.add(result.value);\n  }\n  modernConnections.clear();\n  legacyConnectionExpiresAt.clear();\n  knownLegacyConnections.clear();\n  for (const client of clients) {\n    try {\n      await client.close();\n    } catch {\n      /* ignore close errors */\n    }\n  }\n}\n"],"mappings":"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","names":["import_client"]}
+{"version":3,"sources":["../../../src/lib/protocols/mcp-modern.ts"],"sourcesContent":["/**\n * MCP 2026-07-28 client path.\n *\n * The v2 SDK removed the experimental 2025 Tasks interception API. During the\n * migration window we therefore negotiate with the v2 client first and use it\n * only when the peer selects the modern protocol era. Legacy peers fall back\n * to mcp-tasks.ts, which keeps the existing v1 Tasks behavior intact.\n */\n\nimport {\n  Client,\n  SdkError,\n  SdkErrorCode,\n  StreamableHTTPClientTransport,\n  type DiscoverResult,\n  type OAuthClientProvider as ModernOAuthClientProvider,\n  type PriorDiscovery,\n  type Tool,\n} from '@modelcontextprotocol/client';\nimport { createHmac } from 'node:crypto';\nimport { createMCPAuthHeaders } from '../auth';\nimport { is401Error } from '../errors';\nimport { withSpan, injectTraceHeaders } from '../observability/tracing';\nimport { buildAgentSigningFetch, signingContextStorage, type AgentSigningContext } from '../signing/client';\nimport type { DebugLogEntry } from '../types/adcp';\nimport {\n  isAbortOrTimeoutError,\n  resolveClientRequestTimeoutMs,\n  resolveRequestTimeoutMs,\n  withAbortSignal,\n} from './abort';\nimport { wrapFetchWithCapture } from './rawResponseCapture';\nimport { wrapFetchWithSizeLimit } from './responseSizeLimit';\nimport { wrapFetchWithTransportDiagnostics } from './transportDiagnostics';\n\ntype CallToolResponse = {\n  isError?: boolean;\n  content?: Array<{ type: string; text?: string }>;\n  [key: string]: unknown;\n};\n\nexport type ModernMCPAttempt = { handled: false } | { handled: true; response: CallToolResponse };\nexport type ModernMCPListAttempt = { handled: false } | { handled: true; tools: Tool[] };\n\nexport interface ModernMCPConnectionOptions {\n  signingContext?: AgentSigningContext;\n  authProvider?: object;\n  signal?: AbortSignal;\n  requestTimeoutMs?: number;\n  fetchFn?: typeof fetch;\n  /** Use the v2 SDK's negotiated legacy client instead of handing off to v1. */\n  handleLegacy?: boolean;\n}\n\ninterface ModernConnectionOptions {\n  agentUrl: string;\n  authToken?: string;\n  customHeaders?: Record<string, string>;\n  debugLogs: DebugLogEntry[];\n  signingContext?: AgentSigningContext;\n  authProvider?: object;\n  signal?: AbortSignal;\n  requestTimeoutMs?: number;\n  fetchFn?: typeof fetch;\n  handleLegacy?: boolean;\n}\n\nconst modernConnections = new Map<string, Client>();\nconst legacyConnectionExpiresAt = new Map<string, number>();\nconst pendingModernConnections = new Map<string, Promise<Client>>();\nconst knownLegacyConnections = new Map<string, number>();\nconst modernDiscoveries = new Map<string, { discover: DiscoverResult; expiresAt: number }>();\nconst clientsUsingCachedDiscovery = new WeakSet<Client>();\nconst MAX_CACHED_CONNECTIONS = 20;\nconst LEGACY_CLASSIFICATION_TTL_MS = 5 * 60 * 1000;\nconst MODERN_DISCOVERY_TTL_MS = 5 * 60 * 1000;\nconst modernOAuthProviderIds = new WeakMap<object, string>();\nconst modernFetchFnIds = new WeakMap<typeof fetch, string>();\nlet nextModernOAuthProviderId = 0;\nlet nextModernFetchFnId = 0;\nlet connectionGeneration = 0;\n\nfunction cacheDisambiguator(value: string): string {\n  return createHmac('sha256', '').update(value).digest('hex');\n}\n\nfunction buildAuthHeaders(\n  authToken: string | undefined,\n  customHeaders: Record<string, string> | undefined,\n  authProvider?: object\n): Record<string, string> {\n  const filteredHeaders =\n    authProvider || authToken\n      ? Object.fromEntries(\n          Object.entries(customHeaders ?? {}).filter(keyValue => {\n            const key = keyValue[0].toLowerCase();\n            return key !== 'authorization' && key !== 'x-adcp-auth';\n          })\n        )\n      : customHeaders;\n  return {\n    ...filteredHeaders,\n    ...(!authProvider && authToken ? createMCPAuthHeaders(authToken) : {}),\n  };\n}\n\nfunction oauthProviderCacheKey(provider: object | undefined): string | undefined {\n  if (!provider) return undefined;\n  let key = modernOAuthProviderIds.get(provider);\n  if (!key) {\n    key = `oauth-provider:${++nextModernOAuthProviderId}`;\n    modernOAuthProviderIds.set(provider, key);\n  }\n  return key;\n}\n\nfunction fetchFnCacheKey(fetchFn: typeof fetch | undefined): string | undefined {\n  if (!fetchFn) return undefined;\n  let key = modernFetchFnIds.get(fetchFn);\n  if (!key) {\n    key = `fetch:${++nextModernFetchFnId}`;\n    modernFetchFnIds.set(fetchFn, key);\n  }\n  return key;\n}\n\nfunction connectionCacheKey(\n  agentUrl: string,\n  headers: Record<string, string>,\n  signingCacheKey?: string,\n  authProvider?: object,\n  fetchFn?: typeof fetch\n): string {\n  const normalizedHeaders = Object.entries(headers)\n    .map(([key, value]) => [key.toLowerCase(), value] as const)\n    .sort(([left], [right]) => left.localeCompare(right));\n  const parts = [agentUrl, `headers:${cacheDisambiguator(JSON.stringify(normalizedHeaders))}`];\n  if (signingCacheKey) parts.push(signingCacheKey);\n  const providerKey = oauthProviderCacheKey(authProvider);\n  if (providerKey) parts.push(providerKey);\n  const fetchKey = fetchFnCacheKey(fetchFn);\n  if (fetchKey) parts.push(fetchKey);\n  return parts.join('::');\n}\n\nfunction isKnownLegacy(cacheKey: string): boolean {\n  const classifiedAt = knownLegacyConnections.get(cacheKey);\n  if (classifiedAt === undefined) return false;\n  if (Date.now() - classifiedAt > LEGACY_CLASSIFICATION_TTL_MS) {\n    knownLegacyConnections.delete(cacheKey);\n    return false;\n  }\n  knownLegacyConnections.delete(cacheKey);\n  knownLegacyConnections.set(cacheKey, classifiedAt);\n  return true;\n}\n\nfunction markKnownLegacy(cacheKey: string): void {\n  modernDiscoveries.delete(cacheKey);\n  knownLegacyConnections.delete(cacheKey);\n  knownLegacyConnections.set(cacheKey, Date.now());\n  while (knownLegacyConnections.size > MAX_CACHED_CONNECTIONS) {\n    const oldest = knownLegacyConnections.keys().next().value;\n    if (!oldest) break;\n    knownLegacyConnections.delete(oldest);\n  }\n}\n\nfunction getCachedModernDiscovery(cacheKey: string): PriorDiscovery | undefined {\n  const cached = modernDiscoveries.get(cacheKey);\n  if (!cached) return undefined;\n  if (cached.expiresAt <= Date.now()) {\n    modernDiscoveries.delete(cacheKey);\n    return undefined;\n  }\n  modernDiscoveries.delete(cacheKey);\n  modernDiscoveries.set(cacheKey, cached);\n  return { kind: 'modern', discover: cached.discover };\n}\n\nfunction cacheModernDiscovery(cacheKey: string, discover: DiscoverResult): void {\n  modernDiscoveries.delete(cacheKey);\n  modernDiscoveries.set(cacheKey, {\n    discover,\n    expiresAt: Date.now() + MODERN_DISCOVERY_TTL_MS,\n  });\n  while (modernDiscoveries.size > MAX_CACHED_CONNECTIONS) {\n    const oldest = modernDiscoveries.keys().next().value;\n    if (!oldest) break;\n    modernDiscoveries.delete(oldest);\n  }\n}\n\nfunction httpStatusOf(error: unknown, depth = 0): number | undefined {\n  if (!error || typeof error !== 'object' || depth > 4) return undefined;\n  const candidate = error as { status?: unknown; code?: unknown; cause?: unknown; response?: { status?: unknown } };\n  if (typeof candidate.status === 'number') return candidate.status;\n  if (typeof candidate.response?.status === 'number') return candidate.response.status;\n  if (typeof candidate.code === 'number' && candidate.code >= 100 && candidate.code <= 599) return candidate.code;\n  return httpStatusOf(candidate.cause, depth + 1);\n}\n\nfunction withPerRequestTraceHeaders(fetchImpl: typeof fetch): typeof fetch {\n  return (input, init) => {\n    const headers = new Headers(input instanceof Request ? input.headers : undefined);\n    new Headers(init?.headers).forEach((value, key) => headers.set(key, value));\n    for (const [key, value] of Object.entries(injectTraceHeaders())) headers.set(key, value);\n    return fetchImpl(input, { ...init, headers });\n  };\n}\n\nfunction getCachedConnection(cacheKey: string): Client | undefined {\n  const client = modernConnections.get(cacheKey);\n  if (client) {\n    const legacyExpiry = legacyConnectionExpiresAt.get(cacheKey);\n    if (legacyExpiry !== undefined && legacyExpiry <= Date.now()) {\n      modernConnections.delete(cacheKey);\n      legacyConnectionExpiresAt.delete(cacheKey);\n      void client.close().catch(() => {});\n      return undefined;\n    }\n    modernConnections.delete(cacheKey);\n    modernConnections.set(cacheKey, client);\n  }\n  return client;\n}\n\nfunction evictLeastRecentlyUsed(): void {\n  if (modernConnections.size <= MAX_CACHED_CONNECTIONS) return;\n  const oldestKey = modernConnections.keys().next().value;\n  if (!oldestKey) return;\n  const client = modernConnections.get(oldestKey);\n  modernConnections.delete(oldestKey);\n  legacyConnectionExpiresAt.delete(oldestKey);\n  void client?.close().catch(() => {});\n}\n\nasync function createNegotiatedClient(\n  cacheKey: string,\n  options: ModernConnectionOptions,\n  authHeaders: Record<string, string>,\n  useCachedDiscovery = true\n): Promise<Client> {\n  const generation = connectionGeneration;\n  const requestTimeoutMs = resolveRequestTimeoutMs(options.requestTimeoutMs);\n  const clientRequestTimeoutMs = resolveClientRequestTimeoutMs(options.requestTimeoutMs);\n  const rawNetworkFetch: typeof fetch = options.fetchFn ?? ((input, init) => fetch(input, init));\n  const networkFetch: typeof fetch = (input, init) =>\n    withAbortSignal<Response>([options.signal, init?.signal], requestTimeoutMs, signal =>\n      rawNetworkFetch(input, { ...init, signal })\n    );\n  const diagnosticFetch = wrapFetchWithTransportDiagnostics(wrapFetchWithSizeLimit(networkFetch));\n  const signedFetch: typeof fetch = options.signingContext\n    ? (buildAgentSigningFetch({\n        upstream: diagnosticFetch,\n        signing: options.signingContext.signing,\n        getCapability: options.signingContext.getCapability,\n      }) as typeof fetch)\n    : diagnosticFetch;\n  const transport = new StreamableHTTPClientTransport(new URL(options.agentUrl), {\n    requestInit: { headers: authHeaders, redirect: 'manual' },\n    fetch: wrapFetchWithCapture(withPerRequestTraceHeaders(signedFetch)),\n    ...(options.authProvider && {\n      authProvider: options.authProvider as ModernOAuthClientProvider,\n    }),\n  });\n  const client = new Client(\n    { name: 'AdCP-Client', version: '1.0.0' },\n    {\n      versionNegotiation: {\n        mode: 'auto',\n        ...(clientRequestTimeoutMs !== undefined && { probe: { timeoutMs: clientRequestTimeoutMs } }),\n      },\n    }\n  );\n\n  const prior = useCachedDiscovery ? getCachedModernDiscovery(cacheKey) : undefined;\n  try {\n    await client.connect(transport, {\n      ...(options.signal && { signal: options.signal }),\n      ...(clientRequestTimeoutMs !== undefined && { timeout: clientRequestTimeoutMs }),\n      ...(prior && { prior }),\n    });\n    if (prior) clientsUsingCachedDiscovery.add(client);\n    if (!prior) {\n      const discover = client.getDiscoverResult();\n      if (generation === connectionGeneration) {\n        if (client.getProtocolEra() === 'modern' && discover) cacheModernDiscovery(cacheKey, discover);\n        else modernDiscoveries.delete(cacheKey);\n      }\n    }\n    return client;\n  } catch (error) {\n    if (prior) modernDiscoveries.delete(cacheKey);\n    try {\n      await client.close();\n    } catch {\n      /* ignore close errors */\n    }\n    if (prior && SdkError.isInstance(error) && error.code === SdkErrorCode.EraNegotiationFailed) {\n      return createNegotiatedClient(cacheKey, options, authHeaders, false);\n    }\n    throw error;\n  }\n}\n\nasync function getOrCreateModernConnection(\n  cacheKey: string,\n  options: ModernConnectionOptions,\n  authHeaders: Record<string, string>\n): Promise<Client> {\n  const cached = getCachedConnection(cacheKey);\n  if (cached) return cached;\n\n  const pending = pendingModernConnections.get(cacheKey);\n  if (pending) return pending;\n\n  const generation = connectionGeneration;\n  const promise = createNegotiatedClient(cacheKey, options, authHeaders)\n    .then(client => {\n      if (\n        (client.getProtocolEra() === 'modern' || options.handleLegacy === true) &&\n        generation === connectionGeneration\n      ) {\n        modernConnections.set(cacheKey, client);\n        if (client.getProtocolEra() === 'legacy') {\n          legacyConnectionExpiresAt.set(cacheKey, Date.now() + LEGACY_CLASSIFICATION_TTL_MS);\n        } else {\n          legacyConnectionExpiresAt.delete(cacheKey);\n        }\n        evictLeastRecentlyUsed();\n      } else if (generation !== connectionGeneration) {\n        void client.close().catch(() => {});\n      }\n      return client;\n    })\n    .finally(() => {\n      if (pendingModernConnections.get(cacheKey) === promise) pendingModernConnections.delete(cacheKey);\n    });\n  pendingModernConnections.set(cacheKey, promise);\n  return promise;\n}\n\nasync function callOnModernClient(\n  client: Client,\n  toolName: string,\n  args: Record<string, unknown>,\n  signal?: AbortSignal,\n  requestTimeoutMs?: number\n): Promise<CallToolResponse> {\n  const resolvedRequestTimeoutMs = resolveClientRequestTimeoutMs(requestTimeoutMs);\n  return (await client.callTool(\n    { name: toolName, arguments: args },\n    {\n      ...(signal && { signal }),\n      ...(resolvedRequestTimeoutMs !== undefined && { timeout: resolvedRequestTimeoutMs }),\n    }\n  )) as CallToolResponse;\n}\n\nasync function attemptModernCall(\n  options: ModernConnectionOptions,\n  toolName: string,\n  args: Record<string, unknown>\n): Promise<ModernMCPAttempt> {\n  const authHeaders = buildAuthHeaders(options.authToken, options.customHeaders, options.authProvider);\n  const cacheKey = connectionCacheKey(\n    options.agentUrl,\n    authHeaders,\n    options.signingContext?.cacheKey,\n    options.authProvider,\n    options.fetchFn\n  );\n  if (isKnownLegacy(cacheKey)) return { handled: false };\n\n  const guardedConnection =\n    options.signal !== undefined || options.requestTimeoutMs !== undefined || options.fetchFn !== undefined;\n  let client: Client;\n  try {\n    client = guardedConnection\n      ? await createNegotiatedClient(cacheKey, options, authHeaders)\n      : await getOrCreateModernConnection(cacheKey, options, authHeaders);\n  } catch (error) {\n    const status = httpStatusOf(error);\n    if (status === 404 || status === 405) {\n      markKnownLegacy(cacheKey);\n      options.debugLogs.push({\n        type: 'info',\n        message: `MCP: Modern Streamable HTTP is unavailable (HTTP ${status}); preserving the v1 transport path`,\n        timestamp: new Date().toISOString(),\n      });\n      return { handled: false };\n    }\n    throw error;\n  }\n\n  if (client.getProtocolEra() !== 'modern') {\n    if (options.handleLegacy === true) {\n      options.debugLogs.push({\n        type: 'info',\n        message: `MCP: v2 client selected the legacy protocol era for ${toolName}`,\n        timestamp: new Date().toISOString(),\n      });\n    } else {\n      markKnownLegacy(cacheKey);\n      try {\n        await client.close();\n      } catch {\n        /* ignore close errors */\n      }\n      options.debugLogs.push({\n        type: 'info',\n        message: `MCP: Server selected the legacy protocol era for ${toolName}; preserving the v1 Tasks path`,\n        timestamp: new Date().toISOString(),\n      });\n      return { handled: false };\n    }\n  }\n\n  options.debugLogs.push({\n    type: 'success',\n    message: `MCP: Negotiated protocol ${client.getNegotiatedProtocolVersion()} for ${toolName}`,\n    timestamp: new Date().toISOString(),\n  });\n\n  try {\n    const response = await callOnModernClient(client, toolName, args, options.signal, options.requestTimeoutMs);\n    return { handled: true, response };\n  } catch (error) {\n    // A tool request may have reached the server even when its response was\n    // lost. Never replay automatically: mutating AdCP tools depend on the\n    // caller's explicit idempotency policy, not transport guesswork.\n    modernConnections.delete(cacheKey);\n    legacyConnectionExpiresAt.delete(cacheKey);\n    modernDiscoveries.delete(cacheKey);\n    try {\n      await client.close();\n    } catch {\n      /* ignore close errors */\n    }\n    throw error;\n  } finally {\n    if (guardedConnection) {\n      try {\n        await client.close();\n      } catch {\n        /* ignore close errors */\n      }\n    }\n  }\n}\n\n/**\n * Try a tool call using the MCP 2026-07-28 protocol era.\n *\n * `handled: false` means the caller must use the existing v1 client. This is\n * deliberately a result rather than an exception because legacy negotiation\n * is normal during the transition window.\n */\nexport async function tryCallModernMCPTool(\n  agentUrl: string,\n  toolName: string,\n  args: Record<string, unknown>,\n  authToken?: string,\n  debugLogs: DebugLogEntry[] = [],\n  customHeaders?: Record<string, string>,\n  options: ModernMCPConnectionOptions = {}\n): Promise<ModernMCPAttempt> {\n  return withSpan('adcp.mcp.negotiate', { 'adcp.tool': toolName, 'http.url': agentUrl }, () =>\n    signingContextStorage.run(options.signingContext, () =>\n      attemptModernCall(\n        {\n          agentUrl,\n          authToken,\n          customHeaders,\n          debugLogs,\n          signingContext: options.signingContext,\n          authProvider: options.authProvider,\n          signal: options.signal,\n          requestTimeoutMs: options.requestTimeoutMs,\n          fetchFn: options.fetchFn,\n          handleLegacy: options.handleLegacy,\n        },\n        toolName,\n        args\n      )\n    )\n  );\n}\n\n/**\n * Probe an endpoint with the official v2 client's auto negotiation.\n * `connected: false` lets endpoint discovery retain its v1 SSE fallback.\n */\nexport async function probeModernMCPConnection(\n  agentUrl: string,\n  authToken?: string,\n  customHeaders?: Record<string, string>,\n  options: ModernMCPConnectionOptions = {}\n): Promise<{ connected: boolean; era?: 'legacy' | 'modern' }> {\n  const connectionOptions: ModernConnectionOptions = {\n    agentUrl,\n    authToken,\n    customHeaders,\n    debugLogs: [],\n    signingContext: options.signingContext,\n    authProvider: options.authProvider,\n    signal: options.signal,\n    requestTimeoutMs: options.requestTimeoutMs,\n    fetchFn: options.fetchFn,\n    handleLegacy: options.handleLegacy,\n  };\n  const authHeaders = buildAuthHeaders(authToken, customHeaders, options.authProvider);\n  const cacheKey = connectionCacheKey(\n    agentUrl,\n    authHeaders,\n    options.signingContext?.cacheKey,\n    options.authProvider,\n    options.fetchFn\n  );\n  let client: Client | undefined;\n  try {\n    client = await createNegotiatedClient(cacheKey, connectionOptions, authHeaders, false);\n    return { connected: true, era: client.getProtocolEra() };\n  } catch (error) {\n    modernDiscoveries.delete(cacheKey);\n    if (is401Error(error) || isAbortOrTimeoutError(error)) throw error;\n    const status = httpStatusOf(error);\n    if (status === 404 || status === 405) return { connected: false };\n    throw error;\n  } finally {\n    await client?.close().catch(() => {});\n  }\n}\n\n/** List tools when the endpoint selected the modern era; otherwise let the v1 caller continue. */\nexport async function tryListModernMCPTools(\n  agentUrl: string,\n  authToken?: string,\n  customHeaders?: Record<string, string>,\n  options: ModernMCPConnectionOptions = {}\n): Promise<ModernMCPListAttempt> {\n  const connectionOptions: ModernConnectionOptions = {\n    agentUrl,\n    authToken,\n    customHeaders,\n    debugLogs: [],\n    signingContext: options.signingContext,\n    authProvider: options.authProvider,\n    signal: options.signal,\n    requestTimeoutMs: options.requestTimeoutMs,\n    fetchFn: options.fetchFn,\n  };\n  const authHeaders = buildAuthHeaders(authToken, customHeaders, options.authProvider);\n  const cacheKey = connectionCacheKey(\n    agentUrl,\n    authHeaders,\n    options.signingContext?.cacheKey,\n    options.authProvider,\n    options.fetchFn\n  );\n  let client: Client | undefined;\n  const listTools = async (connectedClient: Client): Promise<ModernMCPListAttempt> => {\n    if (connectedClient.getProtocolEra() !== 'modern') return { handled: false };\n    const resolvedRequestTimeoutMs = resolveClientRequestTimeoutMs(options.requestTimeoutMs);\n    const result = await connectedClient.listTools(undefined, {\n      ...(options.signal && { signal: options.signal }),\n      ...(resolvedRequestTimeoutMs !== undefined && { timeout: resolvedRequestTimeoutMs }),\n    });\n    return { handled: true, tools: result.tools };\n  };\n  try {\n    client = await createNegotiatedClient(cacheKey, connectionOptions, authHeaders);\n    return await listTools(client);\n  } catch (error) {\n    let failure = error;\n    modernDiscoveries.delete(cacheKey);\n    if (!is401Error(failure) && !isAbortOrTimeoutError(failure) && client && clientsUsingCachedDiscovery.has(client)) {\n      await client.close().catch(() => {});\n      try {\n        client = await createNegotiatedClient(cacheKey, connectionOptions, authHeaders, false);\n        return await listTools(client);\n      } catch (retryError) {\n        failure = retryError;\n        modernDiscoveries.delete(cacheKey);\n      }\n    }\n    if (is401Error(failure) || isAbortOrTimeoutError(failure)) throw failure;\n    const status = httpStatusOf(failure);\n    if (status === 404 || status === 405) return { handled: false };\n    throw failure;\n  } finally {\n    await client?.close().catch(() => {});\n  }\n}\n\nexport async function closeModernMCPConnections(): Promise<void> {\n  connectionGeneration++;\n  const pending = [...pendingModernConnections.values()];\n  pendingModernConnections.clear();\n  const settled = await Promise.allSettled(pending);\n  const clients = new Set(modernConnections.values());\n  for (const result of settled) {\n    if (result.status === 'fulfilled') clients.add(result.value);\n  }\n  modernConnections.clear();\n  legacyConnectionExpiresAt.clear();\n  knownLegacyConnections.clear();\n  modernDiscoveries.clear();\n  for (const client of clients) {\n    try {\n      await client.close();\n    } catch {\n      /* ignore close errors */\n    }\n  }\n}\n"],"mappings":"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","names":["import_client"]}

package/dist/lib/protocols/mcp-modern.mjs

@@ -5,6 +5,8 @@ const __dirname = __adcpDirname(__adcpFileURLToPath(import.meta.url));
 const require2 = __adcpCreateRequire(import.meta.url);
 import {
   Client,
+  SdkError,
+  SdkErrorCode,
   StreamableHTTPClientTransport
 } from "@modelcontextprotocol/client";
 import { createHmac } from "node:crypto";
@@ -25,8 +27,11 @@ const modernConnections = /* @__PURE__ */ new Map();
 const legacyConnectionExpiresAt = /* @__PURE__ */ new Map();
 const pendingModernConnections = /* @__PURE__ */ new Map();
 const knownLegacyConnections = /* @__PURE__ */ new Map();
+const modernDiscoveries = /* @__PURE__ */ new Map();
+const clientsUsingCachedDiscovery = /* @__PURE__ */ new WeakSet();
 const MAX_CACHED_CONNECTIONS = 20;
 const LEGACY_CLASSIFICATION_TTL_MS = 5 * 60 * 1e3;
+const MODERN_DISCOVERY_TTL_MS = 5 * 60 * 1e3;
 const modernOAuthProviderIds = /* @__PURE__ */ new WeakMap();
 const modernFetchFnIds = /* @__PURE__ */ new WeakMap();
 let nextModernOAuthProviderId = 0;
@@ -87,6 +92,7 @@ function isKnownLegacy(cacheKey) {
   return true;
 }
 function markKnownLegacy(cacheKey) {
+  modernDiscoveries.delete(cacheKey);
   knownLegacyConnections.delete(cacheKey);
   knownLegacyConnections.set(cacheKey, Date.now());
   while (knownLegacyConnections.size > MAX_CACHED_CONNECTIONS) {
@@ -95,6 +101,29 @@ function markKnownLegacy(cacheKey) {
     knownLegacyConnections.delete(oldest);
   }
 }
+function getCachedModernDiscovery(cacheKey) {
+  const cached = modernDiscoveries.get(cacheKey);
+  if (!cached) return void 0;
+  if (cached.expiresAt <= Date.now()) {
+    modernDiscoveries.delete(cacheKey);
+    return void 0;
+  }
+  modernDiscoveries.delete(cacheKey);
+  modernDiscoveries.set(cacheKey, cached);
+  return { kind: "modern", discover: cached.discover };
+}
+function cacheModernDiscovery(cacheKey, discover) {
+  modernDiscoveries.delete(cacheKey);
+  modernDiscoveries.set(cacheKey, {
+    discover,
+    expiresAt: Date.now() + MODERN_DISCOVERY_TTL_MS
+  });
+  while (modernDiscoveries.size > MAX_CACHED_CONNECTIONS) {
+    const oldest = modernDiscoveries.keys().next().value;
+    if (!oldest) break;
+    modernDiscoveries.delete(oldest);
+  }
+}
 function httpStatusOf(error, depth = 0) {
   if (!error || typeof error !== "object" || depth > 4) return void 0;
   const candidate = error;
@@ -137,7 +166,8 @@ function evictLeastRecentlyUsed() {
   void client?.close().catch(() => {
   });
 }
-async function createNegotiatedClient(options, authHeaders) {
+async function createNegotiatedClient(cacheKey, options, authHeaders, useCachedDiscovery = true) {
+  const generation = connectionGeneration;
   const requestTimeoutMs = resolveRequestTimeoutMs(options.requestTimeoutMs);
   const clientRequestTimeoutMs = resolveClientRequestTimeoutMs(options.requestTimeoutMs);
   const rawNetworkFetch = options.fetchFn ?? ((input, init) => fetch(input, init));
@@ -168,17 +198,31 @@ async function createNegotiatedClient(options, authHeaders) {
       }
     }
   );
+  const prior = useCachedDiscovery ? getCachedModernDiscovery(cacheKey) : void 0;
   try {
     await client.connect(transport, {
       ...options.signal && { signal: options.signal },
-      ...clientRequestTimeoutMs !== void 0 && { timeout: clientRequestTimeoutMs }
+      ...clientRequestTimeoutMs !== void 0 && { timeout: clientRequestTimeoutMs },
+      ...prior && { prior }
     });
+    if (prior) clientsUsingCachedDiscovery.add(client);
+    if (!prior) {
+      const discover = client.getDiscoverResult();
+      if (generation === connectionGeneration) {
+        if (client.getProtocolEra() === "modern" && discover) cacheModernDiscovery(cacheKey, discover);
+        else modernDiscoveries.delete(cacheKey);
+      }
+    }
     return client;
   } catch (error) {
+    if (prior) modernDiscoveries.delete(cacheKey);
     try {
       await client.close();
     } catch {
     }
+    if (prior && SdkError.isInstance(error) && error.code === SdkErrorCode.EraNegotiationFailed) {
+      return createNegotiatedClient(cacheKey, options, authHeaders, false);
+    }
     throw error;
   }
 }
@@ -188,7 +232,7 @@ async function getOrCreateModernConnection(cacheKey, options, authHeaders) {
   const pending = pendingModernConnections.get(cacheKey);
   if (pending) return pending;
   const generation = connectionGeneration;
-  const promise = createNegotiatedClient(options, authHeaders).then((client) => {
+  const promise = createNegotiatedClient(cacheKey, options, authHeaders).then((client) => {
     if ((client.getProtocolEra() === "modern" || options.handleLegacy === true) && generation === connectionGeneration) {
       modernConnections.set(cacheKey, client);
       if (client.getProtocolEra() === "legacy") {
@@ -231,7 +275,7 @@ async function attemptModernCall(options, toolName, args) {
   const guardedConnection = options.signal !== void 0 || options.requestTimeoutMs !== void 0 || options.fetchFn !== void 0;
   let client;
   try {
-    client = guardedConnection ? await createNegotiatedClient(options, authHeaders) : await getOrCreateModernConnection(cacheKey, options, authHeaders);
+    client = guardedConnection ? await createNegotiatedClient(cacheKey, options, authHeaders) : await getOrCreateModernConnection(cacheKey, options, authHeaders);
   } catch (error) {
     const status = httpStatusOf(error);
     if (status === 404 || status === 405) {
@@ -277,6 +321,7 @@ async function attemptModernCall(options, toolName, args) {
   } catch (error) {
     modernConnections.delete(cacheKey);
     legacyConnectionExpiresAt.delete(cacheKey);
+    modernDiscoveries.delete(cacheKey);
     try {
       await client.close();
     } catch {
@@ -330,11 +375,19 @@ async function probeModernMCPConnection(agentUrl, authToken, customHeaders, opti
     handleLegacy: options.handleLegacy
   };
   const authHeaders = buildAuthHeaders(authToken, customHeaders, options.authProvider);
+  const cacheKey = connectionCacheKey(
+    agentUrl,
+    authHeaders,
+    options.signingContext?.cacheKey,
+    options.authProvider,
+    options.fetchFn
+  );
   let client;
   try {
-    client = await createNegotiatedClient(connectionOptions, authHeaders);
+    client = await createNegotiatedClient(cacheKey, connectionOptions, authHeaders, false);
     return { connected: true, era: client.getProtocolEra() };
   } catch (error) {
+    modernDiscoveries.delete(cacheKey);
     if (is401Error(error) || isAbortOrTimeoutError(error)) throw error;
     const status = httpStatusOf(error);
     if (status === 404 || status === 405) return { connected: false };
@@ -357,21 +410,44 @@ async function tryListModernMCPTools(agentUrl, authToken, customHeaders, options
     fetchFn: options.fetchFn
   };
   const authHeaders = buildAuthHeaders(authToken, customHeaders, options.authProvider);
+  const cacheKey = connectionCacheKey(
+    agentUrl,
+    authHeaders,
+    options.signingContext?.cacheKey,
+    options.authProvider,
+    options.fetchFn
+  );
   let client;
-  try {
-    client = await createNegotiatedClient(connectionOptions, authHeaders);
-    if (client.getProtocolEra() !== "modern") return { handled: false };
+  const listTools = async (connectedClient) => {
+    if (connectedClient.getProtocolEra() !== "modern") return { handled: false };
     const resolvedRequestTimeoutMs = resolveClientRequestTimeoutMs(options.requestTimeoutMs);
-    const result = await client.listTools(void 0, {
+    const result = await connectedClient.listTools(void 0, {
       ...options.signal && { signal: options.signal },
       ...resolvedRequestTimeoutMs !== void 0 && { timeout: resolvedRequestTimeoutMs }
     });
     return { handled: true, tools: result.tools };
+  };
+  try {
+    client = await createNegotiatedClient(cacheKey, connectionOptions, authHeaders);
+    return await listTools(client);
   } catch (error) {
-    if (is401Error(error) || isAbortOrTimeoutError(error)) throw error;
-    const status = httpStatusOf(error);
+    let failure = error;
+    modernDiscoveries.delete(cacheKey);
+    if (!is401Error(failure) && !isAbortOrTimeoutError(failure) && client && clientsUsingCachedDiscovery.has(client)) {
+      await client.close().catch(() => {
+      });
+      try {
+        client = await createNegotiatedClient(cacheKey, connectionOptions, authHeaders, false);
+        return await listTools(client);
+      } catch (retryError) {
+        failure = retryError;
+        modernDiscoveries.delete(cacheKey);
+      }
+    }
+    if (is401Error(failure) || isAbortOrTimeoutError(failure)) throw failure;
+    const status = httpStatusOf(failure);
     if (status === 404 || status === 405) return { handled: false };
-    throw error;
+    throw failure;
   } finally {
     await client?.close().catch(() => {
     });
@@ -389,6 +465,7 @@ async function closeModernMCPConnections() {
   modernConnections.clear();
   legacyConnectionExpiresAt.clear();
   knownLegacyConnections.clear();
+  modernDiscoveries.clear();
   for (const client of clients) {
     try {
       await client.close();