openclaw-agent-dashboard 1.0.29 → 1.0.30

package/dashboard/api/collaboration.py

@@ -330,6 +330,37 @@ def _clean_task_name(task_name: str) -> str:
     return ''
 
 
+def _enrich_main_agent_active_tasks_if_needed(
+    agent_active_tasks: Dict[str, List[Dict[str, Any]]],
+    main_agent_id: str,
+) -> Dict[str, List[Dict[str, Any]]]:
+    """
+    主 Agent 仅更新主会话、subagents/runs 无条目时，agentActiveTasks 为空；
+    在仍为 working 时补一条会话摘要，便于卡片「并行任务」区有文案。
+    """
+    from status.status_calculator import calculate_agent_status, get_current_task
+
+    if calculate_agent_status(main_agent_id) != 'working':
+        return agent_active_tasks
+    if agent_active_tasks.get(main_agent_id):
+        return agent_active_tasks
+    hint = get_current_task(main_agent_id)
+    name = _clean_task_name(hint) if hint else ''
+    if not name:
+        return agent_active_tasks
+    merged = dict(agent_active_tasks)
+    merged[main_agent_id] = [
+        {
+            'id': 'task-main-session',
+            'name': name,
+            'status': 'working',
+            'timestamp': None,
+            'featureId': None,
+        }
+    ]
+    return merged
+
+
 def _get_agent_error_info(agent_id: str) -> Optional[Dict[str, Any]]:
     """获取 agent 的错误/异常信息"""
     from session_reader import get_last_error, has_recent_errors
@@ -505,7 +536,7 @@ async def get_collaboration():
         get_model_display_name, get_main_agent_id
     )
     from data.subagent_reader import get_active_runs
-    from status.status_calculator import calculate_agent_status
+    from status.status_calculator import calculate_agent_status, get_current_task
 
     nodes = []
     edges = []
@@ -555,6 +586,8 @@ async def get_collaboration():
                     break
             if not main_current_task and active_runs:
                 main_current_task = _clean_task_name(active_runs[0].get('task', ''))
+        if not main_current_task:
+            main_current_task = _clean_task_name(get_current_task(main_agent_id))
         main_error = _get_agent_error_info(main_agent_id)
         main_stuck = _check_agent_stuck(main_agent_id)
 
@@ -773,7 +806,10 @@ async def get_collaboration():
             depths[aid] = 1
 
     # 构建多任务并行数据
-    agent_active_tasks = _build_agent_active_tasks(active_runs, main_agent_id)
+    agent_active_tasks = _enrich_main_agent_active_tasks_if_needed(
+        _build_agent_active_tasks(active_runs, main_agent_id),
+        main_agent_id,
+    )
 
     return CollaborationFlow(
         nodes=nodes,
@@ -849,20 +885,8 @@ async def get_collaboration_dynamic():
             except Exception as e:
                 logger.warning(f"Failed to get display status for {aid}: {e}")
 
-        main_status = "working" if active_runs else "idle"
-        agent_statuses[main_agent_id] = main_status
-
-        # 获取主 agent 的详细显示状态
-        try:
-            main_dyn_status = get_display_status(main_agent_id)
-            agent_dynamic_statuses[main_agent_id] = AgentDisplayStatus(
-                status=main_dyn_status['status'],
-                display=main_dyn_status['display'],
-                duration=main_dyn_status['duration'],
-                alert=main_dyn_status['alert']
-            )
-        except Exception as e:
-            logger.warning(f"Failed to get display status for {main_agent_id}: {e}")
+        # 主 Agent 状态已在上方循环中与 calculate_agent_status 一致，勿再用「有无 active_runs」覆盖
+        # （独立 PM 仅更新主会话时 runs 可能为空，否则会误显示空闲）
 
         # 处理活跃任务（简化：不在流程图中创建任务节点，任务信息由 agentActiveTasks 提供）
         # 任务详情在 Agent 卡片内显示，流程图只显示 Agent 之间的委托关系
@@ -896,7 +920,10 @@ async def get_collaboration_dynamic():
     ]
 
     # 构建多任务并行数据
-    agent_active_tasks = _build_agent_active_tasks(active_runs, main_agent_id)
+    agent_active_tasks = _enrich_main_agent_active_tasks_if_needed(
+        _build_agent_active_tasks(active_runs, main_agent_id),
+        main_agent_id,
+    )
 
     return CollaborationDynamic(
         activePath=list(set(active_path)),

package/dashboard/data/session_reader.py

@@ -136,6 +136,29 @@ def get_recent_messages(agent_id: str, limit: int = 10) -> List[Dict[str, Any]]:
     return messages[-limit:] if len(messages) > limit else messages
 
 
+def get_latest_user_message_text(agent_id: str, scan_limit: int = 80) -> str:
+    """
+    从最新会话中取最近一条 user 消息的文本（不做截断）。
+    用于无 subagent run 时展示当前任务摘要（独立 PM / 仅主会话）。
+    """
+    messages = get_recent_messages(agent_id, limit=scan_limit)
+    for msg in reversed(messages):
+        if msg.get('role') != 'user':
+            continue
+        content = msg.get('content', [])
+        if isinstance(content, str):
+            t = content.strip()
+            if t:
+                return t
+        elif isinstance(content, list):
+            for c in content:
+                if isinstance(c, dict) and c.get('type') == 'text':
+                    t = (c.get('text') or '').strip()
+                    if t:
+                        return t
+    return ''
+
+
 def has_recent_errors(agent_id: str, minutes: int = 5) -> bool:
     """检查最近是否有错误"""
     messages = get_recent_messages(agent_id, limit=50)

package/dashboard/status/status_calculator.py

@@ -9,7 +9,7 @@ sys.path.append(str(Path(__file__).parent.parent))
 import logging
 import time
 from typing import Literal, Dict, Any, List, Optional
-from data.config_reader import get_agents_list, get_agent_config
+from data.config_reader import get_agents_list, get_agent_config, get_main_agent_id
 from data.subagent_reader import is_agent_working, get_agent_runs
 from data.session_reader import (
     has_recent_errors,
@@ -105,19 +105,34 @@ def get_agents_with_status() -> list:
 
 
 def get_current_task(agent_id: str) -> str:
-    """获取 Agent 当前任务"""
+    """
+    获取 Agent 当前任务描述。
+    优先 subagents/runs.json 中该 Agent 作为执行者的记录。
+    子 Agent 任务仅来自 runs（业务上不存在「仅有会话、无 run」的工作态）。
+    主 Agent 无 run 时，仅在仍活跃时用主会话最近一条 user 消息作摘要，避免空闲时显示陈旧文案。
+    """
     runs = get_agent_runs(agent_id, limit=1)
-    if not runs:
+    if runs:
+        task = runs[0].get('task', '') or ''
+        if len(task) > 60:
+            task = task[:57] + '...'
+        return task
+
+    if agent_id != get_main_agent_id():
         return ''
 
-    run = runs[0]
-    task = run.get('task', '')
+    if not is_agent_working(agent_id) and not has_recent_session_activity(agent_id, minutes=2):
+        return ''
 
-    # 截取前60个字符（统一长度）
-    if len(task) > 60:
-        task = task[:57] + '...'
+    from data.session_reader import get_latest_user_message_text
 
-    return task
+    text = get_latest_user_message_text(agent_id)
+    if not text:
+        return ''
+    text = ' '.join(text.split())
+    if len(text) > 60:
+        text = text[:57] + '...'
+    return text
 
 
 def get_last_active_time(agent_id: str) -> int:

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "openclaw-agent-dashboard",
   "name": "OpenClaw Agent Dashboard",
   "description": "多 Agent 可视化看板 - 状态、任务、API、工作流、协作流程",
-  "version": "1.0.29",
+  "version": "1.0.30",
   "configSchema": {
     "type": "object",
     "additionalProperties": false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-agent-dashboard",
-  "version": "1.0.29",
+  "version": "1.0.30",
   "description": "多 Agent 可视化看板 - OpenClaw 插件",
   "main": "index.js",
   "openclaw": {