fix: mcp server cannot reload successfully after updating mcp server config

fixes: #3780

astrbot/core/agent/mcp_client.py

@@ -345,9 +345,6 @@ class MCPClient:
 
     async def cleanup(self):
         """Clean up resources including old exit stacks from reconnections"""
-        # Set running_event first to unblock any waiting tasks
-        self.running_event.set()
-
         # Close current exit stack
         try:
             await self.exit_stack.aclose()
@@ -359,6 +356,9 @@ class MCPClient:
         # Just clear the list to release references
         self._old_exit_stacks.clear()
 
+        # Set running_event first to unblock any waiting tasks
+        self.running_event.set()
+
 
 class MCPTool(FunctionTool, Generic[TContext]):
     """A function tool that calls an MCP service."""

astrbot/core/provider/manager.py

@@ -1,7 +1,7 @@
 import asyncio
 import traceback
 
-from astrbot.core import astrbot_config, logger, sp
+from astrbot.core import logger, sp
 from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
 from astrbot.core.db import BaseDatabase
 
@@ -24,7 +24,6 @@ class ProviderManager:
         db_helper: BaseDatabase,
         persona_mgr: PersonaManager,
     ):
-        self.reload_lock = asyncio.Lock()
         self.persona_mgr = persona_mgr
         self.acm = acm
         config = acm.confs["default"]
@@ -227,7 +226,6 @@ class ProviderManager:
 
     async def load_provider(self, provider_config: dict):
         if not provider_config["enable"]:
-            logger.info(f"Provider {provider_config['id']} is disabled, skipping")
             return
         if provider_config.get("provider_type", "") == "agent_runner":
             return
@@ -436,46 +434,40 @@ class ProviderManager:
             )
 
     async def reload(self, provider_config: dict):
-        async with self.reload_lock:
-            await self.terminate_provider(provider_config["id"])
-            if provider_config["enable"]:
-                await self.load_provider(provider_config)
+        await self.terminate_provider(provider_config["id"])
+        if provider_config["enable"]:
+            await self.load_provider(provider_config)
 
-            # 和配置文件保持同步
-            self.providers_config = astrbot_config["provider"]
-            config_ids = [provider["id"] for provider in self.providers_config]
-            logger.info(f"providers in user's config: {config_ids}")
-            for key in list(self.inst_map.keys()):
-                if key not in config_ids:
-                    await self.terminate_provider(key)
+        # 和配置文件保持同步
+        config_ids = [provider["id"] for provider in self.providers_config]
+        logger.debug(f"providers in user's config: {config_ids}")
+        for key in list(self.inst_map.keys()):
+            if key not in config_ids:
+                await self.terminate_provider(key)
 
-            if len(self.provider_insts) == 0:
-                self.curr_provider_inst = None
-            elif self.curr_provider_inst is None and len(self.provider_insts) > 0:
-                self.curr_provider_inst = self.provider_insts[0]
-                logger.info(
-                    f"自动选择 {self.curr_provider_inst.meta().id} 作为当前提供商适配器。",
-                )
+        if len(self.provider_insts) == 0:
+            self.curr_provider_inst = None
+        elif self.curr_provider_inst is None and len(self.provider_insts) > 0:
+            self.curr_provider_inst = self.provider_insts[0]
+            logger.info(
+                f"自动选择 {self.curr_provider_inst.meta().id} 作为当前提供商适配器。",
+            )
 
-            if len(self.stt_provider_insts) == 0:
-                self.curr_stt_provider_inst = None
-            elif (
-                self.curr_stt_provider_inst is None and len(self.stt_provider_insts) > 0
-            ):
-                self.curr_stt_provider_inst = self.stt_provider_insts[0]
-                logger.info(
-                    f"自动选择 {self.curr_stt_provider_inst.meta().id} 作为当前语音转文本提供商适配器。",
-                )
+        if len(self.stt_provider_insts) == 0:
+            self.curr_stt_provider_inst = None
+        elif self.curr_stt_provider_inst is None and len(self.stt_provider_insts) > 0:
+            self.curr_stt_provider_inst = self.stt_provider_insts[0]
+            logger.info(
+                f"自动选择 {self.curr_stt_provider_inst.meta().id} 作为当前语音转文本提供商适配器。",
+            )
 
-            if len(self.tts_provider_insts) == 0:
-                self.curr_tts_provider_inst = None
-            elif (
-                self.curr_tts_provider_inst is None and len(self.tts_provider_insts) > 0
-            ):
-                self.curr_tts_provider_inst = self.tts_provider_insts[0]
-                logger.info(
-                    f"自动选择 {self.curr_tts_provider_inst.meta().id} 作为当前文本转语音提供商适配器。",
-                )
+        if len(self.tts_provider_insts) == 0:
+            self.curr_tts_provider_inst = None
+        elif self.curr_tts_provider_inst is None and len(self.tts_provider_insts) > 0:
+            self.curr_tts_provider_inst = self.tts_provider_insts[0]
+            logger.info(
+                f"自动选择 {self.curr_tts_provider_inst.meta().id} 作为当前文本转语音提供商适配器。",
+            )
 
     def get_insts(self):
         return self.provider_insts

packages/astrbot/long_term_memory.py

@@ -6,7 +6,7 @@ from collections import defaultdict
 from astrbot import logger
 from astrbot.api import star
 from astrbot.api.event import AstrMessageEvent
-from astrbot.api.message_components import Image, Plain
+from astrbot.api.message_components import At, Image, Plain
 from astrbot.api.platform import MessageType
 from astrbot.api.provider import Provider, ProviderRequest
 from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
@@ -142,6 +142,8 @@ class LongTermMemory:
                             logger.error(f"获取图片描述失败: {e}")
                     else:
                         parts.append(" [Image]")
+                elif isinstance(comp, At):
+                    parts.append(f" [At: {comp.name}]")
 
             final_message = "".join(parts)
             logger.debug(f"ltm | {event.unified_msg_origin} | {final_message}")