promptfoo 0.121.2 → 0.121.4

package/dist/src/{scanner-BsBlNXNn.js → scanner-1DqWi1Ej.js}

@@ -1,12 +1,8 @@
 #!/usr/bin/env node
-import { O as state, n as getLogLevel, o as logger } from "./logger-KkObSCzq.js";
-import { D as TERMINAL_MAX_WIDTH, u as sleepWithAbort } from "./fetch-Dxpd4_sr.js";
-import "./cloud-C0dlstV_.js";
-import "./types-Cbd8uOMq.js";
-import { t as printBorder } from "./util-C1CeHl-P.js";
-import "./esm-C03C-mv3.js";
-import "./pythonUtils-C3py6GC1.js";
-import { t as formatDuration } from "./formatDuration-DgBVMN65.js";
+import { N as state, n as getLogLevel, s as logger } from "./logger-DksKw1Qc.js";
+import { k as TERMINAL_MAX_WIDTH, u as sleepWithAbort } from "./fetch-BEWnXrrG.js";
+import { t as printBorder } from "./util-DxWpWjhc.js";
+import { t as formatDuration } from "./formatDuration-DZzPsexs.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-BBh91EUK.js")).cloudConfig;
+	cloudConfig$1 = (await import("./cloud-Hphvo8kr.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-BBh91EUK.js")).cloudConfig;
+	cloudConfig = (await import("./cloud-Hphvo8kr.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-BsBlNXNn.js.map
+//# sourceMappingURL=scanner-1DqWi1Ej.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