promptfoo 0.121.1 → 0.121.2

package/dist/src/{openclaw-DAfWQn-o.cjs → openclaw-CSugPYAr.cjs}

@@ -1,16 +1,16 @@
 const require_logger = require("./logger-Cp1GPUjj.cjs");
 require("./esm-CnNt7sI4.cjs");
 require("./pythonUtils-CTU3Y3lw.cjs");
-require("./types-LJ0r3wbR.cjs");
-require("./util-Yz-1aEhW.cjs");
-const require_fetch = require("./fetch-BxUk8odA.cjs");
-require("./cache-COish3-W.cjs");
+require("./types-C_7nyzr1.cjs");
+require("./util-B9vlHIIh.cjs");
+const require_fetch = require("./fetch-BPkYtG8K.cjs");
+require("./cache-Dh5WtQps.cjs");
 require("./genaiTracer-DN4dQywX.cjs");
-const require_chat = require("./chat-DaqekjFr.cjs");
-require("./transform-DOcQeLld.cjs");
-const require_responses = require("./responses-tD4Bd4dc.cjs");
+const require_chat = require("./chat-CgF-J-Jj.cjs");
+require("./transform-DuHvhZpj.cjs");
+const require_responses = require("./responses-D8SBTL64.cjs");
 require("./openai-Cuif0GEt.cjs");
-require("./util-Db0a0AFH.cjs");
+require("./util-BzMcevZc.cjs");
 let fs = require("fs");
 fs = require_logger.__toESM(fs);
 let path = require("path");
@@ -21,75 +21,97 @@ let crypto = require("crypto");
 crypto = require_logger.__toESM(crypto);
 let ws = require("ws");
 ws = require_logger.__toESM(ws);
+let json5 = require("json5");
+json5 = require_logger.__toESM(json5);
 //#region src/providers/openclaw/shared.ts
 const DEFAULT_GATEWAY_PORT = 18789;
 const DEFAULT_GATEWAY_HOST = "127.0.0.1";
 /**
-* Strip JSON5 syntax (comments and trailing commas) for JSON.parse compatibility.
-* Uses a state machine to avoid corrupting strings containing // or slash characters.
-*/
-function stripJson5Syntax(raw) {
-	let result = "";
-	let i = 0;
-	let inString = false;
-	let stringQuote = "";
-	let escape = false;
-	while (i < raw.length) {
-		const ch = raw[i];
-		if (inString) {
-			result += ch;
-			if (escape) escape = false;
-			else if (ch === "\\") escape = true;
-			else if (ch === stringQuote) inString = false;
-			i++;
-			continue;
-		}
-		if (ch === "\"" || ch === "'") {
-			inString = true;
-			stringQuote = ch;
-			result += ch;
-			i++;
-		} else if (ch === "/" && raw[i + 1] === "/") while (i < raw.length && raw[i] !== "\n") i++;
-		else if (ch === "/" && raw[i + 1] === "*") {
-			i += 2;
-			while (i < raw.length - 1 && !(raw[i] === "*" && raw[i + 1] === "/")) i++;
-			if (i < raw.length - 1 && raw[i] === "*" && raw[i + 1] === "/") i += 2;
-		} else if (ch === ",") {
-			let j = i + 1;
-			while (j < raw.length && (raw[j] === " " || raw[j] === "	" || raw[j] === "\n" || raw[j] === "\r")) j++;
-			if (j < raw.length && (raw[j] === "}" || raw[j] === "]")) i++;
-			else {
-				result += ch;
-				i++;
-			}
-		} else {
-			result += ch;
-			i++;
-		}
-	}
-	return result;
-}
-/**
 * Cached config to avoid re-reading the file multiple times during provider init.
 */
 let cachedConfig;
+let cachedConfigPath;
+function resolveConfigPath(env) {
+	return env?.OPENCLAW_CONFIG_PATH || require_logger.getEnvString("OPENCLAW_CONFIG_PATH") || path.default.join(os.default.homedir(), ".openclaw", "openclaw.json");
+}
+function normalizeGatewayUrl(url, transport) {
+	const trimmed = url.trim();
+	if (!trimmed) return;
+	if (transport === "http") {
+		if (trimmed.startsWith("wss://")) return `https://${trimmed.slice(6)}`;
+		if (trimmed.startsWith("ws://")) return `http://${trimmed.slice(5)}`;
+		return trimmed;
+	}
+	if (trimmed.startsWith("https://")) return `wss://${trimmed.slice(8)}`;
+	if (trimmed.startsWith("http://")) return `ws://${trimmed.slice(7)}`;
+	return trimmed;
+}
+function resolveGatewayHost(gatewayConfig) {
+	const bind = gatewayConfig?.bind?.trim();
+	const customBindHost = gatewayConfig?.customBindHost?.trim();
+	if (!bind || bind === "auto" || bind === "loopback" || bind === "lan" || bind === "tailnet" || bind === "0.0.0.0" || bind === "::" || bind === "127.0.0.1" || bind === "localhost" || bind === "::1") return DEFAULT_GATEWAY_HOST;
+	if (bind === "custom") {
+		if (!customBindHost || customBindHost === "0.0.0.0" || customBindHost === "::" || customBindHost === "127.0.0.1" || customBindHost === "localhost" || customBindHost === "::1") return DEFAULT_GATEWAY_HOST;
+		return customBindHost;
+	}
+	return bind;
+}
+function buildLocalGatewayUrl(gatewayConfig, transport) {
+	const scheme = transport === "ws" ? gatewayConfig?.tls?.enabled ? "wss" : "ws" : gatewayConfig?.tls?.enabled ? "https" : "http";
+	const port = gatewayConfig?.port ?? 18789;
+	return `${scheme}://${resolveGatewayHost(gatewayConfig)}:${port}`;
+}
+function resolveGatewayUrlFromConfig(openclawConfig, transport) {
+	const gatewayConfig = openclawConfig?.gateway;
+	if (!gatewayConfig) return;
+	if (gatewayConfig.mode === "remote") {
+		const remoteUrl = normalizeGatewayUrl(gatewayConfig.remote?.url ?? "", transport);
+		if (remoteUrl) return remoteUrl;
+	}
+	return buildLocalGatewayUrl(gatewayConfig, transport);
+}
+function toAuthSecret(kind, value) {
+	const trimmed = value?.trim();
+	return trimmed ? {
+		kind,
+		value: trimmed
+	} : void 0;
+}
+function resolveAuthSecretFromConfig(openclawConfig) {
+	const gatewayConfig = openclawConfig?.gateway;
+	const authMode = gatewayConfig?.auth?.mode?.trim();
+	const preferRemoteCredentials = gatewayConfig?.mode === "remote";
+	const localToken = toAuthSecret("token", gatewayConfig?.auth?.token);
+	const localPassword = toAuthSecret("password", gatewayConfig?.auth?.password);
+	const remoteToken = toAuthSecret("token", gatewayConfig?.remote?.token);
+	const remotePassword = toAuthSecret("password", gatewayConfig?.remote?.password);
+	if (preferRemoteCredentials) {
+		if (authMode === "password") return remotePassword || localPassword || remoteToken || localToken;
+		if (authMode === "token") return remoteToken || localToken || remotePassword || localPassword;
+		return remoteToken || remotePassword || localToken || localPassword;
+	}
+	if (authMode === "password") return localPassword || remotePassword || localToken || remoteToken;
+	if (authMode === "token") return localToken || remoteToken || localPassword || remotePassword;
+	return localToken || localPassword || remoteToken || remotePassword;
+}
 /**
-* Read and parse the OpenClaw configuration file.
+* Read and parse the active OpenClaw configuration file.
 * Results are cached based on file modification time.
 * Returns undefined if the file doesn't exist or can't be parsed.
 */
-function readOpenClawConfig() {
-	const configPath = path.default.join(os.default.homedir(), ".openclaw", "openclaw.json");
+function readOpenClawConfig(env) {
+	const configPath = resolveConfigPath(env);
 	try {
 		if (!fs.default.existsSync(configPath)) return;
 		const mtime = fs.default.statSync(configPath).mtimeMs;
-		if (cachedConfig && cachedConfig.mtime === mtime) return cachedConfig.config;
-		const cleaned = stripJson5Syntax(fs.default.readFileSync(configPath, "utf-8"));
-		const config = JSON.parse(cleaned);
+		if (cachedConfig && cachedConfigPath === configPath && cachedConfig.mtime === mtime) return cachedConfig.config;
+		const raw = fs.default.readFileSync(configPath, "utf-8");
+		const config = json5.default.parse(raw);
 		cachedConfig = {
 			config,
 			mtime
 		};
+		cachedConfigPath = configPath;
 		return config;
 	} catch (err) {
 		require_logger.logger.debug(`Failed to read OpenClaw config at ${configPath}: ${err}`);
@@ -97,28 +119,50 @@ function readOpenClawConfig() {
 	}
 }
 /**
-* Auto-detect the OpenClaw gateway URL from config, env overrides, or environment.
+* Auto-detect the OpenClaw gateway URL from config, env overrides, or the active config file.
 */
 function resolveGatewayUrl(config, env) {
-	if (config?.gateway_url) return config.gateway_url;
-	const envUrl = env?.OPENCLAW_GATEWAY_URL || require_logger.getEnvString("OPENCLAW_GATEWAY_URL");
-	if (envUrl) return envUrl;
-	const openclawConfig = readOpenClawConfig();
-	if (openclawConfig?.gateway) {
-		const port = openclawConfig.gateway.port ?? 18789;
-		const bind = openclawConfig.gateway.bind;
-		return `http://${!bind || bind === "loopback" || bind === "0.0.0.0" || bind === "::" ? DEFAULT_GATEWAY_HOST : bind}:${port}`;
-	}
-	return `http://${DEFAULT_GATEWAY_HOST}:${DEFAULT_GATEWAY_PORT}`;
+	return resolveGatewayTransportUrl(config, env, "http");
+}
+function resolveGatewayWsUrl(config, env) {
+	return resolveGatewayTransportUrl(config, env, "ws");
+}
+function resolveGatewayTransportUrl(config, env, transport) {
+	const configUrl = config?.gateway_url?.trim();
+	if (configUrl) return normalizeGatewayUrl(configUrl, transport) || configUrl;
+	const trimmedEnvUrl = (env?.OPENCLAW_GATEWAY_URL || require_logger.getEnvString("OPENCLAW_GATEWAY_URL") || env?.CLAWDBOT_GATEWAY_URL || require_logger.getEnvString("CLAWDBOT_GATEWAY_URL"))?.trim();
+	if (trimmedEnvUrl) return normalizeGatewayUrl(trimmedEnvUrl, transport) || trimmedEnvUrl;
+	const resolvedUrl = resolveGatewayUrlFromConfig(readOpenClawConfig(env), transport);
+	if (resolvedUrl) return resolvedUrl;
+	return `${transport === "ws" ? "ws" : "http"}://${DEFAULT_GATEWAY_HOST}:${DEFAULT_GATEWAY_PORT}`;
+}
+function resolveAuthSecret(config, env) {
+	if (config?.auth_token) return {
+		kind: "token",
+		value: config.auth_token
+	};
+	if (config?.auth_password) return {
+		kind: "password",
+		value: config.auth_password
+	};
+	const envToken = env?.OPENCLAW_GATEWAY_TOKEN || require_logger.getEnvString("OPENCLAW_GATEWAY_TOKEN") || env?.CLAWDBOT_GATEWAY_TOKEN || require_logger.getEnvString("CLAWDBOT_GATEWAY_TOKEN");
+	if (envToken) return {
+		kind: "token",
+		value: envToken
+	};
+	const envPassword = env?.OPENCLAW_GATEWAY_PASSWORD || require_logger.getEnvString("OPENCLAW_GATEWAY_PASSWORD") || env?.CLAWDBOT_GATEWAY_PASSWORD || require_logger.getEnvString("CLAWDBOT_GATEWAY_PASSWORD");
+	if (envPassword) return {
+		kind: "password",
+		value: envPassword
+	};
+	return resolveAuthSecretFromConfig(readOpenClawConfig(env));
 }
 /**
-* Auto-detect the OpenClaw gateway auth token from config, env overrides, or environment.
+* Auto-detect the OpenClaw gateway bearer secret from config, env overrides, or the active
+* config file. OpenClaw accepts either a token or password as the HTTP bearer secret.
 */
 function resolveAuthToken(config, env) {
-	if (config?.auth_token) return config.auth_token;
-	const envToken = env?.OPENCLAW_GATEWAY_TOKEN || require_logger.getEnvString("OPENCLAW_GATEWAY_TOKEN");
-	if (envToken) return envToken;
-	return readOpenClawConfig()?.gateway?.auth?.token;
+	return resolveAuthSecret(config, env)?.value;
 }
 /**
 * Build common OpenClaw headers for agent-id and session-key.
@@ -178,7 +222,8 @@ const OPENCLAW_PROTOCOL_VERSION = 3;
 var OpenClawAgentProvider = class {
 	agentId;
 	gatewayUrl;
-	authToken;
+	authKind;
+	authSecret;
 	openclawConfig;
 	timeoutMs;
 	activeConnections = /* @__PURE__ */ new Set();
@@ -186,8 +231,10 @@ var OpenClawAgentProvider = class {
 		this.agentId = agentId;
 		this.openclawConfig = providerOptions.config || {};
 		const env = providerOptions.env;
-		this.gatewayUrl = resolveGatewayUrl(this.openclawConfig, env);
-		this.authToken = resolveAuthToken(this.openclawConfig, env);
+		this.gatewayUrl = resolveGatewayWsUrl(this.openclawConfig, env);
+		const authSecret = resolveAuthSecret(this.openclawConfig, env);
+		this.authKind = authSecret?.kind;
+		this.authSecret = authSecret?.value;
 		this.timeoutMs = this.openclawConfig.timeoutMs ?? require_fetch.REQUEST_TIMEOUT_MS;
 	}
 	id() {
@@ -204,9 +251,9 @@ var OpenClawAgentProvider = class {
 		this.activeConnections.clear();
 	}
 	async callApi(prompt) {
-		const wsUrl = this.gatewayUrl.replace(/^http(s?):\/\//, "ws$1://");
+		const sessionKey = this.openclawConfig.session_key || `promptfoo-${crypto.default.randomUUID()}`;
 		return new Promise((resolve) => {
-			const ws$2 = new ws.default(wsUrl);
+			const ws$2 = new ws.default(this.gatewayUrl);
 			this.activeConnections.add(ws$2);
 			const agentRequestId = crypto.default.randomUUID();
 			const waitRequestId = crypto.default.randomUUID();
@@ -215,27 +262,23 @@ var OpenClawAgentProvider = class {
 			let runId;
 			let connected = false;
 			let resolved = false;
-			const timeout = setTimeout(() => {
-				if (!resolved) {
-					resolved = true;
-					ws$2.close();
-					resolve({ error: `OpenClaw agent request timed out after ${this.timeoutMs}ms` });
-				}
-			}, this.timeoutMs);
-			const finish = (result) => {
+			const finish = (result, closeSocket = true) => {
 				if (resolved) return;
 				resolved = true;
 				clearTimeout(timeout);
 				this.activeConnections.delete(ws$2);
-				ws$2.close();
+				if (closeSocket) ws$2.close();
 				resolve(result);
 			};
+			const timeout = setTimeout(() => {
+				finish({ error: `OpenClaw agent request timed out after ${this.timeoutMs}ms` });
+			}, this.timeoutMs);
 			ws$2.on("error", (err) => {
 				finish({ error: `OpenClaw WebSocket error: ${err.message}` });
 			});
 			ws$2.on("close", () => {
 				this.activeConnections.delete(ws$2);
-				if (!resolved) finish({ error: "OpenClaw WebSocket connection closed unexpectedly" });
+				if (!resolved) finish({ error: "OpenClaw WebSocket connection closed unexpectedly" }, false);
 			});
 			ws$2.on("message", (data) => {
 				let frame;
@@ -270,7 +313,7 @@ var OpenClawAgentProvider = class {
 							caps: [],
 							commands: [],
 							permissions: {},
-							...this.authToken && { auth: { token: this.authToken } }
+							...this.authSecret && this.authKind && { auth: this.authKind === "password" ? { password: this.authSecret } : { token: this.authSecret } }
 						}
 					}));
 					return;
@@ -289,8 +332,9 @@ var OpenClawAgentProvider = class {
 							message: prompt,
 							agentId: this.agentId,
 							idempotencyKey,
-							...this.openclawConfig.session_key && { sessionKey: this.openclawConfig.session_key },
-							...this.openclawConfig.thinking_level && { thinking: this.openclawConfig.thinking_level }
+							sessionKey,
+							...this.openclawConfig.thinking_level && { thinking: this.openclawConfig.thinking_level },
+							...this.openclawConfig.extra_system_prompt && { extraSystemPrompt: this.openclawConfig.extra_system_prompt }
 						}
 					}));
 					return;
@@ -300,8 +344,17 @@ var OpenClawAgentProvider = class {
 						finish({ error: `OpenClaw agent error: ${frame.error?.message || "unknown error"}` });
 						return;
 					}
-					runId = frame.payload?.runId;
-					if (runId) ws$2.send(JSON.stringify({
+					const payload = frame.payload;
+					runId = typeof payload?.runId === "string" && payload.runId.trim() ? payload.runId : void 0;
+					if (!runId) {
+						require_logger.logger.warn("[OpenClaw Agent] Missing runId in accepted response", {
+							agentId: this.agentId,
+							payload
+						});
+						finish({ error: "OpenClaw agent error: gateway accepted request without a runId" });
+						return;
+					}
+					ws$2.send(JSON.stringify({
 						type: "req",
 						id: waitRequestId,
 						method: "agent.wait",
@@ -333,10 +386,11 @@ var OpenClawAgentProvider = class {
 * OpenClaw chat provider extends OpenAI chat completion provider.
 *
 * OpenClaw exposes an OpenAI-compatible HTTP API at /v1/chat/completions.
-* This provider auto-detects gateway URL and auth token from:
-*   1. Explicit config (gateway_url, auth_token)
-*   2. Environment variables (OPENCLAW_GATEWAY_URL, OPENCLAW_GATEWAY_TOKEN)
-*   3. ~/.openclaw/openclaw.json
+* This provider auto-detects gateway URL and bearer auth from:
+*   1. Explicit config (gateway_url, auth_token, auth_password)
+*   2. Environment variables (OPENCLAW_GATEWAY_URL, OPENCLAW_GATEWAY_TOKEN, OPENCLAW_GATEWAY_PASSWORD)
+*   3. The active OpenClaw config file (OPENCLAW_CONFIG_PATH or ~/.openclaw/openclaw.json),
+*      including gateway.remote.url and gateway.tls.enabled
 *
 * Usage:
 *   openclaw              - default agent (main)
@@ -413,14 +467,19 @@ var OpenClawResponsesProvider = class extends require_responses.OpenAiResponsesP
 * OpenClaw Tool Invoke Provider
 *
 * Simple HTTP provider for direct tool invocation via POST /tools/invoke.
-* The tool name is extracted from the provider path: openclaw:tools:bash → tool="bash"
+* The tool name is extracted from the provider path:
+* openclaw:tools:sessions_list → tool="sessions_list"
 *
 * The prompt is parsed as JSON for tool arguments. If it's not valid JSON,
 * it's passed as a single `input` argument.
 *
 * Usage:
-*   openclaw:tools:bash        - invoke the bash tool
-*   openclaw:tools:agents_list - invoke the agents_list tool
+*   openclaw:tools:sessions_list - invoke the sessions_list tool
+*   openclaw:tools:session_status - invoke the session_status tool
+*
+* Optional config:
+*   action  - tool sub-action, forwarded as body.action
+*   dry_run - dry-run hint, forwarded as body.dryRun
 */
 var OpenClawToolInvokeProvider = class {
 	toolName;
@@ -453,11 +512,16 @@ var OpenClawToolInvokeProvider = class {
 			args = { input: prompt };
 		}
 		const url = `${this.gatewayUrl}/tools/invoke`;
-		const headers = { "Content-Type": "application/json" };
+		const headers = {
+			"Content-Type": "application/json",
+			...this.openclawConfig.headers || {}
+		};
 		if (this.authToken) headers["Authorization"] = `Bearer ${this.authToken}`;
 		const body = {
 			tool: this.toolName,
+			...this.openclawConfig.action && { action: this.openclawConfig.action },
 			args,
+			...typeof this.openclawConfig.dry_run === "boolean" && { dryRun: this.openclawConfig.dry_run },
 			...this.openclawConfig.session_key && { sessionKey: this.openclawConfig.session_key }
 		};
 		require_logger.logger.debug(`[OpenClaw Tool] POST ${url}`, {
@@ -498,7 +562,7 @@ var OpenClawToolInvokeProvider = class {
 *   openclaw:responses:X    → OpenClawResponsesProvider('X')
 *   openclaw:agent          → OpenClawAgentProvider('main')
 *   openclaw:agent:X        → OpenClawAgentProvider('X')
-*   openclaw:tools:bash     → OpenClawToolInvokeProvider('bash')
+*   openclaw:tools:sessions_list → OpenClawToolInvokeProvider('sessions_list')
 */
 function createOpenClawProvider(providerPath, providerOptions = {}, env) {
 	const splits = providerPath.split(":");
@@ -519,4 +583,4 @@ function createOpenClawProvider(providerPath, providerOptions = {}, env) {
 //#endregion
 exports.createOpenClawProvider = createOpenClawProvider;
 
-//# sourceMappingURL=openclaw-DAfWQn-o.cjs.map
+//# sourceMappingURL=openclaw-CSugPYAr.cjs.map