promptfoo 0.122.1 → 0.122.2

package/dist/src/{util-BdAsuWmv.js → util-CZyLhvIk.js}

@@ -1,13 +1,14 @@
 #!/usr/bin/env node
 import { F as getEnvBool, N as refreshConfigDirectoryPathFromEnv, U as state, b as sanitizeTracingConfigForPersistence, c as logger, j as loadYaml, v as sanitizeObject, x as sanitizeUrl, y as sanitizeRuntimeOptions } from "./logger-YzVIwMVq.js";
-import { A as isApiProvider, i as getResultIndexKey, j as isProviderOptions, r as asEvaluateResult, s as sanitizeResultForJsonlArtifact } from "./evalResult-CmUmgA2I.js";
-import { U as TERMINAL_MAX_WIDTH, Y as VERSION, r as fetchWithProxy } from "./fetch-Bnj1JCJi.js";
+import { A as isApiProvider, i as getResultIndexKey, j as isProviderOptions, r as asEvaluateResult, s as sanitizeResultForJsonlArtifact } from "./evalResult-C9ntrv7r.js";
+import { W as TERMINAL_MAX_WIDTH, X as VERSION, r as fetchWithProxy } from "./fetch-KD8O9oZZ.js";
 import { t as invariant } from "./invariant-CbHB1xyx.js";
 import { C as OutputFileExtension, w as ResultFailureReason } from "./tables-DpSgejqG.js";
 import { i as isJavascriptFile, t as JAVASCRIPT_EXTENSIONS } from "./fileExtensions-CAc10_Jb.js";
 import { o as safeResolve, r as importModule, t as getDirectory } from "./esm-BK0NNGWz.js";
 import { n as PromptfooAttributes } from "./genaiTracer-BRW5P2xD.js";
 import { r as runPython } from "./pythonUtils-BKRucqaP.js";
+import { n as renderVarsInObject, o as getNunjucksEngine } from "./render-BRIaR8VG.js";
 import "./blobs-Dpyeuxru.js";
 import { o as collectBlobHashes } from "./extractor-8jl9p5Oy.js";
 import dotenv from "dotenv";
@@ -19,356 +20,14 @@ import * as os$1 from "os";
 import * as yaml from "js-yaml";
 import dedent from "dedent";
 import { randomUUID } from "crypto";
-import nunjucks from "nunjucks";
 import * as fsPromises from "fs/promises";
 import { access } from "fs/promises";
 import deepEqual from "fast-deep-equal";
 import { parse as parse$1 } from "csv-parse/sync";
 import { globSync, hasMagic } from "glob";
+import nunjucks from "nunjucks";
 import { XMLBuilder } from "fast-xml-parser";
 import { stringify } from "csv-stringify/sync";
-//#region src/util/templates.ts
-function isNunjucksAstNode(value) {
-	return Boolean(value && typeof value === "object" && typeof value.typename === "string");
-}
-function getNunjucksParser() {
-	return nunjucks.parser;
-}
-function parseNunjucksTemplate(template) {
-	const parser = getNunjucksParser();
-	if (!parser || typeof parser.parse !== "function") {
-		logger.debug("[templates] nunjucks.parser.parse is not available; falling back to conservative detection");
-		return { ok: false };
-	}
-	try {
-		return {
-			ok: true,
-			ast: parser.parse(template)
-		};
-	} catch (err) {
-		logger.debug("[templates] nunjucks parse failed; falling back to conservative detection", { error: err instanceof Error ? err.message : String(err) });
-		return { ok: false };
-	}
-}
-function isNonReferenceSymbol(parent) {
-	if (!parent) return false;
-	return parent.node.typename === "Pair" && parent.field === "key" || parent.node.typename === "Filter" && parent.field === "name" || parent.node.typename === "Is" && parent.field === "right" || parent.node.typename === "Set" && parent.field === "targets" || isForLikeNode(parent.node) && parent.field === "name" || parent.node.typename === "Macro" && parent.field === "name" || parent.node.typename === "Import" && parent.field === "target" || parent.node.typename === "FromImport" && parent.field === "names";
-}
-function getSymbolName(node) {
-	return isNunjucksAstNode(node) && node.typename === "Symbol" && typeof node.value === "string" ? node.value : void 0;
-}
-function collectBindingNames(node) {
-	if (Array.isArray(node)) return node.flatMap((item) => collectBindingNames(item));
-	const symbolName = getSymbolName(node);
-	if (symbolName) return [symbolName];
-	if (!isNunjucksAstNode(node) || !Array.isArray(node.children)) return [];
-	return node.children.flatMap((child) => collectBindingNames(child));
-}
-function addBindingNames(scope, node) {
-	const nextScope = new Set(scope);
-	for (const name of collectBindingNames(node)) nextScope.add(name);
-	return nextScope;
-}
-function addNamesToScope(scope, names) {
-	const nextScope = new Set(scope);
-	for (const name of names) nextScope.add(name);
-	return nextScope;
-}
-function collectFromImportBindingNames(namesNode) {
-	if (!isNunjucksAstNode(namesNode) || !Array.isArray(namesNode.children)) return [];
-	const names = [];
-	for (const child of namesNode.children) {
-		const plainImportName = getSymbolName(child);
-		if (plainImportName) {
-			names.push(plainImportName);
-			continue;
-		}
-		if (isNunjucksAstNode(child) && child.typename === "Pair") {
-			const aliasName = getSymbolName(child.value);
-			if (aliasName) names.push(aliasName);
-		}
-	}
-	return names;
-}
-function astNodeListReferencesVariable(nodes, variableName, parent, boundSymbols) {
-	let scope = new Set(boundSymbols);
-	for (const item of nodes) {
-		if (!isNunjucksAstNode(item)) continue;
-		if (astReferencesVariable(item, variableName, parent, scope)) return true;
-		if (item.typename === "Set") scope = addBindingNames(scope, item.targets);
-		else if (item.typename === "Macro") scope = addBindingNames(scope, item.name);
-		else if (item.typename === "Import") scope = addBindingNames(scope, item.target);
-		else if (item.typename === "FromImport") scope = addNamesToScope(scope, collectFromImportBindingNames(item.names));
-	}
-	return false;
-}
-function astChildReferencesVariable(node, field, variableName, boundSymbols) {
-	const child = node[field];
-	if (Array.isArray(child)) return child.some((item) => isNunjucksAstNode(item) && astReferencesVariable(item, variableName, {
-		field,
-		node
-	}, boundSymbols));
-	return isNunjucksAstNode(child) && astReferencesVariable(child, variableName, {
-		field,
-		node
-	}, boundSymbols);
-}
-function isForLikeNode(node) {
-	return node.typename === "For" || node.typename === "AsyncEach" || node.typename === "AsyncAll";
-}
-function forLikeNodeReferencesVariable(node, variableName, boundSymbols) {
-	const loopScope = addBindingNames(boundSymbols, node.name);
-	return astChildReferencesVariable(node, "arr", variableName, boundSymbols) || astChildReferencesVariable(node, "body", variableName, loopScope) || astChildReferencesVariable(node, "else_", variableName, boundSymbols);
-}
-/**
-* Walk a Nunjucks macro/caller signature left-to-right. Positional args and
-* earlier keyword defaults are visible to later defaults, but the current
-* keyword is not bound until its own default value has been evaluated.
-*/
-function analyzeSignatureArgs(argsNode, variableName, boundSymbols) {
-	const paramNames = [];
-	if (!isNunjucksAstNode(argsNode) || !Array.isArray(argsNode.children)) return {
-		paramNames,
-		referencesVariable: false
-	};
-	const defaultScope = new Set(boundSymbols);
-	for (const child of argsNode.children) {
-		if (!isNunjucksAstNode(child)) continue;
-		const positionalParamName = getSymbolName(child);
-		if (positionalParamName) {
-			paramNames.push(positionalParamName);
-			defaultScope.add(positionalParamName);
-			continue;
-		}
-		if (child.typename === "KeywordArgs" && Array.isArray(child.children)) {
-			for (const pair of child.children) {
-				const keywordParamName = isNunjucksAstNode(pair) && pair.typename === "Pair" ? getSymbolName(pair.key) : void 0;
-				if (isNunjucksAstNode(pair) && pair.typename === "Pair" && astChildReferencesVariable(pair, "value", variableName, defaultScope)) return {
-					paramNames,
-					referencesVariable: true
-				};
-				if (keywordParamName) {
-					paramNames.push(keywordParamName);
-					defaultScope.add(keywordParamName);
-				}
-			}
-			continue;
-		}
-		if (astReferencesVariable(child, variableName, {
-			field: "children",
-			node: argsNode
-		}, defaultScope)) return {
-			paramNames,
-			referencesVariable: true
-		};
-	}
-	return {
-		paramNames,
-		referencesVariable: false
-	};
-}
-function macroNodeReferencesVariable(node, variableName, boundSymbols) {
-	const { paramNames, referencesVariable } = analyzeSignatureArgs(node.args, variableName, boundSymbols);
-	if (referencesVariable) return true;
-	const macroScope = addNamesToScope(boundSymbols, paramNames);
-	const macroName = getSymbolName(node.name);
-	if (macroName) macroScope.add(macroName);
-	return astChildReferencesVariable(node, "body", variableName, macroScope);
-}
-function isNodeReferencesVariable(node, variableName, boundSymbols) {
-	if (astChildReferencesVariable(node, "left", variableName, boundSymbols)) return true;
-	const right = node.right;
-	if (!isNunjucksAstNode(right)) return false;
-	if (right.typename === "FunCall") return astChildReferencesVariable(right, "args", variableName, boundSymbols);
-	return right.typename !== "Symbol" && astReferencesVariable(right, variableName, {
-		field: "right",
-		node
-	}, boundSymbols);
-}
-function setNodeReferencesVariable(node, variableName, boundSymbols) {
-	return astChildReferencesVariable(node, "value", variableName, boundSymbols) || astChildReferencesVariable(node, "body", variableName, boundSymbols);
-}
-function fromImportNodeReferencesVariable(node, variableName, boundSymbols) {
-	return astChildReferencesVariable(node, "template", variableName, boundSymbols);
-}
-function blockNodeReferencesVariable(node, variableName, boundSymbols) {
-	return astChildReferencesVariable(node, "body", variableName, boundSymbols);
-}
-function callerNodeReferencesVariable(node, variableName, boundSymbols) {
-	const { paramNames, referencesVariable } = analyzeSignatureArgs(node.args, variableName, boundSymbols);
-	if (referencesVariable) return true;
-	return astChildReferencesVariable(node, "body", variableName, addNamesToScope(boundSymbols, paramNames));
-}
-function astFieldsReferenceVariable(node, variableName, boundSymbols) {
-	return (node.fields ?? []).some((field) => astChildReferencesVariable(node, field, variableName, boundSymbols));
-}
-function astReferencesVariable(node, variableName, parent, boundSymbols = /* @__PURE__ */ new Set()) {
-	if (node.typename === "Symbol" && node.value === variableName) return !boundSymbols.has(variableName) && !isNonReferenceSymbol(parent);
-	if ((node.typename === "Root" || node.typename === "NodeList") && Array.isArray(node.children)) return astNodeListReferencesVariable(node.children, variableName, {
-		field: "children",
-		node
-	}, boundSymbols);
-	if (isForLikeNode(node)) return forLikeNodeReferencesVariable(node, variableName, boundSymbols);
-	if (node.typename === "Macro") return macroNodeReferencesVariable(node, variableName, boundSymbols);
-	if (node.typename === "Is") return isNodeReferencesVariable(node, variableName, boundSymbols);
-	if (node.typename === "Set") return setNodeReferencesVariable(node, variableName, boundSymbols);
-	if (node.typename === "FromImport") return fromImportNodeReferencesVariable(node, variableName, boundSymbols);
-	if (node.typename === "Block") return blockNodeReferencesVariable(node, variableName, boundSymbols);
-	if (node.typename === "Caller") return callerNodeReferencesVariable(node, variableName, boundSymbols);
-	return astFieldsReferenceVariable(node, variableName, boundSymbols);
-}
-/**
-* Get a Nunjucks engine instance with optional filters and configuration.
-* @param filters - Optional map of custom Nunjucks filters.
-* @param throwOnUndefined - Whether to throw an error on undefined variables.
-* @param isGrader - Whether this engine is being used in a grader context.
-* Nunjucks is always enabled in grader mode.
-* @returns A configured Nunjucks environment.
-*/
-function getNunjucksEngine(filters, throwOnUndefined = false, isGrader = false) {
-	if (!isGrader && getEnvBool("PROMPTFOO_DISABLE_TEMPLATING")) return { renderString: (template) => template };
-	const env = nunjucks.configure({
-		autoescape: false,
-		throwOnUndefined
-	});
-	const envGlobals = {
-		...getEnvBool("PROMPTFOO_DISABLE_TEMPLATE_ENV_VARS", getEnvBool("PROMPTFOO_SELF_HOSTED", false)) ? {} : process.env,
-		...state.config?.env
-	};
-	env.addGlobal("env", envGlobals);
-	env.addFilter("load", function(str) {
-		return JSON.parse(str);
-	});
-	if (filters) for (const [name, filter] of Object.entries(filters)) env.addFilter(name, filter);
-	return env;
-}
-/**
-* Parse Nunjucks template to extract variables.
-* @param template - The Nunjucks template string.
-* @returns An array of variables used in the template.
-*/
-function extractVariablesFromTemplate(template) {
-	const variableSet = /* @__PURE__ */ new Set();
-	const regex = /\{\{[\s]*([^{}\s|]+)[\s]*(?:\|[^}]+)?\}\}|\{%[\s]*(?:if|for)[\s]+([^{}\s]+)[\s]*.*?%\}/g;
-	template = template.replace(/\{#[\s\S]*?#\}/g, "");
-	let match;
-	while ((match = regex.exec(template)) !== null) {
-		const variable = match[1] || match[2];
-		if (variable) variableSet.add(variable);
-	}
-	const forLoopRegex = /\{%[\s]*for[\s]+(\w+)[\s]+in[\s]+(\w+)[\s]*%\}/g;
-	while ((match = forLoopRegex.exec(template)) !== null) {
-		variableSet.delete(match[1]);
-		variableSet.add(match[2]);
-	}
-	return Array.from(variableSet);
-}
-/**
-* Extract variables from multiple Nunjucks templates.
-* @param templates - An array of Nunjucks template strings.
-* @returns An array of variables used in the templates.
-*/
-function extractVariablesFromTemplates(templates) {
-	const variableSet = /* @__PURE__ */ new Set();
-	for (const template of templates) extractVariablesFromTemplate(template).forEach((variable) => variableSet.add(variable));
-	return Array.from(variableSet);
-}
-/**
-* Classify whether a template references `variableName` as a real Nunjucks
-* expression symbol, and surface whether the template parsed successfully.
-*
-* Callers that cache results should avoid caching when `parsed` is `false`,
-* otherwise a transient parse failure would poison the cache for the lifetime
-* of the process.
-*/
-function analyzeTemplateReference(template, variableName) {
-	if (!variableName || !template.includes(variableName)) return {
-		referenced: false,
-		parsed: true
-	};
-	const parseResult = parseNunjucksTemplate(template);
-	if (!parseResult.ok) return {
-		referenced: true,
-		parsed: false
-	};
-	return {
-		referenced: astReferencesVariable(parseResult.ast, variableName),
-		parsed: true
-	};
-}
-//#endregion
-//#region src/util/render.ts
-/**
-* Renders ONLY environment variable templates in an object, leaving all other templates untouched.
-* This allows env vars to be resolved at provider load time while preserving runtime var templates.
-*
-* Supports full Nunjucks syntax for env vars including filters and expressions:
-* - {{ env.VAR_NAME }}
-* - {{ env['VAR-NAME'] }}
-* - {{ env["VAR-NAME"] }}
-* - {{ env.VAR | default('fallback') }}
-* - {{ env.VAR | upper }}
-*
-* Preserves non-env templates for runtime rendering:
-* - {{ vars.x }} - preserved as literal
-* - {{ prompt }} - preserved as literal
-*
-* Implementation: Uses regex to find env templates, delegates to Nunjucks for rendering.
-* This ensures full Nunjucks feature support while preserving non-env templates.
-*
-* @param obj - The object to process
-* @param envOverrides - Optional env vars to merge with (or replace) the base env
-* @param replaceBase - If true, envOverrides replaces the base env entirely instead of merging
-* @returns The object with only env templates rendered
-*/
-function renderEnvOnlyInObject(obj, envOverrides, replaceBase) {
-	if (getEnvBool("PROMPTFOO_DISABLE_TEMPLATING")) return obj;
-	if (typeof obj === "string") {
-		const nunjucks = getNunjucksEngine();
-		const baseEnvGlobals = nunjucks.getGlobal("env");
-		const envGlobals = replaceBase ? envOverrides ?? {} : envOverrides ? {
-			...baseEnvGlobals,
-			...envOverrides
-		} : baseEnvGlobals;
-		return obj.replace(/\{\{(?:[^}]|\}(?!\}))*\}\}/g, (match) => {
-			if (!match.match(/\benv\.|env\[/)) return match;
-			const varMatch = match.match(/env\.(\w+)|env\[['"]([^'"]+)['"]\]/);
-			const varName = varMatch?.[1] || varMatch?.[2];
-			if (match.includes("|") || varName && varName in envGlobals && envGlobals[varName] !== void 0) try {
-				return nunjucks.renderString(match, { env: envGlobals });
-			} catch (error) {
-				logger.debug(`Failed to render env template "${match}": ${error instanceof Error ? error.message : String(error)}`);
-				return match;
-			}
-			return match;
-		});
-	}
-	if (Array.isArray(obj)) return obj.map((item) => renderEnvOnlyInObject(item, envOverrides, replaceBase));
-	if (typeof obj === "object" && obj !== null) {
-		const result = {};
-		for (const key in obj) {
-			if (key === "_conversation") {
-				result[key] = obj[key];
-				continue;
-			}
-			result[key] = renderEnvOnlyInObject(obj[key], envOverrides, replaceBase);
-		}
-		return result;
-	}
-	return obj;
-}
-function renderVarsInObject(obj, vars) {
-	if (!vars || getEnvBool("PROMPTFOO_DISABLE_TEMPLATING")) return obj;
-	if (typeof obj === "string") return getNunjucksEngine().renderString(obj, vars);
-	if (Array.isArray(obj)) return obj.map((item) => renderVarsInObject(item, vars));
-	if (typeof obj === "object" && obj !== null) {
-		const result = {};
-		for (const key in obj) result[key] = renderVarsInObject(obj[key], vars);
-		return result;
-	} else if (typeof obj === "function") return renderVarsInObject(obj({ vars }));
-	return obj;
-}
-//#endregion
 //#region src/util/functions/loadFunction.ts
 const functionCache = {};
 /**
@@ -2720,6 +2379,6 @@ function printBorder() {
 	logger.info(border);
 }
 //#endregion
-export { analyzeTemplateReference as $, sanitizeProviderIdForLog as A, maybeLoadResponseFormatFromExternalFile as B, doesProviderRefMatch as C, isGoogleProvider as D, isAnthropicProvider as E, getNunjucksEngineForFilePath as F, readOutput as G, parsePathOrGlob as H, getResolvedRelativePath as I, loadFunction as J, CallbackPathTraversalError as K, maybeLoadConfigFromExternalFile as L, loadProviderConfigsFromFile as M, normalizeProviderRef as N, isOpenAiProvider as O, readProviderConfigFile as P, renderVarsInObject as Q, maybeLoadFromExternalFile as R, checkProviderApiKeys as S, getProviderIdentifier as T, pathExists as U, maybeLoadToolsFromExternalFile as V, readFilters as W, wrapError as X, parseFileUrl as Y, renderEnvOnlyInObject as Z, deduplicateTestCases as _, writeOutput as a, getTestCaseDeduplicationKey as b, ComparisonEvalNotFoundError as c, getEvalTableOutputPromptLocationsBySize as d, extractVariablesFromTemplate as et, getEvalTablePromptStrippedPayload as f, setupEnv as g, isMissingPackageImportError as h, writeMultipleOutputs as i, isProviderConfigFileReference as j, isProviderAllowed as k, evalTableToJson as l, fetchCsvFromGoogleSheet as m, createOutputData as n, getNunjucksEngine as nt, SUPPORTED_OUTPUT_FILE_FORMATS as o, mergeComparisonTables as p, loadCallbackFromFileUrl as q, warnOnDegradedJsonlRecovery as r, getOutputFileFormat as s, printBorder as t, extractVariablesFromTemplates as tt, generateEvalCsv as u, extractRuntimeVars as v, getProviderDescription as w, resultIsForTestCase as x, filterRuntimeVars as y, maybeLoadFromExternalFileWithVars as z };
+export { sanitizeProviderIdForLog as A, maybeLoadResponseFormatFromExternalFile as B, doesProviderRefMatch as C, isGoogleProvider as D, isAnthropicProvider as E, getNunjucksEngineForFilePath as F, readOutput as G, parsePathOrGlob as H, getResolvedRelativePath as I, loadFunction as J, CallbackPathTraversalError as K, maybeLoadConfigFromExternalFile as L, loadProviderConfigsFromFile as M, normalizeProviderRef as N, isOpenAiProvider as O, readProviderConfigFile as P, maybeLoadFromExternalFile as R, checkProviderApiKeys as S, getProviderIdentifier as T, pathExists as U, maybeLoadToolsFromExternalFile as V, readFilters as W, wrapError as X, parseFileUrl as Y, deduplicateTestCases as _, writeOutput as a, getTestCaseDeduplicationKey as b, ComparisonEvalNotFoundError as c, getEvalTableOutputPromptLocationsBySize as d, getEvalTablePromptStrippedPayload as f, setupEnv as g, isMissingPackageImportError as h, writeMultipleOutputs as i, isProviderConfigFileReference as j, isProviderAllowed as k, evalTableToJson as l, fetchCsvFromGoogleSheet as m, createOutputData as n, SUPPORTED_OUTPUT_FILE_FORMATS as o, mergeComparisonTables as p, loadCallbackFromFileUrl as q, warnOnDegradedJsonlRecovery as r, getOutputFileFormat as s, printBorder as t, generateEvalCsv as u, extractRuntimeVars as v, getProviderDescription as w, resultIsForTestCase as x, filterRuntimeVars as y, maybeLoadFromExternalFileWithVars as z };
 
-//# sourceMappingURL=util-BdAsuWmv.js.map
+//# sourceMappingURL=util-CZyLhvIk.js.map

package/dist/src/{util-CeP1x2P-.cjs → util-Cadd9fGT.cjs}

@@ -1,6 +1,6 @@
 const require_logger = require("./logger-BN3n9c1R.cjs");
-const require_util = require("./util-L5T81aJ0.cjs");
-const require_fetch = require("./fetch-DTnUr1aF.cjs");
+const require_util = require("./util-BPkxeLuk.cjs");
+const require_fetch = require("./fetch-D54lzFcD.cjs");
 let openai = require("openai");
 openai = require_logger.__toESM(openai, 1);
 //#region src/providers/openai/util.ts
@@ -970,4 +970,4 @@ Object.defineProperty(exports, "validateFunctionCall", {
 	}
 });
 
-//# sourceMappingURL=util-CeP1x2P-.cjs.map
+//# sourceMappingURL=util-Cadd9fGT.cjs.map

package/dist/src/{util-DT7Jko3E.js → util-CzWbxb9R.js}

@@ -1,7 +1,8 @@
 #!/usr/bin/env node
 import { c as logger } from "./logger-YzVIwMVq.js";
-import { r as fetchWithProxy } from "./fetch-Bnj1JCJi.js";
-import { Q as renderVarsInObject } from "./util-BdAsuWmv.js";
+import { r as fetchWithProxy } from "./fetch-KD8O9oZZ.js";
+import "./util-CZyLhvIk.js";
+import { n as renderVarsInObject } from "./render-BRIaR8VG.js";
 //#region src/util/oauth.ts
 /**
 * Buffer time before token expiry to trigger proactive refresh (60 seconds)
@@ -232,4 +233,4 @@ function requiresAsyncAuth(server) {
 //#endregion
 export { getOAuthToken as a, isMcpToolNameFilter as c, TOKEN_REFRESH_BUFFER_MS as d, getMcpErrorMessage as i, renderAuthVars as l, getAuthHeaders as n, getOAuthTokenWithExpiry as o, getAuthQueryParams as r, isMcpErrorResult as s, applyQueryParams as t, requiresAsyncAuth as u };
 
-//# sourceMappingURL=util-DT7Jko3E.js.map
+//# sourceMappingURL=util-CzWbxb9R.js.map

package/dist/src/{util-CVbeMrg1.js → util-DHtnWbEL.js}

@@ -1,6 +1,6 @@
 import { C as getAjv, E as safeJsonStringify, d as looksLikeSecret, v as sanitizeUrl } from "./logger-BKiOczgq.js";
-import { Y as maybeLoadFromExternalFileWithVars } from "./util-DdGIEAK_.js";
-import { C as calculateCost } from "./fetch-BjXG13jC.js";
+import { Y as maybeLoadFromExternalFileWithVars } from "./util-BnytsHEr.js";
+import { w as calculateCost } from "./fetch-tOnj-VPG.js";
 import OpenAI from "openai";
 //#region src/providers/openai/util.ts
 const ajv = getAjv();
@@ -862,4 +862,4 @@ function formatOpenAiError(data) {
 //#endregion
 export { hasSensitiveOpenAiCacheString as _, OPENAI_REALTIME_MODELS as a, appendOpenAiApiPath as c, failApiCall as d, formatOpenAiError as f, hasSensitiveOpenAiCachePath as g, getTokenUsage as h, OPENAI_COMPLETION_MODELS as i, assertOpenAiApiModel as l, getOpenAICompletionTokenDetails as m, OPENAI_BILLING_MODELS as n, OPENAI_TRANSCRIPTION_MODELS as o, getOpenAICacheWriteInputTokens as p, OPENAI_CHAT_MODELS as r, OPENAI_TTS_MODELS as s, NON_CONVERSATIONAL_REALTIME_MODELS as t, calculateOpenAICost as u, validateFunctionCall as v };
 
-//# sourceMappingURL=util-CVbeMrg1.js.map
+//# sourceMappingURL=util-DHtnWbEL.js.map

package/dist/src/{util-BDDaDhsI.cjs → util-DSwbJPgL.cjs}

@@ -1,7 +1,8 @@
 const require_logger = require("./logger-BN3n9c1R.cjs");
-const require_util = require("./util-L5T81aJ0.cjs");
-const require_fetch = require("./fetch-DTnUr1aF.cjs");
+const require_util = require("./util-BPkxeLuk.cjs");
+const require_fetch = require("./fetch-D54lzFcD.cjs");
 const require_fileExtensions = require("./fileExtensions-BQZEFw03.cjs");
+const require_render = require("./render-C1VJjFT2.cjs");
 const require_dataUrl = require("./dataUrl-DM5cIGrK.cjs");
 let zod = require("zod");
 let crypto = require("crypto");
@@ -920,7 +921,7 @@ function stripExecutableToolFileReferencesFromValue(tools) {
 	return tools;
 }
 function stripExecutableToolFileReferences(tools, vars) {
-	return stripExecutableToolFileReferencesFromValue(require_util.renderVarsInObject(tools, vars));
+	return stripExecutableToolFileReferencesFromValue(require_render.renderVarsInObject(tools, vars));
 }
 /**
 * Calculates the cost for a Google API call.
@@ -1301,7 +1302,7 @@ function normalizeTools(tools) {
 	});
 }
 function loadFile(config_var, context_vars) {
-	const fileContents = require_util.maybeLoadFromExternalFile(require_util.renderVarsInObject(config_var, context_vars));
+	const fileContents = require_util.maybeLoadFromExternalFile(require_render.renderVarsInObject(config_var, context_vars));
 	if (typeof fileContents === "string") try {
 		const parsedContents = JSON.parse(fileContents);
 		return Array.isArray(parsedContents) ? normalizeTools(parsedContents) : parsedContents;
@@ -1399,7 +1400,7 @@ function parseConfigSystemInstruction(configSystemInstruction, contextVars) {
 	if (typeof configSystemInstruction === "string") configInstruction = loadFile(configSystemInstruction, contextVars);
 	if (typeof configInstruction === "string") configInstruction = { parts: [{ text: configInstruction }] };
 	if (contextVars && configInstruction) {
-		const nunjucks = require_util.getNunjucksEngine();
+		const nunjucks = require_render.getNunjucksEngine();
 		for (const part of configInstruction.parts) if (part.text) try {
 			part.text = nunjucks.renderString(part.text, contextVars);
 		} catch (err) {
@@ -1766,4 +1767,4 @@ Object.defineProperty(exports, "validateFunctionCall", {
 	}
 });
 
-//# sourceMappingURL=util-BDDaDhsI.cjs.map
+//# sourceMappingURL=util-DSwbJPgL.cjs.map

package/dist/src/{util-BNvjVvcH.cjs → util-DhtW6BNS.cjs}

@@ -1,6 +1,7 @@
 const require_logger = require("./logger-BN3n9c1R.cjs");
-const require_util = require("./util-L5T81aJ0.cjs");
-const require_fetch = require("./fetch-DTnUr1aF.cjs");
+require("./util-BPkxeLuk.cjs");
+const require_fetch = require("./fetch-D54lzFcD.cjs");
+const require_render = require("./render-C1VJjFT2.cjs");
 //#region src/util/oauth.ts
 /**
 * Buffer time before token expiry to trigger proactive refresh (60 seconds)
@@ -74,7 +75,7 @@ function renderAuthVars(server, vars) {
 	const renderVars = vars || process.env;
 	return {
 		...server,
-		auth: require_util.renderVarsInObject(server.auth, renderVars)
+		auth: require_render.renderVarsInObject(server.auth, renderVars)
 	};
 }
 const oauthTokenCache = /* @__PURE__ */ new Map();
@@ -296,4 +297,4 @@ Object.defineProperty(exports, "requiresAsyncAuth", {
 	}
 });
 
-//# sourceMappingURL=util-BNvjVvcH.cjs.map
+//# sourceMappingURL=util-DhtW6BNS.cjs.map

package/dist/src/{util-CmRx53hM.js → util-DiVs2Kf-.js}

@@ -1,7 +1,8 @@
 import { I as getEnvString, o as logger, w as getAjv } from "./logger-D4ion89i.js";
-import { At as getNunjucksEngine, Et as renderVarsInObject, ut as maybeLoadFromExternalFile, xt as parseFileUrl } from "./util-uYYKYi7_.js";
-import { I as parseChatPrompt, O as calculateCost, R as transformToolChoice, k as clampCachedTokens } from "./fetch-BdWQKDMj.js";
+import { ut as maybeLoadFromExternalFile, xt as parseFileUrl } from "./util-BPtpPW4O.js";
+import { A as clampCachedTokens, L as parseChatPrompt, k as calculateCost, z as transformToolChoice } from "./fetch-DnDg-Ics.js";
 import { i as isJavascriptFile } from "./shared-B6FXN6z-.js";
+import { n as renderVarsInObject, o as getNunjucksEngine } from "./render-DIhuKgcQ.js";
 import { n as isDataUrl, r as parseDataUrl, t as extractBase64FromDataUrl } from "./dataUrl-CVhbP_9M.js";
 import { z as z$1 } from "zod";
 import crypto from "crypto";
@@ -1573,4 +1574,4 @@ function createAuthCacheDiscriminator(headers) {
 //#endregion
 export { hasGoogleDefaultCredentials as A, CHAT_MODELS as C, determineGoogleVertexMode as D, GoogleAuthManager as E, resolveProjectId as M, getGoogleApiKey as O, validateFunctionCall as S, getVertexApiHostForRegion as T, removeDeprecatedGeminiGenerationParams as _, formatCandidateContents as a, sanitizeSchemaForGemini as b, getGoogleAccessToken as c, mergeGoogleCompletionOptions as d, mergeParts as f, parseConfigSystemInstruction as g, normalizeTools as h, createAuthCacheDiscriminator as i, loadCredentials as j, getGoogleClient as k, getLastPromptSafetyRatings as l, normalizeSafetySettings as m, calculateGoogleCostFromUsage as n, geminiFormatAndSystemInstructions as o, normalizeGeminiAudio as p, collectGroundingMetadata as r, getCandidate as s, calculateGoogleCost as t, isNonCandidateStreamChunk as u, removeGoogleFunctionDeclarations as v, GOOGLE_MODELS as w, stripExecutableToolFileReferences as x, resolveGoogleToolConfig as y };
 
-//# sourceMappingURL=util-CmRx53hM.js.map
+//# sourceMappingURL=util-DiVs2Kf-.js.map

package/dist/src/{util-DxyypCZC.js → util-DlFpV1xV.js}

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import { c as logger, k as safeJsonStringify } from "./logger-YzVIwMVq.js";
-import { k as getRequestTimeoutMs } from "./fetch-Bnj1JCJi.js";
+import { A as getRequestTimeoutMs } from "./fetch-KD8O9oZZ.js";
 import { Y as DATASET_PLUGINS, ot as pluginDescriptions } from "./tables-DpSgejqG.js";
-import { i as fetchWithCache } from "./cache-NhFSRGTI.js";
+import { i as fetchWithCache } from "./cache-xL5UULpy.js";
 import { d as createEmptyTokenUsage, f as getErrorTokenUsage, s as accumulateResponseTokenUsage } from "./tokenUsageUtils-Cf6nFV6z.js";
-import { c as neverGenerateRemote, i as getRemoteGenerationUrl, p as remoteGenerationContextPayload, r as getRemoteGenerationHeaders } from "./remoteGeneration-B0eQSIHo.js";
+import { c as neverGenerateRemote, i as getRemoteGenerationUrl, p as remoteGenerationContextPayload, r as getRemoteGenerationHeaders } from "./remoteGeneration-Cc78LDjQ.js";
 import { n as escapeRegExp } from "./text-CV7MmVb_.js";
 import { r as materializeInputVariablesWithMetadata } from "./inputVariables-DpjKHmSc.js";
 //#region src/redteam/generationTokenUsage.ts
@@ -396,4 +396,4 @@ function getSessionId(response, context) {
 //#endregion
 export { extractPromptFromTags as a, isBasicRefusal as c, recordFailedGenerationTokenUsage as d, recordGenerationTokenUsage as f, extractMaterializedVariablesFromJsonWithMetadata as i, isEmptyResponse as l, trackGenerationTokenUsage as m, extractGoalFromPrompt as n, getSessionId as o, trackAdditionalGenerationProvider as p, extractInputVarsFromPrompt as r, getShortPluginId as s, extractAllPromptsFromTags as t, removePrefix as u };
 
-//# sourceMappingURL=util-DxyypCZC.js.map
+//# sourceMappingURL=util-DlFpV1xV.js.map

package/dist/src/{util-DtOvD10k.js → util-DlT2H1W5.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { E as getAjv, k as safeJsonStringify, p as looksLikeSecret, x as sanitizeUrl } from "./logger-YzVIwMVq.js";
-import { D as calculateCost } from "./fetch-Bnj1JCJi.js";
-import { z as maybeLoadFromExternalFileWithVars } from "./util-BdAsuWmv.js";
+import { O as calculateCost } from "./fetch-KD8O9oZZ.js";
+import { z as maybeLoadFromExternalFileWithVars } from "./util-CZyLhvIk.js";
 import OpenAI from "openai";
 //#region src/providers/openai/util.ts
 const ajv = getAjv();
@@ -863,4 +863,4 @@ function formatOpenAiError(data) {
 //#endregion
 export { hasSensitiveOpenAiCacheString as _, OPENAI_REALTIME_MODELS as a, appendOpenAiApiPath as c, failApiCall as d, formatOpenAiError as f, hasSensitiveOpenAiCachePath as g, getTokenUsage as h, OPENAI_COMPLETION_MODELS as i, assertOpenAiApiModel as l, getOpenAICompletionTokenDetails as m, OPENAI_BILLING_MODELS as n, OPENAI_TRANSCRIPTION_MODELS as o, getOpenAICacheWriteInputTokens as p, OPENAI_CHAT_MODELS as r, OPENAI_TTS_MODELS as s, NON_CONVERSATIONAL_REALTIME_MODELS as t, calculateOpenAICost as u, validateFunctionCall as v };
 
-//# sourceMappingURL=util-DtOvD10k.js.map
+//# sourceMappingURL=util-DlT2H1W5.js.map

package/dist/src/{util-PX9qBGnk.js → util-InmFNqSw.js}

@@ -1,6 +1,7 @@
 import { o as logger } from "./logger-BKiOczgq.js";
-import { ct as renderVarsInObject } from "./util-DdGIEAK_.js";
-import { t as fetchWithProxy } from "./fetch-BjXG13jC.js";
+import "./util-BnytsHEr.js";
+import { t as fetchWithProxy } from "./fetch-tOnj-VPG.js";
+import { n as renderVarsInObject } from "./render-zarxdXS7.js";
 //#region src/util/oauth.ts
 /**
 * Buffer time before token expiry to trigger proactive refresh (60 seconds)
@@ -231,4 +232,4 @@ function requiresAsyncAuth(server) {
 //#endregion
 export { getOAuthToken as a, isMcpToolNameFilter as c, TOKEN_REFRESH_BUFFER_MS as d, getMcpErrorMessage as i, renderAuthVars as l, getAuthHeaders as n, getOAuthTokenWithExpiry as o, getAuthQueryParams as r, isMcpErrorResult as s, applyQueryParams as t, requiresAsyncAuth as u };
 
-//# sourceMappingURL=util-PX9qBGnk.js.map
+//# sourceMappingURL=util-InmFNqSw.js.map

package/dist/src/{util-CwUz9jYN.js → util-Rbl6Om9L2.js}

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
 import { E as getAjv, R as getEnvString, c as logger } from "./logger-YzVIwMVq.js";
-import { D as calculateCost, F as parseChatPrompt, L as transformToolChoice, O as clampCachedTokens } from "./fetch-Bnj1JCJi.js";
+import { I as parseChatPrompt, O as calculateCost, R as transformToolChoice, k as clampCachedTokens } from "./fetch-KD8O9oZZ.js";
 import { i as isJavascriptFile } from "./fileExtensions-CAc10_Jb.js";
-import { Q as renderVarsInObject, R as maybeLoadFromExternalFile, Y as parseFileUrl, nt as getNunjucksEngine } from "./util-BdAsuWmv.js";
+import { R as maybeLoadFromExternalFile, Y as parseFileUrl } from "./util-CZyLhvIk.js";
+import { n as renderVarsInObject, o as getNunjucksEngine } from "./render-BRIaR8VG.js";
 import { n as isDataUrl, r as parseDataUrl, t as extractBase64FromDataUrl } from "./dataUrl-CJlC_-p_.js";
 import { z as z$1 } from "zod";
 import crypto from "crypto";
@@ -1574,4 +1575,4 @@ function createAuthCacheDiscriminator(headers) {
 //#endregion
 export { getGoogleClient as A, CHAT_MODELS as C, GoogleAuthManager as D, getVertexApiHostForRegion as E, loadCredentials as M, resolveProjectId as N, determineGoogleVertexMode as O, validateFunctionCall as S, GOOGLE_MODELS as T, removeDeprecatedGeminiGenerationParams as _, formatCandidateContents as a, sanitizeSchemaForGemini as b, getGoogleAccessToken as c, mergeGoogleCompletionOptions as d, mergeParts as f, parseConfigSystemInstruction as g, normalizeTools as h, createAuthCacheDiscriminator as i, hasGoogleDefaultCredentials as j, getGoogleApiKey as k, getLastPromptSafetyRatings as l, normalizeSafetySettings as m, calculateGoogleCostFromUsage as n, geminiFormatAndSystemInstructions as o, normalizeGeminiAudio as p, collectGroundingMetadata as r, getCandidate as s, calculateGoogleCost as t, isNonCandidateStreamChunk as u, removeGoogleFunctionDeclarations as v, GEMINI_FLASH_MODELS as w, stripExecutableToolFileReferences as x, resolveGoogleToolConfig as y };
 
-//# sourceMappingURL=util-CwUz9jYN.js.map
+//# sourceMappingURL=util-Rbl6Om9L2.js.map

package/dist/src/{vertex-BGBoge5t.js → vertex-BJYJC-Tr.js}

@@ -1,12 +1,13 @@
 import { n as __exportAll } from "./processShim-CAJN2mjb.js";
 import { I as getEnvString, M as state, T as isValidJson, k as loadYaml, o as logger } from "./logger-D4ion89i.js";
-import { Et as renderVarsInObject, ut as maybeLoadFromExternalFile } from "./util-uYYKYi7_.js";
-import { A as getRequestTimeoutMs, I as parseChatPrompt, t as fetchWithProxy } from "./fetch-BdWQKDMj.js";
+import { ut as maybeLoadFromExternalFile } from "./util-BPtpPW4O.js";
+import { L as parseChatPrompt, j as getRequestTimeoutMs, t as fetchWithProxy } from "./fetch-DnDg-Ics.js";
 import { f as withGenAISpan } from "./genaiTracer-Cp9O3qLz.js";
-import { a as getCache, l as isCacheEnabled } from "./cache-C41JuZ74.js";
-import { M as resolveProjectId, T as getVertexApiHostForRegion, _ as removeDeprecatedGeminiGenerationParams, a as formatCandidateContents, d as mergeGoogleCompletionOptions, f as mergeParts, g as parseConfigSystemInstruction, j as loadCredentials, k as getGoogleClient, m as normalizeSafetySettings, n as calculateGoogleCostFromUsage, o as geminiFormatAndSystemInstructions, p as normalizeGeminiAudio, r as collectGroundingMetadata, s as getCandidate, v as removeGoogleFunctionDeclarations, y as resolveGoogleToolConfig } from "./util-CmRx53hM.js";
-import { C as parseMessages, S as outputFromMessage, _ as isSamplingParamsDeprecatedClaudeModel, i as calculateAnthropicCost, o as clampMaxTokensForThinkingBudget, r as applyClaudeRegionalPremium, s as claudeThinkingConsumesTokens, u as getTokenUsage, x as normalizeClaudeThinkingConfig } from "./util-EBjz-RBV.js";
-import { t as GoogleGenericProvider } from "./base-Bya3Xq-l.js";
+import { a as getCache, l as isCacheEnabled } from "./cache-ePPAC5hy.js";
+import { n as renderVarsInObject } from "./render-DIhuKgcQ.js";
+import { M as resolveProjectId, T as getVertexApiHostForRegion, _ as removeDeprecatedGeminiGenerationParams, a as formatCandidateContents, d as mergeGoogleCompletionOptions, f as mergeParts, g as parseConfigSystemInstruction, j as loadCredentials, k as getGoogleClient, m as normalizeSafetySettings, n as calculateGoogleCostFromUsage, o as geminiFormatAndSystemInstructions, p as normalizeGeminiAudio, r as collectGroundingMetadata, s as getCandidate, v as removeGoogleFunctionDeclarations, y as resolveGoogleToolConfig } from "./util-DiVs2Kf-.js";
+import { C as parseMessages, S as outputFromMessage, _ as isSamplingParamsDeprecatedClaudeModel, i as calculateAnthropicCost, o as clampMaxTokensForThinkingBudget, r as applyClaudeRegionalPremium, s as claudeThinkingConsumesTokens, u as getTokenUsage, x as normalizeClaudeThinkingConfig } from "./util-BaGd-bCr.js";
+import { t as GoogleGenericProvider } from "./base-wuaktSuM.js";
 import { createHmac } from "crypto";
 //#region src/providers/google/vertex.ts
 var vertex_exports = /* @__PURE__ */ __exportAll({
@@ -789,4 +790,4 @@ function getGoogleVertexProviders(env) {
 //#endregion
 export { getGoogleVertexProviders as n, vertex_exports as r, getGoogleVertexEmbeddingProvider as t };
 
-//# sourceMappingURL=vertex-BGBoge5t.js.map
+//# sourceMappingURL=vertex-BJYJC-Tr.js.map