promptfoo 0.121.4 → 0.121.7

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

@@ -1,14 +1,16 @@
 import { t as __exportAll } from "./chunk-DEq-mXcV.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 { n as VERSION } from "./version-lpHV_53E.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 { AsyncLocalStorage } from "node:async_hooks";
 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 +19,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.4";
-/**
-* 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 +34,223 @@ 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);
+}
+//#endregion
+//#region src/globalConfig/cloud.ts
+const CLOUD_API_HOST = "https://api.promptfoo.app";
+const API_HOST = getEnvString("API_HOST", CLOUD_API_HOST);
+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 +275,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.inputCost ?? config.cost ?? longContextCost?.input ?? model.cost.input;
+	const outputCost = config.outputCost ?? config.cost ?? longContextCost?.output ?? model.cost.output;
 	return inputCost * promptTokens + outputCost * completionTokens;
 }
 /**
@@ -438,220 +645,6 @@ function getCurrentTimestamp() {
 }
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 //#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/util/fetch/monkeyPatchFetch.ts
 const gzipAsync = promisify(gzip);
 function isConnectionError(error) {
@@ -660,6 +653,14 @@ function isConnectionError(error) {
 /**
 * Enhanced fetch wrapper that adds logging, authentication, error handling, and optional compression
 */
+function isPromptfooCloudApiHost(url) {
+	try {
+		const targetUrl = url instanceof Request ? url.url : url.toString();
+		return new URL(targetUrl).origin === CLOUD_API_HOST;
+	} catch {
+		return false;
+	}
+}
 async function monkeyPatchFetch(url, options) {
 	const NO_LOG_URLS = [
 		R_ENDPOINT,
@@ -679,7 +680,7 @@ async function monkeyPatchFetch(url, options) {
 	} catch (e) {
 		logger.warn(`Failed to compress request body: ${e}`);
 	}
-	if (typeof url === "string" && url.startsWith("https://api.promptfoo.app") || url instanceof URL && url.host === "https://api.promptfoo.app".replace(/^https?:\/\//, "")) {
+	if (isPromptfooCloudApiHost(url)) {
 		const token = cloudConfig.getApiKey();
 		opts.headers = {
 			...opts.headers || {},
@@ -713,11 +714,31 @@ async function monkeyPatchFetch(url, options) {
 	}
 }
 //#endregion
+//#region src/util/fetch/retryContext.ts
+const fetchRetryContext = new AsyncLocalStorage();
+/**
+* Run `fn` with a fetch retry context so nested `fetchWithRetries` /
+* `fetchWithProxy` calls inherit the provider's configured `maxRetries`.
+*
+* When `maxRetries` is `undefined`, the new scope deliberately shadows any
+* outer provider context so providers without an override fall back to defaults.
+*/
+function withFetchRetryContext(maxRetries, fn) {
+	return fetchRetryContext.run({ maxRetries }, fn);
+}
+/**
+* Read the active context's `maxRetries`, or `undefined` when none is set.
+*/
+function getFetchRetryContextMaxRetries() {
+	return fetchRetryContext.getStore()?.maxRetries;
+}
+//#endregion
 //#region src/util/fetch/index.ts
 var fetch_exports = /* @__PURE__ */ __exportAll({
 	fetchWithProxy: () => fetchWithProxy,
 	fetchWithRetries: () => fetchWithRetries,
 	fetchWithTimeout: () => fetchWithTimeout,
+	getFetchWithProxyHeaders: () => getFetchWithProxyHeaders,
 	handleRateLimit: () => handleRateLimit,
 	isRateLimited: () => isRateLimited,
 	isTransientError: () => isTransientError
@@ -772,20 +793,44 @@ function getOrCreateProxyAgent(proxyUrl, tlsOptions) {
 	cachedProxyAgents.set(cacheKey, agent);
 	return agent;
 }
+/**
+* Resolve whether to disable transient-error retries. An explicit caller flag
+* always wins (a caller may opt back in even when the provider set
+* `maxRetries: 0`); otherwise we disable only when the retry context carries
+* `maxRetries === 0`.
+*/
+function resolveTransientRetryDisabled(explicit) {
+	if (explicit !== void 0) return explicit;
+	return getFetchRetryContextMaxRetries() === 0;
+}
+function headersInitToRecord(headers) {
+	if (!headers) return {};
+	if (headers instanceof Headers) return Object.fromEntries(headers.entries());
+	if (Array.isArray(headers)) return Object.fromEntries(new Headers(headers).entries());
+	return { ...headers };
+}
+function getFetchWithProxyHeaders(url, options) {
+	const requestHeaders = url instanceof Request && options.headers === void 0 ? headersInitToRecord(url.headers) : {};
+	const optionHeaders = headersInitToRecord(options.headers);
+	return {
+		...requestHeaders,
+		...optionHeaders,
+		"x-promptfoo-version": VERSION
+	};
+}
+function getFetchUrlString(url) {
+	if (typeof url === "string") return url;
+	if (url instanceof URL) return url.toString();
+	if (url instanceof Request) return url.url;
+}
 async function fetchWithProxy(url, options = {}, abortSignal) {
 	let finalUrl = url;
-	let finalUrlString;
-	if (typeof url === "string") finalUrlString = url;
-	else if (url instanceof URL) finalUrlString = url.toString();
-	else if (url instanceof Request) finalUrlString = url.url;
+	let finalUrlString = getFetchUrlString(url);
 	if (!finalUrlString) throw new Error("Invalid URL");
 	const combinedSignal = abortSignal ? options.signal ? AbortSignal.any([options.signal, abortSignal]) : abortSignal : options.signal;
 	const finalOptions = {
 		...options,
-		headers: {
-			...options.headers,
-			"x-promptfoo-version": VERSION
-		},
+		headers: getFetchWithProxyHeaders(url, options),
 		signal: combinedSignal
 	};
 	if (typeof url === "string") try {
@@ -823,10 +868,11 @@ async function fetchWithProxy(url, options = {}, abortSignal) {
 		logger.debug(`Using proxy: ${sanitizeUrl(proxyUrl)}`);
 		finalOptions.dispatcher = getOrCreateProxyAgent(proxyUrl, tlsOptions);
 	} else finalOptions.dispatcher = getOrCreateAgent(tlsOptions);
-	const maxTransientRetries = options.disableTransientRetries ? 0 : 3;
+	const disableTransientRetries = resolveTransientRetryDisabled(options.disableTransientRetries);
+	const maxTransientRetries = disableTransientRetries ? 0 : 3;
 	for (let attempt = 0; attempt <= maxTransientRetries; attempt++) {
 		const response = await monkeyPatchFetch(finalUrl, finalOptions);
-		if (!options.disableTransientRetries && isTransientError(response) && attempt < maxTransientRetries) {
+		if (!disableTransientRetries && isTransientError(response) && attempt < maxTransientRetries) {
 			const backoffMs = Math.pow(2, attempt) * 1e3;
 			logger.debug(`Transient error (${response.status} ${response.statusText}), retry ${attempt + 1}/${maxTransientRetries} after ${backoffMs}ms`);
 			await sleep(backoffMs);
@@ -899,8 +945,17 @@ function isTransientError(response) {
 		default: return false;
 	}
 }
+function formatFetchErrorMessage(error) {
+	if (!(error instanceof Error)) return String(error);
+	const typedError = error;
+	let message = `${typedError.name}: ${typedError.message}`;
+	if (typedError.cause) message += ` (Cause: ${typedError.cause})`;
+	if (typedError.code) message += ` (Code: ${typedError.code})`;
+	return message;
+}
 async function fetchWithRetries(url, options = {}, timeout, maxRetries) {
-	maxRetries = Math.max(0, maxRetries ?? 4);
+	const contextMaxRetries = getFetchRetryContextMaxRetries();
+	maxRetries = Math.max(0, maxRetries ?? contextMaxRetries ?? 4);
 	let lastErrorMessage;
 	const backoff = getEnvInt("PROMPTFOO_REQUEST_BACKOFF_MS", 5e3);
 	for (let i = 0; i <= maxRetries; i++) {
@@ -912,21 +967,19 @@ async function fetchWithRetries(url, options = {}, timeout, maxRetries) {
 			}, timeout);
 			if (getEnvBool("PROMPTFOO_RETRY_5XX") && response.status >= 500 && response.status < 600) throw new Error(`Internal Server Error: ${response.status} ${response.statusText}`);
 			if (response && isRateLimited(response)) {
-				logger.debug(`Rate limited on URL ${url}: ${response.status} ${response.statusText}, attempt ${i + 1}/${maxRetries + 1}, waiting before retry...`);
 				lastErrorMessage = `Rate limited: ${response.status} ${response.statusText}`;
+				if (i >= maxRetries) {
+					logger.debug(`Rate limited on URL ${url}: ${response.status} ${response.statusText}, attempt ${i + 1}/${maxRetries + 1}, no retries remain.`);
+					break;
+				}
+				logger.debug(`Rate limited on URL ${url}: ${response.status} ${response.statusText}, attempt ${i + 1}/${maxRetries + 1}, waiting before retry...`);
 				await handleRateLimit(response);
 				continue;
 			}
 			return response;
 		} catch (error) {
 			if (error instanceof Error && error.name === "AbortError") throw error;
-			let errorMessage;
-			if (error instanceof Error) {
-				const typedError = error;
-				errorMessage = `${typedError.name}: ${typedError.message}`;
-				if (typedError.cause) errorMessage += ` (Cause: ${typedError.cause})`;
-				if (typedError.code) errorMessage += ` (Code: ${typedError.code})`;
-			} else errorMessage = String(error);
+			const errorMessage = formatFetchErrorMessage(error);
 			logger.debug(`Request to ${url} failed (attempt #${i + 1}), retrying: ${errorMessage}`);
 			if (i < maxRetries) await sleep(Math.pow(2, i) * (backoff + 1e3 * Math.random()));
 			lastErrorMessage = errorMessage;
@@ -935,6 +988,6 @@ async function fetchWithRetries(url, options = {}, timeout, maxRetries) {
 	throw new Error(`Request failed after ${maxRetries} retries: ${lastErrorMessage}`);
 }
 //#endregion
-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 };
+export { CONSENT_ENDPOINT as A, transformTools as C, writeGlobalConfig as D, readGlobalConfig as E, getShareApiBaseUrl as F, getShareViewBaseUrl as I, FILE_METADATA_KEY as L, R_ENDPOINT as M, TERMINAL_MAX_WIDTH as N, writeGlobalConfigPartial as O, getDefaultShareViewBaseUrl as P, HUMAN_ASSERTION_TYPE as R, transformToolChoice as S, cloudConfig as T, isPromptfooSampleTarget as _, getFetchWithProxyHeaders as a, parseChatPrompt as b, getCurrentTimestamp as c, parseRetryAfter as d, LONG_RUNNING_MODEL_TIMEOUT_MS as f, isOpenAIToolChoice as g, isOpenAIToolArray as h, fetch_exports as i, EVENTS_ENDPOINT as j, CLOUD_PROVIDER_PREFIX as k, sleep as l, calculateCost as m, fetchWithRetries as n, withFetchRetryContext as o, REQUEST_TIMEOUT_MS as p, fetchWithTimeout as r, isPromptfooCloudApiHost as s, fetchWithProxy as t, parseRateLimitHeaders as u, openaiToolChoiceToBedrock as v, CloudConfig as w, toTitleCase as x, openaiToolsToBedrock as y };
 
-//# sourceMappingURL=fetch-Di00EQrc.js.map
+//# sourceMappingURL=fetch-It34O8Ur.js.map

package/dist/src/fetch-_YgGd2qv.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+import { n as fetchWithProxy } from "./fetch-DXUnXkVU.js";
+export { fetchWithProxy };