@dexto/core 1.7.1 → 1.8.0

package/dist/session/session-manager.cjs

@@ -35,6 +35,7 @@ var import_crypto = require("crypto");
 var import_chat_session = require("./chat-session.js");
 var import_types = require("../logger/v2/types.js");
 var import_errors = require("./errors.js");
+var import_usage_metadata = require("../llm/usage-metadata.js");
 var import_zod = require("zod");
 var import_schemas = require("../systemPrompt/schemas.js");
 function defaultSessionLoggerFactory(options) {
@@ -52,7 +53,6 @@ class SessionManager {
   sessions = /* @__PURE__ */ new Map();
   maxSessions;
   sessionTTL;
-  static MESSAGE_QUEUE_KEY_PREFIX = "session-message-queue:";
   initialized = false;
   cleanupInterval;
   initializationPromise;
@@ -61,7 +61,6 @@ class SessionManager {
   // Per-session mutex for any SessionData read-modify-write path.
   sessionDataLocks = /* @__PURE__ */ new Map();
   logger;
-  static FORK_HISTORY_BATCH_SIZE = 500;
   static FORK_ID_GENERATION_MAX_ATTEMPTS = 5;
   static FORK_TITLE_PREFIX = "Fork: ";
   static FORK_PARENT_ID_PREVIEW_LENGTH = 8;
@@ -104,23 +103,21 @@ class SessionManager {
    */
   async restoreSessionsFromStorage() {
     try {
-      const sessionKeys = await this.services.storageManager.getDatabase().list("session:");
-      this.logger.debug(`Found ${sessionKeys.length} persisted sessions to restore`);
-      for (const sessionKey of sessionKeys) {
-        const sessionId = sessionKey.replace("session:", "");
-        const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+      const sessionIds = await this.services.sessionStore.listSessionIds();
+      this.logger.debug(`Found ${sessionIds.length} persisted sessions to restore`);
+      for (const sessionId of sessionIds) {
+        const sessionData = await this.services.sessionStore.getSession({ sessionId });
         if (sessionData) {
           const now = Date.now();
           const lastActivity = sessionData.lastActivity;
           if (now - lastActivity <= this.sessionTTL) {
             this.logger.debug(`Session ${sessionId} restored from storage`);
           } else {
-            await Promise.all([
-              this.services.storageManager.getDatabase().delete(sessionKey),
-              this.services.storageManager.getCache().delete(sessionKey),
-              this.deleteSessionInteractionState(sessionId)
-            ]);
-            this.logger.debug(`Expired session ${sessionId} cleaned up during restore`);
+            await this.services.sessionStore.evictSession({ sessionId });
+            this.evictSessionInteractionState(sessionId);
+            this.logger.debug(
+              `Expired session ${sessionId} evicted during restore; durable history preserved`
+            );
           }
         }
       }
@@ -132,18 +129,19 @@ class SessionManager {
   }
   async clearPersistedQueuedMessages(reason) {
     try {
-      const queueKeys = await this.services.storageManager.getDatabase().list(SessionManager.MESSAGE_QUEUE_KEY_PREFIX);
-      if (queueKeys.length === 0) {
+      const steerSessionIds = await this.services.steerQueueStore.listSessionIds();
+      const followUpSessionIds = await this.services.followUpQueueStore.listSessionIds();
+      const sessionIds = Array.from(/* @__PURE__ */ new Set([...steerSessionIds, ...followUpSessionIds]));
+      if (sessionIds.length === 0) {
         return;
       }
       await Promise.all(
-        queueKeys.map(
-          (key) => this.services.messageQueueStore.delete(
-            key.slice(SessionManager.MESSAGE_QUEUE_KEY_PREFIX.length)
-          )
-        )
+        sessionIds.flatMap((sessionId) => [
+          this.services.steerQueueStore.delete({ sessionId }),
+          this.services.followUpQueueStore.delete({ sessionId })
+        ])
       );
-      const message = `${reason === "startup" ? "Cleared stale queued follow-up state from previous agent run" : "Cleared queued follow-up state during agent shutdown"} (${queueKeys.length} session bucket(s))`;
+      const message = `${reason === "startup" ? "Cleared stale pending input state from previous agent run" : "Cleared pending input state during agent shutdown"} (${sessionIds.length} session bucket(s))`;
       if (reason === "startup") {
         this.logger.info(message);
       } else {
@@ -204,21 +202,17 @@ class SessionManager {
    */
   async forkSession(parentSessionId) {
     await this.ensureInitialized();
-    const database = this.services.storageManager.getDatabase();
-    const cache = this.services.storageManager.getCache();
-    const parentSessionKey = `session:${parentSessionId}`;
-    const parentMessagesKey = `messages:${parentSessionId}`;
-    const parentSessionData = await database.get(parentSessionKey);
+    const parentSessionData = await this.services.sessionStore.getSession({
+      sessionId: parentSessionId
+    });
     if (!parentSessionData) {
       throw import_errors.SessionError.notFound(parentSessionId);
     }
-    const activeSessionKeys = await database.list("session:");
-    if (activeSessionKeys.length >= this.maxSessions) {
-      throw import_errors.SessionError.maxSessionsExceeded(activeSessionKeys.length, this.maxSessions);
+    const activeSessionIds = await this.services.sessionStore.listSessionIds();
+    if (activeSessionIds.length >= this.maxSessions) {
+      throw import_errors.SessionError.maxSessionsExceeded(activeSessionIds.length, this.maxSessions);
     }
     const childSessionId = await this.generateForkSessionId();
-    const childSessionKey = `session:${childSessionId}`;
-    const childMessagesKey = `messages:${childSessionId}`;
     const now = Date.now();
     const childTitle = this.buildForkTitle(parentSessionData, parentSessionId);
     const childSessionData = {
@@ -245,16 +239,19 @@ class SessionManager {
       }
     };
     try {
-      await database.set(childSessionKey, childSessionData);
-      await this.copySessionHistory(parentMessagesKey, childMessagesKey);
+      await this.services.sessionStore.saveSession({
+        sessionId: childSessionId,
+        session: childSessionData,
+        ttlSeconds: this.sessionTTL / 1e3
+      });
+      await this.copySessionHistory(parentSessionId, childSessionId);
       const childSession = await this.createSession(childSessionId);
       this.logger.info(`Forked session '${parentSessionId}' into child '${childSessionId}'`);
       return childSession;
     } catch (error) {
       await Promise.allSettled([
-        database.delete(childSessionKey),
-        database.delete(childMessagesKey),
-        cache.delete(childSessionKey)
+        this.services.sessionStore.deleteSession({ sessionId: childSessionId }),
+        this.services.conversationStore.clearMessages({ sessionId: childSessionId })
       ]);
       const inMemorySession = this.sessions.get(childSessionId);
       if (inMemorySession) {
@@ -275,13 +272,14 @@ class SessionManager {
     return `${prefix}${baseTitle}`;
   }
   async generateForkSessionId() {
-    const database = this.services.storageManager.getDatabase();
     for (let attempt = 0; attempt < SessionManager.FORK_ID_GENERATION_MAX_ATTEMPTS; attempt++) {
       const candidateId = (0, import_crypto.randomUUID)();
       if (this.sessions.has(candidateId) || this.pendingCreations.has(candidateId)) {
         continue;
       }
-      const existing = await database.get(`session:${candidateId}`);
+      const existing = await this.services.sessionStore.getSession({
+        sessionId: candidateId
+      });
       if (!existing) {
         return candidateId;
       }
@@ -291,25 +289,15 @@ class SessionManager {
       "failed to generate unique child session ID"
     );
   }
-  async copySessionHistory(parentMessagesKey, childMessagesKey) {
-    const database = this.services.storageManager.getDatabase();
-    let offset = 0;
-    while (true) {
-      const batch = await database.getRange(
-        parentMessagesKey,
-        offset,
-        SessionManager.FORK_HISTORY_BATCH_SIZE
-      );
-      if (batch.length === 0) {
-        return;
-      }
-      for (const message of batch) {
-        await database.append(childMessagesKey, message);
-      }
-      offset += batch.length;
-      if (batch.length < SessionManager.FORK_HISTORY_BATCH_SIZE) {
-        return;
-      }
+  async copySessionHistory(parentSessionId, childSessionId) {
+    const messages = await this.services.conversationStore.listMessages({
+      sessionId: parentSessionId
+    });
+    for (const message of messages) {
+      await this.services.conversationStore.saveMessage({
+        sessionId: childSessionId,
+        message
+      });
     }
   }
   /**
@@ -318,8 +306,7 @@ class SessionManager {
    */
   async createSessionInternal(id) {
     await this.cleanupExpiredSessions();
-    const sessionKey = `session:${id}`;
-    const existingMetadata = await this.services.storageManager.getDatabase().get(sessionKey);
+    const existingMetadata = await this.services.sessionStore.getSession({ sessionId: id });
     if (existingMetadata) {
       await this.updateSessionActivity(id);
       const runtimeConfig = this.services.stateManager.getRuntimeConfig();
@@ -329,7 +316,7 @@ class SessionManager {
         agentId,
         sessionId: id
       });
-      const sessionData2 = await this.services.storageManager.getDatabase().get(sessionKey);
+      const sessionData2 = await this.services.sessionStore.getSession({ sessionId: id });
       if (sessionData2?.llmOverride) {
         const { resolveApiKeyForProvider } = await import("../utils/api-key-resolver.js");
         const apiKey = resolveApiKeyForProvider(sessionData2.llmOverride.provider);
@@ -354,7 +341,7 @@ class SessionManager {
       this.logger.info(`Restored session from storage: ${id}`);
       return session2;
     }
-    const activeSessionKeys = await this.services.storageManager.getDatabase().list("session:");
+    const activeSessionKeys = await this.services.sessionStore.listSessionIds();
     if (activeSessionKeys.length >= this.maxSessions) {
       throw import_errors.SessionError.maxSessionsExceeded(activeSessionKeys.length, this.maxSessions);
     }
@@ -368,7 +355,11 @@ class SessionManager {
       ...workspace?.id !== void 0 && { workspaceId: workspace.id }
     };
     try {
-      await this.services.storageManager.getDatabase().set(sessionKey, sessionData);
+      await this.services.sessionStore.saveSession({
+        sessionId: id,
+        session: sessionData,
+        ttlSeconds: this.sessionTTL / 1e3
+      });
     } catch (error) {
       this.logger.error(`Failed to store session metadata for ${id}:`, {
         error: error instanceof Error ? error.message : String(error)
@@ -387,15 +378,13 @@ class SessionManager {
       session = new import_chat_session.ChatSession(this.getChatSessionServices(), id, sessionLogger);
       await session.init();
       this.sessions.set(id, session);
-      await this.services.storageManager.getCache().set(sessionKey, sessionData, this.sessionTTL / 1e3);
       this.logger.info(`Created new session: ${id}`);
       return session;
     } catch (error) {
       this.logger.error(
         `Failed to initialize session ${id}: ${error instanceof Error ? error.message : String(error)}`
       );
-      await this.services.storageManager.getDatabase().delete(sessionKey);
-      await this.services.storageManager.getCache().delete(sessionKey);
+      await this.services.sessionStore.deleteSession({ sessionId: id });
       const reason = error instanceof Error ? error.message : "unknown error";
       throw import_errors.SessionError.initializationFailed(id, reason);
     }
@@ -416,8 +405,7 @@ class SessionManager {
       return this.sessions.get(sessionId);
     }
     if (restoreFromStorage) {
-      const sessionKey = `session:${sessionId}`;
-      const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+      const sessionData = await this.services.sessionStore.getSession({ sessionId });
       if (sessionData) {
         const runtimeConfig = this.services.stateManager.getRuntimeConfig();
         const agentId = runtimeConfig.agentCard?.name ?? runtimeConfig.agentId;
@@ -469,8 +457,7 @@ class SessionManager {
       await session.cleanup();
       this.sessions.delete(sessionId);
     }
-    const sessionKey = `session:${sessionId}`;
-    await this.services.storageManager.getCache().delete(sessionKey);
+    await this.services.sessionStore.evictSession({ sessionId });
     this.evictSessionInteractionState(sessionId);
     this.logger.debug(
       `Ended session (removed from memory, chat history preserved): ${sessionId}`
@@ -489,12 +476,9 @@ class SessionManager {
       await session.cleanup();
       this.sessions.delete(sessionId);
     }
-    const sessionKey = `session:${sessionId}`;
-    await this.services.storageManager.getDatabase().delete(sessionKey);
-    await this.services.storageManager.getCache().delete(sessionKey);
+    await this.services.sessionStore.deleteSession({ sessionId });
     await this.deleteSessionInteractionState(sessionId);
-    const messagesKey = `messages:${sessionId}`;
-    await this.services.storageManager.getDatabase().delete(messagesKey);
+    await this.services.conversationStore.clearMessages({ sessionId });
     this.logger.debug(`Deleted session and conversation history: ${sessionId}`);
   }
   /**
@@ -510,7 +494,7 @@ class SessionManager {
       throw import_errors.SessionError.notFound(sessionId);
     }
     await session.reset();
-    await session.clearMessageQueue();
+    await session.clearPendingInput();
     await Promise.all([
       this.services.toolManager.deleteSessionState(sessionId),
       this.services.approvalManager.deleteSessionState(sessionId)
@@ -519,15 +503,15 @@ class SessionManager {
       this.services.stateManager.clearSessionOverride(sessionId);
       await session.switchLLM(this.services.stateManager.getRuntimeConfig().llm);
     }
-    await this.runWithSessionDataLock(sessionId, async (sessionKey) => {
-      const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+    await this.runWithSessionDataLock(sessionId, async () => {
+      const sessionData = await this.services.sessionStore.getSession({ sessionId });
       if (!sessionData) {
         return;
       }
       sessionData.messageCount = 0;
       sessionData.lastActivity = Date.now();
       delete sessionData.llmOverride;
-      await this.persistSessionData(sessionKey, sessionData);
+      await this.persistSessionData(sessionId, sessionData);
     });
     this.logger.debug(`Reset session conversation: ${sessionId}`);
   }
@@ -538,8 +522,7 @@ class SessionManager {
    */
   async listSessions() {
     await this.ensureInitialized();
-    const sessionKeys = await this.services.storageManager.getDatabase().list("session:");
-    return sessionKeys.map((key) => key.replace("session:", ""));
+    return await this.services.sessionStore.listSessionIds();
   }
   /**
    * Gets metadata for a specific session.
@@ -549,8 +532,7 @@ class SessionManager {
    */
   async getSessionMetadata(sessionId) {
     await this.ensureInitialized();
-    const sessionKey = `session:${sessionId}`;
-    const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+    const sessionData = await this.services.sessionStore.getSession({ sessionId });
     if (!sessionData) return void 0;
     return {
       createdAt: sessionData.createdAt,
@@ -571,8 +553,7 @@ class SessionManager {
   }
   async getSessionSystemPromptContributors(sessionId) {
     await this.ensureInitialized();
-    const sessionKey = `session:${sessionId}`;
-    const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+    const sessionData = await this.services.sessionStore.getSession({ sessionId });
     if (!sessionData) {
       throw import_errors.SessionError.notFound(sessionId);
     }
@@ -580,8 +561,8 @@ class SessionManager {
   }
   async upsertSessionSystemPromptContributor(sessionId, contributor) {
     await this.ensureInitialized();
-    return await this.runWithSessionDataLock(sessionId, async (sessionKey) => {
-      const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+    return await this.runWithSessionDataLock(sessionId, async () => {
+      const sessionData = await this.services.sessionStore.getSession({ sessionId });
       if (!sessionData) {
         throw import_errors.SessionError.notFound(sessionId);
       }
@@ -593,14 +574,14 @@ class SessionManager {
       sessionData.metadata = sessionData.metadata || {};
       sessionData.metadata.systemPromptContributors = next;
       sessionData.lastActivity = Date.now();
-      await this.persistSessionData(sessionKey, sessionData);
+      await this.persistSessionData(sessionId, sessionData);
       return replaced;
     });
   }
   async removeSessionSystemPromptContributor(sessionId, contributorId) {
     await this.ensureInitialized();
-    return await this.runWithSessionDataLock(sessionId, async (sessionKey) => {
-      const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+    return await this.runWithSessionDataLock(sessionId, async () => {
+      const sessionData = await this.services.sessionStore.getSession({ sessionId });
       if (!sessionData) {
         throw import_errors.SessionError.notFound(sessionId);
       }
@@ -613,7 +594,7 @@ class SessionManager {
       sessionData.metadata = sessionData.metadata || {};
       sessionData.metadata.systemPromptContributors = next;
       sessionData.lastActivity = Date.now();
-      await this.persistSessionData(sessionKey, sessionData);
+      await this.persistSessionData(sessionId, sessionData);
       return true;
     });
   }
@@ -631,8 +612,8 @@ class SessionManager {
   }
   async markUntrackedChatGPTLoginUsage(sessionId) {
     await this.ensureInitialized();
-    await this.runWithSessionDataLock(sessionId, async (sessionKey) => {
-      const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+    await this.runWithSessionDataLock(sessionId, async () => {
+      const sessionData = await this.services.sessionStore.getSession({ sessionId });
       if (!sessionData || sessionData.usageTracking?.hasUntrackedChatGPTLoginUsage) {
         return;
       }
@@ -640,7 +621,7 @@ class SessionManager {
         ...sessionData.usageTracking ?? {},
         hasUntrackedChatGPTLoginUsage: true
       };
-      await this.persistSessionData(sessionKey, sessionData);
+      await this.persistSessionData(sessionId, sessionData);
     });
   }
   /**
@@ -656,13 +637,13 @@ class SessionManager {
    * Updates the last activity timestamp for a session.
    */
   async updateSessionActivity(sessionId) {
-    await this.runWithSessionDataLock(sessionId, async (sessionKey) => {
-      const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+    await this.runWithSessionDataLock(sessionId, async () => {
+      const sessionData = await this.services.sessionStore.getSession({ sessionId });
       if (!sessionData) {
         return;
       }
       sessionData.lastActivity = Date.now();
-      await this.persistSessionData(sessionKey, sessionData);
+      await this.persistSessionData(sessionId, sessionData);
     });
   }
   /**
@@ -670,14 +651,14 @@ class SessionManager {
    */
   async incrementMessageCount(sessionId) {
     await this.ensureInitialized();
-    await this.runWithSessionDataLock(sessionId, async (sessionKey) => {
-      const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+    await this.runWithSessionDataLock(sessionId, async () => {
+      const sessionData = await this.services.sessionStore.getSession({ sessionId });
       if (!sessionData) {
         return;
       }
       sessionData.messageCount++;
       sessionData.lastActivity = Date.now();
-      await this.persistSessionData(sessionKey, sessionData);
+      await this.persistSessionData(sessionId, sessionData);
     });
   }
   /**
@@ -693,11 +674,13 @@ class SessionManager {
    */
   async accumulateTokenUsage(sessionId, usage, cost, modelInfo) {
     await this.ensureInitialized();
-    await this.runWithSessionDataLock(sessionId, async (sessionKey) => {
-      const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+    await this.runWithSessionDataLock(sessionId, async () => {
+      const sessionData = await this.services.sessionStore.getSession({ sessionId });
+      const normalizedUsage = (0, import_usage_metadata.normalizeTokenUsageForAccounting)(usage);
+      const finiteCost = typeof cost === "number" && Number.isFinite(cost) ? cost : void 0;
       if (!sessionData) return;
       if (modelInfo) {
-        this.updateModelStats(sessionData, usage, cost, modelInfo);
+        this.updateModelStats(sessionData, normalizedUsage, finiteCost, modelInfo);
       }
       if (!sessionData.tokenUsage) {
         sessionData.tokenUsage = {
@@ -709,12 +692,12 @@ class SessionManager {
           totalTokens: 0
         };
       }
-      this.accumulateTokensInto(sessionData.tokenUsage, usage);
-      if (cost !== void 0) {
-        sessionData.estimatedCost = (sessionData.estimatedCost ?? 0) + cost;
+      this.accumulateTokensInto(sessionData.tokenUsage, normalizedUsage);
+      if (finiteCost !== void 0) {
+        sessionData.estimatedCost = (sessionData.estimatedCost ?? 0) + finiteCost;
       }
       sessionData.lastActivity = Date.now();
-      await this.persistSessionData(sessionKey, sessionData);
+      await this.persistSessionData(sessionId, sessionData);
     });
   }
   /**
@@ -775,8 +758,8 @@ class SessionManager {
   async setSessionTitle(sessionId, title, opts = {}) {
     await this.ensureInitialized();
     const normalized = title.trim().slice(0, 80);
-    await this.runWithSessionDataLock(sessionId, async (sessionKey) => {
-      const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+    await this.runWithSessionDataLock(sessionId, async () => {
+      const sessionData = await this.services.sessionStore.getSession({ sessionId });
       if (!sessionData) {
         throw import_errors.SessionError.notFound(sessionId);
       }
@@ -786,7 +769,7 @@ class SessionManager {
       sessionData.metadata = sessionData.metadata || {};
       sessionData.metadata.title = normalized;
       sessionData.lastActivity = Date.now();
-      await this.persistSessionData(sessionKey, sessionData);
+      await this.persistSessionData(sessionId, sessionData);
     });
   }
   /**
@@ -794,8 +777,7 @@ class SessionManager {
    */
   async getSessionTitle(sessionId) {
     await this.ensureInitialized();
-    const sessionKey = `session:${sessionId}`;
-    const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+    const sessionData = await this.services.sessionStore.getSession({ sessionId });
     return sessionData?.metadata?.title;
   }
   /**
@@ -806,8 +788,7 @@ class SessionManager {
     const now = Date.now();
     const expiredSessions = [];
     for (const [sessionId, _session] of this.sessions.entries()) {
-      const sessionKey = `session:${sessionId}`;
-      const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+      const sessionData = await this.services.sessionStore.getSession({ sessionId });
       if (sessionData && now - sessionData.lastActivity > this.sessionTTL) {
         expiredSessions.push(sessionId);
       }
@@ -917,8 +898,8 @@ class SessionManager {
     return configWithoutApiKey;
   }
   async setPersistedSessionLLMOverride(sessionId, llmOverride) {
-    await this.runWithSessionDataLock(sessionId, async (sessionKey) => {
-      const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+    await this.runWithSessionDataLock(sessionId, async () => {
+      const sessionData = await this.services.sessionStore.getSession({ sessionId });
       if (!sessionData) {
         return;
       }
@@ -927,7 +908,7 @@ class SessionManager {
       } else {
         delete sessionData.llmOverride;
       }
-      await this.persistSessionData(sessionKey, sessionData);
+      await this.persistSessionData(sessionId, sessionData);
     });
   }
   async deleteSessionInteractionState(sessionId) {
@@ -935,7 +916,8 @@ class SessionManager {
     await Promise.all([
       this.services.toolManager.deleteSessionState(sessionId),
       this.services.approvalManager.deleteSessionState(sessionId),
-      this.services.messageQueueStore.delete(sessionId)
+      this.services.steerQueueStore.delete({ sessionId }),
+      this.services.followUpQueueStore.delete({ sessionId })
     ]);
   }
   evictSessionInteractionState(sessionId) {
@@ -946,7 +928,7 @@ class SessionManager {
     const sessionKey = `session:${sessionId}`;
     const previousLock = this.sessionDataLocks.get(sessionKey) ?? Promise.resolve();
     const currentResult = previousLock.catch(() => {
-    }).then(() => fn(sessionKey));
+    }).then(() => fn());
     const currentLock = currentResult.then(
       () => void 0,
       () => void 0
@@ -960,9 +942,12 @@ class SessionManager {
       }
     }
   }
-  async persistSessionData(sessionKey, sessionData) {
-    await this.services.storageManager.getDatabase().set(sessionKey, sessionData);
-    await this.services.storageManager.getCache().set(sessionKey, sessionData, this.sessionTTL / 1e3);
+  async persistSessionData(sessionId, sessionData) {
+    await this.services.sessionStore.saveSession({
+      sessionId,
+      session: sessionData,
+      ttlSeconds: this.sessionTTL / 1e3
+    });
   }
   /**
    * Get session statistics for monitoring and debugging.
@@ -986,8 +971,7 @@ class SessionManager {
    */
   async getSessionData(sessionId) {
     await this.ensureInitialized();
-    const sessionKey = `session:${sessionId}`;
-    return await this.services.storageManager.getDatabase().get(sessionKey);
+    return await this.services.sessionStore.getSession({ sessionId });
   }
   /**
    * Cleanup all sessions and resources.

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

@@ -5,14 +5,15 @@ import { AgentEventBus } from '../events/index.js';
 import type { Logger } from '../logger/v2/types.js';
 import type { AgentStateManager } from '../agent/state-manager.js';
 import type { ValidatedLLMConfig } from '../llm/schemas.js';
-import type { StorageManager } from '../storage/index.js';
 import type { HookManager } from '../hooks/manager.js';
 import type { ApprovalManager } from '../approval/manager.js';
 import type { TokenUsage } from '../llm/types.js';
 import type { LanguageModelFactory } from '../llm/services/types.js';
 import type { CompactionStrategy } from '../context/compaction/types.js';
 import { type SessionPromptContributor } from '../systemPrompt/schemas.js';
-import type { MessageQueueStore } from './message-queue-store.js';
+import type { SessionMessageQueueStore } from '../storage/message-queue/types.js';
+import type { ConversationStore } from '../storage/conversation/types.js';
+import type { SessionStore } from '../storage/sessions/types.js';
 export type SessionLoggerFactory = (options: {
     baseLogger: Logger;
     agentId: string;
@@ -96,14 +97,12 @@ export declare class SessionManager {
     private sessions;
     private readonly maxSessions;
     private readonly sessionTTL;
-    private static readonly MESSAGE_QUEUE_KEY_PREFIX;
     private initialized;
     private cleanupInterval?;
     private initializationPromise;
     private readonly pendingCreations;
     private readonly sessionDataLocks;
     private logger;
-    private static readonly FORK_HISTORY_BATCH_SIZE;
     private static readonly FORK_ID_GENERATION_MAX_ATTEMPTS;
     private static readonly FORK_TITLE_PREFIX;
     private static readonly FORK_PARENT_ID_PREVIEW_LENGTH;
@@ -115,11 +114,13 @@ export declare class SessionManager {
         toolManager: ToolManager;
         approvalManager: ApprovalManager;
         agentEventBus: AgentEventBus;
-        storageManager: StorageManager;
+        sessionStore: SessionStore;
+        conversationStore: ConversationStore;
         resourceManager: import('../resources/index.js').ResourceManager;
         hookManager: HookManager;
         mcpManager: import('../mcp/manager.js').MCPManager;
-        messageQueueStore: Pick<MessageQueueStore, 'load' | 'save' | 'delete'>;
+        steerQueueStore: SessionMessageQueueStore;
+        followUpQueueStore: SessionMessageQueueStore;
         compactionStrategy: CompactionStrategy | null;
         workspaceManager?: import('../workspace/manager.js').WorkspaceManager;
     }, config: SessionManagerConfig | undefined, logger: Logger);

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

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