@dexto/core 1.3.0 → 1.4.0

package/dist/prompts/providers/config-prompt-provider.d.ts

@@ -1,6 +1,7 @@
 import type { PromptProvider, PromptDefinition, PromptListResult } from '../types.js';
 import type { GetPromptResult } from '@modelcontextprotocol/sdk/types.js';
 import type { ValidatedAgentConfig } from '../../agent/schemas.js';
+import type { PromptsConfig } from '../schemas.js';
 import type { IDextoLogger } from '../../logger/v2/types.js';
 /**
  * Config Prompt Provider - Unified provider for prompts from agent configuration
@@ -20,7 +21,7 @@ export declare class ConfigPromptProvider implements PromptProvider {
     constructor(agentConfig: ValidatedAgentConfig, logger: IDextoLogger);
     getSource(): string;
     invalidateCache(): void;
-    updateConfig(agentConfig: ValidatedAgentConfig): void;
+    updatePrompts(prompts: PromptsConfig): void;
     listPrompts(_cursor?: string): Promise<PromptListResult>;
     getPrompt(name: string, args?: Record<string, unknown>): Promise<GetPromptResult>;
     getPromptDefinition(name: string): Promise<PromptDefinition | null>;

package/dist/prompts/providers/config-prompt-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-prompt-provider.d.ts","sourceRoot":"","sources":["../../../src/prompts/providers/config-prompt-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAc,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAClG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAEnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAS7D;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,YAAW,cAAc;IACvD,OAAO,CAAC,OAAO,CAAyB;IACxC,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,aAAa,CAAkC;IACvD,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,MAAM,CAAe;gBAEjB,WAAW,EAAE,oBAAoB,EAAE,MAAM,EAAE,YAAY;IAMnE,SAAS,IAAI,MAAM;IAInB,eAAe,IAAI,IAAI;IAOvB,YAAY,CAAC,WAAW,EAAE,oBAAoB,GAAG,IAAI;IAM/C,WAAW,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAUxD,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IAgCjF,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAkB3D,iBAAiB;IAsC/B,OAAO,CAAC,mBAAmB;YAsBb,iBAAiB;IAwE/B,OAAO,CAAC,mBAAmB;IA+F3B,OAAO,CAAC,iBAAiB;IAyBzB,OAAO,CAAC,cAAc;CA+BzB"}
+{"version":3,"file":"config-prompt-provider.d.ts","sourceRoot":"","sources":["../../../src/prompts/providers/config-prompt-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAc,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAClG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,KAAK,EAA4B,aAAa,EAAE,MAAM,eAAe,CAAC;AAE7E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAS7D;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,YAAW,cAAc;IACvD,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,aAAa,CAAkC;IACvD,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,MAAM,CAAe;gBAEjB,WAAW,EAAE,oBAAoB,EAAE,MAAM,EAAE,YAAY;IAMnE,SAAS,IAAI,MAAM;IAInB,eAAe,IAAI,IAAI;IAOvB,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;IAYrC,WAAW,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAUxD,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IAgCjF,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAkB3D,iBAAiB;IAsC/B,OAAO,CAAC,mBAAmB;YAuBb,iBAAiB;IAyE/B,OAAO,CAAC,mBAAmB;IA+F3B,OAAO,CAAC,iBAAiB;IAyBzB,OAAO,CAAC,cAAc;CA+BzB"}

package/dist/prompts/providers/config-prompt-provider.js

@@ -1,4 +1,5 @@
-import "../../chunk-C6A6W6XS.js";
+import "../../chunk-PTJYTZNU.js";
+import { PromptsSchema } from "../schemas.js";
 import { DextoLogComponent } from "../../logger/v2/types.js";
 import { PromptError } from "../errors.js";
 import { expandPlaceholders } from "../utils.js";
@@ -26,8 +27,14 @@ class ConfigPromptProvider {
     this.promptContent.clear();
     this.logger.debug("ConfigPromptProvider cache invalidated");
   }
-  updateConfig(agentConfig) {
-    this.prompts = agentConfig.prompts;
+  updatePrompts(prompts) {
+    const result = PromptsSchema.safeParse(prompts);
+    if (!result.success) {
+      const errorMsg = result.error.issues.map((i) => i.message).join(", ");
+      this.logger.error(`Invalid prompts config: ${errorMsg}`);
+      throw PromptError.validationFailed(errorMsg);
+    }
+    this.prompts = result.data;
     this.invalidateCache();
     this.buildPromptsCache();
   }
@@ -83,7 +90,7 @@ class ConfigPromptProvider {
   async buildPromptsCache() {
     const cache = [];
     const contentMap = /* @__PURE__ */ new Map();
-    for (const prompt of this.prompts) {
+    for (const prompt of this.prompts ?? []) {
       try {
         if (prompt.type === "inline") {
           const { info, content } = this.processInlinePrompt(prompt);
@@ -116,6 +123,7 @@ class ConfigPromptProvider {
     const promptName = `config:${prompt.id}`;
     const promptInfo = {
       name: promptName,
+      displayName: prompt.id,
       title: prompt.title,
       description: prompt.description,
       source: "config",
@@ -167,6 +175,7 @@ class ConfigPromptProvider {
       }
       const promptInfo = {
         name: `config:${parsed.id}`,
+        displayName: parsed.id,
         title: parsed.title,
         description: parsed.description,
         source: "config",

package/dist/prompts/providers/custom-prompt-provider.js

@@ -1,4 +1,4 @@
-import "../../chunk-C6A6W6XS.js";
+import "../../chunk-PTJYTZNU.js";
 import { DextoLogComponent } from "../../logger/v2/types.js";
 import { expandPlaceholders } from "../utils.js";
 import { PromptError } from "../errors.js";

package/dist/prompts/providers/mcp-prompt-provider.js

@@ -1,4 +1,4 @@
-import "../../chunk-C6A6W6XS.js";
+import "../../chunk-PTJYTZNU.js";
 class MCPPromptProvider {
   mcpManager;
   logger;

package/dist/prompts/schemas.d.ts

@@ -163,6 +163,18 @@ export type ValidatedFilePrompt = z.output<typeof FilePromptSchema>;
  * Type for a single prompt (either inline or file)
  */
 export type ValidatedPrompt = ValidatedInlinePrompt | ValidatedFilePrompt;
+/**
+ * Input type for a single inline prompt (before validation)
+ */
+export type InlinePrompt = z.input<typeof InlinePromptSchema>;
+/**
+ * Input type for a single file-based prompt (before validation)
+ */
+export type FilePrompt = z.input<typeof FilePromptSchema>;
+/**
+ * Input type for a single prompt (before validation)
+ */
+export type Prompt = InlinePrompt | FilePrompt;
 /**
  * Validated prompts configuration type
  */

package/dist/prompts/schemas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/prompts/schemas.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB;;GAEG;AACH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiCoC,CAAC;AAEpE;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;EAeiC,CAAC;AAE/D;;;GAGG;AACH,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MA6BgC,CAAC;AAE3D;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAExE;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAEpE;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,qBAAqB,GAAG,mBAAmB,CAAC;AAE1E;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,aAAa,CAAC,CAAC;AAEpE;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC"}
+{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/prompts/schemas.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB;;GAEG;AACH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiCoC,CAAC;AAEpE;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;EAeiC,CAAC;AAE/D;;;GAGG;AACH,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MA6BgC,CAAC;AAE3D;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAExE;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAEpE;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,qBAAqB,GAAG,mBAAmB,CAAC;AAE1E;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE9D;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG,YAAY,GAAG,UAAU,CAAC;AAE/C;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,aAAa,CAAC,CAAC;AAEpE;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC"}

package/dist/prompts/schemas.js

@@ -1,4 +1,4 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 import { z } from "zod";
 import { PROMPT_NAME_REGEX, PROMPT_NAME_GUIDANCE } from "./name-validation.js";
 const InlinePromptSchema = z.object({

package/dist/prompts/types.d.ts

@@ -23,6 +23,8 @@ export interface PromptDefinition {
  */
 export interface PromptInfo extends PromptDefinition {
     source: 'mcp' | 'config' | 'custom';
+    /** User-friendly display name without namespace prefix (e.g., "quick-start" instead of "config:quick-start") */
+    displayName?: string | undefined;
     metadata?: Record<string, unknown>;
 }
 /**

package/dist/prompts/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/prompts/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAE1E;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAClC;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,SAAS,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;CAC5C;AAED;;GAEG;AACH,MAAM,WAAW,UAAW,SAAQ,gBAAgB;IAChD,MAAM,EAAE,KAAK,GAAG,QAAQ,GAAG,QAAQ,CAAC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AAED;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC7B,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC3B;;OAEG;IACH,SAAS,IAAI,MAAM,CAAC;IAEpB;;OAEG;IACH,eAAe,IAAI,IAAI,CAAC;IAExB;;OAEG;IACH,WAAW,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAExD;;OAEG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IAElF;;OAEG;IACH,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;CACvE"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/prompts/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAE1E;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAClC;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,SAAS,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;CAC5C;AAED;;GAEG;AACH,MAAM,WAAW,UAAW,SAAQ,gBAAgB;IAChD,MAAM,EAAE,KAAK,GAAG,QAAQ,GAAG,QAAQ,CAAC;IACpC,gHAAgH;IAChH,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AAED;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC7B,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC3B;;OAEG;IACH,SAAS,IAAI,MAAM,CAAC;IAEpB;;OAEG;IACH,eAAe,IAAI,IAAI,CAAC;IAExB;;OAEG;IACH,WAAW,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAExD;;OAEG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IAElF;;OAEG;IACH,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;CACvE"}

package/dist/prompts/utils.js

@@ -1,4 +1,4 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 function isValidResourceUri(uri) {
   try {
     if (uri.includes(":")) {

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.js

@@ -1,4 +1,4 @@
-import "../chunk-C6A6W6XS.js";
+import "../chunk-PTJYTZNU.js";
 function escapeRegExp(literal) {
   return literal.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
 }

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

@@ -27,6 +27,7 @@ var import_events = require("../events/index.js");
 var import_types = require("../logger/v2/types.js");
 var import_errors = require("../errors/index.js");
 var import_error_codes = require("../plugins/error-codes.js");
+var import_registry = require("../llm/registry.js");
 class ChatSession {
   /**
    * Creates a new ChatSession instance.
@@ -77,6 +78,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,10 +112,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 = (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.
    */
@@ -123,7 +151,6 @@ class ChatSession {
     );
     this.llmService = (0, import_factory2.createLLMService)(
       llmConfig,
-      llmConfig.router,
       this.services.toolManager,
       this.services.systemPromptManager,
       this.historyProvider,
@@ -152,12 +179,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 +192,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(
@@ -217,22 +261,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 +295,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 +320,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 +411,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 +424,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 = (0, import_factory2.createLLMService)(
         newLLMConfig,
-        router,
         this.services.toolManager,
         this.services.systemPromptManager,
         this.historyProvider,
@@ -394,7 +447,6 @@ class ChatSession {
       );
       this.eventBus.emit("llm:switched", {
         newConfig: newLLMConfig,
-        router,
         historyRetained: true
       });
     } catch (error) {
@@ -435,8 +487,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.