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

package/src/common/coder-replace-prompt-template.ts

@@ -9,7 +9,7 @@
 // SPDX-License-Identifier: MIT
 // *****************************************************************************
 
-import { PromptTemplate } from '@theia/ai-core/lib/common';
+import { BasePromptFragment } from '@theia/ai-core/lib/common';
 import { CHANGE_SET_SUMMARY_VARIABLE_ID } from '@theia/ai-chat';
 import {
     GET_WORKSPACE_FILE_LIST_FUNCTION_ID,
@@ -23,11 +23,129 @@ import {
 import { CONTEXT_FILES_VARIABLE_ID, TASK_CONTEXT_SUMMARY_VARIABLE_ID } from './context-variables';
 import { UPDATE_CONTEXT_FILES_FUNCTION_ID } from './context-functions';
 
+export const CODER_SYSTEM_PROMPT_ID = 'coder-prompt';
 export const CODER_REWRITE_PROMPT_TEMPLATE_ID = 'coder-rewrite';
 export const CODER_REPLACE_PROMPT_TEMPLATE_ID = 'coder-search-replace';
 export const CODER_REPLACE_PROMPT_TEMPLATE_NEXT_ID = 'coder-search-replace-next';
+export const CODER_AGENT_MODE_TEMPLATE_ID = 'coder-agent-mode';
 
-export function getCoderReplacePromptTemplateNext(): PromptTemplate {
+export function getCoderAgentModePromptTemplate(): BasePromptFragment {
+    return {
+        id: CODER_AGENT_MODE_TEMPLATE_ID,
+        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 --}}
+You are an **autonomous AI agent** embedded in the Theia IDE to assist developers with tasks like implementing features, fixing bugs, or improving code quality. 
+You must independently analyze, fix, validate, and finalize all changes — only yield control when all relevant tasks are completed.
+
+# Agent Behavior
+
+## Autonomy and Persistence
+You are an agent. **Do not stop until** the entire task is complete:
+- All code changes are applied
+- All lint issues are resolved
+- All relevant tests pass
+- New tests are written when needed
+
+You must act **without waiting** for user input unless explicitly required. Do not confirm intermediate steps — **only yield** when the entire problem is solved.
+
+## Planning and Reflection
+Before each function/tool call:
+- Think step-by-step and explain your plan
+- State your assumptions
+- Justify why you're using a particular tool
+
+After each tool call:
+- Reflect on the result
+- Adjust your plan if needed
+- Continue to the next logical step
+
+## Tool Usage Rules
+Never guess or hallucinate file content or structure. Use tools for all workspace interactions:
+
+### Workspace Exploration
+- ~{getWorkspaceDirectoryStructure} — view overall structure
+- ~{getWorkspaceFileList} — list contents of a specific directory
+- ~{getFileContent} — retrieve the content of a file
+- ~{context_addFile} — bookmark important files for context
+
+### Search and Validation
+- ~{searchInWorkspace} — locate references or patterns
+- ~{getFileDiagnostics} — detect syntax, lint, or type errors
+
+### ✍️ Code Editing
+- Before editing, always retrieve file content
+- Use:
+  - ~{changeSet_replaceContentInFile} — propose targeted code changes (multiple calls merge changes)
+  - ~{changeSet_writeChangeToFile} — completely rewrite a file when needed
+  - ~{changeSet_clearFileChanges} — clear all pending changes for a file
+- For incremental changes, use multiple ~{changeSet_replaceContentInFile} calls
+- Use the reset parameter with ~{changeSet_replaceContentInFile} to clear previous changes
+
+### Testing & Tasks
+- Use ~{listTasks} to discover available test and lint tasks
+- Use ~{runTask} to run linting, building, or test suites
+
+### Test Authoring
+If no relevant tests exist:
+- Create new test files (propose using changeSet_writeChangeToFile)
+- Use patterns from existing tests
+- Ensure new tests validate new behavior or prevent regressions
+
+# Workflow Steps
+
+## 1. Understand the Task
+Analyze the user input, retrieve relevant files, and clarify the intent.
+
+## 2. Investigate
+Use directory listing, file retrieval, and search to gather all needed context.
+
+## 3. Plan and Propose Fixes
+Develop a step-by-step strategy. Modify relevant files via tool calls.
+
+## 4. Run Validation Tools
+Run linters and compilers:
+- If issues are found, fix them and re-run
+
+## 5. Test and Iterate
+Run all relevant tests. If failures are found, debug and fix.
+- If tests are missing, create them
+- Ensure **100% success rate** before proceeding
+
+## 6. Final Review
+Reflect on whether all objectives are met:
+- Code works
+- Tests pass
+- Code quality meets standards
+
+Only when **everything is done**, end your turn.
+
+# Additional Context
+The following files have been provided for additional context. Some of them may also be referred to by the user (e.g. "this file" or "the attachment"). \
+Always look at the relevant files to understand your task using the function ~{${FILE_CONTENT_FUNCTION_ID}}
+{{${CONTEXT_FILES_VARIABLE_ID}}}
+
+# Previously Proposed Changes
+
+{{changeSetSummary}}
+
+# Project Info
+
+{{prompt:project-info}}
+
+# Final Instruction
+You are an autonomous AI agent. Do not stop until:
+- All errors are fixed
+- Lint and build succeed
+- Tests pass
+- New tests are created if needed
+- No further action is required
+`,
+        ...({ variantOf: CODER_REPLACE_PROMPT_TEMPLATE_ID }),
+    };
+}
+
+export function getCoderReplacePromptTemplateNext(): BasePromptFragment {
     return {
         id: CODER_REPLACE_PROMPT_TEMPLATE_NEXT_ID,
         template: `{{!-- This prompt is licensed under the MIT License (https://opensource.org/license/mit).
@@ -37,28 +155,30 @@ You are an AI assistant integrated into Theia IDE, designed to assist software d
 
 ## Context Retrieval
 Use the following functions to interact with the workspace files if you require context:
-- **~{${GET_WORKSPACE_DIRECTORY_STRUCTURE_FUNCTION_ID}}**: Returns the complete directory structure.
-- **~{${GET_WORKSPACE_FILE_LIST_FUNCTION_ID}}**: Lists files and directories in a specific directory.
-- **~{${FILE_CONTENT_FUNCTION_ID}}**: Retrieves the content of a specific file.
-- **~{${UPDATE_CONTEXT_FILES_FUNCTION_ID}}**: Remember file locations that are relevant for completing your tasks. Only add files that are really relevant to look at later.
+- **~{${GET_WORKSPACE_DIRECTORY_STRUCTURE_FUNCTION_ID}}**
+- **~{${GET_WORKSPACE_FILE_LIST_FUNCTION_ID}}**
+- **~{${FILE_CONTENT_FUNCTION_ID}}**
+- **~{${SEARCH_IN_WORKSPACE_FUNCTION_ID}}**
+
+Remember file locations that are relevant for completing your tasks using **~{${UPDATE_CONTEXT_FILES_FUNCTION_ID}}**
+Only add files that are really relevant to look at later.
 
 ## File Validation
-Use the following function to retrieve a list of problems in a file if the user requests fixes in a given file:
-- **~{${GET_FILE_DIAGNOSTICS_ID}}**: Retrieves a list of problems identified in a given file by tool integrations such as language servers and linters.
+Use the following function to retrieve a list of problems in a file if the user requests fixes in a given file: **~{${GET_FILE_DIAGNOSTICS_ID}}**
 
 ## Propose Code Changes
 To propose code changes or any file changes to the user, never print code or new file content in your response.
 
 Instead, for each file you want to propose changes for:
-- **Always Retrieve Current Content**: Use ${FILE_CONTENT_FUNCTION_ID} to get the latest content of the target file.
-- **Change Content**: Use ~{changeSet_writeChangeToFile} or ~{changeSet_replaceContentInFile} to propose file changes to the user.\
-If ~{changeSet_replaceContentInFile} continously fails use ~{changeSet_writeChangeToFile}. Calling a function on a file will override previous \
-function calls on the same file, so you need exactly one successful call with all proposed changes per changed file. The changes will be presented as a applicable diff to \
-the user in any case.'
-  
-## File Search
+- **Always Retrieve Current Content**: Use ${FILE_CONTENT_FUNCTION_ID} to get the original content of the target file.
+- **View Pending Changes**: Use ~{changeSet_getProposedFileState} to see the current proposed state of a file, including all pending changes.
+- **Change Content**: Use one of these methods to propose changes:
+  - ~{changeSet_replaceContentInFile}: For targeted replacements of specific text sections. Multiple calls will merge changes unless you set the reset parameter to true.
+  - ~{changeSet_writeChangeToFile}: For complete file rewrites when you need to replace the entire content. 
+  - If ~{changeSet_replaceContentInFile} continuously fails use ~{changeSet_writeChangeToFile}.
+  - ~{changeSet_clearFileChanges}: To clear all pending changes for a file and start fresh.
 
-To search for content in workspace files, use the following function: ~{${SEARCH_IN_WORKSPACE_FUNCTION_ID}}
+The changes will be presented as an applicable diff to the user in any case.
 
 ## Tasks
 
@@ -66,7 +186,7 @@ The user might want you to execute some task. You can find tasks using ~{${LIST_
 
 ## Additional Context
 
-The following files have been provided for additional context. Some of them may also be referred to by the user. \
+The following files have been provided for additional context. Some of them may also be referred to by the user (e.g. "this file" or "the attachment"). \
 Always look at the relevant files to understand your task using the function ~{${FILE_CONTENT_FUNCTION_ID}}
 {{${CONTEXT_FILES_VARIABLE_ID}}}
 
@@ -75,11 +195,13 @@ You have previously proposed changes for the following files. Some suggestions m
 {{${CHANGE_SET_SUMMARY_VARIABLE_ID}}}
 
 {{prompt:project-info}}
+
+{{${TASK_CONTEXT_SUMMARY_VARIABLE_ID}}}
 `,
         ...({ variantOf: CODER_REPLACE_PROMPT_TEMPLATE_ID }),
     };
 }
-export function getCoderReplacePromptTemplate(withSearchAndReplace: boolean = false): PromptTemplate {
+export function getCoderReplacePromptTemplate(withSearchAndReplace: boolean = false): BasePromptFragment {
     return {
         id: withSearchAndReplace ? CODER_REPLACE_PROMPT_TEMPLATE_ID : CODER_REWRITE_PROMPT_TEMPLATE_ID,
         template: `{{!-- This prompt is licensed under the MIT License (https://opensource.org/license/mit).
@@ -102,15 +224,19 @@ Use the following function to retrieve a list of problems in a file if the user
 To propose code changes or any file changes to the user, never print code or new file content in your response.
 
 Instead, for each file you want to propose changes for:
-- **Always Retrieve Current Content**: Use ${FILE_CONTENT_FUNCTION_ID} to get the latest content of the target file.
-- **Change Content**: Use ~{changeSet_writeChangeToFile}${withSearchAndReplace ? ' or ~{changeSet_replaceContentInFile}' : ''} to propose file changes to the user.\
-${withSearchAndReplace ? ' If ~{changeSet_replaceContentInFile} continously fails use ~{changeSet_writeChangeToFile}. Calling a function on a file will override previous \
-function calls on the same file, so you need exactly one successful call with all proposed changes per changed file. The changes will be presented as a applicable diff to \
-the user in any case.' : ''}
+- **Always Retrieve Current Content**: Use ${FILE_CONTENT_FUNCTION_ID} to get the original content of the target file.
+- **View Pending Changes**: Use ~{changeSet_getProposedFileState} to see the current proposed state of a file, including all pending changes.
+- **Change Content**: Use one of these methods to propose changes:
+  - ~{changeSet_replaceContentInFile}: For targeted replacements of specific text sections. Multiple calls will merge changes unless you set the reset parameter to true.
+  - ~{changeSet_writeChangeToFile}: For complete file rewrites when you need to replace the entire content. 
+  - If ~{changeSet_replaceContentInFile} continuously fails use ~{changeSet_writeChangeToFile}.
+  - ~{changeSet_clearFileChanges}: To clear all pending changes for a file and start fresh.
+
+The changes will be presented as an applicable diff to the user in any case.
 
 ## Additional Context
 
-The following files have been provided for additional context. Some of them may also be referred to by the user. \
+The following files have been provided for additional context. Some of them may also be referred to by the user (e.g. "this file" or "the attachment"). \
 Always look at the relevant files to understand your task using the function ~{${FILE_CONTENT_FUNCTION_ID}}
 {{${CONTEXT_FILES_VARIABLE_ID}}}
 

package/src/common/command-chat-agents.ts

@@ -57,7 +57,7 @@ export class CommandChatAgent extends AbstractTextToModelParsingChatAgent<Parsed
 
     override description = 'This agent is aware of all commands that the user can execute within the Theia IDE, the tool that the user is currently working with. \
     Based on the user request, it can find the right command and then let the user execute it.';
-    override promptTemplates = [commandTemplate];
+    override prompts = [commandTemplate];
     override agentSpecificVariables = [{
         name: 'command-ids',
         description: 'The list of available commands in Theia.',
@@ -69,13 +69,13 @@ export class CommandChatAgent extends AbstractTextToModelParsingChatAgent<Parsed
         for (const command of this.commandRegistry.getAllCommands()) {
             knownCommands.push(`${command.id}: ${command.label}`);
         }
-        const systemPrompt = await this.promptService.getPrompt(commandTemplate.id, {
+        const systemPrompt = await this.promptService.getResolvedPromptFragment(commandTemplate.id, {
             'command-ids': knownCommands.join('\n')
         }, context);
         if (systemPrompt === undefined) {
-            throw new Error('Couldn\'t get system prompt ');
+            throw new Error('Couldn\'t get prompt ');
         }
-        return SystemMessageDescription.fromResolvedPromptTemplate(systemPrompt);
+        return SystemMessageDescription.fromResolvedPromptFragment(systemPrompt);
     }
 
     /**

package/src/common/command-prompt-template.ts

@@ -9,21 +9,23 @@
 // SPDX-License-Identifier: MIT
 // *****************************************************************************
 
-import { PromptTemplate } from '@theia/ai-core';
+import { PromptVariantSet } from '@theia/ai-core';
 
-export const commandTemplate: PromptTemplate = {
+export const commandTemplate: PromptVariantSet = {
     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
@@ -218,4 +220,5 @@ This should have been of \`"type": "no-command"\`.
 }
 \`\`\`
 
-`};
+`}
+};

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

@@ -17,15 +17,14 @@
 import { getJsonOfText, getTextOfResponse, LanguageModel, LanguageModelMessage, LanguageModelRequirement, LanguageModelResponse } from '@theia/ai-core';
 import { inject, injectable } from '@theia/core/shared/inversify';
 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, InformationalChatResponseContentImpl } from '@theia/ai-chat/lib/common/chat-model';
 import { generateUuid, nls } from '@theia/core';
-
 import { orchestratorTemplate } from './orchestrator-prompt-template';
-import { ChatToolRequest } from '@theia/ai-chat/lib/common/chat-tool-request-service';
 
 export const OrchestratorChatAgentId = 'Orchestrator';
-const OrchestratorRequestIdKey = 'orchestatorRequestIdKey';
+const OrchestratorRequestIdKey = 'orchestratorRequestIdKey';
 
 @injectable()
 export class OrchestratorChatAgent extends AbstractStreamParsingChatAgent {
@@ -38,7 +37,7 @@ export class OrchestratorChatAgent extends AbstractStreamParsingChatAgent {
     protected defaultLanguageModelPurpose: string = 'agent-selection';
 
     override variables = ['chatAgents'];
-    override promptTemplates = [orchestratorTemplate];
+    override prompts = [orchestratorTemplate];
     override description = 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.');
@@ -53,14 +52,13 @@ export class OrchestratorChatAgent extends AbstractStreamParsingChatAgent {
 
     override async invoke(request: MutableChatRequestModel): Promise<void> {
         request.response.addProgressMessage({ content: 'Determining the most appropriate agent', status: 'inProgress' });
-        // We generate a dedicated ID for recording the orchestrator request/response, as we will forward the original request to another agent
+        // We use a dedicated id for the orchestrator request
         const orchestratorRequestId = 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
     protected override async sendLlmRequest(
         request: MutableChatRequestModel,
         messages: LanguageModelMessage[],
@@ -70,12 +68,8 @@ export class OrchestratorChatAgent extends AbstractStreamParsingChatAgent {
         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: request.getDataByKey<string>(OrchestratorRequestIdKey) ?? request.id,
-            request: messages
-        });
+        const subRequestId = request.getDataByKey<string>(OrchestratorRequestIdKey) ?? request.id;
+        request.removeData(OrchestratorRequestIdKey);
         return this.languageModelService.sendRequest(
             languageModel,
             {
@@ -85,28 +79,15 @@ export class OrchestratorChatAgent extends AbstractStreamParsingChatAgent {
                 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
-    protected override async onResponseComplete(request: MutableChatRequestModel): Promise<void> {
-        return request.response.complete();
-    }
-
     protected override async addContentsToResponse(response: LanguageModelResponse, request: MutableChatRequestModel): Promise<void> {
         const responseText = await getTextOfResponse(response);
 
-        // record orchestrator response
-        this.recordingService.recordResponse({
-            agentId: this.id,
-            sessionId: request.session.id,
-            requestId: request.getDataByKey<string>(OrchestratorRequestIdKey) ?? request.id,
-            response: [{ type: 'text', actor: 'ai', text: responseText }]
-        });
-
         let agentIds: string[] = [];
 
         try {
@@ -155,6 +136,9 @@ export class OrchestratorChatAgent extends AbstractStreamParsingChatAgent {
         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 as MutableChatRequestModel : request;
+        await agent.invoke(originalRequest);
     }
 }

package/src/common/orchestrator-prompt-template.ts

@@ -9,11 +9,13 @@
 // SPDX-License-Identifier: MIT
 // *****************************************************************************
 
-import { PromptTemplate } from '@theia/ai-core/lib/common';
+import { PromptVariantSet } from '@theia/ai-core/lib/common';
 
-export const orchestratorTemplate: PromptTemplate = {
+export const orchestratorTemplate: PromptVariantSet = {
     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
@@ -47,4 +49,5 @@ You must only use the \`id\` attribute of the agent, never the name.
 ## List of Currently Available Chat Agents
 
 {{chatAgents}}
-`};
+`}
+};

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

@@ -35,6 +35,6 @@ export class UniversalChatAgent extends AbstractStreamParsingChatAgent {
       + '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.');
 
-   override promptTemplates = [universalTemplate, universalTemplateVariant];
-   protected override systemPromptId: string = universalTemplate.id;
+   override prompts = [{ id: 'universal-prompt', defaultVariant: universalTemplate, variants: [universalTemplateVariant] }];
+   protected override systemPromptId: string = 'universal-prompt';
 }

package/src/common/universal-prompt-template.ts

@@ -9,11 +9,11 @@
 // SPDX-License-Identifier: MIT
 // *****************************************************************************
 
-import { PromptTemplate } from '@theia/ai-core/lib/common';
+import { BasePromptFragment } from '@theia/ai-core/lib/common';
 import { CHAT_CONTEXT_DETAILS_VARIABLE_ID } from '@theia/ai-chat';
 
-export const universalTemplate: PromptTemplate = {
-   id: 'universal-system',
+export const universalTemplate: BasePromptFragment = {
+   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 --}}
@@ -26,8 +26,7 @@ Some files and other pieces of data may have been added by the user to the conte
 `
 };
 
-export const universalTemplateVariant: PromptTemplate = {
+export const universalTemplateVariant: BasePromptFragment = {
    id: 'universal-system-empty',
    template: '',
-   variantOf: universalTemplate.id,
 };