@dexto/tools-filesystem 1.5.2 → 1.5.4

package/dist/directory-approval.integration.test.cjs

@@ -84,7 +84,7 @@ const createMockLogger = () => ({
         });
         const testFile = path.join(tempDir, "test.txt");
         await fs.writeFile(testFile, "test content");
-        const override = tool.getApprovalOverride?.({ file_path: testFile });
+        const override = await tool.getApprovalOverride?.({ file_path: testFile });
         (0, import_vitest.expect)(override).toBeNull();
       });
       (0, import_vitest.it)("should return directory access approval for external paths", async () => {
@@ -93,7 +93,7 @@ const createMockLogger = () => ({
           directoryApproval
         });
         const externalPath = "/external/project/file.ts";
-        const override = tool.getApprovalOverride?.({ file_path: externalPath });
+        const override = await tool.getApprovalOverride?.({ file_path: externalPath });
         (0, import_vitest.expect)(override).not.toBeNull();
         (0, import_vitest.expect)(override?.type).toBe(import_core.ApprovalType.DIRECTORY_ACCESS);
         const metadata = override?.metadata;
@@ -109,7 +109,7 @@ const createMockLogger = () => ({
           directoryApproval
         });
         const externalPath = "/external/project/file.ts";
-        const override = tool.getApprovalOverride?.({ file_path: externalPath });
+        const override = await tool.getApprovalOverride?.({ file_path: externalPath });
         (0, import_vitest.expect)(override).toBeNull();
         (0, import_vitest.expect)(isSessionApprovedMock).toHaveBeenCalledWith(externalPath);
       });
@@ -118,7 +118,7 @@ const createMockLogger = () => ({
           fileSystemService,
           directoryApproval
         });
-        const override = tool.getApprovalOverride?.({});
+        const override = await tool.getApprovalOverride?.({});
         (0, import_vitest.expect)(override).toBeNull();
       });
     });
@@ -129,7 +129,7 @@ const createMockLogger = () => ({
           directoryApproval
         });
         const externalPath = "/external/project/file.ts";
-        tool.getApprovalOverride?.({ file_path: externalPath });
+        await tool.getApprovalOverride?.({ file_path: externalPath });
         tool.onApprovalGranted?.({
           approvalId: "test-approval",
           status: import_core.ApprovalStatus.APPROVED,
@@ -146,7 +146,7 @@ const createMockLogger = () => ({
           directoryApproval
         });
         const externalPath = "/external/project/file.ts";
-        tool.getApprovalOverride?.({ file_path: externalPath });
+        await tool.getApprovalOverride?.({ file_path: externalPath });
         tool.onApprovalGranted?.({
           approvalId: "test-approval",
           status: import_core.ApprovalStatus.APPROVED,
@@ -163,7 +163,7 @@ const createMockLogger = () => ({
           directoryApproval
         });
         const externalPath = "/external/project/file.ts";
-        tool.getApprovalOverride?.({ file_path: externalPath });
+        await tool.getApprovalOverride?.({ file_path: externalPath });
         tool.onApprovalGranted?.({
           approvalId: "test-approval",
           status: import_core.ApprovalStatus.APPROVED,
@@ -180,7 +180,7 @@ const createMockLogger = () => ({
           directoryApproval: void 0
         });
         const externalPath = "/external/project/file.ts";
-        tool.getApprovalOverride?.({ file_path: externalPath });
+        await tool.getApprovalOverride?.({ file_path: externalPath });
         tool.onApprovalGranted?.({
           approvalId: "test-approval",
           status: import_core.ApprovalStatus.APPROVED,
@@ -211,7 +211,7 @@ const createMockLogger = () => ({
           directoryApproval
         });
         const testFile = path.join(tempDir, "new-file.txt");
-        const override = tool.getApprovalOverride?.({
+        const override = await tool.getApprovalOverride?.({
           file_path: testFile,
           content: "test"
         });
@@ -223,7 +223,7 @@ const createMockLogger = () => ({
           directoryApproval
         });
         const externalPath = "/external/project/new.ts";
-        const override = tool.getApprovalOverride?.({
+        const override = await tool.getApprovalOverride?.({
           file_path: externalPath,
           content: "test"
         });
@@ -240,7 +240,7 @@ const createMockLogger = () => ({
           directoryApproval
         });
         const externalPath = "/external/project/new.ts";
-        const override = tool.getApprovalOverride?.({
+        const override = await tool.getApprovalOverride?.({
           file_path: externalPath,
           content: "test"
         });
@@ -254,7 +254,7 @@ const createMockLogger = () => ({
           directoryApproval
         });
         const externalPath = "/external/project/new.ts";
-        tool.getApprovalOverride?.({ file_path: externalPath, content: "test" });
+        await tool.getApprovalOverride?.({ file_path: externalPath, content: "test" });
         tool.onApprovalGranted?.({
           approvalId: "test-approval",
           status: import_core.ApprovalStatus.APPROVED,
@@ -275,7 +275,7 @@ const createMockLogger = () => ({
           directoryApproval
         });
         const testFile = path.join(tempDir, "existing.txt");
-        const override = tool.getApprovalOverride?.({
+        const override = await tool.getApprovalOverride?.({
           file_path: testFile,
           old_string: "old",
           new_string: "new"
@@ -288,7 +288,7 @@ const createMockLogger = () => ({
           directoryApproval
         });
         const externalPath = "/external/project/existing.ts";
-        const override = tool.getApprovalOverride?.({
+        const override = await tool.getApprovalOverride?.({
           file_path: externalPath,
           old_string: "old",
           new_string: "new"
@@ -306,7 +306,7 @@ const createMockLogger = () => ({
           directoryApproval
         });
         const externalPath = "/external/project/existing.ts";
-        const override = tool.getApprovalOverride?.({
+        const override = await tool.getApprovalOverride?.({
           file_path: externalPath,
           old_string: "old",
           new_string: "new"
@@ -323,7 +323,7 @@ const createMockLogger = () => ({
       });
       const externalPath1 = "/external/project/file1.ts";
       const externalPath2 = "/external/project/file2.ts";
-      let override = tool.getApprovalOverride?.({ file_path: externalPath1 });
+      let override = await tool.getApprovalOverride?.({ file_path: externalPath1 });
       (0, import_vitest.expect)(override).not.toBeNull();
       tool.onApprovalGranted?.({
         approvalId: "approval-1",
@@ -335,7 +335,7 @@ const createMockLogger = () => ({
         "session"
       );
       isSessionApprovedMock.mockReturnValue(true);
-      override = tool.getApprovalOverride?.({ file_path: externalPath2 });
+      override = await tool.getApprovalOverride?.({ file_path: externalPath2 });
       (0, import_vitest.expect)(override).toBeNull();
     });
     (0, import_vitest.it)("should prompt for subsequent requests after once approval", async () => {
@@ -345,7 +345,7 @@ const createMockLogger = () => ({
       });
       const externalPath1 = "/external/project/file1.ts";
       const externalPath2 = "/external/project/file2.ts";
-      let override = tool.getApprovalOverride?.({ file_path: externalPath1 });
+      let override = await tool.getApprovalOverride?.({ file_path: externalPath1 });
       (0, import_vitest.expect)(override).not.toBeNull();
       tool.onApprovalGranted?.({
         approvalId: "approval-1",
@@ -357,7 +357,7 @@ const createMockLogger = () => ({
         "once"
       );
       isSessionApprovedMock.mockReturnValue(false);
-      override = tool.getApprovalOverride?.({ file_path: externalPath2 });
+      override = await tool.getApprovalOverride?.({ file_path: externalPath2 });
       (0, import_vitest.expect)(override).not.toBeNull();
     });
   });
@@ -372,9 +372,11 @@ const createMockLogger = () => ({
         const approvedDir = "/external/project";
         return normalizedPath.startsWith(approvedDir + path.sep) || normalizedPath === approvedDir;
       });
-      let override = tool.getApprovalOverride?.({ file_path: "/external/project/file.ts" });
+      let override = await tool.getApprovalOverride?.({
+        file_path: "/external/project/file.ts"
+      });
       (0, import_vitest.expect)(override).toBeNull();
-      override = tool.getApprovalOverride?.({
+      override = await tool.getApprovalOverride?.({
         file_path: "/external/project/deep/nested/file.ts"
       });
       (0, import_vitest.expect)(override).toBeNull();
@@ -389,9 +391,9 @@ const createMockLogger = () => ({
         const approvedDir = "/external/sub";
         return normalizedPath.startsWith(approvedDir + path.sep) || normalizedPath === approvedDir;
       });
-      let override = tool.getApprovalOverride?.({ file_path: "/external/sub/file.ts" });
+      let override = await tool.getApprovalOverride?.({ file_path: "/external/sub/file.ts" });
       (0, import_vitest.expect)(override).toBeNull();
-      override = tool.getApprovalOverride?.({ file_path: "/external/other/file.ts" });
+      override = await tool.getApprovalOverride?.({ file_path: "/external/other/file.ts" });
       (0, import_vitest.expect)(override).not.toBeNull();
     });
   });
@@ -403,11 +405,11 @@ const createMockLogger = () => ({
       });
       const dir1Path = "/external/project1/file.ts";
       const dir2Path = "/external/project2/file.ts";
-      const override1 = tool.getApprovalOverride?.({ file_path: dir1Path });
+      const override1 = await tool.getApprovalOverride?.({ file_path: dir1Path });
       (0, import_vitest.expect)(override1).not.toBeNull();
       const metadata1 = override1?.metadata;
       (0, import_vitest.expect)(metadata1?.parentDir).toBe("/external/project1");
-      const override2 = tool.getApprovalOverride?.({ file_path: dir2Path });
+      const override2 = await tool.getApprovalOverride?.({ file_path: dir2Path });
       (0, import_vitest.expect)(override2).not.toBeNull();
       const metadata2 = override2?.metadata;
       (0, import_vitest.expect)(metadata2?.parentDir).toBe("/external/project2");
@@ -420,16 +422,16 @@ const createMockLogger = () => ({
       const editTool = (0, import_edit_file_tool.createEditFileTool)({ fileSystemService, directoryApproval });
       const externalDir = "/external/project";
       (0, import_vitest.expect)(
-        readTool.getApprovalOverride?.({ file_path: `${externalDir}/file1.ts` })
+        await readTool.getApprovalOverride?.({ file_path: `${externalDir}/file1.ts` })
       ).not.toBeNull();
       (0, import_vitest.expect)(
-        writeTool.getApprovalOverride?.({
+        await writeTool.getApprovalOverride?.({
           file_path: `${externalDir}/file2.ts`,
           content: "test"
         })
       ).not.toBeNull();
       (0, import_vitest.expect)(
-        editTool.getApprovalOverride?.({
+        await editTool.getApprovalOverride?.({
           file_path: `${externalDir}/file3.ts`,
           old_string: "a",
           new_string: "b"
@@ -437,16 +439,16 @@ const createMockLogger = () => ({
       ).not.toBeNull();
       isSessionApprovedMock.mockReturnValue(true);
       (0, import_vitest.expect)(
-        readTool.getApprovalOverride?.({ file_path: `${externalDir}/file1.ts` })
+        await readTool.getApprovalOverride?.({ file_path: `${externalDir}/file1.ts` })
       ).toBeNull();
       (0, import_vitest.expect)(
-        writeTool.getApprovalOverride?.({
+        await writeTool.getApprovalOverride?.({
           file_path: `${externalDir}/file2.ts`,
           content: "test"
         })
       ).toBeNull();
       (0, import_vitest.expect)(
-        editTool.getApprovalOverride?.({
+        await editTool.getApprovalOverride?.({
           file_path: `${externalDir}/file3.ts`,
           old_string: "a",
           new_string: "b"
@@ -460,7 +462,9 @@ const createMockLogger = () => ({
         fileSystemService,
         directoryApproval: void 0
       });
-      const override = tool.getApprovalOverride?.({ file_path: "/external/project/file.ts" });
+      const override = await tool.getApprovalOverride?.({
+        file_path: "/external/project/file.ts"
+      });
       (0, import_vitest.expect)(override).not.toBeNull();
     });
   });

package/dist/directory-approval.integration.test.js

@@ -61,7 +61,7 @@ describe("Directory Approval Integration Tests", () => {
         });
         const testFile = path.join(tempDir, "test.txt");
         await fs.writeFile(testFile, "test content");
-        const override = tool.getApprovalOverride?.({ file_path: testFile });
+        const override = await tool.getApprovalOverride?.({ file_path: testFile });
         expect(override).toBeNull();
       });
       it("should return directory access approval for external paths", async () => {
@@ -70,7 +70,7 @@ describe("Directory Approval Integration Tests", () => {
           directoryApproval
         });
         const externalPath = "/external/project/file.ts";
-        const override = tool.getApprovalOverride?.({ file_path: externalPath });
+        const override = await tool.getApprovalOverride?.({ file_path: externalPath });
         expect(override).not.toBeNull();
         expect(override?.type).toBe(ApprovalType.DIRECTORY_ACCESS);
         const metadata = override?.metadata;
@@ -86,7 +86,7 @@ describe("Directory Approval Integration Tests", () => {
           directoryApproval
         });
         const externalPath = "/external/project/file.ts";
-        const override = tool.getApprovalOverride?.({ file_path: externalPath });
+        const override = await tool.getApprovalOverride?.({ file_path: externalPath });
         expect(override).toBeNull();
         expect(isSessionApprovedMock).toHaveBeenCalledWith(externalPath);
       });
@@ -95,7 +95,7 @@ describe("Directory Approval Integration Tests", () => {
           fileSystemService,
           directoryApproval
         });
-        const override = tool.getApprovalOverride?.({});
+        const override = await tool.getApprovalOverride?.({});
         expect(override).toBeNull();
       });
     });
@@ -106,7 +106,7 @@ describe("Directory Approval Integration Tests", () => {
           directoryApproval
         });
         const externalPath = "/external/project/file.ts";
-        tool.getApprovalOverride?.({ file_path: externalPath });
+        await tool.getApprovalOverride?.({ file_path: externalPath });
         tool.onApprovalGranted?.({
           approvalId: "test-approval",
           status: ApprovalStatus.APPROVED,
@@ -123,7 +123,7 @@ describe("Directory Approval Integration Tests", () => {
           directoryApproval
         });
         const externalPath = "/external/project/file.ts";
-        tool.getApprovalOverride?.({ file_path: externalPath });
+        await tool.getApprovalOverride?.({ file_path: externalPath });
         tool.onApprovalGranted?.({
           approvalId: "test-approval",
           status: ApprovalStatus.APPROVED,
@@ -140,7 +140,7 @@ describe("Directory Approval Integration Tests", () => {
           directoryApproval
         });
         const externalPath = "/external/project/file.ts";
-        tool.getApprovalOverride?.({ file_path: externalPath });
+        await tool.getApprovalOverride?.({ file_path: externalPath });
         tool.onApprovalGranted?.({
           approvalId: "test-approval",
           status: ApprovalStatus.APPROVED,
@@ -157,7 +157,7 @@ describe("Directory Approval Integration Tests", () => {
           directoryApproval: void 0
         });
         const externalPath = "/external/project/file.ts";
-        tool.getApprovalOverride?.({ file_path: externalPath });
+        await tool.getApprovalOverride?.({ file_path: externalPath });
         tool.onApprovalGranted?.({
           approvalId: "test-approval",
           status: ApprovalStatus.APPROVED,
@@ -188,7 +188,7 @@ describe("Directory Approval Integration Tests", () => {
           directoryApproval
         });
         const testFile = path.join(tempDir, "new-file.txt");
-        const override = tool.getApprovalOverride?.({
+        const override = await tool.getApprovalOverride?.({
           file_path: testFile,
           content: "test"
         });
@@ -200,7 +200,7 @@ describe("Directory Approval Integration Tests", () => {
           directoryApproval
         });
         const externalPath = "/external/project/new.ts";
-        const override = tool.getApprovalOverride?.({
+        const override = await tool.getApprovalOverride?.({
           file_path: externalPath,
           content: "test"
         });
@@ -217,7 +217,7 @@ describe("Directory Approval Integration Tests", () => {
           directoryApproval
         });
         const externalPath = "/external/project/new.ts";
-        const override = tool.getApprovalOverride?.({
+        const override = await tool.getApprovalOverride?.({
           file_path: externalPath,
           content: "test"
         });
@@ -231,7 +231,7 @@ describe("Directory Approval Integration Tests", () => {
           directoryApproval
         });
         const externalPath = "/external/project/new.ts";
-        tool.getApprovalOverride?.({ file_path: externalPath, content: "test" });
+        await tool.getApprovalOverride?.({ file_path: externalPath, content: "test" });
         tool.onApprovalGranted?.({
           approvalId: "test-approval",
           status: ApprovalStatus.APPROVED,
@@ -252,7 +252,7 @@ describe("Directory Approval Integration Tests", () => {
           directoryApproval
         });
         const testFile = path.join(tempDir, "existing.txt");
-        const override = tool.getApprovalOverride?.({
+        const override = await tool.getApprovalOverride?.({
           file_path: testFile,
           old_string: "old",
           new_string: "new"
@@ -265,7 +265,7 @@ describe("Directory Approval Integration Tests", () => {
           directoryApproval
         });
         const externalPath = "/external/project/existing.ts";
-        const override = tool.getApprovalOverride?.({
+        const override = await tool.getApprovalOverride?.({
           file_path: externalPath,
           old_string: "old",
           new_string: "new"
@@ -283,7 +283,7 @@ describe("Directory Approval Integration Tests", () => {
           directoryApproval
         });
         const externalPath = "/external/project/existing.ts";
-        const override = tool.getApprovalOverride?.({
+        const override = await tool.getApprovalOverride?.({
           file_path: externalPath,
           old_string: "old",
           new_string: "new"
@@ -300,7 +300,7 @@ describe("Directory Approval Integration Tests", () => {
       });
       const externalPath1 = "/external/project/file1.ts";
       const externalPath2 = "/external/project/file2.ts";
-      let override = tool.getApprovalOverride?.({ file_path: externalPath1 });
+      let override = await tool.getApprovalOverride?.({ file_path: externalPath1 });
       expect(override).not.toBeNull();
       tool.onApprovalGranted?.({
         approvalId: "approval-1",
@@ -312,7 +312,7 @@ describe("Directory Approval Integration Tests", () => {
         "session"
       );
       isSessionApprovedMock.mockReturnValue(true);
-      override = tool.getApprovalOverride?.({ file_path: externalPath2 });
+      override = await tool.getApprovalOverride?.({ file_path: externalPath2 });
       expect(override).toBeNull();
     });
     it("should prompt for subsequent requests after once approval", async () => {
@@ -322,7 +322,7 @@ describe("Directory Approval Integration Tests", () => {
       });
       const externalPath1 = "/external/project/file1.ts";
       const externalPath2 = "/external/project/file2.ts";
-      let override = tool.getApprovalOverride?.({ file_path: externalPath1 });
+      let override = await tool.getApprovalOverride?.({ file_path: externalPath1 });
       expect(override).not.toBeNull();
       tool.onApprovalGranted?.({
         approvalId: "approval-1",
@@ -334,7 +334,7 @@ describe("Directory Approval Integration Tests", () => {
         "once"
       );
       isSessionApprovedMock.mockReturnValue(false);
-      override = tool.getApprovalOverride?.({ file_path: externalPath2 });
+      override = await tool.getApprovalOverride?.({ file_path: externalPath2 });
       expect(override).not.toBeNull();
     });
   });
@@ -349,9 +349,11 @@ describe("Directory Approval Integration Tests", () => {
         const approvedDir = "/external/project";
         return normalizedPath.startsWith(approvedDir + path.sep) || normalizedPath === approvedDir;
       });
-      let override = tool.getApprovalOverride?.({ file_path: "/external/project/file.ts" });
+      let override = await tool.getApprovalOverride?.({
+        file_path: "/external/project/file.ts"
+      });
       expect(override).toBeNull();
-      override = tool.getApprovalOverride?.({
+      override = await tool.getApprovalOverride?.({
         file_path: "/external/project/deep/nested/file.ts"
       });
       expect(override).toBeNull();
@@ -366,9 +368,9 @@ describe("Directory Approval Integration Tests", () => {
         const approvedDir = "/external/sub";
         return normalizedPath.startsWith(approvedDir + path.sep) || normalizedPath === approvedDir;
       });
-      let override = tool.getApprovalOverride?.({ file_path: "/external/sub/file.ts" });
+      let override = await tool.getApprovalOverride?.({ file_path: "/external/sub/file.ts" });
       expect(override).toBeNull();
-      override = tool.getApprovalOverride?.({ file_path: "/external/other/file.ts" });
+      override = await tool.getApprovalOverride?.({ file_path: "/external/other/file.ts" });
       expect(override).not.toBeNull();
     });
   });
@@ -380,11 +382,11 @@ describe("Directory Approval Integration Tests", () => {
       });
       const dir1Path = "/external/project1/file.ts";
       const dir2Path = "/external/project2/file.ts";
-      const override1 = tool.getApprovalOverride?.({ file_path: dir1Path });
+      const override1 = await tool.getApprovalOverride?.({ file_path: dir1Path });
       expect(override1).not.toBeNull();
       const metadata1 = override1?.metadata;
       expect(metadata1?.parentDir).toBe("/external/project1");
-      const override2 = tool.getApprovalOverride?.({ file_path: dir2Path });
+      const override2 = await tool.getApprovalOverride?.({ file_path: dir2Path });
       expect(override2).not.toBeNull();
       const metadata2 = override2?.metadata;
       expect(metadata2?.parentDir).toBe("/external/project2");
@@ -397,16 +399,16 @@ describe("Directory Approval Integration Tests", () => {
       const editTool = createEditFileTool({ fileSystemService, directoryApproval });
       const externalDir = "/external/project";
       expect(
-        readTool.getApprovalOverride?.({ file_path: `${externalDir}/file1.ts` })
+        await readTool.getApprovalOverride?.({ file_path: `${externalDir}/file1.ts` })
       ).not.toBeNull();
       expect(
-        writeTool.getApprovalOverride?.({
+        await writeTool.getApprovalOverride?.({
           file_path: `${externalDir}/file2.ts`,
           content: "test"
         })
       ).not.toBeNull();
       expect(
-        editTool.getApprovalOverride?.({
+        await editTool.getApprovalOverride?.({
           file_path: `${externalDir}/file3.ts`,
           old_string: "a",
           new_string: "b"
@@ -414,16 +416,16 @@ describe("Directory Approval Integration Tests", () => {
       ).not.toBeNull();
       isSessionApprovedMock.mockReturnValue(true);
       expect(
-        readTool.getApprovalOverride?.({ file_path: `${externalDir}/file1.ts` })
+        await readTool.getApprovalOverride?.({ file_path: `${externalDir}/file1.ts` })
       ).toBeNull();
       expect(
-        writeTool.getApprovalOverride?.({
+        await writeTool.getApprovalOverride?.({
           file_path: `${externalDir}/file2.ts`,
           content: "test"
         })
       ).toBeNull();
       expect(
-        editTool.getApprovalOverride?.({
+        await editTool.getApprovalOverride?.({
           file_path: `${externalDir}/file3.ts`,
           old_string: "a",
           new_string: "b"
@@ -437,7 +439,9 @@ describe("Directory Approval Integration Tests", () => {
         fileSystemService,
         directoryApproval: void 0
       });
-      const override = tool.getApprovalOverride?.({ file_path: "/external/project/file.ts" });
+      const override = await tool.getApprovalOverride?.({
+        file_path: "/external/project/file.ts"
+      });
       expect(override).not.toBeNull();
     });
   });

package/dist/edit-file-tool.cjs

@@ -32,12 +32,18 @@ __export(edit_file_tool_exports, {
 });
 module.exports = __toCommonJS(edit_file_tool_exports);
 var path = __toESM(require("node:path"), 1);
+var import_node_crypto = require("node:crypto");
 var import_zod = require("zod");
 var import_diff = require("diff");
 var import_core = require("@dexto/core");
 var import_core2 = require("@dexto/core");
 var import_core3 = require("@dexto/core");
 var import_core4 = require("@dexto/core");
+var import_error_codes = require("./error-codes.js");
+const previewContentHashCache = /* @__PURE__ */ new Map();
+function computeContentHash(content) {
+  return (0, import_node_crypto.createHash)("sha256").update(content, "utf8").digest("hex");
+}
 const EditFileInputSchema = import_zod.z.object({
   file_path: import_zod.z.string().describe("Absolute path to the file to edit"),
   old_string: import_zod.z.string().describe("Text to replace (must be unique unless replace_all is true)"),
@@ -69,10 +75,10 @@ function createEditFileTool(options) {
      * Check if this edit operation needs directory access approval.
      * Returns custom approval request if the file is outside allowed paths.
      */
-    getApprovalOverride: (args) => {
+    getApprovalOverride: async (args) => {
       const { file_path } = args;
       if (!file_path) return null;
-      const isAllowed = fileSystemService.isPathWithinConfigAllowed(file_path);
+      const isAllowed = await fileSystemService.isPathWithinConfigAllowed(file_path);
       if (isAllowed) {
         return null;
       }
@@ -108,12 +114,19 @@ function createEditFileTool(options) {
     /**
      * Generate preview for approval UI - shows diff without modifying file
      * Throws ToolError.validationFailed() for validation errors (file not found, string not found)
+     * Stores content hash for change detection in execute phase.
      */
-    generatePreview: async (input, _context) => {
+    generatePreview: async (input, context) => {
       const { file_path, old_string, new_string, replace_all } = input;
       try {
         const originalFile = await fileSystemService.readFile(file_path);
         const originalContent = originalFile.content;
+        if (context?.toolCallId) {
+          previewContentHashCache.set(
+            context.toolCallId,
+            computeContentHash(originalContent)
+          );
+        }
         if (!replace_all) {
           const occurrences = originalContent.split(old_string).length - 1;
           if (occurrences > 1) {
@@ -146,25 +159,36 @@ function createEditFileTool(options) {
         return null;
       }
     },
-    execute: async (input, _context) => {
+    execute: async (input, context) => {
       const { file_path, old_string, new_string, replace_all } = input;
-      const originalFile = await fileSystemService.readFile(file_path);
-      const originalContent = originalFile.content;
-      const result = await fileSystemService.editFile(
-        file_path,
-        {
-          oldString: old_string,
-          newString: new_string,
-          replaceAll: replace_all
-        },
-        {
-          backup: true
-          // Always create backup for internal tools
+      if (context?.toolCallId && previewContentHashCache.has(context.toolCallId)) {
+        const expectedHash = previewContentHashCache.get(context.toolCallId);
+        previewContentHashCache.delete(context.toolCallId);
+        let currentContent;
+        try {
+          const currentFile = await fileSystemService.readFile(file_path);
+          currentContent = currentFile.content;
+        } catch (error) {
+          if (error instanceof import_core4.DextoRuntimeError && error.code === import_error_codes.FileSystemErrorCode.FILE_NOT_FOUND) {
+            throw import_core2.ToolError.fileModifiedSincePreview("edit_file", file_path);
+          }
+          throw error;
+        }
+        const currentHash = computeContentHash(currentContent);
+        if (expectedHash !== currentHash) {
+          throw import_core2.ToolError.fileModifiedSincePreview("edit_file", file_path);
         }
+      }
+      const result = await fileSystemService.editFile(file_path, {
+        oldString: old_string,
+        newString: new_string,
+        replaceAll: replace_all
+      });
+      const _display = generateDiffPreview(
+        file_path,
+        result.originalContent,
+        result.newContent
       );
-      const newFile = await fileSystemService.readFile(file_path);
-      const newContent = newFile.content;
-      const _display = generateDiffPreview(file_path, originalContent, newContent);
       return {
         success: result.success,
         path: result.path,