vieval 0.0.10 → 0.0.12

package/dist/plugins/chat-models/index.mjs

@@ -1,84 +1,25 @@
-import { n as requiredEnvFrom, t as envFrom } from "../../env-nV5rVErX.mjs";
-import { t as resolveModelByName } from "../../models-pBSRUZhY.mjs";
+import { t as resolveModelByName } from "../../models-CaCOUPZw.mjs";
+import { n as requiredEnvFrom, t as envFrom } from "../../env-egxaJtNn.mjs";
 import process from "node:process";
 import { errorMessageFrom } from "@moeru/std";
 //#region src/plugins/chat-models/runtime-config.ts
-function getParameters(model) {
-	return model.parameters ?? {};
-}
-function parseOptionalStringParameter(parameters, key, modelId) {
-	const value = parameters[key];
-	const normalized = value == null ? void 0 : String(value);
-	const name = `${modelId}.parameters.${key}`;
-	return envFrom({ [name]: normalized }, {
-		name,
-		type: "string"
-	});
-}
-function parseRequiredStringParameter(parameters, key, modelId) {
-	const value = parameters[key];
-	const normalized = value == null ? void 0 : String(value);
-	const name = `${modelId}.parameters.${key}`;
-	return requiredEnvFrom({ [name]: normalized }, {
-		name,
-		type: "string"
-	});
-}
-function parseHeadersParameter(parameters, modelId) {
-	const headers = parameters.headers;
-	if (headers == null) return;
-	if (typeof headers !== "object" || Array.isArray(headers)) throw new TypeError(`Invalid ${modelId}.parameters.headers: expected an object.`);
-	const normalized = {};
-	for (const [key, value] of Object.entries(headers)) {
-		if (typeof value === "string") {
-			normalized[key] = value;
-			continue;
-		}
-		if (Array.isArray(value) && value.every((item) => typeof item === "string")) {
-			normalized[key] = value;
-			continue;
-		}
-		throw new Error(`Invalid ${modelId}.parameters.headers.${key}: expected string or string[].`);
-	}
-	return normalized;
-}
 /**
-* Normalizes one configured chat model into runtime executor config.
+* Resolves Ollama runtime config from one resolved run-context model.
 *
 * Use when:
-* - eval code needs typed provider constructor options from a resolved model
-* - model parameters should be validated once with clear error messages
+* - task execution already has a model resolved through chat-model helpers
+* - eval code wants typed Ollama provider options with a concise helper name
 *
 * Expects:
-* - `model.inferenceExecutorId` to be one of the supported executor ids
-* - required OpenAI fields (apiKey) to exist in `model.parameters`
+* - `model` to resolve to an Ollama-backed chat model
 *
 * Returns:
-* - validated runtime config union for OpenAI or Ollama
+* - validated Ollama runtime config
 */
-function toChatModelRuntimeConfig(model) {
-	const parameters = getParameters(model);
-	if (model.inferenceExecutorId === "openai") return {
-		apiKey: parseRequiredStringParameter(parameters, "apiKey", model.id),
-		baseURL: parseOptionalStringParameter(parameters, "baseURL", model.id),
-		headers: parseHeadersParameter(parameters, model.id),
-		inferenceExecutor: "openai",
-		model: model.model
-	};
-	if (model.inferenceExecutorId === "ollama") return {
-		baseURL: parseOptionalStringParameter(parameters, "baseURL", model.id),
-		headers: parseHeadersParameter(parameters, model.id),
-		inferenceExecutor: "ollama",
-		model: model.model
-	};
-	if (model.inferenceExecutorId === "openrouter") return {
-		apiKey: parseRequiredStringParameter(parameters, "apiKey", model.id),
-		baseURL: parseOptionalStringParameter(parameters, "baseURL", model.id),
-		headers: parseHeadersParameter(parameters, model.id),
-		inferenceExecutor: "openrouter",
-		model: model.model
-	};
-	throw new Error(`Unsupported chat inference executor "${model.inferenceExecutorId}" for model "${model.id}".`);
+function ollamaFromRunContext(model) {
+	const runtimeConfig = toChatModelRuntimeConfig(model);
+	if (runtimeConfig.inferenceExecutor !== "ollama") throw new Error(`Expected ollama model, got "${runtimeConfig.inferenceExecutor}" for "${model.id}".`);
+	return runtimeConfig;
 }
 /**
 * Resolves OpenAI runtime config from one resolved run-context model.
@@ -99,104 +40,141 @@ function openaiFromRunContext(model) {
 	return runtimeConfig;
 }
 /**
-* Resolves Ollama runtime config from one resolved run-context model.
+* Resolves OpenRouter runtime config from one resolved run-context model.
 *
 * Use when:
 * - task execution already has a model resolved through chat-model helpers
-* - eval code wants typed Ollama provider options with a concise helper name
+* - eval code wants typed OpenRouter provider options with a concise helper name
 *
 * Expects:
-* - `model` to resolve to an Ollama-backed chat model
+* - `model` to resolve to an OpenRouter-backed chat model
 *
 * Returns:
-* - validated Ollama runtime config
+* - validated OpenRouter runtime config
 */
-function ollamaFromRunContext(model) {
+function openrouterFromRunContext(model) {
 	const runtimeConfig = toChatModelRuntimeConfig(model);
-	if (runtimeConfig.inferenceExecutor !== "ollama") throw new Error(`Expected ollama model, got "${runtimeConfig.inferenceExecutor}" for "${model.id}".`);
+	if (runtimeConfig.inferenceExecutor !== "openrouter") throw new Error(`Expected openrouter model, got "${runtimeConfig.inferenceExecutor}" for "${model.id}".`);
 	return runtimeConfig;
 }
 /**
-* Resolves OpenRouter runtime config from one resolved run-context model.
+* Normalizes one configured chat model into runtime executor config.
 *
 * Use when:
-* - task execution already has a model resolved through chat-model helpers
-* - eval code wants typed OpenRouter provider options with a concise helper name
+* - eval code needs typed provider constructor options from a resolved model
+* - model parameters should be validated once with clear error messages
 *
 * Expects:
-* - `model` to resolve to an OpenRouter-backed chat model
+* - `model.inferenceExecutorId` to be one of the supported executor ids
+* - required OpenAI fields (apiKey) to exist in `model.parameters`
 *
 * Returns:
-* - validated OpenRouter runtime config
+* - validated runtime config union for OpenAI or Ollama
 */
-function openrouterFromRunContext(model) {
-	const runtimeConfig = toChatModelRuntimeConfig(model);
-	if (runtimeConfig.inferenceExecutor !== "openrouter") throw new Error(`Expected openrouter model, got "${runtimeConfig.inferenceExecutor}" for "${model.id}".`);
-	return runtimeConfig;
+function toChatModelRuntimeConfig(model) {
+	const parameters = getParameters(model);
+	if (model.inferenceExecutorId === "openai") return {
+		apiKey: parseRequiredStringParameter(parameters, "apiKey", model.id),
+		baseURL: parseOptionalStringParameter(parameters, "baseURL", model.id),
+		headers: parseHeadersParameter(parameters, model.id),
+		inferenceExecutor: "openai",
+		model: model.model
+	};
+	if (model.inferenceExecutorId === "ollama") return {
+		baseURL: parseOptionalStringParameter(parameters, "baseURL", model.id),
+		headers: parseHeadersParameter(parameters, model.id),
+		inferenceExecutor: "ollama",
+		model: model.model
+	};
+	if (model.inferenceExecutorId === "openrouter") return {
+		apiKey: parseRequiredStringParameter(parameters, "apiKey", model.id),
+		baseURL: parseOptionalStringParameter(parameters, "baseURL", model.id),
+		headers: parseHeadersParameter(parameters, model.id),
+		inferenceExecutor: "openrouter",
+		model: model.model
+	};
+	throw new Error(`Unsupported chat inference executor "${model.inferenceExecutorId}" for model "${model.id}".`);
 }
-//#endregion
-//#region src/plugins/chat-models/telemetry.ts
-function asRecord(value) {
-	if (value == null || typeof value !== "object") return;
-	return value;
+function getParameters(model) {
+	return model.parameters ?? {};
 }
-function parseMaybeJson(value) {
-	if (typeof value !== "string") return value;
-	try {
-		return JSON.parse(value);
-	} catch {
-		return value;
+function parseHeadersParameter(parameters, modelId) {
+	const headers = parameters.headers;
+	if (headers == null) return;
+	if (typeof headers !== "object" || Array.isArray(headers)) throw new TypeError(`Invalid ${modelId}.parameters.headers: expected an object.`);
+	const normalized = {};
+	for (const [key, value] of Object.entries(headers)) {
+		if (typeof value === "string") {
+			normalized[key] = value;
+			continue;
+		}
+		if (Array.isArray(value) && value.every((item) => typeof item === "string")) {
+			normalized[key] = value;
+			continue;
+		}
+		throw new Error(`Invalid ${modelId}.parameters.headers.${key}: expected string or string[].`);
 	}
+	return normalized;
+}
+function parseOptionalStringParameter(parameters, key, modelId) {
+	const value = parameters[key];
+	const normalized = value == null ? void 0 : String(value);
+	const name = `${modelId}.parameters.${key}`;
+	return envFrom({ [name]: normalized }, {
+		name,
+		type: "string"
+	});
+}
+function parseRequiredStringParameter(parameters, key, modelId) {
+	const value = parameters[key];
+	const normalized = value == null ? void 0 : String(value);
+	const name = `${modelId}.parameters.${key}`;
+	return requiredEnvFrom({ [name]: normalized }, {
+		name,
+		type: "string"
+	});
 }
+//#endregion
+//#region src/plugins/chat-models/telemetry.ts
 /**
-* Extracts normalized tool calls from one chat-model response shape.
+* Emits chat-model failure telemetry as a reportable task event.
 *
 * Use when:
-* - downstream scoring, reporting, or analysis should inspect tool call usage
-* - provider payload differences should stay hidden behind one stable shape
+* - one inference call fails and report artifacts should include normalized error context
 *
-* Returns:
-* - normalized list of `{ id?, name, args }` tool calls
+* Expects:
+* - `context.reporterHooks?.onEvent` to be available in CLI execution paths
 */
-function extractChatModelToolCalls(response) {
-	const responseRecord = asRecord(response);
-	if (responseRecord == null) return [];
-	const rawToolCalls = responseRecord.toolCalls ?? responseRecord.tool_calls;
-	if (!Array.isArray(rawToolCalls)) return [];
-	const toolCalls = [];
-	for (const rawToolCall of rawToolCalls) {
-		const toolCallRecord = asRecord(rawToolCall);
-		if (toolCallRecord == null) continue;
-		const functionPayload = asRecord(toolCallRecord.function);
-		const name = typeof toolCallRecord.name === "string" ? toolCallRecord.name : typeof functionPayload?.name === "string" ? functionPayload.name : void 0;
-		if (name == null || name.length === 0) continue;
-		const rawArgs = toolCallRecord.args ?? toolCallRecord.arguments ?? functionPayload?.args ?? functionPayload?.arguments;
-		toolCalls.push({
-			args: parseMaybeJson(rawArgs),
-			id: typeof toolCallRecord.id === "string" ? toolCallRecord.id : void 0,
-			name
-		});
-	}
-	return toolCalls;
+function emitChatModelErrorTelemetry(context, options) {
+	context.reporterHooks?.onEvent?.({
+		caseId: options.caseId,
+		data: {
+			error: errorMessageFrom(options.error) ?? "Unknown inference error.",
+			modality: "chat",
+			provider: options.provider
+		},
+		event: "InferenceError"
+	});
 }
 /**
-* Extracts numeric metering dimensions from one chat-model response usage block.
+* Emits chat-model request telemetry as a reportable task event.
 *
 * Use when:
-* - report events should capture usage dimensions in a modality-neutral map
+* - task code submits one model request and wants request-side traceability
 *
-* Returns:
-* - numeric dimensions keyed by provider usage field names
+* Expects:
+* - `context.reporterHooks?.onEvent` to be available in CLI execution paths
 */
-function extractMeteringDimensions(response) {
-	const usage = asRecord(asRecord(response)?.usage);
-	if (usage == null) return {};
-	const dimensions = {};
-	for (const [key, value] of Object.entries(usage)) {
-		if (typeof value !== "number" || Number.isNaN(value)) continue;
-		dimensions[key] = value;
-	}
-	return dimensions;
+function emitChatModelRequestTelemetry(context, options) {
+	context.reporterHooks?.onEvent?.({
+		caseId: options.caseId,
+		data: {
+			data: options.data,
+			modality: "chat",
+			provider: options.provider
+		},
+		event: "InferenceRequest"
+	});
 }
 /**
 * Emits chat-model response telemetry as reportable task events.
@@ -252,184 +230,69 @@ function emitChatModelResponseTelemetry(context, options) {
 	}
 }
 /**
-* Emits chat-model request telemetry as a reportable task event.
+* Extracts normalized tool calls from one chat-model response shape.
 *
 * Use when:
-* - task code submits one model request and wants request-side traceability
+* - downstream scoring, reporting, or analysis should inspect tool call usage
+* - provider payload differences should stay hidden behind one stable shape
 *
-* Expects:
-* - `context.reporterHooks?.onEvent` to be available in CLI execution paths
+* Returns:
+* - normalized list of `{ id?, name, args }` tool calls
 */
-function emitChatModelRequestTelemetry(context, options) {
-	context.reporterHooks?.onEvent?.({
-		caseId: options.caseId,
-		data: {
-			data: options.data,
-			modality: "chat",
-			provider: options.provider
-		},
-		event: "InferenceRequest"
-	});
+function extractChatModelToolCalls(response) {
+	const responseRecord = asRecord(response);
+	if (responseRecord == null) return [];
+	const rawToolCalls = responseRecord.toolCalls ?? responseRecord.tool_calls;
+	if (!Array.isArray(rawToolCalls)) return [];
+	const toolCalls = [];
+	for (const rawToolCall of rawToolCalls) {
+		const toolCallRecord = asRecord(rawToolCall);
+		if (toolCallRecord == null) continue;
+		const functionPayload = asRecord(toolCallRecord.function);
+		const name = typeof toolCallRecord.name === "string" ? toolCallRecord.name : typeof functionPayload?.name === "string" ? functionPayload.name : void 0;
+		if (name == null || name.length === 0) continue;
+		const rawArgs = toolCallRecord.args ?? toolCallRecord.arguments ?? functionPayload?.args ?? functionPayload?.arguments;
+		toolCalls.push({
+			args: parseMaybeJson(rawArgs),
+			id: typeof toolCallRecord.id === "string" ? toolCallRecord.id : void 0,
+			name
+		});
+	}
+	return toolCalls;
 }
 /**
-* Emits chat-model failure telemetry as a reportable task event.
+* Extracts numeric metering dimensions from one chat-model response usage block.
 *
 * Use when:
-* - one inference call fails and report artifacts should include normalized error context
+* - report events should capture usage dimensions in a modality-neutral map
 *
-* Expects:
-* - `context.reporterHooks?.onEvent` to be available in CLI execution paths
+* Returns:
+* - numeric dimensions keyed by provider usage field names
 */
-function emitChatModelErrorTelemetry(context, options) {
-	context.reporterHooks?.onEvent?.({
-		caseId: options.caseId,
-		data: {
-			error: errorMessageFrom(options.error) ?? "Unknown inference error.",
-			modality: "chat",
-			provider: options.provider
-		},
-		event: "InferenceError"
-	});
-}
-//#endregion
-//#region src/plugins/chat-models/index.ts
-function normalizeExecutionPolicy(policy) {
-	if (policy == null) return;
-	const normalized = {
-		autoAttempt: policy.autoAttempt,
-		autoRetry: policy.autoRetry,
-		autoRetryDelay: policy.autoRetryDelay,
-		timeout: policy.timeout
-	};
-	return Object.values(normalized).some((value) => value != null) ? normalized : void 0;
-}
-function hasJudgeAlias(model) {
-	return [
-		...model.aliases ?? [],
-		...model.id == null ? [] : [model.id],
-		model.model
-	].some((value) => value.toLowerCase().includes("judge"));
-}
-function resolveModelExecutionPolicy(options) {
-	const explicitPolicy = normalizeExecutionPolicy({
-		autoAttempt: options.autoAttempt ?? options.executionPolicy?.autoAttempt,
-		autoRetry: options.autoRetry ?? options.executionPolicy?.autoRetry,
-		autoRetryDelay: options.autoRetryDelay ?? options.executionPolicy?.autoRetryDelay,
-		timeout: options.timeout ?? options.executionPolicy?.timeout
-	});
-	if (explicitPolicy != null && Object.keys(explicitPolicy).length > 0) return explicitPolicy;
-	if (hasJudgeAlias(options)) return { autoRetry: 3 };
-}
-function normalizeInferenceExecutorId(inferenceExecutor, inferenceExecutorId) {
-	if (typeof inferenceExecutor === "string") return inferenceExecutor;
-	return inferenceExecutorId ?? "custom";
-}
-function createDefaultModelId(inferenceExecutorId, model) {
-	return `${inferenceExecutorId}:${model}`;
-}
-function normalizeEnvRecord(env) {
-	const normalized = {};
-	for (const [key, value] of Object.entries(env)) if (typeof value === "string") normalized[key] = value;
-	return normalized;
-}
-async function resolveChatModelResolverValue(value, context) {
-	if (typeof value === "function") return await value(context);
-	return value;
-}
-function resolveRequiredStringValue(value, name) {
-	return requiredEnvFrom({ [name]: value }, {
-		name,
-		type: "string"
-	});
-}
-function resolveOptionalStringValue(value, name) {
-	return envFrom({ [name]: value }, {
-		name,
-		type: "string"
-	});
-}
-function resolveOptionalEnvValue(env, envKey) {
-	return envFrom(env, {
-		name: envKey,
-		type: "string"
-	});
-}
-function resolveRequiredEnvValue(env, envKey) {
-	return requiredEnvFrom(env, {
-		name: envKey,
-		type: "string"
-	});
-}
-function resolveProviderParameters(provider, env) {
-	const parameters = { ...provider.parameters };
-	for (const [parameterName, envKey] of Object.entries(provider.optionalEnv ?? {})) {
-		const resolved = resolveOptionalEnvValue(env, envKey);
-		if (resolved != null) parameters[parameterName] = resolved;
+function extractMeteringDimensions(response) {
+	const usage = asRecord(asRecord(response)?.usage);
+	if (usage == null) return {};
+	const dimensions = {};
+	for (const [key, value] of Object.entries(usage)) {
+		if (typeof value !== "number" || Number.isNaN(value)) continue;
+		dimensions[key] = value;
 	}
-	for (const [parameterName, envKey] of Object.entries(provider.requiredEnv ?? {})) parameters[parameterName] = resolveRequiredEnvValue(env, envKey);
-	return Object.keys(parameters).length > 0 ? parameters : void 0;
-}
-function normalizeChatProviderDefinition(provider, env) {
-	return {
-		id: provider.id,
-		inferenceExecutor: provider.inferenceExecutor,
-		inferenceExecutorId: normalizeInferenceExecutorId(provider.inferenceExecutor, provider.inferenceExecutorId),
-		optionalEnv: provider.optionalEnv,
-		parameters: resolveProviderParameters(provider, env),
-		requiredEnv: provider.requiredEnv
-	};
-}
-function createProviderMap(config) {
-	const providerMap = /* @__PURE__ */ new Map();
-	for (const provider of config.chatProviders ?? []) providerMap.set(provider.id, provider);
-	return providerMap;
+	return dimensions;
 }
-function resolveModelProvider(model, providerMap) {
-	if (model.provider == null) return model;
-	const provider = providerMap.get(model.provider);
-	if (provider == null) throw new Error(`Unknown chat provider "${model.provider}" referenced by model "${model.id}".`);
-	return {
-		...model,
-		inferenceExecutor: provider.inferenceExecutor,
-		inferenceExecutorId: provider.inferenceExecutorId ?? normalizeInferenceExecutorId(provider.inferenceExecutor, provider.inferenceExecutorId),
-		parameters: {
-			...provider.parameters,
-			...model.parameters
-		}
-	};
+function asRecord(value) {
+	if (value == null || typeof value !== "object") return;
+	return value;
 }
-async function resolveModelRuntimeResolvers(model, context) {
-	if (model.runtimeResolvers == null) return;
-	const resolvedParameters = {};
-	if (model.runtimeResolvers.apiKey != null) resolvedParameters.apiKey = resolveRequiredStringValue(await resolveChatModelResolverValue(model.runtimeResolvers.apiKey, context), `${model.id}.apiKey`);
-	if (model.runtimeResolvers.baseURL != null) {
-		const normalizedBaseURL = resolveOptionalStringValue(await resolveChatModelResolverValue(model.runtimeResolvers.baseURL, context), `${model.id}.baseURL`);
-		if (normalizedBaseURL != null) resolvedParameters.baseURL = normalizedBaseURL;
+function parseMaybeJson(value) {
+	if (typeof value !== "string") return value;
+	try {
+		return JSON.parse(value);
+	} catch {
+		return value;
 	}
-	if (model.runtimeResolvers.headers != null) resolvedParameters.headers = await resolveChatModelResolverValue(model.runtimeResolvers.headers, context);
-	return Object.keys(resolvedParameters).length > 0 ? resolvedParameters : void 0;
-}
-async function resolveChatModelDefinition(model, config) {
-	const providerResolvedModel = resolveModelProvider(model, createProviderMap(config));
-	const resolvedRuntimeParameters = await resolveModelRuntimeResolvers(providerResolvedModel, { env: normalizeEnvRecord(config.env ?? process.env) });
-	if (resolvedRuntimeParameters == null) return providerResolvedModel;
-	return {
-		...providerResolvedModel,
-		parameters: {
-			...providerResolvedModel.parameters,
-			...resolvedRuntimeParameters
-		}
-	};
-}
-function isOpenAIChatModelInferenceExecutor(options) {
-	return options.inferenceExecutor === "openai";
-}
-function isOllamaChatModelInferenceExecutor(options) {
-	return options.inferenceExecutor === "ollama";
-}
-function isOpenRouterChatModelInferenceExecutor(options) {
-	return options.inferenceExecutor === "openrouter";
 }
+//#endregion
+//#region src/plugins/chat-models/index.ts
 /**
 * Builds one normalized chat model definition.
 *
@@ -465,6 +328,41 @@ function chatModelFrom(options) {
 	};
 }
 /**
+* Creates a run-matrix `model` axis from configured chat model names.
+*
+* Use when:
+* - run matrix should iterate over explicit chat model ids/aliases
+* - project configs want a concise model-axis helper
+*
+* Expects:
+* - each provided name to match a configured model id or alias at runtime
+*
+* Returns:
+* - matrix axis object compatible with `runMatrix.extend/override`
+*/
+function chatModelMatrix(...names) {
+	return { model: Array.from(new Set(names)) };
+}
+/**
+* Built-in chat models plugin that contributes model definitions to vieval config.
+*
+* Use when:
+* - chat-model registration should stay in config-level plugin setup
+* - tasks and assertions resolve models by name or alias at runtime
+*/
+function ChatModels(options) {
+	return {
+		async configVieval(config) {
+			const resolvedModels = await Promise.all(options.models.map(async (model) => resolveChatModelDefinition(model, config)));
+			return {
+				...config,
+				models: [...config.models ?? [], ...resolvedModels]
+			};
+		},
+		name: "vieval:chat-models"
+	};
+}
+/**
 * Builds one normalized chat provider definition.
 *
 * Use when:
@@ -482,6 +380,42 @@ function chatProviderFrom(options) {
 	};
 }
 /**
+* Built-in chat providers plugin that contributes provider presets to config.
+*
+* Use when:
+* - provider runtime config should be centralized and reusable
+* - provider parameters should be resolved from env via `envFrom`/`requiredEnvFrom`
+*/
+function ChatProviders(options) {
+	return {
+		configVieval(config) {
+			const env = config.env ?? options.env ?? process.env;
+			const normalizedProviders = options.providers.map((provider) => normalizeChatProviderDefinition(provider, env));
+			return {
+				...config,
+				chatProviders: [...config.chatProviders ?? [], ...normalizedProviders]
+			};
+		},
+		name: "vieval:chat-providers"
+	};
+}
+/**
+* Resolves a configured chat model from one eval-matrix axis.
+*
+* Use when:
+* - eval matrix selects a judge, rubric, or evaluator model
+* - callers want the scoped helper instead of passing `scope: 'eval'`
+*
+* Expects:
+* - `options.axis` to exist in `context.task.matrix.eval`
+*
+* Returns:
+* - the configured model matching the selected eval-matrix value
+*/
+function modelFromEval(context, options) {
+	return modelFromMatrix(context, "eval", options);
+}
+/**
 * Resolves a configured chat model from one scoped matrix axis.
 *
 * Use when:
@@ -518,77 +452,143 @@ function modelFromMatrix(context, scope, options) {
 function modelFromRun(context, options) {
 	return modelFromMatrix(context, "run", options);
 }
-/**
-* Resolves a configured chat model from one eval-matrix axis.
-*
-* Use when:
-* - eval matrix selects a judge, rubric, or evaluator model
-* - callers want the scoped helper instead of passing `scope: 'eval'`
-*
-* Expects:
-* - `options.axis` to exist in `context.task.matrix.eval`
-*
-* Returns:
-* - the configured model matching the selected eval-matrix value
-*/
-function modelFromEval(context, options) {
-	return modelFromMatrix(context, "eval", options);
+function createDefaultModelId(inferenceExecutorId, model) {
+	return `${inferenceExecutorId}:${model}`;
 }
-/**
-* Creates a run-matrix `model` axis from configured chat model names.
-*
-* Use when:
-* - run matrix should iterate over explicit chat model ids/aliases
-* - project configs want a concise model-axis helper
-*
-* Expects:
-* - each provided name to match a configured model id or alias at runtime
-*
-* Returns:
-* - matrix axis object compatible with `runMatrix.extend/override`
-*/
-function chatModelMatrix(...names) {
-	return { model: Array.from(new Set(names)) };
+function createProviderMap(config) {
+	const providerMap = /* @__PURE__ */ new Map();
+	for (const provider of config.chatProviders ?? []) providerMap.set(provider.id, provider);
+	return providerMap;
 }
-/**
-* Built-in chat providers plugin that contributes provider presets to config.
-*
-* Use when:
-* - provider runtime config should be centralized and reusable
-* - provider parameters should be resolved from env via `envFrom`/`requiredEnvFrom`
-*/
-function ChatProviders(options) {
+function hasJudgeAlias(model) {
+	return [
+		...model.aliases ?? [],
+		...model.id == null ? [] : [model.id],
+		model.model
+	].some((value) => value.toLowerCase().includes("judge"));
+}
+function isOllamaChatModelInferenceExecutor(options) {
+	return options.inferenceExecutor === "ollama";
+}
+function isOpenAIChatModelInferenceExecutor(options) {
+	return options.inferenceExecutor === "openai";
+}
+function isOpenRouterChatModelInferenceExecutor(options) {
+	return options.inferenceExecutor === "openrouter";
+}
+function normalizeChatProviderDefinition(provider, env) {
 	return {
-		configVieval(config) {
-			const env = config.env ?? options.env ?? process.env;
-			const normalizedProviders = options.providers.map((provider) => normalizeChatProviderDefinition(provider, env));
-			return {
-				...config,
-				chatProviders: [...config.chatProviders ?? [], ...normalizedProviders]
-			};
-		},
-		name: "vieval:chat-providers"
+		id: provider.id,
+		inferenceExecutor: provider.inferenceExecutor,
+		inferenceExecutorId: normalizeInferenceExecutorId(provider.inferenceExecutor, provider.inferenceExecutorId),
+		optionalEnv: provider.optionalEnv,
+		parameters: resolveProviderParameters(provider, env),
+		requiredEnv: provider.requiredEnv
 	};
 }
-/**
-* Built-in chat models plugin that contributes model definitions to vieval config.
-*
-* Use when:
-* - chat-model registration should stay in config-level plugin setup
-* - tasks and assertions resolve models by name or alias at runtime
-*/
-function ChatModels(options) {
+function normalizeEnvRecord(env) {
+	const normalized = {};
+	for (const [key, value] of Object.entries(env)) if (typeof value === "string") normalized[key] = value;
+	return normalized;
+}
+function normalizeExecutionPolicy(policy) {
+	if (policy == null) return;
+	const normalized = {
+		autoAttempt: policy.autoAttempt,
+		autoRetry: policy.autoRetry,
+		autoRetryDelay: policy.autoRetryDelay,
+		timeout: policy.timeout
+	};
+	return Object.values(normalized).some((value) => value != null) ? normalized : void 0;
+}
+function normalizeInferenceExecutorId(inferenceExecutor, inferenceExecutorId) {
+	if (typeof inferenceExecutor === "string") return inferenceExecutor;
+	return inferenceExecutorId ?? "custom";
+}
+async function resolveChatModelDefinition(model, config) {
+	const providerResolvedModel = resolveModelProvider(model, createProviderMap(config));
+	const resolvedRuntimeParameters = await resolveModelRuntimeResolvers(providerResolvedModel, { env: normalizeEnvRecord(config.env ?? process.env) });
+	if (resolvedRuntimeParameters == null) return providerResolvedModel;
 	return {
-		async configVieval(config) {
-			const resolvedModels = await Promise.all(options.models.map(async (model) => resolveChatModelDefinition(model, config)));
-			return {
-				...config,
-				models: [...config.models ?? [], ...resolvedModels]
-			};
-		},
-		name: "vieval:chat-models"
+		...providerResolvedModel,
+		parameters: {
+			...providerResolvedModel.parameters,
+			...resolvedRuntimeParameters
+		}
 	};
 }
+async function resolveChatModelResolverValue(value, context) {
+	if (typeof value === "function") return await value(context);
+	return value;
+}
+function resolveModelExecutionPolicy(options) {
+	const explicitPolicy = normalizeExecutionPolicy({
+		autoAttempt: options.autoAttempt ?? options.executionPolicy?.autoAttempt,
+		autoRetry: options.autoRetry ?? options.executionPolicy?.autoRetry,
+		autoRetryDelay: options.autoRetryDelay ?? options.executionPolicy?.autoRetryDelay,
+		timeout: options.timeout ?? options.executionPolicy?.timeout
+	});
+	if (explicitPolicy != null && Object.keys(explicitPolicy).length > 0) return explicitPolicy;
+	if (hasJudgeAlias(options)) return { autoRetry: 3 };
+}
+function resolveModelProvider(model, providerMap) {
+	if (model.provider == null) return model;
+	const provider = providerMap.get(model.provider);
+	if (provider == null) throw new Error(`Unknown chat provider "${model.provider}" referenced by model "${model.id}".`);
+	return {
+		...model,
+		inferenceExecutor: provider.inferenceExecutor,
+		inferenceExecutorId: provider.inferenceExecutorId ?? normalizeInferenceExecutorId(provider.inferenceExecutor, provider.inferenceExecutorId),
+		parameters: {
+			...provider.parameters,
+			...model.parameters
+		}
+	};
+}
+async function resolveModelRuntimeResolvers(model, context) {
+	if (model.runtimeResolvers == null) return;
+	const resolvedParameters = {};
+	if (model.runtimeResolvers.apiKey != null) resolvedParameters.apiKey = resolveRequiredStringValue(await resolveChatModelResolverValue(model.runtimeResolvers.apiKey, context), `${model.id}.apiKey`);
+	if (model.runtimeResolvers.baseURL != null) {
+		const normalizedBaseURL = resolveOptionalStringValue(await resolveChatModelResolverValue(model.runtimeResolvers.baseURL, context), `${model.id}.baseURL`);
+		if (normalizedBaseURL != null) resolvedParameters.baseURL = normalizedBaseURL;
+	}
+	if (model.runtimeResolvers.headers != null) resolvedParameters.headers = await resolveChatModelResolverValue(model.runtimeResolvers.headers, context);
+	return Object.keys(resolvedParameters).length > 0 ? resolvedParameters : void 0;
+}
+function resolveOptionalEnvValue(env, envKey) {
+	return envFrom(env, {
+		name: envKey,
+		type: "string"
+	});
+}
+function resolveOptionalStringValue(value, name) {
+	return envFrom({ [name]: value }, {
+		name,
+		type: "string"
+	});
+}
+function resolveProviderParameters(provider, env) {
+	const parameters = { ...provider.parameters };
+	for (const [parameterName, envKey] of Object.entries(provider.optionalEnv ?? {})) {
+		const resolved = resolveOptionalEnvValue(env, envKey);
+		if (resolved != null) parameters[parameterName] = resolved;
+	}
+	for (const [parameterName, envKey] of Object.entries(provider.requiredEnv ?? {})) parameters[parameterName] = resolveRequiredEnvValue(env, envKey);
+	return Object.keys(parameters).length > 0 ? parameters : void 0;
+}
+function resolveRequiredEnvValue(env, envKey) {
+	return requiredEnvFrom(env, {
+		name: envKey,
+		type: "string"
+	});
+}
+function resolveRequiredStringValue(value, name) {
+	return requiredEnvFrom({ [name]: value }, {
+		name,
+		type: "string"
+	});
+}
 //#endregion
 export { ChatModels, ChatProviders, chatModelFrom, chatModelMatrix, chatProviderFrom, emitChatModelErrorTelemetry, emitChatModelRequestTelemetry, emitChatModelResponseTelemetry, extractChatModelToolCalls, extractMeteringDimensions, modelFromEval, modelFromMatrix, modelFromRun, ollamaFromRunContext, openaiFromRunContext, openrouterFromRunContext, toChatModelRuntimeConfig };