code-puppy 0.0.130__py3-none-any.whl → 0.0.132__py3-none-any.whl

code_puppy/mcp/server_registry_catalog.py

@@ -3,9 +3,18 @@ MCP Server Registry Catalog - Pre-configured MCP servers.
 A curated collection of MCP servers that can be easily searched and installed.
 """
 
-from typing import Dict, List, Optional
+from typing import Dict, List, Optional, Union
 from dataclasses import dataclass, field
 
+@dataclass
+class MCPServerRequirements:
+    """Comprehensive requirements for an MCP server installation."""
+    environment_vars: List[str] = field(default_factory=list)  # ["GITHUB_TOKEN", "API_KEY"]
+    command_line_args: List[Dict[str, Union[str, bool]]] = field(default_factory=list)  # [{"name": "port", "prompt": "Port number", "default": "3000", "required": False}]
+    required_tools: List[str] = field(default_factory=list)  # ["node", "python", "npm", "npx"]
+    package_dependencies: List[str] = field(default_factory=list)  # ["jupyter", "@modelcontextprotocol/server-discord"]
+    system_requirements: List[str] = field(default_factory=list)  # ["Docker installed", "Git configured"]
+
 @dataclass
 class MCPServerTemplate:
     """Template for a pre-configured MCP server."""
@@ -20,22 +29,109 @@ class MCPServerTemplate:
     author: str = "Community"
     verified: bool = False
     popular: bool = False
-    requires: List[str] = field(default_factory=list)  # Required tools/dependencies
+    requires: Union[List[str], MCPServerRequirements] = field(default_factory=list)  # Backward compatible
     example_usage: str = ""
     
-    def to_server_config(self, custom_name: Optional[str] = None) -> Dict:
-        """Convert template to server configuration."""
+    def get_requirements(self) -> MCPServerRequirements:
+        """Get requirements as MCPServerRequirements object."""
+        if isinstance(self.requires, list):
+            # Backward compatibility - treat as required_tools
+            return MCPServerRequirements(required_tools=self.requires)
+        return self.requires
+    
+    def get_environment_vars(self) -> List[str]:
+        """Get list of required environment variables."""
+        requirements = self.get_requirements()
+        env_vars = requirements.environment_vars.copy()
+        
+        # Also check config for env vars (existing logic)
+        if 'env' in self.config:
+            for key, value in self.config['env'].items():
+                if isinstance(value, str) and value.startswith('$'):
+                    var_name = value[1:]
+                    if var_name not in env_vars:
+                        env_vars.append(var_name)
+        
+        return env_vars
+    
+    def get_command_line_args(self) -> List[Dict]:
+        """Get list of configurable command line arguments."""
+        return self.get_requirements().command_line_args
+    
+    def get_required_tools(self) -> List[str]:
+        """Get list of required system tools."""
+        return self.get_requirements().required_tools
+    
+    def get_package_dependencies(self) -> List[str]:
+        """Get list of package dependencies."""
+        return self.get_requirements().package_dependencies
+    
+    def get_system_requirements(self) -> List[str]:
+        """Get list of system requirements."""
+        return self.get_requirements().system_requirements
+
+    def to_server_config(self, custom_name: Optional[str] = None, **cmd_args) -> Dict:
+        """Convert template to server configuration with optional overrides.
+        
+        Replaces placeholders in the config with actual values.
+        Placeholders are in the format ${ARG_NAME} in args array.
+        """
+        import copy
         config = {
             "name": custom_name or self.name,
             "type": self.type,
-            **self.config
+            **copy.deepcopy(self.config)
         }
+        
+        # Apply command line argument substitutions
+        if cmd_args and 'args' in config:
+            new_args = []
+            for arg in config['args']:
+                # Check if this arg contains a placeholder like ${db_path}
+                if isinstance(arg, str) and '${' in arg:
+                    # Replace all placeholders in this arg
+                    new_arg = arg
+                    for key, value in cmd_args.items():
+                        placeholder = f"${{{key}}}"
+                        if placeholder in new_arg:
+                            new_arg = new_arg.replace(placeholder, str(value))
+                    new_args.append(new_arg)
+                else:
+                    new_args.append(arg)
+            config['args'] = new_args
+        
+        # Also handle environment variable placeholders
+        if 'env' in config:
+            for env_key, env_value in config['env'].items():
+                if isinstance(env_value, str) and '${' in env_value:
+                    # Replace placeholders in env values
+                    for key, value in cmd_args.items():
+                        placeholder = f"${{{key}}}"
+                        if placeholder in env_value:
+                            config['env'][env_key] = env_value.replace(placeholder, str(value))
+        
         return config
 
 
 # Pre-configured MCP Server Registry
 MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
-    
+    MCPServerTemplate(
+        id="serena",
+        name="serena",
+        display_name="Serena",
+        description="Code Generation MCP Tooling",
+        tags=["Agentic", "Code", "SDK", "AI"],
+        category="Code",
+        type="stdio",
+        config={
+            "command": "uvx",
+            "args": ["--from", "git+https://github.com/oraios/serena", "serena", "start-mcp-server"]
+        },
+        verified=True,
+        popular=True,
+        example_usage="Agentic AI for writing programs",
+        requires=["uvx"]
+    ),
     # ========== File System & Storage ==========
     MCPServerTemplate(
         id="filesystem",
@@ -73,22 +169,72 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
         requires=["node", "npm"]
     ),
     
+    # Enhanced server with comprehensive requirements
     MCPServerTemplate(
         id="gdrive",
         name="gdrive",
         display_name="Google Drive",
-        description="Access and manage Google Drive files",
+        description="Access and manage Google Drive files with OAuth2 authentication",
         category="Storage",
-        tags=["google", "drive", "cloud", "storage", "sync"],
+        tags=["google", "drive", "cloud", "storage", "sync", "oauth"],
         type="stdio",
         config={
             "command": "npx",
             "args": ["-y", "@modelcontextprotocol/server-gdrive"],
+            "env": {
+                "GOOGLE_CLIENT_ID": "$GOOGLE_CLIENT_ID",
+                "GOOGLE_CLIENT_SECRET": "$GOOGLE_CLIENT_SECRET"
+            }
+        },
+        requires=MCPServerRequirements(
+            environment_vars=["GOOGLE_CLIENT_ID", "GOOGLE_CLIENT_SECRET"],
+            command_line_args=[
+                {
+                    "name": "port", 
+                    "prompt": "OAuth redirect port", 
+                    "default": "3000", 
+                    "required": False
+                },
+                {
+                    "name": "scope",
+                    "prompt": "Google Drive API scope",
+                    "default": "https://www.googleapis.com/auth/drive.readonly",
+                    "required": False
+                }
+            ],
+            required_tools=["node", "npx", "npm"],
+            package_dependencies=["@modelcontextprotocol/server-gdrive"],
+            system_requirements=["Internet connection for OAuth"]
+        ),
+        verified=True,
+        popular=True,
+        example_usage="List files: 'Show me my Google Drive files'"
+    ),
+    
+    # Regular server (backward compatible)
+    MCPServerTemplate(
+        id="filesystem-simple",
+        name="filesystem-simple",
+        display_name="Simple Filesystem",
+        description="Basic filesystem access",
+        category="Storage", 
+        tags=["files", "basic"],
+        type="stdio",
+        config={
+            "command": "npx",
+            "args": ["-y", "@modelcontextprotocol/server-filesystem", "/tmp"],
             "timeout": 30
         },
         verified=True,
         popular=True,
-        requires=["node", "npm", "google-auth"]
+        requires=MCPServerRequirements(
+            environment_vars=["GOOGLE_CLIENT_ID", "GOOGLE_CLIENT_SECRET"],
+            command_line_args=[
+                {"name": "port", "prompt": "OAuth redirect port", "default": "3000", "required": False}
+            ],
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-gdrive"]
+        )
     ),
     
     # ========== Databases ==========
@@ -102,12 +248,20 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
         type="stdio",
         config={
             "command": "npx",
-            "args": ["-y", "@modelcontextprotocol/server-postgres", "postgresql://localhost/mydb"],
+            "args": ["-y", "@modelcontextprotocol/server-postgres", "${connection_string}"],
             "timeout": 30
         },
         verified=True,
         popular=True,
-        requires=["node", "npm", "postgresql"],
+        requires=MCPServerRequirements(
+            environment_vars=["DATABASE_URL"],
+            command_line_args=[
+                {"name": "connection_string", "prompt": "PostgreSQL connection string", "default": "postgresql://localhost/mydb", "required": True}
+            ],
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-postgres"],
+            system_requirements=["PostgreSQL server running"]
+        ),
         example_usage="postgresql://user:password@localhost:5432/dbname"
     ),
     
@@ -121,12 +275,18 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
         type="stdio",
         config={
             "command": "npx",
-            "args": ["-y", "@modelcontextprotocol/server-sqlite", "path/to/database.db"],
+            "args": ["-y", "mcp-sqlite", "${db_path}"],
             "timeout": 30
         },
         verified=True,
         popular=True,
-        requires=["node", "npm"]
+        requires=MCPServerRequirements(
+            command_line_args=[
+                {"name": "db_path", "prompt": "Path to SQLite database file", "default": "./database.db", "required": True}
+            ],
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-sqlite"]
+        )
     ),
     
     MCPServerTemplate(
@@ -139,11 +299,19 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
         type="stdio",
         config={
             "command": "npx",
-            "args": ["-y", "@modelcontextprotocol/server-mysql", "mysql://localhost/mydb"],
+            "args": ["-y", "@modelcontextprotocol/server-mysql", "${connection_string}"],
             "timeout": 30
         },
         verified=True,
-        requires=["node", "npm", "mysql"]
+        requires=MCPServerRequirements(
+            environment_vars=["MYSQL_URL"],
+            command_line_args=[
+                {"name": "connection_string", "prompt": "MySQL connection string", "default": "mysql://localhost/mydb", "required": True}
+            ],
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-mysql"],
+            system_requirements=["MySQL server running"]
+        )
     ),
     
     MCPServerTemplate(
@@ -156,11 +324,19 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
         type="stdio",
         config={
             "command": "npx",
-            "args": ["-y", "@modelcontextprotocol/server-mongodb", "mongodb://localhost:27017/mydb"],
+            "args": ["-y", "@modelcontextprotocol/server-mongodb", "${connection_string}"],
             "timeout": 30
         },
         verified=True,
-        requires=["node", "npm", "mongodb"]
+        requires=MCPServerRequirements(
+            environment_vars=["MONGODB_URI"],
+            command_line_args=[
+                {"name": "connection_string", "prompt": "MongoDB connection string", "default": "mongodb://localhost:27017/mydb", "required": True}
+            ],
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-mongodb"],
+            system_requirements=["MongoDB server running"]
+        )
     ),
     
     # ========== Development Tools ==========
@@ -179,7 +355,11 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
         },
         verified=True,
         popular=True,
-        requires=["node", "npm", "git"]
+        requires=MCPServerRequirements(
+            required_tools=["node", "npm", "npx", "git"],
+            package_dependencies=["@modelcontextprotocol/server-git"],
+            system_requirements=["Git repository initialized"]
+        )
     ),
     
     MCPServerTemplate(
@@ -198,7 +378,12 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
         },
         verified=True,
         popular=True,
-        requires=["node", "npm", "github-token"]
+        requires=MCPServerRequirements(
+            environment_vars=["GITHUB_TOKEN"],
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-github"],
+            system_requirements=["GitHub account with personal access token"]
+        )
     ),
     
     MCPServerTemplate(
@@ -216,7 +401,12 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
             "timeout": 30
         },
         verified=True,
-        requires=["node", "npm", "gitlab-token"]
+        requires=MCPServerRequirements(
+            environment_vars=["GITLAB_TOKEN"],
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-gitlab"],
+            system_requirements=["GitLab account with personal access token"]
+        )
     ),
     
     # ========== Web & Browser ==========
@@ -235,7 +425,14 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
         },
         verified=True,
         popular=True,
-        requires=["node", "npm", "chrome"]
+        requires=MCPServerRequirements(
+            command_line_args=[
+                {"name": "headless", "prompt": "Run in headless mode", "default": "true", "required": False}
+            ],
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-puppeteer"],
+            system_requirements=["Chrome/Chromium browser"]
+        )
     ),
     
     MCPServerTemplate(
@@ -252,7 +449,14 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
             "timeout": 60
         },
         verified=True,
-        requires=["node", "npm"]
+        requires=MCPServerRequirements(
+            command_line_args=[
+                {"name": "browser", "prompt": "Browser to use", "default": "chromium", "required": False}
+            ],
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-playwright"],
+            system_requirements=["Playwright browsers (will be installed)"]
+        )
     ),
     
     MCPServerTemplate(
@@ -269,7 +473,10 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
             "timeout": 30
         },
         verified=True,
-        requires=["node", "npm"]
+        requires=MCPServerRequirements(
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-fetch"]
+        )
     ),
     
     # ========== Communication ==========
@@ -289,7 +496,12 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
         },
         verified=True,
         popular=True,
-        requires=["node", "npm", "slack-token"]
+        requires=MCPServerRequirements(
+            environment_vars=["SLACK_TOKEN"],
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-slack"],
+            system_requirements=["Slack app with bot token"]
+        )
     ),
     
     MCPServerTemplate(
@@ -307,7 +519,12 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
             "timeout": 30
         },
         verified=True,
-        requires=["node", "npm", "discord-token"]
+        requires=MCPServerRequirements(
+            environment_vars=["DISCORD_TOKEN"],
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-discord"],
+            system_requirements=["Discord bot token"]
+        )
     ),
     
     MCPServerTemplate(
@@ -324,7 +541,11 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
             "timeout": 30
         },
         verified=True,
-        requires=["node", "npm"]
+        requires=MCPServerRequirements(
+            environment_vars=["EMAIL_HOST", "EMAIL_PORT", "EMAIL_USER", "EMAIL_PASS"],
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-email"]
+        )
     ),
     
     # ========== AI & Machine Learning ==========
@@ -344,7 +565,11 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
         },
         verified=True,
         popular=True,
-        requires=["node", "npm", "openai-api-key"]
+        requires=MCPServerRequirements(
+            environment_vars=["OPENAI_API_KEY"],
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-openai"]
+        )
     ),
     
     MCPServerTemplate(
@@ -362,7 +587,11 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
             "timeout": 60
         },
         verified=True,
-        requires=["node", "npm", "anthropic-api-key"]
+        requires=MCPServerRequirements(
+            environment_vars=["ANTHROPIC_API_KEY"],
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-anthropic"]
+        )
     ),
     
     # ========== Data Processing ==========
@@ -381,7 +610,10 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
         },
         verified=True,
         popular=True,
-        requires=["python", "pandas", "mcp-server-pandas"]
+        requires=MCPServerRequirements(
+            required_tools=["python", "pip"],
+            package_dependencies=["pandas", "mcp-server-pandas"]
+        )
     ),
     
     MCPServerTemplate(
@@ -398,7 +630,10 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
             "timeout": 60
         },
         verified=True,
-        requires=["python", "jupyter", "mcp-server-jupyter"]
+        requires=MCPServerRequirements(
+            required_tools=["python", "pip", "jupyter"],
+            package_dependencies=["jupyter", "mcp-server-jupyter"]
+        )
     ),
     
     # ========== Cloud Services ==========
@@ -421,7 +656,15 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
         },
         verified=True,
         popular=True,
-        requires=["node", "npm", "aws-credentials"]
+        requires=MCPServerRequirements(
+            environment_vars=["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY"],
+            command_line_args=[
+                {"name": "region", "prompt": "AWS region", "default": "us-east-1", "required": False}
+            ],
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-aws-s3"],
+            system_requirements=["AWS account with S3 access"]
+        )
     ),
     
     MCPServerTemplate(
@@ -439,7 +682,12 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
             "timeout": 30
         },
         verified=True,
-        requires=["node", "npm", "azure-credentials"]
+        requires=MCPServerRequirements(
+            environment_vars=["AZURE_STORAGE_CONNECTION_STRING"],
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-azure-storage"],
+            system_requirements=["Azure storage account"]
+        )
     ),
     
     # ========== Security & Authentication ==========
@@ -457,7 +705,10 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
             "timeout": 30
         },
         verified=True,
-        requires=["1password-cli"]
+        requires=MCPServerRequirements(
+            required_tools=["op"],
+            system_requirements=["1Password CLI installed and authenticated"]
+        )
     ),
     
     MCPServerTemplate(
@@ -475,7 +726,12 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
             "timeout": 30
         },
         verified=True,
-        requires=["node", "npm", "vault-token"]
+        requires=MCPServerRequirements(
+            environment_vars=["VAULT_TOKEN", "VAULT_ADDR"],
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-vault"],
+            system_requirements=["HashiCorp Vault server accessible"]
+        )
     ),
     
     # ========== Documentation & Knowledge ==========
@@ -490,11 +746,15 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
         config={
             "timeout": 30,
             "command": "npx",
-            "args": ["-y", "@upstash/context7-mcp","--api-key", "ctx7sk-c884daad-4169-47ca-b44a-bd30ba77c4db"]
+            "args": ["-y", "@upstash/context7-mcp","--api-key", "$CONTEXT7_API_KEY"]
         },
         verified=True,
         popular=True,
-        requires=[],
+        requires=MCPServerRequirements(
+            environment_vars=["CONTEXT7_API_KEY"],
+            required_tools=["node", "npx"],
+            package_dependencies=["@upstash/context7-mcp"]
+        ),
         example_usage="Cloud-based service - no local setup required"
     ),
     
@@ -513,7 +773,12 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
             "timeout": 30
         },
         verified=True,
-        requires=["node", "npm", "confluence-token"]
+        requires=MCPServerRequirements(
+            environment_vars=["CONFLUENCE_TOKEN", "CONFLUENCE_BASE_URL"],
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-confluence"],
+            system_requirements=["Confluence API access"]
+        )
     ),
     
     MCPServerTemplate(
@@ -532,7 +797,12 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
         },
         verified=True,
         popular=True,
-        requires=["node", "npm", "notion-token"]
+        requires=MCPServerRequirements(
+            environment_vars=["NOTION_TOKEN"],
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-notion"],
+            system_requirements=["Notion integration API key"]
+        )
     ),
     
     # ========== DevOps & Infrastructure ==========
@@ -551,7 +821,11 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
         },
         verified=True,
         popular=True,
-        requires=["node", "npm", "docker"]
+        requires=MCPServerRequirements(
+            required_tools=["node", "npm", "npx", "docker"],
+            package_dependencies=["@modelcontextprotocol/server-docker"],
+            system_requirements=["Docker daemon running"]
+        )
     ),
     
     MCPServerTemplate(
@@ -568,7 +842,11 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
             "timeout": 30
         },
         verified=True,
-        requires=["node", "npm", "kubectl"]
+        requires=MCPServerRequirements(
+            required_tools=["node", "npm", "npx", "kubectl"],
+            package_dependencies=["@modelcontextprotocol/server-kubernetes"],
+            system_requirements=["Kubernetes cluster access (kubeconfig)"]
+        )
     ),
     
     MCPServerTemplate(
@@ -585,7 +863,11 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
             "timeout": 60
         },
         verified=True,
-        requires=["node", "npm", "terraform"]
+        requires=MCPServerRequirements(
+            required_tools=["node", "npm", "npx", "terraform"],
+            package_dependencies=["@modelcontextprotocol/server-terraform"],
+            system_requirements=["Terraform configuration files"]
+        )
     ),
     
     # ========== Monitoring & Observability ==========
@@ -599,11 +881,18 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
         type="stdio",
         config={
             "command": "npx",
-            "args": ["-y", "@modelcontextprotocol/server-prometheus", "http://localhost:9090"],
+            "args": ["-y", "@modelcontextprotocol/server-prometheus", "${prometheus_url}"],
             "timeout": 30
         },
         verified=True,
-        requires=["node", "npm"]
+        requires=MCPServerRequirements(
+            command_line_args=[
+                {"name": "prometheus_url", "prompt": "Prometheus server URL", "default": "http://localhost:9090", "required": True}
+            ],
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-prometheus"],
+            system_requirements=["Prometheus server accessible"]
+        )
     ),
     
     MCPServerTemplate(
@@ -621,7 +910,12 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
             "timeout": 30
         },
         verified=True,
-        requires=["node", "npm", "grafana-token"]
+        requires=MCPServerRequirements(
+            environment_vars=["GRAFANA_TOKEN", "GRAFANA_URL"],
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-grafana"],
+            system_requirements=["Grafana server with API access"]
+        )
     ),
     
     # ========== Package Management ==========
@@ -639,7 +933,10 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
             "timeout": 30
         },
         verified=True,
-        requires=["node", "npm"]
+        requires=MCPServerRequirements(
+            required_tools=["node", "npm", "npx"],
+            package_dependencies=["@modelcontextprotocol/server-npm"]
+        )
     ),
     
     MCPServerTemplate(
@@ -656,7 +953,10 @@ MCP_SERVER_REGISTRY: List[MCPServerTemplate] = [
             "timeout": 30
         },
         verified=True,
-        requires=["python", "mcp-server-pypi"]
+        requires=MCPServerRequirements(
+            required_tools=["python", "pip"],
+            package_dependencies=["mcp-server-pypi"]
+        )
     ),
 ]