promptfoo 0.121.4 → 0.121.7

package/dist/src/{fetch-CJU5ELPa.cjs → fetch-Dw4XZHjj.cjs}

@@ -1,16 +1,19 @@
-const require_logger = require("./logger-COuQb2xB.cjs");
-const require_invariant = require("./invariant-kfQ8Bu82.cjs");
+const require_rolldown_runtime = require("./rolldown-runtime-D_mwlA32.cjs");
+const require_logger = require("./logger-cfNpzI4o.cjs");
+const require_invariant = require("./invariant-QtnLD03y.cjs");
+const require_version = require("./version-BWCSaByA.cjs");
 let fs = require("fs");
-fs = require_logger.__toESM(fs);
+fs = require_rolldown_runtime.__toESM(fs, 1);
 let path = require("path");
-path = require_logger.__toESM(path);
+path = require_rolldown_runtime.__toESM(path, 1);
 let js_yaml = require("js-yaml");
-js_yaml = require_logger.__toESM(js_yaml);
-let util = require("util");
+js_yaml = require_rolldown_runtime.__toESM(js_yaml, 1);
+let node_async_hooks = require("node:async_hooks");
 let fs_promises = require("fs/promises");
-fs_promises = require_logger.__toESM(fs_promises);
+fs_promises = require_rolldown_runtime.__toESM(fs_promises, 1);
 let proxy_from_env = require("proxy-from-env");
 let undici = require("undici");
+let util = require("util");
 let zlib = require("zlib");
 //#region src/providers/constants.ts
 const FILE_METADATA_KEY = "_promptfooFileMetadata";
@@ -19,19 +22,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 require_logger.getEnvString("PROMPTFOO_REMOTE_API_BASE_URL") || "https://api.promptfoo.app";
 }
@@ -47,6 +37,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.writeFileSync(path.join(require_logger.getConfigDirectoryPath(true), "promptfoo.yaml"), js_yaml.default.dump(config));
+}
+function readGlobalConfig() {
+	const configDir = require_logger.getConfigDirectoryPath();
+	const configFilePath = path.join(configDir, "promptfoo.yaml");
+	let globalConfig = { id: crypto.randomUUID() };
+	if (fs.existsSync(configFilePath)) {
+		globalConfig = js_yaml.default.load(fs.readFileSync(configFilePath, "utf-8")) || {};
+		if (!globalConfig?.id) {
+			globalConfig = {
+				...globalConfig,
+				id: crypto.randomUUID()
+			};
+			writeGlobalConfig(globalConfig);
+		}
+	} else {
+		if (!fs.existsSync(configDir)) fs.mkdirSync(configDir, { recursive: true });
+		fs.writeFileSync(configFilePath, js_yaml.default.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 = require_logger.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();
+				require_logger.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);
+			require_logger.logger.error(`[Cloud] Failed to validate API token with host ${apiHost}: ${errorMessage}`);
+			if (error.cause) require_logger.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.
@@ -71,8 +278,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;
 }
 /**
@@ -440,220 +648,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.writeFileSync(path.join(require_logger.getConfigDirectoryPath(true), "promptfoo.yaml"), js_yaml.default.dump(config));
-}
-function readGlobalConfig() {
-	const configDir = require_logger.getConfigDirectoryPath();
-	const configFilePath = path.join(configDir, "promptfoo.yaml");
-	let globalConfig = { id: crypto.randomUUID() };
-	if (fs.existsSync(configFilePath)) {
-		globalConfig = js_yaml.default.load(fs.readFileSync(configFilePath, "utf-8")) || {};
-		if (!globalConfig?.id) {
-			globalConfig = {
-				...globalConfig,
-				id: crypto.randomUUID()
-			};
-			writeGlobalConfig(globalConfig);
-		}
-	} else {
-		if (!fs.existsSync(configDir)) fs.mkdirSync(configDir, { recursive: true });
-		fs.writeFileSync(configFilePath, js_yaml.default.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 = require_logger.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();
-				require_logger.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);
-			require_logger.logger.error(`[Cloud] Failed to validate API token with host ${apiHost}: ${errorMessage}`);
-			if (error.cause) require_logger.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 = (0, util.promisify)(zlib.gzip);
 function isConnectionError(error) {
@@ -662,6 +656,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,
@@ -681,7 +683,7 @@ async function monkeyPatchFetch(url, options) {
 	} catch (e) {
 		require_logger.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 || {},
@@ -715,11 +717,31 @@ async function monkeyPatchFetch(url, options) {
 	}
 }
 //#endregion
+//#region src/util/fetch/retryContext.ts
+const fetchRetryContext = new node_async_hooks.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__ */ require_logger.__exportAll({
+var fetch_exports = /* @__PURE__ */ require_rolldown_runtime.__exportAll({
 	fetchWithProxy: () => fetchWithProxy,
 	fetchWithRetries: () => fetchWithRetries,
 	fetchWithTimeout: () => fetchWithTimeout,
+	getFetchWithProxyHeaders: () => getFetchWithProxyHeaders,
 	handleRateLimit: () => handleRateLimit,
 	isRateLimited: () => isRateLimited,
 	isTransientError: () => isTransientError
@@ -774,20 +796,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": require_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 {
@@ -825,10 +871,11 @@ async function fetchWithProxy(url, options = {}, abortSignal) {
 		require_logger.logger.debug(`Using proxy: ${require_logger.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;
 			require_logger.logger.debug(`Transient error (${response.status} ${response.statusText}), retry ${attempt + 1}/${maxTransientRetries} after ${backoffMs}ms`);
 			await sleep(backoffMs);
@@ -901,8 +948,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 = require_logger.getEnvInt("PROMPTFOO_REQUEST_BACKOFF_MS", 5e3);
 	for (let i = 0; i <= maxRetries; i++) {
@@ -914,21 +970,19 @@ async function fetchWithRetries(url, options = {}, timeout, maxRetries) {
 			}, timeout);
 			if (require_logger.getEnvBool("PROMPTFOO_RETRY_5XX") && response.status >= 500 && response.status < 600) throw new Error(`Internal Server Error: ${response.status} ${response.statusText}`);
 			if (response && isRateLimited(response)) {
-				require_logger.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) {
+					require_logger.logger.debug(`Rate limited on URL ${url}: ${response.status} ${response.statusText}, attempt ${i + 1}/${maxRetries + 1}, no retries remain.`);
+					break;
+				}
+				require_logger.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);
 			require_logger.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;
@@ -979,12 +1033,6 @@ Object.defineProperty(exports, "LONG_RUNNING_MODEL_TIMEOUT_MS", {
 		return LONG_RUNNING_MODEL_TIMEOUT_MS;
 	}
 });
-Object.defineProperty(exports, "POSTHOG_KEY", {
-	enumerable: true,
-	get: function() {
-		return POSTHOG_KEY;
-	}
-});
 Object.defineProperty(exports, "REQUEST_TIMEOUT_MS", {
 	enumerable: true,
 	get: function() {
@@ -1003,12 +1051,6 @@ Object.defineProperty(exports, "TERMINAL_MAX_WIDTH", {
 		return TERMINAL_MAX_WIDTH;
 	}
 });
-Object.defineProperty(exports, "VERSION", {
-	enumerable: true,
-	get: function() {
-		return VERSION;
-	}
-});
 Object.defineProperty(exports, "calculateCost", {
 	enumerable: true,
 	get: function() {
@@ -1057,6 +1099,12 @@ Object.defineProperty(exports, "getDefaultShareViewBaseUrl", {
 		return getDefaultShareViewBaseUrl;
 	}
 });
+Object.defineProperty(exports, "getFetchWithProxyHeaders", {
+	enumerable: true,
+	get: function() {
+		return getFetchWithProxyHeaders;
+	}
+});
 Object.defineProperty(exports, "getShareApiBaseUrl", {
 	enumerable: true,
 	get: function() {
@@ -1081,6 +1129,12 @@ Object.defineProperty(exports, "isOpenAIToolChoice", {
 		return isOpenAIToolChoice;
 	}
 });
+Object.defineProperty(exports, "isPromptfooCloudApiHost", {
+	enumerable: true,
+	get: function() {
+		return isPromptfooCloudApiHost;
+	}
+});
 Object.defineProperty(exports, "isPromptfooSampleTarget", {
 	enumerable: true,
 	get: function() {
@@ -1147,6 +1201,12 @@ Object.defineProperty(exports, "transformTools", {
 		return transformTools;
 	}
 });
+Object.defineProperty(exports, "withFetchRetryContext", {
+	enumerable: true,
+	get: function() {
+		return withFetchRetryContext;
+	}
+});
 Object.defineProperty(exports, "writeGlobalConfig", {
 	enumerable: true,
 	get: function() {
@@ -1160,4 +1220,4 @@ Object.defineProperty(exports, "writeGlobalConfigPartial", {
 	}
 });
 
-//# sourceMappingURL=fetch-CJU5ELPa.cjs.map
+//# sourceMappingURL=fetch-Dw4XZHjj.cjs.map