@dexto/tools-filesystem 1.5.8 → 1.6.0

package/dist/filesystem-service.d.cts

@@ -1,4 +1,4 @@
-import { IDextoLogger } from '@dexto/core';
+import { Logger } from '@dexto/core';
 import { FileSystemConfig, ReadFileOptions, FileContent, GlobOptions, GlobResult, GrepOptions, SearchResult, WriteFileOptions, WriteResult, EditOperation, EditFileOptions, EditResult } from './types.cjs';
 
 /**
@@ -10,11 +10,10 @@ import { FileSystemConfig, ReadFileOptions, FileContent, GlobOptions, GlobResult
 /**
  * FileSystemService - Handles all file system operations with security checks
  *
- * This service receives fully-validated configuration from the FileSystem Tools Provider.
- * All defaults have been applied by the provider's schema, so the service trusts the config
+ * This service receives fully-validated configuration from the FileSystem Tools Factory.
+ * All defaults have been applied by the factory's schema, so the service trusts the config
  * and uses it as-is without any fallback logic.
  *
- * TODO: Add tests for this class
  * TODO: instantiate only when internal file tools are enabled to avoid file dependencies which won't work in serverless
  */
 declare class FileSystemService {
@@ -23,14 +22,15 @@ declare class FileSystemService {
     private initialized;
     private initPromise;
     private logger;
+    private directoryApprovalChecker?;
     /**
      * Create a new FileSystemService with validated configuration.
      *
-     * @param config - Fully-validated configuration from provider schema.
+     * @param config - Fully-validated configuration from the factory schema.
      *                 All required fields have values, defaults already applied.
      * @param logger - Logger instance for this service
      */
-    constructor(config: FileSystemConfig, logger: IDextoLogger);
+    constructor(config: FileSystemConfig, logger: Logger);
     /**
      * Get backup directory path (context-aware with optional override)
      * TODO: Migrate to explicit configuration via CLI enrichment layer (per-agent paths)
@@ -63,6 +63,11 @@ declare class FileSystemService {
      * @param checker Function that returns true if path is in an approved directory
      */
     setDirectoryApprovalChecker(checker: (filePath: string) => boolean): void;
+    /**
+     * Update the working directory at runtime (e.g., when workspace changes).
+     * Rebuilds the PathValidator so allowed/blocked path roots are recalculated.
+     */
+    setWorkingDirectory(workingDirectory: string): void;
     /**
      * Check if a file path is within the configured allowed paths (config only).
      * This is used by file tools to determine if directory approval is needed.

package/dist/filesystem-service.d.ts

@@ -1,36 +1,34 @@
-import { IDextoLogger } from '@dexto/core';
-import { FileSystemConfig, ReadFileOptions, FileContent, GlobOptions, GlobResult, GrepOptions, SearchResult, WriteFileOptions, WriteResult, EditOperation, EditFileOptions, EditResult } from './types.js';
-
 /**
  * FileSystem Service
  *
  * Secure file system operations for Dexto internal tools
  */
-
+import { Logger } from '@dexto/core';
+import { FileSystemConfig, FileContent, ReadFileOptions, GlobOptions, GlobResult, GrepOptions, SearchResult, WriteFileOptions, WriteResult, EditFileOptions, EditResult, EditOperation } from './types.js';
 /**
  * FileSystemService - Handles all file system operations with security checks
  *
- * This service receives fully-validated configuration from the FileSystem Tools Provider.
- * All defaults have been applied by the provider's schema, so the service trusts the config
+ * This service receives fully-validated configuration from the FileSystem Tools Factory.
+ * All defaults have been applied by the factory's schema, so the service trusts the config
  * and uses it as-is without any fallback logic.
  *
- * TODO: Add tests for this class
  * TODO: instantiate only when internal file tools are enabled to avoid file dependencies which won't work in serverless
  */
-declare class FileSystemService {
+export declare class FileSystemService {
     private config;
     private pathValidator;
     private initialized;
     private initPromise;
     private logger;
+    private directoryApprovalChecker?;
     /**
      * Create a new FileSystemService with validated configuration.
      *
-     * @param config - Fully-validated configuration from provider schema.
+     * @param config - Fully-validated configuration from the factory schema.
      *                 All required fields have values, defaults already applied.
      * @param logger - Logger instance for this service
      */
-    constructor(config: FileSystemConfig, logger: IDextoLogger);
+    constructor(config: FileSystemConfig, logger: Logger);
     /**
      * Get backup directory path (context-aware with optional override)
      * TODO: Migrate to explicit configuration via CLI enrichment layer (per-agent paths)
@@ -63,6 +61,11 @@ declare class FileSystemService {
      * @param checker Function that returns true if path is in an approved directory
      */
     setDirectoryApprovalChecker(checker: (filePath: string) => boolean): void;
+    /**
+     * Update the working directory at runtime (e.g., when workspace changes).
+     * Rebuilds the PathValidator so allowed/blocked path roots are recalculated.
+     */
+    setWorkingDirectory(workingDirectory: string): void;
     /**
      * Check if a file path is within the configured allowed paths (config only).
      * This is used by file tools to determine if directory approval is needed.
@@ -108,5 +111,4 @@ declare class FileSystemService {
      */
     isPathAllowed(filePath: string): Promise<boolean>;
 }
-
-export { FileSystemService };
+//# sourceMappingURL=filesystem-service.d.ts.map

package/dist/filesystem-service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"filesystem-service.d.ts","sourceRoot":"","sources":["../src/filesystem-service.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,EAAgB,MAAM,EAAqB,MAAM,aAAa,CAAC;AACtE,OAAO,EACH,gBAAgB,EAChB,WAAW,EACX,eAAe,EACf,WAAW,EACX,UAAU,EACV,WAAW,EACX,YAAY,EAEZ,gBAAgB,EAChB,WAAW,EACX,eAAe,EACf,UAAU,EACV,aAAa,EAGhB,MAAM,YAAY,CAAC;AAQpB;;;;;;;;GAQG;AACH,qBAAa,iBAAiB;IAC1B,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,WAAW,CAA8B;IACjD,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,wBAAwB,CAAC,CAAgC;IAEjE;;;;;;OAMG;gBACS,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM;IAQpD;;;OAGG;IACH,OAAO,CAAC,YAAY;IAKpB;;;OAGG;IACH,mBAAmB,IAAI,MAAM;IAI7B;;;OAGG;IACH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAS3B;;OAEG;YACW,YAAY;IAuB1B;;;;OAIG;IACG,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAOxC;;;;;OAKG;IACH,2BAA2B,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,GAAG,IAAI;IAKzE;;;OAGG;IACH,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI;IAanD;;;;;;OAMG;IACG,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAInE;;OAEG;IACG,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,eAAoB,GAAG,OAAO,CAAC,WAAW,CAAC;IA6ErF;;OAEG;IACG,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,UAAU,CAAC;IAsEhF;;OAEG;IACG,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,YAAY,CAAC;IAyItF;;OAEG;IACG,SAAS,CACX,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,gBAAqB,GAC/B,OAAO,CAAC,WAAW,CAAC;IAwDvB;;OAEG;IACG,QAAQ,CACV,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,aAAa,EACxB,OAAO,GAAE,eAAoB,GAC9B,OAAO,CAAC,UAAU,CAAC;IAqEtB;;OAEG;YACW,YAAY;IA0B1B;;OAEG;IACG,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IA6D1C;;OAEG;IACH,SAAS,IAAI,QAAQ,CAAC,gBAAgB,CAAC;IAIvC;;OAEG;IACG,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAI1D"}

package/dist/filesystem-service.js

@@ -14,10 +14,11 @@ class FileSystemService {
   initialized = false;
   initPromise = null;
   logger;
+  directoryApprovalChecker;
   /**
    * Create a new FileSystemService with validated configuration.
    *
-   * @param config - Fully-validated configuration from provider schema.
+   * @param config - Fully-validated configuration from the factory schema.
    *                 All required fields have values, defaults already applied.
    * @param logger - Logger instance for this service
    */
@@ -91,8 +92,24 @@ class FileSystemService {
    * @param checker Function that returns true if path is in an approved directory
    */
   setDirectoryApprovalChecker(checker) {
+    this.directoryApprovalChecker = checker;
     this.pathValidator.setDirectoryApprovalChecker(checker);
   }
+  /**
+   * Update the working directory at runtime (e.g., when workspace changes).
+   * Rebuilds the PathValidator so allowed/blocked path roots are recalculated.
+   */
+  setWorkingDirectory(workingDirectory) {
+    const normalized = workingDirectory?.trim();
+    if (!normalized) return;
+    if (this.config.workingDirectory === normalized) return;
+    this.config = { ...this.config, workingDirectory: normalized };
+    this.pathValidator = new PathValidator(this.config, this.logger);
+    if (this.directoryApprovalChecker) {
+      this.pathValidator.setDirectoryApprovalChecker(this.directoryApprovalChecker);
+    }
+    this.logger.info(`FileSystemService working directory set to ${normalized}`);
+  }
   /**
    * Check if a file path is within the configured allowed paths (config only).
    * This is used by file tools to determine if directory approval is needed.

package/dist/filesystem-service.test.cjs

@@ -36,10 +36,12 @@ const createMockLogger = () => ({
 (0, import_vitest.describe)("FileSystemService", () => {
   let mockLogger;
   let tempDir;
+  let backupDir;
   (0, import_vitest.beforeEach)(async () => {
     mockLogger = createMockLogger();
     const rawTempDir = await fs.mkdtemp(path.join(os.tmpdir(), "dexto-fs-test-"));
     tempDir = await fs.realpath(rawTempDir);
+    backupDir = path.join(tempDir, ".dexto", "backups");
     import_vitest.vi.clearAllMocks();
   });
   (0, import_vitest.afterEach)(async () => {
@@ -59,6 +61,7 @@ const createMockLogger = () => ({
             maxFileSize: 10 * 1024 * 1024,
             workingDirectory: tempDir,
             enableBackups: false,
+            backupPath: backupDir,
             backupRetentionDays: 7
           },
           mockLogger
@@ -69,7 +72,6 @@ const createMockLogger = () => ({
         const result = await fileSystemService.writeFile(testFile, "new content");
         (0, import_vitest.expect)(result.success).toBe(true);
         (0, import_vitest.expect)(result.backupPath).toBeUndefined();
-        const backupDir = path.join(tempDir, ".dexto-backups");
         try {
           const files = await fs.readdir(backupDir);
           (0, import_vitest.expect)(files.length).toBe(0);
@@ -85,6 +87,7 @@ const createMockLogger = () => ({
             maxFileSize: 10 * 1024 * 1024,
             workingDirectory: tempDir,
             enableBackups: true,
+            backupPath: backupDir,
             backupRetentionDays: 7
           },
           mockLogger
@@ -95,7 +98,7 @@ const createMockLogger = () => ({
         const result = await fileSystemService.writeFile(testFile, "new content");
         (0, import_vitest.expect)(result.success).toBe(true);
         (0, import_vitest.expect)(result.backupPath).toBeDefined();
-        (0, import_vitest.expect)(result.backupPath).toContain(".dexto");
+        (0, import_vitest.expect)(result.backupPath).toContain(backupDir);
         (0, import_vitest.expect)(result.backupPath).toContain("backup");
         const backupContent = await fs.readFile(result.backupPath, "utf-8");
         (0, import_vitest.expect)(backupContent).toBe("original content");
@@ -111,6 +114,7 @@ const createMockLogger = () => ({
             maxFileSize: 10 * 1024 * 1024,
             workingDirectory: tempDir,
             enableBackups: true,
+            backupPath: backupDir,
             backupRetentionDays: 7
           },
           mockLogger
@@ -133,6 +137,7 @@ const createMockLogger = () => ({
             workingDirectory: tempDir,
             enableBackups: false,
             // Config says no backups
+            backupPath: backupDir,
             backupRetentionDays: 7
           },
           mockLogger
@@ -157,6 +162,7 @@ const createMockLogger = () => ({
             maxFileSize: 10 * 1024 * 1024,
             workingDirectory: tempDir,
             enableBackups: false,
+            backupPath: backupDir,
             backupRetentionDays: 7
           },
           mockLogger
@@ -182,6 +188,7 @@ const createMockLogger = () => ({
             maxFileSize: 10 * 1024 * 1024,
             workingDirectory: tempDir,
             enableBackups: true,
+            backupPath: backupDir,
             backupRetentionDays: 7
           },
           mockLogger
@@ -210,6 +217,7 @@ const createMockLogger = () => ({
             workingDirectory: tempDir,
             enableBackups: false,
             // Config says no backups
+            backupPath: backupDir,
             backupRetentionDays: 7
           },
           mockLogger

package/dist/filesystem-service.test.d.ts

@@ -1,2 +1,7 @@
-
-export {  }
+/**
+ * FileSystemService Tests
+ *
+ * Tests for the core filesystem service including backup behavior.
+ */
+export {};
+//# sourceMappingURL=filesystem-service.test.d.ts.map

package/dist/filesystem-service.test.d.ts.map

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

package/dist/filesystem-service.test.js

@@ -13,10 +13,12 @@ const createMockLogger = () => ({
 describe("FileSystemService", () => {
   let mockLogger;
   let tempDir;
+  let backupDir;
   beforeEach(async () => {
     mockLogger = createMockLogger();
     const rawTempDir = await fs.mkdtemp(path.join(os.tmpdir(), "dexto-fs-test-"));
     tempDir = await fs.realpath(rawTempDir);
+    backupDir = path.join(tempDir, ".dexto", "backups");
     vi.clearAllMocks();
   });
   afterEach(async () => {
@@ -36,6 +38,7 @@ describe("FileSystemService", () => {
             maxFileSize: 10 * 1024 * 1024,
             workingDirectory: tempDir,
             enableBackups: false,
+            backupPath: backupDir,
             backupRetentionDays: 7
           },
           mockLogger
@@ -46,7 +49,6 @@ describe("FileSystemService", () => {
         const result = await fileSystemService.writeFile(testFile, "new content");
         expect(result.success).toBe(true);
         expect(result.backupPath).toBeUndefined();
-        const backupDir = path.join(tempDir, ".dexto-backups");
         try {
           const files = await fs.readdir(backupDir);
           expect(files.length).toBe(0);
@@ -62,6 +64,7 @@ describe("FileSystemService", () => {
             maxFileSize: 10 * 1024 * 1024,
             workingDirectory: tempDir,
             enableBackups: true,
+            backupPath: backupDir,
             backupRetentionDays: 7
           },
           mockLogger
@@ -72,7 +75,7 @@ describe("FileSystemService", () => {
         const result = await fileSystemService.writeFile(testFile, "new content");
         expect(result.success).toBe(true);
         expect(result.backupPath).toBeDefined();
-        expect(result.backupPath).toContain(".dexto");
+        expect(result.backupPath).toContain(backupDir);
         expect(result.backupPath).toContain("backup");
         const backupContent = await fs.readFile(result.backupPath, "utf-8");
         expect(backupContent).toBe("original content");
@@ -88,6 +91,7 @@ describe("FileSystemService", () => {
             maxFileSize: 10 * 1024 * 1024,
             workingDirectory: tempDir,
             enableBackups: true,
+            backupPath: backupDir,
             backupRetentionDays: 7
           },
           mockLogger
@@ -110,6 +114,7 @@ describe("FileSystemService", () => {
             workingDirectory: tempDir,
             enableBackups: false,
             // Config says no backups
+            backupPath: backupDir,
             backupRetentionDays: 7
           },
           mockLogger
@@ -134,6 +139,7 @@ describe("FileSystemService", () => {
             maxFileSize: 10 * 1024 * 1024,
             workingDirectory: tempDir,
             enableBackups: false,
+            backupPath: backupDir,
             backupRetentionDays: 7
           },
           mockLogger
@@ -159,6 +165,7 @@ describe("FileSystemService", () => {
             maxFileSize: 10 * 1024 * 1024,
             workingDirectory: tempDir,
             enableBackups: true,
+            backupPath: backupDir,
             backupRetentionDays: 7
           },
           mockLogger
@@ -187,6 +194,7 @@ describe("FileSystemService", () => {
             workingDirectory: tempDir,
             enableBackups: false,
             // Config says no backups
+            backupPath: backupDir,
             backupRetentionDays: 7
           },
           mockLogger

package/dist/glob-files-tool.cjs

@@ -34,61 +34,36 @@ module.exports = __toCommonJS(glob_files_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 GlobFilesInputSchema = import_zod.z.object({
   pattern: import_zod.z.string().describe('Glob pattern to match files (e.g., "**/*.ts", "src/**/*.js")'),
   path: import_zod.z.string().optional().describe("Base directory to search from (defaults to working directory)"),
   max_results: import_zod.z.number().int().positive().optional().default(1e3).describe("Maximum number of results to return (default: 1000)")
 }).strict();
-function createGlobFilesTool(options) {
-  const { fileSystemService, directoryApproval } = options;
-  let pendingApprovalSearchDir;
-  return {
+function createGlobFilesTool(getFileSystemService) {
+  return (0, import_core.defineTool)({
     id: "glob_files",
+    displayName: "Find Files",
+    aliases: ["glob"],
     description: "Find files matching a glob pattern. Supports standard glob syntax like **/*.js for recursive matches, *.ts for files in current directory, and src/**/*.tsx for nested paths. Returns array of file paths with metadata (size, modified date). Results are limited to allowed paths only.",
     inputSchema: GlobFilesInputSchema,
-    /**
-     * Check if this glob 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 baseDir = fileSystemService.getWorkingDirectory();
-      const searchDir = path.resolve(baseDir, searchPath || ".");
-      const isAllowed = await fileSystemService.isPathWithinConfigAllowed(searchDir);
-      if (isAllowed) {
-        return null;
+    ...(0, import_directory_approval.createDirectoryAccessApprovalHandlers)({
+      toolName: "glob_files",
+      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: "glob_files"
-        }
-      };
-    },
-    /**
-     * 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, max_results } = input;
-      const result = await fileSystemService.globFiles(pattern, {
-        cwd: path2,
+    }),
+    async execute(input, context) {
+      const resolvedFileSystemService = await getFileSystemService(context);
+      const { pattern, path: searchPath, max_results } = input;
+      const baseDir = resolvedFileSystemService.getWorkingDirectory();
+      const resolvedSearchPath = path.resolve(baseDir, searchPath || ".");
+      const result = await resolvedFileSystemService.globFiles(pattern, {
+        cwd: resolvedSearchPath,
         maxResults: max_results,
         includeMetadata: true
       });
@@ -115,7 +90,7 @@ function createGlobFilesTool(options) {
         _display
       };
     }
-  };
+  });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/glob-files-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 finding files using glob patterns
  */
 
+declare const GlobFilesInputSchema: z.ZodObject<{
+    pattern: z.ZodString;
+    path: z.ZodOptional<z.ZodString>;
+    max_results: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+}, "strict", z.ZodTypeAny, {
+    pattern: string;
+    max_results: number;
+    path?: string | undefined;
+}, {
+    pattern: string;
+    path?: string | undefined;
+    max_results?: number | undefined;
+}>;
 /**
  * Create the glob_files internal tool with directory approval support
  */
-declare function createGlobFilesTool(options: FileToolOptions): InternalTool;
+declare function createGlobFilesTool(getFileSystemService: FileSystemServiceGetter): Tool<typeof GlobFilesInputSchema>;
 
 export { createGlobFilesTool };

package/dist/glob-files-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';
-
 /**
  * Glob Files Tool
  *
  * Internal tool for finding files using glob patterns
  */
-
+import { z } from 'zod';
+import type { Tool } from '@dexto/core';
+import type { FileSystemServiceGetter } from './file-tool-types.js';
+declare const GlobFilesInputSchema: z.ZodObject<{
+    pattern: z.ZodString;
+    path: z.ZodOptional<z.ZodString>;
+    max_results: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+}, "strict", z.ZodTypeAny, {
+    pattern: string;
+    max_results: number;
+    path?: string | undefined;
+}, {
+    pattern: string;
+    path?: string | undefined;
+    max_results?: number | undefined;
+}>;
 /**
  * Create the glob_files internal tool with directory approval support
  */
-declare function createGlobFilesTool(options: FileToolOptions): InternalTool;
-
-export { createGlobFilesTool };
+export declare function createGlobFilesTool(getFileSystemService: FileSystemServiceGetter): Tool<typeof GlobFilesInputSchema>;
+export {};
+//# sourceMappingURL=glob-files-tool.d.ts.map

package/dist/glob-files-tool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"glob-files-tool.d.ts","sourceRoot":"","sources":["../src/glob-files-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,oBAAoB;;;;;;;;;;;;EAiBb,CAAC;AAEd;;GAEG;AACH,wBAAgB,mBAAmB,CAC/B,oBAAoB,EAAE,uBAAuB,GAC9C,IAAI,CAAC,OAAO,oBAAoB,CAAC,CA8DnC"}

package/dist/glob-files-tool.js

@@ -1,61 +1,36 @@
 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 GlobFilesInputSchema = z.object({
   pattern: z.string().describe('Glob pattern to match files (e.g., "**/*.ts", "src/**/*.js")'),
   path: z.string().optional().describe("Base directory to search from (defaults to working directory)"),
   max_results: z.number().int().positive().optional().default(1e3).describe("Maximum number of results to return (default: 1000)")
 }).strict();
-function createGlobFilesTool(options) {
-  const { fileSystemService, directoryApproval } = options;
-  let pendingApprovalSearchDir;
-  return {
+function createGlobFilesTool(getFileSystemService) {
+  return defineTool({
     id: "glob_files",
+    displayName: "Find Files",
+    aliases: ["glob"],
     description: "Find files matching a glob pattern. Supports standard glob syntax like **/*.js for recursive matches, *.ts for files in current directory, and src/**/*.tsx for nested paths. Returns array of file paths with metadata (size, modified date). Results are limited to allowed paths only.",
     inputSchema: GlobFilesInputSchema,
-    /**
-     * Check if this glob 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 baseDir = fileSystemService.getWorkingDirectory();
-      const searchDir = path.resolve(baseDir, searchPath || ".");
-      const isAllowed = await fileSystemService.isPathWithinConfigAllowed(searchDir);
-      if (isAllowed) {
-        return null;
+    ...createDirectoryAccessApprovalHandlers({
+      toolName: "glob_files",
+      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: "glob_files"
-        }
-      };
-    },
-    /**
-     * 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, max_results } = input;
-      const result = await fileSystemService.globFiles(pattern, {
-        cwd: path2,
+    }),
+    async execute(input, context) {
+      const resolvedFileSystemService = await getFileSystemService(context);
+      const { pattern, path: searchPath, max_results } = input;
+      const baseDir = resolvedFileSystemService.getWorkingDirectory();
+      const resolvedSearchPath = path.resolve(baseDir, searchPath || ".");
+      const result = await resolvedFileSystemService.globFiles(pattern, {
+        cwd: resolvedSearchPath,
         maxResults: max_results,
         includeMetadata: true
       });
@@ -82,7 +57,7 @@ function createGlobFilesTool(options) {
         _display
       };
     }
-  };
+  });
 }
 export {
   createGlobFilesTool