From b62743dbae3b7f3e7a7415d10caf4f39818ec0f2 Mon Sep 17 00:00:00 2001
From: one <wangan.cs@gmail.com>
Date: Fri, 23 May 2025 00:39:02 +0800
Subject: [PATCH] feat: toggle MCP servers on the card list (#6232)

---
 .../settings/MCPSettings/McpServersList.tsx   | 45 +++++++++++++++++--
 .../settings/MCPSettings/McpSettings.tsx      | 11 +----
 src/renderer/src/utils/error.ts               |  9 ++++
 3 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/src/renderer/src/pages/settings/MCPSettings/McpServersList.tsx b/src/renderer/src/pages/settings/MCPSettings/McpServersList.tsx
index ed2102530c..de0b83c137 100644
--- a/src/renderer/src/pages/settings/MCPSettings/McpServersList.tsx
+++ b/src/renderer/src/pages/settings/MCPSettings/McpServersList.tsx
@@ -4,7 +4,8 @@ import DragableList from '@renderer/components/DragableList'
 import Scrollbar from '@renderer/components/Scrollbar'
 import { useMCPServers } from '@renderer/hooks/useMCPServers'
 import { MCPServer } from '@renderer/types'
-import { Button, Dropdown, Empty, Tag } from 'antd'
+import { formatMcpError } from '@renderer/utils/error'
+import { Button, Dropdown, Empty, Switch, Tag } from 'antd'
 import { MonitorCheck, Plus, RefreshCw, Settings2, SquareArrowOutUpRight } from 'lucide-react'
 import { FC, useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -17,10 +18,11 @@ import EditMcpJsonPopup from './EditMcpJsonPopup'
 import SyncServersPopup from './SyncServersPopup'
 
 const McpServersList: FC = () => {
-  const { mcpServers, addMCPServer, updateMcpServers } = useMCPServers()
+  const { mcpServers, addMCPServer, updateMcpServers, updateMCPServer } = useMCPServers()
   const { t } = useTranslation()
   const navigate = useNavigate()
   const [isAddModalVisible, setIsAddModalVisible] = useState(false)
+  const [loadingServerIds, setLoadingServerIds] = useState<Set<string>>(new Set())
 
   const onAddMcpServer = useCallback(async () => {
     const newServer = {
@@ -53,6 +55,33 @@ const McpServersList: FC = () => {
     [addMCPServer, t]
   )
 
+  const handleToggleActive = async (server: MCPServer, active: boolean) => {
+    setLoadingServerIds((prev) => new Set(prev).add(server.id))
+    const oldActiveState = server.isActive
+
+    try {
+      if (active) {
+        await window.api.mcp.listTools(server)
+      } else {
+        await window.api.mcp.stopServer(server)
+      }
+      updateMCPServer({ ...server, isActive: active })
+    } catch (error: any) {
+      window.modal.error({
+        title: t('settings.mcp.startError'),
+        content: formatMcpError(error),
+        centered: true
+      })
+      updateMCPServer({ ...server, isActive: oldActiveState })
+    } finally {
+      setLoadingServerIds((prev) => {
+        const next = new Set(prev)
+        next.delete(server.id)
+        return next
+      })
+    }
+  }
+
   return (
     <Container>
       <ListHeader>
@@ -108,7 +137,14 @@ const McpServersList: FC = () => {
                   <MonitorCheck size={16} color={server.isActive ? 'var(--color-primary)' : 'var(--color-text-3)'} />
                 </ServerIcon>
               </ServerName>
-              <StatusIndicator>
+              <StatusIndicator onClick={(e) => e.stopPropagation()}>
+                <Switch
+                  value={server.isActive}
+                  key={server.id}
+                  loading={loadingServerIds.has(server.id)}
+                  onChange={(checked) => handleToggleActive(server, checked)}
+                  size="small"
+                />
                 <Button
                   icon={<Settings2 size={16} />}
                   type="text"
@@ -232,6 +268,9 @@ const ServerNameText = styled.span`
 
 const StatusIndicator = styled.div`
   margin-left: 8px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
 `
 
 const ServerDescription = styled.div`
diff --git a/src/renderer/src/pages/settings/MCPSettings/McpSettings.tsx b/src/renderer/src/pages/settings/MCPSettings/McpSettings.tsx
index ff38942f6a..c20df064d3 100644
--- a/src/renderer/src/pages/settings/MCPSettings/McpSettings.tsx
+++ b/src/renderer/src/pages/settings/MCPSettings/McpSettings.tsx
@@ -3,6 +3,7 @@ import { useTheme } from '@renderer/context/ThemeProvider'
 import { useMCPServer, useMCPServers } from '@renderer/hooks/useMCPServers'
 import MCPDescription from '@renderer/pages/settings/MCPSettings/McpDescription'
 import { MCPPrompt, MCPResource, MCPServer, MCPTool } from '@renderer/types'
+import { formatMcpError } from '@renderer/utils/error'
 import { Button, Flex, Form, Input, Radio, Select, Switch, Tabs } from 'antd'
 import TextArea from 'antd/es/input/TextArea'
 import { ChevronDown } from 'lucide-react'
@@ -332,14 +333,6 @@ const McpSettings: React.FC = () => {
     [server, t]
   )
 
-  const formatError = (error: any) => {
-    if (error.message.includes('32000')) {
-      return t('settings.mcp.errors.32000')
-    }
-
-    return error.message
-  }
-
   const onToggleActive = async (active: boolean) => {
     if (isFormChanged && active) {
       await onSave()
@@ -367,7 +360,7 @@ const McpSettings: React.FC = () => {
     } catch (error: any) {
       window.modal.error({
         title: t('settings.mcp.startError'),
-        content: formatError(error),
+        content: formatMcpError(error),
         centered: true
       })
       updateMCPServer({ ...server, isActive: oldActiveState })
diff --git a/src/renderer/src/utils/error.ts b/src/renderer/src/utils/error.ts
index a53c9e5923..0ee522f08b 100644
--- a/src/renderer/src/utils/error.ts
+++ b/src/renderer/src/utils/error.ts
@@ -1,3 +1,5 @@
+import { t } from 'i18next'
+
 export function getErrorDetails(err: any, seen = new WeakSet()): any {
   // Handle circular references
   if (err === null || typeof err !== 'object' || seen.has(err)) {
@@ -85,3 +87,10 @@ export const isAbortError = (error: any): boolean => {
 
   return false
 }
+
+export const formatMcpError = (error: any) => {
+  if (error.message.includes('32000')) {
+    return t('settings.mcp.errors.32000')
+  }
+  return error.message
+}