♻️ The agent import performance improvement #1905

Author: Phinease

backend/services/agent_service.py

@@ -41,7 +41,7 @@
     update_related_agents
 )
 from database.model_management_db import get_model_by_model_id, get_model_id_by_display_name
-from database.remote_mcp_db import check_mcp_name_exists, get_mcp_server_by_name_and_tenant
+from database.remote_mcp_db import get_mcp_server_by_name_and_tenant
 from database.tool_db import (
     check_tool_is_available,
     create_or_update_tool_by_tool_info,
@@ -53,8 +53,6 @@
 )
 from services.conversation_management_service import save_conversation_assistant, save_conversation_user
 from services.memory_config_service import build_memory_context
-from services.remote_mcp_service import add_remote_mcp_server_list
-from services.tool_configuration_service import update_tool_list
 from utils.auth_utils import get_current_user_info, get_user_language
 from utils.config_utils import tenant_config_manager
 from utils.memory_utils import build_memory_config
@@ -899,52 +897,17 @@ async def import_agent_impl(
     force_import: bool = False
 ):
     """
-    Import agent using DFS
+    Import agent using DFS.
+
+    Note:
+        MCP server registration and tool list refresh are now handled
+        on the frontend / dedicated MCP configuration flows.
+        The backend import logic only consumes the tools that already
+        exist for the current tenant.
     """
     user_id, tenant_id, _ = get_current_user_info(authorization)
     agent_id = agent_info.agent_id
 
-    # First, add MCP servers if any
-    if agent_info.mcp_info:
-        for mcp_info in agent_info.mcp_info:
-            if mcp_info.mcp_server_name and mcp_info.mcp_url:
-                try:
-                    # Check if MCP name already exists
-                    if check_mcp_name_exists(mcp_name=mcp_info.mcp_server_name, tenant_id=tenant_id):
-                        # Get existing MCP server info to compare URLs
-                        existing_mcp = get_mcp_server_by_name_and_tenant(mcp_name=mcp_info.mcp_server_name,
-                                                                         tenant_id=tenant_id)
-                        if existing_mcp and existing_mcp == mcp_info.mcp_url:
-                            # Same name and URL, skip
-                            logger.info(
-                                f"MCP server {mcp_info.mcp_server_name} with same URL already exists, skipping")
-                            continue
-                        else:
-                            # Same name but different URL, add import prefix
-                            import_mcp_name = f"import_{mcp_info.mcp_server_name}"
-                            logger.info(
-                                f"MCP server {mcp_info.mcp_server_name} exists with different URL, using name: {import_mcp_name}")
-                            mcp_server_name = import_mcp_name
-                    else:
-                        # Name doesn't exist, use original name
-                        mcp_server_name = mcp_info.mcp_server_name
-
-                    await add_remote_mcp_server_list(
-                        tenant_id=tenant_id,
-                        user_id=user_id,
-                        remote_mcp_server=mcp_info.mcp_url,
-                        remote_mcp_server_name=mcp_server_name
-                    )
-                except Exception as e:
-                    raise Exception(
-                        f"Failed to add MCP server {mcp_info.mcp_server_name}: {str(e)}")
-
-    # Then, update tool list to include new MCP tools
-    try:
-        await update_tool_list(tenant_id=tenant_id, user_id=user_id)
-    except Exception as e:
-        raise Exception(f"Failed to update tool list: {str(e)}")
-
     agent_stack = deque([agent_id])
     agent_id_set = set()
     mapping_agent_id = {}

frontend/app/[locale]/agents/components/AgentSetupOrchestrator.tsx

@@ -17,13 +17,14 @@ import {
   searchToolConfig,
   updateToolConfig,
 } from "@/services/agentConfigService";
-import { useAgentImport } from "@/hooks/useAgentImport";
+import { useAgentImport, ImportAgentData } from "@/hooks/useAgentImport";
 import {
   Agent,
   AgentSetupOrchestratorProps,
   Tool,
   ToolParam,
 } from "@/types/agentConfig";
+import AgentImportWizard from "@/components/agent/AgentImportWizard";
 import log from "@/lib/logger";
 
 import SubAgentPool from "./agent/SubAgentPool";
@@ -104,6 +105,10 @@ export default function AgentSetupOrchestrator({
   const [importingAction, setImportingAction] = useState<
     "force" | "regenerate" | null
   >(null);
+  
+  // Agent import wizard states
+  const [importWizardVisible, setImportWizardVisible] = useState(false);
+  const [importWizardData, setImportWizardData] = useState<ImportAgentData | null>(null);
   // Use generation state passed from parent component, not local state
 
   // Delete confirmation popup status
@@ -1589,7 +1594,7 @@ export default function AgentSetupOrchestrator({
     [runNormalImport, runForceImport]
   );
 
-  // Handle importing agent
+  // Handle importing agent - use AgentImportWizard for ExportAndImportDataFormat
   const handleImportAgent = (t: TFunction) => {
     // Create a hidden file input element
     const fileInput = document.createElement("input");
@@ -1618,6 +1623,20 @@ export default function AgentSetupOrchestrator({
           return;
         }
 
+        // Check if it's ExportAndImportDataFormat (has agent_id and agent_info)
+        if (agentInfo.agent_id && agentInfo.agent_info && typeof agentInfo.agent_info === "object") {
+          // Use AgentImportWizard for full agent import with configuration
+          const importData: ImportAgentData = {
+            agent_id: agentInfo.agent_id,
+            agent_info: agentInfo.agent_info,
+            mcp_info: agentInfo.mcp_info || [],
+          };
+          setImportWizardData(importData);
+          setImportWizardVisible(true);
+          return;
+        }
+
+        // Fallback to legacy import logic for other formats
         const normalizeValue = (value?: string | null) =>
           typeof value === "string" ? value.trim() : "";
 
@@ -1700,6 +1719,13 @@ export default function AgentSetupOrchestrator({
     fileInput.click();
   };
 
+  // Handle import completion from wizard
+  const handleImportComplete = () => {
+    refreshAgentList(t, false);
+    setImportWizardVisible(false);
+    setImportWizardData(null);
+  };
+
   const handleConfirmedDuplicateImport = useCallback(async () => {
     if (!pendingImportData) {
       return;
@@ -2256,6 +2282,23 @@ export default function AgentSetupOrchestrator({
             {t("businessLogic.config.import.duplicateDescription")}
           </p>
         </Modal>
+        {/* Agent Import Wizard */}
+        <AgentImportWizard
+          visible={importWizardVisible}
+          onCancel={() => {
+            setImportWizardVisible(false);
+            setImportWizardData(null);
+          }}
+          initialData={importWizardData}
+          onImportComplete={handleImportComplete}
+          title={undefined} // Use default title
+          agentDisplayName={
+            importWizardData?.agent_info?.[String(importWizardData.agent_id)]?.display_name
+          }
+          agentDescription={
+            importWizardData?.agent_info?.[String(importWizardData.agent_id)]?.description
+          }
+        />
         {/* Auto unselect knowledge_base_search notice when embedding not configured */}
         <Modal
           title={t("embedding.agentToolAutoDeselectModal.title")}

frontend/app/[locale]/agents/components/McpConfigModal.tsx

@@ -164,6 +164,8 @@ export default function McpConfigModal({
       content: t("mcpConfig.delete.confirmContent", {
         name: server.service_name,
       }),
+      okText: t("common.delete", "Delete"),
+      cancelText: t("common.cancel", "Cancel"),
       okType: "danger",
       cancelButtonProps: { disabled: updatingTools },
       okButtonProps: { disabled: updatingTools, loading: updatingTools },