promptfoo 0.120.24 → 0.120.26

package/dist/src/{providers-CUCHJCHD.js → providers-BlEhY5mi.js}

@@ -1,36 +1,38 @@
 #!/usr/bin/env node
-import { C as getEnvString, O as cliState_default, S as getEnvInt, b as getEnvBool, d as extractFirstJsonObject, g as safeJsonStringify, l as sanitizeObject, m as isValidJson, o as logger_default, u as sanitizeUrl, v as getConfigDirectoryPath, x as getEnvFloat } from "./logger-Bzi5o47S.js";
-import { P as VERSION, S as CLOUD_PROVIDER_PREFIX, _ as openaiToolsToBedrock, b as transformToolChoice, d as REQUEST_TIMEOUT_MS, f as calculateCost, g as openaiToolChoiceToBedrock, i as fetchWithTimeout, l as sleep, m as isOpenAIToolChoice, n as fetchWithProxy, p as isOpenAIToolArray, r as fetchWithRetries, u as LONG_RUNNING_MODEL_TIMEOUT_MS, v as parseChatPrompt, x as transformTools, y as toTitleCase } from "./fetch-Mb7SbeM-.js";
+import { C as getEnvString, O as cliState_default, S as getEnvInt, b as getEnvBool, d as extractFirstJsonObject, g as safeJsonStringify, l as sanitizeObject, m as isValidJson, o as logger_default, u as sanitizeUrl, v as getConfigDirectoryPath, x as getEnvFloat } from "./logger-BotXmWKW.js";
+import { P as VERSION, S as CLOUD_PROVIDER_PREFIX, _ as openaiToolsToBedrock, b as transformToolChoice, d as REQUEST_TIMEOUT_MS, f as calculateCost, g as openaiToolChoiceToBedrock, i as fetchWithTimeout, l as sleep, m as isOpenAIToolChoice, n as fetchWithProxy, p as isOpenAIToolArray, r as fetchWithRetries, u as LONG_RUNNING_MODEL_TIMEOUT_MS, v as parseChatPrompt, x as transformTools, y as toTitleCase } from "./fetch-SRsE6Ctl.js";
 import { t as invariant } from "./invariant-DT20jrBd.js";
-import { o as getUserEmail } from "./accounts-BOlMHrvn.js";
-import { i as cloudConfig } from "./cloud-ByJVRSQI.js";
-import { r as telemetry_default } from "./telemetry-MVkZQxt9.js";
-import { A as DATASET_PLUGINS, H as pluginDescriptions, L as isCustomStrategy, N as MULTI_TURN_STRATEGIES, O as AGENTIC_STRATEGIES, ft as STRATEGY_EXEMPT_PLUGINS, m as isProviderOptions, p as isApiProvider, v as ProviderOptionsSchema } from "./types-CgrxBFgm.js";
-import { f as neverGenerateRemote, l as getRemoteGenerationUrl, m as shouldGenerateRemote, p as neverGenerateRemoteForRegularEvals, r as checkServerFeatureSupport, u as getRemoteGenerationUrlForUnaligned } from "./server-mycZbUH8.js";
-import { a as fetchWithCache, c as isTransientConnectionError, o as getCache, s as isCacheEnabled } from "./cache-DHm8Pc8l.js";
-import { a as isVideoFile, i as isJavascriptFile, n as isAudioFile, r as isImageFile } from "./fileExtensions-CzcPkiKZ.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-M2MoNCUR.js";
-import { a as safeJoin, i as resolvePackageEntryPoint, n as getWrapperDir, o as safeResolve, r as importModule } from "./esm-Lh6czAFT.js";
-import { i as validatePythonPath, n as getEnvInt$1, r as runPython, t as getConfiguredPythonPath } from "./pythonUtils-B9JA-gsC.js";
-import { n as transform, r as getProcessShim, t as TransformInputType } from "./transform-BFPYuBaW.js";
-import { a as sha256, n as isBlobStorageEnabled, r as shouldAttemptRemoteBlobUpload, t as extractAndStoreBinaryData } from "./extractor-BA90EtLq.js";
-import { n as withGenAISpan } from "./genaiTracer-foKtbVa2.js";
-import { i as normalizeFinishReason, n as MCPClient, r as FINISH_REASON_MAP, t as OpenAiChatCompletionProvider } from "./chat-CVOyOBYk.js";
-import { a as createEmptyTokenUsage, n as accumulateResponseTokenUsage, r as accumulateTokenUsage } from "./tokenUsageUtils-DoinwgKF.js";
-import { E as TOKEN_REFRESH_BUFFER_MS, a as calculateGoogleCost, c as geminiFormatAndSystemInstructions, d as mergeParts, f as normalizeTools, g as getGoogleClient, h as GoogleAuthManager, i as transformMCPToolsToOpenAi, l as getCandidate, m as CHAT_MODELS, o as createAuthCacheDiscriminator, r as transformMCPToolsToGoogle, s as formatCandidateContents, u as getGoogleAccessToken, v as loadCredentials, y as resolveProjectId } from "./transform-Bn-lgBE2.js";
-import { n as AnthropicGenericProvider, t as AnthropicMessagesProvider } from "./messages-BMkwrfmt.js";
-import { a as parseMessages, i as outputFromMessage, t as ANTHROPIC_MODELS } from "./util-BZaMVBMq.js";
-import { t as OpenAiGenericProvider } from "./openai-Cv9pEKxp.js";
-import { a as calculateOpenAICost, c as getTokenUsage$3, o as failApiCall, r as OPENAI_REALTIME_MODELS, s as formatOpenAiError } from "./util-DHBpsbZE.js";
-import { n as OpenAiEmbeddingProvider, t as OpenAiCompletionProvider } from "./completion-BLe7SUA4.js";
-import { i as storeBlob } from "./blobs-MlVQyoSc.js";
-import { a as evalResultsTable, g as getDb } from "./tables-BjaApSAB.js";
-import { n as escapeRegExp, t as ellipsize } from "./text-DuYSUYPB.js";
-import { n as getTraceStore } from "./store-BFLqwuc_.js";
-import { t as AwsBedrockGenericProvider } from "./base-DHam07ip.js";
-import { n as callOpenAiImageApi, r as formatOutput, t as OpenAiImageProvider } from "./image-C1i3NoZo.js";
-import { t as providerRegistry } from "./providerRegistry-D32Lt9vp.js";
-import { n as runRuby } from "./rubyUtils-Dn6MGcsk.js";
+import { o as getUserEmail } from "./accounts-DHHiXsy6.js";
+import { i as cloudConfig } from "./cloud-BMbRVJFw.js";
+import { r as telemetry_default } from "./telemetry-BXyVqyAg.js";
+import { A as DATASET_PLUGINS, E as isUuid, H as pluginDescriptions, L as isCustomStrategy, N as MULTI_TURN_STRATEGIES, O as AGENTIC_STRATEGIES, ft as STRATEGY_EXEMPT_PLUGINS, m as isProviderOptions, p as isApiProvider, v as ProviderOptionsSchema } from "./types-t52w-XsS.js";
+import { f as neverGenerateRemote, l as getRemoteGenerationUrl, m as shouldGenerateRemote, p as neverGenerateRemoteForRegularEvals, r as checkServerFeatureSupport, u as getRemoteGenerationUrlForUnaligned } from "./server-DWmZLfCy.js";
+import { a as fetchWithCache, o as getCache, s as isCacheEnabled } from "./cache-mIszOnuz.js";
+import { r as isTransientConnectionError } from "./errors-DnGCbnx8.js";
+import { a as isVideoFile, i as isJavascriptFile, n as isAudioFile, r as isImageFile } from "./fileExtensions-BpuMmaFL.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-BSh4a_Q8.js";
+import { a as safeJoin, i as resolvePackageEntryPoint, n as getWrapperDir, o as safeResolve, r as importModule } from "./esm-CYhseqj4.js";
+import { i as validatePythonPath, n as getEnvInt$1, r as runPython, t as getConfiguredPythonPath } from "./pythonUtils-r1uBuA0n.js";
+import { n as transform, r as getProcessShim, t as TransformInputType } from "./transform-CqTFr7KR.js";
+import { a as sha256, n as isBlobStorageEnabled, r as shouldAttemptRemoteBlobUpload, t as extractAndStoreBinaryData } from "./extractor-LSYjrhK0.js";
+import { n as withGenAISpan } from "./genaiTracer-CqNnnXrE.js";
+import { i as normalizeFinishReason, n as MCPClient, r as FINISH_REASON_MAP, t as OpenAiChatCompletionProvider } from "./chat-DIywASPG.js";
+import { a as createEmptyTokenUsage, n as accumulateResponseTokenUsage, r as accumulateTokenUsage } from "./tokenUsageUtils-DmZSD2eU.js";
+import { O as TOKEN_REFRESH_BUFFER_MS, 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-CoP2bJ7P.js";
+import { n as AnthropicGenericProvider, t as AnthropicMessagesProvider } from "./messages-D61tPFQo.js";
+import { a as parseMessages, i as outputFromMessage, t as ANTHROPIC_MODELS } from "./util-vjscpUzy.js";
+import { n as ResponsesProcessor, r as FunctionCallbackHandler, t as OpenAiResponsesProvider } from "./responses-TsdODUpm.js";
+import { t as OpenAiGenericProvider } from "./openai-CT5fwbve.js";
+import { a as calculateOpenAICost, c as getTokenUsage$2, o as failApiCall, r as OPENAI_REALTIME_MODELS, s as formatOpenAiError } from "./util-CUEt0Vum.js";
+import { n as OpenAiEmbeddingProvider, t as OpenAiCompletionProvider } from "./completion-BBJ6zmG3.js";
+import { i as storeBlob } from "./blobs-kt8v3UyH.js";
+import { a as evalResultsTable, g as getDb } from "./tables-C7TT2XVn.js";
+import { n as escapeRegExp, t as ellipsize } from "./text-DgMr_tiM.js";
+import { n as getTraceStore } from "./store-D4gdn9ih.js";
+import { t as AwsBedrockGenericProvider } from "./base-BaXmtXYp.js";
+import { n as callOpenAiImageApi, r as formatOutput, t as OpenAiImageProvider } from "./image-mhAGP07h.js";
+import { t as providerRegistry } from "./providerRegistry-Xf0qdqGQ.js";
+import { n as runRuby } from "./rubyUtils-BtjlqyXt.js";
 import { Agent } from "undici";
 import { z } from "zod";
 import input from "@inquirer/input";
@@ -55,6 +57,7 @@ import { createHash as createHash$1, randomUUID as randomUUID$1 } from "node:cry
 import { and, desc, eq, sql } from "drizzle-orm";
 import { EventEmitter } from "events";
 import { Presets, SingleBar } from "cli-progress";
+import { execa } from "execa";
 import WebSocket from "ws";
 import http from "http";
 import httpZ from "http-z";
@@ -119,6 +122,78 @@ async function getProviderFromCloud(id) {
 		throw new Error(`Failed to fetch provider from cloud: ${id}.`);
 	}
 }
+function isRecord(value) {
+	return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+async function fetchCloudConfig(path) {
+	const response = await makeRequest(path, "GET");
+	if (!response.ok) {
+		const errorMessage = typeof response.text === "function" ? await response.text() : "";
+		logger_default.error(`[Cloud] Failed to fetch config from cloud: ${errorMessage}. HTTP Status: ${response.status} -- ${response.statusText}.`);
+		throw new Error(`Failed to fetch config from cloud: ${response.statusText}`);
+	}
+	return response.json();
+}
+function looksLikeEvalConfig(config) {
+	return "providers" in config || "providerIds" in config || "prompts" in config || "tests" in config || "testCases" in config;
+}
+function extractEvalConfigPayload(body) {
+	if (!isRecord(body)) throw new Error("Invalid cloud eval config response: expected a JSON object.");
+	const bodyConfig = isRecord(body.config) ? body.config : void 0;
+	if (!bodyConfig) {
+		if (looksLikeEvalConfig(body)) return body;
+		throw new Error("Invalid cloud eval config response: missing \"config\" object.");
+	}
+	const nestedConfig = isRecord(bodyConfig.config) ? bodyConfig.config : void 0;
+	if (!nestedConfig) return {
+		...bodyConfig,
+		...typeof bodyConfig.name !== "string" && typeof body.name === "string" ? { name: body.name } : {}
+	};
+	return {
+		...nestedConfig,
+		...typeof nestedConfig.name !== "string" && typeof bodyConfig.name === "string" ? { name: bodyConfig.name } : {}
+	};
+}
+function normalizeCloudEvalProvider(provider) {
+	if (typeof provider !== "string") return provider;
+	if (provider.startsWith(CLOUD_PROVIDER_PREFIX) || !isUuid(provider)) return provider;
+	return `${CLOUD_PROVIDER_PREFIX}${provider}`;
+}
+function normalizeCloudEvalPrompt(prompt) {
+	if (typeof prompt === "string") return prompt;
+	if (isRecord(prompt)) {
+		if (typeof prompt.content === "string") return prompt.content;
+		if (typeof prompt.raw === "string") return prompt.raw;
+	}
+	return String(prompt ?? "");
+}
+function normalizeEvalConfig(config) {
+	const providers = Array.isArray(config.providers) ? config.providers : Array.isArray(config.providerIds) ? config.providerIds : [];
+	const prompts = Array.isArray(config.prompts) ? config.prompts : [];
+	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 } : {}
+	};
+	const normalizedConfig = {
+		...config,
+		providers: providers.map(normalizeCloudEvalProvider),
+		prompts: prompts.map(normalizeCloudEvalPrompt),
+		tests
+	};
+	if (Object.keys(commandLineOptions).length > 0) normalizedConfig.commandLineOptions = commandLineOptions;
+	else delete normalizedConfig.commandLineOptions;
+	if (typeof config.description === "string" && config.description.trim().length > 0) normalizedConfig.description = config.description;
+	else if (typeof config.name === "string" && config.name.trim().length > 0) normalizedConfig.description = config.name;
+	delete normalizedConfig.providerIds;
+	delete normalizedConfig.testCases;
+	delete normalizedConfig.maxConcurrency;
+	delete normalizedConfig.delay;
+	delete normalizedConfig.verbose;
+	return normalizedConfig;
+}
 /**
 * Fetches a unified configuration from PromptFoo Cloud for red team operations.
 * @param id - The unique identifier of the cloud configuration
@@ -129,13 +204,7 @@ async function getProviderFromCloud(id) {
 async function getConfigFromCloud(id, providerId) {
 	if (!cloudConfig.isEnabled()) throw new Error(`Could not fetch Config ${id} from cloud. Cloud config is not enabled. Please run \`promptfoo auth login\` to login.`);
 	try {
-		const response = await makeRequest(`redteam/configs/${id}/unified${providerId ? `?providerId=${providerId}` : ""}`, "GET");
-		if (!response.ok) {
-			const errorMessage = await response.text();
-			logger_default.error(`[Cloud] Failed to fetch config from cloud: ${errorMessage}. HTTP Status: ${response.status} -- ${response.statusText}.`);
-			throw new Error(`Failed to fetch config from cloud: ${response.statusText}`);
-		}
-		const body = await response.json();
+		const body = await fetchCloudConfig(`redteam/configs/${id}/unified${providerId ? `?providerId=${providerId}` : ""}`);
 		logger_default.info(`Config fetched from cloud: ${id}`);
 		return body;
 	} catch (e) {
@@ -145,6 +214,26 @@ async function getConfigFromCloud(id, providerId) {
 	}
 }
 /**
+* Fetches an eval configuration from PromptFoo Cloud by ID.
+* The response may contain legacy eval fields, which are normalized into UnifiedConfig.
+* @param id - The unique identifier of the cloud eval configuration
+* @returns Promise resolving to a normalized unified configuration object
+* @throws Error if cloud is not enabled, config not found, or response shape is invalid
+*/
+async function getEvalConfigFromCloud(id) {
+	if (!cloudConfig.isEnabled()) throw new Error(`Could not fetch Config ${id} from cloud. Cloud config is not enabled. Please run \`promptfoo auth login\` to login.`);
+	try {
+		const config = normalizeEvalConfig(extractEvalConfigPayload(await fetchCloudConfig(`configs/${id}`)));
+		logger_default.info(`Eval config fetched from cloud: ${id}`);
+		return config;
+	} catch (e) {
+		logger_default.error(`Failed to fetch eval config from cloud: ${id}.`);
+		logger_default.error(String(e));
+		if (e instanceof Error) throw e;
+		throw new Error(String(e));
+	}
+}
+/**
 * Checks if a provider path represents a cloud-based provider.
 * @param providerPath - The provider path to check
 * @returns True if the path starts with the cloud provider prefix, false otherwise
@@ -613,179 +702,6 @@ var ScriptCompletionProvider = class {
 	}
 };
 
-//#endregion
-//#region src/providers/functionCallbackUtils.ts
-/**
-* Handles function callback execution for AI providers.
-* Provides a unified way to execute function callbacks across different provider formats.
-*/
-var FunctionCallbackHandler = class {
-	loadedCallbacks = {};
-	mcpToolNames = null;
-	constructor(mcpClient) {
-		this.mcpClient = mcpClient;
-	}
-	/**
-	* Processes a function call by executing its callback or returning the original call
-	* @param call The function call to process (can be various formats)
-	* @param callbacks Configuration mapping function names to callbacks
-	* @param context Optional context to pass to the callback
-	* @returns The result of processing
-	*/
-	async processCall(call, callbacks, context) {
-		const functionInfo = this.extractFunctionInfo(call);
-		if (this.mcpClient && functionInfo) {
-			if (this.mcpToolNames === null) {
-				const mcpTools = this.mcpClient.getAllTools();
-				this.mcpToolNames = new Set(mcpTools.map((tool) => tool.name));
-			}
-			if (this.mcpToolNames.has(functionInfo.name)) return await this.executeMcpTool(functionInfo.name, functionInfo.arguments);
-		}
-		if (!functionInfo || !callbacks || !callbacks[functionInfo.name]) return {
-			output: typeof call === "string" ? call : JSON.stringify(call),
-			isError: false
-		};
-		try {
-			return {
-				output: await this.executeCallback(functionInfo.name, functionInfo.arguments || "{}", callbacks, context),
-				isError: false
-			};
-		} catch (error) {
-			logger_default.debug(`Function callback failed for ${functionInfo.name}: ${error}`);
-			return {
-				output: typeof call === "string" ? call : JSON.stringify(call),
-				isError: true
-			};
-		}
-	}
-	/**
-	* Processes multiple function calls
-	* @param calls Array of calls or a single call
-	* @param callbacks Configuration mapping function names to callbacks
-	* @param context Optional context to pass to callbacks
-	* @param options Processing options
-	* @returns Processed output in appropriate format
-	*/
-	async processCalls(calls, callbacks, context, _options) {
-		if (!calls) return calls;
-		const isArray = Array.isArray(calls);
-		const callsArray = isArray ? calls : [calls];
-		const results = await Promise.all(callsArray.map((call) => this.processCall(call, callbacks, context)));
-		if (results.some((r, index) => !r.isError && r.output !== JSON.stringify(callsArray[index]))) {
-			const outputs = results.map((r) => r.output);
-			if (!isArray && outputs.length === 1) return outputs[0];
-			return outputs.every((o) => typeof o === "string") ? outputs.join("\n") : outputs;
-		}
-		if (!isArray && results.length === 1) return results[0].output;
-		return calls;
-	}
-	/**
-	* Extracts function name and arguments from various call formats
-	*/
-	extractFunctionInfo(call) {
-		if (!call || typeof call !== "object") return null;
-		if (call.name && typeof call.name === "string") return {
-			name: call.name,
-			arguments: call.arguments
-		};
-		if (call.type === "function" && call.function?.name) return {
-			name: call.function.name,
-			arguments: call.function.arguments
-		};
-		return null;
-	}
-	/**
-	* Executes a function callback
-	*/
-	async executeCallback(functionName, args, callbacks, context) {
-		let callback = this.loadedCallbacks[functionName];
-		if (!callback) {
-			const callbackConfig = callbacks[functionName];
-			if (typeof callbackConfig === "string") if (callbackConfig.startsWith("file://")) callback = await this.loadExternalFunction(callbackConfig);
-			else callback = new Function("return " + callbackConfig)();
-			else if (typeof callbackConfig === "function") callback = callbackConfig;
-			else throw new Error(`Invalid callback configuration for ${functionName}`);
-			this.loadedCallbacks[functionName] = callback;
-		}
-		const result = await callback(args, context);
-		return typeof result === "string" ? result : JSON.stringify(result);
-	}
-	/**
-	* Loads a function from an external file
-	*/
-	async loadExternalFunction(fileRef) {
-		let filePath = fileRef.slice(7);
-		let functionName;
-		if (filePath.includes(":")) {
-			const splits = filePath.split(":");
-			if (splits[0] && isJavascriptFile(splits[0])) [filePath, functionName] = splits;
-		}
-		try {
-			const resolvedPath = path.resolve(cliState_default.basePath || "", filePath);
-			logger_default.debug(`Loading function from ${resolvedPath}${functionName ? `:${functionName}` : ""}`);
-			const mod = await importModule(resolvedPath);
-			const func = functionName && mod[functionName] ? mod[functionName] : mod.default || mod;
-			if (typeof func !== "function") throw new Error(`Expected ${resolvedPath}${functionName ? `:${functionName}` : ""} to export a function, got ${typeof func}`);
-			return func;
-		} catch (error) {
-			throw new Error(`Failed to load function from ${fileRef}: ${error}`);
-		}
-	}
-	/**
-	* Executes an MCP tool
-	*/
-	async executeMcpTool(toolName, args) {
-		try {
-			if (!this.mcpClient) throw new Error("MCP client not available");
-			const parsedArgs = args == null || args === "" ? {} : typeof args === "string" ? JSON.parse(args) : args;
-			const result = await this.mcpClient.callTool(toolName, parsedArgs);
-			if (result?.error) return {
-				output: `MCP Tool Error (${toolName}): ${result.error}`,
-				isError: true
-			};
-			const normalizeContent = (content) => {
-				if (content == null) return "";
-				if (typeof content === "string") return content;
-				if (Array.isArray(content)) return content.map((part) => {
-					if (typeof part === "string") return part;
-					if (part && typeof part === "object") {
-						if ("text" in part && part.text != null) return String(part.text);
-						if ("json" in part) return JSON.stringify(part.json);
-						if ("data" in part) return JSON.stringify(part.data);
-						return JSON.stringify(part);
-					}
-					return String(part);
-				}).join("\n");
-				return JSON.stringify(content);
-			};
-			return {
-				output: `MCP Tool Result (${toolName}): ${normalizeContent(result?.content)}`,
-				isError: false
-			};
-		} catch (error) {
-			const errorMessage = error instanceof Error ? error.message : String(error);
-			logger_default.debug(`MCP tool execution failed for ${toolName}: ${errorMessage}`);
-			return {
-				output: `MCP Tool Error (${toolName}): ${errorMessage}`,
-				isError: true
-			};
-		}
-	}
-	/**
-	* Sets the MCP client, preserving any loaded callbacks
-	*/
-	setMcpClient(client) {
-		this.mcpClient = client;
-		this.mcpToolNames = null;
-	}
-	/**
-	* Clears the cached callbacks
-	*/
-	clearCache() {
-		this.loadedCallbacks = {};
-	}
-};
-
 //#endregion
 //#region src/providers/azure/defaults.ts
 const DEFAULT_AZURE_API_VERSION = "2024-12-01-preview";
@@ -1564,6 +1480,13 @@ const AZURE_MODELS = [
 			output: 6 / 1e6
 		}
 	},
+	{
+		id: "claude-sonnet-4-6",
+		cost: {
+			input: 3 / 1e6,
+			output: 15 / 1e6
+		}
+	},
 	{
 		id: "claude-opus-4-6",
 		cost: {
@@ -1858,6 +1781,13 @@ const AZURE_MODELS = [
 			output: .026 / 1e6
 		}
 	},
+	{
+		id: "Mistral-Large-3",
+		cost: {
+			input: .5 / 1e6,
+			output: 1.5 / 1e6
+		}
+	},
 	{
 		id: "Mistral-Large-2411",
 		cost: {
@@ -2916,7 +2846,7 @@ var AIStudioChatProvider = class extends GoogleGenericProvider {
 			temperature: config.temperature,
 			topP: config.topP,
 			topK: config.topK,
-			safetySettings: config.safetySettings,
+			safetySettings: normalizeSafetySettings(config.safetySettings),
 			stopSequences: config.stopSequences,
 			maxOutputTokens: config.maxOutputTokens
 		};
@@ -2990,7 +2920,7 @@ var AIStudioChatProvider = class extends GoogleGenericProvider {
 				...config.maxOutputTokens !== void 0 && { maxOutputTokens: config.maxOutputTokens },
 				...config.generationConfig
 			},
-			safetySettings: config.safetySettings,
+			safetySettings: normalizeSafetySettings(config.safetySettings),
 			...config.toolConfig ? { toolConfig: config.toolConfig } : {},
 			...allTools.length > 0 ? { tools: allTools } : {},
 			...systemInstruction ? { system_instruction: systemInstruction } : {}
@@ -3309,7 +3239,7 @@ var VertexChatProvider = class extends GoogleGenericProvider {
 				topK: config.topK,
 				...config.generationConfig
 			},
-			...config.safetySettings ? { safetySettings: config.safetySettings } : {},
+			...config.safetySettings ? { safetySettings: normalizeSafetySettings(config.safetySettings) } : {},
 			...config.toolConfig ? { toolConfig: config.toolConfig } : {},
 			...allTools.length > 0 ? { tools: allTools } : {},
 			...systemInstruction ? { systemInstruction } : {},
@@ -3523,7 +3453,7 @@ var VertexChatProvider = class extends GoogleGenericProvider {
 			parameters: {
 				context: this.config.context,
 				examples: this.config.examples,
-				safetySettings: this.config.safetySettings,
+				safetySettings: normalizeSafetySettings(this.config.safetySettings),
 				stopSequences: this.config.stopSequences,
 				temperature: this.config.temperature,
 				maxOutputTokens: this.config.maxOutputTokens,
@@ -3874,7 +3804,7 @@ const MISTRAL_EMBEDDING_MODELS = [{
 		output: .1 / 1e6
 	}
 }];
-function getTokenUsage$2(data, cached) {
+function getTokenUsage$1(data, cached) {
 	if (data.usage) if (cached) return {
 		cached: data.usage.total_tokens,
 		total: data.usage.total_tokens,
@@ -4008,7 +3938,7 @@ var MistralChatCompletionProvider = class MistralChatCompletionProvider {
 		if (!data.choices || !data.choices[0] || !data.choices[0].message.content) return { error: `Malformed response data: ${JSON.stringify(data)}` };
 		const result = {
 			output: data.choices[0].message.content,
-			tokenUsage: getTokenUsage$2(data, cached),
+			tokenUsage: getTokenUsage$1(data, cached),
 			cached,
 			cost: calculateMistralCost(this.modelName, config, data.usage?.prompt_tokens, data.usage?.completion_tokens)
 		};
@@ -4085,7 +4015,7 @@ var MistralEmbeddingProvider = class {
 		try {
 			const embedding = data?.data?.[0]?.embedding;
 			if (!embedding) throw new Error("No embedding found in Mistral Embedding API response");
-			const tokenUsage = getTokenUsage$2(data, cached);
+			const tokenUsage = getTokenUsage$1(data, cached);
 			const promptTokens = tokenUsage.prompt || 0;
 			const completionTokens = 0;
 			return {
@@ -4226,472 +4156,6 @@ var OpenAiModerationProvider = class OpenAiModerationProvider extends OpenAiGene
 	}
 };
 
-//#endregion
-//#region src/providers/responses/processor.ts
-/**
-* Extract user-facing metadata from response data.
-* Only includes fields that are useful for users viewing eval results.
-*/
-function extractMetadata(data, processedOutput) {
-	const metadata = {};
-	if (typeof data.id === "string" && data.id) metadata.responseId = data.id;
-	if (typeof data.model === "string" && data.model) metadata.model = data.model;
-	if (Array.isArray(processedOutput.annotations) && processedOutput.annotations.length > 0) metadata.annotations = processedOutput.annotations;
-	return metadata;
-}
-/**
-* Extract token usage from response data, handling both OpenAI Chat Completions format
-* (prompt_tokens, completion_tokens) and Azure Responses format (input_tokens, output_tokens)
-*/
-function getTokenUsage$1(data, cached) {
-	if (data.usage) if (cached) {
-		const totalTokens = data.usage.total_tokens || (data.usage.input_tokens || 0) + (data.usage.output_tokens || 0);
-		return {
-			cached: totalTokens,
-			total: totalTokens,
-			numRequests: 1
-		};
-	} else {
-		const promptTokens = data.usage.prompt_tokens || data.usage.input_tokens || 0;
-		const completionTokens = data.usage.completion_tokens || data.usage.output_tokens || 0;
-		return {
-			total: data.usage.total_tokens || promptTokens + completionTokens,
-			prompt: promptTokens,
-			completion: completionTokens,
-			numRequests: 1,
-			...data.usage.completion_tokens_details ? { completionDetails: {
-				reasoning: data.usage.completion_tokens_details.reasoning_tokens,
-				acceptedPrediction: data.usage.completion_tokens_details.accepted_prediction_tokens,
-				rejectedPrediction: data.usage.completion_tokens_details.rejected_prediction_tokens
-			} } : {}
-		};
-	}
-	return {};
-}
-/**
-* Shared response processor for OpenAI and Azure Responses APIs.
-* Handles all response types with identical logic to ensure feature parity.
-*/
-var ResponsesProcessor = class {
-	constructor(config) {
-		this.config = config;
-	}
-	async processResponseOutput(data, requestConfig, cached) {
-		logger_default.debug(`Processing ${this.config.providerType} responses output`, {
-			responseId: data.id,
-			model: data.model
-		});
-		if (data.error) return { error: formatOpenAiError(data) };
-		try {
-			const context = {
-				config: requestConfig,
-				cached,
-				data
-			};
-			const processedOutput = await this.processOutput(data.output, context);
-			if (processedOutput.isRefusal) return {
-				output: processedOutput.refusal,
-				tokenUsage: getTokenUsage$1(data, cached),
-				isRefusal: true,
-				cached,
-				cost: this.config.costCalculator(this.config.modelName, data.usage, requestConfig),
-				raw: data,
-				metadata: extractMetadata(data, processedOutput)
-			};
-			let finalOutput = processedOutput.result;
-			if (requestConfig.response_format?.type === "json_schema" && typeof finalOutput === "string") try {
-				finalOutput = JSON.parse(finalOutput);
-			} catch (error) {
-				logger_default.error(`Failed to parse JSON output: ${error}`);
-			}
-			const result = {
-				output: finalOutput,
-				tokenUsage: getTokenUsage$1(data, cached),
-				cached,
-				cost: this.config.costCalculator(this.config.modelName, data.usage, requestConfig),
-				raw: data,
-				metadata: extractMetadata(data, processedOutput)
-			};
-			if (processedOutput.annotations && processedOutput.annotations.length > 0) result.raw = {
-				...data,
-				annotations: processedOutput.annotations
-			};
-			return result;
-		} catch (err) {
-			return { error: `Error parsing response: ${String(err)}\nResponse: ${JSON.stringify(data)}` };
-		}
-	}
-	async processOutput(output, context) {
-		if (this.config.modelName.includes("deep-research")) logger_default.debug(`Deep research response structure: ${JSON.stringify(context.data, null, 2)}`);
-		if (!output || !Array.isArray(output) || output.length === 0) throw new Error("Invalid response format: Missing output array");
-		let result = "";
-		let refusal = "";
-		let isRefusal = false;
-		const annotations = [];
-		for (const item of output) {
-			if (!item || typeof item !== "object") {
-				logger_default.warn(`Skipping invalid output item: ${JSON.stringify(item)}`);
-				continue;
-			}
-			const processed = await this.processOutputItem(item, context);
-			if (processed.isRefusal) {
-				refusal = processed.content || "";
-				isRefusal = true;
-			} else if (processed.content) if (result) result += "\n" + processed.content;
-			else result = processed.content;
-			if (processed.annotations) annotations.push(...processed.annotations);
-		}
-		return {
-			result,
-			refusal,
-			isRefusal,
-			annotations: annotations.length > 0 ? annotations : void 0
-		};
-	}
-	async processOutputItem(item, context) {
-		switch (item.type) {
-			case "function_call": return await this.processFunctionCall(item, context);
-			case "message": return await this.processMessage(item, context);
-			case "tool_result": return this.processToolResult(item);
-			case "reasoning": return this.processReasoning(item);
-			case "web_search_call": return this.processWebSearch(item);
-			case "code_interpreter_call": return this.processCodeInterpreter(item);
-			case "mcp_list_tools": return this.processMcpListTools(item);
-			case "mcp_call": return this.processMcpCall(item);
-			case "mcp_approval_request": return this.processMcpApprovalRequest(item);
-			default:
-				logger_default.debug(`Unknown output item type: ${item.type}`);
-				return {};
-		}
-	}
-	async processFunctionCall(item, context) {
-		let functionResult;
-		if (item.arguments === "{}" && item.status === "completed") functionResult = JSON.stringify({
-			type: "function_call",
-			name: item.name,
-			status: "no_arguments_provided",
-			note: "Function called but no arguments were extracted. Consider using the correct Responses API tool format."
-		});
-		else functionResult = await this.config.functionCallbackHandler.processCalls(item, context.config.functionToolCallbacks);
-		return { content: functionResult };
-	}
-	async processMessage(item, context) {
-		if (item.role !== "assistant") return {};
-		let content = "";
-		let isRefusal = false;
-		let refusal = "";
-		const annotations = [];
-		if (item.content) for (const contentItem of item.content) {
-			if (!contentItem || typeof contentItem !== "object") {
-				logger_default.warn(`Skipping invalid content item: ${JSON.stringify(contentItem)}`);
-				continue;
-			}
-			if (contentItem.type === "output_text") {
-				content += contentItem.text;
-				if (Array.isArray(contentItem.annotations) && contentItem.annotations.length > 0) annotations.push(...contentItem.annotations);
-			} else if (contentItem.type === "tool_use" || contentItem.type === "function_call") content = await this.config.functionCallbackHandler.processCalls(contentItem, context.config.functionToolCallbacks);
-			else if (contentItem.type === "refusal") {
-				refusal = contentItem.refusal;
-				isRefusal = true;
-			}
-		}
-		else if (item.refusal) {
-			refusal = item.refusal;
-			isRefusal = true;
-		}
-		return {
-			content: isRefusal ? refusal : content,
-			isRefusal,
-			annotations: annotations.length > 0 ? annotations : void 0
-		};
-	}
-	processToolResult(item) {
-		return Promise.resolve({ content: JSON.stringify(item) });
-	}
-	processReasoning(item) {
-		if (!item.summary || !item.summary.length) return Promise.resolve({});
-		const reasoningText = `Reasoning: ${item.summary.map((s) => s.text).join("\n")}`;
-		return Promise.resolve({ content: reasoningText });
-	}
-	processWebSearch(item) {
-		let content = "";
-		const action = item.action;
-		if (action) if (action.type === "search") content = `Web Search: "${action.query}"`;
-		else if (action.type === "open_page") content = `Opening page: ${action.url}`;
-		else if (action.type === "find_in_page") content = `Finding in page: "${action.query}"`;
-		else content = `Web action: ${action.type}`;
-		else content = `Web Search Call (status: ${item.status || "unknown"})`;
-		if (item.status === "failed" && item.error) content += ` (Error: ${item.error})`;
-		return Promise.resolve({ content });
-	}
-	processCodeInterpreter(item) {
-		let content = `Code Interpreter: ${item.code || "Running code..."}`;
-		if (item.status === "failed" && item.error) content += ` (Error: ${item.error})`;
-		return Promise.resolve({ content });
-	}
-	processMcpListTools(item) {
-		const content = `MCP Tools from ${item.server_label}: ${JSON.stringify(item.tools, null, 2)}`;
-		return Promise.resolve({ content });
-	}
-	processMcpCall(item) {
-		let content;
-		if (item.error) content = `MCP Tool Error (${item.name}): ${item.error}`;
-		else content = `MCP Tool Result (${item.name}): ${item.output}`;
-		return Promise.resolve({ content });
-	}
-	processMcpApprovalRequest(item) {
-		const content = `MCP Approval Required for ${item.server_label}.${item.name}: ${item.arguments}`;
-		return Promise.resolve({ content });
-	}
-};
-
-//#endregion
-//#region src/providers/openai/responses.ts
-var OpenAiResponsesProvider = class extends OpenAiGenericProvider {
-	functionCallbackHandler = new FunctionCallbackHandler();
-	processor;
-	static OPENAI_RESPONSES_MODEL_NAMES = [
-		"gpt-4o",
-		"gpt-4o-2024-08-06",
-		"gpt-4o-2024-11-20",
-		"gpt-4o-2024-05-13",
-		"gpt-4o-2024-07-18",
-		"gpt-4o-mini",
-		"gpt-4o-mini-2024-07-18",
-		"gpt-4.1",
-		"gpt-4.1-2025-04-14",
-		"gpt-4.1-mini",
-		"gpt-4.1-mini-2025-04-14",
-		"gpt-4.1-nano",
-		"gpt-4.1-nano-2025-04-14",
-		"gpt-5",
-		"gpt-5-2025-08-07",
-		"gpt-5-chat",
-		"gpt-5-chat-latest",
-		"gpt-5-nano",
-		"gpt-5-nano-2025-08-07",
-		"gpt-5-mini",
-		"gpt-5-mini-2025-08-07",
-		"gpt-5-pro",
-		"gpt-5-pro-2025-10-06",
-		"gpt-5.1",
-		"gpt-5.1-2025-11-13",
-		"gpt-5.1-mini",
-		"gpt-5.1-nano",
-		"gpt-5.1-codex",
-		"gpt-5.1-codex-max",
-		"gpt-5.1-chat-latest",
-		"gpt-5.2",
-		"gpt-5.2-2025-12-11",
-		"gpt-audio",
-		"gpt-audio-2025-08-28",
-		"gpt-audio-mini",
-		"gpt-audio-mini-2025-10-06",
-		"computer-use-preview",
-		"computer-use-preview-2025-03-11",
-		"o1",
-		"o1-2024-12-17",
-		"o1-preview",
-		"o1-preview-2024-09-12",
-		"o1-mini",
-		"o1-mini-2024-09-12",
-		"o1-pro",
-		"o1-pro-2025-03-19",
-		"o3-pro",
-		"o3-pro-2025-06-10",
-		"o3",
-		"o3-2025-04-16",
-		"o4-mini",
-		"o4-mini-2025-04-16",
-		"o3-mini",
-		"o3-mini-2025-01-31",
-		"codex-mini-latest",
-		"gpt-5-codex",
-		"o3-deep-research",
-		"o3-deep-research-2025-06-26",
-		"o4-mini-deep-research",
-		"o4-mini-deep-research-2025-06-26"
-	];
-	config;
-	constructor(modelName, options = {}) {
-		super(modelName, options);
-		this.config = options.config || {};
-		this.processor = new ResponsesProcessor({
-			modelName: this.modelName,
-			providerType: "openai",
-			functionCallbackHandler: this.functionCallbackHandler,
-			costCalculator: (modelName, usage, config) => calculateOpenAICost(modelName, config, usage?.input_tokens, usage?.output_tokens, 0, 0) ?? 0
-		});
-	}
-	isGPT5Model() {
-		return this.modelName.startsWith("gpt-5") || this.modelName.includes("/gpt-5");
-	}
-	isReasoningModel() {
-		return this.modelName.startsWith("o1") || this.modelName.startsWith("o3") || this.modelName.startsWith("o4") || this.modelName.includes("/o1") || this.modelName.includes("/o3") || this.modelName.includes("/o4") || this.modelName === "codex-mini-latest" || this.isGPT5Model();
-	}
-	supportsTemperature() {
-		return !this.isReasoningModel();
-	}
-	async getOpenAiBody(prompt, context, _callApiOptions) {
-		const config = {
-			...this.config,
-			...context?.prompt?.config
-		};
-		let input;
-		try {
-			const parsedJson = JSON.parse(prompt);
-			if (Array.isArray(parsedJson)) input = parsedJson;
-			else input = prompt;
-		} catch {
-			input = prompt;
-		}
-		const isReasoningModel = this.isReasoningModel();
-		const maxOutputTokens = config.max_output_tokens ?? (isReasoningModel ? getEnvInt("OPENAI_MAX_COMPLETION_TOKENS") : getEnvInt("OPENAI_MAX_TOKENS", 1024));
-		const temperature = this.supportsTemperature() ? config.temperature ?? getEnvFloat("OPENAI_TEMPERATURE", 0) : void 0;
-		const reasoningEffort = isReasoningModel ? renderVarsInObject(config.reasoning_effort, context?.vars) : void 0;
-		const instructions = config.instructions;
-		const responseFormat = maybeLoadResponseFormatFromExternalFile(config.response_format, context?.vars);
-		let textFormat;
-		if (responseFormat) if (responseFormat.type === "json_object") textFormat = { format: { type: "json_object" } };
-		else if (responseFormat.type === "json_schema") {
-			const schema = responseFormat.schema || responseFormat.json_schema?.schema;
-			textFormat = { format: {
-				type: "json_schema",
-				name: responseFormat.json_schema?.name || responseFormat.name || "response_schema",
-				schema,
-				strict: true
-			} };
-		} else textFormat = { format: { type: "text" } };
-		else textFormat = { format: { type: "text" } };
-		if (this.isGPT5Model() && config.verbosity) textFormat = {
-			...textFormat,
-			verbosity: config.verbosity
-		};
-		const loadedTools = config.tools ? await maybeLoadToolsFromExternalFile(config.tools, context?.vars) : void 0;
-		const body = {
-			model: this.modelName,
-			input,
-			...maxOutputTokens !== void 0 ? { max_output_tokens: maxOutputTokens } : {},
-			...reasoningEffort ? { reasoning: { effort: reasoningEffort } } : {},
-			...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) } : {},
-			...loadedTools ? { tools: loadedTools } : {},
-			...config.tool_choice ? { tool_choice: config.tool_choice } : {},
-			...config.max_tool_calls ? { max_tool_calls: config.max_tool_calls } : {},
-			...config.previous_response_id ? { previous_response_id: config.previous_response_id } : {},
-			text: textFormat,
-			...config.truncation ? { truncation: config.truncation } : {},
-			...config.metadata ? { metadata: config.metadata } : {},
-			..."parallel_tool_calls" in config ? { parallel_tool_calls: Boolean(config.parallel_tool_calls) } : {},
-			...config.stream ? { stream: config.stream } : {},
-			..."store" in config ? { store: Boolean(config.store) } : {},
-			...config.background ? { background: config.background } : {},
-			...config.webhook_url ? { webhook_url: config.webhook_url } : {},
-			...config.user ? { user: config.user } : {},
-			...config.passthrough || {}
-		};
-		if (config.reasoning && this.isReasoningModel()) body.reasoning = config.reasoning;
-		return {
-			body,
-			config: {
-				...config,
-				tools: loadedTools,
-				response_format: responseFormat
-			}
-		};
-	}
-	async callApi(prompt, context, callApiOptions) {
-		if (!this.getApiKey()) throw new Error("OpenAI API key is not set. Set the OPENAI_API_KEY environment variable or add `apiKey` to the provider config.");
-		const { body, config } = await this.getOpenAiBody(prompt, context, callApiOptions);
-		const isDeepResearchModel = this.modelName.includes("deep-research");
-		if (isDeepResearchModel) {
-			if (!config.tools?.some((tool) => tool.type === "web_search_preview")) return { error: `Deep research model ${this.modelName} requires the web_search_preview tool to be configured. Add it to your provider config:\ntools:\n  - type: web_search_preview` };
-			const mcpTools = config.tools?.filter((tool) => tool.type === "mcp") || [];
-			for (const mcpTool of mcpTools) if (mcpTool.require_approval !== "never") return { error: `Deep research model ${this.modelName} requires MCP tools to have require_approval: 'never'. Update your MCP tool configuration:\ntools:\n  - type: mcp\n    require_approval: never` };
-		}
-		let timeout = REQUEST_TIMEOUT_MS;
-		if (isDeepResearchModel || this.modelName.includes("gpt-5-pro")) {
-			const evalTimeout = getEnvInt("PROMPTFOO_EVAL_TIMEOUT_MS", 0);
-			timeout = evalTimeout > 0 ? evalTimeout : LONG_RUNNING_MODEL_TIMEOUT_MS;
-			logger_default.debug(`Using timeout of ${timeout}ms for long-running model ${this.modelName}`);
-		}
-		let data;
-		let status;
-		let statusText;
-		let cached = false;
-		let deleteFromCache;
-		let responseHeaders;
-		try {
-			({data, cached, status, statusText, deleteFromCache, headers: responseHeaders} = await fetchWithCache(`${this.getApiUrl()}/responses`, {
-				method: "POST",
-				headers: {
-					"Content-Type": "application/json",
-					Authorization: `Bearer ${this.getApiKey()}`,
-					...this.getOrganization() ? { "OpenAI-Organization": this.getOrganization() } : {},
-					...config.headers
-				},
-				body: JSON.stringify(body)
-			}, timeout, "json", context?.bustCache ?? context?.debug, this.config.maxRetries));
-			if (status < 200 || status >= 300) {
-				const errorMessage = `API error: ${status} ${statusText}\n${typeof data === "string" ? data : JSON.stringify(data)}`;
-				if (typeof data === "object" && data?.error?.code === "invalid_prompt") return {
-					output: errorMessage,
-					tokenUsage: data?.usage ? getTokenUsage$3(data, cached) : void 0,
-					isRefusal: true,
-					metadata: { http: {
-						status,
-						statusText,
-						headers: responseHeaders ?? {}
-					} }
-				};
-				return {
-					error: errorMessage,
-					metadata: { http: {
-						status,
-						statusText,
-						headers: responseHeaders ?? {}
-					} }
-				};
-			}
-		} catch (err) {
-			logger_default.error(`API call error: ${String(err)}`);
-			await deleteFromCache?.();
-			return {
-				error: `API call error: ${String(err)}`,
-				metadata: { http: {
-					status: 0,
-					statusText: "Error",
-					headers: responseHeaders ?? {}
-				} }
-			};
-		}
-		if (data.error?.message) {
-			await deleteFromCache?.();
-			return {
-				error: formatOpenAiError(data),
-				metadata: { http: {
-					status,
-					statusText,
-					headers: responseHeaders ?? {}
-				} }
-			};
-		}
-		const result = await this.processor.processResponseOutput(data, config, cached);
-		return {
-			...result,
-			metadata: {
-				...result.metadata,
-				http: {
-					status,
-					statusText,
-					headers: responseHeaders ?? {}
-				}
-			}
-		};
-	}
-};
-
 //#endregion
 //#region src/redteam/plugins/agentic/constants.ts
 const REDTEAM_MEMORY_POISONING_PLUGIN_ID = "promptfoo:redteam:agentic:memory-poisoning";
@@ -5933,7 +5397,7 @@ async function loadRedteamProvider({ provider, jsonOnly = false, preferSmallMode
 		ret = redteamProvider;
 	} else if (typeof redteamProvider === "string" || isProviderOptions(redteamProvider)) {
 		logger_default.debug(`Loading ${purpose} provider`, { provider: redteamProvider });
-		ret = (await (await import("./providers-G531909f.js")).loadApiProviders([redteamProvider]))[0];
+		ret = (await (await import("./providers-Ck8HyrC-.js")).loadApiProviders([redteamProvider]))[0];
 	} else {
 		const defaultModel = preferSmallModel ? ATTACKER_MODEL_SMALL : ATTACKER_MODEL;
 		logger_default.debug(`Using default ${purpose} provider: ${defaultModel}`);
@@ -6212,7 +5676,7 @@ async function externalizeResponseForRedteamHistory(response, context) {
 */
 async function tryUnblocking({ messages, lastResponse, goal, purpose }) {
 	try {
-		const { checkServerFeatureSupport } = await import("./server-D9FuxNYE.js");
+		const { checkServerFeatureSupport } = await import("./server-gfOx5Zrk.js");
 		const supportsUnblocking = await checkServerFeatureSupport("blocking-question-analysis", "2025-06-16T14:49:11-07:00");
 		if (!getEnvBool("PROMPTFOO_ENABLE_UNBLOCKING")) {
 			logger_default.debug("[Unblocking] Disabled by default (set PROMPTFOO_ENABLE_UNBLOCKING=true to enable)");
@@ -9993,7 +9457,6 @@ async function addImageToBase64(testCases, injectVar, config = {}) {
 
 //#endregion
 //#region src/redteam/strategies/simpleVideo.ts
-let ffmpegCache = null;
 function shouldShowProgressBar() {
 	return !cliState_default.webUI && logger_default.level !== "debug";
 }
@@ -10010,25 +9473,29 @@ function getSystemFont() {
 		return "DejaVu-Sans";
 	}
 }
-async function importFfmpeg() {
-	if (ffmpegCache) return ffmpegCache;
+let ffmpegAvailable = false;
+async function checkFfmpegAvailable() {
+	if (ffmpegAvailable) return;
 	try {
-		ffmpegCache = await import("fluent-ffmpeg");
-		return ffmpegCache;
+		await execa("ffmpeg", ["-version"]);
+		ffmpegAvailable = true;
 	} catch (error) {
-		logger_default.warn(`fluent-ffmpeg library not available: ${error}`);
-		throw new Error("To use the video strategy, please install fluent-ffmpeg: npm install fluent-ffmpeg\nAlso make sure you have FFmpeg installed on your system:\n- macOS: brew install ffmpeg\n- Ubuntu/Debian: apt-get install ffmpeg\n- Windows: Download from ffmpeg.org");
+		throw new Error(`To use the video strategy, FFmpeg must be installed on your system:
+- macOS: brew install ffmpeg
+- Ubuntu/Debian: apt-get install ffmpeg
+- Windows: Download from ffmpeg.org
+Error: ${error}`);
 	}
 }
-async function createTempVideoEnvironment(text) {
+function escapeDrawtextString(text) {
+	return text.replace(/\\/g, "\\\\").replace(/'/g, "'\\''").replace(/:/g, "\\:").replace(/\n/g, "\\n").replace(/%/g, "%%");
+}
+async function createTempVideoEnvironment() {
 	const tempDir = path.join(os.tmpdir(), "promptfoo-video");
 	if (!fs.existsSync(tempDir)) fs.mkdirSync(tempDir, { recursive: true });
-	const textFilePath = path.join(tempDir, "text.txt");
-	const outputPath = path.join(tempDir, "output-video.mp4");
-	fs.writeFileSync(textFilePath, text);
+	const outputPath = path.join(tempDir, `output-video-${randomUUID()}.mp4`);
 	const cleanup = () => {
 		try {
-			if (fs.existsSync(textFilePath)) fs.unlinkSync(textFilePath);
 			if (fs.existsSync(outputPath)) fs.unlinkSync(outputPath);
 		} catch (error) {
 			logger_default.warn(`Failed to clean up temporary files: ${error}`);
@@ -10036,7 +9503,6 @@ async function createTempVideoEnvironment(text) {
 	};
 	return {
 		tempDir,
-		textFilePath,
 		outputPath,
 		cleanup
 	};
@@ -10047,26 +9513,29 @@ function getFallbackBase64(text) {
 async function textToVideo(text) {
 	try {
 		if (neverGenerateRemote()) {
-			const ffmpegModule = await importFfmpeg();
-			const { textFilePath, outputPath, cleanup } = await createTempVideoEnvironment(text);
-			return new Promise((resolve, reject) => {
-				ffmpegModule().input("color=white:s=640x480:d=5").inputFormat("lavfi").input(textFilePath).inputOptions(["-f", "concat"]).complexFilter([`[0:v]drawtext=fontfile=${getSystemFont()}:text='${text.replace(/'/g, "\\'")}':fontcolor=black:fontsize=24:x=(w-text_w)/2:y=(h-text_h)/2[v]`]).outputOptions(["-map", "[v]"]).save(outputPath).on("end", async () => {
-					try {
-						const base64Video = fs.readFileSync(outputPath).toString("base64");
-						cleanup();
-						resolve(base64Video);
-					} catch (error) {
-						logger_default.error(`Error processing video output: ${error}`);
-						cleanup();
-						reject(error);
-					}
-				}).on("error", (err) => {
-					logger_default.error(`Error creating video: ${err}`);
-					cleanup();
-					reject(err);
-				});
-			});
-		} else throw new Error("Local video generation requires fluent-ffmpeg. Future versions may support remote generation.");
+			await checkFfmpegAvailable();
+			const { outputPath, cleanup } = await createTempVideoEnvironment();
+			try {
+				const escapedText = escapeDrawtextString(text);
+				await execa("ffmpeg", [
+					"-f",
+					"lavfi",
+					"-i",
+					"color=white:s=640x480:d=5",
+					"-vf",
+					`drawtext=fontfile=${getSystemFont()}:text='${escapedText}':fontcolor=black:fontsize=24:x=(w-text_w)/2:y=(h-text_h)/2`,
+					"-y",
+					outputPath
+				]);
+				const base64Video = fs.readFileSync(outputPath).toString("base64");
+				cleanup();
+				return base64Video;
+			} catch (error) {
+				logger_default.error(`Error creating video with ffmpeg: ${error}`);
+				cleanup();
+				throw error;
+			}
+		} else throw new Error("Local video generation requires FFmpeg to be installed. Future versions may support remote generation.");
 	} catch (error) {
 		logger_default.error(`Error generating video from text: ${error}`);
 		return getFallbackBase64(text);
@@ -10277,6 +9746,7 @@ const Strategies = [
 	},
 	{
 		id: "crescendo",
+		requiresGoalExtraction: true,
 		action: async (testCases, injectVar, config) => {
 			logger_default.debug(`Adding Crescendo to ${testCases.length} test cases`);
 			const newTestCases = addCrescendo(testCases, injectVar, config);
@@ -10286,6 +9756,7 @@ const Strategies = [
 	},
 	{
 		id: "custom",
+		requiresGoalExtraction: true,
 		action: async (testCases, injectVar, config, strategyId = "custom") => {
 			logger_default.debug(`Adding Custom to ${testCases.length} test cases`);
 			const newTestCases = addCustom(testCases, injectVar, config, strategyId);
@@ -10304,6 +9775,7 @@ const Strategies = [
 	},
 	{
 		id: "goat",
+		requiresGoalExtraction: true,
 		action: async (testCases, injectVar, config) => {
 			logger_default.debug(`Adding GOAT to ${testCases.length} test cases`);
 			const newTestCases = await addGoatTestCases(testCases, injectVar, config);
@@ -10313,6 +9785,7 @@ const Strategies = [
 	},
 	{
 		id: "indirect-web-pwn",
+		requiresGoalExtraction: true,
 		action: async (testCases, injectVar, config) => {
 			logger_default.debug(`Adding Indirect Web Pwn to ${testCases.length} test cases`);
 			const newTestCases = await addIndirectWebPwnTestCases(testCases, injectVar, config);
@@ -10349,10 +9822,12 @@ const Strategies = [
 	},
 	{
 		id: "jailbreak",
+		requiresGoalExtraction: true,
 		action: async (testCases, injectVar, config) => {
-			logger_default.debug(`Adding experimental jailbreaks to ${testCases.length} test cases`);
-			const newTestCases = addIterativeJailbreaks(testCases, injectVar, "iterative", config);
-			logger_default.debug(`Added ${newTestCases.length} experimental jailbreak test cases`);
+			logger_default.warn("Strategy \"jailbreak\" is deprecated. Use \"jailbreak:meta\" instead. The \"jailbreak\" strategy used outdated single-shot optimization techniques.");
+			logger_default.debug(`Adding meta-agent jailbreaks to ${testCases.length} test cases`);
+			const newTestCases = addIterativeJailbreaks(testCases, injectVar, "iterative:meta", config);
+			logger_default.debug(`Added ${newTestCases.length} meta-agent jailbreak test cases`);
 			return newTestCases;
 		}
 	},
@@ -10376,6 +9851,7 @@ const Strategies = [
 	},
 	{
 		id: "jailbreak:tree",
+		requiresGoalExtraction: true,
 		action: async (testCases, injectVar, config) => {
 			logger_default.debug(`Adding experimental tree jailbreaks to ${testCases.length} test cases`);
 			const newTestCases = addIterativeJailbreaks(testCases, injectVar, "iterative:tree", config);
@@ -10385,6 +9861,7 @@ const Strategies = [
 	},
 	{
 		id: "jailbreak:meta",
+		requiresGoalExtraction: true,
 		action: async (testCases, injectVar, config) => {
 			logger_default.debug(`Adding meta-agent jailbreaks to ${testCases.length} test cases`);
 			const newTestCases = addIterativeJailbreaks(testCases, injectVar, "iterative:meta", config);
@@ -10394,6 +9871,7 @@ const Strategies = [
 	},
 	{
 		id: "jailbreak:hydra",
+		requiresGoalExtraction: true,
 		action: async (testCases, injectVar, config) => {
 			logger_default.debug(`Adding hydra multi-turn jailbreaks to ${testCases.length} test cases`);
 			const newTestCases = addHydra(testCases, injectVar, config);
@@ -11297,7 +10775,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-Bpjtip-E.js");
+		const { getGraderById } = await import("./graders-spkuVC-E.js");
 		let graderPassed;
 		const additionalRubric = getGoalRubric(this.userGoal);
 		while (roundNum < this.maxTurns) try {
@@ -11972,7 +11450,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-Bpjtip-E.js");
+		const { getGraderById } = await import("./graders-spkuVC-E.js");
 		let graderPassed;
 		let storedGraderResult;
 		const additionalRubric = getGoalRubric(this.userGoal);
@@ -12454,7 +11932,7 @@ var GoatProvider = class {
 		let assertToUse;
 		let graderPassed;
 		let storedGraderResult;
-		const { getGraderById } = await import("./graders-Bpjtip-E.js");
+		const { getGraderById } = await import("./graders-spkuVC-E.js");
 		let test;
 		if (context?.test) {
 			test = context?.test;
@@ -12895,7 +12373,7 @@ var HydraProvider = class {
 		let lastTransformResult;
 		let lastTransformDisplayVars;
 		let lastFinalAttackPrompt;
-		const { getGraderById } = await import("./graders-Bpjtip-E.js");
+		const { getGraderById } = await import("./graders-spkuVC-E.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;
@@ -12931,7 +12409,7 @@ var HydraProvider = class {
 				},
 				vars: {}
 			}, options);
-			accumulateResponseTokenUsage(totalTokenUsage, agentResp);
+			accumulateResponseTokenUsage(totalTokenUsage, agentResp, { countAsRequest: false });
 			if (this.agentProvider.delay) await sleep(this.agentProvider.delay);
 			if (agentResp.error) {
 				logger_default.debug("[Hydra] Agent provider error", {
@@ -13254,7 +12732,7 @@ var HydraProvider = class {
 					label: "hydra-learning-update"
 				},
 				vars: {}
-			}, options));
+			}, options), { countAsRequest: false });
 			logger_default.debug("[Hydra] Scan learnings updated", {
 				scanId,
 				testRunId
@@ -13464,7 +12942,8 @@ var IndirectWebPwnProvider = class {
 					fetchPrompt,
 					attempt: attempt + 1
 				});
-				const targetResponse = await targetProvider.callApi(fetchPrompt, context, options);
+				const targetResponse = await getTargetResponse(targetProvider, fetchPrompt, context, options);
+				accumulateResponseTokenUsage(totalTokenUsage, targetResponse);
 				if (targetResponse.metadata?.webFetchUsed) webFetchActuallyUsed = true;
 				if (targetResponse.error) {
 					logger_default.error("[IndirectWebPwn] Target error", { error: targetResponse.error });
@@ -13490,11 +12969,6 @@ var IndirectWebPwnProvider = class {
 					output: responseOutput
 				});
 				lastOutput = responseOutput;
-				if (targetResponse.tokenUsage) {
-					totalTokenUsage.total = (totalTokenUsage.total || 0) + (targetResponse.tokenUsage.total || 0);
-					totalTokenUsage.prompt = (totalTokenUsage.prompt || 0) + (targetResponse.tokenUsage.prompt || 0);
-					totalTokenUsage.completion = (totalTokenUsage.completion || 0) + (targetResponse.tokenUsage.completion || 0);
-				}
 				const tracking = await this.checkPageFetched(webPage.uuid, evalId);
 				logger_default.debug("[IndirectWebPwn] Tracking check", {
 					uuid: webPage.uuid,
@@ -13738,7 +13212,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-Bpjtip-E.js");
+		const { getGraderById } = await import("./graders-spkuVC-E.js");
 		if (test && assertToUse) {
 			const grader = getGraderById(assertToUse.type);
 			if (grader) {
@@ -14204,11 +13678,11 @@ async function runRedteamConversation$1({ prompt, filters, vars, redteamProvider
 			promptIdx: context?.promptIdx
 		});
 		lastResponse = targetResponse;
+		accumulateResponseTokenUsage(totalTokenUsage, targetResponse);
 		if (targetResponse.error) {
 			logger_default.debug(`Iteration ${i + 1}: Target provider error: ${targetResponse.error}`);
 			continue;
 		}
-		accumulateResponseTokenUsage(totalTokenUsage, targetResponse);
 		const url = targetResponse.output.match(/(https?:\/\/[^\s)]+)/g);
 		let imageDescription;
 		if (url && url.length > 0) try {
@@ -14228,7 +13702,7 @@ async function runRedteamConversation$1({ prompt, filters, vars, redteamProvider
 					}
 				}]
 			}]), void 0, options);
-			accumulateResponseTokenUsage(totalTokenUsage, visionResponse);
+			accumulateResponseTokenUsage(totalTokenUsage, visionResponse, { countAsRequest: false });
 			if (visionProvider.delay) await sleep(visionProvider.delay);
 			if (visionResponse.error) {
 				logger_default.warn(`Iteration ${i + 1}: Vision API error: ${visionResponse.error}`);
@@ -14455,7 +13929,7 @@ async function runMetaAgentRedteam({ context, filters, injectVar, numIterations,
 			},
 			vars: {}
 		}, options);
-		accumulateResponseTokenUsage(totalTokenUsage, agentResp);
+		accumulateResponseTokenUsage(totalTokenUsage, agentResp, { countAsRequest: false });
 		if (agentProvider.delay) {
 			logger_default.debug(`[IterativeMeta] Sleeping for ${agentProvider.delay}ms`);
 			await sleep(agentProvider.delay);
@@ -14568,7 +14042,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-Bpjtip-E.js");
+		const { getGraderById } = await import("./graders-spkuVC-E.js");
 		if (test && assertToUse) {
 			const grader = getGraderById(assertToUse.type);
 			if (grader) {
@@ -15101,6 +14575,7 @@ async function runRedteamConversation({ context, filters, injectVar, options, pr
 					promptIdx: context?.promptIdx
 				});
 				lastResponse = targetResponse;
+				accumulateResponseTokenUsage(totalTokenUsage, targetResponse);
 				if (targetResponse.error) {
 					logger_default.info(`[IterativeTree] Target error at depth ${depth}, attempt ${attempts}: ${targetResponse.error}`, { targetResponse });
 					treeOutputs.push({
@@ -15125,7 +14600,6 @@ async function runRedteamConversation({ context, filters, injectVar, options, pr
 					continue;
 				}
 				invariant(Object.prototype.hasOwnProperty.call(targetResponse, "output"), "[IterativeTree] Target did not return an output property");
-				accumulateResponseTokenUsage(totalTokenUsage, targetResponse);
 				const containsPenalizedPhrase = checkPenalizedPhrases(targetResponse.output);
 				const { score, explanation } = await evaluateResponse(gradingProvider, judgeSystemPrompt, targetResponse.output, bestResponse, containsPenalizedPhrase);
 				logger_default.debug(`[Depth ${depth}, Attempt ${attempts}] Evaluation: score=${score}, penalized=${containsPenalizedPhrase}. Max score so far: ${maxScore}`);
@@ -15145,7 +14619,7 @@ async function runRedteamConversation({ context, filters, injectVar, options, pr
 					noImprovementCount++;
 					if (noImprovementCount % 5 === 0) logger_default.debug(`[Depth ${depth}, Attempt ${attempts}] No improvement for ${noImprovementCount} consecutive iterations. Max score: ${maxScore}`);
 				}
-				const { getGraderById } = await import("./graders-Bpjtip-E.js");
+				const { getGraderById } = await import("./graders-spkuVC-E.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);
@@ -19334,6 +18808,7 @@ const AWS_BEDROCK_MODELS = {
 	"anthropic.claude-opus-4-1-20250805-v1:0": BEDROCK_MODEL.CLAUDE_MESSAGES,
 	"anthropic.claude-opus-4-6-v1": BEDROCK_MODEL.CLAUDE_MESSAGES,
 	"anthropic.claude-opus-4-5-20251101-v1:0": BEDROCK_MODEL.CLAUDE_MESSAGES,
+	"anthropic.claude-sonnet-4-6": BEDROCK_MODEL.CLAUDE_MESSAGES,
 	"anthropic.claude-sonnet-4-5-20250929-v1:0": BEDROCK_MODEL.CLAUDE_MESSAGES,
 	"anthropic.claude-haiku-4-5-20251001-v1:0": BEDROCK_MODEL.CLAUDE_MESSAGES,
 	"anthropic.claude-sonnet-4-20250514-v1:0": BEDROCK_MODEL.CLAUDE_MESSAGES,
@@ -19371,6 +18846,7 @@ const AWS_BEDROCK_MODELS = {
 	"apac.anthropic.claude-opus-4-1-20250805-v1:0": BEDROCK_MODEL.CLAUDE_MESSAGES,
 	"apac.anthropic.claude-opus-4-6-v1": BEDROCK_MODEL.CLAUDE_MESSAGES,
 	"apac.anthropic.claude-opus-4-5-20251101-v1:0": BEDROCK_MODEL.CLAUDE_MESSAGES,
+	"apac.anthropic.claude-sonnet-4-6": BEDROCK_MODEL.CLAUDE_MESSAGES,
 	"apac.anthropic.claude-sonnet-4-5-20250929-v1:0": BEDROCK_MODEL.CLAUDE_MESSAGES,
 	"apac.anthropic.claude-haiku-4-5-20251001-v1:0": BEDROCK_MODEL.CLAUDE_MESSAGES,
 	"apac.anthropic.claude-sonnet-4-20250514-v1:0": BEDROCK_MODEL.CLAUDE_MESSAGES,
@@ -19387,6 +18863,7 @@ const AWS_BEDROCK_MODELS = {
 	"eu.anthropic.claude-opus-4-1-20250805-v1:0": BEDROCK_MODEL.CLAUDE_MESSAGES,
 	"eu.anthropic.claude-opus-4-6-v1": BEDROCK_MODEL.CLAUDE_MESSAGES,
 	"eu.anthropic.claude-opus-4-5-20251101-v1:0": BEDROCK_MODEL.CLAUDE_MESSAGES,
+	"eu.anthropic.claude-sonnet-4-6": BEDROCK_MODEL.CLAUDE_MESSAGES,
 	"eu.anthropic.claude-sonnet-4-5-20250929-v1:0": BEDROCK_MODEL.CLAUDE_MESSAGES,
 	"eu.anthropic.claude-haiku-4-5-20251001-v1:0": BEDROCK_MODEL.CLAUDE_MESSAGES,
 	"eu.anthropic.claude-sonnet-4-20250514-v1:0": BEDROCK_MODEL.CLAUDE_MESSAGES,
@@ -19412,6 +18889,7 @@ const AWS_BEDROCK_MODELS = {
 	"us.anthropic.claude-opus-4-1-20250805-v1:0": BEDROCK_MODEL.CLAUDE_MESSAGES,
 	"us.anthropic.claude-opus-4-6-v1": BEDROCK_MODEL.CLAUDE_MESSAGES,
 	"us.anthropic.claude-opus-4-5-20251101-v1:0": BEDROCK_MODEL.CLAUDE_MESSAGES,
+	"us.anthropic.claude-sonnet-4-6": BEDROCK_MODEL.CLAUDE_MESSAGES,
 	"us.anthropic.claude-sonnet-4-5-20250929-v1:0": BEDROCK_MODEL.CLAUDE_MESSAGES,
 	"us.anthropic.claude-haiku-4-5-20251001-v1:0": BEDROCK_MODEL.CLAUDE_MESSAGES,
 	"us.anthropic.claude-sonnet-4-20250514-v1:0": BEDROCK_MODEL.CLAUDE_MESSAGES,
@@ -23126,7 +22604,7 @@ var GeminiImageProvider = class {
 			...this.config.imageAspectRatio && { aspectRatio: this.config.imageAspectRatio },
 			...this.config.imageSize && isGemini3 && { imageSize: this.config.imageSize }
 		};
-		if (this.config.safetySettings) body.safetySettings = this.config.safetySettings;
+		if (this.config.safetySettings) body.safetySettings = normalizeSafetySettings(this.config.safetySettings);
 		return body;
 	}
 	processResponse(data, cached, latencyMs) {
@@ -23147,16 +22625,20 @@ var GeminiImageProvider = class {
 			"SPII"
 		].includes(candidate.finishReason)) return { error: `Response was blocked with finish reason: ${candidate.finishReason}` };
 		if (!candidate.content?.parts) return { error: "No content parts in response" };
-		const outputParts = [];
+		const textParts = [];
+		const imageParts = [];
 		let totalCost = 0;
-		for (const part of candidate.content.parts) if (part.text) outputParts.push(part.text);
+		for (const part of candidate.content.parts) if (part.text) textParts.push(part.text);
 		else if (part.inlineData) {
 			const mimeType = part.inlineData.mimeType || "image/png";
 			const base64Data = part.inlineData.data;
-			outputParts.push(`![Generated Image](data:${mimeType};base64,${base64Data})`);
+			imageParts.push({
+				mimeType,
+				base64Data
+			});
 			totalCost += this.getCostPerImage();
 		}
-		if (outputParts.length === 0) return { error: "No valid content generated" };
+		if (imageParts.length === 0 && textParts.length === 0) return { error: "No valid content generated" };
 		const tokenUsage = cached ? {
 			cached: data.usageMetadata?.totalTokenCount,
 			total: data.usageMetadata?.totalTokenCount,
@@ -23167,8 +22649,13 @@ var GeminiImageProvider = class {
 			total: data.usageMetadata?.totalTokenCount,
 			numRequests: 1
 		};
+		const images = imageParts.length > 0 ? imageParts.map((img) => ({
+			data: toDataUri(img.mimeType, img.base64Data),
+			mimeType: img.mimeType
+		})) : void 0;
 		return {
-			output: outputParts.join("\n\n"),
+			output: imageParts.length > 0 && textParts.length === 0 ? images[0].data : textParts.join("\n\n"),
+			images,
 			cached,
 			latencyMs,
 			cost: totalCost > 0 ? totalCost : void 0,
@@ -23306,13 +22793,17 @@ var GoogleImageProvider = class {
 			const base64Image = imageData.bytesBase64Encoded;
 			const mimeType = imageData.mimeType || "image/png";
 			if (base64Image) {
-				imageOutputs.push(`![Generated Image](data:${mimeType};base64,${base64Image})`);
+				imageOutputs.push({
+					data: toDataUri(mimeType, base64Image),
+					mimeType
+				});
 				totalCost += costPerImage;
 			}
 		}
 		if (imageOutputs.length === 0) return { error: "No valid images generated" };
 		return {
-			output: imageOutputs.join("\n\n"),
+			output: imageOutputs[0].data,
+			images: imageOutputs,
 			cached,
 			latencyMs,
 			cost: totalCost
@@ -25468,6 +24959,7 @@ var HttpProvider = class {
 		const vars = {
 			...context?.vars || {},
 			prompt,
+			...context?.evaluationId ? { evaluationId: context.evaluationId } : {},
 			...transformedTools !== void 0 ? { tools: serializeForTemplate(transformedTools) } : {},
 			...transformedToolChoice !== void 0 ? { tool_choice: serializeForTemplate(transformedToolChoice) } : {}
 		};
@@ -25691,9 +25183,17 @@ var HttpProvider = class {
 			logger_default.error(`Error parsing session ID: ${String(err)}. Got headers: ${safeJsonStringify(sanitizeObject(responseHeaders, { context: "response headers" }))} and parsed body: ${safeJsonStringify(sanitizeObject(parsedData, { context: "response body" }))}`);
 			throw err;
 		}
+		ret.metadata = {
+			...ret.metadata,
+			http: {
+				status,
+				statusText
+			}
+		};
 		if (context?.debug) {
 			ret.raw = data;
 			ret.metadata = {
+				...ret.metadata,
 				headers: sanitizeObject(responseHeaders, { context: "response headers" }),
 				transformedRequest: this.config.transformRequest ? transformedPrompt : parsedRequest.body?.text || renderedRequest.trim(),
 				finalRequestBody: parsedRequest.body?.text,
@@ -27232,7 +26732,7 @@ var OpenAiAssistantProvider = class extends OpenAiGenericProvider {
 		else outputBlocks.push(`[Unknown step type: ${step.step_details.type}]`);
 		return {
 			output: outputBlocks.join("\n\n").trim(),
-			tokenUsage: getTokenUsage$3(run, false)
+			tokenUsage: getTokenUsage$2(run, false)
 		};
 	}
 };
@@ -28676,7 +28176,7 @@ var OpenRouterProvider = class extends OpenAiChatCompletionProvider {
 		}
 		return {
 			output,
-			tokenUsage: getTokenUsage$3(data, cached),
+			tokenUsage: getTokenUsage$2(data, cached),
 			cached,
 			cost: calculateOpenAICost(this.modelName, config, data.usage?.prompt_tokens, data.usage?.completion_tokens),
 			...finishReason && { finishReason }
@@ -30027,7 +29527,7 @@ var SnowflakeCortexProvider = class extends OpenAiChatCompletionProvider {
 		}
 		return {
 			output,
-			tokenUsage: getTokenUsage$3(data, cached),
+			tokenUsage: getTokenUsage$2(data, cached),
 			cached,
 			latencyMs,
 			cost: calculateOpenAICost(this.modelName, config, data.usage?.prompt_tokens, data.usage?.completion_tokens),
@@ -32728,7 +32228,7 @@ const providerMap = [
 	{
 		test: (providerPath) => providerPath.startsWith("opencode:") || providerPath === "opencode",
 		create: async (providerPath, providerOptions, context) => {
-			const { OpenCodeSDKProvider } = await import("./opencode-sdk-Dakn4QMp.js");
+			const { OpenCodeSDKProvider } = await import("./opencode-sdk-CImWVqy9.js");
 			return new OpenCodeSDKProvider({
 				...providerOptions,
 				id: providerPath,
@@ -32737,10 +32237,17 @@ const providerMap = [
 			});
 		}
 	},
+	{
+		test: (providerPath) => providerPath.startsWith("openclaw:") || providerPath === "openclaw",
+		create: async (providerPath, providerOptions, context) => {
+			const { createOpenClawProvider } = await import("./openclaw-B6XY2kUf.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-rVqlUIJl.js");
+			const { ClaudeCodeSDKProvider } = await import("./claude-agent-sdk-CmkTnKGH.js");
 			return new ClaudeCodeSDKProvider({
 				...providerOptions,
 				env: context.env
@@ -32797,25 +32304,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-D4M3kKYu.js");
+				const { NovaSonicProvider } = await import("./nova-sonic-BXRfQyF-.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-gyI_GEy2.js");
+				const { LumaRayVideoProvider } = await import("./luma-ray-DgKLS0BF.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-B5SOonY2.js");
+				const { NovaReelVideoProvider } = await import("./nova-reel-Bk5npr2q.js");
 				return new NovaReelVideoProvider(modelName || "amazon.nova-reel-v1:1", providerOptions);
 			}
 			if (modelType === "agents") {
-				const { AwsBedrockAgentsProvider } = await import("./agents-9Z7pO8yx.js");
+				const { AwsBedrockAgentsProvider } = await import("./agents-Cao4i7AX.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-D-xthvn0.js");
+				const { AwsBedrockKnowledgeBaseProvider } = await import("./knowledgeBase-CMvMlLZR.js");
 				return new AwsBedrockKnowledgeBaseProvider(modelName, providerOptions);
 			}
 			return new AwsBedrockCompletionProvider(splits.slice(1).join(":"), providerOptions);
@@ -32825,7 +32332,7 @@ const providerMap = [
 		test: (providerPath) => providerPath.startsWith("bedrock-agent:"),
 		create: async (providerPath, providerOptions, _context) => {
 			const agentId = providerPath.substring(14);
-			const { AwsBedrockAgentsProvider } = await import("./agents-9Z7pO8yx.js");
+			const { AwsBedrockAgentsProvider } = await import("./agents-Cao4i7AX.js");
 			return new AwsBedrockAgentsProvider(agentId, providerOptions);
 		}
 	},
@@ -32835,7 +32342,7 @@ const providerMap = [
 			const splits = providerPath.split(":");
 			const modelType = splits[1];
 			const endpointName = splits.slice(2).join(":");
-			const { SageMakerCompletionProvider, SageMakerEmbeddingProvider } = await import("./sagemaker-C8MeZIkH.js");
+			const { SageMakerCompletionProvider, SageMakerEmbeddingProvider } = await import("./sagemaker-BcgLu0U4.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, {
@@ -32876,7 +32383,7 @@ const providerMap = [
 	{
 		test: (providerPath) => providerPath.startsWith("cloudflare-ai:"),
 		create: async (providerPath, providerOptions, context) => {
-			const { createCloudflareAiProvider } = await import("./cloudflare-ai-goDJ5bwr.js");
+			const { createCloudflareAiProvider } = await import("./cloudflare-ai-CobxMTR4.js");
 			return createCloudflareAiProvider(providerPath, {
 				...providerOptions,
 				env: context.env
@@ -32886,7 +32393,7 @@ const providerMap = [
 	{
 		test: (providerPath) => providerPath.startsWith("cloudflare-gateway:"),
 		create: async (providerPath, providerOptions, context) => {
-			const { createCloudflareGatewayProvider } = await import("./cloudflare-gateway-CDCOS1Os.js");
+			const { createCloudflareGatewayProvider } = await import("./cloudflare-gateway-D2_yi-Fh.js");
 			return createCloudflareGatewayProvider(providerPath, {
 				...providerOptions,
 				env: context.env
@@ -33038,27 +32545,27 @@ const providerMap = [
 		create: async (providerPath, providerOptions, context) => {
 			const modelType = providerPath.split(":")[1];
 			if (modelType === "image") {
-				const { createHyperbolicImageProvider } = await import("./image-BVEVjrwl.js");
+				const { createHyperbolicImageProvider } = await import("./image-DB4sHxdJ.js");
 				return createHyperbolicImageProvider(providerPath, {
 					...providerOptions,
 					env: context.env
 				});
 			}
 			if (modelType === "audio") {
-				const { createHyperbolicAudioProvider } = await import("./audio-DnfDVjhL.js");
+				const { createHyperbolicAudioProvider } = await import("./audio-DUH4q0Xq.js");
 				return createHyperbolicAudioProvider(providerPath, {
 					...providerOptions,
 					env: context.env
 				});
 			}
-			const { createHyperbolicProvider } = await import("./chat-BRMJOuCv.js");
+			const { createHyperbolicProvider } = await import("./chat-Cpz3O-Xl.js");
 			return createHyperbolicProvider(providerPath, providerOptions);
 		}
 	},
 	{
 		test: (providerPath) => providerPath.startsWith("litellm:"),
 		create: async (providerPath, providerOptions, context) => {
-			const { createLiteLLMProvider } = await import("./litellm-DH_rVIOd.js");
+			const { createLiteLLMProvider } = await import("./litellm-CHrRmPAe.js");
 			return createLiteLLMProvider(providerPath, {
 				config: providerOptions,
 				env: context.env
@@ -33114,7 +32621,7 @@ const providerMap = [
 			const modelType = splits[1];
 			const modelName = splits.slice(2).join(":");
 			if (modelType === "codex-sdk" || modelType === "codex") {
-				const { OpenAICodexSDKProvider } = await import("./codex-sdk-BC5qbCjh.js");
+				const { OpenAICodexSDKProvider } = await import("./codex-sdk-dSnGdgIp.js");
 				return new OpenAICodexSDKProvider({
 					...providerOptions,
 					env: context.env
@@ -33127,7 +32634,7 @@ const providerMap = [
 			if (modelType === "realtime") return new OpenAiRealtimeProvider(modelName || "gpt-4o-realtime-preview-2024-12-17", providerOptions);
 			if (modelType === "responses") return new OpenAiResponsesProvider(modelName || "gpt-4.1-2025-04-14", providerOptions);
 			if (modelType === "transcription") {
-				const { OpenAiTranscriptionProvider } = await import("./transcription-D8ifIKOv.js");
+				const { OpenAiTranscriptionProvider } = await import("./transcription-Ch7S-LWw.js");
 				return new OpenAiTranscriptionProvider(modelName || "gpt-4o-transcribe-diarize", providerOptions);
 			}
 			if (OpenAiChatCompletionProvider.OPENAI_CHAT_MODEL_NAMES.includes(modelType)) return new OpenAiChatCompletionProvider(modelType, providerOptions);
@@ -33135,11 +32642,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-CRAmwjo-.js");
+				const { OpenAiAgentsProvider } = await import("./agents-DYIT-hQy.js");
 				return new OpenAiAgentsProvider(modelName || "default-agent", providerOptions);
 			}
 			if (modelType === "chatkit") {
-				const { OpenAiChatKitProvider } = await import("./chatkit-IWIuhxFE.js");
+				const { OpenAiChatKitProvider } = await import("./chatkit-DEls11hE.js");
 				return new OpenAiChatKitProvider(modelName || "", providerOptions);
 			}
 			if (modelType === "assistant") return new OpenAiAssistantProvider(modelName, providerOptions);
@@ -33182,7 +32689,7 @@ const providerMap = [
 	{
 		test: (providerPath) => providerPath.startsWith("quiverai:"),
 		create: async (providerPath, providerOptions, context) => {
-			const { createQuiverAiProvider } = await import("./quiverai-Cj-PUa3p.js");
+			const { createQuiverAiProvider } = await import("./quiverai-BQigKdIH.js");
 			return createQuiverAiProvider(providerPath, providerOptions, context.env);
 		}
 	},
@@ -33227,7 +32734,7 @@ const providerMap = [
 	{
 		test: (providerPath) => providerPath.startsWith("aimlapi:"),
 		create: async (providerPath, providerOptions, context) => {
-			const { createAimlApiProvider } = await import("./aimlapi-BM9P45Bp.js");
+			const { createAimlApiProvider } = await import("./aimlapi-DMF6v_vb.js");
 			return createAimlApiProvider(providerPath, {
 				...providerOptions,
 				env: context.env
@@ -33237,7 +32744,7 @@ const providerMap = [
 	{
 		test: (providerPath) => providerPath.startsWith("cometapi:"),
 		create: async (providerPath, providerOptions, context) => {
-			const { createCometApiProvider } = await import("./cometapi-DoaO5SLq.js");
+			const { createCometApiProvider } = await import("./cometapi-B01btbfb.js");
 			return createCometApiProvider(providerPath, {
 				...providerOptions,
 				env: context.env
@@ -33247,7 +32754,7 @@ const providerMap = [
 	{
 		test: (providerPath) => providerPath.startsWith("docker:"),
 		create: async (providerPath, providerOptions, context) => {
-			const { createDockerProvider } = await import("./docker-CkOzlD1W.js");
+			const { createDockerProvider } = await import("./docker-BuButc4D.js");
 			return createDockerProvider(providerPath, {
 				...providerOptions,
 				env: context.env
@@ -33513,7 +33020,7 @@ const providerMap = [
 	{
 		test: (providerPath) => providerPath.startsWith("transformers:") || providerPath.startsWith("transformers.js:"),
 		create: async (providerPath, providerOptions, _context) => {
-			const { validateTransformersDependency } = await import("./transformersAvailability-O2YaCv9Z.js");
+			const { validateTransformersDependency } = await import("./transformersAvailability-DwmezkVe.js");
 			await validateTransformersDependency();
 			const splits = providerPath.split(":");
 			if (splits.length < 3) throw new Error(`Invalid Transformers.js provider path: ${providerPath}. Format: transformers:<task>:<model>
@@ -33533,7 +33040,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-Ed1yyt_j.js");
+				const { SlackProvider } = await import("./slack-BfdBx2tO.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>");
@@ -33829,5 +33336,5 @@ function getProviderIds(providerPaths) {
 }
 
 //#endregion
-export { AzureModerationProvider as $, renderPrompt as A, OpenAiResponsesProvider as B, extractVariablesFromJson as C, isEmptyResponse as D, isBasicRefusal as E, TokenUsageTracker as F, DefaultGradingProvider as G, MistralChatCompletionProvider as H, createRateLimitRegistry as I, DefaultGradingJsonProvider as J, VertexChatProvider as K, createProviderRateLimitOptions as L, isPackagePath as M, loadFromPackage as N, removePrefix as O, redteamProviderManager as P, DefaultSynthesizeProvider as Q, PromptfooHarmfulCompletionProvider as R, extractPromptFromTags as S, getShortPluginId as T, MistralEmbeddingProvider as U, OpenAiModerationProvider as V, DefaultEmbeddingProvider as W, DefaultLlmRubricProvider as X, DefaultGradingProvider$1 as Y, DefaultSuggestionsProvider as Z, pluginMatchesStrategyTargets as _, resolveTeamId as _t, resolveProviderConfigs as a, checkCloudPermissions as at, extractGoalFromPrompt as b, createTransformRequest as c, getDefaultTeam as ct, Strategies as d, getPoliciesFromCloud as dt, AzureEmbeddingProvider as et, loadStrategy as f, getProviderFromCloud as ft, retrieveMedia as g, resolveTeamFromIdentifier as gt, mediaExists as h, makeRequest as ht, resolveProvider as i, canCreateTargets as it, runExtensionHook as j, collectFileMetadata as k, createTransformResponse$1 as l, getOrgContext as lt, getMediaStorage as m, isCloudProvider as mt, loadApiProvider as n, getFileHashes as nt, MCPProvider as o, getCloudDatabaseId as ot, validateStrategies as p, getUserTeams as pt, AIStudioChatProvider as q, loadApiProviders as r, parseScriptParts as rt, HttpProvider as s, getConfigFromCloud as st, getProviderIds as t, AzureChatCompletionProvider 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-CUCHJCHD.js.map
+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-BlEhY5mi.js.map