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

package/src/browser/workspace-search-provider.ts

@@ -17,10 +17,15 @@
 import { MutableChatRequestModel } from '@theia/ai-chat';
 import { ToolProvider, ToolRequest } from '@theia/ai-core';
 import { CancellationToken } from '@theia/core';
+import { PreferenceService } from '@theia/core/lib/browser/preferences/preference-service';
 import { inject, injectable } from '@theia/core/shared/inversify';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { SearchInWorkspaceService, SearchInWorkspaceCallbacks } from '@theia/search-in-workspace/lib/browser/search-in-workspace-service';
 import { SearchInWorkspaceResult, SearchInWorkspaceOptions } from '@theia/search-in-workspace/lib/common/search-in-workspace-interface';
 import { SEARCH_IN_WORKSPACE_FUNCTION_ID } from '../common/workspace-functions';
+import { WorkspaceFunctionScope } from './workspace-functions';
+import { SEARCH_IN_WORKSPACE_MAX_RESULTS_PREF } from './workspace-preferences';
+import { optimizeSearchResults } from '../common/workspace-search-provider-util';
 
 @injectable()
 export class WorkspaceSearchProvider implements ToolProvider {
@@ -28,7 +33,14 @@ export class WorkspaceSearchProvider implements ToolProvider {
     @inject(SearchInWorkspaceService)
     protected readonly searchService: SearchInWorkspaceService;
 
-    private readonly MAX_RESULTS = 50;
+    @inject(WorkspaceFunctionScope)
+    protected readonly workspaceScope: WorkspaceFunctionScope;
+
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
+    @inject(FileService)
+    protected readonly fileService: FileService;
 
     getTool(): ToolRequest {
         return {
@@ -38,6 +50,7 @@ export class WorkspaceSearchProvider implements ToolProvider {
             The search uses case-insensitive string matching or regular expressions (controlled by the `useRegExp` parameter). \
             It returns a list of matching files, including the file path (URI), the line number, and the full text content of each matching line. \
             Multi-word patterns must match exactly (including spaces, case-insensitively). \
+            For best results, use specific search terms and consider filtering by file extensions or limiting to specific subdirectories to avoid overwhelming results. \
             For complex searches, prefer multiple simpler queries over one complex query or regular expression.',
             parameters: {
                 type: 'object',
@@ -49,6 +62,18 @@ export class WorkspaceSearchProvider implements ToolProvider {
                     useRegExp: {
                         type: 'boolean',
                         description: 'Set to true if the query is a regular expression.',
+                    },
+                    fileExtensions: {
+                        type: 'array',
+                        items: {
+                            type: 'string'
+                        },
+                        description: 'Optional array of file extensions to search in (e.g., ["ts", "js", "py"]). If not specified, searches all files.'
+                    },
+                    subDirectoryPath: {
+                        type: 'string',
+                        description: 'Optional subdirectory path to limit search scope. Use relative paths from workspace root ' +
+                            '(e.g., "packages/ai-ide/src", "packages/core/src/browser"). If not specified, searches entire workspace.'
                     }
                 },
                 required: ['query', 'useRegExp']
@@ -57,14 +82,36 @@ export class WorkspaceSearchProvider implements ToolProvider {
         };
     }
 
+    private async determineSearchRoots(subDirectoryPath?: string): Promise<string[]> {
+        const workspaceRoot = await this.workspaceScope.getWorkspaceRoot();
+
+        if (!subDirectoryPath) {
+            return [workspaceRoot.toString()];
+        }
+
+        const subDirUri = workspaceRoot.resolve(subDirectoryPath);
+        this.workspaceScope.ensureWithinWorkspace(subDirUri, workspaceRoot);
+
+        try {
+            const stat = await this.fileService.resolve(subDirUri);
+            if (!stat || !stat.isDirectory) {
+                throw new Error(`Subdirectory '${subDirectoryPath}' does not exist or is not a directory`);
+            }
+        } catch (error) {
+            throw new Error(`Invalid subdirectory path '${subDirectoryPath}': ${error.message}`);
+        }
+
+        return [subDirUri.toString()];
+    }
+
     private async handleSearch(argString: string, cancellationToken?: CancellationToken): Promise<string> {
         try {
-            const args: { query: string, useRegExp: boolean } = JSON.parse(argString);
+            const args: { query: string, useRegExp: boolean, fileExtensions?: string[], subDirectoryPath?: string } = JSON.parse(argString);
             const results: SearchInWorkspaceResult[] = [];
             let expectedSearchId: number | undefined;
             let searchCompleted = false;
 
-            const searchPromise = new Promise<SearchInWorkspaceResult[]>((resolve, reject) => {
+            const searchPromise = new Promise<SearchInWorkspaceResult[]>(async (resolve, reject) => {
                 const callbacks: SearchInWorkspaceCallbacks = {
                     onResult: (id, result) => {
                         if (expectedSearchId !== undefined && id !== expectedSearchId) {
@@ -88,21 +135,28 @@ export class WorkspaceSearchProvider implements ToolProvider {
 
                         searchCompleted = true;
                         if (error) {
-                            reject(new Error(`Search failed: ${error}`));
+                            reject(new Error('Search failed: ' + error));
                         } else {
                             resolve(results);
                         }
                     }
                 };
 
+                // Use one more than our actual maximum. this way we can determine if we have more results than our maximum and warn the user
+                const maxResultsForTheiaAPI = this.preferenceService.get<number>(SEARCH_IN_WORKSPACE_MAX_RESULTS_PREF, 30) + 1;
                 const options: SearchInWorkspaceOptions = {
                     useRegExp: args.useRegExp,
                     matchCase: false,
                     matchWholeWord: false,
-                    maxResults: this.MAX_RESULTS,
+                    maxResults: maxResultsForTheiaAPI,
                 };
 
-                this.searchService.search(args.query, callbacks, options)
+                if (args.fileExtensions && args.fileExtensions.length > 0) {
+                    options.include = args.fileExtensions.map(ext => `**/*.${ext}`);
+                }
+
+                await this.determineSearchRoots(args.subDirectoryPath)
+                    .then(rootUris => this.searchService.searchWithCallback(args.query, rootUris, callbacks, options))
                     .then(id => {
                         expectedSearchId = id;
                         cancellationToken?.onCancellationRequested(() => {
@@ -127,11 +181,23 @@ export class WorkspaceSearchProvider implements ToolProvider {
             });
 
             const finalResults = await Promise.race([searchPromise, timeoutPromise]);
-
-            const formattedResults = finalResults.map(r => ({
-                file: r.fileUri,
-                matches: r.matches.map(m => ({ line: m.line, text: m.lineText }))
-            }));
+            const maxResults = this.preferenceService.get<number>(SEARCH_IN_WORKSPACE_MAX_RESULTS_PREF, 30);
+
+            const workspaceRoot = await this.workspaceScope.getWorkspaceRoot();
+            const formattedResults = optimizeSearchResults(finalResults, workspaceRoot);
+
+            let numberOfMatchesInFinalResults = 0;
+            for (const result of finalResults) {
+                numberOfMatchesInFinalResults += result.matches.length;
+            }
+            if (numberOfMatchesInFinalResults > maxResults) {
+                return JSON.stringify({
+                    info: 'Search limit exceeded: Found ' + maxResults + '+ results. ' +
+                        'Please refine your search with more specific terms or use file extension filters. ' +
+                        'You can increase the limit in preferences under \'ai-features.workspaceFunctions.searchMaxResults\'.',
+                    incompleteResults: formattedResults
+                });
+            }
 
             return JSON.stringify(formattedResults);
 
@@ -140,3 +206,4 @@ export class WorkspaceSearchProvider implements ToolProvider {
         }
     }
 }
+

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

@@ -17,13 +17,14 @@ import { CONTEXT_FILES_VARIABLE_ID, TASK_CONTEXT_SUMMARY_VARIABLE_ID } from './c
 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 architectVariants = <PromptVariantSet>{
     id: 'architect-system',
     defaultVariant: {
         id: 'architect-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:
+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
 
@@ -55,12 +56,13 @@ Always look at the relevant files to understand your task using the function ~{$
         {
             id: 'architect-system-next',
             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:
+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'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.\
 
@@ -105,7 +107,165 @@ Skip irrelevant information, e.g. for discussions, only sum up the final result.
 4. If any part of the task is ambiguous, note the ambiguity so that it can be clarified later.
 
 Focus on providing actionable steps and implementation guidance. The coding agent needs practical help with this specific coding task.
+
+Use the following format, but only include the sections that were discussed in the conversation:
+
+# Task Context: [Title Here]
+
+---
+
+## 1. 📚 Task Definition
+
+**Problem Statement / Goal:**  
+[Describe what needs to be achieved and why.]
+
+**Scope:**  
+- **In Scope:**  
+  [Features, components, or behaviors to be included.]
+- **Out of Scope:**  
+  [What explicitly won't be part of this task.]
+
+---
+
+## 2. 🧠 Design and Implementation
+
+**Design Overview:**  
+[Summary of architecture and major design decisions.]
+
+**Implementation Plan:**  
+1. [First major step]
+2. [Second major step]
+3. [Third major step]
+
+**Technology Choices:**  
+- [Frameworks, libraries, services, tools]
+
+---
+
+## 3. 🧪 Testing
+
+### 3.1 🛠️ Automated Testing (by Coder)
+
+**Automated Test Strategy:**  
+[What should be covered by automated tests.]
+
+**Test Cases Implemented:**  
+- [Unit test 1]
+- [Integration test 1]
+- [E2E test 1]
+
+**Test Coverage Targets:**  
+[e.g., Minimum 80% code coverage, all workflows tested.]
+
+---
+
+### 3.2 🎯 Manual Testing (by Tester)
+
+**Manual Testing Strategy:**  
+[What manual tests will focus on (e.g., usability, edge cases, exploratory testing).]
+
+**Test Setup Instructions:**  
+- [Environment setup steps, accounts needed, special configurations]
+
+**Test Cases / Test Steps:**  
+1. [Action 1]
+2. [Action 2]
+3. [Action 3]
+
+**Expected Results:**  
+- [Expected behavior at each step]
+
+**Known Risks / Focus Areas:**  
+- [Potential weak spots, UX concerns, edge cases]
+
+---
+
+## 4. 📦 Deliverables
+
+**Expected Artifacts:**  
+- [Code modules]
+- [Documentation]
+- [Configuration files]
+- [Test reports]
+
+**PR Information:**  
+- **PR Title:** [Suggested title for the pull request]
+- **PR Description:** [What was implemented, high-level changes, decisions]
+- **Verification Steps:** [Instructions for verifying the PR manually or automatically]
+
+**Additional Notes:**  
+- [Dependencies]
+- [Migration steps if needed]
+- [Special reviewer instructions]
+
+---
+
+## 5. 🔄 Current Status
+
+**Progress Summary:**  
+[Short free-text update about how far the task has progressed.]
+
+**Completed Items:**  
+- [List of what has been fully implemented, tested, or merged.]
+
+**Open Items:**  
+- [List of remaining tasks, missing parts.]
+
+**Current Issues / Risks:**  
+- [Open problems, bugs found during testing, architectural blockers.]
+
+**Next Steps:**  
+- [Immediate action items, who should act next.]
 `
-        }
+        },
+        {
+            id: ARCHITECT_TASK_SUMMARY_UPDATE_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 --}}
+You are an AI assistant integrated into Theia IDE, designed to update task context files. You can interact provided task context file and propose changes.
+
+# Task Document Update Instructions
+
+You are an AI agent tasked with updating a technical document based on the current discussion. Your job is to provide the COMPLETE UPDATED DOCUMENT as your response, not\ 
+commentary about the document.
+
+## Analysis Requirements
+
+1. **Review the Current Discussion**: 
+   - Analyze the entire conversation
+   - Identify new information, decisions, and changes
+
+2. **Examine the Existing Document**: 
+   - Understand its structure and purpose
+   - Identify sections that need updates
+
+3. **Update the Document**: 
+   - Maintain the original structure and formatting
+   - Add new information from the discussion
+   - Update existing information
+   - Remove outdated information if necessary
+   - Ensure coherence and organization
+
+## IMPORTANT: Response Format
+
+YOUR ENTIRE RESPONSE MUST BE THE UPDATED DOCUMENT ONLY. Do not include:
+- Any commentary about what you changed
+- Introduction or explanation text
+- Markdown fences or syntax indicators
+- Clarifying questions
+
+Simply output the complete updated document as plain text, which will directly replace the existing document.
+
+## Guidelines
+
+- Be thorough in capturing all relevant information
+- Maintain the original document's style and tone
+- Use clear, concise language
+- Preserve all formatting from the original document
+- Ensure technical accuracy in all updates
+
+{{${TASK_CONTEXT_SUMMARY_VARIABLE_ID}}}
+` }
     ]
 };

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

@@ -22,18 +22,26 @@ import {
 } from './workspace-functions';
 import { CONTEXT_FILES_VARIABLE_ID, TASK_CONTEXT_SUMMARY_VARIABLE_ID } from './context-variables';
 import { UPDATE_CONTEXT_FILES_FUNCTION_ID } from './context-functions';
+import {
+    SUGGEST_FILE_CONTENT_ID,
+    WRITE_FILE_CONTENT_ID,
+    SUGGEST_FILE_REPLACEMENTS_ID,
+    WRITE_FILE_REPLACEMENTS_ID,
+    CLEAR_FILE_CHANGES_ID,
+    GET_PROPOSED_CHANGES_ID
+} from './file-changeset-function-ids';
 
 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_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 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:
+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.
@@ -43,6 +51,7 @@ You must independently analyze, fix, validate, and finalize all changes — only
 ## Autonomy and Persistence
 You are an agent. **Do not stop until** the entire task is complete:
 - All code changes are applied
+- The build succeeds
 - All lint issues are resolved
 - All relevant tests pass
 - New tests are written when needed
@@ -64,31 +73,32 @@ After each tool call:
 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
+- ~{${GET_WORKSPACE_DIRECTORY_STRUCTURE_FUNCTION_ID}} — view overall structure
+- ~{${GET_WORKSPACE_FILE_LIST_FUNCTION_ID}} — list contents of a specific directory
+- ~{${FILE_CONTENT_FUNCTION_ID}} — retrieve the content of a file
+- ~{${SEARCH_IN_WORKSPACE_FUNCTION_ID}}} — locate references or patterns (only search if you are missing information, always prefer examples that are explicitly provided, never \
+search for files you already know the path for)
+- ~{${UPDATE_CONTEXT_FILES_FUNCTION_ID}} — bookmark important files for context
+
+### 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
+  - ~{${WRITE_FILE_REPLACEMENTS_ID}} — to immediately apply targeted code changes (no user review)
+  - ~{${WRITE_FILE_CONTENT_ID}} — to immediately overwrite a file with new content (no user review)
+  
+- For incremental changes, use multiple ~{${WRITE_FILE_REPLACEMENTS_ID}} calls
+- If ~{${WRITE_FILE_REPLACEMENTS_ID}} continuously fails use ~{${WRITE_FILE_CONTENT_ID}}.
+
+### Validation
+- ~{${GET_FILE_DIAGNOSTICS_ID}} — detect syntax, lint, or type errors
 
 ### Testing & Tasks
-- Use ~{listTasks} to discover available test and lint tasks
-- Use ~{runTask} to run linting, building, or test suites
+- Use ~{${LIST_TASKS_FUNCTION_ID}} to discover available test and lint tasks
+- Use ~{${RUN_TASK_FUNCTION_ID}} to run linting, building, or test suites
 
 ### Test Authoring
 If no relevant tests exist:
-- Create new test files (propose using changeSet_writeChangeToFile)
+- Create new test files (propose using suggestFileContent)
 - Use patterns from existing tests
 - Ensure new tests validate new behavior or prevent regressions
 
@@ -125,7 +135,7 @@ The following files have been provided for additional context. Some of them may
 Always look at the relevant files to understand your task using the function ~{${FILE_CONTENT_FUNCTION_ID}}
 {{${CONTEXT_FILES_VARIABLE_ID}}}
 
-# Previously Proposed Changes
+# Previously Changed Files
 
 {{changeSetSummary}}
 
@@ -133,6 +143,8 @@ Always look at the relevant files to understand your task using the function ~{$
 
 {{prompt:project-info}}
 
+{{${TASK_CONTEXT_SUMMARY_VARIABLE_ID}}}
+
 # Final Instruction
 You are an autonomous AI agent. Do not stop until:
 - All errors are fixed
@@ -141,48 +153,56 @@ You are an autonomous AI agent. Do not stop until:
 - New tests are created if needed
 - No further action is required
 `,
-        ...({ variantOf: CODER_REPLACE_PROMPT_TEMPLATE_ID }),
+        ...({ variantOf: CODER_EDIT_TEMPLATE_ID }),
     };
 }
 
-export function getCoderReplacePromptTemplateNext(): BasePromptFragment {
+export function getCoderPromptTemplateEdit(): BasePromptFragment {
     return {
-        id: CODER_REPLACE_PROMPT_TEMPLATE_NEXT_ID,
+        id: CODER_EDIT_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:
+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.
+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, \
+which will be reviewed and accepted by the user.
 
 ## 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}}**
+- **~{${SEARCH_IN_WORKSPACE_FUNCTION_ID}}** (only search if you are missing information, always prefer examples that are explicitly provided, never search for files  \
+you already know the path for)
 
 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}}**
-
 ## Propose Code Changes
-To propose code changes or any file changes to the user, never print code or new file content in your response.
+To propose code changes or any file changes to the user, never just output them as part of your response, but use the following functions for each file you want to propose \
+changes for.
+This also applies for newly created files!
 
-Instead, for each file you want to propose changes for:
-- **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.
+- **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:
-  - ~{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.
+  - ~{${SUGGEST_FILE_REPLACEMENTS_ID}}: 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}}.
+  - ~{${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 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 \
+changes beeing applied, you must wait for the user to review and accept the changes!
 
 ## Tasks
 
 The user might want you to execute some task. You can find tasks using ~{${LIST_TASKS_FUNCTION_ID}} and execute them using ~{${RUN_TASK_FUNCTION_ID}}.
+Be aware that tasks operate on the workspace. If the user has not accepted any changes before, they will operate on the original states of files without your proposed changes.
+Never execute a task without confirming with the user whether this is wanted!
+
+## 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}}**
+Be aware this function operates on the workspace. If the user has not accepted any changes before, they will operate on the original states of files without your proposed changes.
 
 ## Additional Context
 
@@ -197,42 +217,50 @@ You have previously proposed changes for the following files. Some suggestions m
 {{prompt:project-info}}
 
 {{${TASK_CONTEXT_SUMMARY_VARIABLE_ID}}}
-`,
-        ...({ variantOf: CODER_REPLACE_PROMPT_TEMPLATE_ID }),
-    };
+
+## Final Instruction
+- Your task is to propose changes to be reviewed by the user
+- 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 getCoderReplacePromptTemplate(withSearchAndReplace: boolean = false): BasePromptFragment {
+
+export function getCoderPromptTemplateSimpleEdit(): BasePromptFragment {
     return {
-        id: withSearchAndReplace ? CODER_REPLACE_PROMPT_TEMPLATE_ID : CODER_REWRITE_PROMPT_TEMPLATE_ID,
+        id: CODER_SIMPLE_EDIT_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:
+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.
+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 \
+which will be reviewed and accepted by the user.
 
 ## 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}}** (only search if you are missing information, always prefer examples that are explicitly provided, never search for files  \
+you already know the path for)
 
-## 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.
+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.
 
 ## Propose Code Changes
-To propose code changes or any file changes to the user, never print code or new file content in your response.
+To propose code changes or any file changes to the user, never just output them as part of your response, but use the following functions for each file you want to propose \
+changes for.
+This also applies for newly created files!
 
-Instead, for each file you want to propose changes for:
-- **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.
+- **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:
-  - ~{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.
+  - ~{${SUGGEST_FILE_REPLACEMENTS_ID}}: 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}}.
+  - ~{${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 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 \
+changes beeing applied, you must wait for the user to review and accept the changes!
 
 ## Additional Context
 
@@ -240,12 +268,20 @@ The following files have been provided for additional context. Some of them may
 Always look at the relevant files to understand your task using the function ~{${FILE_CONTENT_FUNCTION_ID}}
 {{${CONTEXT_FILES_VARIABLE_ID}}}
 
+## Previously Proposed Changes
+You have previously proposed changes for the following files. Some suggestions may have been accepted by the user, while others may still be pending.
 {{${CHANGE_SET_SUMMARY_VARIABLE_ID}}}
 
 {{prompt:project-info}}
 
 {{${TASK_CONTEXT_SUMMARY_VARIABLE_ID}}}
+
+## Final Instruction
+- Your task is to propose changes to be reviewed by the user
+- 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
 `,
-        ...(!withSearchAndReplace ? { variantOf: CODER_REPLACE_PROMPT_TEMPLATE_ID } : {}),
+        ...({ variantOf: CODER_EDIT_TEMPLATE_ID }),
     };
 }