fix: resolve MCP server import issues by using direct module imports

Co-authored-by: bcollamore <[email protected]>

Author: Copilot

tools/mcp/mcp_server.py

@@ -1,33 +1,34 @@
 #!/usr/bin/env python3
 import sys, importlib
+import os
 from pathlib import Path
 from typing import Dict, Any
 from fastmcp import FastMCP
 
 mcp = FastMCP("roslyn-analyzers-dev")
 BASE_DIR = Path(__file__).resolve().parents[2]
 
-MODULE_NAME = "tools.mcp.ra_tools"
+# Add the MCP directory to path for direct imports
+MCP_DIR = Path(__file__).parent
+if str(MCP_DIR) not in sys.path:
+    sys.path.insert(0, str(MCP_DIR))
+
+# Import ra_tools directly 
+import ra_tools
 
 def _mod():
-    # Always resolve the current module object
-    mod = sys.modules.get(MODULE_NAME)
-    if mod is None:
-        mod = importlib.import_module(MODULE_NAME)
-        mod.set_base_dir(str(BASE_DIR))
-    return mod
+    # Set the base directory and return the ra_tools module
+    ra_tools.set_base_dir(str(BASE_DIR))
+    return ra_tools
 
 @mcp.tool
 def hot_reload() -> Dict[str, Any]:
     """Reload tool implementations from disk without restarting the MCP server."""
     importlib.invalidate_caches()
-    mod = sys.modules.get(MODULE_NAME)
-    if mod is None:
-        mod = importlib.import_module(MODULE_NAME)
-    else:
-        mod = importlib.reload(mod)
-    mod.set_base_dir(str(BASE_DIR))
-    return {"status": "ok", "reloaded": MODULE_NAME, "base_dir": str(BASE_DIR)}
+    global ra_tools
+    ra_tools = importlib.reload(ra_tools)
+    ra_tools.set_base_dir(str(BASE_DIR))
+    return {"status": "ok", "reloaded": "ra_tools", "base_dir": str(BASE_DIR)}
 
 # Thin wrappers: delegate to the current module
 @mcp.tool