update

server/app/controller/mcp/mcp_controller.py

@@ -1,3 +1,4 @@
+import os
 from typing import Dict
 from fastapi import Depends, HTTPException, APIRouter
 from fastapi_babel import _
@@ -11,6 +12,8 @@ from app.model.mcp.mcp import Mcp, McpOut, McpType
 from app.model.mcp.mcp_env import McpEnv, Status as McpEnvStatus
 from app.model.mcp.mcp_user import McpImportType, McpUser, Status
 from loguru import logger
+from camel.toolkits.mcp_toolkit import MCPToolkit
+from app.component.environment import env
 
 from app.component.validator.McpServer import (
     McpRemoteServer,
@@ -22,6 +25,45 @@ from app.component.validator.McpServer import (
 router = APIRouter(tags=["Mcp Servers"])
 
 
+async def pre_instantiate_mcp_toolkit(config_dict: dict) -> bool:
+    """
+    Pre-instantiate MCP toolkit to complete authentication process
+
+    Args:
+        config_dict: MCP server configuration dictionary
+
+    Returns:
+        bool: Whether successfully instantiated and connected
+    """
+    try:
+        # Ensure unified auth directory for all mcp servers
+        for server_config in config_dict.get("mcpServers", {}).values():
+            if "env" not in server_config:
+                server_config["env"] = {}
+            # Set global auth directory to persist authentication across tasks
+            if "MCP_REMOTE_CONFIG_DIR" not in server_config["env"]:
+                server_config["env"]["MCP_REMOTE_CONFIG_DIR"] = env(
+                    "MCP_REMOTE_CONFIG_DIR",
+                    os.path.expanduser("~/.mcp-auth")
+                )
+
+        # Create MCP toolkit and attempt to connect
+        mcp_toolkit = MCPToolkit(config_dict=config_dict, timeout=30)
+        await mcp_toolkit.connect()
+
+        # Get tools list to ensure connection is successful
+        tools = mcp_toolkit.get_tools()
+        logger.info(f"Successfully pre-instantiated MCP toolkit with {len(tools)} tools")
+
+        # Disconnect, authentication info is already saved
+        await mcp_toolkit.disconnect()
+        return True
+
+    except Exception as e:
+        logger.warning(f"Failed to pre-instantiate MCP toolkit: {e!r}")
+        return False
+
+
 @router.get("/mcps", name="mcp list")
 async def gets(
     keyword: str | None = None,
@@ -71,7 +113,23 @@ async def install(mcp_id: int, session: Session = Depends(session), auth: Auth =
     exists = session.exec(select(McpUser).where(McpUser.mcp_id == mcp.id, McpUser.user_id == auth.user.id)).first()
     if exists:
         raise HTTPException(status_code=400, detail=_("mcp is installed"))
+
     install_command: dict = mcp.install_command
+
+    # Pre-instantiate MCP toolkit for authentication
+    config_dict = {
+        "mcpServers": {
+            mcp.key: install_command
+        }
+    }
+
+    try:
+        success = await pre_instantiate_mcp_toolkit(config_dict)
+        if not success:
+            logger.warning(f"Pre-instantiation failed for MCP {mcp.key}, but continuing with installation")
+    except Exception as e:
+        logger.warning(f"Exception during pre-instantiation for MCP {mcp.key}: {e}")
+
     mcp_user = McpUser(
         mcp_id=mcp.id,
         user_id=auth.user.id,
@@ -100,7 +158,26 @@ async def import_mcp(
         if not is_valid:
             raise HTTPException(status_code=400, detail=res)
         mcp_data: Dict[str, McpServerItem] = res.mcpServers
+
         for name, data in mcp_data.items():
+            # Pre-instantiate MCP toolkit for authentication
+            config_dict = {
+                "mcpServers": {
+                    name: {
+                        "command": data.command,
+                        "args": data.args,
+                        "env": data.env or {}
+                    }
+                }
+            }
+
+            try:
+                success = await pre_instantiate_mcp_toolkit(config_dict)
+                if not success:
+                    logger.warning(f"Pre-instantiation failed for local MCP {name}, but continuing with installation")
+            except Exception as e:
+                logger.warning(f"Exception during pre-instantiation for local MCP {name}: {e}")
+
             mcp_user = McpUser(
                 mcp_id=0,
                 user_id=auth.user.id,
@@ -120,6 +197,10 @@ async def import_mcp(
         if not is_valid:
             raise HTTPException(status_code=400, detail=res)
         data: McpRemoteServer = res
+
+        # For remote servers, we don't need to pre-instantiate as they typically don't require authentication
+        # but we can still try to validate the connection if needed
+
         mcp_user = McpUser(
             mcp_id=0,
             user_id=auth.user.id,