refactor code and rename

Author: Hoder-zyf

mcp_config.json.example

@@ -2,7 +2,7 @@
   "mcpServices": {
     "context7": {
       "url": "http://localhost:8123/mcp",
-      "handler": "rdagent.components.mcp.context7.handler:Context7Handler",
+      "handler": "rdagent.components.mcp.context7.client:Context7Client",
       "enabled": true,
       "timeout": 60,
       "extra_config": {
@@ -13,11 +13,11 @@
     },
     "simple_code_search": {
       "url": "http://localhost:9001/mcp",
-      "handler": "rdagent.components.mcp.general_handler:GeneralMCPHandler",
+      "handler": "rdagent.components.mcp.client:MCPClient",
       "timeout": 60,
       "enabled": true,
       "extra_config": {
-        "model": "gpt-3.5-turbo",
+        "model": "gpt-3.5-turbo"
       }
     }
   }

rdagent/components/mcp/__init__.py

@@ -16,15 +16,20 @@
 
 # Main user interfaces
 from .agent import MCPAgent, MCPServerStreamableHTTP, create_agent
+from .client import BaseMCPClient, MCPClient
 
 # Core components (for advanced usage only)
 from .connector import StreamableHTTPConfig, StreamableHTTPConnector
-from .context7.handler import Context7Handler
-from .general_handler import BaseMCPHandler
-from .registry import MCPRegistry, MCPRegistryConfig, MCPServiceConfig
+from .context7.client import Context7Client
 
 # Core execution functions
-from .unified import mcp_execute, mcp_execute_sync
+from .registry import (
+    MCPRegistry,
+    MCPRegistryConfig,
+    MCPServiceConfig,
+    mcp_execute,
+    mcp_execute_sync,
+)
 
 __all__ = [
     # Main user interfaces
@@ -37,8 +42,9 @@
     # Advanced components (for internal use)
     "StreamableHTTPConnector",
     "StreamableHTTPConfig",
-    "BaseMCPHandler",
-    "Context7Handler",
+    "BaseMCPClient",
+    "MCPClient",
+    "Context7Client",
     "MCPRegistry",
     "MCPRegistryConfig",
     "MCPServiceConfig",

rdagent/components/mcp/agent.py

@@ -16,8 +16,12 @@
 from typing import List, Optional, Union
 from urllib.parse import urlparse
 
-from rdagent.components.mcp.registry import MCPServiceConfig, get_global_registry
-from rdagent.components.mcp.unified import mcp_execute, mcp_execute_sync
+from rdagent.components.mcp.registry import (
+    MCPServiceConfig,
+    get_global_registry,
+    mcp_execute,
+    mcp_execute_sync,
+)
 from rdagent.log import rdagent_logger as logger
 
 
@@ -57,7 +61,7 @@ def __init__(
 
         self.url = url
         self.name = name or self._generate_name_from_url(url) if url else name
-        self.handler = handler or "rdagent.components.mcp.general_handler:GeneralMCPHandler"
+        self.handler = handler or "rdagent.components.mcp.client:MCPClient"
         self.extra_config = extra_config
         self.enabled = extra_config.pop("enabled", True)
         self.timeout = extra_config.pop("timeout", 120.0)

rdagent/components/mcp/general_handler.py renamed to rdagent/components/mcp/client.py

@@ -1,8 +1,7 @@
-"""MCP Handler Implementation
+"""MCP Client Implementation
 
-This module contains both the abstract base class and the general implementation
-for MCP service handlers. It provides a unified interface for MCP services using
-LiteLLM backend for all LLM calls.
+This module provides the core MCP client that handles protocol communication,
+tool execution, and LLM interactions for MCP services.
 """
 
 import asyncio
@@ -25,8 +24,8 @@
 from rdagent.oai.backend.litellm import LiteLLMAPIBackend
 
 
-class BaseMCPHandler(ABC):
-    """Abstract base class for MCP service handlers."""
+class BaseMCPClient(ABC):
+    """Abstract base class for MCP clients."""
 
     def __init__(self, service_name: str, **config):
         """Initialize handler with service name and configuration."""
@@ -59,15 +58,15 @@ def get_service_info(self) -> Dict[str, Any]:
         }
 
 
-class GeneralMCPHandler(BaseMCPHandler):
-    """General MCP service handler using LiteLLM backend.
+class MCPClient(BaseMCPClient):
+    """MCP client implementation.
 
-    This handler provides common functionality for all MCP services:
-    - Uses LiteLLM backend for unified model calling and configuration
-    - Supports multi-round tool calling with detailed logging
-    - Provides customizable hooks for service-specific logic
-    - Integrates caching and error handling
-    - Maintains compatibility with existing MCP interfaces
+    This client provides complete MCP protocol support:
+    - Manages connections to MCP services
+    - Executes tools with multi-round calling
+    - Integrates with LLM for intelligent processing
+    - Handles caching, retries, and error recovery
+    - Supports customization through subclassing
     """
 
     # Rate limit wait times (in seconds)

rdagent/components/mcp/context7/handler.py renamed to rdagent/components/mcp/context7/client.py

@@ -1,28 +1,28 @@
-"""Context7 Handler Implementation
+"""Context7 Client Implementation
 
 This handler preserves all the experimental results and optimizations
 for Context7 service, including prompt templates, timm library special
 handling, caching mechanisms, and error handling logic.
 
-Now inherits from GeneralMCPHandler to use unified LiteLLM backend.
+Now inherits from MCPClient to use unified LiteLLM backend.
 """
 
 from typing import Optional
 
+from rdagent.components.mcp.client import MCPClient
 from rdagent.components.mcp.connector import MCPConnectionError, StreamableHTTPConfig
-from rdagent.components.mcp.general_handler import GeneralMCPHandler
 from rdagent.log import rdagent_logger as logger
 from rdagent.utils.agent.tpl import T
 
 
-class Context7Handler(GeneralMCPHandler):
-    """Context7 MCP service handler with all experimental optimizations.
+class Context7Client(MCPClient):
+    """Context7 MCP service client with experimental optimizations.
 
-    This handler preserves all the research results including:
+    This client extends MCPClient with Context7-specific features:
     - Enhanced prompt templates for better documentation search
     - Special handling for timm library (3+ mentions trigger)
     - Intelligent error handling for documentation not found cases
-    - All common functionality now handled by GeneralMCPHandler + LiteLLM
+    - Tool response validation for Context7's specific format
     """
 
     # Tool response validation rules for Context7
@@ -40,27 +40,27 @@ class Context7Handler(GeneralMCPHandler):
 
     # TODO: Consider making these configurable based on server response time patterns
     # Override parent class retry wait times to fit within Context7's 75-second session window
-    # These directly override GeneralMCPHandler's class attributes
+    # These directly override MCPClient's class attributes
     RATE_LIMIT_WAIT_TIMES = [15, 20, 25]  # Maximum total: 60 seconds
     NORMAL_RETRY_WAIT_TIMES = [5, 8, 10]  # For non-rate-limit errors
 
     def __init__(self, service_name: str = "context7", service_url: str = "http://localhost:8123/mcp", **config):
-        # Initialize with GeneralMCPHandler - uses LiteLLM backend
+        # Initialize with MCPClient - uses LiteLLM backend
         super().__init__(service_name, **config)
 
         # Store MCP service URL (from registry config)
         self.mcp_url = service_url
 
         # Log that we're using LiteLLM backend
         logger.info(
-            f"Context7Handler initialized with session_timeout={self.SESSION_TIMEOUT}s, "
+            f"Context7Client initialized with session_timeout={self.SESSION_TIMEOUT}s, "
             f"rate_limit_waits={self.RATE_LIMIT_WAIT_TIMES}",
             tag="context7_config",
         )
 
     # Configuration is now handled by LiteLLM backend - no need for separate resolution
 
-    # process_query is now handled by GeneralMCPHandler - we implement the abstract methods
+    # process_query is now handled by MCPClient - we implement the abstract methods
 
     def preprocess_query(self, query: str, **kwargs) -> str:
         """Preprocess query with Context7 specific enhancements.
@@ -148,7 +148,7 @@ def _build_enhanced_query(self, error_message: str, full_code: Optional[str] = N
 
         return enhanced_query
 
-    # All common functionality is now handled by GeneralMCPHandler
+    # All common functionality is now handled by MCPClient
 
     def customize_connector_config(self, config: "StreamableHTTPConfig") -> "StreamableHTTPConfig":
         """Customize connector configuration for Context7's 75-second session limit.