@dexto/core 1.2.4 → 1.2.5

package/dist/events/index.js

@@ -1,40 +1,68 @@
 import "../chunk-C6A6W6XS.js";
 import { EventEmitter } from "events";
 const AGENT_EVENT_NAMES = [
-  "dexto:conversationReset",
-  "dexto:mcpServerConnected",
-  "dexto:availableToolsUpdated",
-  "dexto:llmSwitched",
-  // Agent state manager events
-  "dexto:stateChanged",
-  "dexto:stateExported",
-  "dexto:stateReset",
-  "dexto:sessionOverrideSet",
-  "dexto:sessionOverrideCleared",
-  "dexto:mcpServerAdded",
-  "dexto:mcpServerRemoved",
-  "dexto:mcpServerRestarted",
-  "dexto:mcpServerUpdated",
-  "dexto:mcpResourceUpdated",
-  "dexto:mcpPromptsListChanged",
-  "dexto:mcpToolsListChanged",
-  "dexto:resourceCacheInvalidated",
-  "dexto:sessionTitleUpdated",
-  // User approval events (generalized approval system)
-  "dexto:approvalRequest",
-  "dexto:approvalResponse"
+  "session:reset",
+  "session:created",
+  "session:title-updated",
+  "session:override-set",
+  "session:override-cleared",
+  "mcp:server-connected",
+  "mcp:server-added",
+  "mcp:server-removed",
+  "mcp:server-restarted",
+  "mcp:server-updated",
+  "mcp:resource-updated",
+  "mcp:prompts-list-changed",
+  "mcp:tools-list-changed",
+  "tools:available-updated",
+  "llm:switched",
+  "state:changed",
+  "state:exported",
+  "state:reset",
+  "resource:cache-invalidated",
+  "approval:request",
+  "approval:response"
 ];
 const SESSION_EVENT_NAMES = [
-  "llmservice:thinking",
-  "llmservice:chunk",
-  "llmservice:response",
-  "llmservice:toolCall",
-  "llmservice:toolResult",
-  "llmservice:error",
-  "llmservice:switched",
-  "llmservice:unsupportedInput"
+  "llm:thinking",
+  "llm:chunk",
+  "llm:response",
+  "llm:tool-call",
+  "llm:tool-result",
+  "llm:error",
+  "llm:switched",
+  "llm:unsupported-input"
 ];
 const EVENT_NAMES = [...AGENT_EVENT_NAMES, ...SESSION_EVENT_NAMES];
+const STREAMING_EVENTS = [
+  // LLM events (session-scoped, forwarded to agent bus with sessionId)
+  "llm:thinking",
+  "llm:chunk",
+  "llm:response",
+  "llm:tool-call",
+  "llm:tool-result",
+  "llm:error",
+  "llm:unsupported-input",
+  // Session metadata
+  "session:title-updated"
+];
+const INTEGRATION_EVENTS = [
+  ...STREAMING_EVENTS,
+  // Session lifecycle
+  "session:created",
+  "session:reset",
+  // MCP lifecycle
+  "mcp:server-connected",
+  "mcp:server-restarted",
+  "mcp:tools-list-changed",
+  "mcp:prompts-list-changed",
+  // Tools
+  "tools:available-updated",
+  // LLM provider switching
+  "llm:switched",
+  // State management
+  "state:changed"
+];
 const _checkAgentEventNames = true;
 const _checkSessionEventNames = true;
 const _checkEventNames = true;
@@ -46,31 +74,48 @@ const SessionEventNames = Object.freeze([
   ...SESSION_EVENT_NAMES
 ]);
 const EventNames = Object.freeze([...EVENT_NAMES]);
-class BaseTypedEventEmitter extends EventEmitter {
+class BaseTypedEventEmitter {
+  // Wrapped EventEmitter instance
+  _emitter = new EventEmitter();
   // Store listeners with their abort controllers for cleanup
+  // Maps AbortSignal -> Event Name -> Set of listener functions
   _abortListeners = /* @__PURE__ */ new WeakMap();
-  // Implementation
+  /**
+   * Emit an event with type-safe payload
+   */
   emit(event, ...args) {
-    return super.emit(event, ...args);
+    return this._emitter.emit(event, ...args);
   }
-  // Implementation
+  /**
+   * Subscribe to an event with type-safe listener
+   */
   on(event, listener, options) {
     if (options?.signal?.aborted) {
       return this;
     }
-    super.on(event, listener);
+    this._emitter.on(event, listener);
     if (options?.signal) {
       const signal = options.signal;
       if (!this._abortListeners.has(signal)) {
-        this._abortListeners.set(signal, /* @__PURE__ */ new Set());
+        this._abortListeners.set(signal, /* @__PURE__ */ new Map());
       }
-      this._abortListeners.get(signal).add({ event, listener });
+      const eventMap = this._abortListeners.get(signal);
+      if (!eventMap.has(event)) {
+        eventMap.set(event, /* @__PURE__ */ new Set());
+      }
+      eventMap.get(event).add(listener);
       const abortHandler = () => {
         this.off(event, listener);
-        const listeners = this._abortListeners.get(signal);
-        if (listeners) {
-          listeners.delete({ event, listener });
-          if (listeners.size === 0) {
+        const eventMap2 = this._abortListeners.get(signal);
+        if (eventMap2) {
+          const listenerSet = eventMap2.get(event);
+          if (listenerSet) {
+            listenerSet.delete(listener);
+            if (listenerSet.size === 0) {
+              eventMap2.delete(event);
+            }
+          }
+          if (eventMap2.size === 0) {
             this._abortListeners.delete(signal);
           }
         }
@@ -79,36 +124,54 @@ class BaseTypedEventEmitter extends EventEmitter {
     }
     return this;
   }
-  // Implementation
+  /**
+   * Subscribe to an event once with type-safe listener
+   */
   once(event, listener, options) {
     if (options?.signal?.aborted) {
       return this;
     }
     const onceWrapper = (...args) => {
       if (options?.signal) {
-        const listeners = this._abortListeners.get(options.signal);
-        if (listeners) {
-          listeners.delete({ event, listener: onceWrapper });
-          if (listeners.size === 0) {
+        const eventMap = this._abortListeners.get(options.signal);
+        if (eventMap) {
+          const listenerSet = eventMap.get(event);
+          if (listenerSet) {
+            listenerSet.delete(onceWrapper);
+            if (listenerSet.size === 0) {
+              eventMap.delete(event);
+            }
+          }
+          if (eventMap.size === 0) {
             this._abortListeners.delete(options.signal);
           }
         }
       }
       listener(...args);
     };
-    super.once(event, onceWrapper);
+    this._emitter.once(event, onceWrapper);
     if (options?.signal) {
       const signal = options.signal;
       if (!this._abortListeners.has(signal)) {
-        this._abortListeners.set(signal, /* @__PURE__ */ new Set());
+        this._abortListeners.set(signal, /* @__PURE__ */ new Map());
+      }
+      const eventMap = this._abortListeners.get(signal);
+      if (!eventMap.has(event)) {
+        eventMap.set(event, /* @__PURE__ */ new Set());
       }
-      this._abortListeners.get(signal).add({ event, listener: onceWrapper });
+      eventMap.get(event).add(onceWrapper);
       const abortHandler = () => {
         this.off(event, onceWrapper);
-        const listeners = this._abortListeners.get(signal);
-        if (listeners) {
-          listeners.delete({ event, listener: onceWrapper });
-          if (listeners.size === 0) {
+        const eventMap2 = this._abortListeners.get(signal);
+        if (eventMap2) {
+          const listenerSet = eventMap2.get(event);
+          if (listenerSet) {
+            listenerSet.delete(onceWrapper);
+            if (listenerSet.size === 0) {
+              eventMap2.delete(event);
+            }
+          }
+          if (eventMap2.size === 0) {
             this._abortListeners.delete(signal);
           }
         }
@@ -117,9 +180,12 @@ class BaseTypedEventEmitter extends EventEmitter {
     }
     return this;
   }
-  // Implementation
+  /**
+   * Unsubscribe from an event
+   */
   off(event, listener) {
-    return super.off(event, listener);
+    this._emitter.off(event, listener);
+    return this;
   }
 }
 class AgentEventBus extends BaseTypedEventEmitter {
@@ -135,7 +201,9 @@ export {
   AgentEventNames,
   EVENT_NAMES,
   EventNames,
+  INTEGRATION_EVENTS,
   SESSION_EVENT_NAMES,
+  STREAMING_EVENTS,
   SessionEventBus,
   SessionEventNames,
   TypedEventEmitter,

package/dist/filesystem/filesystem-service.cjs

@@ -34,9 +34,10 @@ module.exports = __toCommonJS(filesystem_service_exports);
 var fs = __toESM(require("node:fs/promises"), 1);
 var path = __toESM(require("node:path"), 1);
 var import_glob = require("glob");
+var import_path = require("../utils/path.js");
 var import_path_validator = require("./path-validator.js");
 var import_errors = require("./errors.js");
-var import_logger = require("../logger/index.js");
+var import_types2 = require("../logger/v2/types.js");
 const DEFAULT_ENCODING = "utf-8";
 const DEFAULT_MAX_FILE_SIZE = 10 * 1024 * 1024;
 const DEFAULT_MAX_RESULTS = 1e3;
@@ -45,43 +46,50 @@ class FileSystemService {
   config;
   pathValidator;
   initialized = false;
-  constructor(config = {}) {
+  logger;
+  constructor(config = {}, logger) {
     this.config = {
       allowedPaths: config.allowedPaths || ["."],
       blockedPaths: config.blockedPaths || [".git", "node_modules/.bin", ".env"],
       blockedExtensions: config.blockedExtensions || [".exe", ".dll", ".so"],
       maxFileSize: config.maxFileSize || DEFAULT_MAX_FILE_SIZE,
       enableBackups: config.enableBackups ?? true,
-      backupPath: config.backupPath || ".dexto/backups",
+      backupPath: config.backupPath,
+      // Optional absolute override, defaults handled by getBackupDir()
       backupRetentionDays: config.backupRetentionDays || 7,
       workingDirectory: config.workingDirectory
     };
-    this.pathValidator = new import_path_validator.PathValidator(this.config);
+    this.logger = logger.createChild(import_types2.DextoLogComponent.FILESYSTEM);
+    this.pathValidator = new import_path_validator.PathValidator(this.config, this.logger);
+  }
+  /**
+   * Get backup directory path (context-aware with optional override)
+   * TODO: Migrate to explicit configuration via CLI enrichment layer (per-agent paths)
+   */
+  getBackupDir() {
+    return this.config.backupPath || (0, import_path.getDextoPath)("backups");
   }
   /**
    * Initialize the service
    */
   async initialize() {
     if (this.initialized) {
-      import_logger.logger.debug("FileSystemService already initialized");
+      this.logger.debug("FileSystemService already initialized");
       return;
     }
     if (this.config.enableBackups) {
       try {
-        const backupDir = path.resolve(
-          this.config.workingDirectory || process.cwd(),
-          this.config.backupPath
-        );
+        const backupDir = this.getBackupDir();
         await fs.mkdir(backupDir, { recursive: true });
-        import_logger.logger.debug(`Backup directory created/verified: ${backupDir}`);
+        this.logger.debug(`Backup directory created/verified: ${backupDir}`);
       } catch (error) {
-        import_logger.logger.warn(
+        this.logger.warn(
           `Failed to create backup directory: ${error instanceof Error ? error.message : String(error)}`
         );
       }
     }
     this.initialized = true;
-    import_logger.logger.info("FileSystemService initialized successfully");
+    this.logger.info("FileSystemService initialized successfully");
   }
   /**
    * Read a file with validation and size limits
@@ -171,7 +179,7 @@ class FileSystemService {
       for (const file of files) {
         const validation = this.pathValidator.validatePath(file);
         if (!validation.isValid || !validation.normalizedPath) {
-          import_logger.logger.debug(`Skipping invalid path: ${file}`);
+          this.logger.debug(`Skipping invalid path: ${file}`);
           continue;
         }
         if (options.includeMetadata !== false) {
@@ -184,7 +192,7 @@ class FileSystemService {
               isDirectory: stats.isDirectory()
             });
           } catch (error) {
-            import_logger.logger.debug(
+            this.logger.debug(
               `Failed to stat file ${file}: ${error instanceof Error ? error.message : String(error)}`
             );
           }
@@ -272,7 +280,7 @@ class FileSystemService {
             }
           }
         } catch (error) {
-          import_logger.logger.debug(
+          this.logger.debug(
             `Skipping file ${fileInfo.path}: ${error instanceof Error ? error.message : String(error)}`
           );
         }
@@ -323,7 +331,7 @@ class FileSystemService {
       }
       await fs.writeFile(normalizedPath, content, encoding);
       const bytesWritten = Buffer.byteLength(content, encoding);
-      import_logger.logger.debug(`File written: ${normalizedPath} (${bytesWritten} bytes)`);
+      this.logger.debug(`File written: ${normalizedPath} (${bytesWritten} bytes)`);
       return {
         success: true,
         path: normalizedPath,
@@ -374,7 +382,7 @@ class FileSystemService {
         content = content.replace(operation.oldString, operation.newString);
       }
       await fs.writeFile(normalizedPath, content, options.encoding || DEFAULT_ENCODING);
-      import_logger.logger.debug(`File edited: ${normalizedPath} (${occurrences} replacements)`);
+      this.logger.debug(`File edited: ${normalizedPath} (${occurrences} replacements)`);
       return {
         success: true,
         path: normalizedPath,
@@ -392,10 +400,7 @@ class FileSystemService {
    * Create a backup of a file
    */
   async createBackup(filePath) {
-    const backupDir = path.resolve(
-      this.config.workingDirectory || process.cwd(),
-      this.config.backupPath
-    );
+    const backupDir = this.getBackupDir();
     const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
     const basename = path.basename(filePath);
     const backupFilename = `${basename}.${timestamp}.backup`;
@@ -403,7 +408,7 @@ class FileSystemService {
     try {
       await fs.mkdir(backupDir, { recursive: true });
       await fs.copyFile(filePath, backupPath);
-      import_logger.logger.debug(`Backup created: ${backupPath}`);
+      this.logger.debug(`Backup created: ${backupPath}`);
       await this.cleanupOldBackups();
       return backupPath;
     } catch (error) {
@@ -420,10 +425,15 @@ class FileSystemService {
     if (!this.config.enableBackups) {
       return 0;
     }
-    const backupDir = path.resolve(
-      this.config.workingDirectory || process.cwd(),
-      this.config.backupPath
-    );
+    let backupDir;
+    try {
+      backupDir = this.getBackupDir();
+    } catch (error) {
+      this.logger.warn(
+        `Failed to resolve backup directory: ${error instanceof Error ? error.message : String(error)}`
+      );
+      return 0;
+    }
     try {
       await fs.access(backupDir);
     } catch {
@@ -443,20 +453,20 @@ class FileSystemService {
           if (stats.mtime < cutoffDate) {
             await fs.unlink(filePath);
             deletedCount++;
-            import_logger.logger.debug(`Cleaned up old backup: ${file}`);
+            this.logger.debug(`Cleaned up old backup: ${file}`);
           }
         } catch (error) {
-          import_logger.logger.warn(
+          this.logger.warn(
             `Failed to process backup file ${file}: ${error instanceof Error ? error.message : String(error)}`
           );
         }
       }
       if (deletedCount > 0) {
-        import_logger.logger.info(`Backup cleanup: removed ${deletedCount} old backup files`);
+        this.logger.info(`Backup cleanup: removed ${deletedCount} old backup files`);
       }
       return deletedCount;
     } catch (error) {
-      import_logger.logger.warn(
+      this.logger.warn(
         `Failed to cleanup backup directory: ${error instanceof Error ? error.message : String(error)}`
       );
       return 0;

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

@@ -4,15 +4,23 @@
  * Secure file system operations for Dexto internal tools
  */
 import { FileSystemConfig, FileContent, ReadFileOptions, GlobOptions, GlobResult, GrepOptions, SearchResult, WriteFileOptions, WriteResult, EditFileOptions, EditResult, EditOperation } from './types.js';
+import type { IDextoLogger } from '../logger/v2/types.js';
 /**
  * FileSystemService - Handles all file system operations with security checks
  * 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
  */
 export declare class FileSystemService {
     private config;
     private pathValidator;
     private initialized;
-    constructor(config?: Partial<FileSystemConfig>);
+    private logger;
+    constructor(config: Partial<FileSystemConfig> | undefined, logger: IDextoLogger);
+    /**
+     * Get backup directory path (context-aware with optional override)
+     * TODO: Migrate to explicit configuration via CLI enrichment layer (per-agent paths)
+     */
+    private getBackupDir;
     /**
      * Initialize the service
      */

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

@@ -1 +1 @@
-{"version":3,"file":"filesystem-service.d.ts","sourceRoot":"","sources":["../../src/filesystem/filesystem-service.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,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;AAUpB;;;GAGG;AACH,qBAAa,iBAAiB;IAC1B,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,WAAW,CAAkB;gBAEzB,MAAM,GAAE,OAAO,CAAC,gBAAgB,CAAM;IAgBlD;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA0BjC;;OAEG;IACG,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,eAAoB,GAAG,OAAO,CAAC,WAAW,CAAC;IA+ErF;;OAEG;IACG,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,UAAU,CAAC;IAwEhF;;OAEG;IACG,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,YAAY,CAAC;IAqGtF;;OAEG;IACG,SAAS,CACX,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,gBAAqB,GAC/B,OAAO,CAAC,WAAW,CAAC;IA0DvB;;OAEG;IACG,QAAQ,CACV,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,aAAa,EACxB,OAAO,GAAE,eAAoB,GAC9B,OAAO,CAAC,UAAU,CAAC;IAoEtB;;OAEG;YACW,YAAY;IA6B1B;;OAEG;IACG,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IAwD1C;;OAEG;IACH,SAAS,IAAI,QAAQ,CAAC,gBAAgB,CAAC;IAIvC;;OAEG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;CAI3C"}
+{"version":3,"file":"filesystem-service.d.ts","sourceRoot":"","sources":["../../src/filesystem/filesystem-service.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,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;AAGpB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAQ1D;;;;GAIG;AACH,qBAAa,iBAAiB;IAC1B,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,MAAM,CAAe;gBAEjB,MAAM,EAAE,OAAO,CAAC,gBAAgB,CAAC,YAAK,EAAE,MAAM,EAAE,YAAY;IAiBxE;;;OAGG;IACH,OAAO,CAAC,YAAY;IAKpB;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBjC;;OAEG;IACG,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,eAAoB,GAAG,OAAO,CAAC,WAAW,CAAC;IA+ErF;;OAEG;IACG,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,UAAU,CAAC;IAwEhF;;OAEG;IACG,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,YAAY,CAAC;IAqGtF;;OAEG;IACG,SAAS,CACX,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,gBAAqB,GAC/B,OAAO,CAAC,WAAW,CAAC;IA0DvB;;OAEG;IACG,QAAQ,CACV,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,aAAa,EACxB,OAAO,GAAE,eAAoB,GAC9B,OAAO,CAAC,UAAU,CAAC;IAoEtB;;OAEG;YACW,YAAY;IA0B1B;;OAEG;IACG,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IA6D1C;;OAEG;IACH,SAAS,IAAI,QAAQ,CAAC,gBAAgB,CAAC;IAIvC;;OAEG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;CAI3C"}

package/dist/filesystem/filesystem-service.js

@@ -2,9 +2,10 @@ import "../chunk-C6A6W6XS.js";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import { glob } from "glob";
+import { getDextoPath } from "../utils/path.js";
 import { PathValidator } from "./path-validator.js";
 import { FileSystemError } from "./errors.js";
-import { logger } from "../logger/index.js";
+import { DextoLogComponent } from "../logger/v2/types.js";
 const DEFAULT_ENCODING = "utf-8";
 const DEFAULT_MAX_FILE_SIZE = 10 * 1024 * 1024;
 const DEFAULT_MAX_RESULTS = 1e3;
@@ -13,43 +14,50 @@ class FileSystemService {
   config;
   pathValidator;
   initialized = false;
-  constructor(config = {}) {
+  logger;
+  constructor(config = {}, logger) {
     this.config = {
       allowedPaths: config.allowedPaths || ["."],
       blockedPaths: config.blockedPaths || [".git", "node_modules/.bin", ".env"],
       blockedExtensions: config.blockedExtensions || [".exe", ".dll", ".so"],
       maxFileSize: config.maxFileSize || DEFAULT_MAX_FILE_SIZE,
       enableBackups: config.enableBackups ?? true,
-      backupPath: config.backupPath || ".dexto/backups",
+      backupPath: config.backupPath,
+      // Optional absolute override, defaults handled by getBackupDir()
       backupRetentionDays: config.backupRetentionDays || 7,
       workingDirectory: config.workingDirectory
     };
-    this.pathValidator = new PathValidator(this.config);
+    this.logger = logger.createChild(DextoLogComponent.FILESYSTEM);
+    this.pathValidator = new PathValidator(this.config, this.logger);
+  }
+  /**
+   * Get backup directory path (context-aware with optional override)
+   * TODO: Migrate to explicit configuration via CLI enrichment layer (per-agent paths)
+   */
+  getBackupDir() {
+    return this.config.backupPath || getDextoPath("backups");
   }
   /**
    * Initialize the service
    */
   async initialize() {
     if (this.initialized) {
-      logger.debug("FileSystemService already initialized");
+      this.logger.debug("FileSystemService already initialized");
       return;
     }
     if (this.config.enableBackups) {
       try {
-        const backupDir = path.resolve(
-          this.config.workingDirectory || process.cwd(),
-          this.config.backupPath
-        );
+        const backupDir = this.getBackupDir();
         await fs.mkdir(backupDir, { recursive: true });
-        logger.debug(`Backup directory created/verified: ${backupDir}`);
+        this.logger.debug(`Backup directory created/verified: ${backupDir}`);
       } catch (error) {
-        logger.warn(
+        this.logger.warn(
           `Failed to create backup directory: ${error instanceof Error ? error.message : String(error)}`
         );
       }
     }
     this.initialized = true;
-    logger.info("FileSystemService initialized successfully");
+    this.logger.info("FileSystemService initialized successfully");
   }
   /**
    * Read a file with validation and size limits
@@ -139,7 +147,7 @@ class FileSystemService {
       for (const file of files) {
         const validation = this.pathValidator.validatePath(file);
         if (!validation.isValid || !validation.normalizedPath) {
-          logger.debug(`Skipping invalid path: ${file}`);
+          this.logger.debug(`Skipping invalid path: ${file}`);
           continue;
         }
         if (options.includeMetadata !== false) {
@@ -152,7 +160,7 @@ class FileSystemService {
               isDirectory: stats.isDirectory()
             });
           } catch (error) {
-            logger.debug(
+            this.logger.debug(
               `Failed to stat file ${file}: ${error instanceof Error ? error.message : String(error)}`
             );
           }
@@ -240,7 +248,7 @@ class FileSystemService {
             }
           }
         } catch (error) {
-          logger.debug(
+          this.logger.debug(
             `Skipping file ${fileInfo.path}: ${error instanceof Error ? error.message : String(error)}`
           );
         }
@@ -291,7 +299,7 @@ class FileSystemService {
       }
       await fs.writeFile(normalizedPath, content, encoding);
       const bytesWritten = Buffer.byteLength(content, encoding);
-      logger.debug(`File written: ${normalizedPath} (${bytesWritten} bytes)`);
+      this.logger.debug(`File written: ${normalizedPath} (${bytesWritten} bytes)`);
       return {
         success: true,
         path: normalizedPath,
@@ -342,7 +350,7 @@ class FileSystemService {
         content = content.replace(operation.oldString, operation.newString);
       }
       await fs.writeFile(normalizedPath, content, options.encoding || DEFAULT_ENCODING);
-      logger.debug(`File edited: ${normalizedPath} (${occurrences} replacements)`);
+      this.logger.debug(`File edited: ${normalizedPath} (${occurrences} replacements)`);
       return {
         success: true,
         path: normalizedPath,
@@ -360,10 +368,7 @@ class FileSystemService {
    * Create a backup of a file
    */
   async createBackup(filePath) {
-    const backupDir = path.resolve(
-      this.config.workingDirectory || process.cwd(),
-      this.config.backupPath
-    );
+    const backupDir = this.getBackupDir();
     const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
     const basename = path.basename(filePath);
     const backupFilename = `${basename}.${timestamp}.backup`;
@@ -371,7 +376,7 @@ class FileSystemService {
     try {
       await fs.mkdir(backupDir, { recursive: true });
       await fs.copyFile(filePath, backupPath);
-      logger.debug(`Backup created: ${backupPath}`);
+      this.logger.debug(`Backup created: ${backupPath}`);
       await this.cleanupOldBackups();
       return backupPath;
     } catch (error) {
@@ -388,10 +393,15 @@ class FileSystemService {
     if (!this.config.enableBackups) {
       return 0;
     }
-    const backupDir = path.resolve(
-      this.config.workingDirectory || process.cwd(),
-      this.config.backupPath
-    );
+    let backupDir;
+    try {
+      backupDir = this.getBackupDir();
+    } catch (error) {
+      this.logger.warn(
+        `Failed to resolve backup directory: ${error instanceof Error ? error.message : String(error)}`
+      );
+      return 0;
+    }
     try {
       await fs.access(backupDir);
     } catch {
@@ -411,20 +421,20 @@ class FileSystemService {
           if (stats.mtime < cutoffDate) {
             await fs.unlink(filePath);
             deletedCount++;
-            logger.debug(`Cleaned up old backup: ${file}`);
+            this.logger.debug(`Cleaned up old backup: ${file}`);
           }
         } catch (error) {
-          logger.warn(
+          this.logger.warn(
             `Failed to process backup file ${file}: ${error instanceof Error ? error.message : String(error)}`
           );
         }
       }
       if (deletedCount > 0) {
-        logger.info(`Backup cleanup: removed ${deletedCount} old backup files`);
+        this.logger.info(`Backup cleanup: removed ${deletedCount} old backup files`);
       }
       return deletedCount;
     } catch (error) {
-      logger.warn(
+      this.logger.warn(
         `Failed to cleanup backup directory: ${error instanceof Error ? error.message : String(error)}`
       );
       return 0;

package/dist/filesystem/path-validator.cjs

@@ -33,14 +33,15 @@ __export(path_validator_exports, {
 module.exports = __toCommonJS(path_validator_exports);
 var path = __toESM(require("node:path"), 1);
 var import_node_fs = require("node:fs");
-var import_logger = require("../logger/index.js");
 class PathValidator {
   config;
   normalizedAllowedPaths;
   normalizedBlockedPaths;
   normalizedBlockedExtensions;
-  constructor(config) {
+  logger;
+  constructor(config, logger) {
     this.config = config;
+    this.logger = logger;
     const workingDir = config.workingDirectory || process.cwd();
     this.normalizedAllowedPaths = config.allowedPaths.map((p) => path.resolve(workingDir, p));
     this.normalizedBlockedPaths = config.blockedPaths.map((p) => path.normalize(p));
@@ -48,7 +49,7 @@ class PathValidator {
       const e = ext.startsWith(".") ? ext : `.${ext}`;
       return e.toLowerCase();
     });
-    import_logger.logger.debug(
+    this.logger.debug(
       `PathValidator initialized with ${this.normalizedAllowedPaths.length} allowed paths`
     );
   }