@office-ai/aioncli-core 0.2.3 → 0.18.4

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

@@ -13,46 +13,62 @@ describe('getDiffStat', () => {
         const userStr = 'line1\nline2\n';
         const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
         expect(diffStat).toEqual({
-            ai_added_lines: 0,
-            ai_removed_lines: 0,
+            model_added_lines: 0,
+            model_removed_lines: 0,
+            model_added_chars: 0,
+            model_removed_chars: 0,
             user_added_lines: 0,
             user_removed_lines: 0,
+            user_added_chars: 0,
+            user_removed_chars: 0,
         });
     });
-    it('should correctly report AI additions', () => {
+    it('should correctly report model additions', () => {
         const oldStr = 'line1\nline2\n';
         const aiStr = 'line1\nline2\nline3\n';
         const userStr = 'line1\nline2\nline3\n';
         const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
         expect(diffStat).toEqual({
-            ai_added_lines: 1,
-            ai_removed_lines: 0,
+            model_added_lines: 1,
+            model_removed_lines: 0,
+            model_added_chars: 5,
+            model_removed_chars: 0,
             user_added_lines: 0,
             user_removed_lines: 0,
+            user_added_chars: 0,
+            user_removed_chars: 0,
         });
     });
-    it('should correctly report AI removals', () => {
+    it('should correctly report model removals', () => {
         const oldStr = 'line1\nline2\nline3\n';
         const aiStr = 'line1\nline3\n';
         const userStr = 'line1\nline3\n';
         const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
         expect(diffStat).toEqual({
-            ai_added_lines: 0,
-            ai_removed_lines: 1,
+            model_added_lines: 0,
+            model_removed_lines: 1,
+            model_added_chars: 0,
+            model_removed_chars: 5,
             user_added_lines: 0,
             user_removed_lines: 0,
+            user_added_chars: 0,
+            user_removed_chars: 0,
         });
     });
-    it('should correctly report AI modifications', () => {
+    it('should correctly report model modifications', () => {
         const oldStr = 'line1\nline2\nline3\n';
         const aiStr = 'line1\nline_two\nline3\n';
         const userStr = 'line1\nline_two\nline3\n';
         const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
         expect(diffStat).toEqual({
-            ai_added_lines: 1,
-            ai_removed_lines: 1,
+            model_added_lines: 1,
+            model_removed_lines: 1,
+            model_added_chars: 8,
+            model_removed_chars: 5,
             user_added_lines: 0,
             user_removed_lines: 0,
+            user_added_chars: 0,
+            user_removed_chars: 0,
         });
     });
     it('should correctly report user additions', () => {
@@ -61,10 +77,14 @@ describe('getDiffStat', () => {
         const userStr = 'line1\nline2\nline3\nline4\n';
         const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
         expect(diffStat).toEqual({
-            ai_added_lines: 1,
-            ai_removed_lines: 0,
+            model_added_lines: 1,
+            model_removed_lines: 0,
+            model_added_chars: 5,
+            model_removed_chars: 0,
             user_added_lines: 1,
             user_removed_lines: 0,
+            user_added_chars: 5,
+            user_removed_chars: 0,
         });
     });
     it('should correctly report user removals', () => {
@@ -73,10 +93,14 @@ describe('getDiffStat', () => {
         const userStr = 'line1\nline2\n';
         const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
         expect(diffStat).toEqual({
-            ai_added_lines: 1,
-            ai_removed_lines: 0,
+            model_added_lines: 1,
+            model_removed_lines: 0,
+            model_added_chars: 5,
+            model_removed_chars: 0,
             user_added_lines: 0,
             user_removed_lines: 1,
+            user_added_chars: 0,
+            user_removed_chars: 5,
         });
     });
     it('should correctly report user modifications', () => {
@@ -85,22 +109,30 @@ describe('getDiffStat', () => {
         const userStr = 'line1\nline2\nline_three\n';
         const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
         expect(diffStat).toEqual({
-            ai_added_lines: 1,
-            ai_removed_lines: 0,
+            model_added_lines: 1,
+            model_removed_lines: 0,
+            model_added_chars: 5,
+            model_removed_chars: 0,
             user_added_lines: 1,
             user_removed_lines: 1,
+            user_added_chars: 10,
+            user_removed_chars: 5,
         });
     });
-    it('should handle complex changes from both AI and user', () => {
+    it('should handle complex changes from both model and user', () => {
         const oldStr = 'line1\nline2\nline3\nline4\n';
         const aiStr = 'line_one\nline2\nline_three\nline4\n';
         const userStr = 'line_one\nline_two\nline_three\nline4\nline5\n';
         const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
         expect(diffStat).toEqual({
-            ai_added_lines: 2,
-            ai_removed_lines: 2,
+            model_added_lines: 2,
+            model_removed_lines: 2,
+            model_added_chars: 18,
+            model_removed_chars: 10,
             user_added_lines: 2,
             user_removed_lines: 1,
+            user_added_chars: 13,
+            user_removed_chars: 5,
         });
     });
     it('should report a single line modification as one addition and one removal', () => {
@@ -109,10 +141,14 @@ describe('getDiffStat', () => {
         const userStr = 'hello universe';
         const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
         expect(diffStat).toEqual({
-            ai_added_lines: 1,
-            ai_removed_lines: 1,
+            model_added_lines: 1,
+            model_removed_lines: 1,
+            model_added_chars: 14,
+            model_removed_chars: 11,
             user_added_lines: 0,
             user_removed_lines: 0,
+            user_added_chars: 0,
+            user_removed_chars: 0,
         });
     });
 });

package/dist/src/tools/diffOptions.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"diffOptions.test.js","sourceRoot":"","sources":["../../../src/tools/diffOptions.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"diffOptions.test.js","sourceRoot":"","sources":["../../../src/tools/diffOptions.test.ts"],"names":[],"mappings":"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"}

package/dist/src/tools/edit.d.ts

@@ -3,16 +3,18 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { BaseDeclarativeTool, ToolInvocation, ToolResult } from './tools.js';
-import { Config } from '../config/config.js';
-import { ModifiableDeclarativeTool, ModifyContext } from './modifiable-tool.js';
+import type { ToolInvocation, ToolResult } from './tools.js';
+import { BaseDeclarativeTool } from './tools.js';
+import type { MessageBus } from '../confirmation-bus/message-bus.js';
+import type { Config } from '../config/config.js';
+import type { ModifiableDeclarativeTool, ModifyContext } from './modifiable-tool.js';
 export declare function applyReplacement(currentContent: string | null, oldString: string, newString: string, isNewFile: boolean): string;
 /**
  * Parameters for the Edit tool
  */
 export interface EditToolParams {
     /**
-     * The absolute path to the file to modify
+     * The path to the file to modify
      */
     file_path: string;
     /**
@@ -33,9 +35,9 @@ export interface EditToolParams {
      */
     modified_by_user?: boolean;
     /**
-     * Initially proposed string.
+     * Initially proposed content.
      */
-    ai_proposed_string?: string;
+    ai_proposed_content?: string;
 }
 /**
  * Implementation of the Edit tool logic
@@ -43,13 +45,13 @@ export interface EditToolParams {
 export declare class EditTool extends BaseDeclarativeTool<EditToolParams, ToolResult> implements ModifiableDeclarativeTool<EditToolParams> {
     private readonly config;
     static readonly Name = "replace";
-    constructor(config: Config);
+    constructor(config: Config, messageBus?: MessageBus);
     /**
      * Validates the parameters for the Edit tool
      * @param params Parameters to validate
      * @returns Error message string or null if valid
      */
     protected validateToolParamValues(params: EditToolParams): string | null;
-    protected createInvocation(params: EditToolParams): ToolInvocation<EditToolParams, ToolResult>;
+    protected createInvocation(params: EditToolParams, messageBus?: MessageBus, toolName?: string, displayName?: string): ToolInvocation<EditToolParams, ToolResult>;
     getModifyContext(_: AbortSignal): ModifyContext<EditToolParams>;
 }

package/dist/src/tools/edit.js

@@ -3,18 +3,25 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import * as fs from 'fs';
-import * as path from 'path';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
 import * as Diff from 'diff';
-import { BaseDeclarativeTool, Kind, ToolConfirmationOutcome, } from './tools.js';
+import { BaseDeclarativeTool, BaseToolInvocation, Kind, ToolConfirmationOutcome, } from './tools.js';
 import { ToolErrorType } from './tool-error.js';
 import { makeRelative, shortenPath } from '../utils/paths.js';
 import { isNodeError } from '../utils/errors.js';
-import { ApprovalMode } from '../config/config.js';
+import { ApprovalMode } from '../policy/types.js';
 import { ensureCorrectEdit } from '../utils/editCorrector.js';
 import { DEFAULT_DIFF_OPTIONS, getDiffStat } from './diffOptions.js';
-import { ReadFileTool } from './read-file.js';
-import { IDEConnectionStatus } from '../ide/ide-client.js';
+import { logFileOperation } from '../telemetry/loggers.js';
+import { FileOperationEvent } from '../telemetry/types.js';
+import { FileOperation } from '../telemetry/metrics.js';
+import { getSpecificMimeType } from '../utils/fileUtils.js';
+import { getLanguageFromFilePath } from '../utils/language-detection.js';
+import { IdeClient } from '../ide/ide-client.js';
+import { safeLiteralReplace } from '../utils/textUtils.js';
+import { EDIT_TOOL_NAME, READ_FILE_TOOL_NAME } from './tool-names.js';
+import { debugLogger } from '../utils/debugLogger.js';
 export function applyReplacement(currentContent, oldString, newString, isNewFile) {
     if (isNewFile) {
         return newString;
@@ -27,17 +34,19 @@ export function applyReplacement(currentContent, oldString, newString, isNewFile
     if (oldString === '' && !isNewFile) {
         return currentContent;
     }
-    return currentContent.replaceAll(oldString, newString);
+    // Use intelligent replacement that handles $ sequences safely
+    return safeLiteralReplace(currentContent, oldString, newString);
 }
-class EditToolInvocation {
+class EditToolInvocation extends BaseToolInvocation {
     config;
-    params;
-    constructor(config, params) {
+    resolvedPath;
+    constructor(config, params, messageBus, toolName, displayName) {
+        super(params, messageBus, toolName, displayName);
         this.config = config;
-        this.params = params;
+        this.resolvedPath = path.resolve(this.config.getTargetDir(), this.params.file_path);
     }
     toolLocations() {
-        return [{ path: this.params.file_path }];
+        return [{ path: this.resolvedPath }];
     }
     /**
      * Calculates the potential outcome of an edit operation.
@@ -57,7 +66,7 @@ class EditToolInvocation {
         try {
             currentContent = await this.config
                 .getFileSystemService()
-                .readTextFile(params.file_path);
+                .readTextFile(this.resolvedPath);
             // Normalize line endings to LF for consistent processing.
             currentContent = currentContent.replace(/\r\n/g, '\n');
             fileExists = true;
@@ -77,13 +86,13 @@ class EditToolInvocation {
             // Trying to edit a nonexistent file (and old_string is not empty)
             error = {
                 display: `File not found. Cannot apply edit. Use an empty old_string to create a new file.`,
-                raw: `File not found: ${params.file_path}`,
+                raw: `File not found: ${this.resolvedPath}`,
                 type: ToolErrorType.FILE_NOT_FOUND,
             };
         }
         else if (currentContent !== null) {
             // Editing an existing file
-            const correctedEdit = await ensureCorrectEdit(params.file_path, currentContent, params, this.config.getGeminiClient(), abortSignal);
+            const correctedEdit = await ensureCorrectEdit(this.resolvedPath, currentContent, params, this.config.getGeminiClient(), this.config.getBaseLlmClient(), abortSignal);
             finalOldString = correctedEdit.params.old_string;
             finalNewString = correctedEdit.params.new_string;
             occurrences = correctedEdit.occurrences;
@@ -91,14 +100,14 @@ class EditToolInvocation {
                 // Error: Trying to create a file that already exists
                 error = {
                     display: `Failed to edit. Attempted to create a file that already exists.`,
-                    raw: `File already exists, cannot create: ${params.file_path}`,
+                    raw: `File already exists, cannot create: ${this.resolvedPath}`,
                     type: ToolErrorType.ATTEMPT_TO_CREATE_EXISTING_FILE,
                 };
             }
             else if (occurrences === 0) {
                 error = {
                     display: `Failed to edit, could not find the string to replace.`,
-                    raw: `Failed to edit, 0 occurrences found for old_string in ${params.file_path}. No edits made. The exact text in old_string was not found. Ensure you're not escaping content incorrectly and check whitespace, indentation, and context. Use ${ReadFileTool.Name} tool to verify.`,
+                    raw: `Failed to edit, 0 occurrences found for old_string in ${this.resolvedPath}. No edits made. The exact text in old_string was not found. Ensure you're not escaping content incorrectly and check whitespace, indentation, and context. Use ${READ_FILE_TOOL_NAME} tool to verify.`,
                     type: ToolErrorType.EDIT_NO_OCCURRENCE_FOUND,
                 };
             }
@@ -106,14 +115,14 @@ class EditToolInvocation {
                 const occurrenceTerm = expectedReplacements === 1 ? 'occurrence' : 'occurrences';
                 error = {
                     display: `Failed to edit, expected ${expectedReplacements} ${occurrenceTerm} but found ${occurrences}.`,
-                    raw: `Failed to edit, Expected ${expectedReplacements} ${occurrenceTerm} but found ${occurrences} for old_string in file: ${params.file_path}`,
+                    raw: `Failed to edit, Expected ${expectedReplacements} ${occurrenceTerm} but found ${occurrences} for old_string in file: ${this.resolvedPath}`,
                     type: ToolErrorType.EDIT_EXPECTED_OCCURRENCE_MISMATCH,
                 };
             }
             else if (finalOldString === finalNewString) {
                 error = {
                     display: `No changes to apply. The old_string and new_string are identical.`,
-                    raw: `No changes to apply. The old_string and new_string are identical in file: ${params.file_path}`,
+                    raw: `No changes to apply. The old_string and new_string are identical in file: ${this.resolvedPath}`,
                     type: ToolErrorType.EDIT_NO_CHANGE,
                 };
             }
@@ -122,11 +131,20 @@ class EditToolInvocation {
             // Should not happen if fileExists and no exception was thrown, but defensively:
             error = {
                 display: `Failed to read content of file.`,
-                raw: `Failed to read content of existing file: ${params.file_path}`,
+                raw: `Failed to read content of existing file: ${this.resolvedPath}`,
                 type: ToolErrorType.READ_CONTENT_FAILURE,
             };
         }
-        const newContent = applyReplacement(currentContent, finalOldString, finalNewString, isNewFile);
+        const newContent = !error
+            ? applyReplacement(currentContent, finalOldString, finalNewString, isNewFile)
+            : (currentContent ?? '');
+        if (!error && fileExists && currentContent === newContent) {
+            error = {
+                display: 'No changes to apply. The new content is identical to the current content.',
+                raw: `No changes to apply. The new content is identical to the current content in file: ${this.resolvedPath}`,
+                type: ToolErrorType.EDIT_NO_CHANGE,
+            };
+        }
         return {
             currentContent,
             newContent,
@@ -139,7 +157,7 @@ class EditToolInvocation {
      * Handles the confirmation prompt for the Edit tool in the CLI.
      * It needs to calculate the diff to show the user.
      */
-    async shouldConfirmExecute(abortSignal) {
+    async getConfirmationDetails(abortSignal) {
         if (this.config.getApprovalMode() === ApprovalMode.AUTO_EDIT) {
             return false;
         }
@@ -148,26 +166,28 @@ class EditToolInvocation {
             editData = await this.calculateEdit(this.params, abortSignal);
         }
         catch (error) {
+            if (abortSignal.aborted) {
+                throw error;
+            }
             const errorMsg = error instanceof Error ? error.message : String(error);
-            console.log(`Error preparing edit: ${errorMsg}`);
+            debugLogger.log(`Error preparing edit: ${errorMsg}`);
             return false;
         }
         if (editData.error) {
-            console.log(`Error: ${editData.error.display}`);
+            debugLogger.log(`Error: ${editData.error.display}`);
             return false;
         }
-        const fileName = path.basename(this.params.file_path);
+        const fileName = path.basename(this.resolvedPath);
         const fileDiff = Diff.createPatch(fileName, editData.currentContent ?? '', editData.newContent, 'Current', 'Proposed', DEFAULT_DIFF_OPTIONS);
-        const ideClient = this.config.getIdeClient();
-        const ideConfirmation = this.config.getIdeMode() &&
-            ideClient?.getConnectionStatus().status === IDEConnectionStatus.Connected
-            ? ideClient.openDiff(this.params.file_path, editData.newContent)
+        const ideClient = await IdeClient.getInstance();
+        const ideConfirmation = this.config.getIdeMode() && ideClient.isDiffingEnabled()
+            ? ideClient.openDiff(this.resolvedPath, editData.newContent)
             : undefined;
         const confirmationDetails = {
             type: 'edit',
             title: `Confirm Edit: ${shortenPath(makeRelative(this.params.file_path, this.config.getTargetDir()))}`,
             fileName,
-            filePath: this.params.file_path,
+            filePath: this.resolvedPath,
             fileDiff,
             originalContent: editData.currentContent,
             newContent: editData.newContent,
@@ -214,6 +234,9 @@ class EditToolInvocation {
             editData = await this.calculateEdit(this.params, signal);
         }
         catch (error) {
+            if (signal.aborted) {
+                throw error;
+            }
             const errorMsg = error instanceof Error ? error.message : String(error);
             return {
                 llmContent: `Error preparing edit: ${errorMsg}`,
@@ -235,34 +258,34 @@ class EditToolInvocation {
             };
         }
         try {
-            this.ensureParentDirectoriesExist(this.params.file_path);
+            this.ensureParentDirectoriesExist(this.resolvedPath);
             await this.config
                 .getFileSystemService()
-                .writeTextFile(this.params.file_path, editData.newContent);
-            let displayResult;
-            if (editData.isNewFile) {
-                displayResult = `Created ${shortenPath(makeRelative(this.params.file_path, this.config.getTargetDir()))}`;
-            }
-            else {
-                // Generate diff for display, even though core logic doesn't technically need it
-                // The CLI wrapper will use this part of the ToolResult
-                const fileName = path.basename(this.params.file_path);
-                const fileDiff = Diff.createPatch(fileName, editData.currentContent ?? '', // Should not be null here if not isNewFile
-                editData.newContent, 'Current', 'Proposed', DEFAULT_DIFF_OPTIONS);
-                const originallyProposedContent = this.params.ai_proposed_string || this.params.new_string;
-                const diffStat = getDiffStat(fileName, editData.currentContent ?? '', originallyProposedContent, this.params.new_string);
-                displayResult = {
-                    fileDiff,
-                    fileName,
-                    originalContent: editData.currentContent,
-                    newContent: editData.newContent,
-                    diffStat,
-                };
-            }
+                .writeTextFile(this.resolvedPath, editData.newContent);
+            const fileName = path.basename(this.resolvedPath);
+            const originallyProposedContent = this.params.ai_proposed_content || editData.newContent;
+            const diffStat = getDiffStat(fileName, editData.currentContent ?? '', originallyProposedContent, editData.newContent);
+            const fileDiff = Diff.createPatch(fileName, editData.currentContent ?? '', // Should not be null here if not isNewFile
+            editData.newContent, 'Current', 'Proposed', DEFAULT_DIFF_OPTIONS);
+            const displayResult = {
+                fileDiff,
+                fileName,
+                originalContent: editData.currentContent,
+                newContent: editData.newContent,
+                diffStat,
+            };
+            // Log file operation for telemetry (without diff_stat to avoid double-counting)
+            const mimetype = getSpecificMimeType(this.resolvedPath);
+            const programmingLanguage = getLanguageFromFilePath(this.resolvedPath);
+            const extension = path.extname(this.resolvedPath);
+            const operation = editData.isNewFile
+                ? FileOperation.CREATE
+                : FileOperation.UPDATE;
+            logFileOperation(this.config, new FileOperationEvent(EDIT_TOOL_NAME, operation, editData.newContent.split('\n').length, mimetype, extension, programmingLanguage));
             const llmSuccessMessageParts = [
                 editData.isNewFile
-                    ? `Created new file: ${this.params.file_path} with provided content.`
-                    : `Successfully modified file: ${this.params.file_path} (${editData.occurrences} replacements).`,
+                    ? `Created new file: ${this.resolvedPath} with provided content.`
+                    : `Successfully modified file: ${this.resolvedPath} (${editData.occurrences} replacements).`,
             ];
             if (this.params.modified_by_user) {
                 llmSuccessMessageParts.push(`User modified the \`new_string\` content to be: ${this.params.new_string}.`);
@@ -299,14 +322,14 @@ class EditToolInvocation {
  */
 export class EditTool extends BaseDeclarativeTool {
     config;
-    static Name = 'replace';
-    constructor(config) {
-        super(EditTool.Name, 'Edit', `Replaces text within a file. By default, replaces a single occurrence, but can replace multiple occurrences when \`expected_replacements\` is specified. This tool requires providing significant context around the change to ensure precise targeting. Always use the ${ReadFileTool.Name} tool to examine the file's current content before attempting a text replacement.
+    static Name = EDIT_TOOL_NAME;
+    constructor(config, messageBus) {
+        super(EditTool.Name, 'Edit', `Replaces text within a file. By default, replaces a single occurrence, but can replace multiple occurrences when \`expected_replacements\` is specified. This tool requires providing significant context around the change to ensure precise targeting. Always use the ${READ_FILE_TOOL_NAME} tool to examine the file's current content before attempting a text replacement.
 
       The user has the ability to modify the \`new_string\` content. If modified, this will be stated in the response.
 
 Expectation for required parameters:
-1. \`file_path\` MUST be an absolute path; otherwise an error will be thrown.
+1. \`file_path\` is the path to the file to modify.
 2. \`old_string\` MUST be the exact literal text to replace (including all whitespace, indentation, newlines, and surrounding code etc.).
 3. \`new_string\` MUST be the exact literal text to replace \`old_string\` with (also including all whitespace, indentation, newlines, and surrounding code etc.). Ensure the resulting code is correct and idiomatic.
 4. NEVER escape \`old_string\` or \`new_string\`, that would break the exact literal text requirement.
@@ -314,7 +337,7 @@ Expectation for required parameters:
 **Multiple replacements:** Set \`expected_replacements\` to the number of occurrences you want to replace. The tool will replace ALL occurrences that match \`old_string\` exactly. Ensure the number of replacements matches your expectation.`, Kind.Edit, {
             properties: {
                 file_path: {
-                    description: "The absolute path to the file to modify. Must start with '/'.",
+                    description: 'The path to the file to modify.',
                     type: 'string',
                 },
                 old_string: {
@@ -333,7 +356,9 @@ Expectation for required parameters:
             },
             required: ['file_path', 'old_string', 'new_string'],
             type: 'object',
-        });
+        }, true, // isOutputMarkdown
+        false, // canUpdateOutput
+        messageBus);
         this.config = config;
     }
     /**
@@ -345,27 +370,26 @@ Expectation for required parameters:
         if (!params.file_path) {
             return "The 'file_path' parameter must be non-empty.";
         }
-        if (!path.isAbsolute(params.file_path)) {
-            return `File path must be absolute: ${params.file_path}`;
-        }
+        const resolvedPath = path.resolve(this.config.getTargetDir(), params.file_path);
         const workspaceContext = this.config.getWorkspaceContext();
-        if (!workspaceContext.isPathWithinWorkspace(params.file_path)) {
+        if (!workspaceContext.isPathWithinWorkspace(resolvedPath)) {
             const directories = workspaceContext.getDirectories();
             return `File path must be within one of the workspace directories: ${directories.join(', ')}`;
         }
         return null;
     }
-    createInvocation(params) {
-        return new EditToolInvocation(this.config, params);
+    createInvocation(params, messageBus, toolName, displayName) {
+        return new EditToolInvocation(this.config, params, messageBus ?? this.messageBus, toolName ?? this.name, displayName ?? this.displayName);
     }
     getModifyContext(_) {
+        const resolvePath = (filePath) => path.resolve(this.config.getTargetDir(), filePath);
         return {
             getFilePath: (params) => params.file_path,
             getCurrentContent: async (params) => {
                 try {
-                    return this.config
+                    return await this.config
                         .getFileSystemService()
-                        .readTextFile(params.file_path);
+                        .readTextFile(resolvePath(params.file_path));
                 }
                 catch (err) {
                     if (!isNodeError(err) || err.code !== 'ENOENT')
@@ -377,7 +401,7 @@ Expectation for required parameters:
                 try {
                     const currentContent = await this.config
                         .getFileSystemService()
-                        .readTextFile(params.file_path);
+                        .readTextFile(resolvePath(params.file_path));
                     return applyReplacement(currentContent, params.old_string, params.new_string, params.old_string === '' && currentContent === '');
                 }
                 catch (err) {
@@ -386,16 +410,13 @@ Expectation for required parameters:
                     return '';
                 }
             },
-            createUpdatedParams: (oldContent, modifiedProposedContent, originalParams) => {
-                const content = originalParams.new_string;
-                return {
-                    ...originalParams,
-                    ai_proposed_string: content,
-                    old_string: oldContent,
-                    new_string: modifiedProposedContent,
-                    modified_by_user: true,
-                };
-            },
+            createUpdatedParams: (oldContent, modifiedProposedContent, originalParams) => ({
+                ...originalParams,
+                ai_proposed_content: oldContent,
+                old_string: oldContent,
+                new_string: modifiedProposedContent,
+                modified_by_user: true,
+            }),
         };
     }
 }