@theia/ai-chat 1.55.0-next.97 → 1.56.0

package/src/common/chat-model.ts

@@ -80,6 +80,7 @@ export interface ChatProgressMessage {
     kind: 'progressMessage';
     id: string;
     status: 'inProgress' | 'completed' | 'failed';
+    show: 'untilFirstContent' | 'whileIncomplete' | 'forever';
     content: string;
 }
 
@@ -279,6 +280,42 @@ export namespace ErrorChatResponseContent {
     }
 }
 
+export type QuestionResponseHandler = (
+    selectedOption: { text: string, value?: string },
+) => void;
+
+export interface QuestionResponseContent extends ChatResponseContent {
+    kind: 'question';
+    question: string;
+    options: { text: string, value?: string }[];
+    selectedOption?: { text: string, value?: string };
+    handler: QuestionResponseHandler;
+    request: ChatRequestModelImpl;
+}
+
+export namespace QuestionResponseContent {
+    export function is(obj: unknown): obj is QuestionResponseContent {
+        return (
+            ChatResponseContent.is(obj) &&
+            obj.kind === 'question' &&
+            'question' in obj &&
+            typeof (obj as { question: unknown }).question === 'string' &&
+            'options' in obj &&
+            Array.isArray((obj as { options: unknown }).options) &&
+            (obj as { options: unknown[] }).options.every(option =>
+                typeof option === 'object' &&
+                option && 'text' in option &&
+                typeof (option as { text: unknown }).text === 'string' &&
+                ('value' in option ? typeof (option as { value: unknown }).value === 'string' || typeof (option as { value: unknown }).value === 'undefined' : true)
+            ) &&
+            'handler' in obj &&
+            typeof (obj as { handler: unknown }).handler === 'function' &&
+            'request' in obj &&
+            obj.request instanceof ChatRequestModelImpl
+        );
+    }
+}
+
 export interface ChatResponse {
     readonly content: ChatResponseContent[];
     asString(): string;
@@ -292,6 +329,7 @@ export interface ChatResponseModel {
     readonly response: ChatResponse;
     readonly isComplete: boolean;
     readonly isCanceled: boolean;
+    readonly isWaitingForInput: boolean;
     readonly isError: boolean;
     readonly agentId?: string
     readonly errorObject?: Error;
@@ -602,6 +640,31 @@ export class HorizontalLayoutChatResponseContentImpl implements HorizontalLayout
     }
 }
 
+/**
+ * Default implementation for the QuestionResponseContent.
+ */
+export class QuestionResponseContentImpl implements QuestionResponseContent {
+    readonly kind = 'question';
+    protected _selectedOption: { text: string; value?: string } | undefined;
+    constructor(public question: string, public options: { text: string, value?: string }[],
+        public request: ChatRequestModelImpl, public handler: QuestionResponseHandler) {
+    }
+    set selectedOption(option: { text: string; value?: string; } | undefined) {
+        this._selectedOption = option;
+        this.request.response.response.responseContentChanged();
+    }
+    get selectedOption(): { text: string; value?: string; } | undefined {
+        return this._selectedOption;
+    }
+    asString?(): string | undefined {
+        return `Question: ${this.question}
+${this.selectedOption ? `Answer: ${this.selectedOption?.text}` : 'No answer'}`;
+    }
+    merge?(): boolean {
+        return false;
+    }
+}
+
 class ChatResponseImpl implements ChatResponse {
     protected readonly _onDidChangeEmitter = new Emitter<void>();
     onDidChange: Event<void> = this._onDidChangeEmitter.event;
@@ -654,6 +717,11 @@ class ChatResponseImpl implements ChatResponse {
         this._updateResponseRepresentation();
     }
 
+    responseContentChanged(): void {
+        this._updateResponseRepresentation();
+        this._onDidChangeEmitter.fire();
+    }
+
     protected _updateResponseRepresentation(): void {
         this._responseRepresentation = this._content
             .map(responseContent => {
@@ -688,6 +756,7 @@ class ChatResponseModelImpl implements ChatResponseModel {
     protected _response: ChatResponseImpl;
     protected _isComplete: boolean;
     protected _isCanceled: boolean;
+    protected _isWaitingForInput: boolean;
     protected _agentId?: string;
     protected _isError: boolean;
     protected _errorObject: Error | undefined;
@@ -702,6 +771,7 @@ class ChatResponseModelImpl implements ChatResponseModel {
         this._response = response;
         this._isComplete = false;
         this._isCanceled = false;
+        this._isWaitingForInput = false;
         this._agentId = agentId;
     }
 
@@ -728,6 +798,7 @@ class ChatResponseModelImpl implements ChatResponseModel {
             kind: 'progressMessage',
             id,
             status: message.status ?? 'inProgress',
+            show: message.show ?? 'untilFirstContent',
             ...message,
         };
         this._progressMessages.push(newMessage);
@@ -759,6 +830,10 @@ class ChatResponseModelImpl implements ChatResponseModel {
         return this._isCanceled;
     }
 
+    get isWaitingForInput(): boolean {
+        return this._isWaitingForInput;
+    }
+
     get agentId(): string | undefined {
         return this._agentId;
     }
@@ -769,17 +844,31 @@ class ChatResponseModelImpl implements ChatResponseModel {
 
     complete(): void {
         this._isComplete = true;
+        this._isWaitingForInput = false;
         this._onDidChangeEmitter.fire();
     }
 
     cancel(): void {
         this._isComplete = true;
         this._isCanceled = true;
+        this._isWaitingForInput = false;
         this._onDidChangeEmitter.fire();
     }
+
+    waitForInput(): void {
+        this._isWaitingForInput = true;
+        this._onDidChangeEmitter.fire();
+    }
+
+    stopWaitingForInput(): void {
+        this._isWaitingForInput = false;
+        this._onDidChangeEmitter.fire();
+    }
+
     error(error: Error): void {
         this._isComplete = true;
         this._isCanceled = false;
+        this._isWaitingForInput = false;
         this._isError = true;
         this._errorObject = error;
         this._onDidChangeEmitter.fire();

package/src/common/index.ts

@@ -16,6 +16,7 @@
 export * from './chat-agents';
 export * from './chat-agent-service';
 export * from './chat-model';
+export * from './chat-model-util';
 export * from './chat-request-parser';
 export * from './chat-service';
 export * from './command-chat-agents';

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

@@ -78,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;
@@ -98,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 = [];
    }