feat: subagent功能增强

astrbot/builtin_stars/builtin_commands/commands/conversation.py

@@ -189,6 +189,18 @@ async def reset(self, message: AstrMessageEvent) -> None:
 
         ret = "✅ Conversation reset successfully."
 
+        # 清理该会话下的所有 subagent
+        try:
+            from astrbot.core.subagent_manager import SubAgentManager
+
+            cleanup_result = await SubAgentManager.cleanup_session(umo)
+            if cleanup_result["status"] == "cleaned":
+                cleaned_count = len(cleanup_result["cleaned_agents"])
+                if cleaned_count > 0:
+                    ret += f" 🧹 Also cleaned {cleaned_count} subagent(s): {', '.join(cleanup_result['cleaned_agents'])}."
+        except Exception as e:
+            logger.warning(f"[SubAgent] Failed to cleanup subagents on /reset: {e}")
+
         message.set_extra("_clean_ltm_session", True)
 
         message.set_result(MessageEventResult().message(ret))

astrbot/core/agent/runners/tool_loop_agent_runner.py

@@ -47,6 +47,7 @@
     sanitize_contexts_by_modalities,
 )
 from astrbot.core.provider.provider import Provider
+from astrbot.core.subagent_manager import SubAgentManager
 
 from ..context.compressor import ContextCompressor
 from ..context.config import ContextConfig
@@ -1010,6 +1011,22 @@ def _append_tool_call_result(tool_call_id: str, content: str) -> None:
                 if not req.func_tool:
                     return
 
+                # Prefer dynamic tools when available
+                func_tool = self._resolve_dynamic_subagent_tool(func_tool_name)
+
+                # If not found in dynamic tools, check regular tool sets
+                if func_tool is None:
+                    if (
+                        self.tool_schema_mode == "skills_like"
+                        and self._skill_like_raw_tool_set
+                    ):
+                        # in 'skills_like' mode, raw.func_tool is light schema, does not have handler
+                        # so we need to get the tool from the raw tool set
+                        func_tool = self._skill_like_raw_tool_set.get_tool(
+                            func_tool_name
+                        )
+                    else:
+                        func_tool = req.func_tool.get_tool(func_tool_name)
                 if (
                     self.tool_schema_mode == "skills_like"
                     and self._skill_like_raw_tool_set
@@ -1140,6 +1157,12 @@ def _append_tool_call_result(tool_call_id: str, content: str) -> None:
                                         "The tool has returned a data type that is not supported."
                                     )
                         if result_parts:
+                            result_content = "\n\n".join(result_parts)
+                            # Check for dynamic tool creation marker
+                            self._maybe_register_dynamic_tool_from_result(
+                                result_content
+                            )
+
                             inline_result = "\n\n".join(result_parts)
                             inline_result = await self._materialize_large_tool_result(
                                 tool_call_id=func_tool_id,
@@ -1348,13 +1371,16 @@ async def _finalize_aborted_step(
         llm_resp: LLMResponse | None = None,
     ) -> AgentResponse:
         logger.info("Agent execution was requested to stop by user.")
+
         if llm_resp is None:
             llm_resp = LLMResponse(role="assistant", completion_text="")
+
         if llm_resp.role != "assistant":
             llm_resp = LLMResponse(
                 role="assistant",
                 completion_text=self.USER_INTERRUPTION_MESSAGE,
             )
+
         self.final_llm_resp = llm_resp
         self._aborted = True
         self._transition_state(AgentState.DONE)
@@ -1431,3 +1457,55 @@ async def _iter_tool_executor_results(
                     abort_task.cancel()
                     with suppress(asyncio.CancelledError):
                         await abort_task
+
+    def _resolve_dynamic_subagent_tool(self, func_tool_name: str):
+        run_context_context = getattr(self.run_context, "context", None)
+        if run_context_context is None:
+            return None
+
+        event = getattr(run_context_context, "event", None)
+        if event is None:
+            return None
+
+        session_id = getattr(event, "unified_msg_origin", None)
+        if not session_id:
+            return None
+
+        dynamic_handoffs = SubAgentManager.get_handoff_tools_for_session(session_id)
+
+        for h in dynamic_handoffs:
+            if h.name == func_tool_name or f"transfer_to_{h.name}" == func_tool_name:
+                return h
+        return None
+
+    def _maybe_register_dynamic_tool_from_result(self, result_content: str) -> None:
+        if not result_content.startswith("__DYNAMIC_TOOL_CREATED__:"):
+            return
+
+        parts = result_content.split(":", 3)
+        if len(parts) < 4:
+            return
+
+        new_tool_name = parts[1]
+        new_tool_obj_name = parts[2]
+        logger.info(f"[SubAgent] Tool created: {new_tool_name}")
+
+        run_context_context = getattr(self.run_context, "context", None)
+        event = (
+            getattr(run_context_context, "event", None) if run_context_context else None
+        )
+        session_id = getattr(event, "unified_msg_origin", None) if event else None
+        if not session_id:
+            return
+
+        handoffs = SubAgentManager.get_handoff_tools_for_session(session_id)
+
+        for handoff in handoffs:
+            if (
+                handoff.name == new_tool_obj_name
+                or handoff.name == new_tool_name.replace("transfer_to_", "")
+            ):
+                if self.req.func_tool:
+                    self.req.func_tool.add_tool(handoff)
+                logger.info(f"[SubAgent] Added {handoff.name} to func_tool set")
+                break

astrbot/core/astr_agent_context.py

@@ -1,3 +1,5 @@
+from typing import Any
+
 from pydantic import Field
 from pydantic.dataclasses import dataclass
 
@@ -14,7 +16,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."""