@theia/ai-chat 1.58.2 → 1.59.0-next.62

package/src/common/chat-history-entry.ts

@@ -40,7 +40,7 @@ export namespace ChatHistoryEntry {
             agentId: agentId,
             sessionId: request.session.id,
             requestId: request.id,
-            response: request.response.response.asString(),
+            response: request.response.response.asDisplayString(),
             ...args,
         };
     }

package/src/common/chat-model.ts

@@ -23,8 +23,8 @@ import { CancellationToken, CancellationTokenSource, Command, Disposable, Emitte
 import { MarkdownString, MarkdownStringImpl } from '@theia/core/lib/common/markdown-rendering';
 import { Position } from '@theia/core/shared/vscode-languageserver-protocol';
 import { ChatAgentLocation } from './chat-agents';
-import { ParsedChatRequest, ParsedChatRequestVariablePart } from './parsed-chat-request';
-import { ResolvedAIVariable } from '@theia/ai-core';
+import { ParsedChatRequest } from './parsed-chat-request';
+import { ResolvedAIContextVariable } from '@theia/ai-core';
 
 /**********************
  * INTERFACES AND TYPE GUARDS
@@ -35,7 +35,6 @@ export type ChatChangeEvent =
     | ChatAddResponseEvent
     | ChatRemoveRequestEvent
     | ChatSetChangeSetEvent
-    | ChatSetChangeDeleteEvent
     | ChatUpdateChangeSetEvent
     | ChatRemoveChangeSetEvent;
 
@@ -52,10 +51,7 @@ export interface ChatAddResponseEvent {
 export interface ChatSetChangeSetEvent {
     kind: 'setChangeSet';
     changeSet: ChangeSet;
-}
-
-export interface ChatSetChangeDeleteEvent {
-    kind: 'deleteChangeSet';
+    oldChangeSet?: ChangeSet;
 }
 
 export interface ChatUpdateChangeSetEvent {
@@ -70,7 +66,7 @@ export interface ChatRemoveChangeSetEvent {
 
 export namespace ChatChangeEvent {
     export function isChangeSetEvent(event: ChatChangeEvent): event is ChatSetChangeSetEvent | ChatUpdateChangeSetEvent | ChatRemoveChangeSetEvent {
-        return event.kind === 'setChangeSet' || event.kind === 'deleteChangeSet' || event.kind === 'removeChangeSet' || event.kind === 'updateChangeSet';
+        return event.kind === 'setChangeSet' || event.kind === 'removeChangeSet' || event.kind === 'updateChangeSet';
     }
 }
 
@@ -93,25 +89,29 @@ export interface ChatModel {
 }
 
 export interface ChangeSet {
+    onDidChange: Event<ChangeSetChangeEvent>;
     readonly title: string;
     getElements(): ChangeSetElement[];
+    dispose(): void;
 }
 
 export interface ChangeSetElement {
     readonly uri: URI;
 
+    onDidChange?: Event<void>
     readonly name?: string;
     readonly icon?: string;
     readonly additionalInfo?: string;
 
-    readonly state?: 'pending' | 'applied' | 'discarded';
+    readonly state?: 'pending' | 'applied' | 'stale';
     readonly type?: 'add' | 'modify' | 'delete';
     readonly data?: { [key: string]: unknown };
 
     open?(): Promise<void>;
     openChange?(): Promise<void>;
-    accept?(): Promise<void>;
-    discard?(): Promise<void>;
+    apply?(): Promise<void>;
+    revert?(): Promise<void>;
+    dispose?(): void;
 }
 
 export interface ChatRequest {
@@ -119,12 +119,17 @@ export interface ChatRequest {
     readonly displayText?: string;
 }
 
+export interface ChatContext {
+    variables: ResolvedAIContextVariable[];
+}
+
 export interface ChatRequestModel {
     readonly id: string;
     readonly session: ChatModel;
     readonly request: ChatRequest;
     readonly response: ChatResponseModel;
     readonly message: ParsedChatRequest;
+    readonly context: ChatContext;
     readonly agentId?: string;
     readonly data?: { [key: string]: unknown };
 }
@@ -171,6 +176,7 @@ export interface ChatResponseContent {
      * representation of the response.
      */
     asString?(): string | undefined;
+    asDisplayString?(): string | undefined;
     merge?(nextChatResponseContent: ChatResponseContent): boolean;
 }
 
@@ -188,6 +194,11 @@ export namespace ChatResponseContent {
     ): obj is Required<Pick<ChatResponseContent, 'asString'>> & ChatResponseContent {
         return typeof obj.asString === 'function';
     }
+    export function hasDisplayString(
+        obj: ChatResponseContent
+    ): obj is Required<Pick<ChatResponseContent, 'asDisplayString'>> & ChatResponseContent {
+        return typeof obj.asDisplayString === 'function';
+    }
     export function hasMerge(
         obj: ChatResponseContent
     ): obj is Required<Pick<ChatResponseContent, 'merge'>> & ChatResponseContent {
@@ -369,7 +380,7 @@ export interface QuestionResponseContent extends ChatResponseContent {
     options: { text: string, value?: string }[];
     selectedOption?: { text: string, value?: string };
     handler: QuestionResponseHandler;
-    request: ChatRequestModelImpl;
+    request: MutableChatRequestModel;
 }
 
 export namespace QuestionResponseContent {
@@ -390,7 +401,7 @@ export namespace QuestionResponseContent {
             'handler' in obj &&
             typeof (obj as { handler: unknown }).handler === 'function' &&
             'request' in obj &&
-            obj.request instanceof ChatRequestModelImpl
+            obj.request instanceof MutableChatRequestModel
         );
     }
 }
@@ -398,6 +409,7 @@ export namespace QuestionResponseContent {
 export interface ChatResponse {
     readonly content: ChatResponseContent[];
     asString(): string;
+    asDisplayString(): string;
 }
 
 /**
@@ -459,13 +471,12 @@ export interface ChatResponseModel {
  * Implementations
  **********************/
 
-export class ChatModelImpl implements ChatModel {
+export class MutableChatModel implements ChatModel, Disposable {
     protected readonly _onDidChangeEmitter = new Emitter<ChatChangeEvent>();
     onDidChange: Event<ChatChangeEvent> = this._onDidChangeEmitter.event;
 
-    protected _requests: ChatRequestModelImpl[];
+    protected _requests: MutableChatRequestModel[];
     protected _id: string;
-    protected _changeSetListener?: Disposable;
     protected _changeSet?: ChangeSetImpl;
 
     constructor(public readonly location = ChatAgentLocation.Panel) {
@@ -474,11 +485,11 @@ export class ChatModelImpl implements ChatModel {
         this._id = generateUuid();
     }
 
-    getRequests(): ChatRequestModelImpl[] {
+    getRequests(): MutableChatRequestModel[] {
         return this._requests;
     }
 
-    getRequest(id: string): ChatRequestModelImpl | undefined {
+    getRequest(id: string): MutableChatRequestModel | undefined {
         return this._requests.find(request => request.id === id);
     }
 
@@ -491,22 +502,21 @@ export class ChatModelImpl implements ChatModel {
     }
 
     setChangeSet(changeSet: ChangeSetImpl | undefined): void {
-        this._changeSet = changeSet;
-        if (this._changeSet === undefined) {
-            this._changeSetListener?.dispose();
-            this._onDidChangeEmitter.fire({
-                kind: 'deleteChangeSet',
-            });
-            return;
+        if (!changeSet) {
+            return this.removeChangeSet();
         }
+        const oldChangeSet = this._changeSet;
+        oldChangeSet?.dispose();
+        this._changeSet = changeSet;
         this._onDidChangeEmitter.fire({
             kind: 'setChangeSet',
-            changeSet: this._changeSet,
+            changeSet,
+            oldChangeSet,
         });
-        this._changeSetListener = this._changeSet.onDidChange(() => {
+        changeSet.onDidChange(() => {
             this._onDidChangeEmitter.fire({
                 kind: 'updateChangeSet',
-                changeSet: this._changeSet!,
+                changeSet,
             });
         });
     }
@@ -515,6 +525,7 @@ export class ChatModelImpl implements ChatModel {
         if (this._changeSet) {
             const oldChangeSet = this._changeSet;
             this._changeSet = undefined;
+            oldChangeSet.dispose();
             this._onDidChangeEmitter.fire({
                 kind: 'removeChangeSet',
                 changeSet: oldChangeSet,
@@ -522,8 +533,8 @@ export class ChatModelImpl implements ChatModel {
         }
     }
 
-    addRequest(parsedChatRequest: ParsedChatRequest, agentId?: string, context: ResolvedAIVariable[] = []): ChatRequestModelImpl {
-        const requestModel = new ChatRequestModelImpl(this, parsedChatRequest, agentId, context);
+    addRequest(parsedChatRequest: ParsedChatRequest, agentId?: string, context: ChatContext = { variables: [] }): MutableChatRequestModel {
+        const requestModel = new MutableChatRequestModel(this, parsedChatRequest, agentId, context);
         this._requests.push(requestModel);
         this._onDidChangeEmitter.fire({
             kind: 'addRequest',
@@ -535,74 +546,92 @@ export class ChatModelImpl implements ChatModel {
     isEmpty(): boolean {
         return this._requests.length === 0;
     }
+
+    dispose(): void {
+        this.removeChangeSet(); // Signal disposal of last change set.
+        this._onDidChangeEmitter.dispose();
+    }
+}
+
+interface ChangeSetChangeEvent {
+    added?: URI[],
+    removed?: URI[],
+    modified?: URI[],
+    /** Fired when only the state of a given element changes, not its contents */
+    state?: URI[],
 }
 
 export class ChangeSetImpl implements ChangeSet {
-    protected readonly _onDidChangeEmitter = new Emitter<void>();
-    onDidChange: Event<void> = this._onDidChangeEmitter.event;
+    protected readonly _onDidChangeEmitter = new Emitter<ChangeSetChangeEvent>();
+    onDidChange: Event<ChangeSetChangeEvent> = this._onDidChangeEmitter.event;
 
     protected _elements: ChangeSetElement[] = [];
 
     constructor(public readonly title: string, elements: ChangeSetElement[] = []) {
-        this.addElements(elements);
+        this.addElements(...elements);
     }
 
     getElements(): ChangeSetElement[] {
         return this._elements;
     }
 
-    addElement(element: ChangeSetElement): void {
-        this.addElements([element]);
-    }
-
-    addElements(elements: ChangeSetElement[]): void {
-        this._elements.push(...elements);
-        this.notifyChange();
-    }
-
-    replaceElement(element: ChangeSetElement): boolean {
-        const index = this._elements.findIndex(e => e.uri.toString() === element.uri.toString());
-        if (index < 0) {
-            return false;
-        }
-        this._elements[index] = element;
-        this.notifyChange();
-        return true;
+    /** Will replace any element that is already present, using URI as identity criterion. */
+    addElements(...elements: ChangeSetElement[]): void {
+        const added: URI[] = [];
+        const modified: URI[] = [];
+        const toDispose: ChangeSetElement[] = [];
+        const current = new Map(this.getElements().map((element, index) => [element.uri.toString(), index]));
+        elements.forEach(element => {
+            const existingIndex = current.get(element.uri.toString());
+            if (existingIndex !== undefined) {
+                modified.push(element.uri);
+                toDispose.push(this._elements[existingIndex]);
+                this._elements[existingIndex] = element;
+            } else {
+                added.push(element.uri);
+                this._elements.push(element);
+            }
+            element.onDidChange?.(() => this.notifyChange({ state: [element.uri] }));
+        });
+        toDispose.forEach(element => element.dispose?.());
+        this.notifyChange({ added, modified });
     }
 
-    addOrReplaceElement(element: ChangeSetElement): void {
-        if (!this.replaceElement(element)) {
-            this.addElement(element);
-        }
+    removeElements(...indices: number[]): void {
+        // From highest to lowest so that we don't affect lower indices with our splicing.
+        const sorted = indices.slice().sort((left, right) => left - right);
+        const deletions = sorted.flatMap(index => this._elements.splice(index, 1));
+        deletions.forEach(deleted => deleted.dispose?.());
+        this.notifyChange({ removed: deletions.map(element => element.uri) });
     }
 
-    removeElement(index: number): void {
-        this._elements.splice(index, 1);
-        this.notifyChange();
+    protected notifyChange(change: ChangeSetChangeEvent): void {
+        this._onDidChangeEmitter.fire(change);
     }
 
-    notifyChange(): void {
-        this._onDidChangeEmitter.fire();
+    dispose(): void {
+        this._elements.forEach(element => element.dispose?.());
+        this._onDidChangeEmitter.dispose();
     }
 }
 
-export class ChatRequestModelImpl implements ChatRequestModel {
+export class MutableChatRequestModel implements ChatRequestModel {
     protected readonly _id: string;
-    protected _session: ChatModelImpl;
+    protected _session: MutableChatModel;
     protected _request: ChatRequest;
-    protected _response: ChatResponseModelImpl;
-    protected _context: ResolvedAIVariable[];
+    protected _response: MutableChatResponseModel;
+    protected _context: ChatContext;
     protected _agentId?: string;
     protected _data: { [key: string]: unknown };
 
-    constructor(session: ChatModelImpl, public readonly message: ParsedChatRequest, agentId?: string,
-        context: ResolvedAIVariable[] = [], data: { [key: string]: unknown } = {}) {
+    constructor(session: MutableChatModel, public readonly message: ParsedChatRequest, agentId?: string,
+        context: ChatContext = { variables: [] }, data: { [key: string]: unknown } = {}) {
         // TODO accept serialized data as a parameter to restore a previously saved ChatRequestModel
         this._request = message.request;
         this._id = generateUuid();
         this._session = session;
-        this._response = new ChatResponseModelImpl(this._id, agentId);
-        this._context = context.concat(message.parts.filter(part => part.kind === 'var').map(part => (part as ParsedChatRequestVariablePart).resolution));
+        this._response = new MutableChatResponseModel(this._id, agentId);
+        this._context = context;
         this._agentId = agentId;
         this._data = data;
     }
@@ -623,7 +652,7 @@ export class ChatRequestModelImpl implements ChatRequestModel {
         return this._id;
     }
 
-    get session(): ChatModelImpl {
+    get session(): MutableChatModel {
         return this._session;
     }
 
@@ -631,10 +660,14 @@ export class ChatRequestModelImpl implements ChatRequestModel {
         return this._request;
     }
 
-    get response(): ChatResponseModelImpl {
+    get response(): MutableChatResponseModel {
         return this._response;
     }
 
+    get context(): ChatContext {
+        return this._context;
+    }
+
     get agentId(): string | undefined {
         return this._agentId;
     }
@@ -674,6 +707,10 @@ export class TextChatResponseContentImpl implements TextChatResponseContent {
         return this._content;
     }
 
+    asDisplayString(): string | undefined {
+        return this.asString();
+    }
+
     merge(nextChatResponseContent: TextChatResponseContent): boolean {
         this._content += nextChatResponseContent.content;
         return true;
@@ -696,6 +733,10 @@ export class MarkdownChatResponseContentImpl implements MarkdownChatResponseCont
         return this._content.value;
     }
 
+    asDisplayString(): string | undefined {
+        return this.asString();
+    }
+
     merge(nextChatResponseContent: MarkdownChatResponseContent): boolean {
         this._content.appendMarkdown(nextChatResponseContent.content.value);
         return true;
@@ -794,6 +835,10 @@ export class ToolCallChatResponseContentImpl implements ToolCallChatResponseCont
     }
 
     asString(): string {
+        return '';
+    }
+
+    asDisplayString(): string {
         return `Tool call: ${this._name}(${this._arguments ?? ''})`;
     }
     merge(nextChatResponseContent: ToolCallChatResponseContent): boolean {
@@ -847,6 +892,10 @@ export class HorizontalLayoutChatResponseContentImpl implements HorizontalLayout
         return this._content.map(child => child.asString && child.asString()).join(' ');
     }
 
+    asDisplayString(): string | undefined {
+        return this.asString();
+    }
+
     merge(nextChatResponseContent: ChatResponseContent): boolean {
         if (HorizontalLayoutChatResponseContent.is(nextChatResponseContent)) {
             this._content.push(...nextChatResponseContent.content);
@@ -864,7 +913,7 @@ 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) {
+        public request: MutableChatRequestModel, public handler: QuestionResponseHandler) {
     }
     set selectedOption(option: { text: string; value?: string; } | undefined) {
         this._selectedOption = option;
@@ -887,6 +936,7 @@ class ChatResponseImpl implements ChatResponse {
     onDidChange: Event<void> = this._onDidChangeEmitter.event;
     protected _content: ChatResponseContent[];
     protected _responseRepresentation: string;
+    protected _responseRepresentationForDisplay: string;
 
     constructor() {
         // TODO accept serialized data as a parameter to restore a previously saved ChatResponse
@@ -940,8 +990,18 @@ class ChatResponseImpl implements ChatResponse {
     }
 
     protected _updateResponseRepresentation(): void {
-        this._responseRepresentation = this._content
+        this._responseRepresentation = this.responseRepresentationsToString(this._content, 'asString');
+        this._responseRepresentationForDisplay = this.responseRepresentationsToString(this.content, 'asDisplayString');
+    }
+
+    protected responseRepresentationsToString(content: ChatResponseContent[], collect: 'asString' | 'asDisplayString'): string {
+        return content
             .map(responseContent => {
+                if (collect === 'asDisplayString') {
+                    if (ChatResponseContent.hasDisplayString(responseContent)) {
+                        return responseContent.asDisplayString();
+                    }
+                }
                 if (ChatResponseContent.hasAsString(responseContent)) {
                     return responseContent.asString();
                 }
@@ -954,16 +1014,20 @@ class ChatResponseImpl implements ChatResponse {
                 );
                 return undefined;
             })
-            .filter(text => text !== undefined)
+            .filter(text => (text !== undefined && text !== ''))
             .join('\n\n');
     }
 
     asString(): string {
         return this._responseRepresentation;
     }
+
+    asDisplayString(): string {
+        return this._responseRepresentationForDisplay;
+    }
 }
 
-class ChatResponseModelImpl implements ChatResponseModel {
+class MutableChatResponseModel implements ChatResponseModel {
     protected readonly _onDidChangeEmitter = new Emitter<void>();
     onDidChange: Event<void> = this._onDidChangeEmitter.event;
 
@@ -1103,7 +1167,7 @@ class ChatResponseModelImpl implements ChatResponseModel {
     }
 }
 
-export class ErrorChatResponseModelImpl extends ChatResponseModelImpl {
+export class ErrorChatResponseModel extends MutableChatResponseModel {
     constructor(requestId: string, error: Error, agentId?: string) {
         super(requestId, agentId);
         this.error(error);