@rekog/mcp-nest 1.9.4 → 1.9.6

package/dist/mcp/transport/stdio.service.d.ts

@@ -1,14 +1,14 @@
 import { OnApplicationBootstrap } from '@nestjs/common';
 import { ModuleRef } from '@nestjs/core';
 import type { McpOptions } from '../interfaces';
-import { McpRegistryService } from '../services/mcp-registry.service';
+import { McpRegistryDiscoveryService } from '../services/mcp-registry-discovery.service';
 export declare class StdioService implements OnApplicationBootstrap {
     private readonly options;
     private readonly mcpModuleId;
     private readonly moduleRef;
     private readonly toolRegistry;
     private readonly logger;
-    constructor(options: McpOptions, mcpModuleId: string, moduleRef: ModuleRef, toolRegistry: McpRegistryService);
+    constructor(options: McpOptions, mcpModuleId: string, moduleRef: ModuleRef, toolRegistry: McpRegistryDiscoveryService);
     onApplicationBootstrap(): Promise<void>;
 }
 //# sourceMappingURL=stdio.service.d.ts.map

package/dist/mcp/transport/stdio.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stdio.service.d.ts","sourceRoot":"","sources":["../../../src/mcp/transport/stdio.service.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAoB,SAAS,EAAE,MAAM,cAAc,CAAC;AAE3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAItE,qBACa,YAAa,YAAW,sBAAsB;IAIhC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACtB,OAAO,CAAC,QAAQ,CAAC,WAAW;IACrD,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAN/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;gBAGU,OAAO,EAAE,UAAU,EACjB,WAAW,EAAE,MAAM,EAC5C,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,kBAAkB;IAK7C,sBAAsB;CA8C7B"}
+{"version":3,"file":"stdio.service.d.ts","sourceRoot":"","sources":["../../../src/mcp/transport/stdio.service.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAoB,SAAS,EAAE,MAAM,cAAc,CAAC;AAE3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,EAAE,2BAA2B,EAAE,MAAM,4CAA4C,CAAC;AAIzF,qBACa,YAAa,YAAW,sBAAsB;IAIhC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACtB,OAAO,CAAC,QAAQ,CAAC,WAAW;IACrD,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAN/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;gBAGU,OAAO,EAAE,UAAU,EACjB,WAAW,EAAE,MAAM,EAC5C,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,2BAA2B;IAKtD,sBAAsB;CA8C7B"}

package/dist/mcp/transport/stdio.service.js

@@ -19,7 +19,7 @@ const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
 const interfaces_1 = require("../interfaces");
 const mcp_executor_service_1 = require("../services/mcp-executor.service");
-const mcp_registry_service_1 = require("../services/mcp-registry.service");
+const mcp_registry_discovery_service_1 = require("../services/mcp-registry-discovery.service");
 const mcp_logger_factory_1 = require("../utils/mcp-logger.factory");
 const mcp_server_factory_1 = require("../utils/mcp-server.factory");
 let StdioService = StdioService_1 = class StdioService {
@@ -31,17 +31,17 @@ let StdioService = StdioService_1 = class StdioService {
         this.logger = (0, mcp_logger_factory_1.createMcpLogger)(StdioService_1.name, this.options);
     }
     async onApplicationBootstrap() {
-        if (this.options.transport !== interfaces_1.McpTransportType.STDIO) {
+        const transports = Array.isArray(this.options.transport)
+            ? this.options.transport
+            : [this.options.transport];
+        if (!transports.includes(interfaces_1.McpTransportType.STDIO))
             return;
-        }
         this.logger.log('Bootstrapping MCP STDIO...');
         const toolsWithGuards = this.toolRegistry
             .getTools(this.mcpModuleId)
             .filter((tool) => tool.metadata.guards && tool.metadata.guards.length > 0);
         if (toolsWithGuards.length > 0) {
-            const toolNames = toolsWithGuards
-                .map((t) => t.metadata.name)
-                .join(', ');
+            const toolNames = toolsWithGuards.map((t) => t.metadata.name).join(', ');
             this.logger.warn(`@ToolGuards() are not supported with STDIO transport. ` +
                 `The following tools have guards configured and will be hidden: ${toolNames}. ` +
                 `Consider using HTTP transport.`);
@@ -61,6 +61,6 @@ exports.StdioService = StdioService = StdioService_1 = __decorate([
     __param(0, (0, common_1.Inject)('MCP_OPTIONS')),
     __param(1, (0, common_1.Inject)('MCP_MODULE_ID')),
     __metadata("design:paramtypes", [Object, String, core_1.ModuleRef,
-        mcp_registry_service_1.McpRegistryService])
+        mcp_registry_discovery_service_1.McpRegistryDiscoveryService])
 ], StdioService);
 //# sourceMappingURL=stdio.service.js.map

package/dist/mcp/transport/stdio.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"stdio.service.js","sourceRoot":"","sources":["../../../src/mcp/transport/stdio.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wEAAiF;AACjF,2CAKwB;AACxB,uCAA2D;AAC3D,8CAAiD;AAEjD,2EAAsE;AACtE,2EAAsE;AACtE,oEAA8D;AAC9D,oEAA8D;AAGvD,IAAM,YAAY,oBAAlB,MAAM,YAAY;IAGvB,YAC0C,OAAmB,EACjB,WAAmB,EAC5C,SAAoB,EACpB,YAAgC;QAHT,YAAO,GAAP,OAAO,CAAY;QACjB,gBAAW,GAAX,WAAW,CAAQ;QAC5C,cAAS,GAAT,SAAS,CAAW;QACpB,iBAAY,GAAZ,YAAY,CAAoB;QAEjD,IAAI,CAAC,MAAM,GAAG,IAAA,oCAAe,EAAC,cAAY,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC1B,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,KAAK,6BAAgB,CAAC,KAAK,EAAE,CAAC;YACtD,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;QAG9C,MAAM,eAAe,GAAG,IAAI,CAAC,YAAY;aACtC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC;aAC1B,MAAM,CACL,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAClE,CAAC;QAEJ,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,SAAS,GAAG,eAAe;iBAC9B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;iBAC3B,IAAI,CAAC,IAAI,CAAC,CAAC;YACd,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,wDAAwD;gBACtD,kEAAkE,SAAS,IAAI;gBAC/E,gCAAgC,CACnC,CAAC;QACJ,CAAC;QAED,MAAM,SAAS,GAAG,IAAA,oCAAe,EAC/B,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,MAAM,CACZ,CAAC;QAEF,MAAM,SAAS,GAAG,uBAAgB,CAAC,MAAM,EAAE,CAAC;QAC5C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAC3C,yCAAkB,EAClB,SAAS,EACT,EAAE,MAAM,EAAE,KAAK,EAAE,CAClB,CAAC;QAGF,QAAQ,CAAC,uBAAuB,CAAC,SAAS,EAAE,EAAS,CAAC,CAAC;QAEvD,MAAM,SAAS,GAAG,IAAI,+BAAoB,EAAE,CAAC;QAC7C,MAAM,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAEnC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;CACF,CAAA;AA1DY,oCAAY;uBAAZ,YAAY;IADxB,IAAA,mBAAU,GAAE;IAKR,WAAA,IAAA,eAAM,EAAC,aAAa,CAAC,CAAA;IACrB,WAAA,IAAA,eAAM,EAAC,eAAe,CAAC,CAAA;qDACI,gBAAS;QACN,yCAAkB;GAPxC,YAAY,CA0DxB","sourcesContent":["import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';\nimport {\n  Inject,\n  Injectable,\n  Logger,\n  OnApplicationBootstrap,\n} from '@nestjs/common';\nimport { ContextIdFactory, ModuleRef } from '@nestjs/core';\nimport { McpTransportType } from '../interfaces';\nimport type { McpOptions } from '../interfaces';\nimport { McpExecutorService } from '../services/mcp-executor.service';\nimport { McpRegistryService } from '../services/mcp-registry.service';\nimport { createMcpLogger } from '../utils/mcp-logger.factory';\nimport { createMcpServer } from '../utils/mcp-server.factory';\n\n@Injectable()\nexport class StdioService implements OnApplicationBootstrap {\n  private readonly logger: Logger;\n\n  constructor(\n    @Inject('MCP_OPTIONS') private readonly options: McpOptions,\n    @Inject('MCP_MODULE_ID') private readonly mcpModuleId: string,\n    private readonly moduleRef: ModuleRef,\n    private readonly toolRegistry: McpRegistryService,\n  ) {\n    this.logger = createMcpLogger(StdioService.name, this.options);\n  }\n\n  async onApplicationBootstrap() {\n    if (this.options.transport !== McpTransportType.STDIO) {\n      return;\n    }\n    this.logger.log('Bootstrapping MCP STDIO...');\n\n    // Warn about tools with @ToolGuards() - they require HTTP context\n    const toolsWithGuards = this.toolRegistry\n      .getTools(this.mcpModuleId)\n      .filter(\n        (tool) => tool.metadata.guards && tool.metadata.guards.length > 0,\n      );\n\n    if (toolsWithGuards.length > 0) {\n      const toolNames = toolsWithGuards\n        .map((t) => t.metadata.name)\n        .join(', ');\n      this.logger.warn(\n        `@ToolGuards() are not supported with STDIO transport. ` +\n          `The following tools have guards configured and will be hidden: ${toolNames}. ` +\n          `Consider using HTTP transport.`,\n      );\n    }\n\n    const mcpServer = createMcpServer(\n      this.mcpModuleId,\n      this.toolRegistry,\n      this.options,\n      this.logger,\n    );\n\n    const contextId = ContextIdFactory.create();\n    const executor = await this.moduleRef.resolve(\n      McpExecutorService,\n      contextId,\n      { strict: false },\n    );\n\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument\n    executor.registerRequestHandlers(mcpServer, {} as any);\n\n    const transport = new StdioServerTransport();\n    await mcpServer.connect(transport);\n\n    this.logger.log('MCP STDIO ready');\n  }\n}\n"]}
+{"version":3,"file":"stdio.service.js","sourceRoot":"","sources":["../../../src/mcp/transport/stdio.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wEAAiF;AACjF,2CAKwB;AACxB,uCAA2D;AAC3D,8CAAiD;AAEjD,2EAAsE;AACtE,+FAAyF;AACzF,oEAA8D;AAC9D,oEAA8D;AAGvD,IAAM,YAAY,oBAAlB,MAAM,YAAY;IAGvB,YAC0C,OAAmB,EACjB,WAAmB,EAC5C,SAAoB,EACpB,YAAyC;QAHlB,YAAO,GAAP,OAAO,CAAY;QACjB,gBAAW,GAAX,WAAW,CAAQ;QAC5C,cAAS,GAAT,SAAS,CAAW;QACpB,iBAAY,GAAZ,YAAY,CAA6B;QAE1D,IAAI,CAAC,MAAM,GAAG,IAAA,oCAAe,EAAC,cAAY,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC1B,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;YACtD,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS;YACxB,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC7B,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,6BAAgB,CAAC,KAAK,CAAC;YAAE,OAAO;QAEzD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;QAG9C,MAAM,eAAe,GAAG,IAAI,CAAC,YAAY;aACtC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC;aAC1B,MAAM,CACL,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAClE,CAAC;QAEJ,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,SAAS,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzE,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,wDAAwD;gBACtD,kEAAkE,SAAS,IAAI;gBAC/E,gCAAgC,CACnC,CAAC;QACJ,CAAC;QAED,MAAM,SAAS,GAAG,IAAA,oCAAe,EAC/B,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,MAAM,CACZ,CAAC;QAEF,MAAM,SAAS,GAAG,uBAAgB,CAAC,MAAM,EAAE,CAAC;QAC5C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAC3C,yCAAkB,EAClB,SAAS,EACT,EAAE,MAAM,EAAE,KAAK,EAAE,CAClB,CAAC;QAGF,QAAQ,CAAC,uBAAuB,CAAC,SAAS,EAAE,EAAS,CAAC,CAAC;QAEvD,MAAM,SAAS,GAAG,IAAI,+BAAoB,EAAE,CAAC;QAC7C,MAAM,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAEnC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;CACF,CAAA;AA1DY,oCAAY;uBAAZ,YAAY;IADxB,IAAA,mBAAU,GAAE;IAKR,WAAA,IAAA,eAAM,EAAC,aAAa,CAAC,CAAA;IACrB,WAAA,IAAA,eAAM,EAAC,eAAe,CAAC,CAAA;qDACI,gBAAS;QACN,4DAA2B;GAPjD,YAAY,CA0DxB","sourcesContent":["import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';\nimport {\n  Inject,\n  Injectable,\n  Logger,\n  OnApplicationBootstrap,\n} from '@nestjs/common';\nimport { ContextIdFactory, ModuleRef } from '@nestjs/core';\nimport { McpTransportType } from '../interfaces';\nimport type { McpOptions } from '../interfaces';\nimport { McpExecutorService } from '../services/mcp-executor.service';\nimport { McpRegistryDiscoveryService } from '../services/mcp-registry-discovery.service';\nimport { createMcpLogger } from '../utils/mcp-logger.factory';\nimport { createMcpServer } from '../utils/mcp-server.factory';\n\n@Injectable()\nexport class StdioService implements OnApplicationBootstrap {\n  private readonly logger: Logger;\n\n  constructor(\n    @Inject('MCP_OPTIONS') private readonly options: McpOptions,\n    @Inject('MCP_MODULE_ID') private readonly mcpModuleId: string,\n    private readonly moduleRef: ModuleRef,\n    private readonly toolRegistry: McpRegistryDiscoveryService,\n  ) {\n    this.logger = createMcpLogger(StdioService.name, this.options);\n  }\n\n  async onApplicationBootstrap() {\n    const transports = Array.isArray(this.options.transport)\n      ? this.options.transport\n      : [this.options.transport];\n    if (!transports.includes(McpTransportType.STDIO)) return;\n\n    this.logger.log('Bootstrapping MCP STDIO...');\n\n    // Warn about tools with @ToolGuards() - they require HTTP context\n    const toolsWithGuards = this.toolRegistry\n      .getTools(this.mcpModuleId)\n      .filter(\n        (tool) => tool.metadata.guards && tool.metadata.guards.length > 0,\n      );\n\n    if (toolsWithGuards.length > 0) {\n      const toolNames = toolsWithGuards.map((t) => t.metadata.name).join(', ');\n      this.logger.warn(\n        `@ToolGuards() are not supported with STDIO transport. ` +\n          `The following tools have guards configured and will be hidden: ${toolNames}. ` +\n          `Consider using HTTP transport.`,\n      );\n    }\n\n    const mcpServer = createMcpServer(\n      this.mcpModuleId,\n      this.toolRegistry,\n      this.options,\n      this.logger,\n    );\n\n    const contextId = ContextIdFactory.create();\n    const executor = await this.moduleRef.resolve(\n      McpExecutorService,\n      contextId,\n      { strict: false },\n    );\n\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument\n    executor.registerRequestHandlers(mcpServer, {} as any);\n\n    const transport = new StdioServerTransport();\n    await mcpServer.connect(transport);\n\n    this.logger.log('MCP STDIO ready');\n  }\n}\n"]}

package/dist/mcp/utils/capabilities-builder.d.ts

@@ -1,5 +1,5 @@
 import { ServerCapabilities } from '@modelcontextprotocol/sdk/types.js';
-import { McpRegistryService } from '../services/mcp-registry.service';
+import { McpRegistryDiscoveryService } from '../services/mcp-registry-discovery.service';
 import type { McpOptions } from '../interfaces';
-export declare function buildMcpCapabilities(mcpModuleId: string, registry: McpRegistryService, options: McpOptions): ServerCapabilities;
+export declare function buildMcpCapabilities(mcpModuleId: string, registry: McpRegistryDiscoveryService, options: McpOptions): ServerCapabilities;
 //# sourceMappingURL=capabilities-builder.d.ts.map

package/dist/mcp/utils/capabilities-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"capabilities-builder.d.ts","sourceRoot":"","sources":["../../../src/mcp/utils/capabilities-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAMhD,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,kBAAkB,EAC5B,OAAO,EAAE,UAAU,GAClB,kBAAkB,CA8BpB"}
+{"version":3,"file":"capabilities-builder.d.ts","sourceRoot":"","sources":["../../../src/mcp/utils/capabilities-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,2BAA2B,EAAE,MAAM,4CAA4C,CAAC;AACzF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAMhD,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,2BAA2B,EACrC,OAAO,EAAE,UAAU,GAClB,kBAAkB,CA8BpB"}

package/dist/mcp/utils/capabilities-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"capabilities-builder.js","sourceRoot":"","sources":["../../../src/mcp/utils/capabilities-builder.ts"],"names":[],"mappings":";;AAQA,oDAkCC;AAlCD,SAAgB,oBAAoB,CAClC,WAAmB,EACnB,QAA4B,EAC5B,OAAmB;IAGnB,MAAM,gBAAgB,GAAG,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC;IAEpD,MAAM,YAAY,GAAuB,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAGjE,IAAI,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9C,YAAY,CAAC,KAAK,GAAG,YAAY,CAAC,KAAK,IAAI;YACzC,WAAW,EAAE,IAAI;SAClB,CAAC;IACJ,CAAC;IAED,IACE,QAAQ,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC;QAC7C,QAAQ,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,EACrD,CAAC;QACD,YAAY,CAAC,SAAS,GAAG,YAAY,CAAC,SAAS,IAAI;YACjD,WAAW,EAAE,IAAI;SAClB,CAAC;IACJ,CAAC;IAGD,IAAI,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChD,YAAY,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,IAAI;YAC7C,WAAW,EAAE,IAAI;SAClB,CAAC;IACJ,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC","sourcesContent":["import { ServerCapabilities } from '@modelcontextprotocol/sdk/types.js';\nimport { McpRegistryService } from '../services/mcp-registry.service';\nimport type { McpOptions } from '../interfaces';\n\n/**\n * Utility function to build MCP server capabilities dynamically based on\n * discovered tools, resources, and prompts\n */\nexport function buildMcpCapabilities(\n  mcpModuleId: string,\n  registry: McpRegistryService,\n  options: McpOptions,\n): ServerCapabilities {\n  // Start with user-provided capabilities or empty object\n  const baseCapabilities = options.capabilities || {};\n\n  const capabilities: ServerCapabilities = { ...baseCapabilities };\n\n  // Add tools capability if tools are discovered\n  if (registry.getTools(mcpModuleId).length > 0) {\n    capabilities.tools = capabilities.tools || {\n      listChanged: true,\n    };\n  }\n\n  if (\n    registry.getResources(mcpModuleId).length > 0 ||\n    registry.getResourceTemplates(mcpModuleId).length > 0\n  ) {\n    capabilities.resources = capabilities.resources || {\n      listChanged: true,\n    };\n  }\n\n  // Add prompts capability if prompts are discovered\n  if (registry.getPrompts(mcpModuleId).length > 0) {\n    capabilities.prompts = capabilities.prompts || {\n      listChanged: true,\n    };\n  }\n\n  return capabilities;\n}\n"]}
+{"version":3,"file":"capabilities-builder.js","sourceRoot":"","sources":["../../../src/mcp/utils/capabilities-builder.ts"],"names":[],"mappings":";;AAQA,oDAkCC;AAlCD,SAAgB,oBAAoB,CAClC,WAAmB,EACnB,QAAqC,EACrC,OAAmB;IAGnB,MAAM,gBAAgB,GAAG,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC;IAEpD,MAAM,YAAY,GAAuB,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAGjE,IAAI,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9C,YAAY,CAAC,KAAK,GAAG,YAAY,CAAC,KAAK,IAAI;YACzC,WAAW,EAAE,IAAI;SAClB,CAAC;IACJ,CAAC;IAED,IACE,QAAQ,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC;QAC7C,QAAQ,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,EACrD,CAAC;QACD,YAAY,CAAC,SAAS,GAAG,YAAY,CAAC,SAAS,IAAI;YACjD,WAAW,EAAE,IAAI;SAClB,CAAC;IACJ,CAAC;IAGD,IAAI,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChD,YAAY,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,IAAI;YAC7C,WAAW,EAAE,IAAI;SAClB,CAAC;IACJ,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC","sourcesContent":["import { ServerCapabilities } from '@modelcontextprotocol/sdk/types.js';\nimport { McpRegistryDiscoveryService } from '../services/mcp-registry-discovery.service';\nimport type { McpOptions } from '../interfaces';\n\n/**\n * Utility function to build MCP server capabilities dynamically based on\n * discovered tools, resources, and prompts\n */\nexport function buildMcpCapabilities(\n  mcpModuleId: string,\n  registry: McpRegistryDiscoveryService,\n  options: McpOptions,\n): ServerCapabilities {\n  // Start with user-provided capabilities or empty object\n  const baseCapabilities = options.capabilities || {};\n\n  const capabilities: ServerCapabilities = { ...baseCapabilities };\n\n  // Add tools capability if tools are discovered\n  if (registry.getTools(mcpModuleId).length > 0) {\n    capabilities.tools = capabilities.tools || {\n      listChanged: true,\n    };\n  }\n\n  if (\n    registry.getResources(mcpModuleId).length > 0 ||\n    registry.getResourceTemplates(mcpModuleId).length > 0\n  ) {\n    capabilities.resources = capabilities.resources || {\n      listChanged: true,\n    };\n  }\n\n  // Add prompts capability if prompts are discovered\n  if (registry.getPrompts(mcpModuleId).length > 0) {\n    capabilities.prompts = capabilities.prompts || {\n      listChanged: true,\n    };\n  }\n\n  return capabilities;\n}\n"]}

package/dist/mcp/utils/mcp-server.factory.d.ts

@@ -1,6 +1,6 @@
 import { McpOptions } from '../interfaces';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { McpRegistryService } from '../services/mcp-registry.service';
+import { McpRegistryDiscoveryService } from '../services/mcp-registry-discovery.service';
 import { Logger } from '@nestjs/common';
-export declare function createMcpServer(mcpModuleId: string, registry: McpRegistryService, options: McpOptions, logger: Logger): McpServer;
+export declare function createMcpServer(mcpModuleId: string, registry: McpRegistryDiscoveryService, options: McpOptions, logger: Logger): McpServer;
 //# sourceMappingURL=mcp-server.factory.d.ts.map

package/dist/mcp/utils/mcp-server.factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-server.factory.d.ts","sourceRoot":"","sources":["../../../src/mcp/utils/mcp-server.factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,wBAAgB,eAAe,CAC7B,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,kBAAkB,EAC5B,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,MAAM,GACb,SAAS,CAcX"}
+{"version":3,"file":"mcp-server.factory.d.ts","sourceRoot":"","sources":["../../../src/mcp/utils/mcp-server.factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,4CAA4C,CAAC;AACzF,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,wBAAgB,eAAe,CAC7B,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,2BAA2B,EACrC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,MAAM,GACb,SAAS,CAcX"}

package/dist/mcp/utils/mcp-server.factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-server.factory.js","sourceRoot":"","sources":["../../../src/mcp/utils/mcp-server.factory.ts"],"names":[],"mappings":";;AAMA,0CAmBC;AAxBD,oEAAoE;AACpE,iEAA8D;AAI9D,SAAgB,eAAe,CAC7B,WAAmB,EACnB,QAA4B,EAC5B,OAAmB,EACnB,MAAc;IAEd,MAAM,YAAY,GAAG,IAAA,2CAAoB,EAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAE1E,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,YAAY,CAAC,CAAC;IAEtD,MAAM,SAAS,GAAG,IAAI,kBAAS,CAC7B,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,EAChD;QACE,YAAY;QACZ,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,EAAE;KACzC,CACF,CAAC;IAEF,OAAO,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC9E,CAAC","sourcesContent":["import { McpOptions } from '../interfaces';\nimport { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';\nimport { buildMcpCapabilities } from './capabilities-builder';\nimport { McpRegistryService } from '../services/mcp-registry.service';\nimport { Logger } from '@nestjs/common';\n\nexport function createMcpServer(\n  mcpModuleId: string,\n  registry: McpRegistryService,\n  options: McpOptions,\n  logger: Logger,\n): McpServer {\n  const capabilities = buildMcpCapabilities(mcpModuleId, registry, options);\n\n  logger.debug('Built MCP capabilities:', capabilities);\n\n  const mcpServer = new McpServer(\n    { name: options.name, version: options.version },\n    {\n      capabilities,\n      instructions: options.instructions || '',\n    },\n  );\n\n  return options.serverMutator ? options.serverMutator(mcpServer) : mcpServer;\n}\n"]}
+{"version":3,"file":"mcp-server.factory.js","sourceRoot":"","sources":["../../../src/mcp/utils/mcp-server.factory.ts"],"names":[],"mappings":";;AAMA,0CAmBC;AAxBD,oEAAoE;AACpE,iEAA8D;AAI9D,SAAgB,eAAe,CAC7B,WAAmB,EACnB,QAAqC,EACrC,OAAmB,EACnB,MAAc;IAEd,MAAM,YAAY,GAAG,IAAA,2CAAoB,EAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAE1E,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,YAAY,CAAC,CAAC;IAEtD,MAAM,SAAS,GAAG,IAAI,kBAAS,CAC7B,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,EAChD;QACE,YAAY;QACZ,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,EAAE;KACzC,CACF,CAAC;IAEF,OAAO,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC9E,CAAC","sourcesContent":["import { McpOptions } from '../interfaces';\nimport { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';\nimport { buildMcpCapabilities } from './capabilities-builder';\nimport { McpRegistryDiscoveryService } from '../services/mcp-registry-discovery.service';\nimport { Logger } from '@nestjs/common';\n\nexport function createMcpServer(\n  mcpModuleId: string,\n  registry: McpRegistryDiscoveryService,\n  options: McpOptions,\n  logger: Logger,\n): McpServer {\n  const capabilities = buildMcpCapabilities(mcpModuleId, registry, options);\n\n  logger.debug('Built MCP capabilities:', capabilities);\n\n  const mcpServer = new McpServer(\n    { name: options.name, version: options.version },\n    {\n      capabilities,\n      instructions: options.instructions || '',\n    },\n  );\n\n  return options.serverMutator ? options.serverMutator(mcpServer) : mcpServer;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rekog/mcp-nest",
-  "version": "1.9.4",
+  "version": "1.9.6",
   "description": "NestJS module for creating Model Context Protocol (MCP) servers",
   "main": "dist/index.js",
   "license": "MIT",
@@ -56,12 +56,12 @@
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.3",
     "@eslint/js": "^9.39.2",
-    "@modelcontextprotocol/sdk": "^1.25.3",
-    "@nestjs/common": "^11.1.12",
-    "@nestjs/core": "^11.1.12",
-    "@nestjs/platform-express": "^11.1.12",
-    "@nestjs/platform-fastify": "^11.1.12",
-    "@nestjs/testing": "^11.1.12",
+    "@modelcontextprotocol/sdk": "^1.27.1",
+    "@nestjs/common": "^11.1.14",
+    "@nestjs/core": "^11.1.14",
+    "@nestjs/platform-express": "^11.1.14",
+    "@nestjs/platform-fastify": "^11.1.14",
+    "@nestjs/testing": "^11.1.14",
     "@nestjs/typeorm": "^11.0.0",
     "@types/cookie-parser": "^1.4.10",
     "@types/express": "^5.0.6",
@@ -80,10 +80,10 @@
     "ts-node-dev": "^2.0.0",
     "typeorm": "^0.3.28",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.54.0"
+    "typescript-eslint": "^8.56.1"
   },
   "dependencies": {
-    "@nestjs/config": "^4.0.2",
+    "@nestjs/config": "^4.0.3",
     "cookie-parser": "^1.4.7",
     "multer": "^2.0.2",
     "passport": "^0.7.0",

package/src/mcp/decorators/prompt.decorator.ts

@@ -2,7 +2,7 @@ import { SetMetadata } from '@nestjs/common';
 import { MCP_PROMPT_METADATA_KEY } from './constants';
 import { ZodObject, ZodType } from 'zod';
 
-type PromptArgsRawShape = {
+export type PromptArgsRawShape = {
   [k: string]: ZodType;
 };
 

package/src/mcp/index.ts

@@ -1,9 +1,9 @@
 export * from './decorators';
 export * from './interfaces';
 export * from './mcp.module';
-export * from './services/mcp-registry.service';
+export * from './services/mcp-registry-discovery.service';
 export * from './services/mcp-executor.service';
 export * from './services/mcp-sse.service';
 export * from './services/mcp-streamable-http.service';
-export * from './services/mcp-tool-builder.service';
+export * from './services/mcp-dynamic-registry.service';
 export * from './constants/feature-registration.constants';

package/src/mcp/interfaces/dynamic-prompt.interface.ts

@@ -0,0 +1,20 @@
+import { ZodObject } from 'zod';
+import { Context } from './mcp-tool.interface';
+import type { PromptArgsRawShape } from '../decorators/prompt.decorator';
+
+export type DynamicPromptHandler = (
+  args: Record<string, string> | undefined,
+  context: Context,
+  request: any,
+) => Promise<any> | any;
+
+export interface DynamicPromptDefinition {
+  /** Unique name for the prompt */
+  name: string;
+  /** Description shown to the LLM */
+  description: string;
+  /** Zod schema describing the prompt arguments */
+  parameters?: ZodObject<PromptArgsRawShape>;
+  /** Handler function that returns the prompt messages */
+  handler: DynamicPromptHandler;
+}

package/src/mcp/interfaces/dynamic-resource.interface.ts

@@ -0,0 +1,22 @@
+import { Context } from './mcp-tool.interface';
+
+export type DynamicResourceHandler = (
+  params: Record<string, unknown>,
+  context: Context,
+  request: any,
+) => Promise<any> | any;
+
+export interface DynamicResourceDefinition {
+  /** URI that uniquely identifies this resource */
+  uri: string;
+  /** Human-readable name (defaults to uri if omitted) */
+  name?: string;
+  /** Optional description shown to the LLM */
+  description?: string;
+  /** Optional MIME type of the resource content */
+  mimeType?: string;
+  /** Additional metadata */
+  _meta?: Record<string, any>;
+  /** Handler function that returns the resource content */
+  handler: DynamicResourceHandler;
+}

package/src/mcp/interfaces/dynamic-tool.interface.ts

@@ -14,11 +14,11 @@ export type DynamicToolHandler = (
 
 /**
  * Definition for a dynamically registered tool.
- * Use this with McpToolBuilder.registerTool() to register tools at runtime.
+ * Use this with McpRegistryService.registerTool() to register tools at runtime.
  *
  * @example
  * ```typescript
- * toolBuilder.registerTool({
+ * registry.registerTool({
  *   name: 'search-knowledge',
  *   description: 'Search the knowledge base',
  *   parameters: z.object({ query: z.string() }),

package/src/mcp/interfaces/index.ts

@@ -20,3 +20,13 @@ export type {
   DynamicToolDefinition,
   DynamicToolHandler,
 } from './dynamic-tool.interface';
+
+export type {
+  DynamicResourceDefinition,
+  DynamicResourceHandler,
+} from './dynamic-resource.interface';
+
+export type {
+  DynamicPromptDefinition,
+  DynamicPromptHandler,
+} from './dynamic-prompt.interface';

package/src/mcp/mcp.module.ts

@@ -14,12 +14,12 @@ import type {
   McpAsyncOptions,
 } from './interfaces';
 import { McpExecutorService } from './services/mcp-executor.service';
-import { McpRegistryService } from './services/mcp-registry.service';
+import { McpRegistryDiscoveryService } from './services/mcp-registry-discovery.service';
 import { McpSseService } from './services/mcp-sse.service';
 import { McpStreamableHttpService } from './services/mcp-streamable-http.service';
 import { SsePingService } from './services/sse-ping.service';
 import { ToolAuthorizationService } from './services/tool-authorization.service';
-import { McpToolBuilder } from './services/mcp-tool-builder.service';
+import { McpRegistryService } from './services/mcp-dynamic-registry.service';
 import { createSseController } from './transport/sse.controller.factory';
 import { StdioService } from './transport/stdio.service';
 import { createStreamableHttpController } from './transport/streamable-http.controller.factory';
@@ -41,7 +41,11 @@ export class McpFeatureModule {}
 
 @Module({
   imports: [DiscoveryModule],
-  providers: [McpRegistryService, McpExecutorService, ToolAuthorizationService],
+  providers: [
+    McpRegistryDiscoveryService,
+    McpExecutorService,
+    ToolAuthorizationService,
+  ],
 })
 export class McpModule {
   /**
@@ -141,10 +145,10 @@ export class McpModule {
       controllers,
       providers,
       exports: [
-        McpRegistryService,
+        McpRegistryDiscoveryService,
         McpSseService,
         McpStreamableHttpService,
-        McpToolBuilder,
+        McpRegistryService,
       ],
     };
   }
@@ -169,13 +173,13 @@ export class McpModule {
         provide: 'MCP_MODULE_ID',
         useValue: moduleId,
       },
-      McpRegistryService,
+      McpRegistryDiscoveryService,
       McpExecutorService,
       ToolAuthorizationService,
       SsePingService,
       McpSseService,
       McpStreamableHttpService,
-      McpToolBuilder,
+      McpRegistryService,
       StdioService,
     ];
 
@@ -190,10 +194,10 @@ export class McpModule {
         ...(options.extraProviders ?? []),
       ],
       exports: [
-        McpRegistryService,
+        McpRegistryDiscoveryService,
         McpSseService,
         McpStreamableHttpService,
-        McpToolBuilder,
+        McpRegistryService,
       ],
     };
   }
@@ -330,13 +334,13 @@ export class McpModule {
         provide: 'MCP_MODULE_ID',
         useValue: moduleId,
       },
-      McpRegistryService,
+      McpRegistryDiscoveryService,
       McpExecutorService,
       ToolAuthorizationService,
       SsePingService,
       McpSseService,
       McpStreamableHttpService,
-      McpToolBuilder,
+      McpRegistryService,
       StdioService,
     ];
 

package/src/mcp/services/handlers/mcp-handler.base.ts

@@ -14,7 +14,10 @@ import {
   HttpRequest,
 } from '../../interfaces';
 import { McpOptions } from '../../interfaces/mcp-options.interface';
-import { DiscoveredTool, McpRegistryService } from '../mcp-registry.service';
+import {
+  DiscoveredCapability,
+  McpRegistryDiscoveryService,
+} from '../mcp-registry-discovery.service';
 import { createMcpLogger } from '../../utils/mcp-logger.factory';
 import {
   EXCEPTION_FILTERS_METADATA,
@@ -27,7 +30,7 @@ export abstract class McpHandlerBase {
 
   protected constructor(
     protected readonly moduleRef: ModuleRef,
-    protected readonly registry: McpRegistryService,
+    protected readonly registry: McpRegistryDiscoveryService,
     private readonly reflector: Reflector,
     loggerContext: string,
     options?: McpOptions,
@@ -129,7 +132,7 @@ export abstract class McpHandlerBase {
 
   protected handleError(
     error: Error,
-    capabilityInfo: DiscoveredTool<object>,
+    capabilityInfo: DiscoveredCapability<object>,
     httpRequest: HttpRequest,
   ) {
     this.logger.error(error);

package/src/mcp/services/handlers/mcp-prompts.handler.ts

@@ -8,17 +8,24 @@ import {
   McpError,
   PromptArgument,
 } from '@modelcontextprotocol/sdk/types.js';
-import { DiscoveredTool, McpRegistryService } from '../mcp-registry.service';
+import {
+  DiscoveredCapability,
+  McpRegistryDiscoveryService,
+} from '../mcp-registry-discovery.service';
 import { McpHandlerBase } from './mcp-handler.base';
 import { HttpRequest } from '../../interfaces/http-adapter.interface';
 import type { McpOptions } from '../../interfaces/mcp-options.interface';
 import { PromptMetadata } from '../../decorators';
+import {
+  McpRegistryService,
+  DYNAMIC_PROMPT_HANDLER_TOKEN,
+} from '../mcp-dynamic-registry.service';
 
 @Injectable({ scope: Scope.REQUEST })
 export class McpPromptsHandler extends McpHandlerBase {
   constructor(
     moduleRef: ModuleRef,
-    registry: McpRegistryService,
+    registry: McpRegistryDiscoveryService,
     reflector: Reflector,
     @Inject('MCP_MODULE_ID') private readonly mcpModuleId: string,
     @Optional() @Inject('MCP_OPTIONS') options?: McpOptions,
@@ -59,7 +66,7 @@ export class McpPromptsHandler extends McpHandlerBase {
       GetPromptRequestSchema,
       async (request) => {
         this.logger.debug('GetPromptRequestSchema is being called');
-        let promptInfo: DiscoveredTool<PromptMetadata> | undefined;
+        let promptInfo: DiscoveredCapability<PromptMetadata> | undefined;
 
         try {
           const name = request.params.name;
@@ -72,6 +79,32 @@ export class McpPromptsHandler extends McpHandlerBase {
             );
           }
 
+          const context = this.createContext(mcpServer, request);
+
+          if (promptInfo.providerClass === DYNAMIC_PROMPT_HANDLER_TOKEN) {
+            const handler = McpRegistryService.getPromptHandlerByModuleId(
+              this.mcpModuleId,
+              name,
+            );
+
+            if (!handler) {
+              throw new McpError(
+                ErrorCode.MethodNotFound,
+                `Handler not found for dynamic prompt: ${name}`,
+              );
+            }
+
+            const result = await handler(
+              request.params.arguments,
+              context,
+              httpRequest.raw,
+            );
+
+            this.logger.debug('GetPromptRequestSchema result', result);
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+            return result;
+          }
+
           const contextId = ContextIdFactory.getByRequest(httpRequest);
           this.moduleRef.registerRequestByContextId(httpRequest, contextId);
 
@@ -88,7 +121,6 @@ export class McpPromptsHandler extends McpHandlerBase {
             );
           }
 
-          const context = this.createContext(mcpServer, request);
           const methodName = promptInfo.methodName;
 
           const result = await promptInstance[methodName].call(

package/src/mcp/services/handlers/mcp-resources.handler.ts

@@ -15,16 +15,20 @@ import {
   ReadResourceRequestSchema,
   ReadResourceResult,
 } from '@modelcontextprotocol/sdk/types.js';
-import { McpRegistryService } from '../mcp-registry.service';
+import { McpRegistryDiscoveryService } from '../mcp-registry-discovery.service';
 import { McpHandlerBase } from './mcp-handler.base';
 import type { Context, McpOptions } from '../../interfaces';
 import { HttpRequest } from '../../interfaces/http-adapter.interface';
+import {
+  McpRegistryService,
+  DYNAMIC_RESOURCE_HANDLER_TOKEN,
+} from '../mcp-dynamic-registry.service';
 
 @Injectable({ scope: Scope.REQUEST })
 export class McpResourcesHandler extends McpHandlerBase {
   constructor(
     moduleRef: ModuleRef,
-    registry: McpRegistryService,
+    registry: McpRegistryDiscoveryService,
     reflector: Reflector,
     @Inject('MCP_MODULE_ID') private readonly mcpModuleId: string,
     @Optional() @Inject('MCP_OPTIONS') options?: McpOptions,
@@ -132,6 +136,24 @@ export class McpResourcesHandler extends McpHandlerBase {
     requestParams: Record<string, unknown>,
     methodName: string,
   ) {
+    if (providerClass === DYNAMIC_RESOURCE_HANDLER_TOKEN) {
+      const handler = McpRegistryService.getResourceHandlerByModuleId(
+        this.mcpModuleId,
+        methodName,
+      );
+
+      if (!handler) {
+        throw new McpError(
+          ErrorCode.MethodNotFound,
+          `Handler not found for dynamic resource: ${uri}`,
+        );
+      }
+
+      const result = await handler(requestParams, context, httpRequest.raw);
+      this.logger.debug('ReadResourceRequestSchema result', result);
+      return result as ReadResourceResult;
+    }
+
     const contextId = ContextIdFactory.getByRequest(httpRequest);
     this.moduleRef.registerRequestByContextId(httpRequest, contextId);
 

package/src/mcp/services/handlers/mcp-tools.handler.ts

@@ -15,7 +15,10 @@ import {
   Type,
 } from '@nestjs/common';
 import { ContextIdFactory, ModuleRef, Reflector } from '@nestjs/core';
-import { DiscoveredTool, McpRegistryService } from '../mcp-registry.service';
+import {
+  DiscoveredCapability,
+  McpRegistryDiscoveryService,
+} from '../mcp-registry-discovery.service';
 import { ToolGuardExecutionContext, ToolMetadata } from '../../decorators';
 import { McpHandlerBase } from './mcp-handler.base';
 import { ZodType } from 'zod';
@@ -26,9 +29,9 @@ import { toJsonSchemaCompat } from '@modelcontextprotocol/sdk/server/zod-json-sc
 import { normalizeObjectSchema } from '@modelcontextprotocol/sdk/server/zod-compat.js';
 import type { McpOptions } from '../../interfaces/mcp-options.interface';
 import {
-  McpToolBuilder,
+  McpRegistryService,
   DYNAMIC_TOOL_HANDLER_TOKEN,
-} from '../mcp-tool-builder.service';
+} from '../mcp-dynamic-registry.service';
 
 @Injectable({ scope: Scope.REQUEST })
 export class McpToolsHandler extends McpHandlerBase {
@@ -36,7 +39,7 @@ export class McpToolsHandler extends McpHandlerBase {
 
   constructor(
     moduleRef: ModuleRef,
-    registry: McpRegistryService,
+    registry: McpRegistryDiscoveryService,
     reflector: Reflector,
     @Inject('MCP_MODULE_ID') private readonly mcpModuleId: string,
     @Inject('MCP_OPTIONS') private readonly options: McpOptions,
@@ -98,7 +101,7 @@ export class McpToolsHandler extends McpHandlerBase {
    */
   private createToolGuardExecutionContext(
     httpRequest: HttpRequest,
-    tool: DiscoveredTool<ToolMetadata>,
+    tool: DiscoveredCapability<ToolMetadata>,
   ): ToolGuardExecutionContext & ExecutionContext {
     const providerClass = tool.providerClass as Type;
     const methodHandler =
@@ -133,7 +136,7 @@ export class McpToolsHandler extends McpHandlerBase {
    * Returns true if the tool has no guards or all guards pass.
    */
   private async checkToolGuards(
-    tool: DiscoveredTool<ToolMetadata>,
+    tool: DiscoveredCapability<ToolMetadata>,
     httpRequest: HttpRequest,
   ): Promise<boolean> {
     const guards = tool.metadata.guards;
@@ -353,10 +356,10 @@ export class McpToolsHandler extends McpHandlerBase {
           const context = this.createContext(mcpServer, request);
           let result: any;
 
-          // Check if this is a dynamic tool (registered via McpToolBuilder)
+          // Check if this is a dynamic tool (registered via McpRegistryService)
           if (toolInfo.providerClass === DYNAMIC_TOOL_HANDLER_TOKEN) {
             // Dynamic tool - get handler using static method with the correct moduleId
-            const handler = McpToolBuilder.getHandlerByModuleId(
+            const handler = McpRegistryService.getHandlerByModuleId(
               this.mcpModuleId,
               request.params.name,
             );