@dexto/core 1.6.17 → 1.6.19

package/dist/mcp/index.cjs

@@ -3,6 +3,10 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -11,24 +15,48 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var mcp_exports = {};
+__export(mcp_exports, {
+  DEFAULT_MCP_CONNECTION_MODE: () => import_schemas.DEFAULT_MCP_CONNECTION_MODE,
+  DextoMcpClient: () => import_mcp_client.DextoMcpClient,
+  HttpServerConfigSchema: () => import_schemas.HttpServerConfigSchema,
+  MCPError: () => import_errors.MCPError,
+  MCPErrorCode: () => import_error_codes.MCPErrorCode,
+  MCPManager: () => import_manager.MCPManager,
+  MCP_CONNECTION_MODES: () => import_schemas.MCP_CONNECTION_MODES,
+  MCP_CONNECTION_STATUSES: () => import_schemas.MCP_CONNECTION_STATUSES,
+  MCP_SERVER_TYPES: () => import_schemas.MCP_SERVER_TYPES,
+  McpServerConfigSchema: () => import_schemas.McpServerConfigSchema,
+  ServersConfigSchema: () => import_schemas.ServersConfigSchema,
+  SseServerConfigSchema: () => import_schemas.SseServerConfigSchema,
+  StdioServerConfigSchema: () => import_schemas.StdioServerConfigSchema,
+  loadBundledMcpConfigFromDirectory: () => import_bundled_config.loadBundledMcpConfigFromDirectory,
+  resolveAndValidateMcpServerConfig: () => import_resolver.resolveAndValidateMcpServerConfig
+});
 module.exports = __toCommonJS(mcp_exports);
-__reExport(mcp_exports, require("./manager.js"), module.exports);
-__reExport(mcp_exports, require("./mcp-client.js"), module.exports);
-__reExport(mcp_exports, require("./types.js"), module.exports);
-__reExport(mcp_exports, require("./schemas.js"), module.exports);
-__reExport(mcp_exports, require("./errors.js"), module.exports);
-__reExport(mcp_exports, require("./error-codes.js"), module.exports);
-__reExport(mcp_exports, require("./resolver.js"), module.exports);
+var import_manager = require("./manager.js");
+var import_mcp_client = require("./mcp-client.js");
+var import_schemas = require("./schemas.js");
+var import_errors = require("./errors.js");
+var import_error_codes = require("./error-codes.js");
+var import_resolver = require("./resolver.js");
+var import_bundled_config = require("./bundled-config.js");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ...require("./manager.js"),
-  ...require("./mcp-client.js"),
-  ...require("./types.js"),
-  ...require("./schemas.js"),
-  ...require("./errors.js"),
-  ...require("./error-codes.js"),
-  ...require("./resolver.js")
+  DEFAULT_MCP_CONNECTION_MODE,
+  DextoMcpClient,
+  HttpServerConfigSchema,
+  MCPError,
+  MCPErrorCode,
+  MCPManager,
+  MCP_CONNECTION_MODES,
+  MCP_CONNECTION_STATUSES,
+  MCP_SERVER_TYPES,
+  McpServerConfigSchema,
+  ServersConfigSchema,
+  SseServerConfigSchema,
+  StdioServerConfigSchema,
+  loadBundledMcpConfigFromDirectory,
+  resolveAndValidateMcpServerConfig
 });

package/dist/mcp/index.d.ts

@@ -1,8 +1,12 @@
-export * from './manager.js';
-export * from './mcp-client.js';
-export * from './types.js';
-export * from './schemas.js';
-export * from './errors.js';
-export * from './error-codes.js';
-export * from './resolver.js';
+export { MCPManager } from './manager.js';
+export { DextoMcpClient } from './mcp-client.js';
+export type { McpAuthProvider, McpAuthProviderFactory, MCPResourceSummary, MCPResolvedResource, McpClient, } from './types.js';
+export { MCP_SERVER_TYPES, MCP_CONNECTION_MODES, MCP_CONNECTION_STATUSES, DEFAULT_MCP_CONNECTION_MODE, StdioServerConfigSchema, SseServerConfigSchema, HttpServerConfigSchema, McpServerConfigSchema, ServersConfigSchema, } from './schemas.js';
+export type { McpServerType, McpConnectionMode, McpConnectionStatus, McpServerStatus, StdioServerConfig, ValidatedStdioServerConfig, SseServerConfig, ValidatedSseServerConfig, HttpServerConfig, ValidatedHttpServerConfig, McpServerConfig, ValidatedMcpServerConfig, ServersConfig, ValidatedServersConfig, } from './schemas.js';
+export { MCPError } from './errors.js';
+export { MCPErrorCode } from './error-codes.js';
+export { resolveAndValidateMcpServerConfig } from './resolver.js';
+export type { McpServerContext } from './resolver.js';
+export { loadBundledMcpConfigFromDirectory } from './bundled-config.js';
+export type { LoadBundledMcpConfigOptions, LoadBundledMcpConfigResult } from './bundled-config.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/mcp/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mcp/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mcp/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,YAAY,EACR,eAAe,EACf,sBAAsB,EACtB,kBAAkB,EAClB,mBAAmB,EACnB,SAAS,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EACH,gBAAgB,EAChB,oBAAoB,EACpB,uBAAuB,EACvB,2BAA2B,EAC3B,uBAAuB,EACvB,qBAAqB,EACrB,sBAAsB,EACtB,qBAAqB,EACrB,mBAAmB,GACtB,MAAM,cAAc,CAAC;AACtB,YAAY,EACR,aAAa,EACb,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EACjB,0BAA0B,EAC1B,eAAe,EACf,wBAAwB,EACxB,gBAAgB,EAChB,yBAAyB,EACzB,eAAe,EACf,wBAAwB,EACxB,aAAa,EACb,sBAAsB,GACzB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,iCAAiC,EAAE,MAAM,eAAe,CAAC;AAClE,YAAY,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,iCAAiC,EAAE,MAAM,qBAAqB,CAAC;AACxE,YAAY,EAAE,2BAA2B,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC"}

package/dist/mcp/index.js

@@ -1,7 +1,35 @@
-export * from "./manager.js";
-export * from "./mcp-client.js";
-export * from "./types.js";
-export * from "./schemas.js";
-export * from "./errors.js";
-export * from "./error-codes.js";
-export * from "./resolver.js";
+import "../chunk-PTJYTZNU.js";
+import { MCPManager } from "./manager.js";
+import { DextoMcpClient } from "./mcp-client.js";
+import {
+  MCP_SERVER_TYPES,
+  MCP_CONNECTION_MODES,
+  MCP_CONNECTION_STATUSES,
+  DEFAULT_MCP_CONNECTION_MODE,
+  StdioServerConfigSchema,
+  SseServerConfigSchema,
+  HttpServerConfigSchema,
+  McpServerConfigSchema,
+  ServersConfigSchema
+} from "./schemas.js";
+import { MCPError } from "./errors.js";
+import { MCPErrorCode } from "./error-codes.js";
+import { resolveAndValidateMcpServerConfig } from "./resolver.js";
+import { loadBundledMcpConfigFromDirectory } from "./bundled-config.js";
+export {
+  DEFAULT_MCP_CONNECTION_MODE,
+  DextoMcpClient,
+  HttpServerConfigSchema,
+  MCPError,
+  MCPErrorCode,
+  MCPManager,
+  MCP_CONNECTION_MODES,
+  MCP_CONNECTION_STATUSES,
+  MCP_SERVER_TYPES,
+  McpServerConfigSchema,
+  ServersConfigSchema,
+  SseServerConfigSchema,
+  StdioServerConfigSchema,
+  loadBundledMcpConfigFromDirectory,
+  resolveAndValidateMcpServerConfig
+};

package/dist/prompts/providers/config-prompt-provider.cjs

@@ -26,6 +26,7 @@ var import_types = require("../../logger/v2/types.js");
 var import_errors = require("../errors.js");
 var import_utils = require("../utils.js");
 var import_name_validation = require("../name-validation.js");
+var import_bundled_config = require("../../mcp/bundled-config.js");
 var import_promises = require("fs/promises");
 var import_fs = require("fs");
 var import_path = require("path");
@@ -223,6 +224,16 @@ class ConfigPromptProvider {
       const model = prompt.model ?? parsed.model;
       const context = prompt.context ?? parsed.context;
       const agent = prompt.agent ?? parsed.agent;
+      const bundledMcpResult = (0, import_bundled_config.loadBundledMcpConfigFromDirectory)(
+        (0, import_path.dirname)(filePath),
+        parsed.id,
+        {
+          scanNestedMcps: true
+        }
+      );
+      for (const warning of bundledMcpResult.warnings) {
+        this.logger.warn(warning);
+      }
       const displayName = parsed.id;
       const promptName = prompt.namespace ? `config:${prompt.namespace}:${parsed.id}` : `config:${parsed.id}`;
       const promptInfo = {
@@ -248,7 +259,10 @@ class ConfigPromptProvider {
           showInStarters: prompt.showInStarters,
           originalId: parsed.id,
           ...prompt.namespace && { namespace: prompt.namespace },
-          ...parsed.toolkits !== void 0 && { toolkits: parsed.toolkits }
+          ...parsed.toolkits !== void 0 && { toolkits: parsed.toolkits },
+          ...bundledMcpResult.mcpServers !== void 0 && {
+            mcpServers: bundledMcpResult.mcpServers
+          }
         }
       };
       return { info: promptInfo, content: parsed.content };

package/dist/prompts/providers/config-prompt-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-prompt-provider.d.ts","sourceRoot":"","sources":["../../../src/prompts/providers/config-prompt-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAc,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAClG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,KAAK,EAA4B,aAAa,EAAE,MAAM,eAAe,CAAC;AAE7E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AASvD;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,YAAW,cAAc;IACvD,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,aAAa,CAAkC;IACvD,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,MAAM,CAAS;gBAEX,WAAW,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM;IAM7D,SAAS,IAAI,MAAM;IAInB,eAAe,IAAI,IAAI;IAOvB,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;IAYrC,WAAW,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAUxD,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IAgCjF,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAgC3D,iBAAiB;IAsC/B,OAAO,CAAC,mBAAmB;YA8Bb,iBAAiB;IAkG/B,OAAO,CAAC,mBAAmB;IAuL3B,OAAO,CAAC,iBAAiB;IAyBzB,OAAO,CAAC,cAAc;CA+BzB"}
+{"version":3,"file":"config-prompt-provider.d.ts","sourceRoot":"","sources":["../../../src/prompts/providers/config-prompt-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAc,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAClG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,KAAK,EAA4B,aAAa,EAAE,MAAM,eAAe,CAAC;AAE7E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAUvD;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,YAAW,cAAc;IACvD,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,aAAa,CAAkC;IACvD,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,MAAM,CAAS;gBAEX,WAAW,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM;IAM7D,SAAS,IAAI,MAAM;IAInB,eAAe,IAAI,IAAI;IAOvB,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;IAYrC,WAAW,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAUxD,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IAgCjF,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAgC3D,iBAAiB;IAsC/B,OAAO,CAAC,mBAAmB;YA8Bb,iBAAiB;IAgH/B,OAAO,CAAC,mBAAmB;IAuL3B,OAAO,CAAC,iBAAiB;IAyBzB,OAAO,CAAC,cAAc;CA+BzB"}

package/dist/prompts/providers/config-prompt-provider.js

@@ -4,6 +4,7 @@ import { DextoLogComponent } from "../../logger/v2/types.js";
 import { PromptError } from "../errors.js";
 import { expandPlaceholders } from "../utils.js";
 import { assertValidPromptName } from "../name-validation.js";
+import { loadBundledMcpConfigFromDirectory } from "../../mcp/bundled-config.js";
 import { readFile, realpath } from "fs/promises";
 import { existsSync } from "fs";
 import { basename, dirname, relative, sep } from "path";
@@ -201,6 +202,16 @@ class ConfigPromptProvider {
       const model = prompt.model ?? parsed.model;
       const context = prompt.context ?? parsed.context;
       const agent = prompt.agent ?? parsed.agent;
+      const bundledMcpResult = loadBundledMcpConfigFromDirectory(
+        dirname(filePath),
+        parsed.id,
+        {
+          scanNestedMcps: true
+        }
+      );
+      for (const warning of bundledMcpResult.warnings) {
+        this.logger.warn(warning);
+      }
       const displayName = parsed.id;
       const promptName = prompt.namespace ? `config:${prompt.namespace}:${parsed.id}` : `config:${parsed.id}`;
       const promptInfo = {
@@ -226,7 +237,10 @@ class ConfigPromptProvider {
           showInStarters: prompt.showInStarters,
           originalId: parsed.id,
           ...prompt.namespace && { namespace: prompt.namespace },
-          ...parsed.toolkits !== void 0 && { toolkits: parsed.toolkits }
+          ...parsed.toolkits !== void 0 && { toolkits: parsed.toolkits },
+          ...bundledMcpResult.mcpServers !== void 0 && {
+            mcpServers: bundledMcpResult.mcpServers
+          }
         }
       };
       return { info: promptInfo, content: parsed.content };

package/dist/session/chat-session.cjs

@@ -166,6 +166,7 @@ class ChatSession {
   async initializeServices() {
     const runtimeConfig = this.services.stateManager.getRuntimeConfig(this.id);
     const llmConfig = runtimeConfig.llm;
+    const workspace = await this.services.workspaceManager?.getWorkspace();
     this.historyProvider = (0, import_factory.createDatabaseHistoryProvider)(
       this.services.storageManager.getDatabase(),
       this.id,
@@ -185,8 +186,11 @@ class ChatSession {
       // Pass ResourceManager for blob storage
       this.logger,
       // Pass logger for dependency injection
-      compactionStrategy
-      // Pass compaction strategy
+      {
+        usageScopeId: runtimeConfig.usageScopeId,
+        compactionStrategy,
+        cwd: workspace?.path
+      }
     );
     this.logger.debug(`ChatSession ${this.id}: Services initialized with storage`);
   }
@@ -472,6 +476,8 @@ class ChatSession {
    */
   async switchLLM(newLLMConfig) {
     try {
+      const runtimeConfig = this.services.stateManager.getRuntimeConfig(this.id);
+      const workspace = await this.services.workspaceManager?.getWorkspace();
       const compactionStrategy = this.services.compactionStrategy;
       const newLLMService = (0, import_factory2.createLLMService)(
         newLLMConfig,
@@ -484,8 +490,11 @@ class ChatSession {
         this.id,
         this.services.resourceManager,
         this.logger,
-        compactionStrategy
-        // Pass compaction strategy
+        {
+          usageScopeId: runtimeConfig.usageScopeId,
+          compactionStrategy,
+          cwd: workspace?.path
+        }
       );
       this.llmService = newLLMService;
       this.logger.info(

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

@@ -121,6 +121,7 @@ export declare class ChatSession {
         hookManager: HookManager;
         mcpManager: MCPManager;
         sessionManager: import('./session-manager.js').SessionManager;
+        workspaceManager?: import('../workspace/manager.js').WorkspaceManager;
         compactionStrategy: CompactionStrategy | null;
     }, id: string, logger: Logger);
     /**

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

@@ -147,6 +147,7 @@ class ChatSession {
   async initializeServices() {
     const runtimeConfig = this.services.stateManager.getRuntimeConfig(this.id);
     const llmConfig = runtimeConfig.llm;
+    const workspace = await this.services.workspaceManager?.getWorkspace();
     this.historyProvider = createDatabaseHistoryProvider(
       this.services.storageManager.getDatabase(),
       this.id,
@@ -166,8 +167,11 @@ class ChatSession {
       // Pass ResourceManager for blob storage
       this.logger,
       // Pass logger for dependency injection
-      compactionStrategy
-      // Pass compaction strategy
+      {
+        usageScopeId: runtimeConfig.usageScopeId,
+        compactionStrategy,
+        cwd: workspace?.path
+      }
     );
     this.logger.debug(`ChatSession ${this.id}: Services initialized with storage`);
   }
@@ -453,6 +457,8 @@ class ChatSession {
    */
   async switchLLM(newLLMConfig) {
     try {
+      const runtimeConfig = this.services.stateManager.getRuntimeConfig(this.id);
+      const workspace = await this.services.workspaceManager?.getWorkspace();
       const compactionStrategy = this.services.compactionStrategy;
       const newLLMService = createLLMService(
         newLLMConfig,
@@ -465,8 +471,11 @@ class ChatSession {
         this.id,
         this.services.resourceManager,
         this.logger,
-        compactionStrategy
-        // Pass compaction strategy
+        {
+          usageScopeId: runtimeConfig.usageScopeId,
+          compactionStrategy,
+          cwd: workspace?.path
+        }
       );
       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.
    */