@dexto/core 1.6.24 → 1.6.26

package/dist/llm/services/vercel.cjs

@@ -66,14 +66,13 @@ __export(vercel_exports, {
   VercelLLMService: () => VercelLLMService
 });
 module.exports = __toCommonJS(vercel_exports);
-var import_types2 = require("../../logger/v2/types.js");
+var import_types = require("../../logger/v2/types.js");
 var import_manager = require("../../context/manager.js");
 var import_registry = require("../registry/index.js");
 var import_vercel = require("../formatters/vercel.js");
 var import_decorators = require("../../telemetry/decorators.js");
 var import_api = require("@opentelemetry/api");
 var import_turn_executor = require("../executor/turn-executor.js");
-var import_message_queue = require("../../session/message-queue.js");
 var import_DextoRuntimeError = require("../../errors/DextoRuntimeError.js");
 var import_error_codes = require("../error-codes.js");
 var _VercelLLMService_decorators, _init;
@@ -100,8 +99,8 @@ class VercelLLMService {
   getModelId() {
     return typeof this.model === "string" ? this.model : this.model.modelId;
   }
-  constructor(toolManager, model, systemPromptManager, historyProvider, sessionEventBus, config, sessionId, resourceManager, logger, usageScopeId, compactionStrategy) {
-    this.logger = logger.createChild(import_types2.DextoLogComponent.LLM);
+  constructor(toolManager, model, systemPromptManager, historyProvider, sessionEventBus, config, sessionId, resourceManager, logger, messageQueue, usageScopeId, compactionStrategy) {
+    this.logger = logger.createChild(import_types.DextoLogComponent.LLM);
     this.model = model;
     this.config = config;
     this.toolManager = toolManager;
@@ -110,7 +109,7 @@ class VercelLLMService {
     this.resourceManager = resourceManager;
     this.usageScopeId = usageScopeId;
     this.compactionStrategy = compactionStrategy ?? null;
-    this.messageQueue = new import_message_queue.MessageQueueService(this.sessionEventBus, this.logger);
+    this.messageQueue = messageQueue;
     const formatter = new import_vercel.VercelMessageFormatter(this.logger);
     const maxInputTokens = (0, import_registry.getEffectiveMaxInputTokens)(config, this.logger);
     if (this.compactionStrategy) {

package/dist/llm/services/vercel.d.ts

@@ -1,6 +1,6 @@
 import { LanguageModel } from 'ai';
 import { ToolManager } from '../../tools/tool-manager.js';
-import { LLMServiceConfig } from './types.js';
+import type { LLMServiceConfig } from './types.js';
 import type { Logger } from '../../logger/v2/types.js';
 import { ToolSet } from '../../tools/types.js';
 import { ContextManager } from '../../context/manager.js';
@@ -12,7 +12,7 @@ import { MessageQueueService } from '../../session/message-queue.js';
 import type { ResourceManager } from '../../resources/index.js';
 import type { ContentInput } from '../../agent/types.js';
 /**
- * Vercel AI SDK implementation of LLMService
+ * Vercel AI SDK implementation of the core session LLM runtime
  *
  * This service delegates actual LLM execution to TurnExecutor, which handles:
  * - Tool execution with multimodal support
@@ -42,7 +42,7 @@ export declare class VercelLLMService {
      * Helper to extract model ID from LanguageModel union type (string | LanguageModelV2)
      */
     private getModelId;
-    constructor(toolManager: ToolManager, model: LanguageModel, systemPromptManager: SystemPromptManager, historyProvider: ConversationHistoryProvider, sessionEventBus: SessionEventBus, config: ValidatedLLMConfig, sessionId: string, resourceManager: ResourceManager, logger: Logger, usageScopeId?: string, compactionStrategy?: import('../../context/compaction/types.js').CompactionStrategy | null);
+    constructor(toolManager: ToolManager, model: LanguageModel, systemPromptManager: SystemPromptManager, historyProvider: ConversationHistoryProvider, sessionEventBus: SessionEventBus, config: ValidatedLLMConfig, sessionId: string, resourceManager: ResourceManager, logger: Logger, messageQueue: MessageQueueService, usageScopeId?: string, compactionStrategy?: import('../../context/compaction/types.js').CompactionStrategy | null);
     getAllTools(): Promise<ToolSet>;
     getEnabledTools(): Promise<ToolSet>;
     /**

package/dist/llm/services/vercel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vercel.d.ts","sourceRoot":"","sources":["../../../src/llm/services/vercel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAqB,MAAM,IAAI,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAI1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAClF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAIxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAGhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;;;;;GAaG;AACH,qBAIa,gBAAgB;IACzB,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,YAAY,CAAsB;IAC1C,OAAO,CAAC,kBAAkB,CAEf;IACX,OAAO,CAAC,WAAW,CAAC,CAAc;IAClC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAElD;;OAEG;IACH,OAAO,CAAC,UAAU;gBAKd,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,aAAa,EACpB,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,2BAA2B,EAC5C,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,kBAAkB,EAC1B,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,MAAM,EACrB,kBAAkB,CAAC,EAAE,OAAO,mCAAmC,EAAE,kBAAkB,GAAG,IAAI;IAwC9F,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAI/B,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC;IAMnC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IA0B1B;;OAEG;IACH,OAAc,YAAY,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAE7C;;;;;;;OAOG;IACG,MAAM,CACR,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACnC,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IA0D5B;;;OAGG;IACH,SAAS,IAAI,gBAAgB;IA+B7B;;OAEG;IACH,iBAAiB,IAAI,cAAc,CAAC,OAAO,CAAC;IAI5C;;OAEG;IACH,eAAe,IAAI,mBAAmB;IAItC;;OAEG;IACH,qBAAqB,IAAI,OAAO,mCAAmC,EAAE,kBAAkB,GAAG,IAAI;IAI9F,gBAAgB,IAAI,aAAa;CAGpC"}
+{"version":3,"file":"vercel.d.ts","sourceRoot":"","sources":["../../../src/llm/services/vercel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAqB,MAAM,IAAI,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAI1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAClF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAIxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAGhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;;;;;GAaG;AACH,qBAIa,gBAAgB;IACzB,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,YAAY,CAAsB;IAC1C,OAAO,CAAC,kBAAkB,CAEf;IACX,OAAO,CAAC,WAAW,CAAC,CAAc;IAClC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAElD;;OAEG;IACH,OAAO,CAAC,UAAU;gBAKd,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,aAAa,EACpB,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,2BAA2B,EAC5C,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,kBAAkB,EAC1B,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,mBAAmB,EACjC,YAAY,CAAC,EAAE,MAAM,EACrB,kBAAkB,CAAC,EAAE,OAAO,mCAAmC,EAAE,kBAAkB,GAAG,IAAI;IAuC9F,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAI/B,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC;IAMnC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IA0B1B;;OAEG;IACH,OAAc,YAAY,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAE7C;;;;;;;OAOG;IACG,MAAM,CACR,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACnC,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IA0D5B;;;OAGG;IACH,SAAS,IAAI,gBAAgB;IA+B7B;;OAEG;IACH,iBAAiB,IAAI,cAAc,CAAC,OAAO,CAAC;IAI5C;;OAEG;IACH,eAAe,IAAI,mBAAmB;IAItC;;OAEG;IACH,qBAAqB,IAAI,OAAO,mCAAmC,EAAE,kBAAkB,GAAG,IAAI;IAI9F,gBAAgB,IAAI,aAAa;CAGpC"}

package/dist/llm/services/vercel.js

@@ -11,7 +11,6 @@ import { VercelMessageFormatter } from "../formatters/vercel.js";
 import { InstrumentClass } from "../../telemetry/decorators.js";
 import { trace, context, propagation } from "@opentelemetry/api";
 import { TurnExecutor } from "../executor/turn-executor.js";
-import { MessageQueueService } from "../../session/message-queue.js";
 import { DextoRuntimeError } from "../../errors/DextoRuntimeError.js";
 import { LLMErrorCode } from "../error-codes.js";
 _VercelLLMService_decorators = [InstrumentClass({
@@ -37,7 +36,7 @@ class VercelLLMService {
   getModelId() {
     return typeof this.model === "string" ? this.model : this.model.modelId;
   }
-  constructor(toolManager, model, systemPromptManager, historyProvider, sessionEventBus, config, sessionId, resourceManager, logger, usageScopeId, compactionStrategy) {
+  constructor(toolManager, model, systemPromptManager, historyProvider, sessionEventBus, config, sessionId, resourceManager, logger, messageQueue, usageScopeId, compactionStrategy) {
     this.logger = logger.createChild(DextoLogComponent.LLM);
     this.model = model;
     this.config = config;
@@ -47,7 +46,7 @@ class VercelLLMService {
     this.resourceManager = resourceManager;
     this.usageScopeId = usageScopeId;
     this.compactionStrategy = compactionStrategy ?? null;
-    this.messageQueue = new MessageQueueService(this.sessionEventBus, this.logger);
+    this.messageQueue = messageQueue;
     const formatter = new VercelMessageFormatter(this.logger);
     const maxInputTokens = getEffectiveMaxInputTokens(config, this.logger);
     if (this.compactionStrategy) {

package/dist/logger/default-logger-factory.d.ts

@@ -27,13 +27,13 @@ export declare const DefaultLoggerFactoryConfigSchema: z.ZodObject<{
         }, "strict", z.ZodTypeAny, {
             path: string;
             type: "file";
-            maxFiles: number;
             maxSize: number;
+            maxFiles: number;
         }, {
             path: string;
             type: "file";
-            maxFiles?: number | undefined;
             maxSize?: number | undefined;
+            maxFiles?: number | undefined;
         }>, z.ZodObject<{
             type: z.ZodLiteral<"upstash">;
             url: z.ZodString;
@@ -66,8 +66,8 @@ export declare const DefaultLoggerFactoryConfigSchema: z.ZodObject<{
         } | {
             path: string;
             type: "file";
-            maxFiles: number;
             maxSize: number;
+            maxFiles: number;
         } | {
             token: string;
             type: "upstash";
@@ -86,8 +86,8 @@ export declare const DefaultLoggerFactoryConfigSchema: z.ZodObject<{
         } | {
             path: string;
             type: "file";
-            maxFiles?: number | undefined;
             maxSize?: number | undefined;
+            maxFiles?: number | undefined;
         } | {
             token: string;
             type: "upstash";
@@ -108,8 +108,8 @@ export declare const DefaultLoggerFactoryConfigSchema: z.ZodObject<{
         } | {
             path: string;
             type: "file";
-            maxFiles: number;
             maxSize: number;
+            maxFiles: number;
         } | {
             token: string;
             type: "upstash";
@@ -131,8 +131,8 @@ export declare const DefaultLoggerFactoryConfigSchema: z.ZodObject<{
         } | {
             path: string;
             type: "file";
-            maxFiles?: number | undefined;
             maxSize?: number | undefined;
+            maxFiles?: number | undefined;
         } | {
             token: string;
             type: "upstash";
@@ -179,13 +179,13 @@ export declare const defaultLoggerFactory: {
             }, "strict", z.ZodTypeAny, {
                 path: string;
                 type: "file";
-                maxFiles: number;
                 maxSize: number;
+                maxFiles: number;
             }, {
                 path: string;
                 type: "file";
-                maxFiles?: number | undefined;
                 maxSize?: number | undefined;
+                maxFiles?: number | undefined;
             }>, z.ZodObject<{
                 type: z.ZodLiteral<"upstash">;
                 url: z.ZodString;
@@ -218,8 +218,8 @@ export declare const defaultLoggerFactory: {
             } | {
                 path: string;
                 type: "file";
-                maxFiles: number;
                 maxSize: number;
+                maxFiles: number;
             } | {
                 token: string;
                 type: "upstash";
@@ -238,8 +238,8 @@ export declare const defaultLoggerFactory: {
             } | {
                 path: string;
                 type: "file";
-                maxFiles?: number | undefined;
                 maxSize?: number | undefined;
+                maxFiles?: number | undefined;
             } | {
                 token: string;
                 type: "upstash";
@@ -260,8 +260,8 @@ export declare const defaultLoggerFactory: {
             } | {
                 path: string;
                 type: "file";
-                maxFiles: number;
                 maxSize: number;
+                maxFiles: number;
             } | {
                 token: string;
                 type: "upstash";
@@ -283,8 +283,8 @@ export declare const defaultLoggerFactory: {
             } | {
                 path: string;
                 type: "file";
-                maxFiles?: number | undefined;
                 maxSize?: number | undefined;
+                maxFiles?: number | undefined;
             } | {
                 token: string;
                 type: "upstash";

package/dist/logger/v2/schemas.d.ts

@@ -31,13 +31,13 @@ export declare const LoggerTransportSchema: z.ZodDiscriminatedUnion<"type", [z.Z
 }, "strict", z.ZodTypeAny, {
     path: string;
     type: "file";
-    maxFiles: number;
     maxSize: number;
+    maxFiles: number;
 }, {
     path: string;
     type: "file";
-    maxFiles?: number | undefined;
     maxSize?: number | undefined;
+    maxFiles?: number | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"upstash">;
     url: z.ZodString;
@@ -89,13 +89,13 @@ export declare const LoggerConfigSchema: z.ZodObject<{
     }, "strict", z.ZodTypeAny, {
         path: string;
         type: "file";
-        maxFiles: number;
         maxSize: number;
+        maxFiles: number;
     }, {
         path: string;
         type: "file";
-        maxFiles?: number | undefined;
         maxSize?: number | undefined;
+        maxFiles?: number | undefined;
     }>, z.ZodObject<{
         type: z.ZodLiteral<"upstash">;
         url: z.ZodString;
@@ -128,8 +128,8 @@ export declare const LoggerConfigSchema: z.ZodObject<{
     } | {
         path: string;
         type: "file";
-        maxFiles: number;
         maxSize: number;
+        maxFiles: number;
     } | {
         token: string;
         type: "upstash";
@@ -148,8 +148,8 @@ export declare const LoggerConfigSchema: z.ZodObject<{
     } | {
         path: string;
         type: "file";
-        maxFiles?: number | undefined;
         maxSize?: number | undefined;
+        maxFiles?: number | undefined;
     } | {
         token: string;
         type: "upstash";

package/dist/mcp/schemas.d.ts

@@ -55,8 +55,8 @@ export declare const SseServerConfigSchema: z.ZodObject<{
     timeout: number;
     type: "sse";
     enabled: boolean;
-    connectionMode: "strict" | "lenient";
     url: string;
+    connectionMode: "strict" | "lenient";
     headers: Record<string, string>;
 }, {
     type: "sse";
@@ -79,8 +79,8 @@ export declare const HttpServerConfigSchema: z.ZodObject<{
     timeout: number;
     type: "http";
     enabled: boolean;
-    connectionMode: "strict" | "lenient";
     url: string;
+    connectionMode: "strict" | "lenient";
     headers: Record<string, string>;
 }, {
     type: "http";
@@ -127,8 +127,8 @@ export declare const McpServerConfigSchema: z.ZodBranded<z.ZodEffects<z.ZodDiscr
     timeout: number;
     type: "sse";
     enabled: boolean;
-    connectionMode: "strict" | "lenient";
     url: string;
+    connectionMode: "strict" | "lenient";
     headers: Record<string, string>;
 }, {
     type: "sse";
@@ -148,8 +148,8 @@ export declare const McpServerConfigSchema: z.ZodBranded<z.ZodEffects<z.ZodDiscr
     timeout: number;
     type: "http";
     enabled: boolean;
-    connectionMode: "strict" | "lenient";
     url: string;
+    connectionMode: "strict" | "lenient";
     headers: Record<string, string>;
 }, {
     type: "http";
@@ -170,15 +170,15 @@ export declare const McpServerConfigSchema: z.ZodBranded<z.ZodEffects<z.ZodDiscr
     timeout: number;
     type: "sse";
     enabled: boolean;
-    connectionMode: "strict" | "lenient";
     url: string;
+    connectionMode: "strict" | "lenient";
     headers: Record<string, string>;
 } | {
     timeout: number;
     type: "http";
     enabled: boolean;
-    connectionMode: "strict" | "lenient";
     url: string;
+    connectionMode: "strict" | "lenient";
     headers: Record<string, string>;
 }, {
     type: "stdio";
@@ -240,8 +240,8 @@ export declare const ServersConfigSchema: z.ZodBranded<z.ZodRecord<z.ZodString,
     timeout: number;
     type: "sse";
     enabled: boolean;
-    connectionMode: "strict" | "lenient";
     url: string;
+    connectionMode: "strict" | "lenient";
     headers: Record<string, string>;
 }, {
     type: "sse";
@@ -261,8 +261,8 @@ export declare const ServersConfigSchema: z.ZodBranded<z.ZodRecord<z.ZodString,
     timeout: number;
     type: "http";
     enabled: boolean;
-    connectionMode: "strict" | "lenient";
     url: string;
+    connectionMode: "strict" | "lenient";
     headers: Record<string, string>;
 }, {
     type: "http";
@@ -283,15 +283,15 @@ export declare const ServersConfigSchema: z.ZodBranded<z.ZodRecord<z.ZodString,
     timeout: number;
     type: "sse";
     enabled: boolean;
-    connectionMode: "strict" | "lenient";
     url: string;
+    connectionMode: "strict" | "lenient";
     headers: Record<string, string>;
 } | {
     timeout: number;
     type: "http";
     enabled: boolean;
-    connectionMode: "strict" | "lenient";
     url: string;
+    connectionMode: "strict" | "lenient";
     headers: Record<string, string>;
 }, {
     type: "stdio";

package/dist/session/chat-session.cjs

@@ -28,6 +28,7 @@ var import_events = require("../events/index.js");
 var import_types = require("../logger/v2/types.js");
 var import_errors = require("../errors/index.js");
 var import_error_codes = require("../hooks/error-codes.js");
+var import_message_queue = require("./message-queue.js");
 var import_usage_metadata = require("../llm/usage-metadata.js");
 var import_codex_base_url = require("../llm/providers/codex-base-url.js");
 class ChatSession {
@@ -36,7 +37,7 @@ class ChatSession {
    *
    * Each session creates its own isolated services:
    * - ConversationHistoryProvider (with session-specific storage, shared across LLM switches)
-   * - LLMService (creates its own properly-typed ContextManager internally)
+   * - LLM service (creates its own properly-typed ContextManager internally)
    * - SessionEventBus (session-local event handling with forwarding)
    *
    * @param services - The shared services from the agent (state manager, prompt, client managers, etc.)
@@ -48,6 +49,12 @@ class ChatSession {
     this.id = id;
     this.logger = logger.createChild(import_types.DextoLogComponent.SESSION);
     this.eventBus = new import_events.SessionEventBus();
+    this.messageQueue = new import_message_queue.MessageQueueService(
+      this.eventBus,
+      this.logger,
+      this.id,
+      this.services.messageQueueStore
+    );
     this.setupEventForwarding();
     this.logger.debug(`ChatSession ${this.id}: Created, awaiting initialization`);
   }
@@ -71,10 +78,15 @@ class ChatSession {
   /**
    * Handles AI model interactions, tool execution, and response generation for this session.
    *
-   * Each session has its own LLMService instance that uses the session's
+   * Each session has its own LLM runtime instance that uses the session's
    * ContextManager and event bus.
    */
   llmService;
+  /**
+   * Durable queued follow-up messages for this session.
+   * Reused across LLM switches so mid-task follow-ups survive service recreation.
+   */
+  messageQueue;
   /**
    * Map of event forwarder functions for cleanup.
    * Stores the bound functions so they can be removed from the event bus.
@@ -166,33 +178,35 @@ class ChatSession {
   async initializeServices() {
     const runtimeConfig = this.services.stateManager.getRuntimeConfig(this.id);
     const llmConfig = runtimeConfig.llm;
-    const workspace = await this.services.workspaceManager?.getWorkspace();
+    await this.messageQueue.initialize();
     this.historyProvider = (0, import_factory.createDatabaseHistoryProvider)(
       this.services.storageManager.getDatabase(),
       this.id,
       this.logger
     );
-    const compactionStrategy = this.services.compactionStrategy;
-    this.llmService = (0, import_factory2.createLLMService)(
+    this.llmService = await this.createSessionLLMService(llmConfig, runtimeConfig.usageScopeId);
+    this.logger.debug(`ChatSession ${this.id}: Services initialized with storage`);
+  }
+  async createSessionLLMService(llmConfig, usageScopeId) {
+    const workspace = await this.services.workspaceManager?.getWorkspace();
+    const options = {
+      usageScopeId,
+      compactionStrategy: this.services.compactionStrategy,
+      ...workspace?.path !== void 0 && { cwd: workspace.path },
+      messageQueue: this.messageQueue
+    };
+    return (0, import_factory2.createLLMService)(
       llmConfig,
       this.services.toolManager,
       this.services.systemPromptManager,
       this.historyProvider,
-      // Pass history provider for service to use
       this.eventBus,
-      // Use session event bus
       this.id,
       this.services.resourceManager,
-      // Pass ResourceManager for blob storage
       this.logger,
-      // Pass logger for dependency injection
-      {
-        usageScopeId: runtimeConfig.usageScopeId,
-        compactionStrategy,
-        cwd: workspace?.path
-      }
+      options,
+      this.services.languageModelFactory
     );
-    this.logger.debug(`ChatSession ${this.id}: Services initialized with storage`);
   }
   /**
    * Saves a blocked interaction to history when a plugin blocks execution.
@@ -448,9 +462,9 @@ class ChatSession {
     return this.llmService.getContextManager();
   }
   /**
-   * Gets the session's LLMService instance.
+   * Gets the session's LLM service instance.
    *
-   * @returns The LLMService for this session
+   * @returns The session LLM service for this session
    */
   getLLMService() {
     return this.llmService;
@@ -477,26 +491,10 @@ 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)(
+      this.llmService = await this.createSessionLLMService(
         newLLMConfig,
-        this.services.toolManager,
-        this.services.systemPromptManager,
-        this.historyProvider,
-        // Pass the SAME history provider - preserves conversation!
-        this.eventBus,
-        // Use session event bus
-        this.id,
-        this.services.resourceManager,
-        this.logger,
-        {
-          usageScopeId: runtimeConfig.usageScopeId,
-          compactionStrategy,
-          cwd: workspace?.path
-        }
+        runtimeConfig.usageScopeId
       );
-      this.llmService = newLLMService;
       this.logger.info(
         `ChatSession ${this.id}: LLM switched to ${newLLMConfig.provider}/${newLLMConfig.model}`
       );
@@ -562,8 +560,8 @@ class ChatSession {
    * @param message The user message to queue
    * @returns Queue position and message ID
    */
-  queueMessage(message) {
-    return this.llmService.getMessageQueue().enqueue(message);
+  async queueMessage(message) {
+    return await this.llmService.getMessageQueue().enqueue(message);
   }
   /**
    * Get all messages currently in the queue.
@@ -577,17 +575,17 @@ class ChatSession {
    * @param id Message ID to remove
    * @returns true if message was found and removed; false otherwise
    */
-  removeQueuedMessage(id) {
-    return this.llmService.getMessageQueue().remove(id);
+  async removeQueuedMessage(id) {
+    return await this.llmService.getMessageQueue().remove(id);
   }
   /**
    * Clear all queued messages.
    * @returns Number of messages that were cleared
    */
-  clearMessageQueue() {
+  async clearMessageQueue() {
     const queue = this.llmService.getMessageQueue();
     const count = queue.pendingCount();
-    queue.clear();
+    await queue.clear();
     return count;
   }
   /**

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

@@ -1,5 +1,5 @@
 import type { ContextManager } from '../context/index.js';
-import type { VercelLLMService } from '../llm/services/vercel.js';
+import type { LanguageModelFactory } from '../llm/services/types.js';
 import type { SystemPromptManager } from '../systemPrompt/manager.js';
 import type { ToolManager } from '../tools/tool-manager.js';
 import type { ValidatedLLMConfig } from '../llm/schemas.js';
@@ -10,9 +10,11 @@ import type { MCPManager } from '../mcp/manager.js';
 import { SessionEventBus, AgentEventBus } from '../events/index.js';
 import type { Logger } from '../logger/v2/types.js';
 import type { InternalMessage } from '../context/types.js';
-import type { UserMessageInput } from './message-queue.js';
+import { type UserMessageInput } from './message-queue.js';
+import type { MessageQueueStore } from './message-queue-store.js';
 import type { ContentInput } from '../agent/types.js';
 import type { CompactionStrategy } from '../context/compaction/types.js';
+import type { VercelLLMService } from '../llm/services/vercel.js';
 /**
  * Represents an isolated conversation session within a Dexto agent.
  *
@@ -25,7 +27,7 @@ import type { CompactionStrategy } from '../context/compaction/types.js';
  * The ChatSession acts as a lightweight wrapper around core Dexto services, providing
  * session-specific instances of:
  * - **ContextManager**: Handles conversation history and message formatting
- * - **LLMService**: Manages AI model interactions and tool execution
+ * - **VercelLLMService**: Manages AI model interactions and tool execution
  * - **TypedEventEmitter**: Provides session-scoped event handling
  *
  * ## Event Handling
@@ -55,7 +57,7 @@ import type { CompactionStrategy } from '../context/compaction/types.js';
  *
  * @see {@link SessionManager} for session lifecycle management
  * @see {@link ContextManager} for conversation history management
- * @see {@link VercelLLMService} for AI model interaction
+ * @see {@link createLLMService} for the default AI model integration path
  */
 export declare class ChatSession {
     private services;
@@ -80,10 +82,15 @@ export declare class ChatSession {
     /**
      * Handles AI model interactions, tool execution, and response generation for this session.
      *
-     * Each session has its own LLMService instance that uses the session's
+     * Each session has its own LLM runtime instance that uses the session's
      * ContextManager and event bus.
      */
     private llmService;
+    /**
+     * Durable queued follow-up messages for this session.
+     * Reused across LLM switches so mid-task follow-ups survive service recreation.
+     */
+    private messageQueue;
     /**
      * Map of event forwarder functions for cleanup.
      * Stores the bound functions so they can be removed from the event bus.
@@ -104,7 +111,7 @@ export declare class ChatSession {
      *
      * Each session creates its own isolated services:
      * - ConversationHistoryProvider (with session-specific storage, shared across LLM switches)
-     * - LLMService (creates its own properly-typed ContextManager internally)
+     * - LLM service (creates its own properly-typed ContextManager internally)
      * - SessionEventBus (session-local event handling with forwarding)
      *
      * @param services - The shared services from the agent (state manager, prompt, client managers, etc.)
@@ -121,6 +128,8 @@ export declare class ChatSession {
         hookManager: HookManager;
         mcpManager: MCPManager;
         sessionManager: import('./session-manager.js').SessionManager;
+        messageQueueStore: Pick<MessageQueueStore, 'load' | 'save' | 'delete'>;
+        languageModelFactory?: LanguageModelFactory;
         workspaceManager?: import('../workspace/manager.js').WorkspaceManager;
         compactionStrategy: CompactionStrategy | null;
     }, id: string, logger: Logger);
@@ -147,6 +156,7 @@ export declare class ChatSession {
      * Initializes session-specific services.
      */
     private initializeServices;
+    private createSessionLLMService;
     /**
      * Saves a blocked interaction to history when a plugin blocks execution.
      * This ensures that even when a plugin blocks execution (e.g., due to abusive language),
@@ -240,9 +250,9 @@ export declare class ChatSession {
      */
     getContextManager(): ContextManager<unknown>;
     /**
-     * Gets the session's LLMService instance.
+     * Gets the session's LLM service instance.
      *
-     * @returns The LLMService for this session
+     * @returns The session LLM service for this session
      */
     getLLMService(): VercelLLMService;
     /**
@@ -291,11 +301,11 @@ export declare class ChatSession {
      * @param message The user message to queue
      * @returns Queue position and message ID
      */
-    queueMessage(message: UserMessageInput): {
+    queueMessage(message: UserMessageInput): Promise<{
         queued: true;
         position: number;
         id: string;
-    };
+    }>;
     /**
      * Get all messages currently in the queue.
      * @returns Array of queued messages
@@ -306,12 +316,12 @@ export declare class ChatSession {
      * @param id Message ID to remove
      * @returns true if message was found and removed; false otherwise
      */
-    removeQueuedMessage(id: string): boolean;
+    removeQueuedMessage(id: string): Promise<boolean>;
     /**
      * Clear all queued messages.
      * @returns Number of messages that were cleared
      */
-    clearMessageQueue(): number;
+    clearMessageQueue(): Promise<number>;
     /**
      * Cancel the currently running turn for this session, if any.
      * Returns true if a run was in progress and was signaled to abort.

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":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EACH,eAAe,EACf,aAAa,EAIhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,qBAAqB,CAAC;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAGzE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,qBAAa,WAAW;IA6DhB,OAAO,CAAC,QAAQ;aAaA,EAAE,EAAE,MAAM;IAzE9B;;;;;;;;;;OAUG;IACH,SAAgB,QAAQ,EAAE,eAAe,CAAC;IAE1C;;;OAGG;IACH,OAAO,CAAC,eAAe,CAA+B;IAEtD;;;;;OAKG;IACH,OAAO,CAAC,UAAU,CAAoB;IAEtC;;;OAGG;IACH,OAAO,CAAC,UAAU,CAA6D;IAE/E;;OAEG;IACH,OAAO,CAAC,wBAAwB,CACvB;IAET;;;OAGG;IACH,OAAO,CAAC,oBAAoB,CAAgC;IAE5D,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B;;;;;;;;;;;OAWG;gBAES,QAAQ,EAAE;QACd,YAAY,EAAE,iBAAiB,CAAC;QAChC,mBAAmB,EAAE,mBAAmB,CAAC;QACzC,WAAW,EAAE,WAAW,CAAC;QACzB,aAAa,EAAE,aAAa,CAAC;QAC7B,cAAc,EAAE,cAAc,CAAC;QAC/B,eAAe,EAAE,OAAO,uBAAuB,EAAE,eAAe,CAAC;QACjE,WAAW,EAAE,WAAW,CAAC;QACzB,UAAU,EAAE,UAAU,CAAC;QACvB,cAAc,EAAE,OAAO,sBAAsB,EAAE,cAAc,CAAC;QAC9D,gBAAgB,CAAC,EAAE,OAAO,yBAAyB,EAAE,gBAAgB,CAAC;QACtE,kBAAkB,EAAE,kBAAkB,GAAG,IAAI,CAAC;KACjD,EACe,EAAE,EAAE,MAAM,EAC1B,MAAM,EAAE,MAAM;IAalB;;;OAGG;IACU,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIlC;;;;;;;OAOG;IACH,OAAO,CAAC,oBAAoB;IA4B5B;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAmD9B;;OAEG;YACW,kBAAkB;IAqChC;;;;;;;;;;OAUG;YACW,sBAAsB;IA2CpC;;;;;;;;;;;;;;;;;;;;OAoBG;IACU,MAAM,CACf,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACnC,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAiL5B;;OAEG;IACH,OAAO,CAAC,cAAc;IAetB;;;;;;;;;;;;;;;;;;;;OAoBG;IACU,UAAU;IAIvB;;;;;;;;;;;;;;;;;;;;OAoBG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IASnC;;;;OAIG;IACI,iBAAiB,IAAI,cAAc,CAAC,OAAO,CAAC;IAInD;;;;OAIG;IACI,aAAa,IAAI,gBAAgB;IAIxC;;;;;;;;;;;;;;;;;;OAkBG;IACU,SAAS,CAAC,YAAY,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA6CvE;;;;OAIG;IACU,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBrC;;;;;;OAMG;IACI,OAAO,IAAI,IAAI;IAoBtB;;;OAGG;IACI,MAAM,IAAI,OAAO;IAIxB;;;;;;OAMG;IACI,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG;QAAE,MAAM,EAAE,IAAI,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE;IAI9F;;;OAGG;IACI,iBAAiB,IAAI,OAAO,YAAY,EAAE,aAAa,EAAE;IAIhE;;;;OAIG;IACI,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAI/C;;;OAGG;IACI,iBAAiB,IAAI,MAAM;IAOlC;;;OAGG;IACI,MAAM,IAAI,OAAO;CAa3B"}
+{"version":3,"file":"chat-session.d.ts","sourceRoot":"","sources":["../../src/session/chat-session.ts"],"names":[],"mappings":"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"}