openclaw-agent-dashboard 1.0.35 → 1.0.36

package/dashboard/api/agents.py

@@ -1,7 +1,7 @@
 """
 Agent API 路由
 """
-from fastapi import APIRouter, HTTPException
+from fastapi import APIRouter
 from pydantic import BaseModel
 from typing import List, Optional
 import sys
@@ -51,37 +51,10 @@ async def get_agent(agent_id: str):
                 agent['lastActiveFormatted'] = format_last_active(agent['lastActiveAt'])
             return agent
     
+    from fastapi import HTTPException
     raise HTTPException(status_code=404, detail=f"Agent {agent_id} not found")
 
 
-class TimelineContextResponse(BaseModel):
-    """供「实时执行时序」与 runs.json 对齐：使用最新 run 的 childSessionKey 解析独立会话。"""
-    childSessionKey: Optional[str] = None
-
-
-@router.get("/agents/{agent_id}/timeline-context", response_model=TimelineContextResponse)
-async def get_agent_timeline_context(agent_id: str):
-    """
-    返回该 Agent 在 runs.json 中最近一条 run 的 childSessionKey（若有）。
-    前端传给 GET /api/timeline/{agent_id}?session_key= 以命中 sessions.json 指定 jsonl，
-    避免仅靠 mtime 选文件或误扫主会话合并路径。
-    """
-    from data.config_reader import get_agents_list
-    from data.subagent_reader import get_agent_runs
-
-    agents = get_agents_list()
-    if not any(a.get("id") == agent_id for a in agents):
-        raise HTTPException(status_code=404, detail=f"Agent {agent_id} not found")
-
-    runs = get_agent_runs(agent_id, limit=1)
-    key = None
-    if runs:
-        key = runs[0].get("childSessionKey") or None
-        if isinstance(key, str) and not key.strip():
-            key = None
-    return TimelineContextResponse(childSessionKey=key)
-
-
 @router.get("/agents/{agent_id}/output")
 async def get_agent_output(agent_id: str, limit: int = 50):
     """
@@ -93,6 +66,7 @@ async def get_agent_output(agent_id: str, limit: int = 50):
     
     agents = get_agents_list()
     if not any(a.get('id') == agent_id for a in agents):
+        from fastapi import HTTPException
         raise HTTPException(status_code=404, detail=f"Agent {agent_id} not found")
     
     turns = get_session_turns(agent_id, limit=limit)

package/dashboard/api/timeline.py

@@ -1,11 +1,15 @@
 """
 Timeline API 路由 - 实时执行时序图
 """
+import logging
+import time
 from fastapi import APIRouter, Query, HTTPException
 from pydantic import BaseModel
 from typing import Optional, List, Dict, Any
 import sys
 from pathlib import Path
+
+LOG = logging.getLogger(__name__)
 sys.path.append(str(Path(__file__).parent.parent))
 
 from data.timeline_reader import get_timeline_steps, StepType, StepStatus
@@ -38,13 +42,17 @@ class TimelineResponse(BaseModel):
     agentName: Optional[str] = None
     model: Optional[str] = None
     startedAt: Optional[int] = None
+    runStartedAt: Optional[int] = None
     status: str
     steps: List[Dict[str, Any]]
     stats: TimelineStats
     message: Optional[str] = None
+    # 主 Agent 无会话文件时由后端置 True，避免前端误用「子代理」空态文案
+    isMainAgent: Optional[bool] = None
     # LLM 轮次分组
     rounds: Optional[List[LLMRound]] = None
     roundMode: Optional[bool] = None
+    dataSource: Optional[str] = None
 
 
 @router.get("/timeline/{agent_id}", response_model=TimelineResponse)
@@ -73,8 +81,17 @@ async def get_timeline(
     if not agent_info:
         raise HTTPException(status_code=404, detail=f"Agent {agent_id} not found")
 
-    # 获取时序数据
+    t0 = time.perf_counter()
     result = get_timeline_steps(agent_id, session_key, limit)
+    elapsed_ms = (time.perf_counter() - t0) * 1000
+    if elapsed_ms >= 200.0:
+        LOG.info(
+            "timeline agent=%s limit=%d steps=%d ms=%.1f",
+            agent_id,
+            limit,
+            len(result.get("steps", [])),
+            elapsed_ms,
+        )
 
     # 补充 Agent 信息
     result['agentName'] = agent_info.get('name', agent_id)

package/dashboard/data/config_reader.py

@@ -52,8 +52,11 @@ def get_agents_list() -> List[Dict[str, Any]]:
 
 
 def get_main_agent_id() -> str:
-    """获取主 Agent ID（配置中 id 为 main 的，或列表第一个）"""
+    """获取主 Agent ID：优先 default:true，其次 id 为 main，否则列表第一项。"""
     agents = get_agents_list()
+    for a in agents:
+        if a.get('default') is True:
+            return a.get('id', 'main')
     for a in agents:
         if a.get('id') == 'main':
             return 'main'