no message

Author: elecvoid243

astrbot/core/astr_agent_tool_exec.py

@@ -236,7 +236,11 @@ def _build_handoff_toolset(
 
         # Always add send_public_context tool for shared context feature
         try:
-            from astrbot.core.dynamic_subagent_manager import DynamicSubAgentManager, SEND_PUBLIC_CONTEXT_TOOL
+            from astrbot.core.dynamic_subagent_manager import (
+                DynamicSubAgentManager,
+                SEND_PUBLIC_CONTEXT_TOOL,
+            )
+
             session_id = event.unified_msg_origin
             session = DynamicSubAgentManager.get_session(session_id)
             if session and session.shared_context_enabled:
@@ -302,25 +306,32 @@ async def _execute_handoff(
                 except Exception:
                     continue
 
-        # 获取受保护子代理的历史上下文
-        agent_name = getattr(tool.agent, 'name', None)
+        # 获取受保护subagent的历史上下文
+        agent_name = getattr(tool.agent, "name", None)
         subagent_history = []
         if agent_name:
             try:
                 from astrbot.core.dynamic_subagent_manager import DynamicSubAgentManager
-                stored_history = DynamicSubAgentManager.get_subagent_history(umo, agent_name)
+
+                stored_history = DynamicSubAgentManager.get_subagent_history(
+                    umo, agent_name
+                )
                 if stored_history:
                     # 将历史消息转换为 Message 对象
                     for hist_msg in stored_history:
                         try:
                             if isinstance(hist_msg, dict):
-                                subagent_history.append(Message.model_validate(hist_msg))
+                                subagent_history.append(
+                                    Message.model_validate(hist_msg)
+                                )
                             elif isinstance(hist_msg, Message):
                                 subagent_history.append(hist_msg)
                         except Exception:
                             continue
                     if subagent_history:
-                        logger.info(f"[SubAgentHistory] Loaded {len(subagent_history)} history messages for {agent_name}")
+                        logger.info(
+                            f"[SubAgentHistory] Loaded {len(subagent_history)} history messages for {agent_name}"
+                        )
             except Exception:
                 pass
 
@@ -335,27 +346,31 @@ async def _execute_handoff(
             else:
                 contexts = subagent_history + contexts
 
-        # 构建子代理的 system_prompt，添加 skills 提示词和公共上下文
+        # 构建subagent的 system_prompt，添加 skills 提示词和公共上下文
         subagent_system_prompt = tool.agent.instructions or ""
         if agent_name:
             try:
                 from astrbot.core.dynamic_subagent_manager import DynamicSubAgentManager
 
                 # 注入 skills
                 runtime = prov_settings.get("computer_use_runtime", "local")
-                skills_prompt = DynamicSubAgentManager.build_subagent_skills_prompt(umo, agent_name, runtime)
+                skills_prompt = DynamicSubAgentManager.build_subagent_skills_prompt(
+                    umo, agent_name, runtime
+                )
                 if skills_prompt:
                     subagent_system_prompt += f"\n\n# Available Skills\n{skills_prompt}"
                     logger.info(f"[SubAgentSkills] Injected skills for {agent_name}")
 
                 # 注入公共上下文
-                shared_context_prompt = DynamicSubAgentManager.build_shared_context_prompt(umo, agent_name)
+                shared_context_prompt = (
+                    DynamicSubAgentManager.build_shared_context_prompt(umo, agent_name)
+                )
                 if shared_context_prompt:
                     subagent_system_prompt += f"\n{shared_context_prompt}"
-                    logger.info(f"[SubAgentSharedContext] Injected shared context for {agent_name}")
+                    logger.info(
+                        f"[SubAgentSharedContext] Injected shared context for {agent_name}"
+                    )
 
-                # 注入发送公共上下文的工具给子代理
-                from astrbot.core.dynamic_subagent_manager import SEND_PUBLIC_CONTEXT_TOOL
             except Exception:
                 pass
 
@@ -372,23 +387,27 @@ async def _execute_handoff(
             stream=stream,
         )
 
-        # 保存受保护子代理的历史上下文
+        # 保存受保护subagent的历史上下文
         try:
             from astrbot.core.dynamic_subagent_manager import DynamicSubAgentManager
-            agent_name = getattr(tool.agent, 'name', None)
+
+            agent_name = getattr(tool.agent, "name", None)
             if agent_name:
-                history = DynamicSubAgentManager.get_subagent_history(umo, agent_name)
                 # 构建当前对话的历史消息
                 history_messages = []
                 if contexts:
                     history_messages.extend(contexts)
                 # 添加用户输入
                 history_messages.append({"role": "user", "content": input_})
                 # 添加助手回复
-                history_messages.append({"role": "assistant", "content": llm_resp.completion_text})
+                history_messages.append(
+                    {"role": "assistant", "content": llm_resp.completion_text}
+                )
                 # 保存历史
                 if history_messages:
-                    DynamicSubAgentManager.save_subagent_history(umo, agent_name, history_messages)
+                    DynamicSubAgentManager.save_subagent_history(
+                        umo, agent_name, history_messages
+                    )
         except Exception:
             pass  # 不影响主流程
 

astrbot/core/astr_main_agent.py

@@ -145,6 +145,8 @@ class MainAgentBuildConfig:
     """Maximum number of images injected from quoted-message fallback extraction."""
     enhanced_subagent: dict = field(default_factory=dict)
     """Log level for enhanced SubAgent: info or debug."""
+
+
 @dataclass(slots=True)
 class MainAgentBuildResult:
     agent_runner: AgentRunner
@@ -939,7 +941,7 @@ def _apply_enhanced_subagent_tools(
     2. Register dynamic SubAgent management tools
     3. Register session's transfer_to_xxx tools
     """
-    if not config.enhanced_subagent.get('enabled', False):
+    if not config.enhanced_subagent.get("enabled", False):
         return
 
     if req.func_tool is None:
@@ -957,6 +959,7 @@ def _apply_enhanced_subagent_tools(
             DynamicSubAgentManager,
         )
         from astrbot.core.subagent_logger import SubAgentLogger
+
         # Register dynamic SubAgent management tools
         req.func_tool.add_tool(CREATE_DYNAMIC_SUBAGENT_TOOL)
         req.func_tool.add_tool(CLEANUP_DYNAMIC_SUBAGENT_TOOL)
@@ -967,20 +970,26 @@ def _apply_enhanced_subagent_tools(
         req.func_tool.add_tool(SEND_PUBLIC_CONTEXT_TOOL)
 
         # Configure logger
-        SubAgentLogger.configure(level=config.enhanced_subagent.get('log_level'))
+        SubAgentLogger.configure(level=config.enhanced_subagent.get("log_level"))
 
         # Configure DynamicSubAgentManager with settings
-        shared_context_enabled = config.enhanced_subagent.get('shared_context_enabled', False)
+        shared_context_enabled = config.enhanced_subagent.get(
+            "shared_context_enabled", False
+        )
         DynamicSubAgentManager.configure(
-            max_subagent_count=config.enhanced_subagent.get('max_subagent_count'),
-            auto_cleanup_per_turn=config.enhanced_subagent.get('auto_cleanup_per_turn'),
+            max_subagent_count=config.enhanced_subagent.get("max_subagent_count"),
+            auto_cleanup_per_turn=config.enhanced_subagent.get("auto_cleanup_per_turn"),
             shared_context_enabled=shared_context_enabled,
-            shared_context_maxlen=config.enhanced_subagent.get('shared_context_maxlen', 200)
+            shared_context_maxlen=config.enhanced_subagent.get(
+                "shared_context_maxlen", 200
+            ),
         )
 
         # Enable shared context if configured
         if shared_context_enabled:
-            DynamicSubAgentManager.set_shared_context_enabled(event.unified_msg_origin, True)
+            DynamicSubAgentManager.set_shared_context_enabled(
+                event.unified_msg_origin, True
+            )
 
         # Inject enhanced system prompt
         enhanced_prompt = DynamicSubAgentManager.ENHANCED_SUBAGENT_SYSTEM_PROMPT
@@ -995,19 +1004,23 @@ def _apply_enhanced_subagent_tools(
                     req.func_tool.add_tool(tool)
         # Register dynamically created handoff tools
         session_id = event.unified_msg_origin
-        dynamic_handoffs = DynamicSubAgentManager.get_handoff_tools_for_session(session_id)
+        dynamic_handoffs = DynamicSubAgentManager.get_handoff_tools_for_session(
+            session_id
+        )
         for handoff in dynamic_handoffs:
             req.func_tool.add_tool(handoff)
 
-        # Check if we should cleanup subagents from previous turn
-        # This is done at the START of a new turn to clean up from previous turn
+            # Check if we should cleanup subagents from previous turn
+            # This is done at the START of a new turn to clean up from previous turn
             try:
                 DynamicSubAgentManager.cleanup_session_turn_start(session_id)
             except Exception as e:
                 from astrbot import logger
+
                 logger.warning(f"[EnhancedSubAgent] Cleanup failed: {e}")
     except ImportError as e:
         from astrbot import logger
+
         logger.warning(f"[EnhancedSubAgent] Cannot import module: {e}")
 
 

astrbot/core/config/default.py

@@ -202,7 +202,7 @@
         "max_subagent_count": 3,
         "auto_cleanup_per_turn": True,
         "shared_context_enabled": False,
-        "shared_context_maxlen": 200
+        "shared_context_maxlen": 200,
     },
     "provider_stt_settings": {
         "enable": False,