Merge pull request #102 from QuantGeekDev/fix/tool-loading

fix: update tool loader pathing

Author: QuantGeekDev

.cursor/rules/mcp-framework.mdc

@@ -112,3 +112,6 @@ server.start();
 
 ```
 </example>
+
+It's important to keep in mind that mcp-framework is used exclusively as a dependency in other repositories - just like express js would be.
+This means that we are running it from node_modules within the repo - this impacts how relative directories work

src/core/MCPServer.ts

@@ -95,12 +95,6 @@ export class MCPServer {
     this.toolLoader = new ToolLoader(this.basePath);
     this.promptLoader = new PromptLoader(this.basePath);
     this.resourceLoader = new ResourceLoader(this.basePath);
-
-    this.server = new Server(
-      { name: this.serverName, version: this.serverVersion },
-      { capabilities: this.capabilities }
-    );
-    logger.debug(`SDK Server instance created.`);
   }
 
   private resolveBasePath(configPath?: string): string {
@@ -363,9 +357,7 @@ export class MCPServer {
       logger.debug('Resources capability enabled');
     }
 
-    (this.server as any).updateCapabilities?.(this.capabilities);
-    logger.debug(`Capabilities updated: ${JSON.stringify(this.capabilities)}`);
-
+    logger.debug(`Capabilities detected: ${JSON.stringify(this.capabilities)}`);
     return this.capabilities;
   }
 
@@ -406,6 +398,7 @@ export class MCPServer {
       const sdkVersion = this.getSdkVersion();
       logger.info(`Starting MCP server: (Framework: ${frameworkVersion}, SDK: ${sdkVersion})...`);
 
+      // Load all tools, prompts, and resources first
       const tools = await this.toolLoader.loadTools();
       this.toolsMap = new Map(tools.map((tool: ToolProtocol) => [tool.name, tool]));
 
@@ -432,6 +425,14 @@ export class MCPServer {
       await this.detectCapabilities();
       logger.info(`Capabilities detected: ${JSON.stringify(this.capabilities)}`);
 
+      this.server = new Server(
+        { name: this.serverName, version: this.serverVersion },
+        { capabilities: this.capabilities }
+      );
+      logger.debug(
+        `SDK Server instance created with capabilities: ${JSON.stringify(this.capabilities)}`
+      );
+
       this.setupHandlers();
 
       this.transport = this.createTransport();

src/loaders/toolLoader.ts

@@ -1,6 +1,6 @@
 import { ToolProtocol } from '../tools/BaseTool.js';
 import { join, dirname } from 'path';
-import { promises as fs } from 'fs';
+import { promises as fs, existsSync } from 'fs';
 import { logger } from '../core/Logger.js';
 import { discoverFilesRecursively, hasValidFiles } from '../utils/fileDiscovery.js';
 
@@ -9,23 +9,43 @@ export class ToolLoader {
   private readonly EXCLUDED_FILES = ['BaseTool.js', '*.test.js', '*.spec.js'];
 
   constructor(basePath?: string) {
-    if (basePath) {
-      // If basePath is provided, it should be the directory containing the tools folder
+    const projectRoot = process.cwd();
+    const distToolsPath = join(projectRoot, 'dist', 'tools');
+
+    if (existsSync(distToolsPath)) {
+      this.TOOLS_DIR = distToolsPath;
+      logger.debug(`Using project's dist/tools directory: ${this.TOOLS_DIR}`);
+    } else if (basePath) {
       this.TOOLS_DIR = join(basePath, 'tools');
+      logger.debug(`Using provided base path for tools: ${this.TOOLS_DIR}`);
     } else {
-      // For backwards compatibility, use the old behavior with process.argv[1]
+      // For backwards compatibility
       const mainModulePath = process.argv[1];
-      this.TOOLS_DIR = join(dirname(mainModulePath), 'tools');
+      const moduleDir = dirname(mainModulePath);
+
+      if (moduleDir.endsWith('dist')) {
+        this.TOOLS_DIR = join(moduleDir, 'tools');
+      } else {
+        this.TOOLS_DIR = join(moduleDir, 'dist', 'tools');
+      }
+      logger.debug(`Using module path for tools: ${this.TOOLS_DIR}`);
     }
-    logger.debug(`Initialized ToolLoader with directory: ${this.TOOLS_DIR}`);
   }
 
   async hasTools(): Promise<boolean> {
     try {
-      return await hasValidFiles(this.TOOLS_DIR, {
+      const hasDistTools = await hasValidFiles(this.TOOLS_DIR, {
         extensions: ['.js'],
         excludePatterns: this.EXCLUDED_FILES,
       });
+
+      if (hasDistTools) {
+        logger.debug(`Found tools in ${this.TOOLS_DIR}`);
+        return true;
+      }
+
+      logger.debug(`No tools found in ${this.TOOLS_DIR}`);
+      return false;
     } catch (error) {
       logger.debug(`No tools directory found: ${(error as Error).message}`);
       return false;