@dexto/core 1.5.8 → 1.6.0

package/dist/resources/index.cjs

@@ -18,17 +18,16 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var resources_exports = {};
 __export(resources_exports, {
-  InternalResourceConfigSchema: () => import_schemas.InternalResourceConfigSchema,
-  InternalResourcesProvider: () => import_internal_provider.InternalResourcesProvider,
-  InternalResourcesSchema: () => import_schemas.InternalResourcesSchema,
+  AgentResourcesProvider: () => import_agent_resources_provider.AgentResourcesProvider,
+  ResourceConfigSchema: () => import_schemas.ResourceConfigSchema,
   ResourceError: () => import_errors.ResourceError,
   ResourceErrorCodes: () => import_error_codes.ResourceErrorCodes,
   ResourceManager: () => import_manager.ResourceManager,
+  ResourcesConfigSchema: () => import_schemas.ResourcesConfigSchema,
   createInternalResourceHandler: () => import_factory.createInternalResourceHandler,
   expandMessageReferences: () => import_reference_parser.expandMessageReferences,
   formatResourceContent: () => import_reference_parser.formatResourceContent,
   getInternalResourceHandlerTypes: () => import_factory.getInternalResourceHandlerTypes,
-  isInternalResourcesEnabled: () => import_schemas.isInternalResourcesEnabled,
   parseResourceReferences: () => import_reference_parser.parseResourceReferences,
   resolveResourceReferences: () => import_reference_parser.resolveResourceReferences
 });
@@ -36,23 +35,22 @@ module.exports = __toCommonJS(resources_exports);
 var import_manager = require("./manager.js");
 var import_errors = require("./errors.js");
 var import_error_codes = require("./error-codes.js");
-var import_internal_provider = require("./internal-provider.js");
+var import_agent_resources_provider = require("./agent-resources-provider.js");
 var import_factory = require("./handlers/factory.js");
 var import_reference_parser = require("./reference-parser.js");
 var import_schemas = require("./schemas.js");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  InternalResourceConfigSchema,
-  InternalResourcesProvider,
-  InternalResourcesSchema,
+  AgentResourcesProvider,
+  ResourceConfigSchema,
   ResourceError,
   ResourceErrorCodes,
   ResourceManager,
+  ResourcesConfigSchema,
   createInternalResourceHandler,
   expandMessageReferences,
   formatResourceContent,
   getInternalResourceHandlerTypes,
-  isInternalResourcesEnabled,
   parseResourceReferences,
   resolveResourceReferences
 });

package/dist/resources/index.d.ts

@@ -3,12 +3,12 @@
  * Organized into thematic sub-barrels for better tree-shaking and maintainability
  */
 export type { ResourceSource, ResourceMetadata, ResourceProvider, ResourceSet } from './types.js';
-export type { InternalResourcesConfig, ValidatedInternalResourcesConfig, ValidatedInternalResourceConfig, ValidatedFileSystemResourceConfig, ValidatedBlobResourceConfig, } from './schemas.js';
+export type { ResourcesConfig, ValidatedResourcesConfig, ValidatedResourceConfig, ValidatedFileSystemResourceConfig, ValidatedBlobResourceConfig, } from './schemas.js';
 export { ResourceManager } from './manager.js';
 export { ResourceError } from './errors.js';
 export { ResourceErrorCodes } from './error-codes.js';
 export type { InternalResourceHandler, InternalResourceServices } from './handlers/types.js';
-export { InternalResourcesProvider } from './internal-provider.js';
+export { AgentResourcesProvider } from './agent-resources-provider.js';
 export { createInternalResourceHandler, getInternalResourceHandlerTypes, } from './handlers/factory.js';
 /**
  * Resource References
@@ -35,5 +35,5 @@ export { createInternalResourceHandler, getInternalResourceHandlerTypes, } from
  */
 export type { ResourceReference, ResourceExpansionResult } from './reference-parser.js';
 export { parseResourceReferences, resolveResourceReferences, expandMessageReferences, formatResourceContent, } from './reference-parser.js';
-export { InternalResourceConfigSchema, InternalResourcesSchema, isInternalResourcesEnabled, } from './schemas.js';
+export { ResourceConfigSchema, ResourcesConfigSchema } from './schemas.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/resources/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAElG,YAAY,EACR,uBAAuB,EACvB,gCAAgC,EAChC,+BAA+B,EAC/B,iCAAiC,EACjC,2BAA2B,GAC9B,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAGtD,YAAY,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC7F,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EACH,6BAA6B,EAC7B,+BAA+B,GAClC,MAAM,uBAAuB,CAAC;AAG/B;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,YAAY,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AACxF,OAAO,EACH,uBAAuB,EACvB,yBAAyB,EACzB,uBAAuB,EACvB,qBAAqB,GACxB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EACH,4BAA4B,EAC5B,uBAAuB,EACvB,0BAA0B,GAC7B,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/resources/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAElG,YAAY,EACR,eAAe,EACf,wBAAwB,EACxB,uBAAuB,EACvB,iCAAiC,EACjC,2BAA2B,GAC9B,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAGtD,YAAY,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC7F,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EACH,6BAA6B,EAC7B,+BAA+B,GAClC,MAAM,uBAAuB,CAAC;AAG/B;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,YAAY,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AACxF,OAAO,EACH,uBAAuB,EACvB,yBAAyB,EACzB,uBAAuB,EACvB,qBAAqB,GACxB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC"}

package/dist/resources/index.js

@@ -2,7 +2,7 @@ import "../chunk-PTJYTZNU.js";
 import { ResourceManager } from "./manager.js";
 import { ResourceError } from "./errors.js";
 import { ResourceErrorCodes } from "./error-codes.js";
-import { InternalResourcesProvider } from "./internal-provider.js";
+import { AgentResourcesProvider } from "./agent-resources-provider.js";
 import {
   createInternalResourceHandler,
   getInternalResourceHandlerTypes
@@ -13,23 +13,18 @@ import {
   expandMessageReferences,
   formatResourceContent
 } from "./reference-parser.js";
-import {
-  InternalResourceConfigSchema,
-  InternalResourcesSchema,
-  isInternalResourcesEnabled
-} from "./schemas.js";
+import { ResourceConfigSchema, ResourcesConfigSchema } from "./schemas.js";
 export {
-  InternalResourceConfigSchema,
-  InternalResourcesProvider,
-  InternalResourcesSchema,
+  AgentResourcesProvider,
+  ResourceConfigSchema,
   ResourceError,
   ResourceErrorCodes,
   ResourceManager,
+  ResourcesConfigSchema,
   createInternalResourceHandler,
   expandMessageReferences,
   formatResourceContent,
   getInternalResourceHandlerTypes,
-  isInternalResourcesEnabled,
   parseResourceReferences,
   resolveResourceReferences
 };

package/dist/resources/manager.cjs

@@ -21,45 +21,41 @@ __export(manager_exports, {
   ResourceManager: () => ResourceManager
 });
 module.exports = __toCommonJS(manager_exports);
-var import_internal_provider = require("./internal-provider.js");
+var import_agent_resources_provider = require("./agent-resources-provider.js");
 var import_types = require("../logger/v2/types.js");
-var import_errors = require("./errors.js");
-var import_events = require("../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(import_types.DextoLogComponent.RESOURCE);
     const services = {
       blobStore: this.blobStore
     };
-    const config = options.internalResourcesConfig;
-    if (config.enabled || config.resources.length > 0) {
-      this.internalResourcesProvider = new import_internal_provider.InternalResourcesProvider(
-        config,
-        services,
-        this.logger
-      );
-    } else {
-      this.internalResourcesProvider = new import_internal_provider.InternalResourcesProvider(
-        { enabled: true, resources: [] },
-        services,
-        this.logger
-      );
-    }
+    this.agentResourcesProvider = new import_agent_resources_provider.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;
   }
@@ -104,22 +100,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;
   }
@@ -137,10 +131,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}`);
@@ -168,10 +159,7 @@ class ResourceManager {
           }
         };
       }
-      if (!this.internalResourcesProvider) {
-        throw import_errors.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) {
@@ -182,46 +170,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() {
-    import_events.eventBus.on("mcp:resource-updated", async (payload) => {
-      this.logger.debug(
-        `\u{1F504} Resource updated notification: ${payload.resourceUri} from server '${payload.serverName}'`
-      );
-      import_events.eventBus.emit("resource:cache-invalidated", {
-        resourceUri: payload.resourceUri,
-        serverName: payload.serverName,
-        action: "updated"
-      });
-    });
-    import_events.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}'`
         );
-        import_events.eventBus.emit("resource:cache-invalidated", {
-          serverName: payload.name,
-          action: "server_connected"
+        this.emitCacheInvalidated({
+          resourceUri: payload.resourceUri,
+          serverName: payload.serverName,
+          action: "updated"
         });
-      }
-    });
-    import_events.eventBus.on("mcp:server-removed", async (payload) => {
-      this.logger.debug(`\u{1F504} Server removed, resources invalidated: ${payload.serverName}`);
-      import_events.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 }
+    );
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/resources/manager.d.ts

@@ -1,28 +1,37 @@
 import type { MCPManager } from '../mcp/manager.js';
 import type { ResourceSet } from './types.js';
-import { InternalResourcesProvider } from './internal-provider.js';
+import { AgentResourcesProvider } from './agent-resources-provider.js';
 import type { ReadResourceResult } from '@modelcontextprotocol/sdk/types.js';
-import type { ValidatedInternalResourcesConfig } from './schemas.js';
-import type { IDextoLogger } from '../logger/v2/types.js';
+import type { ValidatedResourcesConfig } from './schemas.js';
+import type { Logger } from '../logger/v2/types.js';
+import type { AgentEventBus } from '../events/index.js';
 import type { BlobStore } from '../storage/blob/types.js';
 export interface ResourceManagerOptions {
-    internalResourcesConfig: ValidatedInternalResourcesConfig;
+    resourcesConfig: ValidatedResourcesConfig;
     blobStore: BlobStore;
 }
 export declare class ResourceManager {
     private readonly mcpManager;
-    private internalResourcesProvider?;
+    private agentResourcesProvider;
     private readonly blobStore;
     private logger;
-    constructor(mcpManager: MCPManager, options: ResourceManagerOptions, logger: IDextoLogger);
+    private readonly eventBus;
+    private readonly listenerAbort;
+    constructor(mcpManager: MCPManager, options: ResourceManagerOptions, eventBus: AgentEventBus, logger: Logger);
     initialize(): Promise<void>;
+    cleanup(): void;
     getBlobStore(): BlobStore;
     private deriveName;
     list(): Promise<ResourceSet>;
     has(uri: string): Promise<boolean>;
     read(uri: string): Promise<ReadResourceResult>;
     refresh(): Promise<void>;
-    getInternalResourcesProvider(): InternalResourcesProvider | undefined;
+    getAgentResourcesProvider(): AgentResourcesProvider;
+    emitCacheInvalidated(payload: {
+        resourceUri?: string;
+        serverName: string;
+        action: 'updated' | 'server_connected' | 'server_removed' | 'blob_stored';
+    }): void;
     /**
      * Set up listeners for MCP resource notifications to enable real-time updates
      */

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

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/resources/manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAoB,MAAM,YAAY,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,cAAc,CAAC;AAErE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAI1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE1D,MAAM,WAAW,sBAAsB;IACnC,uBAAuB,EAAE,gCAAgC,CAAC;IAC1D,SAAS,EAAE,SAAS,CAAC;CACxB;AAED,qBAAa,eAAe;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;IACxC,OAAO,CAAC,yBAAyB,CAAC,CAA4B;IAC9D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,MAAM,CAAe;gBAEjB,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,sBAAsB,EAAE,MAAM,EAAE,YAAY;IA+BnF,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAOjC,YAAY,IAAI,SAAS;IAIzB,OAAO,CAAC,UAAU;IAMZ,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC;IA6D5B,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAqBlC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA4C9C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAO9B,4BAA4B,IAAI,yBAAyB,GAAG,SAAS;IAIrE;;OAEG;IACH,OAAO,CAAC,0BAA0B;CAoCrC"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/resources/manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAoB,MAAM,YAAY,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAE7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE1D,MAAM,WAAW,sBAAsB;IACnC,eAAe,EAAE,wBAAwB,CAAC;IAC1C,SAAS,EAAE,SAAS,CAAC;CACxB;AAED,qBAAa,eAAe;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;IACxC,OAAO,CAAC,sBAAsB,CAAyB;IACvD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAyB;gBAGnD,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,sBAAsB,EAC/B,QAAQ,EAAE,aAAa,EACvB,MAAM,EAAE,MAAM;IAuBZ,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC,OAAO,IAAI,IAAI;IAOf,YAAY,IAAI,SAAS;IAIzB,OAAO,CAAC,UAAU;IAMZ,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC;IA2D5B,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAkBlC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAwC9C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAK9B,yBAAyB,IAAI,sBAAsB;IAInD,oBAAoB,CAAC,OAAO,EAAE;QAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;QACnB,MAAM,EAAE,SAAS,GAAG,kBAAkB,GAAG,gBAAgB,GAAG,aAAa,CAAC;KAC7E,GAAG,IAAI;IAIR;;OAEG;IACH,OAAO,CAAC,0BAA0B;CAkDrC"}

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
 });