@dexto/core 1.5.8 → 1.6.1

package/dist/resources/manager.js

@@ -1,43 +1,39 @@
 import "../chunk-PTJYTZNU.js";
-import { InternalResourcesProvider } from "./internal-provider.js";
+import { AgentResourcesProvider } from "./agent-resources-provider.js";
 import { DextoLogComponent } from "../logger/v2/types.js";
-import { ResourceError } from "./errors.js";
-import { eventBus } from "../events/index.js";
 class ResourceManager {
   mcpManager;
-  internalResourcesProvider;
+  agentResourcesProvider;
   blobStore;
   logger;
-  constructor(mcpManager, options, logger) {
+  eventBus;
+  listenerAbort = new AbortController();
+  constructor(mcpManager, options, eventBus, logger) {
     this.mcpManager = mcpManager;
     this.blobStore = options.blobStore;
+    this.eventBus = eventBus;
     this.logger = logger.createChild(DextoLogComponent.RESOURCE);
     const services = {
       blobStore: this.blobStore
     };
-    const config = options.internalResourcesConfig;
-    if (config.enabled || config.resources.length > 0) {
-      this.internalResourcesProvider = new InternalResourcesProvider(
-        config,
-        services,
-        this.logger
-      );
-    } else {
-      this.internalResourcesProvider = new InternalResourcesProvider(
-        { enabled: true, resources: [] },
-        services,
-        this.logger
-      );
-    }
+    this.agentResourcesProvider = new AgentResourcesProvider(
+      options.resourcesConfig,
+      services,
+      this.logger
+    );
     this.setupNotificationListeners();
     this.logger.debug("ResourceManager initialized");
   }
   async initialize() {
-    if (this.internalResourcesProvider) {
-      await this.internalResourcesProvider.initialize();
-    }
+    await this.agentResourcesProvider.initialize();
     this.logger.debug("ResourceManager initialization complete");
   }
+  cleanup() {
+    if (!this.listenerAbort.signal.aborted) {
+      this.listenerAbort.abort();
+      this.logger.debug("ResourceManager event listeners cleaned up");
+    }
+  }
   getBlobStore() {
     return this.blobStore;
   }
@@ -82,22 +78,20 @@ class ResourceManager {
         `Failed to enumerate MCP resources: ${error instanceof Error ? error.message : String(error)}`
       );
     }
-    if (this.internalResourcesProvider) {
-      try {
-        const internalResources = await this.internalResourcesProvider.listResources();
-        for (const resource of internalResources) {
-          resources[resource.uri] = resource;
-        }
-        if (internalResources.length > 0) {
-          this.logger.debug(
-            `\u{1F5C3}\uFE0F Resource discovery (internal): ${internalResources.length} resources`
-          );
-        }
-      } catch (error) {
-        this.logger.error(
-          `Failed to enumerate internal resources: ${error instanceof Error ? error.message : String(error)}`
+    try {
+      const internalResources = await this.agentResourcesProvider.listResources();
+      for (const resource of internalResources) {
+        resources[resource.uri] = resource;
+      }
+      if (internalResources.length > 0) {
+        this.logger.debug(
+          `\u{1F5C3}\uFE0F Resource discovery (internal): ${internalResources.length} resources`
         );
       }
+    } catch (error) {
+      this.logger.error(
+        `Failed to enumerate internal resources: ${error instanceof Error ? error.message : String(error)}`
+      );
     }
     return resources;
   }
@@ -115,10 +109,7 @@ class ResourceManager {
         return false;
       }
     }
-    if (!this.internalResourcesProvider) {
-      return false;
-    }
-    return await this.internalResourcesProvider.hasResource(uri);
+    return await this.agentResourcesProvider.hasResource(uri);
   }
   async read(uri) {
     this.logger.debug(`\u{1F4D6} Reading resource: ${uri}`);
@@ -146,10 +137,7 @@ class ResourceManager {
           }
         };
       }
-      if (!this.internalResourcesProvider) {
-        throw ResourceError.providerNotInitialized("Internal", uri);
-      }
-      const result = await this.internalResourcesProvider.readResource(uri);
+      const result = await this.agentResourcesProvider.readResource(uri);
       this.logger.debug(`\u2705 Successfully read internal resource: ${uri}`);
       return result;
     } catch (error) {
@@ -160,46 +148,61 @@ class ResourceManager {
     }
   }
   async refresh() {
-    if (this.internalResourcesProvider) {
-      await this.internalResourcesProvider.refresh();
-    }
+    await this.agentResourcesProvider.refresh();
     this.logger.info("ResourceManager refreshed");
   }
-  getInternalResourcesProvider() {
-    return this.internalResourcesProvider;
+  getAgentResourcesProvider() {
+    return this.agentResourcesProvider;
+  }
+  emitCacheInvalidated(payload) {
+    this.eventBus.emit("resource:cache-invalidated", payload);
   }
   /**
    * Set up listeners for MCP resource notifications to enable real-time updates
    */
   setupNotificationListeners() {
-    eventBus.on("mcp:resource-updated", async (payload) => {
-      this.logger.debug(
-        `\u{1F504} Resource updated notification: ${payload.resourceUri} from server '${payload.serverName}'`
-      );
-      eventBus.emit("resource:cache-invalidated", {
-        resourceUri: payload.resourceUri,
-        serverName: payload.serverName,
-        action: "updated"
-      });
-    });
-    eventBus.on("mcp:server-connected", async (payload) => {
-      if (payload.success) {
+    this.eventBus.on(
+      "mcp:resource-updated",
+      async (payload) => {
         this.logger.debug(
-          `\u{1F504} Server connected, resources may have changed: ${payload.name}`
+          `\u{1F504} Resource updated notification: ${payload.resourceUri} from server '${payload.serverName}'`
         );
-        eventBus.emit("resource:cache-invalidated", {
-          serverName: payload.name,
-          action: "server_connected"
+        this.emitCacheInvalidated({
+          resourceUri: payload.resourceUri,
+          serverName: payload.serverName,
+          action: "updated"
         });
-      }
-    });
-    eventBus.on("mcp:server-removed", async (payload) => {
-      this.logger.debug(`\u{1F504} Server removed, resources invalidated: ${payload.serverName}`);
-      eventBus.emit("resource:cache-invalidated", {
-        serverName: payload.serverName,
-        action: "server_removed"
-      });
-    });
+      },
+      { signal: this.listenerAbort.signal }
+    );
+    this.eventBus.on(
+      "mcp:server-connected",
+      async (payload) => {
+        if (payload.success) {
+          this.logger.debug(
+            `\u{1F504} Server connected, resources may have changed: ${payload.name}`
+          );
+          this.emitCacheInvalidated({
+            serverName: payload.name,
+            action: "server_connected"
+          });
+        }
+      },
+      { signal: this.listenerAbort.signal }
+    );
+    this.eventBus.on(
+      "mcp:server-removed",
+      async (payload) => {
+        this.logger.debug(
+          `\u{1F504} Server removed, resources invalidated: ${payload.serverName}`
+        );
+        this.emitCacheInvalidated({
+          serverName: payload.serverName,
+          action: "server_removed"
+        });
+      },
+      { signal: this.listenerAbort.signal }
+    );
   }
 }
 export {

package/dist/resources/schemas.cjs

@@ -18,9 +18,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var schemas_exports = {};
 __export(schemas_exports, {
-  InternalResourceConfigSchema: () => InternalResourceConfigSchema,
-  InternalResourcesSchema: () => InternalResourcesSchema,
-  isInternalResourcesEnabled: () => isInternalResourcesEnabled
+  ResourceConfigSchema: () => ResourceConfigSchema,
+  ResourcesConfigSchema: () => ResourcesConfigSchema
 });
 module.exports = __toCommonJS(schemas_exports);
 var import_zod = require("zod");
@@ -67,32 +66,13 @@ const BlobResourceSchema = import_zod.z.object({
 }).strict().describe(
   "Blob resource provider configuration - actual storage settings are in storage.blob section"
 );
-const InternalResourceConfigSchema = import_zod.z.discriminatedUnion("type", [
+const ResourceConfigSchema = import_zod.z.discriminatedUnion("type", [
   FileSystemResourceSchema,
   BlobResourceSchema
 ]);
-const InternalResourcesSchema = import_zod.z.union([
-  import_zod.z.array(InternalResourceConfigSchema),
-  // array-only form
-  import_zod.z.object({
-    enabled: import_zod.z.boolean().optional().describe("Explicit toggle; auto-enabled when resources are non-empty"),
-    resources: import_zod.z.array(InternalResourceConfigSchema).default([]).describe("List of internal resource configurations")
-  }).strict()
-]).default([]).describe(
-  "Internal resource configuration. Can be an array of resources (auto-enabled) or object with enabled field"
-).transform((input) => {
-  if (Array.isArray(input)) {
-    return { enabled: input.length > 0, resources: input };
-  }
-  const enabled = input.enabled !== void 0 ? input.enabled : input.resources.length > 0;
-  return { enabled, resources: input.resources };
-});
-function isInternalResourcesEnabled(config) {
-  return config.enabled && config.resources.length > 0;
-}
+const ResourcesConfigSchema = import_zod.z.array(ResourceConfigSchema).default([]).describe("Agent-managed resource configuration");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  InternalResourceConfigSchema,
-  InternalResourcesSchema,
-  isInternalResourcesEnabled
+  ResourceConfigSchema,
+  ResourcesConfigSchema
 });

package/dist/resources/schemas.d.ts

@@ -49,7 +49,7 @@ export type ValidatedBlobResourceConfig = z.output<typeof BlobResourceSchema>;
 /**
  * Union schema for all internal resource types (composed from individual schemas)
  */
-export declare const InternalResourceConfigSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
+export declare const ResourceConfigSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
     type: z.ZodLiteral<"filesystem">;
     paths: z.ZodArray<z.ZodString, "many">;
     maxDepth: z.ZodDefault<z.ZodNumber>;
@@ -80,17 +80,13 @@ export declare const InternalResourceConfigSchema: z.ZodDiscriminatedUnion<"type
 /**
  * Validated union type for all internal resource configurations
  */
-export type ValidatedInternalResourceConfig = z.output<typeof InternalResourceConfigSchema>;
+export type ValidatedResourceConfig = z.output<typeof ResourceConfigSchema>;
 /**
- * Schema for internal resources configuration with smart auto-enable logic
+ * Schema for agent-managed resources (filesystem, blob, etc.).
  *
- * Design principles:
- * - Clean input format: just specify resources array or object
- * - Auto-enable when resources are specified
- * - Backward compatibility with explicit enabled field
- * - Empty/omitted = disabled
+ * Omit or set to [] to disable agent-managed resources.
  */
-export declare const InternalResourcesSchema: z.ZodEffects<z.ZodDefault<z.ZodUnion<[z.ZodArray<z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
+export declare const ResourcesConfigSchema: z.ZodDefault<z.ZodArray<z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
     type: z.ZodLiteral<"filesystem">;
     paths: z.ZodArray<z.ZodString, "many">;
     maxDepth: z.ZodDefault<z.ZodNumber>;
@@ -117,96 +113,8 @@ export declare const InternalResourcesSchema: z.ZodEffects<z.ZodDefault<z.ZodUni
     type: "blob";
 }, {
     type: "blob";
-}>]>, "many">, z.ZodObject<{
-    enabled: z.ZodOptional<z.ZodBoolean>;
-    resources: z.ZodDefault<z.ZodArray<z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
-        type: z.ZodLiteral<"filesystem">;
-        paths: z.ZodArray<z.ZodString, "many">;
-        maxDepth: z.ZodDefault<z.ZodNumber>;
-        maxFiles: z.ZodDefault<z.ZodNumber>;
-        includeHidden: z.ZodDefault<z.ZodBoolean>;
-        includeExtensions: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
-    }, "strict", z.ZodTypeAny, {
-        type: "filesystem";
-        maxFiles: number;
-        paths: string[];
-        maxDepth: number;
-        includeHidden: boolean;
-        includeExtensions: string[];
-    }, {
-        type: "filesystem";
-        paths: string[];
-        maxFiles?: number | undefined;
-        maxDepth?: number | undefined;
-        includeHidden?: boolean | undefined;
-        includeExtensions?: string[] | undefined;
-    }>, z.ZodObject<{
-        type: z.ZodLiteral<"blob">;
-    }, "strict", z.ZodTypeAny, {
-        type: "blob";
-    }, {
-        type: "blob";
-    }>]>, "many">>;
-}, "strict", z.ZodTypeAny, {
-    resources: ({
-        type: "filesystem";
-        maxFiles: number;
-        paths: string[];
-        maxDepth: number;
-        includeHidden: boolean;
-        includeExtensions: string[];
-    } | {
-        type: "blob";
-    })[];
-    enabled?: boolean | undefined;
-}, {
-    enabled?: boolean | undefined;
-    resources?: ({
-        type: "filesystem";
-        paths: string[];
-        maxFiles?: number | undefined;
-        maxDepth?: number | undefined;
-        includeHidden?: boolean | undefined;
-        includeExtensions?: string[] | undefined;
-    } | {
-        type: "blob";
-    })[] | undefined;
-}>]>>, {
-    enabled: boolean;
-    resources: ({
-        type: "filesystem";
-        maxFiles: number;
-        paths: string[];
-        maxDepth: number;
-        includeHidden: boolean;
-        includeExtensions: string[];
-    } | {
-        type: "blob";
-    })[];
-}, ({
-    type: "filesystem";
-    paths: string[];
-    maxFiles?: number | undefined;
-    maxDepth?: number | undefined;
-    includeHidden?: boolean | undefined;
-    includeExtensions?: string[] | undefined;
-} | {
-    type: "blob";
-})[] | {
-    enabled?: boolean | undefined;
-    resources?: ({
-        type: "filesystem";
-        paths: string[];
-        maxFiles?: number | undefined;
-        maxDepth?: number | undefined;
-        includeHidden?: boolean | undefined;
-        includeExtensions?: string[] | undefined;
-    } | {
-        type: "blob";
-    })[] | undefined;
-} | undefined>;
-export type InternalResourcesConfig = z.input<typeof InternalResourcesSchema>;
-export type ValidatedInternalResourcesConfig = z.output<typeof InternalResourcesSchema>;
-export declare function isInternalResourcesEnabled(config: ValidatedInternalResourcesConfig): boolean;
+}>]>, "many">>;
+export type ResourcesConfig = z.input<typeof ResourcesConfigSchema>;
+export type ValidatedResourcesConfig = z.output<typeof ResourcesConfigSchema>;
 export {};
 //# sourceMappingURL=schemas.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/resources/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAaxB;;GAEG;AACH,QAAA,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;EAsDjB,CAAC;AAEd;;GAEG;AACH,MAAM,MAAM,iCAAiC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1F;;;;;;GAMG;AACH,QAAA,MAAM,kBAAkB;;;;;;EAOnB,CAAC;AAEN;;GAEG;AACH,MAAM,MAAM,2BAA2B,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE9E;;GAEG;AACH,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;IAGvC,CAAC;AAEH;;GAEG;AACH,MAAM,MAAM,+BAA+B,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,4BAA4B,CAAC,CAAC;AAE5F;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cA0B9B,CAAC;AAEP,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAC9E,MAAM,MAAM,gCAAgC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAExF,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,gCAAgC,GAAG,OAAO,CAE5F"}
+{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/resources/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAaxB;;GAEG;AACH,QAAA,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;EAsDjB,CAAC;AAEd;;GAEG;AACH,MAAM,MAAM,iCAAiC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1F;;;;;;GAMG;AACH,QAAA,MAAM,kBAAkB;;;;;;EAOnB,CAAC;AAEN;;GAEG;AACH,MAAM,MAAM,2BAA2B,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE9E;;GAEG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;IAG/B,CAAC;AAEH;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAE5E;;;;GAIG;AACH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;cAGmB,CAAC;AAEtD,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AACpE,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,qBAAqB,CAAC,CAAC"}

package/dist/resources/schemas.js

@@ -43,31 +43,12 @@ const BlobResourceSchema = z.object({
 }).strict().describe(
   "Blob resource provider configuration - actual storage settings are in storage.blob section"
 );
-const InternalResourceConfigSchema = z.discriminatedUnion("type", [
+const ResourceConfigSchema = z.discriminatedUnion("type", [
   FileSystemResourceSchema,
   BlobResourceSchema
 ]);
-const InternalResourcesSchema = z.union([
-  z.array(InternalResourceConfigSchema),
-  // array-only form
-  z.object({
-    enabled: z.boolean().optional().describe("Explicit toggle; auto-enabled when resources are non-empty"),
-    resources: z.array(InternalResourceConfigSchema).default([]).describe("List of internal resource configurations")
-  }).strict()
-]).default([]).describe(
-  "Internal resource configuration. Can be an array of resources (auto-enabled) or object with enabled field"
-).transform((input) => {
-  if (Array.isArray(input)) {
-    return { enabled: input.length > 0, resources: input };
-  }
-  const enabled = input.enabled !== void 0 ? input.enabled : input.resources.length > 0;
-  return { enabled, resources: input.resources };
-});
-function isInternalResourcesEnabled(config) {
-  return config.enabled && config.resources.length > 0;
-}
+const ResourcesConfigSchema = z.array(ResourceConfigSchema).default([]).describe("Agent-managed resource configuration");
 export {
-  InternalResourceConfigSchema,
-  InternalResourcesSchema,
-  isInternalResourcesEnabled
+  ResourceConfigSchema,
+  ResourcesConfigSchema
 };

package/dist/search/search-service.d.ts

@@ -1,4 +1,4 @@
-import type { IDextoLogger } from '../logger/v2/types.js';
+import type { Logger } from '../logger/v2/types.js';
 import type { Database } from '../storage/types.js';
 import type { SearchOptions, SearchResponse, SessionSearchResponse } from './types.js';
 /**
@@ -8,7 +8,7 @@ import type { SearchOptions, SearchResponse, SessionSearchResponse } from './typ
 export declare class SearchService {
     private database;
     private logger;
-    constructor(database: Database, logger: IDextoLogger);
+    constructor(database: Database, logger: Logger);
     /**
      * Search for messages across all sessions or within a specific session
      */

package/dist/search/search-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search-service.d.ts","sourceRoot":"","sources":["../../src/search/search-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,KAAK,EACR,aAAa,EAGb,cAAc,EACd,qBAAqB,EACxB,MAAM,YAAY,CAAC;AAEpB;;;GAGG;AACH,qBAAa,aAAa;IAIlB,OAAO,CAAC,QAAQ;IAHpB,OAAO,CAAC,MAAM,CAAe;gBAGjB,QAAQ,EAAE,QAAQ,EAC1B,MAAM,EAAE,YAAY;IAKxB;;OAEG;IACG,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,cAAc,CAAC;IA2DzF;;OAEG;IACG,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAiEnE;;OAEG;YACW,eAAe;IAsD7B;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAmB7B;;OAEG;IACH,OAAO,CAAC,UAAU;IAsBlB;;OAEG;IACH,OAAO,CAAC,WAAW;IAyBnB;;OAEG;YACW,aAAa;IAK3B;;OAEG;YACW,kBAAkB;CAiBnC"}
+{"version":3,"file":"search-service.d.ts","sourceRoot":"","sources":["../../src/search/search-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,KAAK,EACR,aAAa,EAGb,cAAc,EACd,qBAAqB,EACxB,MAAM,YAAY,CAAC;AAEpB;;;GAGG;AACH,qBAAa,aAAa;IAIlB,OAAO,CAAC,QAAQ;IAHpB,OAAO,CAAC,MAAM,CAAS;gBAGX,QAAQ,EAAE,QAAQ,EAC1B,MAAM,EAAE,MAAM;IAKlB;;OAEG;IACG,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,cAAc,CAAC;IA2DzF;;OAEG;IACG,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAiEnE;;OAEG;YACW,eAAe;IAsD7B;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAmB7B;;OAEG;IACH,OAAO,CAAC,UAAU;IAsBlB;;OAEG;IACH,OAAO,CAAC,WAAW;IAyBnB;;OAEG;YACW,aAAa;IAK3B;;OAEG;YACW,kBAAkB;CAiBnC"}

package/dist/session/chat-session.cjs

@@ -23,11 +23,10 @@ __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_error_codes = require("../hooks/error-codes.js");
 var import_registry = require("../llm/registry/index.js");
 class ChatSession {
   /**
@@ -125,13 +124,17 @@ class ChatSession {
   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);
+        const modelInfo = {
+          provider: payload.provider ?? llmConfig.provider,
+          model: payload.model ?? llmConfig.model
+        };
+        let cost;
+        const pricing = (0, import_registry.getModelPricing)(modelInfo.provider, modelInfo.model);
         if (pricing) {
           cost = (0, import_registry.calculateCost)(payload.tokenUsage, pricing);
         }
-        this.services.sessionManager.accumulateTokenUsage(this.id, payload.tokenUsage, cost).catch((err) => {
+        this.services.sessionManager.accumulateTokenUsage(this.id, payload.tokenUsage, cost, modelInfo).catch((err) => {
           this.logger.warn(
             `Failed to accumulate token usage: ${err instanceof Error ? err.message : String(err)}`
           );
@@ -151,11 +154,7 @@ class ChatSession {
       this.id,
       this.logger
     );
-    const model = (0, import_factory2.createVercelModel)(llmConfig);
-    const compactionStrategy = await (0, import_compaction.createCompactionStrategy)(runtimeConfig.compaction, {
-      logger: this.logger,
-      model
-    });
+    const compactionStrategy = this.services.compactionStrategy;
     this.llmService = (0, import_factory2.createLLMService)(
       llmConfig,
       this.services.toolManager,
@@ -169,10 +168,8 @@ class ChatSession {
       // Pass ResourceManager for blob storage
       this.logger,
       // Pass logger for dependency injection
-      compactionStrategy,
+      compactionStrategy
       // Pass compaction strategy
-      runtimeConfig.compaction
-      // Pass compaction config for threshold settings
     );
     this.logger.debug(`ChatSession ${this.id}: Services initialized with storage`);
   }
@@ -260,7 +257,7 @@ class ChatSession {
         },
         sessionId: this.id
       };
-      const modifiedBeforePayload = await this.services.pluginManager.executePlugins(
+      const modifiedBeforePayload = await this.services.hookManager.executeHooks(
         "beforeLLMRequest",
         beforeLLMPayload,
         {
@@ -285,7 +282,7 @@ class ChatSession {
         model: llmConfig.model,
         sessionId: this.id
       };
-      const modifiedResponsePayload = await this.services.pluginManager.executePlugins(
+      const modifiedResponsePayload = await this.services.hookManager.executeHooks(
         "beforeResponse",
         beforeResponsePayload,
         {
@@ -329,7 +326,7 @@ class ChatSession {
         }
         return { text: "" };
       }
-      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) {
+      if (error instanceof import_errors.DextoRuntimeError && error.code === import_error_codes.HookErrorCode.HOOK_BLOCKED_EXECUTION && error.scope === import_errors.ErrorScope.HOOK && error.type === import_errors.ErrorType.FORBIDDEN) {
         const textContent = parts.filter((p) => p.type === "text").map((p) => p.text).join("\n");
         try {
           await this.saveBlockedInteraction(textContent, error.message);
@@ -452,12 +449,7 @@ class ChatSession {
    */
   async switchLLM(newLLMConfig) {
     try {
-      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 compactionStrategy = this.services.compactionStrategy;
       const newLLMService = (0, import_factory2.createLLMService)(
         newLLMConfig,
         this.services.toolManager,
@@ -469,10 +461,8 @@ class ChatSession {
         this.id,
         this.services.resourceManager,
         this.logger,
-        compactionStrategy,
+        compactionStrategy
         // Pass compaction strategy
-        runtimeConfig.compaction
-        // Pass compaction config for threshold settings
       );
       this.llmService = newLLMService;
       this.logger.info(

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

@@ -5,13 +5,14 @@ import type { ToolManager } from '../tools/tool-manager.js';
 import type { ValidatedLLMConfig } from '../llm/schemas.js';
 import type { AgentStateManager } from '../agent/state-manager.js';
 import type { StorageManager } from '../storage/index.js';
-import type { PluginManager } from '../plugins/manager.js';
+import type { HookManager } from '../hooks/manager.js';
 import type { MCPManager } from '../mcp/manager.js';
 import { SessionEventBus, AgentEventBus } from '../events/index.js';
-import type { IDextoLogger } from '../logger/v2/types.js';
+import type { Logger } 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';
+import type { CompactionStrategy } from '../context/compaction/types.js';
 /**
  * Represents an isolated conversation session within a Dexto agent.
  *
@@ -97,7 +98,7 @@ export declare class ChatSession {
      * Calling cancel() aborts the in-flight LLM request and tool execution checks.
      */
     private currentRunController;
-    readonly logger: IDextoLogger;
+    readonly logger: Logger;
     /**
      * Creates a new ChatSession instance.
      *
@@ -117,10 +118,11 @@ export declare class ChatSession {
         agentEventBus: AgentEventBus;
         storageManager: StorageManager;
         resourceManager: import('../resources/index.js').ResourceManager;
-        pluginManager: PluginManager;
+        hookManager: HookManager;
         mcpManager: MCPManager;
         sessionManager: import('./session-manager.js').SessionManager;
-    }, id: string, logger: IDextoLogger);
+        compactionStrategy: CompactionStrategy | null;
+    }, id: string, logger: Logger);
     /**
      * Initialize the session services asynchronously.
      * This must be called after construction to set up the storage-backed services.

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