From f27e66a399d2b350064fb7092dae020b4be6274e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=87=AA=E7=94=B1=E7=9A=84=E4=B8=96=E7=95=8C=E4=BA=BA?= <3196812536@qq.com> Date: Sat, 24 May 2025 16:00:55 +0800 Subject: [PATCH] feat: add disable MCP server functionality and update translations (#6398) * feat: add disable MCP server functionality and update translations * feat: update MCPToolsButton and WebSearchButton to use CircleX icon and change labels to 'close' --------- Co-authored-by: kangfenmao --- src/renderer/src/i18n/locales/en-us.json | 2 + src/renderer/src/i18n/locales/ja-jp.json | 5 ++- src/renderer/src/i18n/locales/ru-ru.json | 5 ++- src/renderer/src/i18n/locales/zh-cn.json | 2 + src/renderer/src/i18n/locales/zh-tw.json | 2 + .../pages/home/Inputbar/MCPToolsButton.tsx | 38 ++++++++++++++----- .../pages/home/Inputbar/WebSearchButton.tsx | 6 +-- 7 files changed, 43 insertions(+), 17 deletions(-) diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json index 0c70a0535a..f39d9a33db 100644 --- a/src/renderer/src/i18n/locales/en-us.json +++ b/src/renderer/src/i18n/locales/en-us.json @@ -1305,6 +1305,8 @@ "stdio": "Standard Input/Output (stdio)", "inMemory": "Memory", "config_description": "Configure Model Context Protocol servers", + "disable": "Disable MCP Server", + "disable.description": "Do not enable MCP server functionality", "deleteError": "Failed to delete server", "deleteSuccess": "Server deleted successfully", "dependenciesInstall": "Install Dependencies", diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json index 0a6d3e9405..3dd47765c1 100644 --- a/src/renderer/src/i18n/locales/ja-jp.json +++ b/src/renderer/src/i18n/locales/ja-jp.json @@ -599,9 +599,8 @@ "delete.confirm.content": "選択した{{count}}件のメッセージを削除しますか？", "delete.failed": "削除に失敗しました", "delete.success": "削除が成功しました", - "error.chunk_overlap_too_large": "チャンクの重なりは、チャンクサイズを超えることはできません", - "empty_url": "画像をダウンロードできません。プロンプトに不適切なコンテンツや禁止用語が含まれている可能性があります", "error.chunk_overlap_too_large": "チャンクのオーバーラップがチャンクサイズより大きくなることはできません", + "empty_url": "画像をダウンロードできません。プロンプトに不適切なコンテンツや禁止用語が含まれている可能性があります", "error.dimension_too_large": "内容のサイズが大きすぎます", "error.enter.api.host": "APIホストを入力してください", "error.enter.api.key": "APIキーを入力してください", @@ -1302,6 +1301,8 @@ "stdio": "標準入力/出力 (stdio)", "inMemory": "メモリ", "config_description": "モデルコンテキストプロトコルサーバーの設定", + "disable": "MCPサーバーを無効にする", + "disable.description": "MCP機能を有効にしない", "deleteError": "サーバーの削除に失敗しました", "deleteSuccess": "サーバーが正常に削除されました", "dependenciesInstall": "依存関係をインストール", diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json index fc1a54c0d0..b5765087b8 100644 --- a/src/renderer/src/i18n/locales/ru-ru.json +++ b/src/renderer/src/i18n/locales/ru-ru.json @@ -885,8 +885,7 @@ "number_images_tip": "Количество увеличенных результатов для генерации", "seed_tip": "Контролирует случайный характер увеличения изображений для воспроизводимых результатов", "magic_prompt_option_tip": "Улучшает увеличение изображений с помощью интеллектуального оптимизирования промптов" - }, - "rendering_speed": "Скорость рендеринга" + } }, "prompts": { "explanation": "Объясните мне этот концепт", @@ -1302,6 +1301,8 @@ "stdio": "Стандартный ввод/вывод (stdio)", "inMemory": "Память", "config_description": "Настройка серверов протокола контекста модели", + "disable": "Отключить сервер MCP", + "disable.description": "Не включать функциональность сервера MCP", "deleteError": "Не удалось удалить сервер", "deleteSuccess": "Сервер успешно удален", "dependenciesInstall": "Установить зависимости", diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json index ce882f6e4c..142683ee8a 100644 --- a/src/renderer/src/i18n/locales/zh-cn.json +++ b/src/renderer/src/i18n/locales/zh-cn.json @@ -1305,6 +1305,8 @@ "stdio": "标准输入/输出 (stdio)", "inMemory": "内存", "config_description": "配置模型上下文协议服务器", + "disable": "不使用 MCP 服务器", + "disable.description": "不启用 MCP 服务功能", "deleteError": "删除服务器失败", "deleteSuccess": "服务器删除成功", "dependenciesInstall": "安装依赖项", diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json index cb670a51c9..f3ee8c49f6 100644 --- a/src/renderer/src/i18n/locales/zh-tw.json +++ b/src/renderer/src/i18n/locales/zh-tw.json @@ -1305,6 +1305,8 @@ "stdio": "標準輸入/輸出 (stdio)", "inMemory": "記憶體", "config_description": "設定模型上下文協議伺服器", + "disable": "不使用 MCP 伺服器", + "disable.description": "不啟用 MCP 服務功能", "deleteError": "刪除伺服器失敗", "deleteSuccess": "伺服器刪除成功", "dependenciesInstall": "安裝相依套件", diff --git a/src/renderer/src/pages/home/Inputbar/MCPToolsButton.tsx b/src/renderer/src/pages/home/Inputbar/MCPToolsButton.tsx index 46d08184ff..e7826b7e20 100644 --- a/src/renderer/src/pages/home/Inputbar/MCPToolsButton.tsx +++ b/src/renderer/src/pages/home/Inputbar/MCPToolsButton.tsx @@ -4,9 +4,8 @@ import { useMCPServers } from '@renderer/hooks/useMCPServers' import { EventEmitter } from '@renderer/services/EventService' import { Assistant, MCPPrompt, MCPResource, MCPServer } from '@renderer/types' import { Form, Input, Tooltip } from 'antd' -import { Plus, SquareTerminal } from 'lucide-react' -import { FC, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react' -import React from 'react' +import { CircleX, Plus, SquareTerminal } from 'lucide-react' +import React, { FC, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' import { useNavigate } from 'react-router' @@ -132,9 +131,6 @@ const MCPToolsButton: FC = ({ ref, setInputValue, resizeTextArea, Toolbar () => activedMcpServers.filter((server) => mcpServers.some((s) => s.id === server.id)), [activedMcpServers, mcpServers] ) - - const buttonEnabled = assistantMcpServers.length > 0 - const handleMcpServerSelect = useCallback( (server: MCPServer) => { if (assistantMcpServers.some((s) => s.id === server.id)) { @@ -156,6 +152,18 @@ const MCPToolsButton: FC = ({ ref, setInputValue, resizeTextArea, Toolbar return () => EventEmitter.off('mcp-server-select', handler) }, []) + const updateMcpEnabled = useCallback( + (enabled: boolean) => { + setTimeout(() => { + updateAssistant({ + ...assistant, + mcpServers: enabled ? assistant.mcpServers || [] : [] + }) + }, 200) + }, + [assistant, updateAssistant] + ) + const menuItems = useMemo(() => { const newList: QuickPanelListItem[] = activedMcpServers.map((server) => ({ label: server.name, @@ -171,8 +179,16 @@ const MCPToolsButton: FC = ({ ref, setInputValue, resizeTextArea, Toolbar action: () => navigate('/settings/mcp') }) + newList.unshift({ + label: t('common.close'), + description: t('settings.mcp.disable.description'), + icon: , + isSelected: !(assistant.mcpServers && assistant.mcpServers.length > 0), + action: () => updateMcpEnabled(false) + }) + return newList - }, [activedMcpServers, t, assistantMcpServers, navigate]) + }, [activedMcpServers, t, assistant.mcpServers, assistantMcpServers, navigate, updateMcpEnabled]) const openQuickPanel = useCallback(() => { quickPanel.open({ @@ -412,10 +428,9 @@ const MCPToolsButton: FC = ({ ref, setInputValue, resizeTextArea, Toolbar }, [activedMcpServers]) const openResourcesList = useCallback(async () => { - const resources = resourcesList quickPanel.open({ title: t('settings.mcp.title'), - list: resources, + list: resourcesList, symbol: 'mcp-resource', multiple: true }) @@ -442,7 +457,10 @@ const MCPToolsButton: FC = ({ ref, setInputValue, resizeTextArea, Toolbar return ( - + 0 ? 'var(--color-primary)' : 'var(--color-icon)'} + /> ) diff --git a/src/renderer/src/pages/home/Inputbar/WebSearchButton.tsx b/src/renderer/src/pages/home/Inputbar/WebSearchButton.tsx index 68838061cf..906c7aa5aa 100644 --- a/src/renderer/src/pages/home/Inputbar/WebSearchButton.tsx +++ b/src/renderer/src/pages/home/Inputbar/WebSearchButton.tsx @@ -6,7 +6,7 @@ import WebSearchService from '@renderer/services/WebSearchService' import { Assistant, WebSearchProvider } from '@renderer/types' import { hasObjectKey } from '@renderer/utils' import { Tooltip } from 'antd' -import { Globe, Settings } from 'lucide-react' +import { CircleX, Globe, Settings } from 'lucide-react' import { FC, memo, useCallback, useImperativeHandle, useMemo } from 'react' import { useTranslation } from 'react-i18next' import { useNavigate } from 'react-router-dom' @@ -85,9 +85,9 @@ const WebSearchButton: FC = ({ ref, assistant, ToolbarButton }) => { }) items.unshift({ - label: t('chat.input.web_search.no_web_search'), + label: t('common.close'), description: t('chat.input.web_search.no_web_search.description'), - icon: , + icon: , isSelected: !assistant.enableWebSearch && !assistant.webSearchProviderId, action: () => { updateSelectedWebSearchProvider(undefined)