@caius_kong/ccusage-dashboard 0.2.5 → 0.2.7

package/README.md

@@ -5,9 +5,15 @@
 **A tiny local dashboard built specifically for [ccusage](https://github.com/ccusage/ccusage).**
 
 > ⚠️ **This is not a re-implementation.** Every number you see comes straight from
-> `ccusage ... --json`. No own pricing tables, no re-parsing of session logs — the
-> dashboard is a thin view over ccusage's own accurate cost engine. If `ccusage`
+> `ccusage ... --json`. No own pricing tables, no re-parsing of session logs for costs —
+> the dashboard is a thin view over ccusage's own accurate cost engine. If `ccusage`
 > says it, this dashboard shows it.
+>
+> The only exception is the **workdir label** in the Sessions tab: ccusage's session
+> report doesn't expose a real directory name for every agent, so the dashboard reads
+> each agent's own local session file (pi/openclaw/claude/codex stores) to display the
+> actual working directory. This is purely a display label — every cost/token number
+> still comes 100% from ccusage.
 
 </div>
 
@@ -50,12 +56,14 @@ CCUSAGE_UI_NO_OPEN=1 npx @caius_kong/ccusage-dashboard   # don't auto-open brows
 
 | | |
 |---|---|
-| **Today / This Week / This Month / Custom Range** | totals + tokens + cache breakdown |
+| **Today / This Week / This Month / Custom Range** | totals + tokens + cache breakdown + **cache hit rate** |
 | **By model** | per-model cost, % of total, in/out/cache-read/cache-write tokens |
 | **30-day trend** | daily cost bar chart (hover for values, weekends marked) |
+| **Sessions** | per-session rows grouped by workdir name + short session id, sorted by cost — shares the top time-filter tabs (today/week/month/custom) |
 | **Budget alert** | monthly cap (default $300) — green <80%, yellow <100%, red ≥100% |
 
-All costs in USD. Auto-refresh: today every 15s, others every 60s.
+All costs in USD. **Cache hit rate** is the standard input-side metric:
+`cacheReadTokens / (cacheReadTokens + non-cached inputTokens)`. Auto-refresh every 15s.
 
 ## How it works
 

package/lib/index.html

@@ -77,7 +77,6 @@
   <div class="tab" role="tab" tabindex="0" aria-selected="false" data-tab="week">This Week</div>
   <div class="tab" role="tab" tabindex="0" aria-selected="false" data-tab="month">This Month</div>
   <div class="tab" role="tab" tabindex="0" aria-selected="false" data-tab="range">Custom Range</div>
-  <div class="tab" role="tab" tabindex="0" aria-selected="false" data-tab="sessions">Sessions</div>
   <div class="tab-budget">
     <span class="budget-pill" id="budgetPill">budget …</span>
   </div>
@@ -93,6 +92,7 @@
   <div class="card"><div class="label">Tokens</div><div class="value" id="c2">–</div></div>
   <div class="card"><div class="label">Cache Read</div><div class="value" id="c3">–</div></div>
   <div class="card"><div class="label">Cache Write</div><div class="value" id="c4">–</div></div>
+  <div class="card"><div class="label">Cache Hit Rate</div><div class="value" id="c5">–</div><div class="period" id="c5p"></div></div>
 </div>
 
 <div id="rangeRow" class="panel" style="display:none">
@@ -108,18 +108,10 @@
 
 <div class="panel"><h2>Models <span class="tot" id="modelSum"></span></h2><div id="modelList"><div class="empty">loading…</div></div></div>
 
-<div class="panel" id="sessionsPanel" style="display:none">
+<div class="panel" id="sessionsPanel">
   <h2>Sessions <span class="tot" id="sessSum"></span>
     <span class="pill" id="sessRange"></span>
   </h2>
-  <div class="range" style="margin-bottom:12px">
-    <span class="pill">last</span>
-    <button data-sdays="7" class="sday">7d</button>
-    <button data-sdays="30" class="sday active">30d</button>
-    <button data-sdays="90" class="sday">90d</button>
-    <button data-sdays="365" class="sday">all</button>
-    <span class="pill" style="margin-left:auto" id="sessHint"></span>
-  </div>
   <div id="sessionsList"><div class="empty">loading…</div></div>
 </div>
 
@@ -127,8 +119,8 @@
 
 <script>
 const $=(id)=>document.getElementById(id);
-const tabs={today:{label:"Today",len:0},week:{label:"This Week",len:0},month:{label:"This Month",len:0},range:{label:"Custom Range",len:1},sessions:{label:"Sessions",len:0}};
-let active="today", modelCtx=[], sessDays=30;
+const tabs={today:{label:"Today",len:0},week:{label:"This Week",len:0},month:{label:"This Month",len:0},range:{label:"Custom Range",len:1}};
+let active="today", modelCtx=[];
 
 function fmtUsd(n){return "$"+(n==null?"–":Number(n).toFixed(2));}
 function fmtTok(n){
@@ -138,6 +130,7 @@ function fmtTok(n){
   if(n>=1e3)return (n/1e3).toFixed(1)+"k";
   return String(n);
 }
+function fmtPct(n){return n==null?"–":n.toFixed(1)+"%";}
 function esc(s){const d=document.createElement("div");d.textContent=s;return d.innerHTML;}
 
 function renderModels(data){
@@ -173,8 +166,17 @@ function applyBudget(month){
 }
 
 async function loadSessions(){
-  $("sessionsList").innerHTML='<div class="empty">loading sessions…</div>';
-  const data=await(await fetch(`/api/sessions?days=${sessDays}`)).json();
+  // follow the top-level time filter (today/week/month/custom range)
+  let q="";
+  if(active==="today")q="period=today";
+  else if(active==="week")q="period=week";
+  else if(active==="month")q="period=month";
+  else if(active==="range"){
+    const f=$("fromDate").value,t=$("toDate").value;
+    if(!f||!t){return;}
+    q=`from=${f}&to=${t}`;
+  }else{return;}
+  const data=await(await fetch(`/api/sessions?${q}`)).json();
   if(data.error)throw new Error(data.error);
   renderSessions(data);
 }
@@ -182,14 +184,14 @@ async function loadSessions(){
 function renderSessions(data){
   const list=data.sessions||[];
   const total=data.total||0;
-  const sum=list.reduce((a,s)=>a+(s.cost||0),0);
+  const sum=data.totalCost!=null?data.totalCost:list.reduce((a,s)=>a+(s.cost||0),0);
   $("sessSum").textContent=fmtUsd(sum);
-  $("sessRange").textContent=`${total} sessions · last ${sessDays===365?"year":sessDays+"d"}`;
+  $("sessRange").textContent=`${total} sessions`;
   if(!list.length){$("sessionsList").innerHTML='<div class="empty">no sessions in range</div>';return;}
   $("sessionsList").innerHTML=list.map(s=>{
     const label = s.hasCwd
-      ? `<span class="name" title="workdir from ccusage: ${esc(s.cwd||s.projectKey)}">${esc(s.dirName||s.id.slice(0,8))} <span class="pill sessid">${esc(s.id.slice(0,8))}</span></span>`
-      : `<span class="name muted" title="workdir not provided by ccusage for ${esc(s.agent)}">${esc(s.id.slice(0,8))}</span>`;
+      ? `<span class="name" title="workdir: ${esc(s.cwd||s.projectKey)}">${esc(s.dirName||s.id.slice(0,8))} <span class="pill sessid">${esc(s.id.slice(0,8))}</span></span>`
+      : `<span class="name muted" title="no workdir found for this ${esc(s.agent)} session">${esc(s.id.slice(0,8))}</span>`;
     const last=(s.lastActivity||"").slice(0,10);
     return `<div class="row">
       <div class="row-top"><span>${label} <span class="pill">${esc(s.agent)}</span></span><span class="cost">${fmtUsd(s.cost)}</span></div>
@@ -206,6 +208,11 @@ function applyCards(data){
   $("c2").textContent=fmtTok(tt);
   $("c3").textContent=fmtTok(data.cacheReadTokens);
   $("c4").textContent=fmtTok(data.cacheCreationTokens);
+  // cache hit rate = cache-read input / (cache-read input + non-cached input)
+  const hitIn=data.cacheReadTokens||0, plainIn=data.inputTokens||0;
+  const hitRate = (hitIn+plainIn)>0 ? (hitIn/(hitIn+plainIn))*100 : null;
+  $("c5").innerHTML=fmtPct(hitRate)+(hitRate!=null?"<small> cache</small>":"");
+  $("c5p").textContent=hitRate!=null?`${fmtTok(plainIn)} miss · ${fmtTok(hitIn)} hit`:"";
   $("c1label").textContent=tabs[active].label;
   $("modelSum").textContent=fmtUsd(total);
 }
@@ -298,6 +305,7 @@ async function tick(){
     applyBudget(month);
     await loadModels();
     await loadTrend();
+    await loadSessions();
     dot.className="dot ok";st.textContent="live";
     $("lastUpd").textContent="last updated "+new Date().toLocaleTimeString();
   }catch(e){dot.className="dot err";st.textContent="error: "+e.message;}
@@ -310,28 +318,18 @@ document.querySelectorAll(".tab").forEach(t=>{
     t.setAttribute("aria-selected","true");
     active=t.dataset.tab;
     $("rangeRow").style.display = active==="range"?"block":"none";
-    $("sessionsPanel").style.display = active==="sessions"?"block":"none";
     if(active==="range"){
       if(!$("fromDate").value){const e=new Date();$("toDate").value=e.toISOString().slice(0,10);const s=new Date();s.setDate(s.getDate()-6);$("fromDate").value=s.toISOString().slice(0,10);}
       rangeApply();
-    }else if(active==="sessions"){
-      loadSessions();
     }else{
       loadModels();
     }
+    loadSessions();
   };
   t.addEventListener("click",activate);
   t.addEventListener("keydown",(e)=>{if(e.key==="Enter"||e.key===" "||e.key==="Spacebar"){e.preventDefault();activate();}});
 });
 $("rangeGo").addEventListener("click",rangeApply);
-document.querySelectorAll(".sday").forEach(b=>{
-  b.addEventListener("click",()=>{
-    document.querySelectorAll(".sday").forEach(x=>x.classList.remove("active"));
-    b.classList.add("active");
-    sessDays=parseInt(b.dataset.sdays,10);
-    loadSessions();
-  });
-});
 
 tick();
 setInterval(tick,15000);

package/lib/server.py

@@ -18,6 +18,7 @@ from __future__ import annotations
 
 import argparse
 import json
+import os
 import re
 import shutil
 import subprocess
@@ -193,9 +194,14 @@ def trend(days: int = 30) -> dict:
     return {"start": start.isoformat(), "end": end.isoformat(), "days": out}
 
 
-def sessions(since_days: int = 30) -> dict:
-    """Return ccusage's session report, with each session's cwd (projectPath) when
-    ccusage provides it. Data comes 100% from ccusage — we only re-shape it.
+def sessions(since_days: int = 30, period: str = "", from_date: str = "", to_date: str = "") -> dict:
+    """Return ccusage's session report, each with its real workdir (dirName) when
+    the agent's local session store records one. Every numeric cost/token field
+    comes 100% from ccusage; the workdir is only a display label.
+
+    Filtering: pass `period` in ("today" | "week" | "month") OR an explicit
+    date range via `from_date`/`to_date` (YYYY-MM-DD). `since_days` is kept for
+    backward compatibility with the old 7d/30d/90d/all selector.
     """
     data = run_ccusage(
         ["session", "--by-agent", "--json", "--offline"],
@@ -203,52 +209,76 @@ def sessions(since_days: int = 30) -> dict:
     )
     rows = data.get("session") or []
 
-    cutoff = date.today() - timedelta(days=since_days)
+    # ---- choose the cutoff window ----------------
+    today = date.today()
+    lo = hi = None
+    if from_date and to_date:
+        try:
+            lo = date.fromisoformat(from_date)
+            hi = date.fromisoformat(to_date)
+        except ValueError:
+            lo = hi = None
+    elif period == "today":
+        lo = hi = today
+    elif period == "week":
+        lo = today - timedelta(days=6)
+        hi = today
+    elif period == "month":
+        lo = today.replace(day=1)
+        hi = today
+    elif period == "custom":
+        pass  # fall through to since_days below (legacy)
+    if lo is None:
+        lo = today - timedelta(days=since_days)
+        hi = today
+
     out = []
     for r in rows:
         meta = r.get("metadata") or {}
-        sid = r.get("period")  # session id in ccusage's session report
+        sid = r.get("period")
         last_activity = meta.get("lastActivity") or ""
-        # date filter by last activity
+        # date filter by last activity against [lo, hi]
         if last_activity:
             try:
                 act_date = date.fromisoformat(last_activity[:10])
             except ValueError:
                 act_date = None
-            if act_date is not None and act_date < cutoff:
-                continue
+            if act_date is not None:
+                if act_date < lo or act_date > hi:
+                    continue
         project_raw = meta.get("projectPath") or ""
-        dir_name = _basename(project_raw)
-        cwd = _decode_cwd(project_raw)
-        # For pi sessions the authoritative workdir lives on disk (session file first-line
-        # "cwd"). Your dashboards want the REAL dir name (e.g. "fund-tracker", not the
-        # lossy basename "tracker"). This only affects the DISPLAY label — all numeric
-        # cost/token data still comes 100% from ccusage.
-        if project_raw and dir_name:
-            disk_cwd = _pi_cwd_from_disk(project_raw)
+        agent_name = r.get("agent", "?")
+        cwd = ""
+        dir_name = ""
+        if sid:
+            disk_cwd = _cwd_for(agent_name, sid, project_raw)
             if disk_cwd:
                 cwd = disk_cwd
-                disk_base = disk_cwd.rstrip("/").split("/")[-1]
-                if disk_base:
-                    dir_name = disk_base
+                cwd_base = disk_cwd.rstrip("/").split("/")[-1]
+                if cwd_base:
+                    dir_name = cwd_base
+        if not cwd:
+            cwd = _decode_cwd(project_raw)
+            dir_name = _basename(project_raw)
         out.append(
             {
                 "id": sid or "",
-                "agent": r.get("agent", "?"),
+                "agent": agent_name,
                 "cost": round(r.get("totalCost", 0) or 0, 4),
                 "inputTokens": r.get("inputTokens", 0),
                 "outputTokens": r.get("outputTokens", 0),
                 "cacheReadTokens": r.get("cacheReadTokens", 0),
                 "cacheCreationTokens": r.get("cacheCreationTokens", 0),
                 "lastActivity": last_activity,
-                "cwd": cwd,            # real workdir when known (pi), else best-effort decode
-                "dirName": dir_name,  # real dir name when known (pi), else last path segment
-                "projectKey": project_raw,  # raw ccusage projectPath
-                "hasCwd": bool(project_raw),
+                "cwd": cwd,
+                "dirName": dir_name,
+                "projectKey": project_raw,
+                "hasCwd": bool(cwd),
             }
         )
     out.sort(key=lambda s: s["cost"], reverse=True)
-    return {"total": len(out), "sessions": out}
+    total_cost = round(sum(s["cost"] for s in out), 4)
+    return {"total": len(out), "totalCost": total_cost, "sessions": out}
 
 
 def _pi_cwd_from_disk(project_key: str):
@@ -269,29 +299,141 @@ def _pi_cwd_from_disk(project_key: str):
         if not root.is_dir():
             return None
         candidates = sorted(glob.glob(str(root / "*.jsonl")))
-        if not candidates:
-            return None
         for path in candidates:
-            try:
-                with open(path, encoding="utf-8") as fh:
-                    for line in fh:
-                        line = line.strip()
-                        if not line:
-                            continue
-                        try:
-                            rec = json.loads(line)
-                        except Exception:
-                            continue
-                        cwd = rec.get("cwd")
-                        if isinstance(cwd, str) and cwd.strip():
-                            return cwd.strip().rstrip("/")
-            except (OSError, ValueError):
-                continue
+            cwd = _cwd_from_jsonl(path)
+            if cwd:
+                return cwd
     except Exception:
         return None
     return None
 
 
+# --- Unified authoritative-workdir resolution for every agent that stores one ---
+#
+# ccusage's session report only exposes projectPath for pi (and it's lossy for
+# hyphenated dir names). To show the REAL dir name for all sessions we resolve the
+# workdir from each agent's own local session store. This drives only the DISPLAY
+# label (dirName); every numeric cost/token value still comes 100% from ccusage.
+
+_CWD_CACHE = {}      # "agent\x1fsid" -> cwd | None
+_AGENT_INDEX = {}     # agent -> {session_id: [paths]} (built lazily)
+
+
+def _cwd_from_jsonl(path):
+    """Scan a session .jsonl (first few lines) for the first real 'cwd' string."""
+    try:
+        with open(path, encoding="utf-8") as fh:
+            for _ in range(80):
+                line = fh.readline()
+                if not line:
+                    break
+                line = line.strip()
+                if not line:
+                    continue
+                try:
+                    rec = json.loads(line)
+                except Exception:
+                    continue
+                if isinstance(rec, dict):
+                    cwd = rec.get("cwd")
+                    if isinstance(cwd, str) and cwd.strip():
+                        return cwd.strip().rstrip("/")
+    except (OSError, ValueError):
+        return None
+    return None
+
+
+def _codex_cwd(path):
+    """codex stores cwd inside the session_meta payload, not top-level."""
+    try:
+        with open(path, encoding="utf-8") as fh:
+            for _ in range(200):
+                line = fh.readline()
+                if not line:
+                    break
+                line = line.strip()
+                if not line:
+                    continue
+                try:
+                    rec = json.loads(line)
+                except Exception:
+                    continue
+                if isinstance(rec, dict) and rec.get("type") == "session_meta":
+                    cwd = (rec.get("payload") or {}).get("cwd")
+                    if isinstance(cwd, str) and cwd.strip():
+                        return cwd.strip().rstrip("/")
+    except (OSError, ValueError):
+        return None
+    return None
+
+
+def _agent_index(agent):
+    """Build (once) a {session_id: [paths]} for an agent's local session store."""
+    if agent in _AGENT_INDEX:
+        return _AGENT_INDEX[agent]
+    home = Path.home()
+    idx = {}
+    if agent == "openclaw":
+        base = home / ".openclaw" / "agents" / "main" / "sessions"
+        for f in (base.glob("*.jsonl") if base.is_dir() else []):
+            idx.setdefault(f.name[:-6], []).append(str(f))
+    elif agent == "claude":
+        proj = home / ".claude" / "projects"
+        if proj.is_dir():
+            for sub in proj.iterdir():
+                if sub.is_dir():
+                    for f in sub.glob("*.jsonl"):
+                        idx.setdefault(f.name[:-6], []).append(str(f))
+    elif agent == "codex":
+        root = home / ".codex" / "sessions"
+        if root.is_dir():
+            for f in root.glob("*/*/*/rollout-*.jsonl"):
+                idx.setdefault(f.name[len("rollout-"):-len(".jsonl")], []).append(str(f))
+            for f in root.glob("*/*/rollout-*.jsonl"):
+                idx.setdefault(f.name[len("rollout-"):-len(".jsonl")], []).append(str(f))
+    _AGENT_INDEX[agent] = idx
+    return idx
+
+
+def _session_to_cwd(agent, sid):
+    """Locate an agent's session file by id and return its real cwd (or None)."""
+    paths = _agent_index(agent).get(sid)
+    if not paths:
+        return None
+    for p in paths:
+        cwd = _codex_cwd(p) if agent == "codex" else _cwd_from_jsonl(p)
+        if cwd:
+            return cwd
+    return None
+
+
+def _cwd_for(agent, sid, project_key=""):
+    """Real workdir for a session. pi resolves by project key; the rest by session id.
+    Returns the real cwd (or None if unresolvable). Only drives the DISPLAY label."""
+    if agent == "pi":
+        if not project_key:
+            return None
+        key = "pi\x1f" + project_key
+        if key in _CWD_CACHE:
+            return _CWD_CACHE[key]
+        cwd = _pi_cwd_from_disk(project_key)
+        _CWD_CACHE[key] = cwd
+        return cwd
+    if not sid:
+        return None
+    # codex session ids are date-path prefixed ("2025/10/17/rollout-<id>"); the
+    # local file is named "rollout-<id>.jsonl", so match on the final segment.
+    lookup_sid = sid.split("/")[-1]
+    if lookup_sid.startswith("rollout-") and agent == "codex":
+        lookup_sid = lookup_sid[len("rollout-"):]
+    key = agent + "\x1f" + lookup_sid
+    if key in _CWD_CACHE:
+        return _CWD_CACHE[key]
+    cwd = _session_to_cwd(agent, lookup_sid)
+    _CWD_CACHE[key] = cwd
+    return cwd
+
+
 def _decode_cwd(raw: str) -> str:
     """Best-effort decode of ccusage's projectPath into a readable path.
 
@@ -378,8 +520,10 @@ class Handler(BaseHTTPRequestHandler):
             self._json(trend(days))
             return
         elif path == "/api/sessions":
+            period = params.get("period", "")
+            frm, to = params.get("from", ""), params.get("to", "")
             days = max(1, min(366, int(params.get("days", "30"))))
-            self._json(sessions(days))
+            self._json(sessions(days, period, frm, to))
             return
         else:
             self._send(404, b"not found", "text/plain")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caius_kong/ccusage-dashboard",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "One-command local dashboard for ccusage: today/week/month/custom cost by model, 30-day trend, monthly budget alert. Numbers straight from ccusage.",
   "license": "MIT",
   "type": "commonjs",