From 8c4c9d88dafeee147aa657bdc8cf1ddca51abf35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=84=E5=87=A4=E7=A7=91=E6=8A=80?=
 <eric230308@gmail.com>
Date: Mon, 24 Mar 2025 10:28:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BD=91=E7=AB=99=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88mcp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/core/connection.py       |  3 +++
 main/xiaozhi-server/core/mcp/manager.py      |  1 +
 main/xiaozhi-server/mcp_server_settings.json | 19 +++++++++++++++----
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/main/xiaozhi-server/core/connection.py b/main/xiaozhi-server/core/connection.py
index 447c6f8d..4523911a 100644
--- a/main/xiaozhi-server/core/connection.py
+++ b/main/xiaozhi-server/core/connection.py
@@ -208,6 +208,9 @@ class ConnectionHandler:
             self.prompt = self.prompt + f"\nuser location:{self.client_ip_info}"
             self.dialogue.update_system_message(self.prompt)
 
+        """加载MCP工具"""
+        asyncio.run_coroutine_threadsafe(self.mcp_manager.initialize_servers(), self.loop)
+
     def change_system_prompt(self, prompt):
         self.prompt = prompt
         # 找到原来的role==system，替换原来的系统提示
diff --git a/main/xiaozhi-server/core/mcp/manager.py b/main/xiaozhi-server/core/mcp/manager.py
index 810554e7..28efd87d 100644
--- a/main/xiaozhi-server/core/mcp/manager.py
+++ b/main/xiaozhi-server/core/mcp/manager.py
@@ -62,6 +62,7 @@ class MCPManager:
 
             except Exception as e:
                 self.logger.bind(tag=TAG).error(f"Failed to initialize MCP server {name}: {e}")
+        self.conn.func_handler.upload_functions_desc()
 
     def get_all_tools(self) -> List[Dict[str, Any]]:
         """获取所有服务的工具function定义
diff --git a/main/xiaozhi-server/mcp_server_settings.json b/main/xiaozhi-server/mcp_server_settings.json
index 7e4dd5d2..a38bbdfb 100644
--- a/main/xiaozhi-server/mcp_server_settings.json
+++ b/main/xiaozhi-server/mcp_server_settings.json
@@ -1,20 +1,31 @@
 {
+  "des": [
+    "在data目录下创建.mcp_server_settings.json文件，可以选择下面的MCP服务，也可以自行添加新的MCP服务。",
+    "后面不断测试补充好用的mcp服务，欢迎大家一起补充。",
+    "记得删除注释行,des属性仅为说明,不会被解析。",
+    "des和link属性，仅为说明安装方式，方便大家查看原始链接，不是必须项。"
+  ],
   "mcpServers": {
     "filesystem": {
       "command": "npx",
       "args": [
         "-y",
         "@modelcontextprotocol/server-filesystem",
+        "/Users/username/Desktop",
         "/path/to/other/allowed/dir"
-      ]
+      ],
+      "link":"https://github.com/modelcontextprotocol/servers/tree/main/src/filesystem"
     },
-    "puppeteer": {
+    "playwright": {
       "command": "npx",
-      "args": ["-y", "@modelcontextprotocol/server-puppeteer"]
+      "args": ["-y", "@executeautomation/playwright-mcp-server"],
+      "des" : "run 'npx playwright install' first",
+      "link": "https://github.com/executeautomation/mcp-playwright"
     },
     "windows-cli": {
       "command": "npx",
-      "args": ["-y", "@simonb97/server-win-cli"]
+      "args": ["-y", "@simonb97/server-win-cli"],
+      "link": "https://github.com/SimonB97/win-cli-mcp-server"
     }
   }
 }