promptfoo 0.125.0 → 0.125.1

package/dist/src/client-BFf1r6Z8.js

@@ -1,352 +0,0 @@
-#!/usr/bin/env node
-import { J as getEnvBool, X as getEnvInt, c as logger, lt as state, tt as getProcessEnv } from "./logger-pCNnmVuz.js";
-import { S as isCallerAbortError, y as waitForPromiseWithAbort } from "./shared-DS_sDrmK.js";
-import { g as withGenAIToolSpan } from "./genaiTracer-j8OXa5Va.js";
-import "./tracing-Eev_7A4e.js";
-import { t as isMissingPackageImportError } from "./packageImportErrors-B9NSwzz-.js";
-import { a as getOAuthTokenWithExpiry, l as renderAuthVars, n as getAuthHeaders, r as getAuthQueryParams, t as applyQueryParams, u as sanitizeMcpToolData } from "./util-C72P0iIa.js";
-import { t as McpConfigSchema } from "./mcp-49jlEcTQ.js";
-import { AsyncLocalStorage } from "node:async_hooks";
-import path from "path";
-//#region src/providers/mcp/client.ts
-const oauthRequestSignal = new AsyncLocalStorage();
-/**
-* Refresh tokens per request without reconnecting and aborting other tool calls.
-* Retry a rejected token once on HTTP 401; return other failures without a retry.
-*/
-function createOAuthFetch(auth, serverUrl) {
-	return async (url, init) => {
-		let requestSignal;
-		if (typeof init?.body === "string") try {
-			if (JSON.parse(init.body).method === "tools/call") requestSignal = oauthRequestSignal.getStore();
-		} catch {}
-		const signal = requestSignal && init?.signal ? AbortSignal.any([requestSignal, init.signal]) : requestSignal ?? init?.signal;
-		const send = async (rejectedToken) => {
-			signal?.throwIfAborted();
-			const { accessToken } = await getOAuthTokenWithExpiry(auth, serverUrl, rejectedToken, signal ?? void 0);
-			signal?.throwIfAborted();
-			const headers = new Headers(init?.headers);
-			headers.set("Authorization", `Bearer ${accessToken}`);
-			return {
-				accessToken,
-				response: await fetch(url, {
-					...init,
-					headers,
-					signal
-				})
-			};
-		};
-		const first = await send();
-		if (first.response.status !== 401) return first.response;
-		logger.debug("[MCP] Server rejected the OAuth token; retrying with a new token");
-		await first.response.body?.cancel();
-		return (await send(first.accessToken)).response;
-	};
-}
-/**
-* Environment for a spawned stdio MCP server: the promptfoo process environment with
-* the server's own `env` map layered on top. Per-server values win so a config can
-* override an inherited variable (e.g. a scoped token) without unsetting the rest.
-*/
-function getStdioEnv(server) {
-	const parentEnv = getProcessEnv();
-	return server.env ? {
-		...parentEnv,
-		...server.env
-	} : parentEnv;
-}
-async function loadMcpClientSdk() {
-	try {
-		return await import("@modelcontextprotocol/sdk/client/index.js");
-	} catch (error) {
-		if (isMissingPackageImportError(error, "@modelcontextprotocol/sdk")) throw new Error("The @modelcontextprotocol/sdk package is required for MCP provider support. Install it with: npm install @modelcontextprotocol/sdk");
-		throw error;
-	}
-}
-/**
-* Get the effective request options for MCP requests.
-* Priority: config values > MCP_REQUEST_TIMEOUT_MS env var > undefined (SDK default of 60s)
-*/
-function getEffectiveRequestOptions(config) {
-	const timeout = config.timeout ?? getEnvInt("MCP_REQUEST_TIMEOUT_MS");
-	if (!timeout && !config.resetTimeoutOnProgress && !config.maxTotalTimeout) return;
-	const options = {};
-	if (timeout) options.timeout = timeout;
-	if (config.resetTimeoutOnProgress) options.resetTimeoutOnProgress = config.resetTimeoutOnProgress;
-	if (config.maxTotalTimeout) options.maxTotalTimeout = config.maxTotalTimeout;
-	return options;
-}
-var MCPClient = class {
-	clients = /* @__PURE__ */ new Map();
-	tools = /* @__PURE__ */ new Map();
-	config;
-	transports = /* @__PURE__ */ new Map();
-	cleanupPromise = null;
-	startupController = new AbortController();
-	pendingConnections = /* @__PURE__ */ new Set();
-	get hasInitialized() {
-		return this.clients.size > 0;
-	}
-	get connectedServers() {
-		return Array.from(this.clients.keys());
-	}
-	/**
-	* Check if debug mode is enabled (config takes priority over env var)
-	*/
-	get isDebugEnabled() {
-		return this.config.debug ?? getEnvBool("MCP_DEBUG") ?? false;
-	}
-	/**
-	* Check if verbose mode is enabled (config takes priority over env var)
-	*/
-	get isVerboseEnabled() {
-		return this.config.verbose ?? getEnvBool("MCP_VERBOSE") ?? false;
-	}
-	constructor(config) {
-		this.config = McpConfigSchema.parse(config);
-	}
-	async initialize() {
-		if (this.cleanupPromise) await this.cleanupPromise;
-		if (!this.config.enabled) return;
-		if (this.startupController.signal.aborted) this.startupController = new AbortController();
-		const signal = this.startupController.signal;
-		const servers = this.config.servers || (this.config.server ? [this.config.server] : []);
-		const usedKeys = new Set(this.clients.keys());
-		for (const server of servers) {
-			const baseKey = server.name || server.url || server.path || server.command || "default";
-			let serverKey = baseKey;
-			for (let suffix = 1; usedKeys.has(serverKey); suffix++) serverKey = `${baseKey}:${suffix}`;
-			usedKeys.add(serverKey);
-			logger.info(`connecting to server ${serverKey}`);
-			await this.connectToServer(server, serverKey, signal);
-		}
-	}
-	async connectToServer(server, serverKey, signal) {
-		signal.throwIfAborted();
-		const { Client } = await loadMcpClientSdk();
-		signal.throwIfAborted();
-		const client = new Client({
-			name: "promptfoo-MCP",
-			version: "1.0.0",
-			description: "Promptfoo MCP client for connecting to MCP servers during LLM evaluations"
-		});
-		let transport;
-		let closingTransport;
-		let closePromise;
-		const close = () => {
-			if (!closePromise || closingTransport !== transport) {
-				closingTransport = transport;
-				closePromise = this.closeConnection(client, transport);
-			}
-			return closePromise;
-		};
-		this.pendingConnections.add(close);
-		try {
-			const requestOptions = {
-				...getEffectiveRequestOptions(this.config),
-				signal
-			};
-			if (server.command) {
-				const { StdioClientTransport } = await import("@modelcontextprotocol/sdk/client/stdio.js");
-				signal.throwIfAborted();
-				transport = new StdioClientTransport({
-					command: server.command,
-					args: server.args ?? [],
-					env: getStdioEnv(server)
-				});
-				await client.connect(transport, requestOptions);
-			} else if (server.path) {
-				const isJs = server.path.endsWith(".js");
-				const isPy = server.path.endsWith(".py");
-				if (!isJs && !isPy) throw new Error("Local server must be a .js or .py file");
-				const command = isPy ? process.platform === "win32" ? "python" : "python3" : process.execPath;
-				const serverPath = state.basePath ? path.resolve(state.basePath, server.path) : server.path;
-				const { StdioClientTransport } = await import("@modelcontextprotocol/sdk/client/stdio.js");
-				signal.throwIfAborted();
-				transport = new StdioClientTransport({
-					command,
-					args: [serverPath],
-					env: getStdioEnv(server)
-				});
-				await client.connect(transport, requestOptions);
-			} else if (server.url) {
-				const renderedServer = renderAuthVars(server);
-				let oauthFetch;
-				let authHeaders = {};
-				if (renderedServer.auth?.type === "oauth") {
-					const oauthAuth = renderedServer.auth;
-					logger.debug("[MCP] Fetching OAuth token");
-					await getOAuthTokenWithExpiry(oauthAuth, server.url, void 0, signal);
-					signal.throwIfAborted();
-					oauthFetch = createOAuthFetch(oauthAuth, server.url);
-				} else authHeaders = getAuthHeaders(renderedServer);
-				const headers = {
-					...server.headers,
-					...authHeaders
-				};
-				const queryParams = getAuthQueryParams(renderedServer);
-				const serverUrl = applyQueryParams(server.url, queryParams);
-				const transportOptions = {
-					...Object.keys(headers).length > 0 && { requestInit: { headers } },
-					...oauthFetch && { fetch: oauthFetch }
-				};
-				const hasOptions = Object.keys(transportOptions).length > 0;
-				try {
-					const { StreamableHTTPClientTransport } = await import("@modelcontextprotocol/sdk/client/streamableHttp.js");
-					signal.throwIfAborted();
-					transport = new StreamableHTTPClientTransport(new URL(serverUrl), hasOptions ? transportOptions : void 0);
-					await client.connect(transport, requestOptions);
-					logger.debug("Connected using Streamable HTTP transport");
-				} catch (error) {
-					logger.debug(`Failed to connect to MCP server with Streamable HTTP transport ${serverKey}: ${error}`);
-					if (transport) {
-						await transport.close().catch(() => void 0);
-						transport = void 0;
-					}
-					signal.throwIfAborted();
-					const { SSEClientTransport } = await import("@modelcontextprotocol/sdk/client/sse.js");
-					signal.throwIfAborted();
-					transport = new SSEClientTransport(new URL(serverUrl), hasOptions ? transportOptions : void 0);
-					await client.connect(transport, requestOptions);
-					logger.debug("Connected using SSE transport");
-				}
-			} else throw new Error("Either command or path or url must be specified for MCP server");
-			signal.throwIfAborted();
-			if (this.config.pingOnConnect) try {
-				await client.ping(requestOptions);
-				logger.debug(`MCP server ${serverKey} ping successful`);
-			} catch (pingError) {
-				const pingErrorMessage = pingError instanceof Error ? pingError.message : String(pingError);
-				throw new Error(`MCP server ${serverKey} ping failed: ${pingErrorMessage}`);
-			}
-			const serverTools = (await client.listTools(void 0, requestOptions))?.tools?.map((tool) => ({
-				name: tool.name,
-				description: tool.description || "",
-				inputSchema: tool.inputSchema
-			})) || [];
-			let filteredTools = serverTools;
-			if (this.config.tools) filteredTools = serverTools.filter((tool) => this.config.tools?.includes(tool.name));
-			if (this.config.exclude_tools) filteredTools = filteredTools.filter((tool) => !this.config.exclude_tools?.includes(tool.name));
-			signal.throwIfAborted();
-			this.transports.set(serverKey, transport);
-			this.clients.set(serverKey, client);
-			this.tools.set(serverKey, filteredTools);
-			if (this.isVerboseEnabled) console.log(`Connected to MCP server ${serverKey} with tools:`, filteredTools.map((tool) => tool.name));
-		} catch (error) {
-			if (this.clients.get(serverKey) === client) {
-				this.clients.delete(serverKey);
-				this.transports.delete(serverKey);
-				this.tools.delete(serverKey);
-			}
-			await close();
-			const errorMessage = error instanceof Error ? error.message : String(error);
-			if (this.isDebugEnabled) logger.error(`Failed to connect to MCP server ${serverKey}: ${errorMessage}`);
-			throw new Error(`Failed to connect to MCP server ${serverKey}: ${errorMessage}`);
-		} finally {
-			this.pendingConnections.delete(close);
-		}
-	}
-	async closeConnection(client, transport) {
-		for (const resource of [transport, client]) try {
-			await resource?.close();
-		} catch (error) {
-			if (this.isDebugEnabled) logger.error(`Error during cleanup: ${error instanceof Error ? error.message : String(error)}`);
-		}
-	}
-	getAllTools() {
-		return Array.from(this.tools.values()).flat();
-	}
-	async callTool(name, args, signal) {
-		signal?.throwIfAborted();
-		return await withGenAIToolSpan({
-			name,
-			arguments: sanitizeMcpToolData(args),
-			resultFormat: "mcp"
-		}, () => this.callToolInternal(name, args, signal));
-	}
-	async callToolInternal(name, args, signal) {
-		const timeoutOptions = getEffectiveRequestOptions(this.config);
-		const requestOptions = signal ? {
-			...timeoutOptions,
-			signal
-		} : timeoutOptions;
-		const disconnectedServers = [];
-		for (const [serverKey, serverTools] of this.tools.entries()) {
-			signal?.throwIfAborted();
-			if (!serverTools.some((tool) => tool.name === name)) continue;
-			const client = this.clients.get(serverKey);
-			if (!client) {
-				disconnectedServers.push(serverKey);
-				continue;
-			}
-			try {
-				const finished = new AbortController();
-				const requestSignal = signal ? AbortSignal.any([signal, finished.signal]) : finished.signal;
-				let result;
-				try {
-					result = await waitForPromiseWithAbort(oauthRequestSignal.run(requestSignal, () => client.callTool({
-						name,
-						arguments: args
-					}, void 0, requestOptions)), signal);
-				} finally {
-					finished.abort();
-				}
-				if (!result.isError) signal?.throwIfAborted();
-				let content = "";
-				if (result?.content) {
-					if (typeof result.content === "string") try {
-						const parsed = JSON.parse(result.content);
-						content = typeof parsed === "string" ? parsed : JSON.stringify(parsed);
-					} catch {
-						content = result.content;
-					}
-					else if (Buffer.isBuffer(result.content)) content = result.content.toString();
-					else content = JSON.stringify(result.content);
-				}
-				return {
-					content,
-					...result.isError ? { isError: true } : {},
-					raw: result
-				};
-			} catch (error) {
-				if (isCallerAbortError(error, signal, { requireReasonMatch: true })) throw signal.reason;
-				const errorMessage = error instanceof Error ? error.message : String(error);
-				if (this.isDebugEnabled) logger.error(`Error calling tool ${name}: ${errorMessage}`);
-				return {
-					content: "",
-					error: errorMessage
-				};
-			}
-		}
-		if (disconnectedServers.length > 0) {
-			const plural = disconnectedServers.length > 1 ? "s are" : " is";
-			throw new Error(`Tool ${name} is known but MCP server${plural} disconnected: ${disconnectedServers.join(", ")}`);
-		}
-		throw new Error(`Tool ${name} not found in any connected MCP server`);
-	}
-	async cleanup() {
-		this.cleanupPromise ??= this.cleanupInternal();
-		const cleanup = this.cleanupPromise;
-		try {
-			await cleanup;
-		} finally {
-			if (this.cleanupPromise === cleanup) this.cleanupPromise = null;
-		}
-	}
-	async cleanupInternal() {
-		this.startupController.abort();
-		await Promise.all([...this.pendingConnections].map((close) => close()));
-		const connections = [...this.clients].map(([serverKey, client]) => ({
-			client,
-			transport: this.transports.get(serverKey)
-		}));
-		this.clients.clear();
-		this.transports.clear();
-		this.tools.clear();
-		for (const { client, transport } of connections) await this.closeConnection(client, transport);
-	}
-};
-//#endregion
-export { MCPClient as t };
-
-//# sourceMappingURL=client-BFf1r6Z8.js.map

package/dist/src/client-CdXyDdDi.js

@@ -1,351 +0,0 @@
-import { f as McpConfigSchema } from "./shared-DS0YmCOx.js";
-import { G as getEnvInt, U as getEnvBool, X as getProcessEnv, o as logger, rt as state } from "./logger-CNHLbG5Y.js";
-import { S as isCallerAbortError, y as waitForPromiseWithAbort } from "./shared-BnN4RWgk.js";
-import { g as withGenAIToolSpan } from "./genaiTracer-QTyx3Q-T.js";
-import "./tracing-B8p6SMbW.js";
-import { a as getOAuthTokenWithExpiry, l as renderAuthVars, n as getAuthHeaders, r as getAuthQueryParams, t as applyQueryParams, u as sanitizeMcpToolData } from "./util-CCtqagKc.js";
-import { t as isMissingPackageImportError } from "./packageImportErrors-rgCkzu81.js";
-import path from "path";
-import { AsyncLocalStorage } from "node:async_hooks";
-//#region src/providers/mcp/client.ts
-const oauthRequestSignal = new AsyncLocalStorage();
-/**
-* Refresh tokens per request without reconnecting and aborting other tool calls.
-* Retry a rejected token once on HTTP 401; return other failures without a retry.
-*/
-function createOAuthFetch(auth, serverUrl) {
-	return async (url, init) => {
-		let requestSignal;
-		if (typeof init?.body === "string") try {
-			if (JSON.parse(init.body).method === "tools/call") requestSignal = oauthRequestSignal.getStore();
-		} catch {}
-		const signal = requestSignal && init?.signal ? AbortSignal.any([requestSignal, init.signal]) : requestSignal ?? init?.signal;
-		const send = async (rejectedToken) => {
-			signal?.throwIfAborted();
-			const { accessToken } = await getOAuthTokenWithExpiry(auth, serverUrl, rejectedToken, signal ?? void 0);
-			signal?.throwIfAborted();
-			const headers = new Headers(init?.headers);
-			headers.set("Authorization", `Bearer ${accessToken}`);
-			return {
-				accessToken,
-				response: await fetch(url, {
-					...init,
-					headers,
-					signal
-				})
-			};
-		};
-		const first = await send();
-		if (first.response.status !== 401) return first.response;
-		logger.debug("[MCP] Server rejected the OAuth token; retrying with a new token");
-		await first.response.body?.cancel();
-		return (await send(first.accessToken)).response;
-	};
-}
-/**
-* Environment for a spawned stdio MCP server: the promptfoo process environment with
-* the server's own `env` map layered on top. Per-server values win so a config can
-* override an inherited variable (e.g. a scoped token) without unsetting the rest.
-*/
-function getStdioEnv(server) {
-	const parentEnv = getProcessEnv();
-	return server.env ? {
-		...parentEnv,
-		...server.env
-	} : parentEnv;
-}
-async function loadMcpClientSdk() {
-	try {
-		return await import("@modelcontextprotocol/sdk/client/index.js");
-	} catch (error) {
-		if (isMissingPackageImportError(error, "@modelcontextprotocol/sdk")) throw new Error("The @modelcontextprotocol/sdk package is required for MCP provider support. Install it with: npm install @modelcontextprotocol/sdk");
-		throw error;
-	}
-}
-/**
-* Get the effective request options for MCP requests.
-* Priority: config values > MCP_REQUEST_TIMEOUT_MS env var > undefined (SDK default of 60s)
-*/
-function getEffectiveRequestOptions(config) {
-	const timeout = config.timeout ?? getEnvInt("MCP_REQUEST_TIMEOUT_MS");
-	if (!timeout && !config.resetTimeoutOnProgress && !config.maxTotalTimeout) return;
-	const options = {};
-	if (timeout) options.timeout = timeout;
-	if (config.resetTimeoutOnProgress) options.resetTimeoutOnProgress = config.resetTimeoutOnProgress;
-	if (config.maxTotalTimeout) options.maxTotalTimeout = config.maxTotalTimeout;
-	return options;
-}
-var MCPClient = class {
-	clients = /* @__PURE__ */ new Map();
-	tools = /* @__PURE__ */ new Map();
-	config;
-	transports = /* @__PURE__ */ new Map();
-	cleanupPromise = null;
-	startupController = new AbortController();
-	pendingConnections = /* @__PURE__ */ new Set();
-	get hasInitialized() {
-		return this.clients.size > 0;
-	}
-	get connectedServers() {
-		return Array.from(this.clients.keys());
-	}
-	/**
-	* Check if debug mode is enabled (config takes priority over env var)
-	*/
-	get isDebugEnabled() {
-		return this.config.debug ?? getEnvBool("MCP_DEBUG") ?? false;
-	}
-	/**
-	* Check if verbose mode is enabled (config takes priority over env var)
-	*/
-	get isVerboseEnabled() {
-		return this.config.verbose ?? getEnvBool("MCP_VERBOSE") ?? false;
-	}
-	constructor(config) {
-		this.config = McpConfigSchema.parse(config);
-	}
-	async initialize() {
-		if (this.cleanupPromise) await this.cleanupPromise;
-		if (!this.config.enabled) return;
-		if (this.startupController.signal.aborted) this.startupController = new AbortController();
-		const signal = this.startupController.signal;
-		const servers = this.config.servers || (this.config.server ? [this.config.server] : []);
-		const usedKeys = new Set(this.clients.keys());
-		for (const server of servers) {
-			const baseKey = server.name || server.url || server.path || server.command || "default";
-			let serverKey = baseKey;
-			for (let suffix = 1; usedKeys.has(serverKey); suffix++) serverKey = `${baseKey}:${suffix}`;
-			usedKeys.add(serverKey);
-			logger.info(`connecting to server ${serverKey}`);
-			await this.connectToServer(server, serverKey, signal);
-		}
-	}
-	async connectToServer(server, serverKey, signal) {
-		signal.throwIfAborted();
-		const { Client } = await loadMcpClientSdk();
-		signal.throwIfAborted();
-		const client = new Client({
-			name: "promptfoo-MCP",
-			version: "1.0.0",
-			description: "Promptfoo MCP client for connecting to MCP servers during LLM evaluations"
-		});
-		let transport;
-		let closingTransport;
-		let closePromise;
-		const close = () => {
-			if (!closePromise || closingTransport !== transport) {
-				closingTransport = transport;
-				closePromise = this.closeConnection(client, transport);
-			}
-			return closePromise;
-		};
-		this.pendingConnections.add(close);
-		try {
-			const requestOptions = {
-				...getEffectiveRequestOptions(this.config),
-				signal
-			};
-			if (server.command) {
-				const { StdioClientTransport } = await import("@modelcontextprotocol/sdk/client/stdio.js");
-				signal.throwIfAborted();
-				transport = new StdioClientTransport({
-					command: server.command,
-					args: server.args ?? [],
-					env: getStdioEnv(server)
-				});
-				await client.connect(transport, requestOptions);
-			} else if (server.path) {
-				const isJs = server.path.endsWith(".js");
-				const isPy = server.path.endsWith(".py");
-				if (!isJs && !isPy) throw new Error("Local server must be a .js or .py file");
-				const command = isPy ? process.platform === "win32" ? "python" : "python3" : process.execPath;
-				const serverPath = state.basePath ? path.resolve(state.basePath, server.path) : server.path;
-				const { StdioClientTransport } = await import("@modelcontextprotocol/sdk/client/stdio.js");
-				signal.throwIfAborted();
-				transport = new StdioClientTransport({
-					command,
-					args: [serverPath],
-					env: getStdioEnv(server)
-				});
-				await client.connect(transport, requestOptions);
-			} else if (server.url) {
-				const renderedServer = renderAuthVars(server);
-				let oauthFetch;
-				let authHeaders = {};
-				if (renderedServer.auth?.type === "oauth") {
-					const oauthAuth = renderedServer.auth;
-					logger.debug("[MCP] Fetching OAuth token");
-					await getOAuthTokenWithExpiry(oauthAuth, server.url, void 0, signal);
-					signal.throwIfAborted();
-					oauthFetch = createOAuthFetch(oauthAuth, server.url);
-				} else authHeaders = getAuthHeaders(renderedServer);
-				const headers = {
-					...server.headers,
-					...authHeaders
-				};
-				const queryParams = getAuthQueryParams(renderedServer);
-				const serverUrl = applyQueryParams(server.url, queryParams);
-				const transportOptions = {
-					...Object.keys(headers).length > 0 && { requestInit: { headers } },
-					...oauthFetch && { fetch: oauthFetch }
-				};
-				const hasOptions = Object.keys(transportOptions).length > 0;
-				try {
-					const { StreamableHTTPClientTransport } = await import("@modelcontextprotocol/sdk/client/streamableHttp.js");
-					signal.throwIfAborted();
-					transport = new StreamableHTTPClientTransport(new URL(serverUrl), hasOptions ? transportOptions : void 0);
-					await client.connect(transport, requestOptions);
-					logger.debug("Connected using Streamable HTTP transport");
-				} catch (error) {
-					logger.debug(`Failed to connect to MCP server with Streamable HTTP transport ${serverKey}: ${error}`);
-					if (transport) {
-						await transport.close().catch(() => void 0);
-						transport = void 0;
-					}
-					signal.throwIfAborted();
-					const { SSEClientTransport } = await import("@modelcontextprotocol/sdk/client/sse.js");
-					signal.throwIfAborted();
-					transport = new SSEClientTransport(new URL(serverUrl), hasOptions ? transportOptions : void 0);
-					await client.connect(transport, requestOptions);
-					logger.debug("Connected using SSE transport");
-				}
-			} else throw new Error("Either command or path or url must be specified for MCP server");
-			signal.throwIfAborted();
-			if (this.config.pingOnConnect) try {
-				await client.ping(requestOptions);
-				logger.debug(`MCP server ${serverKey} ping successful`);
-			} catch (pingError) {
-				const pingErrorMessage = pingError instanceof Error ? pingError.message : String(pingError);
-				throw new Error(`MCP server ${serverKey} ping failed: ${pingErrorMessage}`);
-			}
-			const serverTools = (await client.listTools(void 0, requestOptions))?.tools?.map((tool) => ({
-				name: tool.name,
-				description: tool.description || "",
-				inputSchema: tool.inputSchema
-			})) || [];
-			let filteredTools = serverTools;
-			if (this.config.tools) filteredTools = serverTools.filter((tool) => this.config.tools?.includes(tool.name));
-			if (this.config.exclude_tools) filteredTools = filteredTools.filter((tool) => !this.config.exclude_tools?.includes(tool.name));
-			signal.throwIfAborted();
-			this.transports.set(serverKey, transport);
-			this.clients.set(serverKey, client);
-			this.tools.set(serverKey, filteredTools);
-			if (this.isVerboseEnabled) console.log(`Connected to MCP server ${serverKey} with tools:`, filteredTools.map((tool) => tool.name));
-		} catch (error) {
-			if (this.clients.get(serverKey) === client) {
-				this.clients.delete(serverKey);
-				this.transports.delete(serverKey);
-				this.tools.delete(serverKey);
-			}
-			await close();
-			const errorMessage = error instanceof Error ? error.message : String(error);
-			if (this.isDebugEnabled) logger.error(`Failed to connect to MCP server ${serverKey}: ${errorMessage}`);
-			throw new Error(`Failed to connect to MCP server ${serverKey}: ${errorMessage}`);
-		} finally {
-			this.pendingConnections.delete(close);
-		}
-	}
-	async closeConnection(client, transport) {
-		for (const resource of [transport, client]) try {
-			await resource?.close();
-		} catch (error) {
-			if (this.isDebugEnabled) logger.error(`Error during cleanup: ${error instanceof Error ? error.message : String(error)}`);
-		}
-	}
-	getAllTools() {
-		return Array.from(this.tools.values()).flat();
-	}
-	async callTool(name, args, signal) {
-		signal?.throwIfAborted();
-		return await withGenAIToolSpan({
-			name,
-			arguments: sanitizeMcpToolData(args),
-			resultFormat: "mcp"
-		}, () => this.callToolInternal(name, args, signal));
-	}
-	async callToolInternal(name, args, signal) {
-		const timeoutOptions = getEffectiveRequestOptions(this.config);
-		const requestOptions = signal ? {
-			...timeoutOptions,
-			signal
-		} : timeoutOptions;
-		const disconnectedServers = [];
-		for (const [serverKey, serverTools] of this.tools.entries()) {
-			signal?.throwIfAborted();
-			if (!serverTools.some((tool) => tool.name === name)) continue;
-			const client = this.clients.get(serverKey);
-			if (!client) {
-				disconnectedServers.push(serverKey);
-				continue;
-			}
-			try {
-				const finished = new AbortController();
-				const requestSignal = signal ? AbortSignal.any([signal, finished.signal]) : finished.signal;
-				let result;
-				try {
-					result = await waitForPromiseWithAbort(oauthRequestSignal.run(requestSignal, () => client.callTool({
-						name,
-						arguments: args
-					}, void 0, requestOptions)), signal);
-				} finally {
-					finished.abort();
-				}
-				if (!result.isError) signal?.throwIfAborted();
-				let content = "";
-				if (result?.content) {
-					if (typeof result.content === "string") try {
-						const parsed = JSON.parse(result.content);
-						content = typeof parsed === "string" ? parsed : JSON.stringify(parsed);
-					} catch {
-						content = result.content;
-					}
-					else if (Buffer.isBuffer(result.content)) content = result.content.toString();
-					else content = JSON.stringify(result.content);
-				}
-				return {
-					content,
-					...result.isError ? { isError: true } : {},
-					raw: result
-				};
-			} catch (error) {
-				if (isCallerAbortError(error, signal, { requireReasonMatch: true })) throw signal.reason;
-				const errorMessage = error instanceof Error ? error.message : String(error);
-				if (this.isDebugEnabled) logger.error(`Error calling tool ${name}: ${errorMessage}`);
-				return {
-					content: "",
-					error: errorMessage
-				};
-			}
-		}
-		if (disconnectedServers.length > 0) {
-			const plural = disconnectedServers.length > 1 ? "s are" : " is";
-			throw new Error(`Tool ${name} is known but MCP server${plural} disconnected: ${disconnectedServers.join(", ")}`);
-		}
-		throw new Error(`Tool ${name} not found in any connected MCP server`);
-	}
-	async cleanup() {
-		this.cleanupPromise ??= this.cleanupInternal();
-		const cleanup = this.cleanupPromise;
-		try {
-			await cleanup;
-		} finally {
-			if (this.cleanupPromise === cleanup) this.cleanupPromise = null;
-		}
-	}
-	async cleanupInternal() {
-		this.startupController.abort();
-		await Promise.all([...this.pendingConnections].map((close) => close()));
-		const connections = [...this.clients].map(([serverKey, client]) => ({
-			client,
-			transport: this.transports.get(serverKey)
-		}));
-		this.clients.clear();
-		this.transports.clear();
-		this.tools.clear();
-		for (const { client, transport } of connections) await this.closeConnection(client, transport);
-	}
-};
-//#endregion
-export { MCPClient as t };
-
-//# sourceMappingURL=client-CdXyDdDi.js.map