@dexto/core 1.2.6 → 1.4.0

package/dist/session/message-queue.d.ts

@@ -0,0 +1,114 @@
+import type { SessionEventBus } from '../events/index.js';
+import type { QueuedMessage, CoalescedMessage } from './types.js';
+import type { ContentPart } from '../context/types.js';
+import type { IDextoLogger } from '../logger/v2/types.js';
+/**
+ * Input for enqueuing a user message to the queue.
+ * (Not to be confused with UserMessage from context/types.ts which represents
+ * a message in conversation history)
+ */
+export interface UserMessageInput {
+    /** Multimodal content array (text, images, files, etc.) */
+    content: ContentPart[];
+    /** Optional metadata to attach to the message */
+    metadata?: Record<string, unknown>;
+}
+/**
+ * MessageQueueService handles queuing of user messages during agent execution.
+ *
+ * Key features:
+ * - Accepts messages when the agent is busy executing tools
+ * - Coalesces multiple queued messages into a single injection
+ * - Supports multimodal content (text, images, files)
+ *
+ * This enables user guidance where users can send
+ * mid-task instructions like "stop" or "try a different approach".
+ *
+ * @example
+ * ```typescript
+ * // In API handler - queue message if agent is busy
+ * if (agent.isBusy()) {
+ *   return messageQueue.enqueue({ content: [{ type: 'text', text: 'stop' }] });
+ * }
+ *
+ * // In TurnExecutor - check for queued messages
+ * const coalesced = messageQueue.dequeueAll();
+ * if (coalesced) {
+ *   await contextManager.addMessage({
+ *     role: 'user',
+ *     content: coalesced.combinedContent,
+ *   });
+ * }
+ * ```
+ */
+export declare class MessageQueueService {
+    private eventBus;
+    private logger;
+    private queue;
+    constructor(eventBus: SessionEventBus, logger: IDextoLogger);
+    /**
+     * Add a message to the queue.
+     * Called by API endpoint - returns immediately with queue position.
+     *
+     * @param message The user message to queue
+     * @returns Queue position and message ID
+     */
+    enqueue(message: UserMessageInput): {
+        queued: true;
+        position: number;
+        id: string;
+    };
+    /**
+     * Dequeue ALL pending messages and coalesce into single injection.
+     * Called by executor between steps.
+     *
+     * Multiple queued messages become ONE combined message to the LLM.
+     *
+     * @example
+     * If 3 messages are queued: "stop", "try X instead", "also check Y"
+     * They become:
+     * ```
+     * [1]: stop
+     *
+     * [2]: try X instead
+     *
+     * [3]: also check Y
+     * ```
+     *
+     * @returns Coalesced message or null if queue is empty
+     */
+    dequeueAll(): CoalescedMessage | null;
+    /**
+     * Coalesce multiple messages into one (multimodal-aware).
+     * Strategy: Combine with numbered separators, preserve all media.
+     */
+    private coalesce;
+    /**
+     * Check if there are pending messages in the queue.
+     */
+    hasPending(): boolean;
+    /**
+     * Get the number of pending messages.
+     */
+    pendingCount(): number;
+    /**
+     * Clear all pending messages without processing.
+     * Used during cleanup/abort.
+     */
+    clear(): void;
+    /**
+     * Get all queued messages (for UI display).
+     * Returns a shallow copy to prevent external mutation.
+     */
+    getAll(): QueuedMessage[];
+    /**
+     * Get a single queued message by ID.
+     */
+    get(id: string): QueuedMessage | undefined;
+    /**
+     * Remove a single queued message by ID.
+     * @returns true if message was found and removed; false otherwise
+     */
+    remove(id: string): boolean;
+}
+//# sourceMappingURL=message-queue.d.ts.map

package/dist/session/message-queue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-queue.d.ts","sourceRoot":"","sources":["../../src/session/message-queue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAS1D;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC7B,2DAA2D;IAC3D,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,iDAAiD;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,qBAAa,mBAAmB;IAIxB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;IAJlB,OAAO,CAAC,KAAK,CAAuB;gBAGxB,QAAQ,EAAE,eAAe,EACzB,MAAM,EAAE,YAAY;IAGhC;;;;;;OAMG;IACH,OAAO,CAAC,OAAO,EAAE,gBAAgB,GAAG;QAAE,MAAM,EAAE,IAAI,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE;IAwBlF;;;;;;;;;;;;;;;;;;OAkBG;IACH,UAAU,IAAI,gBAAgB,GAAG,IAAI;IAsBrC;;;OAGG;IACH,OAAO,CAAC,QAAQ;IA0EhB;;OAEG;IACH,UAAU,IAAI,OAAO;IAIrB;;OAEG;IACH,YAAY,IAAI,MAAM;IAItB;;;OAGG;IACH,KAAK,IAAI,IAAI;IAIb;;;OAGG;IACH,MAAM,IAAI,aAAa,EAAE;IAIzB;;OAEG;IACH,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAI1C;;;OAGG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;CAY9B"}

package/dist/session/message-queue.js

@@ -0,0 +1,178 @@
+import "../chunk-PTJYTZNU.js";
+function generateId() {
+  return `msg_${Date.now()}_${Math.random().toString(36).slice(2, 11)}`;
+}
+class MessageQueueService {
+  constructor(eventBus, logger) {
+    this.eventBus = eventBus;
+    this.logger = logger;
+  }
+  queue = [];
+  /**
+   * Add a message to the queue.
+   * Called by API endpoint - returns immediately with queue position.
+   *
+   * @param message The user message to queue
+   * @returns Queue position and message ID
+   */
+  enqueue(message) {
+    const queuedMsg = {
+      id: generateId(),
+      content: message.content,
+      queuedAt: Date.now(),
+      ...message.metadata !== void 0 && { metadata: message.metadata }
+    };
+    this.queue.push(queuedMsg);
+    this.logger.debug(`Message queued: ${queuedMsg.id}, position: ${this.queue.length}`);
+    this.eventBus.emit("message:queued", {
+      position: this.queue.length,
+      id: queuedMsg.id
+    });
+    return {
+      queued: true,
+      position: this.queue.length,
+      id: queuedMsg.id
+    };
+  }
+  /**
+   * Dequeue ALL pending messages and coalesce into single injection.
+   * Called by executor between steps.
+   *
+   * Multiple queued messages become ONE combined message to the LLM.
+   *
+   * @example
+   * If 3 messages are queued: "stop", "try X instead", "also check Y"
+   * They become:
+   * ```
+   * [1]: stop
+   *
+   * [2]: try X instead
+   *
+   * [3]: also check Y
+   * ```
+   *
+   * @returns Coalesced message or null if queue is empty
+   */
+  dequeueAll() {
+    if (this.queue.length === 0) return null;
+    const messages = [...this.queue];
+    this.queue = [];
+    const combined = this.coalesce(messages);
+    this.logger.debug(
+      `Dequeued ${messages.length} message(s): ${messages.map((m) => m.id).join(", ")}`
+    );
+    this.eventBus.emit("message:dequeued", {
+      count: messages.length,
+      ids: messages.map((m) => m.id),
+      coalesced: messages.length > 1,
+      content: combined.combinedContent
+    });
+    return combined;
+  }
+  /**
+   * Coalesce multiple messages into one (multimodal-aware).
+   * Strategy: Combine with numbered separators, preserve all media.
+   */
+  coalesce(messages) {
+    if (messages.length === 1) {
+      const firstMsg = messages[0];
+      if (!firstMsg) {
+        throw new Error("Unexpected empty messages array");
+      }
+      return {
+        messages,
+        combinedContent: firstMsg.content,
+        firstQueuedAt: firstMsg.queuedAt,
+        lastQueuedAt: firstMsg.queuedAt
+      };
+    }
+    const combinedContent = [];
+    for (const [i, msg] of messages.entries()) {
+      const prefix = messages.length === 2 ? i === 0 ? "First" : "Also" : `[${i + 1}]`;
+      let prefixText = `${prefix}: `;
+      for (const part of msg.content) {
+        if (part.type === "text") {
+          if (prefixText) {
+            combinedContent.push({ type: "text", text: prefixText + part.text });
+            prefixText = "";
+          } else {
+            combinedContent.push(part);
+          }
+        } else {
+          if (prefixText) {
+            combinedContent.push({ type: "text", text: prefixText });
+            prefixText = "";
+          }
+          combinedContent.push(part);
+        }
+      }
+      if (prefixText && msg.content.length === 0) {
+        combinedContent.push({ type: "text", text: prefixText + "[empty message]" });
+      }
+      if (i < messages.length - 1) {
+        combinedContent.push({ type: "text", text: "\n\n" });
+      }
+    }
+    const firstMessage = messages[0];
+    const lastMessage = messages[messages.length - 1];
+    if (!firstMessage || !lastMessage) {
+      throw new Error("Unexpected undefined message in non-empty array");
+    }
+    return {
+      messages,
+      combinedContent,
+      firstQueuedAt: firstMessage.queuedAt,
+      lastQueuedAt: lastMessage.queuedAt
+    };
+  }
+  /**
+   * Check if there are pending messages in the queue.
+   */
+  hasPending() {
+    return this.queue.length > 0;
+  }
+  /**
+   * Get the number of pending messages.
+   */
+  pendingCount() {
+    return this.queue.length;
+  }
+  /**
+   * Clear all pending messages without processing.
+   * Used during cleanup/abort.
+   */
+  clear() {
+    this.queue = [];
+  }
+  /**
+   * Get all queued messages (for UI display).
+   * Returns a shallow copy to prevent external mutation.
+   */
+  getAll() {
+    return [...this.queue];
+  }
+  /**
+   * Get a single queued message by ID.
+   */
+  get(id) {
+    return this.queue.find((m) => m.id === id);
+  }
+  /**
+   * Remove a single queued message by ID.
+   * @returns true if message was found and removed; false otherwise
+   */
+  remove(id) {
+    const index = this.queue.findIndex((m) => m.id === id);
+    if (index === -1) {
+      this.logger.debug(`Remove failed: message ${id} not found in queue`);
+      return false;
+    }
+    this.queue.splice(index, 1);
+    this.logger.debug(`Message removed: ${id}, remaining: ${this.queue.length}`);
+    this.eventBus.emit("message:removed", { id });
+    return true;
+  }
+}
+export {
+  MessageQueueService
+};

package/dist/session/schemas.js

@@ -1,4 +1,4 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 import { z } from "zod";
 const SessionConfigSchema = z.object({
   maxSessions: z.number().int().positive().default(100).describe("Maximum number of concurrent sessions allowed, defaults to 100"),

package/dist/session/session-manager.cjs

@@ -40,6 +40,8 @@ class SessionManager {
   initializationPromise;
   // Add a Map to track ongoing session creation operations to prevent race conditions
   pendingCreations = /* @__PURE__ */ new Map();
+  // Per-session mutex for token usage updates to prevent lost updates from concurrent calls
+  tokenUsageLocks = /* @__PURE__ */ new Map();
   logger;
   /**
    * Initialize the SessionManager with persistent storage.
@@ -295,12 +297,17 @@ class SessionManager {
     await this.ensureInitialized();
     const sessionKey = `session:${sessionId}`;
     const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
-    return sessionData ? {
+    if (!sessionData) return void 0;
+    return {
       createdAt: sessionData.createdAt,
       lastActivity: sessionData.lastActivity,
       messageCount: sessionData.messageCount,
-      title: sessionData.metadata?.title
-    } : void 0;
+      title: sessionData.metadata?.title,
+      ...sessionData.tokenUsage && { tokenUsage: sessionData.tokenUsage },
+      ...sessionData.estimatedCost !== void 0 && {
+        estimatedCost: sessionData.estimatedCost
+      }
+    };
   }
   /**
    * Get the global session manager configuration.
@@ -337,6 +344,51 @@ class SessionManager {
       await this.services.storageManager.getCache().set(sessionKey, sessionData, this.sessionTTL / 1e3);
     }
   }
+  /**
+   * Accumulates token usage for a session.
+   * Called after each LLM response to update session-level totals.
+   *
+   * Uses per-session locking to prevent lost updates from concurrent calls.
+   */
+  async accumulateTokenUsage(sessionId, usage, cost) {
+    await this.ensureInitialized();
+    const sessionKey = `session:${sessionId}`;
+    const previousLock = this.tokenUsageLocks.get(sessionKey) ?? Promise.resolve();
+    const currentLock = previousLock.then(async () => {
+      const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+      if (!sessionData) return;
+      if (!sessionData.tokenUsage) {
+        sessionData.tokenUsage = {
+          inputTokens: 0,
+          outputTokens: 0,
+          reasoningTokens: 0,
+          cacheReadTokens: 0,
+          cacheWriteTokens: 0,
+          totalTokens: 0
+        };
+      }
+      sessionData.tokenUsage.inputTokens += usage.inputTokens ?? 0;
+      sessionData.tokenUsage.outputTokens += usage.outputTokens ?? 0;
+      sessionData.tokenUsage.reasoningTokens += usage.reasoningTokens ?? 0;
+      sessionData.tokenUsage.cacheReadTokens += usage.cacheReadTokens ?? 0;
+      sessionData.tokenUsage.cacheWriteTokens += usage.cacheWriteTokens ?? 0;
+      sessionData.tokenUsage.totalTokens += usage.totalTokens ?? 0;
+      if (cost !== void 0) {
+        sessionData.estimatedCost = (sessionData.estimatedCost ?? 0) + cost;
+      }
+      sessionData.lastActivity = Date.now();
+      await this.services.storageManager.getDatabase().set(sessionKey, sessionData);
+      await this.services.storageManager.getCache().set(sessionKey, sessionData, this.sessionTTL / 1e3);
+    });
+    this.tokenUsageLocks.set(sessionKey, currentLock);
+    try {
+      await currentLock;
+    } finally {
+      if (this.tokenUsageLocks.get(sessionKey) === currentLock) {
+        this.tokenUsageLocks.delete(sessionKey);
+      }
+    }
+  }
   /**
    * Sets the human-friendly title for a session.
    * Title is stored in session metadata and cached with TTL.
@@ -422,11 +474,10 @@ class SessionManager {
     }
     this.services.agentEventBus.emit("llm:switched", {
       newConfig: newLLMConfig,
-      router: newLLMConfig.router,
       historyRetained: true,
       sessionIds: sessionIds.filter((id) => !failedSessions.includes(id))
     });
-    const message = failedSessions.length > 0 ? `Successfully switched to ${newLLMConfig.provider}/${newLLMConfig.model} using ${newLLMConfig.router} router (${failedSessions.length} sessions failed)` : `Successfully switched to ${newLLMConfig.provider}/${newLLMConfig.model} using ${newLLMConfig.router} router for all sessions`;
+    const message = failedSessions.length > 0 ? `Successfully switched to ${newLLMConfig.provider}/${newLLMConfig.model} (${failedSessions.length} sessions failed)` : `Successfully switched to ${newLLMConfig.provider}/${newLLMConfig.model} for all sessions`;
     const warnings = failedSessions.length > 0 ? [`Failed to switch LLM for sessions: ${failedSessions.join(", ")}`] : [];
     return { message, warnings };
   }
@@ -444,11 +495,10 @@ class SessionManager {
     await session.switchLLM(newLLMConfig);
     this.services.agentEventBus.emit("llm:switched", {
       newConfig: newLLMConfig,
-      router: newLLMConfig.router,
       historyRetained: true,
       sessionIds: [sessionId]
     });
-    const message = `Successfully switched to ${newLLMConfig.provider}/${newLLMConfig.model} using ${newLLMConfig.router} router for session ${sessionId}`;
+    const message = `Successfully switched to ${newLLMConfig.provider}/${newLLMConfig.model} for session ${sessionId}`;
     return { message, warnings: [] };
   }
   /**

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

@@ -7,11 +7,19 @@ import type { AgentStateManager } from '../agent/state-manager.js';
 import type { ValidatedLLMConfig } from '../llm/schemas.js';
 import type { StorageManager } from '../storage/index.js';
 import type { PluginManager } from '../plugins/manager.js';
+import type { TokenUsage } from '../llm/types.js';
+/**
+ * Session-level token usage totals (accumulated across all messages).
+ * All fields required since we track cumulative totals (defaulting to 0).
+ */
+export type SessionTokenUsage = Required<TokenUsage>;
 export interface SessionMetadata {
     createdAt: number;
     lastActivity: number;
     messageCount: number;
     title?: string;
+    tokenUsage?: SessionTokenUsage;
+    estimatedCost?: number;
 }
 export interface SessionManagerConfig {
     maxSessions?: number;
@@ -24,6 +32,8 @@ export interface SessionData {
     lastActivity: number;
     messageCount: number;
     metadata?: Record<string, any>;
+    tokenUsage?: SessionTokenUsage;
+    estimatedCost?: number;
 }
 /**
  * Manages multiple chat sessions within a Dexto agent.
@@ -50,6 +60,7 @@ export declare class SessionManager {
     private cleanupInterval?;
     private initializationPromise;
     private readonly pendingCreations;
+    private readonly tokenUsageLocks;
     private logger;
     constructor(services: {
         stateManager: AgentStateManager;
@@ -142,6 +153,13 @@ export declare class SessionManager {
      * Increments the message count for a session.
      */
     incrementMessageCount(sessionId: string): Promise<void>;
+    /**
+     * Accumulates token usage for a session.
+     * Called after each LLM response to update session-level totals.
+     *
+     * Uses per-session locking to prevent lost updates from concurrent calls.
+     */
+    accumulateTokenUsage(sessionId: string, usage: TokenUsage, cost?: number): Promise<void>;
     /**
      * Sets the human-friendly title for a session.
      * Title is stored in session metadata and cached with TTL.

package/dist/session/session-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../src/session/session-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../src/session/session-manager.ts"],"names":[],"mappings":"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"}

package/dist/session/session-manager.js

@@ -1,4 +1,4 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 import { randomUUID } from "crypto";
 import { ChatSession } from "./chat-session.js";
 import { DextoLogComponent } from "../logger/v2/types.js";
@@ -18,6 +18,8 @@ class SessionManager {
   initializationPromise;
   // Add a Map to track ongoing session creation operations to prevent race conditions
   pendingCreations = /* @__PURE__ */ new Map();
+  // Per-session mutex for token usage updates to prevent lost updates from concurrent calls
+  tokenUsageLocks = /* @__PURE__ */ new Map();
   logger;
   /**
    * Initialize the SessionManager with persistent storage.
@@ -273,12 +275,17 @@ class SessionManager {
     await this.ensureInitialized();
     const sessionKey = `session:${sessionId}`;
     const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
-    return sessionData ? {
+    if (!sessionData) return void 0;
+    return {
       createdAt: sessionData.createdAt,
       lastActivity: sessionData.lastActivity,
       messageCount: sessionData.messageCount,
-      title: sessionData.metadata?.title
-    } : void 0;
+      title: sessionData.metadata?.title,
+      ...sessionData.tokenUsage && { tokenUsage: sessionData.tokenUsage },
+      ...sessionData.estimatedCost !== void 0 && {
+        estimatedCost: sessionData.estimatedCost
+      }
+    };
   }
   /**
    * Get the global session manager configuration.
@@ -315,6 +322,51 @@ class SessionManager {
       await this.services.storageManager.getCache().set(sessionKey, sessionData, this.sessionTTL / 1e3);
     }
   }
+  /**
+   * Accumulates token usage for a session.
+   * Called after each LLM response to update session-level totals.
+   *
+   * Uses per-session locking to prevent lost updates from concurrent calls.
+   */
+  async accumulateTokenUsage(sessionId, usage, cost) {
+    await this.ensureInitialized();
+    const sessionKey = `session:${sessionId}`;
+    const previousLock = this.tokenUsageLocks.get(sessionKey) ?? Promise.resolve();
+    const currentLock = previousLock.then(async () => {
+      const sessionData = await this.services.storageManager.getDatabase().get(sessionKey);
+      if (!sessionData) return;
+      if (!sessionData.tokenUsage) {
+        sessionData.tokenUsage = {
+          inputTokens: 0,
+          outputTokens: 0,
+          reasoningTokens: 0,
+          cacheReadTokens: 0,
+          cacheWriteTokens: 0,
+          totalTokens: 0
+        };
+      }
+      sessionData.tokenUsage.inputTokens += usage.inputTokens ?? 0;
+      sessionData.tokenUsage.outputTokens += usage.outputTokens ?? 0;
+      sessionData.tokenUsage.reasoningTokens += usage.reasoningTokens ?? 0;
+      sessionData.tokenUsage.cacheReadTokens += usage.cacheReadTokens ?? 0;
+      sessionData.tokenUsage.cacheWriteTokens += usage.cacheWriteTokens ?? 0;
+      sessionData.tokenUsage.totalTokens += usage.totalTokens ?? 0;
+      if (cost !== void 0) {
+        sessionData.estimatedCost = (sessionData.estimatedCost ?? 0) + cost;
+      }
+      sessionData.lastActivity = Date.now();
+      await this.services.storageManager.getDatabase().set(sessionKey, sessionData);
+      await this.services.storageManager.getCache().set(sessionKey, sessionData, this.sessionTTL / 1e3);
+    });
+    this.tokenUsageLocks.set(sessionKey, currentLock);
+    try {
+      await currentLock;
+    } finally {
+      if (this.tokenUsageLocks.get(sessionKey) === currentLock) {
+        this.tokenUsageLocks.delete(sessionKey);
+      }
+    }
+  }
   /**
    * Sets the human-friendly title for a session.
    * Title is stored in session metadata and cached with TTL.
@@ -400,11 +452,10 @@ class SessionManager {
     }
     this.services.agentEventBus.emit("llm:switched", {
       newConfig: newLLMConfig,
-      router: newLLMConfig.router,
       historyRetained: true,
       sessionIds: sessionIds.filter((id) => !failedSessions.includes(id))
     });
-    const message = failedSessions.length > 0 ? `Successfully switched to ${newLLMConfig.provider}/${newLLMConfig.model} using ${newLLMConfig.router} router (${failedSessions.length} sessions failed)` : `Successfully switched to ${newLLMConfig.provider}/${newLLMConfig.model} using ${newLLMConfig.router} router for all sessions`;
+    const message = failedSessions.length > 0 ? `Successfully switched to ${newLLMConfig.provider}/${newLLMConfig.model} (${failedSessions.length} sessions failed)` : `Successfully switched to ${newLLMConfig.provider}/${newLLMConfig.model} for all sessions`;
     const warnings = failedSessions.length > 0 ? [`Failed to switch LLM for sessions: ${failedSessions.join(", ")}`] : [];
     return { message, warnings };
   }
@@ -422,11 +473,10 @@ class SessionManager {
     await session.switchLLM(newLLMConfig);
     this.services.agentEventBus.emit("llm:switched", {
       newConfig: newLLMConfig,
-      router: newLLMConfig.router,
       historyRetained: true,
       sessionIds: [sessionId]
     });
-    const message = `Successfully switched to ${newLLMConfig.provider}/${newLLMConfig.model} using ${newLLMConfig.router} router for session ${sessionId}`;
+    const message = `Successfully switched to ${newLLMConfig.provider}/${newLLMConfig.model} for session ${sessionId}`;
     return { message, warnings: [] };
   }
   /**

package/dist/session/title-generator.cjs

@@ -25,7 +25,7 @@ module.exports = __toCommonJS(title_generator_exports);
 var import_factory = require("../llm/services/factory.cjs");
 var import_events = require("../events/index.cjs");
 var import_memory = require("./history/memory.js");
-async function generateSessionTitle(config, router, toolManager, systemPromptManager, resourceManager, userText, logger, opts = {}) {
+async function generateSessionTitle(config, toolManager, systemPromptManager, resourceManager, userText, logger, opts = {}) {
   const timeoutMs = opts.timeoutMs;
   const controller = timeoutMs !== void 0 ? new AbortController() : void 0;
   let timer;
@@ -33,11 +33,10 @@ async function generateSessionTitle(config, router, toolManager, systemPromptMan
     timer = setTimeout(() => controller.abort(), timeoutMs);
   }
   try {
-    const history = new import_memory.MemoryHistoryProvider();
+    const history = new import_memory.MemoryHistoryProvider(logger);
     const bus = new import_events.SessionEventBus();
     const tempService = (0, import_factory.createLLMService)(
       config,
-      router,
       toolManager,
       systemPromptManager,
       history,
@@ -53,12 +52,9 @@ async function generateSessionTitle(config, router, toolManager, systemPromptMan
       "Message:",
       sanitizeUserText(userText, 512)
     ].join("\n");
-    const result = await tempService.completeTask(
+    const result = await tempService.stream(
       instruction,
-      controller ? { signal: controller.signal } : {},
-      void 0,
-      void 0,
-      false
+      controller ? { signal: controller.signal } : void 0
     );
     const processed = postProcessTitle(result);
     if (!processed) {

package/dist/session/title-generator.d.ts

@@ -1,5 +1,4 @@
 import type { ValidatedLLMConfig } from '../llm/schemas.js';
-import type { LLMRouter } from '../llm/types.js';
 import type { ToolManager } from '../tools/tool-manager.js';
 import type { SystemPromptManager } from '../systemPrompt/manager.js';
 import type { ResourceManager } from '../resources/index.js';
@@ -13,7 +12,7 @@ export interface GenerateSessionTitleResult {
  * Generate a concise title for a chat based on the first user message.
  * Runs a lightweight, isolated LLM completion that does not touch real history.
  */
-export declare function generateSessionTitle(config: ValidatedLLMConfig, router: LLMRouter, toolManager: ToolManager, systemPromptManager: SystemPromptManager, resourceManager: ResourceManager, userText: string, logger: IDextoLogger, opts?: {
+export declare function generateSessionTitle(config: ValidatedLLMConfig, toolManager: ToolManager, systemPromptManager: SystemPromptManager, resourceManager: ResourceManager, userText: string, logger: IDextoLogger, opts?: {
     timeoutMs?: number;
 }): Promise<GenerateSessionTitleResult>;
 /**

package/dist/session/title-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"title-generator.d.ts","sourceRoot":"","sources":["../../src/session/title-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAK7D,MAAM,WAAW,0BAA0B;IACvC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CACtC,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,WAAW,EACxB,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,eAAe,EAChC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,EACpB,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GAClC,OAAO,CAAC,0BAA0B,CAAC,CAuDrC;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CA8BzE"}
+{"version":3,"file":"title-generator.d.ts","sourceRoot":"","sources":["../../src/session/title-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAK7D,MAAM,WAAW,0BAA0B;IACvC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CACtC,MAAM,EAAE,kBAAkB,EAC1B,WAAW,EAAE,WAAW,EACxB,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,eAAe,EAChC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,EACpB,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GAClC,OAAO,CAAC,0BAA0B,CAAC,CAmDrC;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CA8BzE"}