@dexto/core 1.6.25 → 1.6.26

package/dist/tools/tool-manager.d.ts

@@ -9,6 +9,7 @@ import type { HookManager } from '../hooks/manager.js';
 import type { SessionManager } from '../session/index.js';
 import type { AgentStateManager } from '../agent/state-manager.js';
 import type { WorkspaceManager } from '../workspace/manager.js';
+import type { SessionToolPreferencesStore } from './session-tool-preferences-store.js';
 import type { DynamicContributorContext, DynamicContributorContextFactory } from '../systemPrompt/types.js';
 export type ToolExecutionContextFactory = (baseContext: ToolExecutionContextBase) => ToolExecutionContext;
 /**
@@ -26,7 +27,7 @@ export type ToolExecutionContextFactory = (baseContext: ToolExecutionContextBase
  * - Handle cross-source naming conflicts (MCP tools are prefixed with `mcp--`)
  *
  * Architecture:
- * LLMService → ToolManager → [MCPManager, local tools]
+ * LLM runtime → ToolManager → [MCPManager, local tools]
  *                ↓
  *          ApprovalManager (for approvals)
  *
@@ -38,6 +39,7 @@ export type ToolExecutionContextFactory = (baseContext: ToolExecutionContextBase
  *   See feature-plans/telemetry.md for details
  */
 export declare class ToolManager {
+    private readonly sessionToolPreferencesStore;
     private mcpManager;
     private agentTools;
     private approvalManager;
@@ -61,12 +63,21 @@ export declare class ToolManager {
     private sessionAutoApproveTools;
     private sessionUserAutoApproveTools;
     private sessionDisabledTools;
+    private readonly restoredSessionPreferences;
+    private readonly sessionPreferenceLocks;
     private globalDisabledTools;
     private cleanupHandlers;
     private cleanupStarted;
     private resolveLocalToolIdOrAlias;
     private normalizeToolPolicyPattern;
-    constructor(mcpManager: MCPManager, approvalManager: ApprovalManager, allowedToolsProvider: AllowedToolsProvider, approvalMode: 'manual' | 'auto-approve' | 'auto-deny', agentEventBus: AgentEventBus, toolPolicies: ToolPolicies, tools: Tool[], logger: Logger);
+    constructor(mcpManager: MCPManager, approvalManager: ApprovalManager, allowedToolsProvider: AllowedToolsProvider, approvalMode: 'manual' | 'auto-approve' | 'auto-deny', agentEventBus: AgentEventBus, toolPolicies: ToolPolicies, tools: Tool[], logger: Logger, sessionToolPreferencesStore: SessionToolPreferencesStore);
+    private runWithSessionPreferenceLock;
+    private applySessionToolPreferences;
+    private getSessionToolPreferencesSnapshot;
+    restoreSessionState(sessionId: string): Promise<void>;
+    evictSessionState(sessionId: string): void;
+    deleteSessionState(sessionId: string): Promise<void>;
+    private persistSessionToolPreferences;
     /**
      * Initialize the ToolManager and its components
      */
@@ -105,11 +116,11 @@ export declare class ToolManager {
     /**
      * Set session-level auto-approve tools chosen by the user.
      */
-    setSessionUserAutoApproveTools(sessionId: string, autoApproveTools: string[]): void;
+    setSessionUserAutoApproveTools(sessionId: string, autoApproveTools: string[]): Promise<void>;
     /**
      * Clear session-level auto-approve tools chosen by the user.
      */
-    clearSessionUserAutoApproveTools(sessionId: string): void;
+    clearSessionUserAutoApproveTools(sessionId: string): Promise<void>;
     /**
      * Clear session-level auto-approve tools.
      * Call this when the session ends or when the skill completes.
@@ -126,11 +137,11 @@ export declare class ToolManager {
     /**
      * Set session-level disabled tools (overrides global list).
      */
-    setSessionDisabledTools(sessionId: string, toolNames: string[]): void;
+    setSessionDisabledTools(sessionId: string, toolNames: string[]): Promise<void>;
     /**
      * Clear session-level disabled tools.
      */
-    clearSessionDisabledTools(sessionId: string): void;
+    clearSessionDisabledTools(sessionId: string): Promise<void>;
     /**
      * Get disabled tools for a session (session override wins).
      */

package/dist/tools/tool-manager.d.ts.map

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

package/dist/tools/tool-manager.js

@@ -21,6 +21,24 @@ _ToolManager_decorators = [InstrumentClass({
   excludeMethods: ["setHookSupport", "getApprovalManager", "getAllowedToolsProvider"]
 })];
 let _ToolManager = class _ToolManager {
+  constructor(mcpManager, approvalManager, allowedToolsProvider, approvalMode, agentEventBus, toolPolicies, tools, logger, sessionToolPreferencesStore) {
+    this.sessionToolPreferencesStore = sessionToolPreferencesStore;
+    this.mcpManager = mcpManager;
+    this.approvalManager = approvalManager;
+    this.allowedToolsProvider = allowedToolsProvider;
+    this.approvalMode = approvalMode;
+    this.agentEventBus = agentEventBus;
+    this.toolPolicies = toolPolicies;
+    this.logger = logger.createChild(DextoLogComponent.TOOLS);
+    this.setTools(tools);
+    this.toolExecutionContextFactory = () => {
+      throw ToolError.configInvalid(
+        "ToolExecutionContextFactory not configured. DextoAgent.start() must configure tool execution context before tools can run."
+      );
+    };
+    this.setupNotificationListeners();
+    this.logger.debug("ToolManager initialized");
+  }
   mcpManager;
   agentTools = /* @__PURE__ */ new Map();
   approvalManager;
@@ -53,6 +71,8 @@ let _ToolManager = class _ToolManager {
   // Session-level auto-approve tools set by users (UI)
   sessionUserAutoApproveTools = /* @__PURE__ */ new Map();
   sessionDisabledTools = /* @__PURE__ */ new Map();
+  restoredSessionPreferences = /* @__PURE__ */ new Set();
+  sessionPreferenceLocks = /* @__PURE__ */ new Map();
   globalDisabledTools = [];
   cleanupHandlers = /* @__PURE__ */ new Set();
   cleanupStarted = false;
@@ -76,22 +96,76 @@ let _ToolManager = class _ToolManager {
     }
     return this.resolveLocalToolIdOrAlias(pattern) ?? pattern;
   }
-  constructor(mcpManager, approvalManager, allowedToolsProvider, approvalMode, agentEventBus, toolPolicies, tools, logger) {
-    this.mcpManager = mcpManager;
-    this.approvalManager = approvalManager;
-    this.allowedToolsProvider = allowedToolsProvider;
-    this.approvalMode = approvalMode;
-    this.agentEventBus = agentEventBus;
-    this.toolPolicies = toolPolicies;
-    this.logger = logger.createChild(DextoLogComponent.TOOLS);
-    this.setTools(tools);
-    this.toolExecutionContextFactory = () => {
-      throw ToolError.configInvalid(
-        "ToolExecutionContextFactory not configured. DextoAgent.start() must configure tool execution context before tools can run."
-      );
+  async runWithSessionPreferenceLock(sessionId, fn) {
+    const previousLock = this.sessionPreferenceLocks.get(sessionId) ?? Promise.resolve();
+    const currentResult = previousLock.catch(() => {
+    }).then(() => fn());
+    const currentLock = currentResult.then(
+      () => void 0,
+      () => void 0
+    );
+    this.sessionPreferenceLocks.set(sessionId, currentLock);
+    try {
+      return await currentResult;
+    } finally {
+      if (this.sessionPreferenceLocks.get(sessionId) === currentLock) {
+        this.sessionPreferenceLocks.delete(sessionId);
+      }
+    }
+  }
+  applySessionToolPreferences(sessionId, preferences) {
+    if (preferences.userAutoApproveTools.length > 0) {
+      this.sessionUserAutoApproveTools.set(sessionId, [...preferences.userAutoApproveTools]);
+    } else {
+      this.sessionUserAutoApproveTools.delete(sessionId);
+    }
+    if (preferences.disabledTools.length > 0) {
+      this.sessionDisabledTools.set(sessionId, [...preferences.disabledTools]);
+    } else {
+      this.sessionDisabledTools.delete(sessionId);
+    }
+  }
+  getSessionToolPreferencesSnapshot(sessionId) {
+    return {
+      userAutoApproveTools: [...this.sessionUserAutoApproveTools.get(sessionId) ?? []],
+      disabledTools: [...this.sessionDisabledTools.get(sessionId) ?? []]
     };
-    this.setupNotificationListeners();
-    this.logger.debug("ToolManager initialized");
+  }
+  async restoreSessionState(sessionId) {
+    if (this.restoredSessionPreferences.has(sessionId)) {
+      return;
+    }
+    await this.runWithSessionPreferenceLock(sessionId, async () => {
+      if (this.restoredSessionPreferences.has(sessionId)) {
+        return;
+      }
+      const preferences = await this.sessionToolPreferencesStore.load(sessionId);
+      this.applySessionToolPreferences(sessionId, preferences);
+      this.restoredSessionPreferences.add(sessionId);
+      this.logger.debug("Restored persisted session tool preferences", {
+        sessionId,
+        autoApproveCount: preferences.userAutoApproveTools.length,
+        disabledCount: preferences.disabledTools.length
+      });
+    });
+  }
+  evictSessionState(sessionId) {
+    this.sessionAutoApproveTools.delete(sessionId);
+    this.sessionUserAutoApproveTools.delete(sessionId);
+    this.sessionDisabledTools.delete(sessionId);
+    this.restoredSessionPreferences.delete(sessionId);
+  }
+  async deleteSessionState(sessionId) {
+    await this.runWithSessionPreferenceLock(sessionId, async () => {
+      this.evictSessionState(sessionId);
+      await this.sessionToolPreferencesStore.delete(sessionId);
+    });
+  }
+  async persistSessionToolPreferences(sessionId) {
+    await this.sessionToolPreferencesStore.save(
+      sessionId,
+      this.getSessionToolPreferencesSnapshot(sessionId)
+    );
   }
   /**
    * Initialize the ToolManager and its components
@@ -248,15 +322,19 @@ let _ToolManager = class _ToolManager {
   /**
    * Set session-level auto-approve tools chosen by the user.
    */
-  setSessionUserAutoApproveTools(sessionId, autoApproveTools) {
+  async setSessionUserAutoApproveTools(sessionId, autoApproveTools) {
+    await this.restoreSessionState(sessionId);
     if (autoApproveTools.length === 0) {
-      this.clearSessionUserAutoApproveTools(sessionId);
+      await this.clearSessionUserAutoApproveTools(sessionId);
       return;
     }
     const normalized = autoApproveTools.map(
       (pattern) => this.normalizeToolPolicyPattern(pattern)
     );
-    this.sessionUserAutoApproveTools.set(sessionId, normalized);
+    await this.runWithSessionPreferenceLock(sessionId, async () => {
+      this.sessionUserAutoApproveTools.set(sessionId, normalized);
+      await this.persistSessionToolPreferences(sessionId);
+    });
     this.logger.info(
       `Session user auto-approve tools set for '${sessionId}': ${autoApproveTools.length} tools`
     );
@@ -265,9 +343,14 @@ let _ToolManager = class _ToolManager {
   /**
    * Clear session-level auto-approve tools chosen by the user.
    */
-  clearSessionUserAutoApproveTools(sessionId) {
-    const hadAutoApprove = this.sessionUserAutoApproveTools.has(sessionId);
-    this.sessionUserAutoApproveTools.delete(sessionId);
+  async clearSessionUserAutoApproveTools(sessionId) {
+    await this.restoreSessionState(sessionId);
+    let hadAutoApprove = false;
+    await this.runWithSessionPreferenceLock(sessionId, async () => {
+      hadAutoApprove = this.sessionUserAutoApproveTools.has(sessionId);
+      this.sessionUserAutoApproveTools.delete(sessionId);
+      await this.persistSessionToolPreferences(sessionId);
+    });
     if (hadAutoApprove) {
       this.logger.info(`Session user auto-approve tools cleared for '${sessionId}'`);
     }
@@ -308,12 +391,16 @@ let _ToolManager = class _ToolManager {
   /**
    * Set session-level disabled tools (overrides global list).
    */
-  setSessionDisabledTools(sessionId, toolNames) {
+  async setSessionDisabledTools(sessionId, toolNames) {
+    await this.restoreSessionState(sessionId);
     if (toolNames.length === 0) {
-      this.clearSessionDisabledTools(sessionId);
+      await this.clearSessionDisabledTools(sessionId);
       return;
     }
-    this.sessionDisabledTools.set(sessionId, [...toolNames]);
+    await this.runWithSessionPreferenceLock(sessionId, async () => {
+      this.sessionDisabledTools.set(sessionId, [...toolNames]);
+      await this.persistSessionToolPreferences(sessionId);
+    });
     this.logger.info("Session disabled tools updated", {
       sessionId,
       count: toolNames.length
@@ -327,9 +414,14 @@ let _ToolManager = class _ToolManager {
   /**
    * Clear session-level disabled tools.
    */
-  clearSessionDisabledTools(sessionId) {
-    const hadOverrides = this.sessionDisabledTools.has(sessionId);
-    this.sessionDisabledTools.delete(sessionId);
+  async clearSessionDisabledTools(sessionId) {
+    await this.restoreSessionState(sessionId);
+    let hadOverrides = false;
+    await this.runWithSessionPreferenceLock(sessionId, async () => {
+      hadOverrides = this.sessionDisabledTools.has(sessionId);
+      this.sessionDisabledTools.delete(sessionId);
+      await this.persistSessionToolPreferences(sessionId);
+    });
     if (hadOverrides) {
       this.logger.info("Session disabled tools cleared", { sessionId });
     }
@@ -729,7 +821,7 @@ let _ToolManager = class _ToolManager {
           return false;
         }
         if (!patternKey) return false;
-        return this.approvalManager.matchesPattern(toolName, patternKey);
+        return this.approvalManager.matchesPattern(toolName, patternKey, sessionId);
       },
       { rememberPattern: void 0 }
       // Don't propagate pattern choice to auto-approved requests
@@ -760,7 +852,10 @@ let _ToolManager = class _ToolManager {
         if (!directoryAccess) {
           return false;
         }
-        return this.approvalManager.isDirectorySessionApproved(directoryAccess.parentDir);
+        return this.approvalManager.isDirectorySessionApproved(
+          directoryAccess.parentDir,
+          sessionId
+        );
       },
       { rememberDirectory: false }
     );
@@ -1410,7 +1505,11 @@ let _ToolManager = class _ToolManager {
   async tryQuickApprovalResolution(toolName, args, sessionId, directoryAccess) {
     if (directoryAccess) {
       if (this.approvalMode === "auto-approve") {
-        this.approvalManager.addApprovedDirectory(directoryAccess.parentDir, "once");
+        await this.approvalManager.addApprovedDirectory(
+          directoryAccess.parentDir,
+          "once",
+          sessionId
+        );
         return { requireApproval: false };
       }
       return null;
@@ -1434,7 +1533,7 @@ let _ToolManager = class _ToolManager {
       return { requireApproval: false };
     }
     const patternKey = this.getToolPatternKey(toolName, args);
-    if (patternKey && this.approvalManager.matchesPattern(toolName, patternKey)) {
+    if (patternKey && this.approvalManager.matchesPattern(toolName, patternKey, sessionId)) {
       this.logger.info(
         `Tool '${toolName}' matched approved pattern key '${patternKey}' \u2013 skipping confirmation.`
       );
@@ -1544,7 +1643,7 @@ let _ToolManager = class _ToolManager {
       );
       this.autoApprovePendingToolRequests(toolName, allowSessionId);
     } else if (rememberPattern && this.getToolApprovalPatternKeyFn(toolName)) {
-      this.approvalManager.addPattern(toolName, rememberPattern);
+      await this.approvalManager.addPattern(toolName, rememberPattern, sessionId);
       this.logger.info(`Pattern '${rememberPattern}' added for tool '${toolName}' approval`);
       this.autoApprovePendingPatternRequests(toolName, sessionId);
     } else if (rememberDirectory) {

package/dist/utils/service-initializer.cjs

@@ -28,7 +28,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var service_initializer_exports = {};
 __export(service_initializer_exports, {
-  createAgentServices: () => createAgentServices
+  createAgentServices: () => createAgentServices,
+  initializeAgentTelemetry: () => initializeAgentTelemetry
 });
 module.exports = __toCommonJS(service_initializer_exports);
 var import_manager = require("../mcp/manager.js");
@@ -42,14 +43,28 @@ var import_workspace = require("../workspace/index.js");
 var import_factory = require("../tools/confirmation/allowed-tools-provider/factory.js");
 var import_manager3 = require("../resources/manager.js");
 var import_manager4 = require("../approval/manager.js");
+var import_session_approval_store = require("../approval/session-approval-store.js");
 var import_memory = require("../memory/index.js");
 var import_manager5 = require("../hooks/manager.js");
-async function createAgentServices(config, logger, agentEventBus, overrides, compactionStrategy) {
+var import_message_queue_store = require("../session/message-queue-store.js");
+var import_session_tool_preferences_store = require("../tools/session-tool-preferences-store.js");
+async function initializeAgentTelemetry(config, logger, telemetryBootstrap) {
+  if (telemetryBootstrap) {
+    await telemetryBootstrap({
+      agentId: config.agentId,
+      config: config.telemetry,
+      logger
+    });
+    return;
+  }
   if (config.telemetry?.enabled) {
     const { Telemetry } = await import("../telemetry/telemetry.js");
     await Telemetry.init(config.telemetry);
     logger.debug("Telemetry initialized");
   }
+}
+async function createAgentServices(config, logger, agentEventBus, overrides, compactionStrategy) {
+  await initializeAgentTelemetry(config, logger, overrides?.telemetryBootstrap);
   logger.debug("Using pre-created agent event bus");
   logger.debug("Initializing storage manager");
   const storageManager = overrides?.storageManager ?? (() => {
@@ -62,6 +77,16 @@ async function createAgentServices(config, logger, agentEventBus, overrides, com
     await storageManager.connect();
   }
   logger.debug("Storage manager initialized", await storageManager.getInfo());
+  const sessionCacheTtlMs = config.sessions?.sessionTTL ?? 36e5;
+  const sessionApprovalStore = new import_session_approval_store.SessionApprovalStore(storageManager, logger, {
+    cacheTtlMs: sessionCacheTtlMs
+  });
+  const sessionToolPreferencesStore = new import_session_tool_preferences_store.SessionToolPreferencesStore(storageManager, logger, {
+    cacheTtlMs: sessionCacheTtlMs
+  });
+  const messageQueueStore = new import_message_queue_store.MessageQueueStore(storageManager, logger, {
+    cacheTtlMs: sessionCacheTtlMs
+  });
   const workspaceManager = new import_workspace.WorkspaceManager(
     storageManager.getDatabase(),
     agentEventBus,
@@ -84,7 +109,8 @@ async function createAgentServices(config, logger, agentEventBus, overrides, com
         }
       }
     },
-    logger
+    logger,
+    sessionApprovalStore
   );
   logger.debug("Approval system initialized");
   const mcpManager = new import_manager.MCPManager(logger, agentEventBus);
@@ -142,7 +168,8 @@ async function createAgentServices(config, logger, agentEventBus, overrides, com
     agentEventBus,
     config.permissions.toolPolicies,
     [],
-    logger
+    logger,
+    sessionToolPreferencesStore
   );
   await toolManager.setWorkspaceManager(workspaceManager);
   const mcpServerCount = Object.keys(config.mcpServers).length;
@@ -164,6 +191,7 @@ async function createAgentServices(config, logger, agentEventBus, overrides, com
       stateManager,
       systemPromptManager,
       toolManager,
+      approvalManager,
       agentEventBus,
       storageManager,
       // Add storage manager to session services
@@ -173,6 +201,7 @@ async function createAgentServices(config, logger, agentEventBus, overrides, com
       // Add hook manager for hook execution
       mcpManager,
       // Add MCP manager for ChatSession
+      messageQueueStore,
       compactionStrategy: compactionStrategy ?? null,
       workspaceManager
       // Workspace context propagation
@@ -182,6 +211,9 @@ async function createAgentServices(config, logger, agentEventBus, overrides, com
       sessionTTL: config.sessions?.sessionTTL,
       ...overrides?.sessionLoggerFactory !== void 0 && {
         sessionLoggerFactory: overrides.sessionLoggerFactory
+      },
+      ...overrides?.languageModelFactory !== void 0 && {
+        languageModelFactory: overrides.languageModelFactory
       }
     },
     logger
@@ -208,5 +240,6 @@ async function createAgentServices(config, logger, agentEventBus, overrides, com
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createAgentServices
+  createAgentServices,
+  initializeAgentTelemetry
 });

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

@@ -18,6 +18,7 @@ import { MemoryManager } from '../memory/index.js';
 import { HookManager } from '../hooks/manager.js';
 import type { Hook } from '../hooks/types.js';
 import type { CompactionStrategy } from '../context/compaction/types.js';
+import type { LanguageModelFactory } from '../llm/services/types.js';
 /**
  * Type for the core agent services returned by createAgentServices
  */
@@ -48,20 +49,29 @@ export type ToolManagerFactoryOptions = {
 };
 export type ToolManagerFactory = (options: ToolManagerFactoryOptions) => ToolManager;
 export type ToolkitLoader = (toolkits: string[]) => Promise<Tool[]>;
+export type TelemetryBootstrapContext = Readonly<{
+    agentId: string;
+    config: AgentRuntimeSettings['telemetry'];
+    logger: Logger;
+}>;
+export type TelemetryBootstrap = (context: TelemetryBootstrapContext) => Promise<void> | void;
 export type InitializeServicesOptions = {
     sessionLoggerFactory?: import('../session/session-manager.js').SessionLoggerFactory;
+    languageModelFactory?: LanguageModelFactory;
     mcpAuthProviderFactory?: import('../mcp/types.js').McpAuthProviderFactory | null;
     toolManager?: ToolManager;
     toolManagerFactory?: ToolManagerFactory;
     storageManager?: StorageManager;
     hooks?: Hook[] | undefined;
+    telemetryBootstrap?: TelemetryBootstrap | undefined;
 };
+export declare function initializeAgentTelemetry(config: AgentRuntimeSettings, logger: Logger, telemetryBootstrap?: TelemetryBootstrap | undefined): Promise<void>;
 /**
  * Initializes all agent services from a validated configuration.
  * @param config The validated agent configuration object
  * @param logger Logger instance for this agent (dependency injection)
  * @param agentEventBus Pre-created event bus from DextoAgent constructor
- * @param overrides Optional service overrides for customization (e.g., sessionLoggerFactory)
+ * @param overrides Optional service overrides for customization (e.g., sessionLoggerFactory, languageModelFactory)
  * @returns All the initialized services required for a Dexto agent
  */
 export declare function createAgentServices(config: AgentRuntimeSettings, logger: Logger, agentEventBus: AgentEventBus, overrides?: InitializeServicesOptions, compactionStrategy?: CompactionStrategy | null | undefined): Promise<AgentServices>;

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

package/dist/utils/service-initializer.js

@@ -10,14 +10,28 @@ import { WorkspaceManager } from "../workspace/index.js";
 import { createAllowedToolsProvider } from "../tools/confirmation/allowed-tools-provider/factory.js";
 import { ResourceManager } from "../resources/manager.js";
 import { ApprovalManager } from "../approval/manager.js";
+import { SessionApprovalStore } from "../approval/session-approval-store.js";
 import { MemoryManager } from "../memory/index.js";
 import { HookManager } from "../hooks/manager.js";
-async function createAgentServices(config, logger, agentEventBus, overrides, compactionStrategy) {
+import { MessageQueueStore } from "../session/message-queue-store.js";
+import { SessionToolPreferencesStore } from "../tools/session-tool-preferences-store.js";
+async function initializeAgentTelemetry(config, logger, telemetryBootstrap) {
+  if (telemetryBootstrap) {
+    await telemetryBootstrap({
+      agentId: config.agentId,
+      config: config.telemetry,
+      logger
+    });
+    return;
+  }
   if (config.telemetry?.enabled) {
     const { Telemetry } = await import("../telemetry/telemetry.js");
     await Telemetry.init(config.telemetry);
     logger.debug("Telemetry initialized");
   }
+}
+async function createAgentServices(config, logger, agentEventBus, overrides, compactionStrategy) {
+  await initializeAgentTelemetry(config, logger, overrides?.telemetryBootstrap);
   logger.debug("Using pre-created agent event bus");
   logger.debug("Initializing storage manager");
   const storageManager = overrides?.storageManager ?? (() => {
@@ -30,6 +44,16 @@ async function createAgentServices(config, logger, agentEventBus, overrides, com
     await storageManager.connect();
   }
   logger.debug("Storage manager initialized", await storageManager.getInfo());
+  const sessionCacheTtlMs = config.sessions?.sessionTTL ?? 36e5;
+  const sessionApprovalStore = new SessionApprovalStore(storageManager, logger, {
+    cacheTtlMs: sessionCacheTtlMs
+  });
+  const sessionToolPreferencesStore = new SessionToolPreferencesStore(storageManager, logger, {
+    cacheTtlMs: sessionCacheTtlMs
+  });
+  const messageQueueStore = new MessageQueueStore(storageManager, logger, {
+    cacheTtlMs: sessionCacheTtlMs
+  });
   const workspaceManager = new WorkspaceManager(
     storageManager.getDatabase(),
     agentEventBus,
@@ -52,7 +76,8 @@ async function createAgentServices(config, logger, agentEventBus, overrides, com
         }
       }
     },
-    logger
+    logger,
+    sessionApprovalStore
   );
   logger.debug("Approval system initialized");
   const mcpManager = new MCPManager(logger, agentEventBus);
@@ -110,7 +135,8 @@ async function createAgentServices(config, logger, agentEventBus, overrides, com
     agentEventBus,
     config.permissions.toolPolicies,
     [],
-    logger
+    logger,
+    sessionToolPreferencesStore
   );
   await toolManager.setWorkspaceManager(workspaceManager);
   const mcpServerCount = Object.keys(config.mcpServers).length;
@@ -132,6 +158,7 @@ async function createAgentServices(config, logger, agentEventBus, overrides, com
       stateManager,
       systemPromptManager,
       toolManager,
+      approvalManager,
       agentEventBus,
       storageManager,
       // Add storage manager to session services
@@ -141,6 +168,7 @@ async function createAgentServices(config, logger, agentEventBus, overrides, com
       // Add hook manager for hook execution
       mcpManager,
       // Add MCP manager for ChatSession
+      messageQueueStore,
       compactionStrategy: compactionStrategy ?? null,
       workspaceManager
       // Workspace context propagation
@@ -150,6 +178,9 @@ async function createAgentServices(config, logger, agentEventBus, overrides, com
       sessionTTL: config.sessions?.sessionTTL,
       ...overrides?.sessionLoggerFactory !== void 0 && {
         sessionLoggerFactory: overrides.sessionLoggerFactory
+      },
+      ...overrides?.languageModelFactory !== void 0 && {
+        languageModelFactory: overrides.languageModelFactory
       }
     },
     logger
@@ -175,5 +206,6 @@ async function createAgentServices(config, logger, agentEventBus, overrides, com
   };
 }
 export {
-  createAgentServices
+  createAgentServices,
+  initializeAgentTelemetry
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dexto/core",
-  "version": "1.6.25",
+  "version": "1.6.26",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",