@theia/ai-chat 1.55.1 → 1.57.0-next.22

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

@@ -23,10 +23,13 @@ import { ChatAgentService } from './chat-agent-service';
 import { AbstractStreamParsingChatAgent, ChatAgent, SystemMessageDescription } from './chat-agents';
 import { ChatRequestModelImpl, InformationalChatResponseContentImpl } from './chat-model';
 import { generateUuid } from '@theia/core';
+import { ChatHistoryEntry } from './chat-history-entry';
 
 export const orchestratorTemplate: PromptTemplate = {
     id: 'orchestrator-system',
-    template: `# Instructions
+    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 --}}
+# Instructions
 
 Your task is to identify which Chat Agent(s) should best reply a given user's message.
 You consider all messages of the conversation to ensure consistency and avoid agent switches without a clear context change.
@@ -60,7 +63,7 @@ You must only use the \`id\` attribute of the agent, never the name.
 `};
 
 export const OrchestratorChatAgentId = 'Orchestrator';
-const OrchestatorRequestIdKey = 'orchestatorRequestIdKey';
+const OrchestratorRequestIdKey = 'orchestatorRequestIdKey';
 
 @injectable()
 export class OrchestratorChatAgent extends AbstractStreamParsingChatAgent implements ChatAgent {
@@ -93,16 +96,17 @@ export class OrchestratorChatAgent extends AbstractStreamParsingChatAgent implem
     override async invoke(request: ChatRequestModelImpl): Promise<void> {
         request.response.addProgressMessage({ content: 'Determining the most appropriate agent', status: 'inProgress' });
         // We generate a dedicated ID for recording the orchestrator request/response, as we will forward the original request to another agent
-        const orchestartorRequestId = generateUuid();
-        request.addData(OrchestatorRequestIdKey, orchestartorRequestId);
-        const userPrompt = request.request.text;
-        this.recordingService.recordRequest({
-            agentId: this.id,
-            sessionId: request.session.id,
-            timestamp: Date.now(),
-            requestId: orchestartorRequestId,
-            request: userPrompt,
-        });
+        const orchestratorRequestId = generateUuid();
+        request.addData(OrchestratorRequestIdKey, orchestratorRequestId);
+        const messages = await this.getMessages(request.session);
+        const systemMessage = (await this.getSystemMessageDescription())?.text;
+        this.recordingService.recordRequest(
+            ChatHistoryEntry.fromRequest(this.id, request, {
+                requestId: orchestratorRequestId,
+                messages,
+                systemMessage
+            })
+        );
         return super.invoke(request);
     }
 
@@ -115,12 +119,11 @@ export class OrchestratorChatAgent extends AbstractStreamParsingChatAgent implem
         let agentIds: string[] = [];
         const responseText = await getTextOfResponse(response);
         // We use the previously generated, dedicated ID to log the orchestrator response before we forward the original request
-        const orchestratorRequestId = request.getDataByKey(OrchestatorRequestIdKey);
+        const orchestratorRequestId = request.getDataByKey(OrchestratorRequestIdKey);
         if (typeof orchestratorRequestId === 'string') {
             this.recordingService.recordResponse({
                 agentId: this.id,
                 sessionId: request.session.id,
-                timestamp: Date.now(),
                 requestId: orchestratorRequestId,
                 response: responseText,
             });

package/src/common/parse-contents.spec.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { expect } from 'chai';
-import { ChatResponseContent, CodeChatResponseContentImpl, MarkdownChatResponseContentImpl } from './chat-model';
+import { ChatRequestModelImpl, ChatResponseContent, CodeChatResponseContentImpl, MarkdownChatResponseContentImpl } from './chat-model';
 import { parseContents } from './parse-contents';
 import { CodeContentMatcher, ResponseContentMatcher } from './response-content-matcher';
 
@@ -33,22 +33,24 @@ export const CommandContentMatcher: ResponseContentMatcher = {
     }
 };
 
+const fakeRequest = {} as ChatRequestModelImpl;
+
 describe('parseContents', () => {
     it('should parse code content', () => {
         const text = '```typescript\nconsole.log("Hello World");\n```';
-        const result = parseContents(text);
+        const result = parseContents(text, fakeRequest);
         expect(result).to.deep.equal([new CodeChatResponseContentImpl('console.log("Hello World");', 'typescript')]);
     });
 
     it('should parse markdown content', () => {
         const text = 'Hello **World**';
-        const result = parseContents(text);
+        const result = parseContents(text, fakeRequest);
         expect(result).to.deep.equal([new MarkdownChatResponseContentImpl('Hello **World**')]);
     });
 
     it('should parse multiple content blocks', () => {
         const text = '```typescript\nconsole.log("Hello World");\n```\nHello **World**';
-        const result = parseContents(text);
+        const result = parseContents(text, fakeRequest);
         expect(result).to.deep.equal([
             new CodeChatResponseContentImpl('console.log("Hello World");', 'typescript'),
             new MarkdownChatResponseContentImpl('\nHello **World**')
@@ -57,7 +59,7 @@ describe('parseContents', () => {
 
     it('should parse multiple content blocks with different languages', () => {
         const text = '```typescript\nconsole.log("Hello World");\n```\n```python\nprint("Hello World")\n```';
-        const result = parseContents(text);
+        const result = parseContents(text, fakeRequest);
         expect(result).to.deep.equal([
             new CodeChatResponseContentImpl('console.log("Hello World");', 'typescript'),
             new CodeChatResponseContentImpl('print("Hello World")', 'python')
@@ -66,7 +68,7 @@ describe('parseContents', () => {
 
     it('should parse multiple content blocks with different languages and markdown', () => {
         const text = '```typescript\nconsole.log("Hello World");\n```\nHello **World**\n```python\nprint("Hello World")\n```';
-        const result = parseContents(text);
+        const result = parseContents(text, fakeRequest);
         expect(result).to.deep.equal([
             new CodeChatResponseContentImpl('console.log("Hello World");', 'typescript'),
             new MarkdownChatResponseContentImpl('\nHello **World**\n'),
@@ -76,7 +78,7 @@ describe('parseContents', () => {
 
     it('should parse content blocks with empty content', () => {
         const text = '```typescript\n```\nHello **World**\n```python\nprint("Hello World")\n```';
-        const result = parseContents(text);
+        const result = parseContents(text, fakeRequest);
         expect(result).to.deep.equal([
             new CodeChatResponseContentImpl('', 'typescript'),
             new MarkdownChatResponseContentImpl('\nHello **World**\n'),
@@ -86,7 +88,7 @@ describe('parseContents', () => {
 
     it('should parse content with markdown, code, and markdown', () => {
         const text = 'Hello **World**\n```typescript\nconsole.log("Hello World");\n```\nGoodbye **World**';
-        const result = parseContents(text);
+        const result = parseContents(text, fakeRequest);
         expect(result).to.deep.equal([
             new MarkdownChatResponseContentImpl('Hello **World**\n'),
             new CodeChatResponseContentImpl('console.log("Hello World");', 'typescript'),
@@ -96,25 +98,25 @@ describe('parseContents', () => {
 
     it('should handle text with no special content', () => {
         const text = 'Just some plain text.';
-        const result = parseContents(text);
+        const result = parseContents(text, fakeRequest);
         expect(result).to.deep.equal([new MarkdownChatResponseContentImpl('Just some plain text.')]);
     });
 
     it('should handle text with only start code block', () => {
         const text = '```typescript\nconsole.log("Hello World");';
-        const result = parseContents(text);
+        const result = parseContents(text, fakeRequest);
         expect(result).to.deep.equal([new MarkdownChatResponseContentImpl('```typescript\nconsole.log("Hello World");')]);
     });
 
     it('should handle text with only end code block', () => {
         const text = 'console.log("Hello World");\n```';
-        const result = parseContents(text);
+        const result = parseContents(text, fakeRequest);
         expect(result).to.deep.equal([new MarkdownChatResponseContentImpl('console.log("Hello World");\n```')]);
     });
 
     it('should handle text with unmatched code block', () => {
         const text = '```typescript\nconsole.log("Hello World");\n```\n```python\nprint("Hello World")';
-        const result = parseContents(text);
+        const result = parseContents(text, fakeRequest);
         expect(result).to.deep.equal([
             new CodeChatResponseContentImpl('console.log("Hello World");', 'typescript'),
             new MarkdownChatResponseContentImpl('\n```python\nprint("Hello World")')
@@ -123,7 +125,7 @@ describe('parseContents', () => {
 
     it('should parse code block without newline after language', () => {
         const text = '```typescript console.log("Hello World");```';
-        const result = parseContents(text);
+        const result = parseContents(text, fakeRequest);
         expect(result).to.deep.equal([
             new MarkdownChatResponseContentImpl('```typescript console.log("Hello World");```')
         ]);
@@ -131,7 +133,7 @@ describe('parseContents', () => {
 
     it('should parse with matches of multiple different matchers and default', () => {
         const text = '<command>\nMY_SPECIAL_COMMAND\n</command>\nHello **World**\n```python\nprint("Hello World")\n```\n<command>\nMY_SPECIAL_COMMAND2\n</command>';
-        const result = parseContents(text, [CodeContentMatcher, CommandContentMatcher]);
+        const result = parseContents(text, fakeRequest, [CodeContentMatcher, CommandContentMatcher]);
         expect(result).to.deep.equal([
             new CommandChatResponseContentImpl('MY_SPECIAL_COMMAND'),
             new MarkdownChatResponseContentImpl('\nHello **World**\n'),

package/src/common/parse-contents.ts

@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
  */
-import { ChatResponseContent } from './chat-model';
+import { ChatRequestModelImpl, ChatResponseContent } from './chat-model';
 import { CodeContentMatcher, MarkdownContentFactory, ResponseContentFactory, ResponseContentMatcher } from './response-content-matcher';
 
 interface Match {
@@ -24,6 +24,7 @@ interface Match {
 
 export function parseContents(
     text: string,
+    request: ChatRequestModelImpl,
     contentMatchers: ResponseContentMatcher[] = [CodeContentMatcher],
     defaultContentFactory: ResponseContentFactory = MarkdownContentFactory
 ): ChatResponseContent[] {
@@ -36,7 +37,7 @@ export function parseContents(
         if (!match) {
             // Add the remaining text as default content
             if (remainingText.length > 0) {
-                result.push(defaultContentFactory(remainingText));
+                result.push(defaultContentFactory(remainingText, request));
             }
             break;
         }
@@ -45,11 +46,11 @@ export function parseContents(
         if (match.index > 0) {
             const precedingContent = remainingText.substring(0, match.index);
             if (precedingContent.trim().length > 0) {
-                result.push(defaultContentFactory(precedingContent));
+                result.push(defaultContentFactory(precedingContent, request));
             }
         }
         // 2. Add the matched content object
-        result.push(match.matcher.contentFactory(match.content));
+        result.push(match.matcher.contentFactory(match.content, request));
         // Update currentIndex to the end of the end of the match
         // And continue with the search after the end of the match
         currentIndex += match.index + match.content.length;

package/src/common/response-content-matcher.ts

@@ -14,13 +14,14 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
  */
 import {
+    ChatRequestModelImpl,
     ChatResponseContent,
     CodeChatResponseContentImpl,
     MarkdownChatResponseContentImpl
 } from './chat-model';
 import { injectable } from '@theia/core/shared/inversify';
 
-export type ResponseContentFactory = (content: string) => ChatResponseContent;
+export type ResponseContentFactory = (content: string, request: ChatRequestModelImpl) => ChatResponseContent;
 
 export const MarkdownContentFactory: ResponseContentFactory = (content: string) =>
     new MarkdownChatResponseContentImpl(content);
@@ -33,8 +34,8 @@ export const MarkdownContentFactory: ResponseContentFactory = (content: string)
  */
 @injectable()
 export class DefaultResponseContentFactory {
-    create(content: string): ChatResponseContent {
-        return MarkdownContentFactory(content);
+    create(content: string, request: ChatRequestModelImpl): ChatResponseContent {
+        return MarkdownContentFactory(content, request);
     }
 }
 

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

@@ -23,7 +23,9 @@ import { AbstractStreamParsingChatAgent, ChatAgent, SystemMessageDescription } f
 
 export const universalTemplate: PromptTemplate = {
    id: 'universal-system',
-   template: `# Instructions
+   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 --}}
+# Instructions
 
 You are an AI assistant integrated into the Theia IDE, specifically designed to help software developers by
 providing concise and accurate answers to programming-related questions. Your role is to enhance the
@@ -76,6 +78,12 @@ simple solutions.
 `
 };
 
+export const universalTemplateVariant: PromptTemplate = {
+   id: 'universal-system-empty',
+   template: '',
+   variantOf: universalTemplate.id,
+};
+
 @injectable()
 export class UniversalChatAgent extends AbstractStreamParsingChatAgent implements ChatAgent {
    name: string;
@@ -96,7 +104,7 @@ export class UniversalChatAgent extends AbstractStreamParsingChatAgent implement
          + 'questions the user might ask. The universal agent currently does not have any context by default, i.e. it cannot '
          + 'access the current user context or the workspace.';
       this.variables = [];
-      this.promptTemplates = [universalTemplate];
+      this.promptTemplates = [universalTemplate, universalTemplateVariant];
       this.functions = [];
       this.agentSpecificVariables = [];
    }