@dexto/core 1.2.4 → 1.2.5

package/dist/session/chat-session.cjs

@@ -24,7 +24,7 @@ module.exports = __toCommonJS(chat_session_exports);
 var import_factory = require("./history/factory.js");
 var import_factory2 = require("../llm/services/factory.js");
 var import_events = require("../events/index.js");
-var import_logger = require("../logger/index.js");
+var import_types = require("../logger/v2/types.js");
 var import_errors = require("../errors/index.js");
 var import_error_codes = require("../plugins/error-codes.js");
 class ChatSession {
@@ -38,13 +38,15 @@ class ChatSession {
    *
    * @param services - The shared services from the agent (state manager, prompt, client managers, etc.)
    * @param id - Unique identifier for this session
+   * @param logger - Logger instance for dependency injection
    */
-  constructor(services, id) {
+  constructor(services, id, logger) {
     this.services = services;
     this.id = id;
+    this.logger = logger.createChild(import_types.DextoLogComponent.SESSION);
     this.eventBus = new import_events.SessionEventBus();
     this.setupEventForwarding();
-    import_logger.logger.debug(`ChatSession ${this.id}: Created, awaiting initialization`);
+    this.logger.debug(`ChatSession ${this.id}: Created, awaiting initialization`);
   }
   /**
    * Session-scoped event emitter for handling conversation events.
@@ -53,9 +55,9 @@ class ChatSession {
    * to the global agent event bus.
    *
    * Events emitted include:
-   * - `llmservice:thinking` - AI model is processing
-   * - `llmservice:toolCall` - Tool execution requested
-   * - `llmservice:response` - Final response generated
+   * - `llm:thinking` - AI model is processing
+   * - `llm:tool-call` - Tool execution requested
+   * - `llm:response` - Final response generated
    */
   eventBus;
   /**
@@ -80,6 +82,7 @@ class ChatSession {
    * Calling cancel() aborts the in-flight LLM request and tool execution checks.
    */
   currentRunController = null;
+  logger;
   /**
    * Initialize the session services asynchronously.
    * This must be called after construction to set up the storage-backed services.
@@ -99,14 +102,14 @@ class ChatSession {
     import_events.SessionEventNames.forEach((eventName) => {
       const forwarder = (payload) => {
         const payloadWithSession = payload && typeof payload === "object" ? { ...payload, sessionId: this.id } : { sessionId: this.id };
-        import_logger.logger.silly(
-          `Forwarding session event ${eventName} to agent bus with session context: ${JSON.stringify(payloadWithSession, null, 2)}`
-        );
         this.services.agentEventBus.emit(eventName, payloadWithSession);
       };
       this.forwarders.set(eventName, forwarder);
       this.eventBus.on(eventName, forwarder);
     });
+    this.logger.debug(
+      `[setupEventForwarding] Event forwarding setup complete for session=${this.id}`
+    );
   }
   /**
    * Initializes session-specific services.
@@ -115,7 +118,8 @@ class ChatSession {
     const llmConfig = this.services.stateManager.getLLMConfig(this.id);
     this.historyProvider = (0, import_factory.createDatabaseHistoryProvider)(
       this.services.storageManager.getDatabase(),
-      this.id
+      this.id,
+      this.logger
     );
     this.llmService = (0, import_factory2.createLLMService)(
       llmConfig,
@@ -127,10 +131,12 @@ class ChatSession {
       this.eventBus,
       // Use session event bus
       this.id,
-      this.services.resourceManager
+      this.services.resourceManager,
       // Pass ResourceManager for blob storage
+      this.logger
+      // Pass logger for dependency injection
     );
-    import_logger.logger.debug(`ChatSession ${this.id}: Services initialized with storage`);
+    this.logger.debug(`ChatSession ${this.id}: Services initialized with storage`);
   }
   /**
    * Saves a blocked interaction to history when a plugin blocks execution.
@@ -156,7 +162,7 @@ class ChatSession {
     await this.historyProvider.saveMessage(userMessage);
     await this.historyProvider.saveMessage(assistantMessage);
     const llmConfig = this.services.stateManager.getLLMConfig(this.id);
-    this.eventBus.emit("llmservice:response", {
+    this.eventBus.emit("llm:response", {
       content: errorContent,
       provider: llmConfig.provider,
       model: llmConfig.model,
@@ -187,7 +193,7 @@ class ChatSession {
    * ```
    */
   async run(input, imageDataInput, fileDataInput, stream) {
-    import_logger.logger.debug(
+    this.logger.debug(
       `Running session ${this.id} | input.len=${input?.length ?? 0} | image=${imageDataInput ? imageDataInput.mimeType : "none"} | file=${fileDataInput ? `${fileDataInput.mimeType}:${fileDataInput.filename ?? "unknown"}` : "none"}`
     );
     this.currentRunController = new AbortController();
@@ -245,7 +251,7 @@ class ChatSession {
     } catch (error) {
       const aborted = error instanceof Error && error.name === "AbortError" || typeof error === "object" && error !== null && error.aborted === true;
       if (aborted) {
-        this.eventBus.emit("llmservice:error", {
+        this.eventBus.emit("llm:error", {
           error: new Error("Run cancelled"),
           context: "user_cancelled",
           recoverable: true
@@ -260,14 +266,20 @@ class ChatSession {
             imageDataInput,
             fileDataInput
           );
-          import_logger.logger.debug(`ChatSession ${this.id}: Saved blocked interaction to history`);
+          this.logger.debug(
+            `ChatSession ${this.id}: Saved blocked interaction to history`
+          );
         } catch (saveError) {
-          import_logger.logger.warn(
+          this.logger.warn(
             `Failed to save blocked interaction to history: ${saveError instanceof Error ? saveError.message : String(saveError)}`
           );
         }
         return error.message;
       }
+      const errortype = error instanceof Error ? "object" : "string";
+      this.logger.error(
+        `Error in ChatSession.run: errortype=${errortype}: ${error instanceof Error ? error.message : String(error)}`
+      );
       throw error;
     } finally {
       this.currentRunController = null;
@@ -303,7 +315,7 @@ class ChatSession {
    * This method:
    * 1. Clears all messages from the session's conversation history
    * 2. Removes persisted history from the storage provider
-   * 3. Emits a `dexto:conversationReset` event with session context
+   * 3. Emits a `session:reset` event with session context
    *
    * The system prompt and session configuration remain unchanged.
    * Only the conversation messages are cleared.
@@ -320,7 +332,7 @@ class ChatSession {
    */
   async reset() {
     await this.historyProvider.clearHistory();
-    this.services.agentEventBus.emit("dexto:conversationReset", {
+    this.services.agentEventBus.emit("session:reset", {
       sessionId: this.id
     });
   }
@@ -373,19 +385,20 @@ class ChatSession {
         this.eventBus,
         // Use session event bus
         this.id,
-        this.services.resourceManager
+        this.services.resourceManager,
+        this.logger
       );
       this.llmService = newLLMService;
-      import_logger.logger.info(
+      this.logger.info(
         `ChatSession ${this.id}: LLM switched to ${newLLMConfig.provider}/${newLLMConfig.model}`
       );
-      this.eventBus.emit("llmservice:switched", {
+      this.eventBus.emit("llm:switched", {
         newConfig: newLLMConfig,
         router,
         historyRetained: true
       });
     } catch (error) {
-      import_logger.logger.error(
+      this.logger.error(
         `Error during ChatSession.switchLLM for session ${this.id}: ${error instanceof Error ? error.message : String(error)}`
       );
       throw error;
@@ -399,11 +412,11 @@ class ChatSession {
   async cleanup() {
     try {
       this.dispose();
-      import_logger.logger.debug(
+      this.logger.debug(
         `ChatSession ${this.id}: Memory cleanup completed (chat history preserved)`
       );
     } catch (error) {
-      import_logger.logger.error(
+      this.logger.error(
         `Error during ChatSession cleanup for session ${this.id}: ${error instanceof Error ? error.message : String(error)}`
       );
       throw error;
@@ -417,12 +430,12 @@ class ChatSession {
    * Without this cleanup, sessions would remain in memory due to listener references.
    */
   dispose() {
-    import_logger.logger.debug(`Disposing session ${this.id} - cleaning up event listeners`);
+    this.logger.debug(`Disposing session ${this.id} - cleaning up event listeners`);
     this.forwarders.forEach((forwarder, eventName) => {
       this.eventBus.off(eventName, forwarder);
     });
     this.forwarders.clear();
-    import_logger.logger.debug(`Session ${this.id} disposed successfully`);
+    this.logger.debug(`Session ${this.id} disposed successfully`);
   }
   /**
    * Cancel the currently running turn for this session, if any.

package/dist/session/chat-session.d.ts

@@ -8,6 +8,7 @@ import type { StorageManager } from '../storage/index.js';
 import type { PluginManager } from '../plugins/manager.js';
 import type { MCPManager } from '../mcp/manager.js';
 import { SessionEventBus, AgentEventBus } from '../events/index.js';
+import type { IDextoLogger } from '../logger/v2/types.js';
 import type { InternalMessage } from '../context/types.js';
 /**
  * Represents an isolated conversation session within a Dexto agent.
@@ -27,7 +28,7 @@ import type { InternalMessage } from '../context/types.js';
  * ## Event Handling
  *
  * Each session has its own event bus that emits standard Dexto events:
- * - `llmservice:*` events (thinking, toolCall, response, etc.)
+ * - `llm:*` events (thinking, toolCall, response, etc.)
  *
  * Session events are forwarded to the global agent event bus with session prefixes.
  *
@@ -38,7 +39,7 @@ import type { InternalMessage } from '../context/types.js';
  * const session = agent.createSession('user-123');
  *
  * // Listen for session events
- * session.eventBus.on('llmservice:response', (payload) => {
+ * session.eventBus.on('llm:response', (payload) => {
  *   console.log('Session response:', payload.content);
  * });
  *
@@ -63,9 +64,9 @@ export declare class ChatSession {
      * to the global agent event bus.
      *
      * Events emitted include:
-     * - `llmservice:thinking` - AI model is processing
-     * - `llmservice:toolCall` - Tool execution requested
-     * - `llmservice:response` - Final response generated
+     * - `llm:thinking` - AI model is processing
+     * - `llm:tool-call` - Tool execution requested
+     * - `llm:response` - Final response generated
      */
     readonly eventBus: SessionEventBus;
     /**
@@ -90,6 +91,7 @@ export declare class ChatSession {
      * Calling cancel() aborts the in-flight LLM request and tool execution checks.
      */
     private currentRunController;
+    private logger;
     /**
      * Creates a new ChatSession instance.
      *
@@ -100,6 +102,7 @@ export declare class ChatSession {
      *
      * @param services - The shared services from the agent (state manager, prompt, client managers, etc.)
      * @param id - Unique identifier for this session
+     * @param logger - Logger instance for dependency injection
      */
     constructor(services: {
         stateManager: AgentStateManager;
@@ -111,7 +114,7 @@ export declare class ChatSession {
         pluginManager: PluginManager;
         mcpManager: MCPManager;
         sessionManager: import('./session-manager.js').SessionManager;
-    }, id: string);
+    }, id: string, logger: IDextoLogger);
     /**
      * Initialize the session services asynchronously.
      * This must be called after construction to set up the storage-backed services.
@@ -201,7 +204,7 @@ export declare class ChatSession {
      * This method:
      * 1. Clears all messages from the session's conversation history
      * 2. Removes persisted history from the storage provider
-     * 3. Emits a `dexto:conversationReset` event with session context
+     * 3. Emits a `session:reset` event with session context
      *
      * The system prompt and session configuration remain unchanged.
      * Only the conversation messages are cleared.

package/dist/session/chat-session.d.ts.map

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

package/dist/session/chat-session.js

@@ -5,7 +5,7 @@ import {
   SessionEventBus,
   SessionEventNames
 } from "../events/index.js";
-import { logger } from "../logger/index.js";
+import { DextoLogComponent } from "../logger/v2/types.js";
 import { DextoRuntimeError, ErrorScope, ErrorType } from "../errors/index.js";
 import { PluginErrorCode } from "../plugins/error-codes.js";
 class ChatSession {
@@ -19,13 +19,15 @@ class ChatSession {
    *
    * @param services - The shared services from the agent (state manager, prompt, client managers, etc.)
    * @param id - Unique identifier for this session
+   * @param logger - Logger instance for dependency injection
    */
-  constructor(services, id) {
+  constructor(services, id, logger) {
     this.services = services;
     this.id = id;
+    this.logger = logger.createChild(DextoLogComponent.SESSION);
     this.eventBus = new SessionEventBus();
     this.setupEventForwarding();
-    logger.debug(`ChatSession ${this.id}: Created, awaiting initialization`);
+    this.logger.debug(`ChatSession ${this.id}: Created, awaiting initialization`);
   }
   /**
    * Session-scoped event emitter for handling conversation events.
@@ -34,9 +36,9 @@ class ChatSession {
    * to the global agent event bus.
    *
    * Events emitted include:
-   * - `llmservice:thinking` - AI model is processing
-   * - `llmservice:toolCall` - Tool execution requested
-   * - `llmservice:response` - Final response generated
+   * - `llm:thinking` - AI model is processing
+   * - `llm:tool-call` - Tool execution requested
+   * - `llm:response` - Final response generated
    */
   eventBus;
   /**
@@ -61,6 +63,7 @@ class ChatSession {
    * Calling cancel() aborts the in-flight LLM request and tool execution checks.
    */
   currentRunController = null;
+  logger;
   /**
    * Initialize the session services asynchronously.
    * This must be called after construction to set up the storage-backed services.
@@ -80,14 +83,14 @@ class ChatSession {
     SessionEventNames.forEach((eventName) => {
       const forwarder = (payload) => {
         const payloadWithSession = payload && typeof payload === "object" ? { ...payload, sessionId: this.id } : { sessionId: this.id };
-        logger.silly(
-          `Forwarding session event ${eventName} to agent bus with session context: ${JSON.stringify(payloadWithSession, null, 2)}`
-        );
         this.services.agentEventBus.emit(eventName, payloadWithSession);
       };
       this.forwarders.set(eventName, forwarder);
       this.eventBus.on(eventName, forwarder);
     });
+    this.logger.debug(
+      `[setupEventForwarding] Event forwarding setup complete for session=${this.id}`
+    );
   }
   /**
    * Initializes session-specific services.
@@ -96,7 +99,8 @@ class ChatSession {
     const llmConfig = this.services.stateManager.getLLMConfig(this.id);
     this.historyProvider = createDatabaseHistoryProvider(
       this.services.storageManager.getDatabase(),
-      this.id
+      this.id,
+      this.logger
     );
     this.llmService = createLLMService(
       llmConfig,
@@ -108,10 +112,12 @@ class ChatSession {
       this.eventBus,
       // Use session event bus
       this.id,
-      this.services.resourceManager
+      this.services.resourceManager,
       // Pass ResourceManager for blob storage
+      this.logger
+      // Pass logger for dependency injection
     );
-    logger.debug(`ChatSession ${this.id}: Services initialized with storage`);
+    this.logger.debug(`ChatSession ${this.id}: Services initialized with storage`);
   }
   /**
    * Saves a blocked interaction to history when a plugin blocks execution.
@@ -137,7 +143,7 @@ class ChatSession {
     await this.historyProvider.saveMessage(userMessage);
     await this.historyProvider.saveMessage(assistantMessage);
     const llmConfig = this.services.stateManager.getLLMConfig(this.id);
-    this.eventBus.emit("llmservice:response", {
+    this.eventBus.emit("llm:response", {
       content: errorContent,
       provider: llmConfig.provider,
       model: llmConfig.model,
@@ -168,7 +174,7 @@ class ChatSession {
    * ```
    */
   async run(input, imageDataInput, fileDataInput, stream) {
-    logger.debug(
+    this.logger.debug(
       `Running session ${this.id} | input.len=${input?.length ?? 0} | image=${imageDataInput ? imageDataInput.mimeType : "none"} | file=${fileDataInput ? `${fileDataInput.mimeType}:${fileDataInput.filename ?? "unknown"}` : "none"}`
     );
     this.currentRunController = new AbortController();
@@ -226,7 +232,7 @@ class ChatSession {
     } catch (error) {
       const aborted = error instanceof Error && error.name === "AbortError" || typeof error === "object" && error !== null && error.aborted === true;
       if (aborted) {
-        this.eventBus.emit("llmservice:error", {
+        this.eventBus.emit("llm:error", {
           error: new Error("Run cancelled"),
           context: "user_cancelled",
           recoverable: true
@@ -241,14 +247,20 @@ class ChatSession {
             imageDataInput,
             fileDataInput
           );
-          logger.debug(`ChatSession ${this.id}: Saved blocked interaction to history`);
+          this.logger.debug(
+            `ChatSession ${this.id}: Saved blocked interaction to history`
+          );
         } catch (saveError) {
-          logger.warn(
+          this.logger.warn(
             `Failed to save blocked interaction to history: ${saveError instanceof Error ? saveError.message : String(saveError)}`
           );
         }
         return error.message;
       }
+      const errortype = error instanceof Error ? "object" : "string";
+      this.logger.error(
+        `Error in ChatSession.run: errortype=${errortype}: ${error instanceof Error ? error.message : String(error)}`
+      );
       throw error;
     } finally {
       this.currentRunController = null;
@@ -284,7 +296,7 @@ class ChatSession {
    * This method:
    * 1. Clears all messages from the session's conversation history
    * 2. Removes persisted history from the storage provider
-   * 3. Emits a `dexto:conversationReset` event with session context
+   * 3. Emits a `session:reset` event with session context
    *
    * The system prompt and session configuration remain unchanged.
    * Only the conversation messages are cleared.
@@ -301,7 +313,7 @@ class ChatSession {
    */
   async reset() {
     await this.historyProvider.clearHistory();
-    this.services.agentEventBus.emit("dexto:conversationReset", {
+    this.services.agentEventBus.emit("session:reset", {
       sessionId: this.id
     });
   }
@@ -354,19 +366,20 @@ class ChatSession {
         this.eventBus,
         // Use session event bus
         this.id,
-        this.services.resourceManager
+        this.services.resourceManager,
+        this.logger
       );
       this.llmService = newLLMService;
-      logger.info(
+      this.logger.info(
         `ChatSession ${this.id}: LLM switched to ${newLLMConfig.provider}/${newLLMConfig.model}`
       );
-      this.eventBus.emit("llmservice:switched", {
+      this.eventBus.emit("llm:switched", {
         newConfig: newLLMConfig,
         router,
         historyRetained: true
       });
     } catch (error) {
-      logger.error(
+      this.logger.error(
         `Error during ChatSession.switchLLM for session ${this.id}: ${error instanceof Error ? error.message : String(error)}`
       );
       throw error;
@@ -380,11 +393,11 @@ class ChatSession {
   async cleanup() {
     try {
       this.dispose();
-      logger.debug(
+      this.logger.debug(
         `ChatSession ${this.id}: Memory cleanup completed (chat history preserved)`
       );
     } catch (error) {
-      logger.error(
+      this.logger.error(
         `Error during ChatSession cleanup for session ${this.id}: ${error instanceof Error ? error.message : String(error)}`
       );
       throw error;
@@ -398,12 +411,12 @@ class ChatSession {
    * Without this cleanup, sessions would remain in memory due to listener references.
    */
   dispose() {
-    logger.debug(`Disposing session ${this.id} - cleaning up event listeners`);
+    this.logger.debug(`Disposing session ${this.id} - cleaning up event listeners`);
     this.forwarders.forEach((forwarder, eventName) => {
       this.eventBus.off(eventName, forwarder);
     });
     this.forwarders.clear();
-    logger.debug(`Session ${this.id} disposed successfully`);
+    this.logger.debug(`Session ${this.id} disposed successfully`);
   }
   /**
    * Cancel the currently running turn for this session, if any.

package/dist/session/history/database.cjs

@@ -21,23 +21,25 @@ __export(database_exports, {
   DatabaseHistoryProvider: () => DatabaseHistoryProvider
 });
 module.exports = __toCommonJS(database_exports);
-var import_logger = require("../../logger/index.cjs");
+var import_types = require("../../logger/v2/types.cjs");
 var import_errors = require("../errors.js");
 class DatabaseHistoryProvider {
-  constructor(sessionId, database) {
+  constructor(sessionId, database, logger) {
     this.sessionId = sessionId;
     this.database = database;
+    this.logger = logger.createChild(import_types.DextoLogComponent.SESSION);
   }
+  logger;
   async getHistory() {
     const key = this.getMessagesKey();
     try {
       const messages = await this.database.getRange(key, 0, 1e3);
-      import_logger.logger.debug(
+      this.logger.debug(
         `DatabaseHistoryProvider: Retrieved ${messages.length} messages for session ${this.sessionId}`
       );
       return messages;
     } catch (error) {
-      import_logger.logger.error(
+      this.logger.error(
         `DatabaseHistoryProvider: Error retrieving messages for session ${this.sessionId}: ${error instanceof Error ? error.message : String(error)}`
       );
       return [];
@@ -55,12 +57,15 @@ class DatabaseHistoryProvider {
           contentPreview = `[${message.content.length} parts]`;
         }
       }
-      import_logger.logger.debug(`DatabaseHistoryProvider: Saved message for session ${this.sessionId}`, {
-        role: message.role,
-        content: contentPreview
-      });
+      this.logger.debug(
+        `DatabaseHistoryProvider: Saved message for session ${this.sessionId}`,
+        {
+          role: message.role,
+          content: contentPreview
+        }
+      );
     } catch (error) {
-      import_logger.logger.error(
+      this.logger.error(
         `DatabaseHistoryProvider: Error saving message for session ${this.sessionId}: ${error instanceof Error ? error.message : String(error)}`
       );
       throw import_errors.SessionError.storageFailed(
@@ -74,9 +79,11 @@ class DatabaseHistoryProvider {
     const key = this.getMessagesKey();
     try {
       await this.database.delete(key);
-      import_logger.logger.debug(`DatabaseHistoryProvider: Cleared history for session ${this.sessionId}`);
+      this.logger.debug(
+        `DatabaseHistoryProvider: Cleared history for session ${this.sessionId}`
+      );
     } catch (error) {
-      import_logger.logger.error(
+      this.logger.error(
         `DatabaseHistoryProvider: Error clearing session ${this.sessionId}: ${error instanceof Error ? error.message : String(error)}`
       );
       throw import_errors.SessionError.resetFailed(

package/dist/session/history/database.d.ts

@@ -1,3 +1,4 @@
+import type { IDextoLogger } from '../../logger/v2/types.js';
 import type { Database } from '../../storage/types.js';
 import type { InternalMessage } from '../../context/types.js';
 import type { IConversationHistoryProvider } from './types.js';
@@ -16,7 +17,8 @@ import type { IConversationHistoryProvider } from './types.js';
 export declare class DatabaseHistoryProvider implements IConversationHistoryProvider {
     private sessionId;
     private database;
-    constructor(sessionId: string, database: Database);
+    private logger;
+    constructor(sessionId: string, database: Database, logger: IDextoLogger);
     getHistory(): Promise<InternalMessage[]>;
     saveMessage(message: InternalMessage): Promise<void>;
     clearHistory(): Promise<void>;

package/dist/session/history/database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../../src/session/history/database.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,YAAY,CAAC;AAE/D;;;;;;;;;;;GAWG;AACH,qBAAa,uBAAwB,YAAW,4BAA4B;IAEpE,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ;gBADR,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,QAAQ;IAGxB,UAAU,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAmBxC,WAAW,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAkCpD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBnC,OAAO,CAAC,cAAc;CAGzB"}
+{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../../src/session/history/database.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,YAAY,CAAC;AAE/D;;;;;;;;;;;GAWG;AACH,qBAAa,uBAAwB,YAAW,4BAA4B;IAIpE,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ;IAJpB,OAAO,CAAC,MAAM,CAAe;gBAGjB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,QAAQ,EAC1B,MAAM,EAAE,YAAY;IAKlB,UAAU,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAmBxC,WAAW,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAqCpD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBnC,OAAO,CAAC,cAAc;CAGzB"}

package/dist/session/history/database.js

@@ -1,21 +1,23 @@
 import "../../chunk-C6A6W6XS.js";
-import { logger } from "../../logger/index.js";
+import { DextoLogComponent } from "../../logger/v2/types.js";
 import { SessionError } from "../errors.js";
 class DatabaseHistoryProvider {
-  constructor(sessionId, database) {
+  constructor(sessionId, database, logger) {
     this.sessionId = sessionId;
     this.database = database;
+    this.logger = logger.createChild(DextoLogComponent.SESSION);
   }
+  logger;
   async getHistory() {
     const key = this.getMessagesKey();
     try {
       const messages = await this.database.getRange(key, 0, 1e3);
-      logger.debug(
+      this.logger.debug(
         `DatabaseHistoryProvider: Retrieved ${messages.length} messages for session ${this.sessionId}`
       );
       return messages;
     } catch (error) {
-      logger.error(
+      this.logger.error(
         `DatabaseHistoryProvider: Error retrieving messages for session ${this.sessionId}: ${error instanceof Error ? error.message : String(error)}`
       );
       return [];
@@ -33,12 +35,15 @@ class DatabaseHistoryProvider {
           contentPreview = `[${message.content.length} parts]`;
         }
       }
-      logger.debug(`DatabaseHistoryProvider: Saved message for session ${this.sessionId}`, {
-        role: message.role,
-        content: contentPreview
-      });
+      this.logger.debug(
+        `DatabaseHistoryProvider: Saved message for session ${this.sessionId}`,
+        {
+          role: message.role,
+          content: contentPreview
+        }
+      );
     } catch (error) {
-      logger.error(
+      this.logger.error(
         `DatabaseHistoryProvider: Error saving message for session ${this.sessionId}: ${error instanceof Error ? error.message : String(error)}`
       );
       throw SessionError.storageFailed(
@@ -52,9 +57,11 @@ class DatabaseHistoryProvider {
     const key = this.getMessagesKey();
     try {
       await this.database.delete(key);
-      logger.debug(`DatabaseHistoryProvider: Cleared history for session ${this.sessionId}`);
+      this.logger.debug(
+        `DatabaseHistoryProvider: Cleared history for session ${this.sessionId}`
+      );
     } catch (error) {
-      logger.error(
+      this.logger.error(
         `DatabaseHistoryProvider: Error clearing session ${this.sessionId}: ${error instanceof Error ? error.message : String(error)}`
       );
       throw SessionError.resetFailed(

package/dist/session/history/factory.cjs

@@ -22,8 +22,8 @@ __export(factory_exports, {
 });
 module.exports = __toCommonJS(factory_exports);
 var import_database = require("./database.js");
-function createDatabaseHistoryProvider(database, sessionId) {
-  return new import_database.DatabaseHistoryProvider(sessionId, database);
+function createDatabaseHistoryProvider(database, sessionId, logger) {
+  return new import_database.DatabaseHistoryProvider(sessionId, database, logger);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {