@theia/ai-ide 1.66.0-next.41 → 1.66.0-next.67

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

@@ -58,16 +58,20 @@ export class AppTesterChatAgent extends AbstractStreamParsingChatAgent {
             if (await this.requiresStartingServers()) {
                 // Ask the user if they want to start the server
                 request.response.response.addContent(new QuestionResponseContentImpl(
-                    'The Playwright MCP servers are not running. Would you like to start them now? This may install the Playwright MCP servers.',
+                    nls.localize('theia/ai/ide/app-tester/startPlaywrightServers/question',
+                        '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 servers', value: 'yes' },
-                        { text: 'No, cancel', value: 'no' }
+                        { text: nls.localize('theia/ai/ide/app-tester/startPlaywrightServers/yes', 'Yes, start the servers'), value: 'yes' },
+                        { text: nls.localize('theia/ai/ide/app-tester/startPlaywrightServers/no', 'No, cancel'), value: 'no' }
                     ],
                     request,
                     async selectedOption => {
                         if (selectedOption.value === 'yes') {
                             // Show progress
-                            const progress = request.response.addProgressMessage({ content: 'Starting Playwright MCP servers.', show: 'whileIncomplete' });
+                            const progress = request.response.addProgressMessage({
+                                content: nls.localize('theia/ai/ide/app-tester/startPlaywrightServers/progress', 'Starting Playwright MCP servers.'),
+                                show: 'whileIncomplete'
+                            });
                             try {
                                 await this.startServers();
                                 // Remove progress, continue with normal flow
@@ -75,13 +79,16 @@ export class AppTesterChatAgent extends AbstractStreamParsingChatAgent {
                                 await super.invoke(request);
                             } catch (error) {
                                 request.response.response.addContent(new ErrorChatResponseContentImpl(
-                                    new Error('Failed to start Playwright MCP server: ' + (error instanceof Error ? error.message : String(error)))
+                                    new Error(nls.localize('theia/ai/ide/app-tester/startPlaywrightServers/error', 'Failed to start Playwright MCP server: {0}',
+                                        error instanceof Error ? error.message : String(error)))
                                 ));
                                 request.response.complete();
                             }
                         } else {
                             // Continue without starting the server
-                            request.response.response.addContent(new MarkdownChatResponseContentImpl('Please setup the MCP servers.'));
+                            request.response.response.addContent(new MarkdownChatResponseContentImpl(
+                                nls.localize('theia/ai/ide/app-tester/startPlaywrightServers/canceled', 'Please setup the MCP servers.')
+                            ));
                             request.response.complete();
                         }
                     }
@@ -93,7 +100,8 @@ export class AppTesterChatAgent extends AbstractStreamParsingChatAgent {
             await super.invoke(request);
         } catch (error) {
             request.response.response.addContent(new ErrorChatResponseContentImpl(
-                new Error('Error checking Playwright MCP server status: ' + (error instanceof Error ? error.message : String(error)))
+                new Error(nls.localize('theia/ai/ide/app-tester/errorCheckingPlaywrightServerStatus', 'Error checking Playwright MCP server status: {0}',
+                    error instanceof Error ? error.message : String(error)))
             ));
             request.response.complete();
         }

package/src/browser/architect-agent.ts

@@ -51,8 +51,10 @@ export class ArchitectAgent extends AbstractStreamParsingChatAgent {
         if (!(model instanceof MutableChatModel) || !session) { return; }
         if (!model.isEmpty()) {
             model.setSuggestions([
-                new MarkdownStringImpl(`[Summarize this session as a task for Coder](command:${AI_SUMMARIZE_SESSION_AS_TASK_FOR_CODER.id}).`),
-                new MarkdownStringImpl(`[Update current task context](command:${AI_UPDATE_TASK_CONTEXT_COMMAND.id}).`)
+                new MarkdownStringImpl(`[${nls.localize('theia/ai/ide/architectAgent/suggestion/summarizeSessionAsTaskForCoder',
+                    'Summarize this session as a task for Coder')}](command:${AI_SUMMARIZE_SESSION_AS_TASK_FOR_CODER.id}).`),
+                new MarkdownStringImpl(`[${nls.localize('theia/ai/ide/architectAgent/suggestion/updateTaskContext',
+                    'Update current task context')}](command:${AI_UPDATE_TASK_CONTEXT_COMMAND.id}).`)
             ]);
         }
     }

package/src/browser/coder-agent.ts

@@ -15,7 +15,8 @@
 // *****************************************************************************
 import { AbstractStreamParsingChatAgent, ChatRequestModel, ChatService, ChatSession, MutableChatModel, MutableChatRequestModel } from '@theia/ai-chat/lib/common';
 import { inject, injectable } from '@theia/core/shared/inversify';
-import { CODER_SYSTEM_PROMPT_ID, getCoderAgentModePromptTemplate, getCoderPromptTemplateEdit, getCoderPromptTemplateSimpleEdit } from '../common/coder-replace-prompt-template';
+import { CODER_SYSTEM_PROMPT_ID, getCoderAgentModePromptTemplate, getCoderPromptTemplateEdit, getCoderPromptTemplateEditNext, getCoderPromptTemplateSimpleEdit }
+    from '../common/coder-replace-prompt-template';
 import { LanguageModelRequirement, PromptVariantSet } from '@theia/ai-core';
 import { nls } from '@theia/core';
 import { MarkdownStringImpl } from '@theia/core/lib/common/markdown-rendering';
@@ -39,7 +40,7 @@ export class CoderAgent extends AbstractStreamParsingChatAgent {
     override prompts: PromptVariantSet[] = [{
         id: CODER_SYSTEM_PROMPT_ID,
         defaultVariant: getCoderPromptTemplateEdit(),
-        variants: [getCoderPromptTemplateSimpleEdit(), getCoderAgentModePromptTemplate()]
+        variants: [getCoderPromptTemplateSimpleEdit(), getCoderAgentModePromptTemplate(), getCoderPromptTemplateEditNext()]
     }];
     protected override systemPromptId: string | undefined = CODER_SYSTEM_PROMPT_ID;
     override async invoke(request: MutableChatRequestModel): Promise<void> {
@@ -55,13 +56,16 @@ export class CoderAgent extends AbstractStreamParsingChatAgent {
             model.setSuggestions([
                 {
                     kind: 'callback',
-                    callback: () => this.chatService.sendRequest(session.id, { text: '@Coder please look at #_f and fix any problems.' }),
-                    content: '[Fix problems](_callback) in the current file.'
+                    callback: () => this.chatService.sendRequest(session.id, {
+                        text: `@Coder ${nls.localize('theia/ai/ide/coderAgent/suggestion/fixProblems/prompt', 'please look at {1} and fix any problems.', '#_f')}`
+                    }),
+                    content: nls.localize('theia/ai/ide/coderAgent/suggestion/fixProblems/content', '[Fix problems]({0}) in the current file.', '_callback')
                 },
             ]);
         } else {
-            model.setSuggestions([new MarkdownStringImpl(`Keep chats short and focused. [Start a new chat](command:${AI_CHAT_NEW_CHAT_WINDOW_COMMAND.id}) for a new task`
-                + ` or [start a new chat with a summary of this one](command:${ChatCommands.AI_CHAT_NEW_WITH_TASK_CONTEXT.id}).`)]);
+            model.setSuggestions([new MarkdownStringImpl(nls.localize('theia/ai/ide/coderAgent/suggestion/startNewChat',
+                'Keep chats short and focused. [Start a new chat]({0}) for a new task or [start a new chat with a summary of this one]({1}).',
+                `command:${AI_CHAT_NEW_CHAT_WINDOW_COMMAND.id}`, `command:${ChatCommands.AI_CHAT_NEW_WITH_TASK_CONTEXT.id}`))]);
         }
     }
 

package/src/browser/file-changeset-functions.spec.ts

@@ -30,7 +30,9 @@ import {
     GetProposedFileState,
     ReplaceContentInFileFunctionHelper,
     FileChangeSetTitleProvider,
-    DefaultFileChangeSetTitleProvider
+    DefaultFileChangeSetTitleProvider,
+    ReplaceContentInFileFunctionHelperV2,
+    SuggestFileReplacements_Next
 } from './file-changeset-functions';
 import { MutableChatRequestModel, MutableChatResponseModel, ChangeSet, ChangeSetElement, MutableChatModel } from '@theia/ai-chat';
 import { Container } from '@theia/core/shared/inversify';
@@ -108,6 +110,8 @@ describe('File Changeset Functions Cancellation Tests', () => {
         container.bind(WriteFileReplacements).toSelf();
         container.bind(ClearFileChanges).toSelf();
         container.bind(GetProposedFileState).toSelf();
+        container.bind(ReplaceContentInFileFunctionHelperV2).toSelf();
+        container.bind(SuggestFileReplacements_Next).toSelf();
     });
 
     afterEach(() => {
@@ -209,4 +213,27 @@ describe('File Changeset Functions Cancellation Tests', () => {
         expect(jsonResponse.error).to.equal('Operation cancelled by user');
 
     });
+
+    it('SuggestFileReplacements_Next should respect cancellation token', async () => {
+        const suggestFileReplacementsNext = container.get(SuggestFileReplacements_Next);
+        cancellationTokenSource.cancel();
+
+        const handler = suggestFileReplacementsNext.getTool().handler;
+        const result = await handler(
+            JSON.stringify({
+                path: 'test.txt',
+                replacements: [{ oldContent: 'old', newContent: 'new', multiple: true }]
+            }),
+            mockCtx as MutableChatRequestModel
+        );
+
+        const jsonResponse = typeof result === 'string' ? JSON.parse(result) : result;
+        expect(jsonResponse.error).to.equal('Operation cancelled by user');
+    });
+
+    it('SuggestFileReplacements_Next should have correct ID', () => {
+        const suggestFileReplacementsNext = container.get(SuggestFileReplacements_Next);
+        expect(SuggestFileReplacements_Next.ID).to.equal('suggestFileReplacements_Next');
+        expect(suggestFileReplacementsNext.getTool().id).to.equal('suggestFileReplacements_Next');
+    });
 });

package/src/browser/file-changeset-functions.ts

@@ -16,7 +16,8 @@
 import { ChangeSet, MutableChatRequestModel } from '@theia/ai-chat';
 import { ChangeSetElementArgs, ChangeSetFileElement, ChangeSetFileElementFactory } from '@theia/ai-chat/lib/browser/change-set-file-element';
 import { ToolProvider, ToolRequest, ToolRequestParameters, ToolRequestParametersProperties } from '@theia/ai-core';
-import { ContentReplacer, Replacement } from '@theia/core/lib/common/content-replacer';
+import { ContentReplacerV1Impl, Replacement, ContentReplacer } from '@theia/core/lib/common/content-replacer';
+import { ContentReplacerV2Impl } from '@theia/core/lib/common/content-replacer-v2-impl';
 import { URI } from '@theia/core/lib/common/uri';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
@@ -29,7 +30,8 @@ import {
     SUGGEST_FILE_CONTENT_ID,
     SUGGEST_FILE_REPLACEMENTS_ID,
     WRITE_FILE_CONTENT_ID,
-    WRITE_FILE_REPLACEMENTS_ID
+    WRITE_FILE_REPLACEMENTS_ID,
+    SUGGEST_FILE_REPLACEMENTS_NEXT_ID
 } from '../common/file-changeset-function-ids';
 
 export const FileChangeSetTitleProvider = Symbol('FileChangeSetTitleProvider');
@@ -206,7 +208,11 @@ export class ReplaceContentInFileFunctionHelper {
     private replacer: ContentReplacer;
 
     constructor() {
-        this.replacer = new ContentReplacer();
+        this.replacer = new ContentReplacerV1Impl();
+    }
+
+    protected setReplacer(replacer: ContentReplacer): void {
+        this.replacer = replacer;
     }
 
     getToolMetadata(supportMultipleReplace: boolean = false, immediateApplication: boolean = false): { description: string, parameters: ToolRequestParameters } {
@@ -596,6 +602,44 @@ export class GetProposedFileState implements ToolProvider {
     }
 }
 
+@injectable()
+export class ReplaceContentInFileFunctionHelperV2 extends ReplaceContentInFileFunctionHelper {
+    constructor() {
+        super();
+        this.setReplacer(new ContentReplacerV2Impl());
+    }
+}
+
+@injectable()
+export class SuggestFileReplacements_Next implements ToolProvider {
+    static ID = SUGGEST_FILE_REPLACEMENTS_NEXT_ID;
+
+    @inject(ReplaceContentInFileFunctionHelperV2)
+    protected readonly replaceContentInFileFunctionHelper: ReplaceContentInFileFunctionHelperV2;
+
+    getTool(): ToolRequest {
+        const metadata = this.replaceContentInFileFunctionHelper.getToolMetadata(true);
+        return {
+            id: SuggestFileReplacements_Next.ID,
+            name: SuggestFileReplacements_Next.ID,
+            description: `Proposes to replace sections of content in an existing file by providing a list of replacements.
+            Each replacement consists of oldContent to be matched and newContent to insert in its place.
+            By default, a single occurrence of each oldContent is expected. If the 'multiple' flag is set to true, all occurrences will be replaced.
+            If the expected number of occurrences is not found, the function will return an error. In this case try a different approach.
+            For deletions, use an empty newContent.
+            The proposed changes will be applied when the user accepts.
+            Multiple calls for the same file will merge replacements unless the reset parameter is set to true.`,
+            parameters: metadata.parameters,
+            handler: async (args: string, ctx: MutableChatRequestModel): Promise<string> => {
+                if (ctx?.response?.cancellationToken?.isCancellationRequested) {
+                    return JSON.stringify({ error: 'Operation cancelled by user' });
+                }
+                return this.replaceContentInFileFunctionHelper.createChangesetFromToolCall(args, ctx);
+            }
+        };
+    }
+}
+
 @injectable()
 export class DefaultFileChangeSetTitleProvider implements FileChangeSetTitleProvider {
     getChangeSetTitle(ctx: MutableChatRequestModel): string {

package/src/browser/frontend-module.ts

@@ -56,7 +56,9 @@ import {
     WriteFileReplacements,
     SimpleWriteFileReplacements,
     FileChangeSetTitleProvider,
-    DefaultFileChangeSetTitleProvider
+    DefaultFileChangeSetTitleProvider,
+    ReplaceContentInFileFunctionHelperV2,
+    SuggestFileReplacements_Next
 } from './file-changeset-functions';
 import { OrchestratorChatAgent, OrchestratorChatAgentId } from '../common/orchestrator-chat-agent';
 import { UniversalChatAgent, UniversalChatAgentId } from '../common/universal-chat-agent';
@@ -159,6 +161,8 @@ export default new ContainerModule((bind, _unbind, _isBound, rebind) => {
     bind(FileChangeSetTitleProvider).to(DefaultFileChangeSetTitleProvider).inSingletonScope();
     bindToolProvider(SuggestFileReplacements, bind);
     bindToolProvider(WriteFileReplacements, bind);
+    bind(ReplaceContentInFileFunctionHelperV2).toSelf().inSingletonScope();
+    bindToolProvider(SuggestFileReplacements_Next, bind);
     bindToolProvider(ListChatContext, bind);
     bindToolProvider(ResolveChatContext, bind);
     bind(AIConfigurationSelectionService).toSelf().inSingletonScope();

package/src/browser/github-chat-agent.ts

@@ -54,7 +54,7 @@ export class GitHubChatAgent extends AbstractStreamParsingChatAgent {
         identifier: 'default/code',
     }];
     protected defaultLanguageModelPurpose: string = 'chat';
-    override description = nls.localize('theia/ai/chat/github/description', 'This agent helps you interact with GitHub repositories, issues, pull requests, and other GitHub '
+    override description = nls.localize('theia/ai/ide/github/description', 'This agent helps you interact with GitHub repositories, issues, pull requests, and other GitHub '
         + 'features through the GitHub MCP server. '
         + 'It can help you manage your repositories, create issues, handle pull requests, and perform various GitHub operations.');
 
@@ -70,26 +70,26 @@ export class GitHubChatAgent extends AbstractStreamParsingChatAgent {
         try {
             if (await this.requiresConfiguration()) {
                 // Ask the user if they want to configure the GitHub server
-                request.response.response.addContent(new QuestionResponseContentImpl(
+                request.response.response.addContent(new QuestionResponseContentImpl(nls.localize('theia/ai/ide/github/configureGitHubServer/question',
                     'The GitHub MCP server is not configured. Would you like to configure it now? '
-                    + 'This will open the settings.json file where you can add your GitHub access token.',
+                    + 'This will open the settings.json file where you can add your GitHub access token.'),
                     [
-                        { text: 'Yes, configure GitHub server', value: 'configure' },
-                        { text: 'No, cancel', value: 'cancel' }
+                        { text: nls.localize('theia/ai/ide/github/configureGitHubServer/yes', 'Yes, configure GitHub server'), value: 'configure' },
+                        { text: nls.localize('theia/ai/ide/github/configureGitHubServer/no', 'No, cancel'), value: 'cancel' }
                     ],
                     request,
                     async selectedOption => {
                         if (selectedOption.value === 'configure') {
                             await this.offerConfiguration();
-                            request.response.response.addContent(new MarkdownChatResponseContentImpl(
+                            request.response.response.addContent(new MarkdownChatResponseContentImpl(nls.localize('theia/ai/ide/github/configureGitHubServer/followup',
                                 'Settings file opened. Please add your GitHub Personal Access Token to the `serverAuthToken` property in the GitHub server configuration, then '
                                 + ' save and try again.\n\n' +
                                 'You can create a Personal Access Token at: https://github.com/settings/tokens'
-                            ));
+                            )));
                             request.response.complete();
                         } else {
-                            request.response.response.addContent(new MarkdownChatResponseContentImpl('GitHub server configuration cancelled.'
-                                + ' Please configure the GitHub MCP server to use this agent.'));
+                            request.response.response.addContent(new MarkdownChatResponseContentImpl(nls.localize('theia/ai/ide/github/configureGitHubServer/canceled',
+                                'GitHub server configuration cancelled. Please configure the GitHub MCP server to use this agent.')));
                             request.response.complete();
                         }
                     }
@@ -100,28 +100,33 @@ export class GitHubChatAgent extends AbstractStreamParsingChatAgent {
 
             if (await this.requiresStartingServer()) {
                 // Ask the user if they want to start the server
-                request.response.response.addContent(new QuestionResponseContentImpl(
-                    'The GitHub MCP server is configured but not running. Would you like to start it now?',
+                request.response.response.addContent(new QuestionResponseContentImpl(nls.localize('theia/ai/ide/github/startGitHubServer/question',
+                    'The GitHub MCP server is configured but not running. Would you like to start it now?'),
                     [
-                        { text: 'Yes, start the server', value: 'yes' },
-                        { text: 'No, cancel', value: 'no' }
+                        { text: nls.localize('theia/ai/ide/github/startGitHubServer/yes', 'Yes, start the server'), value: 'yes' },
+                        { text: nls.localize('theia/ai/ide/github/startGitHubServer/no', 'No, cancel'), value: 'no' }
                     ],
                     request,
                     async selectedOption => {
                         if (selectedOption.value === 'yes') {
-                            const progress = request.response.addProgressMessage({ content: 'Starting GitHub MCP server.', show: 'whileIncomplete' });
+                            const progress = request.response.addProgressMessage({
+                                content: nls.localize('theia/ai/ide/github/startGitHubServer/progress', 'Starting GitHub MCP server.'),
+                                show: 'whileIncomplete'
+                            });
                             try {
                                 await this.startServer();
                                 request.response.updateProgressMessage({ ...progress, show: 'whileIncomplete', status: 'completed' });
                                 await super.invoke(request);
                             } catch (error) {
                                 request.response.response.addContent(new ErrorChatResponseContentImpl(
-                                    new Error('Failed to start GitHub MCP server: ' + (error instanceof Error ? error.message : String(error)))
+                                    new Error(nls.localize('theia/ai/ide/github/startGitHubServer/error', 'Failed to start GitHub MCP server: {0}',
+                                        error instanceof Error ? error.message : String(error)))
                                 ));
                                 request.response.complete();
                             }
                         } else {
-                            request.response.response.addContent(new MarkdownChatResponseContentImpl('Please start the GitHub MCP server to use this agent.'));
+                            request.response.response.addContent(new MarkdownChatResponseContentImpl(nls.localize('theia/ai/ide/github/startGitHubServer/canceled',
+                                'Please start the GitHub MCP server to use this agent.')));
                             request.response.complete();
                         }
                     }
@@ -134,7 +139,8 @@ export class GitHubChatAgent extends AbstractStreamParsingChatAgent {
             await super.invoke(request);
         } catch (error) {
             request.response.response.addContent(new ErrorChatResponseContentImpl(
-                new Error('Error checking GitHub MCP server status: ' + (error instanceof Error ? error.message : String(error)))
+                new Error(nls.localize('theia/ai/ide/github/errorCheckingGitHubServerStatus', 'Error checking GitHub MCP server status: {0}',
+                    error instanceof Error ? error.message : String(error)))
             ));
             request.response.complete();
         }

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

@@ -28,13 +28,15 @@ import {
     SUGGEST_FILE_REPLACEMENTS_ID,
     WRITE_FILE_REPLACEMENTS_ID,
     CLEAR_FILE_CHANGES_ID,
-    GET_PROPOSED_CHANGES_ID
+    GET_PROPOSED_CHANGES_ID,
+    SUGGEST_FILE_REPLACEMENTS_NEXT_ID
 } from './file-changeset-function-ids';
 
 export const CODER_SYSTEM_PROMPT_ID = 'coder-system';
 
 export const CODER_SIMPLE_EDIT_TEMPLATE_ID = 'coder-system-simple-edit';
 export const CODER_EDIT_TEMPLATE_ID = 'coder-system-edit';
+export const CODER_EDIT_NEXT_TEMPLATE_ID = 'coder-system-edit-next';
 export const CODER_AGENT_MODE_TEMPLATE_ID = 'coder-system-agent-mode';
 
 export function getCoderAgentModePromptTemplate(): BasePromptFragment {
@@ -159,10 +161,8 @@ You are an autonomous AI agent. Do not stop until:
     };
 }
 
-export function getCoderPromptTemplateEdit(): BasePromptFragment {
-    return {
-        id: CODER_EDIT_TEMPLATE_ID,
-        template: `{{!-- This prompt is licensed under the MIT License (https://opensource.org/license/mit).
+function getCoderEditPromptTemplate(suggestFileReplacementsId: string): string {
+    return `{{!-- 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 AI assistant integrated into Theia IDE, designed to assist software developers with code tasks. You can interact with the code base and suggest changes, \
@@ -189,9 +189,9 @@ This also applies for newly created files!
 - **Always Retrieve Current Content**: Use getFileContent to get the original content of the target file.
 - **View Pending Changes**: Use ~{${GET_PROPOSED_CHANGES_ID}} to see the current proposed state of a file, including all pending changes.
 - **Change Content**: Use one of these methods to propose changes:
-  - ~{${SUGGEST_FILE_REPLACEMENTS_ID}}: For targeted replacements of specific text sections. Multiple calls will merge changes unless you set the reset parameter to true.
+  - ~{${suggestFileReplacementsId}}: For targeted replacements of specific text sections. Multiple calls will merge changes unless you set the reset parameter to true.
   - ~{${SUGGEST_FILE_CONTENT_ID}}: For complete file rewrites when you need to replace the entire content. 
-  - If ~{${SUGGEST_FILE_REPLACEMENTS_ID}} continuously fails use ~{${SUGGEST_FILE_CONTENT_ID}}.
+  - If ~{${suggestFileReplacementsId}} continuously fails use ~{${SUGGEST_FILE_CONTENT_ID}}.
   - ~{${CLEAR_FILE_CHANGES_ID}}: 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. The user can then accept or reject each change individually. Before you run tasks that depend on the \
@@ -229,7 +229,22 @@ You have previously proposed changes for the following files. Some suggestions m
 - 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
-`};
+`;
+}
+
+export function getCoderPromptTemplateEdit(): BasePromptFragment {
+    return {
+        id: CODER_EDIT_TEMPLATE_ID,
+        template: getCoderEditPromptTemplate(SUGGEST_FILE_REPLACEMENTS_ID)
+    };
+}
+
+export function getCoderPromptTemplateEditNext(): BasePromptFragment {
+    return {
+        id: CODER_EDIT_NEXT_TEMPLATE_ID,
+        template: getCoderEditPromptTemplate(SUGGEST_FILE_REPLACEMENTS_NEXT_ID),
+        ...({ variantOf: CODER_EDIT_TEMPLATE_ID })
+    };
 }
 
 export function getCoderPromptTemplateSimpleEdit(): BasePromptFragment {

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

@@ -29,6 +29,7 @@ import {
     CommandRegistry,
     MessageService,
     generateUuid,
+    nls,
 } from '@theia/core';
 
 import { commandTemplate } from './command-prompt-template';
@@ -55,12 +56,13 @@ export class CommandChatAgent extends AbstractTextToModelParsingChatAgent<Parsed
     }];
     protected defaultLanguageModelPurpose: string = 'command';
 
-    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 description = nls.localize('theia/ai/ide/commandAgent/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 prompts = [commandTemplate];
     override agentSpecificVariables = [{
         name: 'command-ids',
-        description: 'The list of available commands in Theia.',
+        description: nls.localize('theia/ai/ide/commandAgent/vars/commandIds/description', 'The list of available commands in Theia.'),
         usedInPrompt: true
     }];
 
@@ -107,7 +109,7 @@ export class CommandChatAgent extends AbstractTextToModelParsingChatAgent<Parsed
 
             return new HorizontalLayoutChatResponseContentImpl([
                 new MarkdownChatResponseContentImpl(
-                    'I found this command that might help you:'
+                    nls.localize('theia/ai/ide/commandAgent/response/theiaCommand', 'I found this command that might help you:')
                 ),
                 new CommandChatResponseContentImpl(theiaCommand, undefined, args),
             ]);
@@ -116,22 +118,24 @@ export class CommandChatAgent extends AbstractTextToModelParsingChatAgent<Parsed
             const commandArgs = parsedCommand.arguments !== undefined && parsedCommand.arguments.length > 0 ? parsedCommand.arguments : [];
             const args = [id, ...commandArgs];
             const customCallback: CustomCallback = {
-                label: 'AI command',
+                label: nls.localize('theia/ai/ide/commandAgent/commandCallback/label', 'AI command'),
                 callback: () => this.commandCallback(...args),
             };
             return new HorizontalLayoutChatResponseContentImpl([
                 new MarkdownChatResponseContentImpl(
-                    'Try executing this:'
+                    nls.localize('theia/ai/ide/commandAgent/response/customHandler', 'Try executing this:')
                 ),
                 new CommandChatResponseContentImpl(undefined, customCallback, args),
             ]);
         } else {
-            return new MarkdownChatResponseContentImpl(parsedCommand.message ?? 'Sorry, I can\'t find such a command');
+            return new MarkdownChatResponseContentImpl(parsedCommand.message ?? nls.localize('theia/ai/ide/commandAgent/response/noCommand',
+                'Sorry, I can\'t find such a command'));
         }
     }
 
     protected async commandCallback(...commandArgs: unknown[]): Promise<void> {
-        this.messageService.info(`Executing callback with args ${commandArgs.join(', ')}. The first arg is the command id registered for the dynamically registered command. \
-        The other args are the actual args for the handler.`, 'Got it');
+        this.messageService.info(nls.localize('theia/ai/ide/commandAgent/commandCallback/message',
+            'Executing callback with args {0}. The first arg is the command id registered for the dynamically registered command. ' +
+            'The other args are the actual args for the handler.', commandArgs.join(', ')), nls.localize('theia/ai/ide/commandAgent/commandCallback/confirmAction', 'Got it'));
     }
 }

package/src/common/file-changeset-function-ids.ts

@@ -20,3 +20,4 @@ export const SUGGEST_FILE_REPLACEMENTS_ID = 'suggestFileReplacements';
 export const WRITE_FILE_REPLACEMENTS_ID = 'writeFileReplacements';
 export const CLEAR_FILE_CHANGES_ID = 'clearFileChanges';
 export const GET_PROPOSED_CHANGES_ID = 'getProposedFileState';
+export const SUGGEST_FILE_REPLACEMENTS_NEXT_ID = 'suggestFileReplacements_Next';

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

@@ -50,7 +50,7 @@ export class OrchestratorChatAgent extends AbstractStreamParsingChatAgent {
     protected chatAgentService: ChatAgentService;
 
     override async invoke(request: MutableChatRequestModel): Promise<void> {
-        request.response.addProgressMessage({ content: 'Determining the most appropriate agent', status: 'inProgress' });
+        request.response.addProgressMessage({ content: nls.localize('theia/ai/ide/orchestrator/progressMessage', 'Determining the most appropriate agent'), status: 'inProgress' });
         // We use a dedicated id for the orchestrator request
         const orchestratorRequestId = generateUuid();
         request.addData(OrchestratorRequestIdKey, orchestratorRequestId);
@@ -114,15 +114,16 @@ export class OrchestratorChatAgent extends AbstractStreamParsingChatAgent {
             if (firstRegisteredAgent) {
                 agentIds = [firstRegisteredAgent];
             } else {
-                throw new Error('No chat agent available to handle request. Please check your configuration whether any are enabled.');
+                throw new Error(nls.localize('theia/ai/ide/orchestrator/error/noAgents',
+                    'No chat agent available to handle request. Please check your configuration whether any are enabled.'));
             }
         }
 
         // TODO support delegating to more than one agent
         const delegatedToAgent = agentIds[0];
         request.response.response.addContent(new InformationalChatResponseContentImpl(
-            `*Orchestrator*: Delegating to \`@${delegatedToAgent}\`
-            
+            `*Orchestrator*: ${nls.localize('theia/ai/ide/orchestrator/response/delegatingToAgent', 'Delegating to \`@{0}\`', delegatedToAgent)}
+
             ---
 
             `

package/src/common/workspace-preferences.ts

@@ -34,13 +34,13 @@ export const WorkspacePreferencesSchema: PreferenceSchema = {
             title: nls.localize('theia/ai/workspace/considerGitignore/title', 'Consider .gitignore'),
             description: nls.localize('theia/ai/workspace/considerGitignore/description',
                 'If enabled, excludes files/folders specified in a global .gitignore file (expected location is the workspace root).'),
-            default: false
+            default: true
         },
         [USER_EXCLUDE_PATTERN_PREF]: {
             type: 'array',
             title: nls.localize('theia/ai/workspace/excludedPattern/title', 'Excluded File Patterns'),
             description: nls.localize('theia/ai/workspace/excludedPattern/description', 'List of patterns (glob or regex) for files/folders to exclude.'),
-            default: ['node_modules', 'lib', '.*'],
+            default: ['node_modules', 'lib'],
             items: {
                 type: 'string'
             }