@dexto/tools-filesystem 1.6.25 → 1.6.27

package/dist/filesystem-service.cjs

@@ -39,6 +39,7 @@ var import_core = require("@dexto/core");
 var import_path_validator = require("./path-validator.js");
 var import_errors = require("./errors.js");
 var import_mime_utils = require("./mime-utils.js");
+var import_path_utils = require("./path-utils.js");
 const DEFAULT_ENCODING = "utf-8";
 const DEFAULT_MAX_RESULTS = 1e3;
 const DEFAULT_MAX_SEARCH_RESULTS = 100;
@@ -68,7 +69,7 @@ class FileSystemService {
    * TODO: Migrate to explicit configuration via CLI enrichment layer (per-agent paths)
    */
   getBackupDir() {
-    return this.config.backupPath || (0, import_core.getDextoPath)("backups");
+    return this.config.backupPath ? (0, import_path_utils.resolveUserPath)(this.getWorkingDirectory(), this.config.backupPath) : (0, import_core.getDextoPath)("backups");
   }
   /**
    * Get the effective working directory for file operations.
@@ -313,7 +314,10 @@ class FileSystemService {
    */
   async globFiles(pattern, options = {}) {
     await this.ensureInitialized();
-    const cwd = options.cwd || this.config.workingDirectory || process.cwd();
+    const cwd = (0, import_path_utils.resolveUserPath)(
+      this.config.workingDirectory || process.cwd(),
+      options.cwd || this.config.workingDirectory || process.cwd()
+    );
     const maxResults = options.maxResults || DEFAULT_MAX_RESULTS;
     try {
       const files = await (0, import_glob.glob)(pattern, {

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

@@ -6,6 +6,7 @@ import { DextoRuntimeError, getDextoPath, DextoLogComponent } from "@dexto/core"
 import { PathValidator } from "./path-validator.js";
 import { FileSystemError } from "./errors.js";
 import { detectMimeType, getMediaFileKind, isLikelyBinary, isTextMimeType } from "./mime-utils.js";
+import { resolveUserPath } from "./path-utils.js";
 const DEFAULT_ENCODING = "utf-8";
 const DEFAULT_MAX_RESULTS = 1e3;
 const DEFAULT_MAX_SEARCH_RESULTS = 100;
@@ -35,7 +36,7 @@ class FileSystemService {
    * TODO: Migrate to explicit configuration via CLI enrichment layer (per-agent paths)
    */
   getBackupDir() {
-    return this.config.backupPath || getDextoPath("backups");
+    return this.config.backupPath ? resolveUserPath(this.getWorkingDirectory(), this.config.backupPath) : getDextoPath("backups");
   }
   /**
    * Get the effective working directory for file operations.
@@ -280,7 +281,10 @@ class FileSystemService {
    */
   async globFiles(pattern, options = {}) {
     await this.ensureInitialized();
-    const cwd = options.cwd || this.config.workingDirectory || process.cwd();
+    const cwd = resolveUserPath(
+      this.config.workingDirectory || process.cwd(),
+      options.cwd || this.config.workingDirectory || process.cwd()
+    );
     const maxResults = options.maxResults || DEFAULT_MAX_RESULTS;
     try {
       const files = await glob(pattern, {

package/dist/glob-files-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,24 +15,16 @@ 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 glob_files_tool_exports = {};
 __export(glob_files_tool_exports, {
   createGlobFilesTool: () => createGlobFilesTool
 });
 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");
+var import_path_utils = require("./path-utils.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)"),
@@ -64,7 +54,7 @@ function createGlobFilesTool(getFileSystemService) {
       getFileSystemService,
       resolvePaths: (input, fileSystemService) => {
         const baseDir = fileSystemService.getWorkingDirectory();
-        const searchDir = path.resolve(baseDir, input.path || ".");
+        const searchDir = (0, import_path_utils.resolveUserPath)(baseDir, input.path || ".");
         return { path: searchDir, parentDir: searchDir };
       }
     }),
@@ -72,7 +62,7 @@ function createGlobFilesTool(getFileSystemService) {
       const resolvedFileSystemService = await getFileSystemService(context);
       const { pattern, path: searchPath, max_results } = input;
       const baseDir = resolvedFileSystemService.getWorkingDirectory();
-      const resolvedSearchPath = path.resolve(baseDir, searchPath || ".");
+      const resolvedSearchPath = (0, import_path_utils.resolveUserPath)(baseDir, searchPath || ".");
       const result = await resolvedFileSystemService.globFiles(pattern, {
         cwd: resolvedSearchPath,
         maxResults: max_results,

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;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,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;AAGxB,OAAO,KAAK,EAAE,IAAI,EAAwB,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAIpE,QAAA,MAAM,oBAAoB;;;;;;;;;;;;EAiBb,CAAC;AAEd;;GAEG;AACH,wBAAgB,mBAAmB,CAC/B,oBAAoB,EAAE,uBAAuB,GAC9C,IAAI,CAAC,OAAO,oBAAoB,CAAC,CA2EnC"}

package/dist/glob-files-tool.js

@@ -1,7 +1,7 @@
-import * as path from "node:path";
 import { z } from "zod";
 import { createLocalToolCallHeader, defineTool, truncateForHeader } from "@dexto/core";
 import { createDirectoryAccessApprovalHandlers } from "./directory-approval.js";
+import { resolveUserPath } from "./path-utils.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)"),
@@ -31,7 +31,7 @@ function createGlobFilesTool(getFileSystemService) {
       getFileSystemService,
       resolvePaths: (input, fileSystemService) => {
         const baseDir = fileSystemService.getWorkingDirectory();
-        const searchDir = path.resolve(baseDir, input.path || ".");
+        const searchDir = resolveUserPath(baseDir, input.path || ".");
         return { path: searchDir, parentDir: searchDir };
       }
     }),
@@ -39,7 +39,7 @@ function createGlobFilesTool(getFileSystemService) {
       const resolvedFileSystemService = await getFileSystemService(context);
       const { pattern, path: searchPath, max_results } = input;
       const baseDir = resolvedFileSystemService.getWorkingDirectory();
-      const resolvedSearchPath = path.resolve(baseDir, searchPath || ".");
+      const resolvedSearchPath = resolveUserPath(baseDir, searchPath || ".");
       const result = await resolvedFileSystemService.globFiles(pattern, {
         cwd: resolvedSearchPath,
         maxResults: max_results,

package/dist/glob-files-tool.test.cjs

@@ -0,0 +1,115 @@
+"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 __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  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 import_vitest = require("vitest");
+var path = __toESM(require("node:path"), 1);
+var fs = __toESM(require("node:fs/promises"), 1);
+var os = __toESM(require("node:os"), 1);
+var import_filesystem_service = require("./filesystem-service.js");
+var import_glob_files_tool = require("./glob-files-tool.js");
+const createMockLogger = () => {
+  const logger = {
+    debug: import_vitest.vi.fn(),
+    silly: import_vitest.vi.fn(),
+    info: import_vitest.vi.fn(),
+    warn: import_vitest.vi.fn(),
+    error: import_vitest.vi.fn(),
+    trackException: import_vitest.vi.fn(),
+    createChild: import_vitest.vi.fn(() => logger),
+    createFileOnlyChild: import_vitest.vi.fn(() => logger),
+    setLevel: import_vitest.vi.fn(),
+    getLevel: import_vitest.vi.fn(() => "debug"),
+    getLogFilePath: import_vitest.vi.fn(() => null),
+    destroy: import_vitest.vi.fn(async () => void 0)
+  };
+  return logger;
+};
+function createToolContext(logger) {
+  return { logger };
+}
+(0, import_vitest.describe)("glob_files tool", () => {
+  let mockLogger;
+  let tempDir;
+  let fileSystemService;
+  (0, import_vitest.beforeEach)(async () => {
+    mockLogger = createMockLogger();
+    const rawTempDir = await fs.mkdtemp(path.join(os.tmpdir(), "dexto-glob-test-"));
+    tempDir = await fs.realpath(rawTempDir);
+    fileSystemService = new import_filesystem_service.FileSystemService(
+      {
+        allowedPaths: [tempDir],
+        blockedPaths: [],
+        blockedExtensions: [],
+        maxFileSize: 10 * 1024 * 1024,
+        workingDirectory: tempDir,
+        enableBackups: false,
+        backupRetentionDays: 7
+      },
+      mockLogger
+    );
+    await fileSystemService.initialize();
+  });
+  (0, import_vitest.afterEach)(async () => {
+    import_vitest.vi.restoreAllMocks();
+    try {
+      await fs.rm(tempDir, { recursive: true, force: true });
+    } catch {
+    }
+  });
+  (0, import_vitest.it)("expands home-directory shorthand for glob base paths", async () => {
+    const homeTempDir = await fs.mkdtemp(path.join(os.homedir(), ".dexto-glob-home-test-"));
+    const fileSystemServiceForHome = new import_filesystem_service.FileSystemService(
+      {
+        allowedPaths: [homeTempDir],
+        blockedPaths: [],
+        blockedExtensions: [],
+        maxFileSize: 10 * 1024 * 1024,
+        workingDirectory: tempDir,
+        enableBackups: false,
+        backupRetentionDays: 7
+      },
+      mockLogger
+    );
+    await fileSystemServiceForHome.initialize();
+    try {
+      const filePath = path.join(homeTempDir, "notes.txt");
+      await fs.writeFile(filePath, "hello");
+      const tool = (0, import_glob_files_tool.createGlobFilesTool)(async () => fileSystemServiceForHome);
+      const parsedInput = tool.inputSchema.parse({
+        pattern: "**/*.txt",
+        path: `~/${path.basename(homeTempDir)}`
+      });
+      const result = await tool.execute(parsedInput, createToolContext(mockLogger));
+      (0, import_vitest.expect)(result.total_found).toBe(1);
+      (0, import_vitest.expect)(result.files).toEqual([
+        {
+          path: filePath,
+          size: 5,
+          modified: import_vitest.expect.any(String)
+        }
+      ]);
+    } finally {
+      await fs.rm(homeTempDir, { recursive: true, force: true });
+    }
+  });
+});

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=glob-files-tool.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"glob-files-tool.test.d.ts","sourceRoot":"","sources":["../src/glob-files-tool.test.ts"],"names":[],"mappings":""}

package/dist/glob-files-tool.test.js

@@ -0,0 +1,92 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
+import * as path from "node:path";
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import { FileSystemService } from "./filesystem-service.js";
+import { createGlobFilesTool } from "./glob-files-tool.js";
+const createMockLogger = () => {
+  const logger = {
+    debug: vi.fn(),
+    silly: vi.fn(),
+    info: vi.fn(),
+    warn: vi.fn(),
+    error: vi.fn(),
+    trackException: vi.fn(),
+    createChild: vi.fn(() => logger),
+    createFileOnlyChild: vi.fn(() => logger),
+    setLevel: vi.fn(),
+    getLevel: vi.fn(() => "debug"),
+    getLogFilePath: vi.fn(() => null),
+    destroy: vi.fn(async () => void 0)
+  };
+  return logger;
+};
+function createToolContext(logger) {
+  return { logger };
+}
+describe("glob_files tool", () => {
+  let mockLogger;
+  let tempDir;
+  let fileSystemService;
+  beforeEach(async () => {
+    mockLogger = createMockLogger();
+    const rawTempDir = await fs.mkdtemp(path.join(os.tmpdir(), "dexto-glob-test-"));
+    tempDir = await fs.realpath(rawTempDir);
+    fileSystemService = new FileSystemService(
+      {
+        allowedPaths: [tempDir],
+        blockedPaths: [],
+        blockedExtensions: [],
+        maxFileSize: 10 * 1024 * 1024,
+        workingDirectory: tempDir,
+        enableBackups: false,
+        backupRetentionDays: 7
+      },
+      mockLogger
+    );
+    await fileSystemService.initialize();
+  });
+  afterEach(async () => {
+    vi.restoreAllMocks();
+    try {
+      await fs.rm(tempDir, { recursive: true, force: true });
+    } catch {
+    }
+  });
+  it("expands home-directory shorthand for glob base paths", async () => {
+    const homeTempDir = await fs.mkdtemp(path.join(os.homedir(), ".dexto-glob-home-test-"));
+    const fileSystemServiceForHome = new FileSystemService(
+      {
+        allowedPaths: [homeTempDir],
+        blockedPaths: [],
+        blockedExtensions: [],
+        maxFileSize: 10 * 1024 * 1024,
+        workingDirectory: tempDir,
+        enableBackups: false,
+        backupRetentionDays: 7
+      },
+      mockLogger
+    );
+    await fileSystemServiceForHome.initialize();
+    try {
+      const filePath = path.join(homeTempDir, "notes.txt");
+      await fs.writeFile(filePath, "hello");
+      const tool = createGlobFilesTool(async () => fileSystemServiceForHome);
+      const parsedInput = tool.inputSchema.parse({
+        pattern: "**/*.txt",
+        path: `~/${path.basename(homeTempDir)}`
+      });
+      const result = await tool.execute(parsedInput, createToolContext(mockLogger));
+      expect(result.total_found).toBe(1);
+      expect(result.files).toEqual([
+        {
+          path: filePath,
+          size: 5,
+          modified: expect.any(String)
+        }
+      ]);
+    } finally {
+      await fs.rm(homeTempDir, { recursive: true, force: true });
+    }
+  });
+});

package/dist/grep-content-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,24 +15,16 @@ 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 grep_content_tool_exports = {};
 __export(grep_content_tool_exports, {
   createGrepContentTool: () => createGrepContentTool
 });
 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");
+var import_path_utils = require("./path-utils.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)"),
@@ -70,7 +60,7 @@ function createGrepContentTool(getFileSystemService) {
       getFileSystemService,
       resolvePaths: (input, fileSystemService) => {
         const baseDir = fileSystemService.getWorkingDirectory();
-        const searchDir = path.resolve(baseDir, input.path || ".");
+        const searchDir = (0, import_path_utils.resolveUserPath)(baseDir, input.path || ".");
         return { path: searchDir, parentDir: searchDir };
       }
     }),
@@ -85,7 +75,7 @@ function createGrepContentTool(getFileSystemService) {
         max_results
       } = input;
       const baseDir = resolvedFileSystemService.getWorkingDirectory();
-      const resolvedSearchPath = path.resolve(baseDir, searchPath || ".");
+      const resolvedSearchPath = (0, import_path_utils.resolveUserPath)(baseDir, searchPath || ".");
       const result = await resolvedFileSystemService.searchContent(pattern, {
         path: resolvedSearchPath,
         glob,

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

@@ -1 +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,CA6FrC"}
+{"version":3,"file":"grep-content-tool.d.ts","sourceRoot":"","sources":["../src/grep-content-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,sBAAsB;;;;;;;;;;;;;;;;;;;;;EAiCf,CAAC;AAEd;;GAEG;AACH,wBAAgB,qBAAqB,CACjC,oBAAoB,EAAE,uBAAuB,GAC9C,IAAI,CAAC,OAAO,sBAAsB,CAAC,CA6FrC"}

package/dist/grep-content-tool.js

@@ -1,7 +1,7 @@
-import * as path from "node:path";
 import { z } from "zod";
 import { createLocalToolCallHeader, defineTool, truncateForHeader } from "@dexto/core";
 import { createDirectoryAccessApprovalHandlers } from "./directory-approval.js";
+import { resolveUserPath } from "./path-utils.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)"),
@@ -37,7 +37,7 @@ function createGrepContentTool(getFileSystemService) {
       getFileSystemService,
       resolvePaths: (input, fileSystemService) => {
         const baseDir = fileSystemService.getWorkingDirectory();
-        const searchDir = path.resolve(baseDir, input.path || ".");
+        const searchDir = resolveUserPath(baseDir, input.path || ".");
         return { path: searchDir, parentDir: searchDir };
       }
     }),
@@ -52,7 +52,7 @@ function createGrepContentTool(getFileSystemService) {
         max_results
       } = input;
       const baseDir = resolvedFileSystemService.getWorkingDirectory();
-      const resolvedSearchPath = path.resolve(baseDir, searchPath || ".");
+      const resolvedSearchPath = resolveUserPath(baseDir, searchPath || ".");
       const result = await resolvedFileSystemService.searchContent(pattern, {
         path: resolvedSearchPath,
         glob,

package/dist/grep-content-tool.test.cjs

@@ -0,0 +1,115 @@
+"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 __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  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 import_vitest = require("vitest");
+var path = __toESM(require("node:path"), 1);
+var fs = __toESM(require("node:fs/promises"), 1);
+var os = __toESM(require("node:os"), 1);
+var import_filesystem_service = require("./filesystem-service.js");
+var import_grep_content_tool = require("./grep-content-tool.js");
+const createMockLogger = () => {
+  const logger = {
+    debug: import_vitest.vi.fn(),
+    silly: import_vitest.vi.fn(),
+    info: import_vitest.vi.fn(),
+    warn: import_vitest.vi.fn(),
+    error: import_vitest.vi.fn(),
+    trackException: import_vitest.vi.fn(),
+    createChild: import_vitest.vi.fn(() => logger),
+    createFileOnlyChild: import_vitest.vi.fn(() => logger),
+    setLevel: import_vitest.vi.fn(),
+    getLevel: import_vitest.vi.fn(() => "debug"),
+    getLogFilePath: import_vitest.vi.fn(() => null),
+    destroy: import_vitest.vi.fn(async () => void 0)
+  };
+  return logger;
+};
+function createToolContext(logger) {
+  return { logger };
+}
+(0, import_vitest.describe)("grep_content tool", () => {
+  let mockLogger;
+  let tempDir;
+  let fileSystemService;
+  (0, import_vitest.beforeEach)(async () => {
+    mockLogger = createMockLogger();
+    const rawTempDir = await fs.mkdtemp(path.join(os.tmpdir(), "dexto-grep-test-"));
+    tempDir = await fs.realpath(rawTempDir);
+    fileSystemService = new import_filesystem_service.FileSystemService(
+      {
+        allowedPaths: [tempDir],
+        blockedPaths: [],
+        blockedExtensions: [],
+        maxFileSize: 10 * 1024 * 1024,
+        workingDirectory: tempDir,
+        enableBackups: false,
+        backupRetentionDays: 7
+      },
+      mockLogger
+    );
+    await fileSystemService.initialize();
+  });
+  (0, import_vitest.afterEach)(async () => {
+    import_vitest.vi.restoreAllMocks();
+    try {
+      await fs.rm(tempDir, { recursive: true, force: true });
+    } catch {
+    }
+  });
+  (0, import_vitest.it)("expands home-directory shorthand for search paths", async () => {
+    const homeTempDir = await fs.mkdtemp(path.join(os.homedir(), ".dexto-grep-home-test-"));
+    const fileSystemServiceForHome = new import_filesystem_service.FileSystemService(
+      {
+        allowedPaths: [homeTempDir],
+        blockedPaths: [],
+        blockedExtensions: [],
+        maxFileSize: 10 * 1024 * 1024,
+        workingDirectory: tempDir,
+        enableBackups: false,
+        backupRetentionDays: 7
+      },
+      mockLogger
+    );
+    await fileSystemServiceForHome.initialize();
+    try {
+      const filePath = path.join(homeTempDir, "notes.txt");
+      await fs.writeFile(filePath, "alpha\nneedle\nomega\n");
+      const tool = (0, import_grep_content_tool.createGrepContentTool)(async () => fileSystemServiceForHome);
+      const parsedInput = tool.inputSchema.parse({
+        pattern: "needle",
+        path: `~/${path.basename(homeTempDir)}`
+      });
+      const result = await tool.execute(parsedInput, createToolContext(mockLogger));
+      (0, import_vitest.expect)(result.files_searched).toBe(1);
+      (0, import_vitest.expect)(result.matches).toEqual([
+        {
+          file: filePath,
+          line_number: 2,
+          line: "needle"
+        }
+      ]);
+    } finally {
+      await fs.rm(homeTempDir, { recursive: true, force: true });
+    }
+  });
+});

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=grep-content-tool.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"grep-content-tool.test.d.ts","sourceRoot":"","sources":["../src/grep-content-tool.test.ts"],"names":[],"mappings":""}