promptfoo 0.121.2 → 0.121.4

package/dist/src/{fetch-Dxpd4_sr.js → fetch-BEWnXrrG.js}

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
-import { C as getEnvString, O as state, S as getEnvInt, a as logRequestResponse, b as getEnvBool, o as logger, u as sanitizeUrl } from "./logger-KkObSCzq.js";
+import { D as getEnvInt, N as state, O as getEnvString, T as getEnvBool, h as sanitizeUrl, o as logRequestResponse, s as logger } from "./logger-DksKw1Qc.js";
 import { t as invariant } from "./invariant-BtWWVVhl.js";
-import { a as cloudConfig } from "./cloud-C0dlstV_.js";
-import { Agent, ProxyAgent } from "undici";
+import { a as cloudConfig } from "./cloud-DQZ5sVjW.js";
 import path from "path";
 import yaml from "js-yaml";
 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
@@ -22,7 +22,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.
@@ -149,7 +149,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 {
@@ -285,6 +285,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);
@@ -371,9 +520,8 @@ async function monkeyPatchFetch(url, options) {
 }
 //#endregion
 //#region src/util/fetch/index.ts
-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).
@@ -393,44 +541,44 @@ function getConnectionPoolSize() {
 * Exported for testing only.
 */
 function clearAgentCache() {
-	if (cachedAgent && typeof cachedAgent.close === "function") cachedAgent.close();
-	cachedAgent = null;
-	cachedAgentConcurrency = void 0;
+	for (const agent of cachedAgents.values()) if (typeof agent.close === "function") agent.close();
+	cachedAgents.clear();
 	for (const agent of cachedProxyAgents.values()) if (typeof agent.close === "function") agent.close();
-	cachedProxyAgents = /* @__PURE__ */ new Map();
+	cachedProxyAgents.clear();
 }
 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;
@@ -532,12 +680,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);
 }
@@ -593,6 +743,6 @@ async function fetchWithRetries(url, options = {}, timeout, maxRetries) {
 	throw new Error(`Request failed after ${maxRetries} retries: ${lastErrorMessage}`);
 }
 //#endregion
-export { getShareApiBaseUrl as A, CLOUD_PROVIDER_PREFIX as C, TERMINAL_MAX_WIDTH as D, R_ENDPOINT as E, HUMAN_ASSERTION_TYPE as F, POSTHOG_KEY as M, VERSION as N, getDefaultPort as O, FILE_METADATA_KEY as P, transformTools as S, EVENTS_ENDPOINT as T, openaiToolChoiceToBedrock as _, handleRateLimit as a, toTitleCase as b, getCurrentTimestamp as c, LONG_RUNNING_MODEL_TIMEOUT_MS as d, REQUEST_TIMEOUT_MS as f, isPromptfooSampleTarget as g, isOpenAIToolChoice as h, fetchWithTimeout as i, getShareViewBaseUrl as j, getDefaultShareViewBaseUrl as k, sleep as l, isOpenAIToolArray as m, fetchWithProxy as n, isRateLimited as o, calculateCost as p, fetchWithRetries as r, isTransientError as s, clearAgentCache as t, sleepWithAbort as u, openaiToolsToBedrock as v, CONSENT_ENDPOINT as w, transformToolChoice as x, parseChatPrompt as y };
+export { getDefaultPort as A, transformToolChoice as C, EVENTS_ENDPOINT as D, CONSENT_ENDPOINT as E, VERSION as F, FILE_METADATA_KEY as I, HUMAN_ASSERTION_TYPE as L, getShareApiBaseUrl as M, getShareViewBaseUrl as N, R_ENDPOINT as O, POSTHOG_KEY as P, toTitleCase as S, CLOUD_PROVIDER_PREFIX as T, isOpenAIToolChoice as _, handleRateLimit as a, openaiToolsToBedrock as b, getCurrentTimestamp as c, parseRateLimitHeaders as d, parseRetryAfter as f, isOpenAIToolArray as g, calculateCost as h, fetchWithTimeout as i, getDefaultShareViewBaseUrl as j, TERMINAL_MAX_WIDTH as k, sleep as l, REQUEST_TIMEOUT_MS as m, fetchWithProxy as n, isRateLimited as o, LONG_RUNNING_MODEL_TIMEOUT_MS as p, fetchWithRetries as r, isTransientError as s, clearAgentCache as t, sleepWithAbort as u, isPromptfooSampleTarget as v, transformTools as w, parseChatPrompt as x, openaiToolChoiceToBedrock as y };
 
-//# sourceMappingURL=fetch-Dxpd4_sr.js.map
+//# sourceMappingURL=fetch-BEWnXrrG.js.map

package/dist/src/fetch-C7bGKDlQ.js

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

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

@@ -1,4 +1,4 @@
-const require_logger = require("./logger-Cp1GPUjj.cjs");
+const require_logger = require("./logger-COuQb2xB.cjs");
 const require_invariant = require("./invariant-kfQ8Bu82.cjs");
 let fs = require("fs");
 fs = require_logger.__toESM(fs);
@@ -25,7 +25,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.
@@ -149,7 +149,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 {
@@ -285,6 +285,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);
@@ -417,7 +566,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}` } });
@@ -427,19 +586,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;
@@ -449,6 +600,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;
 	}
@@ -563,9 +724,8 @@ var fetch_exports = /* @__PURE__ */ require_logger.__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).
@@ -582,36 +742,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 undici.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 undici.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 undici.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 undici.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;
@@ -713,12 +874,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;
 	require_logger.logger.debug(`Rate limited, waiting ${waitTime}ms before retry`);
 	await sleep(waitTime);
 }
@@ -942,6 +1105,18 @@ Object.defineProperty(exports, "parseChatPrompt", {
 		return parseChatPrompt;
 	}
 });
+Object.defineProperty(exports, "parseRateLimitHeaders", {
+	enumerable: true,
+	get: function() {
+		return parseRateLimitHeaders;
+	}
+});
+Object.defineProperty(exports, "parseRetryAfter", {
+	enumerable: true,
+	get: function() {
+		return parseRetryAfter;
+	}
+});
 Object.defineProperty(exports, "readGlobalConfig", {
 	enumerable: true,
 	get: function() {
@@ -985,4 +1160,4 @@ Object.defineProperty(exports, "writeGlobalConfigPartial", {
 	}
 });
 
-//# sourceMappingURL=fetch-BPkYtG8K.cjs.map
+//# sourceMappingURL=fetch-CJU5ELPa.cjs.map