@bastani/atomic 0.8.31-alpha.5 → 0.9.0-alpha.2

package/dist/core/model-registry.js

@@ -1,342 +1,19 @@
 /**
  * Model registry - manages built-in and custom models, provides API key resolution.
  */
-import { getModels, getProviders, registerApiProvider, resetApiProviders, } from "@earendil-works/pi-ai";
-import { registerOAuthProvider, resetOAuthProviders } from "@earendil-works/pi-ai/oauth";
-import { existsSync, readFileSync } from "fs";
-import { Type } from "typebox";
-import { Compile } from "typebox/compile";
+import { resetApiProviders } from "@earendil-works/pi-ai";
+import { resetOAuthProviders } from "@earendil-works/pi-ai/oauth";
 import { dirname } from "node:path";
 import { getAgentConfigPaths } from "../config.js";
 import { normalizePath } from "../utils/paths.js";
-import { warnDeprecation } from "../utils/deprecation.js";
-import { normalizeContextWindowOptions, validateContextWindowValue, withContextWindowOptions } from "./context-window.js";
-import { copilotCatalogCachePath, getActiveCopilotModelCatalog, seedActiveCopilotModelCatalogFromCache, } from "./copilot-model-catalog.js";
+import { copilotCatalogCachePath, seedActiveCopilotModelCatalogFromCache } from "./copilot-model-catalog.js";
+import { getModelRequestAuth, getApiKeyForProviderFromConfig, getProviderAuthStatusFromConfig } from "./model-registry-auth.js";
+import { applyProviderConfigToModels, migrateLegacyRegisterProviderConfigValues, validateProviderConfig } from "./model-registry-dynamic.js";
+import { loadModelRegistryModels } from "./model-registry-loader.js";
 import { BUILT_IN_PROVIDER_DISPLAY_NAMES } from "./provider-display-names.js";
-import { clearConfigValueCache, getConfigValueEnvVarNames, isCommandConfigValue, isConfigValueConfigured, isLegacyEnvVarNameConfigValue, resolveConfigValueOrThrow, resolveConfigValueUncached, resolveHeadersOrThrow, } from "./resolve-config-value.js";
-// Schema for OpenRouter routing preferences
-const PercentileCutoffsSchema = Type.Object({
-    p50: Type.Optional(Type.Number()),
-    p75: Type.Optional(Type.Number()),
-    p90: Type.Optional(Type.Number()),
-    p99: Type.Optional(Type.Number()),
-});
-const OpenRouterRoutingSchema = Type.Object({
-    allow_fallbacks: Type.Optional(Type.Boolean()),
-    require_parameters: Type.Optional(Type.Boolean()),
-    data_collection: Type.Optional(Type.Union([Type.Literal("deny"), Type.Literal("allow")])),
-    zdr: Type.Optional(Type.Boolean()),
-    enforce_distillable_text: Type.Optional(Type.Boolean()),
-    order: Type.Optional(Type.Array(Type.String())),
-    only: Type.Optional(Type.Array(Type.String())),
-    ignore: Type.Optional(Type.Array(Type.String())),
-    quantizations: Type.Optional(Type.Array(Type.String())),
-    sort: Type.Optional(Type.Union([
-        Type.String(),
-        Type.Object({
-            by: Type.Optional(Type.String()),
-            partition: Type.Optional(Type.Union([Type.String(), Type.Null()])),
-        }),
-    ])),
-    max_price: Type.Optional(Type.Object({
-        prompt: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-        completion: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-        image: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-        audio: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-        request: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-    })),
-    preferred_min_throughput: Type.Optional(Type.Union([Type.Number(), PercentileCutoffsSchema])),
-    preferred_max_latency: Type.Optional(Type.Union([Type.Number(), PercentileCutoffsSchema])),
-});
-// Schema for Vercel AI Gateway routing preferences
-const VercelGatewayRoutingSchema = Type.Object({
-    only: Type.Optional(Type.Array(Type.String())),
-    order: Type.Optional(Type.Array(Type.String())),
-});
-// Schema for thinking level support and provider-specific values
-const ThinkingLevelMapValueSchema = Type.Union([Type.String(), Type.Null()]);
-const ThinkingLevelMapSchema = Type.Object({
-    off: Type.Optional(ThinkingLevelMapValueSchema),
-    minimal: Type.Optional(ThinkingLevelMapValueSchema),
-    low: Type.Optional(ThinkingLevelMapValueSchema),
-    medium: Type.Optional(ThinkingLevelMapValueSchema),
-    high: Type.Optional(ThinkingLevelMapValueSchema),
-    xhigh: Type.Optional(ThinkingLevelMapValueSchema),
-});
-const ContextWindowOptionsSchema = Type.Array(Type.Number());
-const OpenAICompletionsCompatSchema = Type.Object({
-    supportsStore: Type.Optional(Type.Boolean()),
-    supportsDeveloperRole: Type.Optional(Type.Boolean()),
-    supportsReasoningEffort: Type.Optional(Type.Boolean()),
-    supportsUsageInStreaming: Type.Optional(Type.Boolean()),
-    maxTokensField: Type.Optional(Type.Union([Type.Literal("max_completion_tokens"), Type.Literal("max_tokens")])),
-    requiresToolResultName: Type.Optional(Type.Boolean()),
-    requiresAssistantAfterToolResult: Type.Optional(Type.Boolean()),
-    requiresThinkingAsText: Type.Optional(Type.Boolean()),
-    requiresReasoningContentOnAssistantMessages: Type.Optional(Type.Boolean()),
-    thinkingFormat: Type.Optional(Type.Union([
-        Type.Literal("openai"),
-        Type.Literal("openrouter"),
-        Type.Literal("together"),
-        Type.Literal("deepseek"),
-        Type.Literal("zai"),
-        Type.Literal("qwen"),
-        Type.Literal("qwen-chat-template"),
-    ])),
-    cacheControlFormat: Type.Optional(Type.Literal("anthropic")),
-    openRouterRouting: Type.Optional(OpenRouterRoutingSchema),
-    vercelGatewayRouting: Type.Optional(VercelGatewayRoutingSchema),
-    supportsStrictMode: Type.Optional(Type.Boolean()),
-    supportsLongCacheRetention: Type.Optional(Type.Boolean()),
-});
-const OpenAIResponsesCompatSchema = Type.Object({
-    sendSessionIdHeader: Type.Optional(Type.Boolean()),
-    supportsDeveloperRole: Type.Optional(Type.Boolean()),
-    supportsLongCacheRetention: Type.Optional(Type.Boolean()),
-});
-const AnthropicMessagesCompatSchema = Type.Object({
-    supportsEagerToolInputStreaming: Type.Optional(Type.Boolean()),
-    supportsLongCacheRetention: Type.Optional(Type.Boolean()),
-    sendSessionAffinityHeaders: Type.Optional(Type.Boolean()),
-    supportsCacheControlOnTools: Type.Optional(Type.Boolean()),
-    forceAdaptiveThinking: Type.Optional(Type.Boolean()),
-});
-const ProviderCompatSchema = Type.Union([
-    OpenAICompletionsCompatSchema,
-    OpenAIResponsesCompatSchema,
-    AnthropicMessagesCompatSchema,
-]);
-// Schema for custom model definition
-// Most fields are optional with sensible defaults for local models (Ollama, LM Studio, etc.)
-const ModelDefinitionSchema = Type.Object({
-    id: Type.String({ minLength: 1 }),
-    name: Type.Optional(Type.String({ minLength: 1 })),
-    api: Type.Optional(Type.String({ minLength: 1 })),
-    baseUrl: Type.Optional(Type.String({ minLength: 1 })),
-    reasoning: Type.Optional(Type.Boolean()),
-    thinkingLevelMap: Type.Optional(ThinkingLevelMapSchema),
-    input: Type.Optional(Type.Array(Type.Union([Type.Literal("text"), Type.Literal("image")]))),
-    cost: Type.Optional(Type.Object({
-        input: Type.Number(),
-        output: Type.Number(),
-        cacheRead: Type.Number(),
-        cacheWrite: Type.Number(),
-    })),
-    contextWindow: Type.Optional(Type.Number()),
-    contextWindowOptions: Type.Optional(ContextWindowOptionsSchema),
-    maxTokens: Type.Optional(Type.Number()),
-    headers: Type.Optional(Type.Record(Type.String(), Type.String())),
-    compat: Type.Optional(ProviderCompatSchema),
-});
-// Schema for per-model overrides (all fields optional, merged with built-in model)
-const ModelOverrideSchema = Type.Object({
-    name: Type.Optional(Type.String({ minLength: 1 })),
-    reasoning: Type.Optional(Type.Boolean()),
-    thinkingLevelMap: Type.Optional(ThinkingLevelMapSchema),
-    input: Type.Optional(Type.Array(Type.Union([Type.Literal("text"), Type.Literal("image")]))),
-    cost: Type.Optional(Type.Object({
-        input: Type.Optional(Type.Number()),
-        output: Type.Optional(Type.Number()),
-        cacheRead: Type.Optional(Type.Number()),
-        cacheWrite: Type.Optional(Type.Number()),
-    })),
-    contextWindow: Type.Optional(Type.Number()),
-    contextWindowOptions: Type.Optional(ContextWindowOptionsSchema),
-    maxTokens: Type.Optional(Type.Number()),
-    headers: Type.Optional(Type.Record(Type.String(), Type.String())),
-    compat: Type.Optional(ProviderCompatSchema),
-});
-const ProviderConfigSchema = Type.Object({
-    name: Type.Optional(Type.String({ minLength: 1 })),
-    baseUrl: Type.Optional(Type.String({ minLength: 1 })),
-    apiKey: Type.Optional(Type.String({ minLength: 1 })),
-    api: Type.Optional(Type.String({ minLength: 1 })),
-    headers: Type.Optional(Type.Record(Type.String(), Type.String())),
-    compat: Type.Optional(ProviderCompatSchema),
-    authHeader: Type.Optional(Type.Boolean()),
-    models: Type.Optional(Type.Array(ModelDefinitionSchema)),
-    modelOverrides: Type.Optional(Type.Record(Type.String(), ModelOverrideSchema)),
-});
-const ModelsConfigSchema = Type.Object({
-    providers: Type.Record(Type.String(), ProviderConfigSchema),
-});
-const validateModelsConfig = Compile(ModelsConfigSchema);
-const GITHUB_COPILOT_API_VERSION_HEADER = "X-GitHub-Api-Version";
-const GITHUB_COPILOT_API_VERSION = "2026-06-01";
-function hasHeader(headers, headerName) {
-    if (!headers)
-        return false;
-    const normalizedHeaderName = headerName.toLowerCase();
-    return Object.keys(headers).some((key) => key.toLowerCase() === normalizedHeaderName);
-}
-function withGitHubCopilotApiVersionHeader(model, headers) {
-    if (model.provider !== "github-copilot" || hasHeader(headers, GITHUB_COPILOT_API_VERSION_HEADER)) {
-        return headers;
-    }
-    return { ...(headers ?? {}), [GITHUB_COPILOT_API_VERSION_HEADER]: GITHUB_COPILOT_API_VERSION };
-}
-/**
- * Apply GitHub Copilot input-token context windows from the live CAPI catalog.
- *
- * The active catalog is only populated when the user has the GitHub Copilot provider (see
- * `copilot-model-catalog.ts`), so non-Copilot users and offline/unauthenticated sessions are
- * unaffected. For catalog models, the model's effective `contextWindow` is set to GitHub's input
- * (prompt) budget; models that expose a larger `long_context` tier additionally get a selectable
- * window so the `/model` picker can switch between the default and long input budgets.
- */
-function withCopilotContextWindowOptions(model) {
-    if (model.provider !== "github-copilot")
-        return model;
-    const context = getActiveCopilotModelCatalog().get(model.id);
-    if (!context)
-        return model;
-    // Apply GitHub's context window everywhere; add a selectable long-context window when the model
-    // exposes one larger than its default tier, and carry the hard prompt cap as the effective input
-    // budget so the displayed total does not overrun GitHub's server-side prompt limit.
-    const base = { ...model, contextWindow: context.contextWindow, maxInputTokens: context.maxInputTokens };
-    if (context.contextWindowOptions && context.contextWindowOptions.length > 1) {
-        return withContextWindowOptions(base, context.contextWindowOptions);
-    }
-    return base;
-}
-function formatValidationPath(error) {
-    if (error.keyword === "required") {
-        const requiredProperties = error.params.requiredProperties;
-        const requiredProperty = requiredProperties?.[0];
-        if (requiredProperty) {
-            const basePath = error.instancePath.replace(/^\//, "").replace(/\//g, ".");
-            return basePath ? `${basePath}.${requiredProperty}` : requiredProperty;
-        }
-    }
-    const path = error.instancePath.replace(/^\//, "").replace(/\//g, ".");
-    return path || "root";
-}
-/** Strip `//` line comments and trailing commas from JSON, leaving string literals untouched. */
-function stripJsonComments(input) {
-    return input
-        .replace(/"(?:\\.|[^"\\])*"|\/\/[^\n]*/g, (m) => (m[0] === '"' ? m : ""))
-        .replace(/"(?:\\.|[^"\\])*"|,(\s*[}\]])/g, (m, tail) => tail ?? (m[0] === '"' ? m : ""));
-}
-function emptyCustomModelsResult(error) {
-    return { models: [], overrides: new Map(), modelOverrides: new Map(), error };
-}
-function mergeCompat(baseCompat, overrideCompat) {
-    if (!overrideCompat)
-        return baseCompat;
-    const base = baseCompat;
-    const override = overrideCompat;
-    const merged = { ...base, ...override };
-    const baseCompletions = base;
-    const overrideCompletions = override;
-    const mergedCompletions = merged;
-    if (baseCompletions?.openRouterRouting || overrideCompletions.openRouterRouting) {
-        mergedCompletions.openRouterRouting = {
-            ...baseCompletions?.openRouterRouting,
-            ...overrideCompletions.openRouterRouting,
-        };
-    }
-    if (baseCompletions?.vercelGatewayRouting || overrideCompletions.vercelGatewayRouting) {
-        mergedCompletions.vercelGatewayRouting = {
-            ...baseCompletions?.vercelGatewayRouting,
-            ...overrideCompletions.vercelGatewayRouting,
-        };
-    }
-    return merged;
-}
-/**
- * Deep merge a model override into a model.
- * Handles nested objects (cost, compat) by merging rather than replacing.
- */
-function applyModelOverride(model, override) {
-    const result = { ...model };
-    // Simple field overrides
-    if (override.name !== undefined)
-        result.name = override.name;
-    if (override.reasoning !== undefined)
-        result.reasoning = override.reasoning;
-    if (override.thinkingLevelMap !== undefined) {
-        result.thinkingLevelMap = { ...model.thinkingLevelMap, ...override.thinkingLevelMap };
-    }
-    if (override.input !== undefined)
-        result.input = override.input;
-    if (override.contextWindow !== undefined) {
-        result.contextWindow = override.contextWindow;
-        result.defaultContextWindow = override.contextWindow;
-        if (override.contextWindowOptions === undefined) {
-            result.contextWindowOptions = undefined;
-        }
-    }
-    if (override.contextWindowOptions !== undefined) {
-        result.contextWindowOptions = normalizeContextWindowOptions(override.contextWindowOptions);
-    }
-    if (override.maxTokens !== undefined)
-        result.maxTokens = override.maxTokens;
-    // Merge cost (partial override)
-    if (override.cost) {
-        result.cost = {
-            input: override.cost.input ?? model.cost.input,
-            output: override.cost.output ?? model.cost.output,
-            cacheRead: override.cost.cacheRead ?? model.cost.cacheRead,
-            cacheWrite: override.cost.cacheWrite ?? model.cost.cacheWrite,
-        };
-    }
-    // Deep merge compat
-    result.compat = mergeCompat(model.compat, override.compat);
-    return result;
-}
+import { clearConfigValueCache, isConfigValueConfigured } from "./resolve-config-value.js";
 /** Clear the config value command cache. Exported for testing. */
 export const clearApiKeyCache = clearConfigValueCache;
-function migrateLegacyRegisterProviderConfigValue(providerName, field, value) {
-    if (!isLegacyEnvVarNameConfigValue(value) || process.env[value] === undefined)
-        return value;
-    warnDeprecation(`registerProvider("${providerName}") ${field} value "${value}" is treated as a legacy environment variable reference. This will no longer be detected as an environment variable reference in a future release. Pass "$${value}" instead.`);
-    return `$${value}`;
-}
-function migrateLegacyRegisterProviderHeaders(providerName, field, headers) {
-    if (!headers)
-        return undefined;
-    let migratedHeaders;
-    for (const [key, value] of Object.entries(headers)) {
-        const migratedValue = migrateLegacyRegisterProviderConfigValue(providerName, `${field} header "${key}"`, value);
-        if (migratedValue === value)
-            continue;
-        migratedHeaders ??= { ...headers };
-        migratedHeaders[key] = migratedValue;
-    }
-    return migratedHeaders ?? headers;
-}
-function migrateLegacyRegisterProviderConfigValues(providerName, config) {
-    let migratedConfig;
-    const setMigratedConfigValue = (key, value) => {
-        migratedConfig ??= { ...config };
-        migratedConfig[key] = value;
-    };
-    if (config.apiKey) {
-        const apiKey = migrateLegacyRegisterProviderConfigValue(providerName, "apiKey", config.apiKey);
-        if (apiKey !== config.apiKey) {
-            setMigratedConfigValue("apiKey", apiKey);
-        }
-    }
-    const headers = migrateLegacyRegisterProviderHeaders(providerName, "headers", config.headers);
-    if (headers !== config.headers) {
-        setMigratedConfigValue("headers", headers);
-    }
-    if (config.models) {
-        let models;
-        for (let index = 0; index < config.models.length; index++) {
-            const model = config.models[index];
-            const modelHeaders = migrateLegacyRegisterProviderHeaders(providerName, `model "${model.id}" headers`, model.headers);
-            if (modelHeaders === model.headers)
-                continue;
-            models ??= [...config.models];
-            models[index] = { ...model, headers: modelHeaders };
-        }
-        if (models) {
-            setMigratedConfigValue("models", models);
-        }
-    }
-    return migratedConfig ?? config;
-}
 /**
  * Model registry - loads and manages models, resolves API keys via AuthStorage.
  */
@@ -349,18 +26,9 @@ export class ModelRegistry {
         this.loadError = undefined;
         this.authStorage = authStorage;
         this.modelsJsonPaths = modelsJsonPaths.map((path) => normalizePath(path));
-        // Seed the Copilot context-window catalog from disk before models load, so a returning user's
-        // persisted long-context selection is recognized at startup rather than warned-about and reset.
         this.seedCopilotModelCatalogFromCache();
         this.loadModels();
     }
-    /**
-     * Seed the active GitHub Copilot context-window catalog from the on-disk cache before models load.
-     *
-     * No-op without a `github-copilot` OAuth credential, without a resolvable agent dir, or without a
-     * host-matching cached catalog. The agent dir is derived from the registry's own models.json path
-     * (not the global agent dir) so unit tests never read the real user cache.
-     */
     seedCopilotModelCatalogFromCache() {
         if (this.modelsJsonPaths.length === 0)
             return;
@@ -382,7 +50,6 @@ export class ModelRegistry {
         this.providerRequestConfigs.clear();
         this.modelRequestHeaders.clear();
         this.loadError = undefined;
-        // Ensure dynamic API/OAuth registrations are rebuilt from current provider state.
         resetApiProviders();
         resetOAuthProviders();
         this.loadModels();
@@ -397,235 +64,11 @@ export class ModelRegistry {
         return this.loadError;
     }
     loadModels() {
-        // Load custom models and overrides from models.json
-        const { models: customModels, overrides, modelOverrides, error, } = this.loadCustomModelsFromPaths(this.modelsJsonPaths);
-        if (error) {
-            this.loadError = error;
-            // Keep built-in models even if custom models failed to load
-        }
-        const builtInModels = this.loadBuiltInModels(overrides, modelOverrides);
-        let combined = this.mergeCustomModels(builtInModels, customModels);
-        // Let OAuth providers modify their models (e.g., update baseUrl)
-        for (const oauthProvider of this.authStorage.getOAuthProviders()) {
-            const cred = this.authStorage.get(oauthProvider.id);
-            if (cred?.type === "oauth" && oauthProvider.modifyModels) {
-                combined = oauthProvider.modifyModels(combined, cred);
-            }
-        }
-        this.models = combined;
-    }
-    /** Load built-in models and apply provider/model overrides */
-    loadBuiltInModels(overrides, modelOverrides) {
-        return getProviders().flatMap((provider) => {
-            const models = getModels(provider);
-            const providerOverride = overrides.get(provider);
-            const perModelOverrides = modelOverrides.get(provider);
-            return models.map((m) => {
-                let model = m;
-                // Apply provider-level baseUrl/headers/compat override
-                if (providerOverride) {
-                    model = {
-                        ...model,
-                        baseUrl: providerOverride.baseUrl ?? model.baseUrl,
-                        compat: mergeCompat(model.compat, providerOverride.compat),
-                    };
-                }
-                model = withCopilotContextWindowOptions(model);
-                // Apply per-model override after built-in selectable windows so explicit
-                // user overrides can clear or replace inherited contextWindowOptions.
-                const modelOverride = perModelOverrides?.get(m.id);
-                if (modelOverride) {
-                    model = applyModelOverride(model, modelOverride);
-                }
-                return model;
-            });
-        });
-    }
-    /** Merge custom models into built-in list by provider+id (custom wins on conflicts). */
-    mergeCustomModels(builtInModels, customModels) {
-        const merged = [...builtInModels];
-        for (const customModel of customModels) {
-            const existingIndex = merged.findIndex((m) => m.provider === customModel.provider && m.id === customModel.id);
-            if (existingIndex >= 0) {
-                merged[existingIndex] = customModel;
-            }
-            else {
-                merged.push(customModel);
-            }
-        }
-        return merged;
-    }
-    loadCustomModelsFromPaths(modelsJsonPaths) {
-        let combined = emptyCustomModelsResult();
-        const errors = [];
-        for (let i = modelsJsonPaths.length - 1; i >= 0; i--) {
-            const result = this.loadCustomModels(modelsJsonPaths[i]);
-            if (result.error) {
-                errors.push(result.error);
-                continue;
-            }
-            combined = {
-                models: this.mergeCustomModels(combined.models, result.models),
-                overrides: new Map([...combined.overrides, ...result.overrides]),
-                modelOverrides: new Map([...combined.modelOverrides, ...result.modelOverrides]),
-                error: undefined,
-            };
-        }
-        return { ...combined, error: errors.length > 0 ? errors.join("\n\n") : undefined };
-    }
-    loadCustomModels(modelsJsonPath) {
-        if (!existsSync(modelsJsonPath)) {
-            return emptyCustomModelsResult();
-        }
-        try {
-            const content = readFileSync(modelsJsonPath, "utf-8");
-            const parsed = JSON.parse(stripJsonComments(content));
-            if (!validateModelsConfig.Check(parsed)) {
-                const errors = validateModelsConfig
-                    .Errors(parsed)
-                    .map((error) => `  - ${formatValidationPath(error)}: ${error.message}`)
-                    .join("\n") || "Unknown schema error";
-                return emptyCustomModelsResult(`Invalid models.json schema:\n${errors}\n\nFile: ${modelsJsonPath}`);
-            }
-            const config = parsed;
-            // Additional validation
-            this.validateConfig(config);
-            const overrides = new Map();
-            const modelOverrides = new Map();
-            for (const [providerName, providerConfig] of Object.entries(config.providers)) {
-                if (providerConfig.baseUrl || providerConfig.compat) {
-                    overrides.set(providerName, {
-                        baseUrl: providerConfig.baseUrl,
-                        compat: providerConfig.compat,
-                    });
-                }
-                this.storeProviderRequestConfig(providerName, providerConfig);
-                if (providerConfig.modelOverrides) {
-                    modelOverrides.set(providerName, new Map(Object.entries(providerConfig.modelOverrides)));
-                    for (const [modelId, modelOverride] of Object.entries(providerConfig.modelOverrides)) {
-                        this.storeModelHeaders(providerName, modelId, modelOverride.headers);
-                    }
-                }
-            }
-            return { models: this.parseModels(config), overrides, modelOverrides, error: undefined };
-        }
-        catch (error) {
-            if (error instanceof SyntaxError) {
-                return emptyCustomModelsResult(`Failed to parse models.json: ${error.message}\n\nFile: ${modelsJsonPath}`);
-            }
-            return emptyCustomModelsResult(`Failed to load models.json: ${error instanceof Error ? error.message : error}\n\nFile: ${modelsJsonPath}`);
-        }
-    }
-    validateConfig(config) {
-        const builtInProviders = new Set(getProviders());
-        for (const [providerName, providerConfig] of Object.entries(config.providers)) {
-            const isBuiltIn = builtInProviders.has(providerName);
-            const hasProviderApi = !!providerConfig.api;
-            const models = providerConfig.models ?? [];
-            const hasModelOverrides = providerConfig.modelOverrides && Object.keys(providerConfig.modelOverrides).length > 0;
-            if (models.length === 0) {
-                // Override-only config: needs baseUrl, headers, compat, modelOverrides, or some combination.
-                if (!providerConfig.baseUrl && !providerConfig.headers && !providerConfig.compat && !hasModelOverrides) {
-                    throw new Error(`Provider ${providerName}: must specify "baseUrl", "headers", "compat", "modelOverrides", or "models".`);
-                }
-            }
-            else if (!isBuiltIn) {
-                // Non-built-in providers with custom models require endpoint + auth.
-                if (!providerConfig.baseUrl) {
-                    throw new Error(`Provider ${providerName}: "baseUrl" is required when defining custom models.`);
-                }
-                if (!providerConfig.apiKey) {
-                    throw new Error(`Provider ${providerName}: "apiKey" is required when defining custom models.`);
-                }
-            }
-            // Built-in providers with custom models: baseUrl/apiKey/api are optional,
-            // inherited from built-in models. Auth comes from env vars / auth storage.
-            for (const modelDef of models) {
-                const hasModelApi = !!modelDef.api;
-                if (!hasProviderApi && !hasModelApi && !isBuiltIn) {
-                    throw new Error(`Provider ${providerName}, model ${modelDef.id}: no "api" specified. Set at provider or model level.`);
-                }
-                // For built-in providers, api is optional — inherited from built-in models.
-                if (!modelDef.id)
-                    throw new Error(`Provider ${providerName}: model missing "id"`);
-                // Validate contextWindow/maxTokens only if provided (they have defaults)
-                if (modelDef.contextWindow !== undefined && validateContextWindowValue(modelDef.contextWindow))
-                    throw new Error(`Provider ${providerName}, model ${modelDef.id}: invalid contextWindow`);
-                this.validateContextWindowOptions(providerName, modelDef.id, modelDef.contextWindowOptions);
-                if (modelDef.maxTokens !== undefined && modelDef.maxTokens <= 0)
-                    throw new Error(`Provider ${providerName}, model ${modelDef.id}: invalid maxTokens`);
-            }
-            for (const [modelId, modelOverride] of Object.entries(providerConfig.modelOverrides ?? {})) {
-                if (modelOverride.contextWindow !== undefined && validateContextWindowValue(modelOverride.contextWindow)) {
-                    throw new Error(`Provider ${providerName}, model ${modelId}: invalid contextWindow`);
-                }
-                this.validateContextWindowOptions(providerName, modelId, modelOverride.contextWindowOptions);
-                if (modelOverride.maxTokens !== undefined && modelOverride.maxTokens <= 0) {
-                    throw new Error(`Provider ${providerName}, model ${modelId}: invalid maxTokens`);
-                }
-            }
-        }
-    }
-    validateContextWindowOptions(providerName, modelId, options) {
-        for (const option of options ?? []) {
-            if (validateContextWindowValue(option)) {
-                throw new Error(`Provider ${providerName}, model ${modelId}: invalid contextWindowOptions value`);
-            }
-        }
-    }
-    parseModels(config) {
-        const models = [];
-        const builtInProviders = new Set(getProviders());
-        // Cache built-in defaults (api, baseUrl) per provider, extracted from first model.
-        const builtInDefaultsCache = new Map();
-        const getBuiltInDefaults = (providerName) => {
-            if (!builtInProviders.has(providerName))
-                return undefined;
-            if (builtInDefaultsCache.has(providerName))
-                return builtInDefaultsCache.get(providerName);
-            const builtIn = getModels(providerName);
-            if (builtIn.length === 0)
-                return undefined;
-            const defaults = { api: builtIn[0].api, baseUrl: builtIn[0].baseUrl };
-            builtInDefaultsCache.set(providerName, defaults);
-            return defaults;
-        };
-        for (const [providerName, providerConfig] of Object.entries(config.providers)) {
-            const modelDefs = providerConfig.models ?? [];
-            if (modelDefs.length === 0)
-                continue; // Override-only, no custom models
-            const builtInDefaults = getBuiltInDefaults(providerName);
-            for (const modelDef of modelDefs) {
-                const api = modelDef.api ?? providerConfig.api ?? builtInDefaults?.api;
-                if (!api)
-                    continue;
-                const baseUrl = modelDef.baseUrl ?? providerConfig.baseUrl ?? builtInDefaults?.baseUrl;
-                if (!baseUrl)
-                    continue;
-                const compat = mergeCompat(providerConfig.compat, modelDef.compat);
-                this.storeModelHeaders(providerName, modelDef.id, modelDef.headers);
-                const defaultCost = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
-                const contextWindow = modelDef.contextWindow ?? 128000;
-                models.push({
-                    id: modelDef.id,
-                    name: modelDef.name ?? modelDef.id,
-                    api: api,
-                    provider: providerName,
-                    baseUrl,
-                    reasoning: modelDef.reasoning ?? false,
-                    thinkingLevelMap: modelDef.thinkingLevelMap,
-                    input: (modelDef.input ?? ["text"]),
-                    cost: modelDef.cost ?? defaultCost,
-                    contextWindow,
-                    defaultContextWindow: contextWindow,
-                    contextWindowOptions: normalizeContextWindowOptions([contextWindow, ...(modelDef.contextWindowOptions ?? [])]),
-                    maxTokens: modelDef.maxTokens ?? 16384,
-                    headers: undefined,
-                    compat,
-                });
-            }
-        }
-        return models;
+        const loaded = loadModelRegistryModels(this.authStorage, this.modelsJsonPaths);
+        this.models = loaded.models;
+        this.providerRequestConfigs = loaded.providerRequestConfigs;
+        this.modelRequestHeaders = loaded.modelRequestHeaders;
+        this.loadError = loaded.loadError;
     }
     /**
      * Get all models (built-in + custom).
@@ -680,61 +123,14 @@ export class ModelRegistry {
      * Get API key and request headers for a model.
      */
     async getApiKeyAndHeaders(model) {
-        try {
-            const providerConfig = this.providerRequestConfigs.get(model.provider);
-            const apiKeyFromAuthStorage = await this.authStorage.getApiKey(model.provider, { includeFallback: false });
-            const apiKey = apiKeyFromAuthStorage ??
-                (providerConfig?.apiKey
-                    ? resolveConfigValueOrThrow(providerConfig.apiKey, `API key for provider "${model.provider}"`)
-                    : undefined);
-            const providerHeaders = resolveHeadersOrThrow(providerConfig?.headers, `provider "${model.provider}"`);
-            const modelHeaders = resolveHeadersOrThrow(this.modelRequestHeaders.get(this.getModelRequestKey(model.provider, model.id)), `model "${model.provider}/${model.id}"`);
-            let headers = model.headers || providerHeaders || modelHeaders
-                ? { ...model.headers, ...providerHeaders, ...modelHeaders }
-                : undefined;
-            if (providerConfig?.authHeader) {
-                if (!apiKey) {
-                    return { ok: false, error: `No API key found for "${model.provider}"` };
-                }
-                headers = { ...headers, Authorization: `Bearer ${apiKey}` };
-            }
-            headers = withGitHubCopilotApiVersionHeader(model, headers);
-            return {
-                ok: true,
-                apiKey,
-                headers: headers && Object.keys(headers).length > 0 ? headers : undefined,
-            };
-        }
-        catch (error) {
-            return {
-                ok: false,
-                error: error instanceof Error ? error.message : String(error),
-            };
-        }
+        return getModelRequestAuth(model, this.authStorage, this.providerRequestConfigs, this.modelRequestHeaders);
     }
     /**
      * Return auth status for a provider, including request auth configured in models.json.
      * This intentionally does not execute command-backed config values.
      */
     getProviderAuthStatus(provider) {
-        const authStatus = this.authStorage.getAuthStatus(provider);
-        if (authStatus.source) {
-            return authStatus;
-        }
-        const providerApiKey = this.providerRequestConfigs.get(provider)?.apiKey;
-        if (!providerApiKey) {
-            return authStatus;
-        }
-        if (isCommandConfigValue(providerApiKey)) {
-            return { configured: true, source: "models_json_command" };
-        }
-        const envVarNames = getConfigValueEnvVarNames(providerApiKey);
-        if (envVarNames.length > 0) {
-            return isConfigValueConfigured(providerApiKey)
-                ? { configured: true, source: "environment", label: envVarNames.join(", ") }
-                : { configured: false };
-        }
-        return { configured: true, source: "models_json_key" };
+        return getProviderAuthStatusFromConfig(provider, this.authStorage, this.providerRequestConfigs);
     }
     /**
      * Get display name for a provider.
@@ -752,12 +148,7 @@ export class ModelRegistry {
      * Get API key for a provider.
      */
     async getApiKeyForProvider(provider) {
-        const apiKey = await this.authStorage.getApiKey(provider, { includeFallback: false });
-        if (apiKey !== undefined) {
-            return apiKey;
-        }
-        const providerApiKey = this.providerRequestConfigs.get(provider)?.apiKey;
-        return providerApiKey ? resolveConfigValueUncached(providerApiKey) : undefined;
+        return getApiKeyForProviderFromConfig(provider, this.authStorage, this.providerRequestConfigs);
     }
     /**
      * Check if a model is using OAuth credentials (subscription).
@@ -768,14 +159,10 @@ export class ModelRegistry {
     }
     /**
      * Register a provider dynamically (from extensions).
-     *
-     * If provider has models: replaces all existing models for this provider.
-     * If provider has only baseUrl/headers: overrides existing models' URLs.
-     * If provider has oauth: registers OAuth provider for /login support.
      */
     registerProvider(providerName, config) {
         const migratedConfig = migrateLegacyRegisterProviderConfigValues(providerName, config);
-        this.validateProviderConfig(providerName, migratedConfig);
+        validateProviderConfig(providerName, migratedConfig);
         this.applyProviderConfig(providerName, migratedConfig);
         this.upsertRegisteredProvider(providerName, migratedConfig);
     }
@@ -792,12 +179,6 @@ export class ModelRegistry {
     }
     /**
      * Unregister a previously registered provider.
-     *
-     * Removes the provider from the registry and reloads models from disk so that
-     * built-in models overridden by this provider are restored to their original state.
-     * Also resets dynamic OAuth and API stream registrations before reapplying
-     * remaining dynamic providers.
-     * Has no effect if the provider was never registered.
      */
     unregisterProvider(providerName) {
         if (!this.registeredProviders.has(providerName))
@@ -805,12 +186,6 @@ export class ModelRegistry {
         this.registeredProviders.delete(providerName);
         this.refresh();
     }
-    /**
-     * Upsert a provider config into registeredProviders.
-     * If the provider is already registered, defined values in the incoming config
-     * override existing ones; undefined values are preserved from the stored config.
-     * If the provider is not registered, the incoming config is stored as-is.
-     */
     upsertRegisteredProvider(providerName, config) {
         const existing = this.registeredProviders.get(providerName);
         if (!existing) {
@@ -823,99 +198,15 @@ export class ModelRegistry {
             }
         }
     }
-    validateProviderConfig(providerName, config) {
-        if (config.streamSimple && !config.api) {
-            throw new Error(`Provider ${providerName}: "api" is required when registering streamSimple.`);
-        }
-        if (!config.models || config.models.length === 0) {
-            return;
-        }
-        if (!config.baseUrl) {
-            throw new Error(`Provider ${providerName}: "baseUrl" is required when defining models.`);
-        }
-        if (!config.apiKey && !config.oauth) {
-            throw new Error(`Provider ${providerName}: "apiKey" or "oauth" is required when defining models.`);
-        }
-        for (const modelDef of config.models) {
-            const api = modelDef.api || config.api;
-            if (!api) {
-                throw new Error(`Provider ${providerName}, model ${modelDef.id}: no "api" specified.`);
-            }
-            if (validateContextWindowValue(modelDef.contextWindow)) {
-                throw new Error(`Provider ${providerName}, model ${modelDef.id}: invalid contextWindow`);
-            }
-            this.validateContextWindowOptions(providerName, modelDef.id, modelDef.contextWindowOptions);
-            if (modelDef.maxTokens <= 0) {
-                throw new Error(`Provider ${providerName}, model ${modelDef.id}: invalid maxTokens`);
-            }
-        }
-    }
     applyProviderConfig(providerName, config) {
-        // Register OAuth provider if provided
-        if (config.oauth) {
-            // Ensure the OAuth provider ID matches the provider name
-            const oauthProvider = {
-                ...config.oauth,
-                id: providerName,
-            };
-            registerOAuthProvider(oauthProvider);
-        }
-        if (config.streamSimple) {
-            const streamSimple = config.streamSimple;
-            registerApiProvider({
-                api: config.api,
-                stream: (model, context, options) => streamSimple(model, context, options),
-                streamSimple,
-            }, `provider:${providerName}`);
-        }
-        this.storeProviderRequestConfig(providerName, config);
-        if (config.models && config.models.length > 0) {
-            // Full replacement: remove existing models for this provider
-            this.models = this.models.filter((m) => m.provider !== providerName);
-            // Parse and add new models
-            for (const modelDef of config.models) {
-                const api = modelDef.api || config.api;
-                this.storeModelHeaders(providerName, modelDef.id, modelDef.headers);
-                this.models.push({
-                    id: modelDef.id,
-                    name: modelDef.name,
-                    api: api,
-                    provider: providerName,
-                    baseUrl: modelDef.baseUrl ?? config.baseUrl,
-                    reasoning: modelDef.reasoning,
-                    thinkingLevelMap: modelDef.thinkingLevelMap,
-                    input: modelDef.input,
-                    cost: modelDef.cost,
-                    contextWindow: modelDef.contextWindow,
-                    defaultContextWindow: modelDef.contextWindow,
-                    contextWindowOptions: normalizeContextWindowOptions([
-                        modelDef.contextWindow,
-                        ...(modelDef.contextWindowOptions ?? []),
-                    ]),
-                    maxTokens: modelDef.maxTokens,
-                    headers: undefined,
-                    compat: modelDef.compat,
-                });
-            }
-            // Apply OAuth modifyModels if credentials exist (e.g., to update baseUrl)
-            if (config.oauth?.modifyModels) {
-                const cred = this.authStorage.get(providerName);
-                if (cred?.type === "oauth") {
-                    this.models = config.oauth.modifyModels(this.models, cred);
-                }
-            }
-        }
-        else if (config.baseUrl || config.headers) {
-            // Override-only: update baseUrl for existing models. Request headers are resolved per request.
-            this.models = this.models.map((m) => {
-                if (m.provider !== providerName)
-                    return m;
-                return {
-                    ...m,
-                    baseUrl: config.baseUrl ?? m.baseUrl,
-                };
-            });
-        }
+        this.models = applyProviderConfigToModels({
+            providerName,
+            config,
+            models: this.models,
+            authStorage: this.authStorage,
+            storeProviderRequestConfig: (name, requestConfig) => this.storeProviderRequestConfig(name, requestConfig),
+            storeModelHeaders: (name, modelId, headers) => this.storeModelHeaders(name, modelId, headers),
+        });
     }
 }
 //# sourceMappingURL=model-registry.js.map