openclaw-agent-dashboard 1.0.17 → 1.0.18

package/README.md

@@ -32,7 +32,7 @@ npm run deploy
 | `npm run deploy` | 打包 + 安装到 OpenClaw（首次安装或升级） |
 | `npm run upgrade` | 拉取最新代码 + 部署（推荐用于升级） |
 | `npm run pack` | 仅打包插件，不安装（开发调试用） |
-| `npm run bundle` | 生成可分发的压缩包（给同事用） |
+| `npm run bundle` | 生成可分发的压缩包（离线分发） |
 
 ### 升级插件
 

package/dashboard/api/performance.py

@@ -10,6 +10,8 @@ from pathlib import Path
 from datetime import datetime, timedelta, timezone
 from zoneinfo import ZoneInfo
 
+from data.session_reader import normalize_sessions_index
+
 # 详情展示使用 Asia/Shanghai 时区
 TZ_DISPLAY = ZoneInfo('Asia/Shanghai')
 
@@ -710,7 +712,8 @@ async def get_tokens_analysis(range: str = "all"):
                     continue
 
                 agent_total = {"input": 0, "output": 0, "cacheRead": 0, "cacheWrite": 0}
-                for session_key, entry in data.items():
+                index_map = normalize_sessions_index(data)
+                for session_key, entry in index_map.items():
                     if not isinstance(entry, dict):
                         continue
                     inp = entry.get('inputTokens', 0) or 0

package/dashboard/api/subagents.py

@@ -17,6 +17,7 @@ from data.subagent_reader import (
     get_agent_files_for_run
 )
 from data.task_history import merge_with_history
+from data.session_reader import normalize_sessions_index, resolve_session_jsonl_path
 import time
 
 router = APIRouter()
@@ -269,19 +270,13 @@ def _get_session_message_count(child_session_key: str) -> int:
 
         with open(sessions_index, 'r', encoding='utf-8') as f:
             index_data = json.load(f)
-        entry = index_data.get(child_session_key)
+        index_map = normalize_sessions_index(index_data)
+        entry = index_map.get(child_session_key)
         if not entry:
             return 0
-        session_file = entry.get('sessionFile')
-        session_id = entry.get('sessionId')
-        if not session_file and not session_id:
-            return 0
-        if not session_file:
-            sessions_dir = openclaw_path / "agents" / agent_id / "sessions"
-            session_file = str(sessions_dir / f"{session_id}.jsonl")
-
-        session_path = Path(session_file)
-        if not session_path.exists():
+        sessions_dir = openclaw_path / "agents" / agent_id / "sessions"
+        session_path = resolve_session_jsonl_path(sessions_dir, entry)
+        if not session_path:
             return 0
 
         count = 0
@@ -365,19 +360,13 @@ def _extract_subtasks_from_session(child_session_key: str) -> List[Dict[str, Any
 
         with open(sessions_index, 'r', encoding='utf-8') as f:
             index_data = json.load(f)
-        entry = index_data.get(child_session_key)
+        index_map = normalize_sessions_index(index_data)
+        entry = index_map.get(child_session_key)
         if not entry:
             return []
-        session_file = entry.get('sessionFile')
-        session_id = entry.get('sessionId')
-        if not session_file and not session_id:
-            return []
-        if not session_file:
-            sessions_dir = openclaw_path / "agents" / agent_id / "sessions"
-            session_file = str(sessions_dir / f"{session_id}.jsonl")
-
-        session_path = Path(session_file)
-        if not session_path.exists():
+        sessions_dir = openclaw_path / "agents" / agent_id / "sessions"
+        session_path = resolve_session_jsonl_path(sessions_dir, entry)
+        if not session_path:
             return []
 
         subtasks: List[Dict[str, Any]] = []
@@ -531,19 +520,13 @@ def _extract_timeline_from_session(child_session_key: str) -> List[Dict[str, Any
 
         with open(sessions_index, 'r', encoding='utf-8') as f:
             index_data = json.load(f)
-        entry = index_data.get(child_session_key)
+        index_map = normalize_sessions_index(index_data)
+        entry = index_map.get(child_session_key)
         if not entry:
             return []
-        session_file = entry.get('sessionFile')
-        session_id = entry.get('sessionId')
-        if not session_file and not session_id:
-            return []
-        if not session_file:
-            sessions_dir = openclaw_path / "agents" / agent_id / "sessions"
-            session_file = str(sessions_dir / f"{session_id}.jsonl")
-
-        session_path = Path(session_file)
-        if not session_path.exists():
+        sessions_dir = openclaw_path / "agents" / agent_id / "sessions"
+        session_path = resolve_session_jsonl_path(sessions_dir, entry)
+        if not session_path:
             return []
 
         timeline: List[Dict[str, Any]] = []

package/dashboard/api/version.py

@@ -10,7 +10,7 @@ from typing import Optional
 # 导入版本信息读取器
 from data.version_info_reader import get_version_reader
 
-router = APIRouter(prefix="/api", tags=["version"])
+router = APIRouter()
 
 
 class VersionInfo(BaseModel):

package/dashboard/data/agent_config_manager.py

@@ -8,6 +8,7 @@ import shutil
 from datetime import datetime
 
 from data.config_reader import get_openclaw_root
+from data.session_reader import normalize_sessions_index
 
 
 def _backup_config() -> Optional[Path]:
@@ -230,7 +231,7 @@ def get_agent_full_info(agent_id: str) -> Dict[str, Any]:
         try:
             with open(session_file, 'r', encoding='utf-8') as f:
                 sessions_data = json.load(f)
-            entries = sessions_data.get('entries', {})
+            entries = normalize_sessions_index(sessions_data)
             if entries:
                 latest = max(entries.values(), key=lambda e: e.get('lastMessageAt', 0))
                 last_active = latest.get('lastMessageAt')

package/dashboard/data/session_reader.py

@@ -9,6 +9,64 @@ from typing import List, Dict, Any, Optional
 
 from data.config_reader import get_openclaw_root
 
+_META_SESSION_INDEX_KEYS = frozenset({"entries", "version", "schema"})
+
+
+def normalize_sessions_index(raw: Any) -> Dict[str, Dict[str, Any]]:
+    """
+    统一 sessions.json 结构（跨平台兼容 OpenClaw 不同版本）：
+    - 常见嵌套：{"entries": {"agent:...": {...}}}
+    - 扁平：{"agent:...": {...}}
+    """
+    if not isinstance(raw, dict):
+        return {}
+    out: Dict[str, Dict[str, Any]] = {}
+    inner = raw.get("entries")
+    if isinstance(inner, dict):
+        for k, v in inner.items():
+            if isinstance(v, dict):
+                out[str(k)] = v
+    for k, v in raw.items():
+        if k in _META_SESSION_INDEX_KEYS or not isinstance(v, dict):
+            continue
+        out.setdefault(str(k), v)
+    return out
+
+
+def resolve_session_jsonl_path(sessions_dir: Path, entry: Dict[str, Any]) -> Optional[Path]:
+    """
+    由 sessions.json 单条记录解析真实 .jsonl 路径。
+    兼容：绝对路径、相对 sessions 目录、仅文件名（避免 Windows 下 cwd 非 sessions 导致找不到文件）。
+    """
+    sf = entry.get("sessionFile")
+    sid = entry.get("sessionId")
+    try:
+        sessions_dir = sessions_dir.resolve()
+    except OSError:
+        sessions_dir = sessions_dir
+
+    if sf:
+        p = Path(str(sf))
+        try:
+            if p.is_file():
+                return p.resolve()
+        except OSError:
+            pass
+        for cand in (sessions_dir / sf, sessions_dir / p.name):
+            try:
+                if cand.is_file():
+                    return cand.resolve()
+            except OSError:
+                continue
+    if sid:
+        cand = sessions_dir / f"{sid}.jsonl"
+        try:
+            if cand.is_file():
+                return cand.resolve()
+        except OSError:
+            pass
+    return None
+
 
 def get_agent_sessions_path(agent_id: str) -> Optional[Path]:
     """获取 Agent 的 sessions 目录"""
@@ -139,12 +197,12 @@ def get_session_updated_at(agent_id: str) -> int:
             data = json.load(f)
         if not isinstance(data, dict):
             return 0
+        index_map = normalize_sessions_index(data)
         max_ts = 0
-        for entry in data.values():
-            if isinstance(entry, dict):
-                ts = entry.get('updatedAt', 0)
-                if isinstance(ts, (int, float)) and ts > max_ts:
-                    max_ts = int(ts)
+        for entry in index_map.values():
+            ts = entry.get('updatedAt') or entry.get('lastMessageAt') or 0
+            if isinstance(ts, (int, float)) and ts > max_ts:
+                max_ts = int(ts)
         return max_ts
     except (json.JSONDecodeError, IOError):
         return 0
@@ -170,18 +228,15 @@ def get_session_turns(agent_id: str, session_key: Optional[str] = None, limit: i
         return []
     
     session_file: Optional[Path] = None
+    sessions_path = get_openclaw_root() / "agents" / agent_id / "sessions"
     if session_key:
         try:
             with open(sessions_index, 'r', encoding='utf-8') as f:
                 index_data = json.load(f)
-            entry = index_data.get(session_key) if isinstance(index_data, dict) else None
-            if entry and isinstance(entry, dict):
-                sf = entry.get('sessionFile')
-                sid = entry.get('sessionId')
-                if sf:
-                    session_file = Path(sf)
-                elif sid:
-                    session_file = get_openclaw_root() / "agents" / agent_id / "sessions" / f"{sid}.jsonl"
+            index_map = normalize_sessions_index(index_data)
+            entry = index_map.get(session_key)
+            if entry:
+                session_file = resolve_session_jsonl_path(sessions_path, entry)
         except (json.JSONDecodeError, IOError):
             pass
     

package/dashboard/data/subagent_reader.py

@@ -6,6 +6,7 @@ from pathlib import Path
 from typing import List, Dict, Any, Optional
 
 from data.config_reader import get_openclaw_root
+from data.session_reader import normalize_sessions_index, resolve_session_jsonl_path
 
 
 def load_subagent_runs() -> List[Dict[str, Any]]:
@@ -117,19 +118,13 @@ def get_agent_output_for_run(child_session_key: str, max_chars: int = 10000) ->
     try:
         with open(sessions_index, 'r', encoding='utf-8') as f:
             index_data = json.load(f)
-        entry = index_data.get(child_session_key)
+        index_map = normalize_sessions_index(index_data)
+        entry = index_map.get(child_session_key)
         if not entry:
             return None
-        session_file = entry.get('sessionFile')
-        session_id = entry.get('sessionId')
-        if not session_file and not session_id:
-            return None
-        if not session_file:
-            sessions_dir = openclaw_path / "agents" / agent_id / "sessions"
-            session_file = str(sessions_dir / f"{session_id}.jsonl")
-        
-        session_path = Path(session_file)
-        if not session_path.exists():
+        sessions_dir = openclaw_path / "agents" / agent_id / "sessions"
+        session_path = resolve_session_jsonl_path(sessions_dir, entry)
+        if not session_path:
             return None
         
         last_text = None
@@ -185,19 +180,13 @@ def get_agent_files_for_run(child_session_key: str) -> List[str]:
     try:
         with open(sessions_index, 'r', encoding='utf-8') as f:
             index_data = json.load(f)
-        entry = index_data.get(child_session_key)
+        index_map = normalize_sessions_index(index_data)
+        entry = index_map.get(child_session_key)
         if not entry:
             return []
-        session_file = entry.get('sessionFile')
-        session_id = entry.get('sessionId')
-        if not session_file and not session_id:
-            return []
-        if not session_file:
-            sessions_dir = openclaw_path / "agents" / agent_id / "sessions"
-            session_file = str(sessions_dir / f"{session_id}.jsonl")
-        
-        session_path = Path(session_file)
-        if not session_path.exists():
+        sessions_dir = openclaw_path / "agents" / agent_id / "sessions"
+        session_path = resolve_session_jsonl_path(sessions_dir, entry)
+        if not session_path:
             return []
         
         file_paths: List[str] = []

package/dashboard/data/timeline_reader.py

@@ -83,6 +83,7 @@ class TimelineStep:
 
 
 from data.config_reader import get_openclaw_root
+from data.session_reader import normalize_sessions_index, resolve_session_jsonl_path
 
 
 # 子 Agent 回传消息的特征
@@ -233,13 +234,17 @@ def _get_requester_info_for_session(agent_id: str, session_key: Optional[str]) -
         try:
             with open(sessions_index, 'r', encoding='utf-8') as f:
                 index_data = json.load(f)
+            index_map = normalize_sessions_index(index_data)
             if not session_key:
-                entries = [(k, v) for k, v in index_data.items() if isinstance(v, dict)]
+                entries = list(index_map.items())
                 if entries:
-                    entries.sort(key=lambda x: x[1].get('updatedAt', 0), reverse=True)
+                    entries.sort(
+                        key=lambda x: (x[1].get('updatedAt') or x[1].get('lastMessageAt') or 0),
+                        reverse=True,
+                    )
                     session_key = entries[0][0]
             if session_key:
-                entry = index_data.get(session_key)
+                entry = index_map.get(session_key)
                 if isinstance(entry, dict):
                     spawned_by = entry.get('spawnedBy', '')
                     if spawned_by and ':' in spawned_by:
@@ -420,15 +425,11 @@ def get_timeline_steps(
             try:
                 with open(sessions_index, 'r', encoding='utf-8') as f:
                     index_data = json.load(f)
-                entry = index_data.get(session_key) if isinstance(index_data, dict) else None
-                if entry and isinstance(entry, dict):
-                    sf = entry.get('sessionFile')
-                    sid = entry.get('sessionId')
-                    if sf:
-                        session_file = Path(sf)
-                    elif sid:
-                        session_file = sessions_path / f"{sid}.jsonl"
-                    session_id = sid or session_key
+                index_map = normalize_sessions_index(index_data)
+                entry = index_map.get(session_key)
+                if entry:
+                    session_file = resolve_session_jsonl_path(sessions_path, entry)
+                    session_id = entry.get('sessionId') or session_key
             except (json.JSONDecodeError, IOError):
                 pass
     else:

package/dashboard/mechanism_reader.py

@@ -7,6 +7,7 @@ from typing import Dict, Any, List
 
 
 from data.config_reader import get_openclaw_root
+from data.session_reader import normalize_sessions_index
 
 
 def get_agent_mechanisms(agent_id: str) -> Dict[str, Any]:
@@ -33,8 +34,9 @@ def get_agent_mechanisms(agent_id: str) -> Dict[str, Any]:
         if not isinstance(data, dict):
             return result
         
-        # 取最新 session 的机制信息
-        for session_key, entry in data.items():
+        # 取最新 session 的机制信息（兼容 sessions.json 顶层或 entries 嵌套）
+        index_map = normalize_sessions_index(data)
+        for session_key, entry in index_map.items():
             if not isinstance(entry, dict):
                 continue
             report = entry.get('systemPromptReport', {})