promptfoo 0.121.2 → 0.121.3

package/dist/src/{providers-BlqUifFg.js → providers-Ch6Mr0gn.js}

@@ -1,39 +1,39 @@
 #!/usr/bin/env node
-import { C as getEnvString, O as state, S as getEnvInt, b as getEnvBool, d as extractFirstJsonObject, g as safeJsonStringify, l as sanitizeObject, m as isValidJson, o as logger, u as sanitizeUrl, v as getConfigDirectoryPath, x as getEnvFloat } from "./logger-KkObSCzq.js";
-import { C as CLOUD_PROVIDER_PREFIX, N as VERSION, S as transformTools, _ as openaiToolChoiceToBedrock, b as toTitleCase, d as LONG_RUNNING_MODEL_TIMEOUT_MS, f as REQUEST_TIMEOUT_MS, h as isOpenAIToolChoice, i as fetchWithTimeout, l as sleep, m as isOpenAIToolArray, n as fetchWithProxy, p as calculateCost, r as fetchWithRetries, v as openaiToolsToBedrock, x as transformToolChoice, y as parseChatPrompt } from "./fetch-Dxpd4_sr.js";
+import { C as getEnvBool, E as getEnvString, T as getEnvInt, _ as isValidJson, f as sanitizeObject, j as state, m as extractFirstJsonObject, p as sanitizeUrl, s as logger, w as getEnvFloat, x as getConfigDirectoryPath, y as safeJsonStringify } from "./logger-BcJBzSSA.js";
+import { C as CLOUD_PROVIDER_PREFIX, N as VERSION, S as transformTools, _ as openaiToolChoiceToBedrock, b as toTitleCase, d as LONG_RUNNING_MODEL_TIMEOUT_MS, f as REQUEST_TIMEOUT_MS$1, h as isOpenAIToolChoice, i as fetchWithTimeout, l as sleep, m as isOpenAIToolArray, n as fetchWithProxy, p as calculateCost, r as fetchWithRetries, v as openaiToolsToBedrock, x as transformToolChoice, y as parseChatPrompt } from "./fetch-DoVRJZhJ.js";
 import { t as invariant } from "./invariant-BtWWVVhl.js";
-import { c as isLoggedIntoCloud, o as getUserEmail } from "./accounts-Bm2D8Db9.js";
-import { a as cloudConfig } from "./cloud-C0dlstV_.js";
-import { r as telemetry } from "./telemetry-CMrFgtPB.js";
-import { A as DATASET_PLUGINS, E as isUuid, I as isCustomStrategy, M as MULTI_TURN_STRATEGIES, O as AGENTIC_STRATEGIES, V as pluginDescriptions, dt as STRATEGY_EXEMPT_PLUGINS, m as isProviderOptions, p as isApiProvider, v as ProviderOptionsSchema } from "./types-Cbd8uOMq.js";
-import { f as neverGenerateRemote, l as getRemoteGenerationUrl, m as shouldGenerateRemote, p as neverGenerateRemoteForRegularEvals, r as checkServerFeatureSupport, u as getRemoteGenerationUrlForUnaligned } from "./server-CqzrVGpF.js";
-import { a as fetchWithCache, o as getCache, s as isCacheEnabled } from "./cache-BVeDlD87.js";
+import { c as isLoggedIntoCloud, o as getUserEmail } from "./accounts-CFLK3mnD.js";
+import { a as cloudConfig } from "./cloud-z8KZpUoa.js";
+import { r as telemetry } from "./telemetry-BnH5VJAU.js";
+import { A as DATASET_PLUGINS, E as isUuid, I as isCustomStrategy, M as MULTI_TURN_STRATEGIES, O as AGENTIC_STRATEGIES, V as pluginDescriptions, dt as STRATEGY_EXEMPT_PLUGINS, m as isProviderOptions, p as isApiProvider, v as ProviderOptionsSchema } from "./types-CIhFeUC4.js";
+import { f as neverGenerateRemote, l as getRemoteGenerationUrl, m as shouldGenerateRemote, p as neverGenerateRemoteForRegularEvals, r as checkServerFeatureSupport, u as getRemoteGenerationUrlForUnaligned } from "./server-DZ9MtCn0.js";
+import { a as fetchWithCache, o as getCache, s as isCacheEnabled } from "./cache-DSqR6ezl.js";
 import { r as isTransientConnectionError } from "./errors-P6ll7XSJ.js";
 import { a as isVideoFile, i as isJavascriptFile, n as isAudioFile, r as isImageFile } from "./fileExtensions-Ds-foDzt.js";
-import { C as extractVariablesFromTemplates, E as parseFileUrl, _ as parsePathOrGlob, b as renderEnvOnlyInObject, d as getResolvedRelativePath, f as maybeLoadConfigFromExternalFile, g as maybeLoadToolsFromExternalFile, h as maybeLoadResponseFormatFromExternalFile, m as maybeLoadFromExternalFileWithVars, p as maybeLoadFromExternalFile, w as getNunjucksEngine, x as renderVarsInObject } from "./util-C1CeHl-P.js";
-import { a as safeJoin, i as resolvePackageEntryPoint, n as getWrapperDir, o as safeResolve, r as importModule } from "./esm-C03C-mv3.js";
-import { i as validatePythonPath, n as getEnvInt$1, r as runPython, t as getConfiguredPythonPath } from "./pythonUtils-C3py6GC1.js";
-import { n as transform, r as getProcessShim, t as TransformInputType } from "./transform-DilY9wbS.js";
+import { C as extractVariablesFromTemplates, E as parseFileUrl, T as loadFunction, _ as parsePathOrGlob, b as renderEnvOnlyInObject, d as getResolvedRelativePath, f as maybeLoadConfigFromExternalFile, g as maybeLoadToolsFromExternalFile, h as maybeLoadResponseFormatFromExternalFile, m as maybeLoadFromExternalFileWithVars, p as maybeLoadFromExternalFile, w as getNunjucksEngine, x as renderVarsInObject } from "./util-Bm3E9jpK.js";
+import { a as safeJoin, i as resolvePackageEntryPoint, n as getWrapperDir, o as safeResolve, r as importModule } from "./esm-7UIl0pPM.js";
+import { i as validatePythonPath, n as getEnvInt$1, r as runPython, t as getConfiguredPythonPath } from "./pythonUtils-wIqk7zAf.js";
+import { n as transform, r as getProcessShim, t as TransformInputType } from "./transform-ljLYHEPh.js";
 import { n as sha256 } from "./createHash-Da8fMwqB.js";
 import { n as withGenAISpan } from "./genaiTracer-C1rxGO8Q.js";
-import { i as normalizeFinishReason, n as MCPClient, r as FINISH_REASON_MAP, t as OpenAiChatCompletionProvider } from "./chat-BiKyneZl.js";
+import { i as normalizeFinishReason, n as MCPClient, r as FINISH_REASON_MAP, t as OpenAiChatCompletionProvider } from "./chat-BEwdgGEg.js";
 import { a as createEmptyTokenUsage, n as accumulateResponseTokenUsage, r as accumulateTokenUsage } from "./tokenUsageUtils-DflFMjS0.js";
-import { S as toDataUri, _ as getGoogleClient, a as calculateGoogleCost, b as resolveProjectId, c as geminiFormatAndSystemInstructions, d as mergeParts, f as normalizeSafetySettings, g as GoogleAuthManager, h as CHAT_MODELS, i as transformMCPToolsToOpenAi, l as getCandidate, o as createAuthCacheDiscriminator, p as normalizeTools, r as transformMCPToolsToGoogle, s as formatCandidateContents, u as getGoogleAccessToken, y as loadCredentials } from "./transform-D5HsjduX.js";
-import { n as AnthropicGenericProvider, t as AnthropicMessagesProvider } from "./messages-D0lx5qK7.js";
-import { a as parseMessages, i as outputFromMessage, n as calculateAnthropicCost, r as getTokenUsage$2, t as ANTHROPIC_MODELS } from "./util-B3xGByQh.js";
-import { n as ResponsesProcessor, r as FunctionCallbackHandler, t as OpenAiResponsesProvider } from "./responses-WNGNYe3K.js";
-import { t as OpenAiGenericProvider } from "./openai-DhbB7eWK.js";
-import { a as calculateOpenAICost, c as getTokenUsage$3, o as failApiCall, r as OPENAI_REALTIME_MODELS, s as formatOpenAiError } from "./util-CMy69ZgQ.js";
-import { n as OpenAiEmbeddingProvider, t as OpenAiCompletionProvider } from "./completion-DZ083F31.js";
-import { i as storeBlob } from "./blobs-CMHN0Qcz.js";
-import { a as evalResultsTable, g as getDb } from "./tables-gftXzE9I.js";
-import { n as isBlobStorageEnabled, r as shouldAttemptRemoteBlobUpload, t as extractAndStoreBinaryData } from "./extractor-DReVID0K.js";
+import { A as TOKEN_REFRESH_BUFFER_MS, S as resolveProjectId, _ as determineGoogleVertexMode, a as calculateGoogleCost, c as geminiFormatAndSystemInstructions, d as mergeParts, f as normalizeSafetySettings, g as GoogleAuthManager, h as CHAT_MODELS, i as transformMCPToolsToOpenAi, l as getCandidate, o as createAuthCacheDiscriminator, p as normalizeTools, r as transformMCPToolsToGoogle, s as formatCandidateContents, u as getGoogleAccessToken, v as getGoogleApiKey, w as toDataUri, x as loadCredentials, y as getGoogleClient } from "./transform-DrleutM3.js";
+import { n as AnthropicGenericProvider, t as AnthropicMessagesProvider } from "./messages-DJNo37Ko.js";
+import { a as parseMessages, i as outputFromMessage, n as calculateAnthropicCost, r as getTokenUsage$2, t as ANTHROPIC_MODELS } from "./util-DMFeUvLz.js";
+import { n as ResponsesProcessor, r as FunctionCallbackHandler, t as OpenAiResponsesProvider } from "./responses-BKP_WYis.js";
+import { t as OpenAiGenericProvider } from "./openai-BMcwgD5C.js";
+import { a as calculateOpenAICost, c as getTokenUsage$3, o as failApiCall, r as OPENAI_REALTIME_MODELS, s as formatOpenAiError } from "./util-DM2rTn_6.js";
+import { n as OpenAiEmbeddingProvider, t as OpenAiCompletionProvider } from "./completion-DoYy49ti.js";
+import { i as storeBlob } from "./blobs-B1JriOyi.js";
+import { a as evalResultsTable, g as getDb } from "./tables-DmzvLbeZ.js";
+import { n as isBlobStorageEnabled, r as shouldAttemptRemoteBlobUpload, t as extractAndStoreBinaryData } from "./extractor-CAZ2G3Kh.js";
 import { n as escapeRegExp, t as ellipsize } from "./text-Db-Wt2u2.js";
-import { n as getTraceStore } from "./store-Dim__MDd.js";
-import { a as novaParseMessages, i as novaOutputFromMessage, t as AwsBedrockGenericProvider } from "./base-Dy1V8--Z.js";
-import { i as formatOutput, n as buildStructuredImageOutputs, r as callOpenAiImageApi, t as OpenAiImageProvider } from "./image-DS-o-0ph.js";
-import { t as providerRegistry } from "./providerRegistry-B0RUOLI_.js";
-import { n as runRuby } from "./rubyUtils-Boc4HZzX.js";
+import { n as getTraceStore } from "./store-P8OKm19S.js";
+import { a as novaParseMessages, i as novaOutputFromMessage, t as AwsBedrockGenericProvider } from "./base-CKjwebIH.js";
+import { i as formatOutput, n as buildStructuredImageOutputs, r as callOpenAiImageApi, t as OpenAiImageProvider } from "./image-PoF6DN3x.js";
+import { t as providerRegistry } from "./providerRegistry-B9lh-_tx.js";
+import { n as runRuby } from "./rubyUtils-CiVfln3g.js";
 import { Agent } from "undici";
 import { z } from "zod";
 import input from "@inquirer/input";
@@ -172,9 +172,9 @@ function normalizeEvalConfig(config) {
 	const tests = Array.isArray(config.tests) ? config.tests : Array.isArray(config.testCases) ? config.testCases : [];
 	const commandLineOptions = {
 		...isRecord(config.commandLineOptions) ? config.commandLineOptions : {},
-		...config.maxConcurrency != null ? { maxConcurrency: config.maxConcurrency } : {},
-		...config.delay != null ? { delay: config.delay } : {},
-		...config.verbose != null ? { verbose: config.verbose } : {}
+		...config.maxConcurrency == null ? {} : { maxConcurrency: config.maxConcurrency },
+		...config.delay == null ? {} : { delay: config.delay },
+		...config.verbose == null ? {} : { verbose: config.verbose }
 	};
 	const normalizedConfig = {
 		...config,
@@ -772,6 +772,62 @@ const AZURE_MODELS = [
 			output: 20 / 1e6
 		}
 	},
+	{
+		id: "gpt-5.4",
+		cost: {
+			input: 2.5 / 1e6,
+			output: 10 / 1e6
+		}
+	},
+	{
+		id: "gpt-5.4-2026-03-05",
+		cost: {
+			input: 2.5 / 1e6,
+			output: 10 / 1e6
+		}
+	},
+	{
+		id: "gpt-5.4-pro",
+		cost: {
+			input: 5 / 1e6,
+			output: 20 / 1e6
+		}
+	},
+	{
+		id: "gpt-5.4-pro-2026-03-05",
+		cost: {
+			input: 5 / 1e6,
+			output: 20 / 1e6
+		}
+	},
+	{
+		id: "gpt-5.4-mini",
+		cost: {
+			input: .4 / 1e6,
+			output: 1.6 / 1e6
+		}
+	},
+	{
+		id: "gpt-5.4-mini-2026-03-17",
+		cost: {
+			input: .4 / 1e6,
+			output: 1.6 / 1e6
+		}
+	},
+	{
+		id: "gpt-5.4-nano",
+		cost: {
+			input: .1 / 1e6,
+			output: .4 / 1e6
+		}
+	},
+	{
+		id: "gpt-5.4-nano-2026-03-17",
+		cost: {
+			input: .1 / 1e6,
+			output: .4 / 1e6
+		}
+	},
 	{
 		id: "gpt-5-mini",
 		cost: {
@@ -2198,7 +2254,7 @@ var AzureChatCompletionProvider = class extends AzureGenericProvider {
 					...this.config.headers
 				},
 				body: JSON.stringify(body)
-			}, REQUEST_TIMEOUT_MS, "json", context?.bustCache ?? context?.debug);
+			}, REQUEST_TIMEOUT_MS$1, "json", context?.bustCache ?? context?.debug);
 			cached = isCached;
 			latencyMs = fetchLatencyMs;
 			if (typeof responseData === "string") try {
@@ -2298,7 +2354,7 @@ var AzureEmbeddingProvider = class extends AzureGenericProvider {
 					...this.config.headers
 				},
 				body: JSON.stringify(body)
-			}, REQUEST_TIMEOUT_MS));
+			}, REQUEST_TIMEOUT_MS$1));
 		} catch (err) {
 			return {
 				error: `API call error: ${String(err)}`,
@@ -2459,7 +2515,7 @@ var AzureModerationProvider = class AzureModerationProvider extends AzureGeneric
 				...this.configWithHeaders.passthrough || {}
 			};
 			const controller = new AbortController();
-			const timeoutId = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
+			const timeoutId = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS$1);
 			const response = await fetchWithProxy(url, {
 				method: "POST",
 				headers,
@@ -2706,7 +2762,7 @@ var GoogleGenericProvider = class {
 	* Get the request timeout in milliseconds.
 	*/
 	getTimeout() {
-		return this.config.timeoutMs || REQUEST_TIMEOUT_MS;
+		return this.config.timeoutMs || REQUEST_TIMEOUT_MS$1;
 	}
 };
 //#endregion
@@ -2848,7 +2904,7 @@ var AIStudioChatProvider = class extends GoogleGenericProvider {
 				headers,
 				body: JSON.stringify(body),
 				...authDiscriminator && { _authHash: authDiscriminator }
-			}, REQUEST_TIMEOUT_MS, "json", context?.bustCache ?? context?.debug));
+			}, REQUEST_TIMEOUT_MS$1, "json", context?.bustCache ?? context?.debug));
 		} catch (err) {
 			return { error: `API call error: ${String(err)}` };
 		}
@@ -2875,7 +2931,7 @@ var AIStudioChatProvider = class extends GoogleGenericProvider {
 					rejectedPrediction: 0
 				} }
 			};
-			const completionForCost = data.usageMetadata?.candidatesTokenCount != null ? data.usageMetadata.candidatesTokenCount + (data.usageMetadata?.thoughtsTokenCount ?? 0) : void 0;
+			const completionForCost = data.usageMetadata?.candidatesTokenCount == null ? void 0 : data.usageMetadata.candidatesTokenCount + (data.usageMetadata?.thoughtsTokenCount ?? 0);
 			return {
 				output,
 				tokenUsage,
@@ -2930,7 +2986,7 @@ var AIStudioChatProvider = class extends GoogleGenericProvider {
 				headers,
 				body: JSON.stringify(body),
 				...authDiscriminator && { _authHash: authDiscriminator }
-			}, REQUEST_TIMEOUT_MS, "json", false));
+			}, REQUEST_TIMEOUT_MS$1, "json", false));
 		} catch (err) {
 			return { error: `API call error: ${String(err)}` };
 		}
@@ -2972,7 +3028,7 @@ var AIStudioChatProvider = class extends GoogleGenericProvider {
 					rejectedPrediction: 0
 				} }
 			};
-			const completionForCost = data.usageMetadata?.candidatesTokenCount != null ? data.usageMetadata.candidatesTokenCount + (data.usageMetadata?.thoughtsTokenCount ?? 0) : void 0;
+			const completionForCost = data.usageMetadata?.candidatesTokenCount == null ? void 0 : data.usageMetadata.candidatesTokenCount + (data.usageMetadata?.thoughtsTokenCount ?? 0);
 			const cost = cached ? void 0 : calculateGoogleCost(this.modelName, config, data.usageMetadata?.promptTokenCount, completionForCost);
 			return {
 				output,
@@ -3163,7 +3219,7 @@ var VertexChatProvider = class extends GoogleGenericProvider {
 				method: "POST",
 				headers: { "Content-Type": "application/json; charset=utf-8" },
 				data: body,
-				timeout: REQUEST_TIMEOUT_MS
+				timeout: REQUEST_TIMEOUT_MS$1
 			})).data;
 		} catch (err) {
 			const error = err;
@@ -3277,7 +3333,7 @@ var VertexChatProvider = class extends GoogleGenericProvider {
 						method: "POST",
 						headers: await this.getAuthHeaders(),
 						body: JSON.stringify(body),
-						signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS)
+						signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS$1)
 					});
 					if (!res.ok) {
 						const errorData = await res.json().catch(() => null);
@@ -3293,7 +3349,7 @@ var VertexChatProvider = class extends GoogleGenericProvider {
 						url,
 						method: "POST",
 						data: body,
-						timeout: REQUEST_TIMEOUT_MS
+						timeout: REQUEST_TIMEOUT_MS$1
 					})).data;
 				}
 			} catch (err) {
@@ -3396,7 +3452,7 @@ var VertexChatProvider = class extends GoogleGenericProvider {
 						rejectedPrediction: 0
 					} }
 				};
-				const completionForCost = completionTokenCount != null ? completionTokenCount + (thoughtsTokenCount ?? 0) : void 0;
+				const completionForCost = completionTokenCount == null ? void 0 : completionTokenCount + (thoughtsTokenCount ?? 0);
 				const cost = calculateGoogleCost(this.modelName, config, promptTokenCount, completionForCost, true);
 				response = {
 					cached: false,
@@ -3483,7 +3539,7 @@ var VertexChatProvider = class extends GoogleGenericProvider {
 				method: "POST",
 				headers: { "Content-Type": "application/json" },
 				data: body,
-				timeout: REQUEST_TIMEOUT_MS
+				timeout: REQUEST_TIMEOUT_MS$1
 			})).data;
 		} catch (err) {
 			return { error: `API call error: ${JSON.stringify(err)}` };
@@ -3552,7 +3608,7 @@ var VertexChatProvider = class extends GoogleGenericProvider {
 				method: "POST",
 				headers: { "Content-Type": "application/json; charset=utf-8" },
 				data: body,
-				timeout: REQUEST_TIMEOUT_MS
+				timeout: REQUEST_TIMEOUT_MS$1
 			})).data;
 			logger.debug(`Llama API response: ${JSON.stringify(data)}`);
 		} catch (err) {
@@ -3879,12 +3935,14 @@ var MistralChatCompletionProvider = class MistralChatCompletionProvider {
 		};
 		return withGenAISpan(spanContext, () => this.callApiInternal(prompt, context, config), resultExtractor);
 	}
-	async callApiInternal(prompt, _context, config = {}) {
+	async callApiInternal(prompt, context, config = {}) {
 		if (!this.getApiKey()) throw new Error("Mistral API key is not set. Set the MISTRAL_API_KEY environment variable or add `apiKey` or `apiKeyEnvar` to the provider config.");
 		const messages = parseChatPrompt(prompt, [{
 			role: "user",
 			content: prompt
 		}]);
+		const loadedTools = config.tools ? await maybeLoadToolsFromExternalFile(config.tools, context?.vars) : void 0;
+		const hasTools = Array.isArray(loadedTools) ? loadedTools.length > 0 : loadedTools !== void 0;
 		const params = {
 			model: this.modelName,
 			messages,
@@ -3893,6 +3951,9 @@ var MistralChatCompletionProvider = class MistralChatCompletionProvider {
 			max_tokens: config?.max_tokens || 1024,
 			safe_prompt: config?.safe_prompt || false,
 			random_seed: config?.random_seed || null,
+			...hasTools ? { tools: loadedTools } : {},
+			...config?.tool_choice ? { tool_choice: config.tool_choice } : {},
+			..."parallel_tool_calls" in config ? { parallel_tool_calls: Boolean(config.parallel_tool_calls) } : {},
 			...config?.response_format ? { response_format: config.response_format } : {}
 		};
 		const cacheKey = `mistral:${JSON.stringify(params)}`;
@@ -3927,15 +3988,20 @@ var MistralChatCompletionProvider = class MistralChatCompletionProvider {
 					Authorization: `Bearer ${this.getApiKey()}`
 				},
 				body: JSON.stringify(params)
-			}, REQUEST_TIMEOUT_MS));
+			}, REQUEST_TIMEOUT_MS$1));
 		} catch (err) {
 			return { error: `API call error: ${String(err)}` };
 		}
 		logger.debug("Mistral API response", { data });
 		if (data.error) return { error: `API call error: ${data.error}` };
-		if (!data.choices || !data.choices[0] || !data.choices[0].message.content) return { error: `Malformed response data: ${JSON.stringify(data)}` };
+		if (!data.choices || !data.choices[0] || !data.choices[0].message) return { error: `Malformed response data: ${JSON.stringify(data)}` };
+		const message = data.choices[0].message;
+		let output;
+		if (message.content && message.tool_calls?.length) output = message;
+		else if (message.tool_calls?.length) output = message.tool_calls;
+		else output = message.content;
 		const result = {
-			output: data.choices[0].message.content,
+			output,
 			tokenUsage: getTokenUsage$1(data, cached),
 			cached,
 			cost: calculateMistralCost(this.modelName, config, data.usage?.prompt_tokens, data.usage?.completion_tokens)
@@ -4008,7 +4074,7 @@ var MistralEmbeddingProvider = class {
 					Authorization: `Bearer ${this.getApiKey()}`
 				},
 				body: JSON.stringify(body)
-			}, REQUEST_TIMEOUT_MS));
+			}, REQUEST_TIMEOUT_MS$1));
 		} catch (err) {
 			logger.error(`API call error: ${err}`);
 			throw err;
@@ -4144,7 +4210,7 @@ var OpenAiModerationProvider = class OpenAiModerationProvider extends OpenAiGene
 				method: "POST",
 				headers,
 				body: requestBody
-			}, REQUEST_TIMEOUT_MS, "json", false, this.config.maxRetries);
+			}, REQUEST_TIMEOUT_MS$1, "json", false, this.config.maxRetries);
 			if (status < 200 || status >= 300) return handleApiError$1(`${status} ${statusText}`, typeof data === "string" ? data : JSON.stringify(data));
 			logger.debug(`\tOpenAI moderation API response: ${JSON.stringify(data)}`);
 			const response = parseOpenAIModerationResponse(data);
@@ -4257,7 +4323,7 @@ var PromptfooChatCompletionProvider = class {
 				headers: { "Content-Type": "application/json" },
 				body: JSON.stringify(body),
 				...callApiOptions?.abortSignal && { signal: callApiOptions.abortSignal }
-			}, REQUEST_TIMEOUT_MS);
+			}, REQUEST_TIMEOUT_MS$1);
 			const data = await response.json();
 			if (!data.result) {
 				logger.debug(`Error from promptfoo completion provider. Status: ${response.status} ${response.statusText} ${JSON.stringify(data)} `);
@@ -4316,7 +4382,7 @@ var PromptfooSimulatedUserProvider = class {
 				headers: { "Content-Type": "application/json" },
 				body: JSON.stringify(body),
 				...callApiOptions?.abortSignal && { signal: callApiOptions.abortSignal }
-			}, REQUEST_TIMEOUT_MS);
+			}, REQUEST_TIMEOUT_MS$1);
 			if (!response.ok) throw new Error(`API call failed with status ${response.status}: ${await response.text()}`);
 			const data = await response.json();
 			return {
@@ -5383,7 +5449,7 @@ async function loadRedteamProvider({ provider, jsonOnly = false, preferSmallMode
 		ret = redteamProvider;
 	} else if (typeof redteamProvider === "string" || isProviderOptions(redteamProvider)) {
 		logger.debug(`Loading ${purpose} provider`, { provider: redteamProvider });
-		ret = (await (await import("./providers-B7V0njNs.js")).loadApiProviders([redteamProvider]))[0];
+		ret = (await (await import("./providers-BSLEaIQG.js")).loadApiProviders([redteamProvider]))[0];
 	} else {
 		const defaultModel = preferSmallModel ? ATTACKER_MODEL_SMALL : ATTACKER_MODEL;
 		logger.debug(`Using default ${purpose} provider: ${defaultModel}`);
@@ -5670,7 +5736,7 @@ async function externalizeResponseForRedteamHistory(response, context) {
 */
 async function tryUnblocking({ messages, lastResponse, goal, purpose }) {
 	try {
-		const { checkServerFeatureSupport } = await import("./server-DA4Cyrrq.js");
+		const { checkServerFeatureSupport } = await import("./server-B0Xh1Gx-.js");
 		const supportsUnblocking = await checkServerFeatureSupport("blocking-question-analysis", "2025-06-16T14:49:11-07:00");
 		if (!getEnvBool("PROMPTFOO_ENABLE_UNBLOCKING")) {
 			logger.debug("[Unblocking] Disabled by default (set PROMPTFOO_ENABLE_UNBLOCKING=true to enable)");
@@ -6639,7 +6705,7 @@ async function extractGoalFromPrompt(prompt, purpose, pluginId, policy) {
 			method: "POST",
 			headers: { "Content-Type": "application/json" },
 			body: JSON.stringify(requestBody)
-		}, REQUEST_TIMEOUT_MS);
+		}, REQUEST_TIMEOUT_MS$1);
 		logger.debug(`Goal extraction response - Status: ${status} ${statusText || ""}, Data: ${JSON.stringify(data)}`);
 		if (status !== 200) {
 			logger.warn(`Failed to extract goal from prompt: HTTP ${status} ${statusText || ""}, Response Data: ${JSON.stringify(data)}`);
@@ -7138,7 +7204,7 @@ async function generateCitations(testCases, injectVar, config) {
 				method: "POST",
 				headers: { "Content-Type": "application/json" },
 				body: JSON.stringify(payload)
-			}, REQUEST_TIMEOUT_MS);
+			}, REQUEST_TIMEOUT_MS$1);
 			logger.debug(`Got remote citation generation result for case ${Number(index) + 1}: ${JSON.stringify(data)}`);
 			if (data.error) {
 				logger.error(`[Citation] Error in citation generation: ${data.error}`);
@@ -7275,7 +7341,7 @@ async function generateGcgPrompts(testCases, injectVar, config) {
 				method: "POST",
 				headers: { "Content-Type": "application/json" },
 				body: JSON.stringify(payload)
-			}, REQUEST_TIMEOUT_MS);
+			}, REQUEST_TIMEOUT_MS$1);
 			logger.debug(`Got GCG generation result for case ${Number(index) + 1}: ${JSON.stringify(data)}`);
 			if (data.error) {
 				logger.error(`[GCG] Error in GCG generation: ${data.error}`);
@@ -8200,7 +8266,7 @@ async function generateLikertPrompts(testCases, injectVar, config) {
 				method: "POST",
 				headers: { "Content-Type": "application/json" },
 				body: JSON.stringify(payload)
-			}, REQUEST_TIMEOUT_MS);
+			}, REQUEST_TIMEOUT_MS$1);
 			logger.debug(`Got Likert jailbreak generation result for case ${Number(index) + 1}: ${JSON.stringify(data)}`);
 			if (data.error || !data.modifiedPrompts) {
 				logger.error(`[jailbreak:likert] Error in Likert generation: ${data.error}}`);
@@ -8285,7 +8351,7 @@ async function generateMathPrompt(testCases, injectVar, config) {
 				method: "POST",
 				headers: { "Content-Type": "application/json" },
 				body: JSON.stringify(payload)
-			}, REQUEST_TIMEOUT_MS);
+			}, REQUEST_TIMEOUT_MS$1);
 			logger.debug(`Got remote MathPrompt generation result for batch ${Number(index) + 1}: ${JSON.stringify(data)}`);
 			allResults = allResults.concat(data.result);
 			processedBatches++;
@@ -9175,7 +9241,7 @@ async function textToAudio(text, language = "en", options) {
 			method: "POST",
 			headers: { "Content-Type": "application/json" },
 			body: JSON.stringify(payload)
-		}, REQUEST_TIMEOUT_MS);
+		}, REQUEST_TIMEOUT_MS$1);
 		if (data.error || !data.audioBase64) throw new Error(`Error in remote audio generation: ${data.error || "No audio data returned"}`);
 		logger.debug(`Received audio base64 from remote API (${data.audioBase64.length} chars)`);
 		const base64Audio = data.audioBase64;
@@ -9591,13 +9657,21 @@ async function generateCompositePrompts(testCases, injectVar, config) {
 				email: getUserEmail(),
 				...config.n && { n: config.n },
 				...config.modelFamily && { modelFamily: config.modelFamily },
-				...inputs && { inputs }
+				...inputs && { inputs },
+				...config.techniques && { techniques: config.techniques },
+				...config.evasions && { evasions: config.evasions },
+				...config.alwaysIncludeTechniques && { alwaysIncludeTechniques: config.alwaysIncludeTechniques },
+				...config.compositionOrder && { compositionOrder: config.compositionOrder },
+				...config.combinationMode && { combinationMode: config.combinationMode },
+				...config.includeEvasionGuidance != null && { includeEvasionGuidance: config.includeEvasionGuidance },
+				...config.evasionGuidance && { evasionGuidance: config.evasionGuidance },
+				...config.targetContext && { targetContext: config.targetContext }
 			};
 			const { data } = await fetchWithCache(getRemoteGenerationUrl(), {
 				method: "POST",
 				headers: { "Content-Type": "application/json" },
 				body: JSON.stringify(payload)
-			}, REQUEST_TIMEOUT_MS);
+			}, REQUEST_TIMEOUT_MS$1);
 			logger.debug(`Got composite jailbreak generation result for case ${Number(index) + 1}: ${JSON.stringify(data)}`);
 			if (data.error || !data.modifiedPrompts) {
 				logger.error(`[jailbreak:composite] Error in composite generation: ${data.error}}`);
@@ -10722,7 +10796,7 @@ var CrescendoProvider = class {
 		});
 		let assertToUse = test?.assert?.find((a) => a.type && a.type.includes(test.metadata?.pluginId));
 		if (!assertToUse) assertToUse = test?.assert?.find((a) => a.type);
-		const { getGraderById } = await import("./graders-B_pgMLS2.js");
+		const { getGraderById } = await import("./graders-CzVMbEnv.js");
 		let graderPassed;
 		const additionalRubric = getGoalRubric(this.userGoal);
 		while (roundNum < this.maxTurns) try {
@@ -10828,18 +10902,7 @@ var CrescendoProvider = class {
 				if (grader) {
 					const gradingTraceSummary = tracingOptions.includeInGrading ? response.traceSummary ?? (response.traceContext ? formatTraceSummary(response.traceContext) : void 0) : void 0;
 					let gradingContext;
-					if (lastResponse.metadata?.wasExfiltrated !== void 0) {
-						logger.debug("[Crescendo] Using exfil data from provider response metadata");
-						gradingContext = {
-							...tracingOptions.includeInGrading ? {
-								traceContext: response.traceContext,
-								traceSummary: gradingTraceSummary
-							} : {},
-							wasExfiltrated: Boolean(lastResponse.metadata.wasExfiltrated),
-							exfilCount: Number(lastResponse.metadata.exfilCount) || 0,
-							exfilRecords: []
-						};
-					} else {
+					if (lastResponse.metadata?.wasExfiltrated === void 0) {
 						const webPageUuid = test.metadata?.webPageUuid;
 						if (webPageUuid) {
 							const evalId = context?.evaluationId ?? test.metadata?.evaluationId;
@@ -10858,6 +10921,17 @@ var CrescendoProvider = class {
 								exfilRecords: exfilData.exfilRecords
 							};
 						}
+					} else {
+						logger.debug("[Crescendo] Using exfil data from provider response metadata");
+						gradingContext = {
+							...tracingOptions.includeInGrading ? {
+								traceContext: response.traceContext,
+								traceSummary: gradingTraceSummary
+							} : {},
+							wasExfiltrated: Boolean(lastResponse.metadata.wasExfiltrated),
+							exfilCount: Number(lastResponse.metadata.exfilCount) || 0,
+							exfilRecords: []
+						};
 					}
 					if (!gradingContext && tracingOptions.includeInGrading) gradingContext = {
 						traceContext: response.traceContext,
@@ -11413,7 +11487,7 @@ var CustomProvider = class {
 		let lastTransformResult;
 		let assertToUse = test?.assert?.find((a) => a.type && a.type.includes(test.metadata?.pluginId));
 		if (!assertToUse) assertToUse = test?.assert?.find((a) => a.type);
-		const { getGraderById } = await import("./graders-B_pgMLS2.js");
+		const { getGraderById } = await import("./graders-CzVMbEnv.js");
 		let graderPassed;
 		let storedGraderResult;
 		const additionalRubric = getGoalRubric(this.userGoal);
@@ -11911,7 +11985,7 @@ var GoatProvider = class {
 		let assertToUse;
 		let graderPassed;
 		let storedGraderResult;
-		const { getGraderById } = await import("./graders-B_pgMLS2.js");
+		const { getGraderById } = await import("./graders-CzVMbEnv.js");
 		let test;
 		if (context?.test) {
 			test = context?.test;
@@ -12194,18 +12268,7 @@ var GoatProvider = class {
 			const grader = assertToUse ? getGraderById(assertToUse.type) : void 0;
 			if (test && grader && finalOutput) {
 				let gradingContext;
-				if (finalResponse.metadata?.wasExfiltrated !== void 0) {
-					logger.debug("[GOAT] Using exfil data from provider response metadata");
-					gradingContext = {
-						...tracingOptions.includeInGrading ? {
-							traceContext: targetResponse.traceContext,
-							traceSummary: gradingTraceSummary
-						} : {},
-						wasExfiltrated: Boolean(finalResponse.metadata.wasExfiltrated),
-						exfilCount: Number(finalResponse.metadata.exfilCount) || 0,
-						exfilRecords: []
-					};
-				} else {
+				if (finalResponse.metadata?.wasExfiltrated === void 0) {
 					const webPageUuid = test.metadata?.webPageUuid;
 					if (webPageUuid) {
 						const evalId = context?.evaluationId ?? test.metadata?.evaluationId;
@@ -12224,6 +12287,17 @@ var GoatProvider = class {
 							exfilRecords: exfilData.exfilRecords
 						};
 					}
+				} else {
+					logger.debug("[GOAT] Using exfil data from provider response metadata");
+					gradingContext = {
+						...tracingOptions.includeInGrading ? {
+							traceContext: targetResponse.traceContext,
+							traceSummary: gradingTraceSummary
+						} : {},
+						wasExfiltrated: Boolean(finalResponse.metadata.wasExfiltrated),
+						exfilCount: Number(finalResponse.metadata.exfilCount) || 0,
+						exfilRecords: []
+					};
 				}
 				if (!gradingContext && tracingOptions.includeInGrading) gradingContext = {
 					traceContext: targetResponse.traceContext,
@@ -12384,7 +12458,7 @@ var HydraProvider = class {
 		let lastTransformResult;
 		let lastTransformDisplayVars;
 		let lastFinalAttackPrompt;
-		const { getGraderById } = await import("./graders-B_pgMLS2.js");
+		const { getGraderById } = await import("./graders-CzVMbEnv.js");
 		let assertToUse = test?.assert?.find((a) => a.type && a.type.includes(test.metadata?.pluginId));
 		if (!assertToUse) assertToUse = test?.assert?.find((a) => a.type);
 		let previousTraceSummary;
@@ -13238,7 +13312,7 @@ async function runRedteamConversation$2({ context, filters, injectVar, numIterat
 		if (sessionId) sessionIds.push(sessionId);
 		let assertToUse = test?.assert?.find((a) => a.type && a.type.includes(test.metadata?.pluginId));
 		if (!assertToUse) assertToUse = test?.assert?.find((a) => a.type);
-		const { getGraderById } = await import("./graders-B_pgMLS2.js");
+		const { getGraderById } = await import("./graders-CzVMbEnv.js");
 		if (test && assertToUse) {
 			const grader = getGraderById(assertToUse.type);
 			if (grader) {
@@ -14065,7 +14139,7 @@ async function runMetaAgentRedteam({ context, filters, injectVar, numIterations,
 		previousTraceSummary = attackTraceSummary;
 		let assertToUse = test?.assert?.find((a) => a.type && a.type.includes(test.metadata?.pluginId));
 		if (!assertToUse) assertToUse = test?.assert?.find((a) => a.type);
-		const { getGraderById } = await import("./graders-B_pgMLS2.js");
+		const { getGraderById } = await import("./graders-CzVMbEnv.js");
 		if (test && assertToUse) {
 			const grader = getGraderById(assertToUse.type);
 			if (grader) {
@@ -14649,7 +14723,7 @@ async function runRedteamConversation({ context, filters, injectVar, options, pr
 					noImprovementCount++;
 					if (noImprovementCount % 5 === 0) logger.debug(`[Depth ${depth}, Attempt ${attempts}] No improvement for ${noImprovementCount} consecutive iterations. Max score: ${maxScore}`);
 				}
-				const { getGraderById } = await import("./graders-B_pgMLS2.js");
+				const { getGraderById } = await import("./graders-CzVMbEnv.js");
 				let graderPassed;
 				let assertToUse = test?.assert?.find((a) => a.type && a.type.includes(test.metadata?.pluginId));
 				if (!assertToUse) assertToUse = test?.assert?.find((a) => a.type);
@@ -15323,7 +15397,7 @@ var AI21ChatCompletionProvider = class AI21ChatCompletionProvider {
 			messages,
 			temperature: config?.temperature ?? .1,
 			top_p: config?.top_p || 1,
-			max_tokens: config?.max_tokens || 1024,
+			max_tokens: config?.max_tokens ?? 1024,
 			n: 1,
 			stop: [],
 			response_format: config.response_format || { type: "text" }
@@ -15338,7 +15412,7 @@ var AI21ChatCompletionProvider = class AI21ChatCompletionProvider {
 					Authorization: `Bearer ${this.getApiKey()}`
 				},
 				body: JSON.stringify(body)
-			}, REQUEST_TIMEOUT_MS));
+			}, REQUEST_TIMEOUT_MS$1));
 		} catch (err) {
 			return { error: `API call error: ${String(err)}` };
 		}
@@ -15504,7 +15578,7 @@ var AnthropicCompletionProvider = class extends AnthropicGenericProvider {
 		const params = {
 			model: this.modelName,
 			prompt: `${Anthropic.HUMAN_PROMPT} ${prompt} ${Anthropic.AI_PROMPT}`,
-			max_tokens_to_sample: this.config?.max_tokens_to_sample || getEnvInt("ANTHROPIC_MAX_TOKENS", 1024),
+			max_tokens_to_sample: this.config?.max_tokens_to_sample ?? getEnvInt("ANTHROPIC_MAX_TOKENS", 1024),
 			temperature: this.config.temperature ?? getEnvFloat("ANTHROPIC_TEMPERATURE", 0),
 			stop_sequences: stop
 		};
@@ -15678,7 +15752,7 @@ var AzureAssistantProvider = class extends AzureGenericProvider {
 	* Helper method to make HTTP requests using fetchWithCache
 	*/
 	async makeRequest(url, options) {
-		const timeoutMs = this.assistantConfig.timeoutMs || REQUEST_TIMEOUT_MS;
+		const timeoutMs = this.assistantConfig.timeoutMs || REQUEST_TIMEOUT_MS$1;
 		const retries = this.assistantConfig.retryOptions?.maxRetries || 4;
 		const shouldBustCache = url.includes("/runs/") && options.method === "GET" || url.includes("/threads") && options.method === "POST" && !url.includes("/messages") && !url.includes("submit_tool_outputs");
 		try {
@@ -15976,7 +16050,7 @@ var AzureCompletionProvider = class extends AzureGenericProvider {
 					...this.config.headers
 				},
 				body: JSON.stringify(body)
-			}, REQUEST_TIMEOUT_MS, "json", context?.bustCache ?? context?.debug));
+			}, REQUEST_TIMEOUT_MS$1, "json", context?.bustCache ?? context?.debug));
 		} catch (err) {
 			return { error: `API call error: ${String(err)}` };
 		}
@@ -16043,61 +16117,65 @@ var AzureCompletionProvider = class extends AzureGenericProvider {
 var AzureFoundryAgentProvider = class extends AzureGenericProvider {
 	assistantConfig;
 	loadedFunctionCallbacks = {};
+	processor;
 	projectClient = null;
 	projectUrl;
+	resolvedAgent = null;
+	warnedUnsupportedFields = /* @__PURE__ */ new Set();
 	constructor(deploymentName, options = {}) {
 		super(deploymentName, options);
 		this.assistantConfig = options.config || {};
 		this.projectUrl = options.config?.projectUrl || process.env.AZURE_AI_PROJECT_URL || "";
 		if (!this.projectUrl) throw new Error("Azure AI Project URL must be provided via projectUrl option or AZURE_AI_PROJECT_URL environment variable");
+		this.processor = new ResponsesProcessor({
+			modelName: this.assistantConfig.modelName || deploymentName,
+			providerType: "azure",
+			functionCallbackHandler: new FunctionCallbackHandler(),
+			costCalculator: (_modelName, usage, requestConfig) => calculateAzureCost(requestConfig?.model || this.assistantConfig.modelName || this.deploymentName, usage) ?? 0
+		});
 		if (this.assistantConfig.functionToolCallbacks) this.preloadFunctionCallbacks();
 	}
-	/**
-	* Initialize the Azure AI Project client
-	*/
 	async initializeClient() {
 		if (this.projectClient) return this.projectClient;
 		try {
 			const { AIProjectClient } = await import("@azure/ai-projects");
 			const { DefaultAzureCredential } = await import("@azure/identity");
-			this.projectClient = new AIProjectClient(this.projectUrl, new DefaultAzureCredential());
+			const projectClient = new AIProjectClient(this.projectUrl, new DefaultAzureCredential());
+			this.projectClient = projectClient;
 			logger.debug("Azure AI Project client initialized successfully");
-			return this.projectClient;
+			return projectClient;
 		} catch (error) {
-			logger.error(`Failed to initialize Azure AI Project client: ${error instanceof Error ? error.message : String(error)}`);
-			throw new Error(`Failed to initialize Azure AI Project client: ${error instanceof Error ? error.message : String(error)}`);
+			const errorMessage = error instanceof Error ? error.message : String(error);
+			logger.error(`Failed to initialize Azure AI Project client: ${errorMessage}`);
+			throw new Error(`Failed to initialize Azure AI Project client: ${errorMessage}`);
 		}
 	}
-	/**
-	* Preloads all function callbacks to ensure they're ready when needed
-	*/
+	async resolveAgent(client) {
+		if (this.resolvedAgent) return this.resolvedAgent;
+		try {
+			const agent = await client.agents.get(this.deploymentName);
+			this.resolvedAgent = agent;
+			return agent;
+		} catch (error) {
+			logger.debug(`[AzureFoundryAgentProvider] Direct agent lookup failed for '${this.deploymentName}', falling back to list lookup`, { error: error instanceof Error ? error.message : String(error) });
+		}
+		for await (const agent of client.agents.list()) if (agent.id === this.deploymentName || agent.name === this.deploymentName) {
+			this.resolvedAgent = agent;
+			return agent;
+		}
+		throw new Error(`Azure Foundry agent '${this.deploymentName}' was not found by name or legacy ID in project '${this.projectUrl}'. The Azure AI Projects v2 SDK resolves agents by name. Update the provider to use azure:foundry-agent:<agent-name>, or keep using the legacy ID format and ensure the agent still exists in this project.`);
+	}
 	async preloadFunctionCallbacks() {
 		if (!this.assistantConfig.functionToolCallbacks) return;
 		const callbacks = this.assistantConfig.functionToolCallbacks;
 		for (const [name, callback] of Object.entries(callbacks)) try {
-			if (typeof callback === "string") {
-				const callbackStr = callback;
-				if (callbackStr.startsWith("file://")) {
-					const fn = await this.loadExternalFunction(callbackStr);
-					this.loadedFunctionCallbacks[name] = fn;
-					logger.debug(`Successfully preloaded function callback '${name}' from file`);
-				} else {
-					this.loadedFunctionCallbacks[name] = new Function("return " + callbackStr)();
-					logger.debug(`Successfully preloaded inline function callback '${name}'`);
-				}
-			} else if (typeof callback === "function") {
-				this.loadedFunctionCallbacks[name] = callback;
-				logger.debug(`Successfully stored function callback '${name}'`);
-			}
+			if (typeof callback === "string") if (callback.startsWith("file://")) this.loadedFunctionCallbacks[name] = await this.loadExternalFunction(callback);
+			else this.loadedFunctionCallbacks[name] = new Function("return " + callback)();
+			else if (typeof callback === "function") this.loadedFunctionCallbacks[name] = callback;
 		} catch (error) {
 			logger.error(`Failed to preload function callback '${name}': ${error}`);
 		}
 	}
-	/**
-	* Loads a function from an external file
-	* @param fileRef The file reference in the format 'file://path/to/file:functionName'
-	* @returns The loaded function
-	*/
 	async loadExternalFunction(fileRef) {
 		let filePath = fileRef.slice(7);
 		let functionName;
@@ -16106,11 +16184,9 @@ var AzureFoundryAgentProvider = class extends AzureGenericProvider {
 			if (splits[0] && isJavascriptFile(splits[0])) [filePath, functionName] = splits;
 		}
 		try {
-			const resolvedPath = path.resolve(state.basePath || "", filePath);
-			logger.debug(`Loading function from ${resolvedPath}${functionName ? `:${functionName}` : ""}`);
-			const requiredModule = await importModule(resolvedPath, functionName);
+			const requiredModule = await importModule(path.resolve(state.basePath || "", filePath), functionName);
 			if (typeof requiredModule === "function") return requiredModule;
-			else if (requiredModule && typeof requiredModule === "object" && functionName && functionName in requiredModule) {
+			if (requiredModule && typeof requiredModule === "object" && functionName && functionName in requiredModule) {
 				const fn = requiredModule[functionName];
 				if (typeof fn === "function") return fn;
 			}
@@ -16119,139 +16195,197 @@ var AzureFoundryAgentProvider = class extends AzureGenericProvider {
 			throw new Error(`Error loading function from ${filePath}: ${error.message || String(error)}`);
 		}
 	}
-	/**
-	* Executes a function callback with proper error handling
-	*/
-	async executeFunctionCallback(functionName, args, context) {
+	async executeFunctionCallback(functionName, args, context, callbacks) {
 		try {
 			let callback = this.loadedFunctionCallbacks[functionName];
+			const effectiveCallbacks = callbacks || this.assistantConfig.functionToolCallbacks;
 			if (!callback) {
-				const callbackRef = this.assistantConfig.functionToolCallbacks?.[functionName];
-				if (callbackRef && typeof callbackRef === "string") {
-					const callbackStr = callbackRef;
-					if (callbackStr.startsWith("file://")) callback = await this.loadExternalFunction(callbackStr);
-					else callback = new Function("return " + callbackStr)();
-					this.loadedFunctionCallbacks[functionName] = callback;
-				} else if (typeof callbackRef === "function") {
-					callback = callbackRef;
-					this.loadedFunctionCallbacks[functionName] = callback;
-				}
+				const callbackRef = effectiveCallbacks?.[functionName];
+				if (callbackRef && typeof callbackRef === "string") if (callbackRef.startsWith("file://")) callback = await this.loadExternalFunction(callbackRef);
+				else callback = new Function("return " + callbackRef)();
+				else if (typeof callbackRef === "function") callback = callbackRef;
+				if (callback) this.loadedFunctionCallbacks[functionName] = callback;
 			}
 			if (!callback) throw new Error(`No callback found for function '${functionName}'`);
-			logger.debug(`Executing function '${functionName}' with args: ${args}${context ? ` and context: ${JSON.stringify(context)}` : ""}`);
 			const result = await callback(args, context);
 			if (result === void 0 || result === null) return "";
-			else if (typeof result === "object") try {
-				return JSON.stringify(result);
-			} catch (error) {
-				logger.warn(`Error stringifying result from function '${functionName}': ${error}`);
-				return String(result);
-			}
-			else return String(result);
+			if (typeof result === "object") return JSON.stringify(result);
+			return String(result);
 		} catch (error) {
 			logger.error(`Error executing function '${functionName}': ${error.message || String(error)}`);
 			return JSON.stringify({ error: `Error in ${functionName}: ${error.message || String(error)}` });
 		}
 	}
+	parsePromptInput(prompt) {
+		try {
+			const parsedJson = JSON.parse(prompt);
+			if (Array.isArray(parsedJson)) return parsedJson;
+		} catch {}
+		return [{
+			type: "message",
+			role: "user",
+			content: prompt
+		}];
+	}
+	warnForUnsupportedConfig(config) {
+		const unsupportedFields = [
+			config.frequency_penalty === void 0 ? null : "frequency_penalty",
+			config.presence_penalty === void 0 ? null : "presence_penalty",
+			config.retryOptions ? "retryOptions" : null,
+			config.seed === void 0 ? null : "seed",
+			config.stop?.length ? "stop" : null,
+			config.timeoutMs === void 0 ? null : "timeoutMs",
+			config.tool_resources ? "tool_resources" : null
+		].filter(Boolean);
+		if (unsupportedFields.length === 0) return;
+		const warningKey = unsupportedFields.sort().join(",");
+		if (this.warnedUnsupportedFields.has(warningKey)) return;
+		this.warnedUnsupportedFields.add(warningKey);
+		logger.warn(`[AzureFoundryAgentProvider] The Azure AI Projects v2 agent runtime ignores these per-request settings: ${unsupportedFields.join(", ")}. Configure them on the agent itself, or pass supported Responses API fields instead.`);
+	}
+	async buildResponsesBody(prompt, context) {
+		const config = {
+			...this.assistantConfig,
+			...context?.prompt?.config
+		};
+		this.warnForUnsupportedConfig(config);
+		const responseFormat = maybeLoadResponseFormatFromExternalFile(config.response_format, context?.vars);
+		const loadedTools = config.tools ? await maybeLoadToolsFromExternalFile(config.tools, context?.vars) : void 0;
+		const reasoningEffort = config.reasoning_effort ? renderVarsInObject(config.reasoning_effort, context?.vars) : void 0;
+		const maxOutputTokens = config.max_output_tokens ?? config.max_completion_tokens ?? config.max_tokens;
+		let text;
+		if (responseFormat?.type === "json_object") text = { format: { type: "json_object" } };
+		else if (responseFormat?.type === "json_schema") {
+			const schema = responseFormat.schema || responseFormat.json_schema?.schema;
+			text = { format: {
+				type: "json_schema",
+				name: responseFormat.json_schema?.name || responseFormat.name || "response_schema",
+				schema,
+				strict: responseFormat.json_schema?.strict ?? responseFormat.strict ?? true
+			} };
+		}
+		if (config.verbosity) text = {
+			...text || {},
+			verbosity: config.verbosity
+		};
+		return {
+			body: {
+				input: this.parsePromptInput(prompt),
+				...config.instructions ? { instructions: config.instructions } : {},
+				...config.metadata ? { metadata: config.metadata } : {},
+				...config.modelName ? { model: config.modelName } : {},
+				...maxOutputTokens === void 0 ? {} : { max_output_tokens: maxOutputTokens },
+				...reasoningEffort ? { reasoning: { effort: reasoningEffort } } : {},
+				...config.temperature === void 0 ? {} : { temperature: config.temperature },
+				...config.top_p === void 0 ? {} : { top_p: config.top_p },
+				...config.tool_choice ? { tool_choice: config.tool_choice } : {},
+				...loadedTools ? { tools: loadedTools } : {},
+				...text ? { text } : {},
+				...config.passthrough || {}
+			},
+			effectiveConfig: {
+				...config,
+				response_format: responseFormat,
+				tools: loadedTools
+			}
+		};
+	}
+	getFunctionCalls(response) {
+		return (response.output || []).filter((item) => {
+			return item?.type === "function_call" && typeof item.id === "string" && typeof item.call_id === "string" && typeof item.name === "string" && typeof item.arguments === "string";
+		});
+	}
+	getCallableFunctionCalls(response, callbacks) {
+		const functionCalls = this.getFunctionCalls(response);
+		if (functionCalls.length === 0 || !callbacks || Object.keys(callbacks).length === 0) return [];
+		const missingCallbacks = functionCalls.filter((call) => !(call.name in callbacks));
+		if (missingCallbacks.length > 0) {
+			logger.debug(`[AzureFoundryAgentProvider] Returning unresolved function calls because callbacks are missing for: ${missingCallbacks.map((call) => call.name).join(", ")}`);
+			return [];
+		}
+		return functionCalls;
+	}
+	async buildFunctionCallOutputs(functionCalls, response, agent, callbacks) {
+		const callbackContext = {
+			threadId: response.conversation?.id || response.id,
+			runId: response.id,
+			assistantId: agent.id,
+			provider: "azure-foundry"
+		};
+		return Promise.all(functionCalls.map(async (call) => ({
+			type: "function_call_output",
+			call_id: call.call_id,
+			output: await this.executeFunctionCallback(call.name, call.arguments, callbackContext, callbacks)
+		})));
+	}
+	getAgentReference(agent) {
+		return { body: { agent: {
+			name: agent.name,
+			type: "agent_reference"
+		} } };
+	}
+	async processResponse(response, effectiveConfig) {
+		const result = await this.processor.processResponseOutput(response, effectiveConfig, false);
+		if (!result.error) return result;
+		if (response.output_text) {
+			logger.debug(`[AzureFoundryAgentProvider] ResponsesProcessor returned an error, falling back to output_text`, { processorError: result.error });
+			return {
+				...result,
+				error: void 0,
+				output: response.output_text,
+				raw: response
+			};
+		}
+		return result;
+	}
 	async callApi(prompt, context, _callApiOptions) {
-		const cacheKey = `azure_foundry_agent:${this.deploymentName}:${JSON.stringify({
-			frequency_penalty: this.assistantConfig.frequency_penalty,
-			instructions: this.assistantConfig.instructions,
-			max_completion_tokens: this.assistantConfig.max_completion_tokens,
-			max_tokens: this.assistantConfig.max_tokens,
-			model: this.assistantConfig.modelName,
-			presence_penalty: this.assistantConfig.presence_penalty,
-			prompt,
-			response_format: this.assistantConfig.response_format,
-			seed: this.assistantConfig.seed,
-			stop: this.assistantConfig.stop,
-			temperature: this.assistantConfig.temperature,
-			tool_choice: this.assistantConfig.tool_choice,
-			tool_resources: this.assistantConfig.tool_resources,
-			tools: JSON.stringify(await maybeLoadToolsFromExternalFile(this.assistantConfig.tools, context?.vars)),
-			top_p: this.assistantConfig.top_p
-		})}`;
+		const { body, effectiveConfig } = await this.buildResponsesBody(prompt, context);
+		const cacheKey = `azure_foundry_agent:${this.deploymentName}:${JSON.stringify(body)}`;
 		if (isCacheEnabled()) try {
 			const cachedResult = await (await getCache()).get(cacheKey);
 			if (cachedResult) {
-				logger.debug(`Cache hit for agent prompt: ${prompt.substring(0, 50)}...`);
+				logger.debug(`Cache hit for Foundry agent prompt: ${prompt.substring(0, 50)}...`);
 				return {
 					...cachedResult,
 					cached: true
 				};
 			}
-		} catch (err) {
-			logger.warn(`Error checking cache: ${err}`);
+		} catch (error) {
+			logger.warn(`Error checking cache for Azure Foundry agent response: ${error}`);
 		}
 		try {
 			const client = await this.initializeClient();
-			if (!client) throw new Error("Failed to initialize Azure AI Project client");
-			const agent = await client.agents.getAgent(this.deploymentName);
-			logger.debug(`Retrieved agent: ${agent.name}`);
-			const thread = await client.agents.threads.create();
-			logger.debug(`Created thread: ${thread.id}`);
-			const message = await client.agents.messages.create(thread.id, "user", prompt);
-			logger.debug(`Created message: ${message.id}`);
-			const runOptions = {};
-			if (this.assistantConfig.temperature !== void 0) runOptions.temperature = this.assistantConfig.temperature;
-			if (this.assistantConfig.top_p !== void 0) runOptions.top_p = this.assistantConfig.top_p;
-			if (this.assistantConfig.frequency_penalty !== void 0) runOptions.frequency_penalty = this.assistantConfig.frequency_penalty;
-			if (this.assistantConfig.presence_penalty !== void 0) runOptions.presence_penalty = this.assistantConfig.presence_penalty;
-			if (this.assistantConfig.max_completion_tokens !== void 0) runOptions.max_completion_tokens = this.assistantConfig.max_completion_tokens;
-			if (this.assistantConfig.max_tokens !== void 0) runOptions.max_tokens = this.assistantConfig.max_tokens;
-			if (this.assistantConfig.response_format) runOptions.response_format = this.assistantConfig.response_format;
-			if (this.assistantConfig.stop) runOptions.stop = this.assistantConfig.stop;
-			if (this.assistantConfig.seed !== void 0) runOptions.seed = this.assistantConfig.seed;
-			if (this.assistantConfig.tool_resources) runOptions.tool_resources = this.assistantConfig.tool_resources;
-			if (this.assistantConfig.tool_choice) runOptions.tool_choice = this.assistantConfig.tool_choice;
-			if (this.assistantConfig.tools) {
-				const loadedTools = await maybeLoadToolsFromExternalFile(this.assistantConfig.tools, context?.vars);
-				if (loadedTools !== void 0) runOptions.tools = loadedTools;
-			}
-			if (this.assistantConfig.modelName) runOptions.model = this.assistantConfig.modelName;
-			if (this.assistantConfig.instructions) runOptions.instructions = this.assistantConfig.instructions;
-			const run = await client.agents.runs.create(thread.id, agent.id, runOptions);
-			logger.debug(`Created run: ${run.id}`);
-			let result;
-			if (this.assistantConfig.functionToolCallbacks && Object.keys(this.assistantConfig.functionToolCallbacks).length > 0) result = await this.pollRunWithToolCallHandling(client, thread.id, run);
-			else {
-				const completedRun = await this.pollRun(client, thread.id, run.id);
-				if (completedRun.status === "completed") result = await this.processCompletedRun(client, thread.id, completedRun);
-				else if (completedRun.lastError) {
-					const errorCode = completedRun.lastError.code || "";
-					const errorMessage = completedRun.lastError.message || "";
-					if (errorCode === "content_filter" || this.isContentFilterError(errorMessage)) {
-						const lowerErrorMessage = errorMessage.toLowerCase();
-						const isInputFiltered = lowerErrorMessage.includes("prompt") || lowerErrorMessage.includes("input");
-						const isOutputFiltered = lowerErrorMessage.includes("output") || lowerErrorMessage.includes("response");
-						result = {
-							output: "The generated content was filtered due to triggering Azure OpenAI Service's content filtering system.",
-							guardrails: {
-								flagged: true,
-								flaggedInput: isInputFiltered,
-								flaggedOutput: !isInputFiltered && (isOutputFiltered || !isOutputFiltered)
-							}
-						};
-					} else result = { error: `Thread run failed: ${errorCode} - ${errorMessage}` };
-				} else result = { error: `Thread run failed with status: ${completedRun.status}` };
-			}
+			const agent = await this.resolveAgent(client);
+			const openAIClient = client.getOpenAIClient();
+			const responseOptions = this.getAgentReference(agent);
+			const maxLoopTimeMs = this.assistantConfig.maxPollTimeMs || 3e5;
+			const startTime = Date.now();
+			let response = await openAIClient.responses.create(body, responseOptions);
+			while (Date.now() - startTime <= maxLoopTimeMs) {
+				const functionCalls = this.getCallableFunctionCalls(response, effectiveConfig.functionToolCallbacks);
+				if (functionCalls.length === 0) break;
+				const outputs = await this.buildFunctionCallOutputs(functionCalls, response, agent, effectiveConfig.functionToolCallbacks);
+				logger.debug(`[AzureFoundryAgentProvider] Submitting ${outputs.length} function_call_output item(s)`);
+				response = await openAIClient.responses.create({
+					input: outputs,
+					previous_response_id: response.id
+				}, responseOptions);
+			}
+			if (Date.now() - startTime > maxLoopTimeMs) return { error: `Azure Foundry agent tool-calling loop timed out after ${maxLoopTimeMs}ms.` };
+			const result = await this.processResponse(response, effectiveConfig);
 			if (isCacheEnabled() && !result.error) try {
 				await (await getCache()).set(cacheKey, result);
-				logger.debug(`Cached agent response for prompt: ${prompt.substring(0, 50)}...`);
-			} catch (err) {
-				logger.warn(`Error caching result: ${err}`);
+			} catch (error) {
+				logger.warn(`Error caching Azure Foundry agent response: ${error}`);
 			}
 			return result;
-		} catch (err) {
-			logger.error(`Error in Azure Foundry Agent API call: ${err}`);
-			return this.formatError(err);
+		} catch (error) {
+			logger.error(`Error in Azure Foundry Agent API call: ${error}`);
+			return this.formatError(error);
 		}
 	}
-	/**
-	* Format error responses consistently
-	*/
-	formatError(err) {
-		const errorMessage = err.message || String(err);
+	formatError(error) {
+		const errorMessage = error instanceof Error ? error.message : String(error);
 		if (this.isContentFilterError(errorMessage)) {
 			const lowerErrorMessage = errorMessage.toLowerCase();
 			const isInputFiltered = lowerErrorMessage.includes("prompt") || lowerErrorMessage.includes("input");
@@ -16265,14 +16399,10 @@ var AzureFoundryAgentProvider = class extends AzureGenericProvider {
 				}
 			};
 		}
-		if (errorMessage.includes("Can't add messages to thread") && errorMessage.includes("while a run")) return { error: `Error in Azure Foundry Agent API call: ${errorMessage}` };
 		if (this.isRateLimitError(errorMessage)) return { error: `Rate limit exceeded: ${errorMessage}` };
 		if (this.isServiceError(errorMessage)) return { error: `Service error: ${errorMessage}` };
 		return { error: `Error in Azure Foundry Agent API call: ${errorMessage}` };
 	}
-	/**
-	* Helper methods to check for specific error types
-	*/
 	isContentFilterError(errorMessage) {
 		const lowerErrorMessage = errorMessage.toLowerCase();
 		return lowerErrorMessage.includes("content_filter") || lowerErrorMessage.includes("content filter") || lowerErrorMessage.includes("filtered due to") || lowerErrorMessage.includes("content filtering") || lowerErrorMessage.includes("inappropriate content") || lowerErrorMessage.includes("safety guidelines") || lowerErrorMessage.includes("guardrail");
@@ -16283,160 +16413,6 @@ var AzureFoundryAgentProvider = class extends AzureGenericProvider {
 	isServiceError(errorMessage) {
 		return errorMessage.includes("Service unavailable") || errorMessage.includes("Bad gateway") || errorMessage.includes("Gateway timeout") || errorMessage.includes("Server is busy") || errorMessage.includes("Sorry, something went wrong");
 	}
-	isServerError(errorMessage) {
-		return errorMessage.includes("500") || errorMessage.includes("502") || errorMessage.includes("503") || errorMessage.includes("504");
-	}
-	isRetryableError(code, message) {
-		if (code === "rate_limit_exceeded") return true;
-		if (!message) return false;
-		return this.isRateLimitError(message) || this.isServiceError(message) || this.isServerError(message);
-	}
-	/**
-	* Poll a run until it completes or fails
-	*/
-	async pollRun(client, threadId, runId, pollIntervalMs = 1e3) {
-		const maxPollTime = this.assistantConfig.maxPollTimeMs || 3e5;
-		const startTime = Date.now();
-		let run = await client.agents.runs.get(threadId, runId);
-		while (["queued", "in_progress"].includes(run.status)) {
-			if (Date.now() - startTime > maxPollTime) throw new Error(`Run polling timed out after ${maxPollTime}ms. Last status: ${run.status}`);
-			await sleep(pollIntervalMs);
-			run = await client.agents.runs.get(threadId, runId);
-			if (Date.now() - startTime > 3e4) pollIntervalMs = Math.min(pollIntervalMs * 1.5, 5e3);
-		}
-		return run;
-	}
-	/**
-	* Handle tool calls during run polling
-	*/
-	async pollRunWithToolCallHandling(client, threadId, initialRun) {
-		const maxPollTime = this.assistantConfig.maxPollTimeMs || 3e5;
-		const startTime = Date.now();
-		let pollIntervalMs = 1e3;
-		let run = initialRun;
-		while (true) {
-			if (Date.now() - startTime > maxPollTime) return { error: `Run polling timed out after ${maxPollTime}ms. The operation may still be in progress.` };
-			try {
-				run = await client.agents.runs.get(threadId, run.id);
-				logger.debug(`Run status: ${run.status}`);
-				if (run.status === "requires_action") if (run.requiredAction?.type === "submit_tool_outputs" && run.requiredAction.submitToolOutputs?.toolCalls) {
-					const toolCalls = run.requiredAction.submitToolOutputs.toolCalls;
-					const functionCallsWithCallbacks = toolCalls.filter((toolCall) => {
-						return toolCall.type === "function" && toolCall.function && toolCall.function.name in (this.assistantConfig.functionToolCallbacks ?? {});
-					});
-					if (functionCallsWithCallbacks.length === 0) {
-						logger.debug(`No matching callbacks found for tool calls. Available functions: ${Object.keys(this.assistantConfig.functionToolCallbacks || {}).join(", ")}. Tool calls: ${JSON.stringify(toolCalls)}`);
-						const emptyOutputs = toolCalls.map((toolCall) => ({
-							toolCallId: toolCall.id,
-							output: JSON.stringify({ message: `No callback registered for function ${toolCall.type === "function" ? toolCall.function?.name : toolCall.type}` })
-						}));
-						try {
-							await client.agents.runs.submitToolOutputs(threadId, run.id, emptyOutputs);
-							await sleep(pollIntervalMs);
-							continue;
-						} catch (error) {
-							logger.error(`Error submitting empty tool outputs: ${error.message}`);
-							return { error: `Error submitting empty tool outputs: ${error.message}` };
-						}
-					}
-					const callbackContext = {
-						threadId,
-						runId: run.id,
-						assistantId: this.deploymentName,
-						provider: "azure-foundry"
-					};
-					const toolOutputs = await Promise.all(functionCallsWithCallbacks.map(async (toolCall) => {
-						const functionName = toolCall.function.name;
-						const functionArgs = toolCall.function.arguments;
-						try {
-							logger.debug(`Calling function ${functionName} with args: ${functionArgs}`);
-							const outputResult = await this.executeFunctionCallback(functionName, functionArgs, callbackContext);
-							logger.debug(`Function ${functionName} result: ${outputResult}`);
-							return {
-								toolCallId: toolCall.id,
-								output: outputResult
-							};
-						} catch (error) {
-							logger.error(`Error calling function ${functionName}: ${error}`);
-							return {
-								toolCallId: toolCall.id,
-								output: JSON.stringify({ error: String(error) })
-							};
-						}
-					}));
-					if (toolOutputs.length === 0) {
-						logger.error("No valid tool outputs to submit");
-						break;
-					}
-					logger.debug(`Submitting tool outputs: ${JSON.stringify(toolOutputs)}`);
-					try {
-						await client.agents.runs.submitToolOutputs(threadId, run.id, toolOutputs);
-					} catch (error) {
-						logger.error(`Error submitting tool outputs: ${error.message}`);
-						return { error: `Error submitting tool outputs: ${error.message}` };
-					}
-				} else {
-					logger.error(`Unknown required action type: ${run.requiredAction?.type}`);
-					break;
-				}
-				else if ([
-					"completed",
-					"failed",
-					"cancelled",
-					"expired"
-				].includes(run.status)) {
-					if (run.status !== "completed") {
-						if (run.lastError) {
-							const errorCode = run.lastError.code || "";
-							const errorMessage = run.lastError.message || "";
-							if (errorCode === "content_filter" || this.isContentFilterError(errorMessage)) {
-								const lowerErrorMessage = errorMessage.toLowerCase();
-								const isInputFiltered = lowerErrorMessage.includes("prompt") || lowerErrorMessage.includes("input");
-								const isOutputFiltered = lowerErrorMessage.includes("output") || lowerErrorMessage.includes("response");
-								return {
-									output: "The generated content was filtered due to triggering Azure OpenAI Service's content filtering system.",
-									guardrails: {
-										flagged: true,
-										flaggedInput: isInputFiltered,
-										flaggedOutput: !isInputFiltered && (isOutputFiltered || !isOutputFiltered)
-									}
-								};
-							}
-							return { error: `Thread run failed: ${errorCode} - ${errorMessage}` };
-						}
-						return { error: `Thread run failed with status: ${run.status}` };
-					}
-					break;
-				}
-				await sleep(pollIntervalMs);
-				if (Date.now() - startTime > 3e4) pollIntervalMs = Math.min(pollIntervalMs * 1.5, 5e3);
-			} catch (error) {
-				logger.error(`Error polling run status: ${error}`);
-				const errorMessage = error.message || String(error);
-				if (this.isRetryableError("", errorMessage)) return { error: `Error polling run status: ${errorMessage}` };
-				return { error: `Error polling run status: ${errorMessage}` };
-			}
-		}
-		return await this.processCompletedRun(client, threadId, run);
-	}
-	/**
-	* Process a completed run to extract messages
-	*/
-	async processCompletedRun(client, threadId, _run) {
-		try {
-			const messages = [];
-			for await (const message of client.agents.messages.list(threadId, { order: "asc" })) messages.push(message);
-			const outputBlocks = [];
-			messages.forEach((message) => {
-				const contentBlocks = message.content.map((content) => content.type === "text" && content.text ? content.text.value : `<${content.type} output>`).join("\n");
-				outputBlocks.push(`[${toTitleCase(message.role)}] ${contentBlocks}`);
-			});
-			return { output: outputBlocks.join("\n\n").trim() };
-		} catch (err) {
-			logger.error(`Error processing run results: ${err}`);
-			return { error: `Error processing run results: ${err.message || String(err)}` };
-		}
-	}
 };
 //#endregion
 //#region src/providers/azure/responses.ts
@@ -16506,9 +16482,9 @@ var AzureResponsesProvider = class extends AzureGenericProvider {
 		const body = {
 			model: this.deploymentName,
 			input,
-			...maxOutputTokens !== void 0 ? { max_output_tokens: maxOutputTokens } : {},
+			...maxOutputTokens === void 0 ? {} : { max_output_tokens: maxOutputTokens },
 			...reasoningEffort ? { reasoning: { effort: reasoningEffort } } : {},
-			...temperature !== void 0 ? { temperature } : {},
+			...temperature === void 0 ? {} : { temperature },
 			...instructions ? { instructions } : {},
 			...config.top_p !== void 0 || getEnvString("OPENAI_TOP_P") ? { top_p: config.top_p ?? getEnvFloat("OPENAI_TOP_P", 1) } : {},
 			...config.tools ? { tools: await maybeLoadToolsFromExternalFile(config.tools, context?.vars) } : {},
@@ -16539,7 +16515,7 @@ var AzureResponsesProvider = class extends AzureGenericProvider {
 		}
 		const body = await this.getAzureResponsesBody(prompt, context, callApiOptions);
 		const isDeepResearchModel = this.deploymentName.includes("deep-research");
-		let timeout = REQUEST_TIMEOUT_MS;
+		let timeout = REQUEST_TIMEOUT_MS$1;
 		if (isDeepResearchModel) {
 			const evalTimeout = getEnvInt("PROMPTFOO_EVAL_TIMEOUT_MS", 0);
 			timeout = evalTimeout > 0 ? evalTimeout : LONG_RUNNING_MODEL_TIMEOUT_MS;
@@ -17543,9 +17519,9 @@ var AwsBedrockConverseProvider = class extends AwsBedrockGenericProvider {
 		const temperature = reasoningEnabled ? void 0 : temperatureValue;
 		const topP = reasoningEnabled ? void 0 : topPValue;
 		if (maxTokens !== void 0 || temperature !== void 0 || topP !== void 0 || stopSequences) return {
-			...maxTokens !== void 0 ? { maxTokens } : {},
-			...temperature !== void 0 ? { temperature } : {},
-			...topP !== void 0 ? { topP } : {},
+			...maxTokens === void 0 ? {} : { maxTokens },
+			...temperature === void 0 ? {} : { temperature },
+			...topP === void 0 ? {} : { topP },
 			...stopSequences ? { stopSequences } : {}
 		};
 	}
@@ -17765,7 +17741,7 @@ var AwsBedrockConverseProvider = class extends AwsBedrockGenericProvider {
 				if (hasSuccessfulCallback && results.length > 0) return {
 					output: results.join("\n"),
 					tokenUsage,
-					...cost !== void 0 ? { cost } : {},
+					...cost === void 0 ? {} : { cost },
 					...Object.keys(metadata).length > 0 ? { metadata } : {},
 					...guardrails ? { guardrails } : {},
 					...malformedError ? { error: malformedError } : {}
@@ -17775,7 +17751,7 @@ var AwsBedrockConverseProvider = class extends AwsBedrockGenericProvider {
 		return {
 			output: extractTextFromContentBlocks(content, showThinking),
 			tokenUsage,
-			...cost !== void 0 ? { cost } : {},
+			...cost === void 0 ? {} : { cost },
 			...Object.keys(metadata).length > 0 ? { metadata } : {},
 			...guardrails ? { guardrails } : {},
 			...malformedError ? { error: malformedError } : {}
@@ -17889,7 +17865,7 @@ var AwsBedrockConverseProvider = class extends AwsBedrockGenericProvider {
 			return {
 				output: finalOutput,
 				tokenUsage,
-				...cost !== void 0 ? { cost } : {},
+				...cost === void 0 ? {} : { cost },
 				...Object.keys(metadata).length > 0 ? { metadata } : {},
 				...malformedError ? { error: malformedError } : {}
 			};
@@ -19553,7 +19529,7 @@ var CohereChatCompletionProvider = class CohereChatCompletionProvider {
 					"X-Client-Name": getEnvString("COHERE_CLIENT_NAME") || "promptfoo"
 				},
 				body: JSON.stringify(body)
-			}, REQUEST_TIMEOUT_MS));
+			}, REQUEST_TIMEOUT_MS$1));
 			if (data.message) return { error: data.message };
 			const tokenUsage = {
 				cached: cached ? data.token_count?.total_tokens || 0 : 0,
@@ -19615,7 +19591,7 @@ var CohereEmbeddingProvider = class {
 					"X-Client-Name": getEnvString("COHERE_CLIENT_NAME") || "promptfoo"
 				},
 				body: JSON.stringify(body)
-			}, REQUEST_TIMEOUT_MS));
+			}, REQUEST_TIMEOUT_MS$1));
 		} catch (err) {
 			logger.error(`API call error: ${err}`);
 			throw err;
@@ -20524,7 +20500,7 @@ var ElevenLabsAgentsProvider = class {
 				promptLength: prompt.length
 			});
 			const simulationRequest = buildSimulationRequest(parseConversation(prompt, context), this.config.simulatedUser, this.config.evaluationCriteria, this.config.toolMockConfig);
-			simulationRequest.new_turns_limit = this.config.maxTurns || 10;
+			simulationRequest.new_turns_limit = this.config.maxTurns ?? 10;
 			logger.debug("[ElevenLabs Agents] Request payload", {
 				endpoint: `/convai/agents/${agentId}/simulate-conversation`,
 				payload: simulationRequest
@@ -20651,7 +20627,7 @@ var ElevenLabsAgentsProvider = class {
 			simulatedUser: config?.simulatedUser,
 			evaluationCriteria: config?.evaluationCriteria,
 			toolMockConfig: config?.toolMockConfig,
-			maxTurns: config?.maxTurns || 10,
+			maxTurns: config?.maxTurns ?? 10,
 			label: options.label || options.id
 		};
 	}
@@ -22522,7 +22498,7 @@ var GeminiImageProvider = class {
 				headers,
 				body: JSON.stringify(body),
 				...authDiscriminator && { _authHash: authDiscriminator }
-			}, REQUEST_TIMEOUT_MS, "json", false);
+			}, REQUEST_TIMEOUT_MS$1, "json", false);
 			const latencyMs = Date.now() - startTime;
 			return this.processResponse(data, cached, latencyMs);
 		} catch (err) {
@@ -22550,7 +22526,7 @@ var GeminiImageProvider = class {
 					...this.config.headers || {}
 				},
 				data: body,
-				timeout: REQUEST_TIMEOUT_MS
+				timeout: REQUEST_TIMEOUT_MS$1
 			});
 			const latencyMs = Date.now() - startTime;
 			return this.processResponse(response.data, false, latencyMs);
@@ -22711,7 +22687,7 @@ var GoogleImageProvider = class {
 					...this.config.headers || {}
 				},
 				data: body,
-				timeout: REQUEST_TIMEOUT_MS
+				timeout: REQUEST_TIMEOUT_MS$1
 			}), "Vertex AI API call");
 			const latencyMs = Date.now() - startTime;
 			return this.processResponse(response.data, false, latencyMs);
@@ -22748,7 +22724,7 @@ var GoogleImageProvider = class {
 				headers,
 				body: JSON.stringify(body),
 				...authDiscriminator && { _authHash: authDiscriminator }
-			}, REQUEST_TIMEOUT_MS, "json"), "Google AI Studio API call");
+			}, REQUEST_TIMEOUT_MS$1, "json"), "Google AI Studio API call");
 			return this.processResponse(response.data, response.cached, response.latencyMs);
 		} catch (err) {
 			return { error: `API call error: ${String(err)}` };
@@ -23296,6 +23272,8 @@ const DEFAULT_RESOLUTION$1 = "720p";
 const DEFAULT_DURATION$1 = 8;
 const DEFAULT_POLL_INTERVAL_MS$1 = 1e4;
 const DEFAULT_MAX_POLL_TIME_MS$1 = 6e5;
+const REQUEST_TIMEOUT_MS = 3e5;
+const AI_STUDIO_BASE_URL = "https://generativelanguage.googleapis.com/v1beta";
 function validateAspectRatio$1(ratio) {
 	if (!["16:9", "9:16"].includes(ratio)) return {
 		valid: false,
@@ -23347,6 +23325,13 @@ var GoogleVideoProvider = class {
 	async getProjectId() {
 		return await resolveProjectId(this.config, this.env);
 	}
+	isVertexMode(config = this.config) {
+		return determineGoogleVertexMode(config, this.env);
+	}
+	getApiKey(config = this.config) {
+		const { apiKey } = getGoogleApiKey(config, this.env, this.isVertexMode(config));
+		return apiKey;
+	}
 	async getClientWithCredentials() {
 		const { client } = await getGoogleClient({ credentials: loadCredentials(this.config.credentials) });
 		return client;
@@ -23355,6 +23340,17 @@ var GoogleVideoProvider = class {
 		const location = this.getLocation();
 		return `https://${location}-aiplatform.googleapis.com/v1/projects/${await this.getProjectId()}/locations/${location}/publishers/google/models/${this.modelName}:${action}`;
 	}
+	getAiStudioEndpoint(pathSuffix) {
+		return `${AI_STUDIO_BASE_URL}/${pathSuffix}`;
+	}
+	async getAiStudioHeaders(config) {
+		const apiKey = this.getApiKey(config);
+		if (!apiKey) throw new Error("Google API key is not set. Set GOOGLE_API_KEY or GEMINI_API_KEY, or add `apiKey` to the provider config.");
+		return {
+			"Content-Type": "application/json",
+			"x-goog-api-key": apiKey
+		};
+	}
 	/**
 	* Load image data from file:// path or return as-is if base64
 	*/
@@ -23367,10 +23363,24 @@ var GoogleVideoProvider = class {
 		return { data: imagePath };
 	}
 	/**
+	* Load video data from file:// path or return as-is if base64
+	*/
+	loadVideoData(videoPath) {
+		if (videoPath.startsWith("file://")) {
+			const filePath = videoPath.slice(7);
+			if (!fs.existsSync(filePath)) return { error: `Video file not found: ${filePath}` };
+			return { data: fs.readFileSync(filePath).toString("base64") };
+		}
+		return { data: videoPath };
+	}
+	/**
 	* Create a new video generation job
 	*/
 	async createVideoJob(prompt, config) {
-		const url = await this.getVertexEndpoint("predictLongRunning");
+		if (this.isVertexMode(config)) return this.createVertexVideoJob(prompt, config);
+		return this.createAiStudioVideoJob(prompt, config);
+	}
+	buildVertexRequestBody(prompt, config) {
 		const instance = { prompt };
 		if (config.aspectRatio) instance.aspectRatio = config.aspectRatio;
 		if (config.resolution) instance.resolution = config.resolution;
@@ -23414,7 +23424,69 @@ var GoogleVideoProvider = class {
 		}
 		const extendVideoId = config.extendVideoId || config.sourceVideo;
 		if (extendVideoId) instance.video = { operationName: extendVideoId };
+		return { body: { instances: [instance] } };
+	}
+	buildAiStudioRequestBody(prompt, config) {
+		const instance = { prompt };
+		const parameters = {};
+		if (config.aspectRatio) parameters.aspectRatio = config.aspectRatio;
+		if (config.resolution) parameters.resolution = config.resolution;
+		if (config.durationSeconds) parameters.durationSeconds = config.durationSeconds;
+		if (config.negativePrompt) parameters.negativePrompt = config.negativePrompt;
+		if (config.personGeneration) parameters.personGeneration = config.personGeneration;
+		if (config.seed !== void 0) parameters.seed = config.seed;
+		if (config.image) {
+			const { data: imageData, error } = this.loadImageData(config.image);
+			if (error) return { error };
+			instance.image = { inlineData: {
+				mimeType: "image/png",
+				data: imageData
+			} };
+		}
+		const lastFrame = config.lastFrame || config.lastImage;
+		if (lastFrame) {
+			const { data: lastFrameData, error } = this.loadImageData(lastFrame);
+			if (error) return { error };
+			instance.lastFrame = { inlineData: {
+				mimeType: "image/png",
+				data: lastFrameData
+			} };
+		}
+		if (config.referenceImages && config.referenceImages.length > 0) {
+			const refs = [];
+			for (const ref of config.referenceImages.slice(0, 3)) {
+				const imagePath = typeof ref === "string" ? ref : ref.image;
+				const referenceType = typeof ref === "string" ? "asset" : ref.referenceType || "asset";
+				const { data: imageData, error } = this.loadImageData(imagePath);
+				if (error) return { error };
+				refs.push({
+					image: { inlineData: {
+						mimeType: "image/png",
+						data: imageData
+					} },
+					referenceType
+				});
+			}
+			instance.referenceImages = refs;
+		}
+		const sourceVideo = config.extendVideoId || config.sourceVideo;
+		if (sourceVideo) {
+			if (sourceVideo.includes("/operations/")) return { error: "Google AI Studio Veo does not accept operation IDs for video extension. Use `vertex:video:*` with `extendVideoId`, or provide base64/file:// video data via `sourceVideo`." };
+			const { data: videoData, error } = this.loadVideoData(sourceVideo);
+			if (error) return { error };
+			instance.video = { inlineData: {
+				mimeType: "video/mp4",
+				data: videoData
+			} };
+		}
 		const body = { instances: [instance] };
+		if (Object.keys(parameters).length > 0) body.parameters = parameters;
+		return { body };
+	}
+	async createVertexVideoJob(prompt, config) {
+		const url = await this.getVertexEndpoint("predictLongRunning");
+		const { body, error: bodyError } = this.buildVertexRequestBody(prompt, config);
+		if (bodyError || !body) return { error: bodyError || "Failed to build Vertex Veo request" };
 		try {
 			const client = await this.getClientWithCredentials();
 			logger.debug("[Google Video] Creating video job", {
@@ -23432,10 +23504,37 @@ var GoogleVideoProvider = class {
 			return { error: `Failed to create video job: ${error.response?.data?.error?.message || error.message || String(err)}` };
 		}
 	}
+	async createAiStudioVideoJob(prompt, config) {
+		const { body, error: bodyError } = this.buildAiStudioRequestBody(prompt, config);
+		if (bodyError || !body) return { error: bodyError || "Failed to build Google AI Studio Veo request" };
+		try {
+			const headers = await this.getAiStudioHeaders(config);
+			const url = this.getAiStudioEndpoint(`models/${this.modelName}:predictLongRunning`);
+			logger.debug("[Google Video] Creating video job", {
+				url,
+				model: this.modelName,
+				transport: "google-ai-studio"
+			});
+			const response = await fetchWithTimeout(url, {
+				method: "POST",
+				headers,
+				body: JSON.stringify(body)
+			}, REQUEST_TIMEOUT_MS);
+			const data = await response.json();
+			if (!response.ok) return { error: `Failed to create video job: ${data.error?.message || response.statusText}` };
+			return { operation: data };
+		} catch (err) {
+			return { error: `Failed to create video job: ${err.message || String(err)}` };
+		}
+	}
 	/**
 	* Poll for video job completion using fetchPredictOperation endpoint
 	*/
-	async pollOperationStatus(operationName, pollIntervalMs, maxPollTimeMs) {
+	async pollOperationStatus(operationName, pollIntervalMs, maxPollTimeMs, config) {
+		if (this.isVertexMode(config)) return this.pollVertexOperationStatus(operationName, pollIntervalMs, maxPollTimeMs);
+		return this.pollAiStudioOperationStatus(operationName, pollIntervalMs, maxPollTimeMs, config);
+	}
+	async pollVertexOperationStatus(operationName, pollIntervalMs, maxPollTimeMs) {
 		const startTime = Date.now();
 		const location = this.getLocation();
 		const url = `https://${location}-aiplatform.googleapis.com/v1/projects/${await this.getProjectId()}/locations/${location}/publishers/google/models/${this.modelName}:fetchPredictOperation`;
@@ -23460,10 +23559,37 @@ var GoogleVideoProvider = class {
 		}
 		return { error: `Video generation timed out after ${maxPollTimeMs / 1e3} seconds` };
 	}
+	async pollAiStudioOperationStatus(operationName, pollIntervalMs, maxPollTimeMs, config) {
+		const startTime = Date.now();
+		const url = this.getAiStudioEndpoint(operationName);
+		const headers = await this.getAiStudioHeaders(config);
+		logger.debug(`[Google Video] Polling operation via Google AI Studio: ${url}`);
+		while (Date.now() - startTime < maxPollTimeMs) try {
+			const response = await fetchWithTimeout(url, {
+				method: "GET",
+				headers
+			}, REQUEST_TIMEOUT_MS);
+			const operation = await response.json();
+			if (!response.ok) return { error: `Polling error: ${operation.error?.message || response.statusText}` };
+			logger.debug(`[Google Video] Operation status: done=${operation.done}, progress=${operation.metadata?.progress}%`);
+			if (operation.done) {
+				if (operation.error) return { error: `Video generation failed: ${operation.error.message}` };
+				return { operation };
+			}
+			await sleep(pollIntervalMs);
+		} catch (err) {
+			return { error: `Polling error: ${err.message || String(err)}` };
+		}
+		return { error: `Video generation timed out after ${maxPollTimeMs / 1e3} seconds` };
+	}
 	/**
 	* Download video from URI and store to blob storage
 	*/
-	async downloadVideoToBlob(videoUri) {
+	async downloadVideoToBlob(videoUri, config) {
+		if (this.isVertexMode(config)) return this.downloadVertexVideoToBlob(videoUri);
+		return this.downloadAiStudioVideoToBlob(videoUri, config);
+	}
+	async downloadVertexVideoToBlob(videoUri) {
 		try {
 			const response = await (await this.getClientWithCredentials()).request({
 				url: videoUri,
@@ -23480,6 +23606,23 @@ var GoogleVideoProvider = class {
 			return { error: `Download error: ${err.message || String(err)}` };
 		}
 	}
+	async downloadAiStudioVideoToBlob(videoUri, config) {
+		try {
+			const response = await fetchWithTimeout(videoUri, {
+				method: "GET",
+				headers: await this.getAiStudioHeaders(config)
+			}, REQUEST_TIMEOUT_MS);
+			if (!response.ok) return { error: `Download error: ${response.statusText}` };
+			const { ref } = await storeBlob(Buffer.from(await response.arrayBuffer()), "video/mp4", {
+				kind: "video",
+				location: "response.video"
+			});
+			logger.debug(`[Google Video] Stored video to blob storage: ${ref.uri}`);
+			return { blobRef: ref };
+		} catch (err) {
+			return { error: `Download error: ${err.message || String(err)}` };
+		}
+	}
 	/**
 	* Store base64 encoded video to blob storage
 	*/
@@ -23497,20 +23640,40 @@ var GoogleVideoProvider = class {
 	}
 	async callApi(prompt, context) {
 		if (!prompt || prompt.trim() === "") return { error: "Prompt is required for video generation" };
-		let projectId = this.config.projectId || getEnvString("GOOGLE_CLOUD_PROJECT") || getEnvString("GOOGLE_PROJECT_ID") || this.env?.GOOGLE_CLOUD_PROJECT || this.env?.GOOGLE_PROJECT_ID;
-		if (!projectId) try {
-			projectId = await resolveProjectId(this.config, this.env);
-		} catch {
-			return { error: "Google Veo video generation requires Vertex AI. Set GOOGLE_CLOUD_PROJECT environment variable or add `projectId` to the provider config, then run \"gcloud auth application-default login\"." };
-		}
-		const config = {
+		let effectiveConfig = {
 			...this.config,
 			...context?.prompt?.config
 		};
-		const model = config.model || this.modelName;
-		const aspectRatio = config.aspectRatio || DEFAULT_ASPECT_RATIO$1;
-		const resolution = config.resolution || DEFAULT_RESOLUTION$1;
-		const durationSeconds = config.durationSeconds || config.duration || DEFAULT_DURATION$1;
+		let isVertexMode = this.isVertexMode(effectiveConfig);
+		if (isVertexMode) {
+			let projectId = effectiveConfig.projectId || getEnvString("GOOGLE_CLOUD_PROJECT") || getEnvString("GOOGLE_PROJECT_ID") || this.env?.GOOGLE_CLOUD_PROJECT || this.env?.GOOGLE_PROJECT_ID;
+			if (!projectId) try {
+				projectId = await resolveProjectId(effectiveConfig, this.env);
+			} catch {
+				return { error: "Google Veo video generation via Vertex AI requires a project ID. Set GOOGLE_CLOUD_PROJECT or add `projectId` to the provider config, then run \"gcloud auth application-default login\"." };
+			}
+			effectiveConfig = {
+				...effectiveConfig,
+				vertexai: true,
+				...projectId ? { projectId } : {}
+			};
+		} else if (!this.getApiKey(effectiveConfig)) try {
+			const adcProjectId = await resolveProjectId(effectiveConfig, this.env);
+			if (adcProjectId) {
+				isVertexMode = true;
+				effectiveConfig = {
+					...effectiveConfig,
+					vertexai: true,
+					projectId: adcProjectId
+				};
+			} else return { error: "Google Veo video generation via Google AI Studio requires an API key. Set GOOGLE_API_KEY or GEMINI_API_KEY, or add `apiKey` to the provider config." };
+		} catch {
+			return { error: "Google Veo video generation via Google AI Studio requires an API key. Set GOOGLE_API_KEY or GEMINI_API_KEY, or add `apiKey` to the provider config." };
+		}
+		const model = effectiveConfig.model || this.modelName;
+		const aspectRatio = effectiveConfig.aspectRatio || DEFAULT_ASPECT_RATIO$1;
+		const resolution = effectiveConfig.resolution || DEFAULT_RESOLUTION$1;
+		const durationSeconds = effectiveConfig.durationSeconds || effectiveConfig.duration || DEFAULT_DURATION$1;
 		const ratioValidation = validateAspectRatio$1(aspectRatio);
 		if (!ratioValidation.valid) return { error: ratioValidation.message };
 		const durationValidation = validateDuration$1(model, durationSeconds);
@@ -23520,7 +23683,7 @@ var GoogleVideoProvider = class {
 		const startTime = Date.now();
 		logger.info(`[Google Video] Creating video job for model ${model}...`);
 		const { operation: createdOp, error: createError } = await this.createVideoJob(prompt, {
-			...config,
+			...effectiveConfig,
 			aspectRatio,
 			resolution,
 			durationSeconds
@@ -23528,9 +23691,9 @@ var GoogleVideoProvider = class {
 		if (createError || !createdOp) return { error: createError || "Failed to create video job" };
 		const operationName = createdOp.name;
 		logger.info(`[Google Video] Video job created: ${operationName}`);
-		const pollIntervalMs = config.pollIntervalMs || DEFAULT_POLL_INTERVAL_MS$1;
-		const maxPollTimeMs = config.maxPollTimeMs || DEFAULT_MAX_POLL_TIME_MS$1;
-		const { operation: completedOp, error: pollError } = await this.pollOperationStatus(operationName, pollIntervalMs, maxPollTimeMs);
+		const pollIntervalMs = effectiveConfig.pollIntervalMs || DEFAULT_POLL_INTERVAL_MS$1;
+		const maxPollTimeMs = effectiveConfig.maxPollTimeMs || DEFAULT_MAX_POLL_TIME_MS$1;
+		const { operation: completedOp, error: pollError } = await this.pollOperationStatus(operationName, pollIntervalMs, maxPollTimeMs, effectiveConfig);
 		if (pollError || !completedOp) return { error: pollError || "Polling failed" };
 		let blobRef;
 		const base64Video = completedOp.response?.videos?.[0]?.bytesBase64Encoded;
@@ -23545,7 +23708,7 @@ var GoogleVideoProvider = class {
 				logger.debug(`[Google Video] Response: ${JSON.stringify(completedOp.response)}`);
 				return { error: "No video data in response" };
 			}
-			const { blobRef: ref, error: downloadError } = await this.downloadVideoToBlob(videoUri);
+			const { blobRef: ref, error: downloadError } = await this.downloadVideoToBlob(videoUri, effectiveConfig);
 			if (downloadError) return { error: downloadError };
 			blobRef = ref;
 		}
@@ -24235,13 +24398,22 @@ const ApiKeyAuthSchema = z.object({
 	placement: z.enum(["header", "query"]),
 	keyName: z.string()
 });
+const FileAuthSchema = z.object({
+	type: z.literal("file"),
+	path: z.string().min(1)
+});
 const AuthSchema = z.union([
 	OAuthClientCredentialsSchema,
 	OAuthPasswordSchema,
 	BasicAuthSchema,
 	BearerAuthSchema,
-	ApiKeyAuthSchema
+	ApiKeyAuthSchema,
+	FileAuthSchema
 ]);
+const FileAuthResultSchema = z.object({
+	token: z.string().min(1),
+	expiration: z.number().finite().nullable().optional()
+});
 /**
 * Configuration for a separate session endpoint that must be called before the main API.
 * The session endpoint returns a session ID that is then used in the main request.
@@ -24330,6 +24502,12 @@ async function loadTransformModule(transform) {
 	}
 	return transform;
 }
+function hasOwnProperty(obj, key) {
+	return Object.prototype.hasOwnProperty.call(obj, key);
+}
+function parseFileAuthReference(filePath) {
+	return filePath.startsWith("file://") ? parseFileUrl(filePath) : { filePath };
+}
 async function createSessionParser(parser) {
 	if (!parser) return () => "";
 	if (typeof parser === "function") return (response) => parser(response);
@@ -24690,20 +24868,11 @@ var HttpProvider = class {
 			password: this.config.auth.password ? nunjucks.renderString(this.config.auth.password, vars) : void 0
 		} : baseConfig;
 		const now = Date.now();
-		if (this.lastToken && this.lastTokenExpiresAt && now + 6e4 < this.lastTokenExpiresAt) {
+		if (this.hasValidCachedToken(now)) {
 			logger.debug("[HTTP Provider Auth]: Using cached OAuth token");
 			return;
 		}
-		if (this.tokenRefreshPromise != null) {
-			logger.debug("[HTTP Provider Auth]: Token refresh already in progress, waiting...");
-			try {
-				await this.tokenRefreshPromise;
-				if (this.lastToken && this.lastTokenExpiresAt && Date.now() + 6e4 < this.lastTokenExpiresAt) return;
-				logger.debug("[HTTP Provider Auth]: Token expired while waiting, refreshing again...");
-			} catch {
-				logger.debug("[HTTP Provider Auth]: Previous token refresh failed, retrying...");
-			}
-		}
+		if (this.tokenRefreshPromise != null && await this.waitForInFlightTokenRefresh()) return;
 		logger.debug("[HTTP Provider Auth]: Refreshing OAuth token");
 		const refreshPromise = this.performTokenRefresh(oauthConfig, now);
 		this.tokenRefreshPromise = refreshPromise;
@@ -24732,7 +24901,7 @@ var HttpProvider = class {
 				body: tokenRequestBody.toString()
 			};
 			if (httpsAgent) fetchOptions.dispatcher = httpsAgent;
-			const response = await fetchWithCache(oauthConfig.tokenUrl, fetchOptions, REQUEST_TIMEOUT_MS, "text", true, 0);
+			const response = await fetchWithCache(oauthConfig.tokenUrl, fetchOptions, REQUEST_TIMEOUT_MS$1, "text", true, 0);
 			if (response.status < 200 || response.status >= 300) throw new Error(`OAuth token request failed with status ${response.status} ${response.statusText}: ${response.data}`);
 			const tokenData = JSON.parse(response.data);
 			if (!tokenData.access_token) throw new Error("OAuth token response missing access_token");
@@ -24745,6 +24914,70 @@ var HttpProvider = class {
 		}
 		invariant(this.lastToken, "OAuth token should be defined at this point");
 	}
+	hasValidCachedToken(now = Date.now()) {
+		if (!this.lastToken) return false;
+		if (this.lastTokenExpiresAt == null) return this.config.auth?.type === "file";
+		return now + TOKEN_REFRESH_BUFFER_MS < this.lastTokenExpiresAt;
+	}
+	async waitForInFlightTokenRefresh() {
+		if (this.tokenRefreshPromise == null) return false;
+		logger.debug("[HTTP Provider Auth]: Token refresh already in progress, waiting...");
+		try {
+			await this.tokenRefreshPromise;
+			if (this.hasValidCachedToken()) return true;
+			logger.debug("[HTTP Provider Auth]: Token expired while waiting, refreshing again...");
+		} catch {
+			logger.debug("[HTTP Provider Auth]: Previous token refresh failed, retrying...");
+		}
+		return false;
+	}
+	async refreshFileTokenIfNeeded(prompt, vars, context) {
+		if (!this.config.auth || this.config.auth.type !== "file") {
+			logger.debug("[HTTP Provider Auth]: No file auth configured");
+			return;
+		}
+		if (this.hasValidCachedToken()) {
+			logger.debug("[HTTP Provider Auth]: Using cached file auth token");
+			return;
+		}
+		if (this.tokenRefreshPromise != null && await this.waitForInFlightTokenRefresh()) return;
+		logger.debug("[HTTP Provider Auth]: Refreshing file auth token");
+		const refreshPromise = this.performFileTokenRefresh(prompt, vars, context);
+		this.tokenRefreshPromise = refreshPromise;
+		try {
+			await refreshPromise;
+		} finally {
+			if (this.tokenRefreshPromise === refreshPromise) this.tokenRefreshPromise = void 0;
+		}
+	}
+	async performFileTokenRefresh(prompt, vars, context) {
+		invariant(this.config.auth?.type === "file", "File auth should be configured");
+		const { filePath, functionName } = parseFileAuthReference(this.config.auth.path);
+		const defaultFunctionName = filePath.endsWith(".py") ? "get_auth" : "default";
+		const authContext = {
+			...context ?? {},
+			prompt: context?.prompt ?? {
+				raw: prompt,
+				label: prompt
+			},
+			vars
+		};
+		try {
+			const authFn = await loadFunction({
+				filePath,
+				functionName,
+				defaultFunctionName
+			});
+			const result = FileAuthResultSchema.parse(await authFn(authContext));
+			this.lastToken = result.token;
+			this.lastTokenExpiresAt = result.expiration ?? void 0;
+			logger.debug("[HTTP Provider Auth]: Successfully refreshed file auth token");
+		} catch (err) {
+			logger.error(`[HTTP Provider Auth]: Failed to refresh file auth token: ${String(err)}`);
+			throw new Error(`Failed to refresh file auth token: ${String(err)}`);
+		}
+		invariant(this.lastToken, "File auth token should be defined at this point");
+	}
 	async refreshSignatureIfNeeded(vars) {
 		if (!this.config.signatureAuth) {
 			logger.debug("[HTTP Provider Auth]: No signature auth configured");
@@ -24825,7 +25058,7 @@ var HttpProvider = class {
 		};
 		if (body) fetchOptions.body = body;
 		if (httpsAgent) fetchOptions.dispatcher = httpsAgent;
-		const response = await fetchWithCache(url, fetchOptions, REQUEST_TIMEOUT_MS, "text", true, this.config.maxRetries);
+		const response = await fetchWithCache(url, fetchOptions, REQUEST_TIMEOUT_MS$1, "text", true, this.config.maxRetries);
 		if (response.status < 200 || response.status >= 300) throw new Error(`Session endpoint request failed with status ${response.status} ${response.statusText}: ${response.data}`);
 		const rawText = response.data;
 		let parsedData;
@@ -24926,12 +25159,21 @@ var HttpProvider = class {
 			...context?.vars || {},
 			prompt,
 			...context?.evaluationId ? { evaluationId: context.evaluationId } : {},
-			...transformedTools !== void 0 ? { tools: serializeForTemplate(transformedTools) } : {},
-			...transformedToolChoice !== void 0 ? { tool_choice: serializeForTemplate(transformedToolChoice) } : {}
+			...transformedTools === void 0 ? {} : { tools: serializeForTemplate(transformedTools) },
+			...transformedToolChoice === void 0 ? {} : { tool_choice: serializeForTemplate(transformedToolChoice) }
 		};
 		if (this.config.auth?.type === "oauth") {
 			await this.refreshOAuthTokenIfNeeded(vars);
 			invariant(this.lastToken, "OAuth token should be defined at this point");
+			if (hasOwnProperty(vars, "token")) logger.warn("[HTTP Provider Auth]: `token` is already defined in vars and will be overwritten");
+			vars.token = this.lastToken;
+		} else if (this.config.auth?.type === "file") {
+			await this.refreshFileTokenIfNeeded(prompt, vars, context);
+			invariant(this.lastToken, "File auth token should be defined at this point");
+			if (hasOwnProperty(vars, "token")) logger.warn("[HTTP Provider Auth]: `token` is already defined in vars and will be overwritten");
+			if (hasOwnProperty(vars, "expiration")) logger.warn("[HTTP Provider Auth]: `expiration` is already defined in vars and will be overwritten");
+			vars.token = this.lastToken;
+			vars.expiration = this.lastTokenExpiresAt;
 		}
 		if (this.config.signatureAuth) {
 			await this.refreshSignatureIfNeeded(vars);
@@ -25001,7 +25243,7 @@ var HttpProvider = class {
 		}
 		let data, cached = false, status, statusText, responseHeaders, latencyMs;
 		try {
-			({data, cached, status, statusText, headers: responseHeaders, latencyMs} = await fetchWithCache(url, fetchOptions, REQUEST_TIMEOUT_MS, "text", context?.bustCache ?? context?.debug, this.config.maxRetries));
+			({data, cached, status, statusText, headers: responseHeaders, latencyMs} = await fetchWithCache(url, fetchOptions, REQUEST_TIMEOUT_MS$1, "text", context?.bustCache ?? context?.debug, this.config.maxRetries));
 		} catch (err) {
 			throw err;
 		}
@@ -25119,7 +25361,7 @@ var HttpProvider = class {
 		}
 		let data, cached = false, status, statusText, responseHeaders, latencyMs;
 		try {
-			({data, cached, status, statusText, headers: responseHeaders, latencyMs} = await fetchWithCache(url, fetchOptions, REQUEST_TIMEOUT_MS, "text", context?.bustCache ?? context?.debug, this.config.maxRetries));
+			({data, cached, status, statusText, headers: responseHeaders, latencyMs} = await fetchWithCache(url, fetchOptions, REQUEST_TIMEOUT_MS$1, "text", context?.bustCache ?? context?.debug, this.config.maxRetries));
 		} catch (err) {
 			throw err;
 		}
@@ -25366,7 +25608,7 @@ var HuggingfaceTextGenerationProvider = class {
 					...this.getApiKey() ? { Authorization: `Bearer ${this.getApiKey()}` } : {}
 				},
 				body: JSON.stringify(params)
-			}, REQUEST_TIMEOUT_MS);
+			}, REQUEST_TIMEOUT_MS$1);
 			logger.debug("Huggingface Inference API response", { data: response.data });
 			if (response.data.error) return { error: `API call error: ${response.data.error}` };
 			if (!response.data[0] && !response.data.generated_text) return { error: `Malformed response data: ${response.data}` };
@@ -25408,7 +25650,7 @@ var HuggingfaceTextClassificationProvider = class {
 					...this.getApiKey() ? { Authorization: `Bearer ${this.getApiKey()}` } : {}
 				},
 				body: JSON.stringify(params)
-			}, REQUEST_TIMEOUT_MS);
+			}, REQUEST_TIMEOUT_MS$1);
 			if (response.data.error) return { error: `API call error: ${response.data.error}` };
 			if (!response.data[0] || !Array.isArray(response.data[0])) return { error: `Malformed response data: ${response.data}` };
 			const scores = {};
@@ -25471,7 +25713,7 @@ var HuggingfaceFeatureExtractionProvider = class {
 					...this.getApiKey() ? { Authorization: `Bearer ${this.getApiKey()}` } : {}
 				},
 				body: JSON.stringify(params)
-			}, REQUEST_TIMEOUT_MS);
+			}, REQUEST_TIMEOUT_MS$1);
 			if (typeof response.data === "object" && "error" in response.data) return { error: `API call error: ${response.data.error}` };
 			if (!Array.isArray(response.data)) return { error: `Malformed response data: ${response.data}` };
 			return { embedding: response.data };
@@ -25521,7 +25763,7 @@ var HuggingfaceSentenceSimilarityProvider = class {
 					...this.getApiKey() ? { Authorization: `Bearer ${this.getApiKey()}` } : {}
 				},
 				body: JSON.stringify(params)
-			}, REQUEST_TIMEOUT_MS);
+			}, REQUEST_TIMEOUT_MS$1);
 			if (typeof response.data === "object" && "error" in response.data) return { error: `API call error: ${response.data.error}` };
 			if (!Array.isArray(response.data)) return { error: `Malformed response data: ${response.data}` };
 			return { similarity: response.data[0] };
@@ -25563,7 +25805,7 @@ var HuggingfaceTokenExtractionProvider = class {
 					...this.getApiKey() ? { Authorization: `Bearer ${this.getApiKey()}` } : {}
 				},
 				body: JSON.stringify(params)
-			}, REQUEST_TIMEOUT_MS);
+			}, REQUEST_TIMEOUT_MS$1);
 			if (typeof response.data === "object" && "error" in response.data) return { error: `API call error: ${response.data.error}` };
 			if (!Array.isArray(response.data)) return { error: `Malformed response data: ${response.data}` };
 			const classification = {};
@@ -25642,7 +25884,7 @@ var LlamaProvider = class {
 				method: "POST",
 				headers: { "Content-Type": "application/json" },
 				body: JSON.stringify(body)
-			}, REQUEST_TIMEOUT_MS));
+			}, REQUEST_TIMEOUT_MS$1));
 		} catch (err) {
 			return { error: `API call error: ${String(err)}` };
 		}
@@ -25768,13 +26010,20 @@ function createLlamaApiProvider(providerPath, options = {}) {
 }
 //#endregion
 //#region src/providers/localai.ts
+function parseEnvFloat(value) {
+	if (value === void 0) return;
+	const parsed = Number.parseFloat(value);
+	return Number.isNaN(parsed) ? void 0 : parsed;
+}
 var LocalAiGenericProvider = class {
 	modelName;
 	apiBaseUrl;
 	config;
+	env;
 	constructor(modelName, options = {}) {
 		const { id, config, env } = options;
 		this.modelName = modelName;
+		this.env = env;
 		this.apiBaseUrl = config?.apiBaseUrl || env?.LOCALAI_BASE_URL || getEnvString("LOCALAI_BASE_URL") || "http://localhost:8080/v1";
 		this.config = config || {};
 		this.id = id ? () => id : this.id;
@@ -25798,7 +26047,7 @@ var LocalAiChatProvider = class extends LocalAiGenericProvider {
 		const body = {
 			model: this.modelName,
 			messages,
-			temperature: this.config.temperature || getEnvFloat("LOCALAI_TEMPERATURE") || .7
+			temperature: this.config.temperature ?? parseEnvFloat(this.env?.LOCALAI_TEMPERATURE) ?? getEnvFloat("LOCALAI_TEMPERATURE") ?? .7
 		};
 		let data;
 		try {
@@ -25806,7 +26055,7 @@ var LocalAiChatProvider = class extends LocalAiGenericProvider {
 				method: "POST",
 				headers: { "Content-Type": "application/json" },
 				body: JSON.stringify(body)
-			}, REQUEST_TIMEOUT_MS));
+			}, REQUEST_TIMEOUT_MS$1));
 		} catch (err) {
 			return { error: `API call error: ${String(err)}` };
 		}
@@ -25829,7 +26078,7 @@ var LocalAiEmbeddingProvider = class extends LocalAiGenericProvider {
 				method: "POST",
 				headers: { "Content-Type": "application/json" },
 				body: JSON.stringify(body)
-			}, REQUEST_TIMEOUT_MS));
+			}, REQUEST_TIMEOUT_MS$1));
 		} catch (err) {
 			return { error: `API call error: ${String(err)}` };
 		}
@@ -25847,7 +26096,7 @@ var LocalAiCompletionProvider = class extends LocalAiGenericProvider {
 		const body = {
 			model: this.modelName,
 			prompt,
-			temperature: this.config.temperature || getEnvFloat("LOCALAI_TEMPERATURE") || .7
+			temperature: this.config.temperature ?? parseEnvFloat(this.env?.LOCALAI_TEMPERATURE) ?? getEnvFloat("LOCALAI_TEMPERATURE") ?? .7
 		};
 		let data;
 		try {
@@ -25855,7 +26104,7 @@ var LocalAiCompletionProvider = class extends LocalAiGenericProvider {
 				method: "POST",
 				headers: { "Content-Type": "application/json" },
 				body: JSON.stringify(body)
-			}, REQUEST_TIMEOUT_MS));
+			}, REQUEST_TIMEOUT_MS$1));
 		} catch (err) {
 			return { error: `API call error: ${String(err)}` };
 		}
@@ -26097,7 +26346,7 @@ var NscaleImageProvider = class NscaleImageProvider extends OpenAiImageProvider
 		let data, status, statusText;
 		let cached = false;
 		try {
-			({data, cached, status, statusText} = await callOpenAiImageApi(`${this.getApiUrl()}${endpoint}`, body, headers, REQUEST_TIMEOUT_MS));
+			({data, cached, status, statusText} = await callOpenAiImageApi(`${this.getApiUrl()}${endpoint}`, body, headers, REQUEST_TIMEOUT_MS$1));
 			if (status < 200 || status >= 300) return { error: `API error: ${status} ${statusText}\n${typeof data === "string" ? data : JSON.stringify(data)}` };
 		} catch (err) {
 			logger.error(`API call error: ${String(err)}`);
@@ -26265,7 +26514,7 @@ var OllamaCompletionProvider = class {
 				if (OllamaCompletionOptionKeys.has(optionName) && optionName !== "think" && optionName !== "tools" && optionName !== "passthrough") options[optionName] = this.config[optionName];
 				return options;
 			}, {}),
-			...this.config.think !== void 0 ? { think: this.config.think } : {},
+			...this.config.think === void 0 ? {} : { think: this.config.think },
 			...this.config.passthrough || {}
 		};
 		if (this.config.think !== void 0) params.think = this.config.think;
@@ -26279,7 +26528,7 @@ var OllamaCompletionProvider = class {
 					...getEnvString("OLLAMA_API_KEY") ? { Authorization: `Bearer ${getEnvString("OLLAMA_API_KEY")}` } : {}
 				},
 				body: JSON.stringify(params)
-			}, REQUEST_TIMEOUT_MS, "text");
+			}, REQUEST_TIMEOUT_MS$1, "text");
 		} catch (err) {
 			return { error: `API call error: ${String(err)}. Output:\n${response?.data}` };
 		}
@@ -26364,7 +26613,7 @@ var OllamaChatProvider = class {
 				if (OllamaCompletionOptionKeys.has(optionName) && optionName !== "tools") options[optionName] = this.config[optionName];
 				return options;
 			}, {}),
-			...this.config.think !== void 0 ? { think: this.config.think } : {},
+			...this.config.think === void 0 ? {} : { think: this.config.think },
 			...this.config.passthrough || {}
 		};
 		if (this.config.tools) {
@@ -26381,7 +26630,7 @@ var OllamaChatProvider = class {
 					...getEnvString("OLLAMA_API_KEY") ? { Authorization: `Bearer ${getEnvString("OLLAMA_API_KEY")}` } : {}
 				},
 				body: JSON.stringify(params)
-			}, REQUEST_TIMEOUT_MS, "text", context?.bustCache ?? context?.debug);
+			}, REQUEST_TIMEOUT_MS$1, "text", context?.bustCache ?? context?.debug);
 		} catch (err) {
 			return { error: `API call error: ${String(err)}. Output:\n${response?.data}` };
 		}
@@ -26449,7 +26698,7 @@ var OllamaEmbeddingProvider = class extends OllamaCompletionProvider {
 					...getEnvString("OLLAMA_API_KEY") ? { Authorization: `Bearer ${getEnvString("OLLAMA_API_KEY")}` } : {}
 				},
 				body: JSON.stringify(params)
-			}, REQUEST_TIMEOUT_MS, "json");
+			}, REQUEST_TIMEOUT_MS$1, "json");
 		} catch (err) {
 			return { error: `API call error: ${String(err)}` };
 		}
@@ -26573,7 +26822,7 @@ var OpenAiAssistantProvider = class extends OpenAiGenericProvider {
 			organization: this.getOrganization(),
 			baseURL: this.getApiUrl(),
 			maxRetries: 3,
-			timeout: REQUEST_TIMEOUT_MS,
+			timeout: REQUEST_TIMEOUT_MS$1,
 			defaultHeaders: this.assistantConfig.headers
 		});
 		const messages = parseChatPrompt(prompt, [{
@@ -27706,7 +27955,12 @@ const SORA_COSTS = {
 /**
 * Valid video sizes (aspect ratios) for OpenAI Sora
 */
-const VALID_VIDEO_SIZES = ["1280x720", "720x1280"];
+const VALID_VIDEO_SIZES = [
+	"1280x720",
+	"720x1280",
+	"1792x1024",
+	"1024x1792"
+];
 /**
 * Valid video durations in seconds for OpenAI Sora
 */
@@ -27874,7 +28128,7 @@ var OpenAiVideoProvider = class extends OpenAiGenericProvider {
 	* Download video content and store in media storage
 	*/
 	async downloadVideoContent(soraVideoId, variant, cacheKey, evalId) {
-		const url = `${this.getApiUrl()}/videos/${soraVideoId}/content${variant !== "video" ? `?variant=${variant}` : ""}`;
+		const url = `${this.getApiUrl()}/videos/${soraVideoId}/content${variant === "video" ? "" : `?variant=${variant}`}`;
 		const headers = this.getAuthHeaders();
 		try {
 			const response = await fetchWithProxy(url, {
@@ -28104,7 +28358,7 @@ var OpenRouterProvider = class extends OpenAiChatCompletionProvider {
 					...config.headers
 				},
 				body: JSON.stringify(body)
-			}, REQUEST_TIMEOUT_MS, "json", context?.bustCache ?? context?.debug));
+			}, REQUEST_TIMEOUT_MS$1, "json", context?.bustCache ?? context?.debug));
 			if (status < 200 || status >= 300) return { error: `API error: ${status} ${statusText}\n${typeof data === "string" ? data : JSON.stringify(data)}` };
 		} catch (err) {
 			logger.error(`API call error: ${String(err)}`);
@@ -28371,7 +28625,7 @@ var PythonWorker = class {
 	maxCrashes = 3;
 	pendingRequest = null;
 	requestTimeout = null;
-	constructor(scriptPath, functionName, pythonPath, timeout = REQUEST_TIMEOUT_MS, onReady) {
+	constructor(scriptPath, functionName, pythonPath, timeout = REQUEST_TIMEOUT_MS$1, onReady) {
 		this.scriptPath = scriptPath;
 		this.functionName = functionName;
 		this.pythonPath = pythonPath;
@@ -28912,7 +29166,7 @@ var ReplicateProvider = class {
 			providerId: this.id(),
 			temperature: this.config.temperature,
 			topP: this.config.top_p,
-			maxTokens: this.config.max_tokens || this.config.max_length || this.config.max_new_tokens,
+			maxTokens: this.config.max_tokens ?? this.config.max_length ?? this.config.max_new_tokens,
 			testIndex: context?.test?.vars?.__testIdx,
 			promptLabel: context?.prompt?.label,
 			traceparent: context?.traceparent
@@ -28956,14 +29210,14 @@ var ReplicateProvider = class {
 		let response;
 		try {
 			const inputOptions = {
-				max_length: this.config.max_length || getEnvInt("REPLICATE_MAX_LENGTH"),
-				max_new_tokens: this.config.max_new_tokens || getEnvInt("REPLICATE_MAX_NEW_TOKENS"),
-				temperature: this.config.temperature || getEnvFloat("REPLICATE_TEMPERATURE"),
-				top_p: this.config.top_p || getEnvFloat("REPLICATE_TOP_P"),
-				top_k: this.config.top_k || getEnvInt("REPLICATE_TOP_K"),
-				repetition_penalty: this.config.repetition_penalty || getEnvFloat("REPLICATE_REPETITION_PENALTY"),
-				stop_sequences: this.config.stop_sequences || getEnvString("REPLICATE_STOP_SEQUENCES"),
-				seed: this.config.seed || getEnvInt("REPLICATE_SEED"),
+				max_length: this.config.max_length ?? getEnvInt("REPLICATE_MAX_LENGTH"),
+				max_new_tokens: this.config.max_new_tokens ?? getEnvInt("REPLICATE_MAX_NEW_TOKENS"),
+				temperature: this.config.temperature ?? getEnvFloat("REPLICATE_TEMPERATURE"),
+				top_p: this.config.top_p ?? getEnvFloat("REPLICATE_TOP_P"),
+				top_k: this.config.top_k ?? getEnvInt("REPLICATE_TOP_K"),
+				repetition_penalty: this.config.repetition_penalty ?? getEnvFloat("REPLICATE_REPETITION_PENALTY"),
+				stop_sequences: this.config.stop_sequences ?? getEnvString("REPLICATE_STOP_SEQUENCES"),
+				seed: this.config.seed ?? getEnvInt("REPLICATE_SEED"),
 				system_prompt: systemPrompt,
 				prompt: userPrompt
 			};
@@ -28982,7 +29236,7 @@ var ReplicateProvider = class {
 					Prefer: "wait=60"
 				},
 				body: JSON.stringify(data)
-			}, REQUEST_TIMEOUT_MS, "json")).data;
+			}, REQUEST_TIMEOUT_MS$1, "json")).data;
 			if (response.status === "starting" || response.status === "processing") response = await this.pollForCompletion(response.id);
 			if (response.status === "failed") throw new Error(response.error || "Prediction failed");
 			response = response.output;
@@ -29018,7 +29272,7 @@ var ReplicateProvider = class {
 			const prediction = (await fetchWithCache(`https://api.replicate.com/v1/predictions/${predictionId}`, {
 				method: "GET",
 				headers: { Authorization: `Bearer ${this.apiKey}` }
-			}, REQUEST_TIMEOUT_MS, "json", false)).data;
+			}, REQUEST_TIMEOUT_MS$1, "json", false)).data;
 			if (prediction.status === "succeeded" || prediction.status === "failed" || prediction.status === "canceled") return prediction;
 			await new Promise((resolve) => setTimeout(resolve, pollInterval));
 		}
@@ -29110,7 +29364,7 @@ var ReplicateImageProvider = class extends ReplicateProvider {
 					Prefer: "wait=60"
 				},
 				body: JSON.stringify(data)
-			}, REQUEST_TIMEOUT_MS, "json")).data;
+			}, REQUEST_TIMEOUT_MS$1, "json")).data;
 			logger.debug(`Initial prediction status: ${prediction.status}, ID: ${prediction.id}`);
 			if (prediction.status === "starting" || prediction.status === "processing") prediction = await this.pollForCompletion(prediction.id);
 			logger.debug(`Final prediction status: ${prediction.status}, output: ${JSON.stringify(prediction.output)}`);
@@ -29451,7 +29705,7 @@ var SnowflakeCortexProvider = class extends OpenAiChatCompletionProvider {
 					...config.headers
 				},
 				body: JSON.stringify(body)
-			}, REQUEST_TIMEOUT_MS, "json", context?.bustCache ?? context?.debug));
+			}, REQUEST_TIMEOUT_MS$1, "json", context?.bustCache ?? context?.debug));
 			if (status < 200 || status >= 300) return { error: `API error: ${status} ${statusText}\n${typeof data === "string" ? data : JSON.stringify(data)}` };
 		} catch (err) {
 			logger.error(`[Snowflake Cortex] API call error: ${String(err)}`);
@@ -29866,7 +30120,7 @@ function createTrueFoundryProvider(providerPath, options = {}) {
 }
 //#endregion
 //#region src/providers/vercel.ts
-const DEFAULT_TIMEOUT_MS = REQUEST_TIMEOUT_MS;
+const DEFAULT_TIMEOUT_MS = REQUEST_TIMEOUT_MS$1;
 /**
 * Resolves the API key from config, environment variables, or defaults.
 */
@@ -30267,7 +30521,7 @@ var VoyageEmbeddingProvider = class {
 					...this.config.headers
 				},
 				body: JSON.stringify(body)
-			}, REQUEST_TIMEOUT_MS));
+			}, REQUEST_TIMEOUT_MS$1));
 		} catch (err) {
 			logger.error(`API call error: ${err}`);
 			throw err;
@@ -30377,7 +30631,7 @@ function generateConfigHash(config) {
 }
 async function fetchModelSpecs() {
 	try {
-		const { data, cached: _cached, latencyMs: _latencyMs } = await fetchWithCache("https://us-south.ml.cloud.ibm.com/ml/v1/foundation_model_specs?version=2023-09-30", { headers: { "Content-Type": "application/json" } }, REQUEST_TIMEOUT_MS);
+		const { data, cached: _cached, latencyMs: _latencyMs } = await fetchWithCache("https://us-south.ml.cloud.ibm.com/ml/v1/foundation_model_specs?version=2023-09-30", { headers: { "Content-Type": "application/json" } }, REQUEST_TIMEOUT_MS$1);
 		return (typeof data === "string" ? JSON.parse(data) : data)?.resources || [];
 	} catch (error) {
 		logger.error(`Failed to fetch model specs: ${error}`);
@@ -30676,7 +30930,7 @@ var WebhookProvider = class {
 				method: "POST",
 				headers: { "Content-Type": "application/json" },
 				body: JSON.stringify(params)
-			}, REQUEST_TIMEOUT_MS, "json"));
+			}, REQUEST_TIMEOUT_MS$1, "json"));
 		} catch (err) {
 			return { error: `Webhook call error: ${String(err)}` };
 		}
@@ -30754,7 +31008,7 @@ var WebSocketProvider = class {
 	constructor(url, options) {
 		this.config = options.config;
 		this.url = this.config.url || url;
-		this.timeoutMs = this.config.timeoutMs || REQUEST_TIMEOUT_MS;
+		this.timeoutMs = this.config.timeoutMs || REQUEST_TIMEOUT_MS$1;
 		this.transformResponse = createTransformResponse(this.config.transformResponse || this.config.responseParser);
 		this.streamResponse = this.config.streamResponse ? createStreamResponse(this.config.streamResponse) : void 0;
 		invariant(this.config.messageTemplate, `Expected WebSocket provider ${this.url} to have a config containing {messageTemplate}, but got ${safeJsonStringify(this.config)}`);
@@ -30771,7 +31025,7 @@ var WebSocketProvider = class {
 			prompt
 		};
 		const message = nunjucks.renderString(this.config.messageTemplate, vars);
-		const streamResponse = this.streamResponse != null ? await this.streamResponse : void 0;
+		const streamResponse = this.streamResponse == null ? void 0 : await this.streamResponse;
 		logger.debug(`Sending WebSocket message to ${this.url}: ${message}`);
 		let accumulator = { error: "unknown error occurred" };
 		return new Promise((resolve, reject) => {
@@ -31209,7 +31463,7 @@ var XAIImageProvider = class extends OpenAiImageProvider {
 		let cached = false;
 		let latencyMs;
 		try {
-			({data, cached, status, statusText, latencyMs} = await callOpenAiImageApi(`${this.getApiUrl()}${endpoint}`, body, headers, REQUEST_TIMEOUT_MS));
+			({data, cached, status, statusText, latencyMs} = await callOpenAiImageApi(`${this.getApiUrl()}${endpoint}`, body, headers, REQUEST_TIMEOUT_MS$1));
 			if (status < 200 || status >= 300) return { error: `API error: ${status} ${statusText}\n${typeof data === "string" ? data : JSON.stringify(data)}` };
 		} catch (err) {
 			logger.error(`API call error: ${String(err)}`);
@@ -31333,10 +31587,10 @@ var XAIResponsesProvider = class {
 		const body = {
 			model: this.modelName,
 			input,
-			...maxOutputTokens !== void 0 ? { max_output_tokens: maxOutputTokens } : {},
-			...temperature !== void 0 ? { temperature } : {},
+			...maxOutputTokens === void 0 ? {} : { max_output_tokens: maxOutputTokens },
+			...temperature === void 0 ? {} : { temperature },
 			...config.instructions ? { instructions: config.instructions } : {},
-			...config.top_p !== void 0 ? { top_p: config.top_p } : {},
+			...config.top_p === void 0 ? {} : { top_p: config.top_p },
 			...loadedTools && loadedTools.length > 0 ? { tools: loadedTools } : {},
 			...config.tool_choice ? { tool_choice: config.tool_choice } : {},
 			...config.previous_response_id ? { previous_response_id: config.previous_response_id } : {},
@@ -31382,7 +31636,7 @@ var XAIResponsesProvider = class {
 					...config.headers
 				},
 				body: JSON.stringify(body)
-			}, REQUEST_TIMEOUT_MS, "json", context?.bustCache ?? context?.debug, this.config.maxRetries);
+			}, REQUEST_TIMEOUT_MS$1, "json", context?.bustCache ?? context?.debug, this.config.maxRetries);
 			data = response.data;
 			cached = response.cached;
 			status = response.status;
@@ -32159,7 +32413,7 @@ const providerMap = [
 	{
 		test: (providerPath) => providerPath.startsWith("opencode:") || providerPath === "opencode",
 		create: async (providerPath, providerOptions, context) => {
-			const { OpenCodeSDKProvider } = await import("./opencode-sdk-0j6rTWNb.js");
+			const { OpenCodeSDKProvider } = await import("./opencode-sdk-C71Z0ehR.js");
 			return new OpenCodeSDKProvider({
 				...providerOptions,
 				id: providerPath,
@@ -32171,18 +32425,15 @@ const providerMap = [
 	{
 		test: (providerPath) => providerPath.startsWith("openclaw:") || providerPath === "openclaw",
 		create: async (providerPath, providerOptions, context) => {
-			const { createOpenClawProvider } = await import("./openclaw-DiSz3I5L.js");
+			const { createOpenClawProvider } = await import("./openclaw-D2ENvu7a.js");
 			return createOpenClawProvider(providerPath, providerOptions, context.env);
 		}
 	},
 	{
 		test: (providerPath) => providerPath.startsWith("anthropic:claude-agent-sdk") || providerPath.startsWith("anthropic:claude-code"),
-		create: async (_providerPath, providerOptions, context) => {
-			const { ClaudeCodeSDKProvider } = await import("./claude-agent-sdk-DfCoW0E6.js");
-			return new ClaudeCodeSDKProvider({
-				...providerOptions,
-				env: context.env
-			});
+		create: async (_providerPath, providerOptions, _context) => {
+			const { ClaudeCodeSDKProvider } = await import("./claude-agent-sdk-Bq5EArsX.js");
+			return new ClaudeCodeSDKProvider({ ...providerOptions });
 		}
 	},
 	{
@@ -32235,25 +32486,25 @@ const providerMap = [
 			const modelName = splits.slice(2).join(":");
 			if (modelType === "converse") return new AwsBedrockConverseProvider(modelName, providerOptions);
 			if (modelType === "nova-sonic" || modelType.includes("amazon.nova-sonic")) {
-				const { NovaSonicProvider } = await import("./nova-sonic-De1HW5fD.js");
+				const { NovaSonicProvider } = await import("./nova-sonic-DWswpN1E.js");
 				return new NovaSonicProvider("amazon.nova-sonic-v1:0", providerOptions);
 			}
 			if (modelType.includes("luma.ray") || modelName.includes("luma.ray")) {
-				const { LumaRayVideoProvider } = await import("./luma-ray-BS2_tY8L.js");
+				const { LumaRayVideoProvider } = await import("./luma-ray-0ehMPt5N.js");
 				return new LumaRayVideoProvider(modelName.includes("luma.ray") ? modelName : splits.slice(1).join(":") || "luma.ray-v2:0", providerOptions);
 			}
 			if (modelType.includes("amazon.nova-reel") || modelType === "video" && (modelName.includes("amazon.nova-reel") || modelName === "")) {
-				const { NovaReelVideoProvider } = await import("./nova-reel-D_W1tjMH.js");
+				const { NovaReelVideoProvider } = await import("./nova-reel-DEeQlnOJ.js");
 				return new NovaReelVideoProvider(modelName || "amazon.nova-reel-v1:1", providerOptions);
 			}
 			if (modelType === "agents") {
-				const { AwsBedrockAgentsProvider } = await import("./agents-cLXA8a_8.js");
+				const { AwsBedrockAgentsProvider } = await import("./agents-CgBniSlI.js");
 				return new AwsBedrockAgentsProvider(modelName, providerOptions);
 			}
 			if (modelType === "completion") return new AwsBedrockCompletionProvider(modelName, providerOptions);
 			if (modelType === "embeddings" || modelType === "embedding") return new AwsBedrockEmbeddingProvider(modelName, providerOptions);
 			if (modelType === "kb" || modelType === "knowledge-base") {
-				const { AwsBedrockKnowledgeBaseProvider } = await import("./knowledgeBase-CYTLHOt1.js");
+				const { AwsBedrockKnowledgeBaseProvider } = await import("./knowledgeBase-Ce3ofVan.js");
 				return new AwsBedrockKnowledgeBaseProvider(modelName, providerOptions);
 			}
 			return new AwsBedrockCompletionProvider(splits.slice(1).join(":"), providerOptions);
@@ -32263,7 +32514,7 @@ const providerMap = [
 		test: (providerPath) => providerPath.startsWith("bedrock-agent:"),
 		create: async (providerPath, providerOptions, _context) => {
 			const agentId = providerPath.substring(14);
-			const { AwsBedrockAgentsProvider } = await import("./agents-cLXA8a_8.js");
+			const { AwsBedrockAgentsProvider } = await import("./agents-CgBniSlI.js");
 			return new AwsBedrockAgentsProvider(agentId, providerOptions);
 		}
 	},
@@ -32273,7 +32524,7 @@ const providerMap = [
 			const splits = providerPath.split(":");
 			const modelType = splits[1];
 			const endpointName = splits.slice(2).join(":");
-			const { SageMakerCompletionProvider, SageMakerEmbeddingProvider } = await import("./sagemaker-YSyBXQQh.js");
+			const { SageMakerCompletionProvider, SageMakerEmbeddingProvider } = await import("./sagemaker-MUbD5V3v.js");
 			if (modelType === "embedding" || modelType === "embeddings") return new SageMakerEmbeddingProvider(endpointName || modelType, providerOptions);
 			if (splits.length === 2) return new SageMakerCompletionProvider(modelType, providerOptions);
 			if (endpointName.includes("jumpstart") || modelType === "jumpstart") return new SageMakerCompletionProvider(endpointName, {
@@ -32314,7 +32565,7 @@ const providerMap = [
 	{
 		test: (providerPath) => providerPath.startsWith("cloudflare-ai:"),
 		create: async (providerPath, providerOptions, context) => {
-			const { createCloudflareAiProvider } = await import("./cloudflare-ai-BxAGvfju.js");
+			const { createCloudflareAiProvider } = await import("./cloudflare-ai-DdKP9TKT.js");
 			return createCloudflareAiProvider(providerPath, {
 				...providerOptions,
 				env: context.env
@@ -32324,7 +32575,7 @@ const providerMap = [
 	{
 		test: (providerPath) => providerPath.startsWith("cloudflare-gateway:"),
 		create: async (providerPath, providerOptions, context) => {
-			const { createCloudflareGatewayProvider } = await import("./cloudflare-gateway-B9HWA5wf.js");
+			const { createCloudflareGatewayProvider } = await import("./cloudflare-gateway-D-e9i1Sn.js");
 			return createCloudflareGatewayProvider(providerPath, {
 				...providerOptions,
 				env: context.env
@@ -32476,27 +32727,27 @@ const providerMap = [
 		create: async (providerPath, providerOptions, context) => {
 			const modelType = providerPath.split(":")[1];
 			if (modelType === "image") {
-				const { createHyperbolicImageProvider } = await import("./image-B02ogr_b.js");
+				const { createHyperbolicImageProvider } = await import("./image-DO0RYnjH.js");
 				return createHyperbolicImageProvider(providerPath, {
 					...providerOptions,
 					env: context.env
 				});
 			}
 			if (modelType === "audio") {
-				const { createHyperbolicAudioProvider } = await import("./audio-Dz3z7s3J.js");
+				const { createHyperbolicAudioProvider } = await import("./audio-DjU9GswO.js");
 				return createHyperbolicAudioProvider(providerPath, {
 					...providerOptions,
 					env: context.env
 				});
 			}
-			const { createHyperbolicProvider } = await import("./chat-qmatte1u.js");
+			const { createHyperbolicProvider } = await import("./chat-BE0qTA8e.js");
 			return createHyperbolicProvider(providerPath, providerOptions);
 		}
 	},
 	{
 		test: (providerPath) => providerPath.startsWith("litellm:"),
 		create: async (providerPath, providerOptions, context) => {
-			const { createLiteLLMProvider } = await import("./litellm-AaeZcZQF.js");
+			const { createLiteLLMProvider } = await import("./litellm-Bo2gQXpo.js");
 			return createLiteLLMProvider(providerPath, {
 				config: providerOptions,
 				env: context.env
@@ -32553,9 +32804,16 @@ const providerMap = [
 			const modelName = splits.slice(2).join(":");
 			const configuredModel = getConfiguredOpenAiModel(providerOptions);
 			if (modelType === "codex-sdk" || modelType === "codex") {
-				const { OpenAICodexSDKProvider } = await import("./codex-sdk-GGAw0qbD.js");
+				const { OpenAICodexSDKProvider } = await import("./codex-sdk-DE5G18dx.js");
+				const codexModel = modelName || configuredModel;
+				const codexProviderId = providerOptions.id ?? providerPath;
 				return new OpenAICodexSDKProvider({
 					...providerOptions,
+					id: codexProviderId,
+					config: codexModel ? {
+						...providerOptions.config,
+						model: codexModel
+					} : providerOptions.config,
 					env: context.env
 				});
 			}
@@ -32566,7 +32824,7 @@ const providerMap = [
 			if (modelType === "realtime") return new OpenAiRealtimeProvider(modelName || configuredModel || "gpt-4o-realtime-preview-2024-12-17", providerOptions);
 			if (modelType === "responses") return new OpenAiResponsesProvider(modelName || configuredModel || "gpt-4.1-2025-04-14", providerOptions);
 			if (modelType === "transcription") {
-				const { OpenAiTranscriptionProvider } = await import("./transcription-s6A-bNrZ.js");
+				const { OpenAiTranscriptionProvider } = await import("./transcription-DOMMTu01.js");
 				return new OpenAiTranscriptionProvider(modelName || configuredModel || "gpt-4o-transcribe-diarize", providerOptions);
 			}
 			if (OpenAiChatCompletionProvider.OPENAI_CHAT_MODEL_NAMES.includes(modelType)) return new OpenAiChatCompletionProvider(modelType, providerOptions);
@@ -32574,11 +32832,11 @@ const providerMap = [
 			if (OpenAiRealtimeProvider.OPENAI_REALTIME_MODEL_NAMES.includes(modelType)) return new OpenAiRealtimeProvider(modelType, providerOptions);
 			if (OpenAiResponsesProvider.OPENAI_RESPONSES_MODEL_NAMES.includes(modelType)) return new OpenAiResponsesProvider(modelType, providerOptions);
 			if (modelType === "agents") {
-				const { OpenAiAgentsProvider } = await import("./agents-D__IdAlg.js");
+				const { OpenAiAgentsProvider } = await import("./agents-Bqgfdokm.js");
 				return new OpenAiAgentsProvider(modelName || "default-agent", providerOptions);
 			}
 			if (modelType === "chatkit") {
-				const { OpenAiChatKitProvider } = await import("./chatkit-BxFvW8KY.js");
+				const { OpenAiChatKitProvider } = await import("./chatkit-_8eJqKcD.js");
 				return new OpenAiChatKitProvider(modelName || "", providerOptions);
 			}
 			if (modelType === "assistant") return new OpenAiAssistantProvider(modelName, providerOptions);
@@ -32621,7 +32879,7 @@ const providerMap = [
 	{
 		test: (providerPath) => providerPath.startsWith("quiverai:"),
 		create: async (providerPath, providerOptions, context) => {
-			const { createQuiverAiProvider } = await import("./quiverai-uH-dcTIr.js");
+			const { createQuiverAiProvider } = await import("./quiverai-CCQn73lq.js");
 			return createQuiverAiProvider(providerPath, providerOptions, context.env);
 		}
 	},
@@ -32639,7 +32897,7 @@ const providerMap = [
 	{
 		test: (providerPath) => providerPath.startsWith("modelslab:"),
 		create: async (providerPath, providerOptions, context) => {
-			const { ModelsLabImageProvider } = await import("./modelslab-Bx9IrZfS.js");
+			const { ModelsLabImageProvider } = await import("./modelslab-BI458moT.js");
 			const splits = providerPath.split(":");
 			const modelType = splits[1];
 			const modelName = splits.slice(2).join(":");
@@ -32683,7 +32941,7 @@ const providerMap = [
 	{
 		test: (providerPath) => providerPath.startsWith("aimlapi:"),
 		create: async (providerPath, providerOptions, context) => {
-			const { createAimlApiProvider } = await import("./aimlapi-CnkC2HqE.js");
+			const { createAimlApiProvider } = await import("./aimlapi-DaC3qZ-o.js");
 			return createAimlApiProvider(providerPath, {
 				...providerOptions,
 				env: context.env
@@ -32693,7 +32951,7 @@ const providerMap = [
 	{
 		test: (providerPath) => providerPath.startsWith("cometapi:"),
 		create: async (providerPath, providerOptions, context) => {
-			const { createCometApiProvider } = await import("./cometapi-DFNiKmSz.js");
+			const { createCometApiProvider } = await import("./cometapi-sp7sJpBD.js");
 			return createCometApiProvider(providerPath, {
 				...providerOptions,
 				env: context.env
@@ -32703,7 +32961,7 @@ const providerMap = [
 	{
 		test: (providerPath) => providerPath.startsWith("docker:"),
 		create: async (providerPath, providerOptions, context) => {
-			const { createDockerProvider } = await import("./docker-BvfL2BrW.js");
+			const { createDockerProvider } = await import("./docker-DpguQj-w.js");
 			return createDockerProvider(providerPath, {
 				...providerOptions,
 				env: context.env
@@ -32724,6 +32982,14 @@ const providerMap = [
 		create: async (providerPath, providerOptions, _context) => {
 			const splits = providerPath.split(":");
 			const firstPart = splits[1];
+			if (firstPart === "video") return new GoogleVideoProvider(splits.slice(2).join(":"), {
+				...providerOptions,
+				id: providerPath,
+				config: {
+					...providerOptions.config,
+					vertexai: true
+				}
+			});
 			if (firstPart === "chat") return new VertexChatProvider(splits.slice(2).join(":"), providerOptions);
 			if (firstPart === "embedding" || firstPart === "embeddings") return new VertexEmbeddingProvider(splits.slice(2).join(":"), providerOptions);
 			return new VertexChatProvider(splits.slice(1).join(":"), providerOptions);
@@ -32790,7 +33056,10 @@ const providerMap = [
 				const modelName = splits.slice(2).join(":");
 				if (serviceType === "live") return new GoogleLiveProvider(modelName, providerOptions);
 				else if (serviceType === "image") return new GoogleImageProvider(modelName, providerOptions);
-				else if (serviceType === "video") return new GoogleVideoProvider(modelName, providerOptions);
+				else if (serviceType === "video") return new GoogleVideoProvider(modelName, {
+					...providerOptions,
+					id: providerPath
+				});
 			}
 			const modelName = splits[1];
 			if (modelName.includes("-image")) return new GeminiImageProvider(modelName, providerOptions);
@@ -32989,7 +33258,7 @@ Example: transformers:feature-extraction:Xenova/all-MiniLM-L6-v2`);
 		test: (providerPath) => providerPath === "slack" || providerPath.startsWith("slack:"),
 		create: async (providerPath, providerOptions, _context) => {
 			try {
-				const { SlackProvider } = await import("./slack-DCUPTzS2.js");
+				const { SlackProvider } = await import("./slack-BR0HtO3K.js");
 				if (providerPath === "slack") return new SlackProvider(providerOptions);
 				const splits = providerPath.split(":");
 				if (splits.length < 2) throw new Error("Invalid Slack provider path. Use slack:<channel_id> or slack:channel:<channel_id>");
@@ -33285,4 +33554,4 @@ function getProviderIds(providerPaths) {
 //#endregion
 export { AzureEmbeddingProvider as $, renderPrompt as A, OpenAiModerationProvider as B, extractVariablesFromJson as C, isEmptyResponse as D, isBasicRefusal as E, TokenUsageTracker as F, VertexChatProvider as G, MistralEmbeddingProvider as H, createRateLimitRegistry as I, DefaultGradingProvider$1 as J, AIStudioChatProvider as K, createProviderRateLimitOptions as L, isPackagePath as M, loadFromPackage as N, removePrefix as O, redteamProviderManager as P, AzureModerationProvider as Q, PromptfooHarmfulCompletionProvider as R, extractPromptFromTags as S, getShortPluginId as T, DefaultEmbeddingProvider as U, MistralChatCompletionProvider as V, DefaultGradingProvider as W, DefaultSuggestionsProvider as X, DefaultLlmRubricProvider as Y, DefaultSynthesizeProvider as Z, pluginMatchesStrategyTargets as _, resolveTeamId as _t, resolveProviderConfigs as a, getCloudDatabaseId as at, extractGoalFromPrompt as b, createTransformRequest as c, getEvalConfigFromCloud as ct, Strategies as d, getPoliciesFromCloud as dt, AzureChatCompletionProvider as et, loadStrategy as f, getProviderFromCloud as ft, retrieveMedia as g, resolveTeamFromIdentifier as gt, mediaExists as h, makeRequest as ht, resolveProvider as i, checkCloudPermissions as it, runExtensionHook as j, collectFileMetadata as k, createTransformResponse$1 as l, getOrgContext as lt, getMediaStorage as m, isCloudProvider as mt, loadApiProvider as n, parseScriptParts as nt, MCPProvider as o, getConfigFromCloud as ot, validateStrategies as p, getUserTeams as pt, DefaultGradingJsonProvider as q, loadApiProviders as r, canCreateTargets as rt, HttpProvider as s, getDefaultTeam as st, getProviderIds as t, getFileHashes as tt, GoogleLiveProvider as u, getPluginSeverityOverridesFromCloud as ut, checkExfilTracking as v, getSessionId as w, extractInputVarsFromPrompt as x, extractAllPromptsFromTags as y, REDTEAM_MEMORY_POISONING_PLUGIN_ID as z };
 
-//# sourceMappingURL=providers-BlqUifFg.js.map
+//# sourceMappingURL=providers-Ch6Mr0gn.js.map