@theia/ai-ide 1.62.0-next.3 → 1.62.1

package/lib/common/command-prompt-template.js

@@ -13,17 +13,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.commandTemplate = void 0;
 exports.commandTemplate = {
     id: 'command-system',
-    template: `{{!-- This prompt is licensed under the MIT License (https://opensource.org/license/mit).
+    defaultVariant: {
+        id: 'command-system-default',
+        template: `{{!-- This prompt is licensed under the MIT License (https://opensource.org/license/mit).
 Made improvements or adaptations to this prompt template? We\u2019d 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. 
+You reply with stringified JSON Objects that tell the user which command to execute and its arguments, if any.
 
 # Examples
 
-The examples start with a short explanation of the return object. 
+The examples start with a short explanation of the return object.
 The response can be found within the markdown \`\`\`json and \`\`\` markers.
 Please include these markers in the reply.
 
@@ -42,7 +44,7 @@ This reply is to tell the user to execute the \`theia-ai-prompt-template:show-pr
 
 ## Example 2
 
-This reply is to tell the user to execute the \`theia-ai-prompt-template:show-prompts-command\` command that is available in the theia command registry, 
+This reply is to tell the user to execute the \`theia-ai-prompt-template:show-prompts-command\` command that is available in the theia command registry,
 when the user want to pass arguments to the command.
 
 \`\`\`json
@@ -55,9 +57,9 @@ when the user want to pass arguments to the command.
 
 ## Example 3
 
-This reply is for custom commands that are not registered in the Theia command registry. 
+This reply is for custom commands that are not registered in the Theia command registry.
 These commands always have the command id \`ai-chat.command-chat-response.generic\`.
-The arguments are an array and may differ, depending on the user's instructions. 
+The arguments are an array and may differ, depending on the user's instructions.
 
 \`\`\`json
 {
@@ -69,7 +71,7 @@ The arguments are an array and may differ, depending on the user's instructions.
 
 ## Example 4
 
-This reply of type no-command is for cases where you can't find a proper command. 
+This reply of type no-command is for cases where you can't find a proper command.
 You may use the message to explain the situation to the user.
 
 \`\`\`json
@@ -84,17 +86,17 @@ You may use the message to explain the situation to the user.
 ## Theia Commands
 
 If a user asks for a Theia command, or the context implies it is about a command in Theia, return a response with \`"type": "theia-command"\`.
-You need to exchange the "commandId". 
+You need to exchange the "commandId".
 The available command ids in Theia are in the list below. The list of commands is formatted like this:
 
 command-id1: Label1
 command-id2: Label2
-command-id3: 
+command-id3:
 command-id4: Label4
 
 The Labels may be empty, but there is always a command-id.
 
-Suggest a command that probably fits the user's message based on the label and the command ids you know. 
+Suggest a command that probably fits the user's message based on the label and the command ids you know.
 If you have multiple commands that fit, return the one that fits best. We only want a single command in the reply.
 If the user says that the last command was not right, try to return the next best fit based on the conversation history with the user.
 
@@ -122,7 +124,7 @@ In all other cases, return a reply of \`"type": "no-command"\`.
 
 ## Invalid Response Example 1
 
-This example is invalid because it returns text and two commands. 
+This example is invalid because it returns text and two commands.
 Only one command should be replied, and it must be parseable JSON.
 
 ### The Example
@@ -172,7 +174,7 @@ I found this command that might help you: core.close.right.tabs
 
 ## Invalid Response Example 4
 
-The following example is invalid because it has an explanation string before the JSON. 
+The following example is invalid because it has an explanation string before the JSON.
 We only want the JSON!
 
 ### The Example
@@ -188,7 +190,7 @@ You can toggle high contrast mode with this command:
 
 ## Invalid Response Example 5
 
-The following example is invalid because it explains that no command was found. 
+The following example is invalid because it explains that no command was found.
 We want a response of \`"type": "no-command"\` and have the message there.
 
 ### The Example
@@ -205,8 +207,8 @@ foo:toggle-visibility-explorer-view-container--files: Label 1
 foo:toggle-visibility-explorer-view-container--plugin-view: Label 2
 End List
 
-The problem is that workbench.action.toggleHighContrast is not in this list. 
-theia-command types may only use commandIds from this list. 
+The problem is that workbench.action.toggleHighContrast is not in this list.
+theia-command types may only use commandIds from this list.
 This should have been of \`"type": "no-command"\`.
 
 ### The Example
@@ -219,5 +221,6 @@ This should have been of \`"type": "no-command"\`.
 \`\`\`
 
 `
+    }
 };
 //# sourceMappingURL=command-prompt-template.js.map

package/lib/common/command-prompt-template.js.map

@@ -1 +1 @@
-{"version":3,"file":"command-prompt-template.js","sourceRoot":"","sources":["../../src/common/command-prompt-template.ts"],"names":[],"mappings":";AAAA,qDAAqD;AACrD,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,+CAA+C;AAC/C,mEAAmE;AACnE,sCAAsC;AACtC,EAAE;AACF,+BAA+B;AAC/B,gFAAgF;;;AAInE,QAAA,eAAe,GAAmB;IAC3C,EAAE,EAAE,gBAAgB;IACpB,QAAQ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6Mb;CAAC,CAAC"}
+{"version":3,"file":"command-prompt-template.js","sourceRoot":"","sources":["../../src/common/command-prompt-template.ts"],"names":[],"mappings":";AAAA,qDAAqD;AACrD,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,+CAA+C;AAC/C,mEAAmE;AACnE,sCAAsC;AACtC,EAAE;AACF,+BAA+B;AAC/B,gFAAgF;;;AAInE,QAAA,eAAe,GAAqB;IAC7C,EAAE,EAAE,gBAAgB;IACpB,cAAc,EAAE;QACZ,EAAE,EAAE,wBAAwB;QAC5B,QAAQ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6MjB;KAAC;CACD,CAAC"}

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

@@ -1,8 +1,8 @@
 import { LanguageModel, LanguageModelMessage, LanguageModelRequirement, LanguageModelResponse } from '@theia/ai-core';
 import { ChatAgentService } from '@theia/ai-chat/lib/common/chat-agent-service';
+import { ChatToolRequest } from '@theia/ai-chat/lib/common/chat-tool-request-service';
 import { AbstractStreamParsingChatAgent } from '@theia/ai-chat/lib/common/chat-agents';
 import { MutableChatRequestModel } from '@theia/ai-chat/lib/common/chat-model';
-import { ChatToolRequest } from '@theia/ai-chat/lib/common/chat-tool-request-service';
 export declare const OrchestratorChatAgentId = "Orchestrator";
 export declare class OrchestratorChatAgent extends AbstractStreamParsingChatAgent {
     id: string;
@@ -10,7 +10,7 @@ export declare class OrchestratorChatAgent extends AbstractStreamParsingChatAgen
     languageModelRequirements: LanguageModelRequirement[];
     protected defaultLanguageModelPurpose: string;
     variables: string[];
-    promptTemplates: import("@theia/ai-core").PromptTemplate[];
+    prompts: import("@theia/ai-core").PromptVariantSet[];
     description: string;
     iconClass: string;
     protected systemPromptId: string;
@@ -18,7 +18,6 @@ export declare class OrchestratorChatAgent extends AbstractStreamParsingChatAgen
     protected chatAgentService: ChatAgentService;
     invoke(request: MutableChatRequestModel): Promise<void>;
     protected sendLlmRequest(request: MutableChatRequestModel, messages: LanguageModelMessage[], toolRequests: ChatToolRequest[], languageModel: LanguageModel): Promise<LanguageModelResponse>;
-    protected onResponseComplete(request: MutableChatRequestModel): Promise<void>;
     protected addContentsToResponse(response: LanguageModelResponse, request: MutableChatRequestModel): Promise<void>;
 }
 //# sourceMappingURL=orchestrator-chat-agent.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"orchestrator-chat-agent.d.ts","sourceRoot":"","sources":["../../src/common/orchestrator-chat-agent.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAoC,aAAa,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAExJ,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,EAAE,8BAA8B,EAAE,MAAM,uCAAuC,CAAC;AACvF,OAAO,EAAE,uBAAuB,EAAwC,MAAM,sCAAsC,CAAC;AAIrH,OAAO,EAAE,eAAe,EAAE,MAAM,qDAAqD,CAAC;AAEtF,eAAO,MAAM,uBAAuB,iBAAiB,CAAC;AAGtD,qBACa,qBAAsB,SAAQ,8BAA8B;IACrE,EAAE,EAAE,MAAM,CAA2B;IACrC,IAAI,SAA2B;IAC/B,yBAAyB,EAAE,wBAAwB,EAAE,CAGlD;IACH,SAAS,CAAC,2BAA2B,EAAE,MAAM,CAAqB;IAEzD,SAAS,WAAkB;IAC3B,eAAe,4CAA0B;IACzC,WAAW,SAE+F;IAC1G,SAAS,EAAE,MAAM,CAAoC;IAE9D,UAAmB,cAAc,EAAE,MAAM,CAA2B;IAEpE,OAAO,CAAC,mBAAmB,CAAe;IAG1C,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAE9B,MAAM,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;cAU7C,cAAc,CACnC,OAAO,EAAE,uBAAuB,EAChC,QAAQ,EAAE,oBAAoB,EAAE,EAChC,YAAY,EAAE,eAAe,EAAE,EAC/B,aAAa,EAAE,aAAa,GAC7B,OAAO,CAAC,qBAAqB,CAAC;cA0BR,kBAAkB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;cAInE,qBAAqB,CAAC,QAAQ,EAAE,qBAAqB,EAAE,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CA6DnI"}
+{"version":3,"file":"orchestrator-chat-agent.d.ts","sourceRoot":"","sources":["../../src/common/orchestrator-chat-agent.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAoC,aAAa,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAExJ,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,qDAAqD,CAAC;AACtF,OAAO,EAAE,8BAA8B,EAAE,MAAM,uCAAuC,CAAC;AACvF,OAAO,EAAE,uBAAuB,EAAwC,MAAM,sCAAsC,CAAC;AAIrH,eAAO,MAAM,uBAAuB,iBAAiB,CAAC;AAGtD,qBACa,qBAAsB,SAAQ,8BAA8B;IACrE,EAAE,EAAE,MAAM,CAA2B;IACrC,IAAI,SAA2B;IAC/B,yBAAyB,EAAE,wBAAwB,EAAE,CAGlD;IACH,SAAS,CAAC,2BAA2B,EAAE,MAAM,CAAqB;IAEzD,SAAS,WAAkB;IAC3B,OAAO,8CAA0B;IACjC,WAAW,SAE+F;IAC1G,SAAS,EAAE,MAAM,CAAoC;IAE9D,UAAmB,cAAc,EAAE,MAAM,CAA2B;IAEpE,OAAO,CAAC,mBAAmB,CAAe;IAG1C,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAE9B,MAAM,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;cAS7C,cAAc,CACnC,OAAO,EAAE,uBAAuB,EAChC,QAAQ,EAAE,oBAAoB,EAAE,EAChC,YAAY,EAAE,eAAe,EAAE,EAC/B,aAAa,EAAE,aAAa,GAC7B,OAAO,CAAC,qBAAqB,CAAC;cAqBR,qBAAqB,CAAC,QAAQ,EAAE,qBAAqB,EAAE,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAwDnI"}

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

@@ -25,7 +25,7 @@ const chat_model_1 = require("@theia/ai-chat/lib/common/chat-model");
 const core_1 = require("@theia/core");
 const orchestrator_prompt_template_1 = require("./orchestrator-prompt-template");
 exports.OrchestratorChatAgentId = 'Orchestrator';
-const OrchestratorRequestIdKey = 'orchestatorRequestIdKey';
+const OrchestratorRequestIdKey = 'orchestratorRequestIdKey';
 let OrchestratorChatAgent = class OrchestratorChatAgent extends chat_agents_1.AbstractStreamParsingChatAgent {
     constructor() {
         super(...arguments);
@@ -37,7 +37,7 @@ let OrchestratorChatAgent = class OrchestratorChatAgent extends chat_agents_1.Ab
             }];
         this.defaultLanguageModelPurpose = 'agent-selection';
         this.variables = ['chatAgents'];
-        this.promptTemplates = [orchestrator_prompt_template_1.orchestratorTemplate];
+        this.prompts = [orchestrator_prompt_template_1.orchestratorTemplate];
         this.description = core_1.nls.localize('theia/ai/chat/orchestrator/description', 'This agent analyzes the user request against the description of all available chat agents and selects the best fitting agent to answer the request \
     (by using AI).The user\'s request will be directly delegated to the selected agent without further confirmation.');
         this.iconClass = 'codicon codicon-symbol-boolean';
@@ -46,24 +46,18 @@ let OrchestratorChatAgent = class OrchestratorChatAgent extends chat_agents_1.Ab
     }
     async invoke(request) {
         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
+        // We use a dedicated id for the orchestrator request
         const orchestratorRequestId = (0, core_1.generateUuid)();
         request.addData(OrchestratorRequestIdKey, orchestratorRequestId);
         return super.invoke(request);
     }
-    // override sendLlmRequest to modify the data sent to the recording service
-    // should no longer be needed after https://github.com/eclipse-theia/theia/issues/15221
     async sendLlmRequest(request, messages, toolRequests, languageModel) {
         var _a;
         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: (_a = request.getDataByKey(OrchestratorRequestIdKey)) !== null && _a !== void 0 ? _a : request.id,
-            request: messages
-        });
+        const subRequestId = (_a = request.getDataByKey(OrchestratorRequestIdKey)) !== null && _a !== void 0 ? _a : request.id;
+        request.removeData(OrchestratorRequestIdKey);
         return this.languageModelService.sendRequest(languageModel, {
             messages,
             tools,
@@ -71,24 +65,13 @@ let OrchestratorChatAgent = class OrchestratorChatAgent extends chat_agents_1.Ab
             agentId: this.id,
             sessionId: request.session.id,
             requestId: request.id,
+            subRequestId: subRequestId,
             cancellationToken: request.response.cancellationToken
         });
     }
-    // override onResponseComplete to not send data to the communication service on completion
-    // should no longer be needed after https://github.com/eclipse-theia/theia/issues/15221
-    async onResponseComplete(request) {
-        return request.response.complete();
-    }
     async addContentsToResponse(response, request) {
-        var _a, _b;
+        var _a;
         const responseText = await (0, ai_core_1.getTextOfResponse)(response);
-        // record orchestrator response
-        this.recordingService.recordResponse({
-            agentId: this.id,
-            sessionId: request.session.id,
-            requestId: (_a = request.getDataByKey(OrchestratorRequestIdKey)) !== null && _a !== void 0 ? _a : request.id,
-            response: [{ type: 'text', actor: 'ai', text: responseText }]
-        });
         let agentIds = [];
         try {
             const jsonResponse = await (0, ai_core_1.getJsonOfText)(responseText);
@@ -108,7 +91,7 @@ let OrchestratorChatAgent = class OrchestratorChatAgent extends chat_agents_1.Ab
         // check if selected (or fallback) agent exists
         if (!this.chatAgentService.getAgent(agentIds[0])) {
             this.logger.error(`Chat agent ${agentIds[0]} not found. Falling back to first registered agent.`);
-            const firstRegisteredAgent = (_b = this.chatAgentService.getAgents().filter(a => a.id !== this.id)[0]) === null || _b === void 0 ? void 0 : _b.id;
+            const firstRegisteredAgent = (_a = this.chatAgentService.getAgents().filter(a => a.id !== this.id)[0]) === null || _a === void 0 ? void 0 : _a.id;
             if (firstRegisteredAgent) {
                 agentIds = [firstRegisteredAgent];
             }
@@ -129,7 +112,9 @@ let OrchestratorChatAgent = class OrchestratorChatAgent extends chat_agents_1.Ab
         if (!agent) {
             throw new Error(`Chat agent ${delegatedToAgent} not found.`);
         }
-        await agent.invoke(request);
+        // Get the original request if available
+        const originalRequest = '__originalRequest' in request ? request.__originalRequest : request;
+        await agent.invoke(originalRequest);
     }
 };
 exports.OrchestratorChatAgent = OrchestratorChatAgent;

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

@@ -1 +1 @@
-{"version":3,"file":"orchestrator-chat-agent.js","sourceRoot":"","sources":["../../src/common/orchestrator-chat-agent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"orchestrator-chat-agent.js","sourceRoot":"","sources":["../../src/common/orchestrator-chat-agent.ts"],"names":[],"mappings":"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"}

package/lib/common/orchestrator-prompt-template.d.ts

@@ -1,3 +1,3 @@
-import { PromptTemplate } from '@theia/ai-core/lib/common';
-export declare const orchestratorTemplate: PromptTemplate;
+import { PromptVariantSet } from '@theia/ai-core/lib/common';
+export declare const orchestratorTemplate: PromptVariantSet;
 //# sourceMappingURL=orchestrator-prompt-template.d.ts.map

package/lib/common/orchestrator-prompt-template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orchestrator-prompt-template.d.ts","sourceRoot":"","sources":["../../src/common/orchestrator-prompt-template.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,eAAO,MAAM,oBAAoB,EAAE,cAoCjC,CAAC"}
+{"version":3,"file":"orchestrator-prompt-template.d.ts","sourceRoot":"","sources":["../../src/common/orchestrator-prompt-template.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D,eAAO,MAAM,oBAAoB,EAAE,gBAuClC,CAAC"}

package/lib/common/orchestrator-prompt-template.js

@@ -13,7 +13,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.orchestratorTemplate = void 0;
 exports.orchestratorTemplate = {
     id: 'orchestrator-system',
-    template: `{{!-- This prompt is licensed under the MIT License (https://opensource.org/license/mit).
+    defaultVariant: {
+        id: 'orchestrator-system-default',
+        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 --}}
 # Instructions
@@ -48,5 +50,6 @@ You must only use the \`id\` attribute of the agent, never the name.
 
 {{chatAgents}}
 `
+    }
 };
 //# sourceMappingURL=orchestrator-prompt-template.js.map

package/lib/common/orchestrator-prompt-template.js.map

@@ -1 +1 @@
-{"version":3,"file":"orchestrator-prompt-template.js","sourceRoot":"","sources":["../../src/common/orchestrator-prompt-template.ts"],"names":[],"mappings":";AAAA,qDAAqD;AACrD,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,+CAA+C;AAC/C,mEAAmE;AACnE,sCAAsC;AACtC,EAAE;AACF,+BAA+B;AAC/B,gFAAgF;;;AAInE,QAAA,oBAAoB,GAAmB;IAChD,EAAE,EAAE,qBAAqB;IACzB,QAAQ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkCb;CAAC,CAAC"}
+{"version":3,"file":"orchestrator-prompt-template.js","sourceRoot":"","sources":["../../src/common/orchestrator-prompt-template.ts"],"names":[],"mappings":";AAAA,qDAAqD;AACrD,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,+CAA+C;AAC/C,mEAAmE;AACnE,sCAAsC;AACtC,EAAE;AACF,+BAA+B;AAC/B,gFAAgF;;;AAInE,QAAA,oBAAoB,GAAqB;IAClD,EAAE,EAAE,qBAAqB;IACzB,cAAc,EAAE;QACZ,EAAE,EAAE,6BAA6B;QACjC,QAAQ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkCjB;KAAC;CACD,CAAC"}

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

@@ -7,7 +7,11 @@ export declare class UniversalChatAgent extends AbstractStreamParsingChatAgent {
     languageModelRequirements: LanguageModelRequirement[];
     protected defaultLanguageModelPurpose: string;
     description: string;
-    promptTemplates: import("@theia/ai-core/lib/common").PromptTemplate[];
+    prompts: {
+        id: string;
+        defaultVariant: import("@theia/ai-core/lib/common").BasePromptFragment;
+        variants: import("@theia/ai-core/lib/common").BasePromptFragment[];
+    }[];
     protected systemPromptId: string;
 }
 //# sourceMappingURL=universal-chat-agent.d.ts.map

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,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,EAAE,8BAA8B,EAAE,MAAM,uCAAuC,CAAC;AAIvF,eAAO,MAAM,oBAAoB,cAAc,CAAC;AAChD,qBACa,kBAAmB,SAAQ,8BAA8B;IACnE,EAAE,EAAE,MAAM,CAAwB;IAClC,IAAI,SAAwB;IAC5B,yBAAyB,EAAE,wBAAwB,EAAE,CAGlD;IACH,SAAS,CAAC,2BAA2B,EAAE,MAAM,CAAU;IAC9C,WAAW,SAGsC;IAEjD,eAAe,uDAAiD;IACzE,UAAmB,cAAc,EAAE,MAAM,CAAwB;CACnE"}
+{"version":3,"file":"universal-chat-agent.d.ts","sourceRoot":"","sources":["../../src/common/universal-chat-agent.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,EAAE,8BAA8B,EAAE,MAAM,uCAAuC,CAAC;AAIvF,eAAO,MAAM,oBAAoB,cAAc,CAAC;AAChD,qBACa,kBAAmB,SAAQ,8BAA8B;IACnE,EAAE,EAAE,MAAM,CAAwB;IAClC,IAAI,SAAwB;IAC5B,yBAAyB,EAAE,wBAAwB,EAAE,CAGlD;IACH,SAAS,CAAC,2BAA2B,EAAE,MAAM,CAAU;IAC9C,WAAW,SAGsC;IAEjD,OAAO;;;;QAAyG;IACzH,UAAmB,cAAc,EAAE,MAAM,CAAsB;CACjE"}

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

@@ -36,8 +36,8 @@ let UniversalChatAgent = class UniversalChatAgent extends chat_agents_1.Abstract
             + 'answers to general programming and software development questions. It is also the fall-back for any generic '
             + '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.promptTemplates = [universal_prompt_template_1.universalTemplate, universal_prompt_template_1.universalTemplateVariant];
-        this.systemPromptId = universal_prompt_template_1.universalTemplate.id;
+        this.prompts = [{ id: 'universal-prompt', defaultVariant: universal_prompt_template_1.universalTemplate, variants: [universal_prompt_template_1.universalTemplateVariant] }];
+        this.systemPromptId = 'universal-prompt';
     }
 };
 exports.UniversalChatAgent = UniversalChatAgent;

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;;;;AAGhF,4DAA0D;AAC1D,uEAAuF;AACvF,sCAAkC;AAClC,2EAA0F;AAE7E,QAAA,oBAAoB,GAAG,WAAW,CAAC;AAEzC,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,4CAA8B;IAA/D;;QACJ,OAAE,GAAW,4BAAoB,CAAC;QAClC,SAAI,GAAG,4BAAoB,CAAC;QAC5B,8BAAyB,GAA+B,CAAC;gBACtD,OAAO,EAAE,MAAM;gBACf,UAAU,EAAE,eAAe;aAC7B,CAAC,CAAC;QACO,gCAA2B,GAAW,MAAM,CAAC;QAC9C,gBAAW,GAAG,UAAG,CAAC,QAAQ,CAAC,qCAAqC,EAAE,uFAAuF;cAC7J,8GAA8G;cAC9G,mHAAmH;cACnH,mDAAmD,CAAC,CAAC;QAEjD,oBAAe,GAAG,CAAC,6CAAiB,EAAE,oDAAwB,CAAC,CAAC;QACtD,mBAAc,GAAW,6CAAiB,CAAC,EAAE,CAAC;IACpE,CAAC;CAAA,CAAA;AAfY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;GACA,kBAAkB,CAe9B"}
+{"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;;;;AAGhF,4DAA0D;AAC1D,uEAAuF;AACvF,sCAAkC;AAClC,2EAA0F;AAE7E,QAAA,oBAAoB,GAAG,WAAW,CAAC;AAEzC,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,4CAA8B;IAA/D;;QACJ,OAAE,GAAW,4BAAoB,CAAC;QAClC,SAAI,GAAG,4BAAoB,CAAC;QAC5B,8BAAyB,GAA+B,CAAC;gBACtD,OAAO,EAAE,MAAM;gBACf,UAAU,EAAE,eAAe;aAC7B,CAAC,CAAC;QACO,gCAA2B,GAAW,MAAM,CAAC;QAC9C,gBAAW,GAAG,UAAG,CAAC,QAAQ,CAAC,qCAAqC,EAAE,uFAAuF;cAC7J,8GAA8G;cAC9G,mHAAmH;cACnH,mDAAmD,CAAC,CAAC;QAEjD,YAAO,GAAG,CAAC,EAAE,EAAE,EAAE,kBAAkB,EAAE,cAAc,EAAE,6CAAiB,EAAE,QAAQ,EAAE,CAAC,oDAAwB,CAAC,EAAE,CAAC,CAAC;QACtG,mBAAc,GAAW,kBAAkB,CAAC;IAClE,CAAC;CAAA,CAAA;AAfY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;GACA,kBAAkB,CAe9B"}

package/lib/common/universal-prompt-template.d.ts

@@ -1,4 +1,4 @@
-import { PromptTemplate } from '@theia/ai-core/lib/common';
-export declare const universalTemplate: PromptTemplate;
-export declare const universalTemplateVariant: PromptTemplate;
+import { BasePromptFragment } from '@theia/ai-core/lib/common';
+export declare const universalTemplate: BasePromptFragment;
+export declare const universalTemplateVariant: BasePromptFragment;
 //# sourceMappingURL=universal-prompt-template.d.ts.map

package/lib/common/universal-prompt-template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"universal-prompt-template.d.ts","sourceRoot":"","sources":["../../src/common/universal-prompt-template.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAG3D,eAAO,MAAM,iBAAiB,EAAE,cAY/B,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,cAItC,CAAC"}
+{"version":3,"file":"universal-prompt-template.d.ts","sourceRoot":"","sources":["../../src/common/universal-prompt-template.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAG/D,eAAO,MAAM,iBAAiB,EAAE,kBAY/B,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,kBAGtC,CAAC"}

package/lib/common/universal-prompt-template.js

@@ -13,7 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.universalTemplateVariant = exports.universalTemplate = void 0;
 const ai_chat_1 = require("@theia/ai-chat");
 exports.universalTemplate = {
-    id: 'universal-system',
+    id: 'universal-system-default',
     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 --}}
@@ -28,6 +28,5 @@ Some files and other pieces of data may have been added by the user to the conte
 exports.universalTemplateVariant = {
     id: 'universal-system-empty',
     template: '',
-    variantOf: exports.universalTemplate.id,
 };
 //# sourceMappingURL=universal-prompt-template.js.map

package/lib/common/universal-prompt-template.js.map

@@ -1 +1 @@
-{"version":3,"file":"universal-prompt-template.js","sourceRoot":"","sources":["../../src/common/universal-prompt-template.ts"],"names":[],"mappings":";AAAA,qDAAqD;AACrD,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,+CAA+C;AAC/C,mEAAmE;AACnE,sCAAsC;AACtC,EAAE;AACF,+BAA+B;AAC/B,gFAAgF;;;AAGhF,4CAAkE;AAErD,QAAA,iBAAiB,GAAmB;IAC9C,EAAE,EAAE,kBAAkB;IACtB,QAAQ,EAAE;;;;;;;;IAQT,0CAAgC;CACnC;CACA,CAAC;AAEW,QAAA,wBAAwB,GAAmB;IACrD,EAAE,EAAE,wBAAwB;IAC5B,QAAQ,EAAE,EAAE;IACZ,SAAS,EAAE,yBAAiB,CAAC,EAAE;CACjC,CAAC"}
+{"version":3,"file":"universal-prompt-template.js","sourceRoot":"","sources":["../../src/common/universal-prompt-template.ts"],"names":[],"mappings":";AAAA,qDAAqD;AACrD,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,+CAA+C;AAC/C,mEAAmE;AACnE,sCAAsC;AACtC,EAAE;AACF,+BAA+B;AAC/B,gFAAgF;;;AAGhF,4CAAkE;AAErD,QAAA,iBAAiB,GAAuB;IAClD,EAAE,EAAE,0BAA0B;IAC9B,QAAQ,EAAE;;;;;;;;IAQT,0CAAgC;CACnC;CACA,CAAC;AAEW,QAAA,wBAAwB,GAAuB;IACzD,EAAE,EAAE,wBAAwB;IAC5B,QAAQ,EAAE,EAAE;CACd,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theia/ai-ide",
-  "version": "1.62.0-next.3+907647f99",
+  "version": "1.62.1",
   "description": "AI IDE Agents Extension",
   "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0",
   "repository": {
@@ -15,19 +15,19 @@
     "theia-extension"
   ],
   "dependencies": {
-    "@theia/ai-chat": "1.62.0-next.3+907647f99",
-    "@theia/ai-chat-ui": "1.62.0-next.3+907647f99",
-    "@theia/ai-core": "1.62.0-next.3+907647f99",
-    "@theia/ai-mcp": "1.62.0-next.3+907647f99",
-    "@theia/core": "1.62.0-next.3+907647f99",
-    "@theia/filesystem": "1.62.0-next.3+907647f99",
-    "@theia/markers": "1.62.0-next.3+907647f99",
-    "@theia/monaco": "1.62.0-next.3+907647f99",
-    "@theia/navigator": "1.62.0-next.3+907647f99",
-    "@theia/search-in-workspace": "1.62.0-next.3+907647f99",
-    "@theia/task": "1.62.0-next.3+907647f99",
-    "@theia/terminal": "1.62.0-next.3+907647f99",
-    "@theia/workspace": "1.62.0-next.3+907647f99",
+    "@theia/ai-chat": "1.62.1",
+    "@theia/ai-chat-ui": "1.62.1",
+    "@theia/ai-core": "1.62.1",
+    "@theia/ai-mcp": "1.62.1",
+    "@theia/core": "1.62.1",
+    "@theia/filesystem": "1.62.1",
+    "@theia/markers": "1.62.1",
+    "@theia/monaco": "1.62.1",
+    "@theia/navigator": "1.62.1",
+    "@theia/search-in-workspace": "1.62.1",
+    "@theia/task": "1.62.1",
+    "@theia/terminal": "1.62.1",
+    "@theia/workspace": "1.62.1",
     "date-fns": "^4.1.0",
     "ignore": "^6.0.0",
     "js-yaml": "^4.1.0",
@@ -37,8 +37,8 @@
     "access": "public"
   },
   "devDependencies": {
-    "@theia/cli": "1.62.0-next.3+907647f99",
-    "@theia/test": "1.62.0-next.3+907647f99"
+    "@theia/cli": "1.62.1",
+    "@theia/test": "1.62.1"
   },
   "theiaExtensions": [
     {
@@ -60,5 +60,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "907647f99bd78541b18e8e6133acc9246d85a8a2"
+  "gitHead": "0cdb67623c7b5ce0a2d41a1440ed0a78bce890de"
 }

package/src/browser/ai-configuration/agent-configuration-widget.tsx

@@ -19,11 +19,12 @@ import {
     AgentService,
     AISettingsService,
     AIVariableService,
+    BasePromptFragment,
     LanguageModel,
     LanguageModelRegistry,
     matchVariablesRegEx,
     PROMPT_FUNCTION_REGEX,
-    PromptCustomizationService,
+    PromptFragmentCustomizationService,
     PromptService,
 } from '@theia/ai-core/lib/common';
 import { codicon, QuickInputService, ReactWidget } from '@theia/core/lib/browser';
@@ -32,9 +33,9 @@ import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'
 import * as React from '@theia/core/shared/react';
 import { AIConfigurationSelectionService } from './ai-configuration-service';
 import { LanguageModelRenderer } from './language-model-renderer';
-import { TemplateRenderer } from './template-settings-renderer';
 import { AIVariableConfigurationWidget } from './variable-configuration-widget';
 import { nls } from '@theia/core';
+import { PromptVariantRenderer } from './template-settings-renderer';
 
 interface ParsedPrompt {
     functions: string[];
@@ -54,8 +55,8 @@ export class AIAgentConfigurationWidget extends ReactWidget {
     @inject(LanguageModelRegistry)
     protected readonly languageModelRegistry: LanguageModelRegistry;
 
-    @inject(PromptCustomizationService)
-    protected readonly promptCustomizationService: PromptCustomizationService;
+    @inject(PromptFragmentCustomizationService)
+    protected readonly promptFragmentCustomizationService: PromptFragmentCustomizationService;
 
     @inject(AISettingsService)
     protected readonly aiSettingsService: AISettingsService;
@@ -88,7 +89,7 @@ export class AIAgentConfigurationWidget extends ReactWidget {
             this.languageModels = models;
             this.update();
         }));
-        this.toDispose.push(this.promptCustomizationService.onDidChangePrompt(() => this.update()));
+        this.toDispose.push(this.promptService.onPromptsChange(() => this.update()));
 
         this.aiSettingsService.onDidChange(() => this.update());
         this.aiConfigurationSelectionService.onDidAgentChange(() => this.update());
@@ -134,7 +135,7 @@ export class AIAgentConfigurationWidget extends ReactWidget {
 
         const enabled = this.agentService.isEnabled(agent.id);
 
-        const parsedPromptParts = this.parsePromptTemplatesForVariableAndFunction(agent);
+        const parsedPromptParts = this.parsePromptFragmentsForVariableAndFunction(agent);
         const globalVariables = Array.from(new Set([...parsedPromptParts.globalVariables, ...agent.variables]));
         const functions = Array.from(new Set([...parsedPromptParts.functions, ...agent.functions]));
 
@@ -157,17 +158,16 @@ export class AIAgentConfigurationWidget extends ReactWidget {
             </div>
             <div className="ai-templates">
                 {(() => {
-                    const defaultTemplates = agent.promptTemplates?.filter(template => !template.variantOf) || [];
-                    return defaultTemplates.length > 0 ? (
-                        defaultTemplates.map(template => (
-                            <div key={agent.id + '.' + template.id}>
-                                <TemplateRenderer
-                                    key={agent.id + '.' + template.id}
+                    const prompts = agent.prompts;
+                    return prompts.length > 0 ? (
+                        prompts.map(prompt => (
+                            <div key={agent.id + '.' + prompt.id}>
+                                <PromptVariantRenderer
+                                    key={agent.id + '.' + prompt.id}
                                     agentId={agent.id}
-                                    template={template}
+                                    promptVariantSet={prompt}
                                     promptService={this.promptService}
                                     aiSettingsService={this.aiSettingsService}
-                                    promptCustomizationService={this.promptCustomizationService}
                                 />
                             </div>
                         ))
@@ -208,11 +208,18 @@ export class AIAgentConfigurationWidget extends ReactWidget {
         </div>;
     }
 
-    private parsePromptTemplatesForVariableAndFunction(agent: Agent): ParsedPrompt {
-        const promptTemplates = agent.promptTemplates;
+    private parsePromptFragmentsForVariableAndFunction(agent: Agent): ParsedPrompt {
+        const prompts = agent.prompts;
+        const promptFragments: BasePromptFragment[] = [];
+        prompts.forEach(prompt => {
+            promptFragments.push(prompt.defaultVariant);
+            if (prompt.variants) {
+                promptFragments.push(...prompt.variants);
+            }
+        });
         const result: ParsedPrompt = { functions: [], globalVariables: [], agentSpecificVariables: [] };
-        promptTemplates.forEach(template => {
-            const storedPrompt = this.promptService.getUnresolvedPrompt(template.id);
+        promptFragments.forEach(template => {
+            const storedPrompt = this.promptService.getPromptFragment(template.id);
             const prompt = storedPrompt?.template ?? template.template;
             const variableMatches = matchVariablesRegEx(prompt);
 
@@ -242,11 +249,11 @@ export class AIAgentConfigurationWidget extends ReactWidget {
     }
 
     protected async addCustomAgent(): Promise<void> {
-        const locations = await this.promptCustomizationService.getCustomAgentsLocations();
+        const locations = await this.promptFragmentCustomizationService.getCustomAgentsLocations();
 
         // If only one location is available, use the direct approach
         if (locations.length === 1) {
-            this.promptCustomizationService.openCustomAgentYaml(locations[0].uri);
+            this.promptFragmentCustomizationService.openCustomAgentYaml(locations[0].uri);
             return;
         }
 
@@ -265,7 +272,7 @@ export class AIAgentConfigurationWidget extends ReactWidget {
             const selectedItem = quickPick.selectedItems[0] as unknown as { location: { uri: URI, exists: boolean } };
             if (selectedItem && selectedItem.location) {
                 quickPick.dispose();
-                this.promptCustomizationService.openCustomAgentYaml(selectedItem.location.uri);
+                this.promptFragmentCustomizationService.openCustomAgentYaml(selectedItem.location.uri);
             }
         });
 
@@ -336,7 +343,7 @@ const AgentSpecificVariables = ({ promptVariables, agent }: AgentSpecificVariabl
     }
     return <>
         {variables.map(variableId =>
-            <AgentSpecifcVariable
+            <AgentSpecificVariable
                 key={variableId}
                 variableId={variableId}
                 agent={agent}
@@ -345,12 +352,12 @@ const AgentSpecificVariables = ({ promptVariables, agent }: AgentSpecificVariabl
         )}
     </>;
 };
-interface AgentSpecifcVariableProps {
+interface AgentSpecificVariableProps {
     variableId: string;
     agent: Agent;
     promptVariables: string[];
 }
-const AgentSpecifcVariable = ({ variableId, agent, promptVariables }: AgentSpecifcVariableProps) => {
+const AgentSpecificVariable = ({ variableId, agent, promptVariables }: AgentSpecificVariableProps) => {
     const agentDefinedVariable = agent.agentSpecificVariables.find(v => v.name === variableId);
     const undeclared = agentDefinedVariable === undefined;
     const notUsed = !promptVariables.includes(variableId) && agentDefinedVariable?.usedInPrompt === true;

package/src/browser/ai-configuration/ai-configuration-view-contribution.ts

@@ -35,7 +35,7 @@ export class AIAgentConfigurationViewContribution extends AIViewContribution<AIC
             widgetId: AIConfigurationContainerWidget.ID,
             widgetName: AIConfigurationContainerWidget.LABEL,
             defaultWidgetOptions: {
-                area: 'main',
+                area: 'bottom',
                 rank: 100
             },
             toggleCommandId: AI_CONFIGURATION_TOGGLE_COMMAND_ID