@vybestack/llxprt-code-core 0.1.18 → 0.1.19-beta

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

@@ -0,0 +1,119 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, expect, it } from 'vitest';
+import { getDiffStat } from './diffOptions.js';
+describe('getDiffStat', () => {
+    const fileName = 'test.txt';
+    it('should return 0 for all stats when there are no changes', () => {
+        const oldStr = 'line1\nline2\n';
+        const aiStr = 'line1\nline2\n';
+        const userStr = 'line1\nline2\n';
+        const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
+        expect(diffStat).toEqual({
+            ai_added_lines: 0,
+            ai_removed_lines: 0,
+            user_added_lines: 0,
+            user_removed_lines: 0,
+        });
+    });
+    it('should correctly report AI 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,
+            user_added_lines: 0,
+            user_removed_lines: 0,
+        });
+    });
+    it('should correctly report AI 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,
+            user_added_lines: 0,
+            user_removed_lines: 0,
+        });
+    });
+    it('should correctly report AI 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,
+            user_added_lines: 0,
+            user_removed_lines: 0,
+        });
+    });
+    it('should correctly report user additions', () => {
+        const oldStr = 'line1\nline2\n';
+        const aiStr = 'line1\nline2\nline3\n';
+        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,
+            user_added_lines: 1,
+            user_removed_lines: 0,
+        });
+    });
+    it('should correctly report user removals', () => {
+        const oldStr = 'line1\nline2\n';
+        const aiStr = 'line1\nline2\nline3\n';
+        const userStr = 'line1\nline2\n';
+        const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
+        expect(diffStat).toEqual({
+            ai_added_lines: 1,
+            ai_removed_lines: 0,
+            user_added_lines: 0,
+            user_removed_lines: 1,
+        });
+    });
+    it('should correctly report user modifications', () => {
+        const oldStr = 'line1\nline2\n';
+        const aiStr = 'line1\nline2\nline3\n';
+        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,
+            user_added_lines: 1,
+            user_removed_lines: 1,
+        });
+    });
+    it('should handle complex changes from both AI 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,
+            user_added_lines: 2,
+            user_removed_lines: 1,
+        });
+    });
+    it('should report a single line modification as one addition and one removal', () => {
+        const oldStr = 'hello world';
+        const aiStr = 'hello universe';
+        const userStr = 'hello universe';
+        const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
+        expect(diffStat).toEqual({
+            ai_added_lines: 1,
+            ai_removed_lines: 1,
+            user_added_lines: 0,
+            user_removed_lines: 0,
+        });
+    });
+});
+//# sourceMappingURL=diffOptions.test.js.map

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

@@ -0,0 +1 @@
+{"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,9 +3,10 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { BaseTool, ToolCallConfirmationDetails, ToolLocation, ToolResult } from './tools.js';
+import { BaseDeclarativeTool, ToolInvocation, ToolResult } from './tools.js';
 import { Config } from '../config/config.js';
-import { ModifiableTool, ModifyContext } from './modifiable-tool.js';
+import { 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
  */
@@ -31,11 +32,15 @@ export interface EditToolParams {
      * Whether the edit was modified manually by the user.
      */
     modified_by_user?: boolean;
+    /**
+     * Initially proposed string.
+     */
+    ai_proposed_string?: string;
 }
 /**
  * Implementation of the Edit tool logic
  */
-export declare class EditTool extends BaseTool<EditToolParams, ToolResult> implements ModifiableTool<EditToolParams> {
+export declare class EditTool extends BaseDeclarativeTool<EditToolParams, ToolResult> implements ModifiableDeclarativeTool<EditToolParams> {
     private readonly config;
     static readonly Name = "replace";
     constructor(config: Config);
@@ -45,35 +50,6 @@ export declare class EditTool extends BaseTool<EditToolParams, ToolResult> imple
      * @returns Error message string or null if valid
      */
     validateToolParams(params: EditToolParams): string | null;
-    /**
-     * Determines any file locations affected by the tool execution
-     * @param params Parameters for the tool execution
-     * @returns A list of such paths
-     */
-    toolLocations(params: EditToolParams): ToolLocation[];
-    private _applyReplacement;
-    /**
-     * Calculates the potential outcome of an edit operation.
-     * @param params Parameters for the edit operation
-     * @returns An object describing the potential edit outcome
-     * @throws File system errors if reading the file fails unexpectedly (e.g., permissions)
-     */
-    private calculateEdit;
-    /**
-     * Handles the confirmation prompt for the Edit tool in the CLI.
-     * It needs to calculate the diff to show the user.
-     */
-    shouldConfirmExecute(params: EditToolParams, abortSignal: AbortSignal): Promise<ToolCallConfirmationDetails | false>;
-    getDescription(params: EditToolParams): string;
-    /**
-     * Executes the edit operation with the given parameters.
-     * @param params Parameters for the edit operation
-     * @returns Result of the edit operation
-     */
-    execute(params: EditToolParams, signal: AbortSignal): Promise<ToolResult>;
-    /**
-     * Creates parent directories if they don't exist
-     */
-    private ensureParentDirectoriesExist;
+    protected createInvocation(params: EditToolParams): ToolInvocation<EditToolParams, ToolResult>;
     getModifyContext(_: AbortSignal): ModifyContext<EditToolParams>;
 }

package/dist/src/tools/edit.js

@@ -6,7 +6,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import * as Diff from 'diff';
-import { BaseTool, Icon, ToolConfirmationOutcome, } from './tools.js';
+import { BaseDeclarativeTool, Icon, ToolConfirmationOutcome, } from './tools.js';
 import { ToolErrorType } from './tool-error.js';
 import { Type } from '@google/genai';
 import { SchemaValidator } from '../utils/schemaValidator.js';
@@ -14,91 +14,33 @@ import { makeRelative, shortenPath } from '../utils/paths.js';
 import { isNodeError } from '../utils/errors.js';
 import { ApprovalMode } from '../config/config.js';
 import { ensureCorrectEdit } from '../utils/editCorrector.js';
-import { DEFAULT_DIFF_OPTIONS } from './diffOptions.js';
+import { DEFAULT_DIFF_OPTIONS, getDiffStat } from './diffOptions.js';
 import { ReadFileTool } from './read-file.js';
-/**
- * Implementation of the Edit tool logic
- */
-export class EditTool extends BaseTool {
-    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.
-
-      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.
-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.
-**Important:** If ANY of the above are not satisfied, the tool will fail. CRITICAL for \`old_string\`: Must uniquely identify the single instance to change. Include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. If this string matches multiple locations, or does not match exactly, the tool will fail.
-**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.`, Icon.Pencil, {
-            properties: {
-                file_path: {
-                    description: "The absolute path to the file to modify. Must start with '/'.",
-                    type: Type.STRING,
-                },
-                old_string: {
-                    description: 'The exact literal text to replace, preferably unescaped. For single replacements (default), include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. For multiple replacements, specify expected_replacements parameter. If this string is not the exact literal text (i.e. you escaped it) or does not match exactly, the tool will fail.',
-                    type: Type.STRING,
-                },
-                new_string: {
-                    description: 'The exact literal text to replace `old_string` with, preferably unescaped. Provide the EXACT text. Ensure the resulting code is correct and idiomatic.',
-                    type: Type.STRING,
-                },
-                expected_replacements: {
-                    type: Type.NUMBER,
-                    description: 'Number of replacements expected. Defaults to 1 if not specified. Use when you want to replace multiple occurrences.',
-                    minimum: 1,
-                },
-            },
-            required: ['file_path', 'old_string', 'new_string'],
-            type: Type.OBJECT,
-        });
-        this.config = config;
+import { IDEConnectionStatus } from '../ide/ide-client.js';
+import { getGitStatsService } from '../services/git-stats-service.js';
+export function applyReplacement(currentContent, oldString, newString, isNewFile) {
+    if (isNewFile) {
+        return newString;
     }
-    /**
-     * Validates the parameters for the Edit tool
-     * @param params Parameters to validate
-     * @returns Error message string or null if valid
-     */
-    validateToolParams(params) {
-        const errors = SchemaValidator.validate(this.schema.parameters, params);
-        if (errors) {
-            return errors;
-        }
-        if (!path.isAbsolute(params.file_path)) {
-            return `File path must be absolute: ${params.file_path}`;
-        }
-        const workspaceContext = this.config.getWorkspaceContext();
-        if (!workspaceContext.isPathWithinWorkspace(params.file_path)) {
-            const directories = workspaceContext.getDirectories();
-            return `File path must be within one of the workspace directories: ${directories.join(', ')}`;
-        }
-        return null;
+    if (currentContent === null) {
+        // Should not happen if not a new file, but defensively return empty or newString if oldString is also empty
+        return oldString === '' ? newString : '';
     }
-    /**
-     * Determines any file locations affected by the tool execution
-     * @param params Parameters for the tool execution
-     * @returns A list of such paths
-     */
-    toolLocations(params) {
-        return [{ path: params.file_path }];
+    // If oldString is empty and it's not a new file, do not modify the content.
+    if (oldString === '' && !isNewFile) {
+        return currentContent;
     }
-    _applyReplacement(currentContent, oldString, newString, isNewFile) {
-        if (isNewFile) {
-            return newString;
-        }
-        if (currentContent === null) {
-            // Should not happen if not a new file, but defensively return empty or newString if oldString is also empty
-            return oldString === '' ? newString : '';
-        }
-        // If oldString is empty and it's not a new file, do not modify the content.
-        if (oldString === '' && !isNewFile) {
-            return currentContent;
-        }
-        return currentContent.replaceAll(oldString, newString);
+    return currentContent.replaceAll(oldString, newString);
+}
+class EditToolInvocation {
+    config;
+    params;
+    constructor(config, params) {
+        this.config = config;
+        this.params = params;
+    }
+    toolLocations() {
+        return [{ path: this.params.file_path }];
     }
     /**
      * Calculates the potential outcome of an edit operation.
@@ -185,7 +127,7 @@ Expectation for required parameters:
                 type: ToolErrorType.READ_CONTENT_FAILURE,
             };
         }
-        const newContent = this._applyReplacement(currentContent, finalOldString, finalNewString, isNewFile);
+        const newContent = applyReplacement(currentContent, finalOldString, finalNewString, isNewFile);
         return {
             currentContent,
             newContent,
@@ -198,20 +140,15 @@ Expectation for required parameters:
      * Handles the confirmation prompt for the Edit tool in the CLI.
      * It needs to calculate the diff to show the user.
      */
-    async shouldConfirmExecute(params, abortSignal) {
+    async shouldConfirmExecute(abortSignal) {
         const approvalMode = this.config.getApprovalMode();
         if (approvalMode === ApprovalMode.AUTO_EDIT ||
             approvalMode === ApprovalMode.YOLO) {
             return false;
         }
-        const validationError = this.validateToolParams(params);
-        if (validationError) {
-            console.error(`[EditTool Wrapper] Attempted confirmation with invalid parameters: ${validationError}`);
-            return false;
-        }
         let editData;
         try {
-            editData = await this.calculateEdit(params, abortSignal);
+            editData = await this.calculateEdit(this.params, abortSignal);
         }
         catch (error) {
             console.error('Failed to calculate edit:', error);
@@ -220,12 +157,19 @@ Expectation for required parameters:
         if (editData.error) {
             return false;
         }
-        const fileName = path.basename(params.file_path);
+        const fileName = path.basename(this.params.file_path);
         const fileDiff = Diff.createPatch(fileName, editData.currentContent ?? '', editData.newContent, 'Current', 'Proposed', DEFAULT_DIFF_OPTIONS);
+        const ideClient = this.config.getIdeClient();
+        const ideConfirmation = this.config.getIdeModeFeature() &&
+            this.config.getIdeMode() &&
+            ideClient?.getConnectionStatus().status === IDEConnectionStatus.Connected
+            ? ideClient.openDiff(this.params.file_path, editData.newContent)
+            : undefined;
         const confirmationDetails = {
             type: 'edit',
-            title: `Confirm Edit: ${shortenPath(makeRelative(params.file_path, this.config.getTargetDir()))}`,
+            title: `Confirm Edit: ${shortenPath(makeRelative(this.params.file_path, this.config.getTargetDir()))}`,
             fileName,
+            filePath: this.params.file_path,
             fileDiff,
             originalContent: editData.currentContent,
             newContent: editData.newContent,
@@ -233,23 +177,30 @@ Expectation for required parameters:
                 if (outcome === ToolConfirmationOutcome.ProceedAlways) {
                     this.config.setApprovalMode(ApprovalMode.AUTO_EDIT);
                 }
+                if (ideConfirmation) {
+                    const result = await ideConfirmation;
+                    if (result.status === 'accepted' && result.content) {
+                        // TODO(chrstn): See https://github.com/google-gemini/gemini-cli/pull/5618#discussion_r2255413084
+                        // for info on a possible race condition where the file is modified on disk while being edited.
+                        this.params.old_string = editData.currentContent ?? '';
+                        this.params.new_string = result.content;
+                    }
+                }
             },
+            ideConfirmation,
         };
         return confirmationDetails;
     }
-    getDescription(params) {
-        if (!params.file_path || !params.old_string || !params.new_string) {
-            return `Model did not provide valid parameters for edit tool`;
-        }
-        const relativePath = makeRelative(params.file_path, this.config.getTargetDir());
-        if (params.old_string === '') {
+    getDescription() {
+        const relativePath = makeRelative(this.params.file_path, this.config.getTargetDir());
+        if (this.params.old_string === '') {
             return `Create ${shortenPath(relativePath)}`;
         }
-        const oldStringSnippet = params.old_string.split('\n')[0].substring(0, 30) +
-            (params.old_string.length > 30 ? '...' : '');
-        const newStringSnippet = params.new_string.split('\n')[0].substring(0, 30) +
-            (params.new_string.length > 30 ? '...' : '');
-        if (params.old_string === params.new_string) {
+        const oldStringSnippet = this.params.old_string.split('\n')[0].substring(0, 30) +
+            (this.params.old_string.length > 30 ? '...' : '');
+        const newStringSnippet = this.params.new_string.split('\n')[0].substring(0, 30) +
+            (this.params.new_string.length > 30 ? '...' : '');
+        if (this.params.old_string === this.params.new_string) {
             return `No file changes to ${shortenPath(relativePath)}`;
         }
         return `${shortenPath(relativePath)}: ${oldStringSnippet} => ${newStringSnippet}`;
@@ -259,21 +210,10 @@ Expectation for required parameters:
      * @param params Parameters for the edit operation
      * @returns Result of the edit operation
      */
-    async execute(params, signal) {
-        const validationError = this.validateToolParams(params);
-        if (validationError) {
-            return {
-                llmContent: `Error: Invalid parameters provided. Reason: ${validationError}`,
-                returnDisplay: `Error: ${validationError}`,
-                error: {
-                    message: validationError,
-                    type: ToolErrorType.INVALID_TOOL_PARAMS,
-                },
-            };
-        }
+    async execute(signal) {
         let editData;
         try {
-            editData = await this.calculateEdit(params, signal);
+            editData = await this.calculateEdit(this.params, signal);
         }
         catch (error) {
             const errorMsg = error instanceof Error ? error.message : String(error);
@@ -297,37 +237,62 @@ Expectation for required parameters:
             };
         }
         try {
-            this.ensureParentDirectoriesExist(params.file_path);
-            fs.writeFileSync(params.file_path, editData.newContent, 'utf8');
+            this.ensureParentDirectoriesExist(this.params.file_path);
+            fs.writeFileSync(this.params.file_path, editData.newContent, 'utf8');
+            // Track git stats if logging is enabled and service is available
+            let gitStats = null;
+            if (this.config.getConversationLoggingEnabled()) {
+                const gitStatsService = getGitStatsService();
+                if (gitStatsService) {
+                    try {
+                        gitStats = await gitStatsService.trackFileEdit(this.params.file_path, editData.currentContent || '', editData.newContent);
+                    }
+                    catch (error) {
+                        // Don't fail the edit if git stats tracking fails
+                        console.warn('Failed to track git stats:', error);
+                    }
+                }
+            }
             let displayResult;
             if (editData.isNewFile) {
-                displayResult = `Created ${shortenPath(makeRelative(params.file_path, this.config.getTargetDir()))}`;
+                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(params.file_path);
+                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,
                 };
             }
             const llmSuccessMessageParts = [
                 editData.isNewFile
-                    ? `Created new file: ${params.file_path} with provided content.`
-                    : `Successfully modified file: ${params.file_path} (${editData.occurrences} replacements).`,
+                    ? `Created new file: ${this.params.file_path} with provided content.`
+                    : `Successfully modified file: ${this.params.file_path} (${editData.occurrences} replacements).`,
             ];
-            if (params.modified_by_user) {
-                llmSuccessMessageParts.push(`User modified the \`new_string\` content to be: ${params.new_string}.`);
+            if (this.params.modified_by_user) {
+                llmSuccessMessageParts.push(`User modified the \`new_string\` content to be: ${this.params.new_string}.`);
             }
-            return {
+            const result = {
                 llmContent: llmSuccessMessageParts.join(' '),
                 returnDisplay: displayResult,
             };
+            // Include git stats in metadata if available
+            if (gitStats) {
+                result.metadata = {
+                    ...result.metadata,
+                    gitStats,
+                };
+            }
+            return result;
         }
         catch (error) {
             const errorMsg = error instanceof Error ? error.message : String(error);
@@ -350,6 +315,72 @@ Expectation for required parameters:
             fs.mkdirSync(dirName, { recursive: true });
         }
     }
+}
+/**
+ * Implementation of the Edit tool logic
+ */
+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.
+
+      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.
+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.
+**Important:** If ANY of the above are not satisfied, the tool will fail. CRITICAL for \`old_string\`: Must uniquely identify the single instance to change. Include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. If this string matches multiple locations, or does not match exactly, the tool will fail.
+**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.`, Icon.Pencil, {
+            properties: {
+                file_path: {
+                    description: "The absolute path to the file to modify. Must start with '/'.",
+                    type: Type.STRING,
+                },
+                old_string: {
+                    description: 'The exact literal text to replace, preferably unescaped. For single replacements (default), include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. For multiple replacements, specify expected_replacements parameter. If this string is not the exact literal text (i.e. you escaped it) or does not match exactly, the tool will fail.',
+                    type: Type.STRING,
+                },
+                new_string: {
+                    description: 'The exact literal text to replace `old_string` with, preferably unescaped. Provide the EXACT text. Ensure the resulting code is correct and idiomatic.',
+                    type: Type.STRING,
+                },
+                expected_replacements: {
+                    type: Type.NUMBER,
+                    description: 'Number of replacements expected. Defaults to 1 if not specified. Use when you want to replace multiple occurrences.',
+                    minimum: 1,
+                },
+            },
+            required: ['file_path', 'old_string', 'new_string'],
+            type: Type.OBJECT,
+        });
+        this.config = config;
+    }
+    /**
+     * Validates the parameters for the Edit tool
+     * @param params Parameters to validate
+     * @returns Error message string or null if valid
+     */
+    validateToolParams(params) {
+        const errors = SchemaValidator.validate(this.schema.parameters, params);
+        if (errors) {
+            return errors;
+        }
+        if (!path.isAbsolute(params.file_path)) {
+            return `File path must be absolute: ${params.file_path}`;
+        }
+        const workspaceContext = this.config.getWorkspaceContext();
+        if (!workspaceContext.isPathWithinWorkspace(params.file_path)) {
+            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);
+    }
     getModifyContext(_) {
         return {
             getFilePath: (params) => params.file_path,
@@ -366,7 +397,7 @@ Expectation for required parameters:
             getProposedContent: async (params) => {
                 try {
                     const currentContent = fs.readFileSync(params.file_path, 'utf8');
-                    return this._applyReplacement(currentContent, params.old_string, params.new_string, params.old_string === '' && currentContent === '');
+                    return applyReplacement(currentContent, params.old_string, params.new_string, params.old_string === '' && currentContent === '');
                 }
                 catch (err) {
                     if (!isNodeError(err) || err.code !== 'ENOENT')
@@ -374,12 +405,16 @@ Expectation for required parameters:
                     return '';
                 }
             },
-            createUpdatedParams: (oldContent, modifiedProposedContent, originalParams) => ({
-                ...originalParams,
-                old_string: oldContent,
-                new_string: modifiedProposedContent,
-                modified_by_user: true,
-            }),
+            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,
+                };
+            },
         };
     }
 }