@theia/ai-chat 1.56.0 → 1.57.0-next.136

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

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { Agent, AgentService, AIVariableContribution } from '@theia/ai-core/lib/common';
-import { bindContributionProvider } from '@theia/core';
+import { bindContributionProvider, ResourceResolver } from '@theia/core';
 import { FrontendApplicationContribution, PreferenceContribution } from '@theia/core/lib/browser';
 import { ContainerModule } from '@theia/core/shared/inversify';
 import {
@@ -25,27 +25,27 @@ import {
     ChatRequestParser,
     ChatRequestParserImpl,
     ChatService,
-    DefaultChatAgentId
 } from '../common';
 import { ChatAgentsVariableContribution } from '../common/chat-agents-variable-contribution';
-import { CommandChatAgent } from '../common/command-chat-agents';
 import { CustomChatAgent } from '../common/custom-chat-agent';
-import { OrchestratorChatAgent, OrchestratorChatAgentId } from '../common/orchestrator-chat-agent';
 import { DefaultResponseContentFactory, DefaultResponseContentMatcherProvider, ResponseContentMatcherProvider } from '../common/response-content-matcher';
-import { UniversalChatAgent } from '../common/universal-chat-agent';
 import { aiChatPreferences } from './ai-chat-preferences';
+import { ChangeSetElementArgs, ChangeSetFileElement, ChangeSetFileElementFactory } from './change-set-file-element';
 import { AICustomAgentsFrontendApplicationContribution } from './custom-agent-frontend-application-contribution';
 import { FrontendChatServiceImpl } from './frontend-chat-service';
 import { CustomAgentFactory } from './custom-agent-factory';
-import { O1ChatAgent } from '../common/o1-chat-agent';
+import { ChatToolRequestService } from '../common/chat-tool-request-service';
+import { ChangeSetFileResourceResolver } from './change-set-file-resource';
+import { ChangeSetFileService } from './change-set-file-service';
 
 export default new ContainerModule(bind => {
     bindContributionProvider(bind, Agent);
     bindContributionProvider(bind, ChatAgent);
 
+    bind(ChatToolRequestService).toSelf().inSingletonScope();
+
     bind(ChatAgentServiceImpl).toSelf().inSingletonScope();
     bind(ChatAgentService).toService(ChatAgentServiceImpl);
-    bind(DefaultChatAgentId).toConstantValue({ id: OrchestratorChatAgentId });
 
     bindContributionProvider(bind, ResponseContentMatcherProvider);
     bind(DefaultResponseContentMatcherProvider).toSelf().inSingletonScope();
@@ -60,22 +60,6 @@ export default new ContainerModule(bind => {
     bind(FrontendChatServiceImpl).toSelf().inSingletonScope();
     bind(ChatService).toService(FrontendChatServiceImpl);
 
-    bind(OrchestratorChatAgent).toSelf().inSingletonScope();
-    bind(Agent).toService(OrchestratorChatAgent);
-    bind(ChatAgent).toService(OrchestratorChatAgent);
-
-    bind(O1ChatAgent).toSelf().inSingletonScope();
-    bind(Agent).toService(O1ChatAgent);
-    bind(ChatAgent).toService(O1ChatAgent);
-
-    bind(UniversalChatAgent).toSelf().inSingletonScope();
-    bind(Agent).toService(UniversalChatAgent);
-    bind(ChatAgent).toService(UniversalChatAgent);
-
-    bind(CommandChatAgent).toSelf().inSingletonScope();
-    bind(Agent).toService(CommandChatAgent);
-    bind(ChatAgent).toService(CommandChatAgent);
-
     bind(PreferenceContribution).toConstantValue({ schema: aiChatPreferences });
 
     bind(CustomChatAgent).toSelf();
@@ -95,4 +79,14 @@ export default new ContainerModule(bind => {
             return agent;
         });
     bind(FrontendApplicationContribution).to(AICustomAgentsFrontendApplicationContribution).inSingletonScope();
+
+    bind(ChangeSetFileService).toSelf().inSingletonScope();
+    bind(ChangeSetFileElementFactory).toFactory(ctx => (args: ChangeSetElementArgs) => {
+        const container = ctx.container.createChild();
+        container.bind(ChangeSetElementArgs).toConstantValue(args);
+        container.bind(ChangeSetFileElement).toSelf().inSingletonScope();
+        return container.get(ChangeSetFileElement);
+    });
+    bind(ChangeSetFileResourceResolver).toSelf().inSingletonScope();
+    bind(ResourceResolver).toService(ChangeSetFileResourceResolver);
 });

package/src/browser/change-set-file-element.ts

@@ -0,0 +1,137 @@
+// *****************************************************************************
+// 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 { URI } from '@theia/core';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import { ChangeSetElement, ChangeSetImpl } from '../common';
+import { createChangeSetFileUri } from './change-set-file-resource';
+import { ChangeSetFileService } from './change-set-file-service';
+
+export const ChangeSetFileElementFactory = Symbol('ChangeSetFileElementFactory');
+export type ChangeSetFileElementFactory = (elementProps: ChangeSetElementArgs) => ChangeSetFileElement;
+
+export const ChangeSetElementArgs = Symbol('ChangeSetElementArgs');
+export interface ChangeSetElementArgs extends Partial<ChangeSetElement> {
+    /** The URI of the element, expected to be unique within the same change set. */
+    uri: URI;
+    /** The change set containing this element. */
+    changeSet: ChangeSetImpl;
+    /** The id of the chat session containing this change set element. */
+    chatSessionId: string;
+    /**
+     * The state of the file after the changes have been applied.
+     * If `undefined`, there is no change.
+     */
+    targetState?: string;
+};
+
+@injectable()
+export class ChangeSetFileElement implements ChangeSetElement {
+
+    @inject(ChangeSetElementArgs)
+    protected readonly elementProps: ChangeSetElementArgs;
+
+    @inject(ChangeSetFileService)
+    protected readonly changeSetFileService: ChangeSetFileService;
+
+    protected _state: 'pending' | 'applied' | 'discarded' | undefined;
+
+    protected originalContent: string | undefined;
+
+    @postConstruct()
+    init(): void {
+        this.obtainOriginalContent();
+    }
+
+    protected async obtainOriginalContent(): Promise<void> {
+        this.originalContent = await this.changeSetFileService.read(this.uri);
+    }
+
+    get uri(): URI {
+        return this.elementProps.uri;
+    }
+
+    get changedUri(): URI {
+        return createChangeSetFileUri(this.elementProps.chatSessionId, this.uri);
+    }
+
+    get name(): string {
+        return this.elementProps.name ?? this.changeSetFileService.getName(this.uri);
+    }
+
+    get icon(): string | undefined {
+        return this.elementProps.icon ?? this.changeSetFileService.getIcon(this.uri);
+    }
+
+    get additionalInfo(): string | undefined {
+        return this.changeSetFileService.getAdditionalInfo(this.uri);
+    }
+
+    get state(): 'pending' | 'applied' | 'discarded' | undefined {
+        return this._state ?? this.elementProps.state;
+    }
+
+    protected set state(value: 'pending' | 'applied' | 'discarded' | undefined) {
+        this._state = value;
+        this.elementProps.changeSet.notifyChange();
+    }
+
+    get type(): 'add' | 'modify' | 'delete' | undefined {
+        return this.elementProps.type;
+    }
+
+    get data(): { [key: string]: unknown; } | undefined {
+        return this.elementProps.data;
+    };
+
+    get targetState(): string {
+        return this.elementProps.targetState ?? '';
+    }
+
+    async open(): Promise<void> {
+        this.changeSetFileService.open(this);
+    }
+
+    async openChange(): Promise<void> {
+        this.changeSetFileService.openDiff(
+            this.uri,
+            this.changedUri
+        );
+    }
+
+    async accept(contents?: string): Promise<void> {
+        this.state = 'applied';
+        if (this.type === 'delete') {
+            await this.changeSetFileService.delete(this.uri);
+            this.state = 'applied';
+            return;
+        }
+
+        await this.changeSetFileService.write(this.uri, contents !== undefined ? contents : this.targetState);
+    }
+
+    async discard(): Promise<void> {
+        this.state = 'discarded';
+        if (this.type === 'add') {
+            await this.changeSetFileService.delete(this.uri);
+            return;
+        }
+        if (this.originalContent) {
+            await this.changeSetFileService.write(this.uri, this.originalContent);
+        }
+    }
+
+}

package/src/browser/change-set-file-resource.ts

@@ -0,0 +1,74 @@
+// *****************************************************************************
+// 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 { Resource, ResourceResolver, ResourceSaveOptions, URI } from '@theia/core';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { ChatService } from '../common';
+import { ChangeSetFileElement } from './change-set-file-element';
+
+export const CHANGE_SET_FILE_RESOURCE_SCHEME = 'changeset-file';
+const QUERY = 'uri=';
+
+export function createChangeSetFileUri(chatSessionId: string, elementUri: URI): URI {
+    return new URI(CHANGE_SET_FILE_RESOURCE_SCHEME + '://' + chatSessionId + '/' + elementUri.path).withQuery(QUERY + encodeURIComponent(elementUri.path.toString()));
+}
+
+/**
+ * A file resource within a chat's change set can be resolved with the following URI:
+ * changeset-file:/<chat-session-id>?uri=<element-uri-without-scheme>
+ */
+@injectable()
+export class ChangeSetFileResourceResolver implements ResourceResolver {
+
+    @inject(ChatService)
+    protected readonly chatService: ChatService;
+
+    async resolve(uri: URI): Promise<Resource> {
+        if (uri.scheme !== CHANGE_SET_FILE_RESOURCE_SCHEME) {
+            throw new Error('The given uri is not a change set file uri: ' + uri);
+        }
+
+        const chatSessionId = uri.authority;
+        const session = this.chatService.getSession(chatSessionId);
+        if (!session) {
+            throw new Error('Chat session not found: ' + chatSessionId);
+        }
+
+        const changeSet = session.model.changeSet;
+        if (!changeSet) {
+            throw new Error('Chat session has no change set: ' + chatSessionId);
+        }
+
+        const fileUri = decodeURIComponent(uri.query.toString().replace(QUERY, ''));
+        const element = changeSet.getElements().find(e => e.uri.path.toString() === fileUri);
+        if (!(element instanceof ChangeSetFileElement)) {
+            throw new Error('Change set element not found: ' + fileUri);
+        }
+
+        return {
+            uri,
+            readOnly: false,
+            initiallyDirty: true,
+            readContents: async () => element.targetState ?? '',
+            saveContents: async (content: string, options?: ResourceSaveOptions): Promise<void> => {
+                element.accept(content);
+            },
+            dispose: () => { }
+        };
+    }
+
+}
+

package/src/browser/change-set-file-service.ts

@@ -0,0 +1,136 @@
+// *****************************************************************************
+// 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 { ILogger, UNTITLED_SCHEME, URI } from '@theia/core';
+import { DiffUris, LabelProvider, OpenerService, open } from '@theia/core/lib/browser';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { EditorManager } from '@theia/editor/lib/browser';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import { MonacoWorkspace } from '@theia/monaco/lib/browser/monaco-workspace';
+import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
+import { ChangeSetFileElement } from './change-set-file-element';
+
+@injectable()
+export class ChangeSetFileService {
+    @inject(ILogger)
+    protected readonly logger: ILogger;
+
+    @inject(WorkspaceService)
+    protected readonly wsService: WorkspaceService;
+
+    @inject(LabelProvider)
+    protected readonly labelProvider: LabelProvider;
+
+    @inject(OpenerService)
+    protected readonly openerService: OpenerService;
+
+    @inject(EditorManager)
+    protected readonly editorManager: EditorManager;
+
+    @inject(MonacoWorkspace)
+    protected readonly monacoWorkspace: MonacoWorkspace;
+
+    @inject(FileService)
+    protected readonly fileService: FileService;
+
+    async read(uri: URI): Promise<string | undefined> {
+        const exists = await this.fileService.exists(uri);
+        if (!exists) {
+            return undefined;
+        }
+        try {
+            const document = this.monacoWorkspace.getTextDocument(uri.toString());
+            if (document) {
+                return document.getText();
+            }
+            return (await this.fileService.readFile(uri)).value.toString();
+        } catch (error) {
+            this.logger.error('Failed to read original content of change set file element.', error);
+            return undefined;
+        }
+    }
+
+    getName(uri: URI): string {
+        return this.labelProvider.getName(uri);
+    }
+
+    getIcon(uri: URI): string | undefined {
+        return this.labelProvider.getIcon(uri);
+    }
+
+    getAdditionalInfo(uri: URI): string | undefined {
+        const wsUri = this.wsService.getWorkspaceRootUri(uri);
+        if (wsUri) {
+            const wsRelative = wsUri.relative(uri);
+            if (wsRelative?.hasDir) {
+                return `${wsRelative.dir.toString()}`;
+            }
+            return '';
+        }
+        return this.labelProvider.getLongName(uri.parent);
+    }
+
+    async open(element: ChangeSetFileElement): Promise<void> {
+        const exists = await this.fileService.exists(element.uri);
+        if (exists) {
+            await open(this.openerService, element.uri);
+            return;
+        }
+        await this.editorManager.open(element.changedUri, {
+            mode: 'reveal'
+        });
+    }
+
+    async openDiff(originalUri: URI, suggestedUri: URI): Promise<void> {
+        const exists = await this.fileService.exists(originalUri);
+        const openedUri = exists ? originalUri : originalUri.withScheme(UNTITLED_SCHEME);
+        // Currently we don't have a great way to show the suggestions in a diff editor with accept/reject buttons
+        // So we just use plain diffs with the suggestions as original and the current state as modified, so users can apply changes in their current state
+        // But this leads to wrong colors and wrong label (revert change instead of accept change)
+        const diffUri = DiffUris.encode(openedUri, suggestedUri,
+            `AI Changes: ${this.labelProvider.getName(originalUri)}`,
+        );
+        open(this.openerService, diffUri);
+    }
+
+    async delete(uri: URI): Promise<void> {
+        const exists = await this.fileService.exists(uri);
+        if (exists) {
+            await this.fileService.delete(uri);
+        }
+    }
+
+    async write(uri: URI, targetState: string): Promise<void> {
+        const exists = await this.fileService.exists(uri);
+        if (!exists) {
+            await this.fileService.create(uri, targetState);
+        }
+        await this.doWrite(uri, targetState);
+    }
+
+    protected async doWrite(uri: URI, text: string): Promise<void> {
+        const document = this.monacoWorkspace.getTextDocument(uri.toString());
+        if (document) {
+            await this.monacoWorkspace.applyBackgroundEdit(document, [{
+                range: document.textEditorModel.getFullModelRange(),
+                text
+            }], (editor, wasDirty) => editor === undefined || !wasDirty);
+        } else {
+            await this.fileService.write(uri, text);
+        }
+    }
+
+}

package/src/browser/frontend-chat-service.ts

@@ -19,6 +19,9 @@ import { ChatAgent, ChatServiceImpl, ParsedChatRequest } from '../common';
 import { PreferenceService } from '@theia/core/lib/browser';
 import { DEFAULT_CHAT_AGENT_PREF } from './ai-chat-preferences';
 
+/**
+ * Customizes the ChatServiceImpl to consider preference based default chat agent
+ */
 @injectable()
 export class FrontendChatServiceImpl extends ChatServiceImpl {
 
@@ -27,32 +30,13 @@ export class FrontendChatServiceImpl extends ChatServiceImpl {
 
     protected override getAgent(parsedRequest: ParsedChatRequest): ChatAgent | undefined {
         const agentPart = this.getMentionedAgent(parsedRequest);
-        if (agentPart) {
-            return this.chatAgentService.getAgent(agentPart.agentId);
-        }
-
-        const configuredDefaultChatAgent = this.getConfiguredDefaultChatAgent();
-        if (configuredDefaultChatAgent) {
-            return configuredDefaultChatAgent;
-        }
-
-        if (this.defaultChatAgentId) {
-            const defaultAgent = this.chatAgentService.getAgent(this.defaultChatAgentId.id);
-            // the default agent could be disabled
-            if (defaultAgent) {
-                return defaultAgent;
+        if (!agentPart) {
+            const configuredDefaultChatAgent = this.getConfiguredDefaultChatAgent();
+            if (configuredDefaultChatAgent) {
+                return configuredDefaultChatAgent;
             }
         }
-
-        // check whether "Universal" is available
-        const universalAgent = this.chatAgentService.getAgent('Universal');
-        if (universalAgent) {
-            return universalAgent;
-        }
-
-        this.logger.warn('No default chat agent is configured or available and the "Universal" Chat Agent is unavailable too. Falling back to first registered agent.');
-
-        return this.chatAgentService.getAgents()[0] ?? undefined;
+        return super.getAgent(parsedRequest);
     }
 
     protected getConfiguredDefaultChatAgent(): ChatAgent | undefined {

package/src/common/chat-agents.ts

@@ -38,12 +38,11 @@ import {
     LanguageModelStreamResponsePart,
     MessageActor,
 } from '@theia/ai-core/lib/common';
-import { CancellationToken, CancellationTokenSource, ContributionProvider, ILogger, isArray } from '@theia/core';
+import { CancellationToken, ContributionProvider, ILogger, isArray } from '@theia/core';
 import { inject, injectable, named, postConstruct, unmanaged } from '@theia/core/shared/inversify';
 import { ChatAgentService } from './chat-agent-service';
 import {
     ChatModel,
-    ChatRequestModel,
     ChatRequestModelImpl,
     ChatResponseContent,
     ErrorChatResponseContentImpl,
@@ -53,6 +52,7 @@ import {
 import { findFirstMatch, parseContents } from './parse-contents';
 import { DefaultResponseContentFactory, ResponseContentMatcher, ResponseContentMatcherProvider } from './response-content-matcher';
 import { ChatHistoryEntry } from './chat-history-entry';
+import { ChatToolRequestService } from './chat-tool-request-service';
 
 /**
  * A conversation consists of a sequence of ChatMessages.
@@ -123,10 +123,12 @@ export abstract class AbstractChatAgent {
     @inject(LanguageModelRegistry) protected languageModelRegistry: LanguageModelRegistry;
     @inject(ILogger) protected logger: ILogger;
     @inject(CommunicationRecordingService) protected recordingService: CommunicationRecordingService;
+    @inject(ChatToolRequestService) protected chatToolRequestService: ChatToolRequestService;
     @inject(PromptService) protected promptService: PromptService;
 
     @inject(ContributionProvider) @named(ResponseContentMatcherProvider)
     protected contentMatcherProviders: ContributionProvider<ResponseContentMatcherProvider>;
+    protected additionalToolRequests: ToolRequest[] = [];
     protected contentMatchers: ResponseContentMatcher[] = [];
 
     @inject(DefaultResponseContentFactory)
@@ -171,7 +173,6 @@ export abstract class AbstractChatAgent {
                 );
             }
 
-            const tools: Map<string, ToolRequest> = new Map();
             if (systemMessageDescription) {
                 const systemMsg: ChatMessage = {
                     actor: 'system',
@@ -180,24 +181,20 @@ export abstract class AbstractChatAgent {
                 };
                 // insert system message at the beginning of the request messages
                 messages.unshift(systemMsg);
-                systemMessageDescription.functionDescriptions?.forEach((tool, id) => {
-                    tools.set(id, tool);
-                });
             }
-            this.getTools(request)?.forEach(tool => tools.set(tool.id, tool));
 
-            const cancellationToken = new CancellationTokenSource();
-            request.response.onDidChange(() => {
-                if (request.response.isCanceled) {
-                    cancellationToken.cancel();
-                }
-            });
+            const systemMessageToolRequests = systemMessageDescription?.functionDescriptions?.values();
+            const tools = [
+                ...this.chatToolRequestService.getChatToolRequests(request),
+                ...this.chatToolRequestService.toChatToolRequests(systemMessageToolRequests ? Array.from(systemMessageToolRequests) : [], request),
+                ...this.chatToolRequestService.toChatToolRequests(this.additionalToolRequests, request)
+            ];
 
             const languageModelResponse = await this.callLlm(
                 languageModel,
                 messages,
-                tools.size > 0 ? Array.from(tools.values()) : undefined,
-                cancellationToken.token
+                tools.length > 0 ? tools : undefined,
+                request.response.cancellationToken
             );
             await this.addContentsToResponse(languageModelResponse, request);
             await this.onResponseComplete(request);
@@ -265,15 +262,6 @@ export abstract class AbstractChatAgent {
         return requestMessages;
     }
 
-    /**
-     * @returns the list of tools used by this agent, or undefined if none is needed.
-     */
-    protected getTools(request: ChatRequestModel): ToolRequest[] | undefined {
-        return request.message.toolRequests.size > 0
-            ? [...request.message.toolRequests.values()]
-            : undefined;
-    }
-
     protected async callLlm(
         languageModel: LanguageModel,
         messages: ChatMessage[],