@dexto/tools-filesystem 1.7.1 → 1.8.0

package/dist/filesystem-service.cjs

@@ -35,9 +35,11 @@ var fs = __toESM(require("node:fs/promises"), 1);
 var path = __toESM(require("node:path"), 1);
 var import_glob = require("glob");
 var import_safe_regex = __toESM(require("safe-regex"), 1);
-var import_core = require("@dexto/core");
+var import_errors = require("@dexto/core/errors");
+var import_logger = require("@dexto/core/logger");
+var import_path = require("@dexto/core/utils/path.js");
 var import_path_validator = require("./path-validator.js");
-var import_errors = require("./errors.js");
+var import_errors2 = require("./errors.js");
 var import_mime_utils = require("./mime-utils.js");
 var import_path_utils = require("./path-utils.js");
 const DEFAULT_ENCODING = "utf-8";
@@ -61,7 +63,7 @@ class FileSystemService {
    */
   constructor(config, logger) {
     this.config = config;
-    this.logger = logger.createChild(import_core.DextoLogComponent.FILESYSTEM);
+    this.logger = logger.createChild(import_logger.DextoLogComponent.FILESYSTEM);
     this.pathValidator = new import_path_validator.PathValidator(this.config, this.logger);
   }
   /**
@@ -69,7 +71,7 @@ class FileSystemService {
    * TODO: Migrate to explicit configuration via CLI enrichment layer (per-agent paths)
    */
   getBackupDir() {
-    return this.config.backupPath ? (0, import_path_utils.resolveUserPath)(this.getWorkingDirectory(), this.config.backupPath) : (0, import_core.getDextoPath)("backups");
+    return this.config.backupPath ? (0, import_path_utils.resolveUserPath)(this.getWorkingDirectory(), this.config.backupPath) : (0, import_path.getDextoPath)("backups");
   }
   /**
    * Get the effective working directory for file operations.
@@ -160,7 +162,7 @@ class FileSystemService {
   async validateReadPath(filePath, mode) {
     const validation = mode === "toolPreview" ? await this.pathValidator.validatePathForPreview(filePath) : await this.pathValidator.validatePath(filePath);
     if (!validation.isValid || !validation.normalizedPath) {
-      throw import_errors.FileSystemError.invalidPath(filePath, validation.error || "Unknown error");
+      throw import_errors2.FileSystemError.invalidPath(filePath, validation.error || "Unknown error");
     }
     return validation.normalizedPath;
   }
@@ -168,29 +170,29 @@ class FileSystemService {
     try {
       const stats = await fs.stat(normalizedPath);
       if (!stats.isFile()) {
-        throw import_errors.FileSystemError.invalidPath(normalizedPath, "Path is not a file");
+        throw import_errors2.FileSystemError.invalidPath(normalizedPath, "Path is not a file");
       }
       if (stats.size > this.config.maxFileSize) {
-        throw import_errors.FileSystemError.fileTooLarge(
+        throw import_errors2.FileSystemError.fileTooLarge(
           normalizedPath,
           stats.size,
           this.config.maxFileSize
         );
       }
     } catch (error) {
-      if (error instanceof import_core.DextoRuntimeError && error.scope === "filesystem") {
+      if (error instanceof import_errors.DextoRuntimeError && error.scope === "filesystem") {
         throw error;
       }
       if (error.code === "ENOENT") {
-        throw import_errors.FileSystemError.fileNotFound(normalizedPath);
+        throw import_errors2.FileSystemError.fileNotFound(normalizedPath);
       }
       if (error.code === "EACCES") {
-        throw import_errors.FileSystemError.permissionDenied(normalizedPath, "read");
+        throw import_errors2.FileSystemError.permissionDenied(normalizedPath, "read");
       }
-      if (error instanceof import_core.DextoRuntimeError) {
+      if (error instanceof import_errors.DextoRuntimeError) {
         throw error;
       }
-      throw import_errors.FileSystemError.readFailed(
+      throw import_errors2.FileSystemError.readFailed(
         normalizedPath,
         error instanceof Error ? error.message : String(error)
       );
@@ -202,7 +204,7 @@ class FileSystemService {
       const binaryLike = (0, import_mime_utils.isLikelyBinary)(rawContent);
       const canReadAsText = !binaryLike && ((0, import_mime_utils.isTextMimeType)(mimeType) || mimeType === "image/svg+xml");
       if (!canReadAsText) {
-        throw import_errors.FileSystemError.readFailed(
+        throw import_errors2.FileSystemError.readFailed(
           normalizedPath,
           `File is binary (${mimeType}). Use read_media_file instead.`
         );
@@ -231,10 +233,10 @@ class FileSystemService {
         size: Buffer.byteLength(returnedContent, encoding)
       };
     } catch (error) {
-      if (error instanceof import_core.DextoRuntimeError && error.scope === "filesystem") {
+      if (error instanceof import_errors.DextoRuntimeError && error.scope === "filesystem") {
         throw error;
       }
-      throw import_errors.FileSystemError.readFailed(
+      throw import_errors2.FileSystemError.readFailed(
         normalizedPath,
         error instanceof Error ? error.message : String(error)
       );
@@ -257,10 +259,10 @@ class FileSystemService {
     try {
       const stats = await fs.stat(normalizedPath);
       if (!stats.isFile()) {
-        throw import_errors.FileSystemError.invalidPath(normalizedPath, "Path is not a file");
+        throw import_errors2.FileSystemError.invalidPath(normalizedPath, "Path is not a file");
       }
       if (stats.size > this.config.maxFileSize) {
-        throw import_errors.FileSystemError.fileTooLarge(
+        throw import_errors2.FileSystemError.fileTooLarge(
           normalizedPath,
           stats.size,
           this.config.maxFileSize
@@ -269,7 +271,7 @@ class FileSystemService {
       const rawContent = await fs.readFile(normalizedPath);
       const mimeType = (0, import_mime_utils.detectMimeType)(normalizedPath, rawContent);
       if ((0, import_mime_utils.isTextMimeType)(mimeType) && !(0, import_mime_utils.isLikelyBinary)(rawContent)) {
-        throw import_errors.FileSystemError.readFailed(
+        throw import_errors2.FileSystemError.readFailed(
           normalizedPath,
           `File is text (${mimeType}). Use read_file instead.`
         );
@@ -282,16 +284,16 @@ class FileSystemService {
         size: stats.size
       };
     } catch (error) {
-      if (error instanceof import_core.DextoRuntimeError && error.scope === "filesystem") {
+      if (error instanceof import_errors.DextoRuntimeError && error.scope === "filesystem") {
         throw error;
       }
       if (error.code === "ENOENT") {
-        throw import_errors.FileSystemError.fileNotFound(normalizedPath);
+        throw import_errors2.FileSystemError.fileNotFound(normalizedPath);
       }
       if (error.code === "EACCES") {
-        throw import_errors.FileSystemError.permissionDenied(normalizedPath, "read");
+        throw import_errors2.FileSystemError.permissionDenied(normalizedPath, "read");
       }
-      throw import_errors.FileSystemError.readFailed(
+      throw import_errors2.FileSystemError.readFailed(
         normalizedPath,
         error instanceof Error ? error.message : String(error)
       );
@@ -368,7 +370,7 @@ class FileSystemService {
         totalFound: validFiles.length
       };
     } catch (error) {
-      throw import_errors.FileSystemError.globFailed(
+      throw import_errors2.FileSystemError.globFailed(
         pattern,
         error instanceof Error ? error.message : String(error)
       );
@@ -381,25 +383,25 @@ class FileSystemService {
     await this.ensureInitialized();
     const validation = await this.pathValidator.validatePath(dirPath);
     if (!validation.isValid || !validation.normalizedPath) {
-      throw import_errors.FileSystemError.invalidPath(dirPath, validation.error || "Unknown error");
+      throw import_errors2.FileSystemError.invalidPath(dirPath, validation.error || "Unknown error");
     }
     const normalizedPath = validation.normalizedPath;
     try {
       const stats = await fs.stat(normalizedPath);
       if (!stats.isDirectory()) {
-        throw import_errors.FileSystemError.invalidPath(normalizedPath, "Path is not a directory");
+        throw import_errors2.FileSystemError.invalidPath(normalizedPath, "Path is not a directory");
       }
     } catch (error) {
-      if (error instanceof import_core.DextoRuntimeError && error.scope === "filesystem") {
+      if (error instanceof import_errors.DextoRuntimeError && error.scope === "filesystem") {
         throw error;
       }
       if (error.code === "ENOENT") {
-        throw import_errors.FileSystemError.directoryNotFound(normalizedPath);
+        throw import_errors2.FileSystemError.directoryNotFound(normalizedPath);
       }
       if (error.code === "EACCES") {
-        throw import_errors.FileSystemError.permissionDenied(normalizedPath, "read");
+        throw import_errors2.FileSystemError.permissionDenied(normalizedPath, "read");
       }
-      throw import_errors.FileSystemError.listFailed(
+      throw import_errors2.FileSystemError.listFailed(
         normalizedPath,
         error instanceof Error ? error.message : String(error)
       );
@@ -495,7 +497,7 @@ class FileSystemService {
         totalEntries
       };
     } catch (error) {
-      throw import_errors.FileSystemError.listFailed(
+      throw import_errors2.FileSystemError.listFailed(
         normalizedPath,
         error instanceof Error ? error.message : String(error)
       );
@@ -531,7 +533,7 @@ class FileSystemService {
     await this.ensureInitialized();
     const validation = await this.pathValidator.validatePath(dirPath);
     if (!validation.isValid || !validation.normalizedPath) {
-      throw import_errors.FileSystemError.invalidPath(dirPath, validation.error || "Unknown error");
+      throw import_errors2.FileSystemError.invalidPath(dirPath, validation.error || "Unknown error");
     }
     const normalizedPath = validation.normalizedPath;
     const recursive = options.recursive ?? false;
@@ -551,9 +553,9 @@ class FileSystemService {
         }
       }
       if (code === "EACCES" || code === "EPERM") {
-        throw import_errors.FileSystemError.permissionDenied(normalizedPath, "create directory");
+        throw import_errors2.FileSystemError.permissionDenied(normalizedPath, "create directory");
       }
-      throw import_errors.FileSystemError.createDirFailed(
+      throw import_errors2.FileSystemError.createDirFailed(
         normalizedPath,
         error instanceof Error ? error.message : String(error)
       );
@@ -566,7 +568,7 @@ class FileSystemService {
     await this.ensureInitialized();
     const validation = await this.pathValidator.validatePath(targetPath);
     if (!validation.isValid || !validation.normalizedPath) {
-      throw import_errors.FileSystemError.invalidPath(targetPath, validation.error || "Unknown error");
+      throw import_errors2.FileSystemError.invalidPath(targetPath, validation.error || "Unknown error");
     }
     const normalizedPath = validation.normalizedPath;
     try {
@@ -575,12 +577,12 @@ class FileSystemService {
     } catch (error) {
       const code = error.code;
       if (code === "ENOENT") {
-        throw import_errors.FileSystemError.fileNotFound(normalizedPath);
+        throw import_errors2.FileSystemError.fileNotFound(normalizedPath);
       }
       if (code === "EACCES" || code === "EPERM") {
-        throw import_errors.FileSystemError.permissionDenied(normalizedPath, "delete");
+        throw import_errors2.FileSystemError.permissionDenied(normalizedPath, "delete");
       }
-      throw import_errors.FileSystemError.deleteFailed(
+      throw import_errors2.FileSystemError.deleteFailed(
         normalizedPath,
         error instanceof Error ? error.message : String(error)
       );
@@ -593,11 +595,11 @@ class FileSystemService {
     await this.ensureInitialized();
     const fromValidation = await this.pathValidator.validatePath(fromPath);
     if (!fromValidation.isValid || !fromValidation.normalizedPath) {
-      throw import_errors.FileSystemError.invalidPath(fromPath, fromValidation.error || "Unknown error");
+      throw import_errors2.FileSystemError.invalidPath(fromPath, fromValidation.error || "Unknown error");
     }
     const toValidation = await this.pathValidator.validatePath(toPath);
     if (!toValidation.isValid || !toValidation.normalizedPath) {
-      throw import_errors.FileSystemError.invalidPath(toPath, toValidation.error || "Unknown error");
+      throw import_errors2.FileSystemError.invalidPath(toPath, toValidation.error || "Unknown error");
     }
     const normalizedFrom = fromValidation.normalizedPath;
     const normalizedTo = toValidation.normalizedPath;
@@ -606,7 +608,7 @@ class FileSystemService {
     }
     try {
       await fs.access(normalizedTo);
-      throw import_errors.FileSystemError.renameFailed(
+      throw import_errors2.FileSystemError.renameFailed(
         normalizedFrom,
         `Target already exists: ${normalizedTo}`
       );
@@ -617,9 +619,9 @@ class FileSystemService {
       }
       if (code === "ENOENT") {
       } else if (code === "EACCES" || code === "EPERM") {
-        throw import_errors.FileSystemError.permissionDenied(normalizedTo, "rename");
+        throw import_errors2.FileSystemError.permissionDenied(normalizedTo, "rename");
       } else {
-        throw import_errors.FileSystemError.renameFailed(
+        throw import_errors2.FileSystemError.renameFailed(
           normalizedFrom,
           error instanceof Error ? error.message : String(error)
         );
@@ -631,12 +633,12 @@ class FileSystemService {
     } catch (error) {
       const code = error.code;
       if (code === "ENOENT") {
-        throw import_errors.FileSystemError.fileNotFound(normalizedFrom);
+        throw import_errors2.FileSystemError.fileNotFound(normalizedFrom);
       }
       if (code === "EACCES" || code === "EPERM") {
-        throw import_errors.FileSystemError.permissionDenied(normalizedFrom, "rename");
+        throw import_errors2.FileSystemError.permissionDenied(normalizedFrom, "rename");
       }
-      throw import_errors.FileSystemError.renameFailed(
+      throw import_errors2.FileSystemError.renameFailed(
         normalizedFrom,
         error instanceof Error ? error.message : String(error)
       );
@@ -652,7 +654,7 @@ class FileSystemService {
     let globPattern;
     const baseValidation = await this.pathValidator.validatePath(basePath);
     if (!baseValidation.isValid || !baseValidation.normalizedPath) {
-      throw import_errors.FileSystemError.invalidPath(basePath, baseValidation.error || "Unknown error");
+      throw import_errors2.FileSystemError.invalidPath(basePath, baseValidation.error || "Unknown error");
     }
     const resolvedPath = baseValidation.normalizedPath;
     try {
@@ -674,7 +676,7 @@ class FileSystemService {
     const contextLines = options.contextLines || 0;
     try {
       if (!(0, import_safe_regex.default)(pattern)) {
-        throw import_errors.FileSystemError.invalidPattern(
+        throw import_errors2.FileSystemError.invalidPattern(
           pattern,
           "Pattern may cause catastrophic backtracking (ReDoS). Please simplify the regex."
         );
@@ -739,9 +741,9 @@ class FileSystemService {
       };
     } catch (error) {
       if (error instanceof Error && error.message.includes("Invalid regular expression")) {
-        throw import_errors.FileSystemError.invalidPattern(pattern, "Invalid regular expression syntax");
+        throw import_errors2.FileSystemError.invalidPattern(pattern, "Invalid regular expression syntax");
       }
-      throw import_errors.FileSystemError.searchFailed(
+      throw import_errors2.FileSystemError.searchFailed(
         pattern,
         error instanceof Error ? error.message : String(error)
       );
@@ -754,7 +756,7 @@ class FileSystemService {
     await this.ensureInitialized();
     const validation = await this.pathValidator.validatePath(filePath);
     if (!validation.isValid || !validation.normalizedPath) {
-      throw import_errors.FileSystemError.invalidPath(filePath, validation.error || "Unknown error");
+      throw import_errors2.FileSystemError.invalidPath(filePath, validation.error || "Unknown error");
     }
     const normalizedPath = validation.normalizedPath;
     const encoding = options.encoding || DEFAULT_ENCODING;
@@ -769,10 +771,8 @@ class FileSystemService {
       backupPath = await this.createBackup(normalizedPath);
     }
     try {
-      if (options.createDirs) {
-        const dir = path.dirname(normalizedPath);
-        await fs.mkdir(dir, { recursive: true });
-      }
+      const dir = path.dirname(normalizedPath);
+      await fs.mkdir(dir, { recursive: true });
       await fs.writeFile(normalizedPath, content, encoding);
       const bytesWritten = Buffer.byteLength(content, encoding);
       this.logger.debug(`File written: ${normalizedPath} (${bytesWritten} bytes)`);
@@ -783,7 +783,7 @@ class FileSystemService {
         backupPath
       };
     } catch (error) {
-      throw import_errors.FileSystemError.writeFailed(
+      throw import_errors2.FileSystemError.writeFailed(
         normalizedPath,
         error instanceof Error ? error.message : String(error)
       );
@@ -796,7 +796,7 @@ class FileSystemService {
     await this.ensureInitialized();
     const validation = await this.pathValidator.validatePath(filePath);
     if (!validation.isValid || !validation.normalizedPath) {
-      throw import_errors.FileSystemError.invalidPath(filePath, validation.error || "Unknown error");
+      throw import_errors2.FileSystemError.invalidPath(filePath, validation.error || "Unknown error");
     }
     const normalizedPath = validation.normalizedPath;
     const fileContent = await this.readFile(normalizedPath);
@@ -805,10 +805,10 @@ class FileSystemService {
       new RegExp(operation.oldString.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), "g")
     ) || []).length;
     if (occurrences === 0) {
-      throw import_errors.FileSystemError.stringNotFound(normalizedPath, operation.oldString);
+      throw import_errors2.FileSystemError.stringNotFound(normalizedPath, operation.oldString);
     }
     if (!operation.replaceAll && occurrences > 1) {
-      throw import_errors.FileSystemError.stringNotUnique(normalizedPath, operation.oldString, occurrences);
+      throw import_errors2.FileSystemError.stringNotUnique(normalizedPath, operation.oldString, occurrences);
     }
     let backupPath;
     if (options.backup ?? this.config.enableBackups) {
@@ -835,7 +835,7 @@ class FileSystemService {
         newContent
       };
     } catch (error) {
-      throw import_errors.FileSystemError.editFailed(
+      throw import_errors2.FileSystemError.editFailed(
         normalizedPath,
         error instanceof Error ? error.message : String(error)
       );
@@ -857,7 +857,7 @@ class FileSystemService {
       await this.cleanupOldBackups();
       return backupPath;
     } catch (error) {
-      throw import_errors.FileSystemError.backupFailed(
+      throw import_errors2.FileSystemError.backupFailed(
         filePath,
         error instanceof Error ? error.message : String(error)
       );

package/dist/filesystem-service.d.ts

@@ -3,7 +3,7 @@
  *
  * Secure file system operations for Dexto internal tools
  */
-import { Logger } from '@dexto/core';
+import { type Logger } from '@dexto/core/logger';
 import { FileSystemConfig, FileContent, MediaFileContent, ReadFileOptions, GlobOptions, GlobResult, GrepOptions, SearchResult, WriteFileOptions, WriteResult, EditFileOptions, EditResult, EditOperation, ListDirectoryOptions, ListDirectoryResult, CreateDirectoryOptions, CreateDirectoryResult, DeletePathOptions, DeletePathResult, RenamePathResult } from './types.js';
 /**
  * FileSystemService - Handles all file system operations with security checks

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

@@ -1 +1 @@
-{"version":3,"file":"filesystem-service.d.ts","sourceRoot":"","sources":["../src/filesystem-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"filesystem-service.d.ts","sourceRoot":"","sources":["../src/filesystem-service.ts"],"names":[],"mappings":"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"}

package/dist/filesystem-service.js

@@ -2,7 +2,9 @@ import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import { glob } from "glob";
 import safeRegex from "safe-regex";
-import { DextoRuntimeError, getDextoPath, DextoLogComponent } from "@dexto/core";
+import { DextoRuntimeError } from "@dexto/core/errors";
+import { DextoLogComponent } from "@dexto/core/logger";
+import { getDextoPath } from "@dexto/core/utils/path.js";
 import { PathValidator } from "./path-validator.js";
 import { FileSystemError } from "./errors.js";
 import { detectMimeType, getMediaFileKind, isLikelyBinary, isTextMimeType } from "./mime-utils.js";
@@ -736,10 +738,8 @@ class FileSystemService {
       backupPath = await this.createBackup(normalizedPath);
     }
     try {
-      if (options.createDirs) {
-        const dir = path.dirname(normalizedPath);
-        await fs.mkdir(dir, { recursive: true });
-      }
+      const dir = path.dirname(normalizedPath);
+      await fs.mkdir(dir, { recursive: true });
       await fs.writeFile(normalizedPath, content, encoding);
       const bytesWritten = Buffer.byteLength(content, encoding);
       this.logger.debug(`File written: ${normalizedPath} (${bytesWritten} bytes)`);

package/dist/filesystem-service.test.cjs

@@ -237,9 +237,7 @@ const createMockLogger = () => {
         );
         await fileSystemService.initialize();
         const testFile = path.join(tempDir, "new-file.txt");
-        const result = await fileSystemService.writeFile(testFile, "content", {
-          createDirs: true
-        });
+        const result = await fileSystemService.writeFile(testFile, "content");
         (0, import_vitest.expect)(result.success).toBe(true);
         (0, import_vitest.expect)(result.backupPath).toBeUndefined();
       });

package/dist/filesystem-service.test.js

@@ -214,9 +214,7 @@ describe("FileSystemService", () => {
         );
         await fileSystemService.initialize();
         const testFile = path.join(tempDir, "new-file.txt");
-        const result = await fileSystemService.writeFile(testFile, "content", {
-          createDirs: true
-        });
+        const result = await fileSystemService.writeFile(testFile, "content");
         expect(result.success).toBe(true);
         expect(result.backupPath).toBeUndefined();
       });

package/dist/glob-files-tool.cjs

@@ -22,16 +22,17 @@ __export(glob_files_tool_exports, {
 });
 module.exports = __toCommonJS(glob_files_tool_exports);
 var import_zod = require("zod");
-var import_core = require("@dexto/core");
+var import_tools = require("@dexto/core/tools");
 var import_directory_approval = require("./directory-approval.js");
 var import_path_utils = require("./path-utils.js");
+var import_workspace_paths = require("./workspace-paths.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(getFileSystemService) {
-  return (0, import_core.defineTool)({
+  return (0, import_tools.defineTool)({
     id: "glob_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.",
@@ -41,9 +42,9 @@ function createGlobFilesTool(getFileSystemService) {
         const bits = [`pattern=${input.pattern}`];
         if (input.path) bits.push(`path=${input.path}`);
         if (typeof input.max_results === "number") bits.push(`max=${input.max_results}`);
-        return (0, import_core.createLocalToolCallHeader)({
+        return (0, import_tools.createLocalToolCallHeader)({
           title: "Find Files",
-          argsText: (0, import_core.truncateForHeader)(bits.join(", "), 140)
+          argsText: (0, import_tools.truncateForHeader)(bits.join(", "), 140)
         });
       }
     },
@@ -59,40 +60,42 @@ function createGlobFilesTool(getFileSystemService) {
       }
     }),
     async execute(input, context) {
-      const resolvedFileSystemService = await getFileSystemService(context);
       const { pattern, path: searchPath, max_results } = input;
-      const baseDir = resolvedFileSystemService.getWorkingDirectory();
-      const resolvedSearchPath = (0, import_path_utils.resolveUserPath)(baseDir, searchPath || ".");
-      const result = await resolvedFileSystemService.globFiles(pattern, {
-        cwd: resolvedSearchPath,
-        maxResults: max_results,
-        includeMetadata: true
-      });
+      if (!context.services) {
+        throw new Error("glob_files requires ToolExecutionContext.services");
+      }
+      const handle = await context.services.workspaceManager.open({ intent: "read" });
+      const workspacePattern = joinWorkspacePattern(handle.context.path, searchPath, pattern);
+      const matches = await handle.files.glob(workspacePattern);
+      const limitedMatches = matches.slice(0, max_results);
+      const truncated = matches.length > max_results;
       const _display = {
         type: "search",
         pattern,
-        matches: result.files.map((file) => ({
-          file: file.path,
+        matches: limitedMatches.map((file) => ({
+          file,
           line: 0,
           // No line number for glob
-          content: file.path
+          content: file
         })),
-        totalMatches: result.totalFound,
-        truncated: result.truncated
+        totalMatches: limitedMatches.length,
+        truncated
       };
       return {
-        files: result.files.map((file) => ({
-          path: file.path,
-          size: file.size,
-          modified: file.modified.toISOString()
-        })),
-        total_found: result.totalFound,
-        truncated: result.truncated,
+        files: limitedMatches.map((filePath) => ({ path: filePath })),
+        total_found: limitedMatches.length,
+        truncated,
         _display
       };
     }
   });
 }
+function joinWorkspacePattern(workspaceRoot, searchPath, pattern) {
+  (0, import_workspace_paths.assertWorkspaceRelativeGlob)("glob_files", pattern);
+  const basePath = (0, import_workspace_paths.toWorkspaceRelativePath)("glob_files", workspaceRoot, searchPath || ".");
+  if (basePath === "." || basePath === "") return pattern;
+  return `${basePath.replace(/\/$/, "")}/${pattern}`;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createGlobFilesTool

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

@@ -4,7 +4,7 @@
  * Internal tool for finding files using glob patterns
  */
 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 GlobFilesInputSchema: z.ZodObject<{
     pattern: z.ZodString;

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

@@ -1 +1 @@
-{"version":3,"file":"glob-files-tool.d.ts","sourceRoot":"","sources":["../src/glob-files-tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,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;AAIpE,QAAA,MAAM,oBAAoB;;;;kBAiBb,CAAC;AAEd;;GAEG;AACH,wBAAgB,mBAAmB,CAC/B,oBAAoB,EAAE,uBAAuB,GAC9C,IAAI,CAAC,OAAO,oBAAoB,CAAC,CA2EnC"}
+{"version":3,"file":"glob-files-tool.d.ts","sourceRoot":"","sources":["../src/glob-files-tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAqB,IAAI,EAAwB,MAAM,mBAAmB,CAAC;AACvF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAKpE,QAAA,MAAM,oBAAoB;;;;kBAiBb,CAAC;AAEd;;GAEG;AACH,wBAAgB,mBAAmB,CAC/B,oBAAoB,EAAE,uBAAuB,GAC9C,IAAI,CAAC,OAAO,oBAAoB,CAAC,CAiEnC"}

package/dist/glob-files-tool.js

@@ -1,7 +1,8 @@
 import { z } from "zod";
-import { createLocalToolCallHeader, defineTool, truncateForHeader } from "@dexto/core";
+import { createLocalToolCallHeader, defineTool, truncateForHeader } from "@dexto/core/tools";
 import { createDirectoryAccessApprovalHandlers } from "./directory-approval.js";
 import { resolveUserPath } from "./path-utils.js";
+import { assertWorkspaceRelativeGlob, toWorkspaceRelativePath } from "./workspace-paths.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)"),
@@ -36,40 +37,42 @@ function createGlobFilesTool(getFileSystemService) {
       }
     }),
     async execute(input, context) {
-      const resolvedFileSystemService = await getFileSystemService(context);
       const { pattern, path: searchPath, max_results } = input;
-      const baseDir = resolvedFileSystemService.getWorkingDirectory();
-      const resolvedSearchPath = resolveUserPath(baseDir, searchPath || ".");
-      const result = await resolvedFileSystemService.globFiles(pattern, {
-        cwd: resolvedSearchPath,
-        maxResults: max_results,
-        includeMetadata: true
-      });
+      if (!context.services) {
+        throw new Error("glob_files requires ToolExecutionContext.services");
+      }
+      const handle = await context.services.workspaceManager.open({ intent: "read" });
+      const workspacePattern = joinWorkspacePattern(handle.context.path, searchPath, pattern);
+      const matches = await handle.files.glob(workspacePattern);
+      const limitedMatches = matches.slice(0, max_results);
+      const truncated = matches.length > max_results;
       const _display = {
         type: "search",
         pattern,
-        matches: result.files.map((file) => ({
-          file: file.path,
+        matches: limitedMatches.map((file) => ({
+          file,
           line: 0,
           // No line number for glob
-          content: file.path
+          content: file
         })),
-        totalMatches: result.totalFound,
-        truncated: result.truncated
+        totalMatches: limitedMatches.length,
+        truncated
       };
       return {
-        files: result.files.map((file) => ({
-          path: file.path,
-          size: file.size,
-          modified: file.modified.toISOString()
-        })),
-        total_found: result.totalFound,
-        truncated: result.truncated,
+        files: limitedMatches.map((filePath) => ({ path: filePath })),
+        total_found: limitedMatches.length,
+        truncated,
         _display
       };
     }
   });
 }
+function joinWorkspacePattern(workspaceRoot, searchPath, pattern) {
+  assertWorkspaceRelativeGlob("glob_files", pattern);
+  const basePath = toWorkspaceRelativePath("glob_files", workspaceRoot, searchPath || ".");
+  if (basePath === "." || basePath === "") return pattern;
+  return `${basePath.replace(/\/$/, "")}/${pattern}`;
+}
 export {
   createGlobFilesTool
 };