promptfoo 0.120.26 → 0.121.1

package/dist/drizzle/meta/_journal.json

@@ -162,6 +162,13 @@
       "when": 1765906817572,
       "tag": "0022_sleepy_ultimo",
       "breakpoints": true
+    },
+    {
+      "idx": 23,
+      "version": "6",
+      "when": 1767985150681,
+      "tag": "0023_wooden_mandrill",
+      "breakpoints": true
     }
   ]
 }

package/dist/src/{ListApp-D3DG0F8h.js → ListApp-Du7YVwj5.js}

@@ -2,7 +2,6 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { Box, Text, useApp, useInput } from "ink";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-
 //#region src/ui/init/components/shared/TextInput.tsx
 /**
 * TextInput - Single-line text input component.
@@ -103,7 +102,6 @@ function TextInput({ value, onChange, onSubmit, placeholder = "", isFocused = tr
 		]
 	});
 }
-
 //#endregion
 //#region src/ui/list/ListApp.tsx
 /**
@@ -575,7 +573,7 @@ function ListApp({ resourceType, items: initialItems = [], onSelect, onExit, onL
 		]
 	});
 }
-
 //#endregion
 export { ListApp };
-//# sourceMappingURL=ListApp-D3DG0F8h.js.map
+
+//# sourceMappingURL=ListApp-Du7YVwj5.js.map

package/dist/src/accounts-BgNJDBE6.js

@@ -0,0 +1,206 @@
+import { C as isCI, b as getEnvString, i as logger } from "./logger-DLcq4dWf.js";
+import { O as TERMINAL_MAX_WIDTH, a as CloudConfig, c as writeGlobalConfig, l as writeGlobalConfigPartial, r as fetchWithTimeout, s as readGlobalConfig } from "./fetch-4M3YRaqL.js";
+import chalk from "chalk";
+import input from "@inquirer/input";
+import { z } from "zod";
+const BAD_EMAIL_RESULT = "bad_email";
+const EmailValidationStatus = {
+	OK: "ok",
+	EXCEEDED_LIMIT: "exceeded_limit",
+	SHOW_USAGE_WARNING: "show_usage_warning",
+	EMAIL_VERIFICATION_REQUIRED: "email_verification_required",
+	RISKY_EMAIL: "risky_email",
+	DISPOSABLE_EMAIL: "disposable_email"
+};
+const NO_EMAIL_STATUS = "no_email";
+//#endregion
+//#region src/globalConfig/accounts.ts
+const CI_PLACEHOLDER_EMAIL = "ci-placeholder@promptfoo.dev";
+function getUserId() {
+	let globalConfig = readGlobalConfig();
+	if (!globalConfig?.id) {
+		const newId = crypto.randomUUID();
+		globalConfig = {
+			...globalConfig,
+			id: newId
+		};
+		writeGlobalConfig(globalConfig);
+		return newId;
+	}
+	return globalConfig.id;
+}
+function getUserEmail() {
+	return readGlobalConfig()?.account?.email || null;
+}
+function setUserEmail(email) {
+	const account = readGlobalConfig()?.account ?? {};
+	account.email = email;
+	writeGlobalConfigPartial({ account });
+}
+function clearUserEmail() {
+	const account = readGlobalConfig()?.account ?? {};
+	delete account.email;
+	writeGlobalConfigPartial({ account });
+}
+function getUserEmailNeedsValidation() {
+	return readGlobalConfig()?.account?.emailNeedsValidation || false;
+}
+function setUserEmailNeedsValidation(needsValidation) {
+	const account = readGlobalConfig()?.account ?? {};
+	account.emailNeedsValidation = needsValidation;
+	writeGlobalConfigPartial({ account });
+}
+function getUserEmailValidated() {
+	return readGlobalConfig()?.account?.emailValidated || false;
+}
+function setUserEmailValidated(validated) {
+	const account = readGlobalConfig()?.account ?? {};
+	account.emailValidated = validated;
+	writeGlobalConfigPartial({ account });
+}
+function getAuthor() {
+	return getEnvString("PROMPTFOO_AUTHOR") || getUserEmail() || null;
+}
+function isLoggedIntoCloud() {
+	return new CloudConfig().isEnabled();
+}
+/**
+* Get the authentication method used for cloud access
+* @returns 'api-key' | 'email' | 'none'
+*/
+function getAuthMethod() {
+	const hasApiKey = new CloudConfig().isEnabled();
+	const hasEmail = !!getUserEmail();
+	if (hasApiKey && hasEmail) return "api-key";
+	if (hasApiKey) return "api-key";
+	if (hasEmail) return "email";
+	return "none";
+}
+/**
+* Shared function to check email status with the promptfoo API
+* Used by both CLI and server routes
+*/
+async function checkEmailStatus(options) {
+	const { default: telemetry } = await import("./telemetry-DMb2Mpfm.js").then((n) => n.r);
+	const ciMode = isCI();
+	const userEmail = ciMode ? CI_PLACEHOLDER_EMAIL : getUserEmail();
+	if (!userEmail) return {
+		status: NO_EMAIL_STATUS,
+		hasEmail: false,
+		message: "Redteam evals require email verification. Please enter your work email:"
+	};
+	if (ciMode) return {
+		status: EmailValidationStatus.OK,
+		hasEmail: true,
+		email: userEmail
+	};
+	try {
+		const validateParam = options?.validate ? "&validate=true" : "";
+		const timeout = options?.validate ? 3e3 : 500;
+		if (options?.validate) logger.info(`Checking email...`);
+		const data = await (await fetchWithTimeout(`${getEnvString("PROMPTFOO_CLOUD_API_URL", "https://api.promptfoo.app")}/api/users/status?email=${encodeURIComponent(userEmail)}${validateParam}`, void 0, timeout)).json();
+		if (options?.validate) if (new Set([
+			EmailValidationStatus.RISKY_EMAIL,
+			EmailValidationStatus.DISPOSABLE_EMAIL,
+			EmailValidationStatus.EMAIL_VERIFICATION_REQUIRED
+		]).has(data.status)) {
+			if (data.status === EmailValidationStatus.EMAIL_VERIFICATION_REQUIRED) {
+				setUserEmailValidated(false);
+				setUserEmailNeedsValidation(true);
+			}
+			if (data.status === EmailValidationStatus.RISKY_EMAIL || data.status === EmailValidationStatus.DISPOSABLE_EMAIL) await telemetry.saveConsent(userEmail, { source: "filteredInvalidEmail" });
+		} else {
+			setUserEmailValidated(true);
+			await telemetry.saveConsent(userEmail, { source: "promptForEmailValidated" });
+		}
+		return {
+			status: data.status,
+			message: data.message ?? data.error,
+			email: userEmail,
+			hasEmail: true
+		};
+	} catch (e) {
+		logger.debug(`Failed to check user status: ${e}`);
+		return {
+			status: EmailValidationStatus.OK,
+			message: "Unable to verify email status, but proceeding",
+			email: userEmail,
+			hasEmail: true
+		};
+	}
+}
+async function promptForEmailUnverified() {
+	const { default: telemetry } = await import("./telemetry-DMb2Mpfm.js").then((n) => n.r);
+	const ciMode = isCI();
+	const existingEmail = getUserEmail();
+	let email = ciMode ? CI_PLACEHOLDER_EMAIL : existingEmail;
+	const existingEmailNeedsValidation = !ciMode && getUserEmailNeedsValidation();
+	const existingEmailValidated = ciMode || getUserEmailValidated();
+	let emailNeedsValidation = existingEmailNeedsValidation && !existingEmailValidated;
+	if (!email) {
+		await telemetry.record("feature_used", { feature: "promptForEmailUnverified" });
+		const border = "─".repeat(TERMINAL_MAX_WIDTH);
+		logger.info("");
+		logger.info(chalk.cyan(border));
+		logger.info(chalk.cyan.bold("  Email Verification Required"));
+		logger.info(chalk.cyan(border));
+		logger.info("");
+		logger.info("  Red team scans require email verification to continue.");
+		logger.info("");
+		const emailSchema = z.email();
+		try {
+			email = await input({
+				message: chalk.bold("Work email:"),
+				validate: (input) => {
+					const result = emailSchema.safeParse(input);
+					return result.success || result.error.issues[0].message;
+				}
+			});
+		} catch (error) {
+			const err = error;
+			if (err?.name === "AbortPromptError" || err?.name === "ExitPromptError") process.exit(1);
+			logger.error(`failed to prompt for email: ${err}`);
+			throw err;
+		}
+		setUserEmail(email);
+		setUserEmailNeedsValidation(true);
+		setUserEmailValidated(false);
+		emailNeedsValidation = true;
+		await telemetry.record("feature_used", { feature: "userCompletedPromptForEmailUnverified" });
+	}
+	return { emailNeedsValidation };
+}
+async function checkEmailStatusAndMaybeExit(options) {
+	const result = await checkEmailStatus(options);
+	if (isCI()) return "ok";
+	if (result.status === EmailValidationStatus.RISKY_EMAIL || result.status === EmailValidationStatus.DISPOSABLE_EMAIL) {
+		logger.error("Please use a valid work email.");
+		setUserEmail("");
+		return BAD_EMAIL_RESULT;
+	}
+	if (result.status === EmailValidationStatus.EXCEEDED_LIMIT) {
+		logger.error("You have exceeded the maximum cloud inference limit. Please contact inquiries@promptfoo.dev to upgrade your account.");
+		process.exit(1);
+	}
+	if (result.status === EmailValidationStatus.EMAIL_VERIFICATION_REQUIRED) {
+		setUserEmailNeedsValidation(true);
+		setUserEmailValidated(false);
+		const message = result.message || "Your email address is not verified. Check your inbox for a verification link, then rerun the command.";
+		logger.error(message, {
+			status: result.status,
+			hasEmail: result.hasEmail
+		});
+		process.exit(1);
+	}
+	if (result.status === EmailValidationStatus.SHOW_USAGE_WARNING && result.message) {
+		const border = "=".repeat(TERMINAL_MAX_WIDTH);
+		logger.info(chalk.yellow(border));
+		logger.warn(chalk.yellow(result.message));
+		logger.info(chalk.yellow(border));
+	}
+	return "ok";
+}
+//#endregion
+export { getAuthor as a, isLoggedIntoCloud as c, getAuthMethod as i, promptForEmailUnverified as l, checkEmailStatusAndMaybeExit as n, getUserEmail as o, clearUserEmail as r, getUserId as s, checkEmailStatus as t, setUserEmail as u };
+
+//# sourceMappingURL=accounts-BgNJDBE6.js.map

package/dist/src/{accounts-BzEY8H3v.cjs → accounts-Bx-x3bmW.cjs}

@@ -1,25 +1,23 @@
-const require_logger = require('./logger-BdZ-IqBc.cjs');
-const require_fetch = require('./fetch-ZMn_oemb.cjs');
+const require_logger = require("./logger-Cp1GPUjj.cjs");
+const require_fetch = require("./fetch-BxUk8odA.cjs");
 let chalk = require("chalk");
 chalk = require_logger.__toESM(chalk);
 let zod = require("zod");
 let _inquirer_input = require("@inquirer/input");
 _inquirer_input = require_logger.__toESM(_inquirer_input);
-
-//#region src/types/email.ts
-const EMAIL_OK_STATUS = "ok";
 const BAD_EMAIL_RESULT = "bad_email";
 const EmailValidationStatus = {
-	OK: EMAIL_OK_STATUS,
+	OK: "ok",
 	EXCEEDED_LIMIT: "exceeded_limit",
 	SHOW_USAGE_WARNING: "show_usage_warning",
+	EMAIL_VERIFICATION_REQUIRED: "email_verification_required",
 	RISKY_EMAIL: "risky_email",
 	DISPOSABLE_EMAIL: "disposable_email"
 };
 const NO_EMAIL_STATUS = "no_email";
-
 //#endregion
 //#region src/globalConfig/accounts.ts
+const CI_PLACEHOLDER_EMAIL = "ci-placeholder@promptfoo.dev";
 function getUserId() {
 	let globalConfig = require_fetch.readGlobalConfig();
 	if (!globalConfig?.id) {
@@ -80,31 +78,46 @@ function getAuthMethod() {
 * Used by both CLI and server routes
 */
 async function checkEmailStatus(options) {
-	const { default: telemetry } = await Promise.resolve().then(() => require("./telemetry-LojxPoFq.cjs"));
-	const userEmail = require_logger.isCI() ? "ci-placeholder@promptfoo.dev" : getUserEmail();
+	const { default: telemetry } = await Promise.resolve().then(() => require("./telemetry-5BCRNBbe.cjs"));
+	const ciMode = require_logger.isCI();
+	const userEmail = ciMode ? CI_PLACEHOLDER_EMAIL : getUserEmail();
 	if (!userEmail) return {
 		status: NO_EMAIL_STATUS,
 		hasEmail: false,
 		message: "Redteam evals require email verification. Please enter your work email:"
 	};
+	if (ciMode) return {
+		status: EmailValidationStatus.OK,
+		hasEmail: true,
+		email: userEmail
+	};
 	try {
 		const validateParam = options?.validate ? "&validate=true" : "";
 		const timeout = options?.validate ? 3e3 : 500;
-		if (options?.validate) require_logger.logger_default.info(`Checking email...`);
+		if (options?.validate) require_logger.logger.info(`Checking email...`);
 		const data = await (await require_fetch.fetchWithTimeout(`${require_logger.getEnvString("PROMPTFOO_CLOUD_API_URL", "https://api.promptfoo.app")}/api/users/status?email=${encodeURIComponent(userEmail)}${validateParam}`, void 0, timeout)).json();
-		if (options?.validate) if (new Set([EmailValidationStatus.RISKY_EMAIL, EmailValidationStatus.DISPOSABLE_EMAIL]).has(data.status)) await telemetry.saveConsent(userEmail, { source: "filteredInvalidEmail" });
-		else {
+		if (options?.validate) if (new Set([
+			EmailValidationStatus.RISKY_EMAIL,
+			EmailValidationStatus.DISPOSABLE_EMAIL,
+			EmailValidationStatus.EMAIL_VERIFICATION_REQUIRED
+		]).has(data.status)) {
+			if (data.status === EmailValidationStatus.EMAIL_VERIFICATION_REQUIRED) {
+				setUserEmailValidated(false);
+				setUserEmailNeedsValidation(true);
+			}
+			if (data.status === EmailValidationStatus.RISKY_EMAIL || data.status === EmailValidationStatus.DISPOSABLE_EMAIL) await telemetry.saveConsent(userEmail, { source: "filteredInvalidEmail" });
+		} else {
 			setUserEmailValidated(true);
 			await telemetry.saveConsent(userEmail, { source: "promptForEmailValidated" });
 		}
 		return {
 			status: data.status,
-			message: data.message,
+			message: data.message ?? data.error,
 			email: userEmail,
 			hasEmail: true
 		};
 	} catch (e) {
-		require_logger.logger_default.debug(`Failed to check user status: ${e}`);
+		require_logger.logger.debug(`Failed to check user status: ${e}`);
 		return {
 			status: EmailValidationStatus.OK,
 			message: "Unable to verify email status, but proceeding",
@@ -114,22 +127,23 @@ async function checkEmailStatus(options) {
 	}
 }
 async function promptForEmailUnverified() {
-	const { default: telemetry } = await Promise.resolve().then(() => require("./telemetry-LojxPoFq.cjs"));
+	const { default: telemetry } = await Promise.resolve().then(() => require("./telemetry-5BCRNBbe.cjs"));
+	const ciMode = require_logger.isCI();
 	const existingEmail = getUserEmail();
-	let email = require_logger.isCI() ? "ci-placeholder@promptfoo.dev" : existingEmail;
-	const existingEmailNeedsValidation = !require_logger.isCI() && getUserEmailNeedsValidation();
-	const existingEmailValidated = require_logger.isCI() || getUserEmailValidated();
+	let email = ciMode ? CI_PLACEHOLDER_EMAIL : existingEmail;
+	const existingEmailNeedsValidation = !ciMode && getUserEmailNeedsValidation();
+	const existingEmailValidated = ciMode || getUserEmailValidated();
 	let emailNeedsValidation = existingEmailNeedsValidation && !existingEmailValidated;
 	if (!email) {
 		await telemetry.record("feature_used", { feature: "promptForEmailUnverified" });
 		const border = "─".repeat(require_fetch.TERMINAL_MAX_WIDTH);
-		require_logger.logger_default.info("");
-		require_logger.logger_default.info(chalk.default.cyan(border));
-		require_logger.logger_default.info(chalk.default.cyan.bold("  Email Verification Required"));
-		require_logger.logger_default.info(chalk.default.cyan(border));
-		require_logger.logger_default.info("");
-		require_logger.logger_default.info("  Red team scans require email verification to continue.");
-		require_logger.logger_default.info("");
+		require_logger.logger.info("");
+		require_logger.logger.info(chalk.default.cyan(border));
+		require_logger.logger.info(chalk.default.cyan.bold("  Email Verification Required"));
+		require_logger.logger.info(chalk.default.cyan(border));
+		require_logger.logger.info("");
+		require_logger.logger.info("  Red team scans require email verification to continue.");
+		require_logger.logger.info("");
 		const emailSchema = zod.z.email();
 		try {
 			email = await (0, _inquirer_input.default)({
@@ -142,7 +156,7 @@ async function promptForEmailUnverified() {
 		} catch (error) {
 			const err = error;
 			if (err?.name === "AbortPromptError" || err?.name === "ExitPromptError") process.exit(1);
-			require_logger.logger_default.error(`failed to prompt for email: ${err}`);
+			require_logger.logger.error(`failed to prompt for email: ${err}`);
 			throw err;
 		}
 		setUserEmail(email);
@@ -155,77 +169,82 @@ async function promptForEmailUnverified() {
 }
 async function checkEmailStatusAndMaybeExit(options) {
 	const result = await checkEmailStatus(options);
+	if (require_logger.isCI()) return "ok";
 	if (result.status === EmailValidationStatus.RISKY_EMAIL || result.status === EmailValidationStatus.DISPOSABLE_EMAIL) {
-		require_logger.logger_default.error("Please use a valid work email.");
+		require_logger.logger.error("Please use a valid work email.");
 		setUserEmail("");
 		return BAD_EMAIL_RESULT;
 	}
 	if (result.status === EmailValidationStatus.EXCEEDED_LIMIT) {
-		require_logger.logger_default.error("You have exceeded the maximum cloud inference limit. Please contact inquiries@promptfoo.dev to upgrade your account.");
+		require_logger.logger.error("You have exceeded the maximum cloud inference limit. Please contact inquiries@promptfoo.dev to upgrade your account.");
+		process.exit(1);
+	}
+	if (result.status === EmailValidationStatus.EMAIL_VERIFICATION_REQUIRED) {
+		setUserEmailNeedsValidation(true);
+		setUserEmailValidated(false);
+		const message = result.message || "Your email address is not verified. Check your inbox for a verification link, then rerun the command.";
+		require_logger.logger.error(message, {
+			status: result.status,
+			hasEmail: result.hasEmail
+		});
 		process.exit(1);
 	}
 	if (result.status === EmailValidationStatus.SHOW_USAGE_WARNING && result.message) {
 		const border = "=".repeat(require_fetch.TERMINAL_MAX_WIDTH);
-		require_logger.logger_default.info(chalk.default.yellow(border));
-		require_logger.logger_default.warn(chalk.default.yellow(result.message));
-		require_logger.logger_default.info(chalk.default.yellow(border));
+		require_logger.logger.info(chalk.default.yellow(border));
+		require_logger.logger.warn(chalk.default.yellow(result.message));
+		require_logger.logger.info(chalk.default.yellow(border));
 	}
-	return EMAIL_OK_STATUS;
+	return "ok";
 }
-
 //#endregion
-Object.defineProperty(exports, 'EMAIL_OK_STATUS', {
-  enumerable: true,
-  get: function () {
-    return EMAIL_OK_STATUS;
-  }
-});
-Object.defineProperty(exports, 'checkEmailStatusAndMaybeExit', {
-  enumerable: true,
-  get: function () {
-    return checkEmailStatusAndMaybeExit;
-  }
+Object.defineProperty(exports, "checkEmailStatusAndMaybeExit", {
+	enumerable: true,
+	get: function() {
+		return checkEmailStatusAndMaybeExit;
+	}
 });
-Object.defineProperty(exports, 'getAuthMethod', {
-  enumerable: true,
-  get: function () {
-    return getAuthMethod;
-  }
+Object.defineProperty(exports, "getAuthMethod", {
+	enumerable: true,
+	get: function() {
+		return getAuthMethod;
+	}
 });
-Object.defineProperty(exports, 'getAuthor', {
-  enumerable: true,
-  get: function () {
-    return getAuthor;
-  }
+Object.defineProperty(exports, "getAuthor", {
+	enumerable: true,
+	get: function() {
+		return getAuthor;
+	}
 });
-Object.defineProperty(exports, 'getUserEmail', {
-  enumerable: true,
-  get: function () {
-    return getUserEmail;
-  }
+Object.defineProperty(exports, "getUserEmail", {
+	enumerable: true,
+	get: function() {
+		return getUserEmail;
+	}
 });
-Object.defineProperty(exports, 'getUserId', {
-  enumerable: true,
-  get: function () {
-    return getUserId;
-  }
+Object.defineProperty(exports, "getUserId", {
+	enumerable: true,
+	get: function() {
+		return getUserId;
+	}
 });
-Object.defineProperty(exports, 'isLoggedIntoCloud', {
-  enumerable: true,
-  get: function () {
-    return isLoggedIntoCloud;
-  }
+Object.defineProperty(exports, "isLoggedIntoCloud", {
+	enumerable: true,
+	get: function() {
+		return isLoggedIntoCloud;
+	}
 });
-Object.defineProperty(exports, 'promptForEmailUnverified', {
-  enumerable: true,
-  get: function () {
-    return promptForEmailUnverified;
-  }
+Object.defineProperty(exports, "promptForEmailUnverified", {
+	enumerable: true,
+	get: function() {
+		return promptForEmailUnverified;
+	}
 });
-Object.defineProperty(exports, 'setUserEmail', {
-  enumerable: true,
-  get: function () {
-    return setUserEmail;
-  }
+Object.defineProperty(exports, "setUserEmail", {
+	enumerable: true,
+	get: function() {
+		return setUserEmail;
+	}
 });
-//# sourceMappingURL=accounts-BzEY8H3v.cjs.map
+
+//# sourceMappingURL=accounts-Bx-x3bmW.cjs.map