resolve: merge upstream/main into feature/mcp-exit-fix and fix conflicts

2026-07-29 09:03:55 +08:00 · 2025-05-07 00:39:21 +08:00
parent 0a765f4aac 48e890c1b1
commit 1bb8fbd56f
4 changed files with 41 additions and 60 deletions
@@ -50,9 +50,9 @@ class MCPManager:
        """初始化所有MCP服务"""
        config = self.load_config()
        for name, srv_config in config.items():
-            if not srv_config.get("command"):
+            if not srv_config.get("command") and not srv_config.get("url"):
                self.logger.bind(tag=TAG).warning(
-                    f"Skipping server {name}: command not specified"
+                    f"Skipping server {name}: neither command nor url specified"
                )
                continue