@theia/ai-core 1.60.0-next.47 → 1.60.1

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

@@ -19,6 +19,14 @@ import { inject, injectable } from '@theia/core/shared/inversify';
 import { VariableRegistry, VariableResolverService } from '@theia/variable-resolver/lib/browser';
 import { AIVariableContribution, AIVariableResolver, AIVariableService, AIVariableResolutionRequest, AIVariableContext, ResolvedAIVariable } from '../common';
 
+/**
+ * Mapping configuration for a Theia variable to one or more AI variables
+ */
+interface VariableMapping {
+    name?: string;
+    description?: string;
+}
+
 /**
  * Integrates the Theia VariableRegistry with the Theia AI VariableService
  */
@@ -36,33 +44,52 @@ export class TheiaVariableContribution implements AIVariableContribution, AIVari
     @inject(FrontendApplicationStateService)
     protected readonly stateService: FrontendApplicationStateService;
 
-    // Map original variable name to new name and description. If a mapped value is not present then the original will be kept.
+    // Map original variable name to one or more mappings with new name and description.
     // Only variables present in this map are registered.
-    protected variableRenameMap: Map<string, { name?: string, description?: string }> = new Map([
-        ['file', {
-            name: 'currentAbsoluteFilePath', description: nls.localize('theia/ai/core/variable-contribution/currentAbsoluteFilePath', 'The absolute path of the \
-            currently opened file. Please note that most agents will expect a relative file path (relative to the current workspace).')
-        }],
-        ['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. Please note that most agents will work better with a relative file path \
-            (relative to the current workspace).')
-        }],
-        ['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. Please note that most agents will work better with a relative file path \
-            (relative to the current workspace).')
-        }],
-        ['relativeFile', {
-            name: 'currentRelativeFilePath', description: nls.localize('theia/ai/core/variable-contribution/currentRelativeFilePath', 'The relative path of the \
-            currently opened file.')
-        }],
-        ['relativeFileDirname', {
-            name: 'currentRelativeDirPath', description: nls.localize('theia/ai/core/variable-contribution/currentRelativeDirPath', 'The relative path of the directory \
-            containing the currently opened file.')
-        }],
-        ['lineNumber', {}],
-        ['workspaceFolder', {}]
+    protected variableRenameMap: Map<string, VariableMapping[]> = new Map([
+        ['file', [
+            {
+                name: 'currentAbsoluteFilePath',
+                description: nls.localize('theia/ai/core/variable-contribution/currentAbsoluteFilePath', 'The absolute path of the \
+                currently opened file. Please note that most agents will expect a relative file path (relative to the current workspace).')
+            }
+        ]],
+        ['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. Please note that most agents will work better with a relative file path \
+                (relative to the current workspace).')
+            }
+        ]],
+        ['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. Please note that most agents will work better with a relative file path \
+                (relative to the current workspace).')
+            }
+        ]],
+        ['relativeFile', [
+            {
+                name: 'currentRelativeFilePath',
+                description: nls.localize('theia/ai/core/variable-contribution/currentRelativeFilePath', 'The relative path of the \
+                currently opened file.')
+            },
+            {
+                name: '_f',
+                description: nls.localize('theia/ai/core/variable-contribution/dotRelativePath', 'Short reference to the relative path of the \
+                currently opened file (\'currentRelativeFilePath\').')
+            }
+        ]],
+        ['relativeFileDirname', [
+            {
+                name: 'currentRelativeDirPath',
+                description: nls.localize('theia/ai/core/variable-contribution/currentRelativeDirPath', 'The relative path of the directory \
+                containing the currently opened file.')
+            }
+        ]],
+        ['lineNumber', [{}]],
+        ['workspaceFolder', [{}]]
     ]);
 
     registerVariables(service: AIVariableService): void {
@@ -73,25 +100,39 @@ export class TheiaVariableContribution implements AIVariableContribution, AIVari
                 if (!this.variableRenameMap.has(variable.name)) {
                     return; // Do not register variables not part of the map
                 }
-                const mapping = this.variableRenameMap.get(variable.name)!;
-                const newName = (mapping.name && mapping.name.trim() !== '') ? mapping.name : variable.name;
-                const newDescription = (mapping.description && mapping.description.trim() !== '') ? mapping.description
-                    : (variable.description && variable.description.trim() !== '' ? variable.description
-                        : nls.localize('theia/ai/core/variable-contribution/builtInVariable', 'Theia Built-in Variable'));
-
-                service.registerResolver({
-                    id: `${TheiaVariableContribution.THEIA_PREFIX}${variable.name}`,
-                    name: newName,
-                    description: newDescription
-                }, this);
+
+                const mappings = this.variableRenameMap.get(variable.name)!;
+
+                // Register each mapping for this variable
+                mappings.forEach((mapping, index) => {
+                    const newName = (mapping.name && mapping.name.trim() !== '') ? mapping.name : variable.name;
+                    const newDescription = (mapping.description && mapping.description.trim() !== '') ? mapping.description
+                        : (variable.description && variable.description.trim() !== '' ? variable.description
+                            : nls.localize('theia/ai/core/variable-contribution/builtInVariable', 'Theia Built-in Variable'));
+
+                    // For multiple mappings of the same variable, add a suffix to the ID to make it unique
+                    const idSuffix = mappings.length > 1 ? `-${index}` : '';
+                    const id = `${TheiaVariableContribution.THEIA_PREFIX}${variable.name}${idSuffix}`;
+
+                    service.registerResolver({
+                        id,
+                        name: newName,
+                        description: newDescription
+                    }, this);
+                });
             });
         });
     }
 
     protected toTheiaVariable(request: AIVariableResolutionRequest): string {
-        // Remove the THEIA_PREFIX if present before constructing the variable string
-        const variableId = request.variable.id.startsWith(TheiaVariableContribution.THEIA_PREFIX) ? request.variable.id.slice(TheiaVariableContribution.THEIA_PREFIX.length) :
-            request.variable.id;
+        // Extract the base variable name by removing the THEIA_PREFIX and any potential index suffix
+        let variableId = request.variable.id;
+        if (variableId.startsWith(TheiaVariableContribution.THEIA_PREFIX)) {
+            variableId = variableId.slice(TheiaVariableContribution.THEIA_PREFIX.length);
+            // Remove any potential index suffix (e.g., -0, -1)
+            variableId = variableId.replace(/-\d+$/, '');
+        }
+
         return `\${${variableId}${request.arg ? ':' + request.arg : ''}}`;
     }
 

package/src/common/communication-recording-service.ts

@@ -15,26 +15,28 @@
 // *****************************************************************************
 
 import { Event } from '@theia/core';
+import { LanguageModelMessage } from './language-model';
 
 export type CommunicationHistory = CommunicationHistoryEntry[];
 
-export interface CommunicationHistoryEntry {
+export interface CommunicationHistoryEntryBase {
     agentId: string;
     sessionId: string;
     timestamp: number;
     requestId: string;
-    request?: string;
-    response?: string;
+}
+
+export interface CommunicationHistoryEntry extends CommunicationHistoryEntryBase {
+    request?: LanguageModelMessage[];
+    response?: LanguageModelMessage[];
     responseTime?: number;
-    systemMessage?: string;
-    messages?: unknown[];
 }
 
 export type CommunicationRequestEntry = Omit<CommunicationHistoryEntry, 'response' | 'responseTime'>;
 export type CommunicationResponseEntry = Omit<CommunicationHistoryEntry, 'request'>;
 
-export type CommunicationRequestEntryParam = Omit<CommunicationRequestEntry, 'timestamp'> & Partial<Pick<CommunicationHistoryEntry, 'timestamp'>>;
-export type CommunicationResponseEntryParam = Omit<CommunicationResponseEntry, 'timestamp'> & Partial<Pick<CommunicationHistoryEntry, 'timestamp'>>;
+export type CommunicationRequestEntryParam = Omit<CommunicationRequestEntry, 'timestamp'> & Partial<Pick<CommunicationRequestEntry, 'timestamp'>>;
+export type CommunicationResponseEntryParam = Omit<CommunicationResponseEntry, 'timestamp'> & Partial<Pick<CommunicationResponseEntry, 'timestamp'>>;
 
 export const CommunicationRecordingService = Symbol('CommunicationRecordingService');
 export interface CommunicationRecordingService {

package/src/common/index.ts

@@ -28,3 +28,4 @@ export * from './protocol';
 export * from './today-variable-contribution';
 export * from './variable-service';
 export * from './settings-service';
+export * from './language-model-service';

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

@@ -0,0 +1,59 @@
+// *****************************************************************************
+// Copyright (C) 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 { inject } from '@theia/core/shared/inversify';
+import { LanguageModel, LanguageModelRegistry, LanguageModelResponse, UserRequest } from './language-model';
+import { CommunicationRecordingService } from './communication-recording-service';
+
+export const LanguageModelService = Symbol('LanguageModelService');
+export interface LanguageModelService {
+    /**
+     * Submit a language model request in the context of the given `chatRequest`.
+     */
+    sendRequest(
+        languageModel: LanguageModel,
+        languageModelRequest: UserRequest
+    ): Promise<LanguageModelResponse>;
+}
+export class LanguageModelServiceImpl implements LanguageModelService {
+
+    @inject(LanguageModelRegistry)
+    protected languageModelRegistry: LanguageModelRegistry;
+
+    @inject(CommunicationRecordingService)
+    protected recordingService: CommunicationRecordingService;
+
+    async sendRequest(
+        languageModel: LanguageModel,
+        languageModelRequest: UserRequest
+    ): Promise<LanguageModelResponse> {
+        // Filter messages based on client settings
+        languageModelRequest.messages = languageModelRequest.messages.filter(message => {
+            if (message.type === 'thinking' && languageModelRequest.clientSettings?.keepThinking === false) {
+                return false;
+            }
+            if ((message.type === 'tool_result' || message.type === 'tool_use') &&
+                languageModelRequest.clientSettings?.keepToolCalls === false) {
+                return false;
+            }
+            // Keep all other messages
+            return true;
+        });
+
+        return languageModel.request(languageModelRequest, languageModelRequest.cancellationToken);
+    }
+
+}

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

@@ -14,7 +14,14 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { isLanguageModelParsedResponse, isLanguageModelStreamResponse, isLanguageModelTextResponse, LanguageModelResponse, ToolRequest } from './language-model';
+import {
+    isLanguageModelParsedResponse,
+    isLanguageModelStreamResponse,
+    isLanguageModelTextResponse,
+    isTextResponsePart,
+    LanguageModelResponse,
+    ToolRequest
+} from './language-model';
 
 /**
  * Retrieves the text content from a `LanguageModelResponse` object.
@@ -32,7 +39,7 @@ export const getTextOfResponse = async (response: LanguageModelResponse): Promis
     } else if (isLanguageModelStreamResponse(response)) {
         let result = '';
         for await (const chunk of response.stream) {
-            result += chunk.content ?? '';
+            result += (isTextResponsePart(chunk) && chunk.content) ? chunk.content : '';
         }
         return result;
     } else if (isLanguageModelParsedResponse(response)) {

package/src/common/language-model.ts

@@ -1,5 +1,5 @@
 // *****************************************************************************
-// Copyright (C) 2024 EclipseSource GmbH.
+// 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
@@ -19,12 +19,52 @@ import { inject, injectable, named, postConstruct } from '@theia/core/shared/inv
 
 export type MessageActor = 'user' | 'ai' | 'system';
 
-export interface LanguageModelRequestMessage {
+export type LanguageModelMessage = TextMessage | ThinkingMessage | ToolUseMessage | ToolResultMessage;
+export namespace LanguageModelMessage {
+
+    export function isTextMessage(obj: LanguageModelMessage): obj is TextMessage {
+        return obj.type === 'text';
+    }
+    export function isThinkingMessage(obj: LanguageModelMessage): obj is ThinkingMessage {
+        return obj.type === 'thinking';
+    }
+    export function isToolUseMessage(obj: LanguageModelMessage): obj is ToolUseMessage {
+        return obj.type === 'tool_use';
+    }
+    export function isToolResultMessage(obj: LanguageModelMessage): obj is ToolResultMessage {
+        return obj.type === 'tool_result';
+    }
+}
+export interface TextMessage {
     actor: MessageActor;
     type: 'text';
-    query: string;
+    text: string;
+}
+export interface ThinkingMessage {
+    actor: 'ai'
+    type: 'thinking';
+    thinking: string;
+    signature: string;
+}
+
+export interface ToolResultMessage {
+    actor: 'user';
+    tool_use_id: string;
+    name: string;
+    type: 'tool_result';
+    content?: string;
+    is_error?: boolean;
+}
+
+export interface ToolUseMessage {
+    actor: 'ai';
+    type: 'tool_use';
+    id: string;
+    input: unknown;
+    name: string;
 }
-export const isLanguageModelRequestMessage = (obj: unknown): obj is LanguageModelRequestMessage =>
+
+export const isLanguageModelRequestMessage = (obj: unknown): obj is LanguageModelMessage =>
     !!(obj && typeof obj === 'object' &&
         'type' in obj &&
         typeof (obj as { type: unknown }).type === 'string' &&
@@ -48,7 +88,7 @@ export interface ToolRequestParameters {
 export interface ToolRequest {
     id: string;
     name: string;
-    parameters?: ToolRequestParameters
+    parameters: ToolRequestParameters
     description?: string;
     handler: (arg_string: string, ctx?: unknown) => Promise<unknown>;
     providerName?: string;
@@ -102,12 +142,12 @@ export namespace ToolRequest {
             (!('required' in obj) || (Array.isArray(obj.required) && obj.required.every(prop => typeof prop === 'string')));
     }
 }
-
 export interface LanguageModelRequest {
-    messages: LanguageModelRequestMessage[],
+    messages: LanguageModelMessage[],
     tools?: ToolRequest[];
     response_format?: { type: 'text' } | { type: 'json_object' } | ResponseFormatJsonSchema;
     settings?: { [key: string]: unknown };
+    clientSettings?: { keepToolCalls: boolean; keepThinking: boolean }
 }
 export interface ResponseFormatJsonSchema {
     type: 'json_schema';
@@ -119,16 +159,38 @@ export interface ResponseFormatJsonSchema {
     };
 }
 
+export interface UserRequest extends LanguageModelRequest {
+    sessionId: string;
+    requestId: string;
+    agentId: string;
+    cancellationToken?: CancellationToken;
+}
+
 export interface LanguageModelTextResponse {
     text: string;
 }
 export const isLanguageModelTextResponse = (obj: unknown): obj is LanguageModelTextResponse =>
     !!(obj && typeof obj === 'object' && 'text' in obj && typeof (obj as { text: unknown }).text === 'string');
 
-export interface LanguageModelStreamResponsePart {
-    content?: string | null;
-    tool_calls?: ToolCall[];
+export type LanguageModelStreamResponsePart = TextResponsePart | ToolCallResponsePart | ThinkingResponsePart;
+export interface TextResponsePart {
+    content: string;
+}
+export const isTextResponsePart = (part: unknown): part is TextResponsePart =>
+    !!(part && typeof part === 'object' && 'content' in part && typeof part.content === 'string');
+
+export interface ToolCallResponsePart {
+    tool_calls: ToolCall[];
+}
+export const isToolCallResponsePart = (part: unknown): part is ToolCallResponsePart =>
+    !!(part && typeof part === 'object' && 'tool_calls' in part && Array.isArray(part.tool_calls));
+
+export interface ThinkingResponsePart {
+    thought: string;
+    signature: string;
 }
+export const isThinkingResponsePart = (part: unknown): part is ThinkingResponsePart =>
+    !!(part && typeof part === 'object' && 'thought' in part && typeof part.thought === 'string');
 
 export interface ToolCall {
     id?: string;
@@ -171,11 +233,6 @@ export interface LanguageModelMetaData {
     readonly family?: string;
     readonly maxInputTokens?: number;
     readonly maxOutputTokens?: number;
-    /**
-     * Default request settings for the language model. These settings can be set by a user preferences.
-     * Settings in a request will override these default settings.
-     */
-    readonly defaultRequestSettings?: { [key: string]: unknown };
 }
 
 export namespace LanguageModelMetaData {

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

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { inject, injectable, named, postConstruct } from '@theia/core/shared/inversify';
+import { inject, injectable, named, postConstruct, interfaces } from '@theia/core/shared/inversify';
 import { ToolRequest } from './language-model';
 import { ContributionProvider } from '@theia/core';
 
@@ -69,6 +69,12 @@ export interface ToolProvider {
     getTool(): ToolRequest;
 }
 
+/** Binds the identifier to self in singleton scope and then binds `ToolProvider` to that service. */
+export function bindToolProvider(identifier: interfaces.Newable<ToolProvider>, bind: interfaces.Bind): void {
+    bind(identifier).toSelf().inSingletonScope();
+    bind(ToolProvider).toService(identifier);
+}
+
 @injectable()
 export class ToolInvocationRegistryImpl implements ToolInvocationRegistry {
 
@@ -122,4 +128,3 @@ export class ToolInvocationRegistryImpl implements ToolInvocationRegistry {
         return tools;
     }
 }
-

package/src/common/variable-service.ts

@@ -128,7 +128,8 @@ export interface AIVariableContext {
 export type AIVariableArg = string | { variable: string, arg?: string } | AIVariableResolutionRequest;
 
 export type AIVariableArgPicker = (context: AIVariableContext) => MaybePromise<string | undefined>;
-export type AIVariableArgCompletionProvider = (model: monaco.editor.ITextModel, position: monaco.Position) => MaybePromise<monaco.languages.CompletionItem[] | undefined>;
+export type AIVariableArgCompletionProvider =
+    (model: monaco.editor.ITextModel, position: monaco.Position, matchString?: string) => MaybePromise<monaco.languages.CompletionItem[] | undefined>;
 
 export interface AIVariableResolver {
     canResolve(request: AIVariableResolutionRequest, context: AIVariableContext): MaybePromise<number>,