@theia/ai-core 1.77.0-next.7 → 1.77.0-next.71

package/src/browser/file-variable-contribution.spec.ts

@@ -0,0 +1,107 @@
+// *****************************************************************************
+// Copyright (C) 2026 STMicroelectronics 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 { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
+let disableJSDOM = enableJSDOM();
+import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
+FrontendApplicationConfigProvider.set({});
+
+import { expect } from 'chai';
+import { URI } from '@theia/core';
+import { OpenerService } from '@theia/core/lib/browser';
+import { Container, injectable } from '@theia/core/shared/inversify';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
+import { withWorkspaceServiceDefaults } from '@theia/workspace/lib/browser/test/with-workspace-service-defaults';
+import { FileVariableContribution } from './file-variable-contribution';
+import { WorkspaceRelativePathResolver } from './workspace-relative-path-resolver';
+
+disableJSDOM();
+
+@injectable()
+class TestFileVariableContribution extends FileVariableContribution {
+    resolvePath(path: string): Promise<URI | undefined> {
+        return this.makeAbsolute(path);
+    }
+}
+
+describe('FileVariableContribution path resolution', () => {
+
+    const ROOTS = ['file:///alice/app', 'file:///bob/app', 'file:///ws/theia'];
+    const FILES = ['file:///alice/app/src/a.ts', 'file:///bob/app/src/a.ts', 'file:///bob/app/src/only-bob.ts', 'file:///ws/theia/README.md'];
+
+    let roots: string[];
+    let workspaceService: WorkspaceService;
+    let contribution: TestFileVariableContribution;
+
+    before(() => {
+        disableJSDOM = enableJSDOM();
+    });
+    after(() => {
+        disableJSDOM();
+    });
+
+    beforeEach(() => {
+        roots = ROOTS;
+        const container = new Container();
+        const fileService = { exists: async (uri: URI) => FILES.includes(uri.toString()) } as unknown as FileService;
+        workspaceService = withWorkspaceServiceDefaults({
+            tryGetRoots: () => roots.map(root => ({ resource: new URI(root), isDirectory: true }))
+        });
+        container.bind(WorkspaceService).toConstantValue(workspaceService);
+        container.bind(FileService).toConstantValue(fileService);
+        container.bind(OpenerService).toConstantValue({} as OpenerService);
+        container.bind(WorkspaceRelativePathResolver).toSelf();
+        container.bind(TestFileVariableContribution).toSelf();
+        contribution = container.get(TestFileVariableContribution);
+    });
+
+    const resolve = async (path: string): Promise<string | undefined> => (await contribution.resolvePath(path))?.toString();
+
+    it('resolves the root-prefixed path of a file in every root', async () => {
+        for (const file of FILES) {
+            expect(await resolve(workspaceService.getRootPrefixedPath(new URI(file)))).to.equal(file);
+        }
+    });
+
+    it('resolves a path prefixed with a basename shared by several roots, as saved by earlier versions', async () => {
+        expect(await resolve('app/src/only-bob.ts')).to.equal('file:///bob/app/src/only-bob.ts');
+    });
+
+    it('does not resolve a path prefixed with a basename shared by several roots that contain the file', async () => {
+        expect(await resolve('app/src/a.ts')).to.be.undefined;
+    });
+
+    it('resolves a path prefixed with a root name that the roots no longer assign', async () => {
+        // Saved as `alice/app/...` while `/bob/app` was open, too; now the root is just named `app`.
+        roots = ['file:///alice/app', 'file:///ws/theia'];
+        expect(await resolve('alice/app/src/a.ts')).to.equal('file:///alice/app/src/a.ts');
+    });
+
+    it('resolves a path without a root name, as saved by earlier versions', async () => {
+        expect(await resolve('README.md')).to.equal('file:///ws/theia/README.md');
+    });
+
+    it('does not resolve a relative path that leaves its root', async () => {
+        FILES.push('file:///alice/secret.txt');
+        try {
+            expect(await resolve('../secret.txt')).to.be.undefined;
+            expect(await resolve('app/../../secret.txt')).to.be.undefined;
+        } finally {
+            FILES.pop();
+        }
+    });
+});

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

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { nls, Path, URI } from '@theia/core';
+import { nls, URI } from '@theia/core';
 import { OpenerService, codiconArray, open } from '@theia/core/lib/browser';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
@@ -29,6 +29,7 @@ import {
     ResolvedAIContextVariable,
 } from '../common/variable-service';
 import { FrontendVariableService } from './frontend-variable-service';
+import { WorkspaceRelativePathResolver } from './workspace-relative-path-resolver';
 
 export namespace FileVariableArgs {
     export const uri = 'uri';
@@ -55,6 +56,9 @@ export class FileVariableContribution implements AIVariableContribution, AIVaria
     @inject(OpenerService)
     protected readonly openerService: OpenerService;
 
+    @inject(WorkspaceRelativePathResolver)
+    protected readonly pathResolver: WorkspaceRelativePathResolver;
+
     registerVariables(service: FrontendVariableService): void {
         service.registerResolver(FILE_VARIABLE, this);
         service.registerOpener(FILE_VARIABLE, this);
@@ -104,32 +108,9 @@ export class FileVariableContribution implements AIVariableContribution, AIVaria
     }
 
     protected async makeAbsolute(pathStr: string): Promise<URI | undefined> {
-        const normalizedPath = Path.normalizePathSeparator(pathStr);
-        const path = new Path(normalizedPath);
-
-        if (!path.isAbsolute) {
-            const workspaceRoots = this.wsService.tryGetRoots();
-
-            const segments = normalizedPath.split('/');
-            if (segments.length > 0) {
-                const potentialRootName = segments[0];
-                for (const root of workspaceRoots) {
-                    if (root.resource.path.base === potentialRootName) {
-                        const restOfPath = segments.slice(1).join('/');
-                        const uri = restOfPath ? root.resource.resolve(restOfPath) : root.resource;
-                        if (await this.fileService.exists(uri)) {
-                            return uri;
-                        }
-                    }
-                }
-            }
-
-            const wsUris = workspaceRoots.map(root => root.resource.resolve(path));
-            for (const uri of wsUris) {
-                if (await this.fileService.exists(uri)) {
-                    return uri;
-                }
-            }
+        const workspaceUri = await this.pathResolver.resolveExistingRelativePath(pathStr);
+        if (workspaceUri) {
+            return workspaceUri;
         }
 
         const argUri = new URI(pathStr);

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

@@ -18,7 +18,7 @@ import { nls } from '@theia/core/lib/common/nls';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { Prioritizeable } from '@theia/core/lib/common/prioritizeable';
 import { WorkspaceTrustService } from '@theia/workspace/lib/browser/workspace-trust-service';
-import { AiConfigurationService, LanguageModel, LanguageModelResponse, ReasoningSettings, ReasoningSupport, UserRequest } from '../common';
+import { AiConfigurationService, LanguageModel, LanguageModelResponse, ReasoningSettings, UserRequest } from '../common';
 import { LanguageModelServiceImpl } from '../common/language-model-service';
 import {
     PREFERENCE_NAME_REQUEST_SETTINGS,
@@ -76,15 +76,6 @@ export class FrontendLanguageModelServiceImpl extends LanguageModelServiceImpl {
                 languageModelRequest.reasoning = { level: languageModel.reasoningSupport.defaultLevel };
             }
         }
-        // A persisted selection or preference entry can name a level the current model does not accept,
-        // which the provider would otherwise send as-is; clamp it to the model's declared levels.
-        if (languageModelRequest.reasoning && languageModel.reasoningSupport) {
-            const level = ReasoningSupport.clampLevel(languageModel.reasoningSupport, languageModelRequest.reasoning.level);
-            if (level !== languageModelRequest.reasoning.level) {
-                languageModelRequest.reasoning = { ...languageModelRequest.reasoning, level };
-            }
-        }
-
         return super.sendRequest(languageModel, languageModelRequest);
     }
 }

package/src/browser/frontend-prompt-customization-service.spec.ts

@@ -266,6 +266,10 @@ Template`;
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 return (this as any).provenanceLabel(sourceUri);
             }
+
+            public useSourceMaps(active: Map<string, FragmentEntry>, all: Map<string, FragmentEntry>): void {
+                Object.assign(this, { activeCustomizations: active, allCustomizations: all });
+            }
         }
 
         let service: TestableCustomizationService;
@@ -362,6 +366,26 @@ Template`;
             expect(idxB).to.be.lessThan(idxC);
         });
 
+        it('reports every source and marks all equal-priority merged sources active', () => {
+            service.testAddTemplate(activeMap, 'project-info', 'Shared instructions',
+                'file:///config/project-info.prompttemplate', allMap, 1, CustomizationSource.CUSTOMIZED);
+            service.testAddTemplate(activeMap, 'project-info', 'Root A instructions',
+                'file:///rootA/.prompts/project-info.prompttemplate', allMap, 2, CustomizationSource.FOLDER);
+            service.testAddTemplate(activeMap, 'project-info', 'Root B instructions',
+                'file:///rootB/.prompts/project-info.prompttemplate', allMap, 2, CustomizationSource.FOLDER);
+            service.testAddTemplate(activeMap, 'other-fragment', 'Unrelated',
+                'file:///config/other.prompttemplate', allMap, 1, CustomizationSource.CUSTOMIZED);
+            service.useSourceMaps(activeMap, allMap);
+
+            expect(service.getPromptFragmentCustomizationSources('project-info').map(source => ({
+                path: source.uri.path.toString(), template: source.template, active: source.active
+            }))).to.deep.equal([
+                { path: '/config/project-info.prompttemplate', template: 'Shared instructions', active: false },
+                { path: '/rootA/.prompts/project-info.prompttemplate', template: 'Root A instructions', active: true },
+                { path: '/rootB/.prompts/project-info.prompttemplate', template: 'Root B instructions', active: true }
+            ]);
+        });
+
         it('provenanceLabel extracts grandparent directory name from URI', () => {
             // For "file:///home/user/my-project/.prompts/foo.prompttemplate"
             // parent is ".prompts", grandparent is "my-project"

package/src/browser/frontend-prompt-customization-service.ts

@@ -18,7 +18,8 @@ import { DisposableCollection, URI, Event, Emitter, nls, ILogger } from '@theia/
 import { OpenerService } from '@theia/core/lib/browser';
 import { inject, injectable, postConstruct, named } from '@theia/core/shared/inversify';
 import {
-    PromptFragmentCustomizationService, CustomAgentDescription, CustomAgentPromptVariant, CustomizedPromptFragment, CommandPromptFragmentMetadata, CustomAgentsLocation
+    PromptFragmentCustomizationService, CustomAgentDescription, CustomAgentPromptVariant, CustomizedPromptFragment, CommandPromptFragmentMetadata, CustomAgentsLocation,
+    PromptFragmentCustomizationSource
 } from '../common';
 import { ConfigurableInMemoryResources } from '../common/configurable-in-memory-resources';
 import { parseFrontmatter, serializeFrontmatter } from '../common/frontmatter';
@@ -1166,6 +1167,17 @@ export class DefaultPromptFragmentCustomizationService implements PromptFragment
         return this.activeCustomizations.has(id);
     }
 
+    getPromptFragmentCustomizationSources(id: string): PromptFragmentCustomizationSource[] {
+        const activeSources = this.activeCustomizations.get(id)?.sourceUris ?? [];
+        return Array.from(this.allCustomizations.values())
+            .filter(entry => entry.id === id)
+            .map(entry => ({
+                uri: new URI(entry.sourceUri),
+                template: entry.template,
+                active: activeSources.includes(entry.sourceUri)
+            }));
+    }
+
     getActivePromptFragmentCustomization(id: string): CustomizedPromptFragment | undefined {
         const entry = this.activeCustomizations.get(id);
         if (!entry) {

package/src/browser/index.ts

@@ -37,6 +37,11 @@ export * from './theia-variable-contribution';
 export * from './open-editors-variable-contribution';
 export * from './skills-variable-contribution';
 export * from './skill-service';
+export * from './agents-md-service';
+export * from './agents-md-variable-contribution';
+export * from './agents-md-prompt-fragment-contribution';
+export * from './agents-md-migration-service';
+export * from './agents-md-frontend-application-contribution';
 export * from './skill-prompt-coordinator';
 export * from './agent-plugin-ui-bridge';
 export * from './skill-registry-ui-bridge';
@@ -46,3 +51,4 @@ export * from '../common/language-model-service';
 export * from './generic-capabilities-variable-contribution';
 export * from './generic-capabilities-prompt-fragment-contribution';
 export * from './prompt-variable-contribution';
+export * from './workspace-relative-path-resolver';

package/src/browser/reasoning-labels.spec.ts

@@ -0,0 +1,28 @@
+// *****************************************************************************
+// Copyright (C) 2026 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 { expect } from 'chai';
+import { reasoningLevelDescription, reasoningLevelLabel } from './reasoning-labels';
+
+describe('Reasoning selector wording', () => {
+    it('labels max and distinguishes provider-specific off behavior from explicit no reasoning', () => {
+        expect(reasoningLevelLabel('max')).to.equal('Max');
+        expect(reasoningLevelDescription('off')).to.equal(
+            'Omits explicit reasoning effort, allowing provider defaults or raw request settings to apply; on Ollama, disables thinking.');
+        expect(reasoningLevelDescription('none')).to.equal('Explicitly requests no reasoning.');
+        expect(reasoningLevelDescription('high')).to.equal(undefined);
+    });
+});

package/src/browser/reasoning-labels.ts

@@ -0,0 +1,41 @@
+// *****************************************************************************
+// Copyright (C) 2026 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 { nls } from '@theia/core/lib/common/nls';
+import { ReasoningLevel } from '../common/language-model';
+
+export function reasoningLevelLabel(level: ReasoningLevel): string {
+    switch (level) {
+        case 'off': return nls.localizeByDefault('Off');
+        case 'none': return nls.localizeByDefault('None');
+        case 'minimal': return nls.localizeByDefault('Minimal');
+        case 'low': return nls.localizeByDefault('Low');
+        case 'medium': return nls.localizeByDefault('Medium');
+        case 'high': return nls.localizeByDefault('High');
+        case 'xhigh': return nls.localizeByDefault('Extra High');
+        case 'max': return nls.localizeByDefault('Max');
+        case 'auto': return nls.localizeByDefault('Auto');
+    }
+}
+
+export function reasoningLevelDescription(level: ReasoningLevel): string | undefined {
+    switch (level) {
+        case 'off': return nls.localize('theia/ai/core/reasoning/offDescription',
+            'Omits explicit reasoning effort, allowing provider defaults or raw request settings to apply; on Ollama, disables thinking.');
+        case 'none': return nls.localize('theia/ai/core/reasoning/noneDescription', 'Explicitly requests no reasoning.');
+        default: return undefined;
+    }
+}

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

@@ -72,19 +72,19 @@ export class TheiaVariableContribution implements AIVariableContribution, AIVari
             {
                 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).')
+                    'The path of the currently opened file relative to its workspace root, without the root name (e.g., 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\').')
+                    'Short reference to the path of the currently opened file relative to its workspace root, without the root name (\'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).')
+                    'The path of the directory containing the currently opened file relative to its workspace root, without the root name (e.g., src).')
             }
         ]],
         ['lineNumber', [{}]],

package/src/browser/workspace-relative-path-resolver.ts

@@ -0,0 +1,71 @@
+// *****************************************************************************
+// Copyright (C) 2026 STMicroelectronics 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 { Path, URI } from '@theia/core';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
+
+/**
+ * Resolves the relative paths of files in the workspace that AI features, e.g. chat variables, refer to.
+ */
+@injectable()
+export class WorkspaceRelativePathResolver {
+
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
+
+    @inject(FileService)
+    protected readonly fileService: FileService;
+
+    /**
+     * Resolves a relative path to an existing file or folder in the workspace. Besides the format of
+     * {@link WorkspaceService.getRootPrefixedPath}, it accepts the formats of paths saved by earlier versions,
+     * e.g. in chat sessions, or before the workspace roots changed: in the format of
+     * {@link WorkspaceService.resolveSupraRelativePath}, if only one of the roots contains the file, or relative to any root.
+     *
+     * @returns `undefined` if the path is absolute, leaves its root or does not resolve to an existing file or folder.
+     */
+    async resolveExistingRelativePath(relativePath: string): Promise<URI | undefined> {
+        const normalizedPath = Path.normalizePathSeparator(relativePath);
+        const path = new Path(normalizedPath).normalize();
+        const segments = path.toString().split('/').filter(segment => segment.length > 0);
+        if (path.isAbsolute || Path.isDrive(segments[0] ?? '') || segments.includes('..')) {
+            return undefined;
+        }
+        const rootPrefixed = this.workspaceService.resolveRootPrefixedPath(normalizedPath);
+        if (rootPrefixed && await this.fileService.exists(rootPrefixed)) {
+            return rootPrefixed;
+        }
+        const supraRelative: URI[] = [];
+        for (const uri of this.workspaceService.resolveSupraRelativePath(normalizedPath)) {
+            if (await this.fileService.exists(uri)) {
+                supraRelative.push(uri);
+            }
+        }
+        if (supraRelative.length === 1) {
+            return supraRelative[0];
+        }
+        const roots = this.workspaceService.tryGetRoots();
+        for (const root of roots) {
+            const uri = root.resource.resolve(segments.join('/'));
+            if (await this.fileService.exists(uri)) {
+                return uri;
+            }
+        }
+        return undefined;
+    }
+}

package/src/common/agents-md.ts

@@ -0,0 +1,37 @@
+// *****************************************************************************
+// Copyright (C) 2026 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
+// *****************************************************************************
+
+/**
+ * File name of the [AGENTS.md standard](https://agents.md/), the source of project-specific context
+ * for AI agents. Only this exact name is recognized: `AGENT.md`, `CLAUDE.md` and the various
+ * vendor-specific instruction files are deliberately not treated as fallbacks.
+ */
+export const AGENTS_MD_FILE_NAME = 'AGENTS.md';
+
+/**
+ * Advertises the workspace's `AGENTS.md` files by path so that a tool-calling agent can read them on
+ * demand. Reference it from a system prompt with `{{prompt:agents-md}}`.
+ */
+export const AGENTS_MD_PROMPT_FRAGMENT_ID = 'agents-md';
+
+/**
+ * Inlines the full `AGENTS.md` content.
+ *
+ * @deprecated Kept so that prompts still referencing `{{prompt:project-info}}` keep working, and for
+ * consumers without a tool-calling loop, which cannot fetch anything on demand. Prefer
+ * {@link AGENTS_MD_PROMPT_FRAGMENT_ID}, which lets the model load the content only when relevant.
+ */
+export const PROJECT_INFO_PROMPT_FRAGMENT_ID = 'project-info';

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

@@ -240,11 +240,14 @@ export const aiCorePreferenceSchema: PreferenceSchema = {
                 + ' `#ai-features.modelSettings.requestSettings#` for the same fields.\n\n'
                 + 'Each entry consists of:\n'
                 + '- `scope`: Defines when the setting applies (`modelId`, `providerId`, `agentId`).\n'
-                + '- `reasoning.level`: One of `off`, `minimal`, `low`, `medium`, `high`, `auto`.\n\n'
+                + '- `reasoning.level`: One of `off`, `none`, `minimal`, `low`, `medium`, `high`, `xhigh`, `max`, `auto`.\n'
+                + 'Supported levels depend on the model. `none` explicitly requests no reasoning; `off` disables thinking'
+                + ' on Ollama. For other providers, `off` omits explicit reasoning effort, allowing provider defaults'
+                + ' or raw request settings to apply. `auto` uses the provider default.\n\n'
                 + 'Precedence at runtime (highest first): session override via the selector → this preference →'
                 + ' the model\'s declared default. Whichever the selector displays is what gets sent. To override'
                 + ' a provider\'s reasoning field manually via `#ai-features.modelSettings.requestSettings#`, set'
-                + ' `reasoning.level` to `off` here so the level-based translation is disabled.\n\n'
+                + ' `reasoning.level` to `off` here so the level-based translation is disabled (except on Ollama).\n\n'
                 + 'Entries are matched based on scope specificity (agent: 100, model: 10, provider: 1 points).\n\n'
                 + 'Example:\n'
                 + '```json\n'
@@ -272,7 +275,7 @@ export const aiCorePreferenceSchema: PreferenceSchema = {
                         properties: {
                             level: {
                                 type: 'string',
-                                enum: ['off', 'minimal', 'low', 'medium', 'high', 'auto'],
+                                enum: ['off', 'none', 'minimal', 'low', 'medium', 'high', 'xhigh', 'max', 'auto'],
                                 default: 'auto'
                             }
                         },

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

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import * as deepEqual from 'fast-deep-equal';
+import deepEqual from 'fast-deep-equal';
 import { inject, injectable, postConstruct, named } from '@theia/core/shared/inversify';
 import { Resource, URI, generateUuid, ILogger } from '@theia/core';
 import { AIVariableContext, AIVariableResolutionRequest } from './variable-service';

package/src/common/index.ts

@@ -22,6 +22,7 @@ export * from './language-model-delegate';
 export * from './language-model-util';
 export * from './language-model';
 export * from './language-model-alias';
+export * from './tool-call-execution';
 export * from './model-discovery-status';
 export * from './model-discovery-util';
 export * from './prompt-service';
@@ -40,6 +41,7 @@ export * from './ai-variable-resource';
 export * from './configurable-in-memory-resources';
 export * from './notification-types';
 export * from './skill';
+export * from './agents-md';
 export * from './frontmatter';
 export * from './capability-utils';
 export * from './tool-constants';

package/src/common/language-model-service.spec.ts

@@ -16,7 +16,7 @@
 
 import { expect } from 'chai';
 import { LanguageModelServiceImpl } from './language-model-service';
-import { LanguageModel, LanguageModelMessage, UserRequest } from './language-model';
+import { LanguageModel, LanguageModelMessage, ReasoningLevel, ReasoningSupport, UserRequest } from './language-model';
 
 describe('LanguageModelServiceImpl message filtering', () => {
 
@@ -33,6 +33,28 @@ describe('LanguageModelServiceImpl message filtering', () => {
         return { model, captured: () => capturedMessages };
     }
 
+    for (const [support, requested, expected] of [
+        [{ supportedLevels: ['off', 'minimal', 'low', 'auto'] }, 'none', 'off'],
+        [{ supportedLevels: ['off', 'low', 'medium', 'high', 'auto'] }, 'max', 'high'],
+        [{ supportedLevels: ['none', 'low'] }, 'minimal', 'low'],
+        [undefined, 'max', 'max']
+    ] satisfies [ReasoningSupport | undefined, ReasoningLevel, ReasoningLevel][]) {
+        it(`clamps ${requested} to ${expected} in the common request path with support ${JSON.stringify(support)}`, async () => {
+            const service = new LanguageModelServiceImpl();
+            const reasoning = { level: requested };
+            const model: LanguageModel = {
+                id: 'test', name: 'test', vendor: 'test', version: '1', status: { status: 'ready' }, reasoningSupport: support,
+                async request(request): Promise<{ text: string }> {
+                    expect(request.reasoning?.level).to.equal(expected);
+                    return { text: '' };
+                }
+            };
+            await service.sendRequest(model, { messages: [], sessionId: 'session', requestId: 'req', reasoning });
+            expect(reasoning.level).to.equal(requested);
+            expect(service.sessions[0].exchanges[0].requests[0].request.reasoning?.level).to.equal(expected);
+        });
+    }
+
     function baseMessages(): LanguageModelMessage[] {
         return [
             { actor: 'user', type: 'text', text: 'hi' },

package/src/common/language-model-service.ts

@@ -15,7 +15,9 @@
 // *****************************************************************************
 
 import { inject } from '@theia/core/shared/inversify';
-import { isLanguageModelStreamResponse, LanguageModel, LanguageModelRegistry, LanguageModelResponse, LanguageModelStreamResponsePart, UserRequest } from './language-model';
+import {
+    isLanguageModelStreamResponse, LanguageModel, LanguageModelRegistry, LanguageModelResponse, LanguageModelStreamResponsePart, ReasoningSupport, UserRequest
+} from './language-model';
 import { LanguageModelExchangeRequest, LanguageModelSession } from './language-model-interaction-model';
 import { Emitter } from '@theia/core';
 
@@ -72,6 +74,14 @@ export class LanguageModelServiceImpl implements LanguageModelService {
         languageModel: LanguageModel,
         languageModelRequest: UserRequest
     ): Promise<LanguageModelResponse> {
+        // Clamp persisted selections and direct requests to the model's declared reasoning levels.
+        if (languageModelRequest.reasoning && languageModel.reasoningSupport) {
+            const level = ReasoningSupport.clampLevel(languageModel.reasoningSupport, languageModelRequest.reasoning.level);
+            if (level !== languageModelRequest.reasoning.level) {
+                languageModelRequest.reasoning = { ...languageModelRequest.reasoning, level };
+            }
+        }
+
         // Filter messages based on client settings
         languageModelRequest.messages = languageModelRequest.messages.filter(message => {
             if (message.type === 'thinking' && languageModelRequest.clientSettings?.keepThinking === false) {

package/src/common/language-model.spec.ts

@@ -367,8 +367,29 @@ describe('ReasoningSupport.clampLevel', () => {
         expect(ReasoningSupport.clampLevel(oSeries, 'auto')).to.equal('auto');
     });
 
+    it('passes through native none, xhigh, and max when supported', () => {
+        const support: ReasoningSupport = { supportedLevels: ['none', 'low', 'medium', 'high', 'xhigh', 'max', 'auto'] };
+        for (const level of support.supportedLevels) {
+            expect(ReasoningSupport.clampLevel(support, level)).to.equal(level);
+        }
+    });
+
+    it('clamps extended efforts to older models and max to max-only models', () => {
+        expect(ReasoningSupport.clampLevel(oSeries, 'xhigh')).to.equal('high');
+        expect(ReasoningSupport.clampLevel(oSeries, 'max')).to.equal('high');
+        expect(ReasoningSupport.clampLevel({ supportedLevels: ['low', 'medium', 'high', 'max'] }, 'xhigh')).to.equal('max');
+        expect(ReasoningSupport.clampLevel({ supportedLevels: ['low', 'medium', 'high', 'xhigh'] }, 'max')).to.equal('xhigh');
+    });
+
+    it('clamps none to the nearest supported effort', () => {
+        expect(ReasoningSupport.clampLevel({ supportedLevels: ['low', 'medium', 'high'] }, 'none')).to.equal('low');
+        expect(ReasoningSupport.clampLevel(oSeries, 'none')).to.equal('off');
+        expect(ReasoningSupport.clampLevel({ supportedLevels: ['off', 'minimal', 'low', 'auto'] }, 'none')).to.equal('off');
+    });
+
     it('raises an unsupported minimal to low rather than lowering it to off', () => {
         expect(ReasoningSupport.clampLevel(oSeries, 'minimal')).to.equal('low');
+        expect(ReasoningSupport.clampLevel({ supportedLevels: ['none', 'low'] }, 'minimal')).to.equal('low');
     });
 
     it('lowers an unsupported level when nothing higher is supported', () => {