formatting

Author: elecvoid243

astrbot/core/agent/runners/tool_loop_agent_runner.py

@@ -1123,10 +1123,12 @@ def _append_tool_call_result(tool_call_id: str, content: str) -> None:
                                         )
                             else:
                                 inline_result = "\n\n".join(result_parts)
-                                inline_result = await self._materialize_large_tool_result(
-                                tool_call_id=func_tool_id,
-                                content=inline_result,
-                            )
+                                inline_result = (
+                                    await self._materialize_large_tool_result(
+                                        tool_call_id=func_tool_id,
+                                        content=inline_result,
+                                    )
+                                )
                             _append_tool_call_result(
                                 func_tool_id,
                                 inline_result

astrbot/core/astr_agent_tool_exec.py

@@ -423,13 +423,14 @@ async def _execute_handoff(
             max_steps=agent_max_step,
             tool_call_timeout=run_context.tool_call_timeout,
             stream=stream,
-            return_runner_messages=True
+            return_runner_messages=True,
         )
 
         # 保存历史上下文
         if agent_name and runner_messages:
             try:
                 from astrbot.core.dynamic_subagent_manager import DynamicSubAgentManager
+
                 DynamicSubAgentManager.update_subagent_history(
                     umo, agent_name, runner_messages
                 )

astrbot/core/config/default.py

@@ -198,11 +198,11 @@
     },
     "enhanced_subagent": {
         "enabled": False,
-        "log_level": "debug",
         "max_subagent_count": 3,
         "auto_cleanup_per_turn": True,
-        "shared_context_enabled": False,
+        "shared_context_enabled": True,
         "shared_context_maxlen": 200,
+        "max_subagent_history": 500,
     },
     "provider_stt_settings": {
         "enable": False,

astrbot/core/dynamic_subagent_manager.py

@@ -70,8 +70,8 @@ class DynamicSubAgentManager:
     _max_subagent_count: int = 3
     _auto_cleanup_per_turn: bool = True
     _shared_context_enabled: bool = False
-    _shared_context_maxlen: int = 200   # 公共上下文保留的历史消息条数
-    _max_subagent_history: int = 500   # 每个subagent最多保留的历史消息条数
+    _shared_context_maxlen: int = 200  # 公共上下文保留的历史消息条数
+    _max_subagent_history: int = 500  # 每个subagent最多保留的历史消息条数
     _tools_blacklist: set[str] = {
         "send_shared_context_for_main_agentcreate_dynamic_subagent",
         "protect_subagent",
@@ -187,12 +187,15 @@ def configure(
         auto_cleanup_per_turn: bool = True,
         shared_context_enabled: bool = False,
         shared_context_maxlen: int = 200,
+        max_subagent_history: int = 500,
+        **kwargsr,
     ) -> None:
         """Configure DynamicSubAgentManager settings"""
         cls._max_subagent_count = max_subagent_count
         cls._auto_cleanup_per_turn = auto_cleanup_per_turn
         cls._shared_context_enabled = shared_context_enabled
         cls._shared_context_maxlen = shared_context_maxlen
+        cls._max_subagent_history = max_subagent_history
 
     @classmethod
     def is_auto_cleanup_per_turn(cls) -> bool:
@@ -265,18 +268,26 @@ def update_subagent_history(
         if isinstance(current_messages, list):
             _MAX_TOOL_RESULT_LEN = 2000
             for msg in current_messages:
-                if isinstance(msg, dict) and msg.get("role") == "system": # 移除system消息
+                if (
+                    isinstance(msg, dict) and msg.get("role") == "system"
+                ):  # 移除system消息
                     current_messages.remove(msg)
                 # 对过长的 tool 结果做截断，避免单条消息占用过多空间
-                if (isinstance(msg, dict) and msg.get("role") == "tool" and isinstance(msg.get("content"), str) and len(msg["content"]) > _MAX_TOOL_RESULT_LEN
+                if (
+                    isinstance(msg, dict)
+                    and msg.get("role") == "tool"
+                    and isinstance(msg.get("content"), str)
+                    and len(msg["content"]) > _MAX_TOOL_RESULT_LEN
                 ):
                     msg["content"] = (
-                            msg["content"][:_MAX_TOOL_RESULT_LEN] + "\n...[truncated]"
+                        msg["content"][:_MAX_TOOL_RESULT_LEN] + "\n...[truncated]"
                     )
 
         session.subagent_histories[agent_name].extend(current_messages)
         if cls._max_subagent_history < len(session.subagent_histories[agent_name]):
-            session.subagent_histories[agent_name] = session.subagent_histories[agent_name][-cls._max_subagent_history:]
+            session.subagent_histories[agent_name] = session.subagent_histories[
+                agent_name
+            ][-cls._max_subagent_history :]
 
         logger.debug(
             "[EnhancedSubAgent:History] Saved messages for %s, current len=%d",