@dexto/core 1.6.17 → 1.6.18

package/dist/session/chat-session.cjs

@@ -185,8 +185,10 @@ class ChatSession {
       // Pass ResourceManager for blob storage
       this.logger,
       // Pass logger for dependency injection
-      compactionStrategy
-      // Pass compaction strategy
+      {
+        usageScopeId: runtimeConfig.usageScopeId,
+        compactionStrategy
+      }
     );
     this.logger.debug(`ChatSession ${this.id}: Services initialized with storage`);
   }
@@ -472,6 +474,7 @@ class ChatSession {
    */
   async switchLLM(newLLMConfig) {
     try {
+      const runtimeConfig = this.services.stateManager.getRuntimeConfig(this.id);
       const compactionStrategy = this.services.compactionStrategy;
       const newLLMService = (0, import_factory2.createLLMService)(
         newLLMConfig,
@@ -484,8 +487,10 @@ class ChatSession {
         this.id,
         this.services.resourceManager,
         this.logger,
-        compactionStrategy
-        // Pass compaction strategy
+        {
+          usageScopeId: runtimeConfig.usageScopeId,
+          compactionStrategy
+        }
       );
       this.llmService = newLLMService;
       this.logger.info(

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

@@ -166,8 +166,10 @@ class ChatSession {
       // Pass ResourceManager for blob storage
       this.logger,
       // Pass logger for dependency injection
-      compactionStrategy
-      // Pass compaction strategy
+      {
+        usageScopeId: runtimeConfig.usageScopeId,
+        compactionStrategy
+      }
     );
     this.logger.debug(`ChatSession ${this.id}: Services initialized with storage`);
   }
@@ -453,6 +455,7 @@ class ChatSession {
    */
   async switchLLM(newLLMConfig) {
     try {
+      const runtimeConfig = this.services.stateManager.getRuntimeConfig(this.id);
       const compactionStrategy = this.services.compactionStrategy;
       const newLLMService = createLLMService(
         newLLMConfig,
@@ -465,8 +468,10 @@ class ChatSession {
         this.id,
         this.services.resourceManager,
         this.logger,
-        compactionStrategy
-        // Pass compaction strategy
+        {
+          usageScopeId: runtimeConfig.usageScopeId,
+          compactionStrategy
+        }
       );
       this.llmService = newLLMService;
       this.logger.info(

package/dist/session/session-manager.cjs

@@ -35,6 +35,8 @@ 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_zod = require("zod");
+var import_schemas = require("../systemPrompt/schemas.js");
 function defaultSessionLoggerFactory(options) {
   return options.baseLogger.createChild(import_types.DextoLogComponent.SESSION);
 }
@@ -54,8 +56,8 @@ class SessionManager {
   initializationPromise;
   // Add a Map to track ongoing session creation operations to prevent race conditions
   pendingCreations = /* @__PURE__ */ new Map();
-  // Per-session mutex for token usage updates to prevent lost updates from concurrent calls
-  tokenUsageLocks = /* @__PURE__ */ new Map();
+  // 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;
@@ -183,8 +185,15 @@ class SessionManager {
       lastActivity: now,
       messageCount: parentSessionData.messageCount,
       parentSessionId,
-      metadata: {
-        title: childTitle
+      ...parentSessionData.metadata !== void 0 ? {
+        metadata: {
+          ...parentSessionData.metadata,
+          title: childTitle
+        }
+      } : {
+        metadata: {
+          title: childTitle
+        }
       },
       ...parentSessionData.workspaceId !== void 0 && {
         workspaceId: parentSessionData.workspaceId
@@ -460,14 +469,15 @@ class SessionManager {
       throw import_errors.SessionError.notFound(sessionId);
     }
     await session.reset();
-    const sessionKey = `session:${sessionId}`;
-    const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
-    if (sessionData) {
+    await this.runWithSessionDataLock(sessionId, async (sessionKey) => {
+      const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+      if (!sessionData) {
+        return;
+      }
       sessionData.messageCount = 0;
       sessionData.lastActivity = Date.now();
-      await this.services.storageManager.getDatabase().set(sessionKey, sessionData);
-      await this.services.storageManager.getCache().set(sessionKey, sessionData, this.sessionTTL / 1e3);
-    }
+      await this.persistSessionData(sessionKey, sessionData);
+    });
     this.logger.debug(`Reset session conversation: ${sessionId}`);
   }
   /**
@@ -508,11 +518,69 @@ class SessionManager {
       ...sessionData.usageTracking && { usageTracking: sessionData.usageTracking }
     };
   }
-  async markUntrackedChatGPTLoginUsage(sessionId) {
+  async getSessionSystemPromptContributors(sessionId) {
     await this.ensureInitialized();
     const sessionKey = `session:${sessionId}`;
-    const previousLock = this.tokenUsageLocks.get(sessionKey) ?? Promise.resolve();
-    const currentLock = previousLock.then(async () => {
+    const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+    if (!sessionData) {
+      throw import_errors.SessionError.notFound(sessionId);
+    }
+    return this.parseSessionPromptContributors(sessionId, sessionData);
+  }
+  async upsertSessionSystemPromptContributor(sessionId, contributor) {
+    await this.ensureInitialized();
+    return await this.runWithSessionDataLock(sessionId, async (sessionKey) => {
+      const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+      if (!sessionData) {
+        throw import_errors.SessionError.notFound(sessionId);
+      }
+      const existing = this.parseSessionPromptContributors(sessionId, sessionData);
+      const next = existing.filter((entry) => entry.id !== contributor.id);
+      const replaced = next.length !== existing.length;
+      next.push(contributor);
+      next.sort((left, right) => left.priority - right.priority);
+      sessionData.metadata = sessionData.metadata || {};
+      sessionData.metadata.systemPromptContributors = next;
+      sessionData.lastActivity = Date.now();
+      await this.persistSessionData(sessionKey, 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);
+      if (!sessionData) {
+        throw import_errors.SessionError.notFound(sessionId);
+      }
+      const existing = this.parseSessionPromptContributors(sessionId, sessionData);
+      const next = existing.filter((entry) => entry.id !== contributorId);
+      const removed = next.length !== existing.length;
+      if (!removed) {
+        return false;
+      }
+      sessionData.metadata = sessionData.metadata || {};
+      sessionData.metadata.systemPromptContributors = next;
+      sessionData.lastActivity = Date.now();
+      await this.persistSessionData(sessionKey, sessionData);
+      return true;
+    });
+  }
+  parseSessionPromptContributors(sessionId, sessionData) {
+    try {
+      return import_schemas.SessionPromptContributorSchema.array().parse(
+        sessionData.metadata?.systemPromptContributors ?? []
+      );
+    } catch (error) {
+      if (error instanceof import_zod.ZodError) {
+        throw import_errors.SessionError.storageFailed(sessionId, "read", error.message);
+      }
+      throw error;
+    }
+  }
+  async markUntrackedChatGPTLoginUsage(sessionId) {
+    await this.ensureInitialized();
+    await this.runWithSessionDataLock(sessionId, async (sessionKey) => {
       const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
       if (!sessionData || sessionData.usageTracking?.hasUntrackedChatGPTLoginUsage) {
         return;
@@ -521,17 +589,8 @@ class SessionManager {
         ...sessionData.usageTracking ?? {},
         hasUntrackedChatGPTLoginUsage: true
       };
-      await this.services.storageManager.getDatabase().set(sessionKey, sessionData);
-      await this.services.storageManager.getCache().set(sessionKey, sessionData, this.sessionTTL / 1e3);
+      await this.persistSessionData(sessionKey, sessionData);
     });
-    this.tokenUsageLocks.set(sessionKey, currentLock);
-    try {
-      await currentLock;
-    } finally {
-      if (this.tokenUsageLocks.get(sessionKey) === currentLock) {
-        this.tokenUsageLocks.delete(sessionKey);
-      }
-    }
   }
   /**
    * Get the global session manager configuration.
@@ -546,27 +605,29 @@ class SessionManager {
    * Updates the last activity timestamp for a session.
    */
   async updateSessionActivity(sessionId) {
-    const sessionKey = `session:${sessionId}`;
-    const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
-    if (sessionData) {
+    await this.runWithSessionDataLock(sessionId, async (sessionKey) => {
+      const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+      if (!sessionData) {
+        return;
+      }
       sessionData.lastActivity = Date.now();
-      await this.services.storageManager.getDatabase().set(sessionKey, sessionData);
-      await this.services.storageManager.getCache().set(sessionKey, sessionData, this.sessionTTL / 1e3);
-    }
+      await this.persistSessionData(sessionKey, sessionData);
+    });
   }
   /**
    * Increments the message count for a session.
    */
   async incrementMessageCount(sessionId) {
     await this.ensureInitialized();
-    const sessionKey = `session:${sessionId}`;
-    const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
-    if (sessionData) {
+    await this.runWithSessionDataLock(sessionId, async (sessionKey) => {
+      const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+      if (!sessionData) {
+        return;
+      }
       sessionData.messageCount++;
       sessionData.lastActivity = Date.now();
-      await this.services.storageManager.getDatabase().set(sessionKey, sessionData);
-      await this.services.storageManager.getCache().set(sessionKey, sessionData, this.sessionTTL / 1e3);
-    }
+      await this.persistSessionData(sessionKey, sessionData);
+    });
   }
   /**
    * Accumulates token usage for a session.
@@ -581,9 +642,7 @@ class SessionManager {
    */
   async accumulateTokenUsage(sessionId, usage, cost, modelInfo) {
     await this.ensureInitialized();
-    const sessionKey = `session:${sessionId}`;
-    const previousLock = this.tokenUsageLocks.get(sessionKey) ?? Promise.resolve();
-    const currentLock = previousLock.then(async () => {
+    await this.runWithSessionDataLock(sessionId, async (sessionKey) => {
       const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
       if (!sessionData) return;
       if (modelInfo) {
@@ -604,17 +663,8 @@ class SessionManager {
         sessionData.estimatedCost = (sessionData.estimatedCost ?? 0) + cost;
       }
       sessionData.lastActivity = Date.now();
-      await this.services.storageManager.getDatabase().set(sessionKey, sessionData);
-      await this.services.storageManager.getCache().set(sessionKey, sessionData, this.sessionTTL / 1e3);
+      await this.persistSessionData(sessionKey, sessionData);
     });
-    this.tokenUsageLocks.set(sessionKey, currentLock);
-    try {
-      await currentLock;
-    } finally {
-      if (this.tokenUsageLocks.get(sessionKey) === currentLock) {
-        this.tokenUsageLocks.delete(sessionKey);
-      }
-    }
   }
   /**
    * Helper to accumulate token usage into a target SessionTokenUsage object.
@@ -673,20 +723,20 @@ class SessionManager {
    */
   async setSessionTitle(sessionId, title, opts = {}) {
     await this.ensureInitialized();
-    const sessionKey = `session:${sessionId}`;
-    const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
-    if (!sessionData) {
-      throw import_errors.SessionError.notFound(sessionId);
-    }
     const normalized = title.trim().slice(0, 80);
-    if (opts.ifUnsetOnly && sessionData.metadata?.title) {
-      return;
-    }
-    sessionData.metadata = sessionData.metadata || {};
-    sessionData.metadata.title = normalized;
-    sessionData.lastActivity = Date.now();
-    await this.services.storageManager.getDatabase().set(sessionKey, sessionData);
-    await this.services.storageManager.getCache().set(sessionKey, sessionData, this.sessionTTL / 1e3);
+    await this.runWithSessionDataLock(sessionId, async (sessionKey) => {
+      const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+      if (!sessionData) {
+        throw import_errors.SessionError.notFound(sessionId);
+      }
+      if (opts.ifUnsetOnly && sessionData.metadata?.title) {
+        return;
+      }
+      sessionData.metadata = sessionData.metadata || {};
+      sessionData.metadata.title = normalized;
+      sessionData.lastActivity = Date.now();
+      await this.persistSessionData(sessionKey, sessionData);
+    });
   }
   /**
    * Gets the stored title for a session, if any.
@@ -771,14 +821,15 @@ class SessionManager {
       throw import_errors.SessionError.notFound(sessionId);
     }
     await session.switchLLM(newLLMConfig);
-    const sessionKey = `session:${sessionId}`;
-    const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
-    if (sessionData) {
+    await this.runWithSessionDataLock(sessionId, async (sessionKey) => {
+      const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+      if (!sessionData) {
+        return;
+      }
       const { apiKey: _apiKey, ...configWithoutApiKey } = newLLMConfig;
       sessionData.llmOverride = configWithoutApiKey;
-      await this.services.storageManager.getDatabase().set(sessionKey, sessionData);
-      await this.services.storageManager.getCache().set(sessionKey, sessionData, this.sessionTTL / 1e3);
-    }
+      await this.persistSessionData(sessionKey, sessionData);
+    });
     this.services.agentEventBus.emit("llm:switched", {
       newConfig: newLLMConfig,
       historyRetained: true,
@@ -787,6 +838,28 @@ class SessionManager {
     const message = `Successfully switched to ${newLLMConfig.provider}/${newLLMConfig.model} for session ${sessionId}`;
     return { message, warnings: [] };
   }
+  async runWithSessionDataLock(sessionId, fn) {
+    const sessionKey = `session:${sessionId}`;
+    const previousLock = this.sessionDataLocks.get(sessionKey) ?? Promise.resolve();
+    const currentResult = previousLock.catch(() => {
+    }).then(() => fn(sessionKey));
+    const currentLock = currentResult.then(
+      () => void 0,
+      () => void 0
+    );
+    this.sessionDataLocks.set(sessionKey, currentLock);
+    try {
+      return await currentResult;
+    } finally {
+      if (this.sessionDataLocks.get(sessionKey) === currentLock) {
+        this.sessionDataLocks.delete(sessionKey);
+      }
+    }
+  }
+  async persistSessionData(sessionKey, sessionData) {
+    await this.services.storageManager.getDatabase().set(sessionKey, sessionData);
+    await this.services.storageManager.getCache().set(sessionKey, sessionData, this.sessionTTL / 1e3);
+  }
   /**
    * Get session statistics for monitoring and debugging.
    */

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

@@ -9,6 +9,7 @@ import type { StorageManager } from '../storage/index.js';
 import type { HookManager } from '../hooks/manager.js';
 import type { TokenUsage } from '../llm/types.js';
 import type { CompactionStrategy } from '../context/compaction/types.js';
+import { type SessionPromptContributor } from '../systemPrompt/schemas.js';
 export type SessionLoggerFactory = (options: {
     baseLogger: Logger;
     agentId: string;
@@ -94,7 +95,7 @@ export declare class SessionManager {
     private cleanupInterval?;
     private initializationPromise;
     private readonly pendingCreations;
-    private readonly tokenUsageLocks;
+    private readonly sessionDataLocks;
     private logger;
     private static readonly FORK_HISTORY_BATCH_SIZE;
     private static readonly FORK_ID_GENERATION_MAX_ATTEMPTS;
@@ -196,6 +197,10 @@ export declare class SessionManager {
      * @returns Session metadata if found, undefined otherwise
      */
     getSessionMetadata(sessionId: string): Promise<SessionMetadata | undefined>;
+    getSessionSystemPromptContributors(sessionId: string): Promise<SessionPromptContributor[]>;
+    upsertSessionSystemPromptContributor(sessionId: string, contributor: SessionPromptContributor): Promise<boolean>;
+    removeSessionSystemPromptContributor(sessionId: string, contributorId: string): Promise<boolean>;
+    private parseSessionPromptContributors;
     markUntrackedChatGPTLoginUsage(sessionId: string): Promise<void>;
     /**
      * Get the global session manager configuration.
@@ -271,6 +276,8 @@ export declare class SessionManager {
         message: string;
         warnings: string[];
     }>;
+    private runWithSessionDataLock;
+    private persistSessionData;
     /**
      * Get session statistics for monitoring and debugging.
      */

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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"}