promptfoo 0.121.3 → 0.121.5

package/dist/src/{sagemaker-jiw1wQa-.cjs → sagemaker-ljtY12VM.cjs}

@@ -1,10 +1,6 @@
-const require_logger = require("./logger-D5iKBpu_.cjs");
-require("./esm-CipptfDu.cjs");
-require("./pythonUtils-dAVigVK-.cjs");
-const require_transform = require("./transform-ZrG2dvlo.cjs");
-require("./fetch-BnR9wSnm.cjs");
-require("./accounts-BPyfpSeU.cjs");
-const require_telemetry = require("./telemetry-re627Lre.cjs");
+const require_logger = require("./logger-COuQb2xB.cjs");
+const require_transform = require("./transform-C9izGX54.cjs");
+const require_telemetry = require("./telemetry-CEQxGnMZ.cjs");
 let zod = require("zod");
 let crypto = require("crypto");
 crypto = require_logger.__toESM(crypto);
@@ -186,7 +182,7 @@ var SageMakerGenericProvider = class {
 				require_logger.logger.error(`Error executing inline transform: ${transformError}`);
 			}
 			else try {
-				const { TransformInputType } = await Promise.resolve().then(() => require("./transform-PtQ6rAE3.cjs"));
+				const { TransformInputType } = await Promise.resolve().then(() => require("./transform-Bq5oqC0s.cjs"));
 				const transformed = await require_transform.transform(transformFn, prompt, transformContext, false, TransformInputType.OUTPUT);
 				if (transformed === void 0 || transformed === null) {
 					require_logger.logger.debug("Transform function returned null or undefined, using original prompt");
@@ -213,7 +209,7 @@ var SageMakerGenericProvider = class {
 		if (!pathExpression) return responseJson;
 		try {
 			if (pathExpression.startsWith("file://")) try {
-				const { TransformInputType } = await Promise.resolve().then(() => require("./transform-PtQ6rAE3.cjs"));
+				const { TransformInputType } = await Promise.resolve().then(() => require("./transform-Bq5oqC0s.cjs"));
 				const transformedResult = await require_transform.transform(pathExpression, responseJson, { prompt: {} }, false, TransformInputType.OUTPUT);
 				return transformedResult !== void 0 && transformedResult !== null ? transformedResult : responseJson;
 			} catch (error) {
@@ -266,7 +262,7 @@ var SageMakerCompletionProvider = class extends SageMakerGenericProvider {
 	* Format the request payload based on model type
 	*/
 	formatPayload(prompt) {
-		const maxTokens = this.config.maxTokens || require_logger.getEnvInt("AWS_SAGEMAKER_MAX_TOKENS") || 1024;
+		const maxTokens = this.config.maxTokens ?? require_logger.getEnvInt("AWS_SAGEMAKER_MAX_TOKENS") ?? 1024;
 		const temperature = typeof this.config.temperature === "number" ? this.config.temperature : require_logger.getEnvFloat("AWS_SAGEMAKER_TEMPERATURE") ?? .7;
 		const topP = typeof this.config.topP === "number" ? this.config.topP : require_logger.getEnvFloat("AWS_SAGEMAKER_TOP_P") ?? 1;
 		const stopSequences = this.config.stopSequences || [];
@@ -408,7 +404,7 @@ var SageMakerCompletionProvider = class extends SageMakerGenericProvider {
 	* Invoke SageMaker endpoint for text generation with caching, delay support, and transformations
 	*/
 	async callApi(prompt, context, _options) {
-		const { isCacheEnabled, getCache } = await Promise.resolve().then(() => require("./cache-Df_QFDNu.cjs"));
+		const { isCacheEnabled, getCache } = await Promise.resolve().then(() => require("./cache-BRkhlH3k.cjs"));
 		const delayMs = context?.originalProvider?.delay || this.delay;
 		const transformedPrompt = await this.applyTransformation(prompt, context);
 		const isTransformed = transformedPrompt !== prompt;
@@ -420,7 +416,7 @@ var SageMakerCompletionProvider = class extends SageMakerGenericProvider {
 		const bustCache = context?.bustCache ?? context?.debug === true;
 		if (isCacheEnabled() && !bustCache) {
 			const cacheKey = this.getCacheKey(transformedPrompt);
-			const cachedResult = await (getCache ? getCache() : await Promise.resolve().then(() => require("./cache-Df_QFDNu.cjs")).then((m) => m.getCache())).get(cacheKey);
+			const cachedResult = await (getCache ? getCache() : await Promise.resolve().then(() => require("./cache-BRkhlH3k.cjs")).then((m) => m.getCache())).get(cacheKey);
 			if (cachedResult) {
 				require_logger.logger.debug(`Using cached SageMaker response for ${this.getEndpointName()}`);
 				try {
@@ -494,7 +490,7 @@ var SageMakerCompletionProvider = class extends SageMakerGenericProvider {
 			};
 			if (isCacheEnabled() && !bustCache && result.output && !result.error) {
 				const cacheKey = this.getCacheKey(transformedPrompt);
-				const cache = getCache ? getCache() : await Promise.resolve().then(() => require("./cache-Df_QFDNu.cjs")).then((m) => m.getCache());
+				const cache = getCache ? getCache() : await Promise.resolve().then(() => require("./cache-BRkhlH3k.cjs")).then((m) => m.getCache());
 				const resultToCache = JSON.stringify(result);
 				try {
 					await cache.set(cacheKey, resultToCache);
@@ -539,7 +535,7 @@ var SageMakerEmbeddingProvider = class extends SageMakerGenericProvider {
 	* Invoke SageMaker endpoint for embeddings with caching, delay support, and transformations
 	*/
 	async callEmbeddingApi(text, context) {
-		const { isCacheEnabled, getCache } = await Promise.resolve().then(() => require("./cache-Df_QFDNu.cjs"));
+		const { isCacheEnabled, getCache } = await Promise.resolve().then(() => require("./cache-BRkhlH3k.cjs"));
 		const delayMs = context?.originalProvider?.delay || this.delay;
 		const transformedText = await this.applyTransformation(text, context);
 		const isTransformed = transformedText !== text;
@@ -551,7 +547,7 @@ var SageMakerEmbeddingProvider = class extends SageMakerGenericProvider {
 		const bustCache = context?.debug === true;
 		if (isCacheEnabled() && !bustCache) {
 			const cacheKey = this.getCacheKey(transformedText);
-			const cachedResult = await (await getCache ? await getCache() : await Promise.resolve().then(() => require("./cache-Df_QFDNu.cjs")).then((m) => m.getCache())).get(cacheKey);
+			const cachedResult = await (await getCache ? await getCache() : await Promise.resolve().then(() => require("./cache-BRkhlH3k.cjs")).then((m) => m.getCache())).get(cacheKey);
 			if (cachedResult) {
 				require_logger.logger.debug(`Using cached SageMaker embedding response for ${this.getEndpointName()}`);
 				try {
@@ -665,11 +661,11 @@ var SageMakerEmbeddingProvider = class extends SageMakerGenericProvider {
 	* Helper method to cache embedding results
 	*/
 	async cacheEmbeddingResult(result, text, context, isTransformed = false, originalText) {
-		const { isCacheEnabled, getCache } = await Promise.resolve().then(() => require("./cache-Df_QFDNu.cjs"));
+		const { isCacheEnabled, getCache } = await Promise.resolve().then(() => require("./cache-BRkhlH3k.cjs"));
 		const bustCache = context?.debug === true;
 		if (isCacheEnabled() && !bustCache && result.embedding && !result.error) {
 			const cacheKey = this.getCacheKey(text);
-			const cache = await getCache ? await getCache() : await Promise.resolve().then(() => require("./cache-Df_QFDNu.cjs")).then((m) => m.getCache());
+			const cache = await getCache ? await getCache() : await Promise.resolve().then(() => require("./cache-BRkhlH3k.cjs")).then((m) => m.getCache());
 			if (isTransformed && originalText && !result.metadata) result.metadata = {
 				transformed: true,
 				originalText
@@ -692,4 +688,4 @@ var SageMakerEmbeddingProvider = class extends SageMakerGenericProvider {
 exports.SageMakerCompletionProvider = SageMakerCompletionProvider;
 exports.SageMakerEmbeddingProvider = SageMakerEmbeddingProvider;
 
-//# sourceMappingURL=sagemaker-jiw1wQa-.cjs.map
+//# sourceMappingURL=sagemaker-ljtY12VM.cjs.map

package/dist/src/{scanner-DVDeUz1r.js → scanner-nOCWNIXa.js}

@@ -1,12 +1,8 @@
 #!/usr/bin/env node
-import { j as state, n as getLogLevel, s as logger } from "./logger-BcJBzSSA.js";
-import { D as TERMINAL_MAX_WIDTH, u as sleepWithAbort } from "./fetch-DoVRJZhJ.js";
-import "./cloud-z8KZpUoa.js";
-import "./types-CIhFeUC4.js";
-import { t as printBorder } from "./util-Bm3E9jpK.js";
-import "./esm-7UIl0pPM.js";
-import "./pythonUtils-wIqk7zAf.js";
-import { t as formatDuration } from "./formatDuration-DgBVMN65.js";
+import { N as state, n as getLogLevel, s as logger } from "./logger-BbY6ypFL.js";
+import { k as TERMINAL_MAX_WIDTH, u as sleepWithAbort } from "./fetch-B6ch2nU2.js";
+import { t as printBorder } from "./util-BQOCAHQC.js";
+import { t as formatDuration } from "./formatDuration-Ch4A7G3o.js";
 import { z } from "zod";
 import chalk from "chalk";
 import fs from "fs";
@@ -32,7 +28,7 @@ import { minimatch } from "minimatch";
 */
 let cloudConfig$1;
 try {
-	cloudConfig$1 = (await import("./cloud-DE3t1-ZI.js")).cloudConfig;
+	cloudConfig$1 = (await import("./cloud-CoD5OacT.js")).cloudConfig;
 } catch (error) {
 	if (error instanceof Error && "code" in error && error.code === "MODULE_NOT_FOUND") {} else logger.debug(`Unexpected error loading cloud config: ${error}`);
 }
@@ -77,7 +73,7 @@ function resolveBaseAuthCredentials(opts) {
 */
 let cloudConfig;
 try {
-	cloudConfig = (await import("./cloud-DE3t1-ZI.js")).cloudConfig;
+	cloudConfig = (await import("./cloud-CoD5OacT.js")).cloudConfig;
 } catch (error) {
 	if (error instanceof Error && "code" in error && error.code === "MODULE_NOT_FOUND") {} else logger.debug(`Unexpected error loading cloud config: ${error}`);
 }
@@ -1045,6 +1041,17 @@ async function extractMetadata(repoPath, baseBranch, compareRef) {
 *
 * Spawns and manages the @modelcontextprotocol/server-filesystem child process.
 */
+const FILESYSTEM_MCP_READY_MARKER = "running on stdio";
+const FILESYSTEM_MCP_READY_TIMEOUT_MS = 3e4;
+function formatFilesystemMcpExitReason(code, signal) {
+	return code === null ? signal ? `signal ${signal}` : "unknown reason" : `code ${code}`;
+}
+function createFilesystemMcpEnv() {
+	const env = { ...process.env };
+	delete env.NPM_CONFIG_BEFORE;
+	delete env.npm_config_before;
+	return env;
+}
 /**
 * Start the filesystem MCP server as a child process
 * @param rootDir Absolute path to root directory for filesystem access
@@ -1066,7 +1073,8 @@ function startFilesystemMcpServer(rootDir) {
 				"pipe",
 				"pipe"
 			],
-			cwd: absoluteRootDir
+			cwd: absoluteRootDir,
+			env: createFilesystemMcpEnv()
 		});
 		mcpProcess.stderr?.on("data", (chunk) => {
 			const message = chunk.toString("utf8");
@@ -1087,11 +1095,65 @@ function startFilesystemMcpServer(rootDir) {
 	}
 }
 /**
+* Wait until the filesystem MCP server is ready to accept JSON-RPC messages.
+*
+* The child process is started through npx, which can spend time resolving or
+* installing the package before the MCP server takes over stdin. Announcing the
+* runner before that point lets the cloud side send initialize too early.
+*/
+function waitForFilesystemMcpServerReady(mcpProcess, timeoutMs = FILESYSTEM_MCP_READY_TIMEOUT_MS) {
+	if (mcpProcess.exitCode !== null || mcpProcess.signalCode !== null || mcpProcess.killed) return Promise.reject(new FilesystemMcpError(`Filesystem MCP server exited before ready: ${formatFilesystemMcpExitReason(mcpProcess.exitCode, mcpProcess.signalCode)}`));
+	const stderr = mcpProcess.stderr;
+	if (!stderr) return Promise.reject(new FilesystemMcpError("Filesystem MCP server stderr pipe unavailable"));
+	return new Promise((resolve, reject) => {
+		let stderrBuffer = "";
+		let settled = false;
+		const cleanup = () => {
+			clearTimeout(timeout);
+			stderr.off("data", onStderr);
+			mcpProcess.off("error", onError);
+			mcpProcess.off("exit", onExit);
+		};
+		const settle = (callback) => {
+			if (settled) return;
+			settled = true;
+			cleanup();
+			callback();
+		};
+		const onStderr = (chunk) => {
+			stderrBuffer += chunk.toString("utf8");
+			if (stderrBuffer.includes(FILESYSTEM_MCP_READY_MARKER)) {
+				settle(resolve);
+				return;
+			}
+			if (stderrBuffer.length > 4096) stderrBuffer = stderrBuffer.slice(-4096);
+		};
+		const onError = (error) => {
+			settle(() => {
+				reject(new FilesystemMcpError(`Filesystem MCP server error before ready: ${error.message}`));
+			});
+		};
+		const onExit = (code, signal) => {
+			settle(() => {
+				reject(new FilesystemMcpError(`Filesystem MCP server exited before ready: ${formatFilesystemMcpExitReason(code, signal)}`));
+			});
+		};
+		const timeout = setTimeout(() => {
+			settle(() => {
+				reject(new FilesystemMcpError(`Timed out waiting for filesystem MCP server to be ready after ${timeoutMs}ms`));
+			});
+		}, timeoutMs);
+		stderr.on("data", onStderr);
+		mcpProcess.once("error", onError);
+		mcpProcess.once("exit", onExit);
+	});
+}
+/**
 * Stop the filesystem MCP server process
 * @param process Child process to terminate
 */
 async function stopFilesystemMcpServer(process) {
-	if (!process.pid) {
+	if (!process.pid || process.exitCode !== null || process.signalCode !== null) {
 		logger.debug("MCP server already stopped");
 		return;
 	}
@@ -1247,17 +1309,24 @@ async function setupMcpBridge(socket, absoluteRepoPath, sessionId) {
 	logger.debug("Setting up repo MCP access...");
 	logger.debug(`Using session ID: ${sessionId}`);
 	const mcpProcess = startFilesystemMcpServer(absoluteRepoPath);
-	const mcpBridge = new SocketIoMcpBridge(mcpProcess, socket, sessionId);
-	await mcpBridge.connect();
-	socket.emit("runner:hello", {
-		session_id: sessionId,
-		repo_root: absoluteRepoPath
-	});
-	return {
-		mcpProcess,
-		mcpBridge,
-		sessionId
-	};
+	try {
+		await waitForFilesystemMcpServerReady(mcpProcess);
+		logger.debug("Filesystem MCP server ready");
+		const mcpBridge = new SocketIoMcpBridge(mcpProcess, socket, sessionId);
+		await mcpBridge.connect();
+		socket.emit("runner:hello", {
+			session_id: sessionId,
+			repo_root: absoluteRepoPath
+		});
+		return {
+			mcpProcess,
+			mcpBridge,
+			sessionId
+		};
+	} catch (error) {
+		await stopFilesystemMcpServer(mcpProcess);
+		throw error;
+	}
 }
 //#endregion
 //#region src/codeScan/util/auth.ts
@@ -1427,7 +1496,9 @@ function displayScanResults(response, duration, options) {
 * Handles building scan requests and executing them via the agent client.
 */
 const CAPACITY_ERROR_MESSAGE = "Server at capacity";
-const MAX_RETRIES = 7;
+const MCP_REQUEST_TIMEOUT_ERROR_MESSAGE = "MCP error -32001: Request timed out";
+const MAX_CAPACITY_ATTEMPTS = 7;
+const MAX_MCP_TIMEOUT_ATTEMPTS = 2;
 const BASE_DELAY_MS = 1e3;
 /**
 * Build scan request from inputs
@@ -1532,13 +1603,34 @@ function isCapacityError(error) {
 	if (error instanceof Error) return error.message.includes(CAPACITY_ERROR_MESSAGE);
 	return false;
 }
+function isMcpRequestTimeout(error) {
+	if (error instanceof Error) return error.message.includes(MCP_REQUEST_TIMEOUT_ERROR_MESSAGE);
+	return false;
+}
+function getRetryPolicy(error) {
+	if (isCapacityError(error)) return {
+		key: "capacity",
+		maxAttempts: MAX_CAPACITY_ATTEMPTS,
+		status: "Server busy",
+		waitStatus: "Server busy"
+	};
+	if (isMcpRequestTimeout(error)) return {
+		key: "mcp_timeout",
+		maxAttempts: MAX_MCP_TIMEOUT_ATTEMPTS,
+		status: "Code scan timed out waiting for repository access",
+		waitStatus: "Repository access timed out"
+	};
+}
 /**
-* Execute scan request with retry for capacity errors
+* Execute scan request with retry for transient scanner errors
 *
 * When the server is at capacity, it returns "Server at capacity. Please retry."
-* This wrapper retries with exponential backoff + jitter to spread load.
+* This wrapper retries with exponential backoff + jitter to spread load. Remote
+* MCP request timeouts get one retry because each failed attempt already waited
+* on the server-side request timeout.
 *
-* Backoff schedule: ~1s, ~2s, ~4s, ~8s, ~16s, ~32s (total ~63s max)
+* Capacity backoff schedule: ~1s, ~2s, ~4s, ~8s, ~16s, ~32s (up to 7 attempts, ~63s max)
+* MCP timeout backoff: ~1s (up to 2 attempts)
 *
 * @param client - Connected agent client
 * @param request - Scan request to send
@@ -1548,22 +1640,25 @@ function isCapacityError(error) {
 */
 async function executeScanRequestWithRetry(client, request, options) {
 	const { showSpinner, spinner } = options;
-	for (let attempt = 0; attempt < MAX_RETRIES; attempt++) try {
+	const attemptsByPolicy = /* @__PURE__ */ new Map();
+	while (true) try {
 		return await executeScanRequest(client, request, options);
 	} catch (error) {
-		if (!isCapacityError(error)) throw error;
-		if (attempt === MAX_RETRIES - 1) throw error;
+		const retryPolicy = getRetryPolicy(error);
+		if (!retryPolicy) throw error;
+		const policyAttempts = (attemptsByPolicy.get(retryPolicy.key) ?? 0) + 1;
+		attemptsByPolicy.set(retryPolicy.key, policyAttempts);
+		if (policyAttempts >= retryPolicy.maxAttempts) throw error;
 		const jitter = .7 + .6 * Math.random();
-		const delay = BASE_DELAY_MS * Math.pow(2, attempt) * jitter;
-		logger.debug(`Server busy, retrying in ${Math.round(delay / 1e3)}s (attempt ${attempt + 1}/${MAX_RETRIES})`);
+		const delay = BASE_DELAY_MS * Math.pow(2, policyAttempts - 1) * jitter;
+		logger.debug(`${retryPolicy.status}, retrying in ${Math.round(delay / 1e3)}s (attempt ${policyAttempts}/${retryPolicy.maxAttempts})`);
 		if (showSpinner && spinner) {
 			const originalText = spinner.text;
-			spinner.text = `Server busy, retrying in ${Math.round(delay / 1e3)}s...`;
+			spinner.text = `${retryPolicy.waitStatus}, retrying in ${Math.round(delay / 1e3)}s...`;
 			await sleepWithAbort(delay, options.abortController.signal);
 			spinner.text = originalText;
 		} else await sleepWithAbort(delay, options.abortController.signal);
 	}
-	throw new Error("Scan failed: exceeded maximum retries");
 }
 //#endregion
 //#region src/codeScan/scanner/index.ts
@@ -1740,4 +1835,4 @@ async function executeScan(repoPath, options) {
 //#endregion
 export { executeScan };
 
-//# sourceMappingURL=scanner-DVDeUz1r.js.map
+//# sourceMappingURL=scanner-nOCWNIXa.js.map

package/dist/src/server/golang/wrapper.go

@@ -28,7 +28,7 @@ func main() {
 	}
 
 	// Get the function by name using reflection
-	f := reflect.ValueOf(nil)
+	var f reflect.Value
 	switch functionName {
 	case "call_api", "CallApi":
 		// Use the CallApi function defined in the user's code