usage-cli 0.30.22__tar.gz → 0.30.24__tar.gz

{usage_cli-0.30.22/usage_cli.egg-info → usage_cli-0.30.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usage-cli
-Version: 0.30.22
+Version: 0.30.24
 Summary: usage — 在 macOS menu bar 與 Windows 系統匣顯示 Claude Code、Codex、Antigravity 用量的小工具（也提供終端機 TUI）
 License-Expression: AGPL-3.0-only
 Requires-Python: >=3.13
@@ -62,8 +62,9 @@ It lands in your Applications folder automatically. Open it once; if macOS 15 or
 ### Live Visibility
 
 - **Always-on Monitor:** Your quota lives in the menu bar, color-coded from green to red. Click when you want the full session, weekly, and per-project breakdown.
-- **Antigravity Support:** Antigravity (Gemini) session and weekly quota show up as a third card in every theme except World Cup 2026, which stays a two-team HUD. Numbers come straight from the official quota API, using the sign-in the Antigravity CLI already keeps on your machine — refreshed every few minutes, with live reset countdowns.
+- **Antigravity Support:** Antigravity (Gemini) session and weekly quota show up as a third card in every theme except World Cup 2026, which stays a two-team HUD. Numbers come straight from the official quota API, using the sign-in the Antigravity CLI already keeps on your machine — refreshed every few minutes, with live reset countdowns. Antigravity keeps two separate quota pools: the card shows Gemini by default, and tapping the `Gemini ⇄` tag next to the title switches it to Claude / GPT — the choice is remembered.
 - **Grok CLI Support:** A fourth card reads Grok CLI's weekly credit percentage straight from its own local debug log — no network call. Grok CLI doesn't expose session or burn-rate data, so the card shows a single weekly bar; its per-request token usage still counts toward today's cost and project totals like Claude Code and Codex.
+- **Muse Code Spending:** Muse Code's per-request tokens and cost count toward today's cost, project totals, the HTML report, and the `usage` CLI, read from its own local session logs. Muse keeps no local quota data, so there is no Muse quota card.
 - **Service Status Alerts:** An orange-red banner appears when Claude Code, Claude API, or Codex API has an outage or degraded performance, read from their public Statuspage.io pages — never an LLM usage API. Antigravity isn't covered; it has no public status page.
 - **Context Nudges & Notifications:** When your context window hits 70% — or earlier when it is filling fast — the status line nudges you to `/clear` or `/compact` to prevent token waste. You can also opt-in to system notifications for quota limits and recoveries.
 - **Prompt Cache Health:** The status line shows Claude Code's prompt cache hit rate with a countdown to expiry, so you can tell at a glance whether finishing now still reuses the cached context or lets it go cold and re-sends everything. Needs Claude Code 2.1.251 or newer; on older versions the segment simply doesn't appear.
@@ -204,8 +205,9 @@ If the menu bar shows `--`, it's usually not broken — there's just no local da
 | Always on screen | ✅ | — | ✅ |
 | macOS menu bar & Windows system tray | ✅ | — | macOS only |
 | Claude Code & Codex usage | ✅ | Claude only | ✅ |
-| Antigravity (Gemini) usage | ✅ | — | — |
+| Antigravity usage (Gemini and Claude / GPT) | ✅ | — | — |
 | Grok CLI usage | ✅ | — | — |
+| Muse Code token spend | ✅ | — | — |
 | Claude Code & Codex service-status alerts | ✅ | — | — |
 | HTML deep reports & UI | ✅ | ✅ | — |
 | AI Update Daily | ✅ | — | — |

{usage_cli-0.30.22 → usage_cli-0.30.24}/README.md

@@ -42,8 +42,9 @@ It lands in your Applications folder automatically. Open it once; if macOS 15 or
 ### Live Visibility
 
 - **Always-on Monitor:** Your quota lives in the menu bar, color-coded from green to red. Click when you want the full session, weekly, and per-project breakdown.
-- **Antigravity Support:** Antigravity (Gemini) session and weekly quota show up as a third card in every theme except World Cup 2026, which stays a two-team HUD. Numbers come straight from the official quota API, using the sign-in the Antigravity CLI already keeps on your machine — refreshed every few minutes, with live reset countdowns.
+- **Antigravity Support:** Antigravity (Gemini) session and weekly quota show up as a third card in every theme except World Cup 2026, which stays a two-team HUD. Numbers come straight from the official quota API, using the sign-in the Antigravity CLI already keeps on your machine — refreshed every few minutes, with live reset countdowns. Antigravity keeps two separate quota pools: the card shows Gemini by default, and tapping the `Gemini ⇄` tag next to the title switches it to Claude / GPT — the choice is remembered.
 - **Grok CLI Support:** A fourth card reads Grok CLI's weekly credit percentage straight from its own local debug log — no network call. Grok CLI doesn't expose session or burn-rate data, so the card shows a single weekly bar; its per-request token usage still counts toward today's cost and project totals like Claude Code and Codex.
+- **Muse Code Spending:** Muse Code's per-request tokens and cost count toward today's cost, project totals, the HTML report, and the `usage` CLI, read from its own local session logs. Muse keeps no local quota data, so there is no Muse quota card.
 - **Service Status Alerts:** An orange-red banner appears when Claude Code, Claude API, or Codex API has an outage or degraded performance, read from their public Statuspage.io pages — never an LLM usage API. Antigravity isn't covered; it has no public status page.
 - **Context Nudges & Notifications:** When your context window hits 70% — or earlier when it is filling fast — the status line nudges you to `/clear` or `/compact` to prevent token waste. You can also opt-in to system notifications for quota limits and recoveries.
 - **Prompt Cache Health:** The status line shows Claude Code's prompt cache hit rate with a countdown to expiry, so you can tell at a glance whether finishing now still reuses the cached context or lets it go cold and re-sends everything. Needs Claude Code 2.1.251 or newer; on older versions the segment simply doesn't appear.
@@ -184,8 +185,9 @@ If the menu bar shows `--`, it's usually not broken — there's just no local da
 | Always on screen | ✅ | — | ✅ |
 | macOS menu bar & Windows system tray | ✅ | — | macOS only |
 | Claude Code & Codex usage | ✅ | Claude only | ✅ |
-| Antigravity (Gemini) usage | ✅ | — | — |
+| Antigravity usage (Gemini and Claude / GPT) | ✅ | — | — |
 | Grok CLI usage | ✅ | — | — |
+| Muse Code token spend | ✅ | — | — |
 | Claude Code & Codex service-status alerts | ✅ | — | — |
 | HTML deep reports & UI | ✅ | ✅ | — |
 | AI Update Daily | ✅ | — | — |

usage_cli-0.30.24/adapters/muse.py

@@ -0,0 +1,43 @@
+# SPDX-License-Identifier: AGPL-3.0-only
+# Copyright (C) 2026 lollapalooza <https://github.com/aqua5230>
+
+from __future__ import annotations
+
+from loaders import muse_loader
+from loaders.history_loader import UsageEntry as MuseUsageEntry
+
+from i18n import t
+
+from .types import AgentInfo, UsageEntry
+
+
+def detect() -> AgentInfo | None:
+    if muse_loader.session_paths():
+        return AgentInfo(
+            id="muse",
+            name=t("muse_name"),
+            data_dir=str(muse_loader.MUSE_SESSIONS_DIR),
+            installed=True,
+        )
+    return None
+
+
+def load_entries(hours_back: int = 0) -> list[UsageEntry]:
+    return [_to_usage_entry(entry) for entry in muse_loader.load_entries(hours_back)]
+
+
+def _to_usage_entry(entry: MuseUsageEntry) -> UsageEntry:
+    return UsageEntry(
+        timestamp=entry.timestamp,
+        session_id=entry.session_id,
+        message_id=entry.message_id,
+        request_id=entry.request_id,
+        model=entry.model,
+        input_tokens=entry.input_tokens,
+        output_tokens=entry.output_tokens,
+        cache_creation_tokens=entry.cache_creation_tokens,
+        cache_read_tokens=entry.cache_read_tokens,
+        cost_usd=entry.cost_usd,
+        project=entry.project,
+        agent_id="muse",
+    )

{usage_cli-0.30.22 → usage_cli-0.30.24}/adapters/registry.py

@@ -5,12 +5,12 @@
 # License v3.0 only; see the LICENSE file for full terms and the warranty disclaimer.
 
 from .types import AgentInfo
-from . import agy, claude, codex, grok
+from . import agy, claude, codex, grok, muse
 
 
 def detect_agents() -> list[AgentInfo]:
     agents: list[AgentInfo] = []
-    for detector in [claude.detect, codex.detect, agy.detect, grok.detect]:
+    for detector in [claude.detect, codex.detect, agy.detect, grok.detect, muse.detect]:
         info = detector()
         if info:
             agents.append(info)

{usage_cli-0.30.22 → usage_cli-0.30.24}/analyzer/aggregator.py

@@ -122,6 +122,7 @@ def aggregate_sessions(entries: list[UsageEntry]) -> list[SessionStats]:
             start_time=first.timestamp,
             end_time=last.timestamp,
             duration_minutes=round(duration, 1),
+            agent_id=first.agent_id,
         )
         for e in session_entries:
             cost = calculate_cost(e)

usage_cli-0.30.24/analyzer/dispatch_ledger.py

@@ -0,0 +1,451 @@
+# SPDX-License-Identifier: AGPL-3.0-only
+# Copyright (C) 2026 lollapalooza <https://github.com/aqua5230>
+
+"""Local dispatch matching and subscription quota estimates for HTML reports."""
+
+from __future__ import annotations
+
+from collections import defaultdict
+from dataclasses import dataclass
+from datetime import UTC, datetime, timedelta
+import json
+from pathlib import Path
+import re
+import sqlite3
+from typing import Any, TypedDict
+
+from adapters import rate_limits
+from adapters.types import UsageEntry
+from loaders import agy_loader, agy_quota_probe, codex_loader
+from loaders.claude_paths import claude_config_dirs
+
+_DISPATCH = {
+    "codex": re.compile(r"(^|[;&|(\s])codex exec"),
+    "antigravity": re.compile(r"(^|[;&|(\s])agy -p"),
+}
+_UUID = re.compile(r"\b[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}\b")
+_CWD = re.compile(rb'"Cwd":"((?:[^"\\]|\\.)*)"')
+_file_cache: dict[tuple[Path, int, float], list[Dispatch]] = {}
+_codex_cache: dict[Path, tuple[tuple[int, float], Candidate | None]] = {}
+
+
+@dataclass(frozen=True)
+class Dispatch:
+    timestamp: datetime
+    session_id: str
+    cwd: str
+    command: str
+    agent_id: str
+
+
+@dataclass(frozen=True)
+class Candidate:
+    agent_id: str
+    session_id: str
+    timestamp: datetime
+    cwd: str
+    first_message: str = ""
+
+
+@dataclass(frozen=True)
+class QuotaWindow:
+    used_pct: float
+    resets_at: datetime
+    length: timedelta
+
+
+class LedgerRow(TypedDict):
+    date: str
+    project: str
+    title: str
+    dispatch_count: int
+    claude_pct: float | None
+    codex_pct: float | None
+    agy_pct: float | None
+    total_pct: float
+
+
+class LedgerData(TypedDict):
+    rows: list[LedgerRow]
+    unowned_codex: int
+    unowned_agy: int
+
+
+def _timestamp(value: object) -> datetime | None:
+    try:
+        if isinstance(value, (float, int)) and not isinstance(value, bool):
+            return datetime.fromtimestamp(value, UTC)
+        if isinstance(value, str):
+            parsed = datetime.fromisoformat(value.replace("Z", "+00:00"))
+            return parsed.replace(tzinfo=UTC) if parsed.tzinfo is None else parsed.astimezone(UTC)
+    except (ValueError, OverflowError):
+        pass
+    return None
+
+
+def _dict(value: object) -> dict[str, Any]:
+    return value if isinstance(value, dict) else {}
+
+
+def _claude_paths(cutoff: datetime) -> list[Path]:
+    paths: list[Path] = []
+    for root in claude_config_dirs():
+        for path in (root / "projects").glob("*/*.jsonl"):
+            try:
+                if path.stat().st_mtime >= cutoff.timestamp():
+                    paths.append(path)
+            except OSError:
+                continue
+    return paths
+
+
+def _read_dispatches(path: Path) -> list[Dispatch]:
+    try:
+        stat = path.stat()
+        key = (path, stat.st_size, stat.st_mtime)
+        cached = _file_cache.get(key)
+        if cached is not None:
+            return cached
+        found: list[Dispatch] = []
+        with path.open(encoding="utf-8", errors="replace") as stream:
+            for line in stream:
+                if "codex exec" not in line and "agy -p" not in line:
+                    continue
+                try:
+                    record = _dict(json.loads(line))
+                except json.JSONDecodeError:
+                    continue
+                timestamp = _timestamp(record.get("timestamp"))
+                if timestamp is None:
+                    continue
+                message = _dict(record.get("message"))
+                blocks = message.get("content")
+                if not isinstance(blocks, list):
+                    blocks = [record]
+                for block in blocks:
+                    item = _dict(block)
+                    if item.get("type") != "tool_use" or item.get("name") != "Bash":
+                        continue
+                    command = _dict(item.get("input")).get("command")
+                    if not isinstance(command, str):
+                        continue
+                    for agent_id, pattern in _DISPATCH.items():
+                        for _ in pattern.finditer(command):
+                            found.append(
+                                Dispatch(
+                                    timestamp,
+                                    path.stem,
+                                    str(record.get("cwd") or ""),
+                                    command,
+                                    agent_id,
+                                )
+                            )
+        for old_key in tuple(_file_cache):
+            if old_key[0] == path and old_key != key:
+                del _file_cache[old_key]
+        _file_cache[key] = found
+        return found
+    except OSError:
+        return []
+
+
+def _read_codex_candidate(path: Path) -> Candidate | None:
+    try:
+        stat = path.stat()
+        signature = (stat.st_size, stat.st_mtime)
+        cached = _codex_cache.get(path)
+        if cached is not None and cached[0] == signature:
+            return cached[1]
+        candidate = None
+        with path.open(encoding="utf-8", errors="replace") as stream:
+            first = _dict(json.loads(next(stream)))
+            meta = _dict(first.get("payload"))
+            started = _timestamp(first.get("timestamp"))
+            if (
+                first.get("type") == "session_meta"
+                and meta.get("originator") == "codex_exec"
+                and started is not None
+            ):
+                message = ""
+                for line in stream:
+                    if '"user_message"' not in line:
+                        continue
+                    try:
+                        payload = _dict(_dict(json.loads(line)).get("payload"))
+                    except json.JSONDecodeError:
+                        continue
+                    if payload.get("type") == "user_message":
+                        message = str(payload.get("message") or "")
+                        break
+                candidate = Candidate(
+                    "codex",
+                    str(meta.get("id") or path.stem),
+                    started,
+                    str(meta.get("cwd") or ""),
+                    message,
+                )
+        _codex_cache[path] = (signature, candidate)
+        return candidate
+    except (OSError, StopIteration, json.JSONDecodeError):
+        return None
+
+
+def _codex_candidates(cutoff: datetime, now: datetime) -> list[Candidate]:
+    day = (cutoff - timedelta(days=1)).date()
+    day_dirs = []
+    while day <= (now + timedelta(days=1)).date():
+        day_dirs.append(codex_loader.SESSIONS_DIR / f"{day:%Y}" / f"{day:%m}" / f"{day:%d}")
+        day += timedelta(days=1)
+    result: list[Candidate] = []
+    for path in (path for day_dir in day_dirs for path in day_dir.glob("*.jsonl")):
+        candidate = _read_codex_candidate(path)
+        if candidate is not None and cutoff <= candidate.timestamp <= now:
+            result.append(candidate)
+    return result
+
+
+def _agy_candidates(cutoff: datetime, now: datetime) -> list[Candidate]:
+    result: list[Candidate] = []
+    for path in agy_loader.AGY_SESSIONS_DIR.glob("*.db"):
+        try:
+            if path.stat().st_mtime < cutoff.timestamp():
+                continue
+            with sqlite3.connect(agy_loader._readonly_sqlite_uri(path), uri=True) as connection:
+                started = agy_loader._session_timestamp(connection, path)
+                if not cutoff <= started <= now:
+                    continue
+                row = connection.execute(
+                    'SELECT step_payload FROM steps WHERE step_payload LIKE \'%"Cwd":"%\' ORDER BY idx LIMIT 1'
+                ).fetchone()
+                match = _CWD.search(row[0]) if row and isinstance(row[0], bytes) else None
+                cwd = (
+                    json.loads('"' + match.group(1).decode("utf-8", "replace") + '"')
+                    if match
+                    else ""
+                )
+                result.append(
+                    Candidate(
+                        "antigravity", path.stem, started, cwd if isinstance(cwd, str) else ""
+                    )
+                )
+        except (OSError, sqlite3.Error, json.JSONDecodeError):
+            continue
+    return result
+
+
+def match_candidate(
+    candidate: Candidate, dispatches: list[Dispatch], known_sessions: set[str]
+) -> str | None:
+    if candidate.agent_id == "codex":
+        direct: set[str] = {
+            value.lower() for value in _UUID.findall(candidate.cwd + " " + candidate.first_message)
+        } & known_sessions
+        if len(direct) == 1:
+            return next(iter(direct))
+        if len(direct) > 1:
+            return None
+    eligible = [
+        dispatch
+        for dispatch in dispatches
+        if dispatch.agent_id == candidate.agent_id
+        and -5 <= (candidate.timestamp - dispatch.timestamp).total_seconds() <= 120
+    ]
+    owners = {dispatch.session_id for dispatch in eligible}
+    if len(owners) > 1:
+        eligible = [
+            dispatch
+            for dispatch in eligible
+            if candidate.cwd
+            and (candidate.cwd == dispatch.cwd or candidate.cwd in dispatch.command)
+        ]
+        owners = {dispatch.session_id for dispatch in eligible}
+    return next(iter(owners)) if len(owners) == 1 else None
+
+
+def _window(pct: float | None, reset: object, minutes: float) -> QuotaWindow | None:
+    resets_at = _timestamp(reset)
+    if pct is None or resets_at is None or minutes <= 0:
+        return None
+    return QuotaWindow(pct, resets_at, timedelta(minutes=minutes))
+
+
+def load_windows() -> dict[str, QuotaWindow]:
+    windows: dict[str, QuotaWindow] = {}
+    claude = rate_limits.load_rate_limits()
+    if claude:
+        window = _window(claude.seven_day_pct, claude.seven_day_resets_at, 7 * 24 * 60)
+        if window:
+            windows["claude-code"] = window
+    codex = codex_loader.load_rate_limits()
+    if codex:
+        window = _window(
+            codex.seven_day_pct,
+            codex.seven_day_resets_at,
+            codex.seven_day_window_minutes or 7 * 24 * 60,
+        )
+        if window:
+            windows["codex"] = window
+    agy = agy_quota_probe._read_cache()
+    if agy:
+        fetched = _timestamp(agy.fetched_at)
+        if fetched:
+            for group in agy.groups:
+                minutes = group.weekly.resets_in_minutes
+                if minutes is None:
+                    continue
+                window = QuotaWindow(
+                    100 - group.weekly.remaining_percent,
+                    fetched + timedelta(minutes=minutes),
+                    timedelta(days=7),
+                )
+                group_key = f"antigravity:{group.name}"
+                windows[group_key] = window
+                for model in group.models:
+                    windows[f"antigravity-model:{model.lower()}"] = window
+    return windows
+
+
+def estimate_pct(
+    session_tokens: int, total_tokens: int, window: QuotaWindow | None, now: datetime
+) -> float | None:
+    if window is None or window.resets_at <= now or total_tokens <= 0:
+        return None
+    return session_tokens / total_tokens * window.used_pct
+
+
+def estimate_sessions(
+    entries: list[UsageEntry], windows: dict[str, QuotaWindow], now: datetime
+) -> dict[tuple[str, str], float | None]:
+    totals: dict[str, int] = defaultdict(int)
+    sessions: dict[tuple[str, str, str], int] = defaultdict(int)
+    for entry in entries:
+        group = entry.agent_id
+        if entry.agent_id == "antigravity":
+            model = entry.model.lower().replace("-", " ")
+            matched = next(
+                (
+                    label.removeprefix("antigravity-model:")
+                    for label in windows
+                    if label.startswith("antigravity-model:")
+                    and all(
+                        word in model for word in label.removeprefix("antigravity-model:").split()
+                    )
+                ),
+                None,
+            )
+            if matched is None:
+                continue
+            group = next(
+                (
+                    key
+                    for key, window in windows.items()
+                    if key.startswith("antigravity:")
+                    and window is windows[f"antigravity-model:{matched}"]
+                ),
+                "",
+            )
+        window = windows.get(group)
+        if window is None or not window.resets_at - window.length <= entry.timestamp <= now:
+            continue
+        tokens = entry.input_tokens + entry.output_tokens + entry.cache_creation_tokens
+        totals[group] += tokens
+        sessions[(entry.agent_id, entry.session_id, group)] += tokens
+    estimates: dict[tuple[str, str], float | None] = {}
+    for (agent_id, session_id, group), tokens in sessions.items():
+        value = estimate_pct(tokens, totals[group], windows.get(group), now)
+        if value is not None:
+            key = (agent_id, session_id)
+            estimates[key] = (estimates.get(key) or 0.0) + value
+    return estimates
+
+
+def _session_title(path: Path) -> str:
+    """Return Claude Code's own ai-title, falling back to the first user text."""
+    title = first_text = ""
+    try:
+        with path.open(encoding="utf-8", errors="replace") as stream:
+            for line in stream:
+                if '"ai-title"' not in line and (first_text or '"user"' not in line):
+                    continue
+                try:
+                    item = _dict(json.loads(line))
+                except json.JSONDecodeError:
+                    continue
+                if item.get("type") == "ai-title" and isinstance(item.get("aiTitle"), str):
+                    title = item["aiTitle"].strip()
+                elif item.get("type") == "user" and not first_text:
+                    content = _dict(item.get("message")).get("content")
+                    blocks = [{"text": content}] if isinstance(content, str) else content
+                    for block in blocks if isinstance(blocks, list) else []:
+                        text = _dict(block).get("text")
+                        if isinstance(text, str) and text.strip():
+                            first_text = text.strip()[:40]
+                            break
+    except OSError:
+        return ""
+    return title or first_text
+
+
+def build_ledger(estimates: dict[tuple[str, str], float | None], now: datetime) -> LedgerData:
+    cutoff = now - timedelta(days=7)
+    paths = _claude_paths(cutoff)
+    dispatches = [
+        item for path in paths for item in _read_dispatches(path) if cutoff <= item.timestamp <= now
+    ]
+    empty: LedgerData = {"rows": [], "unowned_codex": 0, "unowned_agy": 0}
+    if not dispatches:
+        return empty
+    known_sessions = {path.stem for path in paths}
+    candidates = _codex_candidates(cutoff - timedelta(seconds=5), now) + _agy_candidates(
+        cutoff - timedelta(seconds=5), now
+    )
+    owned: dict[str, dict[str, set[str]]] = defaultdict(lambda: defaultdict(set))
+    for candidate in candidates:
+        owner = match_candidate(candidate, dispatches, known_sessions)
+        if owner is None:
+            if candidate.agent_id == "codex":
+                empty["unowned_codex"] += 1
+            else:
+                empty["unowned_agy"] += 1
+        else:
+            owned[owner][candidate.agent_id].add(candidate.session_id)
+    if not owned:
+        return empty
+    path_by_session = {path.stem: path for path in paths}
+    by_owner: dict[str, list[Dispatch]] = defaultdict(list)
+    for dispatch in dispatches:
+        by_owner[dispatch.session_id].append(dispatch)
+    rows: list[tuple[str, LedgerRow]] = []
+    for owner, children in owned.items():
+        origin = by_owner.get(owner)
+        if not origin:
+            continue
+        shares = {"claude-code": estimates.get(("claude-code", owner))}
+        for agent_id in ("codex", "antigravity"):
+            values = [estimates.get((agent_id, session_id)) for session_id in children[agent_id]]
+            shares[agent_id] = (
+                sum(value for value in values if value is not None)
+                if any(value is not None for value in values)
+                else None
+            )
+        first = min(origin, key=lambda item: item.timestamp)
+        rows.append(
+            (
+                owner,
+                {
+                    "date": first.timestamp.astimezone().strftime("%Y-%m-%d"),
+                    "project": Path(first.cwd).name or "unknown",
+                    "title": "",
+                    "dispatch_count": len(origin),
+                    "claude_pct": shares["claude-code"],
+                    "codex_pct": shares["codex"],
+                    "agy_pct": shares["antigravity"],
+                    "total_pct": sum(value for value in shares.values() if value is not None),
+                },
+            )
+        )
+    rows.sort(key=lambda item: item[1]["total_pct"], reverse=True)
+    for owner, row in rows[:15]:
+        row["title"] = _session_title(path_by_session[owner])
+        empty["rows"].append(row)
+    return empty

{usage_cli-0.30.22 → usage_cli-0.30.24}/analyzer/reporter.py

@@ -22,16 +22,22 @@ from typing import Any, NotRequired, TypedDict, cast
 from loaders import cache_quarantine, codex_loader
 from analyzer import persona_loader
 from analyzer import subscription
-from adapters import agy, claude, codex, grok
+from adapters import agy, claude, codex, grok, muse
 from adapters.types import AgentInfo, UsageEntry
 from pricing import calculate_cost, is_model_priced
 
 from .aggregator import aggregate_sessions
-from . import diagnoser, usage_snapshot
+from . import diagnoser, dispatch_ledger, usage_snapshot
 
 logger = logging.getLogger(__name__)
 
-AGENT_LOADERS = {"claude-code": claude, "codex": codex, "antigravity": agy, "grok": grok}
+AGENT_LOADERS = {
+    "claude-code": claude,
+    "codex": codex,
+    "antigravity": agy,
+    "grok": grok,
+    "muse": muse,
+}
 AGENT_NAMES = {"claude-code": "Claude Code", "codex": "Codex"}
 _YEAR_WEEKS = 53
 YEAR_CACHE_PATH = Path(os.path.expanduser("~/.usage/year_cache.json"))
@@ -124,6 +130,7 @@ class TopSessionReportRow(TypedDict):
     duration_min: float
     tokens: int
     cost: float
+    weekly_quota_pct: float | None
 
 
 class CubeAgentData(TypedDict):
@@ -235,6 +242,7 @@ class ReportData(_ReportDataRequired, total=False):
     by_agent_model: list[AgentModelReportRow]
     cube: CubeReportData
     sessions: list[SessionRowData]
+    dispatch_ledger: dispatch_ledger.LedgerData
 
 
 @dataclass(frozen=True)
@@ -905,6 +913,11 @@ def build_report_data(agents: list[AgentInfo], period: str = "month") -> ReportD
         prev_date_from = date_from - timedelta(days=total_days_for_comparison)
         hours_back = ((date_to - prev_date_from).days + 2) * 24
 
+    weekly_preloaded = (
+        [entry for agent in agents for entry in _load_agent_entries(agent, 8 * 24)]
+        if hours_back < 8 * 24
+        else None
+    )
     raw_entries: list[UsageEntry] = []
     for agent in agents:
         raw_entries.extend(_load_agent_entries(agent, hours_back))
@@ -1187,6 +1200,10 @@ def build_report_data(agents: list[AgentInfo], period: str = "month") -> ReportD
         cursor += timedelta(days=1)
 
     top_sessions: list[TopSessionReportRow] = []
+    now = datetime.now().astimezone(timezone.utc)
+    weekly_entries = raw_entries if weekly_preloaded is None else weekly_preloaded
+    windows = dispatch_ledger.load_windows() if weekly_entries else {}
+    estimates = dispatch_ledger.estimate_sessions(weekly_entries, windows, now)
     sessions_by_cost = sorted(
         aggregate_sessions(entries), key=lambda session: session.cost_usd, reverse=True
     )
@@ -1194,16 +1211,16 @@ def build_report_data(agents: list[AgentInfo], period: str = "month") -> ReportD
         sessions_by_cost, key=lambda session: session.total_tokens, reverse=True
     )
     for session in sessions_by_tokens[:5]:
-        top_sessions.append(
-            {
-                "start_time": _session_start_text(session.start_time),
-                "project": session.project or "unknown",
-                "model": session.model or "unknown",
-                "duration_min": session.duration_minutes,
-                "tokens": session.total_tokens,
-                "cost": _round_cost(session.cost_usd),
-            }
-        )
+        session_row: TopSessionReportRow = {
+            "start_time": _session_start_text(session.start_time),
+            "project": session.project or "unknown",
+            "model": session.model or "unknown",
+            "duration_min": session.duration_minutes,
+            "tokens": session.total_tokens,
+            "cost": _round_cost(session.cost_usd),
+            "weekly_quota_pct": estimates.get((session.agent_id, session.session_id)),
+        }
+        top_sessions.append(session_row)
 
     session_rows: list[SessionRowData] = []
     for session in sessions_by_cost:
@@ -1250,6 +1267,7 @@ def build_report_data(agents: list[AgentInfo], period: str = "month") -> ReportD
         "sessions": session_rows,
         "daily_trend": daily_trend,
         "top_sessions": top_sessions,
+        "dispatch_ledger": dispatch_ledger.build_ledger(estimates, now),
         "comparison": comparison,
         "subscriptions": subscription.load_subscriptions(),
         "persona": _load_persona_for_period(period),