@dexto/tools-filesystem 1.5.7 → 1.6.0

package/dist/grep-content-tool.cjs

@@ -34,6 +34,7 @@ module.exports = __toCommonJS(grep_content_tool_exports);
 var path = __toESM(require("node:path"), 1);
 var import_zod = require("zod");
 var import_core = require("@dexto/core");
+var import_directory_approval = require("./directory-approval.js");
 const GrepContentInputSchema = import_zod.z.object({
   pattern: import_zod.z.string().describe("Regular expression pattern to search for"),
   path: import_zod.z.string().optional().describe("Directory to search in (defaults to working directory)"),
@@ -44,55 +45,37 @@ const GrepContentInputSchema = import_zod.z.object({
   case_insensitive: import_zod.z.boolean().optional().default(false).describe("Perform case-insensitive search (default: false)"),
   max_results: import_zod.z.number().int().positive().optional().default(100).describe("Maximum number of results to return (default: 100)")
 }).strict();
-function createGrepContentTool(options) {
-  const { fileSystemService, directoryApproval } = options;
-  let pendingApprovalSearchDir;
-  return {
+function createGrepContentTool(getFileSystemService) {
+  return (0, import_core.defineTool)({
     id: "grep_content",
+    displayName: "Search Files",
+    aliases: ["grep"],
     description: 'Search for text patterns in files using regular expressions. Returns matching lines with file path, line number, and optional context lines. Use glob parameter to filter specific file types (e.g., "*.ts"). Supports case-insensitive search. Great for finding code patterns, function definitions, or specific text across multiple files.',
     inputSchema: GrepContentInputSchema,
-    /**
-     * Check if this grep operation needs directory access approval.
-     * Returns custom approval request if the search directory is outside allowed paths.
-     */
-    getApprovalOverride: async (args) => {
-      const { path: searchPath } = args;
-      const searchDir = path.resolve(searchPath || process.cwd());
-      const isAllowed = await fileSystemService.isPathWithinConfigAllowed(searchDir);
-      if (isAllowed) {
-        return null;
+    ...(0, import_directory_approval.createDirectoryAccessApprovalHandlers)({
+      toolName: "grep_content",
+      operation: "read",
+      getFileSystemService,
+      resolvePaths: (input, fileSystemService) => {
+        const baseDir = fileSystemService.getWorkingDirectory();
+        const searchDir = path.resolve(baseDir, input.path || ".");
+        return { path: searchDir, parentDir: searchDir };
       }
-      if (directoryApproval?.isSessionApproved(searchDir)) {
-        return null;
-      }
-      pendingApprovalSearchDir = searchDir;
-      return {
-        type: import_core.ApprovalType.DIRECTORY_ACCESS,
-        metadata: {
-          path: searchDir,
-          parentDir: searchDir,
-          operation: "search",
-          toolName: "grep_content"
-        }
-      };
-    },
-    /**
-     * Handle approved directory access - remember the directory for session
-     */
-    onApprovalGranted: (response) => {
-      if (!directoryApproval || !pendingApprovalSearchDir) return;
-      const data = response.data;
-      const rememberDirectory = data?.rememberDirectory ?? false;
-      directoryApproval.addApproved(
-        pendingApprovalSearchDir,
-        rememberDirectory ? "session" : "once"
-      );
-      pendingApprovalSearchDir = void 0;
-    },
-    execute: async (input, _context) => {
-      const { pattern, path: path2, glob, context_lines, case_insensitive, max_results } = input;
-      const result = await fileSystemService.searchContent(pattern, {
-        path: path2,
+    }),
+    async execute(input, context) {
+      const resolvedFileSystemService = await getFileSystemService(context);
+      const {
+        pattern,
+        path: searchPath,
+        glob,
+        context_lines,
+        case_insensitive,
+        max_results
+      } = input;
+      const baseDir = resolvedFileSystemService.getWorkingDirectory();
+      const resolvedSearchPath = path.resolve(baseDir, searchPath || ".");
+      const result = await resolvedFileSystemService.searchContent(pattern, {
+        path: resolvedSearchPath,
         glob,
         contextLines: context_lines,
         caseInsensitive: case_insensitive,
@@ -130,7 +113,7 @@ function createGrepContentTool(options) {
         _display
       };
     }
-  };
+  });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/grep-content-tool.d.cts

@@ -1,5 +1,6 @@
-import { InternalTool } from '@dexto/core';
-import { FileToolOptions } from './file-tool-types.cjs';
+import { z } from 'zod';
+import { Tool } from '@dexto/core';
+import { FileSystemServiceGetter } from './file-tool-types.cjs';
 import './filesystem-service.cjs';
 import './types.cjs';
 
@@ -9,9 +10,31 @@ import './types.cjs';
  * Internal tool for searching file contents using regex patterns
  */
 
+declare const GrepContentInputSchema: z.ZodObject<{
+    pattern: z.ZodString;
+    path: z.ZodOptional<z.ZodString>;
+    glob: z.ZodOptional<z.ZodString>;
+    context_lines: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+    case_insensitive: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    max_results: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+}, "strict", z.ZodTypeAny, {
+    pattern: string;
+    max_results: number;
+    context_lines: number;
+    case_insensitive: boolean;
+    path?: string | undefined;
+    glob?: string | undefined;
+}, {
+    pattern: string;
+    path?: string | undefined;
+    max_results?: number | undefined;
+    glob?: string | undefined;
+    context_lines?: number | undefined;
+    case_insensitive?: boolean | undefined;
+}>;
 /**
  * Create the grep_content internal tool with directory approval support
  */
-declare function createGrepContentTool(options: FileToolOptions): InternalTool;
+declare function createGrepContentTool(getFileSystemService: FileSystemServiceGetter): Tool<typeof GrepContentInputSchema>;
 
 export { createGrepContentTool };

package/dist/grep-content-tool.d.ts

@@ -1,17 +1,36 @@
-import { InternalTool } from '@dexto/core';
-import { FileToolOptions } from './file-tool-types.js';
-import './filesystem-service.js';
-import './types.js';
-
 /**
  * Grep Content Tool
  *
  * Internal tool for searching file contents using regex patterns
  */
-
+import { z } from 'zod';
+import type { Tool } from '@dexto/core';
+import type { FileSystemServiceGetter } from './file-tool-types.js';
+declare const GrepContentInputSchema: z.ZodObject<{
+    pattern: z.ZodString;
+    path: z.ZodOptional<z.ZodString>;
+    glob: z.ZodOptional<z.ZodString>;
+    context_lines: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+    case_insensitive: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    max_results: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+}, "strict", z.ZodTypeAny, {
+    pattern: string;
+    max_results: number;
+    context_lines: number;
+    case_insensitive: boolean;
+    path?: string | undefined;
+    glob?: string | undefined;
+}, {
+    pattern: string;
+    path?: string | undefined;
+    max_results?: number | undefined;
+    glob?: string | undefined;
+    context_lines?: number | undefined;
+    case_insensitive?: boolean | undefined;
+}>;
 /**
  * Create the grep_content internal tool with directory approval support
  */
-declare function createGrepContentTool(options: FileToolOptions): InternalTool;
-
-export { createGrepContentTool };
+export declare function createGrepContentTool(getFileSystemService: FileSystemServiceGetter): Tool<typeof GrepContentInputSchema>;
+export {};
+//# sourceMappingURL=grep-content-tool.d.ts.map

package/dist/grep-content-tool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"grep-content-tool.d.ts","sourceRoot":"","sources":["../src/grep-content-tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,KAAK,EAAE,IAAI,EAAwB,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAGpE,QAAA,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;EAiCf,CAAC;AAEd;;GAEG;AACH,wBAAgB,qBAAqB,CACjC,oBAAoB,EAAE,uBAAuB,GAC9C,IAAI,CAAC,OAAO,sBAAsB,CAAC,CA+ErC"}

package/dist/grep-content-tool.js

@@ -1,6 +1,7 @@
 import * as path from "node:path";
 import { z } from "zod";
-import { ApprovalType } from "@dexto/core";
+import { defineTool } from "@dexto/core";
+import { createDirectoryAccessApprovalHandlers } from "./directory-approval.js";
 const GrepContentInputSchema = z.object({
   pattern: z.string().describe("Regular expression pattern to search for"),
   path: z.string().optional().describe("Directory to search in (defaults to working directory)"),
@@ -11,55 +12,37 @@ const GrepContentInputSchema = z.object({
   case_insensitive: z.boolean().optional().default(false).describe("Perform case-insensitive search (default: false)"),
   max_results: z.number().int().positive().optional().default(100).describe("Maximum number of results to return (default: 100)")
 }).strict();
-function createGrepContentTool(options) {
-  const { fileSystemService, directoryApproval } = options;
-  let pendingApprovalSearchDir;
-  return {
+function createGrepContentTool(getFileSystemService) {
+  return defineTool({
     id: "grep_content",
+    displayName: "Search Files",
+    aliases: ["grep"],
     description: 'Search for text patterns in files using regular expressions. Returns matching lines with file path, line number, and optional context lines. Use glob parameter to filter specific file types (e.g., "*.ts"). Supports case-insensitive search. Great for finding code patterns, function definitions, or specific text across multiple files.',
     inputSchema: GrepContentInputSchema,
-    /**
-     * Check if this grep operation needs directory access approval.
-     * Returns custom approval request if the search directory is outside allowed paths.
-     */
-    getApprovalOverride: async (args) => {
-      const { path: searchPath } = args;
-      const searchDir = path.resolve(searchPath || process.cwd());
-      const isAllowed = await fileSystemService.isPathWithinConfigAllowed(searchDir);
-      if (isAllowed) {
-        return null;
+    ...createDirectoryAccessApprovalHandlers({
+      toolName: "grep_content",
+      operation: "read",
+      getFileSystemService,
+      resolvePaths: (input, fileSystemService) => {
+        const baseDir = fileSystemService.getWorkingDirectory();
+        const searchDir = path.resolve(baseDir, input.path || ".");
+        return { path: searchDir, parentDir: searchDir };
       }
-      if (directoryApproval?.isSessionApproved(searchDir)) {
-        return null;
-      }
-      pendingApprovalSearchDir = searchDir;
-      return {
-        type: ApprovalType.DIRECTORY_ACCESS,
-        metadata: {
-          path: searchDir,
-          parentDir: searchDir,
-          operation: "search",
-          toolName: "grep_content"
-        }
-      };
-    },
-    /**
-     * Handle approved directory access - remember the directory for session
-     */
-    onApprovalGranted: (response) => {
-      if (!directoryApproval || !pendingApprovalSearchDir) return;
-      const data = response.data;
-      const rememberDirectory = data?.rememberDirectory ?? false;
-      directoryApproval.addApproved(
-        pendingApprovalSearchDir,
-        rememberDirectory ? "session" : "once"
-      );
-      pendingApprovalSearchDir = void 0;
-    },
-    execute: async (input, _context) => {
-      const { pattern, path: path2, glob, context_lines, case_insensitive, max_results } = input;
-      const result = await fileSystemService.searchContent(pattern, {
-        path: path2,
+    }),
+    async execute(input, context) {
+      const resolvedFileSystemService = await getFileSystemService(context);
+      const {
+        pattern,
+        path: searchPath,
+        glob,
+        context_lines,
+        case_insensitive,
+        max_results
+      } = input;
+      const baseDir = resolvedFileSystemService.getWorkingDirectory();
+      const resolvedSearchPath = path.resolve(baseDir, searchPath || ".");
+      const result = await resolvedFileSystemService.searchContent(pattern, {
+        path: resolvedSearchPath,
         glob,
         contextLines: context_lines,
         caseInsensitive: case_insensitive,
@@ -97,7 +80,7 @@ function createGrepContentTool(options) {
         _display
       };
     }
-  };
+  });
 }
 export {
   createGrepContentTool

package/dist/index.cjs

@@ -27,10 +27,10 @@ __export(index_exports, {
   createGrepContentTool: () => import_grep_content_tool.createGrepContentTool,
   createReadFileTool: () => import_read_file_tool.createReadFileTool,
   createWriteFileTool: () => import_write_file_tool.createWriteFileTool,
-  fileSystemToolsProvider: () => import_tool_provider.fileSystemToolsProvider
+  fileSystemToolsFactory: () => import_tool_factory.fileSystemToolsFactory
 });
 module.exports = __toCommonJS(index_exports);
-var import_tool_provider = require("./tool-provider.js");
+var import_tool_factory = require("./tool-factory.js");
 var import_filesystem_service = require("./filesystem-service.js");
 var import_path_validator = require("./path-validator.js");
 var import_errors = require("./errors.js");
@@ -51,5 +51,5 @@ var import_grep_content_tool = require("./grep-content-tool.js");
   createGrepContentTool,
   createReadFileTool,
   createWriteFileTool,
-  fileSystemToolsProvider
+  fileSystemToolsFactory
 });

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-export { fileSystemToolsProvider } from './tool-provider.cjs';
-export { DirectoryApprovalCallbacks, FileToolOptions } from './file-tool-types.cjs';
+export { fileSystemToolsFactory } from './tool-factory.cjs';
+export { FileSystemServiceGetter } from './file-tool-types.cjs';
 export { FileSystemService } from './filesystem-service.cjs';
 export { PathValidator } from './path-validator.cjs';
 export { FileSystemError } from './errors.cjs';
@@ -10,5 +10,7 @@ export { createWriteFileTool } from './write-file-tool.cjs';
 export { createEditFileTool } from './edit-file-tool.cjs';
 export { createGlobFilesTool } from './glob-files-tool.cjs';
 export { createGrepContentTool } from './grep-content-tool.cjs';
+import '@dexto/agent-config';
+import './tool-factory-config.cjs';
 import 'zod';
 import '@dexto/core';

package/dist/index.d.ts

@@ -1,14 +1,19 @@
-export { fileSystemToolsProvider } from './tool-provider.js';
-export { DirectoryApprovalCallbacks, FileToolOptions } from './file-tool-types.js';
+/**
+ * @dexto/tools-filesystem
+ *
+ * FileSystem tools factory for Dexto agents.
+ * Provides file operation tools: read, write, edit, glob, grep.
+ */
+export { fileSystemToolsFactory } from './tool-factory.js';
+export type { FileSystemServiceGetter } from './file-tool-types.js';
 export { FileSystemService } from './filesystem-service.js';
 export { PathValidator } from './path-validator.js';
 export { FileSystemError } from './errors.js';
 export { FileSystemErrorCode } from './error-codes.js';
-export { BufferEncoding, EditFileOptions, EditOperation, EditResult, FileContent, FileMetadata, FileSystemConfig, GlobOptions, GlobResult, GrepOptions, PathValidation, ReadFileOptions, SearchMatch, SearchResult, WriteFileOptions, WriteResult } from './types.js';
+export type { FileSystemConfig, FileContent, ReadFileOptions, GlobOptions, GlobResult, GrepOptions, SearchResult, SearchMatch, WriteFileOptions, WriteResult, EditFileOptions, EditResult, EditOperation, FileMetadata, PathValidation, BufferEncoding, } from './types.js';
 export { createReadFileTool } from './read-file-tool.js';
 export { createWriteFileTool } from './write-file-tool.js';
 export { createEditFileTool } from './edit-file-tool.js';
 export { createGlobFilesTool } from './glob-files-tool.js';
 export { createGrepContentTool } from './grep-content-tool.js';
-import 'zod';
-import '@dexto/core';
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,YAAY,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAGpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAGvD,YAAY,EACR,gBAAgB,EAChB,WAAW,EACX,eAAe,EACf,WAAW,EACX,UAAU,EACV,WAAW,EACX,YAAY,EACZ,WAAW,EACX,gBAAgB,EAChB,WAAW,EACX,eAAe,EACf,UAAU,EACV,aAAa,EACb,YAAY,EACZ,cAAc,EACd,cAAc,GACjB,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC"}

package/dist/index.js

@@ -1,4 +1,4 @@
-import { fileSystemToolsProvider } from "./tool-provider.js";
+import { fileSystemToolsFactory } from "./tool-factory.js";
 import { FileSystemService } from "./filesystem-service.js";
 import { PathValidator } from "./path-validator.js";
 import { FileSystemError } from "./errors.js";
@@ -18,5 +18,5 @@ export {
   createGrepContentTool,
   createReadFileTool,
   createWriteFileTool,
-  fileSystemToolsProvider
+  fileSystemToolsFactory
 };

package/dist/path-validator.d.cts

@@ -1,5 +1,5 @@
 import { FileSystemConfig, PathValidation } from './types.cjs';
-import { IDextoLogger } from '@dexto/core';
+import { Logger } from '@dexto/core';
 
 /**
  * Path Validator
@@ -32,7 +32,7 @@ declare class PathValidator {
     private normalizedBlockedExtensions;
     private logger;
     private directoryApprovalChecker;
-    constructor(config: FileSystemConfig, logger: IDextoLogger);
+    constructor(config: FileSystemConfig, logger: Logger);
     /**
      * Set a callback to check if a path is in an approved directory.
      * This allows PathValidator to consult ApprovalManager without a direct dependency.

package/dist/path-validator.d.ts

@@ -1,17 +1,15 @@
-import { FileSystemConfig, PathValidation } from './types.js';
-import { IDextoLogger } from '@dexto/core';
-
 /**
  * Path Validator
  *
  * Security-focused path validation for file system operations
  */
-
+import { FileSystemConfig, PathValidation } from './types.js';
+import type { Logger } from '@dexto/core';
 /**
  * Callback type for checking if a path is in an approved directory.
  * Used to consult ApprovalManager without creating a direct dependency.
  */
-type DirectoryApprovalChecker = (filePath: string) => boolean;
+export type DirectoryApprovalChecker = (filePath: string) => boolean;
 /**
  * PathValidator - Validates file paths for security and policy compliance
  *
@@ -25,14 +23,14 @@ type DirectoryApprovalChecker = (filePath: string) => boolean;
  * PathValidator can optionally consult an external approval checker (e.g., ApprovalManager)
  * to determine if paths outside the config's allowed paths are accessible.
  */
-declare class PathValidator {
+export declare class PathValidator {
     private config;
     private normalizedAllowedPaths;
     private normalizedBlockedPaths;
     private normalizedBlockedExtensions;
     private logger;
     private directoryApprovalChecker;
-    constructor(config: FileSystemConfig, logger: IDextoLogger);
+    constructor(config: FileSystemConfig, logger: Logger);
     /**
      * Set a callback to check if a path is in an approved directory.
      * This allows PathValidator to consult ApprovalManager without a direct dependency.
@@ -93,5 +91,4 @@ declare class PathValidator {
      */
     getBlockedPaths(): string[];
 }
-
-export { type DirectoryApprovalChecker, PathValidator };
+//# sourceMappingURL=path-validator.d.ts.map

package/dist/path-validator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"path-validator.d.ts","sourceRoot":"","sources":["../src/path-validator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;AAErE;;;;;;;;;;;;GAYG;AACH,qBAAa,aAAa;IACtB,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,sBAAsB,CAAW;IACzC,OAAO,CAAC,sBAAsB,CAAW;IACzC,OAAO,CAAC,2BAA2B,CAAW;IAC9C,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,wBAAwB,CAAuC;gBAE3D,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM;IAsBpD;;;;;OAKG;IACH,2BAA2B,CAAC,OAAO,EAAE,wBAAwB,GAAG,IAAI;IAKpE;;OAEG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAyE7D;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAaxB;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAIrB;;OAEG;IACH,OAAO,CAAC,aAAa;IAyBrB;;;OAGG;IACH,kBAAkB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO;IAInD;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAyBzB;;;;;;;;;OASG;IACG,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA8B7D;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAY9B;;OAEG;IACH,eAAe,IAAI,MAAM,EAAE;IAI3B;;OAEG;IACH,eAAe,IAAI,MAAM,EAAE;CAG9B"}

package/dist/path-validator.test.d.ts

@@ -1,2 +1,7 @@
-
-export {  }
+/**
+ * PathValidator Unit Tests
+ *
+ * Tests for path validation, security checks, and allowed path logic.
+ */
+export {};
+//# sourceMappingURL=path-validator.test.d.ts.map

package/dist/path-validator.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"path-validator.test.d.ts","sourceRoot":"","sources":["../src/path-validator.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}

package/dist/read-file-tool.cjs

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,84 +15,47 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var read_file_tool_exports = {};
 __export(read_file_tool_exports, {
   createReadFileTool: () => createReadFileTool
 });
 module.exports = __toCommonJS(read_file_tool_exports);
-var path = __toESM(require("node:path"), 1);
 var import_zod = require("zod");
 var import_core = require("@dexto/core");
+var import_directory_approval = require("./directory-approval.js");
 const ReadFileInputSchema = import_zod.z.object({
-  file_path: import_zod.z.string().describe("Absolute path to the file to read"),
+  file_path: import_zod.z.string().min(1).describe("Absolute path to the file to read"),
   limit: import_zod.z.number().int().positive().optional().describe("Maximum number of lines to read (optional)"),
   offset: import_zod.z.number().int().min(1).optional().describe("Starting line number (1-based, optional)")
 }).strict();
-function createReadFileTool(options) {
-  const { fileSystemService, directoryApproval } = options;
-  let pendingApprovalParentDir;
-  return {
+function createReadFileTool(getFileSystemService) {
+  return (0, import_core.defineTool)({
     id: "read_file",
+    displayName: "Read",
+    aliases: ["read"],
     description: "Read the contents of a file with optional pagination. Returns file content, line count, encoding, and whether the output was truncated. Use limit and offset parameters for large files to read specific sections. This tool is for reading files within allowed paths only.",
     inputSchema: ReadFileInputSchema,
-    /**
-     * Check if this read operation needs directory access approval.
-     * Returns custom approval request if the file is outside allowed paths.
-     */
-    getApprovalOverride: async (args) => {
-      const { file_path } = args;
-      if (!file_path) return null;
-      const isAllowed = await fileSystemService.isPathWithinConfigAllowed(file_path);
-      if (isAllowed) {
-        return null;
-      }
-      if (directoryApproval?.isSessionApproved(file_path)) {
-        return null;
-      }
-      const absolutePath = path.resolve(file_path);
-      const parentDir = path.dirname(absolutePath);
-      pendingApprovalParentDir = parentDir;
-      return {
-        type: import_core.ApprovalType.DIRECTORY_ACCESS,
-        metadata: {
-          path: absolutePath,
-          parentDir,
-          operation: "read",
-          toolName: "read_file"
-        }
-      };
-    },
-    /**
-     * Handle approved directory access - remember the directory for session
-     */
-    onApprovalGranted: (response) => {
-      if (!directoryApproval || !pendingApprovalParentDir) return;
-      const data = response.data;
-      const rememberDirectory = data?.rememberDirectory ?? false;
-      directoryApproval.addApproved(
-        pendingApprovalParentDir,
-        rememberDirectory ? "session" : "once"
-      );
-      pendingApprovalParentDir = void 0;
-    },
-    execute: async (input, _context) => {
+    ...(0, import_directory_approval.createDirectoryAccessApprovalHandlers)({
+      toolName: "read_file",
+      operation: "read",
+      getFileSystemService,
+      resolvePaths: (input, fileSystemService) => (0, import_directory_approval.resolveFilePath)(fileSystemService.getWorkingDirectory(), input.file_path)
+    }),
+    async execute(input, context) {
+      const resolvedFileSystemService = await getFileSystemService(context);
       const { file_path, limit, offset } = input;
-      const result = await fileSystemService.readFile(file_path, {
+      const { path: resolvedPath } = (0, import_directory_approval.resolveFilePath)(
+        resolvedFileSystemService.getWorkingDirectory(),
+        file_path
+      );
+      const result = await resolvedFileSystemService.readFile(resolvedPath, {
         limit,
         offset
       });
       const _display = {
         type: "file",
-        path: file_path,
+        path: resolvedPath,
         operation: "read",
         size: result.size,
         lineCount: result.lines
@@ -109,7 +70,7 @@ function createReadFileTool(options) {
         _display
       };
     }
-  };
+  });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/read-file-tool.d.cts

@@ -1,5 +1,6 @@
-import { InternalTool } from '@dexto/core';
-import { FileToolOptions } from './file-tool-types.cjs';
+import { z } from 'zod';
+import { Tool } from '@dexto/core';
+import { FileSystemServiceGetter } from './file-tool-types.cjs';
 import './filesystem-service.cjs';
 import './types.cjs';
 
@@ -9,9 +10,22 @@ import './types.cjs';
  * Internal tool for reading file contents with size limits and pagination
  */
 
+declare const ReadFileInputSchema: z.ZodObject<{
+    file_path: z.ZodString;
+    limit: z.ZodOptional<z.ZodNumber>;
+    offset: z.ZodOptional<z.ZodNumber>;
+}, "strict", z.ZodTypeAny, {
+    file_path: string;
+    limit?: number | undefined;
+    offset?: number | undefined;
+}, {
+    file_path: string;
+    limit?: number | undefined;
+    offset?: number | undefined;
+}>;
 /**
  * Create the read_file internal tool with directory approval support
  */
-declare function createReadFileTool(options: FileToolOptions): InternalTool;
+declare function createReadFileTool(getFileSystemService: FileSystemServiceGetter): Tool<typeof ReadFileInputSchema>;
 
 export { createReadFileTool };

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

@@ -1,17 +1,27 @@
-import { InternalTool } from '@dexto/core';
-import { FileToolOptions } from './file-tool-types.js';
-import './filesystem-service.js';
-import './types.js';
-
 /**
  * Read File Tool
  *
  * Internal tool for reading file contents with size limits and pagination
  */
-
+import { z } from 'zod';
+import type { Tool } from '@dexto/core';
+import type { FileSystemServiceGetter } from './file-tool-types.js';
+declare const ReadFileInputSchema: z.ZodObject<{
+    file_path: z.ZodString;
+    limit: z.ZodOptional<z.ZodNumber>;
+    offset: z.ZodOptional<z.ZodNumber>;
+}, "strict", z.ZodTypeAny, {
+    file_path: string;
+    limit?: number | undefined;
+    offset?: number | undefined;
+}, {
+    file_path: string;
+    limit?: number | undefined;
+    offset?: number | undefined;
+}>;
 /**
  * Create the read_file internal tool with directory approval support
  */
-declare function createReadFileTool(options: FileToolOptions): InternalTool;
-
-export { createReadFileTool };
+export declare function createReadFileTool(getFileSystemService: FileSystemServiceGetter): Tool<typeof ReadFileInputSchema>;
+export {};
+//# sourceMappingURL=read-file-tool.d.ts.map