usage-cli 0.34.5__tar.gz → 0.34.6__tar.gz

{usage_cli-0.34.5/usage_cli.egg-info → usage_cli-0.34.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usage-cli
-Version: 0.34.5
+Version: 0.34.6
 Summary: usage — 在 macOS menu bar 與 Windows 系統匣顯示 Claude Code、Codex、Antigravity 用量的小工具（也提供終端機 TUI）
 License-Expression: AGPL-3.0-only
 Requires-Python: >=3.13

{usage_cli-0.34.5 → usage_cli-0.34.6}/analyzer/dispatch_ledger.py

@@ -18,6 +18,7 @@ from adapters import rate_limits
 from adapters.types import UsageEntry
 from loaders import agy_loader, agy_quota_probe, codex_loader, muse_quota_probe
 from loaders.claude_paths import claude_config_dirs
+from usage_common.project_resolver import resolve_project_name
 
 _DISPATCH = {
     "codex": re.compile(r"(^|[;&|(\s])codex exec"),
@@ -61,7 +62,10 @@ class LedgerRow(TypedDict):
     dispatch_count: int
     claude_pct: float | None
     codex_pct: float | None
-    agy_pct: float | None
+    agy_groups: dict[str, float]
+    claude_reset: bool
+    codex_reset: bool
+    agy_reset: bool
     total_pct: float
 
 
@@ -69,6 +73,52 @@ class LedgerData(TypedDict):
     rows: list[LedgerRow]
     unowned_codex: int
     unowned_agy: int
+    used_pct: dict[str, float]
+
+
+class LedgerBlock(TypedDict):
+    quota: str
+    used_pct: float | None
+    conversations: list[tuple[LedgerRow, float]]
+    more_count: int
+    more_pct: float
+    other_pct: float | None
+    all_reset: bool
+
+
+def ledger_blocks(rows: list[LedgerRow], used_pct: dict[str, float]) -> list[LedgerBlock]:
+    """Select each quota's top five from every owned conversation."""
+    shares: dict[str, list[tuple[LedgerRow, float]]] = defaultdict(list)
+    for row in rows:
+        if row["codex_pct"] is not None and row["codex_pct"] > 0:
+            shares["codex"].append((row, row["codex_pct"]))
+        for group, value in row["agy_groups"].items():
+            if value > 0:
+                shares[f"antigravity:{group}"].append((row, value))
+    if any(row["codex_reset"] for row in rows):
+        shares.setdefault("codex", [])
+    blocks: list[LedgerBlock] = []
+    for quota, conversations in shares.items():
+        conversations.sort(key=lambda item: item[1], reverse=True)
+        total = sum(value for _, value in conversations)
+        used = used_pct.get(quota)
+        other = max(0.0, used - total) if used is not None else None
+        blocks.append(
+            {
+                "quota": quota,
+                "used_pct": used,
+                "conversations": conversations[:5],
+                "more_count": len(conversations[5:]),
+                "more_pct": sum(value for _, value in conversations[5:]),
+                "other_pct": other if other is not None and other >= 0.5 else None,
+                "all_reset": quota == "codex" and not conversations,
+            }
+        )
+    blocks.sort(
+        key=lambda block: sum(value for _, value in block["conversations"]) + block["more_pct"],
+        reverse=True,
+    )
+    return blocks
 
 
 def _timestamp(value: object) -> datetime | None:
@@ -319,11 +369,15 @@ def estimate_pct(
     return session_tokens / total_tokens * window.used_pct
 
 
+SessionGroup = tuple[str, str, str]
+
+
 def estimate_sessions(
     entries: list[UsageEntry], windows: dict[str, QuotaWindow], now: datetime
-) -> dict[tuple[str, str], float | None]:
+) -> tuple[dict[SessionGroup, float], set[SessionGroup]]:
     totals: dict[str, int] = defaultdict(int)
     sessions: dict[tuple[str, str, str], int] = defaultdict(int)
+    before_window: set[SessionGroup] = set()
     for entry in entries:
         group = entry.agent_id
         if entry.agent_id == "antigravity":
@@ -351,18 +405,21 @@ def estimate_sessions(
                 "",
             )
         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
+        if window is None or entry.timestamp > now or tokens <= 0:
+            continue
+        key = (entry.agent_id, entry.session_id, group)
+        if entry.timestamp < window.resets_at - window.length:
+            before_window.add(key)
+            continue
         totals[group] += tokens
-        sessions[(entry.agent_id, entry.session_id, group)] += tokens
-    estimates: dict[tuple[str, str], float | None] = {}
+        sessions[key] += tokens
+    estimates: dict[SessionGroup, float] = {}
     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
+            estimates[(agent_id, session_id, group)] = value
+    return estimates, before_window - sessions.keys()
 
 
 def _session_title(path: Path) -> str:
@@ -392,13 +449,23 @@ def _session_title(path: Path) -> str:
     return title or first_text
 
 
-def build_ledger(estimates: dict[tuple[str, str], float | None], now: datetime) -> LedgerData:
+def build_ledger(
+    estimates: dict[SessionGroup, float],
+    now: datetime,
+    reset_sessions: set[SessionGroup] | None = None,
+    used_pct: dict[str, float] | None = None,
+) -> 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}
+    empty: LedgerData = {
+        "rows": [],
+        "unowned_codex": 0,
+        "unowned_agy": 0,
+        "used_pct": used_pct or {},
+    }
     if not dispatches:
         return empty
     known_sessions = {path.stem for path in paths}
@@ -426,32 +493,51 @@ def build_ledger(estimates: dict[tuple[str, str], float | None], now: datetime)
         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
-            )
+        claude_pct = estimates.get(("claude-code", owner, "claude-code"))
+        codex_values = [
+            estimates[("codex", child, "codex")]
+            for child in children["codex"]
+            if ("codex", child, "codex") in estimates
+        ]
+        codex_pct = sum(codex_values) if codex_values else None
+        agy_groups: dict[str, float] = {}
+        for (agent, child, group), value in estimates.items():
+            if agent == "antigravity" and child in children[agent]:
+                name = group.removeprefix("antigravity:")
+                agy_groups[name] = agy_groups.get(name, 0.0) + value
+        reset_agents = {
+            agent
+            for agent, session, _ in reset_sessions or set()
+            if (agent == "claude-code" and session == owner)
+            or session in children.get(agent, set())
+        }
         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",
+                    "project": resolve_project_name(first.cwd),
                     "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),
+                    "claude_pct": claude_pct,
+                    "codex_pct": codex_pct,
+                    "agy_groups": agy_groups,
+                    "claude_reset": claude_pct is None and "claude-code" in reset_agents,
+                    "codex_reset": codex_pct is None and "codex" in reset_agents,
+                    "agy_reset": not agy_groups and "antigravity" in reset_agents,
+                    "total_pct": (claude_pct or 0) + (codex_pct or 0) + sum(agy_groups.values()),
                 },
             )
         )
     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)
+    empty["rows"] = [row for _, row in rows]
+    displayed = {
+        id(row)
+        for block in ledger_blocks(empty["rows"], empty["used_pct"])
+        for row, _ in block["conversations"]
+    }
+    for owner, row in rows:
+        if id(row) in displayed:
+            row["title"] = _session_title(path_by_session[owner])
     return empty

{usage_cli-0.34.5 → usage_cli-0.34.6}/analyzer/reporter.py

@@ -1258,7 +1258,13 @@ def build_report_data(agents: list[AgentInfo], period: str = "month") -> ReportD
         entry for entry in weekly_entries if not ledger_backfill.is_ledger_entry(entry)
     ]
     windows = dispatch_ledger.load_windows() if weekly_entries else {}
-    estimates = dispatch_ledger.estimate_sessions(weekly_entries, windows, now)
+    group_estimates, reset_sessions = dispatch_ledger.estimate_sessions(
+        weekly_entries, windows, now
+    )
+    estimates: dict[tuple[str, str], float] = {}
+    for (agent_id, session_id, _), value in group_estimates.items():
+        key = (agent_id, session_id)
+        estimates[key] = estimates.get(key, 0.0) + value
     sessions_by_cost = sorted(
         aggregate_sessions(real_entries), key=lambda session: session.cost_usd, reverse=True
     )
@@ -1322,7 +1328,12 @@ 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),
+        "dispatch_ledger": dispatch_ledger.build_ledger(
+            group_estimates,
+            now,
+            reset_sessions,
+            {key: window.used_pct for key, window in windows.items()},
+        ),
         "comparison": comparison,
         "subscriptions": subscription.load_subscriptions(),
         "persona": _load_persona_for_period(period),

{usage_cli-0.34.5 → usage_cli-0.34.6}/i18n.json

@@ -223,16 +223,7 @@
     "report_cost": "API 等值",
     "report_quota_share": "約佔週額度",
     "report_quota_approx": "約 {value}%",
-    "report_ledger_section": "派工帳本（最近 7 天）",
-    "report_ledger_date": "日期",
-    "report_ledger_title": "對話標題",
-    "report_ledger_count": "派工次數",
-    "report_ledger_claude": "Claude 週額度",
-    "report_ledger_codex": "Codex 週額度",
-    "report_ledger_agy": "Antigravity 週額度",
-    "report_ledger_unowned_part": "{count} 個 {agent}",
-    "report_ledger_unowned_sep": "、",
-    "report_ledger_unowned": "另有 {items} 對話找不到由 Claude 派工的紀錄，未列入上表",
+    "report_ledger_section": "派工額度花在哪（最近 7 天）",
     "report_daily_chart_title": "每日用量",
     "report_daily_chart_mode_tokens": "Tokens",
     "report_daily_chart_mode_cost": "API 等值",
@@ -320,9 +311,9 @@
     "report_wrapped_top_project": "最常用專案",
     "report_wrapped_books_equivalent": "≈ {books} 本書的字量",
     "report_wrapped_beast_phoenix_title": "鳳凰加冕",
-    "report_wrapped_beast_phoenix_caption": "今年 Claude 的火力略勝一籌，像把灰燼一口氣吹回天空。",
+    "report_wrapped_beast_phoenix_caption": "近一年 Claude 的火力略勝一籌，像把灰燼一口氣吹回天空。",
     "report_wrapped_beast_dragon_title": "巨龍加冕",
-    "report_wrapped_beast_dragon_caption": "今年 Codex 的火力更猛，像一條龍一路把工地燒到完工。",
+    "report_wrapped_beast_dragon_caption": "近一年 Codex 的火力更猛，像一條龍一路把工地燒到完工。",
     "project_butler": "接著上次做",
     "project_butler_tooltip": "開新對話時，自動把上次的進度交給 AI，不用再重講一次。",
     "terse_mode_menu": "省 token 模式",
@@ -552,14 +543,19 @@
     "claude_desktop_updated": "Claude 桌面版 · {minutes} 分鐘前更新",
     "claude_desktop_stale": "Claude 桌面版 · 資料過期 · {minutes} 分鐘前更新",
     "report_project_others": "其他專案",
-    "report_ledger_pct_note": "Claude、Codex、Antigravity 三欄是約佔該工具週額度的百分比。",
+    "report_ledger_lead": "Claude 派給 Codex、Antigravity 的工作，各吃掉多少週額度。",
     "report_trend_partial_week": "僅 {days} 天",
     "report_history_scope": "分工具紀錄從 {date} 起；更早的每日總量只在下方熱力圖",
     "report_composition_missing": "另有 {tokens} tokens 沒有輸入／輸出拆解",
     "report_wrapped_cost_scope": "只含有價格紀錄的日子（{date} 起）",
     "report_wrapped_cost_no_records": "沒有價格紀錄",
-    "report_wrapped_beast_phoenix_caption_dominant": "今年 Claude 的用量遙遙領先。",
-    "report_wrapped_beast_dragon_caption_dominant": "今年 Codex 的用量遙遙領先。"
+    "report_wrapped_beast_phoenix_caption_dominant": "近一年 Claude 的用量遙遙領先。",
+    "report_wrapped_beast_dragon_caption_dominant": "近一年 Codex 的用量遙遙領先。",
+    "report_ledger_used": "本週已用 {pct}%",
+    "report_ledger_row_meta": "{project} · 派工 {count} 次",
+    "report_ledger_more": "另外 {count} 段派工對話",
+    "report_ledger_other": "其他（你直接用的，或沒對到派工紀錄）",
+    "report_ledger_all_reset": "最近 7 天的派工都在額度重置前，算在上週。"
   },
   "en": {
     "panel_default_name": "Default",
@@ -785,16 +781,7 @@
     "report_cost": "API equivalent",
     "report_quota_share": "Approx. weekly quota",
     "report_quota_approx": "about {value}%",
-    "report_ledger_section": "Dispatch ledger (last 7 days)",
-    "report_ledger_date": "Date",
-    "report_ledger_title": "Conversation title",
-    "report_ledger_count": "Dispatches",
-    "report_ledger_claude": "Claude weekly quota",
-    "report_ledger_codex": "Codex weekly quota",
-    "report_ledger_agy": "Antigravity weekly quota",
-    "report_ledger_unowned_part": "{count} {agent}",
-    "report_ledger_unowned_sep": ", ",
-    "report_ledger_unowned": "No record of dispatch by Claude was found for another {items} conversations; they are not included in the table above",
+    "report_ledger_section": "Where your dispatch quota went (last 7 days)",
     "report_daily_chart_title": "Daily usage",
     "report_daily_chart_mode_tokens": "Tokens",
     "report_daily_chart_mode_cost": "API equivalent",
@@ -882,9 +869,9 @@
     "report_wrapped_top_project": "Top project",
     "report_wrapped_books_equivalent": "≈ {books} books worth of words",
     "report_wrapped_beast_phoenix_title": "Phoenix Crowned",
-    "report_wrapped_beast_phoenix_caption": "Claude carried slightly more fire this year, like a bird kicking the whole workshop back into the sky.",
+    "report_wrapped_beast_phoenix_caption": "Claude carried slightly more fire over the past year, like a bird kicking the whole workshop back into the sky.",
     "report_wrapped_beast_dragon_title": "Dragon Crowned",
-    "report_wrapped_beast_dragon_caption": "Codex hit harder this year, like a dragon torching a build all the way to done.",
+    "report_wrapped_beast_dragon_caption": "Codex hit harder over the past year, like a dragon torching a build all the way to done.",
     "project_butler": "Resume Last Session",
     "project_butler_tooltip": "When you open a new session, automatically hand your last progress to the AI — no need to re-explain.",
     "terse_mode_menu": "Token Saver",
@@ -1114,14 +1101,19 @@
     "claude_desktop_updated": "Claude Desktop · updated {minutes}m ago",
     "claude_desktop_stale": "Claude Desktop · stale · updated {minutes}m ago",
     "report_project_others": "Other projects",
-    "report_ledger_pct_note": "The Claude, Codex, and Antigravity columns are approximate shares of each tool’s weekly quota.",
+    "report_ledger_lead": "How much of each weekly quota went to work Claude handed to Codex and Antigravity.",
     "report_trend_partial_week": "only {days} days",
     "report_history_scope": "Per-tool records start on {date}; earlier daily totals appear only in the heatmap below.",
     "report_composition_missing": "Another {tokens} tokens have no input/output breakdown.",
     "report_wrapped_cost_scope": "Only days with price records (from {date})",
     "report_wrapped_cost_no_records": "No price records",
-    "report_wrapped_beast_phoenix_caption_dominant": "Claude led by a wide margin in tokens this year.",
-    "report_wrapped_beast_dragon_caption_dominant": "Codex led by a wide margin in tokens this year."
+    "report_wrapped_beast_phoenix_caption_dominant": "Claude led by a wide margin in tokens over the past year.",
+    "report_wrapped_beast_dragon_caption_dominant": "Codex led by a wide margin in tokens over the past year.",
+    "report_ledger_used": "{pct}% used this week",
+    "report_ledger_row_meta": "{project} · {count} dispatches",
+    "report_ledger_more": "{count} more dispatching conversations",
+    "report_ledger_other": "Other (your own use, or no dispatch record found)",
+    "report_ledger_all_reset": "All dispatched work in the last 7 days came before the quota reset, so it counts toward last week."
   },
   "zh-CN": {
     "panel_default_name": "默认",
@@ -1347,16 +1339,7 @@
     "report_cost": "API 等值",
     "report_quota_share": "约占周额度",
     "report_quota_approx": "约 {value}%",
-    "report_ledger_section": "派工账本（最近 7 天）",
-    "report_ledger_date": "日期",
-    "report_ledger_title": "对话标题",
-    "report_ledger_count": "派工次数",
-    "report_ledger_claude": "Claude 周额度",
-    "report_ledger_codex": "Codex 周额度",
-    "report_ledger_agy": "Antigravity 周额度",
-    "report_ledger_unowned_part": "{count} 个 {agent}",
-    "report_ledger_unowned_sep": "、",
-    "report_ledger_unowned": "另有 {items} 对话找不到由 Claude 派工的记录，未列入上表",
+    "report_ledger_section": "派工额度花在哪（最近 7 天）",
     "report_daily_chart_title": "每日用量",
     "report_daily_chart_mode_tokens": "Tokens",
     "report_daily_chart_mode_cost": "API 等值",
@@ -1444,9 +1427,9 @@
     "report_wrapped_top_project": "最常用项目",
     "report_wrapped_books_equivalent": "≈ {books} 本书的字量",
     "report_wrapped_beast_phoenix_title": "凤凰加冕",
-    "report_wrapped_beast_phoenix_caption": "今年 Claude 的火力略胜一筹，像把灰烬一口气吹回天空。",
+    "report_wrapped_beast_phoenix_caption": "近一年 Claude 的火力略胜一筹，像把灰烬一口气吹回天空。",
     "report_wrapped_beast_dragon_title": "巨龙加冕",
-    "report_wrapped_beast_dragon_caption": "今年 Codex 的火力更猛，像一条龙一路把工地烧到完工。",
+    "report_wrapped_beast_dragon_caption": "近一年 Codex 的火力更猛，像一条龙一路把工地烧到完工。",
     "project_butler": "接着上次做",
     "project_butler_tooltip": "开新对话时，自动把上次的进度交给 AI，不用再重讲一次。",
     "terse_mode_menu": "省 token 模式",
@@ -1676,14 +1659,19 @@
     "claude_desktop_updated": "Claude 桌面版 · {minutes} 分钟前更新",
     "claude_desktop_stale": "Claude 桌面版 · 数据过期 · {minutes} 分钟前更新",
     "report_project_others": "其他项目",
-    "report_ledger_pct_note": "Claude、Codex、Antigravity 三列是约占该工具周额度的百分比。",
+    "report_ledger_lead": "Claude 派给 Codex、Antigravity 的工作，各吃掉多少周额度。",
     "report_trend_partial_week": "仅 {days} 天",
     "report_history_scope": "分工具记录从 {date} 起；更早的每日总量只在下方热力图",
     "report_composition_missing": "另有 {tokens} tokens 没有输入／输出拆解",
     "report_wrapped_cost_scope": "只含有价格记录的日子（{date} 起）",
     "report_wrapped_cost_no_records": "没有价格记录",
-    "report_wrapped_beast_phoenix_caption_dominant": "今年 Claude 的用量遥遥领先。",
-    "report_wrapped_beast_dragon_caption_dominant": "今年 Codex 的用量遥遥领先。"
+    "report_wrapped_beast_phoenix_caption_dominant": "近一年 Claude 的用量遥遥领先。",
+    "report_wrapped_beast_dragon_caption_dominant": "近一年 Codex 的用量遥遥领先。",
+    "report_ledger_used": "本周已用 {pct}%",
+    "report_ledger_row_meta": "{project} · 派工 {count} 次",
+    "report_ledger_more": "另外 {count} 段派工对话",
+    "report_ledger_other": "其他（你直接用的，或没对到派工记录）",
+    "report_ledger_all_reset": "最近 7 天的派工都在额度重置前，算在上周。"
   },
   "ja": {
     "panel_default_name": "デフォルト",
@@ -1909,16 +1897,7 @@
     "report_cost": "API 換算",
     "report_quota_share": "週間枠の推定割合",
     "report_quota_approx": "約 {value}%",
-    "report_ledger_section": "委任台帳（直近 7 日間）",
-    "report_ledger_date": "日付",
-    "report_ledger_title": "会話タイトル",
-    "report_ledger_count": "委任回数",
-    "report_ledger_claude": "Claude 週間クォータ",
-    "report_ledger_codex": "Codex 週間クォータ",
-    "report_ledger_agy": "Antigravity 週間クォータ",
-    "report_ledger_unowned_part": "{agent} {count} 件",
-    "report_ledger_unowned_sep": "、",
-    "report_ledger_unowned": "ほかに {items} 件の会話には Claude からのタスク割り当て記録が見つからず、上の表には含めていません",
+    "report_ledger_section": "委任先で使ったクォータ（直近 7 日間）",
     "report_daily_chart_title": "日別の使用量",
     "report_daily_chart_mode_tokens": "Tokens",
     "report_daily_chart_mode_cost": "API 換算",
@@ -2006,9 +1985,9 @@
     "report_wrapped_top_project": "最も使ったプロジェクト",
     "report_wrapped_books_equivalent": "≈ {books} 冊分の文字量",
     "report_wrapped_beast_phoenix_title": "フェニックス戴冠",
-    "report_wrapped_beast_phoenix_caption": "今年は Claude の火力がわずかに上回り、灰を空へ吹き返すような一年でした。",
+    "report_wrapped_beast_phoenix_caption": "この1年は Claude の火力がわずかに上回り、灰を空へ吹き返すような一年でした。",
     "report_wrapped_beast_dragon_title": "ドラゴン戴冠",
-    "report_wrapped_beast_dragon_caption": "今年は Codex の火力がより強く、工事現場を完成まで焼き切るような一年でした。",
+    "report_wrapped_beast_dragon_caption": "この1年は Codex の火力がより強く、工事現場を完成まで焼き切るような一年でした。",
     "project_butler": "前回の続きから",
     "project_butler_tooltip": "新規セッションを開くと、前回の進捗を自動で AI に引き継ぎます。説明し直す必要はありません。",
     "terse_mode_menu": "トークン節約モード",
@@ -2238,14 +2217,19 @@
     "claude_desktop_updated": "Claude デスクトップ · {minutes}分前に更新",
     "claude_desktop_stale": "Claude デスクトップ · 古いデータ · {minutes}分前に更新",
     "report_project_others": "その他のプロジェクト",
-    "report_ledger_pct_note": "Claude、Codex、Antigravity の各列は、各ツールの週間上限に対する推定使用率です。",
+    "report_ledger_lead": "Claude が Codex・Antigravity に任せた作業が、それぞれの週間クォータをどれだけ使ったか。",
     "report_trend_partial_week": "{days} 日分のみ",
     "report_history_scope": "ツール別記録は {date} から。それ以前の日別合計は下のヒートマップにのみ表示します。",
     "report_composition_missing": "ほかに {tokens} tokens は入力／出力の内訳がありません。",
     "report_wrapped_cost_scope": "価格記録のある日のみ（{date} 以降）",
     "report_wrapped_cost_no_records": "価格記録なし",
-    "report_wrapped_beast_phoenix_caption_dominant": "今年のトークン数は Claude が大きくリードしました。",
-    "report_wrapped_beast_dragon_caption_dominant": "今年のトークン数は Codex が大きくリードしました。"
+    "report_wrapped_beast_phoenix_caption_dominant": "この1年のトークン数は Claude が大きくリードしました。",
+    "report_wrapped_beast_dragon_caption_dominant": "この1年のトークン数は Codex が大きくリードしました。",
+    "report_ledger_used": "今週は {pct}% 使用済み",
+    "report_ledger_row_meta": "{project} · 委任 {count} 回",
+    "report_ledger_more": "ほか {count} 件の委任元の会話",
+    "report_ledger_other": "その他（直接使った分、または委任記録が見つからない分）",
+    "report_ledger_all_reset": "直近 7 日間に委任した作業はすべてクォータのリセット前のため、先週分に含まれます。"
   },
   "ko": {
     "panel_default_name": "기본",
@@ -2471,16 +2455,7 @@
     "report_cost": "API 환산",
     "report_quota_share": "주간 한도 예상 비율",
     "report_quota_approx": "약 {value}%",
-    "report_ledger_section": "작업 위임 내역 (최근 7일)",
-    "report_ledger_date": "날짜",
-    "report_ledger_title": "대화 제목",
-    "report_ledger_count": "위임 횟수",
-    "report_ledger_claude": "Claude 주간 한도",
-    "report_ledger_codex": "Codex 주간 한도",
-    "report_ledger_agy": "Antigravity 주간 한도",
-    "report_ledger_unowned_part": "{agent} {count}개",
-    "report_ledger_unowned_sep": ", ",
-    "report_ledger_unowned": "추가로 {items}개 대화는 Claude의 작업 배정 기록을 찾을 수 없어 위 표에서 제외했습니다",
+    "report_ledger_section": "위임 작업에 쓴 한도 (최근 7일)",
     "report_daily_chart_title": "일별 사용량",
     "report_daily_chart_mode_tokens": "Tokens",
     "report_daily_chart_mode_cost": "API 환산",
@@ -2568,9 +2543,9 @@
     "report_wrapped_top_project": "가장 많이 쓴 프로젝트",
     "report_wrapped_books_equivalent": "≈ 책 {books}권 분량의 글자",
     "report_wrapped_beast_phoenix_title": "불사조 즉위",
-    "report_wrapped_beast_phoenix_caption": "올해는 Claude 쪽 화력이 조금 더 컸고, 재를 한 번에 하늘로 날려 보내는 듯했습니다.",
+    "report_wrapped_beast_phoenix_caption": "최근 1년은 Claude 쪽 화력이 조금 더 컸고, 재를 한 번에 하늘로 날려 보내는 듯했습니다.",
     "report_wrapped_beast_dragon_title": "드래곤 즉위",
-    "report_wrapped_beast_dragon_caption": "올해는 Codex 쪽 화력이 더 강했고, 공사판을 완공까지 밀어붙이는 용 같았습니다.",
+    "report_wrapped_beast_dragon_caption": "최근 1년은 Codex 쪽 화력이 더 강했고, 공사판을 완공까지 밀어붙이는 용 같았습니다.",
     "project_butler": "이어하기",
     "project_butler_tooltip": "새 세션을 열 때 지난 진행 상황을 AI에게 자동으로 전달합니다. 처음부터 다시 설명할 필요 없어요.",
     "terse_mode_menu": "토큰 절약 모드",
@@ -2800,13 +2775,18 @@
     "claude_desktop_updated": "Claude 데스크톱 · {minutes}분 전 업데이트",
     "claude_desktop_stale": "Claude 데스크톱 · 오래된 데이터 · {minutes}분 전 업데이트",
     "report_project_others": "기타 프로젝트",
-    "report_ledger_pct_note": "Claude, Codex, Antigravity 열은 각 도구의 주간 한도 대비 대략적인 사용 비율입니다.",
+    "report_ledger_lead": "Claude가 Codex와 Antigravity에 맡긴 작업이 각 주간 한도를 얼마나 썼는지 보여 줍니다.",
     "report_trend_partial_week": "{days}일만 포함",
     "report_history_scope": "도구별 기록은 {date}부터입니다. 이전 일별 합계는 아래 히트맵에만 표시됩니다.",
     "report_composition_missing": "추가 {tokens} tokens에는 입력/출력 내역이 없습니다.",
     "report_wrapped_cost_scope": "가격 기록이 있는 날만 포함 ({date}부터)",
     "report_wrapped_cost_no_records": "가격 기록 없음",
-    "report_wrapped_beast_phoenix_caption_dominant": "올해 토큰 사용량은 Claude가 크게 앞섰습니다.",
-    "report_wrapped_beast_dragon_caption_dominant": "올해 토큰 사용량은 Codex가 크게 앞섰습니다."
+    "report_wrapped_beast_phoenix_caption_dominant": "최근 1년 토큰 사용량은 Claude가 크게 앞섰습니다.",
+    "report_wrapped_beast_dragon_caption_dominant": "최근 1년 토큰 사용량은 Codex가 크게 앞섰습니다.",
+    "report_ledger_used": "이번 주 {pct}% 사용",
+    "report_ledger_row_meta": "{project} · 작업 위임 {count}회",
+    "report_ledger_more": "작업을 위임한 대화 {count}개 더",
+    "report_ledger_other": "기타 (직접 사용했거나 위임 기록을 찾지 못한 사용량)",
+    "report_ledger_all_reset": "최근 7일 동안 위임한 작업은 모두 한도 초기화 전이므로 지난주 사용량에 포함됩니다."
   }
 }

{usage_cli-0.34.5 → usage_cli-0.34.6}/loaders/muse_quota_probe.py

@@ -29,6 +29,7 @@ CACHE_PATH = Path.home() / ".usage/muse_quota.json"
 PROBE_DIR = Path.home() / ".usage/muse-probe"
 MUSE_MODEL = "muse-spark-1.3"
 STALE_SECONDS = 30 * 60
+WINDOW_SECONDS = 5 * 3600
 _EXHAUSTED = re.compile(
     r"Subscription quota exhausted\. Your usage window resets at (\d{4}-\d\d-\d\dT[\d:.]+Z)"
 )
@@ -114,10 +115,13 @@ def parse_muse_allowance(stdout: str, checked_at: float) -> MuseQuotaResult | No
     return None
 
 
-def parse_exhausted_window(stdout: str, cached: MuseQuotaResult | None) -> MuseQuotaResult | None:
-    """Read the 429 Muse returns once the 5-hour window is used up; it carries no allowance.
+def parse_exhausted_window(
+    stdout: str, cached: MuseQuotaResult | None, now: float
+) -> MuseQuotaResult | None:
+    """Read the 429 Muse returns once a window is used up; it carries no allowance.
 
-    Only the window's reset time is known, so the weekly reading and its age stay from ``cached``.
+    The reply names only a reset time. Within 5 hours it is the 5-hour window, so the weekly
+    reading and its age stay from ``cached``. Further out it can only be the weekly allowance.
     """
     match = _EXHAUSTED.search(stdout)
     if cached is None or match is None:
@@ -126,11 +130,17 @@ def parse_exhausted_window(stdout: str, cached: MuseQuotaResult | None) -> MuseQ
         reset = datetime.fromisoformat(match[1]).timestamp()
     except ValueError:
         return None
-    return MuseQuotaResult(
-        checked_at=cached["checked_at"],
-        window=MuseQuotaWindow(used_percent=100.0, resets_at=reset),
-        weekly=cached["weekly"],
-    )
+    used_up = MuseQuotaWindow(used_percent=100.0, resets_at=reset)
+    if reset - now <= WINDOW_SECONDS:
+        return MuseQuotaResult(
+            checked_at=cached["checked_at"], window=used_up, weekly=cached["weekly"]
+        )
+    window = cached["window"]
+    # Nothing runs without weekly allowance, so a lapsed window is empty. One resetting past
+    # 5 hours is a weekly 429 that v0.34.5 recorded as the 5-hour window.
+    if not now < window["resets_at"] <= now + WINDOW_SECONDS:
+        window = MuseQuotaWindow(used_percent=0.0, resets_at=now)
+    return MuseQuotaResult(checked_at=now, window=window, weekly=used_up)
 
 
 def read_cache() -> MuseQuotaResult | None:
@@ -241,7 +251,7 @@ def _probe_worker(executable: str) -> None:
         if process.returncode == 0:
             result = parse_muse_allowance(stdout, time.time())
         else:
-            result = parse_exhausted_window(stdout, read_cache())
+            result = parse_exhausted_window(stdout, read_cache(), time.time())
         if result is not None:
             _write_cache(result)
             succeeded = True

{usage_cli-0.34.5 → usage_cli-0.34.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "usage-cli"
-version = "0.34.5"
+version = "0.34.6"
 description = "usage — 在 macOS menu bar 與 Windows 系統匣顯示 Claude Code、Codex、Antigravity 用量的小工具（也提供終端機 TUI）"
 readme = "README.md"
 requires-python = ">=3.13"