@theia/ai-chat 1.62.0-next.3 → 1.62.0

package/src/common/chat-agents.ts

@@ -23,8 +23,8 @@ import {
     AgentSpecificVariables,
     AIVariableContext,
     AIVariableResolutionRequest,
-    CommunicationRecordingService,
     getTextOfResponse,
+    isLanguageModelStreamResponsePart,
     isTextResponsePart,
     isThinkingResponsePart,
     isToolCallResponsePart,
@@ -36,8 +36,8 @@ import {
     LanguageModelService,
     LanguageModelStreamResponse,
     PromptService,
-    PromptTemplate,
-    ResolvedPromptTemplate,
+    ResolvedPromptFragment,
+    PromptVariantSet,
     TextMessage,
     ToolCall,
     ToolRequest,
@@ -75,7 +75,7 @@ export interface SystemMessageDescription {
     functionDescriptions?: Map<string, ToolRequest>;
 }
 export namespace SystemMessageDescription {
-    export function fromResolvedPromptTemplate(resolvedPrompt: ResolvedPromptTemplate): SystemMessageDescription {
+    export function fromResolvedPromptFragment(resolvedPrompt: ResolvedPromptFragment): SystemMessageDescription {
         return {
             text: resolvedPrompt.text,
             functionDescriptions: resolvedPrompt.functionDescriptions
@@ -147,9 +147,6 @@ export abstract class AbstractChatAgent implements ChatAgent {
     @inject(DefaultResponseContentFactory)
     protected defaultContentFactory: DefaultResponseContentFactory;
 
-    @inject(CommunicationRecordingService)
-    protected recordingService: CommunicationRecordingService;
-
     readonly abstract id: string;
     readonly abstract name: string;
     readonly abstract languageModelRequirements: LanguageModelRequirement[];
@@ -158,7 +155,7 @@ export abstract class AbstractChatAgent implements ChatAgent {
     tags: string[] = ['Chat'];
     description: string = '';
     variables: string[] = [];
-    promptTemplates: PromptTemplate[] = [];
+    prompts: PromptVariantSet[] = [];
     agentSpecificVariables: AgentSpecificVariables[] = [];
     functions: string[] = [];
     protected readonly abstract defaultLanguageModelPurpose: string;
@@ -245,8 +242,8 @@ export abstract class AbstractChatAgent implements ChatAgent {
         if (this.systemPromptId === undefined) {
             return undefined;
         }
-        const resolvedPrompt = await this.promptService.getPrompt(this.systemPromptId, undefined, context);
-        return resolvedPrompt ? SystemMessageDescription.fromResolvedPromptTemplate(resolvedPrompt) : undefined;
+        const resolvedPrompt = await this.promptService.getResolvedPromptFragment(this.systemPromptId, undefined, context);
+        return resolvedPrompt ? SystemMessageDescription.fromResolvedPromptFragment(resolvedPrompt) : undefined;
     }
 
     protected async getMessages(
@@ -289,12 +286,6 @@ export abstract class AbstractChatAgent implements ChatAgent {
         const agentSettings = this.getLlmSettings();
         const settings = { ...agentSettings, ...request.session.settings };
         const tools = toolRequests.length > 0 ? toolRequests : undefined;
-        this.recordingService.recordRequest({
-            agentId: this.id,
-            sessionId: request.session.id,
-            requestId: request.id,
-            request: messages
-        });
         return this.languageModelService.sendRequest(
             languageModel,
             {
@@ -323,15 +314,6 @@ export abstract class AbstractChatAgent implements ChatAgent {
      * Subclasses may override this method to perform additional actions or keep the response open for processing further requests.
      */
     protected async onResponseComplete(request: MutableChatRequestModel): Promise<void> {
-        this.recordingService.recordResponse(
-            {
-                agentId: this.id,
-                sessionId: request.session.id,
-                requestId: request.id,
-                response: request.response.response.content.flatMap(c =>
-                    c.toLanguageModelMessage?.() ?? ({ type: 'text', actor: 'ai', text: c.asDisplayString?.() ?? c.asString?.() ?? JSON.stringify(c) }))
-            }
-        );
         return request.response.complete();
     }
 
@@ -399,9 +381,13 @@ export abstract class AbstractStreamParsingChatAgent extends AbstractChatAgent {
         let startIndex = Math.max(0, request.response.response.content.length - 1);
 
         for await (const token of languageModelResponse.stream) {
+            // Skip unknown tokens. For example OpenAI sends empty tokens around tool calls
+            if (!isLanguageModelStreamResponsePart(token)) {
+                console.debug(`Unknown token: '${JSON.stringify(token)}'. Skipping`);
+                continue;
+            }
             const newContent = this.parse(token, request);
-
-            if (!(isTextResponsePart(token) && token.content)) {
+            if (!isTextResponsePart(token)) {
                 // For non-text tokens (like tool calls), add them directly
                 if (isArray(newContent)) {
                     request.response.response.addContents(newContent);
@@ -409,7 +395,7 @@ export abstract class AbstractStreamParsingChatAgent extends AbstractChatAgent {
                     request.response.response.addContent(newContent);
                 }
                 // And reset the marker index and the text buffer as we skip matching across non-text tokens
-                startIndex = request.response.response.content.length - 1;
+                startIndex = request.response.response.content.length;
                 completeTextBuffer = '';
             } else {
                 // parse the entire text so far (since beginning of the stream or last non-text token)

package/src/common/chat-model.ts

@@ -205,6 +205,12 @@ export interface ChangeSet extends Disposable {
     onDidChange: Event<ChangeSetChangeEvent>;
     readonly title: string;
     getElements(): ChangeSetElement[];
+    /**
+     * Find an element by URI.
+     * @param uri The URI to look for.
+     * @returns The element with the given URI, or undefined if not found.
+     */
+    getElementByURI(uri: URI): ChangeSetElement | undefined;
     dispose(): void;
 }
 
@@ -1037,6 +1043,21 @@ export class ChangeSetImpl implements ChangeSet {
         return this._elements;
     }
 
+    /**
+     * Find an element by URI.
+     * @param uri The URI to look for.
+     * @returns The element with the given URI, or undefined if not found.
+     */
+    getElementByURI(uri: URI): ChangeSetElement | undefined {
+        const uriString = uri.toString();
+        for (const element of this._elements) {
+            if (element.uri.toString() === uriString) {
+                return element;
+            }
+        }
+        return undefined;
+    }
+
     /** Will replace any element that is already present, using URI as identity criterion. */
     addElements(...elements: ChangeSetElement[]): void {
         const added: URI[] = [];
@@ -1190,6 +1211,10 @@ export class MutableChatRequestModel implements ChatRequestModel, EditableChatRe
         return this._data[key] as T;
     }
 
+    removeData(key: string): void {
+        delete this._data[key];
+    }
+
     get id(): string {
         return this._id;
     }
@@ -1516,6 +1541,8 @@ export class ToolCallChatResponseContentImpl implements ToolCallChatResponseCont
         if (nextChatResponseContent.id === this.id) {
             this._finished = nextChatResponseContent.finished;
             this._result = nextChatResponseContent.result;
+            const args = nextChatResponseContent.arguments;
+            this._arguments = (args && args.length > 0) ? args : this._arguments;
             return true;
         }
         if (nextChatResponseContent.name !== undefined) {

package/src/common/chat-session-naming-service.ts

@@ -17,31 +17,33 @@
 import {
     Agent,
     AgentService,
-    CommunicationRecordingService,
-    CommunicationRequestEntryParam,
     getTextOfResponse,
     LanguageModelRegistry,
     LanguageModelRequirement,
+    LanguageModelService,
     PromptService,
-    PromptTemplate,
+    PromptVariantSet,
     UserRequest
 } from '@theia/ai-core';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { ChatSession } from './chat-service';
 import { generateUuid } from '@theia/core';
 
-const CHAT_SESSION_NAMING_PROMPT = {
+const CHAT_SESSION_NAMING_PROMPT: PromptVariantSet = {
     id: 'chat-session-naming-prompt',
-    template: '{{!-- Made improvements or adaptations to this prompt template? We\'d love for you to share it with the community! Contribute back here: ' +
-        'https://github.com/eclipse-theia/theia/discussions/new?category=prompt-template-contribution --}}\n\n' +
-        'Provide a short and descriptive name for the given AI chat conversation of an AI-powered tool based on the conversation below.\n\n' +
-        'The purpose of the name is for users to recognize the chat conversation easily in a list of conversations. ' +
-        'Use the same language for the chat conversation name as used in the provided conversation, if in doubt default to English. ' +
-        'Start the chat conversation name with an upper-case letter. ' +
-        'Below we also provide the already existing other conversation names, make sure your suggestion for a name is unique with respect to the existing ones.\n\n' +
-        'IMPORTANT: Your answer MUST ONLY CONTAIN THE PROPOSED NAME and must not be preceded or followed by any other text.' +
-        '\n\nOther session names:\n{{listOfSessionNames}}' +
-        '\n\nConversation:\n{{conversation}}',
+    defaultVariant: {
+        id: 'chat-session-naming-prompt',
+        template: '{{!-- Made improvements or adaptations to this prompt template? We\'d love for you to share it with the community! Contribute back here: ' +
+            'https://github.com/eclipse-theia/theia/discussions/new?category=prompt-template-contribution --}}\n\n' +
+            'Provide a short and descriptive name for the given AI chat conversation of an AI-powered tool based on the conversation below.\n\n' +
+            'The purpose of the name is for users to recognize the chat conversation easily in a list of conversations. ' +
+            'Use the same language for the chat conversation name as used in the provided conversation, if in doubt default to English. ' +
+            'Start the chat conversation name with an upper-case letter. ' +
+            'Below we also provide the already existing other conversation names, make sure your suggestion for a name is unique with respect to the existing ones.\n\n' +
+            'IMPORTANT: Your answer MUST ONLY CONTAIN THE PROPOSED NAME and must not be preceded or followed by any other text.' +
+            '\n\nOther session names:\n{{listOfSessionNames}}' +
+            '\n\nConversation:\n{{conversation}}',
+    }
 };
 
 @injectable()
@@ -58,12 +60,12 @@ export class ChatSessionNamingService {
 
 @injectable()
 export class ChatSessionNamingAgent implements Agent {
-    static ID = 'chat-session-naming-agent';
+    static ID = 'Chat Session Naming';
     id = ChatSessionNamingAgent.ID;
-    name = 'Chat Session Naming';
+    name = ChatSessionNamingAgent.ID;
     description = 'Agent for generating chat session names';
     variables = [];
-    promptTemplates: PromptTemplate[] = [CHAT_SESSION_NAMING_PROMPT];
+    prompts = [CHAT_SESSION_NAMING_PROMPT];
     languageModelRequirements: LanguageModelRequirement[] = [{
         purpose: 'chat-session-naming',
         identifier: 'openai/gpt-4o-mini',
@@ -77,8 +79,8 @@ export class ChatSessionNamingAgent implements Agent {
     @inject(LanguageModelRegistry)
     protected readonly lmRegistry: LanguageModelRegistry;
 
-    @inject(CommunicationRecordingService)
-    protected recordingService: CommunicationRecordingService;
+    @inject(LanguageModelService)
+    protected readonly languageModelService: LanguageModelService;
 
     @inject(PromptService)
     protected promptService: PromptService;
@@ -98,7 +100,7 @@ export class ChatSessionNamingAgent implements Agent {
             .join('\n\n');
         const listOfSessionNames = otherNames.map(name => name).join(', ');
 
-        const prompt = await this.promptService.getPrompt(CHAT_SESSION_NAMING_PROMPT.id, { conversation, listOfSessionNames });
+        const prompt = await this.promptService.getResolvedPromptFragment(CHAT_SESSION_NAMING_PROMPT.id, { conversation, listOfSessionNames });
         const message = prompt?.text;
         if (!message) {
             throw new Error('Unable to create prompt message for generating chat session name');
@@ -106,7 +108,7 @@ export class ChatSessionNamingAgent implements Agent {
 
         const sessionId = generateUuid();
         const requestId = generateUuid();
-        const request: UserRequest = {
+        const request: UserRequest & { agentId: string } = {
             messages: [{
                 actor: 'user',
                 text: message,
@@ -116,18 +118,9 @@ export class ChatSessionNamingAgent implements Agent {
             sessionId,
             agentId: this.id
         };
-        this.recordingService.recordRequest({ ...request, request: request.messages } satisfies CommunicationRequestEntryParam);
-
-        const result = await lm.request(request);
+        const result = await this.languageModelService.sendRequest(lm, request);
         const response = await getTextOfResponse(result);
-        this.recordingService.recordResponse({
-            agentId: this.id,
-            sessionId,
-            requestId,
-            response: [{ actor: 'ai', text: response, type: 'text' }]
-        });
 
         return response.replace(/\s+/g, ' ').substring(0, 100);
     }
-
 }

package/src/common/chat-session-summary-agent-prompt.ts

@@ -11,18 +11,21 @@
 import { CHANGE_SET_SUMMARY_VARIABLE_ID } from './context-variables';
 
 export const CHAT_SESSION_SUMMARY_PROMPT = {
-    id: 'chat-session-summary-prompt',
-    template: `{{!-- !-- This prompt is licensed under the MIT License (https://opensource.org/license/mit).
-Made improvements or adaptations to this prompt template? We\'d love for you to share it with the community! Contribute back here: ' +
-        'https://github.com/eclipse-theia/theia/discussions/new?category=prompt-template-contribution --}}\n\n' +
-        'You are a chat agent for summarizing AI agent chat sessions for later use. \
-Review the conversation above and generate a concise summary that captures every crucial detail, \
-including all requirements, decisions, and pending tasks. \
-Ensure that the summary is sufficiently comprehensive to allow seamless continuation of the workflow. The summary will primarily be used by other AI agents, so tailor your \
-response for use by AI agents. \
-Also consider the system message.
-Make sure you include all necessary context information and use unique references (such as URIs, file paths, etc.).
-If the conversation was about a task, describe the state of the task, i.e. what has been completed and what is open.
-If a changeset is open in the session, describe the state of the suggested changes.
-{{${CHANGE_SET_SUMMARY_VARIABLE_ID}}}`,
+    id: 'chat-session-summary-system-prompt',
+    defaultVariant: {
+        id: 'chat-session-summary-prompt',
+        template: '{{!-- !-- This prompt is licensed under the MIT License (https://opensource.org/license/mit).\n' +
+            'Made improvements or adaptations to this prompt template? We\'d love for you to share it with the community! Contribute back here:  ' +
+            'https://github.com/eclipse-theia/theia/discussions/new?category=prompt-template-contribution --}}\n\n' +
+            'You are a chat agent for summarizing AI agent chat sessions for later use. ' +
+            'Review the conversation above and generate a concise summary that captures every crucial detail, ' +
+            'including all requirements, decisions, and pending tasks. ' +
+            'Ensure that the summary is sufficiently comprehensive to allow seamless continuation of the workflow. ' +
+            'The summary will primarily be used by other AI agents, so tailor your response for use by AI agents. ' +
+            'Also consider the system message. ' +
+            'Make sure you include all necessary context information and use unique references(such as URIs, file paths, etc.). ' +
+            'If the conversation was about a task, describe the state of the task, i.e.what has been completed and what is open. ' +
+            'If a changeset is open in the session, describe the state of the suggested changes. ' +
+            `\n\n{{${CHANGE_SET_SUMMARY_VARIABLE_ID}}}`,
+    }
 };

package/src/common/chat-session-summary-agent.ts

@@ -16,7 +16,7 @@
 
 import {
     LanguageModelRequirement,
-    PromptTemplate
+    PromptVariantSet
 } from '@theia/ai-core';
 import { injectable } from '@theia/core/shared/inversify';
 import { AbstractStreamParsingChatAgent, ChatAgent } from './chat-agents';
@@ -29,7 +29,7 @@ export class ChatSessionSummaryAgent extends AbstractStreamParsingChatAgent impl
     name = 'Chat Session Summary';
     override description = 'Agent for generating chat session summaries.';
     override variables = [];
-    override promptTemplates: PromptTemplate[] = [CHAT_SESSION_SUMMARY_PROMPT];
+    override prompts: PromptVariantSet[] = [CHAT_SESSION_SUMMARY_PROMPT];
     protected readonly defaultLanguageModelPurpose = 'chat-session-summary';
     languageModelRequirements: LanguageModelRequirement[] = [{
         purpose: 'chat-session-summary',

package/src/common/chat-tool-request-service.ts

@@ -19,10 +19,8 @@ import { injectable } from '@theia/core/shared/inversify';
 import { MutableChatRequestModel } from './chat-model';
 
 export interface ChatToolRequest extends ToolRequest {
-    handler: (
-        arg_string: string,
-        context: MutableChatRequestModel,
-    ) => Promise<unknown>;
+    handler(arg_string: string, context: MutableChatRequestModel): Promise<unknown>;
+    handler(arg_string: string, ctx?: unknown): Promise<unknown>;
 }
 
 /**

package/src/common/custom-chat-agent.ts

@@ -28,6 +28,6 @@ export class CustomChatAgent extends AbstractStreamParsingChatAgent {
     set prompt(prompt: string) {
         // the name is dynamic, so we set the propmptId here
         this.systemPromptId = `${this.name}_prompt`;
-        this.promptTemplates.push({ id: `${this.name}_prompt`, template: prompt });
+        this.prompts.push({ id: this.systemPromptId, defaultVariant: { id: `${this.name}_prompt`, template: prompt } });
     }
 }