@aetherai/aether 0.0.3

package/dist/CLI/packages/core/src/mocks/msw.js

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { setupServer } from 'msw/node';
+export const server = setupServer();
+//# sourceMappingURL=msw.js.map

package/dist/CLI/packages/core/src/mocks/msw.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"msw.js","sourceRoot":"","sources":["../../../../../../../core/src/mocks/msw.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,MAAM,CAAC,MAAM,MAAM,GAAG,WAAW,EAAE,CAAC"}

package/dist/CLI/packages/core/src/models/constants.d.ts

@@ -0,0 +1,71 @@
+/**
+ * @license
+ * Copyright 2025 Qwen Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { ModelConfig } from './types.js';
+type AuthType = import('../core/contentGenerator.js').AuthType;
+/**
+ * Field keys for model-scoped generation config.
+ *
+ * Kept in a small standalone module to avoid circular deps. The `import('...')`
+ * usage is type-only and does not emit runtime imports.
+ */
+export declare const MODEL_GENERATION_CONFIG_FIELDS: readonly ["samplingParams", "timeout", "maxRetries", "retryErrorCodes", "enableCacheControl", "schemaCompliance", "reasoning", "contextWindowSize", "customHeaders", "extra_body", "modalities"];
+/**
+ * Credential-related fields that are part of ContentGeneratorConfig
+ * but not ModelGenerationConfig.
+ */
+export declare const CREDENTIAL_FIELDS: readonly ["model", "apiKey", "apiKeyEnvKey", "baseUrl"];
+/**
+ * All provider-sourced fields that need to be tracked for source attribution
+ * and cleared when switching from provider to manual credentials.
+ */
+export declare const PROVIDER_SOURCED_FIELDS: readonly ["model", "apiKey", "apiKeyEnvKey", "baseUrl", "samplingParams", "timeout", "maxRetries", "retryErrorCodes", "enableCacheControl", "schemaCompliance", "reasoning", "contextWindowSize", "customHeaders", "extra_body", "modalities"];
+/**
+ * Environment variable mappings per authType.
+ */
+export interface AuthEnvMapping {
+    apiKey: string[];
+    baseUrl: string[];
+    model: string[];
+}
+export declare const AUTH_ENV_MAPPINGS: {
+    readonly openai: {
+        readonly apiKey: ["OPENAI_API_KEY"];
+        readonly baseUrl: ["OPENAI_BASE_URL"];
+        readonly model: ["OPENAI_MODEL", "QWEN_MODEL"];
+    };
+    readonly anthropic: {
+        readonly apiKey: ["ANTHROPIC_API_KEY"];
+        readonly baseUrl: ["ANTHROPIC_BASE_URL"];
+        readonly model: ["ANTHROPIC_MODEL"];
+    };
+    readonly gemini: {
+        readonly apiKey: ["GEMINI_API_KEY"];
+        readonly baseUrl: [];
+        readonly model: ["GEMINI_MODEL"];
+    };
+    readonly 'vertex-ai': {
+        readonly apiKey: ["GOOGLE_API_KEY"];
+        readonly baseUrl: [];
+        readonly model: ["GOOGLE_MODEL"];
+    };
+    readonly 'aether-oauth': {
+        readonly apiKey: [];
+        readonly baseUrl: [];
+        readonly model: [];
+    };
+};
+export declare const DEFAULT_MODELS: Partial<Record<AuthType, string>>;
+/**
+ * Hard-coded Aether OAuth models that are always available.
+ * These cannot be overridden by user configuration.
+ */
+export declare const AETHER_OAUTH_MODELS: ModelConfig[];
+/**
+ * Derive allowed models from AETHER_OAUTH_MODELS for authorization.
+ * This ensures single source of truth (SSOT).
+ */
+export declare const AETHER_OAUTH_ALLOWED_MODELS: readonly string[];
+export {};

package/dist/CLI/packages/core/src/models/constants.js

@@ -0,0 +1,92 @@
+/**
+ * @license
+ * Copyright 2025 Qwen Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { DEFAULT_AETHER_MODEL, MAINLINE_CODER_MODEL } from '../config/models.js';
+/**
+ * Field keys for model-scoped generation config.
+ *
+ * Kept in a small standalone module to avoid circular deps. The `import('...')`
+ * usage is type-only and does not emit runtime imports.
+ */
+export const MODEL_GENERATION_CONFIG_FIELDS = [
+    'samplingParams',
+    'timeout',
+    'maxRetries',
+    'retryErrorCodes',
+    'enableCacheControl',
+    'schemaCompliance',
+    'reasoning',
+    'contextWindowSize',
+    'customHeaders',
+    'extra_body',
+    'modalities',
+];
+/**
+ * Credential-related fields that are part of ContentGeneratorConfig
+ * but not ModelGenerationConfig.
+ */
+export const CREDENTIAL_FIELDS = [
+    'model',
+    'apiKey',
+    'apiKeyEnvKey',
+    'baseUrl',
+];
+/**
+ * All provider-sourced fields that need to be tracked for source attribution
+ * and cleared when switching from provider to manual credentials.
+ */
+export const PROVIDER_SOURCED_FIELDS = [
+    ...CREDENTIAL_FIELDS,
+    ...MODEL_GENERATION_CONFIG_FIELDS,
+];
+export const AUTH_ENV_MAPPINGS = {
+    openai: {
+        apiKey: ['OPENAI_API_KEY'],
+        baseUrl: ['OPENAI_BASE_URL'],
+        model: ['OPENAI_MODEL', 'QWEN_MODEL'],
+    },
+    anthropic: {
+        apiKey: ['ANTHROPIC_API_KEY'],
+        baseUrl: ['ANTHROPIC_BASE_URL'],
+        model: ['ANTHROPIC_MODEL'],
+    },
+    gemini: {
+        apiKey: ['GEMINI_API_KEY'],
+        baseUrl: [],
+        model: ['GEMINI_MODEL'],
+    },
+    'vertex-ai': {
+        apiKey: ['GOOGLE_API_KEY'],
+        baseUrl: [],
+        model: ['GOOGLE_MODEL'],
+    },
+    'aether-oauth': {
+        apiKey: [],
+        baseUrl: [],
+        model: [],
+    },
+};
+export const DEFAULT_MODELS = {
+    openai: MAINLINE_CODER_MODEL,
+    'aether-oauth': DEFAULT_AETHER_MODEL,
+};
+/**
+ * Hard-coded Aether OAuth models that are always available.
+ * These cannot be overridden by user configuration.
+ */
+export const AETHER_OAUTH_MODELS = [
+    {
+        id: 'coder-model',
+        name: 'coder-model',
+        description: 'Qwen 3.6 Plus — efficient hybrid model with leading coding performance',
+        capabilities: { vision: true },
+    },
+];
+/**
+ * Derive allowed models from AETHER_OAUTH_MODELS for authorization.
+ * This ensures single source of truth (SSOT).
+ */
+export const AETHER_OAUTH_ALLOWED_MODELS = AETHER_OAUTH_MODELS.map((model) => model.id);
+//# sourceMappingURL=constants.js.map

package/dist/CLI/packages/core/src/models/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../../core/src/models/constants.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAQjF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,8BAA8B,GAAG;IAC5C,gBAAgB;IAChB,SAAS;IACT,YAAY;IACZ,iBAAiB;IACjB,oBAAoB;IACpB,kBAAkB;IAClB,WAAW;IACX,mBAAmB;IACnB,eAAe;IACf,YAAY;IACZ,YAAY;CACkD,CAAC;AAEjE;;;GAGG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,OAAO;IACP,QAAQ;IACR,cAAc;IACd,SAAS;CACqD,CAAC;AAEjE;;;GAGG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,GAAG,iBAAiB;IACpB,GAAG,8BAA8B;CACzB,CAAC;AAWX,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,MAAM,EAAE;QACN,MAAM,EAAE,CAAC,gBAAgB,CAAC;QAC1B,OAAO,EAAE,CAAC,iBAAiB,CAAC;QAC5B,KAAK,EAAE,CAAC,cAAc,EAAE,YAAY,CAAC;KACtC;IACD,SAAS,EAAE;QACT,MAAM,EAAE,CAAC,mBAAmB,CAAC;QAC7B,OAAO,EAAE,CAAC,oBAAoB,CAAC;QAC/B,KAAK,EAAE,CAAC,iBAAiB,CAAC;KAC3B;IACD,MAAM,EAAE;QACN,MAAM,EAAE,CAAC,gBAAgB,CAAC;QAC1B,OAAO,EAAE,EAAE;QACX,KAAK,EAAE,CAAC,cAAc,CAAC;KACxB;IACD,WAAW,EAAE;QACX,MAAM,EAAE,CAAC,gBAAgB,CAAC;QAC1B,OAAO,EAAE,EAAE;QACX,KAAK,EAAE,CAAC,cAAc,CAAC;KACxB;IACD,cAAc,EAAE;QACd,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;QACX,KAAK,EAAE,EAAE;KACV;CACkD,CAAC;AAEtD,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,MAAM,EAAE,oBAAoB;IAC5B,cAAc,EAAE,oBAAoB;CACA,CAAC;AAEvC;;;GAGG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAkB;IAChD;QACE,EAAE,EAAE,aAAa;QACjB,IAAI,EAAE,aAAa;QACnB,WAAW,EACT,wEAAwE;QAC1E,YAAY,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;KAC/B;CACF,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,mBAAmB,CAAC,GAAG,CAChE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CACC,CAAC"}

package/dist/CLI/packages/core/src/models/content-generator-config.d.ts

@@ -0,0 +1,36 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * @fileoverview Shared utilities for building per-agent ContentGeneratorConfig.
+ *
+ * Used by both InProcessBackend (Arena agents) and SubagentManager (regular
+ * subagents) to create dedicated ContentGenerators when an agent targets a
+ * different model or provider than the parent process.
+ */
+import type { Config } from '../config/config.js';
+import { type ContentGeneratorConfig } from '../core/contentGenerator.js';
+export interface AuthOverrides {
+    authType: string;
+    apiKey?: string;
+    baseUrl?: string;
+}
+/**
+ * Build a ContentGeneratorConfig for a per-agent ContentGenerator.
+ * Inherits operational settings (timeout, retries, proxy, sampling, etc.)
+ * from the parent's config and overlays the agent-specific auth fields.
+ *
+ * For cross-provider agents the parent's API key / base URL are invalid,
+ * so we resolve credentials from the provider-specific environment
+ * variables (e.g. ANTHROPIC_API_KEY, ANTHROPIC_BASE_URL). This mirrors
+ * what a PTY subprocess does during its own initialization.
+ */
+export declare function buildAgentContentGeneratorConfig(base: Config, modelId: string | undefined, authOverrides: AuthOverrides): ContentGeneratorConfig;
+/**
+ * Resolve a credential field (apiKey or baseUrl) with the following
+ * priority: explicit override → same-provider parent value.
+ * Note: Environment variables are no longer used - credentials must come from settings.
+ */
+export declare function resolveCredentialField(explicitValue: string | undefined, inheritedValue: string | undefined, authType: string, field: 'apiKey' | 'baseUrl'): string | undefined;

package/dist/CLI/packages/core/src/models/content-generator-config.js

@@ -0,0 +1,94 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import {} from '../core/contentGenerator.js';
+import { MODEL_GENERATION_CONFIG_FIELDS, } from './constants.js';
+/**
+ * Build a ContentGeneratorConfig for a per-agent ContentGenerator.
+ * Inherits operational settings (timeout, retries, proxy, sampling, etc.)
+ * from the parent's config and overlays the agent-specific auth fields.
+ *
+ * For cross-provider agents the parent's API key / base URL are invalid,
+ * so we resolve credentials from the provider-specific environment
+ * variables (e.g. ANTHROPIC_API_KEY, ANTHROPIC_BASE_URL). This mirrors
+ * what a PTY subprocess does during its own initialization.
+ */
+export function buildAgentContentGeneratorConfig(base, modelId, authOverrides) {
+    const parentConfig = base.getContentGeneratorConfig();
+    const sameProvider = authOverrides.authType === parentConfig.authType;
+    const modelsConfig = base.getModelsConfig();
+    const resolvedModel = modelId
+        ? modelsConfig.getResolvedModel(authOverrides.authType, modelId)
+        : undefined;
+    const nextConfig = {
+        ...parentConfig,
+        model: modelId ?? parentConfig.model,
+        authType: authOverrides.authType,
+    };
+    // When switching providers, clear generation config fields so parent
+    // settings (samplingParams, reasoning, extra_body, etc.) don't leak.
+    if (!sameProvider) {
+        for (const field of MODEL_GENERATION_CONFIG_FIELDS) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            nextConfig[field] = undefined;
+        }
+    }
+    if (resolvedModel) {
+        applyResolvedModelConfig(nextConfig, resolvedModel, parentConfig, authOverrides);
+        return nextConfig;
+    }
+    nextConfig.apiKey = resolveCredentialField(authOverrides.apiKey, sameProvider ? parentConfig.apiKey : undefined, authOverrides.authType, 'apiKey');
+    nextConfig.baseUrl =
+        authOverrides.baseUrl ??
+            resolveCredentialField(undefined, sameProvider ? parentConfig.baseUrl : undefined, authOverrides.authType, 'baseUrl');
+    nextConfig.apiKeyEnvKey = sameProvider
+        ? parentConfig.apiKeyEnvKey
+        : undefined;
+    return nextConfig;
+}
+function applyResolvedModelConfig(targetConfig, resolvedModel, parentConfig, authOverrides) {
+    const sameProvider = authOverrides.authType === parentConfig.authType;
+    targetConfig.model = resolvedModel.id;
+    targetConfig.authType = resolvedModel.authType;
+    targetConfig.baseUrl =
+        authOverrides.baseUrl ??
+            resolvedModel.baseUrl ??
+            (sameProvider ? parentConfig.baseUrl : undefined);
+    if (resolvedModel.envKey) {
+        targetConfig.apiKey =
+            authOverrides.apiKey ??
+                (sameProvider ? parentConfig.apiKey : undefined);
+        targetConfig.apiKeyEnvKey = resolvedModel.envKey;
+    }
+    else {
+        targetConfig.apiKey = resolveCredentialField(authOverrides.apiKey, sameProvider ? parentConfig.apiKey : undefined, authOverrides.authType, 'apiKey');
+        targetConfig.apiKeyEnvKey = sameProvider
+            ? parentConfig.apiKeyEnvKey
+            : undefined;
+    }
+    // Apply registry-defined generation config fields. Cross-provider
+    // clearing is already handled by buildAgentContentGeneratorConfig,
+    // so here we only overwrite when the registry provides a value.
+    for (const field of MODEL_GENERATION_CONFIG_FIELDS) {
+        const registryValue = resolvedModel.generationConfig[field];
+        if (registryValue !== undefined) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            targetConfig[field] = registryValue;
+        }
+    }
+}
+/**
+ * Resolve a credential field (apiKey or baseUrl) with the following
+ * priority: explicit override → same-provider parent value.
+ * Note: Environment variables are no longer used - credentials must come from settings.
+ */
+export function resolveCredentialField(explicitValue, inheritedValue, authType, field) {
+    if (explicitValue)
+        return explicitValue;
+    if (inheritedValue)
+        return inheritedValue;
+    return undefined;
+}
+//# sourceMappingURL=content-generator-config.js.map

package/dist/CLI/packages/core/src/models/content-generator-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"content-generator-config.js","sourceRoot":"","sources":["../../../../../../../core/src/models/content-generator-config.ts"],"names":[],"mappings":"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"}

package/dist/CLI/packages/core/src/models/index.d.ts

@@ -0,0 +1,10 @@
+/**
+ * @license
+ * Copyright 2025 Qwen Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export { type ModelCapabilities, type ModelGenerationConfig, type ModelConfig, type ModelProvidersConfig, type ResolvedModelConfig, type AvailableModel, type ModelSwitchMetadata, type RuntimeModelSnapshot, } from './types.js';
+export { ModelRegistry } from './modelRegistry.js';
+export { ModelsConfig, type ModelsConfigOptions, type OnModelChangeCallback, } from './modelsConfig.js';
+export { AUTH_ENV_MAPPINGS, CREDENTIAL_FIELDS, DEFAULT_MODELS, MODEL_GENERATION_CONFIG_FIELDS, PROVIDER_SOURCED_FIELDS, AETHER_OAUTH_ALLOWED_MODELS, AETHER_OAUTH_MODELS, } from './constants.js';
+export { resolveModelConfig, validateModelConfig, type ModelConfigSourcesInput, type ModelConfigCliInput, type ModelConfigSettingsInput, type ModelConfigResolutionResult, type ModelConfigValidationResult, } from './modelConfigResolver.js';

package/dist/CLI/packages/core/src/models/index.js

@@ -0,0 +1,12 @@
+/**
+ * @license
+ * Copyright 2025 Qwen Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {} from './types.js';
+export { ModelRegistry } from './modelRegistry.js';
+export { ModelsConfig, } from './modelsConfig.js';
+export { AUTH_ENV_MAPPINGS, CREDENTIAL_FIELDS, DEFAULT_MODELS, MODEL_GENERATION_CONFIG_FIELDS, PROVIDER_SOURCED_FIELDS, AETHER_OAUTH_ALLOWED_MODELS, AETHER_OAUTH_MODELS, } from './constants.js';
+// Model configuration resolver
+export { resolveModelConfig, validateModelConfig, } from './modelConfigResolver.js';
+//# sourceMappingURL=index.js.map

package/dist/CLI/packages/core/src/models/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../core/src/models/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EASN,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EACL,YAAY,GAGb,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,cAAc,EACd,8BAA8B,EAC9B,uBAAuB,EACvB,2BAA2B,EAC3B,mBAAmB,GACpB,MAAM,gBAAgB,CAAC;AAExB,+BAA+B;AAC/B,OAAO,EACL,kBAAkB,EAClB,mBAAmB,GAMpB,MAAM,0BAA0B,CAAC"}

package/dist/CLI/packages/core/src/models/modelConfigErrors.d.ts

@@ -0,0 +1,46 @@
+/**
+ * @license
+ * Copyright 2025 Qwen Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export declare function getDefaultApiKeyEnvVar(authType: string | undefined): string;
+export declare function getDefaultModelEnvVar(authType: string | undefined): string;
+export declare abstract class ModelConfigError extends Error {
+    abstract readonly code: string;
+    protected constructor(message: string);
+}
+export declare class StrictMissingCredentialsError extends ModelConfigError {
+    readonly code = "STRICT_MISSING_CREDENTIALS";
+    constructor(authType: string | undefined, model: string | undefined, envKey?: string);
+}
+export declare class StrictMissingModelIdError extends ModelConfigError {
+    readonly code = "STRICT_MISSING_MODEL_ID";
+    constructor(authType: string | undefined);
+}
+export declare class MissingApiKeyError extends ModelConfigError {
+    readonly code = "MISSING_API_KEY";
+    constructor(params: {
+        authType: string | undefined;
+        model: string | undefined;
+        baseUrl: string | undefined;
+        envKey: string;
+    });
+}
+export declare class MissingModelError extends ModelConfigError {
+    readonly code = "MISSING_MODEL";
+    constructor(params: {
+        authType: string | undefined;
+        envKey: string;
+    });
+}
+export declare class MissingBaseUrlError extends ModelConfigError {
+    readonly code = "MISSING_BASE_URL";
+    constructor(params: {
+        authType: string | undefined;
+        model: string | undefined;
+    });
+}
+export declare class MissingAnthropicBaseUrlEnvError extends ModelConfigError {
+    readonly code = "MISSING_ANTHROPIC_BASE_URL_ENV";
+    constructor();
+}

package/dist/CLI/packages/core/src/models/modelConfigErrors.js

@@ -0,0 +1,86 @@
+/**
+ * @license
+ * Copyright 2025 Qwen Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export function getDefaultApiKeyEnvVar(authType) {
+    switch (authType) {
+        case 'openai':
+            return 'OPENAI_API_KEY';
+        case 'anthropic':
+            return 'ANTHROPIC_API_KEY';
+        case 'gemini':
+            return 'GEMINI_API_KEY';
+        case 'vertex-ai':
+            return 'GOOGLE_API_KEY';
+        default:
+            return 'API_KEY';
+    }
+}
+export function getDefaultModelEnvVar(authType) {
+    switch (authType) {
+        case 'openai':
+            return 'OPENAI_MODEL';
+        case 'anthropic':
+            return 'ANTHROPIC_MODEL';
+        case 'gemini':
+            return 'GEMINI_MODEL';
+        case 'vertex-ai':
+            return 'GOOGLE_MODEL';
+        default:
+            return 'MODEL';
+    }
+}
+export class ModelConfigError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = new.target.name;
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+}
+export class StrictMissingCredentialsError extends ModelConfigError {
+    code = 'STRICT_MISSING_CREDENTIALS';
+    constructor(authType, model, envKey) {
+        const modelName = model || '(unknown)';
+        super(`Missing credentials for model '${modelName}'. ` +
+            (envKey
+                ? `Current configured envKey: '${envKey}'. Set that environment variable, or configure the provider in settings.`
+                : `Configure the provider in settings and set the required API key.`));
+    }
+}
+export class StrictMissingModelIdError extends ModelConfigError {
+    code = 'STRICT_MISSING_MODEL_ID';
+    constructor(authType) {
+        super(`Missing model id for strict provider resolution (authType: ${authType}).`);
+    }
+}
+export class MissingApiKeyError extends ModelConfigError {
+    code = 'MISSING_API_KEY';
+    constructor(params) {
+        super(`Missing API key for ${params.authType} auth. ` +
+            `Current model: '${params.model || '(unknown)'}', baseUrl: '${params.baseUrl || '(default)'}'. ` +
+            `Provide an API key via settings (security.auth.apiKey), ` +
+            `or set the environment variable '${params.envKey}'.`);
+    }
+}
+export class MissingModelError extends ModelConfigError {
+    code = 'MISSING_MODEL';
+    constructor(params) {
+        super(`Missing model for ${params.authType} auth. ` +
+            `Set the environment variable '${params.envKey}'.`);
+    }
+}
+export class MissingBaseUrlError extends ModelConfigError {
+    code = 'MISSING_BASE_URL';
+    constructor(params) {
+        super(`Missing baseUrl for model '${params.model || '(unknown)'}'. ` +
+            `Configure the provider in settings with the correct baseUrl.`);
+    }
+}
+export class MissingAnthropicBaseUrlEnvError extends ModelConfigError {
+    code = 'MISSING_ANTHROPIC_BASE_URL_ENV';
+    constructor() {
+        super('ANTHROPIC_BASE_URL environment variable not found.');
+    }
+}
+//# sourceMappingURL=modelConfigErrors.js.map

package/dist/CLI/packages/core/src/models/modelConfigErrors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"modelConfigErrors.js","sourceRoot":"","sources":["../../../../../../../core/src/models/modelConfigErrors.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,UAAU,sBAAsB,CAAC,QAA4B;IACjE,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,QAAQ;YACX,OAAO,gBAAgB,CAAC;QAC1B,KAAK,WAAW;YACd,OAAO,mBAAmB,CAAC;QAC7B,KAAK,QAAQ;YACX,OAAO,gBAAgB,CAAC;QAC1B,KAAK,WAAW;YACd,OAAO,gBAAgB,CAAC;QAC1B;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,QAA4B;IAChE,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,QAAQ;YACX,OAAO,cAAc,CAAC;QACxB,KAAK,WAAW;YACd,OAAO,iBAAiB,CAAC;QAC3B,KAAK,QAAQ;YACX,OAAO,cAAc,CAAC;QACxB,KAAK,WAAW;YACd,OAAO,cAAc,CAAC;QACxB;YACE,OAAO,OAAO,CAAC;IACnB,CAAC;AACH,CAAC;AAED,MAAM,OAAgB,gBAAiB,SAAQ,KAAK;IAGlD,YAAsB,OAAe;QACnC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;QAC5B,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACpD,CAAC;CACF;AAED,MAAM,OAAO,6BAA8B,SAAQ,gBAAgB;IACxD,IAAI,GAAG,4BAA4B,CAAC;IAE7C,YACE,QAA4B,EAC5B,KAAyB,EACzB,MAAe;QAEf,MAAM,SAAS,GAAG,KAAK,IAAI,WAAW,CAAC;QACvC,KAAK,CACH,kCAAkC,SAAS,KAAK;YAC9C,CAAC,MAAM;gBACL,CAAC,CAAC,+BAA+B,MAAM,0EAA0E;gBACjH,CAAC,CAAC,kEAAkE,CAAC,CAC1E,CAAC;IACJ,CAAC;CACF;AAED,MAAM,OAAO,yBAA0B,SAAQ,gBAAgB;IACpD,IAAI,GAAG,yBAAyB,CAAC;IAE1C,YAAY,QAA4B;QACtC,KAAK,CACH,8DAA8D,QAAQ,IAAI,CAC3E,CAAC;IACJ,CAAC;CACF;AAED,MAAM,OAAO,kBAAmB,SAAQ,gBAAgB;IAC7C,IAAI,GAAG,iBAAiB,CAAC;IAElC,YAAY,MAKX;QACC,KAAK,CACH,uBAAuB,MAAM,CAAC,QAAQ,SAAS;YAC7C,mBAAmB,MAAM,CAAC,KAAK,IAAI,WAAW,gBAAgB,MAAM,CAAC,OAAO,IAAI,WAAW,KAAK;YAChG,0DAA0D;YAC1D,oCAAoC,MAAM,CAAC,MAAM,IAAI,CACxD,CAAC;IACJ,CAAC;CACF;AAED,MAAM,OAAO,iBAAkB,SAAQ,gBAAgB;IAC5C,IAAI,GAAG,eAAe,CAAC;IAEhC,YAAY,MAAwD;QAClE,KAAK,CACH,qBAAqB,MAAM,CAAC,QAAQ,SAAS;YAC3C,iCAAiC,MAAM,CAAC,MAAM,IAAI,CACrD,CAAC;IACJ,CAAC;CACF;AAED,MAAM,OAAO,mBAAoB,SAAQ,gBAAgB;IAC9C,IAAI,GAAG,kBAAkB,CAAC;IAEnC,YAAY,MAGX;QACC,KAAK,CACH,8BAA8B,MAAM,CAAC,KAAK,IAAI,WAAW,KAAK;YAC5D,8DAA8D,CACjE,CAAC;IACJ,CAAC;CACF;AAED,MAAM,OAAO,+BAAgC,SAAQ,gBAAgB;IAC1D,IAAI,GAAG,gCAAgC,CAAC;IAEjD;QACE,KAAK,CAAC,oDAAoD,CAAC,CAAC;IAC9D,CAAC;CACF"}

package/dist/CLI/packages/core/src/models/modelConfigResolver.d.ts

@@ -0,0 +1,84 @@
+/**
+ * @license
+ * Copyright 2025 Qwen Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * ModelConfigResolver - Unified resolver for model-related configuration.
+ *
+ * This module consolidates all model configuration resolution logic,
+ * eliminating duplicate code between CLI and Core layers.
+ *
+ * Configuration priority (highest to lowest):
+ * 1. modelProvider - Explicit selection from ModelProviders config
+ * 2. CLI arguments - Command line flags (--model, --openaiApiKey, etc.)
+ * 3. Environment variables - OPENAI_API_KEY, OPENAI_MODEL, etc.
+ * 4. Settings - User/workspace settings file
+ * 5. Defaults - Built-in default values
+ */
+import { AuthType } from '../core/contentGenerator.js';
+import type { ContentGeneratorConfig } from '../core/contentGenerator.js';
+import { type ConfigSources } from '../utils/configResolver.js';
+import type { ModelConfig as ModelProviderConfig } from './types.js';
+export { validateModelConfig, type ModelConfigValidationResult, } from '../core/contentGenerator.js';
+/**
+ * CLI-provided configuration values
+ */
+export interface ModelConfigCliInput {
+    model?: string;
+    apiKey?: string;
+    baseUrl?: string;
+}
+/**
+ * Settings-provided configuration values
+ */
+export interface ModelConfigSettingsInput {
+    /** Model name from settings.model.name */
+    model?: string;
+    /** API key from settings.security.auth.apiKey */
+    apiKey?: string;
+    /** Base URL from settings.security.auth.baseUrl */
+    baseUrl?: string;
+    /** Generation config from settings.model.generationConfig */
+    generationConfig?: Partial<ContentGeneratorConfig>;
+}
+/**
+ * All input sources for model configuration resolution
+ */
+export interface ModelConfigSourcesInput {
+    /** Authentication type */
+    authType?: AuthType;
+    /** CLI arguments (highest priority for user-provided values) */
+    cli?: ModelConfigCliInput;
+    /** Settings file configuration */
+    settings?: ModelConfigSettingsInput;
+    /** Environment variables (injected for testability) */
+    env: Record<string, string | undefined>;
+    /** Model from ModelProviders (explicit selection, highest priority) */
+    modelProvider?: ModelProviderConfig;
+    /** Proxy URL (computed from Config) */
+    proxy?: string;
+}
+/**
+ * Result of model configuration resolution
+ */
+export interface ModelConfigResolutionResult {
+    /** The fully resolved configuration */
+    config: ContentGeneratorConfig;
+    /** Source attribution for each field */
+    sources: ConfigSources;
+    /** Warnings generated during resolution */
+    warnings: string[];
+}
+/**
+ * Resolve model configuration from all input sources.
+ *
+ * This is the single entry point for model configuration resolution.
+ * It replaces the duplicate logic in:
+ * - packages/cli/src/utils/modelProviderUtils.ts (resolveCliGenerationConfig)
+ * - packages/core/src/core/contentGenerator.ts (resolveContentGeneratorConfigWithSources)
+ *
+ * @param input - All configuration sources
+ * @returns Resolved configuration with source tracking
+ */
+export declare function resolveModelConfig(input: ModelConfigSourcesInput): ModelConfigResolutionResult;