promptfoo 0.121.2 → 0.121.4

package/dist/src/{fetch-Cwxnd8zz.js → fetch-Di00EQrc.js}

@@ -1,7 +1,7 @@
 import { t as __exportAll } from "./chunk-DEq-mXcV.js";
-import { _ as getEnvBool, b as getEnvString, c as sanitizeUrl, g as getConfigDirectoryPath, i as logger, r as logRequestResponse, w as state, y as getEnvInt } from "./logger-CT3IKMKA.js";
+import { S as getEnvBool, T as getEnvString, a as logger, i as logRequestResponse, k as state, p as sanitizeUrl, w as getEnvInt, x as getConfigDirectoryPath } from "./logger-Ct2S6Yx-.js";
 import { t as invariant } from "./invariant-Ddh24eXh.js";
-import * as fs$1 from "fs";
+import * as fs$2 from "fs";
 import * as path$1 from "path";
 import path from "path";
 import yaml from "js-yaml";
@@ -23,7 +23,7 @@ const HUMAN_ASSERTION_TYPE = "human";
 * Application version from package.json.
 * Injected at build time, or read from npm environment in development.
 */
-const VERSION = "0.121.2";
+const VERSION = "0.121.4";
 /**
 * PostHog analytics key.
 * Only populated during production builds via PROMPTFOO_POSTHOG_KEY env var.
@@ -147,7 +147,7 @@ function isOpenAIToolChoice(obj) {
 function openaiToolChoiceToAnthropic(choice) {
 	if (typeof choice === "string") switch (choice) {
 		case "auto": return { type: "auto" };
-		case "none": return { type: "auto" };
+		case "none": return { type: "none" };
 		case "required": return { type: "any" };
 	}
 	return {
@@ -283,6 +283,155 @@ function transformTools(tools, format) {
 	}
 }
 //#endregion
+//#region src/scheduler/headerParser.ts
+const OPENAI_HEADERS = {
+	remainingRequests: "x-ratelimit-remaining-requests",
+	remainingTokens: "x-ratelimit-remaining-tokens",
+	limitRequests: "x-ratelimit-limit-requests",
+	limitTokens: "x-ratelimit-limit-tokens",
+	resetRequests: "x-ratelimit-reset-requests",
+	resetTokens: "x-ratelimit-reset-tokens"
+};
+const ANTHROPIC_HEADERS = {
+	remainingRequests: "anthropic-ratelimit-requests-remaining",
+	remainingTokens: "anthropic-ratelimit-tokens-remaining",
+	limitRequests: "anthropic-ratelimit-requests-limit",
+	limitTokens: "anthropic-ratelimit-tokens-limit",
+	reset: "anthropic-ratelimit-requests-reset"
+};
+const STANDARD_HEADERS = {
+	remaining: "ratelimit-remaining",
+	limit: "ratelimit-limit",
+	reset: "ratelimit-reset",
+	remainingAlt: "x-ratelimit-remaining",
+	limitAlt: "x-ratelimit-limit",
+	resetAlt: "x-ratelimit-reset"
+};
+/**
+* Parse rate limit headers from response.
+*/
+function parseRateLimitHeaders(headers) {
+	const result = {};
+	const h = lowercaseKeys(headers);
+	result.remainingRequests = parseFirstMatch(h, [
+		OPENAI_HEADERS.remainingRequests,
+		ANTHROPIC_HEADERS.remainingRequests,
+		STANDARD_HEADERS.remainingAlt,
+		STANDARD_HEADERS.remaining
+	]);
+	result.remainingTokens = parseFirstMatch(h, [OPENAI_HEADERS.remainingTokens, ANTHROPIC_HEADERS.remainingTokens]);
+	result.limitRequests = parseFirstMatch(h, [
+		OPENAI_HEADERS.limitRequests,
+		ANTHROPIC_HEADERS.limitRequests,
+		STANDARD_HEADERS.limitAlt,
+		STANDARD_HEADERS.limit
+	]);
+	result.limitTokens = parseFirstMatch(h, [OPENAI_HEADERS.limitTokens, ANTHROPIC_HEADERS.limitTokens]);
+	for (const name of [
+		OPENAI_HEADERS.resetRequests,
+		OPENAI_HEADERS.resetTokens,
+		ANTHROPIC_HEADERS.reset,
+		STANDARD_HEADERS.resetAlt,
+		STANDARD_HEADERS.reset
+	]) if (h[name] !== void 0) {
+		const parsed = parseResetTime(h[name]);
+		if (parsed !== null) {
+			result.resetAt = parsed;
+			break;
+		}
+	}
+	if (h["retry-after-ms"] !== void 0) {
+		const ms = parseInt(h["retry-after-ms"], 10);
+		if (!isNaN(ms) && ms >= 0) {
+			result.retryAfterMs = ms;
+			if (result.resetAt === void 0) result.resetAt = Date.now() + ms;
+		}
+	} else if (h["retry-after"] !== void 0) {
+		const parsed = parseRetryAfter(h["retry-after"]);
+		if (parsed !== null) {
+			result.retryAfterMs = parsed;
+			if (result.resetAt === void 0) result.resetAt = Date.now() + parsed;
+		}
+	}
+	return result;
+}
+/**
+* Parse Retry-After header value.
+* Returns duration in milliseconds.
+* Exported for integration use.
+*/
+function parseRetryAfter(value) {
+	const seconds = parseInt(value, 10);
+	if (!isNaN(seconds) && seconds >= 0 && String(seconds) === value.trim()) return seconds * 1e3;
+	const httpDate = parseHttpDate(value);
+	if (httpDate !== null) return Math.max(0, httpDate - Date.now());
+	return null;
+}
+function parseFirstMatch(headers, names) {
+	for (const name of names) {
+		const value = headers[name];
+		if (value !== void 0) {
+			const num = parseInt(value, 10);
+			if (!isNaN(num) && num >= 0) return num;
+		}
+	}
+}
+/**
+* Parse reset time from various formats.
+* Returns absolute Unix timestamp in milliseconds.
+*/
+function parseResetTime(value) {
+	const durationMs = parseDuration(value);
+	if (durationMs !== null) return Date.now() + durationMs;
+	const num = parseFloat(value);
+	if (!isNaN(num)) if (num < 1e9) return Date.now() + num * 1e3;
+	else if (num < 1e10) return num * 1e3;
+	else return num;
+	const httpDate = parseHttpDate(value);
+	if (httpDate !== null) return httpDate;
+	return null;
+}
+/**
+* Parse HTTP-date format (RFC 7231).
+*/
+function parseHttpDate(value) {
+	const timestamp = Date.parse(value);
+	if (!isNaN(timestamp)) {
+		const now = Date.now();
+		const oneYearMs = 365 * 24 * 60 * 60 * 1e3;
+		if (timestamp > now - oneYearMs && timestamp < now + oneYearMs) return timestamp;
+	}
+	return null;
+}
+/**
+* Parse duration strings like "1s", "100ms", "1m30s", "1h30s", "2h15m30s".
+*
+* Supported formats:
+* - Xms (milliseconds)
+* - Xs or X.Xs (seconds)
+* - Xm or XmYs (minutes with optional seconds)
+* - Xh or XhYm or XhYs or XhYmZs (hours with optional minutes/seconds)
+*/
+function parseDuration(value) {
+	const match = value.match(/^(?:(\d+)h)?(?:(\d+)m(?!s))?(?:(\d+(?:\.\d+)?)(ms|s))?$/);
+	if (!match) return null;
+	const [, hours, minutes, secondsValue, secondsUnit] = match;
+	if (!hours && !minutes && !secondsValue) return null;
+	let ms = 0;
+	if (hours) ms += parseInt(hours, 10) * 36e5;
+	if (minutes) ms += parseInt(minutes, 10) * 6e4;
+	if (secondsValue) {
+		const num = parseFloat(secondsValue);
+		ms += secondsUnit === "ms" ? num : num * 1e3;
+	}
+	return ms;
+}
+function lowercaseKeys(obj) {
+	const result = {};
+	for (const [key, value] of Object.entries(obj)) result[key.toLowerCase()] = value;
+	return result;
+}
+//#endregion
 //#region src/util/time.ts
 function getCurrentTimestamp() {
 	return Math.floor((/* @__PURE__ */ new Date()).getTime() / 1e3);
@@ -295,14 +444,14 @@ const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 * ~/.promptfoo/promptfoo.yaml by default.
 */
 function writeGlobalConfig(config) {
-	fs$1.writeFileSync(path$1.join(getConfigDirectoryPath(true), "promptfoo.yaml"), yaml.dump(config));
+	fs$2.writeFileSync(path$1.join(getConfigDirectoryPath(true), "promptfoo.yaml"), yaml.dump(config));
 }
 function readGlobalConfig() {
 	const configDir = getConfigDirectoryPath();
 	const configFilePath = path$1.join(configDir, "promptfoo.yaml");
 	let globalConfig = { id: crypto.randomUUID() };
-	if (fs$1.existsSync(configFilePath)) {
-		globalConfig = yaml.load(fs$1.readFileSync(configFilePath, "utf-8")) || {};
+	if (fs$2.existsSync(configFilePath)) {
+		globalConfig = yaml.load(fs$2.readFileSync(configFilePath, "utf-8")) || {};
 		if (!globalConfig?.id) {
 			globalConfig = {
 				...globalConfig,
@@ -311,8 +460,8 @@ function readGlobalConfig() {
 			writeGlobalConfig(globalConfig);
 		}
 	} else {
-		if (!fs$1.existsSync(configDir)) fs$1.mkdirSync(configDir, { recursive: true });
-		fs$1.writeFileSync(configFilePath, yaml.dump(globalConfig));
+		if (!fs$2.existsSync(configDir)) fs$2.mkdirSync(configDir, { recursive: true });
+		fs$2.writeFileSync(configFilePath, yaml.dump(globalConfig));
 	}
 	return globalConfig;
 }
@@ -415,7 +564,17 @@ var CloudConfig = class {
 			teams: savedConfig.teams
 		};
 	}
-	async validateAndSetApiToken(token, apiHost) {
+	saveValidatedApiToken(token, apiHost, user, app, hasActiveLicense) {
+		this.setApiKey(token);
+		this.setApiHost(apiHost);
+		this.setAppUrl(app.url);
+		if (typeof hasActiveLicense === "boolean") {
+			const createdAt = user?.createdAt ? new Date(user.createdAt) : null;
+			const isGrandfathered = createdAt != null && createdAt < SHARING_CUTOFF_DATE;
+			this.setSharing(hasActiveLicense || isGrandfathered);
+		}
+	}
+	async validateApiToken(token, apiHost) {
 		try {
 			const { fetchWithProxy } = await Promise.resolve().then(() => fetch_exports);
 			const response = await fetchWithProxy(`${apiHost}/api/v1/users/me`, { headers: { Authorization: `Bearer ${token}` } });
@@ -425,19 +584,11 @@ var CloudConfig = class {
 				throw new Error("Failed to validate API token: " + response.statusText);
 			}
 			const { user, organization, app, hasActiveLicense } = await response.json();
-			this.setApiKey(token);
-			this.setApiHost(apiHost);
-			this.setAppUrl(app.url);
-			if (typeof hasActiveLicense === "boolean") {
-				const createdAt = user?.createdAt ? new Date(user.createdAt) : null;
-				const isGrandfathered = createdAt != null && createdAt < SHARING_CUTOFF_DATE;
-				this.setSharing(hasActiveLicense || isGrandfathered);
-			}
 			return {
 				user,
 				organization,
 				app,
-				hasActiveLicense: typeof hasActiveLicense === "boolean" ? hasActiveLicense : false
+				...typeof hasActiveLicense === "boolean" ? { hasActiveLicense } : {}
 			};
 		} catch (err) {
 			const error = err;
@@ -447,6 +598,16 @@ var CloudConfig = class {
 			throw error;
 		}
 	}
+	async validateAndSetApiToken(token, apiHost) {
+		const { user, organization, app, hasActiveLicense } = await this.validateApiToken(token, apiHost);
+		this.saveValidatedApiToken(token, apiHost, user, app, hasActiveLicense);
+		return {
+			user,
+			organization,
+			app,
+			hasActiveLicense: typeof hasActiveLicense === "boolean" ? hasActiveLicense : false
+		};
+	}
 	getCurrentOrganizationId() {
 		return this.config.currentOrganizationId;
 	}
@@ -561,9 +722,8 @@ var fetch_exports = /* @__PURE__ */ __exportAll({
 	isRateLimited: () => isRateLimited,
 	isTransientError: () => isTransientError
 });
-let cachedAgent = null;
-let cachedAgentConcurrency;
-let cachedProxyAgents = /* @__PURE__ */ new Map();
+const cachedAgents = /* @__PURE__ */ new Map();
+const cachedProxyAgents = /* @__PURE__ */ new Map();
 /**
 * Get the connection pool size for HTTP agents.
 * Priority: PROMPTFOO_FETCH_CONNECTIONS env var > CLI -j flag > DEFAULT_MAX_CONCURRENCY (4).
@@ -580,36 +740,37 @@ function getConnectionPoolSize() {
 }
 function getOrCreateAgent(tlsOptions) {
 	const concurrency = getConnectionPoolSize();
-	if (cachedAgent && cachedAgentConcurrency !== concurrency) {
-		if (typeof cachedAgent.close === "function") cachedAgent.close();
-		cachedAgent = null;
-	}
-	if (!cachedAgent) {
-		cachedAgent = new Agent({
-			headersTimeout: REQUEST_TIMEOUT_MS,
-			keepAliveTimeout: 3e4,
-			keepAliveMaxTimeout: 6e4,
-			connections: concurrency,
-			connect: tlsOptions
-		});
-		cachedAgentConcurrency = concurrency;
-	}
-	return cachedAgent;
+	const existing = cachedAgents.get(concurrency);
+	if (existing) return existing;
+	const agent = new Agent({
+		headersTimeout: REQUEST_TIMEOUT_MS,
+		keepAliveTimeout: 3e4,
+		keepAliveMaxTimeout: 6e4,
+		connections: concurrency,
+		connect: tlsOptions
+	});
+	cachedAgents.set(concurrency, agent);
+	return agent;
+}
+function getProxyAgentCacheKey(proxyUrl, concurrency) {
+	return `${proxyUrl}::${concurrency}`;
 }
 function getOrCreateProxyAgent(proxyUrl, tlsOptions) {
-	if (!cachedProxyAgents.has(proxyUrl)) {
-		const agent = new ProxyAgent({
-			uri: proxyUrl,
-			proxyTls: tlsOptions,
-			requestTls: tlsOptions,
-			headersTimeout: REQUEST_TIMEOUT_MS,
-			keepAliveTimeout: 3e4,
-			keepAliveMaxTimeout: 6e4,
-			connections: getConnectionPoolSize()
-		});
-		cachedProxyAgents.set(proxyUrl, agent);
-	}
-	return cachedProxyAgents.get(proxyUrl);
+	const concurrency = getConnectionPoolSize();
+	const cacheKey = getProxyAgentCacheKey(proxyUrl, concurrency);
+	const existing = cachedProxyAgents.get(cacheKey);
+	if (existing) return existing;
+	const agent = new ProxyAgent({
+		uri: proxyUrl,
+		proxyTls: tlsOptions,
+		requestTls: tlsOptions,
+		headersTimeout: REQUEST_TIMEOUT_MS,
+		keepAliveTimeout: 3e4,
+		keepAliveMaxTimeout: 6e4,
+		connections: concurrency
+	});
+	cachedProxyAgents.set(cacheKey, agent);
+	return agent;
 }
 async function fetchWithProxy(url, options = {}, abortSignal) {
 	let finalUrl = url;
@@ -711,12 +872,14 @@ async function handleRateLimit(response) {
 	const retryAfter = response.headers.get("Retry-After");
 	const openaiReset = response.headers.get("x-ratelimit-reset-requests") || response.headers.get("x-ratelimit-reset-tokens");
 	let waitTime = 6e4;
-	if (openaiReset) waitTime = Math.max(Number.parseInt(openaiReset) * 1e3, 0);
-	else if (rateLimitReset) {
+	if (openaiReset) {
+		const parsedHeaders = parseRateLimitHeaders(Object.fromEntries(response.headers.entries()));
+		if (parsedHeaders.resetAt !== void 0) waitTime = Math.max(parsedHeaders.resetAt - Date.now(), 0);
+	} else if (rateLimitReset) {
 		const resetTime = /* @__PURE__ */ new Date(Number.parseInt(rateLimitReset) * 1e3);
 		const now = /* @__PURE__ */ new Date();
 		waitTime = Math.max(resetTime.getTime() - now.getTime() + 1e3, 0);
-	} else if (retryAfter) waitTime = Number.parseInt(retryAfter) * 1e3;
+	} else if (retryAfter) waitTime = parseRetryAfter(retryAfter) ?? waitTime;
 	logger.debug(`Rate limited, waiting ${waitTime}ms before retry`);
 	await sleep(waitTime);
 }
@@ -772,6 +935,6 @@ async function fetchWithRetries(url, options = {}, timeout, maxRetries) {
 	throw new Error(`Request failed after ${maxRetries} retries: ${lastErrorMessage}`);
 }
 //#endregion
-export { getShareApiBaseUrl as A, transformTools as C, R_ENDPOINT as D, EVENTS_ENDPOINT as E, HUMAN_ASSERTION_TYPE as F, POSTHOG_KEY as M, VERSION as N, TERMINAL_MAX_WIDTH as O, FILE_METADATA_KEY as P, transformToolChoice as S, CONSENT_ENDPOINT as T, isPromptfooSampleTarget as _, CloudConfig as a, parseChatPrompt as b, writeGlobalConfig as c, sleep as d, LONG_RUNNING_MODEL_TIMEOUT_MS as f, isOpenAIToolChoice as g, isOpenAIToolArray as h, fetch_exports as i, getShareViewBaseUrl as j, getDefaultShareViewBaseUrl as k, writeGlobalConfigPartial as l, calculateCost as m, fetchWithRetries as n, cloudConfig as o, REQUEST_TIMEOUT_MS as p, fetchWithTimeout as r, readGlobalConfig as s, fetchWithProxy as t, getCurrentTimestamp as u, openaiToolChoiceToBedrock as v, CLOUD_PROVIDER_PREFIX as w, toTitleCase as x, openaiToolsToBedrock as y };
+export { TERMINAL_MAX_WIDTH as A, toTitleCase as C, CONSENT_ENDPOINT as D, CLOUD_PROVIDER_PREFIX as E, VERSION as F, FILE_METADATA_KEY as I, HUMAN_ASSERTION_TYPE as L, getShareApiBaseUrl as M, getShareViewBaseUrl as N, EVENTS_ENDPOINT as O, POSTHOG_KEY as P, parseChatPrompt as S, transformTools as T, isOpenAIToolArray as _, CloudConfig as a, openaiToolChoiceToBedrock as b, writeGlobalConfig as c, sleep as d, parseRateLimitHeaders as f, calculateCost as g, REQUEST_TIMEOUT_MS as h, fetch_exports as i, getDefaultShareViewBaseUrl as j, R_ENDPOINT as k, writeGlobalConfigPartial as l, LONG_RUNNING_MODEL_TIMEOUT_MS as m, fetchWithRetries as n, cloudConfig as o, parseRetryAfter as p, fetchWithTimeout as r, readGlobalConfig as s, fetchWithProxy as t, getCurrentTimestamp as u, isOpenAIToolChoice as v, transformToolChoice as w, openaiToolsToBedrock as x, isPromptfooSampleTarget as y };
 
-//# sourceMappingURL=fetch-Cwxnd8zz.js.map
+//# sourceMappingURL=fetch-Di00EQrc.js.map

package/dist/src/{fileExtensions-Ds-foDzt.js → fileExtensions-AWa2ZML4.js}

@@ -83,4 +83,4 @@ function isAudioFile(filePath) {
 //#endregion
 export { isVideoFile as a, isJavascriptFile as i, isAudioFile as n, isImageFile as r, JAVASCRIPT_EXTENSIONS as t };
 
-//# sourceMappingURL=fileExtensions-Ds-foDzt.js.map
+//# sourceMappingURL=fileExtensions-AWa2ZML4.js.map

package/dist/src/{fileExtensions-LcDYkU4v.js → fileExtensions-BArZuxsI.js}

@@ -82,4 +82,4 @@ function isAudioFile(filePath) {
 //#endregion
 export { isVideoFile as a, isJavascriptFile as i, isAudioFile as n, isImageFile as r, JAVASCRIPT_EXTENSIONS as t };
 
-//# sourceMappingURL=fileExtensions-LcDYkU4v.js.map
+//# sourceMappingURL=fileExtensions-BArZuxsI.js.map

package/dist/src/{formatDuration-DgBVMN65.js → formatDuration-DZzPsexs.js}

@@ -20,4 +20,4 @@ function formatDuration(seconds) {
 //#endregion
 export { formatDuration as t };
 
-//# sourceMappingURL=formatDuration-DgBVMN65.js.map
+//# sourceMappingURL=formatDuration-DZzPsexs.js.map

package/dist/src/{genaiTracer-D3fD9dNV.js → genaiTracer-COYDi-tC.js}

@@ -22,7 +22,9 @@ const GenAIAttributes = {
 	USAGE_CACHED_TOKENS: "gen_ai.usage.cached_tokens",
 	USAGE_REASONING_TOKENS: "gen_ai.usage.reasoning_tokens",
 	USAGE_ACCEPTED_PREDICTION_TOKENS: "gen_ai.usage.accepted_prediction_tokens",
-	USAGE_REJECTED_PREDICTION_TOKENS: "gen_ai.usage.rejected_prediction_tokens"
+	USAGE_REJECTED_PREDICTION_TOKENS: "gen_ai.usage.rejected_prediction_tokens",
+	USAGE_CACHE_READ_INPUT_TOKENS: "gen_ai.usage.cache_read_input_tokens",
+	USAGE_CACHE_CREATION_INPUT_TOKENS: "gen_ai.usage.cache_creation_input_tokens"
 };
 const PromptfooAttributes = {
 	PROVIDER_ID: "promptfoo.provider.id",
@@ -225,6 +227,8 @@ function setGenAIResponseAttributes(span, result, sanitize = true) {
 			if (usage.completionDetails.reasoning !== void 0) span.setAttribute(GenAIAttributes.USAGE_REASONING_TOKENS, usage.completionDetails.reasoning);
 			if (usage.completionDetails.acceptedPrediction !== void 0) span.setAttribute(GenAIAttributes.USAGE_ACCEPTED_PREDICTION_TOKENS, usage.completionDetails.acceptedPrediction);
 			if (usage.completionDetails.rejectedPrediction !== void 0) span.setAttribute(GenAIAttributes.USAGE_REJECTED_PREDICTION_TOKENS, usage.completionDetails.rejectedPrediction);
+			if (usage.completionDetails.cacheReadInputTokens !== void 0) span.setAttribute(GenAIAttributes.USAGE_CACHE_READ_INPUT_TOKENS, usage.completionDetails.cacheReadInputTokens);
+			if (usage.completionDetails.cacheCreationInputTokens !== void 0) span.setAttribute(GenAIAttributes.USAGE_CACHE_CREATION_INPUT_TOKENS, usage.completionDetails.cacheCreationInputTokens);
 		}
 	}
 	if (result.responseModel) span.setAttribute(GenAIAttributes.RESPONSE_MODEL, result.responseModel);
@@ -253,4 +257,4 @@ function getTraceparent() {
 //#endregion
 export { withGenAISpan as n, getTraceparent as t };
 
-//# sourceMappingURL=genaiTracer-D3fD9dNV.js.map
+//# sourceMappingURL=genaiTracer-COYDi-tC.js.map

package/dist/src/{genaiTracer-C1rxGO8Q.js → genaiTracer-DWdZ28hY.js}

@@ -23,7 +23,9 @@ const GenAIAttributes = {
 	USAGE_CACHED_TOKENS: "gen_ai.usage.cached_tokens",
 	USAGE_REASONING_TOKENS: "gen_ai.usage.reasoning_tokens",
 	USAGE_ACCEPTED_PREDICTION_TOKENS: "gen_ai.usage.accepted_prediction_tokens",
-	USAGE_REJECTED_PREDICTION_TOKENS: "gen_ai.usage.rejected_prediction_tokens"
+	USAGE_REJECTED_PREDICTION_TOKENS: "gen_ai.usage.rejected_prediction_tokens",
+	USAGE_CACHE_READ_INPUT_TOKENS: "gen_ai.usage.cache_read_input_tokens",
+	USAGE_CACHE_CREATION_INPUT_TOKENS: "gen_ai.usage.cache_creation_input_tokens"
 };
 const PromptfooAttributes = {
 	PROVIDER_ID: "promptfoo.provider.id",
@@ -226,6 +228,8 @@ function setGenAIResponseAttributes(span, result, sanitize = true) {
 			if (usage.completionDetails.reasoning !== void 0) span.setAttribute(GenAIAttributes.USAGE_REASONING_TOKENS, usage.completionDetails.reasoning);
 			if (usage.completionDetails.acceptedPrediction !== void 0) span.setAttribute(GenAIAttributes.USAGE_ACCEPTED_PREDICTION_TOKENS, usage.completionDetails.acceptedPrediction);
 			if (usage.completionDetails.rejectedPrediction !== void 0) span.setAttribute(GenAIAttributes.USAGE_REJECTED_PREDICTION_TOKENS, usage.completionDetails.rejectedPrediction);
+			if (usage.completionDetails.cacheReadInputTokens !== void 0) span.setAttribute(GenAIAttributes.USAGE_CACHE_READ_INPUT_TOKENS, usage.completionDetails.cacheReadInputTokens);
+			if (usage.completionDetails.cacheCreationInputTokens !== void 0) span.setAttribute(GenAIAttributes.USAGE_CACHE_CREATION_INPUT_TOKENS, usage.completionDetails.cacheCreationInputTokens);
 		}
 	}
 	if (result.responseModel) span.setAttribute(GenAIAttributes.RESPONSE_MODEL, result.responseModel);
@@ -254,4 +258,4 @@ function getTraceparent() {
 //#endregion
 export { withGenAISpan as n, getTraceparent as t };
 
-//# sourceMappingURL=genaiTracer-C1rxGO8Q.js.map
+//# sourceMappingURL=genaiTracer-DWdZ28hY.js.map

package/dist/src/{genaiTracer-70Z8BIuV.js → genaiTracer-XnrcgDCe.js}

@@ -22,7 +22,9 @@ const GenAIAttributes = {
 	USAGE_CACHED_TOKENS: "gen_ai.usage.cached_tokens",
 	USAGE_REASONING_TOKENS: "gen_ai.usage.reasoning_tokens",
 	USAGE_ACCEPTED_PREDICTION_TOKENS: "gen_ai.usage.accepted_prediction_tokens",
-	USAGE_REJECTED_PREDICTION_TOKENS: "gen_ai.usage.rejected_prediction_tokens"
+	USAGE_REJECTED_PREDICTION_TOKENS: "gen_ai.usage.rejected_prediction_tokens",
+	USAGE_CACHE_READ_INPUT_TOKENS: "gen_ai.usage.cache_read_input_tokens",
+	USAGE_CACHE_CREATION_INPUT_TOKENS: "gen_ai.usage.cache_creation_input_tokens"
 };
 const PromptfooAttributes = {
 	PROVIDER_ID: "promptfoo.provider.id",
@@ -225,6 +227,8 @@ function setGenAIResponseAttributes(span, result, sanitize = true) {
 			if (usage.completionDetails.reasoning !== void 0) span.setAttribute(GenAIAttributes.USAGE_REASONING_TOKENS, usage.completionDetails.reasoning);
 			if (usage.completionDetails.acceptedPrediction !== void 0) span.setAttribute(GenAIAttributes.USAGE_ACCEPTED_PREDICTION_TOKENS, usage.completionDetails.acceptedPrediction);
 			if (usage.completionDetails.rejectedPrediction !== void 0) span.setAttribute(GenAIAttributes.USAGE_REJECTED_PREDICTION_TOKENS, usage.completionDetails.rejectedPrediction);
+			if (usage.completionDetails.cacheReadInputTokens !== void 0) span.setAttribute(GenAIAttributes.USAGE_CACHE_READ_INPUT_TOKENS, usage.completionDetails.cacheReadInputTokens);
+			if (usage.completionDetails.cacheCreationInputTokens !== void 0) span.setAttribute(GenAIAttributes.USAGE_CACHE_CREATION_INPUT_TOKENS, usage.completionDetails.cacheCreationInputTokens);
 		}
 	}
 	if (result.responseModel) span.setAttribute(GenAIAttributes.RESPONSE_MODEL, result.responseModel);
@@ -253,4 +257,4 @@ function getTraceparent() {
 //#endregion
 export { withGenAISpan as n, getTraceparent as t };
 
-//# sourceMappingURL=genaiTracer-70Z8BIuV.js.map
+//# sourceMappingURL=genaiTracer-XnrcgDCe.js.map

package/dist/src/{genaiTracer-DN4dQywX.cjs → genaiTracer-yRuxj9-L.cjs}

@@ -1,4 +1,4 @@
-require("./logger-Cp1GPUjj.cjs");
+require("./logger-COuQb2xB.cjs");
 let _opentelemetry_api = require("@opentelemetry/api");
 //#region src/tracing/genaiTracer.ts
 const TRACER_NAME = "promptfoo.providers";
@@ -23,7 +23,9 @@ const GenAIAttributes = {
 	USAGE_CACHED_TOKENS: "gen_ai.usage.cached_tokens",
 	USAGE_REASONING_TOKENS: "gen_ai.usage.reasoning_tokens",
 	USAGE_ACCEPTED_PREDICTION_TOKENS: "gen_ai.usage.accepted_prediction_tokens",
-	USAGE_REJECTED_PREDICTION_TOKENS: "gen_ai.usage.rejected_prediction_tokens"
+	USAGE_REJECTED_PREDICTION_TOKENS: "gen_ai.usage.rejected_prediction_tokens",
+	USAGE_CACHE_READ_INPUT_TOKENS: "gen_ai.usage.cache_read_input_tokens",
+	USAGE_CACHE_CREATION_INPUT_TOKENS: "gen_ai.usage.cache_creation_input_tokens"
 };
 const PromptfooAttributes = {
 	PROVIDER_ID: "promptfoo.provider.id",
@@ -226,6 +228,8 @@ function setGenAIResponseAttributes(span, result, sanitize = true) {
 			if (usage.completionDetails.reasoning !== void 0) span.setAttribute(GenAIAttributes.USAGE_REASONING_TOKENS, usage.completionDetails.reasoning);
 			if (usage.completionDetails.acceptedPrediction !== void 0) span.setAttribute(GenAIAttributes.USAGE_ACCEPTED_PREDICTION_TOKENS, usage.completionDetails.acceptedPrediction);
 			if (usage.completionDetails.rejectedPrediction !== void 0) span.setAttribute(GenAIAttributes.USAGE_REJECTED_PREDICTION_TOKENS, usage.completionDetails.rejectedPrediction);
+			if (usage.completionDetails.cacheReadInputTokens !== void 0) span.setAttribute(GenAIAttributes.USAGE_CACHE_READ_INPUT_TOKENS, usage.completionDetails.cacheReadInputTokens);
+			if (usage.completionDetails.cacheCreationInputTokens !== void 0) span.setAttribute(GenAIAttributes.USAGE_CACHE_CREATION_INPUT_TOKENS, usage.completionDetails.cacheCreationInputTokens);
 		}
 	}
 	if (result.responseModel) span.setAttribute(GenAIAttributes.RESPONSE_MODEL, result.responseModel);
@@ -265,4 +269,4 @@ Object.defineProperty(exports, "withGenAISpan", {
 	}
 });
 
-//# sourceMappingURL=genaiTracer-DN4dQywX.cjs.map
+//# sourceMappingURL=genaiTracer-yRuxj9-L.cjs.map

package/dist/src/golang/wrapper.go

@@ -28,7 +28,7 @@ func main() {
 	}
 
 	// Get the function by name using reflection
-	f := reflect.ValueOf(nil)
+	var f reflect.Value
 	switch functionName {
 	case "call_api", "CallApi":
 		// Use the CallApi function defined in the user's code