promptfoo 0.120.24 → 0.120.26

package/dist/src/{codex-sdk-BlvhxMr0.js → codex-sdk-BASDNkIl.js}

@@ -1,4 +1,4 @@
-import { A as logger_default, F as cliState_default, P as getEnvString, T as resolvePackageEntryPoint, h as withGenAISpan, m as getTraceparent, w as importModule } from "./server/index.js";
+import { E as resolvePackageEntryPoint, I as getEnvString, L as cliState_default, T as importModule, g as withGenAISpan, h as getTraceparent, j as logger_default } from "./server/index.js";
 import fs from "fs";
 import path from "path";
 import dedent from "dedent";
@@ -38,37 +38,56 @@ async function loadCodexSDK() {
 	}
 }
 const CODEX_MODEL_PRICING = {
+	"gpt-5.3-codex": {
+		input: 1.75,
+		output: 14,
+		cache_read: .175
+	},
+	"gpt-5.3-codex-spark": {
+		input: .5,
+		output: 4,
+		cache_read: .05
+	},
 	"gpt-5.2": {
 		input: 2,
-		output: 8
+		output: 8,
+		cache_read: .2
 	},
 	"gpt-5.1-codex": {
 		input: 2,
-		output: 8
+		output: 8,
+		cache_read: .2
 	},
 	"gpt-5.1-codex-max": {
 		input: 3,
-		output: 12
+		output: 12,
+		cache_read: .3
 	},
 	"gpt-5.1-codex-mini": {
 		input: .5,
-		output: 2
+		output: 2,
+		cache_read: .05
 	},
 	"gpt-5-codex": {
 		input: 2,
-		output: 8
+		output: 8,
+		cache_read: .2
 	},
 	"gpt-5-codex-mini": {
 		input: .5,
-		output: 2
+		output: 2,
+		cache_read: .05
 	},
 	"gpt-5": {
 		input: 2,
-		output: 8
+		output: 8,
+		cache_read: .2
 	}
 };
 var OpenAICodexSDKProvider = class OpenAICodexSDKProvider {
 	static OPENAI_MODELS = [
+		"gpt-5.3-codex",
+		"gpt-5.3-codex-spark",
 		"gpt-5.2",
 		"gpt-5.1-codex",
 		"gpt-5.1-codex-max",
@@ -103,13 +122,20 @@ var OpenAICodexSDKProvider = class OpenAICodexSDKProvider {
 	toString() {
 		return "[OpenAI Codex SDK Provider]";
 	}
+	/**
+	* Safely tear down a Codex instance by calling its cleanup method
+	* (destroy, cleanup, or close -- whichever is available).
+	*/
+	async destroyInstance(instance) {
+		if (typeof instance.destroy === "function") await instance.destroy();
+		else if (typeof instance.cleanup === "function") await instance.cleanup();
+		else if (typeof instance.close === "function") await instance.close();
+	}
 	async cleanup() {
 		this.threads.clear();
 		if (this.codexInstance) {
 			try {
-				if (typeof this.codexInstance.destroy === "function") await this.codexInstance.destroy();
-				else if (typeof this.codexInstance.cleanup === "function") await this.codexInstance.cleanup();
-				else if (typeof this.codexInstance.close === "function") await this.codexInstance.close();
+				await this.destroyInstance(this.codexInstance);
 			} catch (error) {
 				logger_default.warn("[CodexSDK] Error during cleanup", { error });
 			}
@@ -164,6 +190,19 @@ var OpenAICodexSDKProvider = class OpenAICodexSDKProvider {
           To bypass this check, set skip_git_repo_check: true in your provider config.`);
 		}
 	}
+	/**
+	* Build Codex constructor options from provider config.
+	* Used when creating both local (deep-tracing) and cached instances.
+	*/
+	buildCodexOptions(env, config) {
+		return {
+			env,
+			...this.apiKey ? { apiKey: this.apiKey } : {},
+			...config.codex_path_override ? { codexPathOverride: config.codex_path_override } : {},
+			...config.base_url ? { baseUrl: config.base_url } : {},
+			...config.cli_config ? { config: config.cli_config } : {}
+		};
+	}
 	buildThreadOptions(config) {
 		return {
 			workingDirectory: config.working_dir,
@@ -173,9 +212,9 @@ var OpenAICodexSDKProvider = class OpenAICodexSDKProvider {
 			...config.sandbox_mode ? { sandboxMode: config.sandbox_mode } : {},
 			...config.model_reasoning_effort ? { modelReasoningEffort: config.model_reasoning_effort } : {},
 			...config.network_access_enabled !== void 0 ? { networkAccessEnabled: config.network_access_enabled } : {},
-			...config.web_search_enabled !== void 0 ? { webSearchEnabled: config.web_search_enabled } : {},
-			...config.approval_policy ? { approvalPolicy: config.approval_policy } : {},
-			...config.collaboration_mode ? { collaborationMode: config.collaboration_mode } : {}
+			...config.web_search_mode ? { webSearchMode: config.web_search_mode } : {},
+			...config.web_search_enabled !== void 0 && !config.web_search_mode ? { webSearchEnabled: config.web_search_enabled } : {},
+			...config.approval_policy ? { approvalPolicy: config.approval_policy } : {}
 		};
 	}
 	async getOrCreateThread(config, cacheKey, instance) {
@@ -303,10 +342,31 @@ var OpenAICodexSDKProvider = class OpenAICodexSDKProvider {
 						});
 						break;
 					}
+					case "item.updated": {
+						const item = event.item;
+						if (item?.id) {
+							const itemId = String(item.id);
+							const span = activeSpans.get(itemId);
+							if (span) {
+								const updatedAttrs = this.getCompletionAttributesForItem(item);
+								for (const [key, value] of Object.entries(updatedAttrs)) span.setAttribute(key, value);
+							}
+						}
+						logger_default.debug("Codex item updated", {
+							itemId: item?.id,
+							type: item?.type
+						});
+						break;
+					}
 					case "turn.completed":
 						usage = event.usage;
 						logger_default.debug("Codex turn completed", { usage });
 						break;
+					case "turn.failed": {
+						const errorMsg = event.error?.message || "Turn failed";
+						logger_default.error("Codex turn failed", { error: errorMsg });
+						throw new Error(`Codex turn failed: ${errorMsg}`);
+					}
 					default: logger_default.debug("Codex unknown event type", { type: event.type });
 				}
 				lastEventTime = eventTime;
@@ -426,6 +486,7 @@ var OpenAICodexSDKProvider = class OpenAICodexSDKProvider {
 			model_reasoning_effort: config.model_reasoning_effort,
 			network_access_enabled: config.network_access_enabled,
 			web_search_enabled: config.web_search_enabled,
+			web_search_mode: config.web_search_mode,
 			approval_policy: config.approval_policy,
 			prompt
 		};
@@ -502,11 +563,7 @@ var OpenAICodexSDKProvider = class OpenAICodexSDKProvider {
 				logger_default.warn("[CodexSDK] deep_tracing is incompatible with thread persistence. Thread options (persist_threads, thread_id, thread_pool_size) are ignored when deep_tracing is enabled.");
 				this.deepTracingWarningShown = true;
 			}
-			localInstance = new this.codexModule.Codex({
-				env,
-				...config.codex_path_override ? { codexPathOverride: config.codex_path_override } : {},
-				...config.base_url ? { baseUrl: config.base_url } : {}
-			});
+			localInstance = new this.codexModule.Codex(this.buildCodexOptions(env, config));
 		} else {
 			const stableEnv = { ...env };
 			delete stableEnv.TRACEPARENT;
@@ -516,19 +573,13 @@ var OpenAICodexSDKProvider = class OpenAICodexSDKProvider {
 				if (envChanged && this.codexInstance) {
 					logger_default.debug("[CodexSDK] Recreating instance due to configuration change");
 					try {
-						if (typeof this.codexInstance.destroy === "function") await this.codexInstance.destroy();
-						else if (typeof this.codexInstance.cleanup === "function") await this.codexInstance.cleanup();
-						else if (typeof this.codexInstance.close === "function") await this.codexInstance.close();
+						await this.destroyInstance(this.codexInstance);
 					} catch (cleanupError) {
 						logger_default.warn("[CodexSDK] Error cleaning up old instance", { error: cleanupError });
 					}
 					this.threads.clear();
 				}
-				this.codexInstance = new this.codexModule.Codex({
-					env,
-					...config.codex_path_override ? { codexPathOverride: config.codex_path_override } : {},
-					...config.base_url ? { baseUrl: config.base_url } : {}
-				});
+				this.codexInstance = new this.codexModule.Codex(this.buildCodexOptions(env, config));
 				this.codexInstanceEnvHash = envHash;
 			}
 		}
@@ -544,14 +595,21 @@ var OpenAICodexSDKProvider = class OpenAICodexSDKProvider {
 			const output = turn.finalResponse || "";
 			const raw = JSON.stringify(turn);
 			const tokenUsage = turn.usage ? {
-				prompt: turn.usage.input_tokens + (turn.usage.cached_input_tokens || 0),
+				prompt: turn.usage.input_tokens,
 				completion: turn.usage.output_tokens,
-				total: turn.usage.input_tokens + (turn.usage.cached_input_tokens || 0) + turn.usage.output_tokens
+				total: turn.usage.input_tokens + turn.usage.output_tokens,
+				cached: turn.usage.cached_input_tokens || 0
 			} : void 0;
 			let cost = 0;
 			if (tokenUsage && config.model) {
 				const pricing = CODEX_MODEL_PRICING[config.model];
-				if (pricing) cost = (tokenUsage.prompt || 0) * (pricing.input / 1e6) + (tokenUsage.completion || 0) * (pricing.output / 1e6);
+				if (pricing) {
+					const cachedTokens = tokenUsage.cached || 0;
+					const inputCost = ((tokenUsage.prompt || 0) - cachedTokens) * (pricing.input / 1e6);
+					const cacheReadCost = cachedTokens * (pricing.cache_read / 1e6);
+					const outputCost = (tokenUsage.completion || 0) * (pricing.output / 1e6);
+					cost = inputCost + cacheReadCost + outputCost;
+				}
 			}
 			logger_default.debug("OpenAI Codex SDK response", {
 				output,
@@ -575,9 +633,7 @@ var OpenAICodexSDKProvider = class OpenAICodexSDKProvider {
 		} finally {
 			if (!config.deep_tracing && !config.persist_threads && !config.thread_id && cacheKey) this.threads.delete(cacheKey);
 			if (useLocalInstance && localInstance) try {
-				if (typeof localInstance.destroy === "function") await localInstance.destroy();
-				else if (typeof localInstance.cleanup === "function") await localInstance.cleanup();
-				else if (typeof localInstance.close === "function") await localInstance.close();
+				await this.destroyInstance(localInstance);
 			} catch (cleanupError) {
 				logger_default.debug("[CodexSDK] Error cleaning up local instance", { error: cleanupError });
 			}
@@ -587,4 +643,4 @@ var OpenAICodexSDKProvider = class OpenAICodexSDKProvider {
 
 //#endregion
 export { OpenAICodexSDKProvider };
-//# sourceMappingURL=codex-sdk-BlvhxMr0.js.map
+//# sourceMappingURL=codex-sdk-BASDNkIl.js.map

package/dist/src/{codex-sdk-BC5qbCjh.js → codex-sdk-dSnGdgIp.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import { C as getEnvString, O as cliState_default, o as logger_default } from "./logger-Bzi5o47S.js";
-import { i as resolvePackageEntryPoint, r as importModule } from "./esm-Lh6czAFT.js";
-import { n as withGenAISpan, t as getTraceparent } from "./genaiTracer-foKtbVa2.js";
+import { C as getEnvString, O as cliState_default, o as logger_default } from "./logger-BotXmWKW.js";
+import { i as resolvePackageEntryPoint, r as importModule } from "./esm-CYhseqj4.js";
+import { n as withGenAISpan, t as getTraceparent } from "./genaiTracer-CqNnnXrE.js";
 import fs from "fs";
 import path from "path";
 import dedent from "dedent";
@@ -41,37 +41,56 @@ async function loadCodexSDK() {
 	}
 }
 const CODEX_MODEL_PRICING = {
+	"gpt-5.3-codex": {
+		input: 1.75,
+		output: 14,
+		cache_read: .175
+	},
+	"gpt-5.3-codex-spark": {
+		input: .5,
+		output: 4,
+		cache_read: .05
+	},
 	"gpt-5.2": {
 		input: 2,
-		output: 8
+		output: 8,
+		cache_read: .2
 	},
 	"gpt-5.1-codex": {
 		input: 2,
-		output: 8
+		output: 8,
+		cache_read: .2
 	},
 	"gpt-5.1-codex-max": {
 		input: 3,
-		output: 12
+		output: 12,
+		cache_read: .3
 	},
 	"gpt-5.1-codex-mini": {
 		input: .5,
-		output: 2
+		output: 2,
+		cache_read: .05
 	},
 	"gpt-5-codex": {
 		input: 2,
-		output: 8
+		output: 8,
+		cache_read: .2
 	},
 	"gpt-5-codex-mini": {
 		input: .5,
-		output: 2
+		output: 2,
+		cache_read: .05
 	},
 	"gpt-5": {
 		input: 2,
-		output: 8
+		output: 8,
+		cache_read: .2
 	}
 };
 var OpenAICodexSDKProvider = class OpenAICodexSDKProvider {
 	static OPENAI_MODELS = [
+		"gpt-5.3-codex",
+		"gpt-5.3-codex-spark",
 		"gpt-5.2",
 		"gpt-5.1-codex",
 		"gpt-5.1-codex-max",
@@ -106,13 +125,20 @@ var OpenAICodexSDKProvider = class OpenAICodexSDKProvider {
 	toString() {
 		return "[OpenAI Codex SDK Provider]";
 	}
+	/**
+	* Safely tear down a Codex instance by calling its cleanup method
+	* (destroy, cleanup, or close -- whichever is available).
+	*/
+	async destroyInstance(instance) {
+		if (typeof instance.destroy === "function") await instance.destroy();
+		else if (typeof instance.cleanup === "function") await instance.cleanup();
+		else if (typeof instance.close === "function") await instance.close();
+	}
 	async cleanup() {
 		this.threads.clear();
 		if (this.codexInstance) {
 			try {
-				if (typeof this.codexInstance.destroy === "function") await this.codexInstance.destroy();
-				else if (typeof this.codexInstance.cleanup === "function") await this.codexInstance.cleanup();
-				else if (typeof this.codexInstance.close === "function") await this.codexInstance.close();
+				await this.destroyInstance(this.codexInstance);
 			} catch (error) {
 				logger_default.warn("[CodexSDK] Error during cleanup", { error });
 			}
@@ -167,6 +193,19 @@ var OpenAICodexSDKProvider = class OpenAICodexSDKProvider {
           To bypass this check, set skip_git_repo_check: true in your provider config.`);
 		}
 	}
+	/**
+	* Build Codex constructor options from provider config.
+	* Used when creating both local (deep-tracing) and cached instances.
+	*/
+	buildCodexOptions(env, config) {
+		return {
+			env,
+			...this.apiKey ? { apiKey: this.apiKey } : {},
+			...config.codex_path_override ? { codexPathOverride: config.codex_path_override } : {},
+			...config.base_url ? { baseUrl: config.base_url } : {},
+			...config.cli_config ? { config: config.cli_config } : {}
+		};
+	}
 	buildThreadOptions(config) {
 		return {
 			workingDirectory: config.working_dir,
@@ -176,9 +215,9 @@ var OpenAICodexSDKProvider = class OpenAICodexSDKProvider {
 			...config.sandbox_mode ? { sandboxMode: config.sandbox_mode } : {},
 			...config.model_reasoning_effort ? { modelReasoningEffort: config.model_reasoning_effort } : {},
 			...config.network_access_enabled !== void 0 ? { networkAccessEnabled: config.network_access_enabled } : {},
-			...config.web_search_enabled !== void 0 ? { webSearchEnabled: config.web_search_enabled } : {},
-			...config.approval_policy ? { approvalPolicy: config.approval_policy } : {},
-			...config.collaboration_mode ? { collaborationMode: config.collaboration_mode } : {}
+			...config.web_search_mode ? { webSearchMode: config.web_search_mode } : {},
+			...config.web_search_enabled !== void 0 && !config.web_search_mode ? { webSearchEnabled: config.web_search_enabled } : {},
+			...config.approval_policy ? { approvalPolicy: config.approval_policy } : {}
 		};
 	}
 	async getOrCreateThread(config, cacheKey, instance) {
@@ -306,10 +345,31 @@ var OpenAICodexSDKProvider = class OpenAICodexSDKProvider {
 						});
 						break;
 					}
+					case "item.updated": {
+						const item = event.item;
+						if (item?.id) {
+							const itemId = String(item.id);
+							const span = activeSpans.get(itemId);
+							if (span) {
+								const updatedAttrs = this.getCompletionAttributesForItem(item);
+								for (const [key, value] of Object.entries(updatedAttrs)) span.setAttribute(key, value);
+							}
+						}
+						logger_default.debug("Codex item updated", {
+							itemId: item?.id,
+							type: item?.type
+						});
+						break;
+					}
 					case "turn.completed":
 						usage = event.usage;
 						logger_default.debug("Codex turn completed", { usage });
 						break;
+					case "turn.failed": {
+						const errorMsg = event.error?.message || "Turn failed";
+						logger_default.error("Codex turn failed", { error: errorMsg });
+						throw new Error(`Codex turn failed: ${errorMsg}`);
+					}
 					default: logger_default.debug("Codex unknown event type", { type: event.type });
 				}
 				lastEventTime = eventTime;
@@ -429,6 +489,7 @@ var OpenAICodexSDKProvider = class OpenAICodexSDKProvider {
 			model_reasoning_effort: config.model_reasoning_effort,
 			network_access_enabled: config.network_access_enabled,
 			web_search_enabled: config.web_search_enabled,
+			web_search_mode: config.web_search_mode,
 			approval_policy: config.approval_policy,
 			prompt
 		};
@@ -505,11 +566,7 @@ var OpenAICodexSDKProvider = class OpenAICodexSDKProvider {
 				logger_default.warn("[CodexSDK] deep_tracing is incompatible with thread persistence. Thread options (persist_threads, thread_id, thread_pool_size) are ignored when deep_tracing is enabled.");
 				this.deepTracingWarningShown = true;
 			}
-			localInstance = new this.codexModule.Codex({
-				env,
-				...config.codex_path_override ? { codexPathOverride: config.codex_path_override } : {},
-				...config.base_url ? { baseUrl: config.base_url } : {}
-			});
+			localInstance = new this.codexModule.Codex(this.buildCodexOptions(env, config));
 		} else {
 			const stableEnv = { ...env };
 			delete stableEnv.TRACEPARENT;
@@ -519,19 +576,13 @@ var OpenAICodexSDKProvider = class OpenAICodexSDKProvider {
 				if (envChanged && this.codexInstance) {
 					logger_default.debug("[CodexSDK] Recreating instance due to configuration change");
 					try {
-						if (typeof this.codexInstance.destroy === "function") await this.codexInstance.destroy();
-						else if (typeof this.codexInstance.cleanup === "function") await this.codexInstance.cleanup();
-						else if (typeof this.codexInstance.close === "function") await this.codexInstance.close();
+						await this.destroyInstance(this.codexInstance);
 					} catch (cleanupError) {
 						logger_default.warn("[CodexSDK] Error cleaning up old instance", { error: cleanupError });
 					}
 					this.threads.clear();
 				}
-				this.codexInstance = new this.codexModule.Codex({
-					env,
-					...config.codex_path_override ? { codexPathOverride: config.codex_path_override } : {},
-					...config.base_url ? { baseUrl: config.base_url } : {}
-				});
+				this.codexInstance = new this.codexModule.Codex(this.buildCodexOptions(env, config));
 				this.codexInstanceEnvHash = envHash;
 			}
 		}
@@ -547,14 +598,21 @@ var OpenAICodexSDKProvider = class OpenAICodexSDKProvider {
 			const output = turn.finalResponse || "";
 			const raw = JSON.stringify(turn);
 			const tokenUsage = turn.usage ? {
-				prompt: turn.usage.input_tokens + (turn.usage.cached_input_tokens || 0),
+				prompt: turn.usage.input_tokens,
 				completion: turn.usage.output_tokens,
-				total: turn.usage.input_tokens + (turn.usage.cached_input_tokens || 0) + turn.usage.output_tokens
+				total: turn.usage.input_tokens + turn.usage.output_tokens,
+				cached: turn.usage.cached_input_tokens || 0
 			} : void 0;
 			let cost = 0;
 			if (tokenUsage && config.model) {
 				const pricing = CODEX_MODEL_PRICING[config.model];
-				if (pricing) cost = (tokenUsage.prompt || 0) * (pricing.input / 1e6) + (tokenUsage.completion || 0) * (pricing.output / 1e6);
+				if (pricing) {
+					const cachedTokens = tokenUsage.cached || 0;
+					const inputCost = ((tokenUsage.prompt || 0) - cachedTokens) * (pricing.input / 1e6);
+					const cacheReadCost = cachedTokens * (pricing.cache_read / 1e6);
+					const outputCost = (tokenUsage.completion || 0) * (pricing.output / 1e6);
+					cost = inputCost + cacheReadCost + outputCost;
+				}
 			}
 			logger_default.debug("OpenAI Codex SDK response", {
 				output,
@@ -578,9 +636,7 @@ var OpenAICodexSDKProvider = class OpenAICodexSDKProvider {
 		} finally {
 			if (!config.deep_tracing && !config.persist_threads && !config.thread_id && cacheKey) this.threads.delete(cacheKey);
 			if (useLocalInstance && localInstance) try {
-				if (typeof localInstance.destroy === "function") await localInstance.destroy();
-				else if (typeof localInstance.cleanup === "function") await localInstance.cleanup();
-				else if (typeof localInstance.close === "function") await localInstance.close();
+				await this.destroyInstance(localInstance);
 			} catch (cleanupError) {
 				logger_default.debug("[CodexSDK] Error cleaning up local instance", { error: cleanupError });
 			}
@@ -590,4 +646,4 @@ var OpenAICodexSDKProvider = class OpenAICodexSDKProvider {
 
 //#endregion
 export { OpenAICodexSDKProvider };
-//# sourceMappingURL=codex-sdk-BC5qbCjh.js.map
+//# sourceMappingURL=codex-sdk-dSnGdgIp.js.map