@theia/ai-core 1.75.0-next.4 → 1.75.0-next.43

package/src/browser/hide-ai-preferences-contribution.ts

@@ -0,0 +1,88 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource and others.
+//
+// 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 } from '@theia/core/shared/inversify';
+import { nls, PreferenceContribution, PreferenceSchema, PreferenceSchemaService } from '@theia/core';
+import { AI_CORE_PREFERENCES_TITLE } from '../common/ai-core-preferences';
+
+/** Prefix shared by all AI preferences. */
+const AI_PREFERENCE_PREFIX = 'ai-features.';
+
+/**
+ * Informational placeholder shown in the Settings UI where the AI preferences used to live. It is a
+ * `null`-type preference (no editable value) grouped under "AI Features"; `@theia/ai-ide` renders it
+ * with a button that opens the AI Configuration view. Excluded from the hiding pass below.
+ */
+export const AI_CONFIGURATION_OPEN_PREFERENCE_ID = 'ai-features.openConfiguration';
+
+export const aiConfigurationOpenPlaceholderSchema: PreferenceSchema = {
+    properties: {
+        [AI_CONFIGURATION_OPEN_PREFERENCE_ID]: {
+            // eslint-disable-next-line no-null/no-null
+            type: 'null',
+            title: AI_CORE_PREFERENCES_TITLE,
+            markdownDescription: nls.localize('theia/ai-core/openConfiguration/description',
+                'AI settings have moved to the AI Configuration view. Open it to configure providers, models, agents, and more.')
+        }
+    }
+};
+
+/**
+ * Hides all AI preferences (`ai-features.*`) from the Settings UI once the AI Configuration view
+ * covers them (eclipsesource/theia#316). The schemas stay registered so validation and typing are
+ * unaffected; only their Settings-UI visibility is turned off via `hidden: true`. Matching by prefix
+ * means any future AI preference is covered without per-schema maintenance.
+ */
+@injectable()
+export class HideAiPreferencesContribution implements PreferenceContribution {
+
+    /**
+     * Re-entrancy guard: {@link PreferenceSchemaService.updateSchemaProperty} fires `onDidChangeSchema`
+     * synchronously, so our own writes call {@link hideAiPreferences} back while it is still iterating
+     * the service's live property map.
+     */
+    protected hiding = false;
+
+    async initSchema(service: PreferenceSchemaService): Promise<void> {
+        // Hide what is registered so far, then stay subscribed: schemas contributed after this point
+        // (a contribution whose own `initSchema` awaits, or any runtime `addSchema`) would otherwise
+        // remain visible in the Settings UI. Every addition fires `onDidChangeSchema`.
+        this.hideAiPreferences(service);
+        // Never disposed on purpose: this contribution lives as long as the application.
+        service.onDidChangeSchema(() => this.hideAiPreferences(service));
+    }
+
+    /**
+     * Turns on `hidden` for every `ai-features.*` property that is not already hidden. Idempotent, so it
+     * can run on every schema change. The `hidden` check and {@link hiding} each independently stop our own
+     * updates from looping; keep both, since dropping either leaves the pass one edit away from recursing.
+     */
+    protected hideAiPreferences(service: PreferenceSchemaService): void {
+        if (this.hiding) {
+            return;
+        }
+        this.hiding = true;
+        try {
+            for (const [key, property] of service.getSchemaProperties()) {
+                if (key.startsWith(AI_PREFERENCE_PREFIX) && key !== AI_CONFIGURATION_OPEN_PREFERENCE_ID && !property.hidden) {
+                    service.updateSchemaProperty(key, { ...property, hidden: true });
+                }
+            }
+        } finally {
+            this.hiding = false;
+        }
+    }
+}

package/src/browser/index.ts

@@ -27,6 +27,7 @@ export * from './ai-configuration-service-impl';
 export * from './ai-view-contribution';
 export * from './frontend-language-model-registry';
 export * from './frontend-language-model-alias-registry';
+export * from './hide-ai-preferences-contribution';
 export * from './frontend-variable-service';
 export * from './prompttemplate-contribution';
 export * from './theia-variable-contribution';

package/src/browser/prompt-variable-contribution.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 import { CommandService, ILogger, nls } from '@theia/core';
-import { injectable, inject } from '@theia/core/shared/inversify';
+import { injectable, inject, named } from '@theia/core/shared/inversify';
 import * as monaco from '@theia/monaco-editor-core';
 import {
     AIVariable,
@@ -47,8 +47,8 @@ export class PromptVariableContribution implements AIVariableContribution, AIVar
     @inject(PromptService)
     protected readonly promptService: PromptService;
 
-    @inject(ILogger)
-    protected logger: ILogger;
+    @inject(ILogger) @named('ai-core:PromptVariableContribution')
+    protected readonly logger: ILogger;
 
     registerVariables(service: AIVariableService): void {
         service.registerResolver(PROMPT_VARIABLE, this);

package/src/browser/skill-prompt-coordinator.ts

@@ -14,7 +14,8 @@
 // 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 { inject, injectable, named } from '@theia/core/shared/inversify';
+import { ILogger } from '@theia/core';
 import { FrontendApplicationContribution } from '@theia/core/lib/browser';
 import { SkillService } from './skill-service';
 import { PromptService } from '../common/prompt-service';
@@ -28,18 +29,19 @@ export class SkillPromptCoordinator implements FrontendApplicationContribution {
     @inject(PromptService)
     protected readonly promptService: PromptService;
 
-    protected registeredSkillCommands = new Set<string>();
-
-    async onStart(): Promise<void> {
-        // Wait for skills to be loaded before registering commands
-        await this.skillService.ready;
+    @inject(ILogger) @named('ai-core:SkillPromptCoordinator')
+    protected readonly logger: ILogger;
 
-        // Register initial skills
-        this.updateSkillCommands();
+    protected registeredSkillCommands = new Set<string>();
 
-        // Listen for skill changes
-        this.skillService.onSkillsChanged(() => {
+    onStart(): void {
+        this.skillService.ready.then(() => {
+            this.skillService.onSkillsChanged(() => {
+                this.updateSkillCommands();
+            });
             this.updateSkillCommands();
+        }).catch(error => {
+            this.logger.error('Failed to update skill commands', error);
         });
     }
 

package/src/browser/skill-service.ts

@@ -58,8 +58,7 @@ export class DefaultSkillService implements SkillService {
     @inject(FileService)
     protected readonly fileService: FileService;
 
-    @inject(ILogger)
-    @named('SkillService')
+    @inject(ILogger) @named('ai-core:DefaultSkillService')
     protected readonly logger: ILogger;
 
     @inject(EnvVariablesServer)

package/src/browser/skills-variable-contribution.ts

@@ -14,7 +14,7 @@
 // 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 { inject, injectable, named } from '@theia/core/shared/inversify';
 import { ILogger, MaybePromise, nls, URI } from '@theia/core';
 import {
     AIVariable, AIVariableContext, AIVariableContribution, AIVariableResolutionRequest,
@@ -54,7 +54,7 @@ export class SkillsVariableContribution implements AIVariableContribution, AIVar
     @inject(SkillService)
     protected readonly skillService: SkillService;
 
-    @inject(ILogger)
+    @inject(ILogger) @named('ai-core:SkillsVariableContribution')
     protected readonly logger: ILogger;
 
     @inject(FileService)

package/src/browser/theia-variable-contribution.ts

@@ -51,40 +51,40 @@ export class TheiaVariableContribution implements AIVariableContribution, AIVari
         ['file', [
             {
                 name: 'currentAbsoluteFilePath',
-                description: nls.localize('theia/ai/core/variable-contribution/currentAbsoluteFilePath', 'The absolute path of the \
-                currently opened file.')
+                description: nls.localize('theia/ai/core/variable-contribution/currentAbsoluteFilePath',
+                    'The absolute path of the currently opened file.')
             }
         ]],
         ['selectedText', [
             {
-                description: nls.localize('theia/ai/core/variable-contribution/currentSelectedText', 'The plain text that is currently selected in the \
-                opened file. This excludes the information where the content is coming from.')
+                description: nls.localize('theia/ai/core/variable-contribution/currentSelectedText',
+                    'The plain text that is currently selected in the opened file. This excludes the information where the content is coming from.')
             }
         ]],
         ['currentText', [
             {
                 name: 'currentFileContent',
-                description: nls.localize('theia/ai/core/variable-contribution/currentFileContent', 'The plain content of the \
-                currently opened file. This excludes the information where the content is coming from.')
+                description: nls.localize('theia/ai/core/variable-contribution/currentFileContent',
+                    'The plain content of the currently opened file. This excludes the information where the content is coming from.')
             }
         ]],
         ['relativeFile', [
             {
                 name: 'currentRelativeFilePath',
-                description: nls.localize('theia/ai/core/variable-contribution/currentRelativeFilePath', 'The workspace-relative path of the \
-                currently opened file (e.g., my-project/src/index.ts).')
+                description: nls.localize('theia/ai/core/variable-contribution/currentRelativeFilePath',
+                    'The workspace-relative path of the currently opened file (e.g., my-project/src/index.ts).')
             },
             {
                 name: '_f',
-                description: nls.localize('theia/ai/core/variable-contribution/dotRelativePath', 'Short reference to the workspace-relative path of the \
-                currently opened file (\'currentRelativeFilePath\').')
+                description: nls.localize('theia/ai/core/variable-contribution/dotRelativePath',
+                    'Short reference to the workspace-relative path of the currently opened file (\'currentRelativeFilePath\').')
             }
         ]],
         ['relativeFileDirname', [
             {
                 name: 'currentRelativeDirPath',
-                description: nls.localize('theia/ai/core/variable-contribution/currentRelativeDirPath', 'The workspace-relative path of the directory \
-                containing the currently opened file (e.g., my-project/src).')
+                description: nls.localize('theia/ai/core/variable-contribution/currentRelativeDirPath',
+                    'The workspace-relative path of the directory containing the currently opened file (e.g., my-project/src).')
             }
         ]],
         ['lineNumber', [{}]],

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

@@ -28,6 +28,25 @@ import { ReasoningSettings, SERVER_SIDE_COMPACTION_TOKEN_THRESHOLD_MINIMUM } fro
 import { PreferenceSchema } from '@theia/core/lib/common/preferences/preference-schema';
 
 export const AI_CORE_PREFERENCES_TITLE = nls.localize('theia/ai-core/preferences/title', 'AI Features');
+
+/**
+ * Key under a preference's schema `typeDetails` where a language-model provider declares the
+ * human-readable name of its provider block. The AI Configuration view's Models page reads this to
+ * label the provider node (discovered from the `ai-features.<provider>.*` preferences) without
+ * having to hard-code provider names. Declare it on any one preference of the provider's block, e.g.
+ * `typeDetails: { [MODEL_PROVIDER_TYPE_DETAIL]: 'Anthropic' }`.
+ */
+export const MODEL_PROVIDER_TYPE_DETAIL = 'aiModelProvider';
+
+/**
+ * Shape a language-model provider stores under a preference's `typeDetails[MODEL_PROVIDER_TYPE_DETAIL]`
+ * to describe its `ai-features.<provider>.*` block to the AI Configuration view's Models page. Declared
+ * on any one preference of the block, e.g. `typeDetails: { [MODEL_PROVIDER_TYPE_DETAIL]: { label: 'Anthropic' } }`.
+ */
+export interface ModelProviderTypeDetail {
+    /** Human-readable provider name shown as the provider node/card label. */
+    label: string;
+}
 export const PREFERENCE_NAME_PROMPT_TEMPLATES = 'ai-features.promptTemplates.promptTemplatesFolder';
 export const PREFERENCE_NAME_REQUEST_SETTINGS = 'ai-features.modelSettings.requestSettings';
 export const PREFERENCE_NAME_REASONING = 'ai-features.reasoning.defaults';

package/src/common/ai-variable-resource.ts

@@ -15,8 +15,8 @@
 // *****************************************************************************
 
 import * as deepEqual from 'fast-deep-equal';
-import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
-import { Resource, URI, generateUuid } from '@theia/core';
+import { inject, injectable, postConstruct, named } from '@theia/core/shared/inversify';
+import { Resource, URI, generateUuid, ILogger } from '@theia/core';
 import { AIVariableContext, AIVariableResolutionRequest } from './variable-service';
 import stableJsonStringify = require('fast-json-stable-stringify');
 import { ConfigurableInMemoryResources, ConfigurableMutableReferenceResource } from './configurable-in-memory-resources';
@@ -28,6 +28,9 @@ export const NO_CONTEXT_AUTHORITY = 'context-free';
 export class AIVariableResourceResolver {
     @inject(ConfigurableInMemoryResources) protected readonly inMemoryResources: ConfigurableInMemoryResources;
 
+    @inject(ILogger) @named('ai-core:AIVariableResourceResolver')
+    protected readonly logger: ILogger;
+
     @postConstruct()
     protected init(): void {
         this.inMemoryResources.onWillDispose(resource => this.cache.delete(resource.uri.toString()));
@@ -68,7 +71,7 @@ export class AIVariableResourceResolver {
             }
         } catch (err) {
             // Mostly that deep equal could overflow the stack, but it should run into === or inequality before that.
-            console.warn('Problem evaluating context in AIVariableResourceResolver', err);
+            this.logger.warn('Problem evaluating context in AIVariableResourceResolver', err);
         }
         return generateUuid();
     }

package/src/common/capability-variable-contribution.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 import { ILogger, nls } from '@theia/core';
-import { injectable, inject } from '@theia/core/shared/inversify';
+import { injectable, inject, named } from '@theia/core/shared/inversify';
 import * as monaco from '@theia/monaco-editor-core';
 import {
     AIVariable,
@@ -49,8 +49,8 @@ export class CapabilityVariableContribution implements AIVariableContribution, A
     @inject(PromptService)
     protected readonly promptService: PromptService;
 
-    @inject(ILogger)
-    protected logger: ILogger;
+    @inject(ILogger) @named('ai-core:CapabilityVariableContribution')
+    protected readonly logger: ILogger;
 
     registerVariables(service: AIVariableService): void {
         service.registerResolver(CAPABILITY_VARIABLE, this);

package/src/common/language-model.ts

@@ -703,8 +703,10 @@ export interface FrontendLanguageModelRegistry extends LanguageModelRegistry {
 
 @injectable()
 export class DefaultLanguageModelRegistryImpl implements LanguageModelRegistry {
-    @inject(ILogger)
-    protected logger: ILogger;
+
+    @inject(ILogger) @named('ai-core:DefaultLanguageModelRegistryImpl')
+    protected readonly logger: ILogger;
+
     @inject(ContributionProvider) @named(LanguageModelProvider)
     protected readonly languageModelContributions: ContributionProvider<LanguageModelProvider>;
 
@@ -735,7 +737,7 @@ export class DefaultLanguageModelRegistryImpl implements LanguageModelRegistry {
     addLanguageModels(models: LanguageModel[]): void {
         models.forEach(model => {
             if (this.languageModels.find(lm => lm.id === model.id)) {
-                console.warn(`Tried to add already existing language model with id ${model.id}. The new model will be ignored.`);
+                this.logger.warn(`Tried to add already existing language model with id ${model.id}. The new model will be ignored.`);
                 return;
             }
             this.languageModels.push(model);
@@ -762,7 +764,7 @@ export class DefaultLanguageModelRegistryImpl implements LanguageModelRegistry {
                 this.languageModels.splice(index, 1);
                 this.changeEmitter.fire({ models: this.languageModels });
             } else {
-                console.warn(`Language model with id ${id} was requested to be removed, however it does not exist`);
+                this.logger.warn(`Language model with id ${id} was requested to be removed, however it does not exist`);
             }
         });
     }

package/src/common/prompt-service.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { Event, Emitter, URI, ILogger, DisposableCollection } from '@theia/core';
-import { inject, injectable, optional, postConstruct } from '@theia/core/shared/inversify';
+import { inject, injectable, optional, postConstruct, named } from '@theia/core/shared/inversify';
 import { AIVariableArg, AIVariableContext, AIVariableService, createAIResolveVariableCache, ResolvedAIVariable } from './variable-service';
 import { ToolInvocationRegistry } from './tool-invocation-registry';
 import { toolRequestToPromptText } from './language-model-util';
@@ -607,7 +607,7 @@ export interface PromptService {
 
 @injectable()
 export class PromptServiceImpl implements PromptService {
-    @inject(ILogger)
+    @inject(ILogger) @named('ai-core:PromptServiceImpl')
     protected readonly logger: ILogger;
 
     @inject(AISettingsService) @optional()

package/src/common/today-variable-contribution.ts

@@ -24,7 +24,8 @@ export namespace TodayVariableArgs {
 
 export const TODAY_VARIABLE: AIVariable = {
     id: 'today-provider',
-    description: nls.localize('theia/ai/core/todayVariable/description', 'Does something for today'),
+    description: nls.localize('theia/ai/core/todayVariable/dateDescription',
+        'The current date. Resolves to a human-readable date string by default, or to ISO 8601 or Unix seconds via the format argument.'),
     name: 'today',
     args: [
         {

package/src/common/tool-invocation-registry.ts

@@ -16,7 +16,7 @@
 
 import { inject, injectable, named, postConstruct, interfaces } from '@theia/core/shared/inversify';
 import { ToolRequest } from './language-model';
-import { ContributionProvider, Emitter, Event } from '@theia/core';
+import { ContributionProvider, Emitter, Event, ILogger } from '@theia/core';
 
 export const ToolInvocationRegistry = Symbol('ToolInvocationRegistry');
 
@@ -99,6 +99,9 @@ export class ToolInvocationRegistryImpl implements ToolInvocationRegistry {
     @named(ToolProvider)
     private providers: ContributionProvider<ToolProvider>;
 
+    @inject(ILogger) @named('ai-core:ToolInvocationRegistryImpl')
+    protected readonly logger: ILogger;
+
     @postConstruct()
     init(): void {
         this.providers.getContributions().forEach(provider => {
@@ -135,7 +138,7 @@ export class ToolInvocationRegistryImpl implements ToolInvocationRegistry {
 
     registerTool(tool: ToolRequest): void {
         if (this.tools.has(tool.id)) {
-            console.warn(`Function with id ${tool.id} is already registered.`);
+            this.logger.warn(`Function with id ${tool.id} is already registered.`);
         } else {
             this.tools.set(tool.id, tool);
             this.onDidChangeEmitter.fire();

package/src/node/language-model-frontend-delegate.ts

@@ -14,7 +14,7 @@
 // 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 { inject, injectable, named } from '@theia/core/shared/inversify';
 import { CancellationToken, CancellationTokenSource, ILogger, generateUuid } from '@theia/core';
 import {
     LanguageModelMetaData,
@@ -53,8 +53,8 @@ export class LanguageModelFrontendDelegateImpl implements LanguageModelFrontendD
     @inject(LanguageModelRegistry)
     private registry: LanguageModelRegistry;
 
-    @inject(ILogger)
-    private logger: ILogger;
+    @inject(ILogger) @named('ai-core:LanguageModelFrontendDelegateImpl')
+    protected readonly logger: ILogger;
 
     private frontendDelegateClient: LanguageModelDelegateClient;
     private requestCancellationTokenMap: Map<string, CancellationTokenSource> = new Map();