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

package/lib/common/response-content-matcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"response-content-matcher.d.ts","sourceRoot":"","sources":["../../src/common/response-content-matcher.ts"],"names":[],"mappings":"AAeA,OAAO,EACH,mBAAmB,EAGtB,MAAM,cAAc,CAAC;AAGtB,MAAM,MAAM,sBAAsB,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,mBAAmB,CAAC;AAE9E,eAAO,MAAM,sBAAsB,EAAE,sBACW,CAAC;AAEjD;;;;;GAKG;AACH,qBACa,6BAA6B;IACtC,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,mBAAmB;CAG/C;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACnC,0DAA0D;IAC1D,KAAK,EAAE,MAAM,CAAC;IACd,0DAA0D;IAC1D,GAAG,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,cAAc,EAAE,sBAAsB,CAAC;CAC1C;AAED,eAAO,MAAM,kBAAkB,EAAE,sBAQhC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,eAAO,MAAM,8BAA8B,eAA2C,CAAC;AACvF,MAAM,WAAW,8BAA8B;IAC3C,QAAQ,CAAC,QAAQ,EAAE,sBAAsB,EAAE,CAAC;CAC/C;AAED,qBACa,qCAAsC,YAAW,8BAA8B;IACxF,QAAQ,CAAC,QAAQ,EAAE,sBAAsB,EAAE,CAAwB;CACtE"}
+{"version":3,"file":"response-content-matcher.d.ts","sourceRoot":"","sources":["../../src/common/response-content-matcher.ts"],"names":[],"mappings":"AAeA,OAAO,EACH,oBAAoB,EACpB,mBAAmB,EAGtB,MAAM,cAAc,CAAC;AAGtB,MAAM,MAAM,sBAAsB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,KAAK,mBAAmB,CAAC;AAE7G,eAAO,MAAM,sBAAsB,EAAE,sBACW,CAAC;AAEjD;;;;;GAKG;AACH,qBACa,6BAA6B;IACtC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,GAAG,mBAAmB;CAG9E;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACnC,0DAA0D;IAC1D,KAAK,EAAE,MAAM,CAAC;IACd,0DAA0D;IAC1D,GAAG,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,cAAc,EAAE,sBAAsB,CAAC;CAC1C;AAED,eAAO,MAAM,kBAAkB,EAAE,sBAQhC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,eAAO,MAAM,8BAA8B,eAA2C,CAAC;AACvF,MAAM,WAAW,8BAA8B;IAC3C,QAAQ,CAAC,QAAQ,EAAE,sBAAsB,EAAE,CAAC;CAC/C;AAED,qBACa,qCAAsC,YAAW,8BAA8B;IACxF,QAAQ,CAAC,QAAQ,EAAE,sBAAsB,EAAE,CAAwB;CACtE"}

package/lib/common/response-content-matcher.js

@@ -28,8 +28,8 @@ exports.MarkdownContentFactory = MarkdownContentFactory;
  * @see MarkdownChatResponseContentImpl
  */
 let DefaultResponseContentFactory = class DefaultResponseContentFactory {
-    create(content) {
-        return (0, exports.MarkdownContentFactory)(content);
+    create(content, request) {
+        return (0, exports.MarkdownContentFactory)(content, request);
     }
 };
 exports.DefaultResponseContentFactory = DefaultResponseContentFactory;

package/lib/common/response-content-matcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"response-content-matcher.js","sourceRoot":"","sources":["../../src/common/response-content-matcher.ts"],"names":[],"mappings":";;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,6CAIsB;AACtB,4DAA0D;AAInD,MAAM,sBAAsB,GAA2B,CAAC,OAAe,EAAE,EAAE,CAC9E,IAAI,4CAA+B,CAAC,OAAO,CAAC,CAAC;AADpC,QAAA,sBAAsB,0BACc;AAEjD;;;;;GAKG;AAEI,IAAM,6BAA6B,GAAnC,MAAM,6BAA6B;IACtC,MAAM,CAAC,OAAe;QAClB,OAAO,IAAA,8BAAsB,EAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;CACJ,CAAA;AAJY,sEAA6B;wCAA7B,6BAA6B;IADzC,IAAA,sBAAU,GAAE;GACA,6BAA6B,CAIzC;AAkBY,QAAA,kBAAkB,GAA2B;IACtD,KAAK,EAAE,WAAW;IAClB,GAAG,EAAE,QAAQ;IACb,cAAc,EAAE,CAAC,OAAe,EAAE,EAAE;;QAChC,MAAM,QAAQ,GAAG,CAAA,MAAA,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,0CAAG,CAAC,CAAC,KAAI,EAAE,CAAC;QACvD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;QACtD,OAAO,IAAI,wCAA2B,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC;IAClE,CAAC;CACJ,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACU,QAAA,8BAA8B,GAAG,MAAM,CAAC,gCAAgC,CAAC,CAAC;AAMhF,IAAM,qCAAqC,GAA3C,MAAM,qCAAqC;IAA3C;QACM,aAAQ,GAA6B,CAAC,0BAAkB,CAAC,CAAC;IACvE,CAAC;CAAA,CAAA;AAFY,sFAAqC;gDAArC,qCAAqC;IADjD,IAAA,sBAAU,GAAE;GACA,qCAAqC,CAEjD"}
+{"version":3,"file":"response-content-matcher.js","sourceRoot":"","sources":["../../src/common/response-content-matcher.ts"],"names":[],"mappings":";;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,6CAKsB;AACtB,4DAA0D;AAInD,MAAM,sBAAsB,GAA2B,CAAC,OAAe,EAAE,EAAE,CAC9E,IAAI,4CAA+B,CAAC,OAAO,CAAC,CAAC;AADpC,QAAA,sBAAsB,0BACc;AAEjD;;;;;GAKG;AAEI,IAAM,6BAA6B,GAAnC,MAAM,6BAA6B;IACtC,MAAM,CAAC,OAAe,EAAE,OAA6B;QACjD,OAAO,IAAA,8BAAsB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;CACJ,CAAA;AAJY,sEAA6B;wCAA7B,6BAA6B;IADzC,IAAA,sBAAU,GAAE;GACA,6BAA6B,CAIzC;AAkBY,QAAA,kBAAkB,GAA2B;IACtD,KAAK,EAAE,WAAW;IAClB,GAAG,EAAE,QAAQ;IACb,cAAc,EAAE,CAAC,OAAe,EAAE,EAAE;;QAChC,MAAM,QAAQ,GAAG,CAAA,MAAA,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,0CAAG,CAAC,CAAC,KAAI,EAAE,CAAC;QACvD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;QACtD,OAAO,IAAI,wCAA2B,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC;IAClE,CAAC;CACJ,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACU,QAAA,8BAA8B,GAAG,MAAM,CAAC,gCAAgC,CAAC,CAAC;AAMhF,IAAM,qCAAqC,GAA3C,MAAM,qCAAqC;IAA3C;QACM,aAAQ,GAA6B,CAAC,0BAAkB,CAAC,CAAC;IACvE,CAAC;CAAA,CAAA;AAFY,sFAAqC;gDAArC,qCAAqC;IADjD,IAAA,sBAAU,GAAE;GACA,qCAAqC,CAEjD"}

package/lib/common/universal-chat-agent.d.ts

@@ -2,6 +2,7 @@ import { AgentSpecificVariables } from '@theia/ai-core';
 import { PromptTemplate } from '@theia/ai-core/lib/common';
 import { AbstractStreamParsingChatAgent, ChatAgent, SystemMessageDescription } from './chat-agents';
 export declare const universalTemplate: PromptTemplate;
+export declare const universalTemplateVariant: PromptTemplate;
 export declare class UniversalChatAgent extends AbstractStreamParsingChatAgent implements ChatAgent {
     name: string;
     description: string;

package/lib/common/universal-chat-agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"universal-chat-agent.d.ts","sourceRoot":"","sources":["../../src/common/universal-chat-agent.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EACJ,cAAc,EAChB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,8BAA8B,EAAE,SAAS,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAEpG,eAAO,MAAM,iBAAiB,EAAE,cAqD/B,CAAC;AAEF,qBACa,kBAAmB,SAAQ,8BAA+B,YAAW,SAAS;IACxF,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;IAC7B,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB,EAAE,CAAC;;cAkBjC,2BAA2B,IAAI,OAAO,CAAC,wBAAwB,GAAG,SAAS,CAAC;CAKvG"}
+{"version":3,"file":"universal-chat-agent.d.ts","sourceRoot":"","sources":["../../src/common/universal-chat-agent.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EACJ,cAAc,EAChB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,8BAA8B,EAAE,SAAS,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAEpG,eAAO,MAAM,iBAAiB,EAAE,cAuD/B,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,cAItC,CAAC;AAEF,qBACa,kBAAmB,SAAQ,8BAA+B,YAAW,SAAS;IACxF,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;IAC7B,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB,EAAE,CAAC;;cAkBjC,2BAA2B,IAAI,OAAO,CAAC,wBAAwB,GAAG,SAAS,CAAC;CAKvG"}

package/lib/common/universal-chat-agent.js

@@ -15,13 +15,15 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UniversalChatAgent = exports.universalTemplate = void 0;
+exports.UniversalChatAgent = exports.universalTemplateVariant = exports.universalTemplate = void 0;
 const tslib_1 = require("tslib");
 const inversify_1 = require("@theia/core/shared/inversify");
 const chat_agents_1 = require("./chat-agents");
 exports.universalTemplate = {
     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
@@ -73,6 +75,11 @@ simple solutions.
   **Answer:** "I'm here to assist with programming-related queries. For other topics, please refer to a specialized source."
 `
 };
+exports.universalTemplateVariant = {
+    id: 'universal-system-empty',
+    template: '',
+    variantOf: exports.universalTemplate.id,
+};
 let UniversalChatAgent = class UniversalChatAgent extends chat_agents_1.AbstractStreamParsingChatAgent {
     constructor() {
         super('Universal', [{
@@ -85,7 +92,7 @@ let UniversalChatAgent = class UniversalChatAgent extends chat_agents_1.Abstract
             + '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 = [exports.universalTemplate];
+        this.promptTemplates = [exports.universalTemplate, exports.universalTemplateVariant];
         this.functions = [];
         this.agentSpecificVariables = [];
     }

package/lib/common/universal-chat-agent.js.map

@@ -1 +1 @@
-{"version":3,"file":"universal-chat-agent.js","sourceRoot":"","sources":["../../src/common/universal-chat-agent.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAMhF,4DAA0D;AAC1D,+CAAoG;AAEvF,QAAA,iBAAiB,GAAmB;IAC9C,EAAE,EAAE,kBAAkB;IACtB,QAAQ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkDZ;CACA,CAAC;AAGK,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,4CAA8B;IAQnE;QACG,KAAK,CAAC,WAAW,EAAE,CAAC;gBACjB,OAAO,EAAE,MAAM;gBACf,UAAU,EAAE,eAAe;aAC7B,CAAC,EAAE,MAAM,CAAC,CAAC;QACZ,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,uFAAuF;cACrG,8GAA8G;cAC9G,mHAAmH;cACnH,mDAAmD,CAAC;QACzD,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC,eAAe,GAAG,CAAC,yBAAiB,CAAC,CAAC;QAC3C,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC,sBAAsB,GAAG,EAAE,CAAC;IACpC,CAAC;IAEkB,KAAK,CAAC,2BAA2B;QACjD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,yBAAiB,CAAC,EAAE,CAAC,CAAC;QAChF,OAAO,cAAc,CAAC,CAAC,CAAC,sCAAwB,CAAC,0BAA0B,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3G,CAAC;CAEH,CAAA;AA7BY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;;GACA,kBAAkB,CA6B9B"}
+{"version":3,"file":"universal-chat-agent.js","sourceRoot":"","sources":["../../src/common/universal-chat-agent.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAMhF,4DAA0D;AAC1D,+CAAoG;AAEvF,QAAA,iBAAiB,GAAmB;IAC9C,EAAE,EAAE,kBAAkB;IACtB,QAAQ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoDZ;CACA,CAAC;AAEW,QAAA,wBAAwB,GAAmB;IACrD,EAAE,EAAE,wBAAwB;IAC5B,QAAQ,EAAE,EAAE;IACZ,SAAS,EAAE,yBAAiB,CAAC,EAAE;CACjC,CAAC;AAGK,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,4CAA8B;IAQnE;QACG,KAAK,CAAC,WAAW,EAAE,CAAC;gBACjB,OAAO,EAAE,MAAM;gBACf,UAAU,EAAE,eAAe;aAC7B,CAAC,EAAE,MAAM,CAAC,CAAC;QACZ,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,uFAAuF;cACrG,8GAA8G;cAC9G,mHAAmH;cACnH,mDAAmD,CAAC;QACzD,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC,eAAe,GAAG,CAAC,yBAAiB,EAAE,gCAAwB,CAAC,CAAC;QACrE,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC,sBAAsB,GAAG,EAAE,CAAC;IACpC,CAAC;IAEkB,KAAK,CAAC,2BAA2B;QACjD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,yBAAiB,CAAC,EAAE,CAAC,CAAC;QAChF,OAAO,cAAc,CAAC,CAAC,CAAC,sCAAwB,CAAC,0BAA0B,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3G,CAAC;CAEH,CAAA;AA7BY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;;GACA,kBAAkB,CA6B9B"}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@theia/ai-chat",
-  "version": "1.55.1",
+  "version": "1.57.0-next.22+35d458a96",
   "description": "Theia - AI Chat Extension",
   "dependencies": {
-    "@theia/ai-core": "1.55.1",
-    "@theia/ai-history": "1.55.1",
-    "@theia/core": "1.55.1",
-    "@theia/filesystem": "1.55.1",
-    "@theia/workspace": "1.55.1",
+    "@theia/ai-core": "1.57.0-next.22+35d458a96",
+    "@theia/ai-history": "1.57.0-next.22+35d458a96",
+    "@theia/core": "1.57.0-next.22+35d458a96",
+    "@theia/filesystem": "1.57.0-next.22+35d458a96",
+    "@theia/workspace": "1.57.0-next.22+35d458a96",
     "minimatch": "^5.1.0",
     "tslib": "^2.6.2"
   },
@@ -45,10 +45,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.55.1"
+    "@theia/ext-scripts": "1.56.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "be4713a778be16ba831af63a6fbd43b2301e882d"
+  "gitHead": "35d458a961212de264d9579305d984147fa55618"
 }

package/src/common/chat-agents.ts

@@ -39,7 +39,7 @@ import {
     MessageActor,
 } from '@theia/ai-core/lib/common';
 import { CancellationToken, CancellationTokenSource, ContributionProvider, ILogger, isArray } from '@theia/core';
-import { inject, injectable, named, postConstruct } from '@theia/core/shared/inversify';
+import { inject, injectable, named, postConstruct, unmanaged } from '@theia/core/shared/inversify';
 import { ChatAgentService } from './chat-agent-service';
 import {
     ChatModel,
@@ -52,6 +52,7 @@ import {
 } from './chat-model';
 import { findFirstMatch, parseContents } from './parse-contents';
 import { DefaultResponseContentFactory, ResponseContentMatcher, ResponseContentMatcherProvider } from './response-content-matcher';
+import { ChatHistoryEntry } from './chat-history-entry';
 
 /**
  * A conversation consists of a sequence of ChatMessages.
@@ -132,18 +133,23 @@ export abstract class AbstractChatAgent {
     protected defaultContentFactory: DefaultResponseContentFactory;
 
     constructor(
-        public id: string,
-        public languageModelRequirements: LanguageModelRequirement[],
-        protected defaultLanguageModelPurpose: string,
-        public iconClass: string = 'codicon codicon-copilot',
-        public locations: ChatAgentLocation[] = ChatAgentLocation.ALL,
-        public tags: String[] = ['Chat'],
-        public defaultLogging: boolean = true) {
+        @unmanaged() public id: string,
+        @unmanaged() public languageModelRequirements: LanguageModelRequirement[],
+        @unmanaged() protected defaultLanguageModelPurpose: string,
+        @unmanaged() public iconClass: string = 'codicon codicon-copilot',
+        @unmanaged() public locations: ChatAgentLocation[] = ChatAgentLocation.ALL,
+        @unmanaged() public tags: string[] = ['Chat'],
+        @unmanaged() public defaultLogging: boolean = true) {
     }
 
     @postConstruct()
     init(): void {
-        this.contentMatchers = this.contentMatcherProviders.getContributions().flatMap(provider => provider.matchers);
+        this.initializeContentMatchers();
+    }
+
+    protected initializeContentMatchers(): void {
+        const contributedContentMatchers = this.contentMatcherProviders.getContributions().flatMap(provider => provider.matchers);
+        this.contentMatchers.push(...contributedContentMatchers);
     }
 
     async invoke(request: ChatRequestModelImpl): Promise<void> {
@@ -152,19 +158,19 @@ export abstract class AbstractChatAgent {
             if (!languageModel) {
                 throw new Error('Couldn\'t find a matching language model. Please check your setup!');
             }
+
+            const systemMessageDescription = await this.getSystemMessageDescription();
             const messages = await this.getMessages(request.session);
             if (this.defaultLogging) {
-                this.recordingService.recordRequest({
-                    agentId: this.id,
-                    sessionId: request.session.id,
-                    timestamp: Date.now(),
-                    requestId: request.id,
-                    request: request.request.text,
-                    messages
-                });
+                this.recordingService.recordRequest(
+                    ChatHistoryEntry.fromRequest(
+                        this.id, request, {
+                        messages,
+                        systemMessage: systemMessageDescription?.text
+                    })
+                );
             }
 
-            const systemMessageDescription = await this.getSystemMessageDescription();
             const tools: Map<string, ToolRequest> = new Map();
             if (systemMessageDescription) {
                 const systemMsg: ChatMessage = {
@@ -194,24 +200,19 @@ export abstract class AbstractChatAgent {
                 cancellationToken.token
             );
             await this.addContentsToResponse(languageModelResponse, request);
-            request.response.complete();
+            await this.onResponseComplete(request);
             if (this.defaultLogging) {
-                this.recordingService.recordResponse({
-                    agentId: this.id,
-                    sessionId: request.session.id,
-                    timestamp: Date.now(),
-                    requestId: request.response.requestId,
-                    response: request.response.response.asString()
-                });
+                this.recordingService.recordResponse(ChatHistoryEntry.fromResponse(this.id, request));
             }
         } catch (e) {
             this.handleError(request, e);
         }
     }
 
-    protected parseContents(text: string): ChatResponseContent[] {
+    protected parseContents(text: string, request: ChatRequestModelImpl): ChatResponseContent[] {
         return parseContents(
             text,
+            request,
             this.contentMatchers,
             this.defaultContentFactory?.create.bind(this.defaultContentFactory)
         );
@@ -295,6 +296,16 @@ export abstract class AbstractChatAgent {
         return undefined;
     }
 
+    /**
+     * Invoked after the response by the LLM completed successfully.
+     *
+     * The default implementation sets the state of the response to `complete`.
+     * Subclasses may override this method to perform additional actions or keep the response open for processing further requests.
+     */
+    protected async onResponseComplete(request: ChatRequestModelImpl): Promise<void> {
+        return request.response.complete();
+    }
+
     protected abstract addContentsToResponse(languageModelResponse: LanguageModelResponse, request: ChatRequestModelImpl): Promise<void>;
 }
 
@@ -318,33 +329,12 @@ export abstract class AbstractStreamParsingChatAgent extends AbstractChatAgent {
 
     protected override async addContentsToResponse(languageModelResponse: LanguageModelResponse, request: ChatRequestModelImpl): Promise<void> {
         if (isLanguageModelTextResponse(languageModelResponse)) {
-            const contents = this.parseContents(languageModelResponse.text);
+            const contents = this.parseContents(languageModelResponse.text, request);
             request.response.response.addContents(contents);
-            request.response.complete();
-            if (this.defaultLogging) {
-                this.recordingService.recordResponse({
-                    agentId: this.id,
-                    sessionId: request.session.id,
-                    timestamp: Date.now(),
-                    requestId: request.response.requestId,
-                    response: request.response.response.asString()
-
-                });
-            }
             return;
         }
         if (isLanguageModelStreamResponse(languageModelResponse)) {
             await this.addStreamResponse(languageModelResponse, request);
-            request.response.complete();
-            if (this.defaultLogging) {
-                this.recordingService.recordResponse({
-                    agentId: this.id,
-                    sessionId: request.session.id,
-                    timestamp: Date.now(),
-                    requestId: request.response.requestId,
-                    response: request.response.response.asString()
-                });
-            }
             return;
         }
         this.logger.error(
@@ -359,7 +349,7 @@ export abstract class AbstractStreamParsingChatAgent extends AbstractChatAgent {
 
     protected async addStreamResponse(languageModelResponse: LanguageModelStreamResponse, request: ChatRequestModelImpl): Promise<void> {
         for await (const token of languageModelResponse.stream) {
-            const newContents = this.parse(token, request.response.response.content);
+            const newContents = this.parse(token, request);
             if (isArray(newContents)) {
                 request.response.response.addContents(newContents);
             } else {
@@ -375,7 +365,7 @@ export abstract class AbstractStreamParsingChatAgent extends AbstractChatAgent {
                 return;
             }
 
-            const result: ChatResponseContent[] = findFirstMatch(this.contentMatchers, text) ? this.parseContents(text) : [];
+            const result: ChatResponseContent[] = findFirstMatch(this.contentMatchers, text) ? this.parseContents(text, request) : [];
             if (result.length > 0) {
                 request.response.response.addContents(result);
             } else {
@@ -384,11 +374,11 @@ export abstract class AbstractStreamParsingChatAgent extends AbstractChatAgent {
         }
     }
 
-    protected parse(token: LanguageModelStreamResponsePart, previousContent: ChatResponseContent[]): ChatResponseContent | ChatResponseContent[] {
+    protected parse(token: LanguageModelStreamResponsePart, request: ChatRequestModelImpl): ChatResponseContent | ChatResponseContent[] {
         const content = token.content;
         // eslint-disable-next-line no-null/no-null
         if (content !== undefined && content !== null) {
-            return this.defaultContentFactory.create(content);
+            return this.defaultContentFactory.create(content, request);
         }
         const toolCalls = token.tool_calls;
         if (toolCalls !== undefined) {
@@ -396,7 +386,7 @@ export abstract class AbstractStreamParsingChatAgent extends AbstractChatAgent {
                 new ToolCallChatResponseContentImpl(toolCall.id, toolCall.function?.name, toolCall.function?.arguments, toolCall.finished, toolCall.result));
             return toolCallContents;
         }
-        return this.defaultContentFactory.create('');
+        return this.defaultContentFactory.create('', request);
     }
 
 }

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

@@ -0,0 +1,47 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 { CommunicationRequestEntryParam, CommunicationResponseEntryParam } from '@theia/ai-core/lib/common/communication-recording-service';
+import { ChatRequestModel } from './chat-model';
+
+export namespace ChatHistoryEntry {
+    export function fromRequest(
+        agentId: string,
+        request: ChatRequestModel,
+        args: Partial<CommunicationRequestEntryParam> = {}
+    ): CommunicationRequestEntryParam {
+        return {
+            agentId: agentId,
+            sessionId: request.session.id,
+            requestId: request.id,
+            request: request.request.text,
+            ...args,
+        };
+    }
+    export function fromResponse(
+        agentId: string,
+        request: ChatRequestModel,
+        args: Partial<CommunicationResponseEntryParam> = {}
+    ): CommunicationResponseEntryParam {
+        return {
+            agentId: agentId,
+            sessionId: request.session.id,
+            requestId: request.id,
+            response: request.response.response.asString(),
+            ...args,
+        };
+    }
+}

package/src/common/chat-model-util.ts

@@ -0,0 +1,44 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 { ChatProgressMessage, ChatRequestModel, ChatResponse, ChatResponseContent, ChatResponseModel, QuestionResponseContent } from './chat-model';
+
+export function lastResponseContent(request: ChatRequestModel): ChatResponseContent | undefined {
+    return lastContentOfResponse(request.response?.response);
+}
+
+export function lastContentOfResponse(response: ChatResponse | undefined): ChatResponseContent | undefined {
+    const content = response?.content;
+    return content && content.length > 0 ? content[content.length - 1] : undefined;
+}
+
+export function lastProgressMessage(request: ChatRequestModel): ChatProgressMessage | undefined {
+    return lastProgressMessageOfResponse(request.response);
+}
+
+export function lastProgressMessageOfResponse(response: ChatResponseModel | undefined): ChatProgressMessage | undefined {
+    const progressMessages = response?.progressMessages;
+    return progressMessages && progressMessages.length > 0 ? progressMessages[progressMessages.length - 1] : undefined;
+}
+
+export function unansweredQuestions(request: ChatRequestModel): QuestionResponseContent[] {
+    const response = request.response;
+    return unansweredQuestionsOfResponse(response);
+}
+
+function unansweredQuestionsOfResponse(response: ChatResponseModel | undefined): QuestionResponseContent[] {
+    if (!response || !response.response) { return []; }
+    return response.response.content.filter((c): c is QuestionResponseContent => QuestionResponseContent.is(c) && c.selectedOption === undefined);
+}

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/command-chat-agents.ts

@@ -36,7 +36,9 @@ import {
 
 export const commandTemplate: PromptTemplate = {
     id: 'command-system',
-    template: `# System 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 --}}
+# System Prompt
 
 You are a service that helps users find commands to execute in an IDE.
 You reply with stringified JSON Objects that tell the user which command to execute and its arguments, if any. 

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';