@dexto/core 1.3.0 → 1.4.0

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

@@ -1,5 +1,5 @@
 import type { ContextManager } from '../context/index.js';
-import type { ILLMService } from '../llm/services/types.js';
+import type { VercelLLMService } from '../llm/services/vercel.js';
 import type { SystemPromptManager } from '../systemPrompt/manager.js';
 import type { ToolManager } from '../tools/tool-manager.js';
 import type { ValidatedLLMConfig } from '../llm/schemas.js';
@@ -10,6 +10,8 @@ import type { MCPManager } from '../mcp/manager.js';
 import { SessionEventBus, AgentEventBus } from '../events/index.js';
 import type { IDextoLogger } from '../logger/v2/types.js';
 import type { InternalMessage } from '../context/types.js';
+import type { UserMessageInput } from './message-queue.js';
+import type { ContentInput } from '../agent/types.js';
 /**
  * Represents an isolated conversation session within a Dexto agent.
  *
@@ -52,7 +54,7 @@ import type { InternalMessage } from '../context/types.js';
  *
  * @see {@link SessionManager} for session lifecycle management
  * @see {@link ContextManager} for conversation history management
- * @see {@link ILLMService} for AI model interaction interface
+ * @see {@link VercelLLMService} for AI model interaction
  */
 export declare class ChatSession {
     private services;
@@ -86,6 +88,10 @@ export declare class ChatSession {
      * Stores the bound functions so they can be removed from the event bus.
      */
     private forwarders;
+    /**
+     * Token accumulator listener for cleanup.
+     */
+    private tokenAccumulatorListener;
     /**
      * AbortController for the currently running turn, if any.
      * Calling cancel() aborts the in-flight LLM request and tool execution checks.
@@ -129,6 +135,11 @@ export declare class ChatSession {
      * information when needed.
      */
     private setupEventForwarding;
+    /**
+     * Sets up token usage accumulation by listening to llm:response events.
+     * Accumulates token usage and cost to session metadata for /stats tracking.
+     */
+    private setupTokenAccumulation;
     /**
      * Initializes session-specific services.
      */
@@ -146,36 +157,33 @@ export declare class ChatSession {
      */
     private saveBlockedInteraction;
     /**
-     * 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
+     * Stream a response for the given content.
+     * Primary method for running conversations with multi-image support.
      *
-     * The method handles both text-only and multimodal input (text + images/files).
-     * Tool calls and conversation management are handled internally by the LLM service.
-     *
-     * @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' }
+     * ]);
      * ```
      */
-    run(input: string, imageDataInput?: {
-        image: string;
-        mimeType: string;
-    }, fileDataInput?: {
-        data: string;
-        mimeType: string;
-        filename?: string;
-    }, stream?: boolean): Promise<string>;
+    stream(content: ContentInput, options?: {
+        signal?: AbortSignal;
+    }): Promise<string>;
+    /**
+     * Combine multiple abort signals into one.
+     */
+    private combineSignals;
     /**
      * Retrieves the complete conversation history for this session.
      *
@@ -231,15 +239,15 @@ export declare class ChatSession {
      *
      * @returns The LLMService for this session
      */
-    getLLMService(): ILLMService;
+    getLLMService(): VercelLLMService;
     /**
      * 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
@@ -248,7 +256,6 @@ export declare class ChatSession {
      *   provider: 'openai',
      *   model: 'gpt-5',
      *   apiKey: process.env.OPENAI_API_KEY,
-     *   router: 'in-built'
      * });
      * ```
      */
@@ -267,6 +274,39 @@ export declare class ChatSession {
      * Without this cleanup, sessions would remain in memory due to listener references.
      */
     dispose(): void;
+    /**
+     * Check if this session is currently processing a message.
+     * Returns true if a run is in progress and has not been aborted.
+     */
+    isBusy(): boolean;
+    /**
+     * 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: UserMessageInput): {
+        queued: true;
+        position: number;
+        id: string;
+    };
+    /**
+     * Get all messages currently in the queue.
+     * @returns Array of queued messages
+     */
+    getQueuedMessages(): import('./types.js').QueuedMessage[];
+    /**
+     * Remove a queued message.
+     * @param id Message ID to remove
+     * @returns true if message was found and removed; false otherwise
+     */
+    removeQueuedMessage(id: string): boolean;
+    /**
+     * Clear all queued messages.
+     * @returns Number of messages that were cleared
+     */
+    clearMessageQueue(): 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":"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"}
+{"version":3,"file":"chat-session.d.ts","sourceRoot":"","sources":["../../src/session/chat-session.ts"],"names":[],"mappings":"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"}

package/dist/session/chat-session.js

@@ -1,4 +1,4 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 import { createDatabaseHistoryProvider } from "./history/factory.js";
 import { createLLMService } from "../llm/services/factory.js";
 import {
@@ -8,6 +8,7 @@ import {
 import { DextoLogComponent } from "../logger/v2/types.js";
 import { DextoRuntimeError, ErrorScope, ErrorType } from "../errors/index.js";
 import { PluginErrorCode } from "../plugins/error-codes.js";
+import { getModelPricing, calculateCost } from "../llm/registry.js";
 class ChatSession {
   /**
    * Creates a new ChatSession instance.
@@ -58,6 +59,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.
@@ -88,10 +93,33 @@ 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 = getModelPricing(llmConfig.provider, llmConfig.model);
+        if (pricing) {
+          cost = 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.
    */
@@ -104,7 +132,6 @@ class ChatSession {
     );
     this.llmService = createLLMService(
       llmConfig,
-      llmConfig.router,
       this.services.toolManager,
       this.services.systemPromptManager,
       this.historyProvider,
@@ -133,12 +160,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);
@@ -146,44 +173,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.
+   * Stream a response for the given content.
+   * Primary method for running conversations with multi-image support.
    *
-   * 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.
-   *
-   * @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(
@@ -198,22 +242,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(
@@ -237,16 +276,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 DextoRuntimeError && error.code === PluginErrorCode.PLUGIN_BLOCKED_EXECUTION && error.scope === ErrorScope.PLUGIN && error.type === 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`
           );
@@ -257,15 +301,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.
    *
@@ -336,11 +392,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
@@ -349,16 +405,13 @@ 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 newLLMService = createLLMService(
         newLLMConfig,
-        router,
         this.services.toolManager,
         this.services.systemPromptManager,
         this.historyProvider,
@@ -375,7 +428,6 @@ class ChatSession {
       );
       this.eventBus.emit("llm:switched", {
         newConfig: newLLMConfig,
-        router,
         historyRetained: true
       });
     } catch (error) {
@@ -416,8 +468,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.

package/dist/session/error-codes.js

@@ -1,4 +1,4 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 var SessionErrorCode = /* @__PURE__ */ ((SessionErrorCode2) => {
   SessionErrorCode2["SESSION_NOT_FOUND"] = "session_not_found";
   SessionErrorCode2["SESSION_INITIALIZATION_FAILED"] = "session_initialization_failed";

package/dist/session/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 { SessionErrorCode } from "./error-codes.js";