dag test

Author: elecvoid243

astrbot/core/astr_agent_tool_exec.py

@@ -385,7 +385,7 @@ async def _execute_handoff(
         subagent_trace.record(
             "subagent_execution_begin",
             agent_name=agent_name,
-            input_preview=input_[:500] if input_ else None,
+            input=input_ if input_ else None,
             image_count=len(image_urls),
             tools=[t.name for t in toolset] if toolset else [],
             max_steps=agent_max_step,
@@ -414,7 +414,7 @@ async def _execute_handoff(
             "subagent_system_prompt",
             agent_name=agent_name,
             prompt_length=len(subagent_system_prompt),
-            prompt_preview=subagent_system_prompt[:300]
+            prompt=subagent_system_prompt
             if subagent_system_prompt
             else None,
         )
@@ -480,7 +480,7 @@ async def _run_subagent():
         subagent_trace.record(
             "subagent_execution_complete",
             agent_name=agent_name,
-            result_preview=llm_resp.completion_text[:500]
+            result=llm_resp.completion_text
             if hasattr(llm_resp, "completion_text") and llm_resp.completion_text
             else None,
             result_length=len(llm_resp.completion_text)
@@ -883,7 +883,7 @@ async def _execute_local(
         while True:
             try:
                 if (
-                    tool.name == "wait_for_subagent"
+                    tool.name == "wait_for_subagent" or tool.name == "orchestrate_tasks"
                 ):  # wait工具有自己的超时，避免受到tool_call_timeout影响
                     resp = await asyncio.wait_for(
                         anext(wrapper),

astrbot/core/astr_main_agent.py

@@ -1035,6 +1035,7 @@ async def _apply_subagent_manager_tools(
             CREATE_SUBAGENT_TOOL,
             LIST_SUBAGENTS_TOOL,
             MANAGE_SUBAGENT_PROTECTION_TOOL,
+            ORCHESTRATE_TASKS_TOOL,
             REMOVE_SUBAGENT_TOOL,
             VIEW_SHARED_CONTEXT_TOOL,
             WAIT_FOR_SUBAGENT_TOOL,
@@ -1073,6 +1074,10 @@ async def _apply_subagent_manager_tools(
         # Register dynamic subagent management tools (only when dynamic creation is enabled)
         # Always register `wait_for_subagent` for better background task running
         req.func_tool.add_tool(WAIT_FOR_SUBAGENT_TOOL)
+        # Register DAG orchestration tool if enabled
+        dag_cfg = orch_cfg.get("dag_enabled", True)
+        if dag_cfg:
+            req.func_tool.add_tool(ORCHESTRATE_TASKS_TOOL)
         if enable_dynamic:
             req.func_tool.add_tool(CREATE_SUBAGENT_TOOL)
             req.func_tool.add_tool(REMOVE_SUBAGENT_TOOL)

astrbot/core/config/default.py

@@ -222,6 +222,7 @@
                 "remove_subagent",
                 "list_subagents",
                 "wait_for_subagent",
+                "orchestrate_tasks",
                 "broadcast_shared_context",
                 "view_shared_context",
             ],
@@ -233,6 +234,10 @@
         "shared_context_maxlen": 300,
         "subagent_history_maxlen": 300,
         "execution_timeout": 1200,
+        "dag_enabled": True,
+        "dag_max_nodes": 10,
+        "dag_max_parallel": 5,
+        "dag_max_inject_length": 4000,
     },
     "provider_stt_settings": {
         "enable": False,