promptfoo 0.121.3 → 0.121.4

package/dist/src/{chat-B0iaWhoh.js → chat-BfPaS15_.js}

@@ -1,13 +1,14 @@
-import { C as getEnvString, D as state, S as getEnvInt, a as logger, b as getEnvBool, x as getEnvFloat } from "./logger-BnkjG2jt.js";
-import { C as transformTools, S as transformToolChoice, b as parseChatPrompt, p as REQUEST_TIMEOUT_MS } from "./fetch-BiYv2BZc.js";
-import { r as importModule } from "./esm-CKWP3u_P.js";
-import { i as isJavascriptFile } from "./fileExtensions-LcDYkU4v.js";
-import { r as fetchWithCache } from "./cache-HP0NP4k3.js";
-import { n as withGenAISpan } from "./genaiTracer-70Z8BIuV.js";
-import { D as maybeLoadResponseFormatFromExternalFile, E as maybeLoadFromExternalFileWithVars, N as renderVarsInObject, O as maybeLoadToolsFromExternalFile } from "./util-BLvy9qfE.js";
-import { D as getAuthQueryParams, E as getAuthHeaders, O as getOAuthTokenWithExpiry, T as applyQueryParams, i as transformMCPToolsToOpenAi, k as renderAuthVars } from "./transform-B2-jIv68.js";
-import { t as OpenAiGenericProvider } from "./openai-D6wITiVn.js";
-import { a as calculateOpenAICost, c as getTokenUsage, t as OPENAI_CHAT_MODELS } from "./util-BtoGs5Cb.js";
+import { C as getEnvFloat, S as getEnvBool, T as getEnvString, a as logger, k as state, w as getEnvInt } from "./logger-B88EkIn6.js";
+import { S as parseChatPrompt, T as transformTools, h as REQUEST_TIMEOUT_MS, w as transformToolChoice } from "./fetch-B0Z3Oe4k.js";
+import { r as importModule } from "./esm-Dh4dOLlt.js";
+import { n as withGenAISpan } from "./genaiTracer-COYDi-tC.js";
+import { n as renderVarsInObject } from "./render-DHIZ6_k8.js";
+import { i as isJavascriptFile } from "./fileExtensions-BArZuxsI.js";
+import { r as fetchWithCache } from "./cache-C4Xb-hNb.js";
+import { D as maybeLoadResponseFormatFromExternalFile, E as maybeLoadFromExternalFileWithVars, O as maybeLoadToolsFromExternalFile } from "./util-C8e5uydV.js";
+import { A as renderAuthVars, D as getAuthHeaders, E as applyQueryParams, O as getAuthQueryParams, i as transformMCPToolsToOpenAi, k as getOAuthTokenWithExpiry } from "./transform-lQrDE1BQ.js";
+import { t as OpenAiGenericProvider } from "./openai-DhVEmgeZ.js";
+import { a as calculateOpenAICost, c as getTokenUsage, t as OPENAI_CHAT_MODELS } from "./util-D3q0WQ-0.js";
 import path from "path";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 //#region src/util/finishReason.ts
@@ -24,13 +25,14 @@ import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 *
 * **Provider Mappings:**
 * - OpenAI: `function_call` (legacy) → `tool_calls` (current)
-* - Anthropic: `end_turn` → `stop`, `stop_sequence` → `stop`, `max_tokens` → `length`, `tool_use` → `tool_calls`
+* - Anthropic: `end_turn` → `stop`, `stop_sequence` → `stop`, `max_tokens` → `length`, `tool_use` → `tool_calls`, `refusal` → `content_filter`, `pause_turn` → `pause_turn`
 *
 * @example
 * ```typescript
 * normalizeFinishReason('end_turn')     // Returns: 'stop'
 * normalizeFinishReason('max_tokens')   // Returns: 'length'
 * normalizeFinishReason('tool_use')     // Returns: 'tool_calls'
+* normalizeFinishReason('refusal')      // Returns: 'content_filter'
 * normalizeFinishReason('function_call') // Returns: 'tool_calls'
 * normalizeFinishReason('unknown')      // Returns: 'unknown' (passthrough)
 * ```
@@ -44,7 +46,9 @@ const FINISH_REASON_MAP = {
 	end_turn: "stop",
 	stop_sequence: "stop",
 	max_tokens: "length",
-	tool_use: "tool_calls"
+	tool_use: "tool_calls",
+	refusal: "content_filter",
+	pause_turn: "pause_turn"
 };
 /**
 * Normalize a provider-specific finish or stop reason to a standard OpenAI-compatible value.
@@ -100,7 +104,7 @@ var MCPClient = class {
 	transports = /* @__PURE__ */ new Map();
 	oauthConfigs = /* @__PURE__ */ new Map();
 	tokenExpiresAt = /* @__PURE__ */ new Map();
-	tokenRefreshPromise = /* @__PURE__ */ new Map();
+	tokenRefreshLocks = /* @__PURE__ */ new Map();
 	get hasInitialized() {
 		return this.clients.size > 0;
 	}
@@ -232,31 +236,36 @@ var MCPClient = class {
 	async refreshOAuthTokenIfNeeded(serverKey) {
 		const oauthConfig = this.oauthConfigs.get(serverKey);
 		if (!oauthConfig) return;
-		const now = Date.now();
+		await this.refreshOAuthToken(serverKey, oauthConfig, false);
+	}
+	hasValidToken(serverKey) {
 		const expiresAt = this.tokenExpiresAt.get(serverKey);
-		if (expiresAt && now + 6e4 < expiresAt) {
-			logger.debug(`[MCP] Token for ${serverKey} still valid, no refresh needed`);
-			return;
-		}
-		const existingRefresh = this.tokenRefreshPromise.get(serverKey);
-		if (existingRefresh) {
+		return expiresAt != null && this.clients.has(serverKey) && Date.now() + 6e4 < expiresAt;
+	}
+	async refreshOAuthToken(serverKey, oauthConfig, forceRefresh) {
+		while (true) {
+			const existingRefreshPromise = this.tokenRefreshLocks.get(serverKey)?.promise;
+			if (!existingRefreshPromise) break;
 			logger.debug(`[MCP] Token refresh already in progress for ${serverKey}, waiting...`);
 			try {
-				await existingRefresh;
-				const newExpiresAt = this.tokenExpiresAt.get(serverKey);
-				if (newExpiresAt && Date.now() + 6e4 < newExpiresAt) return;
-				logger.debug(`[MCP] Token expired while waiting for ${serverKey}, refreshing again...`);
+				await existingRefreshPromise;
+				if (this.hasValidToken(serverKey)) return;
+				logger.debug(`[MCP] Token still needs refresh for ${serverKey}, refreshing again...`);
 			} catch {
 				logger.debug(`[MCP] Previous token refresh failed for ${serverKey}, retrying...`);
 			}
 		}
-		logger.debug(`[MCP] Proactively refreshing OAuth token for server ${serverKey}`);
-		const refreshPromise = this.performTokenRefresh(serverKey, oauthConfig);
-		this.tokenRefreshPromise.set(serverKey, refreshPromise);
+		if (!forceRefresh && this.hasValidToken(serverKey)) {
+			logger.debug(`[MCP] Token for ${serverKey} still valid, no refresh needed`);
+			return;
+		}
+		logger.debug(`[MCP] Refreshing OAuth token for server ${serverKey}`);
+		const refreshLock = { promise: this.performTokenRefresh(serverKey, oauthConfig) };
+		this.tokenRefreshLocks.set(serverKey, refreshLock);
 		try {
-			await refreshPromise;
+			await refreshLock.promise;
 		} finally {
-			if (this.tokenRefreshPromise.get(serverKey) === refreshPromise) this.tokenRefreshPromise.delete(serverKey);
+			if (this.tokenRefreshLocks.get(serverKey) === refreshLock) this.tokenRefreshLocks.delete(serverKey);
 		}
 	}
 	/**
@@ -274,9 +283,21 @@ var MCPClient = class {
 	}
 	async callTool(name, args) {
 		const requestOptions = getEffectiveRequestOptions(this.config);
-		for (const [serverKey, client] of this.clients.entries()) if ((this.tools.get(serverKey) || []).some((tool) => tool.name === name)) {
-			await this.refreshOAuthTokenIfNeeded(serverKey);
-			let currentClient = this.clients.get(serverKey) || client;
+		const disconnectedServers = [];
+		for (const [serverKey, serverTools] of this.tools.entries()) if (serverTools.some((tool) => tool.name === name)) {
+			try {
+				await this.refreshOAuthTokenIfNeeded(serverKey);
+			} catch (error) {
+				const errorMessage = error instanceof Error ? error.message : String(error);
+				logger.debug(`[MCP] Failed to refresh OAuth token for ${serverKey}, trying the next matching server: ${errorMessage}`);
+			}
+			const client = this.clients.get(serverKey);
+			if (!client) {
+				logger.debug(`[MCP] Server ${serverKey} is not connected, trying the next matching server`);
+				disconnectedServers.push(serverKey);
+				continue;
+			}
+			let currentClient = client;
 			let retried = false;
 			while (true) try {
 				const result = await currentClient.callTool({
@@ -301,7 +322,7 @@ var MCPClient = class {
 					logger.debug(`[MCP] Auth error for ${serverKey}, attempting reactive token refresh`);
 					retried = true;
 					try {
-						await this.performTokenRefresh(serverKey, oauthConfig);
+						await this.refreshOAuthToken(serverKey, oauthConfig, true);
 						const newClient = this.clients.get(serverKey);
 						if (newClient) {
 							currentClient = newClient;
@@ -319,6 +340,10 @@ var MCPClient = class {
 				};
 			}
 		}
+		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() {
@@ -334,7 +359,7 @@ var MCPClient = class {
 		this.tools.clear();
 		this.oauthConfigs.clear();
 		this.tokenExpiresAt.clear();
-		this.tokenRefreshPromise.clear();
+		this.tokenRefreshLocks.clear();
 	}
 };
 //#endregion
@@ -349,7 +374,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 	constructor(modelName, options = {}) {
 		if (!OpenAiChatCompletionProvider.OPENAI_CHAT_MODEL_NAMES.includes(modelName)) logger.debug(`Using unknown chat model: ${modelName}`);
 		super(modelName, options);
-		this.config = options.config || {};
+		this.config = options.config ? { ...options.config } : {};
 		if (this.config.mcp?.enabled) this.initializationPromise = this.initializeMCP();
 	}
 	async initializeMCP() {
@@ -487,6 +512,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 		if (config.user) body.user = config.user;
 		if (config.metadata) body.metadata = config.metadata;
 		if (config.store !== void 0) body.store = config.store;
+		if ((isReasoningModel || isGPT5Model) && "max_tokens" in body) delete body.max_tokens;
 		return {
 			body,
 			config
@@ -494,7 +520,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 	}
 	async callApi(prompt, context, callApiOptions) {
 		if (this.initializationPromise != null) await this.initializationPromise;
-		if (this.requiresApiKey() && !this.getApiKey()) throw new Error(`API key is not set. Set the ${this.config.apiKeyEnvar || "OPENAI_API_KEY"} environment variable or add \`apiKey\` to the provider config.`);
+		if (this.requiresApiKey() && !this.getApiKey()) throw new Error(this.getMissingApiKeyErrorMessage());
 		const spanContext = {
 			system: "openai",
 			operationName: "chat",
@@ -763,4 +789,4 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 //#endregion
 export { normalizeFinishReason as i, MCPClient as n, FINISH_REASON_MAP as r, OpenAiChatCompletionProvider as t };
 
-//# sourceMappingURL=chat-B0iaWhoh.js.map
+//# sourceMappingURL=chat-BfPaS15_.js.map

package/dist/src/{chat-CM8qWR3_.cjs → chat-CclRbxGf.cjs}

@@ -1,13 +1,14 @@
-const require_logger = require("./logger-D5iKBpu_.cjs");
-const require_esm = require("./esm-CipptfDu.cjs");
+const require_logger = require("./logger-COuQb2xB.cjs");
+const require_esm = require("./esm-CtEPLdAj.cjs");
 const require_fileExtensions = require("./fileExtensions-bYh77CN8.cjs");
-const require_util = require("./util-CuLo2pMR.cjs");
-const require_fetch = require("./fetch-BnR9wSnm.cjs");
-const require_cache = require("./cache-C5yFZ4gC.cjs");
-const require_genaiTracer = require("./genaiTracer-BfxrvSUb.cjs");
-const require_transform = require("./transform-0BwoBsvO.cjs");
-const require_openai = require("./openai-CoxGAQwn.cjs");
-const require_util$1 = require("./util-CFj4YKIn.cjs");
+const require_util = require("./util-Bxn8emtE.cjs");
+const require_render = require("./render-DfQSFxGE.cjs");
+const require_fetch = require("./fetch-CJU5ELPa.cjs");
+const require_cache = require("./cache-BIyPcp5v.cjs");
+const require_genaiTracer = require("./genaiTracer-yRuxj9-L.cjs");
+const require_transform = require("./transform-CTeuTR3S.cjs");
+const require_openai = require("./openai-URNyItar.cjs");
+const require_util$1 = require("./util-CN3SrLT4.cjs");
 let path = require("path");
 path = require_logger.__toESM(path);
 let _modelcontextprotocol_sdk_client_index_js = require("@modelcontextprotocol/sdk/client/index.js");
@@ -25,13 +26,14 @@ let _modelcontextprotocol_sdk_client_index_js = require("@modelcontextprotocol/s
 *
 * **Provider Mappings:**
 * - OpenAI: `function_call` (legacy) → `tool_calls` (current)
-* - Anthropic: `end_turn` → `stop`, `stop_sequence` → `stop`, `max_tokens` → `length`, `tool_use` → `tool_calls`
+* - Anthropic: `end_turn` → `stop`, `stop_sequence` → `stop`, `max_tokens` → `length`, `tool_use` → `tool_calls`, `refusal` → `content_filter`, `pause_turn` → `pause_turn`
 *
 * @example
 * ```typescript
 * normalizeFinishReason('end_turn')     // Returns: 'stop'
 * normalizeFinishReason('max_tokens')   // Returns: 'length'
 * normalizeFinishReason('tool_use')     // Returns: 'tool_calls'
+* normalizeFinishReason('refusal')      // Returns: 'content_filter'
 * normalizeFinishReason('function_call') // Returns: 'tool_calls'
 * normalizeFinishReason('unknown')      // Returns: 'unknown' (passthrough)
 * ```
@@ -45,7 +47,9 @@ const FINISH_REASON_MAP = {
 	end_turn: "stop",
 	stop_sequence: "stop",
 	max_tokens: "length",
-	tool_use: "tool_calls"
+	tool_use: "tool_calls",
+	refusal: "content_filter",
+	pause_turn: "pause_turn"
 };
 /**
 * Normalize a provider-specific finish or stop reason to a standard OpenAI-compatible value.
@@ -101,7 +105,7 @@ var MCPClient = class {
 	transports = /* @__PURE__ */ new Map();
 	oauthConfigs = /* @__PURE__ */ new Map();
 	tokenExpiresAt = /* @__PURE__ */ new Map();
-	tokenRefreshPromise = /* @__PURE__ */ new Map();
+	tokenRefreshLocks = /* @__PURE__ */ new Map();
 	get hasInitialized() {
 		return this.clients.size > 0;
 	}
@@ -233,31 +237,36 @@ var MCPClient = class {
 	async refreshOAuthTokenIfNeeded(serverKey) {
 		const oauthConfig = this.oauthConfigs.get(serverKey);
 		if (!oauthConfig) return;
-		const now = Date.now();
+		await this.refreshOAuthToken(serverKey, oauthConfig, false);
+	}
+	hasValidToken(serverKey) {
 		const expiresAt = this.tokenExpiresAt.get(serverKey);
-		if (expiresAt && now + 6e4 < expiresAt) {
-			require_logger.logger.debug(`[MCP] Token for ${serverKey} still valid, no refresh needed`);
-			return;
-		}
-		const existingRefresh = this.tokenRefreshPromise.get(serverKey);
-		if (existingRefresh) {
+		return expiresAt != null && this.clients.has(serverKey) && Date.now() + 6e4 < expiresAt;
+	}
+	async refreshOAuthToken(serverKey, oauthConfig, forceRefresh) {
+		while (true) {
+			const existingRefreshPromise = this.tokenRefreshLocks.get(serverKey)?.promise;
+			if (!existingRefreshPromise) break;
 			require_logger.logger.debug(`[MCP] Token refresh already in progress for ${serverKey}, waiting...`);
 			try {
-				await existingRefresh;
-				const newExpiresAt = this.tokenExpiresAt.get(serverKey);
-				if (newExpiresAt && Date.now() + 6e4 < newExpiresAt) return;
-				require_logger.logger.debug(`[MCP] Token expired while waiting for ${serverKey}, refreshing again...`);
+				await existingRefreshPromise;
+				if (this.hasValidToken(serverKey)) return;
+				require_logger.logger.debug(`[MCP] Token still needs refresh for ${serverKey}, refreshing again...`);
 			} catch {
 				require_logger.logger.debug(`[MCP] Previous token refresh failed for ${serverKey}, retrying...`);
 			}
 		}
-		require_logger.logger.debug(`[MCP] Proactively refreshing OAuth token for server ${serverKey}`);
-		const refreshPromise = this.performTokenRefresh(serverKey, oauthConfig);
-		this.tokenRefreshPromise.set(serverKey, refreshPromise);
+		if (!forceRefresh && this.hasValidToken(serverKey)) {
+			require_logger.logger.debug(`[MCP] Token for ${serverKey} still valid, no refresh needed`);
+			return;
+		}
+		require_logger.logger.debug(`[MCP] Refreshing OAuth token for server ${serverKey}`);
+		const refreshLock = { promise: this.performTokenRefresh(serverKey, oauthConfig) };
+		this.tokenRefreshLocks.set(serverKey, refreshLock);
 		try {
-			await refreshPromise;
+			await refreshLock.promise;
 		} finally {
-			if (this.tokenRefreshPromise.get(serverKey) === refreshPromise) this.tokenRefreshPromise.delete(serverKey);
+			if (this.tokenRefreshLocks.get(serverKey) === refreshLock) this.tokenRefreshLocks.delete(serverKey);
 		}
 	}
 	/**
@@ -275,9 +284,21 @@ var MCPClient = class {
 	}
 	async callTool(name, args) {
 		const requestOptions = getEffectiveRequestOptions(this.config);
-		for (const [serverKey, client] of this.clients.entries()) if ((this.tools.get(serverKey) || []).some((tool) => tool.name === name)) {
-			await this.refreshOAuthTokenIfNeeded(serverKey);
-			let currentClient = this.clients.get(serverKey) || client;
+		const disconnectedServers = [];
+		for (const [serverKey, serverTools] of this.tools.entries()) if (serverTools.some((tool) => tool.name === name)) {
+			try {
+				await this.refreshOAuthTokenIfNeeded(serverKey);
+			} catch (error) {
+				const errorMessage = error instanceof Error ? error.message : String(error);
+				require_logger.logger.debug(`[MCP] Failed to refresh OAuth token for ${serverKey}, trying the next matching server: ${errorMessage}`);
+			}
+			const client = this.clients.get(serverKey);
+			if (!client) {
+				require_logger.logger.debug(`[MCP] Server ${serverKey} is not connected, trying the next matching server`);
+				disconnectedServers.push(serverKey);
+				continue;
+			}
+			let currentClient = client;
 			let retried = false;
 			while (true) try {
 				const result = await currentClient.callTool({
@@ -302,7 +323,7 @@ var MCPClient = class {
 					require_logger.logger.debug(`[MCP] Auth error for ${serverKey}, attempting reactive token refresh`);
 					retried = true;
 					try {
-						await this.performTokenRefresh(serverKey, oauthConfig);
+						await this.refreshOAuthToken(serverKey, oauthConfig, true);
 						const newClient = this.clients.get(serverKey);
 						if (newClient) {
 							currentClient = newClient;
@@ -320,6 +341,10 @@ var MCPClient = class {
 				};
 			}
 		}
+		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() {
@@ -335,7 +360,7 @@ var MCPClient = class {
 		this.tools.clear();
 		this.oauthConfigs.clear();
 		this.tokenExpiresAt.clear();
-		this.tokenRefreshPromise.clear();
+		this.tokenRefreshLocks.clear();
 	}
 };
 //#endregion
@@ -350,7 +375,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends re
 	constructor(modelName, options = {}) {
 		if (!OpenAiChatCompletionProvider.OPENAI_CHAT_MODEL_NAMES.includes(modelName)) require_logger.logger.debug(`Using unknown chat model: ${modelName}`);
 		super(modelName, options);
-		this.config = options.config || {};
+		this.config = options.config ? { ...options.config } : {};
 		if (this.config.mcp?.enabled) this.initializationPromise = this.initializeMCP();
 	}
 	async initializeMCP() {
@@ -449,7 +474,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends re
 		const maxTokens = isReasoningModel || isGPT5Model ? void 0 : config.max_tokens ?? maxTokensDefault;
 		const temperatureDefault = config.omitDefaults ? require_logger.getEnvString("OPENAI_TEMPERATURE") === void 0 ? void 0 : require_logger.getEnvFloat("OPENAI_TEMPERATURE") : require_logger.getEnvFloat("OPENAI_TEMPERATURE", 0);
 		const temperature = this.supportsTemperature() ? config.temperature ?? temperatureDefault : void 0;
-		const reasoningEffort = isReasoningModel ? require_util.renderVarsInObject(config.reasoning_effort, context?.vars) : void 0;
+		const reasoningEffort = isReasoningModel ? require_render.renderVarsInObject(config.reasoning_effort, context?.vars) : void 0;
 		const mcpTools = this.mcpClient ? require_transform.transformMCPToolsToOpenAi(this.mcpClient.getAllTools()) : [];
 		const fileTools = require_fetch.transformTools(config.tools ? await require_util.maybeLoadToolsFromExternalFile(config.tools, context?.vars) || [] : [], "openai");
 		const allTools = [...mcpTools, ...fileTools];
@@ -488,6 +513,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends re
 		if (config.user) body.user = config.user;
 		if (config.metadata) body.metadata = config.metadata;
 		if (config.store !== void 0) body.store = config.store;
+		if ((isReasoningModel || isGPT5Model) && "max_tokens" in body) delete body.max_tokens;
 		return {
 			body,
 			config
@@ -495,7 +521,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends re
 	}
 	async callApi(prompt, context, callApiOptions) {
 		if (this.initializationPromise != null) await this.initializationPromise;
-		if (this.requiresApiKey() && !this.getApiKey()) throw new Error(`API key is not set. Set the ${this.config.apiKeyEnvar || "OPENAI_API_KEY"} environment variable or add \`apiKey\` to the provider config.`);
+		if (this.requiresApiKey() && !this.getApiKey()) throw new Error(this.getMissingApiKeyErrorMessage());
 		const spanContext = {
 			system: "openai",
 			operationName: "chat",
@@ -787,4 +813,4 @@ Object.defineProperty(exports, "normalizeFinishReason", {
 	}
 });
 
-//# sourceMappingURL=chat-CM8qWR3_.cjs.map
+//# sourceMappingURL=chat-CclRbxGf.cjs.map

package/dist/src/{chat-BEwdgGEg.js → chat-Dr3DUQ0D.js}

@@ -1,14 +1,15 @@
 #!/usr/bin/env node
-import { C as getEnvBool, E as getEnvString, T as getEnvInt, j as state, s as logger, w as getEnvFloat } from "./logger-BcJBzSSA.js";
-import { S as transformTools, f as REQUEST_TIMEOUT_MS, x as transformToolChoice, y as parseChatPrompt } from "./fetch-DoVRJZhJ.js";
-import { a as fetchWithCache } from "./cache-DSqR6ezl.js";
-import { i as isJavascriptFile } from "./fileExtensions-Ds-foDzt.js";
-import { g as maybeLoadToolsFromExternalFile, h as maybeLoadResponseFormatFromExternalFile, m as maybeLoadFromExternalFileWithVars, x as renderVarsInObject } from "./util-Bm3E9jpK.js";
-import { r as importModule } from "./esm-7UIl0pPM.js";
-import { n as withGenAISpan } from "./genaiTracer-C1rxGO8Q.js";
-import { D as getAuthQueryParams, E as getAuthHeaders, O as getOAuthTokenWithExpiry, T as applyQueryParams, i as transformMCPToolsToOpenAi, k as renderAuthVars } from "./transform-DrleutM3.js";
-import { t as OpenAiGenericProvider } from "./openai-BMcwgD5C.js";
-import { a as calculateOpenAICost, c as getTokenUsage, t as OPENAI_CHAT_MODELS } from "./util-DM2rTn_6.js";
+import { D as getEnvInt, E as getEnvFloat, N as state, O as getEnvString, T as getEnvBool, s as logger } from "./logger-DksKw1Qc.js";
+import { C as transformToolChoice, m as REQUEST_TIMEOUT_MS, w as transformTools, x as parseChatPrompt } from "./fetch-BEWnXrrG.js";
+import { r as importModule } from "./esm-tVgYPY-f.js";
+import { n as withGenAISpan } from "./genaiTracer-DWdZ28hY.js";
+import { n as renderVarsInObject } from "./render-CMEpfLaO.js";
+import { a as fetchWithCache } from "./cache-mb7c8hbp.js";
+import { i as isJavascriptFile } from "./fileExtensions-AWa2ZML4.js";
+import { g as maybeLoadToolsFromExternalFile, h as maybeLoadResponseFormatFromExternalFile, m as maybeLoadFromExternalFileWithVars } from "./util-DxWpWjhc.js";
+import { A as renderAuthVars, D as getAuthHeaders, E as applyQueryParams, O as getAuthQueryParams, i as transformMCPToolsToOpenAi, k as getOAuthTokenWithExpiry } from "./transform-zDhMmzwX.js";
+import { t as OpenAiGenericProvider } from "./openai-Qsvz25mV.js";
+import { a as calculateOpenAICost, c as getTokenUsage, t as OPENAI_CHAT_MODELS } from "./util-C9J8ahRn.js";
 import path from "path";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 //#region src/util/finishReason.ts
@@ -25,13 +26,14 @@ import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 *
 * **Provider Mappings:**
 * - OpenAI: `function_call` (legacy) → `tool_calls` (current)
-* - Anthropic: `end_turn` → `stop`, `stop_sequence` → `stop`, `max_tokens` → `length`, `tool_use` → `tool_calls`
+* - Anthropic: `end_turn` → `stop`, `stop_sequence` → `stop`, `max_tokens` → `length`, `tool_use` → `tool_calls`, `refusal` → `content_filter`, `pause_turn` → `pause_turn`
 *
 * @example
 * ```typescript
 * normalizeFinishReason('end_turn')     // Returns: 'stop'
 * normalizeFinishReason('max_tokens')   // Returns: 'length'
 * normalizeFinishReason('tool_use')     // Returns: 'tool_calls'
+* normalizeFinishReason('refusal')      // Returns: 'content_filter'
 * normalizeFinishReason('function_call') // Returns: 'tool_calls'
 * normalizeFinishReason('unknown')      // Returns: 'unknown' (passthrough)
 * ```
@@ -45,7 +47,9 @@ const FINISH_REASON_MAP = {
 	end_turn: "stop",
 	stop_sequence: "stop",
 	max_tokens: "length",
-	tool_use: "tool_calls"
+	tool_use: "tool_calls",
+	refusal: "content_filter",
+	pause_turn: "pause_turn"
 };
 /**
 * Normalize a provider-specific finish or stop reason to a standard OpenAI-compatible value.
@@ -101,7 +105,7 @@ var MCPClient = class {
 	transports = /* @__PURE__ */ new Map();
 	oauthConfigs = /* @__PURE__ */ new Map();
 	tokenExpiresAt = /* @__PURE__ */ new Map();
-	tokenRefreshPromise = /* @__PURE__ */ new Map();
+	tokenRefreshLocks = /* @__PURE__ */ new Map();
 	get hasInitialized() {
 		return this.clients.size > 0;
 	}
@@ -233,31 +237,36 @@ var MCPClient = class {
 	async refreshOAuthTokenIfNeeded(serverKey) {
 		const oauthConfig = this.oauthConfigs.get(serverKey);
 		if (!oauthConfig) return;
-		const now = Date.now();
+		await this.refreshOAuthToken(serverKey, oauthConfig, false);
+	}
+	hasValidToken(serverKey) {
 		const expiresAt = this.tokenExpiresAt.get(serverKey);
-		if (expiresAt && now + 6e4 < expiresAt) {
-			logger.debug(`[MCP] Token for ${serverKey} still valid, no refresh needed`);
-			return;
-		}
-		const existingRefresh = this.tokenRefreshPromise.get(serverKey);
-		if (existingRefresh) {
+		return expiresAt != null && this.clients.has(serverKey) && Date.now() + 6e4 < expiresAt;
+	}
+	async refreshOAuthToken(serverKey, oauthConfig, forceRefresh) {
+		while (true) {
+			const existingRefreshPromise = this.tokenRefreshLocks.get(serverKey)?.promise;
+			if (!existingRefreshPromise) break;
 			logger.debug(`[MCP] Token refresh already in progress for ${serverKey}, waiting...`);
 			try {
-				await existingRefresh;
-				const newExpiresAt = this.tokenExpiresAt.get(serverKey);
-				if (newExpiresAt && Date.now() + 6e4 < newExpiresAt) return;
-				logger.debug(`[MCP] Token expired while waiting for ${serverKey}, refreshing again...`);
+				await existingRefreshPromise;
+				if (this.hasValidToken(serverKey)) return;
+				logger.debug(`[MCP] Token still needs refresh for ${serverKey}, refreshing again...`);
 			} catch {
 				logger.debug(`[MCP] Previous token refresh failed for ${serverKey}, retrying...`);
 			}
 		}
-		logger.debug(`[MCP] Proactively refreshing OAuth token for server ${serverKey}`);
-		const refreshPromise = this.performTokenRefresh(serverKey, oauthConfig);
-		this.tokenRefreshPromise.set(serverKey, refreshPromise);
+		if (!forceRefresh && this.hasValidToken(serverKey)) {
+			logger.debug(`[MCP] Token for ${serverKey} still valid, no refresh needed`);
+			return;
+		}
+		logger.debug(`[MCP] Refreshing OAuth token for server ${serverKey}`);
+		const refreshLock = { promise: this.performTokenRefresh(serverKey, oauthConfig) };
+		this.tokenRefreshLocks.set(serverKey, refreshLock);
 		try {
-			await refreshPromise;
+			await refreshLock.promise;
 		} finally {
-			if (this.tokenRefreshPromise.get(serverKey) === refreshPromise) this.tokenRefreshPromise.delete(serverKey);
+			if (this.tokenRefreshLocks.get(serverKey) === refreshLock) this.tokenRefreshLocks.delete(serverKey);
 		}
 	}
 	/**
@@ -275,9 +284,21 @@ var MCPClient = class {
 	}
 	async callTool(name, args) {
 		const requestOptions = getEffectiveRequestOptions(this.config);
-		for (const [serverKey, client] of this.clients.entries()) if ((this.tools.get(serverKey) || []).some((tool) => tool.name === name)) {
-			await this.refreshOAuthTokenIfNeeded(serverKey);
-			let currentClient = this.clients.get(serverKey) || client;
+		const disconnectedServers = [];
+		for (const [serverKey, serverTools] of this.tools.entries()) if (serverTools.some((tool) => tool.name === name)) {
+			try {
+				await this.refreshOAuthTokenIfNeeded(serverKey);
+			} catch (error) {
+				const errorMessage = error instanceof Error ? error.message : String(error);
+				logger.debug(`[MCP] Failed to refresh OAuth token for ${serverKey}, trying the next matching server: ${errorMessage}`);
+			}
+			const client = this.clients.get(serverKey);
+			if (!client) {
+				logger.debug(`[MCP] Server ${serverKey} is not connected, trying the next matching server`);
+				disconnectedServers.push(serverKey);
+				continue;
+			}
+			let currentClient = client;
 			let retried = false;
 			while (true) try {
 				const result = await currentClient.callTool({
@@ -302,7 +323,7 @@ var MCPClient = class {
 					logger.debug(`[MCP] Auth error for ${serverKey}, attempting reactive token refresh`);
 					retried = true;
 					try {
-						await this.performTokenRefresh(serverKey, oauthConfig);
+						await this.refreshOAuthToken(serverKey, oauthConfig, true);
 						const newClient = this.clients.get(serverKey);
 						if (newClient) {
 							currentClient = newClient;
@@ -320,6 +341,10 @@ var MCPClient = class {
 				};
 			}
 		}
+		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() {
@@ -335,7 +360,7 @@ var MCPClient = class {
 		this.tools.clear();
 		this.oauthConfigs.clear();
 		this.tokenExpiresAt.clear();
-		this.tokenRefreshPromise.clear();
+		this.tokenRefreshLocks.clear();
 	}
 };
 //#endregion
@@ -350,7 +375,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 	constructor(modelName, options = {}) {
 		if (!OpenAiChatCompletionProvider.OPENAI_CHAT_MODEL_NAMES.includes(modelName)) logger.debug(`Using unknown chat model: ${modelName}`);
 		super(modelName, options);
-		this.config = options.config || {};
+		this.config = options.config ? { ...options.config } : {};
 		if (this.config.mcp?.enabled) this.initializationPromise = this.initializeMCP();
 	}
 	async initializeMCP() {
@@ -488,6 +513,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 		if (config.user) body.user = config.user;
 		if (config.metadata) body.metadata = config.metadata;
 		if (config.store !== void 0) body.store = config.store;
+		if ((isReasoningModel || isGPT5Model) && "max_tokens" in body) delete body.max_tokens;
 		return {
 			body,
 			config
@@ -495,7 +521,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 	}
 	async callApi(prompt, context, callApiOptions) {
 		if (this.initializationPromise != null) await this.initializationPromise;
-		if (this.requiresApiKey() && !this.getApiKey()) throw new Error(`API key is not set. Set the ${this.config.apiKeyEnvar || "OPENAI_API_KEY"} environment variable or add \`apiKey\` to the provider config.`);
+		if (this.requiresApiKey() && !this.getApiKey()) throw new Error(this.getMissingApiKeyErrorMessage());
 		const spanContext = {
 			system: "openai",
 			operationName: "chat",
@@ -764,4 +790,4 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 //#endregion
 export { normalizeFinishReason as i, MCPClient as n, FINISH_REASON_MAP as r, OpenAiChatCompletionProvider as t };
 
-//# sourceMappingURL=chat-BEwdgGEg.js.map
+//# sourceMappingURL=chat-Dr3DUQ0D.js.map