@theia/ai-ide 1.63.0-next.52 → 1.63.0

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

@@ -60,7 +60,7 @@ export class AIAgentConfigurationViewContribution extends AIViewContribution<AIC
             tooltip: nls.localize('theia/ai-ide/open-agent-settings-tooltip', 'Open Agent settings...'),
             group: 'ai-settings',
             priority: 2,
-            isVisible: widget => widget instanceof ChatViewWidget
+            isVisible: widget => this.activationService.isActive && widget instanceof ChatViewWidget
         });
     }
 }

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

@@ -18,7 +18,14 @@ import { ReactWidget } from '@theia/core/lib/browser';
 import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
 import * as React from '@theia/core/shared/react';
 import { HoverService } from '@theia/core/lib/browser/hover-service';
-import { MCPFrontendNotificationService, MCPFrontendService, MCPServerDescription, MCPServerStatus } from '@theia/ai-mcp/lib/common/mcp-server-manager';
+import {
+    isLocalMCPServerDescription,
+    isRemoteMCPServerDescription,
+    MCPFrontendNotificationService,
+    MCPFrontendService,
+    MCPServerDescription,
+    MCPServerStatus
+} from '@theia/ai-mcp/lib/common/mcp-server-manager';
 import { MessageService, nls } from '@theia/core';
 import { PROMPT_VARIABLE } from '@theia/ai-core/lib/common/prompt-variable-contribution';
 
@@ -67,12 +74,15 @@ export class AIMCPConfigurationWidget extends ReactWidget {
         }
         switch (status) {
             case MCPServerStatus.Running:
+            case MCPServerStatus.Connected:
                 return { bg: 'var(--theia-successBackground)', fg: 'var(--theia-successForeground)' };
             case MCPServerStatus.Starting:
+            case MCPServerStatus.Connecting:
                 return { bg: 'var(--theia-warningBackground)', fg: 'var(--theia-warningForeground)' };
             case MCPServerStatus.Errored:
                 return { bg: 'var(--theia-errorBackground)', fg: 'var(--theia-errorForeground)' };
             case MCPServerStatus.NotRunning:
+            case MCPServerStatus.NotConnected:
             default:
                 return { bg: 'var(--theia-inputValidation-infoBackground)', fg: 'var(--theia-inputValidation-infoForeground)' };
         }
@@ -106,10 +116,14 @@ export class AIMCPConfigurationWidget extends ReactWidget {
         );
     }
 
-    protected renderStatusBadge(status?: MCPServerStatus, error?: string): React.ReactNode {
-        const colors = this.getStatusColor(status);
-        const displayStatus = status || MCPServerStatus.NotRunning;
+    protected renderStatusBadge(server: MCPServerDescription): React.ReactNode {
+        const colors = this.getStatusColor(server.status);
+        let displayStatus = server.status;
+        if (!displayStatus) {
+            displayStatus = isRemoteMCPServerDescription(server) ? MCPServerStatus.NotConnected : MCPServerStatus.NotRunning;
+        }
         const spanRef = React.createRef<HTMLSpanElement>();
+        const error = server.error;
         return (
             <div className="mcp-status-container">
                 <span className="mcp-status-badge" style={{
@@ -136,12 +150,15 @@ export class AIMCPConfigurationWidget extends ReactWidget {
         return (
             <div className="mcp-server-header">
                 <div className="mcp-server-name">{server.name}</div>
-                {this.renderStatusBadge(server.status, server.error)}
+                {this.renderStatusBadge(server)}
             </div>
         );
     }
 
     protected renderCommandSection(server: MCPServerDescription): React.ReactNode {
+        if (!isLocalMCPServerDescription(server)) {
+            return;
+        }
         return (
             <div className="mcp-server-section">
                 <span className="mcp-section-label">{nls.localize('theia/ai/mcpConfiguration/command', 'Command: ')}</span>
@@ -151,7 +168,7 @@ export class AIMCPConfigurationWidget extends ReactWidget {
     }
 
     protected renderArgumentsSection(server: MCPServerDescription): React.ReactNode {
-        if (!server.args || server.args.length === 0) {
+        if (!isLocalMCPServerDescription(server) || !server.args || server.args.length === 0) {
             return;
         }
         return (
@@ -163,7 +180,7 @@ export class AIMCPConfigurationWidget extends ReactWidget {
     }
 
     protected renderEnvironmentSection(server: MCPServerDescription): React.ReactNode {
-        if (!server.env || Object.keys(server.env).length === 0) {
+        if (!isLocalMCPServerDescription(server) || !server.env || Object.keys(server.env).length === 0) {
             return;
         }
         return (
@@ -172,7 +189,7 @@ export class AIMCPConfigurationWidget extends ReactWidget {
                 <div className="mcp-env-block">
                     {Object.entries(server.env).map(([key, value]) => (
                         <div key={key}>
-                            {key}={key.toLowerCase().includes('token') ? '******' : value}
+                            {key}={key.toLowerCase().includes('token') ? '******' : String(value)}
                         </div>
                     ))}
                 </div>
@@ -180,6 +197,42 @@ export class AIMCPConfigurationWidget extends ReactWidget {
         );
     }
 
+    protected renderServerUrlSection(server: MCPServerDescription): React.ReactNode {
+        if (!isRemoteMCPServerDescription(server)) {
+            return;
+        }
+        return (
+            <div className="mcp-server-section">
+                <span className="mcp-section-label">{nls.localize('theia/ai/mcpConfiguration/serverUrl', 'Server URL: ')}</span>
+                <code className="mcp-code-block">{server.serverUrl}</code>
+            </div>
+        );
+    }
+
+    protected renderServerAuthTokenHeaderSection(server: MCPServerDescription): React.ReactNode {
+        if (!isRemoteMCPServerDescription(server) || !server.serverAuthTokenHeader) {
+            return;
+        }
+        return (
+            <div className="mcp-server-section">
+                <span className="mcp-section-label">{nls.localize('theia/ai/mcpConfiguration/serverAuthTokenHeader', 'Authentication Header Name: ')}</span>
+                <code className="mcp-code-block">{server.serverAuthTokenHeader}</code>
+            </div>
+        );
+    }
+
+    protected renderServerAuthTokenSection(server: MCPServerDescription): React.ReactNode {
+        if (!isRemoteMCPServerDescription(server) || !server.serverAuthToken) {
+            return;
+        }
+        return (
+            <div className="mcp-server-section">
+                <span className="mcp-section-label">{nls.localize('theia/ai/mcpConfiguration/serverAuthToken', 'Authentication Token: ')}</span>
+                <code className="mcp-code-block">******</code>
+            </div>
+        );
+    }
+
     protected renderAutostartSection(server: MCPServerDescription): React.ReactNode {
         return (
             <div className="mcp-server-section">
@@ -286,19 +339,31 @@ export class AIMCPConfigurationWidget extends ReactWidget {
     }
 
     protected renderServerControls(server: MCPServerDescription): React.ReactNode {
-        const isStoppable = server.status === MCPServerStatus.Running || server.status === MCPServerStatus.Starting;
-        const isStartable = server.status === MCPServerStatus.NotRunning || server.status === MCPServerStatus.Errored;
+        const isStoppable = server.status === MCPServerStatus.Running
+            || server.status === MCPServerStatus.Connected
+            || server.status === MCPServerStatus.Starting
+            || server.status === MCPServerStatus.Connecting;
+        const isStartable = server.status === MCPServerStatus.NotRunning
+            || server.status === MCPServerStatus.NotConnected
+            || server.status === MCPServerStatus.Errored;
+
+        const startLabel = isRemoteMCPServerDescription(server)
+            ? nls.localize('theia/ai/mcpConfiguration/connectServer', 'Connnect')
+            : nls.localize('theia/ai/mcpConfiguration/startServer', 'Start Server');
+        const stopLabel = isRemoteMCPServerDescription(server)
+            ? nls.localize('theia/ai/mcpConfiguration/disconnectServer', 'Disconnnect')
+            : nls.localize('theia/ai/mcpConfiguration/stopServer', 'Stop Server');
         return (
             <div className="mcp-server-controls">
                 {isStartable && this.renderButton(
-                    <><i className="codicon codicon-play"></i> {nls.localize('theia/ai/mcpConfiguration/startServer', 'Start Server')}</>,
-                    nls.localize('theia/ai/mcpConfiguration/startServer', 'Start Server'),
+                    <><i className="codicon codicon-play"></i> {startLabel}</>,
+                    startLabel,
                     () => this.handleStartServer(server.name),
                     'mcp-server-button play-button'
                 )}
                 {isStoppable && this.renderButton(
-                    <><i className="codicon codicon-close"></i> {nls.localize('theia/ai/mcpConfiguration/stopServer', 'Stop Server')}</>,
-                    nls.localize('theia/ai/mcpConfiguration/stopServer', 'Stop Server'),
+                    <><i className="codicon codicon-close"></i> {stopLabel}</>,
+                    stopLabel,
                     () => this.handleStopServer(server.name),
                     'mcp-server-button stop-button'
                 )}
@@ -313,6 +378,9 @@ export class AIMCPConfigurationWidget extends ReactWidget {
                 {this.renderCommandSection(server)}
                 {this.renderArgumentsSection(server)}
                 {this.renderEnvironmentSection(server)}
+                {this.renderServerUrlSection(server)}
+                {this.renderServerAuthTokenHeaderSection(server)}
+                {this.renderServerAuthTokenSection(server)}
                 {this.renderAutostartSection(server)}
                 {this.renderToolsSection(server)}
                 {this.renderServerControls(server)}

package/src/browser/ai-configuration/prompt-fragments-configuration-widget.tsx

@@ -346,9 +346,7 @@ export class AIPromptFragmentsConfigurationWidget extends ReactWidget {
 
         const shouldReset = await dialog.open();
         if (shouldReset) {
-            this.promptFragmentMap.forEach(fragments => {
-                this.promptService.resetToBuiltIn(fragments[0].id);
-            });
+            this.promptService.resetAllToBuiltIn();
         }
     };
 

package/src/browser/ai-configuration/template-settings-renderer.tsx

@@ -77,7 +77,7 @@ export const PromptVariantRenderer: React.FC<PromptVariantRendererProps> = ({
                         >
                             {isInvalidVariant && (
                                 <option value="invalid" disabled>
-                                    {nls.localize('theia/ai/core/templateSettings/unavailableVariant', 'The selected variant is no longer available')}
+                                    {nls.localize('theia/ai/core/templateSettings/unavailableVariant', 'Selected variant not available, default will be used')}
                                 </option>
                             )}
                             {variantIds.map(variantId => (

package/src/browser/app-tester-chat-agent.ts

@@ -26,7 +26,22 @@ import { inject, injectable } from '@theia/core/shared/inversify';
 import { MCP_SERVERS_PREF } from '@theia/ai-mcp/lib/browser/mcp-preferences';
 import { PreferenceScope, PreferenceService } from '@theia/core/lib/browser';
 
-export const EXPECTED_MCP_SERVER_NAME = 'playwright';
+export const REQUIRED_MCP_SERVERS: MCPServerDescription[] = [
+   {
+      name: 'playwright',
+      command: 'npx',
+      args: ['-y', '@playwright/mcp@latest'],
+      autostart: false,
+      env: {},
+   },
+   {
+      name: 'playwright-visual',
+      command: 'npx',
+      args: ['-y', '@playwright/mcp@latest', '--vision'],
+      autostart: false,
+      env: {},
+   }
+];
 
 // Prompt templates
 export const appTesterTemplate: BasePromptFragment = {
@@ -45,7 +60,8 @@ Your role is to inspect the application for user-specified test scenarios throug
 4. Help fix issues when needed
 
 ## Available Playwright Testing Tools
-You have access to these powerful automation tools: {{prompt:mcp_${EXPECTED_MCP_SERVER_NAME}_tools}}
+You have access to these powerful automation tools:
+${REQUIRED_MCP_SERVERS.map(server => `{{prompt:mcp_${server.name}_tools}}`)}
 
 ## Workflow Approach
 1. **Understand Requirements**: Ask the user to clearly define what needs to be tested
@@ -86,30 +102,29 @@ export class AppTesterChatAgent extends AbstractStreamParsingChatAgent {
       + 'It can automate testing workflows and provide detailed feedback on application functionality.');
 
    override iconClass: string = 'codicon codicon-beaker';
-   protected override systemPromptId: string = 'app-tester-prompt';
-   override prompts = [{ id: 'app-tester-prompt', defaultVariant: appTesterTemplate, variants: [appTesterTemplateVariant] }];
+   protected override systemPromptId: string = 'app-tester-system';
+   override prompts = [{ id: 'app-tester-system', defaultVariant: appTesterTemplate, variants: [appTesterTemplateVariant] }];
 
    /**
     * Override invoke to check if the Playwright MCP server is running, and if not, ask the user if it should be started.
     */
    override async invoke(request: MutableChatRequestModel): Promise<void> {
       try {
-         const startedServers = await this.mcpService.getStartedServers();
-         if (!startedServers.includes(EXPECTED_MCP_SERVER_NAME)) {
+         if (await this.requiresStartingServers()) {
             // Ask the user if they want to start the server
             request.response.response.addContent(new QuestionResponseContentImpl(
-               'The Playwright MCP server is not running. Would you like to start it now? This may install the Playwright MCP server.',
+               'The Playwright MCP servers are not running. Would you like to start them now? This may install the Playwright MCP servers.',
                [
-                  { text: 'Yes, start the server', value: 'yes' },
+                  { text: 'Yes, start the servers', value: 'yes' },
                   { text: 'No, cancel', value: 'no' }
                ],
                request,
                async selectedOption => {
                   if (selectedOption.value === 'yes') {
                      // Show progress
-                     const progress = request.response.addProgressMessage({ content: 'Starting Playwright MCP server.', show: 'whileIncomplete' });
+                     const progress = request.response.addProgressMessage({ content: 'Starting Playwright MCP servers.', show: 'whileIncomplete' });
                      try {
-                        await this.startPlaywrightMCPServer();
+                        await this.startServers();
                         // Remove progress, continue with normal flow
                         request.response.updateProgressMessage({ ...progress, show: 'whileIncomplete', status: 'completed' });
                         await super.invoke(request);
@@ -121,7 +136,7 @@ export class AppTesterChatAgent extends AbstractStreamParsingChatAgent {
                      }
                   } else {
                      // Continue without starting the server
-                     request.response.response.addContent(new MarkdownChatResponseContentImpl('Please setup the MCP server.'));
+                     request.response.response.addContent(new MarkdownChatResponseContentImpl('Please setup the MCP servers.'));
                      request.response.complete();
                   }
                }
@@ -139,39 +154,34 @@ export class AppTesterChatAgent extends AbstractStreamParsingChatAgent {
       }
    }
 
+   protected async requiresStartingServers(): Promise<boolean> {
+      const allStarted = await Promise.all(REQUIRED_MCP_SERVERS.map(server => this.mcpService.isServerStarted(server.name)));
+      return allStarted.some(started => !started);
+   }
+
+   protected async startServers(): Promise<void> {
+      await Promise.all(REQUIRED_MCP_SERVERS.map(server => this.ensureServerStarted(server)));
+
+   }
+
    /**
     * Starts the Playwright MCP server if it doesn't exist or isn't running.
     *
     * @returns A promise that resolves when the server is started
     */
-   async startPlaywrightMCPServer(): Promise<void> {
+   async ensureServerStarted(server: MCPServerDescription): Promise<void> {
       try {
-         const startedServers = await this.mcpService.getStartedServers();
-         if (startedServers.includes(EXPECTED_MCP_SERVER_NAME)) {
+         if ((await this.mcpService.isServerStarted(server.name))) {
             return;
          }
-
-         const mcpServer: MCPServerDescription = {
-            name: EXPECTED_MCP_SERVER_NAME,
-            command: 'npx',
-            args: ['-y', '@playwright/mcp@latest'],
-            autostart: false,
-            env: {},
-         };
-
-         const availableServers = await this.mcpService.getServerNames();
-         if (!availableServers.includes(EXPECTED_MCP_SERVER_NAME)) {
+         if (!(await this.mcpService.hasServer(server.name))) {
             const currentServers = this.preferenceService.get<Record<string, MCPServerDescription>>(MCP_SERVERS_PREF, {});
-            await this.preferenceService.set(MCP_SERVERS_PREF, {
-               ...currentServers,
-               mcpServer
-            }, PreferenceScope.User);
-
-            await this.mcpService.addOrUpdateServer(mcpServer);
+            await this.preferenceService.set(MCP_SERVERS_PREF, { ...currentServers, server }, PreferenceScope.User);
+            await this.mcpService.addOrUpdateServer(server);
          }
-         await this.mcpService.startServer(EXPECTED_MCP_SERVER_NAME);
+         await this.mcpService.startServer(server.name);
       } catch (error) {
-         this.logger.error(`Error starting Playwright MCP server: ${error}`);
+         this.logger.error(`Error starting MCP server ${server.name}: ${error}`);
          throw error;
       }
    }

package/src/browser/architect-agent.ts

@@ -16,7 +16,7 @@
 import { AbstractStreamParsingChatAgent, ChatRequestModel, ChatService, ChatSession, MutableChatModel, MutableChatRequestModel } from '@theia/ai-chat/lib/common';
 import { LanguageModelRequirement } from '@theia/ai-core';
 import { inject, injectable } from '@theia/core/shared/inversify';
-import { architectVariants } from '../common/architect-prompt-template';
+import { architectSystemVariants, architectTaskSummaryVariants } from '../common/architect-prompt-template';
 import { FILE_CONTENT_FUNCTION_ID, GET_WORKSPACE_FILE_LIST_FUNCTION_ID } from '../common/workspace-functions';
 import { nls } from '@theia/core';
 import { MarkdownStringImpl } from '@theia/core/lib/common/markdown-rendering';
@@ -38,9 +38,9 @@ export class ArchitectAgent extends AbstractStreamParsingChatAgent {
         'An AI assistant integrated into Theia IDE, designed to assist software developers. This agent can access the users workspace, it can get a list of all available files \
          and folders and retrieve their content. It cannot modify files. It can therefore answer questions about the current project, project files and source code in the \
          workspace, such as how to build the project, where to put source code, where to find specific code or configurations, etc.');
-    override prompts = [architectVariants];
+    override prompts = [architectSystemVariants, architectTaskSummaryVariants];
     override functions = [GET_WORKSPACE_FILE_LIST_FUNCTION_ID, FILE_CONTENT_FUNCTION_ID];
-    protected override systemPromptId: string | undefined = architectVariants.id;
+    protected override systemPromptId: string | undefined = architectSystemVariants.id;
 
     override async invoke(request: MutableChatRequestModel): Promise<void> {
         await super.invoke(request);

package/src/browser/summarize-session-command-contribution.ts

@@ -26,6 +26,7 @@ import { FILE_VARIABLE } from '@theia/ai-core/lib/browser/file-variable-contribu
 import { AIVariableResolutionRequest } from '@theia/ai-core';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
+import { AICommandHandlerFactory } from '@theia/ai-core/lib/browser';
 
 @injectable()
 export class SummarizeSessionCommandContribution implements CommandContribution {
@@ -50,8 +51,11 @@ export class SummarizeSessionCommandContribution implements CommandContribution
     @inject(WorkspaceService)
     protected readonly wsService: WorkspaceService;
 
+    @inject(AICommandHandlerFactory)
+    protected readonly commandHandlerFactory: AICommandHandlerFactory;
+
     registerCommands(registry: CommandRegistry): void {
-        registry.registerCommand(AI_UPDATE_TASK_CONTEXT_COMMAND, {
+        registry.registerCommand(AI_UPDATE_TASK_CONTEXT_COMMAND, this.commandHandlerFactory({
             execute: async () => {
                 const activeSession = this.chatService.getActiveSession();
 
@@ -68,9 +72,9 @@ export class SummarizeSessionCommandContribution implements CommandContribution
                     await this.taskContextService.update(activeSession, ARCHITECT_TASK_SUMMARY_UPDATE_PROMPT_TEMPLATE_ID);
                 }
             }
-        });
+        }));
 
-        registry.registerCommand(AI_SUMMARIZE_SESSION_AS_TASK_FOR_CODER, {
+        registry.registerCommand(AI_SUMMARIZE_SESSION_AS_TASK_FOR_CODER, this.commandHandlerFactory({
             execute: async () => {
                 const activeSession = this.chatService.getActiveSession();
 
@@ -104,6 +108,6 @@ export class SummarizeSessionCommandContribution implements CommandContribution
                     newSession.model.context.addVariables(summaryVariable);
                 }
             }
-        });
+        }));
     }
 }

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

@@ -16,10 +16,10 @@ 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 ARCHITECT_TASK_SUMMARY_PROMPT_TEMPLATE_ID = 'architect-task-summary';
-export const ARCHITECT_TASK_SUMMARY_UPDATE_PROMPT_TEMPLATE_ID = 'architect-update-task-summary';
+export const ARCHITECT_TASK_SUMMARY_PROMPT_TEMPLATE_ID = 'architect-tasksummary-create';
+export const ARCHITECT_TASK_SUMMARY_UPDATE_PROMPT_TEMPLATE_ID = 'architect-tasksummary-update';
 
-export const architectVariants = <PromptVariantSet>{
+export const architectSystemVariants = <PromptVariantSet>{
     id: 'architect-system',
     defaultVariant: {
         id: 'architect-system-default',
@@ -28,69 +28,73 @@ Made improvements or adaptations to this prompt template? We'd love for you to s
 https://github.com/eclipse-theia/theia/discussions/new?category=prompt-template-contribution --}}
 # Instructions
 
-You are an AI assistant integrated into Theia IDE, designed to assist software developers. You can't change any files, but you can navigate and read the users workspace using \
-the provided functions. Therefore describe and explain the details or procedures necessary to achieve the desired outcome. If file changes are necessary to help the user, be \
+You are an AI assistant integrated into Theia IDE, designed to assist software developers. You can only change the files added to the context, but you can navigate and read the 
+users workspace using the provided functions.\
+Therefore describe and explain the details or procedures necessary to achieve the desired outcome. If file changes are necessary to help the user, be \
 aware that there is another agent called 'Coder' that can suggest file changes. In this case you can create a description on what to do and tell the user to ask '@Coder' to \
 implement the change plan. If you refer to files, always mention the workspace-relative path.\
 
-Use the following functions to interact with the workspace files as needed:
-- **~{${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.
-
-### Workspace Navigation Guidelines
+## Context Retrieval
+Use the following functions to interact with the workspace files if you require context:
+- **~{${GET_WORKSPACE_DIRECTORY_STRUCTURE_FUNCTION_ID}}**
+- **~{${GET_WORKSPACE_FILE_LIST_FUNCTION_ID}}**
+- **~{${FILE_CONTENT_FUNCTION_ID}}**
+- **~{${SEARCH_IN_WORKSPACE_FUNCTION_ID}}**
 
-1. **Start at the Root**: For general questions (e.g., "How to build the project"), check root-level documentation files or setup files before browsing subdirectories.
-2. **Confirm Paths**: Always verify paths by listing directories or files as you navigate. Avoid assumptions based on user input alone.
-3. **Navigate Step-by-Step**: Move into subdirectories only as needed, confirming each directory level.
+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. 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}}**
 ## 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}}}
 
 {{prompt:project-info}}
+
+{{${TASK_CONTEXT_SUMMARY_VARIABLE_ID}}}
 `
     },
     variants: [
         {
-            id: 'architect-system-next',
+            id: 'architect-system-simple',
             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
-
-You are an AI assistant integrated into Theia IDE, designed to assist software developers. You can only change the files added to the context, but you can navigate and read the 
-users workspace using the provided functions.\
-Therefore describe and explain the details or procedures necessary to achieve the desired outcome. If file changes are necessary to help the user, be \
+    
+You are an AI assistant integrated into Theia IDE, designed to assist software developers. You can't change any files, but you can navigate and read the users workspace using \
+the provided functions. Therefore describe and explain the details or procedures necessary to achieve the desired outcome. If file changes are necessary to help the user, be \
 aware that there is another agent called 'Coder' that can suggest file changes. In this case you can create a description on what to do and tell the user to ask '@Coder' to \
 implement the change plan. If you refer to files, always mention the workspace-relative path.\
+    
+Use the following functions to interact with the workspace files as needed:
+- **~{${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.
+    
+### Workspace Navigation Guidelines
 
-## Context Retrieval
-Use the following functions to interact with the workspace files if you require context:
-- **~{${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. Only add files that are really relevant to look at later.
+1. **Start at the Root**: For general questions (e.g., "How to build the project"), check root-level documentation files or setup files before browsing subdirectories.
+2. **Confirm Paths**: Always verify paths by listing directories or files as you navigate. Avoid assumptions based on user input alone.
+3. **Navigate Step-by-Step**: Move into subdirectories only as needed, confirming each directory level.
 
-## 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}}**
 ## 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}}}
 
 {{prompt:project-info}}
-
-{{${TASK_CONTEXT_SUMMARY_VARIABLE_ID}}}
 `
-        },
-        {
-            id: ARCHITECT_TASK_SUMMARY_PROMPT_TEMPLATE_ID,
-            template: `{{!-- This prompt is licensed under the MIT License (https://opensource.org/license/mit).
+        }]
+};
+
+export const architectTaskSummaryVariants = <PromptVariantSet>{
+    id: 'architect-tasksummary',
+    defaultVariant: {
+        id: ARCHITECT_TASK_SUMMARY_PROMPT_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 --}}
 
@@ -217,7 +221,9 @@ Use the following format, but only include the sections that were discussed in t
 **Next Steps:**  
 - [Immediate action items, who should act next.]
 `
-        },
+    },
+    variants: [
+
         {
             id: ARCHITECT_TASK_SUMMARY_UPDATE_PROMPT_TEMPLATE_ID,
             template: `{{!-- This prompt is licensed under the MIT License (https://opensource.org/license/mit).

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

@@ -31,11 +31,11 @@ import {
     GET_PROPOSED_CHANGES_ID
 } from './file-changeset-function-ids';
 
-export const CODER_SYSTEM_PROMPT_ID = 'coder-prompt';
+export const CODER_SYSTEM_PROMPT_ID = 'coder-system';
 
-export const CODER_SIMPLE_EDIT_TEMPLATE_ID = 'coder-simple-edit';
-export const CODER_EDIT_TEMPLATE_ID = 'coder-edit';
-export const CODER_AGENT_MODE_TEMPLATE_ID = 'coder-agent-mode';
+export const CODER_SIMPLE_EDIT_TEMPLATE_ID = 'coder-system-simple-edit';
+export const CODER_EDIT_TEMPLATE_ID = 'coder-system-edit';
+export const CODER_AGENT_MODE_TEMPLATE_ID = 'coder-system-agent-mode';
 
 export function getCoderAgentModePromptTemplate(): BasePromptFragment {
     return {
@@ -219,7 +219,7 @@ You have previously proposed changes for the following files. Some suggestions m
 {{${TASK_CONTEXT_SUMMARY_VARIABLE_ID}}}
 
 ## Final Instruction
-- Your task is to propose changes to be reviewed by the user
+- Your task is to propose changes to be reviewed by the user. Always do so using the functions described above.
 - Tasks such as building or liniting run on the workspace state, the user has to accept the changes beforehand
 - Do not run a build or any error checking before the users asks you to
 - Focus on the task that the user described
@@ -277,7 +277,7 @@ You have previously proposed changes for the following files. Some suggestions m
 {{${TASK_CONTEXT_SUMMARY_VARIABLE_ID}}}
 
 ## Final Instruction
-- Your task is to propose changes to be reviewed by the user
+- Your task is to propose changes to be reviewed by the user. Always do so using the functions described above.
 - Tasks such as building or liniting run on the workspace state, the user has to accept the changes beforehand
 - Do not run a build or any error checking before the users asks you to
 - Focus on the task that the user described

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 prompts = [{ id: 'universal-prompt', defaultVariant: universalTemplate, variants: [universalTemplateVariant] }];
-   protected override systemPromptId: string = 'universal-prompt';
+   override prompts = [{ id: 'universal-system', defaultVariant: universalTemplate, variants: [universalTemplateVariant] }];
+   protected override systemPromptId: string = 'universal-system';
 }