subagent运行状态监控

Author: elecvoid243

astrbot/core/astr_agent_tool_exec.py

@@ -447,23 +447,27 @@ async def _execute_handoff_background(
 
             if agent_name:
                 session = DynamicSubAgentManager.get_session(umo)
-                if session and agent_name in session.subagents:
+                if session and (agent_name in session.subagents):
                     subagent_task_id = (
                         DynamicSubAgentManager.create_pending_subagent_task(
                             session_id=umo, agent_name=agent_name
                         )
                     )
-                    DynamicSubAgentManager.set_subagent_status(
-                        session_id=umo,
-                        agent_name=agent_name,
-                        status="RUNNING",
-                    )
 
-                    logger.info(
-                        f"[EnhancedSubAgent] Created background task {subagent_task_id} for {agent_name}"
-                    )
+                    if subagent_task_id.startswith("__PENDING_TASK_CREATE_FAILED__"):
+                        logger.info(subagent_task_id)
+                    else:
+                        DynamicSubAgentManager.set_subagent_status(
+                            session_id=umo,
+                            agent_name=agent_name,
+                            status="RUNNING",
+                        )
+
+                        logger.info(
+                            f"[EnhancedSubAgent] Created background task {subagent_task_id} for {agent_name}"
+                        )
         except Exception as e:
-            logger.debug(f"[EnhancedSubAgent] Failed to create pending task: {e}")
+            logger.info(f"[EnhancedSubAgent] Failed to create pending task: {e}")
 
         # 生成原始的 task_id（用于唤醒机制等）
         original_task_id = uuid.uuid4().hex
@@ -561,7 +565,7 @@ async def _do_handoff_background(
             session = DynamicSubAgentManager.get_session(umo)
             if session and agent_name:
                 # 检查是否是动态创建的 SubAgent
-                if agent_name in session.agents:
+                if agent_name in session.subagents:
                     enhanced_subagent_enabled = True
         except Exception:
             session = None

astrbot/core/astr_main_agent.py

@@ -970,8 +970,9 @@ def _apply_enhanced_subagent_tools(
         if DynamicSubAgentManager.is_auto_cleanup_per_turn():
             req.func_tool.add_tool(PROTECT_SUBAGENT_TOOL)
             req.func_tool.add_tool(UNPROTECT_SUBAGENT_TOOL)
-        req.func_tool.add_tool(VIEW_SHARED_CONTEXT_TOOL)
-        req.func_tool.add_tool(SEND_SHARED_CONTEXT_TOOL_FOR_MAIN_AGENT)
+        if DynamicSubAgentManager.is_shared_context_enabled():
+            req.func_tool.add_tool(VIEW_SHARED_CONTEXT_TOOL)
+            req.func_tool.add_tool(SEND_SHARED_CONTEXT_TOOL_FOR_MAIN_AGENT)
         req.func_tool.add_tool(WAIT_FOR_SUBAGENT_TOOL)
 
         # Configure logger
@@ -1346,8 +1347,9 @@ async def build_main_agent(
     elif config.computer_use_runtime == "local":
         _apply_local_env_tools(req)
 
-    # Apply enhanced SubAgent tools
-    _apply_enhanced_subagent_tools(config, req, event)
+    if config.enhanced_subagent.get("enabled", False):
+        # Apply enhanced SubAgent tools
+        _apply_enhanced_subagent_tools(config, req, event)
 
     agent_runner = AgentRunner()
     astr_agent_ctx = AstrAgentContext(

astrbot/core/computer/booters/local.py

@@ -159,10 +159,16 @@ def _run() -> dict[str, Any]:
                     [os.environ.get("PYTHON", sys.executable), "-c", code],
                     timeout=timeout,
                     capture_output=True,
-                    text=True,
+                    # text=True,
+                )
+                # stdout = "" if silent else result.stdout
+                # stderr = result.stderr if result.returncode != 0 else ""
+                stdout = "" if silent else _decode_shell_output(result.stdout)
+                stderr = (
+                    _decode_shell_output(result.stderr)
+                    if result.returncode != 0
+                    else ""
                 )
-                stdout = "" if silent else result.stdout
-                stderr = result.stderr if result.returncode != 0 else ""
                 return {
                     "data": {
                         "output": {"text": stdout, "images": []},