@dexto/core 1.6.25 → 1.6.27

package/dist/llm/executor/turn-executor.js

@@ -22,7 +22,7 @@ import { isCodexBaseURL } from "../providers/codex-base-url.js";
 const toolSupportCache = /* @__PURE__ */ new Map();
 const LOCAL_PROVIDERS = ["ollama", "local"];
 class TurnExecutor {
-  constructor(model, toolManager, contextManager, eventBus, resourceManager, sessionId, config, llmContext, logger, messageQueue, modelLimits, externalSignal, compactionStrategy = null) {
+  constructor(model, toolManager, contextManager, eventBus, resourceManager, sessionId, config, llmContext, logger, messageQueue, modelLimits, externalSignal, compactionStrategy = null, runContext) {
     this.model = model;
     this.toolManager = toolManager;
     this.contextManager = contextManager;
@@ -34,6 +34,7 @@ class TurnExecutor {
     this.messageQueue = messageQueue;
     this.modelLimits = modelLimits;
     this.externalSignal = externalSignal;
+    this.runContext = runContext;
     this.logger = logger.createChild(DextoLogComponent.EXECUTOR);
     this.stepAbortController = new AbortController();
     this.compactionStrategy = compactionStrategy;
@@ -86,7 +87,7 @@ class TurnExecutor {
       let lastStepTokens = null;
       let lastFinishReason = "unknown";
       let lastText = "";
-      this.eventBus.emit("llm:thinking");
+      this.eventBus.emit("llm:thinking", {});
       const supportsTools = await this.validateToolSupport();
       if (!supportsTools) {
         const modelKey = `${this.llmContext.provider}:${this.llmContext.model}`;
@@ -119,7 +120,7 @@ class TurnExecutor {
               once: true
             });
           }
-          const coalesced = this.messageQueue.dequeueAll();
+          const coalesced = await this.messageQueue.dequeueAll();
           if (coalesced) {
             await this.injectQueuedMessages(coalesced);
           }
@@ -252,7 +253,7 @@ class TurnExecutor {
             );
           }
           if (result.finishReason !== "tool-calls") {
-            const queuedOnTerminate = this.messageQueue.dequeueAll();
+            const queuedOnTerminate = await this.messageQueue.dequeueAll();
             if (queuedOnTerminate) {
               this.logger.debug(
                 `Continuing: ${queuedOnTerminate.messages.length} queued message(s) to process`
@@ -463,8 +464,11 @@ class TurnExecutor {
                     name,
                     args,
                     options.toolCallId,
-                    this.sessionId,
-                    abortSignal
+                    {
+                      sessionId: this.sessionId,
+                      abortSignal,
+                      ...this.runContext !== void 0 ? { runContext: this.runContext } : {}
+                    }
                   );
                   const metadata = (() => {
                     const meta = {};
@@ -689,7 +693,11 @@ class TurnExecutor {
     if (!this.stepAbortController.signal.aborted) {
       this.stepAbortController.abort();
     }
-    this.messageQueue.clear();
+    void this.messageQueue.clear().catch((error) => {
+      this.logger.warn(
+        `Failed to clear queued follow-up messages during cleanup: ${error instanceof Error ? error.message : String(error)}`
+      );
+    });
   }
   /**
    * Check if context should be compacted based on estimated token count.

package/dist/llm/services/factory.cjs

@@ -237,9 +237,9 @@ function createVercelModel(llmConfig, context) {
       throw import_errors.LLMError.unsupportedProvider(provider);
   }
 }
-function createLLMService(config, toolManager, systemPromptManager, historyProvider, sessionEventBus, sessionId, resourceManager, logger, options = {}) {
-  const { usageScopeId, compactionStrategy } = options;
-  const model = createVercelModel(config, {
+function createLLMService(config, toolManager, systemPromptManager, historyProvider, sessionEventBus, sessionId, resourceManager, logger, options, languageModelFactory) {
+  const { usageScopeId, compactionStrategy, messageQueue } = options;
+  const providerContext = {
     sessionId,
     ...options.cwd !== void 0 ? { cwd: options.cwd } : {},
     onCodexRateLimitStatus: (snapshot) => {
@@ -249,7 +249,12 @@ function createLLMService(config, toolManager, systemPromptManager, historyProvi
         snapshot
       });
     }
-  });
+  };
+  const model = languageModelFactory?.({
+    config,
+    context: providerContext,
+    createDefaultLanguageModel: () => createVercelModel(config, providerContext)
+  }) ?? createVercelModel(config, providerContext);
   return new import_vercel.VercelLLMService(
     toolManager,
     model,
@@ -260,6 +265,7 @@ function createLLMService(config, toolManager, systemPromptManager, historyProvi
     sessionId,
     resourceManager,
     logger,
+    messageQueue,
     usageScopeId,
     compactionStrategy
   );

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

@@ -6,26 +6,7 @@ import { SessionEventBus } from '../../events/index.js';
 import type { ConversationHistoryProvider } from '../../session/history/types.js';
 import type { SystemPromptManager } from '../../systemPrompt/manager.js';
 import type { Logger } from '../../logger/v2/types.js';
-import { type CodexRateLimitSnapshot } from '../providers/codex-app-server.js';
-import type { CompactionStrategy } from '../../context/compaction/types.js';
-/**
- * Context for model creation, including session info for usage tracking.
- */
-export interface DextoProviderContext {
-    /** Session ID for usage tracking */
-    sessionId?: string;
-    /** Client source for usage attribution (cli, web, sdk) */
-    clientSource?: 'cli' | 'web' | 'sdk';
-    /** Working directory for providers that need an explicit workspace root. */
-    cwd?: string;
-    /** Optional callback for ChatGPT Login rate-limit status updates from Codex. */
-    onCodexRateLimitStatus?: (snapshot: CodexRateLimitSnapshot) => void;
-}
-export interface CreateLLMServiceOptions {
-    usageScopeId?: string | undefined;
-    compactionStrategy?: CompactionStrategy | null | undefined;
-    cwd?: string | undefined;
-}
+import type { CreateLLMServiceOptions, DextoProviderContext, LanguageModelFactory } from './types.js';
 /**
  * Create a Vercel AI SDK LanguageModel from config.
  *
@@ -52,5 +33,5 @@ export declare function createVercelModel(llmConfig: ValidatedLLMConfig, context
  * @param options Session-scoped runtime options
  * @returns VercelLLMService instance
  */
-export declare function createLLMService(config: ValidatedLLMConfig, toolManager: ToolManager, systemPromptManager: SystemPromptManager, historyProvider: ConversationHistoryProvider, sessionEventBus: SessionEventBus, sessionId: string, resourceManager: import('../../resources/index.js').ResourceManager, logger: Logger, options?: CreateLLMServiceOptions): VercelLLMService;
+export declare function createLLMService(config: ValidatedLLMConfig, toolManager: ToolManager, systemPromptManager: SystemPromptManager, historyProvider: ConversationHistoryProvider, sessionEventBus: SessionEventBus, sessionId: string, resourceManager: import('../../resources/index.js').ResourceManager, logger: Logger, options: CreateLLMServiceOptions, languageModelFactory?: LanguageModelFactory): VercelLLMService;
 //# sourceMappingURL=factory.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/llm/services/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAYnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAClF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,EAEH,KAAK,sBAAsB,EAC9B,MAAM,kCAAkC,CAAC;AAQ1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AA2C5E;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,oCAAoC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0DAA0D;IAC1D,YAAY,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;IACrC,4EAA4E;IAC5E,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,gFAAgF;IAChF,sBAAsB,CAAC,EAAE,CAAC,QAAQ,EAAE,sBAAsB,KAAK,IAAI,CAAC;CACvE;AAED,MAAM,WAAW,uBAAuB;IACpC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,kBAAkB,CAAC,EAAE,kBAAkB,GAAG,IAAI,GAAG,SAAS,CAAC;IAC3D,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B;AAUD;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAC7B,SAAS,EAAE,kBAAkB,EAC7B,OAAO,CAAC,EAAE,oBAAoB,GAC/B,aAAa,CAyOf;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAC5B,MAAM,EAAE,kBAAkB,EAC1B,WAAW,EAAE,WAAW,EACxB,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,2BAA2B,EAC5C,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,OAAO,0BAA0B,EAAE,eAAe,EACnE,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,uBAA4B,GACtC,gBAAgB,CA4BlB"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/llm/services/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAYnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAClF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EACR,uBAAuB,EACvB,oBAAoB,EACpB,oBAAoB,EACvB,MAAM,YAAY,CAAC;AA6DpB;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAC7B,SAAS,EAAE,kBAAkB,EAC7B,OAAO,CAAC,EAAE,oBAAoB,GAC/B,aAAa,CAyOf;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAC5B,MAAM,EAAE,kBAAkB,EAC1B,WAAW,EAAE,WAAW,EACxB,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,2BAA2B,EAC5C,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,OAAO,0BAA0B,EAAE,eAAe,EACnE,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,uBAAuB,EAChC,oBAAoB,CAAC,EAAE,oBAAoB,GAC5C,gBAAgB,CAoClB"}

package/dist/llm/services/factory.js

@@ -15,9 +15,7 @@ import { createCohere } from "@ai-sdk/cohere";
 import { createLocalLanguageModel } from "../providers/local/ai-sdk-adapter.js";
 import { requiresApiKey } from "../registry/index.js";
 import { getPrimaryApiKeyEnvVar, resolveApiKeyForProvider } from "../../utils/api-key-resolver.js";
-import {
-  createCodexLanguageModel
-} from "../providers/codex-app-server.js";
+import { createCodexLanguageModel } from "../providers/codex-app-server.js";
 import { isCodexBaseURL } from "../providers/codex-base-url.js";
 import { findDextoProjectRoot } from "../../utils/execution-context.js";
 import {
@@ -219,9 +217,9 @@ function createVercelModel(llmConfig, context) {
       throw LLMError.unsupportedProvider(provider);
   }
 }
-function createLLMService(config, toolManager, systemPromptManager, historyProvider, sessionEventBus, sessionId, resourceManager, logger, options = {}) {
-  const { usageScopeId, compactionStrategy } = options;
-  const model = createVercelModel(config, {
+function createLLMService(config, toolManager, systemPromptManager, historyProvider, sessionEventBus, sessionId, resourceManager, logger, options, languageModelFactory) {
+  const { usageScopeId, compactionStrategy, messageQueue } = options;
+  const providerContext = {
     sessionId,
     ...options.cwd !== void 0 ? { cwd: options.cwd } : {},
     onCodexRateLimitStatus: (snapshot) => {
@@ -231,7 +229,12 @@ function createLLMService(config, toolManager, systemPromptManager, historyProvi
         snapshot
       });
     }
-  });
+  };
+  const model = languageModelFactory?.({
+    config,
+    context: providerContext,
+    createDefaultLanguageModel: () => createVercelModel(config, providerContext)
+  }) ?? createVercelModel(config, providerContext);
   return new VercelLLMService(
     toolManager,
     model,
@@ -242,6 +245,7 @@ function createLLMService(config, toolManager, systemPromptManager, historyProvi
     sessionId,
     resourceManager,
     logger,
+    messageQueue,
     usageScopeId,
     compactionStrategy
   );

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

@@ -1,7 +1,11 @@
-import { LanguageModel } from 'ai';
+import type { CompactionStrategy } from '../../context/compaction/types.js';
+import type { LanguageModel } from 'ai';
+import type { CodexRateLimitSnapshot } from '../providers/codex-app-server.js';
+import type { ValidatedLLMConfig } from '../schemas.js';
 import type { LLMProvider } from '../types.js';
+import type { MessageQueueService } from '../../session/message-queue.js';
 /**
- * Configuration object returned by LLMService.getConfig()
+ * Configuration object returned by the default session LLM service.
  */
 export type LLMServiceConfig = {
     provider: LLMProvider;
@@ -9,6 +13,33 @@ export type LLMServiceConfig = {
     configuredMaxInputTokens?: number | null;
     modelMaxInputTokens?: number | null;
 };
+export interface CreateLLMServiceOptions {
+    usageScopeId?: string | undefined;
+    compactionStrategy?: CompactionStrategy | null | undefined;
+    cwd?: string | undefined;
+    messageQueue: MessageQueueService;
+}
+/**
+ * Context for model creation, including session info for usage tracking.
+ */
+export interface DextoProviderContext {
+    /** Session ID for usage tracking */
+    sessionId?: string;
+    /** Client source for usage attribution (cli, web, sdk) */
+    clientSource?: 'cli' | 'web' | 'sdk';
+    /** Working directory for providers that need an explicit workspace root. */
+    cwd?: string;
+    /** Optional callback for ChatGPT Login rate-limit status updates from Codex. */
+    onCodexRateLimitStatus?: (snapshot: CodexRateLimitSnapshot) => void;
+}
+export interface LanguageModelFactoryInput {
+    config: ValidatedLLMConfig;
+    context: DextoProviderContext;
+}
+export interface LanguageModelFactoryContext extends LanguageModelFactoryInput {
+    createDefaultLanguageModel: () => LanguageModel;
+}
+export type LanguageModelFactory = (context: LanguageModelFactoryContext) => LanguageModel;
 /**
  * Token usage statistics from LLM
  */

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/llm/services/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACnC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC3B,QAAQ,EAAE,WAAW,CAAC;IACtB,KAAK,EAAE,aAAa,CAAC;IACrB,wBAAwB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvC,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,aAAa;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/llm/services/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACxC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAE1E;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC3B,QAAQ,EAAE,WAAW,CAAC;IACtB,KAAK,EAAE,aAAa,CAAC;IACrB,wBAAwB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvC,CAAC;AAEF,MAAM,WAAW,uBAAuB;IACpC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,kBAAkB,CAAC,EAAE,kBAAkB,GAAG,IAAI,GAAG,SAAS,CAAC;IAC3D,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,YAAY,EAAE,mBAAmB,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,oCAAoC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0DAA0D;IAC1D,YAAY,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;IACrC,4EAA4E;IAC5E,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,gFAAgF;IAChF,sBAAsB,CAAC,EAAE,CAAC,QAAQ,EAAE,sBAAsB,KAAK,IAAI,CAAC;CACvE;AAED,MAAM,WAAW,yBAAyB;IACtC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,OAAO,EAAE,oBAAoB,CAAC;CACjC;AAED,MAAM,WAAW,2BAA4B,SAAQ,yBAAyB;IAC1E,0BAA0B,EAAE,MAAM,aAAa,CAAC;CACnD;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,EAAE,2BAA2B,KAAK,aAAa,CAAC;AAE3F;;GAEG;AACH,MAAM,WAAW,aAAa;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B"}

package/dist/llm/services/vercel.cjs

@@ -63,20 +63,36 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
 var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
 var vercel_exports = {};
 __export(vercel_exports, {
-  VercelLLMService: () => VercelLLMService
+  VercelLLMService: () => VercelLLMService,
+  ensureRunContextMatchesServiceSession: () => ensureRunContextMatchesServiceSession
 });
 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_types4 = require("../../errors/types.js");
 var import_error_codes = require("../error-codes.js");
 var _VercelLLMService_decorators, _init;
+function ensureRunContextMatchesServiceSession(serviceSessionId, runContext) {
+  if (runContext !== void 0 && runContext.sessionId !== serviceSessionId) {
+    throw new import_DextoRuntimeError.DextoRuntimeError(
+      import_error_codes.LLMErrorCode.GENERATION_FAILED,
+      import_types4.ErrorScope.LLM,
+      import_types4.ErrorType.SYSTEM,
+      `Run context session '${runContext.sessionId}' does not match LLM service session '${serviceSessionId}'`,
+      {
+        serviceSessionId,
+        runContextSessionId: runContext.sessionId
+      }
+    );
+  }
+  return serviceSessionId;
+}
 _VercelLLMService_decorators = [(0, import_decorators.InstrumentClass)({
   prefix: "llm.vercel",
   excludeMethods: ["getModelId", "getAllTools", "createTurnExecutor"]
@@ -100,8 +116,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 +126,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) {
@@ -139,7 +155,7 @@ class VercelLLMService {
   /**
    * Create a TurnExecutor instance for executing the agent loop.
    */
-  createTurnExecutor(externalSignal) {
+  createTurnExecutor(externalSignal, runContext) {
     return new import_turn_executor.TurnExecutor(
       this.model,
       this.toolManager,
@@ -161,7 +177,8 @@ class VercelLLMService {
       this.messageQueue,
       this.modelLimits,
       externalSignal,
-      this.compactionStrategy
+      this.compactionStrategy,
+      runContext
     );
   }
   /**
@@ -177,6 +194,10 @@ class VercelLLMService {
    * @returns Object with text response
    */
   async stream(content, options) {
+    const sessionId = ensureRunContextMatchesServiceSession(
+      this.sessionId,
+      options?.runContext
+    );
     const activeSpan = import_api.trace.getActiveSpan();
     const currentContext = import_api.context.active();
     const provider = this.config.provider;
@@ -201,9 +222,9 @@ class VercelLLMService {
     return await import_api.context.with(updatedContext, async () => {
       const parts = typeof content === "string" ? [{ type: "text", text: content }] : content;
       await this.contextManager.addUserMessage(parts);
-      const executor = this.createTurnExecutor(options?.signal);
+      const executor = this.createTurnExecutor(options?.signal, options?.runContext);
       const contributorContext = await this.toolManager.buildContributorContext({
-        sessionId: this.sessionId
+        sessionId
       });
       const result = await executor.execute(contributorContext, true);
       return {
@@ -268,5 +289,6 @@ VercelLLMService = __decorateElement(_init, 0, "VercelLLMService", _VercelLLMSer
 __runInitializers(_init, 1, VercelLLMService);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  VercelLLMService
+  VercelLLMService,
+  ensureRunContextMatchesServiceSession
 });

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';
@@ -11,8 +11,10 @@ import type { ValidatedLLMConfig } from '../schemas.js';
 import { MessageQueueService } from '../../session/message-queue.js';
 import type { ResourceManager } from '../../resources/index.js';
 import type { ContentInput } from '../../agent/types.js';
+import type { AgentRunContext } from '../../runtime/run-context.js';
+export declare function ensureRunContextMatchesServiceSession(serviceSessionId: string, runContext?: AgentRunContext): string;
 /**
- * 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 +44,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>;
     /**
@@ -65,6 +67,7 @@ export declare class VercelLLMService {
      */
     stream(content: ContentInput, options?: {
         signal?: AbortSignal;
+        runContext?: AgentRunContext;
     }): Promise<{
         text: string;
     }>;

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

package/dist/llm/services/vercel.js

@@ -11,9 +11,24 @@ 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 { ErrorScope, ErrorType } from "../../errors/types.js";
 import { LLMErrorCode } from "../error-codes.js";
+function ensureRunContextMatchesServiceSession(serviceSessionId, runContext) {
+  if (runContext !== void 0 && runContext.sessionId !== serviceSessionId) {
+    throw new DextoRuntimeError(
+      LLMErrorCode.GENERATION_FAILED,
+      ErrorScope.LLM,
+      ErrorType.SYSTEM,
+      `Run context session '${runContext.sessionId}' does not match LLM service session '${serviceSessionId}'`,
+      {
+        serviceSessionId,
+        runContextSessionId: runContext.sessionId
+      }
+    );
+  }
+  return serviceSessionId;
+}
 _VercelLLMService_decorators = [InstrumentClass({
   prefix: "llm.vercel",
   excludeMethods: ["getModelId", "getAllTools", "createTurnExecutor"]
@@ -37,7 +52,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 +62,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) {
@@ -76,7 +91,7 @@ class VercelLLMService {
   /**
    * Create a TurnExecutor instance for executing the agent loop.
    */
-  createTurnExecutor(externalSignal) {
+  createTurnExecutor(externalSignal, runContext) {
     return new TurnExecutor(
       this.model,
       this.toolManager,
@@ -98,7 +113,8 @@ class VercelLLMService {
       this.messageQueue,
       this.modelLimits,
       externalSignal,
-      this.compactionStrategy
+      this.compactionStrategy,
+      runContext
     );
   }
   /**
@@ -114,6 +130,10 @@ class VercelLLMService {
    * @returns Object with text response
    */
   async stream(content, options) {
+    const sessionId = ensureRunContextMatchesServiceSession(
+      this.sessionId,
+      options?.runContext
+    );
     const activeSpan = trace.getActiveSpan();
     const currentContext = context.active();
     const provider = this.config.provider;
@@ -138,9 +158,9 @@ class VercelLLMService {
     return await context.with(updatedContext, async () => {
       const parts = typeof content === "string" ? [{ type: "text", text: content }] : content;
       await this.contextManager.addUserMessage(parts);
-      const executor = this.createTurnExecutor(options?.signal);
+      const executor = this.createTurnExecutor(options?.signal, options?.runContext);
       const contributorContext = await this.toolManager.buildContributorContext({
-        sessionId: this.sessionId
+        sessionId
       });
       const result = await executor.execute(contributorContext, true);
       return {
@@ -204,5 +224,6 @@ _init = __decoratorStart(null);
 VercelLLMService = __decorateElement(_init, 0, "VercelLLMService", _VercelLLMService_decorators, VercelLLMService);
 __runInitializers(_init, 1, VercelLLMService);
 export {
-  VercelLLMService
+  VercelLLMService,
+  ensureRunContextMatchesServiceSession
 };

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