promptfoo 0.120.26 → 0.121.1

package/dist/src/{chat-XPN9YHhr.js → chat-CM_kyI8B.js}

@@ -1,5 +1,16 @@
-import { M as invariant, j as logger_default, l as OpenAiChatCompletionProvider } from "./server/index.js";
-
+import { i as logger } from "./logger-DLcq4dWf.js";
+import "./fetch-4M3YRaqL.js";
+import { t as invariant } from "./invariant-vgHWClmd.js";
+import "./esm-CaIwzWR5.js";
+import "./types-CN_TZ2GJ.js";
+import "./cache-D3eqDYGU.js";
+import "./genaiTracer-70Z8BIuV.js";
+import "./pythonUtils-D6fwaDSg.js";
+import "./util-5cB-L7U3.js";
+import { t as OpenAiChatCompletionProvider } from "./chat-BKm79wib.js";
+import "./transform-DGxXocjk.js";
+import "./openai-j-sE2O7r.js";
+import "./util-6-GqIvzS.js";
 //#region src/providers/hyperbolic/chat.ts
 const HYPERBOLIC_CHAT_MODELS = [
 	{
@@ -188,7 +199,7 @@ function calculateHyperbolicCost(modelName, config, promptTokens, completionToke
 	const outputCost = config.cost ?? model.cost.output;
 	const inputCostTotal = inputCost * promptTokens;
 	const outputCostTotal = outputCost * completionTokens;
-	logger_default.debug(`Hyperbolic cost calculation for ${modelName}: promptTokens=${promptTokens}, completionTokens=${completionTokens}, reasoningTokens=${reasoningTokens || "N/A"}, inputCost=${inputCostTotal}, outputCost=${outputCostTotal}`);
+	logger.debug(`Hyperbolic cost calculation for ${modelName}: promptTokens=${promptTokens}, completionTokens=${completionTokens}, reasoningTokens=${reasoningTokens || "N/A"}, inputCost=${inputCostTotal}, outputCost=${outputCostTotal}`);
 	return inputCostTotal + outputCostTotal;
 }
 var HyperbolicProvider = class extends OpenAiChatCompletionProvider {
@@ -245,11 +256,11 @@ var HyperbolicProvider = class extends OpenAiChatCompletionProvider {
 							acceptedPrediction: acceptedPredictions,
 							rejectedPrediction: rejectedPredictions
 						};
-						logger_default.debug(`Hyperbolic reasoning token details for ${this.modelName}: reasoning=${reasoningTokens}, accepted=${acceptedPredictions}, rejected=${rejectedPredictions}`);
+						logger.debug(`Hyperbolic reasoning token details for ${this.modelName}: reasoning=${reasoningTokens}, accepted=${acceptedPredictions}, rejected=${rejectedPredictions}`);
 					}
 				}
 			} catch (err) {
-				logger_default.error(`Failed to parse raw response JSON: ${err}`);
+				logger.error(`Failed to parse raw response JSON: ${err}`);
 			}
 			else if (typeof response.raw === "object" && response.raw !== null) {
 				const rawData = response.raw;
@@ -263,7 +274,7 @@ var HyperbolicProvider = class extends OpenAiChatCompletionProvider {
 							acceptedPrediction: acceptedPredictions,
 							rejectedPrediction: rejectedPredictions
 						};
-						logger_default.debug(`Hyperbolic reasoning token details for ${this.modelName}: reasoning=${reasoningTokens}, accepted=${acceptedPredictions}, rejected=${rejectedPredictions}`);
+						logger.debug(`Hyperbolic reasoning token details for ${this.modelName}: reasoning=${reasoningTokens}, accepted=${acceptedPredictions}, rejected=${rejectedPredictions}`);
 					}
 				}
 			}
@@ -272,7 +283,7 @@ var HyperbolicProvider = class extends OpenAiChatCompletionProvider {
 				response.cost = calculateHyperbolicCost(this.modelName, this.config || {}, response.tokenUsage.prompt, response.tokenUsage.completion, reasoningTokens);
 			}
 		} catch (err) {
-			logger_default.error(`Error processing Hyperbolic response: ${err}`);
+			logger.error(`Error processing Hyperbolic response: ${err}`);
 		}
 		return response;
 	}
@@ -282,7 +293,7 @@ function createHyperbolicProvider(providerPath, options = {}) {
 	invariant(modelName, "Model name is required");
 	return new HyperbolicProvider(modelName, options);
 }
-
 //#endregion
 export { createHyperbolicProvider };
-//# sourceMappingURL=chat-XPN9YHhr.js.map
+
+//# sourceMappingURL=chat-CM_kyI8B.js.map

package/dist/src/{chat-DIywASPG.js → chat-CRWNNq73.js}

@@ -1,17 +1,16 @@
 #!/usr/bin/env node
-import { C as getEnvString, O as cliState_default, S as getEnvInt, b as getEnvBool, o as logger_default, x as getEnvFloat } from "./logger-BotXmWKW.js";
-import { b as transformToolChoice, d as REQUEST_TIMEOUT_MS, v as parseChatPrompt, x as transformTools } from "./fetch-SRsE6Ctl.js";
-import { a as fetchWithCache } from "./cache-mIszOnuz.js";
-import { i as isJavascriptFile } from "./fileExtensions-BpuMmaFL.js";
-import { g as maybeLoadToolsFromExternalFile, h as maybeLoadResponseFormatFromExternalFile, m as maybeLoadFromExternalFileWithVars, x as renderVarsInObject } from "./util-BSh4a_Q8.js";
-import { r as importModule } from "./esm-CYhseqj4.js";
-import { n as withGenAISpan } from "./genaiTracer-CqNnnXrE.js";
-import { C as applyQueryParams, D as renderAuthVars, E as getOAuthTokenWithExpiry, O as TOKEN_REFRESH_BUFFER_MS, T as getAuthQueryParams, i as transformMCPToolsToOpenAi, w as getAuthHeaders } from "./transform-CoP2bJ7P.js";
-import { t as OpenAiGenericProvider } from "./openai-CT5fwbve.js";
-import { a as calculateOpenAICost, c as getTokenUsage, t as OPENAI_CHAT_MODELS } from "./util-CUEt0Vum.js";
+import { C as getEnvString, O as state, S as getEnvInt, b as getEnvBool, o as logger, x as getEnvFloat } from "./logger-KkObSCzq.js";
+import { S as transformTools, f as REQUEST_TIMEOUT_MS, x as transformToolChoice, y as parseChatPrompt } from "./fetch-BMv0O527.js";
+import { a as fetchWithCache } from "./cache-CG0SlR1d.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-YT5HPZaS.js";
+import { r as importModule } from "./esm-C03C-mv3.js";
+import { n as withGenAISpan } from "./genaiTracer-C1rxGO8Q.js";
+import { C as applyQueryParams, D as renderAuthVars, E as getOAuthTokenWithExpiry, T as getAuthQueryParams, i as transformMCPToolsToOpenAi, w as getAuthHeaders } from "./transform-Cgi24fJ7.js";
+import { t as OpenAiGenericProvider } from "./openai-DhbB7eWK.js";
+import { a as calculateOpenAICost, c as getTokenUsage, t as OPENAI_CHAT_MODELS } from "./util-C-PPYSMq.js";
 import path from "path";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-
 //#region src/util/finishReason.ts
 /**
 * Mapping of provider-specific finish/stop reasons to standardized OpenAI-compatible values.
@@ -80,7 +79,6 @@ function normalizeFinishReason(raw) {
 	const key = trimmed.toLowerCase();
 	return FINISH_REASON_MAP[key] ?? key;
 }
-
 //#endregion
 //#region src/providers/mcp/client.ts
 /**
@@ -129,7 +127,7 @@ var MCPClient = class {
 		if (!this.config.enabled) return;
 		const servers = this.config.servers || (this.config.server ? [this.config.server] : []);
 		for (const server of servers) {
-			logger_default.info(`connecting to server ${server.name || server.url || server.path || "default"}`);
+			logger.info(`connecting to server ${server.name || server.url || server.path || "default"}`);
 			await this.connectToServer(server);
 		}
 	}
@@ -168,7 +166,7 @@ var MCPClient = class {
 				let authHeaders = {};
 				if (renderedServer.auth?.type === "oauth") {
 					const oauthAuth = renderedServer.auth;
-					logger_default.debug("[MCP] Fetching OAuth token");
+					logger.debug("[MCP] Fetching OAuth token");
 					const { accessToken, expiresAt } = await getOAuthTokenWithExpiry(oauthAuth, server.url);
 					authHeaders = { Authorization: `Bearer ${accessToken}` };
 					this.oauthConfigs.set(serverKey, {
@@ -191,18 +189,18 @@ var MCPClient = class {
 					const { StreamableHTTPClientTransport } = await import("@modelcontextprotocol/sdk/client/streamableHttp.js");
 					transport = new StreamableHTTPClientTransport(new URL(serverUrl), hasOptions ? transportOptions : void 0);
 					await client.connect(transport, requestOptions);
-					logger_default.debug("Connected using Streamable HTTP transport");
+					logger.debug("Connected using Streamable HTTP transport");
 				} catch (error) {
-					logger_default.debug(`Failed to connect to MCP server with Streamable HTTP transport ${serverKey}: ${error}`);
+					logger.debug(`Failed to connect to MCP server with Streamable HTTP transport ${serverKey}: ${error}`);
 					const { SSEClientTransport } = await import("@modelcontextprotocol/sdk/client/sse.js");
 					transport = new SSEClientTransport(new URL(serverUrl), hasOptions ? transportOptions : void 0);
 					await client.connect(transport, requestOptions);
-					logger_default.debug("Connected using SSE transport");
+					logger.debug("Connected using SSE transport");
 				}
 			} else throw new Error("Either command+args or path or url must be specified for MCP server");
 			if (this.config.pingOnConnect) try {
 				await client.ping(requestOptions);
-				logger_default.debug(`MCP server ${serverKey} ping successful`);
+				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}`);
@@ -221,7 +219,7 @@ var MCPClient = class {
 			if (this.isVerboseEnabled) console.log(`Connected to MCP server ${serverKey} with tools:`, filteredTools.map((tool) => tool.name));
 		} catch (error) {
 			const errorMessage = error instanceof Error ? error.message : String(error);
-			if (this.isDebugEnabled) logger_default.error(`Failed to connect to MCP server ${serverKey}: ${errorMessage}`);
+			if (this.isDebugEnabled) logger.error(`Failed to connect to MCP server ${serverKey}: ${errorMessage}`);
 			throw new Error(`Failed to connect to MCP server ${serverKey}: ${errorMessage}`);
 		}
 	}
@@ -237,23 +235,23 @@ var MCPClient = class {
 		if (!oauthConfig) return;
 		const now = Date.now();
 		const expiresAt = this.tokenExpiresAt.get(serverKey);
-		if (expiresAt && now + TOKEN_REFRESH_BUFFER_MS < expiresAt) {
-			logger_default.debug(`[MCP] Token for ${serverKey} still valid, no refresh needed`);
+		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) {
-			logger_default.debug(`[MCP] Token refresh already in progress for ${serverKey}, waiting...`);
+			logger.debug(`[MCP] Token refresh already in progress for ${serverKey}, waiting...`);
 			try {
 				await existingRefresh;
 				const newExpiresAt = this.tokenExpiresAt.get(serverKey);
-				if (newExpiresAt && Date.now() + TOKEN_REFRESH_BUFFER_MS < newExpiresAt) return;
-				logger_default.debug(`[MCP] Token expired while waiting for ${serverKey}, refreshing again...`);
+				if (newExpiresAt && Date.now() + 6e4 < newExpiresAt) return;
+				logger.debug(`[MCP] Token expired while waiting for ${serverKey}, refreshing again...`);
 			} catch {
-				logger_default.debug(`[MCP] Previous token refresh failed for ${serverKey}, retrying...`);
+				logger.debug(`[MCP] Previous token refresh failed for ${serverKey}, retrying...`);
 			}
 		}
-		logger_default.debug(`[MCP] Proactively refreshing OAuth token for server ${serverKey}`);
+		logger.debug(`[MCP] Proactively refreshing OAuth token for server ${serverKey}`);
 		const refreshPromise = this.performTokenRefresh(serverKey, oauthConfig);
 		this.tokenRefreshPromise.set(serverKey, refreshPromise);
 		try {
@@ -273,7 +271,7 @@ var MCPClient = class {
 		this.clients.delete(serverKey);
 		this.transports.delete(serverKey);
 		await this.connectToServer(oauthConfig.serverConfig);
-		logger_default.debug(`[MCP] Successfully refreshed OAuth token for server ${serverKey}`);
+		logger.debug(`[MCP] Successfully refreshed OAuth token for server ${serverKey}`);
 	}
 	async callTool(name, args) {
 		const requestOptions = getEffectiveRequestOptions(this.config);
@@ -301,7 +299,7 @@ var MCPClient = class {
 				const isAuthError = errorMessage.includes("401") || errorMessage.includes("Unauthorized") || errorMessage.includes("authorization_endpoint") || errorMessage.includes("token");
 				const oauthConfig = this.oauthConfigs.get(serverKey);
 				if (!retried && isAuthError && oauthConfig) {
-					logger_default.debug(`[MCP] Auth error for ${serverKey}, attempting reactive token refresh`);
+					logger.debug(`[MCP] Auth error for ${serverKey}, attempting reactive token refresh`);
 					retried = true;
 					try {
 						await this.performTokenRefresh(serverKey, oauthConfig);
@@ -312,10 +310,10 @@ var MCPClient = class {
 						}
 					} catch (refreshError) {
 						const refreshErrorMsg = refreshError instanceof Error ? refreshError.message : String(refreshError);
-						logger_default.error(`[MCP] Token refresh failed for ${serverKey}: ${refreshErrorMsg}`);
+						logger.error(`[MCP] Token refresh failed for ${serverKey}: ${refreshErrorMsg}`);
 					}
 				}
-				if (this.isDebugEnabled) logger_default.error(`Error calling tool ${name}: ${errorMessage}`);
+				if (this.isDebugEnabled) logger.error(`Error calling tool ${name}: ${errorMessage}`);
 				return {
 					content: "",
 					error: errorMessage
@@ -330,7 +328,7 @@ var MCPClient = class {
 			if (transport) await transport.close();
 			await client.close();
 		} catch (error) {
-			if (this.isDebugEnabled) logger_default.error(`Error during cleanup: ${error instanceof Error ? error.message : String(error)}`);
+			if (this.isDebugEnabled) logger.error(`Error during cleanup: ${error instanceof Error ? error.message : String(error)}`);
 		}
 		this.clients.clear();
 		this.transports.clear();
@@ -340,7 +338,6 @@ var MCPClient = class {
 		this.tokenRefreshPromise.clear();
 	}
 };
-
 //#endregion
 //#region src/providers/openai/chat.ts
 var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends OpenAiGenericProvider {
@@ -351,7 +348,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 	initializationPromise = null;
 	loadedFunctionCallbacks = {};
 	constructor(modelName, options = {}) {
-		if (!OpenAiChatCompletionProvider.OPENAI_CHAT_MODEL_NAMES.includes(modelName)) logger_default.debug(`Using unknown chat model: ${modelName}`);
+		if (!OpenAiChatCompletionProvider.OPENAI_CHAT_MODEL_NAMES.includes(modelName)) logger.debug(`Using unknown chat model: ${modelName}`);
 		super(modelName, options);
 		this.config = options.config || {};
 		if (this.config.mcp?.enabled) this.initializationPromise = this.initializeMCP();
@@ -380,8 +377,8 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 			if (splits[0] && isJavascriptFile(splits[0])) [filePath, functionName] = splits;
 		}
 		try {
-			const resolvedPath = path.resolve(cliState_default.basePath || "", filePath);
-			logger_default.debug(`Loading function from ${resolvedPath}${functionName ? `:${functionName}` : ""}`);
+			const resolvedPath = path.resolve(state.basePath || "", filePath);
+			logger.debug(`Loading function from ${resolvedPath}${functionName ? `:${functionName}` : ""}`);
 			const requiredModule = await importModule(resolvedPath, functionName);
 			if (typeof requiredModule === "function") return requiredModule;
 			else if (requiredModule && typeof requiredModule === "object" && functionName && functionName in requiredModule) {
@@ -412,18 +409,18 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 				}
 			}
 			if (!callback) throw new Error(`No callback found for function '${functionName}'`);
-			logger_default.debug(`Executing function '${functionName}' with args: ${args}`);
+			logger.debug(`Executing function '${functionName}' with args: ${args}`);
 			const result = await callback(args);
 			if (result === void 0 || result === null) return "";
 			else if (typeof result === "object") try {
 				return JSON.stringify(result);
 			} catch (error) {
-				logger_default.warn(`Error stringifying result from function '${functionName}': ${error}`);
+				logger.warn(`Error stringifying result from function '${functionName}': ${error}`);
 				return String(result);
 			}
 			else return String(result);
 		} catch (error) {
-			logger_default.error(`Error executing function '${functionName}': ${error.message || String(error)}`);
+			logger.error(`Error executing function '${functionName}': ${error.message || String(error)}`);
 			throw error;
 		}
 	}
@@ -583,7 +580,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 				};
 			}
 		} catch (err) {
-			logger_default.error(`API call error: ${String(err)}`);
+			logger.error(`API call error: ${String(err)}`);
 			await deleteFromCache?.();
 			return {
 				error: `API call error: ${String(err)}`,
@@ -639,7 +636,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 			if (config.response_format?.type === "json_schema" && typeof output === "string") try {
 				output = JSON.parse(output);
 			} catch (error) {
-				logger_default.error(`Failed to parse JSON output: ${error}`);
+				logger.error(`Failed to parse JSON output: ${error}`);
 			}
 			if (reasoning && (this.config.showThinking ?? true)) output = `Thinking: ${reasoning}\n\n${output}`;
 			const functionCalls = message.function_call ? [message.function_call] : message.tool_calls;
@@ -676,7 +673,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 							hasSuccessfulCallback = true;
 							continue;
 						} catch (error) {
-							logger_default.debug(`MCP tool execution failed for ${functionName}: ${error}`);
+							logger.debug(`MCP tool execution failed for ${functionName}: ${error}`);
 							results.push(`MCP Tool Error (${functionName}): ${error}`);
 							hasSuccessfulCallback = true;
 							continue;
@@ -687,7 +684,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 						results.push(functionResult);
 						hasSuccessfulCallback = true;
 					} catch (error) {
-						logger_default.debug(`Function callback failed for ${functionName} with error ${error}, falling back to original output`);
+						logger.debug(`Function callback failed for ${functionName} with error ${error}, falling back to original output`);
 						hasSuccessfulCallback = false;
 						break;
 					}
@@ -740,11 +737,14 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 				...finishReason && { finishReason },
 				cost: calculateOpenAICost(this.modelName, config, data.usage?.prompt_tokens, data.usage?.completion_tokens, data.usage?.audio_prompt_tokens, data.usage?.audio_completion_tokens),
 				guardrails: { flagged: contentFiltered },
-				metadata: { http: {
-					status,
-					statusText,
-					headers: responseHeaders ?? {}
-				} }
+				metadata: {
+					http: {
+						status,
+						statusText,
+						headers: responseHeaders ?? {}
+					},
+					...data.choices.length > 1 && { choices: data.choices }
+				}
 			};
 		} catch (err) {
 			await deleteFromCache?.();
@@ -759,7 +759,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 		}
 	}
 };
-
 //#endregion
 export { normalizeFinishReason as i, MCPClient as n, FINISH_REASON_MAP as r, OpenAiChatCompletionProvider as t };
-//# sourceMappingURL=chat-DIywASPG.js.map
+
+//# sourceMappingURL=chat-CRWNNq73.js.map

package/dist/src/{chat-C8Ei4f87.js → chat-CznLWr_D.js}

@@ -1,16 +1,15 @@
-import { _ as getEnvBool, b as getEnvString, i as logger_default, v as getEnvFloat, w as cliState_default, y as getEnvInt } from "./logger-w8Ozp0Td.js";
-import { r as importModule } from "./esm-rDtG_2rg.js";
-import { i as isJavascriptFile } from "./fileExtensions-ePDqouxn.js";
-import { d as maybeLoadToolsFromExternalFile, g as renderVarsInObject, l as maybeLoadFromExternalFileWithVars, u as maybeLoadResponseFormatFromExternalFile } from "./util-DiCePfDu.js";
-import { S as parseChatPrompt, T as transformTools, h as REQUEST_TIMEOUT_MS, w as transformToolChoice } from "./fetch-18MuNu9i.js";
-import { a as fetchWithCache } from "./cache-BLLayYEN.js";
-import { n as withGenAISpan } from "./genaiTracer-Ce19n68P.js";
-import { C as applyQueryParams, D as renderAuthVars, E as getOAuthTokenWithExpiry, O as TOKEN_REFRESH_BUFFER_MS, T as getAuthQueryParams, i as transformMCPToolsToOpenAi, w as getAuthHeaders } from "./transform-DMaxQwDx.js";
-import { t as OpenAiGenericProvider } from "./openai-Dz3surb_.js";
-import { a as calculateOpenAICost, c as getTokenUsage, t as OPENAI_CHAT_MODELS } from "./util-Cl0zfT3V.js";
+import { _ as getEnvBool, b as getEnvString, i as logger, v as getEnvFloat, w as state, y as getEnvInt } from "./logger-CT3IKMKA.js";
+import { r as importModule } from "./esm-Cd1AjG1D.js";
+import { i as isJavascriptFile } from "./fileExtensions-DnqA1y9x.js";
+import { d as maybeLoadToolsFromExternalFile, g as renderVarsInObject, l as maybeLoadFromExternalFileWithVars, u as maybeLoadResponseFormatFromExternalFile } from "./util-Dlz_Wvgm.js";
+import { C as transformTools, S as transformToolChoice, b as parseChatPrompt, p as REQUEST_TIMEOUT_MS } from "./fetch-60Gzydls.js";
+import { r as fetchWithCache } from "./cache-8XhNqPKW.js";
+import { n as withGenAISpan } from "./genaiTracer-D3fD9dNV.js";
+import { C as applyQueryParams, D as renderAuthVars, E as getOAuthTokenWithExpiry, T as getAuthQueryParams, i as transformMCPToolsToOpenAi, w as getAuthHeaders } from "./transform-DGLazrMm.js";
+import { t as OpenAiGenericProvider } from "./openai-DElQ-fPX.js";
+import { a as calculateOpenAICost, c as getTokenUsage, t as OPENAI_CHAT_MODELS } from "./util-Betm42rL.js";
 import path from "path";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-
 //#region src/util/finishReason.ts
 /**
 * Mapping of provider-specific finish/stop reasons to standardized OpenAI-compatible values.
@@ -79,7 +78,6 @@ function normalizeFinishReason(raw) {
 	const key = trimmed.toLowerCase();
 	return FINISH_REASON_MAP[key] ?? key;
 }
-
 //#endregion
 //#region src/providers/mcp/client.ts
 /**
@@ -128,7 +126,7 @@ var MCPClient = class {
 		if (!this.config.enabled) return;
 		const servers = this.config.servers || (this.config.server ? [this.config.server] : []);
 		for (const server of servers) {
-			logger_default.info(`connecting to server ${server.name || server.url || server.path || "default"}`);
+			logger.info(`connecting to server ${server.name || server.url || server.path || "default"}`);
 			await this.connectToServer(server);
 		}
 	}
@@ -167,7 +165,7 @@ var MCPClient = class {
 				let authHeaders = {};
 				if (renderedServer.auth?.type === "oauth") {
 					const oauthAuth = renderedServer.auth;
-					logger_default.debug("[MCP] Fetching OAuth token");
+					logger.debug("[MCP] Fetching OAuth token");
 					const { accessToken, expiresAt } = await getOAuthTokenWithExpiry(oauthAuth, server.url);
 					authHeaders = { Authorization: `Bearer ${accessToken}` };
 					this.oauthConfigs.set(serverKey, {
@@ -190,18 +188,18 @@ var MCPClient = class {
 					const { StreamableHTTPClientTransport } = await import("@modelcontextprotocol/sdk/client/streamableHttp.js");
 					transport = new StreamableHTTPClientTransport(new URL(serverUrl), hasOptions ? transportOptions : void 0);
 					await client.connect(transport, requestOptions);
-					logger_default.debug("Connected using Streamable HTTP transport");
+					logger.debug("Connected using Streamable HTTP transport");
 				} catch (error) {
-					logger_default.debug(`Failed to connect to MCP server with Streamable HTTP transport ${serverKey}: ${error}`);
+					logger.debug(`Failed to connect to MCP server with Streamable HTTP transport ${serverKey}: ${error}`);
 					const { SSEClientTransport } = await import("@modelcontextprotocol/sdk/client/sse.js");
 					transport = new SSEClientTransport(new URL(serverUrl), hasOptions ? transportOptions : void 0);
 					await client.connect(transport, requestOptions);
-					logger_default.debug("Connected using SSE transport");
+					logger.debug("Connected using SSE transport");
 				}
 			} else throw new Error("Either command+args or path or url must be specified for MCP server");
 			if (this.config.pingOnConnect) try {
 				await client.ping(requestOptions);
-				logger_default.debug(`MCP server ${serverKey} ping successful`);
+				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}`);
@@ -220,7 +218,7 @@ var MCPClient = class {
 			if (this.isVerboseEnabled) console.log(`Connected to MCP server ${serverKey} with tools:`, filteredTools.map((tool) => tool.name));
 		} catch (error) {
 			const errorMessage = error instanceof Error ? error.message : String(error);
-			if (this.isDebugEnabled) logger_default.error(`Failed to connect to MCP server ${serverKey}: ${errorMessage}`);
+			if (this.isDebugEnabled) logger.error(`Failed to connect to MCP server ${serverKey}: ${errorMessage}`);
 			throw new Error(`Failed to connect to MCP server ${serverKey}: ${errorMessage}`);
 		}
 	}
@@ -236,23 +234,23 @@ var MCPClient = class {
 		if (!oauthConfig) return;
 		const now = Date.now();
 		const expiresAt = this.tokenExpiresAt.get(serverKey);
-		if (expiresAt && now + TOKEN_REFRESH_BUFFER_MS < expiresAt) {
-			logger_default.debug(`[MCP] Token for ${serverKey} still valid, no refresh needed`);
+		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) {
-			logger_default.debug(`[MCP] Token refresh already in progress for ${serverKey}, waiting...`);
+			logger.debug(`[MCP] Token refresh already in progress for ${serverKey}, waiting...`);
 			try {
 				await existingRefresh;
 				const newExpiresAt = this.tokenExpiresAt.get(serverKey);
-				if (newExpiresAt && Date.now() + TOKEN_REFRESH_BUFFER_MS < newExpiresAt) return;
-				logger_default.debug(`[MCP] Token expired while waiting for ${serverKey}, refreshing again...`);
+				if (newExpiresAt && Date.now() + 6e4 < newExpiresAt) return;
+				logger.debug(`[MCP] Token expired while waiting for ${serverKey}, refreshing again...`);
 			} catch {
-				logger_default.debug(`[MCP] Previous token refresh failed for ${serverKey}, retrying...`);
+				logger.debug(`[MCP] Previous token refresh failed for ${serverKey}, retrying...`);
 			}
 		}
-		logger_default.debug(`[MCP] Proactively refreshing OAuth token for server ${serverKey}`);
+		logger.debug(`[MCP] Proactively refreshing OAuth token for server ${serverKey}`);
 		const refreshPromise = this.performTokenRefresh(serverKey, oauthConfig);
 		this.tokenRefreshPromise.set(serverKey, refreshPromise);
 		try {
@@ -272,7 +270,7 @@ var MCPClient = class {
 		this.clients.delete(serverKey);
 		this.transports.delete(serverKey);
 		await this.connectToServer(oauthConfig.serverConfig);
-		logger_default.debug(`[MCP] Successfully refreshed OAuth token for server ${serverKey}`);
+		logger.debug(`[MCP] Successfully refreshed OAuth token for server ${serverKey}`);
 	}
 	async callTool(name, args) {
 		const requestOptions = getEffectiveRequestOptions(this.config);
@@ -300,7 +298,7 @@ var MCPClient = class {
 				const isAuthError = errorMessage.includes("401") || errorMessage.includes("Unauthorized") || errorMessage.includes("authorization_endpoint") || errorMessage.includes("token");
 				const oauthConfig = this.oauthConfigs.get(serverKey);
 				if (!retried && isAuthError && oauthConfig) {
-					logger_default.debug(`[MCP] Auth error for ${serverKey}, attempting reactive token refresh`);
+					logger.debug(`[MCP] Auth error for ${serverKey}, attempting reactive token refresh`);
 					retried = true;
 					try {
 						await this.performTokenRefresh(serverKey, oauthConfig);
@@ -311,10 +309,10 @@ var MCPClient = class {
 						}
 					} catch (refreshError) {
 						const refreshErrorMsg = refreshError instanceof Error ? refreshError.message : String(refreshError);
-						logger_default.error(`[MCP] Token refresh failed for ${serverKey}: ${refreshErrorMsg}`);
+						logger.error(`[MCP] Token refresh failed for ${serverKey}: ${refreshErrorMsg}`);
 					}
 				}
-				if (this.isDebugEnabled) logger_default.error(`Error calling tool ${name}: ${errorMessage}`);
+				if (this.isDebugEnabled) logger.error(`Error calling tool ${name}: ${errorMessage}`);
 				return {
 					content: "",
 					error: errorMessage
@@ -329,7 +327,7 @@ var MCPClient = class {
 			if (transport) await transport.close();
 			await client.close();
 		} catch (error) {
-			if (this.isDebugEnabled) logger_default.error(`Error during cleanup: ${error instanceof Error ? error.message : String(error)}`);
+			if (this.isDebugEnabled) logger.error(`Error during cleanup: ${error instanceof Error ? error.message : String(error)}`);
 		}
 		this.clients.clear();
 		this.transports.clear();
@@ -339,7 +337,6 @@ var MCPClient = class {
 		this.tokenRefreshPromise.clear();
 	}
 };
-
 //#endregion
 //#region src/providers/openai/chat.ts
 var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends OpenAiGenericProvider {
@@ -350,7 +347,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 	initializationPromise = null;
 	loadedFunctionCallbacks = {};
 	constructor(modelName, options = {}) {
-		if (!OpenAiChatCompletionProvider.OPENAI_CHAT_MODEL_NAMES.includes(modelName)) logger_default.debug(`Using unknown chat model: ${modelName}`);
+		if (!OpenAiChatCompletionProvider.OPENAI_CHAT_MODEL_NAMES.includes(modelName)) logger.debug(`Using unknown chat model: ${modelName}`);
 		super(modelName, options);
 		this.config = options.config || {};
 		if (this.config.mcp?.enabled) this.initializationPromise = this.initializeMCP();
@@ -379,8 +376,8 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 			if (splits[0] && isJavascriptFile(splits[0])) [filePath, functionName] = splits;
 		}
 		try {
-			const resolvedPath = path.resolve(cliState_default.basePath || "", filePath);
-			logger_default.debug(`Loading function from ${resolvedPath}${functionName ? `:${functionName}` : ""}`);
+			const resolvedPath = path.resolve(state.basePath || "", filePath);
+			logger.debug(`Loading function from ${resolvedPath}${functionName ? `:${functionName}` : ""}`);
 			const requiredModule = await importModule(resolvedPath, functionName);
 			if (typeof requiredModule === "function") return requiredModule;
 			else if (requiredModule && typeof requiredModule === "object" && functionName && functionName in requiredModule) {
@@ -411,18 +408,18 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 				}
 			}
 			if (!callback) throw new Error(`No callback found for function '${functionName}'`);
-			logger_default.debug(`Executing function '${functionName}' with args: ${args}`);
+			logger.debug(`Executing function '${functionName}' with args: ${args}`);
 			const result = await callback(args);
 			if (result === void 0 || result === null) return "";
 			else if (typeof result === "object") try {
 				return JSON.stringify(result);
 			} catch (error) {
-				logger_default.warn(`Error stringifying result from function '${functionName}': ${error}`);
+				logger.warn(`Error stringifying result from function '${functionName}': ${error}`);
 				return String(result);
 			}
 			else return String(result);
 		} catch (error) {
-			logger_default.error(`Error executing function '${functionName}': ${error.message || String(error)}`);
+			logger.error(`Error executing function '${functionName}': ${error.message || String(error)}`);
 			throw error;
 		}
 	}
@@ -582,7 +579,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 				};
 			}
 		} catch (err) {
-			logger_default.error(`API call error: ${String(err)}`);
+			logger.error(`API call error: ${String(err)}`);
 			await deleteFromCache?.();
 			return {
 				error: `API call error: ${String(err)}`,
@@ -638,7 +635,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 			if (config.response_format?.type === "json_schema" && typeof output === "string") try {
 				output = JSON.parse(output);
 			} catch (error) {
-				logger_default.error(`Failed to parse JSON output: ${error}`);
+				logger.error(`Failed to parse JSON output: ${error}`);
 			}
 			if (reasoning && (this.config.showThinking ?? true)) output = `Thinking: ${reasoning}\n\n${output}`;
 			const functionCalls = message.function_call ? [message.function_call] : message.tool_calls;
@@ -675,7 +672,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 							hasSuccessfulCallback = true;
 							continue;
 						} catch (error) {
-							logger_default.debug(`MCP tool execution failed for ${functionName}: ${error}`);
+							logger.debug(`MCP tool execution failed for ${functionName}: ${error}`);
 							results.push(`MCP Tool Error (${functionName}): ${error}`);
 							hasSuccessfulCallback = true;
 							continue;
@@ -686,7 +683,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 						results.push(functionResult);
 						hasSuccessfulCallback = true;
 					} catch (error) {
-						logger_default.debug(`Function callback failed for ${functionName} with error ${error}, falling back to original output`);
+						logger.debug(`Function callback failed for ${functionName} with error ${error}, falling back to original output`);
 						hasSuccessfulCallback = false;
 						break;
 					}
@@ -739,11 +736,14 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 				...finishReason && { finishReason },
 				cost: calculateOpenAICost(this.modelName, config, data.usage?.prompt_tokens, data.usage?.completion_tokens, data.usage?.audio_prompt_tokens, data.usage?.audio_completion_tokens),
 				guardrails: { flagged: contentFiltered },
-				metadata: { http: {
-					status,
-					statusText,
-					headers: responseHeaders ?? {}
-				} }
+				metadata: {
+					http: {
+						status,
+						statusText,
+						headers: responseHeaders ?? {}
+					},
+					...data.choices.length > 1 && { choices: data.choices }
+				}
 			};
 		} catch (err) {
 			await deleteFromCache?.();
@@ -758,7 +758,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 		}
 	}
 };
-
 //#endregion
 export { normalizeFinishReason as i, MCPClient as n, FINISH_REASON_MAP as r, OpenAiChatCompletionProvider as t };
-//# sourceMappingURL=chat-C8Ei4f87.js.map
+
+//# sourceMappingURL=chat-CznLWr_D.js.map