@dexto/core 1.2.3 → 1.2.5

package/dist/utils/service-initializer.cjs

@@ -38,11 +38,8 @@ var import_state_manager = require("../agent/state-manager.js");
 var import_session = require("../session/index.js");
 var import_search = require("../search/index.js");
 var import_path = require("path");
-var path = __toESM(require("path"), 1);
 var import_storage = require("../storage/index.js");
 var import_factory = require("../tools/confirmation/allowed-tools-provider/factory.js");
-var import_logger = require("../logger/index.js");
-var import_events = require("../events/index.js");
 var import_manager3 = require("../resources/manager.js");
 var import_manager4 = require("../approval/manager.js");
 var import_memory = require("../memory/index.js");
@@ -50,62 +47,84 @@ var import_manager5 = require("../plugins/manager.js");
 var import_builtins = require("../plugins/registrations/builtins.js");
 var import_filesystem = require("../filesystem/index.js");
 var import_process = require("../process/index.js");
-async function createAgentServices(config, configPath, agentId) {
+async function createAgentServices(config, configPath, logger, agentEventBus) {
   if (config.telemetry?.enabled) {
     const { Telemetry } = await import("../telemetry/telemetry.js");
     await Telemetry.init(config.telemetry);
-    import_logger.logger.debug("Telemetry initialized");
+    logger.debug("Telemetry initialized");
   }
-  const agentEventBus = new import_events.AgentEventBus();
-  import_logger.logger.debug("Agent event bus initialized");
-  const effectiveAgentId = agentId || config.agentCard?.name || (configPath ? path.basename(configPath, path.extname(configPath)) : void 0) || "default-agent";
-  import_logger.logger.debug("Initializing storage manager", { agentId: effectiveAgentId });
-  const storageManager = await (0, import_storage.createStorageManager)(config.storage, effectiveAgentId);
-  import_logger.logger.debug("Storage manager initialized", {
+  logger.debug("Using pre-created agent event bus");
+  logger.debug("Initializing storage manager");
+  const storageManager = await (0, import_storage.createStorageManager)(config.storage, logger);
+  logger.debug("Storage manager initialized", {
     cache: config.storage.cache.type,
     database: config.storage.database.type
   });
-  import_logger.logger.debug("Initializing approval manager");
-  const approvalManager = new import_manager4.ApprovalManager(agentEventBus, {
-    mode: config.toolConfirmation.mode,
-    timeout: config.toolConfirmation.timeout
-  });
-  import_logger.logger.debug("Approval system initialized");
-  const mcpManager = new import_manager.MCPManager();
+  logger.debug("Initializing approval manager");
+  const approvalManager = new import_manager4.ApprovalManager(
+    {
+      toolConfirmation: {
+        mode: config.toolConfirmation.mode,
+        timeout: config.toolConfirmation.timeout
+      },
+      elicitation: {
+        enabled: config.elicitation.enabled,
+        timeout: config.elicitation.timeout
+      }
+    },
+    logger
+  );
+  logger.debug("Approval system initialized");
+  const mcpManager = new import_manager.MCPManager(logger);
   await mcpManager.initializeFromConfig(config.mcpServers);
   mcpManager.setApprovalManager(approvalManager);
-  import_logger.logger.debug("Approval manager connected to MCP manager for elicitation support");
-  const searchService = new import_search.SearchService(storageManager.getDatabase());
-  const memoryManager = new import_memory.MemoryManager(storageManager.getDatabase());
-  import_logger.logger.debug("Memory manager initialized");
+  logger.debug("Approval manager connected to MCP manager for elicitation support");
+  const searchService = new import_search.SearchService(storageManager.getDatabase(), logger);
+  const memoryManager = new import_memory.MemoryManager(storageManager.getDatabase(), logger);
+  logger.debug("Memory manager initialized");
   const configDir = configPath ? (0, import_path.dirname)((0, import_path.resolve)(configPath)) : process.cwd();
-  const pluginManager = new import_manager5.PluginManager({
-    agentEventBus,
-    storageManager,
-    configDir
-  });
+  const pluginManager = new import_manager5.PluginManager(
+    {
+      agentEventBus,
+      storageManager,
+      configDir
+    },
+    logger
+  );
   (0, import_builtins.registerBuiltInPlugins)({ pluginManager, config });
-  import_logger.logger.debug("Built-in plugins registered");
+  logger.debug("Built-in plugins registered");
   await pluginManager.initialize(config.plugins.custom);
-  import_logger.logger.info("Plugin manager initialized");
-  const fileSystemService = new import_filesystem.FileSystemService({
-    allowedPaths: ["."],
-    blockedPaths: [".git", "node_modules/.bin", ".env"],
-    blockedExtensions: [".exe", ".dll", ".so"],
-    workingDirectory: process.cwd()
-  });
+  logger.info("Plugin manager initialized");
+  const fileSystemService = new import_filesystem.FileSystemService(
+    {
+      allowedPaths: ["."],
+      blockedPaths: [".git", "node_modules/.bin", ".env"],
+      blockedExtensions: [".exe", ".dll", ".so"],
+      workingDirectory: process.cwd()
+      // Note: enableBackups and backupPath are not configured here
+      // Backups are disabled by default. To enable per-agent backups,
+      // filesystem config would need to be added to AgentConfig schema
+    },
+    logger
+  );
   await fileSystemService.initialize();
-  import_logger.logger.debug("FileSystemService initialized");
-  const processService = new import_process.ProcessService({
-    securityLevel: "moderate",
-    workingDirectory: process.cwd()
-  });
+  logger.debug("FileSystemService initialized");
+  const processService = new import_process.ProcessService(
+    {
+      securityLevel: "moderate",
+      workingDirectory: process.cwd()
+    },
+    logger
+  );
   await processService.initialize();
-  import_logger.logger.debug("ProcessService initialized");
-  const allowedToolsProvider = (0, import_factory.createAllowedToolsProvider)({
-    type: config.toolConfirmation.allowedToolsStorage,
-    storageManager
-  });
+  logger.debug("ProcessService initialized");
+  const allowedToolsProvider = (0, import_factory.createAllowedToolsProvider)(
+    {
+      type: config.toolConfirmation.allowedToolsStorage,
+      storageManager
+    },
+    logger
+  );
   const toolManager = new import_tool_manager.ToolManager(
     mcpManager,
     approvalManager,
@@ -120,34 +139,40 @@ async function createAgentServices(config, configPath, agentId) {
         processService
       },
       internalToolsConfig: config.internalTools
-    }
+    },
+    logger
   );
   await toolManager.initialize();
   const mcpServerCount = Object.keys(config.mcpServers).length;
   if (mcpServerCount === 0) {
-    import_logger.logger.info("Agent initialized without MCP servers - only built-in capabilities available");
+    logger.info("Agent initialized without MCP servers - only built-in capabilities available");
   } else {
-    import_logger.logger.debug(`MCPManager initialized with ${mcpServerCount} MCP server(s)`);
+    logger.debug(`MCPManager initialized with ${mcpServerCount} MCP server(s)`);
   }
   if (config.internalTools.length === 0) {
-    import_logger.logger.info("No internal tools enabled by configuration");
+    logger.info("No internal tools enabled by configuration");
   } else {
-    import_logger.logger.info(`Internal tools enabled: ${config.internalTools.join(", ")}`);
+    logger.info(`Internal tools enabled: ${config.internalTools.join(", ")}`);
   }
-  import_logger.logger.debug(
+  logger.debug(
     `[ServiceInitializer] Creating SystemPromptManager with configPath: ${configPath} \u2192 configDir: ${configDir}`
   );
   const systemPromptManager = new import_manager2.SystemPromptManager(
     config.systemPrompt,
     configDir,
-    memoryManager
+    memoryManager,
+    logger
+  );
+  const stateManager = new import_state_manager.AgentStateManager(config, agentEventBus, logger);
+  logger.debug("Agent state manager initialized");
+  const resourceManager = new import_manager3.ResourceManager(
+    mcpManager,
+    {
+      internalResourcesConfig: config.internalResources,
+      blobStore: storageManager.getBlobStore()
+    },
+    logger
   );
-  const stateManager = new import_state_manager.AgentStateManager(config, agentEventBus);
-  import_logger.logger.debug("Agent state manager initialized");
-  const resourceManager = new import_manager3.ResourceManager(mcpManager, {
-    internalResourcesConfig: config.internalResources,
-    blobStore: storageManager.getBlobStore()
-  });
   await resourceManager.initialize();
   const sessionManager = new import_session.SessionManager(
     {
@@ -167,12 +192,13 @@ async function createAgentServices(config, configPath, agentId) {
     {
       maxSessions: config.sessions?.maxSessions,
       sessionTTL: config.sessions?.sessionTTL
-    }
+    },
+    logger
   );
   await sessionManager.init();
-  import_logger.logger.debug("Session manager initialized with storage support");
+  logger.debug("Session manager initialized with storage support");
   toolManager.setPluginSupport(pluginManager, sessionManager, stateManager);
-  import_logger.logger.debug("Plugin support connected to ToolManager");
+  logger.debug("Plugin support connected to ToolManager");
   return {
     mcpManager,
     toolManager,

package/dist/utils/service-initializer.d.ts

@@ -5,6 +5,7 @@ import { AgentStateManager } from '../agent/state-manager.js';
 import { SessionManager } from '../session/index.js';
 import { SearchService } from '../search/index.js';
 import { StorageManager } from '../storage/index.js';
+import type { IDextoLogger } from '../logger/v2/types.js';
 import type { ValidatedAgentConfig } from '../agent/schemas.js';
 import { AgentEventBus } from '../events/index.js';
 import { ResourceManager } from '../resources/manager.js';
@@ -32,8 +33,9 @@ export type AgentServices = {
  * Initializes all agent services from a validated configuration.
  * @param config The validated agent configuration object
  * @param configPath Optional path to the config file (for relative path resolution)
- * @param agentId Optional agent identifier used for database naming (default: derived from config or 'default-agent')
+ * @param logger Logger instance for this agent (dependency injection)
+ * @param agentEventBus Pre-created event bus from DextoAgent constructor
  * @returns All the initialized services required for a Dexto agent
  */
-export declare function createAgentServices(config: ValidatedAgentConfig, configPath?: string, agentId?: string): Promise<AgentServices>;
+export declare function createAgentServices(config: ValidatedAgentConfig, configPath: string | undefined, logger: IDextoLogger, agentEventBus: AgentEventBus): Promise<AgentServices>;
 //# sourceMappingURL=service-initializer.d.ts.map

package/dist/utils/service-initializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-initializer.d.ts","sourceRoot":"","sources":["../../src/utils/service-initializer.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGnD,OAAO,EAAwB,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAG3E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAKtD;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,WAAW,EAAE,WAAW,CAAC;IACzB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,aAAa,EAAE,aAAa,CAAC;IAC7B,YAAY,EAAE,iBAAiB,CAAC;IAChC,cAAc,EAAE,cAAc,CAAC;IAC/B,aAAa,EAAE,aAAa,CAAC;IAC7B,cAAc,EAAE,cAAc,CAAC;IAC/B,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,EAAE,eAAe,CAAC;IACjC,aAAa,EAAE,aAAa,CAAC;IAC7B,aAAa,EAAE,aAAa,CAAC;CAChC,CAAC;AAGF;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACrC,MAAM,EAAE,oBAAoB,EAC5B,UAAU,CAAC,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,aAAa,CAAC,CA8LxB"}
+{"version":3,"file":"service-initializer.d.ts","sourceRoot":"","sources":["../../src/utils/service-initializer.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAwB,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAKtD;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,WAAW,EAAE,WAAW,CAAC;IACzB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,aAAa,EAAE,aAAa,CAAC;IAC7B,YAAY,EAAE,iBAAiB,CAAC;IAChC,cAAc,EAAE,cAAc,CAAC;IAC/B,aAAa,EAAE,aAAa,CAAC;IAC7B,cAAc,EAAE,cAAc,CAAC;IAC/B,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,EAAE,eAAe,CAAC;IACjC,aAAa,EAAE,aAAa,CAAC;IAC7B,aAAa,EAAE,aAAa,CAAC;CAChC,CAAC;AAGF;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACrC,MAAM,EAAE,oBAAoB,EAC5B,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,MAAM,EAAE,YAAY,EACpB,aAAa,EAAE,aAAa,GAC7B,OAAO,CAAC,aAAa,CAAC,CA8NxB"}

package/dist/utils/service-initializer.js

@@ -6,11 +6,8 @@ import { AgentStateManager } from "../agent/state-manager.js";
 import { SessionManager } from "../session/index.js";
 import { SearchService } from "../search/index.js";
 import { dirname, resolve } from "path";
-import * as path from "path";
 import { createStorageManager } from "../storage/index.js";
 import { createAllowedToolsProvider } from "../tools/confirmation/allowed-tools-provider/factory.js";
-import { logger } from "../logger/index.js";
-import { AgentEventBus } from "../events/index.js";
 import { ResourceManager } from "../resources/manager.js";
 import { ApprovalManager } from "../approval/manager.js";
 import { MemoryManager } from "../memory/index.js";
@@ -18,62 +15,84 @@ import { PluginManager } from "../plugins/manager.js";
 import { registerBuiltInPlugins } from "../plugins/registrations/builtins.js";
 import { FileSystemService } from "../filesystem/index.js";
 import { ProcessService } from "../process/index.js";
-async function createAgentServices(config, configPath, agentId) {
+async function createAgentServices(config, configPath, logger, agentEventBus) {
   if (config.telemetry?.enabled) {
     const { Telemetry } = await import("../telemetry/telemetry.js");
     await Telemetry.init(config.telemetry);
     logger.debug("Telemetry initialized");
   }
-  const agentEventBus = new AgentEventBus();
-  logger.debug("Agent event bus initialized");
-  const effectiveAgentId = agentId || config.agentCard?.name || (configPath ? path.basename(configPath, path.extname(configPath)) : void 0) || "default-agent";
-  logger.debug("Initializing storage manager", { agentId: effectiveAgentId });
-  const storageManager = await createStorageManager(config.storage, effectiveAgentId);
+  logger.debug("Using pre-created agent event bus");
+  logger.debug("Initializing storage manager");
+  const storageManager = await createStorageManager(config.storage, logger);
   logger.debug("Storage manager initialized", {
     cache: config.storage.cache.type,
     database: config.storage.database.type
   });
   logger.debug("Initializing approval manager");
-  const approvalManager = new ApprovalManager(agentEventBus, {
-    mode: config.toolConfirmation.mode,
-    timeout: config.toolConfirmation.timeout
-  });
+  const approvalManager = new ApprovalManager(
+    {
+      toolConfirmation: {
+        mode: config.toolConfirmation.mode,
+        timeout: config.toolConfirmation.timeout
+      },
+      elicitation: {
+        enabled: config.elicitation.enabled,
+        timeout: config.elicitation.timeout
+      }
+    },
+    logger
+  );
   logger.debug("Approval system initialized");
-  const mcpManager = new MCPManager();
+  const mcpManager = new MCPManager(logger);
   await mcpManager.initializeFromConfig(config.mcpServers);
   mcpManager.setApprovalManager(approvalManager);
   logger.debug("Approval manager connected to MCP manager for elicitation support");
-  const searchService = new SearchService(storageManager.getDatabase());
-  const memoryManager = new MemoryManager(storageManager.getDatabase());
+  const searchService = new SearchService(storageManager.getDatabase(), logger);
+  const memoryManager = new MemoryManager(storageManager.getDatabase(), logger);
   logger.debug("Memory manager initialized");
   const configDir = configPath ? dirname(resolve(configPath)) : process.cwd();
-  const pluginManager = new PluginManager({
-    agentEventBus,
-    storageManager,
-    configDir
-  });
+  const pluginManager = new PluginManager(
+    {
+      agentEventBus,
+      storageManager,
+      configDir
+    },
+    logger
+  );
   registerBuiltInPlugins({ pluginManager, config });
   logger.debug("Built-in plugins registered");
   await pluginManager.initialize(config.plugins.custom);
   logger.info("Plugin manager initialized");
-  const fileSystemService = new FileSystemService({
-    allowedPaths: ["."],
-    blockedPaths: [".git", "node_modules/.bin", ".env"],
-    blockedExtensions: [".exe", ".dll", ".so"],
-    workingDirectory: process.cwd()
-  });
+  const fileSystemService = new FileSystemService(
+    {
+      allowedPaths: ["."],
+      blockedPaths: [".git", "node_modules/.bin", ".env"],
+      blockedExtensions: [".exe", ".dll", ".so"],
+      workingDirectory: process.cwd()
+      // Note: enableBackups and backupPath are not configured here
+      // Backups are disabled by default. To enable per-agent backups,
+      // filesystem config would need to be added to AgentConfig schema
+    },
+    logger
+  );
   await fileSystemService.initialize();
   logger.debug("FileSystemService initialized");
-  const processService = new ProcessService({
-    securityLevel: "moderate",
-    workingDirectory: process.cwd()
-  });
+  const processService = new ProcessService(
+    {
+      securityLevel: "moderate",
+      workingDirectory: process.cwd()
+    },
+    logger
+  );
   await processService.initialize();
   logger.debug("ProcessService initialized");
-  const allowedToolsProvider = createAllowedToolsProvider({
-    type: config.toolConfirmation.allowedToolsStorage,
-    storageManager
-  });
+  const allowedToolsProvider = createAllowedToolsProvider(
+    {
+      type: config.toolConfirmation.allowedToolsStorage,
+      storageManager
+    },
+    logger
+  );
   const toolManager = new ToolManager(
     mcpManager,
     approvalManager,
@@ -88,7 +107,8 @@ async function createAgentServices(config, configPath, agentId) {
         processService
       },
       internalToolsConfig: config.internalTools
-    }
+    },
+    logger
   );
   await toolManager.initialize();
   const mcpServerCount = Object.keys(config.mcpServers).length;
@@ -108,14 +128,19 @@ async function createAgentServices(config, configPath, agentId) {
   const systemPromptManager = new SystemPromptManager(
     config.systemPrompt,
     configDir,
-    memoryManager
+    memoryManager,
+    logger
   );
-  const stateManager = new AgentStateManager(config, agentEventBus);
+  const stateManager = new AgentStateManager(config, agentEventBus, logger);
   logger.debug("Agent state manager initialized");
-  const resourceManager = new ResourceManager(mcpManager, {
-    internalResourcesConfig: config.internalResources,
-    blobStore: storageManager.getBlobStore()
-  });
+  const resourceManager = new ResourceManager(
+    mcpManager,
+    {
+      internalResourcesConfig: config.internalResources,
+      blobStore: storageManager.getBlobStore()
+    },
+    logger
+  );
   await resourceManager.initialize();
   const sessionManager = new SessionManager(
     {
@@ -135,7 +160,8 @@ async function createAgentServices(config, configPath, agentId) {
     {
       maxSessions: config.sessions?.maxSessions,
       sessionTTL: config.sessions?.sessionTTL
-    }
+    },
+    logger
   );
   await sessionManager.init();
   logger.debug("Session manager initialized with storage support");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dexto/core",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",
@@ -51,11 +51,14 @@
     "tsx": "^4.19.2",
     "winston": "^3.17.0",
     "yaml": "^2.7.1",
-    "zod": "^3.25.0",
     "zod-to-json-schema": "^3.24.6"
   },
   "devDependencies": {
-    "@types/json-schema": "^7.0.15"
+    "@types/json-schema": "^7.0.15",
+    "zod": "^3.25.0"
+  },
+  "peerDependencies": {
+    "zod": "^3.25.0"
   },
   "files": [
     "dist",
@@ -67,6 +70,7 @@
   "sideEffects": false,
   "scripts": {
     "build": "cross-env NODE_OPTIONS='--max-old-space-size=4096' tsup && cross-env NODE_OPTIONS='--max-old-space-size=4096' tsc -p tsconfig.json --emitDeclarationOnly && node scripts/fix-dist-aliases.mjs",
+    "dev": "tsup --watch",
     "typecheck": "tsc -p tsconfig.typecheck.json --noEmit",
     "lint": "eslint . --ext .ts"
   }