@dexto/core 1.3.0 → 1.5.0

package/dist/providers/index.cjs

@@ -0,0 +1,24 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  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 providers_exports = {};
+module.exports = __toCommonJS(providers_exports);
+__reExport(providers_exports, require("./base-registry.js"), module.exports);
+__reExport(providers_exports, require("./discovery.js"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("./base-registry.js"),
+  ...require("./discovery.js")
+});

package/dist/providers/index.d.ts

@@ -0,0 +1,32 @@
+/**
+ * Provider Infrastructure
+ *
+ * This module provides:
+ * 1. BaseRegistry - Generic base class for building type-safe provider registries
+ * 2. Discovery API - Utilities for querying registered providers across all registries
+ *
+ * Useful for:
+ * - Building custom provider registries with consistent behavior
+ * - Debugging: See what providers are available at runtime
+ * - UIs: Build dynamic interfaces that show available providers
+ * - Configuration validation: Check if required providers are registered
+ *
+ * @example
+ * ```typescript
+ * import { BaseRegistry, listAllProviders, hasProvider } from '@dexto/core';
+ *
+ * // Create a custom registry
+ * class MyRegistry extends BaseRegistry<MyProvider> {
+ *   constructor() {
+ *     super(myErrorFactory);
+ *   }
+ * }
+ *
+ * // List all providers
+ * const providers = listAllProviders();
+ * console.log('Blob providers:', providers.blob);
+ * ```
+ */
+export * from './base-registry.js';
+export * from './discovery.js';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC"}

package/dist/providers/index.js

@@ -0,0 +1,2 @@
+export * from "./base-registry.js";
+export * from "./discovery.js";

package/dist/resources/error-codes.js

@@ -1,4 +1,4 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 const ResourceErrorCodes = {
   INVALID_URI_FORMAT: "resource_invalid_uri_format",
   EMPTY_URI: "resource_empty_uri",

package/dist/resources/errors.js

@@ -1,4 +1,4 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 import { DextoRuntimeError } from "../errors/DextoRuntimeError.js";
 import { ErrorScope, ErrorType } from "../errors/types.js";
 import { ResourceErrorCodes } from "./error-codes.js";

package/dist/resources/handlers/blob-handler.js

@@ -1,4 +1,4 @@
-import "../../chunk-C6A6W6XS.js";
+import "../../chunk-PTJYTZNU.js";
 import { DextoLogComponent } from "../../logger/v2/types.js";
 import { ResourceError } from "../errors.js";
 class BlobResourceHandler {

package/dist/resources/handlers/factory.js

@@ -1,4 +1,4 @@
-import "../../chunk-C6A6W6XS.js";
+import "../../chunk-PTJYTZNU.js";
 import { ResourceError } from "../errors.js";
 import { FileSystemResourceHandler } from "./filesystem-handler.js";
 import { BlobResourceHandler } from "./blob-handler.js";

package/dist/resources/handlers/filesystem-handler.js

@@ -1,4 +1,4 @@
-import "../../chunk-C6A6W6XS.js";
+import "../../chunk-PTJYTZNU.js";
 import { promises as fs } from "fs";
 import path from "path";
 import { DextoLogComponent } from "../../logger/v2/types.js";

package/dist/resources/index.js

@@ -1,4 +1,4 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 import { ResourceManager } from "./manager.js";
 import { ResourceError } from "./errors.js";
 import { ResourceErrorCodes } from "./error-codes.js";

package/dist/resources/internal-provider.js

@@ -1,4 +1,4 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 import { DextoLogComponent } from "../logger/v2/types.js";
 import { createInternalResourceHandler } from "./handlers/factory.js";
 import { InternalResourceConfigSchema } from "./schemas.js";

package/dist/resources/manager.js

@@ -1,4 +1,4 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 import { InternalResourcesProvider } from "./internal-provider.js";
 import { DextoLogComponent } from "../logger/v2/types.js";
 import { ResourceError } from "./errors.js";

package/dist/resources/reference-parser.cjs

@@ -140,9 +140,9 @@ function formatResourceContent(resourceUri, resourceName, content) {
   contentParts.push(`
 --- Content from resource: ${resourceName} (${resourceUri}) ---`);
   for (const item of content.contents) {
-    if (item.text && typeof item.text === "string") {
+    if ("text" in item && item.text && typeof item.text === "string") {
       contentParts.push(item.text);
-    } else if (item.blob) {
+    } else if ("blob" in item && item.blob) {
       const blobSize = typeof item.blob === "string" ? item.blob.length : "unknown";
       contentParts.push(`[Binary content: ${item.mimeType || "unknown"}, ${blobSize} bytes]`);
     }
@@ -172,7 +172,7 @@ async function expandMessageReferences(message, availableResources, resourceRead
       const resource = availableResources[ref.resourceUri];
       let isImageResource = false;
       for (const item of content.contents) {
-        if (item.blob && item.mimeType && item.mimeType.startsWith("image/") && typeof item.blob === "string") {
+        if ("blob" in item && item.blob && item.mimeType && item.mimeType.startsWith("image/") && typeof item.blob === "string") {
           extractedImages.push({
             image: item.blob,
             mimeType: item.mimeType,

package/dist/resources/reference-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reference-parser.d.ts","sourceRoot":"","sources":["../../src/resources/reference-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAK7E,MAAM,WAAW,iBAAiB;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,eAAe,CAAC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,uBAAuB;IACpC,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,iBAAiB,EAAE,CAAC;IACxC,oBAAoB,EAAE,iBAAiB,EAAE,CAAC;IAC1C,eAAe,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC7E;AAMD;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,iBAAiB,EAAE,CAuB5E;AAED,wBAAgB,yBAAyB,CACrC,UAAU,EAAE,iBAAiB,EAAE,EAC/B,kBAAkB,EAAE,WAAW,GAChC,iBAAiB,EAAE,CAmCrB;AAiGD,wBAAgB,qBAAqB,CACjC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,kBAAkB,GAC5B,MAAM,CAaR;AAED,wBAAsB,uBAAuB,CACzC,OAAO,EAAE,MAAM,EACf,kBAAkB,EAAE,WAAW,EAC/B,cAAc,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,kBAAkB,CAAC,GAC7D,OAAO,CAAC,uBAAuB,CAAC,CA8ElC"}
+{"version":3,"file":"reference-parser.d.ts","sourceRoot":"","sources":["../../src/resources/reference-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAK7E,MAAM,WAAW,iBAAiB;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,eAAe,CAAC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,uBAAuB;IACpC,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,iBAAiB,EAAE,CAAC;IACxC,oBAAoB,EAAE,iBAAiB,EAAE,CAAC;IAC1C,eAAe,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC7E;AAMD;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,iBAAiB,EAAE,CAuB5E;AAED,wBAAgB,yBAAyB,CACrC,UAAU,EAAE,iBAAiB,EAAE,EAC/B,kBAAkB,EAAE,WAAW,GAChC,iBAAiB,EAAE,CAmCrB;AAiGD,wBAAgB,qBAAqB,CACjC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,kBAAkB,GAC5B,MAAM,CAaR;AAED,wBAAsB,uBAAuB,CACzC,OAAO,EAAE,MAAM,EACf,kBAAkB,EAAE,WAAW,EAC/B,cAAc,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,kBAAkB,CAAC,GAC7D,OAAO,CAAC,uBAAuB,CAAC,CA+ElC"}

package/dist/resources/reference-parser.js

@@ -1,4 +1,4 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 function escapeRegExp(literal) {
   return literal.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
 }
@@ -115,9 +115,9 @@ function formatResourceContent(resourceUri, resourceName, content) {
   contentParts.push(`
 --- Content from resource: ${resourceName} (${resourceUri}) ---`);
   for (const item of content.contents) {
-    if (item.text && typeof item.text === "string") {
+    if ("text" in item && item.text && typeof item.text === "string") {
       contentParts.push(item.text);
-    } else if (item.blob) {
+    } else if ("blob" in item && item.blob) {
       const blobSize = typeof item.blob === "string" ? item.blob.length : "unknown";
       contentParts.push(`[Binary content: ${item.mimeType || "unknown"}, ${blobSize} bytes]`);
     }
@@ -147,7 +147,7 @@ async function expandMessageReferences(message, availableResources, resourceRead
       const resource = availableResources[ref.resourceUri];
       let isImageResource = false;
       for (const item of content.contents) {
-        if (item.blob && item.mimeType && item.mimeType.startsWith("image/") && typeof item.blob === "string") {
+        if ("blob" in item && item.blob && item.mimeType && item.mimeType.startsWith("image/") && typeof item.blob === "string") {
           extractedImages.push({
             image: item.blob,
             mimeType: item.mimeType,

package/dist/resources/schemas.js

@@ -1,4 +1,4 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 import { z } from "zod";
 const FileExtensionSchema = z.string().regex(
   /^\.[A-Za-z0-9][A-Za-z0-9._-]*$/,

package/dist/search/index.js

@@ -1,4 +1,4 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 import { SearchService } from "./search-service.js";
 export {
   SearchService

package/dist/search/search-service.js

@@ -1,4 +1,4 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 import { DextoLogComponent } from "../logger/v2/types.js";
 class SearchService {
   constructor(database, logger) {

package/dist/session/chat-session.cjs

@@ -23,10 +23,12 @@ __export(chat_session_exports, {
 module.exports = __toCommonJS(chat_session_exports);
 var import_factory = require("./history/factory.js");
 var import_factory2 = require("../llm/services/factory.js");
+var import_compaction = require("../context/compaction/index.js");
 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("../plugins/error-codes.js");
+var import_registry = require("../llm/registry.js");
 class ChatSession {
   /**
    * Creates a new ChatSession instance.
@@ -77,6 +79,10 @@ class ChatSession {
    * Stores the bound functions so they can be removed from the event bus.
    */
   forwarders = /* @__PURE__ */ new Map();
+  /**
+   * Token accumulator listener for cleanup.
+   */
+  tokenAccumulatorListener = null;
   /**
    * AbortController for the currently running turn, if any.
    * Calling cancel() aborts the in-flight LLM request and tool execution checks.
@@ -107,23 +113,51 @@ class ChatSession {
       this.forwarders.set(eventName, forwarder);
       this.eventBus.on(eventName, forwarder);
     });
+    this.setupTokenAccumulation();
     this.logger.debug(
       `[setupEventForwarding] Event forwarding setup complete for session=${this.id}`
     );
   }
+  /**
+   * Sets up token usage accumulation by listening to llm:response events.
+   * Accumulates token usage and cost to session metadata for /stats tracking.
+   */
+  setupTokenAccumulation() {
+    this.tokenAccumulatorListener = (payload) => {
+      if (payload.tokenUsage) {
+        let cost;
+        const llmConfig = this.services.stateManager.getLLMConfig(this.id);
+        const pricing = (0, import_registry.getModelPricing)(llmConfig.provider, llmConfig.model);
+        if (pricing) {
+          cost = (0, import_registry.calculateCost)(payload.tokenUsage, pricing);
+        }
+        this.services.sessionManager.accumulateTokenUsage(this.id, payload.tokenUsage, cost).catch((err) => {
+          this.logger.warn(
+            `Failed to accumulate token usage: ${err instanceof Error ? err.message : String(err)}`
+          );
+        });
+      }
+    };
+    this.eventBus.on("llm:response", this.tokenAccumulatorListener);
+  }
   /**
    * Initializes session-specific services.
    */
   async initializeServices() {
-    const llmConfig = this.services.stateManager.getLLMConfig(this.id);
+    const runtimeConfig = this.services.stateManager.getRuntimeConfig(this.id);
+    const llmConfig = runtimeConfig.llm;
     this.historyProvider = (0, import_factory.createDatabaseHistoryProvider)(
       this.services.storageManager.getDatabase(),
       this.id,
       this.logger
     );
+    const model = (0, import_factory2.createVercelModel)(llmConfig);
+    const compactionStrategy = await (0, import_compaction.createCompactionStrategy)(runtimeConfig.compaction, {
+      logger: this.logger,
+      model
+    });
     this.llmService = (0, import_factory2.createLLMService)(
       llmConfig,
-      llmConfig.router,
       this.services.toolManager,
       this.services.systemPromptManager,
       this.historyProvider,
@@ -133,8 +167,10 @@ class ChatSession {
       this.id,
       this.services.resourceManager,
       // Pass ResourceManager for blob storage
-      this.logger
+      this.logger,
       // Pass logger for dependency injection
+      compactionStrategy
+      // Pass compaction strategy
     );
     this.logger.debug(`ChatSession ${this.id}: Services initialized with storage`);
   }
@@ -152,12 +188,12 @@ class ChatSession {
   async saveBlockedInteraction(userInput, errorMessage, _imageData, _fileData) {
     const userMessage = {
       role: "user",
-      content: "[Blocked by content policy: input redacted]"
+      content: [{ type: "text", text: "[Blocked by content policy: input redacted]" }]
     };
     const errorContent = `Error: ${errorMessage}`;
     const assistantMessage = {
       role: "assistant",
-      content: errorContent
+      content: [{ type: "text", text: errorContent }]
     };
     await this.historyProvider.saveMessage(userMessage);
     await this.historyProvider.saveMessage(assistantMessage);
@@ -165,44 +201,61 @@ class ChatSession {
     this.eventBus.emit("llm:response", {
       content: errorContent,
       provider: llmConfig.provider,
-      model: llmConfig.model,
-      router: llmConfig.router
+      model: llmConfig.model
     });
   }
   /**
-   * Processes user input through the session's LLM service and returns the response.
-   *
-   * This method:
-   * 1. Takes user input (text, optionally with image or file data)
-   * 2. Passes it to the LLM service for processing
-   * 3. Returns the AI's response text
-   *
-   * The method handles both text-only and multimodal input (text + images/files).
-   * Tool calls and conversation management are handled internally by the LLM service.
+   * Stream a response for the given content.
+   * Primary method for running conversations with multi-image support.
    *
-   * @param input - The user's text input
-   * @param imageDataInput - Optional image data for multimodal input
-   * @param fileDataInput - Optional file data for file input
-   * @param stream - Optional flag to enable streaming responses
+   * @param content - String or ContentPart[] (text, images, files)
+   * @param options - { signal?: AbortSignal }
    * @returns Promise that resolves to the AI's response text
    *
    * @example
    * ```typescript
-   * const response = await session.run('What is the weather like today?');
-   * console.log(response); // "I'll check the weather for you..."
+   * // Text only
+   * const response = await session.stream('What is the weather?');
+   *
+   * // Multiple images
+   * const response = await session.stream([
+   *     { type: 'text', text: 'Compare these images' },
+   *     { type: 'image', image: base64Data1, mimeType: 'image/png' },
+   *     { type: 'image', image: base64Data2, mimeType: 'image/png' }
+   * ]);
    * ```
    */
-  async run(input, imageDataInput, fileDataInput, stream) {
+  async stream(content, options) {
+    const parts = typeof content === "string" ? [{ type: "text", text: content }] : content;
+    const textParts = parts.filter(
+      (p) => p.type === "text"
+    );
+    const imageParts = parts.filter((p) => p.type === "image");
+    const fileParts = parts.filter((p) => p.type === "file");
     this.logger.debug(
-      `Running session ${this.id} | input.len=${input?.length ?? 0} | image=${imageDataInput ? imageDataInput.mimeType : "none"} | file=${fileDataInput ? `${fileDataInput.mimeType}:${fileDataInput.filename ?? "unknown"}` : "none"}`
+      `Streaming session ${this.id} | textParts=${textParts.length} | images=${imageParts.length} | files=${fileParts.length}`
     );
     this.currentRunController = new AbortController();
-    const signal = this.currentRunController.signal;
+    const signal = options?.signal ? this.combineSignals(options.signal, this.currentRunController.signal) : this.currentRunController.signal;
     try {
+      const textContent = textParts.map((p) => p.text).join("\n");
+      const firstImage = imageParts[0];
+      const firstFile = fileParts[0];
       const beforeLLMPayload = {
-        text: input,
-        ...imageDataInput !== void 0 && { imageData: imageDataInput },
-        ...fileDataInput !== void 0 && { fileData: fileDataInput },
+        text: textContent,
+        ...firstImage && {
+          imageData: {
+            image: typeof firstImage.image === "string" ? firstImage.image : "[binary]",
+            mimeType: firstImage.mimeType || "image/jpeg"
+          }
+        },
+        ...firstFile && {
+          fileData: {
+            data: typeof firstFile.data === "string" ? firstFile.data : "[binary]",
+            mimeType: firstFile.mimeType,
+            ...firstFile.filename && { filename: firstFile.filename }
+          }
+        },
         sessionId: this.id
       };
       const modifiedBeforePayload = await this.services.pluginManager.executePlugins(
@@ -217,22 +270,17 @@ class ChatSession {
           abortSignal: signal
         }
       );
-      const finalInput = modifiedBeforePayload.text;
-      const finalImageData = modifiedBeforePayload.imageData;
-      const finalFileData = modifiedBeforePayload.fileData;
-      const response = await this.llmService.completeTask(
-        finalInput,
-        { signal },
-        finalImageData,
-        finalFileData,
-        stream
-      );
+      let modifiedParts = [...parts];
+      if (modifiedBeforePayload.text !== textContent && textParts.length > 0) {
+        modifiedParts = modifiedParts.filter((p) => p.type !== "text");
+        modifiedParts.unshift({ type: "text", text: modifiedBeforePayload.text });
+      }
+      const response = await this.llmService.stream(modifiedParts, { signal });
       const llmConfig = this.services.stateManager.getLLMConfig(this.id);
       const beforeResponsePayload = {
         content: response,
         provider: llmConfig.provider,
         model: llmConfig.model,
-        router: llmConfig.router,
         sessionId: this.id
       };
       const modifiedResponsePayload = await this.services.pluginManager.executePlugins(
@@ -256,16 +304,21 @@ class ChatSession {
           context: "user_cancelled",
           recoverable: true
         });
+        try {
+          const history = await this.getHistory();
+          const lastAssistant = history.filter((m) => m.role === "assistant").pop();
+          if (lastAssistant && typeof lastAssistant.content === "string") {
+            return lastAssistant.content;
+          }
+        } catch {
+          this.logger.debug("Failed to retrieve partial response from history on cancel");
+        }
         return "";
       }
       if (error instanceof import_errors.DextoRuntimeError && error.code === import_error_codes.PluginErrorCode.PLUGIN_BLOCKED_EXECUTION && error.scope === import_errors.ErrorScope.PLUGIN && error.type === import_errors.ErrorType.FORBIDDEN) {
+        const textContent = parts.filter((p) => p.type === "text").map((p) => p.text).join("\n");
         try {
-          await this.saveBlockedInteraction(
-            input,
-            error.message,
-            imageDataInput,
-            fileDataInput
-          );
+          await this.saveBlockedInteraction(textContent, error.message);
           this.logger.debug(
             `ChatSession ${this.id}: Saved blocked interaction to history`
           );
@@ -276,15 +329,27 @@ class ChatSession {
         }
         return error.message;
       }
-      const errortype = error instanceof Error ? "object" : "string";
       this.logger.error(
-        `Error in ChatSession.run: errortype=${errortype}: ${error instanceof Error ? error.message : String(error)}`
+        `Error in ChatSession.stream: ${error instanceof Error ? error.message : String(error)}`
       );
       throw error;
     } finally {
       this.currentRunController = null;
     }
   }
+  /**
+   * Combine multiple abort signals into one.
+   */
+  combineSignals(signal1, signal2) {
+    const controller = new AbortController();
+    const onAbort = () => controller.abort();
+    signal1.addEventListener("abort", onAbort);
+    signal2.addEventListener("abort", onAbort);
+    if (signal1.aborted || signal2.aborted) {
+      controller.abort();
+    }
+    return controller.signal;
+  }
   /**
    * Retrieves the complete conversation history for this session.
    *
@@ -355,11 +420,11 @@ class ChatSession {
   /**
    * Switches the LLM service for this session while preserving conversation history.
    *
-   * This method creates a new LLM service with the specified configuration and router,
+   * This method creates a new LLM service with the specified configuration,
    * while maintaining the existing ContextManager and conversation history. This allows
    * users to change AI models mid-conversation without losing context.
    *
-   * @param newLLMConfig The new LLM configuration to use (includes router)
+   * @param newLLMConfig The new LLM configuration to use
    *
    * @example
    * ```typescript
@@ -368,16 +433,19 @@ class ChatSession {
    *   provider: 'openai',
    *   model: 'gpt-5',
    *   apiKey: process.env.OPENAI_API_KEY,
-   *   router: 'in-built'
    * });
    * ```
    */
   async switchLLM(newLLMConfig) {
     try {
-      const router = newLLMConfig.router;
+      const runtimeConfig = this.services.stateManager.getRuntimeConfig(this.id);
+      const model = (0, import_factory2.createVercelModel)(newLLMConfig);
+      const compactionStrategy = await (0, import_compaction.createCompactionStrategy)(runtimeConfig.compaction, {
+        logger: this.logger,
+        model
+      });
       const newLLMService = (0, import_factory2.createLLMService)(
         newLLMConfig,
-        router,
         this.services.toolManager,
         this.services.systemPromptManager,
         this.historyProvider,
@@ -386,7 +454,9 @@ class ChatSession {
         // Use session event bus
         this.id,
         this.services.resourceManager,
-        this.logger
+        this.logger,
+        compactionStrategy
+        // Pass compaction strategy
       );
       this.llmService = newLLMService;
       this.logger.info(
@@ -394,7 +464,6 @@ class ChatSession {
       );
       this.eventBus.emit("llm:switched", {
         newConfig: newLLMConfig,
-        router,
         historyRetained: true
       });
     } catch (error) {
@@ -435,8 +504,54 @@ class ChatSession {
       this.eventBus.off(eventName, forwarder);
     });
     this.forwarders.clear();
+    if (this.tokenAccumulatorListener) {
+      this.eventBus.off("llm:response", this.tokenAccumulatorListener);
+      this.tokenAccumulatorListener = null;
+    }
     this.logger.debug(`Session ${this.id} disposed successfully`);
   }
+  /**
+   * Check if this session is currently processing a message.
+   * Returns true if a run is in progress and has not been aborted.
+   */
+  isBusy() {
+    return this.currentRunController !== null && !this.currentRunController.signal.aborted;
+  }
+  /**
+   * Queue a message for processing when the session is busy.
+   * The message will be injected into the conversation when the current turn completes.
+   *
+   * @param message The user message to queue
+   * @returns Queue position and message ID
+   */
+  queueMessage(message) {
+    return this.llmService.getMessageQueue().enqueue(message);
+  }
+  /**
+   * Get all messages currently in the queue.
+   * @returns Array of queued messages
+   */
+  getQueuedMessages() {
+    return this.llmService.getMessageQueue().getAll();
+  }
+  /**
+   * Remove a queued message.
+   * @param id Message ID to remove
+   * @returns true if message was found and removed; false otherwise
+   */
+  removeQueuedMessage(id) {
+    return this.llmService.getMessageQueue().remove(id);
+  }
+  /**
+   * Clear all queued messages.
+   * @returns Number of messages that were cleared
+   */
+  clearMessageQueue() {
+    const queue = this.llmService.getMessageQueue();
+    const count = queue.pendingCount();
+    queue.clear();
+    return count;
+  }
   /**
    * Cancel the currently running turn for this session, if any.
    * Returns true if a run was in progress and was signaled to abort.