@dexto/tools-filesystem 1.7.1 → 1.8.0

package/dist/directory-approval.cjs

@@ -33,7 +33,8 @@ __export(directory_approval_exports, {
 });
 module.exports = __toCommonJS(directory_approval_exports);
 var path = __toESM(require("node:path"), 1);
-var import_core = require("@dexto/core");
+var import_approval = require("@dexto/core/approval");
+var import_tools = require("@dexto/core/tools");
 var import_path_utils = require("./path-utils.js");
 function resolveFilePath(workingDirectory, filePath) {
   const resolvedPath = (0, import_path_utils.resolveUserPath)(workingDirectory, filePath);
@@ -53,7 +54,7 @@ function createDirectoryAccessApprovalHandlers(options) {
         }
         const approvalManager = context.services?.approval;
         if (!approvalManager) {
-          throw import_core.ToolError.configInvalid(
+          throw import_tools.ToolError.configInvalid(
             `${options.toolName} requires ToolExecutionContext.services.approval`
           );
         }
@@ -61,7 +62,7 @@ function createDirectoryAccessApprovalHandlers(options) {
           return null;
         }
         return {
-          type: import_core.ApprovalType.DIRECTORY_ACCESS,
+          type: import_approval.ApprovalType.DIRECTORY_ACCESS,
           metadata: {
             path: paths.path,
             parentDir: paths.parentDir,
@@ -75,7 +76,7 @@ function createDirectoryAccessApprovalHandlers(options) {
         if (!approvalManager) {
           return;
         }
-        if (response.status !== import_core.ApprovalStatus.APPROVED) {
+        if (response.status !== import_approval.ApprovalStatus.APPROVED) {
           return;
         }
         const data = response.data;

package/dist/directory-approval.d.ts

@@ -1,5 +1,6 @@
 import type { z, ZodTypeAny } from 'zod';
-import type { ApprovalRequestDetails, ApprovalResponse, ToolExecutionContext } from '@dexto/core';
+import type { ApprovalRequestDetails, ApprovalResponse } from '@dexto/core/approval';
+import type { ToolExecutionContext } from '@dexto/core/tools';
 import type { FileSystemService } from './filesystem-service.js';
 import type { FileSystemServiceGetter } from './file-tool-types.js';
 type DirectoryApprovalOperation = 'read' | 'write' | 'edit';

package/dist/directory-approval.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"directory-approval.d.ts","sourceRoot":"","sources":["../src/directory-approval.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,MAAM,KAAK,CAAC;AAEzC,OAAO,KAAK,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAClG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAGpE,KAAK,0BAA0B,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;AAE5D,KAAK,sBAAsB,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,wBAAgB,eAAe,CAC3B,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,GACjB,sBAAsB,CAGxB;AAED,wBAAgB,qCAAqC,CAAC,KAAK,CAAC,OAAO,SAAS,UAAU,EAAE,OAAO,EAAE;IAC7F,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,0BAA0B,CAAC;IACtC,WAAW,EAAE,OAAO,CAAC;IACrB,oBAAoB,EAAE,uBAAuB,CAAC;IAC9C,YAAY,EAAE,CACV,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EACxB,iBAAiB,EAAE,iBAAiB,KACnC,sBAAsB,CAAC;CAC/B,GAAG;IACA,QAAQ,EAAE;QACN,QAAQ,EAAE,CACN,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EACxB,OAAO,EAAE,oBAAoB,KAC5B,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAAC;QAC5C,SAAS,EAAE,CACP,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,EAAE,oBAAoB,EAC7B,eAAe,EAAE,sBAAsB,KACtC,OAAO,CAAC,IAAI,CAAC,CAAC;KACtB,CAAC;CACL,CA6DA"}
+{"version":3,"file":"directory-approval.d.ts","sourceRoot":"","sources":["../src/directory-approval.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,MAAM,KAAK,CAAC;AAEzC,OAAO,KAAK,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAErF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAGpE,KAAK,0BAA0B,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;AAE5D,KAAK,sBAAsB,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,wBAAgB,eAAe,CAC3B,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,GACjB,sBAAsB,CAGxB;AAED,wBAAgB,qCAAqC,CAAC,KAAK,CAAC,OAAO,SAAS,UAAU,EAAE,OAAO,EAAE;IAC7F,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,0BAA0B,CAAC;IACtC,WAAW,EAAE,OAAO,CAAC;IACrB,oBAAoB,EAAE,uBAAuB,CAAC;IAC9C,YAAY,EAAE,CACV,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EACxB,iBAAiB,EAAE,iBAAiB,KACnC,sBAAsB,CAAC;CAC/B,GAAG;IACA,QAAQ,EAAE;QACN,QAAQ,EAAE,CACN,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EACxB,OAAO,EAAE,oBAAoB,KAC5B,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAAC;QAC5C,SAAS,EAAE,CACP,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,EAAE,oBAAoB,EAC7B,eAAe,EAAE,sBAAsB,KACtC,OAAO,CAAC,IAAI,CAAC,CAAC;KACtB,CAAC;CACL,CA6DA"}

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

@@ -26,6 +26,8 @@ var path = __toESM(require("node:path"), 1);
 var fs = __toESM(require("node:fs/promises"), 1);
 var os = __toESM(require("node:os"), 1);
 var import_core = require("@dexto/core");
+var import_storage = require("@dexto/core/storage");
+var import_workspace = require("@dexto/core/workspace");
 var import_filesystem_service = require("./filesystem-service.js");
 var import_read_file_tool = require("./read-file-tool.js");
 var import_write_file_tool = require("./write-file-tool.js");
@@ -49,26 +51,8 @@ const createMockLogger = () => {
   };
   return logger;
 };
-function createInMemorySessionApprovalStore() {
-  const states = /* @__PURE__ */ new Map();
-  return {
-    async load(sessionId) {
-      return structuredClone(
-        states.get(sessionId ?? "__global__") ?? {
-          toolPatterns: {},
-          approvedDirectories: []
-        }
-      );
-    },
-    async save(sessionId, state) {
-      states.set(sessionId ?? "__global__", structuredClone(state));
-    },
-    async delete(sessionId) {
-      states.delete(sessionId ?? "__global__");
-    }
-  };
-}
-function createToolContext(logger, approval, sessionId) {
+function createToolContext(logger, approval, sessionId, workspacePath) {
+  const workspaceRoot = workspacePath ?? tempWorkspaceRoot;
   return {
     logger,
     ...sessionId !== void 0 ? { sessionId } : {},
@@ -77,11 +61,57 @@ function createToolContext(logger, approval, sessionId) {
       search: {},
       resources: {},
       prompts: {},
+      skills: {},
       mcp: {},
-      taskForker: null
+      taskForker: null,
+      workspaceManager: createWorkspaceManager(workspaceRoot)
     }
   };
 }
+let tempWorkspaceRoot = process.cwd();
+function createWorkspaceManager(workspaceRoot) {
+  return {
+    open: async () => ({
+      context: {
+        id: "test-workspace",
+        path: workspaceRoot,
+        createdAt: Date.now(),
+        lastActiveAt: Date.now()
+      },
+      capabilities: ["files"],
+      files: {
+        readFile: async (filePath) => {
+          const resolved = resolveWorkspacePath(workspaceRoot, filePath);
+          return readWorkspaceFile(resolved, filePath);
+        },
+        readText: async (filePath) => {
+          const resolved = resolveWorkspacePath(workspaceRoot, filePath);
+          return readWorkspaceFile(resolved, filePath);
+        },
+        writeFile: async (filePath, content) => {
+          const resolved = resolveWorkspacePath(workspaceRoot, filePath);
+          await fs.mkdir(path.dirname(resolved), { recursive: true });
+          await fs.writeFile(resolved, content, "utf8");
+        },
+        glob: import_vitest.vi.fn(async () => []),
+        listFiles: import_vitest.vi.fn(async () => [])
+      }
+    })
+  };
+}
+function resolveWorkspacePath(workspaceRoot, filePath) {
+  return path.isAbsolute(filePath) ? filePath : path.join(workspaceRoot, filePath);
+}
+async function readWorkspaceFile(resolvedPath, filePath) {
+  try {
+    return await fs.readFile(resolvedPath, "utf8");
+  } catch (error) {
+    if (error.code === "ENOENT") {
+      throw import_workspace.WorkspaceError.fileNotFound(filePath);
+    }
+    throw error;
+  }
+}
 (0, import_vitest.describe)("Directory Approval Integration Tests", () => {
   let mockLogger;
   let tempDir;
@@ -106,13 +136,14 @@ function createToolContext(logger, approval, sessionId) {
       mockLogger
     );
     await fileSystemService.initialize();
+    tempWorkspaceRoot = tempDir;
     approvalManager = new import_core.ApprovalManager(
       {
         permissions: { mode: "manual" },
         elicitation: { enabled: true }
       },
       mockLogger,
-      createInMemorySessionApprovalStore()
+      new import_storage.InMemoryDextoStores().getStore("approvals")
     );
     toolContext = createToolContext(mockLogger, approvalManager);
     import_vitest.vi.clearAllMocks();
@@ -321,7 +352,7 @@ function createToolContext(logger, approval, sessionId) {
               file_path: externalFile,
               content: "session-scoped write"
             }),
-            createToolContext(mockLogger, approvalManager, "session-a")
+            createToolContext(mockLogger, approvalManager, "session-a", externalDir)
           )
         ).resolves.toEqual(
           import_vitest.expect.objectContaining({
@@ -332,15 +363,20 @@ function createToolContext(logger, approval, sessionId) {
         await (0, import_vitest.expect)(fs.readFile(externalFile, "utf8")).resolves.toBe(
           "session-scoped write"
         );
+        const blockedInput = writeTool.inputSchema.parse({
+          file_path: path.join(externalDir, "blocked.txt"),
+          content: "should fail"
+        });
         await (0, import_vitest.expect)(
-          writeTool.execute(
-            writeTool.inputSchema.parse({
-              file_path: path.join(externalDir, "blocked.txt"),
-              content: "should fail"
-            }),
+          writeTool.approval.override(
+            blockedInput,
             createToolContext(mockLogger, approvalManager, "session-b")
           )
-        ).rejects.toBeInstanceOf(import_core.DextoRuntimeError);
+        ).resolves.toEqual(
+          import_vitest.expect.objectContaining({
+            type: "directory_access"
+          })
+        );
       } finally {
         await fs.rm(externalDir, { recursive: true, force: true });
       }
@@ -367,9 +403,8 @@ function createToolContext(logger, approval, sessionId) {
       });
       const readTool = tools.find((tool) => tool.id === "read_file");
       (0, import_vitest.expect)(readTool).toBeDefined();
-      const baseContext = createToolContext(mockLogger, approvalManager);
       const contextA = {
-        ...baseContext,
+        ...createToolContext(mockLogger, approvalManager, "session-a", workspaceA),
         sessionId: "session-a",
         workspace: {
           id: "workspace-a",
@@ -379,7 +414,7 @@ function createToolContext(logger, approval, sessionId) {
         }
       };
       const contextB = {
-        ...baseContext,
+        ...createToolContext(mockLogger, approvalManager, "session-b", workspaceB),
         sessionId: "session-b",
         workspace: {
           id: "workspace-b",
@@ -441,7 +476,12 @@ function createToolContext(logger, approval, sessionId) {
         setWorkingDirectory: import_vitest.vi.fn(),
         setDirectoryApprovalChecker: import_vitest.vi.fn()
       };
-      const baseContext = createToolContext(mockLogger, approvalManager, "session-a");
+      const baseContext = createToolContext(
+        mockLogger,
+        approvalManager,
+        "session-a",
+        workspace
+      );
       const context = {
         ...baseContext,
         workspace: {

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

@@ -7,6 +7,8 @@ import {
   ApprovalStatus,
   DextoRuntimeError
 } from "@dexto/core";
+import { InMemoryDextoStores } from "@dexto/core/storage";
+import { WorkspaceError } from "@dexto/core/workspace";
 import { FileSystemService } from "./filesystem-service.js";
 import { createReadFileTool } from "./read-file-tool.js";
 import { createWriteFileTool } from "./write-file-tool.js";
@@ -30,26 +32,8 @@ const createMockLogger = () => {
   };
   return logger;
 };
-function createInMemorySessionApprovalStore() {
-  const states = /* @__PURE__ */ new Map();
-  return {
-    async load(sessionId) {
-      return structuredClone(
-        states.get(sessionId ?? "__global__") ?? {
-          toolPatterns: {},
-          approvedDirectories: []
-        }
-      );
-    },
-    async save(sessionId, state) {
-      states.set(sessionId ?? "__global__", structuredClone(state));
-    },
-    async delete(sessionId) {
-      states.delete(sessionId ?? "__global__");
-    }
-  };
-}
-function createToolContext(logger, approval, sessionId) {
+function createToolContext(logger, approval, sessionId, workspacePath) {
+  const workspaceRoot = workspacePath ?? tempWorkspaceRoot;
   return {
     logger,
     ...sessionId !== void 0 ? { sessionId } : {},
@@ -58,11 +42,57 @@ function createToolContext(logger, approval, sessionId) {
       search: {},
       resources: {},
       prompts: {},
+      skills: {},
       mcp: {},
-      taskForker: null
+      taskForker: null,
+      workspaceManager: createWorkspaceManager(workspaceRoot)
     }
   };
 }
+let tempWorkspaceRoot = process.cwd();
+function createWorkspaceManager(workspaceRoot) {
+  return {
+    open: async () => ({
+      context: {
+        id: "test-workspace",
+        path: workspaceRoot,
+        createdAt: Date.now(),
+        lastActiveAt: Date.now()
+      },
+      capabilities: ["files"],
+      files: {
+        readFile: async (filePath) => {
+          const resolved = resolveWorkspacePath(workspaceRoot, filePath);
+          return readWorkspaceFile(resolved, filePath);
+        },
+        readText: async (filePath) => {
+          const resolved = resolveWorkspacePath(workspaceRoot, filePath);
+          return readWorkspaceFile(resolved, filePath);
+        },
+        writeFile: async (filePath, content) => {
+          const resolved = resolveWorkspacePath(workspaceRoot, filePath);
+          await fs.mkdir(path.dirname(resolved), { recursive: true });
+          await fs.writeFile(resolved, content, "utf8");
+        },
+        glob: vi.fn(async () => []),
+        listFiles: vi.fn(async () => [])
+      }
+    })
+  };
+}
+function resolveWorkspacePath(workspaceRoot, filePath) {
+  return path.isAbsolute(filePath) ? filePath : path.join(workspaceRoot, filePath);
+}
+async function readWorkspaceFile(resolvedPath, filePath) {
+  try {
+    return await fs.readFile(resolvedPath, "utf8");
+  } catch (error) {
+    if (error.code === "ENOENT") {
+      throw WorkspaceError.fileNotFound(filePath);
+    }
+    throw error;
+  }
+}
 describe("Directory Approval Integration Tests", () => {
   let mockLogger;
   let tempDir;
@@ -87,13 +117,14 @@ describe("Directory Approval Integration Tests", () => {
       mockLogger
     );
     await fileSystemService.initialize();
+    tempWorkspaceRoot = tempDir;
     approvalManager = new ApprovalManager(
       {
         permissions: { mode: "manual" },
         elicitation: { enabled: true }
       },
       mockLogger,
-      createInMemorySessionApprovalStore()
+      new InMemoryDextoStores().getStore("approvals")
     );
     toolContext = createToolContext(mockLogger, approvalManager);
     vi.clearAllMocks();
@@ -302,7 +333,7 @@ describe("Directory Approval Integration Tests", () => {
               file_path: externalFile,
               content: "session-scoped write"
             }),
-            createToolContext(mockLogger, approvalManager, "session-a")
+            createToolContext(mockLogger, approvalManager, "session-a", externalDir)
           )
         ).resolves.toEqual(
           expect.objectContaining({
@@ -313,15 +344,20 @@ describe("Directory Approval Integration Tests", () => {
         await expect(fs.readFile(externalFile, "utf8")).resolves.toBe(
           "session-scoped write"
         );
+        const blockedInput = writeTool.inputSchema.parse({
+          file_path: path.join(externalDir, "blocked.txt"),
+          content: "should fail"
+        });
         await expect(
-          writeTool.execute(
-            writeTool.inputSchema.parse({
-              file_path: path.join(externalDir, "blocked.txt"),
-              content: "should fail"
-            }),
+          writeTool.approval.override(
+            blockedInput,
             createToolContext(mockLogger, approvalManager, "session-b")
           )
-        ).rejects.toBeInstanceOf(DextoRuntimeError);
+        ).resolves.toEqual(
+          expect.objectContaining({
+            type: "directory_access"
+          })
+        );
       } finally {
         await fs.rm(externalDir, { recursive: true, force: true });
       }
@@ -348,9 +384,8 @@ describe("Directory Approval Integration Tests", () => {
       });
       const readTool = tools.find((tool) => tool.id === "read_file");
       expect(readTool).toBeDefined();
-      const baseContext = createToolContext(mockLogger, approvalManager);
       const contextA = {
-        ...baseContext,
+        ...createToolContext(mockLogger, approvalManager, "session-a", workspaceA),
         sessionId: "session-a",
         workspace: {
           id: "workspace-a",
@@ -360,7 +395,7 @@ describe("Directory Approval Integration Tests", () => {
         }
       };
       const contextB = {
-        ...baseContext,
+        ...createToolContext(mockLogger, approvalManager, "session-b", workspaceB),
         sessionId: "session-b",
         workspace: {
           id: "workspace-b",
@@ -422,7 +457,12 @@ describe("Directory Approval Integration Tests", () => {
         setWorkingDirectory: vi.fn(),
         setDirectoryApprovalChecker: vi.fn()
       };
-      const baseContext = createToolContext(mockLogger, approvalManager, "session-a");
+      const baseContext = createToolContext(
+        mockLogger,
+        approvalManager,
+        "session-a",
+        workspace
+      );
       const context = {
         ...baseContext,
         workspace: {

package/dist/directory-approval.js

@@ -1,5 +1,6 @@
 import * as path from "node:path";
-import { ApprovalStatus, ApprovalType, ToolError } from "@dexto/core";
+import { ApprovalStatus, ApprovalType } from "@dexto/core/approval";
+import { ToolError } from "@dexto/core/tools";
 import { resolveUserPath } from "./path-utils.js";
 function resolveFilePath(workingDirectory, filePath) {
   const resolvedPath = resolveUserPath(workingDirectory, filePath);

package/dist/edit-file-tool.cjs

@@ -24,9 +24,11 @@ module.exports = __toCommonJS(edit_file_tool_exports);
 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_tools = require("@dexto/core/tools");
+var import_errors = require("@dexto/core/errors");
 var import_error_codes = require("./error-codes.js");
 var import_directory_approval = require("./directory-approval.js");
+var import_workspace_paths = require("./workspace-paths.js");
 const previewContentHashCache = /* @__PURE__ */ new Map();
 function computeContentHash(content) {
   return (0, import_node_crypto.createHash)("sha256").update(content, "utf8").digest("hex");
@@ -53,7 +55,7 @@ function generateDiffPreview(filePath, originalContent, newContent) {
   };
 }
 function createEditFileTool(getFileSystemService) {
-  return (0, import_core.defineTool)({
+  return (0, import_tools.defineTool)({
     id: "edit_file",
     aliases: ["edit"],
     description: "Edit a file by replacing text. By default, old_string must be unique in the file (will error if found multiple times). Set replace_all=true to replace all occurrences. Automatically creates backup before editing. Requires approval. Returns success status, path, number of changes made, and backup path.",
@@ -66,9 +68,9 @@ function createEditFileTool(getFileSystemService) {
       resolvePaths: (input, fileSystemService) => (0, import_directory_approval.resolveFilePath)(fileSystemService.getWorkingDirectory(), input.file_path)
     }),
     presentation: {
-      describeHeader: (input) => (0, import_core.createLocalToolCallHeader)({
-        title: "Update",
-        argsText: (0, import_core.truncateForHeader)(input.file_path, 140)
+      describeHeader: (input) => (0, import_tools.createLocalToolCallHeader)({
+        title: "Edit",
+        argsText: (0, import_tools.truncateForHeader)(input.file_path, 140)
       }),
       /**
        * Generate preview for approval UI - shows diff without modifying file
@@ -88,7 +90,7 @@ function createEditFileTool(getFileSystemService) {
             const originalFile = await resolvedFileSystemService.readFile(resolvedPath);
             originalContent = originalFile.content;
           } catch (error) {
-            if (error instanceof import_core.DextoRuntimeError && error.code === import_error_codes.FileSystemErrorCode.INVALID_PATH) {
+            if (error instanceof import_errors.DextoRuntimeError && error.code === import_error_codes.FileSystemErrorCode.INVALID_PATH) {
               const originalFile = await resolvedFileSystemService.readFileForToolPreview(
                 resolvedPath
               );
@@ -106,7 +108,7 @@ function createEditFileTool(getFileSystemService) {
           if (!replace_all) {
             const occurrences = originalContent.split(old_string).length - 1;
             if (occurrences > 1) {
-              throw import_core.ToolError.validationFailed(
+              throw import_tools.ToolError.validationFailed(
                 "edit_file",
                 `String found ${occurrences} times in file. Set replace_all=true to replace all, or provide more context to make old_string unique.`,
                 { file_path: resolvedPath, occurrences }
@@ -115,7 +117,7 @@ function createEditFileTool(getFileSystemService) {
           }
           const newContent = replace_all ? originalContent.split(old_string).join(new_string) : originalContent.replace(old_string, new_string);
           if (originalContent === newContent) {
-            throw import_core.ToolError.validationFailed(
+            throw import_tools.ToolError.validationFailed(
               "edit_file",
               `String not found in file: "${old_string.slice(0, 50)}${old_string.length > 50 ? "..." : ""}"`,
               {
@@ -126,11 +128,11 @@ function createEditFileTool(getFileSystemService) {
           }
           return generateDiffPreview(resolvedPath, originalContent, newContent);
         } catch (error) {
-          if (error instanceof import_core.DextoRuntimeError && error.code === import_core.ToolErrorCode.VALIDATION_FAILED) {
+          if (error instanceof import_errors.DextoRuntimeError && error.code === import_tools.ToolErrorCode.VALIDATION_FAILED) {
             throw error;
           }
-          if (error instanceof import_core.DextoRuntimeError) {
-            throw import_core.ToolError.validationFailed("edit_file", error.message, {
+          if (error instanceof import_errors.DextoRuntimeError) {
+            throw import_tools.ToolError.validationFailed("edit_file", error.message, {
               file_path: resolvedPath,
               originalErrorCode: error.code
             });
@@ -140,54 +142,67 @@ function createEditFileTool(getFileSystemService) {
       }
     },
     async execute(input, context) {
-      const resolvedFileSystemService = await getFileSystemService(context);
       const { file_path, old_string, new_string, replace_all } = input;
-      const { path: resolvedPath } = (0, import_directory_approval.resolveFilePath)(
-        resolvedFileSystemService.getWorkingDirectory(),
+      const handle = await openWorkspace(context, "edit_file");
+      const workspacePath = (0, import_workspace_paths.toWorkspaceRelativePath)(
+        "edit_file",
+        handle.context.path,
         file_path
       );
+      let currentContent = await handle.files.readText(workspacePath);
       const toolCallId = context.toolCallId;
       if (toolCallId) {
         const expectedHash = previewContentHashCache.get(toolCallId);
         if (expectedHash === void 0) {
         } else {
           previewContentHashCache.delete(toolCallId);
-          let currentContent;
           try {
-            const currentFile = await resolvedFileSystemService.readFile(resolvedPath);
-            currentContent = currentFile.content;
-          } catch (error) {
-            if (error instanceof import_core.DextoRuntimeError && error.code === import_error_codes.FileSystemErrorCode.FILE_NOT_FOUND) {
-              throw import_core.ToolError.fileModifiedSincePreview("edit_file", resolvedPath);
-            }
-            throw error;
+            currentContent = await handle.files.readText(workspacePath);
+          } catch {
+            throw import_tools.ToolError.fileModifiedSincePreview("edit_file", file_path);
           }
           const currentHash = computeContentHash(currentContent);
           if (expectedHash !== currentHash) {
-            throw import_core.ToolError.fileModifiedSincePreview("edit_file", resolvedPath);
+            throw import_tools.ToolError.fileModifiedSincePreview("edit_file", file_path);
           }
         }
       }
-      const result = await resolvedFileSystemService.editFile(resolvedPath, {
-        oldString: old_string,
-        newString: new_string,
-        replaceAll: replace_all
-      });
-      const _display = generateDiffPreview(
-        resolvedPath,
-        result.originalContent,
-        result.newContent
-      );
+      const occurrences = currentContent.split(old_string).length - 1;
+      if (occurrences === 0) {
+        throw import_tools.ToolError.validationFailed(
+          "edit_file",
+          `String not found in file: "${old_string.slice(0, 50)}${old_string.length > 50 ? "..." : ""}"`,
+          {
+            file_path,
+            old_string_preview: old_string.slice(0, 100)
+          }
+        );
+      }
+      if (!replace_all && occurrences > 1) {
+        throw import_tools.ToolError.validationFailed(
+          "edit_file",
+          `String found ${occurrences} times in file. Set replace_all=true to replace all, or provide more context to make old_string unique.`,
+          { file_path, occurrences }
+        );
+      }
+      const newContent = replace_all ? currentContent.split(old_string).join(new_string) : currentContent.replace(old_string, new_string);
+      await handle.files.writeFile(workspacePath, newContent);
+      const _display = generateDiffPreview(file_path, currentContent, newContent);
       return {
-        success: result.success,
-        path: result.path,
-        changes_count: result.changesCount,
-        ...result.backupPath && { backup_path: result.backupPath },
+        success: true,
+        path: file_path,
+        changes_count: occurrences,
         _display
       };
     }
   });
 }
+async function openWorkspace(context, toolName) {
+  if (!context.services) {
+    throw new Error(`${toolName} requires ToolExecutionContext.services`);
+  }
+  return context.services.workspaceManager.open({ intent: "write" });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createEditFileTool

package/dist/edit-file-tool.d.ts

@@ -4,7 +4,7 @@
  * Internal tool for editing files by replacing text (requires approval)
  */
 import { z } from 'zod';
-import type { Tool } from '@dexto/core';
+import type { Tool } from '@dexto/core/tools';
 import type { FileSystemServiceGetter } from './file-tool-types.js';
 declare const EditFileInputSchema: z.ZodObject<{
     file_path: z.ZodString;

package/dist/edit-file-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edit-file-tool.d.ts","sourceRoot":"","sources":["../src/edit-file-tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAUxB,OAAO,KAAK,EAAE,IAAI,EAAwB,MAAM,aAAa,CAAC;AAE9D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAkBpE,QAAA,MAAM,mBAAmB;;;;;kBAaZ,CAAC;AA0Bd;;GAEG;AACH,wBAAgB,kBAAkB,CAC9B,oBAAoB,EAAE,uBAAuB,GAC9C,IAAI,CAAC,OAAO,mBAAmB,CAAC,CA2LlC"}
+{"version":3,"file":"edit-file-tool.d.ts","sourceRoot":"","sources":["../src/edit-file-tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAUxB,OAAO,KAAK,EAAmB,IAAI,EAAwB,MAAM,mBAAmB,CAAC;AACrF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAmBpE,QAAA,MAAM,mBAAmB;;;;;kBAaZ,CAAC;AA0Bd;;GAEG;AACH,wBAAgB,kBAAkB,CAC9B,oBAAoB,EAAE,uBAAuB,GAC9C,IAAI,CAAC,OAAO,mBAAmB,CAAC,CA4LlC"}