promptfoo 0.121.3 → 0.121.5

package/dist/src/{fetch-CVAtKnI3.js → fetch-D9xxyC1p.js}

@@ -1,14 +1,15 @@
 import { t as __exportAll } from "./chunk-DEq-mXcV.js";
-import { C as getEnvString, D as state, S as getEnvInt, a as logger, b as getEnvBool, d as sanitizeUrl, i as logRequestResponse, y as getConfigDirectoryPath } from "./logger-DO8_zM18.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 { n as VERSION } from "./version-CbuBKu2U.js";
+import * as fs$2 from "fs";
 import * as path$1 from "path";
 import path from "path";
 import yaml from "js-yaml";
-import { promisify } from "util";
 import * as fsPromises from "fs/promises";
 import { getProxyForUrl } from "proxy-from-env";
 import { Agent, ProxyAgent } from "undici";
+import { promisify } from "util";
 import { gzip } from "zlib";
 //#region src/providers/constants.ts
 const FILE_METADATA_KEY = "_promptfooFileMetadata";
@@ -17,19 +18,6 @@ const FILE_METADATA_KEY = "_promptfooFileMetadata";
 * Used to distinguish human ratings from automated assertions.
 */
 const HUMAN_ASSERTION_TYPE = "human";
-//#endregion
-//#region src/version.ts
-/**
-* Application version from package.json.
-* Injected at build time, or read from npm environment in development.
-*/
-const VERSION = "0.121.3";
-/**
-* PostHog analytics key.
-* Only populated during production builds via PROMPTFOO_POSTHOG_KEY env var.
-* Empty string in development/test.
-*/
-const POSTHOG_KEY = "phc_E5n5uHnDo2eREJL1uqX1cIlbkoRby4yFWt3V94HqRRg";
 function getShareApiBaseUrl() {
 	return getEnvString("PROMPTFOO_REMOTE_API_BASE_URL") || "https://api.promptfoo.app";
 }
@@ -45,6 +33,220 @@ const CONSENT_ENDPOINT = "https://api.promptfoo.dev/consent";
 const EVENTS_ENDPOINT = "https://a.promptfoo.app";
 const R_ENDPOINT = "https://r.promptfoo.app/";
 //#endregion
+//#region src/globalConfig/globalConfig.ts
+/**
+* Functions for manipulating the global configuration file, which lives at
+* ~/.promptfoo/promptfoo.yaml by default.
+*/
+function writeGlobalConfig(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$2.existsSync(configFilePath)) {
+		globalConfig = yaml.load(fs$2.readFileSync(configFilePath, "utf-8")) || {};
+		if (!globalConfig?.id) {
+			globalConfig = {
+				...globalConfig,
+				id: crypto.randomUUID()
+			};
+			writeGlobalConfig(globalConfig);
+		}
+	} else {
+		if (!fs$2.existsSync(configDir)) fs$2.mkdirSync(configDir, { recursive: true });
+		fs$2.writeFileSync(configFilePath, yaml.dump(globalConfig));
+	}
+	return globalConfig;
+}
+/**
+* Merges the top-level keys into existing config.
+* @param partialConfig New keys to merge into the existing config.
+*/
+function writeGlobalConfigPartial(partialConfig) {
+	const updatedConfig = { ...readGlobalConfig() };
+	Object.entries(partialConfig).forEach(([key, value]) => {
+		if (value !== void 0 && value !== null) updatedConfig[key] = value;
+		else delete updatedConfig[key];
+	});
+	writeGlobalConfig(updatedConfig);
+}
+const API_HOST = getEnvString("API_HOST", "https://api.promptfoo.app");
+const SHARING_CUTOFF_DATE = /* @__PURE__ */ new Date("2026-03-09T00:00:00Z");
+var CloudConfig = class {
+	config;
+	constructor() {
+		const savedConfig = readGlobalConfig()?.cloud || {};
+		this.config = {
+			appUrl: savedConfig.appUrl || "https://www.promptfoo.app",
+			apiHost: savedConfig.apiHost,
+			apiKey: savedConfig.apiKey,
+			sharing: savedConfig.sharing,
+			currentOrganizationId: savedConfig.currentOrganizationId,
+			currentTeamId: savedConfig.currentTeamId,
+			teams: savedConfig.teams
+		};
+	}
+	/**
+	* Returns the API key from config file or PROMPTFOO_API_KEY environment variable.
+	* Config file takes precedence over environment variable.
+	*/
+	resolveApiKey() {
+		return this.config.apiKey || process.env.PROMPTFOO_API_KEY;
+	}
+	/**
+	* Returns the API host from config file, PROMPTFOO_CLOUD_API_URL environment variable,
+	* or defaults to the standard cloud API host.
+	* Config file takes precedence over environment variable.
+	*/
+	resolveApiHost() {
+		return this.config.apiHost || process.env.PROMPTFOO_CLOUD_API_URL || API_HOST;
+	}
+	isEnabled() {
+		return !!this.resolveApiKey();
+	}
+	setApiHost(apiHost) {
+		this.config.apiHost = apiHost;
+		this.saveConfig();
+	}
+	setApiKey(apiKey) {
+		this.config.apiKey = apiKey;
+		this.saveConfig();
+	}
+	getApiKey() {
+		return this.resolveApiKey();
+	}
+	getApiHost() {
+		return this.resolveApiHost();
+	}
+	setAppUrl(appUrl) {
+		this.config.appUrl = appUrl;
+		this.saveConfig();
+	}
+	getAppUrl() {
+		return this.config.appUrl;
+	}
+	getSharing() {
+		return this.config.sharing;
+	}
+	/**
+	* Sets the sharing preference. Note: this value is only updated at authentication time
+	* (via `validateAndSetApiToken`) and may become stale if the user's license status
+	* changes between re-authentications.
+	*/
+	setSharing(sharing) {
+		this.config.sharing = sharing;
+		this.saveConfig();
+	}
+	delete() {
+		writeGlobalConfigPartial({ cloud: {} });
+		this.reload();
+	}
+	saveConfig() {
+		writeGlobalConfigPartial({ cloud: this.config });
+		this.reload();
+	}
+	reload() {
+		const savedConfig = readGlobalConfig()?.cloud || {};
+		this.config = {
+			appUrl: savedConfig.appUrl || "https://www.promptfoo.app",
+			apiHost: savedConfig.apiHost,
+			apiKey: savedConfig.apiKey,
+			sharing: savedConfig.sharing,
+			currentOrganizationId: savedConfig.currentOrganizationId,
+			currentTeamId: savedConfig.currentTeamId,
+			teams: savedConfig.teams
+		};
+	}
+	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}` } });
+			if (!response.ok) {
+				const errorMessage = await response.text();
+				logger.error(`[Cloud] Failed to validate API token: ${errorMessage}. HTTP Status: ${response.status} - ${response.statusText}.`);
+				throw new Error("Failed to validate API token: " + response.statusText);
+			}
+			const { user, organization, app, hasActiveLicense } = await response.json();
+			return {
+				user,
+				organization,
+				app,
+				...typeof hasActiveLicense === "boolean" ? { hasActiveLicense } : {}
+			};
+		} catch (err) {
+			const error = err;
+			const errorMessage = error instanceof Error ? error.message : String(error);
+			logger.error(`[Cloud] Failed to validate API token with host ${apiHost}: ${errorMessage}`);
+			if (error.cause) logger.error(`Cause: ${error.cause}`);
+			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;
+	}
+	setCurrentOrganization(organizationId) {
+		this.config.currentOrganizationId = organizationId;
+		this.saveConfig();
+	}
+	getCurrentTeamId(organizationId) {
+		if (organizationId) return this.config.teams?.[organizationId]?.currentTeamId;
+		return this.config.currentTeamId;
+	}
+	setCurrentTeamId(teamId, organizationId) {
+		if (organizationId) {
+			if (!this.config.teams) this.config.teams = {};
+			if (!this.config.teams[organizationId]) this.config.teams[organizationId] = {};
+			this.config.teams[organizationId].currentTeamId = teamId;
+		} else this.config.currentTeamId = teamId;
+		this.saveConfig();
+	}
+	clearCurrentTeamId(organizationId) {
+		if (organizationId) {
+			if (this.config.teams?.[organizationId]) delete this.config.teams[organizationId].currentTeamId;
+		} else delete this.config.currentTeamId;
+		this.saveConfig();
+	}
+	cacheTeams(teams, organizationId) {
+		if (organizationId) {
+			if (!this.config.teams) this.config.teams = {};
+			if (!this.config.teams[organizationId]) this.config.teams[organizationId] = {};
+			this.config.teams[organizationId].cache = teams.map((t) => ({
+				id: t.id,
+				name: t.name,
+				slug: t.slug,
+				lastFetched: (/* @__PURE__ */ new Date()).toISOString()
+			}));
+		}
+		this.saveConfig();
+	}
+	getCachedTeams(organizationId) {
+		if (organizationId) return this.config.teams?.[organizationId]?.cache;
+	}
+};
+const cloudConfig = new CloudConfig();
+//#endregion
 //#region src/providers/shared.ts
 /**
 * The default timeout for API requests in milliseconds.
@@ -69,8 +271,9 @@ function calculateCost(modelName, config, promptTokens, completionTokens, models
 	if (!Number.isFinite(promptTokens) || !Number.isFinite(completionTokens) || typeof promptTokens === "undefined" || typeof completionTokens === "undefined") return;
 	const model = models.find((m) => m.id === modelName);
 	if (!model || !model.cost) return;
-	const inputCost = config.cost ?? model.cost.input;
-	const outputCost = config.cost ?? model.cost.output;
+	const longContextCost = model.cost.longContext && promptTokens > model.cost.longContext.threshold ? model.cost.longContext : void 0;
+	const inputCost = config.cost ?? longContextCost?.input ?? model.cost.input;
+	const outputCost = config.cost ?? longContextCost?.output ?? model.cost.output;
 	return inputCost * promptTokens + outputCost * completionTokens;
 }
 /**
@@ -147,7 +350,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,213 +486,160 @@ function transformTools(tools, format) {
 	}
 }
 //#endregion
-//#region src/util/time.ts
-function getCurrentTimestamp() {
-	return Math.floor((/* @__PURE__ */ new Date()).getTime() / 1e3);
-}
-const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-//#endregion
-//#region src/globalConfig/globalConfig.ts
+//#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"
+};
 /**
-* Functions for manipulating the global configuration file, which lives at
-* ~/.promptfoo/promptfoo.yaml by default.
+* Parse rate limit headers from response.
 */
-function writeGlobalConfig(config) {
-	fs$1.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 (!globalConfig?.id) {
-			globalConfig = {
-				...globalConfig,
-				id: crypto.randomUUID()
-			};
-			writeGlobalConfig(globalConfig);
+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;
 		}
-	} else {
-		if (!fs$1.existsSync(configDir)) fs$1.mkdirSync(configDir, { recursive: true });
-		fs$1.writeFileSync(configFilePath, yaml.dump(globalConfig));
 	}
-	return globalConfig;
+	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;
 }
 /**
-* Merges the top-level keys into existing config.
-* @param partialConfig New keys to merge into the existing config.
+* Parse Retry-After header value.
+* Returns duration in milliseconds.
+* Exported for integration use.
 */
-function writeGlobalConfigPartial(partialConfig) {
-	const updatedConfig = { ...readGlobalConfig() };
-	Object.entries(partialConfig).forEach(([key, value]) => {
-		if (value !== void 0 && value !== null) updatedConfig[key] = value;
-		else delete updatedConfig[key];
-	});
-	writeGlobalConfig(updatedConfig);
-}
-const API_HOST = getEnvString("API_HOST", "https://api.promptfoo.app");
-const SHARING_CUTOFF_DATE = /* @__PURE__ */ new Date("2026-03-09T00:00:00Z");
-var CloudConfig = class {
-	config;
-	constructor() {
-		const savedConfig = readGlobalConfig()?.cloud || {};
-		this.config = {
-			appUrl: savedConfig.appUrl || "https://www.promptfoo.app",
-			apiHost: savedConfig.apiHost,
-			apiKey: savedConfig.apiKey,
-			sharing: savedConfig.sharing,
-			currentOrganizationId: savedConfig.currentOrganizationId,
-			currentTeamId: savedConfig.currentTeamId,
-			teams: savedConfig.teams
-		};
-	}
-	/**
-	* Returns the API key from config file or PROMPTFOO_API_KEY environment variable.
-	* Config file takes precedence over environment variable.
-	*/
-	resolveApiKey() {
-		return this.config.apiKey || process.env.PROMPTFOO_API_KEY;
-	}
-	/**
-	* Returns the API host from config file, PROMPTFOO_CLOUD_API_URL environment variable,
-	* or defaults to the standard cloud API host.
-	* Config file takes precedence over environment variable.
-	*/
-	resolveApiHost() {
-		return this.config.apiHost || process.env.PROMPTFOO_CLOUD_API_URL || API_HOST;
-	}
-	isEnabled() {
-		return !!this.resolveApiKey();
-	}
-	setApiHost(apiHost) {
-		this.config.apiHost = apiHost;
-		this.saveConfig();
-	}
-	setApiKey(apiKey) {
-		this.config.apiKey = apiKey;
-		this.saveConfig();
-	}
-	getApiKey() {
-		return this.resolveApiKey();
-	}
-	getApiHost() {
-		return this.resolveApiHost();
-	}
-	setAppUrl(appUrl) {
-		this.config.appUrl = appUrl;
-		this.saveConfig();
-	}
-	getAppUrl() {
-		return this.config.appUrl;
-	}
-	getSharing() {
-		return this.config.sharing;
-	}
-	/**
-	* Sets the sharing preference. Note: this value is only updated at authentication time
-	* (via `validateAndSetApiToken`) and may become stale if the user's license status
-	* changes between re-authentications.
-	*/
-	setSharing(sharing) {
-		this.config.sharing = sharing;
-		this.saveConfig();
-	}
-	delete() {
-		writeGlobalConfigPartial({ cloud: {} });
-		this.reload();
-	}
-	saveConfig() {
-		writeGlobalConfigPartial({ cloud: this.config });
-		this.reload();
-	}
-	reload() {
-		const savedConfig = readGlobalConfig()?.cloud || {};
-		this.config = {
-			appUrl: savedConfig.appUrl || "https://www.promptfoo.app",
-			apiHost: savedConfig.apiHost,
-			apiKey: savedConfig.apiKey,
-			sharing: savedConfig.sharing,
-			currentOrganizationId: savedConfig.currentOrganizationId,
-			currentTeamId: savedConfig.currentTeamId,
-			teams: savedConfig.teams
-		};
-	}
-	async validateAndSetApiToken(token, apiHost) {
-		try {
-			const { fetchWithProxy } = await Promise.resolve().then(() => fetch_exports);
-			const response = await fetchWithProxy(`${apiHost}/api/v1/users/me`, { headers: { Authorization: `Bearer ${token}` } });
-			if (!response.ok) {
-				const errorMessage = await response.text();
-				logger.error(`[Cloud] Failed to validate API token: ${errorMessage}. HTTP Status: ${response.status} - ${response.statusText}.`);
-				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
-			};
-		} catch (err) {
-			const error = err;
-			const errorMessage = error instanceof Error ? error.message : String(error);
-			logger.error(`[Cloud] Failed to validate API token with host ${apiHost}: ${errorMessage}`);
-			if (error.cause) logger.error(`Cause: ${error.cause}`);
-			throw error;
-		}
-	}
-	getCurrentOrganizationId() {
-		return this.config.currentOrganizationId;
-	}
-	setCurrentOrganization(organizationId) {
-		this.config.currentOrganizationId = organizationId;
-		this.saveConfig();
-	}
-	getCurrentTeamId(organizationId) {
-		if (organizationId) return this.config.teams?.[organizationId]?.currentTeamId;
-		return this.config.currentTeamId;
-	}
-	setCurrentTeamId(teamId, organizationId) {
-		if (organizationId) {
-			if (!this.config.teams) this.config.teams = {};
-			if (!this.config.teams[organizationId]) this.config.teams[organizationId] = {};
-			this.config.teams[organizationId].currentTeamId = teamId;
-		} else this.config.currentTeamId = teamId;
-		this.saveConfig();
-	}
-	clearCurrentTeamId(organizationId) {
-		if (organizationId) {
-			if (this.config.teams?.[organizationId]) delete this.config.teams[organizationId].currentTeamId;
-		} else delete this.config.currentTeamId;
-		this.saveConfig();
-	}
-	cacheTeams(teams, organizationId) {
-		if (organizationId) {
-			if (!this.config.teams) this.config.teams = {};
-			if (!this.config.teams[organizationId]) this.config.teams[organizationId] = {};
-			this.config.teams[organizationId].cache = teams.map((t) => ({
-				id: t.id,
-				name: t.name,
-				slug: t.slug,
-				lastFetched: (/* @__PURE__ */ new Date()).toISOString()
-			}));
+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;
 		}
-		this.saveConfig();
 	}
-	getCachedTeams(organizationId) {
-		if (organizationId) return this.config.teams?.[organizationId]?.cache;
+}
+/**
+* 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;
 	}
-};
-const cloudConfig = new CloudConfig();
+	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);
+}
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 //#endregion
 //#region src/util/fetch/monkeyPatchFetch.ts
 const gzipAsync = promisify(gzip);
@@ -561,9 +711,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 +729,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 +861,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 +924,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, readGlobalConfig as C, CONSENT_ENDPOINT as D, CLOUD_PROVIDER_PREFIX as E, HUMAN_ASSERTION_TYPE as F, getShareApiBaseUrl as M, getShareViewBaseUrl as N, EVENTS_ENDPOINT as O, FILE_METADATA_KEY as P, cloudConfig as S, writeGlobalConfigPartial as T, parseChatPrompt as _, getCurrentTimestamp as a, transformTools as b, parseRetryAfter as c, calculateCost as d, isOpenAIToolArray as f, openaiToolsToBedrock as g, openaiToolChoiceToBedrock as h, fetch_exports as i, getDefaultShareViewBaseUrl as j, R_ENDPOINT as k, LONG_RUNNING_MODEL_TIMEOUT_MS as l, isPromptfooSampleTarget as m, fetchWithRetries as n, sleep as o, isOpenAIToolChoice as p, fetchWithTimeout as r, parseRateLimitHeaders as s, fetchWithProxy as t, REQUEST_TIMEOUT_MS as u, toTitleCase as v, writeGlobalConfig as w, CloudConfig as x, transformToolChoice as y };
 
-//# sourceMappingURL=fetch-CVAtKnI3.js.map
+//# sourceMappingURL=fetch-D9xxyC1p.js.map