@alint-js/config 0.3.2 → 0.4.0

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { AlintConfig, AlintConfig as AlintConfig$1, AlintConfigItem, ModelSize, PluginDefinition, ProviderDefinition, ProviderDefinition as ProviderDefinition$1, ProviderType, RunnerConfig, RunnerStatsConfig, SetupConfig, SetupConfig as SetupConfig$1, SetupModelDefinition } from "@alint-js/core";
+import { AlintConfig, AlintConfig as AlintConfig$1, AlintConfigItem, ModelSize, PluginDefinition, ProviderDefinition, ProviderType, ProviderType as ProviderType$1, RunnerConfig, RunnerConfig as RunnerConfig$1, RunnerStatsConfig, SetupConfig as SetupConfig$1, SetupModelDefinition, SetupModelDefinition as SetupModelDefinition$1 } from "@alint-js/core";
 //#region src/plugins/spec.d.ts
 interface DirectoryPluginSpecifier {
   directory: string;
@@ -232,25 +232,66 @@ declare function parsePluginLockFile(value: unknown, options: {
 }): ParsedPluginLockFile;
 declare function writePluginLockFile(cwd: string, lockFile: PluginLockFile): Promise<void>;
 //#endregion
+//#region src/setup/types.d.ts
+interface AcpModelConfig extends SetupModelDefinition$1 {
+  args?: string[];
+  command: string;
+  cwd?: string;
+  driver: 'acp';
+  env?: Record<string, string>;
+}
+type ModelConfig = AcpModelConfig | SetupModelDefinition$1;
+/** Raw setup-file provider. CLI model drivers are materialized before core receives it. */
+interface ProviderConfig {
+  endpoint?: string;
+  headers?: Record<string, string>;
+  id: string;
+  models: ModelConfig[];
+  type?: ProviderType$1;
+}
+interface SetupConfig {
+  providers: ProviderConfig[];
+  runner?: RunnerConfig$1;
+  version: 1;
+}
+declare function isAcpModel(model: ModelConfig): model is AcpModelConfig;
+declare function modelFromAcpModel(model: AcpModelConfig): SetupModelDefinition$1;
+//#endregion
 //#region src/setup/load.d.ts
-declare const emptySetupConfig: SetupConfig$1;
-declare function loadSetupConfig(filePath: string): Promise<SetupConfig$1>;
-declare function mergeSetupConfigs(...configs: SetupConfig$1[]): SetupConfig$1;
+declare const emptySetupConfig: SetupConfig;
+declare function loadSetupConfig(filePath: string): Promise<SetupConfig>;
+declare function mergeSetupConfigs(...configs: SetupConfig[]): SetupConfig;
 //#endregion
 //#region src/setup/mutate.d.ts
-declare function addProviderModels(config: SetupConfig$1, providerId: string, modelIds: readonly string[]): SetupConfig$1;
-declare function pruneProviderModels(config: SetupConfig$1, providerId: string, remoteModelIds: ReadonlySet<string>): SetupConfig$1;
-declare function removeProviderModels(config: SetupConfig$1, providerId: string, modelIds: ReadonlySet<string>): SetupConfig$1;
-declare function replaceSetupProvider(config: SetupConfig$1, replacement: ProviderDefinition$1): SetupConfig$1;
-declare function setProviderEndpoint(config: SetupConfig$1, providerId: string, endpoint: string): SetupConfig$1;
-declare function setProviderHeader(config: SetupConfig$1, providerId: string, name: string, value: string): SetupConfig$1;
-declare function unsetProviderHeader(config: SetupConfig$1, providerId: string, name: string): SetupConfig$1;
+declare function addProviderModels(config: SetupConfig, providerId: string, modelIds: readonly string[]): SetupConfig;
+declare function pruneProviderModels(config: SetupConfig, providerId: string, remoteModelIds: ReadonlySet<string>): SetupConfig;
+declare function removeProviderModels(config: SetupConfig, providerId: string, modelIds: ReadonlySet<string>): SetupConfig;
+declare function replaceSetupProvider(config: SetupConfig, replacement: ProviderConfig): SetupConfig;
+declare function setProviderEndpoint(config: SetupConfig, providerId: string, endpoint: string): SetupConfig;
+declare function setProviderHeader(config: SetupConfig, providerId: string, name: string, value: string): SetupConfig;
+declare function unsetProviderHeader(config: SetupConfig, providerId: string, name: string): SetupConfig;
+//#endregion
+//#region src/setup/normalize.d.ts
+interface AcpProviderConfig {
+  id: string;
+  models: AcpModelConfig[];
+}
+interface ModelAdapterProvider {
+  endpoint: string;
+  headers?: Record<string, string>;
+  type: ProviderDefinition['type'];
+}
+interface SetupModelAdapters {
+  acp: (provider: AcpProviderConfig) => Promise<ModelAdapterProvider>;
+}
+/** Normalizes setup-file providers while delegating only model-driven transports. */
+declare function normalizeSetupConfig(config: SetupConfig, adapters: SetupModelAdapters): Promise<SetupConfig$1>;
 //#endregion
 //#region src/setup/toml.d.ts
-declare function parseSetupConfigToml(toml: string): SetupConfig$1;
-declare function stringifySetupConfigToml(config: SetupConfig$1): string;
+declare function parseSetupConfigToml(toml: string): SetupConfig;
+declare function stringifySetupConfigToml(config: SetupConfig): string;
 //#endregion
 //#region src/setup/write.d.ts
-declare function writeSetupConfig(filePath: string, config: SetupConfig$1): Promise<void>;
+declare function writeSetupConfig(filePath: string, config: SetupConfig): Promise<void>;
 //#endregion
-export { type AlintConfig, BuiltInAgentName, CreateDeclarativePluginOptions, CreateReportScopeOptions, DeclarativeFinding, DeclarativeFindingResponse, DeclarativeRuleDefinition, type DirectoryPluginLockEntry, type GlobalSetupConfigPathOptions, LoadDeclarativeRulesOptions, type ModelSize, type ParseStaticConfigOptions, type ParsedDirectoryPluginLockEntry, type ParsedPluginLockEntry, type ParsedPluginLockFile, type ParsedPluginSpecifier, type ParsedRegistryPluginLockEntry, type ParsedStaticConfig, type ParsedStaticConfigGroup, type PluginLockEntry, type PluginLockFile, type ProviderDefinition, type ProviderType, type RegistryPluginLockEntry, ReportScope, type RunnerConfig, type RunnerStatsConfig, type SetupConfig, type SetupModelDefinition, type StaticConfigInput, type StaticConfigItem, type StaticPluginInstallOptions, type StaticPluginInstallResult, type StaticPluginReference, type StaticPluginResolver, type ToAlintConfigOptions, addProviderModels, builtInAgentNames, createDeclarativePlugin, createEmptyPluginLockFile, createReportScope, declarativeFindingResponseSchema, declarativeFindingSchema, declarativeRuleFilePattern, emptySetupConfig, getGlobalSetupConfigPath, getProjectPluginLockPath, getProjectPluginStorePath, getProjectSetupConfigPath, getStatsDir, hasDeclarativeRuleFiles, ignorePatternsAIAgents, ignorePatternsBuildOutputs, ignorePatternsCaches, ignorePatternsCommon, ignorePatternsEslintDefaults, ignorePatternsGenerated, installStaticPlugins, isBuiltInAgentName, listMissing, listUnresolved, loadAlintConfig, loadDeclarativeRules, loadPluginLockFile, loadSetupConfig, loadStaticConfig, mergeSetupConfigs, parsePluginLockFile, parsePluginSpecifier, parseSetupConfigToml, parseStaticConfig, pruneProviderModels, removeProviderModels, replaceSetupProvider, setProviderEndpoint, setProviderHeader, stringifySetupConfigToml, toAlintConfig, unsetProviderHeader, writePluginLockFile, writeSetupConfig };
+export { type AcpModelConfig, type AcpProviderConfig, type AlintConfig, BuiltInAgentName, CreateDeclarativePluginOptions, CreateReportScopeOptions, DeclarativeFinding, DeclarativeFindingResponse, DeclarativeRuleDefinition, type DirectoryPluginLockEntry, type GlobalSetupConfigPathOptions, LoadDeclarativeRulesOptions, type ModelAdapterProvider, type ModelConfig, type ModelSize, type ParseStaticConfigOptions, type ParsedDirectoryPluginLockEntry, type ParsedPluginLockEntry, type ParsedPluginLockFile, type ParsedPluginSpecifier, type ParsedRegistryPluginLockEntry, type ParsedStaticConfig, type ParsedStaticConfigGroup, type PluginLockEntry, type PluginLockFile, type ProviderConfig, type ProviderConfig as ProviderDefinition, type ProviderType, type RegistryPluginLockEntry, ReportScope, type RunnerConfig, type RunnerStatsConfig, type SetupConfig, type SetupModelAdapters, type SetupModelDefinition, type StaticConfigInput, type StaticConfigItem, type StaticPluginInstallOptions, type StaticPluginInstallResult, type StaticPluginReference, type StaticPluginResolver, type ToAlintConfigOptions, addProviderModels, builtInAgentNames, createDeclarativePlugin, createEmptyPluginLockFile, createReportScope, declarativeFindingResponseSchema, declarativeFindingSchema, declarativeRuleFilePattern, emptySetupConfig, getGlobalSetupConfigPath, getProjectPluginLockPath, getProjectPluginStorePath, getProjectSetupConfigPath, getStatsDir, hasDeclarativeRuleFiles, ignorePatternsAIAgents, ignorePatternsBuildOutputs, ignorePatternsCaches, ignorePatternsCommon, ignorePatternsEslintDefaults, ignorePatternsGenerated, installStaticPlugins, isAcpModel, isBuiltInAgentName, listMissing, listUnresolved, loadAlintConfig, loadDeclarativeRules, loadPluginLockFile, loadSetupConfig, loadStaticConfig, mergeSetupConfigs, modelFromAcpModel, normalizeSetupConfig, parsePluginLockFile, parsePluginSpecifier, parseSetupConfigToml, parseStaticConfig, pruneProviderModels, removeProviderModels, replaceSetupProvider, setProviderEndpoint, setProviderHeader, stringifySetupConfigToml, toAlintConfig, unsetProviderHeader, writePluginLockFile, writeSetupConfig };

package/dist/index.mjs

@@ -3,7 +3,7 @@ import { loadConfig } from "c12";
 import { createJiti } from "jiti/static";
 import { createHash, randomUUID } from "node:crypto";
 import { access, mkdir, open, readFile, readdir, realpath, rename, rm, stat, writeFile } from "node:fs/promises";
-import { array, boolean, check, description, literal, looseObject, number, object, optional, parse, picklist, pipe, record, strictObject, string, tupleWithRest, union, unknown, variant } from "valibot";
+import { array, boolean, check, description, finite, integer, literal, looseObject, minValue, nonEmpty, number, object, optional, parse, picklist, pipe, record, strictObject, string, transform, tupleWithRest, undefined_, union, unknown, variant } from "valibot";
 import process from "node:process";
 import { homedir } from "node:os";
 import { dirname as dirname$1, extname, join as join$1, normalize as normalize$1 } from "pathe";
@@ -23,6 +23,7 @@ import tar from "tar-stream";
 import { ofetch } from "ofetch";
 import { pathToFileURL } from "node:url";
 import { isPlainObject } from "es-toolkit/compat";
+import { merge } from "@moeru/std/merge";
 import { parse as parse$1, stringify } from "smol-toml";
 //#region src/paths.ts
 function getGlobalSetupConfigPath(env = process.env, options = {}) {
@@ -156,12 +157,12 @@ async function findDeclarativeRuleFiles(root) {
 	await collectDeclarativeRuleFiles(root, files);
 	return files.sort((left, right) => left.localeCompare(right));
 }
-function isPlainObject$3(value) {
+function isPlainObject$2(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 async function loadDeclarativeRuleFile(filePath) {
 	const input = await loadDeclarativeRuleFileContent(filePath);
-	if (!isPlainObject$3(input)) throw new Error(`Declarative rule file ${filePath} must contain an object.`);
+	if (!isPlainObject$2(input)) throw new Error(`Declarative rule file ${filePath} must contain an object.`);
 	const parsed = parseDeclarativeRuleFileInput(input, filePath);
 	return {
 		builtInAgent: parsed.builtInAgent,
@@ -1086,7 +1087,7 @@ async function toAlintConfig(config, options) {
 	const pluginCache = /* @__PURE__ */ new Map();
 	return Promise.all(config.groups.map((group) => resolveStaticPlugins(group, options, pluginCache)));
 }
-function isPlainObject$2(value) {
+function isPlainObject$1(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isTomlConfig(configFile) {
@@ -1104,14 +1105,14 @@ function parseStaticConfigItems(value) {
 	return value.map(parseStaticConfigItem);
 }
 function readConfigGroup(value) {
-	if (!isPlainObject$2(value)) return;
+	if (!isPlainObject$1(value)) return;
 	const wrapper = value;
 	if (wrapper.config === void 0) return;
-	if (!isPlainObject$2(wrapper.config) || !Array.isArray(wrapper.config.group)) throw new TypeError("Static config field \"config.group\" must be an array.");
+	if (!isPlainObject$1(wrapper.config) || !Array.isArray(wrapper.config.group)) throw new TypeError("Static config field \"config.group\" must be an array.");
 	return wrapper.config.group;
 }
 function readStaticPluginReferences(item, pluginsByAlias, options) {
-	if (!isPlainObject$2(item.plugins)) return [];
+	if (!isPlainObject$1(item.plugins)) return [];
 	const references = [];
 	for (const [alias, plugin] of Object.entries(item.plugins)) {
 		if (typeof plugin !== "string") continue;
@@ -1298,22 +1299,90 @@ async function installStaticPlugins(options) {
 	};
 }
 //#endregion
+//#region src/setup/types.ts
+function isAcpModel(model) {
+	return "driver" in model && model.driver === "acp";
+}
+function modelFromAcpModel(model) {
+	const { args: _, command: _command, cwd: _cwd, driver: _driver, env: _env, ...definition } = model;
+	return definition;
+}
+//#endregion
 //#region src/setup/toml.ts
-const modelSizes = /* @__PURE__ */ new Set([
-	"large",
-	"medium",
-	"small"
-]);
+const modelEntries = {
+	aliases: optional(array(string())),
+	capabilities: optional(array(string())),
+	context_window: optional(number()),
+	default_params: optional(record(string(), unknown())),
+	driver: optional(undefined_()),
+	id: pipe(string(), nonEmpty("Model id must be a non-empty string.")),
+	name: optional(string()),
+	size: optional(picklist([
+		"large",
+		"medium",
+		"small"
+	]))
+};
+const providerModelSchema = object(modelEntries);
+const acpModelSchema = object({
+	...modelEntries,
+	args: optional(array(string())),
+	command: pipe(string(), nonEmpty("ACP model command must be a non-empty string.")),
+	cwd: optional(pipe(string(), nonEmpty("ACP model cwd must be a non-empty string."))),
+	driver: literal("acp"),
+	env: optional(record(string(), string()))
+});
+const modelSchema = pipe(variant("driver", [acpModelSchema, providerModelSchema]), transform(({ context_window: contextWindow, default_params: defaultParams, ...model }) => ({
+	...model,
+	...contextWindow === void 0 ? {} : { contextWindow },
+	...defaultParams === void 0 ? {} : { defaultParams }
+})));
+const providerSchema = pipe(object({
+	endpoint: optional(pipe(string(), nonEmpty("Provider endpoint must be a non-empty string."))),
+	headers: optional(record(string(), string())),
+	id: pipe(string(), nonEmpty("Provider id must be a non-empty string.")),
+	models: array(modelSchema),
+	type: optional(literal("openai-compatible"))
+}), check((provider) => provider.models.every(isAcpModel) || provider.type === "openai-compatible", (issue) => `Invalid provider "${issue.input.id}": type is required for models without a driver.`), check((provider) => provider.models.every(isAcpModel) || provider.endpoint !== void 0, (issue) => `Invalid provider "${issue.input.id}": endpoint is required for models without a driver.`));
+const runnerCacheSchema = union([boolean(), object({
+	enabled: optional(boolean()),
+	location: optional(pipe(string("Invalid runner cache location: must be a string."), nonEmpty("Invalid runner cache location: must be a non-empty string.")))
+})]);
+const positiveIntegerSchemas = {
+	retentionMonths: pipe(number("Invalid runner stats retention_months: must be a positive integer."), integer("Invalid runner stats retention_months: must be a positive integer."), minValue(1, "Invalid runner stats retention_months: must be a positive integer.")),
+	ruleConcurrency: pipe(number("Invalid runner rule_concurrency: must be a positive integer."), integer("Invalid runner rule_concurrency: must be a positive integer."), minValue(1, "Invalid runner rule_concurrency: must be a positive integer.")),
+	timeoutMs: pipe(number("Invalid runner timeout_ms: must be a positive integer."), integer("Invalid runner timeout_ms: must be a positive integer."), minValue(1, "Invalid runner timeout_ms: must be a positive integer."))
+};
+const runnerStatsSchema = union([boolean(), pipe(object({
+	enabled: optional(boolean()),
+	location: optional(pipe(string("Invalid runner stats location: must be a string."), nonEmpty("Invalid runner stats location: must be a non-empty string."))),
+	retention_months: optional(positiveIntegerSchemas.retentionMonths)
+}), transform(({ retention_months: retentionMonths, ...stats }) => ({
+	...stats,
+	...retentionMonths === void 0 ? {} : { retentionMonths }
+})))]);
+const runnerSchema = pipe(object({
+	agent_retries: optional(pipe(number("Invalid runner agent_retries: must be a finite number."), finite("Invalid runner agent_retries: must be a finite number."))),
+	cache: optional(runnerCacheSchema),
+	rule_concurrency: optional(positiveIntegerSchemas.ruleConcurrency),
+	stats: optional(runnerStatsSchema),
+	timeout_ms: optional(positiveIntegerSchemas.timeoutMs)
+}), transform(({ agent_retries: agentRetries, rule_concurrency: ruleConcurrency, timeout_ms: timeoutMs, ...runner }) => ({
+	...runner,
+	...agentRetries === void 0 ? {} : { agentRetries },
+	...ruleConcurrency === void 0 ? {} : { ruleConcurrency },
+	...timeoutMs === void 0 ? {} : { timeoutMs }
+})));
+const setupConfigSchema = pipe(object({
+	providers: optional(array(providerSchema), []),
+	runner: optional(runnerSchema),
+	version: literal(1, "Invalid setup config: version must be 1.")
+}), transform(({ runner, ...config }) => ({
+	...config,
+	...runner === void 0 ? {} : { runner }
+})));
 function parseSetupConfigToml(toml) {
-	const rawConfig = parse$1(toml);
-	if (rawConfig.version !== 1) throw new Error("Invalid setup config: version must be 1.");
-	if (!Array.isArray(rawConfig.providers)) throw new TypeError("Invalid setup config: providers must be an array.");
-	const parsedConfig = {
-		providers: rawConfig.providers.map((provider) => parseProvider(provider)),
-		version: 1
-	};
-	if (rawConfig.runner !== void 0) parsedConfig.runner = parseRunner(rawConfig.runner);
-	return parsedConfig;
+	return parse(setupConfigSchema, parse$1(toml));
 }
 function stringifySetupConfigToml(config) {
 	const stringifiableConfig = {
@@ -1323,103 +1392,15 @@ function stringifySetupConfigToml(config) {
 	if (config.runner !== void 0) stringifiableConfig.runner = toTomlRunner(config.runner);
 	return stringify(stringifiableConfig);
 }
-function isModelSize(value) {
-	return typeof value === "string" && modelSizes.has(value);
-}
-function isPlainObject$1(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function parseModel(providerId, model) {
-	const id = readNonEmptyString(model.id, `provider "${providerId}" model id`);
-	const parsedModel = { id };
-	if (model.name !== void 0) parsedModel.name = readString(model.name, `model "${id}" name`);
-	if (model.aliases !== void 0) parsedModel.aliases = readStringArray(model.aliases, `model "${id}" aliases`);
-	if (model.capabilities !== void 0) parsedModel.capabilities = readStringArray(model.capabilities, `model "${id}" capabilities`);
-	if (model.size !== void 0) {
-		if (!isModelSize(model.size)) throw new Error(`Invalid model "${id}": size must be "small", "medium", or "large".`);
-		parsedModel.size = model.size;
-	}
-	if (model.context_window !== void 0) parsedModel.contextWindow = readFiniteNumber(model.context_window, `model "${id}" context_window`);
-	if (model.default_params !== void 0) parsedModel.defaultParams = readRecord(model.default_params, `model "${id}" default_params`);
-	return parsedModel;
-}
-function parsePositiveInteger(value, label) {
-	if (typeof value !== "number" || !Number.isInteger(value) || value <= 0) throw new TypeError(`Invalid ${label}: must be a positive integer.`);
-	return value;
-}
-function parseProvider(provider) {
-	const id = readNonEmptyString(provider.id, "provider id");
-	if (provider.type !== "openai-compatible") throw new Error(`Invalid provider "${id}": type must be "openai-compatible".`);
-	const endpoint = readNonEmptyString(provider.endpoint, `provider "${id}" endpoint`);
-	if (!Array.isArray(provider.models)) throw new TypeError(`Invalid provider "${id}": models must be an array.`);
-	const parsedProvider = {
-		endpoint,
-		id,
-		models: provider.models.map((model) => parseModel(id, model)),
-		type: provider.type
+function toTomlAcpModel(model) {
+	return {
+		...toTomlModel(model),
+		args: model.args,
+		command: model.command,
+		cwd: model.cwd,
+		driver: "acp",
+		env: model.env
 	};
-	if (provider.headers !== void 0) parsedProvider.headers = readStringMap(provider.headers, `provider "${id}" headers`);
-	return parsedProvider;
-}
-function parseRunner(runner) {
-	const parsedRunner = {};
-	if (runner.agent_retries !== void 0) parsedRunner.agentRetries = readFiniteNumber(runner.agent_retries, "runner agent_retries");
-	if (runner.cache !== void 0) parsedRunner.cache = parseRunnerCache(runner.cache);
-	if (runner.rule_concurrency !== void 0) parsedRunner.ruleConcurrency = parsePositiveInteger(runner.rule_concurrency, "runner rule_concurrency");
-	if (runner.stats !== void 0) parsedRunner.stats = parseRunnerStats(runner.stats);
-	if (runner.timeout_ms !== void 0) parsedRunner.timeoutMs = parsePositiveInteger(runner.timeout_ms, "runner timeout_ms");
-	return parsedRunner;
-}
-function parseRunnerCache(cache) {
-	if (typeof cache === "boolean") return cache;
-	if (!isPlainObject$1(cache)) throw new TypeError("Invalid runner cache: must be a boolean or table.");
-	const tomlCache = cache;
-	const parsedCache = {};
-	if (tomlCache.enabled !== void 0) {
-		if (typeof tomlCache.enabled !== "boolean") throw new TypeError("Invalid runner cache enabled: must be a boolean.");
-		parsedCache.enabled = tomlCache.enabled;
-	}
-	if (tomlCache.location !== void 0) parsedCache.location = readNonEmptyString(tomlCache.location, "runner cache location");
-	return parsedCache;
-}
-function parseRunnerStats(stats) {
-	if (typeof stats === "boolean") return stats;
-	if (!isPlainObject$1(stats)) throw new TypeError("Invalid runner stats: must be a boolean or an object.");
-	const tomlStats = stats;
-	const parsedStats = {};
-	if (tomlStats.enabled !== void 0) {
-		if (typeof tomlStats.enabled !== "boolean") throw new TypeError("Invalid runner stats enabled: must be a boolean.");
-		parsedStats.enabled = tomlStats.enabled;
-	}
-	if (tomlStats.location !== void 0) parsedStats.location = readNonEmptyString(tomlStats.location, "runner stats location");
-	if (tomlStats.retention_months !== void 0) parsedStats.retentionMonths = parsePositiveInteger(tomlStats.retention_months, "runner stats retention_months");
-	return parsedStats;
-}
-function readFiniteNumber(value, label) {
-	if (typeof value !== "number" || !Number.isFinite(value)) throw new TypeError(`Invalid ${label}: must be a finite number.`);
-	return value;
-}
-function readNonEmptyString(value, label) {
-	const stringValue = readString(value, label);
-	if (stringValue.length === 0) throw new Error(`Invalid ${label}: must be a non-empty string.`);
-	return stringValue;
-}
-function readRecord(value, label) {
-	if (!isPlainObject$1(value)) throw new Error(`Invalid ${label}: must be a table.`);
-	return value;
-}
-function readString(value, label) {
-	if (typeof value !== "string") throw new TypeError(`Invalid ${label}: must be a string.`);
-	return value;
-}
-function readStringArray(value, label) {
-	if (!Array.isArray(value) || !value.every((item) => typeof item === "string")) throw new Error(`Invalid ${label}: must be an array of strings.`);
-	return value;
-}
-function readStringMap(value, label) {
-	const record = readRecord(value, label);
-	if (!Object.values(record).every((item) => typeof item === "string")) throw new Error(`Invalid ${label}: must be a string map.`);
-	return record;
 }
 function toTomlModel(model) {
 	const tomlModel = { id: model.id };
@@ -1435,7 +1416,7 @@ function toTomlProvider(provider) {
 	const tomlProvider = {
 		endpoint: provider.endpoint,
 		id: provider.id,
-		models: provider.models.map(toTomlModel),
+		models: provider.models.map((model) => "driver" in model && model.driver === "acp" ? toTomlAcpModel(model) : toTomlModel(model)),
 		type: provider.type
 	};
 	if (provider.headers !== void 0) tomlProvider.headers = provider.headers;
@@ -1494,8 +1475,8 @@ function mergeSetupConfigs(...configs) {
 				configProviders.push(mergedProvider);
 				continue;
 			}
-			existingProvider.endpoint = provider.endpoint;
-			existingProvider.type = provider.type;
+			if (provider.endpoint !== void 0) existingProvider.endpoint = provider.endpoint;
+			if (provider.type !== void 0) existingProvider.type = provider.type;
 			configProviders.push(existingProvider);
 			if (provider.headers !== void 0) existingProvider.headers = {
 				...existingProvider.headers,
@@ -1505,7 +1486,7 @@ function mergeSetupConfigs(...configs) {
 			for (const incomingModel of provider.models) {
 				const existingModelIndex = existingProvider.models.findIndex((model) => model.id === incomingModel.id);
 				if (existingModelIndex === -1) {
-					nextModels.push(cloneModel$1(incomingModel));
+					nextModels.push(cloneModel$2(incomingModel));
 					continue;
 				}
 				const existingModel = existingProvider.models[existingModelIndex];
@@ -1523,8 +1504,12 @@ function mergeSetupConfigs(...configs) {
 	if (runner !== void 0) mergedConfig.runner = runner;
 	return mergedConfig;
 }
-function cloneModel$1(model) {
-	const clonedModel = { ...model };
+function cloneModel$2(model) {
+	const clonedModel = isAcpModel(model) ? {
+		...model,
+		args: model.args ? [...model.args] : void 0,
+		env: model.env ? { ...model.env } : void 0
+	} : { ...model };
 	if (model.aliases !== void 0) clonedModel.aliases = [...model.aliases];
 	if (model.capabilities !== void 0) clonedModel.capabilities = [...model.capabilities];
 	if (model.defaultParams !== void 0) clonedModel.defaultParams = { ...model.defaultParams };
@@ -1533,7 +1518,7 @@ function cloneModel$1(model) {
 function cloneProvider$1(provider) {
 	const clonedProvider = {
 		...provider,
-		models: provider.models.map(cloneModel$1)
+		models: provider.models.map(cloneModel$2)
 	};
 	if (provider.headers !== void 0) clonedProvider.headers = { ...provider.headers };
 	return clonedProvider;
@@ -1545,15 +1530,9 @@ function createEmptySetupConfig() {
 	};
 }
 function mergeModel(existingModel, incomingModel) {
-	const existing = cloneModel$1(existingModel);
-	const incoming = cloneModel$1(incomingModel);
-	return {
-		...existing,
-		...incoming,
-		aliases: incoming.aliases ?? existing.aliases,
-		capabilities: incoming.capabilities ?? existing.capabilities,
-		defaultParams: incoming.defaultParams ?? existing.defaultParams
-	};
+	const existing = cloneModel$2(existingModel);
+	const incoming = cloneModel$2(incomingModel);
+	return merge(existing, incoming);
 }
 function prioritizeProviders(providers, prioritizedProviders) {
 	const prioritizedProviderIds = new Set(prioritizedProviders.map((provider) => provider.id));
@@ -1582,7 +1561,7 @@ function addProviderModels(config, providerId, modelIds) {
 function pruneProviderModels(config, providerId, remoteModelIds) {
 	return updateProvider(config, providerId, (provider) => ({
 		...provider,
-		models: provider.models.filter((model) => remoteModelIds.has(model.id))
+		models: provider.models.filter((model) => isAcpModel(model) || remoteModelIds.has(model.id))
 	}));
 }
 function removeProviderModels(config, providerId, modelIds) {
@@ -1619,7 +1598,7 @@ function unsetProviderHeader(config, providerId, name) {
 		};
 	});
 }
-function cloneModel(model) {
+function cloneModel$1(model) {
 	return {
 		...model,
 		aliases: model.aliases === void 0 ? void 0 : [...model.aliases],
@@ -1631,7 +1610,7 @@ function cloneProvider(provider) {
 	return {
 		...provider,
 		headers: provider.headers === void 0 ? void 0 : { ...provider.headers },
-		models: provider.models.map(cloneModel)
+		models: provider.models.map(cloneModel$1)
 	};
 }
 function headersWithoutName(headers, name) {
@@ -1650,10 +1629,94 @@ function updateProvider(config, providerId, update) {
 	};
 }
 //#endregion
+//#region src/setup/normalize.ts
+/** Normalizes setup-file providers while delegating only model-driven transports. */
+async function normalizeSetupConfig(config, adapters) {
+	const providers = [];
+	for (const provider of config.providers) {
+		const acpModels = provider.models.filter(isAcpModel);
+		if (acpModels.length === 0) {
+			if (provider.models.length > 0) {
+				const normalizedProvider = providerFromConfig(provider);
+				normalizedProvider.models.push(...provider.models.map(cloneModel));
+				providers.push(normalizedProvider);
+			}
+			continue;
+		}
+		const acpProvider = await adapters.acp({
+			id: provider.id,
+			models: acpModels.map(cloneAcpModel)
+		});
+		let activeDriver;
+		let activeProvider;
+		for (const model of provider.models) {
+			const driver = isAcpModel(model) ? "acp" : "provider";
+			const normalizedModel = cloneModel(isAcpModel(model) ? modelFromAcpModel(model) : model);
+			if (driver === activeDriver && activeProvider !== void 0) {
+				activeProvider.models.push(normalizedModel);
+				continue;
+			}
+			activeDriver = driver;
+			activeProvider = driver === "acp" ? providerFromAdapter(provider.id, acpProvider) : providerFromConfig(provider);
+			activeProvider.models.push(normalizedModel);
+			providers.push(activeProvider);
+		}
+	}
+	return {
+		providers,
+		...config.runner === void 0 ? {} : { runner: cloneRunner(config.runner) },
+		version: 1
+	};
+}
+function cloneAcpModel(model) {
+	return {
+		...model,
+		aliases: model.aliases ? [...model.aliases] : void 0,
+		args: model.args ? [...model.args] : void 0,
+		capabilities: model.capabilities ? [...model.capabilities] : void 0,
+		defaultParams: model.defaultParams ? { ...model.defaultParams } : void 0,
+		env: model.env ? { ...model.env } : void 0
+	};
+}
+function cloneModel(model) {
+	return {
+		...model,
+		aliases: model.aliases ? [...model.aliases] : void 0,
+		capabilities: model.capabilities ? [...model.capabilities] : void 0,
+		defaultParams: model.defaultParams ? { ...model.defaultParams } : void 0
+	};
+}
+function cloneRunner(runner) {
+	return {
+		...runner,
+		cache: typeof runner.cache === "object" ? { ...runner.cache } : runner.cache,
+		stats: typeof runner.stats === "object" ? { ...runner.stats } : runner.stats
+	};
+}
+function providerFromAdapter(id, provider) {
+	return {
+		...provider,
+		headers: provider.headers ? { ...provider.headers } : void 0,
+		id,
+		models: []
+	};
+}
+function providerFromConfig(provider) {
+	if (provider.endpoint === void 0) throw new Error(`Provider "${provider.id}" requires endpoint for models without a driver.`);
+	if (provider.type === void 0) throw new Error(`Provider "${provider.id}" requires type for models without a driver.`);
+	return {
+		endpoint: provider.endpoint,
+		headers: provider.headers ? { ...provider.headers } : void 0,
+		id: provider.id,
+		models: [],
+		type: provider.type
+	};
+}
+//#endregion
 //#region src/setup/write.ts
 async function writeSetupConfig(filePath, config) {
 	await mkdir(dirname$1(filePath), { recursive: true });
 	await writeFile(filePath, stringifySetupConfigToml(config), "utf8");
 }
 //#endregion
-export { addProviderModels, builtInAgentNames, createDeclarativePlugin, createEmptyPluginLockFile, createReportScope, declarativeFindingResponseSchema, declarativeFindingSchema, declarativeRuleFilePattern, emptySetupConfig, getGlobalSetupConfigPath, getProjectPluginLockPath, getProjectPluginStorePath, getProjectSetupConfigPath, getStatsDir, hasDeclarativeRuleFiles, ignorePatternsAIAgents, ignorePatternsBuildOutputs, ignorePatternsCaches, ignorePatternsCommon, ignorePatternsEslintDefaults, ignorePatternsGenerated, installStaticPlugins, isBuiltInAgentName, listMissing, listUnresolved, loadAlintConfig, loadDeclarativeRules, loadPluginLockFile, loadSetupConfig, loadStaticConfig, mergeSetupConfigs, parsePluginLockFile, parsePluginSpecifier, parseSetupConfigToml, parseStaticConfig, pruneProviderModels, removeProviderModels, replaceSetupProvider, setProviderEndpoint, setProviderHeader, stringifySetupConfigToml, toAlintConfig, unsetProviderHeader, writePluginLockFile, writeSetupConfig };
+export { addProviderModels, builtInAgentNames, createDeclarativePlugin, createEmptyPluginLockFile, createReportScope, declarativeFindingResponseSchema, declarativeFindingSchema, declarativeRuleFilePattern, emptySetupConfig, getGlobalSetupConfigPath, getProjectPluginLockPath, getProjectPluginStorePath, getProjectSetupConfigPath, getStatsDir, hasDeclarativeRuleFiles, ignorePatternsAIAgents, ignorePatternsBuildOutputs, ignorePatternsCaches, ignorePatternsCommon, ignorePatternsEslintDefaults, ignorePatternsGenerated, installStaticPlugins, isAcpModel, isBuiltInAgentName, listMissing, listUnresolved, loadAlintConfig, loadDeclarativeRules, loadPluginLockFile, loadSetupConfig, loadStaticConfig, mergeSetupConfigs, modelFromAcpModel, normalizeSetupConfig, parsePluginLockFile, parsePluginSpecifier, parseSetupConfigToml, parseStaticConfig, pruneProviderModels, removeProviderModels, replaceSetupProvider, setProviderEndpoint, setProviderHeader, stringifySetupConfigToml, toAlintConfig, unsetProviderHeader, writePluginLockFile, writeSetupConfig };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alint-js/config",
   "type": "module",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "exports": {
     ".": {
       "types": "./dist/index.d.mts",
@@ -28,8 +28,8 @@
     "tar-stream": "^3.2.0",
     "valibot": "^1.4.2",
     "xdg-basedir": "^5.1.0",
-    "@alint-js/core": "0.3.2",
-    "@alint-js/tools-fs": "0.3.2"
+    "@alint-js/core": "0.4.0",
+    "@alint-js/tools-fs": "0.4.0"
   },
   "devDependencies": {
     "@types/tar-stream": "^3.1.4",