@office-ai/aioncli-core 0.18.7 → 0.24.0

package/dist/src/tools/edit.test.js

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-const mockEnsureCorrectEdit = vi.hoisted(() => vi.fn());
+const mockFixLLMEditWithInstruction = vi.hoisted(() => vi.fn());
 const mockGenerateJson = vi.hoisted(() => vi.fn());
 const mockOpenDiff = vi.hoisted(() => vi.fn());
 import { IdeClient } from '../ide/ide-client.js';
@@ -13,36 +13,38 @@ vi.mock('../ide/ide-client.js', () => ({
         getInstance: vi.fn(),
     },
 }));
-vi.mock('../utils/editCorrector.js', () => ({
-    ensureCorrectEdit: mockEnsureCorrectEdit,
+vi.mock('../utils/llm-edit-fixer.js', () => ({
+    FixLLMEditWithInstruction: mockFixLLMEditWithInstruction,
 }));
 vi.mock('../core/client.js', () => ({
     GeminiClient: vi.fn().mockImplementation(() => ({
         generateJson: mockGenerateJson,
+        getHistory: vi.fn().mockResolvedValue([]),
     })),
 }));
 vi.mock('../utils/editor.js', () => ({
     openDiff: mockOpenDiff,
 }));
-vi.mock('../telemetry/loggers.js', () => ({
-    logFileOperation: vi.fn(),
-}));
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { applyReplacement, EditTool } from './edit.js';
+import { describe, it, expect, beforeEach, afterEach, vi, } from 'vitest';
+import { EditTool, applyReplacement, calculateReplacement, } from './edit.js';
 import { ToolConfirmationOutcome } from './tools.js';
 import { ToolErrorType } from './tool-error.js';
+import { createMockMessageBus, getMockMessageBusInstance, } from '../test-utils/mock-message-bus.js';
 import path from 'node:path';
 import fs from 'node:fs';
 import os from 'node:os';
 import { ApprovalMode } from '../policy/types.js';
+import {} from '../config/config.js';
+import {} from '@google/genai';
+import { createMockWorkspaceContext } from '../test-utils/mockWorkspaceContext.js';
 import { StandardFileSystemService } from '../services/fileSystemService.js';
-import { WorkspaceContext } from '../utils/workspaceContext.js';
 describe('EditTool', () => {
     let tool;
     let tempDir;
     let rootDir;
     let mockConfig;
     let geminiClient;
+    let fileSystemService;
     let baseLlmClient;
     beforeEach(() => {
         vi.restoreAllMocks();
@@ -50,23 +52,26 @@ describe('EditTool', () => {
         rootDir = path.join(tempDir, 'root');
         fs.mkdirSync(rootDir);
         geminiClient = {
-            generateJson: mockGenerateJson, // mockGenerateJson is already defined and hoisted
+            generateJson: mockGenerateJson,
+            getHistory: vi.fn().mockResolvedValue([]),
         };
         baseLlmClient = {
-            generateJson: vi.fn(),
+            generateJson: mockGenerateJson,
         };
+        fileSystemService = new StandardFileSystemService();
         mockConfig = {
+            getUsageStatisticsEnabled: vi.fn(() => true),
+            getSessionId: vi.fn(() => 'mock-session-id'),
+            getContentGeneratorConfig: vi.fn(() => ({ authType: 'mock' })),
+            getProxy: vi.fn(() => undefined),
             getGeminiClient: vi.fn().mockReturnValue(geminiClient),
             getBaseLlmClient: vi.fn().mockReturnValue(baseLlmClient),
             getTargetDir: () => rootDir,
             getApprovalMode: vi.fn(),
             setApprovalMode: vi.fn(),
-            getWorkspaceContext: () => new WorkspaceContext(rootDir),
-            getFileSystemService: () => new StandardFileSystemService(),
+            getWorkspaceContext: () => createMockWorkspaceContext(rootDir),
+            getFileSystemService: () => fileSystemService,
             getIdeMode: () => false,
-            // getGeminiConfig: () => ({ apiKey: 'test-api-key' }), // This was not a real Config method
-            // Add other properties/methods of Config if EditTool uses them
-            // Minimal other methods to satisfy Config type if needed by EditTool constructor or other direct uses:
             getApiKey: () => 'test-api-key',
             getModel: () => 'test-model',
             getSandbox: () => false,
@@ -81,34 +86,21 @@ describe('EditTool', () => {
             setUserMemory: vi.fn(),
             getGeminiMdFileCount: () => 0,
             setGeminiMdFileCount: vi.fn(),
-            getToolRegistry: () => ({}), // Minimal mock for ToolRegistry
+            getToolRegistry: () => ({}),
             isInteractive: () => false,
+            getExperiments: () => { },
         };
-        // Reset mocks before each test
         mockConfig.getApprovalMode.mockClear();
-        // Default to not skipping confirmation
         mockConfig.getApprovalMode.mockReturnValue(ApprovalMode.DEFAULT);
-        // Reset mocks and set default implementation for ensureCorrectEdit
-        mockEnsureCorrectEdit.mockReset();
-        mockEnsureCorrectEdit.mockImplementation(async (_, currentContent, params) => {
-            let occurrences = 0;
-            if (params.old_string && currentContent) {
-                // Simple string counting for the mock
-                let index = currentContent.indexOf(params.old_string);
-                while (index !== -1) {
-                    occurrences++;
-                    index = currentContent.indexOf(params.old_string, index + 1);
-                }
-            }
-            else if (params.old_string === '') {
-                occurrences = 0; // Creating a new file
-            }
-            return Promise.resolve({ params, occurrences });
+        mockFixLLMEditWithInstruction.mockReset();
+        mockFixLLMEditWithInstruction.mockResolvedValue({
+            noChangesRequired: false,
+            search: '',
+            replace: '',
+            explanation: 'LLM fix failed',
         });
-        // Default mock for generateJson to return the snippet unchanged
         mockGenerateJson.mockReset();
         mockGenerateJson.mockImplementation(async (contents, schema) => {
-            // The problematic_snippet is the last part of the user's content
             const userContent = contents.find((c) => c.role === 'user');
             let promptText = '';
             if (userContent && userContent.parts) {
@@ -125,17 +117,17 @@ describe('EditTool', () => {
                 });
             }
             if (schema.properties?.corrected_new_string) {
-                // For new_string correction, we might need more sophisticated logic,
-                // but for now, returning original is a safe default if not specified by a test.
                 const originalNewStringMatch = promptText.match(/original_new_string \(what was intended to replace original_old_string\):\n```\n([\s\S]*?)\n```/);
                 const originalNewString = originalNewStringMatch && originalNewStringMatch[1]
                     ? originalNewStringMatch[1]
                     : '';
                 return Promise.resolve({ corrected_new_string: originalNewString });
             }
-            return Promise.resolve({}); // Default empty object if schema doesn't match
+            return Promise.resolve({});
         });
-        tool = new EditTool(mockConfig);
+        const bus = createMockMessageBus();
+        getMockMessageBusInstance(bus).defaultToolDecision = 'ask_user';
+        tool = new EditTool(mockConfig, bus);
     });
     afterEach(() => {
         fs.rmSync(tempDir, { recursive: true, force: true });
@@ -233,180 +225,85 @@ describe('EditTool', () => {
             expect(result).toBe(expected);
         });
     });
+    describe('calculateReplacement', () => {
+        const abortSignal = new AbortController().signal;
+        it.each([
+            {
+                name: 'perform an exact replacement',
+                content: 'hello world',
+                old_string: 'world',
+                new_string: 'moon',
+                expected: 'hello moon',
+                occurrences: 1,
+            },
+            {
+                name: 'perform a flexible, whitespace-insensitive replacement',
+                content: '  hello\n    world\n',
+                old_string: 'hello\nworld',
+                new_string: 'goodbye\nmoon',
+                expected: '  goodbye\n  moon\n',
+                occurrences: 1,
+            },
+            {
+                name: 'return 0 occurrences if no match is found',
+                content: 'hello world',
+                old_string: 'nomatch',
+                new_string: 'moon',
+                expected: 'hello world',
+                occurrences: 0,
+            },
+        ])('should $name', async ({ content, old_string, new_string, expected, occurrences }) => {
+            const result = await calculateReplacement(mockConfig, {
+                params: {
+                    file_path: 'test.txt',
+                    instruction: 'test',
+                    old_string,
+                    new_string,
+                },
+                currentContent: content,
+                abortSignal,
+            });
+            expect(result.newContent).toBe(expected);
+            expect(result.occurrences).toBe(occurrences);
+        });
+        it('should perform a regex-based replacement for flexible intra-line whitespace', async () => {
+            // This case would fail with the previous exact and line-trimming flexible logic
+            // because the whitespace *within* the line is different.
+            const content = '  function  myFunc( a, b ) {\n    return a + b;\n  }';
+            const result = await calculateReplacement(mockConfig, {
+                params: {
+                    file_path: 'test.js',
+                    instruction: 'test',
+                    old_string: 'function myFunc(a, b) {', // Note the normalized whitespace
+                    new_string: 'const yourFunc = (a, b) => {',
+                },
+                currentContent: content,
+                abortSignal,
+            });
+            // The indentation from the original line should be preserved and applied to the new string.
+            const expectedContent = '  const yourFunc = (a, b) => {\n    return a + b;\n  }';
+            expect(result.newContent).toBe(expectedContent);
+            expect(result.occurrences).toBe(1);
+        });
+    });
     describe('validateToolParams', () => {
         it('should return null for valid params', () => {
             const params = {
                 file_path: path.join(rootDir, 'test.txt'),
+                instruction: 'An instruction',
                 old_string: 'old',
                 new_string: 'new',
             };
             expect(tool.validateToolParams(params)).toBeNull();
         });
-        it('should return error for path outside root', () => {
-            const params = {
-                file_path: path.join(tempDir, 'outside-root.txt'),
-                old_string: 'old',
-                new_string: 'new',
-            };
-            const error = tool.validateToolParams(params);
-            expect(error).toContain('File path must be within one of the workspace directories');
-        });
-    });
-    describe('shouldConfirmExecute', () => {
-        const testFile = 'edit_me.txt';
-        let filePath;
-        beforeEach(() => {
-            filePath = path.join(rootDir, testFile);
-        });
-        it('should resolve relative path and request confirmation', async () => {
-            fs.writeFileSync(filePath, 'some old content here');
-            const params = {
-                file_path: testFile, // relative path
-                old_string: 'old',
-                new_string: 'new',
-            };
-            // ensureCorrectEdit will be called by shouldConfirmExecute
-            mockEnsureCorrectEdit.mockResolvedValueOnce({
-                params: { ...params, file_path: filePath },
-                occurrences: 1,
-            });
-            const invocation = tool.build(params);
-            const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
-            expect(confirmation).toEqual(expect.objectContaining({
-                title: `Confirm Edit: ${testFile}`,
-                fileName: testFile,
-                fileDiff: expect.any(String),
-            }));
-        });
-        it('should request confirmation for valid edit', async () => {
-            fs.writeFileSync(filePath, 'some old content here');
-            const params = {
-                file_path: filePath,
-                old_string: 'old',
-                new_string: 'new',
-            };
-            // ensureCorrectEdit will be called by shouldConfirmExecute
-            mockEnsureCorrectEdit.mockResolvedValueOnce({ params, occurrences: 1 });
-            const invocation = tool.build(params);
-            const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
-            expect(confirmation).toEqual(expect.objectContaining({
-                title: `Confirm Edit: ${testFile}`,
-                fileName: testFile,
-                fileDiff: expect.any(String),
-            }));
-        });
-        it('should return false if old_string is not found (ensureCorrectEdit returns 0)', async () => {
-            fs.writeFileSync(filePath, 'some content here');
-            const params = {
-                file_path: filePath,
-                old_string: 'not_found',
-                new_string: 'new',
-            };
-            mockEnsureCorrectEdit.mockResolvedValueOnce({ params, occurrences: 0 });
-            const invocation = tool.build(params);
-            const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
-            expect(confirmation).toBe(false);
-        });
-        it('should return false if multiple occurrences of old_string are found (ensureCorrectEdit returns > 1)', async () => {
-            fs.writeFileSync(filePath, 'old old content here');
-            const params = {
-                file_path: filePath,
-                old_string: 'old',
-                new_string: 'new',
-            };
-            mockEnsureCorrectEdit.mockResolvedValueOnce({ params, occurrences: 2 });
-            const invocation = tool.build(params);
-            const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
-            expect(confirmation).toBe(false);
-        });
-        it('should request confirmation for creating a new file (empty old_string)', async () => {
-            const newFileName = 'new_file.txt';
-            const newFilePath = path.join(rootDir, newFileName);
-            const params = {
-                file_path: newFilePath,
-                old_string: '',
-                new_string: 'new file content',
-            };
-            // ensureCorrectEdit might not be called if old_string is empty,
-            // as shouldConfirmExecute handles this for diff generation.
-            // If it is called, it should return 0 occurrences for a new file.
-            mockEnsureCorrectEdit.mockResolvedValueOnce({ params, occurrences: 0 });
-            const invocation = tool.build(params);
-            const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
-            expect(confirmation).toEqual(expect.objectContaining({
-                title: `Confirm Edit: ${newFileName}`,
-                fileName: newFileName,
-                fileDiff: expect.any(String),
-            }));
-        });
-        it('should use corrected params from ensureCorrectEdit for diff generation', async () => {
-            const originalContent = 'This is the original string to be replaced.';
-            const originalOldString = 'original string';
-            const originalNewString = 'new string';
-            const correctedOldString = 'original string to be replaced'; // More specific
-            const correctedNewString = 'completely new string'; // Different replacement
-            const expectedFinalContent = 'This is the completely new string.';
-            fs.writeFileSync(filePath, originalContent);
-            const params = {
-                file_path: filePath,
-                old_string: originalOldString,
-                new_string: originalNewString,
-            };
-            // The main beforeEach already calls mockEnsureCorrectEdit.mockReset()
-            // Set a specific mock for this test case
-            let mockCalled = false;
-            mockEnsureCorrectEdit.mockImplementationOnce(async (_, content, p, client, baseClient) => {
-                mockCalled = true;
-                expect(content).toBe(originalContent);
-                expect(p).toBe(params);
-                expect(client).toBe(geminiClient);
-                expect(baseClient).toBe(baseLlmClient);
-                return {
-                    params: {
-                        file_path: filePath,
-                        old_string: correctedOldString,
-                        new_string: correctedNewString,
-                    },
-                    occurrences: 1,
-                };
-            });
-            const invocation = tool.build(params);
-            const confirmation = (await invocation.shouldConfirmExecute(new AbortController().signal));
-            expect(mockCalled).toBe(true); // Check if the mock implementation was run
-            // expect(mockEnsureCorrectEdit).toHaveBeenCalledWith(originalContent, params, expect.anything()); // Keep this commented for now
-            expect(confirmation).toEqual(expect.objectContaining({
-                title: `Confirm Edit: ${testFile}`,
-                fileName: testFile,
-            }));
-            // Check that the diff is based on the corrected strings leading to the new state
-            expect(confirmation.fileDiff).toContain(`-${originalContent}`);
-            expect(confirmation.fileDiff).toContain(`+${expectedFinalContent}`);
-            // Verify that applying the correctedOldString and correctedNewString to originalContent
-            // indeed produces the expectedFinalContent, which is what the diff should reflect.
-            const patchedContent = originalContent.replace(correctedOldString, // This was the string identified by ensureCorrectEdit for replacement
-            correctedNewString);
-            expect(patchedContent).toBe(expectedFinalContent);
-        });
-        it('should rethrow calculateEdit errors when the abort signal is triggered', async () => {
-            const filePath = path.join(rootDir, 'abort-confirmation.txt');
+        it('should return an error if path is outside the workspace', () => {
             const params = {
-                file_path: filePath,
+                file_path: path.join(os.tmpdir(), 'outside.txt'),
+                instruction: 'An instruction',
                 old_string: 'old',
                 new_string: 'new',
             };
-            const invocation = tool.build(params);
-            const abortController = new AbortController();
-            const abortError = new Error('Abort requested');
-            const calculateSpy = vi
-                .spyOn(invocation, 'calculateEdit')
-                .mockImplementation(async () => {
-                if (!abortController.signal.aborted) {
-                    abortController.abort();
-                }
-                throw abortError;
-            });
-            await expect(invocation.shouldConfirmExecute(abortController.signal)).rejects.toBe(abortError);
-            calculateSpy.mockRestore();
+            expect(tool.validateToolParams(params)).toMatch(/must be within one of the workspace directories/);
         });
     });
     describe('execute', () => {
@@ -414,53 +311,17 @@ describe('EditTool', () => {
         let filePath;
         beforeEach(() => {
             filePath = path.join(rootDir, testFile);
-            // Default for execute tests, can be overridden
-            mockEnsureCorrectEdit.mockImplementation(async (_, content, params) => {
-                let occurrences = 0;
-                if (params.old_string && content) {
-                    let index = content.indexOf(params.old_string);
-                    while (index !== -1) {
-                        occurrences++;
-                        index = content.indexOf(params.old_string, index + 1);
-                    }
-                }
-                else if (params.old_string === '') {
-                    occurrences = 0;
-                }
-                return { params, occurrences };
-            });
-        });
-        it('should resolve relative path and execute successfully', async () => {
-            const initialContent = 'This is some old text.';
-            const newContent = 'This is some new text.';
-            fs.writeFileSync(filePath, initialContent, 'utf8');
-            const params = {
-                file_path: testFile, // relative path
-                old_string: 'old',
-                new_string: 'new',
-            };
-            const invocation = tool.build(params);
-            const result = await invocation.execute(new AbortController().signal);
-            expect(result.llmContent).toMatch(/Successfully modified file/);
-            expect(fs.readFileSync(filePath, 'utf8')).toBe(newContent);
-        });
-        it('should throw error if file path is empty', async () => {
-            const params = {
-                file_path: '',
-                old_string: 'old',
-                new_string: 'new',
-            };
-            expect(() => tool.build(params)).toThrow(/The 'file_path' parameter must be non-empty./);
         });
         it('should reject when calculateEdit fails after an abort signal', async () => {
             const params = {
                 file_path: path.join(rootDir, 'abort-execute.txt'),
+                instruction: 'Abort during execute',
                 old_string: 'old',
                 new_string: 'new',
             };
             const invocation = tool.build(params);
             const abortController = new AbortController();
-            const abortError = new Error('Abort requested during execute');
+            const abortError = new Error('Abort requested during edit execution');
             const calculateSpy = vi
                 .spyOn(invocation, 'calculateEdit')
                 .mockImplementation(async () => {
@@ -474,16 +335,14 @@ describe('EditTool', () => {
         });
         it('should edit an existing file and return diff with fileName', async () => {
             const initialContent = 'This is some old text.';
-            const newContent = 'This is some new text.'; // old -> new
+            const newContent = 'This is some new text.';
             fs.writeFileSync(filePath, initialContent, 'utf8');
             const params = {
                 file_path: filePath,
+                instruction: 'Replace old with new',
                 old_string: 'old',
                 new_string: 'new',
             };
-            // Specific mock for this test's execution path in calculateEdit
-            // ensureCorrectEdit is NOT called by calculateEdit, only by shouldConfirmExecute
-            // So, the default mockEnsureCorrectEdit should correctly return 1 occurrence for 'old' in initialContent
             const invocation = tool.build(params);
             const result = await invocation.execute(new AbortController().signal);
             expect(result.llmContent).toMatch(/Successfully modified file/);
@@ -493,196 +352,124 @@ describe('EditTool', () => {
             expect(display.fileDiff).toMatch(newContent);
             expect(display.fileName).toBe(testFile);
         });
-        it('should create a new file if old_string is empty and file does not exist, and return created message', async () => {
-            const newFileName = 'brand_new_file.txt';
-            const newFilePath = path.join(rootDir, newFileName);
-            const fileContent = 'Content for the new file.';
-            const params = {
-                file_path: newFilePath,
-                old_string: '',
-                new_string: fileContent,
-            };
-            mockConfig.getApprovalMode.mockReturnValueOnce(ApprovalMode.AUTO_EDIT);
-            const invocation = tool.build(params);
-            const result = await invocation.execute(new AbortController().signal);
-            expect(result.llmContent).toMatch(/Created new file/);
-            expect(fs.existsSync(newFilePath)).toBe(true);
-            expect(fs.readFileSync(newFilePath, 'utf8')).toBe(fileContent);
-            const display = result.returnDisplay;
-            expect(display.fileDiff).toMatch(/\+Content for the new file\./);
-            expect(display.fileName).toBe(newFileName);
-            expect(result.returnDisplay.diffStat).toStrictEqual({
-                model_added_lines: 1,
-                model_removed_lines: 0,
-                model_added_chars: 25,
-                model_removed_chars: 0,
-                user_added_lines: 0,
-                user_removed_lines: 0,
-                user_added_chars: 0,
-                user_removed_chars: 0,
-            });
-        });
         it('should return error if old_string is not found in file', async () => {
             fs.writeFileSync(filePath, 'Some content.', 'utf8');
             const params = {
                 file_path: filePath,
+                instruction: 'Replace non-existent text',
                 old_string: 'nonexistent',
                 new_string: 'replacement',
             };
-            // The default mockEnsureCorrectEdit will return 0 occurrences for 'nonexistent'
             const invocation = tool.build(params);
             const result = await invocation.execute(new AbortController().signal);
-            expect(result.llmContent).toMatch(/0 occurrences found for old_string in/);
+            expect(result.llmContent).toMatch(/0 occurrences found for old_string/);
             expect(result.returnDisplay).toMatch(/Failed to edit, could not find the string to replace./);
+            expect(mockFixLLMEditWithInstruction).toHaveBeenCalled();
         });
-        it('should return error if multiple occurrences of old_string are found', async () => {
-            fs.writeFileSync(filePath, 'multiple old old strings', 'utf8');
-            const params = {
-                file_path: filePath,
-                old_string: 'old',
-                new_string: 'new',
-            };
-            // The default mockEnsureCorrectEdit will return 2 occurrences for 'old'
-            const invocation = tool.build(params);
-            const result = await invocation.execute(new AbortController().signal);
-            expect(result.llmContent).toMatch(/Expected 1 occurrence but found 2 for old_string in file/);
-            expect(result.returnDisplay).toMatch(/Failed to edit, expected 1 occurrence but found 2/);
-        });
-        it('should successfully replace multiple occurrences when expected_replacements specified', async () => {
-            fs.writeFileSync(filePath, 'old text\nold text\nold text', 'utf8');
+        it('should succeed if FixLLMEditWithInstruction corrects the params', async () => {
+            const initialContent = 'This is some original text.';
+            const finalContent = 'This is some brand new text.';
+            fs.writeFileSync(filePath, initialContent, 'utf8');
             const params = {
                 file_path: filePath,
-                old_string: 'old',
-                new_string: 'new',
-                expected_replacements: 3,
+                instruction: 'Replace original with brand new',
+                old_string: 'wrong text', // This will fail first
+                new_string: 'brand new text',
             };
+            mockFixLLMEditWithInstruction.mockResolvedValueOnce({
+                noChangesRequired: false,
+                search: 'original text', // The corrected search string
+                replace: 'brand new text',
+                explanation: 'Corrected the search string to match the file content.',
+            });
             const invocation = tool.build(params);
             const result = await invocation.execute(new AbortController().signal);
+            expect(result.error).toBeUndefined();
             expect(result.llmContent).toMatch(/Successfully modified file/);
-            expect(fs.readFileSync(filePath, 'utf8')).toBe('new text\nnew text\nnew text');
-            const display = result.returnDisplay;
-            expect(display.fileDiff).toMatch(/-old text\n-old text\n-old text/);
-            expect(display.fileDiff).toMatch(/\+new text\n\+new text\n\+new text/);
-            expect(display.fileName).toBe(testFile);
-            expect(result.returnDisplay.diffStat).toStrictEqual({
-                model_added_lines: 3,
-                model_removed_lines: 3,
-                model_added_chars: 24,
-                model_removed_chars: 24,
-                user_added_lines: 0,
-                user_removed_lines: 0,
-                user_added_chars: 0,
-                user_removed_chars: 0,
-            });
+            expect(fs.readFileSync(filePath, 'utf8')).toBe(finalContent);
+            expect(mockFixLLMEditWithInstruction).toHaveBeenCalledTimes(1);
         });
-        it('should return error if expected_replacements does not match actual occurrences', async () => {
-            fs.writeFileSync(filePath, 'old text old text', 'utf8');
+        it('should preserve CRLF line endings when editing a file', async () => {
+            const initialContent = 'line one\r\nline two\r\n';
+            const newContent = 'line one\r\nline three\r\n';
+            fs.writeFileSync(filePath, initialContent, 'utf8');
             const params = {
                 file_path: filePath,
-                old_string: 'old',
-                new_string: 'new',
-                expected_replacements: 3, // Expecting 3 but only 2 exist
+                instruction: 'Replace two with three',
+                old_string: 'line two',
+                new_string: 'line three',
             };
             const invocation = tool.build(params);
-            const result = await invocation.execute(new AbortController().signal);
-            expect(result.llmContent).toMatch(/Expected 3 occurrences but found 2 for old_string in file/);
-            expect(result.returnDisplay).toMatch(/Failed to edit, expected 3 occurrences but found 2/);
+            await invocation.execute(new AbortController().signal);
+            const finalContent = fs.readFileSync(filePath, 'utf8');
+            expect(finalContent).toBe(newContent);
         });
-        it('should return error if trying to create a file that already exists (empty old_string)', async () => {
-            fs.writeFileSync(filePath, 'Existing content', 'utf8');
+        it('should create a new file with CRLF line endings if new_string has them', async () => {
+            const newContentWithCRLF = 'new line one\r\nnew line two\r\n';
             const params = {
                 file_path: filePath,
+                instruction: 'Create a new file',
                 old_string: '',
-                new_string: 'new content',
+                new_string: newContentWithCRLF,
             };
             const invocation = tool.build(params);
-            const result = await invocation.execute(new AbortController().signal);
-            expect(result.llmContent).toMatch(/File already exists, cannot create/);
-            expect(result.returnDisplay).toMatch(/Attempted to create a file that already exists/);
+            await invocation.execute(new AbortController().signal);
+            const finalContent = fs.readFileSync(filePath, 'utf8');
+            expect(finalContent).toBe(newContentWithCRLF);
         });
-        it('should include modification message when proposed content is modified', async () => {
-            const initialContent = 'Line 1\nold line\nLine 3\nLine 4\nLine 5\n';
+        it('should return NO_CHANGE if FixLLMEditWithInstruction determines no changes are needed', async () => {
+            const initialContent = 'The price is $100.';
             fs.writeFileSync(filePath, initialContent, 'utf8');
             const params = {
                 file_path: filePath,
-                old_string: 'old',
-                new_string: 'new',
-                modified_by_user: true,
-                ai_proposed_content: 'Line 1\nAI line\nLine 3\nLine 4\nLine 5\n',
+                instruction: 'Ensure the price is $100',
+                old_string: 'price is $50', // Incorrect old string
+                new_string: 'price is $100',
             };
-            mockConfig.getApprovalMode.mockReturnValueOnce(ApprovalMode.AUTO_EDIT);
-            const invocation = tool.build(params);
-            const result = await invocation.execute(new AbortController().signal);
-            expect(result.llmContent).toMatch(/User modified the `new_string` content/);
-            expect(result.returnDisplay.diffStat).toStrictEqual({
-                model_added_lines: 1,
-                model_removed_lines: 1,
-                model_added_chars: 7,
-                model_removed_chars: 8,
-                user_added_lines: 1,
-                user_removed_lines: 1,
-                user_added_chars: 8,
-                user_removed_chars: 7,
+            mockFixLLMEditWithInstruction.mockResolvedValueOnce({
+                noChangesRequired: true,
+                search: '',
+                replace: '',
+                explanation: 'The price is already correctly set to $100.',
             });
-        });
-        it.each([
-            {
-                name: 'modified_by_user is false',
-                modifiedByUser: false,
-            },
-            {
-                name: 'modified_by_user is not provided',
-                modifiedByUser: undefined,
-            },
-        ])('should not include modification message when $name', async ({ modifiedByUser }) => {
-            const initialContent = 'This is some old text.';
-            fs.writeFileSync(filePath, initialContent, 'utf8');
-            const params = {
-                file_path: filePath,
-                old_string: 'old',
-                new_string: 'new',
-                ...(modifiedByUser !== undefined && {
-                    modified_by_user: modifiedByUser,
-                }),
-            };
-            mockConfig.getApprovalMode.mockReturnValueOnce(ApprovalMode.AUTO_EDIT);
             const invocation = tool.build(params);
             const result = await invocation.execute(new AbortController().signal);
-            expect(result.llmContent).not.toMatch(/User modified the `new_string` content/);
+            expect(result.error?.type).toBe(ToolErrorType.EDIT_NO_CHANGE_LLM_JUDGEMENT);
+            expect(result.llmContent).toMatch(/A secondary check by an LLM determined/);
+            expect(fs.readFileSync(filePath, 'utf8')).toBe(initialContent); // File is unchanged
         });
-        it('should return error if old_string and new_string are identical', async () => {
-            const initialContent = 'This is some identical text.';
-            fs.writeFileSync(filePath, initialContent, 'utf8');
-            const params = {
-                file_path: filePath,
-                old_string: 'identical',
-                new_string: 'identical',
-            };
-            const invocation = tool.build(params);
-            const result = await invocation.execute(new AbortController().signal);
-            expect(result.llmContent).toMatch(/No changes to apply/);
-            expect(result.returnDisplay).toMatch(/No changes to apply/);
+    });
+    describe('self-correction with content refresh to pull in external edits', () => {
+        const testFile = 'test.txt';
+        let filePath;
+        beforeEach(() => {
+            filePath = path.join(rootDir, testFile);
         });
-        it('should return EDIT_NO_CHANGE error if replacement results in identical content', async () => {
-            // This can happen if ensureCorrectEdit finds a fuzzy match, but the literal
-            // string replacement with `replaceAll` results in no change.
-            const initialContent = 'line 1\nline  2\nline 3'; // Note the double space
+        it('should use refreshed file content for self-correction if file was modified externally', async () => {
+            const initialContent = 'This is the original content.';
+            const externallyModifiedContent = 'This is the externally modified content.';
             fs.writeFileSync(filePath, initialContent, 'utf8');
             const params = {
                 file_path: filePath,
-                // old_string has a single space, so it won't be found by replaceAll
-                old_string: 'line 1\nline 2\nline 3',
-                new_string: 'line 1\nnew line 2\nline 3',
+                instruction: 'Replace "externally modified content" with "externally modified string"',
+                old_string: 'externally modified content', // This will fail the first attempt, triggering self-correction.
+                new_string: 'externally modified string',
             };
-            // Mock ensureCorrectEdit to simulate it finding a match (e.g., via fuzzy matching)
-            // but it doesn't correct the old_string to the literal content.
-            mockEnsureCorrectEdit.mockResolvedValueOnce({ params, occurrences: 1 });
+            // Spy on `readTextFile` to simulate an external file change between reads.
+            const readTextFileSpy = vi
+                .spyOn(fileSystemService, 'readTextFile')
+                .mockResolvedValueOnce(initialContent) // First call in `calculateEdit`
+                .mockResolvedValueOnce(externallyModifiedContent); // Second call in `attemptSelfCorrection`
             const invocation = tool.build(params);
-            const result = await invocation.execute(new AbortController().signal);
-            expect(result.error?.type).toBe(ToolErrorType.EDIT_NO_CHANGE);
-            expect(result.returnDisplay).toMatch(/No changes to apply. The new content is identical to the current content./);
-            // Ensure the file was not actually changed
-            expect(fs.readFileSync(filePath, 'utf8')).toBe(initialContent);
+            await invocation.execute(new AbortController().signal);
+            // Assert that the file was read twice (initial read, then re-read for hash comparison).
+            expect(readTextFileSpy).toHaveBeenCalledTimes(2);
+            // Assert that the self-correction LLM was called with the updated content and a specific message.
+            expect(mockFixLLMEditWithInstruction).toHaveBeenCalledWith(expect.any(String), // instruction
+            params.old_string, params.new_string, expect.stringContaining('However, the file has been modified by either the user or an external process'), // errorForLlmEditFixer
+            externallyModifiedContent, // The new content for correction
+            expect.any(Object), // baseLlmClient
+            expect.any(Object));
         });
     });
     describe('Error Scenarios', () => {
@@ -693,163 +480,85 @@ describe('EditTool', () => {
         });
         it.each([
             {
-                name: 'FILE_NOT_FOUND error',
-                setup: () => { },
-                params: { file_path: '', old_string: 'any', new_string: 'new' },
+                name: 'FILE_NOT_FOUND',
+                setup: () => { }, // no file created
+                params: { old_string: 'any', new_string: 'new' },
                 expectedError: ToolErrorType.FILE_NOT_FOUND,
-                isAsyncTest: true,
             },
             {
-                name: 'ATTEMPT_TO_CREATE_EXISTING_FILE error',
+                name: 'ATTEMPT_TO_CREATE_EXISTING_FILE',
                 setup: (fp) => fs.writeFileSync(fp, 'existing content', 'utf8'),
-                params: { file_path: '', old_string: '', new_string: 'new content' },
+                params: { old_string: '', new_string: 'new content' },
                 expectedError: ToolErrorType.ATTEMPT_TO_CREATE_EXISTING_FILE,
-                isAsyncTest: true,
             },
             {
-                name: 'NO_OCCURRENCE_FOUND error',
+                name: 'NO_OCCURRENCE_FOUND',
                 setup: (fp) => fs.writeFileSync(fp, 'content', 'utf8'),
-                params: { file_path: '', old_string: 'not-found', new_string: 'new' },
+                params: { old_string: 'not-found', new_string: 'new' },
                 expectedError: ToolErrorType.EDIT_NO_OCCURRENCE_FOUND,
-                isAsyncTest: true,
             },
             {
-                name: 'EXPECTED_OCCURRENCE_MISMATCH error',
+                name: 'EXPECTED_OCCURRENCE_MISMATCH',
                 setup: (fp) => fs.writeFileSync(fp, 'one one two', 'utf8'),
-                params: {
-                    file_path: '',
-                    old_string: 'one',
-                    new_string: 'new',
-                    expected_replacements: 3,
-                },
+                params: { old_string: 'one', new_string: 'new' },
                 expectedError: ToolErrorType.EDIT_EXPECTED_OCCURRENCE_MISMATCH,
-                isAsyncTest: true,
-            },
-            {
-                name: 'NO_CHANGE error',
-                setup: (fp) => fs.writeFileSync(fp, 'content', 'utf8'),
-                params: { file_path: '', old_string: 'content', new_string: 'content' },
-                expectedError: ToolErrorType.EDIT_NO_CHANGE,
-                isAsyncTest: true,
-            },
-            {
-                name: 'relative path (should not throw)',
-                setup: () => { },
-                params: {
-                    file_path: 'relative/path.txt',
-                    old_string: 'a',
-                    new_string: 'b',
-                },
-                expectedError: null,
-                isAsyncTest: false,
-            },
-            {
-                name: 'FILE_WRITE_FAILURE on write error',
-                setup: (fp) => {
-                    fs.writeFileSync(fp, 'content', 'utf8');
-                    fs.chmodSync(fp, '444');
-                },
-                params: {
-                    file_path: '',
-                    old_string: 'content',
-                    new_string: 'new content',
-                },
-                expectedError: ToolErrorType.FILE_WRITE_FAILURE,
-                isAsyncTest: true,
             },
-        ])('should return $name', async ({ setup, params, expectedError, isAsyncTest }) => {
-            const testParams = {
-                ...params,
-                file_path: params.file_path || filePath,
-            };
+        ])('should return $name error', async ({ setup, params, expectedError }) => {
             setup(filePath);
-            if (!isAsyncTest) {
-                expect(() => tool.build(testParams)).not.toThrow();
-            }
-            else {
-                const invocation = tool.build(testParams);
-                const result = await invocation.execute(new AbortController().signal);
-                expect(result.error?.type).toBe(expectedError);
-            }
+            const invocation = tool.build({
+                file_path: filePath,
+                instruction: 'test',
+                ...params,
+            });
+            const result = await invocation.execute(new AbortController().signal);
+            expect(result.error?.type).toBe(expectedError);
         });
     });
-    describe('getDescription', () => {
+    describe('expected_replacements', () => {
+        const testFile = 'replacements_test.txt';
+        let filePath;
+        beforeEach(() => {
+            filePath = path.join(rootDir, testFile);
+        });
         it.each([
             {
-                name: 'identical strings (no change)',
-                fileName: 'test.txt',
-                oldStr: 'identical_string',
-                newStr: 'identical_string',
-                expected: 'No file changes to test.txt',
-            },
-            {
-                name: 'different strings (full)',
-                fileName: 'test.txt',
-                oldStr: 'this is the old string value',
-                newStr: 'this is the new string value',
-                expected: 'test.txt: this is the old string value => this is the new string value',
+                name: 'succeed when occurrences match expected_replacements',
+                content: 'foo foo foo',
+                expected: 3,
+                shouldSucceed: true,
+                finalContent: 'bar bar bar',
             },
             {
-                name: 'very short strings',
-                fileName: 'short.txt',
-                oldStr: 'old',
-                newStr: 'new',
-                expected: 'short.txt: old => new',
+                name: 'fail when occurrences do not match expected_replacements',
+                content: 'foo foo foo',
+                expected: 2,
+                shouldSucceed: false,
             },
             {
-                name: 'long strings (truncated)',
-                fileName: 'long.txt',
-                oldStr: 'this is a very long old string that will definitely be truncated',
-                newStr: 'this is a very long new string that will also be truncated',
-                expected: 'long.txt: this is a very long old string... => this is a very long new string...',
+                name: 'default to 1 expected replacement if not specified',
+                content: 'foo foo',
+                expected: undefined,
+                shouldSucceed: false,
             },
-        ])('should handle $name', ({ fileName, oldStr, newStr, expected }) => {
+        ])('should $name', async ({ content, expected, shouldSucceed, finalContent }) => {
+            fs.writeFileSync(filePath, content, 'utf8');
             const params = {
-                file_path: path.join(rootDir, fileName),
-                old_string: oldStr,
-                new_string: newStr,
+                file_path: filePath,
+                instruction: 'Replace all foo with bar',
+                old_string: 'foo',
+                new_string: 'bar',
+                ...(expected !== undefined && { expected_replacements: expected }),
             };
             const invocation = tool.build(params);
-            expect(invocation.getDescription()).toBe(expected);
-        });
-    });
-    describe('workspace boundary validation', () => {
-        it('should validate paths are within workspace root', () => {
-            const validPath = {
-                file_path: path.join(rootDir, 'file.txt'),
-                old_string: 'old',
-                new_string: 'new',
-            };
-            expect(tool.validateToolParams(validPath)).toBeNull();
-        });
-        it('should reject paths outside workspace root', () => {
-            const invalidPath = {
-                file_path: '/etc/passwd',
-                old_string: 'root',
-                new_string: 'hacked',
-            };
-            const error = tool.validateToolParams(invalidPath);
-            expect(error).toContain('File path must be within one of the workspace directories');
-            expect(error).toContain(rootDir);
-        });
-    });
-    describe('constructor', () => {
-        afterEach(() => {
-            vi.restoreAllMocks();
-        });
-        it('should use windows-style path examples on windows', () => {
-            vi.spyOn(process, 'platform', 'get').mockReturnValue('win32');
-            const tool = new EditTool({});
-            const schema = tool.schema;
-            expect(schema.parametersJsonSchema.properties
-                .file_path.description).toBe('The path to the file to modify.');
-        });
-        it('should use unix-style path examples on non-windows platforms', () => {
-            vi.spyOn(process, 'platform', 'get').mockReturnValue('linux');
-            const tool = new EditTool({});
-            const schema = tool.schema;
-            expect(schema.parametersJsonSchema.properties
-                .file_path.description).toBe('The path to the file to modify.');
+            const result = await invocation.execute(new AbortController().signal);
+            if (shouldSucceed) {
+                expect(result.error).toBeUndefined();
+                if (finalContent)
+                    expect(fs.readFileSync(filePath, 'utf8')).toBe(finalContent);
+            }
+            else {
+                expect(result.error?.type).toBe(ToolErrorType.EDIT_EXPECTED_OCCURRENCE_MISMATCH);
+            }
         });
     });
     describe('IDE mode', () => {
@@ -872,13 +581,10 @@ describe('EditTool', () => {
             fs.writeFileSync(filePath, initialContent);
             const params = {
                 file_path: filePath,
+                instruction: 'test',
                 old_string: 'old',
                 new_string: 'new',
             };
-            mockEnsureCorrectEdit.mockResolvedValueOnce({
-                params: { ...params, old_string: 'old', new_string: 'new' },
-                occurrences: 1,
-            });
             ideClient.openDiff.mockResolvedValueOnce({
                 status: 'accepted',
                 content: modifiedContent,
@@ -893,6 +599,30 @@ describe('EditTool', () => {
             expect(params.new_string).toBe(modifiedContent);
         });
     });
+    describe('shouldConfirmExecute', () => {
+        it('should rethrow calculateEdit errors when the abort signal is triggered', async () => {
+            const filePath = path.join(rootDir, 'abort-confirmation.txt');
+            const params = {
+                file_path: filePath,
+                instruction: 'Abort during confirmation',
+                old_string: 'old',
+                new_string: 'new',
+            };
+            const invocation = tool.build(params);
+            const abortController = new AbortController();
+            const abortError = new Error('Abort requested during edit confirmation');
+            const calculateSpy = vi
+                .spyOn(invocation, 'calculateEdit')
+                .mockImplementation(async () => {
+                if (!abortController.signal.aborted) {
+                    abortController.abort();
+                }
+                throw abortError;
+            });
+            await expect(invocation.shouldConfirmExecute(abortController.signal)).rejects.toBe(abortError);
+            calculateSpy.mockRestore();
+        });
+    });
     describe('multiple file edits', () => {
         it('should perform multiple removals and report correct diff stats', async () => {
             const numFiles = 10;
@@ -923,8 +653,10 @@ describe('EditTool', () => {
             for (const file of files) {
                 const params = {
                     file_path: file.path,
+                    instruction: `Remove lines from the file`,
                     old_string: file.toRemove,
                     new_string: '', // Removing the content
+                    ai_proposed_content: '',
                 };
                 const invocation = tool.build(params);
                 const result = await invocation.execute(new AbortController().signal);
@@ -935,7 +667,7 @@ describe('EditTool', () => {
                     actualLinesRemoved.push(result.returnDisplay.diffStat?.model_removed_lines);
                 }
                 else if (result.error) {
-                    console.error(`Edit failed for ${file.path}:`, result.error);
+                    throw result.error;
                 }
             }
             // 3. Assert that the content was removed from each file