no message

Author: elecvoid243

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
@@ -1506,12 +1507,7 @@ def _resolve_dynamic_subagent_tool(self, func_tool_name: str):
         if not session_id:
             return None
 
-        try:
-            from astrbot.core.subagent_manager import SubAgentManager
-
-            dynamic_handoffs = SubAgentManager.get_handoff_tools_for_session(session_id)
-        except Exception:
-            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:
@@ -1538,13 +1534,7 @@ def _maybe_register_dynamic_tool_from_result(self, result_content: str) -> None:
         if not session_id:
             return
 
-        try:
-            from astrbot.core.subagent_manager import SubAgentManager
-
-            handoffs = SubAgentManager.get_handoff_tools_for_session(session_id)
-        except Exception as e:
-            logger.warning(f"[SubAgent] Failed to load dynamic handoffs: {e}")
-            return
+        handoffs = SubAgentManager.get_handoff_tools_for_session(session_id)
 
         for handoff in handoffs:
             if (

astrbot/core/astr_agent_tool_exec.py

@@ -31,6 +31,7 @@
 from astrbot.core.platform.message_session import MessageSession
 from astrbot.core.provider.entites import ProviderRequest
 from astrbot.core.provider.register import llm_tools
+from astrbot.core.subagent_manager import SubAgentManager
 from astrbot.core.tools.computer_tools import (
     CuaKeyboardTypeTool,
     CuaMouseClickTool,
@@ -823,8 +824,6 @@ async def _execute_mcp(
     def _load_subagent_history(
         umo: str, tool: HandoffTool
     ) -> tuple[list[Message], str]:
-        from astrbot.core.subagent_manager import SubAgentManager
-
         agent_name = getattr(tool.agent, "name", None)
         subagent_history = []
         if agent_name:
@@ -871,8 +870,6 @@ def _build_subagent_system_prompt(
             f"# Role\nYour name is {agent_name}(used for tool calling)\n{base}\n"
         )
         if agent_name:
-            from astrbot.core.subagent_manager import SubAgentManager
-
             runtime = prov_settings.get("computer_use_runtime", "local")
             static_subagent_prompt = SubAgentManager.build_static_subagent_prompts(
                 umo, agent_name
@@ -889,8 +886,6 @@ def _save_subagent_history(
         umo: str, runner_messages: list[Message], agent_name: str
     ) -> None:
         if agent_name and runner_messages:
-            from astrbot.core.subagent_manager import SubAgentManager
-
             # 仅在历史功能启用时保存历史
             if SubAgentManager.is_history_enabled():
                 SubAgentManager.update_subagent_history(
@@ -908,8 +903,6 @@ def _register_subagent_task(umo: str, agent_name: str | None) -> str | None:
         if not agent_name:
             return None
         try:
-            from astrbot.core.subagent_manager import SubAgentManager
-
             session = SubAgentManager.get_session(umo)
             if session and (agent_name in session.subagents):
                 subagent_task_id = SubAgentManager.create_pending_subagent_task(
@@ -967,8 +960,6 @@ def _build_background_submission_message(
     @staticmethod
     def _get_subagent_execution_timeout() -> float:
         try:
-            from astrbot.core.subagent_manager import SubAgentManager
-
             return SubAgentManager.get_execution_timeout()
         except Exception:
             return -1
@@ -978,8 +969,6 @@ def _handle_subagent_timeout(
         umo: str,
         agent_name: str,
     ) -> None:
-        from astrbot.core.subagent_manager import SubAgentManager
-
         SubAgentManager.set_subagent_status(
             session_id=umo,
             agent_name=agent_name,
@@ -988,8 +977,6 @@ def _handle_subagent_timeout(
 
     @staticmethod
     def _is_managed_subagent(umo: str, agent_name: str | None) -> bool:
-        from astrbot.core.subagent_manager import SubAgentManager
-
         if not agent_name:
             return False
         session = SubAgentManager.get_session(umo)
@@ -1011,8 +998,6 @@ async def _handle_subagent_background_result(
         tool: HandoffTool,
         tool_args: dict,
     ) -> None:
-        from astrbot.core.subagent_manager import SubAgentManager
-
         success = error_text is None
         status = "COMPLETED" if success else "FAILED"
         SubAgentManager.set_subagent_status(

astrbot/core/subagent_manager.py

@@ -19,6 +19,7 @@
 from astrbot.core.agent.agent import Agent
 from astrbot.core.agent.handoff import HandoffTool
 from astrbot.core.agent.tool import FunctionTool
+from astrbot.core.astr_main_agent import _get_workspace_path_for_umo
 from astrbot.core.utils.astrbot_path import get_astrbot_temp_path
 
 
@@ -220,7 +221,6 @@ def configure(
             cls._tools_blacklist = {
                 "send_shared_context_for_main_agent",
                 "create_subagent",
-                "stop_subagent",
                 "protect_subagent",
                 "unprotect_subagent",
                 "reset_subagent",
@@ -337,7 +337,7 @@ def update_subagent_history(
                 filtered_messages.append(msg)
 
         session.subagent_histories[agent_name].extend(filtered_messages)
-        if cls._subagent_history_maxlen > len(session.subagent_histories[agent_name]):
+        if len(session.subagent_histories[agent_name]) > cls._subagent_history_maxlen:
             session.subagent_histories[agent_name] = session.subagent_histories[
                 agent_name
             ][-cls._subagent_history_maxlen :]
@@ -1295,13 +1295,11 @@ async def call(self, context, **kwargs) -> str:
         tools = kwargs.get("tools", {})
         skills = kwargs.get("skills", {})
         workdir = kwargs.get("workdir")
-        # 检查工作路径是否非法
-        if workdir is not None and self._check_path_safety(workdir):
-            pass
-        else:
-            workdir = get_astrbot_temp_path()
 
         session_id = context.context.event.unified_msg_origin
+        # 工作路径如果非法，回退到该session的默认工作路径
+        if workdir is None or (not self._check_path_safety(workdir)):
+            workdir = _get_workspace_path_for_umo(session_id)
         config = SubAgentConfig(
             name=name,
             system_prompt=system_prompt,