bug fix

Author: elecvoid243

astrbot/core/astr_agent_tool_exec.py

@@ -392,6 +392,8 @@ async def _run_subagent():
                     _run_subagent(), timeout=execution_timeout
                 )
             except asyncio.TimeoutError:
+                # 若超时，保存已产生的部分历史
+                cls._save_subagent_history(agent_name, runner_messages, umo)
                 error_msg = f"SubAgent '{agent_name}' execution timeout after {execution_timeout:.1f} seconds."
                 logger.warning(f"[SubAgentTimeout] {error_msg}")
 
@@ -528,7 +530,6 @@ async def _run():
         is_enhanced = cls._is_enhanced_subagent(umo, agent_name)
         if is_enhanced:
             await cls._handle_enhanced_subagent_background_result(
-                cls=cls,
                 umo=umo,
                 agent_name=agent_name,
                 task_id=tool_args.get("subagent_task_id"),
@@ -917,7 +918,9 @@ def _build_background_submission_message(
         original_task_id: str,
         subagent_task_id: str | None,
     ) -> mcp.types.TextContent:
-        if subagent_task_id:
+        if subagent_task_id and not subagent_task_id.startswith(
+            "__PENDING_TASK_CREATE_FAILED__"
+        ):
             return mcp.types.TextContent(
                 type="text",
                 text=(
@@ -969,7 +972,7 @@ def _is_enhanced_subagent(umo: str, agent_name: str | None) -> bool:
             return True
         return False
 
-    @staticmethod
+    @classmethod
     async def _handle_enhanced_subagent_background_result(
         cls,
         *,
@@ -985,8 +988,20 @@ async def _handle_enhanced_subagent_background_result(
     ) -> None:
         from astrbot.core.dynamic_subagent_manager import DynamicSubAgentManager
 
+        success = error_text is None
+        status = "COMPLETED" if success else "FAILED"
         DynamicSubAgentManager.set_subagent_status(
-            session_id=umo, agent_name=agent_name, status="FAILED"
+            session_id=umo, agent_name=agent_name, status=status
+        )
+
+        DynamicSubAgentManager.store_subagent_result(
+            session_id=umo,
+            agent_name=agent_name,
+            success=success,
+            result=result_text,
+            task_id=task_id,
+            error=error_text,
+            execution_time=execution_time,
         )
 
         if not await cls._maybe_wake_main_agent_after_background(
@@ -1020,9 +1035,9 @@ async def _maybe_wake_main_agent_after_background(
                 )
             else:
                 main_agent_is_running = False
-        except Exception as e:  # noqa: BLE001
+        except Exception as e:
             logger.error("Failed to check main agent status: %s", e)
-            main_agent_is_running = True
+            main_agent_is_running = False  # 异常时尝试通知，避免结果丢失
 
         if main_agent_is_running:
             return False

astrbot/core/astr_main_agent.py

@@ -1097,7 +1097,7 @@ def _apply_enhanced_subagent_tools(
                 "max_subagent_history", 500
             ),
             tools_blacklist=config.enhanced_subagent.get("tools_blacklist", None),
-            tools_whitelist=config.enhanced_subagent.get("tools_whitelist", None),
+            tools_inherent=config.enhanced_subagent.get("tools_inherent", None),
             execution_timeout=config.enhanced_subagent.get("execution_timeout", 600),
         )
 
@@ -1122,12 +1122,16 @@ def _apply_enhanced_subagent_tools(
         dynamic_handoffs = DynamicSubAgentManager.get_handoff_tools_for_session(
             session_id
         )
+        # Prevent duplication of name with the original subagent tool
+        existing_names = {t.name for t in req.func_tool.tools}
         for handoff in dynamic_handoffs:
-            req.func_tool.add_tool(handoff)
-
+            if handoff.name not in existing_names:
+                req.func_tool.add_tool(handoff)
+            else:
+                logger.warning(
+                    "[EnhancedSubAgent] Failed to create due to duplicate names between the enhanced sub agent and the original sub agent."
+                )
     except ImportError as e:
-        from astrbot import logger
-
         logger.warning(f"[EnhancedSubAgent] Cannot import module: {e}")