后台subagent任务：若主agent已结束，回退到原始唤醒机制

Author: elecvoid243

astrbot/core/astr_agent_context.py

@@ -14,7 +14,7 @@ class AstrAgentContext:
     """The star context instance"""
     event: AstrMessageEvent
     """The message event associated with the agent context."""
-    extra: dict[str, str] = Field(default_factory=dict)
+    extra: dict[str, any] = Field(default_factory=dict)
     """Customized extra data."""
 
 

astrbot/core/astr_agent_tool_exec.py

@@ -28,6 +28,7 @@
     PYTHON_TOOL,
 )
 from astrbot.core.cron.events import CronMessageEvent
+from astrbot.core.dynamic_subagent_manager import DynamicSubAgentManager
 from astrbot.core.message.components import Image
 from astrbot.core.message.message_event_result import (
     CommandResult,
@@ -281,7 +282,6 @@ async def _execute_handoff(
 
         # Build handoff toolset from registered tools plus runtime computer tools.
         toolset = cls._build_handoff_toolset(run_context, tool.agent.tools)
-
         ctx = run_context.context.context
         event = run_context.context.event
         umo = event.unified_msg_origin
@@ -342,13 +342,13 @@ async def _execute_handoff(
         prov_settings: dict = ctx.get_config(umo=umo).get("provider_settings", {})
         agent_max_step = int(prov_settings.get("max_agent_step", 30))
         stream = prov_settings.get("streaming_response", False)
+
         # 如果有历史上下文，合并到 contexts 中
         if subagent_history:
             if contexts is None:
                 contexts = subagent_history
             else:
                 contexts = subagent_history + contexts
-
         # 构建子代理的 system_prompt，添加 skills 提示词和公共上下文
         subagent_system_prompt = tool.agent.instructions or ""
         subagent_system_prompt = f"# Role\nYour name is {agent_name}(used for tool calling)\n{subagent_system_prompt}\n"
@@ -439,17 +439,21 @@ async def _execute_handoff_background(
     ):
         """Execute a handoff as a background task.
 
+        Immediately yields a success response with a task_id, then runs
+        the subagent asynchronously.  When the subagent finishes, a
+        ``CronMessageEvent`` is created so the main LLM can inform the
+        user of the result – the same pattern used by
+        ``_execute_background`` for regular background tasks.
+
         当启用增强SubAgent时，会在 DynamicSubAgentManager 中创建 pending 任务，
         并返回 task_id 给主 Agent，以便后续通过 wait_for_subagent 获取结果。
         """
         event = run_context.context.event
         umo = event.unified_msg_origin
         agent_name = getattr(tool.agent, "name", None)
 
-        # 生成 subagent_task_id（用于 DynamicSubAgentManager）
+        # check if enhanced subAgent
         subagent_task_id = None
-
-        # 检查是否启用增强版 SubAgent
         try:
             from astrbot.core.dynamic_subagent_manager import DynamicSubAgentManager
 
@@ -463,7 +467,9 @@ async def _execute_handoff_background(
                     )
 
                     if subagent_task_id.startswith("__PENDING_TASK_CREATE_FAILED__"):
-                        logger.info(subagent_task_id)
+                        logger.info(
+                            f"[EnhancedSubAgent] Failed to created background task {subagent_task_id} for {agent_name}"
+                        )
                     else:
                         DynamicSubAgentManager.set_subagent_status(
                             session_id=umo,
@@ -475,9 +481,10 @@ async def _execute_handoff_background(
                             f"[EnhancedSubAgent] Created background task {subagent_task_id} for {agent_name}"
                         )
         except Exception as e:
-            logger.info(f"[EnhancedSubAgent] Failed to create pending task: {e}")
+            logger.info(
+                f"[EnhancedSubAgent] Failed to created background task {subagent_task_id} for {agent_name}: {e}"
+            )
 
-        # 生成原始的 task_id（用于唤醒机制等）
         original_task_id = uuid.uuid4().hex
 
         async def _run_handoff_in_background() -> None:
@@ -498,7 +505,6 @@ async def _run_handoff_in_background() -> None:
 
         asyncio.create_task(_run_handoff_in_background())
 
-        # 构建返回消息
         if subagent_task_id:
             text_content = mcp.types.TextContent(
                 type="text",
@@ -565,26 +571,12 @@ async def _do_handoff_background(
 
         execution_time = time.time() - start_time
         success = error_text is None
-
-        enhanced_subagent_enabled = False
-        try:
-            from astrbot.core.dynamic_subagent_manager import DynamicSubAgentManager
-
-            session = DynamicSubAgentManager.get_session(umo)
-            if session and agent_name:
-                # 检查是否是动态创建的 SubAgent
-                if agent_name in session.subagents:
-                    enhanced_subagent_enabled = True
-        except Exception:
-            session = None
-
-        subagent_task_id = tool_args.get("subagent_task_id", None)
-
-        if enhanced_subagent_enabled and session and agent_name and subagent_task_id:
-            # 如果增强版subagent正在运行：存储结果到 DynamicSubAgentManager，使得主Agent可以访问
-            try:
-                from astrbot.core.dynamic_subagent_manager import DynamicSubAgentManager
-
+        session = DynamicSubAgentManager.get_session(umo)
+        if session and agent_name:
+            # if it is enhanced subagent
+            if agent_name in session.subagents:
+                subagent_task_id = tool_args.get("subagent_task_id", None)
+                # store the results of background enhanced subagent task
                 DynamicSubAgentManager.store_subagent_result(
                     session_id=umo,
                     agent_name=agent_name,
@@ -594,6 +586,7 @@ async def _do_handoff_background(
                     error=error_text,
                     execution_time=execution_time,
                 )
+                # update subagent status
                 if error_text:
                     DynamicSubAgentManager.set_subagent_status(
                         session_id=umo,
@@ -607,48 +600,47 @@ async def _do_handoff_background(
                         status="COMPLETED",
                     )
 
-                # 如果启用了 shared_context，发布完成状态
+                # if shared_context is enabled, publish status
                 if session.shared_context_enabled:
-                    status_content = f" SubAgent '{agent_name}' 任务'{subagent_task_id}'完成，耗时 {execution_time:.1f}s"
+                    status_content = f"[EnhancedSubAgent] SubAgent '{agent_name}' Task '{subagent_task_id}' Complete. Execution Time: {execution_time:.1f}s"
                     if error_text:
-                        status_content = f" SubAgent '{agent_name}' 任务'{subagent_task_id}' 失败: {error_text}"
-
+                        status_content = f"[EnhancedSubAgent] SubAgent '{agent_name}' Task '{subagent_task_id}' Failed: {error_text}"
                     DynamicSubAgentManager.add_shared_context(
                         session_id=umo,
                         sender=agent_name,
                         context_type="status",
                         content=status_content,
                         target="all",
                     )
-
                 logger.info(
                     f"[EnhancedSubAgent] Stored result for {agent_name} task {subagent_task_id}: "
                     f"success={success}, time={execution_time:.1f}s"
                 )
 
-            except Exception as e:
-                logger.error(
-                    f"[EnhancedSubAgent] Failed to store result for {agent_name}: {e}"
-                )
-                # 存储失败时，回退到原有的唤醒机制
-                await cls._wake_main_agent_for_background_result(
-                    run_context=run_context,
-                    task_id=task_id,
-                    tool_name=tool.name,
-                    result_text=result_text,
-                    tool_args=tool_args,
-                    note=(
-                        event.get_extra("background_note")
-                        or f"Background task for subagent '{agent_name}' finished."
-                    ),
-                    summary_name=f"Dedicated to subagent `{agent_name}`",
-                    extra_result_fields={
-                        "subagent_name": agent_name,
-                        "subagent_task_id": subagent_task_id,
-                    },
-                )
+                try:
+                    context_extra = getattr(run_context.context, "extra", None)
+                    main_agent_runner = context_extra.get("main_agent_runner", None)
+                    main_agent_is_running = not main_agent_runner.done()
+                except Exception as e:
+                    logger.error("get main agent failed:", e)
+                    main_agent_is_running = False
+
+                # Inform user through _wake_main_agent_for_background_result if main agent is over
+                if not main_agent_is_running:
+                    await cls._wake_main_agent_for_background_result(
+                        run_context=run_context,
+                        task_id=task_id,
+                        tool_name=tool.name,
+                        result_text=result_text,
+                        tool_args=tool_args,
+                        note=(
+                            event.get_extra("background_note")
+                            or f"Background task for subagent '{agent_name}' finished."
+                        ),
+                        summary_name=f"Dedicated to subagent `{agent_name}`",
+                        extra_result_fields={"subagent_name": agent_name},
+                    )
         else:
-            # 未开启增强subagent：使用原有的唤醒机制
             await cls._wake_main_agent_for_background_result(
                 run_context=run_context,
                 task_id=task_id,

astrbot/core/astr_main_agent.py

@@ -1449,8 +1449,7 @@ async def build_main_agent(
 
     agent_runner = AgentRunner()
     astr_agent_ctx = AstrAgentContext(
-        context=plugin_context,
-        event=event,
+        context=plugin_context, event=event, extra={"main_agent_runner": agent_runner}
     )
 
     if config.add_cron_tools:

astrbot/core/dynamic_subagent_manager.py

@@ -25,8 +25,8 @@
 class DynamicSubAgentConfig:
     name: str
     system_prompt: str = ""
-    tools: list | None = None
-    skills: list | None = None
+    tools: set | None = None
+    skills: set | None = None
     provider_id: str | None = None
     description: str = ""
     workdir: str | None = None
@@ -650,7 +650,7 @@ def set_subagent_status(cls, session_id: str, agent_name: str, status: str) -> N
 
     @classmethod
     def get_session(cls, session_id: str) -> DynamicSubAgentSession | None:
-        return cls._sessions.get(session_id)
+        return cls._sessions.get(session_id, None)
 
     @classmethod
     def get_or_create_session(cls, session_id: str) -> DynamicSubAgentSession:
@@ -685,20 +685,19 @@ async def create_subagent(
         # When shared_context is enabled, the send_shared_context tool is allocated regardless of whether the main agent allocates the tool to the subagent
         if session.shared_context_enabled:
             if config.tools is None:
-                config.tools = []
-            if "send_shared_context_for_main_agent" in config.tools:
-                config.tools.remove("send_shared_context_for_main_agent")
-            config.tools.append("send_shared_context")
+                config.tools = {}
+            config.tools.discard("send_shared_context_for_main_agent")
+            config.tools.add("send_shared_context")
         if "astrbot_execute_python" not in config.tools:
-            config.tools.append("astrbot_execute_python")
+            config.tools.add("astrbot_execute_python")
         if "astrbot_execute_shell" not in config.tools:
-            config.tools.append("astrbot_execute_shell")
+            config.tools.add("astrbot_execute_shell")
 
         session.subagents[config.name] = config
         agent = Agent(
             name=config.name,
             instructions=config.system_prompt,
-            tools=config.tools,
+            tools=list(config.tools),
         )
         handoff_tool = HandoffTool(
             agent=agent,
@@ -1246,7 +1245,6 @@ async def call(self, context, **kwargs) -> str:
         tools = kwargs.get("tools")
         skills = kwargs.get("skills")
         workdir = kwargs.get("workdir")
-
         # 检查工作路径是否非法
         if not self._check_path_safety(workdir):
             workdir = get_astrbot_temp_path()
@@ -1255,8 +1253,8 @@ async def call(self, context, **kwargs) -> str:
         config = DynamicSubAgentConfig(
             name=name,
             system_prompt=system_prompt,
-            tools=tools,
-            skills=skills,
+            tools=set(tools),
+            skills=set(skills),
             workdir=workdir,
         )