Merge branch 'master' into bot_manager

agent/prompt_loader.py

@@ -223,7 +223,7 @@ async def load_mcp_settings_async(config) -> List[Dict]:
     if merged_settings and len(merged_settings) > 0:
         mcp_servers = merged_settings[0].get('mcpServers', {})
         for server_name, server_config in mcp_servers.items():
-            if isinstance(server_config, dict):
+            if isinstance(server_config, dict) and 'command' in server_config:
                 # 如果还没有env字段，则创建一个
                 if 'env' not in server_config:
                     server_config['env'] = {}