@theia/ai-core 1.64.0-next.35 → 1.64.1

package/lib/node/language-model-frontend-delegate.js

@@ -32,7 +32,7 @@ let LanguageModelRegistryFrontendDelegateImpl = class LanguageModelRegistryFront
 exports.LanguageModelRegistryFrontendDelegateImpl = LanguageModelRegistryFrontendDelegateImpl;
 tslib_1.__decorate([
     (0, inversify_1.inject)(common_1.LanguageModelRegistry),
-    tslib_1.__metadata("design:type", backend_language_model_registry_1.BackendLanguageModelRegistry)
+    tslib_1.__metadata("design:type", backend_language_model_registry_1.BackendLanguageModelRegistryImpl)
 ], LanguageModelRegistryFrontendDelegateImpl.prototype, "registry", void 0);
 exports.LanguageModelRegistryFrontendDelegateImpl = LanguageModelRegistryFrontendDelegateImpl = tslib_1.__decorate([
     (0, inversify_1.injectable)()

package/lib/node/language-model-frontend-delegate.js.map

@@ -1 +1 @@
-{"version":3,"file":"language-model-frontend-delegate.js","sourceRoot":"","sources":["../../src/node/language-model-frontend-delegate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"language-model-frontend-delegate.js","sourceRoot":"","sources":["../../src/node/language-model-frontend-delegate.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@theia/ai-core",
-  "version": "1.64.0-next.35+c964c3040",
+  "version": "1.64.1",
   "description": "Theia - AI Core",
   "dependencies": {
-    "@theia/core": "1.64.0-next.35+c964c3040",
-    "@theia/editor": "1.64.0-next.35+c964c3040",
-    "@theia/filesystem": "1.64.0-next.35+c964c3040",
-    "@theia/monaco": "1.64.0-next.35+c964c3040",
+    "@theia/core": "1.64.1",
+    "@theia/editor": "1.64.1",
+    "@theia/filesystem": "1.64.1",
+    "@theia/monaco": "1.64.1",
     "@theia/monaco-editor-core": "1.96.302",
-    "@theia/output": "1.64.0-next.35+c964c3040",
-    "@theia/variable-resolver": "1.64.0-next.35+c964c3040",
-    "@theia/workspace": "1.64.0-next.35+c964c3040",
+    "@theia/output": "1.64.1",
+    "@theia/variable-resolver": "1.64.1",
+    "@theia/workspace": "1.64.1",
     "@types/js-yaml": "^4.0.9",
     "fast-deep-equal": "^3.1.3",
     "js-yaml": "^4.1.0",
@@ -53,10 +53,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.63.0"
+    "@theia/ext-scripts": "1.64.1"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "c964c30402a92d5ba662fcafa839af99d8760f53"
+  "gitHead": "63e84b05db2d2eda0add659f67e9552887b0da8e"
 }

package/src/browser/ai-activation-service.ts

@@ -14,54 +14,46 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 import { inject, injectable } from '@theia/core/shared/inversify';
-import { FrontendApplicationContribution, PreferenceService } from '@theia/core/lib/browser';
-import { Emitter, MaybePromise, Event, } from '@theia/core';
-import { ContextKeyService, ContextKey } from '@theia/core/lib/browser/context-key-service';
-import { PREFERENCE_NAME_ENABLE_AI } from './ai-core-preferences';
+import { Emitter, Event, } from '@theia/core';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser';
+import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
+
+export const AIActivationService = Symbol('AIActivationService');
+/**
+ * AIActivationService is used to manage the activation state of AI features in Theia.
+ */
+export interface AIActivationService {
+    isActive: boolean;
+    onDidChangeActiveStatus: Event<boolean>;
+}
 
 /**
  * Context key for the AI features. It is set to `true` if the feature is enabled.
  */
-// We reuse the enablement preference for the context key
-export const ENABLE_AI_CONTEXT_KEY = PREFERENCE_NAME_ENABLE_AI;
+export const ENABLE_AI_CONTEXT_KEY = 'ai-features.AiEnable.enableAI';
 
+/**
+ * Default implementation of AIActivationService marks the feature active by default.
+ *
+ * Adopters may override this implementation to provide custom activation logic.
+ *
+ * Note that '@theia/ai-ide' also overrides this service to provide activation based on preferences,
+ * disabling the feature by default.
+ */
 @injectable()
-export class AIActivationService implements FrontendApplicationContribution {
+export class AIActivationServiceImpl implements AIActivationService, FrontendApplicationContribution {
+
     @inject(ContextKeyService)
     protected readonly contextKeyService: ContextKeyService;
 
-    @inject(PreferenceService)
-    protected preferenceService: PreferenceService;
-
-    protected isAiEnabledKey: ContextKey<boolean>;
+    isActive: boolean = true;
 
     protected onDidChangeAIEnabled = new Emitter<boolean>();
     get onDidChangeActiveStatus(): Event<boolean> {
         return this.onDidChangeAIEnabled.event;
     }
 
-    get isActive(): boolean {
-        return this.isAiEnabledKey.get() ?? false;
-    }
-
-    protected updateEnableValue(value: boolean): void {
-        if (value !== this.isAiEnabledKey.get()) {
-            this.isAiEnabledKey.set(value);
-            this.onDidChangeAIEnabled.fire(value);
-        }
-    }
-
-    initialize(): MaybePromise<void> {
-        this.isAiEnabledKey = this.contextKeyService.createKey(ENABLE_AI_CONTEXT_KEY, false);
-        // make sure we don't miss once preferences are ready
-        this.preferenceService.ready.then(() => {
-            const enableValue = this.preferenceService.get<boolean>(PREFERENCE_NAME_ENABLE_AI, false);
-            this.updateEnableValue(enableValue);
-        });
-        this.preferenceService.onPreferenceChanged(e => {
-            if (e.preferenceName === PREFERENCE_NAME_ENABLE_AI) {
-                this.updateEnableValue(e.newValue);
-            }
-        });
+    initialize(): void {
+        this.contextKeyService.createKey(ENABLE_AI_CONTEXT_KEY, true);
     }
 }

package/src/browser/ai-core-frontend-module.ts

@@ -20,6 +20,8 @@ import {
     ServiceConnectionProvider,
 } from '@theia/core/lib/browser/messaging/service-connection-provider';
 import { ContainerModule } from '@theia/core/shared/inversify';
+import { DefaultLanguageModelAliasRegistry } from './frontend-language-model-alias-registry';
+import { LanguageModelAliasRegistry } from '../common/language-model-alias';
 import {
     AIVariableContribution,
     AIVariableService,
@@ -42,18 +44,18 @@ import {
     TokenUsageServiceClient,
     AIVariableResourceResolver,
     ConfigurableInMemoryResources,
-    Agent
+    Agent,
+    FrontendLanguageModelRegistry
 } from '../common';
 import {
     FrontendLanguageModelRegistryImpl,
     LanguageModelDelegateClientImpl,
 } from './frontend-language-model-registry';
-import { FrontendApplicationContribution, LabelProviderContribution, PreferenceContribution } from '@theia/core/lib/browser';
+import { FrontendApplicationContribution, LabelProviderContribution } from '@theia/core/lib/browser';
 import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
 import { LanguageGrammarDefinitionContribution } from '@theia/monaco/lib/browser/textmate';
 import { AICoreFrontendApplicationContribution } from './ai-core-frontend-application-contribution';
 import { bindAICorePreferences } from './ai-core-preferences';
-import { AgentSettingsPreferenceSchema } from './agent-preferences';
 import { AISettingsServiceImpl } from './ai-settings-service';
 import { DefaultPromptFragmentCustomizationService } from './frontend-prompt-customization-service';
 import { DefaultFrontendVariableService, FrontendVariableService } from './frontend-variable-service';
@@ -63,7 +65,7 @@ import { TheiaVariableContribution } from './theia-variable-contribution';
 import { TodayVariableContribution } from '../common/today-variable-contribution';
 import { AgentsVariableContribution } from '../common/agents-variable-contribution';
 import { OpenEditorsVariableContribution } from './open-editors-variable-contribution';
-import { AIActivationService } from './ai-activation-service';
+import { AIActivationService, AIActivationServiceImpl } from './ai-activation-service';
 import { AgentService, AgentServiceImpl } from '../common/agent-service';
 import { AICommandHandlerFactory } from './ai-command-handler-factory';
 import { AISettingsService } from '../common/settings-service';
@@ -83,6 +85,7 @@ export default new ContainerModule(bind => {
     bindContributionProvider(bind, LanguageModelProvider);
 
     bind(FrontendLanguageModelRegistryImpl).toSelf().inSingletonScope();
+    bind(FrontendLanguageModelRegistry).toService(FrontendLanguageModelRegistryImpl);
     bind(LanguageModelRegistry).toService(FrontendLanguageModelRegistryImpl);
 
     bind(LanguageModelDelegateClientImpl).toSelf().inSingletonScope();
@@ -106,7 +109,6 @@ export default new ContainerModule(bind => {
         .inSingletonScope();
 
     bindAICorePreferences(bind);
-    bind(PreferenceContribution).toConstantValue({ schema: AgentSettingsPreferenceSchema });
 
     bind(DefaultPromptFragmentCustomizationService).toSelf().inSingletonScope();
     bind(PromptFragmentCustomizationService).toService(DefaultPromptFragmentCustomizationService);
@@ -118,7 +120,8 @@ export default new ContainerModule(bind => {
     bind(CommandContribution).toService(PromptTemplateContribution);
     bind(TabBarToolbarContribution).toService(PromptTemplateContribution);
 
-    bind(AISettingsService).to(AISettingsServiceImpl).inRequestScope();
+    bind(AISettingsServiceImpl).toSelf().inSingletonScope();
+    bind(AISettingsService).toService(AISettingsServiceImpl);
     bindContributionProvider(bind, AIVariableContribution);
     bind(DefaultFrontendVariableService).toSelf().inSingletonScope();
     bind(FrontendVariableService).toService(DefaultFrontendVariableService);
@@ -139,13 +142,15 @@ export default new ContainerModule(bind => {
     bind(ToolInvocationRegistry).to(ToolInvocationRegistryImpl).inSingletonScope();
     bindContributionProvider(bind, ToolProvider);
 
-    bind(AIActivationService).toSelf().inSingletonScope();
+    bind(AIActivationServiceImpl).toSelf().inSingletonScope();
+    bind(AIActivationService).toService(AIActivationServiceImpl);
     bind(FrontendApplicationContribution).toService(AIActivationService);
+
     bind(AgentServiceImpl).toSelf().inSingletonScope();
     bind(AgentService).toService(AgentServiceImpl);
 
     bind(AICommandHandlerFactory).toFactory<CommandHandler>(context => (handler: CommandHandler) => {
-        const activationService = context.container.get(AIActivationService);
+        const activationService = context.container.get<AIActivationService>(AIActivationService);
         return {
             execute: (...args: unknown[]) => handler.execute(...args),
             isEnabled: (...args: unknown[]) => activationService.isActive && (handler.isEnabled?.(...args) ?? true),
@@ -162,6 +167,9 @@ export default new ContainerModule(bind => {
     bind(TokenUsageFrontendService).to(TokenUsageFrontendServiceImpl).inSingletonScope();
     bind(TokenUsageServiceClient).to(TokenUsageServiceClientImpl).inSingletonScope();
 
+    bind(DefaultLanguageModelAliasRegistry).toSelf().inSingletonScope();
+    bind(LanguageModelAliasRegistry).toService(DefaultLanguageModelAliasRegistry);
+
     bind(TokenUsageService).toDynamicValue(ctx => {
         const connection = ctx.container.get<ServiceConnectionProvider>(RemoteConnectionProvider);
         const client = ctx.container.get<TokenUsageServiceClient>(TokenUsageServiceClient);

package/src/browser/ai-core-preferences.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { nls } from '@theia/core';
-import { PreferenceContribution, PreferenceProxy, PreferenceSchema } from '@theia/core/lib/browser';
+import { PreferenceProxy, PreferenceSchema } from '@theia/core/lib/browser';
 import { PreferenceProxyFactory } from '@theia/core/lib/browser/preferences/injectable-preference-proxy';
 import { interfaces } from '@theia/core/shared/inversify';
 import {
@@ -24,32 +24,17 @@ import {
     NotificationType
 } from '../common/notification-types';
 
-export const AI_CORE_PREFERENCES_TITLE = nls.localize('theia/ai/core/prefs/title', '✨ AI Features [Alpha]');
-export const PREFERENCE_NAME_ENABLE_AI = 'ai-features.AiEnable.enableAI';
+export const AI_CORE_PREFERENCES_TITLE = nls.localize('theia/ai/core/prefs/title', '✨ AI Features [Beta]');
 export const PREFERENCE_NAME_PROMPT_TEMPLATES = 'ai-features.promptTemplates.promptTemplatesFolder';
 export const PREFERENCE_NAME_REQUEST_SETTINGS = 'ai-features.modelSettings.requestSettings';
 export const PREFERENCE_NAME_MAX_RETRIES = 'ai-features.modelSettings.maxRetries';
 export const PREFERENCE_NAME_DEFAULT_NOTIFICATION_TYPE = 'ai-features.notifications.default';
 
+export const LANGUAGE_MODEL_ALIASES_PREFERENCE = 'ai-features.languageModelAliases';
+
 export const aiCorePreferenceSchema: PreferenceSchema = {
     type: 'object',
     properties: {
-        [PREFERENCE_NAME_ENABLE_AI]: {
-            title: AI_CORE_PREFERENCES_TITLE,
-            markdownDescription: nls.localize('theia/ai/core/enableAI/mdDescription',
-                '❗ This setting allows you to access the latest AI capabilities (Alpha version).\
-            \n\
-            Please note that these features are in an alpha phase, which means they may \
-            undergo changes and will be further improved. It is important to be aware that these features may generate\
-            continuous requests to the language models (LLMs) you provide access to. This might incur costs that you\
-            need to monitor closely. By enabling this option, you acknowledge these risks.\
-            \n\
-            **Please note! The settings below in this section will only take effect\n\
-            once the main feature setting is enabled. After enabling the feature, you need to configure at least one\
-            LLM provider below. Also see [the documentation](https://theia-ide.org/docs/user_ai/)**.'),
-            type: 'boolean',
-            default: false,
-        },
         [PREFERENCE_NAME_PROMPT_TEMPLATES]: {
             title: AI_CORE_PREFERENCES_TITLE,
             description: nls.localize('theia/ai/core/promptTemplates/description',
@@ -148,12 +133,35 @@ export const aiCorePreferenceSchema: PreferenceSchema = {
             type: 'string',
             enum: [...NOTIFICATION_TYPES],
             default: NOTIFICATION_TYPE_OFF
+        },
+        [LANGUAGE_MODEL_ALIASES_PREFERENCE]: {
+            title: nls.localize('theia/ai/core/preference/languageModelAliases/title', 'Language Model Aliases'),
+            markdownDescription: nls.localize('theia/ai/core/preference/languageModelAliases/description', 'Configure models for each language model alias in the \
+[AI Configuration View]({0}). Alternatiely you can set the settings manually in the settings.json: \n\
+```\n\
+"default/code": {\n\
+  "selectedModel": "anthropic/claude-opus-4-20250514"\n\
+}\n\```',
+                'command:aiConfiguration:open'
+            ),
+            type: 'object',
+            additionalProperties: {
+                type: 'object',
+                properties: {
+                    selectedModel: {
+                        type: 'string',
+                        description: nls.localize('theia/ai/core/preference/languageModelAliases/selectedModel', 'The user-selected model for this alias.')
+                    }
+                },
+                required: ['selectedModel'],
+                additionalProperties: false
+            },
+            default: {},
         }
     }
 };
 
 export interface AICoreConfiguration {
-    [PREFERENCE_NAME_ENABLE_AI]: boolean | undefined;
     [PREFERENCE_NAME_PROMPT_TEMPLATES]: string | undefined;
     [PREFERENCE_NAME_REQUEST_SETTINGS]: Array<RequestSetting> | undefined;
     [PREFERENCE_NAME_MAX_RETRIES]: number | undefined;
@@ -180,7 +188,6 @@ export function bindAICorePreferences(bind: interfaces.Bind): void {
         const factory = ctx.container.get<PreferenceProxyFactory>(PreferenceProxyFactory);
         return factory(aiCorePreferenceSchema);
     }).inSingletonScope();
-    bind(PreferenceContribution).toConstantValue({ schema: aiCorePreferenceSchema });
 }
 
 /**

package/src/browser/ai-settings-service.ts

@@ -13,14 +13,18 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
-import { DisposableCollection, Emitter, Event } from '@theia/core';
+import { DisposableCollection, Emitter, Event, ILogger } from '@theia/core';
 import { PreferenceScope, PreferenceService } from '@theia/core/lib/browser';
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
 import { JSONObject } from '@theia/core/shared/@lumino/coreutils';
 import { AISettings, AISettingsService, AgentSettings } from '../common';
 
 @injectable()
 export class AISettingsServiceImpl implements AISettingsService {
+
+    @inject(ILogger)
+    protected readonly logger: ILogger;
+
     @inject(PreferenceService) protected preferenceService: PreferenceService;
     static readonly PREFERENCE_NAME = 'ai-features.agentSettings';
 
@@ -29,12 +33,27 @@ export class AISettingsServiceImpl implements AISettingsService {
     protected readonly onDidChangeEmitter = new Emitter<void>();
     onDidChange: Event<void> = this.onDidChangeEmitter.event;
 
+    @postConstruct()
+    protected init(): void {
+        this.toDispose.push(
+            this.preferenceService.onPreferenceChanged(event => {
+                if (event.preferenceName === AISettingsServiceImpl.PREFERENCE_NAME) {
+                    this.onDidChangeEmitter.fire();
+                }
+            })
+        );
+    }
+
     async updateAgentSettings(agent: string, agentSettings: Partial<AgentSettings>): Promise<void> {
         const settings = await this.getSettings();
         const newAgentSettings = { ...settings[agent], ...agentSettings };
         settings[agent] = newAgentSettings;
-        this.preferenceService.set(AISettingsServiceImpl.PREFERENCE_NAME, settings, PreferenceScope.User);
-        this.onDidChangeEmitter.fire();
+        try {
+            await this.preferenceService.set(AISettingsServiceImpl.PREFERENCE_NAME, settings, PreferenceScope.User);
+        } catch (e) {
+            this.onDidChangeEmitter.fire();
+            this.logger.warn('Updating the preferences was unsuccessful: ' + e);
+        }
     }
 
     async getAgentSettings(agent: string): Promise<AgentSettings | undefined> {

package/src/browser/frontend-language-model-alias-registry.ts

@@ -0,0 +1,166 @@
+// *****************************************************************************
+// Copyright (C) 2024-2025 EclipseSource GmbH.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
+import { Emitter, Event } from '@theia/core';
+import { LanguageModelAlias, LanguageModelAliasRegistry } from '../common/language-model-alias';
+import { PreferenceScope, PreferenceService } from '@theia/core/lib/browser';
+import { LANGUAGE_MODEL_ALIASES_PREFERENCE } from './ai-core-preferences';
+import { Deferred } from '@theia/core/lib/common/promise-util';
+
+@injectable()
+export class DefaultLanguageModelAliasRegistry implements LanguageModelAliasRegistry {
+
+    protected aliases: LanguageModelAlias[] = [
+        {
+            id: 'default/code',
+            defaultModelIds: [
+                'anthropic/claude-3-7-sonnet-latest',
+                'openai/gpt-4.1',
+                'google/gemini-2.5-pro-exp-03-25'
+            ],
+            description: 'Optimized for code understanding and generation tasks.'
+        },
+        {
+            id: 'default/universal',
+            defaultModelIds: [
+                'openai/gpt-4o',
+                'anthropic/claude-3-7-sonnet-latest',
+                'google/gemini-2.5-pro-exp-03-25'
+            ],
+            description: 'Well-balanced for both code and general language use.'
+        },
+        {
+            id: 'default/code-completion',
+            defaultModelIds: [
+                'openai/gpt-4.1',
+                'anthropic/claude-3-7-sonnet-latest',
+                'google/gemini-2.5-pro-exp-03-25'
+            ],
+            description: 'Best suited for code autocompletion scenarios.'
+        },
+        {
+            id: 'default/summarize',
+            defaultModelIds: [
+                'openai/gpt-4.1',
+                'anthropic/claude-3-7-sonnet-latest',
+                'google/gemini-2.5-pro-exp-03-25'
+            ],
+            description: 'Models prioritized for summarization and condensation of content.'
+        }
+    ];
+    protected readonly onDidChangeEmitter = new Emitter<void>();
+    readonly onDidChange: Event<void> = this.onDidChangeEmitter.event;
+
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
+    protected readonly _ready = new Deferred<void>();
+    get ready(): Promise<void> {
+        return this._ready.promise;
+    }
+
+    @postConstruct()
+    protected init(): void {
+        this.preferenceService.ready.then(() => {
+            this.loadFromPreference();
+            this.preferenceService.onPreferenceChanged(ev => {
+                if (ev.preferenceName === LANGUAGE_MODEL_ALIASES_PREFERENCE) {
+                    this.loadFromPreference();
+                }
+            });
+            this._ready.resolve();
+        }, err => {
+            this._ready.reject(err);
+        });
+    }
+
+    addAlias(alias: LanguageModelAlias): void {
+        const idx = this.aliases.findIndex(a => a.id === alias.id);
+        if (idx !== -1) {
+            this.aliases[idx] = alias;
+        } else {
+            this.aliases.push(alias);
+        }
+        this.saveToPreference();
+        this.onDidChangeEmitter.fire();
+    }
+
+    removeAlias(id: string): void {
+        const idx = this.aliases.findIndex(a => a.id === id);
+        if (idx !== -1) {
+            this.aliases.splice(idx, 1);
+            this.saveToPreference();
+            this.onDidChangeEmitter.fire();
+        }
+    }
+
+    getAliases(): LanguageModelAlias[] {
+        return [...this.aliases];
+    }
+
+    resolveAlias(id: string): string[] | undefined {
+        const alias = this.aliases.find(a => a.id === id);
+        if (!alias) {
+            return undefined;
+        }
+        if (alias.selectedModelId) {
+            return [alias.selectedModelId];
+        }
+        return alias.defaultModelIds;
+    }
+
+    /**
+     * Set the selected model for the given alias id.
+     * Updates the alias' selectedModelId to the given modelId, persists, and fires onDidChange.
+     */
+    selectModelForAlias(aliasId: string, modelId: string): void {
+        const alias = this.aliases.find(a => a.id === aliasId);
+        if (alias) {
+            alias.selectedModelId = modelId;
+            this.saveToPreference();
+            this.onDidChangeEmitter.fire();
+        }
+    }
+
+    /**
+     * Load aliases from the persisted setting
+     */
+    protected loadFromPreference(): void {
+        const stored = this.preferenceService.get<{ [name: string]: { selectedModel: string } }>(LANGUAGE_MODEL_ALIASES_PREFERENCE) || {};
+        this.aliases.forEach(alias => {
+            if (stored[alias.id] && stored[alias.id].selectedModel) {
+                alias.selectedModelId = stored[alias.id].selectedModel;
+            } else {
+                delete alias.selectedModelId;
+            }
+        });
+    }
+
+    /**
+     * Persist the current aliases and their selected models to the setting
+     */
+    protected saveToPreference(): void {
+        const map: { [name: string]: { selectedModel: string } } = {};
+        for (const alias of this.aliases) {
+            if (alias.selectedModelId) {
+                map[alias.id] = { selectedModel: alias.selectedModelId };
+            }
+        }
+        this.preferenceService.set(LANGUAGE_MODEL_ALIASES_PREFERENCE, map, PreferenceScope.User);
+    }
+}
+

package/src/browser/frontend-language-model-registry.ts

@@ -27,13 +27,14 @@ import {
 import {
     AISettingsService,
     DefaultLanguageModelRegistryImpl,
+    FrontendLanguageModelRegistry,
     isLanguageModelParsedResponse,
     isLanguageModelStreamResponse,
     isLanguageModelStreamResponseDelegate,
     isLanguageModelTextResponse,
-    isModelMatching,
     isTextResponsePart,
     LanguageModel,
+    LanguageModelAliasRegistry,
     LanguageModelDelegateClient,
     LanguageModelFrontendDelegate,
     LanguageModelMetaData,
@@ -43,12 +44,15 @@ import {
     LanguageModelResponse,
     LanguageModelSelector,
     LanguageModelStreamResponsePart,
-    ToolCallResult,
+    ToolCallResult
 } from '../common';
 
 @injectable()
 export class LanguageModelDelegateClientImpl
     implements LanguageModelDelegateClient, LanguageModelRegistryClient {
+    onLanguageModelUpdated(id: string): void {
+        this.receiver.onLanguageModelUpdated(id);
+    }
     protected receiver: FrontendLanguageModelRegistryImpl;
 
     setReceiver(receiver: FrontendLanguageModelRegistryImpl): void {
@@ -85,7 +89,11 @@ interface StreamState {
 
 @injectable()
 export class FrontendLanguageModelRegistryImpl
-    extends DefaultLanguageModelRegistryImpl {
+    extends DefaultLanguageModelRegistryImpl
+    implements FrontendLanguageModelRegistry {
+
+    @inject(LanguageModelAliasRegistry)
+    protected aliasRegistry: LanguageModelAliasRegistry;
 
     // called by backend
     languageModelAdded(metadata: LanguageModelMetaData): void {
@@ -95,6 +103,28 @@ export class FrontendLanguageModelRegistryImpl
     languageModelRemoved(id: string): void {
         this.removeLanguageModels([id]);
     }
+
+    // called by backend when a model is updated
+    onLanguageModelUpdated(id: string): void {
+        this.updateLanguageModelFromBackend(id);
+    }
+
+    /**
+     * Fetch the updated model metadata from the backend and update the registry.
+     */
+    protected async updateLanguageModelFromBackend(id: string): Promise<void> {
+        try {
+            const backendModels = await this.registryDelegate.getLanguageModelDescriptions();
+            const updated = backendModels.find((m: { id: string }) => m.id === id);
+            if (updated) {
+                // Remove the old model and add the updated one
+                this.removeLanguageModels([id]);
+                this.addLanguageModels([updated]);
+            }
+        } catch (err) {
+            this.logger.error('Failed to update language model from backend', err);
+        }
+    }
     @inject(LanguageModelRegistryFrontendDelegate)
     protected registryDelegate: LanguageModelRegistryFrontendDelegate;
 
@@ -312,20 +342,34 @@ export class FrontendLanguageModelRegistryImpl
         streamState.reject?.(error);
     }
 
-    override async selectLanguageModels(request: LanguageModelSelector): Promise<LanguageModel[]> {
+    override async selectLanguageModels(request: LanguageModelSelector): Promise<LanguageModel[] | undefined> {
         await this.initialized;
         const userSettings = (await this.settingsService.getAgentSettings(request.agent))?.languageModelRequirements?.find(req => req.purpose === request.purpose);
-        if (userSettings?.identifier) {
-            const model = await this.getLanguageModel(userSettings.identifier);
+        const identifier = userSettings?.identifier ?? request.identifier;
+        if (identifier) {
+            const model = await this.getReadyLanguageModel(identifier);
             if (model) {
                 return [model];
             }
         }
-        return this.languageModels.filter(model => isModelMatching(request, model));
+        // Previously we returned the default model here, but this is not really transparent for the user so we do not select any model here.
+        return undefined;
     }
 
-    override async selectLanguageModel(request: LanguageModelSelector): Promise<LanguageModel | undefined> {
-        return (await this.selectLanguageModels(request))[0];
+    async getReadyLanguageModel(idOrAlias: string): Promise<LanguageModel | undefined> {
+        await this.aliasRegistry.ready;
+        const modelIds = this.aliasRegistry.resolveAlias(idOrAlias);
+        if (modelIds) {
+            for (const modelId of modelIds) {
+                const model = await this.getLanguageModel(modelId);
+                if (model?.status.status === 'ready') {
+                    return model;
+                }
+            }
+            return undefined;
+        }
+        const languageModel = await this.getLanguageModel(idOrAlias);
+        return languageModel?.status.status === 'ready' ? languageModel : undefined;
     }
 }