usage-cli 0.34.11__tar.gz → 0.34.13__tar.gz

{usage_cli-0.34.11/usage_cli.egg-info → usage_cli-0.34.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usage-cli
-Version: 0.34.11
+Version: 0.34.13
 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.11 → usage_cli-0.34.13}/adapters/claude.py

@@ -16,6 +16,7 @@ from typing import Any
 from loaders.claude_paths import claude_config_dirs
 from loaders.jsonl_utils import iter_jsonl_dicts
 from usage_common.project_resolver import resolve_project_name
+from usage_common.time_utils import parse_optional_iso8601_utc
 
 from .types import AgentInfo
 
@@ -190,10 +191,8 @@ def _parse_assistant_entry(data: dict[str, Any], project: str) -> list[UsageEntr
         else 0
     )
 
-    timestamp_str = data.get("timestamp", "")
-    try:
-        ts = datetime.fromisoformat(timestamp_str.replace("Z", "+00:00"))
-    except (ValueError, AttributeError):
+    ts = parse_optional_iso8601_utc(data.get("timestamp", ""))
+    if ts is None:
         return []
 
     message_id = message.get("id", "")

{usage_cli-0.34.11 → usage_cli-0.34.13}/adapters/rate_limits.py

@@ -36,7 +36,8 @@ def _read_status() -> dict[str, Any] | None:
         try:
             with open(path, "r", encoding="utf-8") as f:
                 data: dict[str, Any] = json.load(f)
-                return data
+                if isinstance(data, dict):
+                    return data
         except (json.JSONDecodeError, OSError, UnicodeDecodeError):
             continue
     return None

{usage_cli-0.34.11 → usage_cli-0.34.13}/analyzer/blocks.py

@@ -56,7 +56,10 @@ def analyze_blocks(entries: list[UsageEntry]) -> list[SessionBlock]:
             block.is_active = True
             elapsed = (now - block.start_time).total_seconds() / 60
             if elapsed > 0:
-                block.burn_rate = block.total_tokens / elapsed
+                active_tokens = (
+                    block.input_tokens + block.output_tokens + block.cache_creation_tokens
+                )
+                block.burn_rate = active_tokens / elapsed
 
     return blocks
 

{usage_cli-0.34.11 → usage_cli-0.34.13}/analyzer/reporter.py

@@ -7,6 +7,7 @@
 from __future__ import annotations
 
 import contextlib
+from bisect import bisect_right
 from collections import defaultdict
 from concurrent.futures import ThreadPoolExecutor
 from dataclasses import dataclass
@@ -146,6 +147,7 @@ class CubeModelData(TypedDict):
 
 
 class CubeReportData(TypedDict):
+    today: NotRequired[str]
     dates: list[str]
     agents: list[CubeAgentData]
     models: list[CubeModelData]
@@ -1236,6 +1238,7 @@ def build_report_data(agents: list[AgentInfo], period: str = "month") -> ReportD
         )
     cube_rows.sort(key=lambda row: (row[0], row[1], row[2], row[3]))
     cube: CubeReportData = {
+        "today": today.isoformat(),
         "dates": cube_dates,
         "agents": cube_agents,
         "models": cube_models,
@@ -1293,7 +1296,7 @@ def build_report_data(agents: list[AgentInfo], period: str = "month") -> ReportD
         start_time = _session_start_text(session.start_time)
         session_rows.append(
             {
-                "date_idx": date_indices[start_time[:10]],
+                "date_idx": max(0, bisect_right(cube_dates, start_time[:10]) - 1),
                 "project_idx": project_indices[session.project or "unknown"],
                 "model_idx": model_indices[session.model or "unknown"],
                 "start_time": start_time,

{usage_cli-0.34.11 → usage_cli-0.34.13}/i18n.json

@@ -37,6 +37,7 @@
     "statusline_sync_menu": "狀態列同步額度",
     "statusline_sync_tooltip": "從 Claude Code 的狀態列讀取額度。關掉後，Claude 的額度就不會再更新。",
     "launch_at_login": "開機自動啟動",
+    "launch_at_login_failed": "無法設定開機自動啟動：{error}",
     "reset_panel_position": "重設面板位置",
     "hide_sections_menu": "隱藏區塊",
     "tray_provider_menu": "系統匣顯示來源",
@@ -44,6 +45,10 @@
     "quota_label_format": "{provider}: {value}%",
     "quota_label_unknown": "{provider}: --",
     "quota_notifications_menu": "用量提醒通知",
+    "quota_notifications_toggle": "開啟通知",
+    "quota_notifications_permission_denied": "系統已關閉 usage 的通知 — 打開系統設定…",
+    "quota_threshold_header": "提醒門檻",
+    "quota_threshold_item": "用到 {percent}%",
     "window_keeper_menu": "自動啟動 5 小時計時",
     "window_keeper_tooltip": "5 小時額度重置後，自動各送一則極小訊息（Claude 用 Haiku、agy 用 Gemini 3.8 Flash Low、Codex 用最省成本模型），讓下一輪 5 小時立刻開始計時（會消耗極少量額度）",
     "window_keeper_sleep_title": "🐾 自動啟動 5 小時計時已開啟",
@@ -130,8 +135,8 @@
     "grok_stale_minutes": "約 {minutes} 分鐘前",
     "grok_stale_hours": "約 {hours} 小時前",
     "grok_stale_tooltip": "資料來自 Grok CLI 本機 log，不是即時 API；請最近執行過 grok 指令後再查看，才會更新。",
-    "codex_stale_minutes": "約 {minutes} 分鐘前",
-    "codex_stale_hours": "約 {hours} 小時前",
+    "codex_stale_minutes": "約 {minutes} 分鐘前更新",
+    "codex_stale_hours": "約 {hours} 小時前更新",
     "codex_stale_tooltip": "Claude 有即時回報所以很準；Codex 沒有，usage 會讀它本機偶爾留下的紀錄，可能比實際略舊。繼續在終端機跑 Codex 就會自動更新。",
     "history_load_error_file": "讀不到使用紀錄檔",
     "history_load_error_parse": "使用紀錄格式異常",
@@ -143,7 +148,7 @@
     "project_range_7d": "7 日",
     "project_range_30d": "月",
     "project_range_all": "全部",
-    "session_label": "Session",
+    "session_label": "5 小時",
     "weekly_label": "本週",
     "monthly_label": "本月",
     "projects_empty": "無記錄",
@@ -515,6 +520,7 @@
     "claude_pane_remaining": "剩",
     "claude_pane_reset_done": "已重置",
     "claude_pane_hours_ago": "{count}時前",
+    "claude_pane_updated_ago": "{ago}更新",
     "update_check_failed_offline": "連不上 GitHub，請確認網路後再試。",
     "update_check_failed_rate_limited": "GitHub 暫時拒絕請求，可能太頻繁了，稍後再試。",
     "update_check_failed_server": "GitHub 回應錯誤，稍後再試。",
@@ -610,6 +616,7 @@
     "statusline_sync_menu": "Sync quota via status line",
     "statusline_sync_tooltip": "Reads the Claude quota from Claude Code's status line. Turn it off and the Claude quota stops updating.",
     "launch_at_login": "Launch at Login",
+    "launch_at_login_failed": "Unable to set launch at login: {error}",
     "reset_panel_position": "Reset panel position",
     "hide_sections_menu": "Hide Sections",
     "tray_provider_menu": "Tray Display Source",
@@ -617,6 +624,10 @@
     "quota_label_format": "{provider}: {value}%",
     "quota_label_unknown": "{provider}: --",
     "quota_notifications_menu": "Usage Alert Notifications",
+    "quota_notifications_toggle": "Enable notifications",
+    "quota_notifications_permission_denied": "System notifications for usage are off — Open System Settings…",
+    "quota_threshold_header": "Alert thresholds",
+    "quota_threshold_item": "At {percent}%",
     "window_keeper_menu": "Auto-start 5-hour Session",
     "window_keeper_tooltip": "After your 5-hour quotas reset, automatically send one tiny message to each tool (Claude with Haiku, agy with Gemini 3.8 Flash Low, Codex with its cheapest model) so the next 5-hour sessions start counting right away (uses a tiny bit of quota).",
     "window_keeper_sleep_title": "🐾 Auto-start 5-hour Session is on",
@@ -703,8 +714,8 @@
     "grok_stale_minutes": "about {minutes} minutes ago",
     "grok_stale_hours": "about {hours} hours ago",
     "grok_stale_tooltip": "Data comes from Grok CLI's local log, not a live API. Run a grok command recently for it to update.",
-    "codex_stale_minutes": "about {minutes} minutes ago",
-    "codex_stale_hours": "about {hours} hours ago",
+    "codex_stale_minutes": "updated about {minutes} min ago",
+    "codex_stale_hours": "updated about {hours} hr ago",
     "codex_stale_tooltip": "Claude is accurate because it reports in real time; Codex does not, so usage reads the local records it leaves occasionally, which may be slightly older than reality. Keep running Codex in the terminal and it will update automatically.",
     "history_load_error_file": "Couldn't read usage files",
     "history_load_error_parse": "Usage data format issue",
@@ -1088,6 +1099,7 @@
     "claude_pane_remaining": "left",
     "claude_pane_reset_done": "Reset",
     "claude_pane_hours_ago": "{count}h ago",
+    "claude_pane_updated_ago": "updated {ago}",
     "update_check_failed_offline": "Cannot reach GitHub. Check your connection and try again.",
     "update_check_failed_rate_limited": "GitHub is limiting requests. Try again later.",
     "update_check_failed_server": "GitHub returned an error. Try again later.",
@@ -1183,6 +1195,7 @@
     "statusline_sync_menu": "状态栏同步额度",
     "statusline_sync_tooltip": "从 Claude Code 的状态栏读取额度。关闭后，Claude 的额度就不会再更新。",
     "launch_at_login": "开机自动启动",
+    "launch_at_login_failed": "无法设置开机自动启动：{error}",
     "reset_panel_position": "重设面板位置",
     "hide_sections_menu": "隐藏区块",
     "tray_provider_menu": "托盘显示来源",
@@ -1190,6 +1203,10 @@
     "quota_label_format": "{provider}: {value}%",
     "quota_label_unknown": "{provider}: --",
     "quota_notifications_menu": "用量提醒通知",
+    "quota_notifications_toggle": "开启通知",
+    "quota_notifications_permission_denied": "系统已关闭 usage 的通知 — 打开系统设置…",
+    "quota_threshold_header": "提醒阈值",
+    "quota_threshold_item": "用到 {percent}%",
     "window_keeper_menu": "自动启动 5 小时计时",
     "window_keeper_tooltip": "5 小时额度重置后，自动各发送一则极小消息（Claude 用 Haiku、agy 用 Gemini 3.8 Flash Low、Codex 用最省成本模型），让下一轮 5 小时立刻开始计时（会消耗极少量额度）",
     "window_keeper_sleep_title": "🐾 已开启自动启动 5 小时计时",
@@ -1276,8 +1293,8 @@
     "grok_stale_minutes": "约 {minutes} 分钟前",
     "grok_stale_hours": "约 {hours} 小时前",
     "grok_stale_tooltip": "资料来自 Grok CLI 本地日志，不是即时 API；请最近运行过 grok 指令后再查看，才会更新。",
-    "codex_stale_minutes": "约 {minutes} 分钟前",
-    "codex_stale_hours": "约 {hours} 小时前",
+    "codex_stale_minutes": "约 {minutes} 分钟前更新",
+    "codex_stale_hours": "约 {hours} 小时前更新",
     "codex_stale_tooltip": "Claude 有实时回报所以很准；Codex 没有，usage 会读取它本机偶尔留下的记录，可能比实际略旧。继续在终端运行 Codex 就会自动更新。",
     "history_load_error_file": "读不到使用记录文件",
     "history_load_error_parse": "使用记录格式异常",
@@ -1289,7 +1306,7 @@
     "project_range_7d": "7 日",
     "project_range_30d": "月",
     "project_range_all": "全部",
-    "session_label": "Session",
+    "session_label": "5 小时",
     "weekly_label": "本周",
     "monthly_label": "本月",
     "projects_empty": "无记录",
@@ -1661,6 +1678,7 @@
     "claude_pane_remaining": "剩",
     "claude_pane_reset_done": "已重置",
     "claude_pane_hours_ago": "{count}时前",
+    "claude_pane_updated_ago": "{ago}更新",
     "update_check_failed_offline": "连不上 GitHub，请确认网络后再试。",
     "update_check_failed_rate_limited": "GitHub 暂时拒绝请求，可能太频繁了，稍后再试。",
     "update_check_failed_server": "GitHub 响应错误，稍后再试。",
@@ -1756,6 +1774,7 @@
     "statusline_sync_menu": "ステータスラインで使用量を同期",
     "statusline_sync_tooltip": "Claude Code のステータスラインから使用量を読み取ります。オフにすると Claude の使用量は更新されなくなります。",
     "launch_at_login": "ログイン時に起動",
+    "launch_at_login_failed": "ログイン時の起動を設定できません：{error}",
     "reset_panel_position": "パネルの位置をリセット",
     "hide_sections_menu": "セクションを非表示",
     "tray_provider_menu": "トレイの表示元",
@@ -1763,6 +1782,10 @@
     "quota_label_format": "{provider}: {value}%",
     "quota_label_unknown": "{provider}: --",
     "quota_notifications_menu": "使用量アラート通知",
+    "quota_notifications_toggle": "通知を有効にする",
+    "quota_notifications_permission_denied": "usage の通知はシステムで無効です — システム設定を開く…",
+    "quota_threshold_header": "通知のしきい値",
+    "quota_threshold_item": "使用量 {percent}%",
     "window_keeper_menu": "5 時間セッションを自動開始",
     "window_keeper_tooltip": "5 時間枠のリセット後、各ツールにごく小さなメッセージを自動送信します（Claude は Haiku、agy は Gemini 3.8 Flash Low、Codex は最も低コストなモデル）。次の 5 時間のカウントをすぐに開始します（ごくわずかな枠を消費します）。",
     "window_keeper_sleep_title": "🐾 5 時間セッションの自動開始をオンにしました",
@@ -1849,8 +1872,8 @@
     "grok_stale_minutes": "約 {minutes} 分前",
     "grok_stale_hours": "約 {hours} 時間前",
     "grok_stale_tooltip": "データは Grok CLI のローカルログから読み取るもので、リアルタイム API ではありません。更新するには最近 grok コマンドを実行してください。",
-    "codex_stale_minutes": "約 {minutes} 分前",
-    "codex_stale_hours": "約 {hours} 時間前",
+    "codex_stale_minutes": "約 {minutes} 分前に更新",
+    "codex_stale_hours": "約 {hours} 時間前に更新",
     "codex_stale_tooltip": "Claude はリアルタイムに報告するので正確です。Codex にはそれがないため、usage は Codex がローカルに時々残す記録を読み取り、実際より少し古い場合があります。ターミナルで Codex を使い続けると自動的に更新されます。",
     "history_load_error_file": "使用履歴ファイルを読み込めません",
     "history_load_error_parse": "使用履歴データの形式に問題があります",
@@ -1862,7 +1885,7 @@
     "project_range_7d": "7日間",
     "project_range_30d": "月",
     "project_range_all": "全期間",
-    "session_label": "セッション",
+    "session_label": "5時間",
     "weekly_label": "週間",
     "monthly_label": "月間",
     "projects_empty": "記録なし",
@@ -2234,6 +2257,7 @@
     "claude_pane_remaining": "残り",
     "claude_pane_reset_done": "リセット済み",
     "claude_pane_hours_ago": "{count}時間前",
+    "claude_pane_updated_ago": "{ago}に更新",
     "update_check_failed_offline": "GitHub に接続できません。ネット接続を確認して再試行してください。",
     "update_check_failed_rate_limited": "GitHub がリクエストを制限しています。後でもう一度お試しください。",
     "update_check_failed_server": "GitHub でエラーが発生しました。後でもう一度お試しください。",
@@ -2329,6 +2353,7 @@
     "statusline_sync_menu": "상태 표시줄로 사용량 동기화",
     "statusline_sync_tooltip": "Claude Code 상태 표시줄에서 사용량을 읽습니다. 끄면 Claude 사용량이 더 이상 업데이트되지 않습니다.",
     "launch_at_login": "로그인 시 시작",
+    "launch_at_login_failed": "로그인 시 시작을 설정할 수 없습니다: {error}",
     "reset_panel_position": "패널 위치 재설정",
     "hide_sections_menu": "섹션 숨기기",
     "tray_provider_menu": "트레이 표시 소스",
@@ -2336,6 +2361,10 @@
     "quota_label_format": "{provider}: {value}%",
     "quota_label_unknown": "{provider}: --",
     "quota_notifications_menu": "사용량 알림",
+    "quota_notifications_toggle": "알림 켜기",
+    "quota_notifications_permission_denied": "시스템에서 usage 알림이 꺼져 있습니다 — 시스템 설정 열기…",
+    "quota_threshold_header": "알림 기준",
+    "quota_threshold_item": "사용량 {percent}%",
     "window_keeper_menu": "5시간 세션 자동 시작",
     "window_keeper_tooltip": "5시간 할당량이 리셋되면 각 도구에 아주 작은 메시지를 자동 전송합니다 (Claude는 Haiku, agy는 Gemini 3.8 Flash Low, Codex는 가장 저렴한 모델). 다음 5시간 카운트를 바로 시작합니다 (극소량의 할당량을 소모합니다).",
     "window_keeper_sleep_title": "🐾 5시간 세션 자동 시작이 켜졌어요",
@@ -2422,8 +2451,8 @@
     "grok_stale_minutes": "약 {minutes}분 전",
     "grok_stale_hours": "약 {hours}시간 전",
     "grok_stale_tooltip": "데이터는 Grok CLI의 로컬 로그에서 읽으며 실시간 API가 아닙니다. 업데이트하려면 최근에 grok 명령을 실행하세요.",
-    "codex_stale_minutes": "약 {minutes}분 전",
-    "codex_stale_hours": "약 {hours}시간 전",
+    "codex_stale_minutes": "약 {minutes}분 전 업데이트",
+    "codex_stale_hours": "약 {hours}시간 전 업데이트",
     "codex_stale_tooltip": "Claude는 실시간으로 보고하므로 정확합니다. Codex는 그렇지 않아 usage가 Codex가 로컬에 가끔 남기는 기록을 읽으며, 실제보다 조금 오래된 값일 수 있습니다. 터미널에서 Codex를 계속 실행하면 자동으로 업데이트됩니다.",
     "history_load_error_file": "사용 기록 파일을 읽을 수 없습니다",
     "history_load_error_parse": "사용 기록 형식에 문제가 있습니다",
@@ -2435,7 +2464,7 @@
     "project_range_7d": "7일",
     "project_range_30d": "월",
     "project_range_all": "전체",
-    "session_label": "세션",
+    "session_label": "5시간",
     "weekly_label": "주간",
     "monthly_label": "월간",
     "projects_empty": "기록 없음",
@@ -2807,6 +2836,7 @@
     "claude_pane_remaining": "남음",
     "claude_pane_reset_done": "리셋됨",
     "claude_pane_hours_ago": "{count}시간 전",
+    "claude_pane_updated_ago": "{ago} 업데이트",
     "update_check_failed_offline": "GitHub에 연결할 수 없어요. 인터넷 연결을 확인하고 다시 시도하세요.",
     "update_check_failed_rate_limited": "GitHub가 요청을 제한하고 있어요. 잠시 후 다시 시도하세요.",
     "update_check_failed_server": "GitHub에서 오류가 발생했어요. 잠시 후 다시 시도하세요.",

{usage_cli-0.34.11 → usage_cli-0.34.13}/installer/login_item.py

@@ -113,14 +113,15 @@ def _launchctl_bootstrap() -> None:
         )
     except FileNotFoundError as exc:
         _log_launchctl_error("bootstrap", str(exc))
-        return
+        raise
     except subprocess.TimeoutExpired as exc:
         _log_launchctl_error("bootstrap", f"timed out after {exc.timeout} seconds")
-        return
+        raise
 
     if result.returncode not in (0, 17):
         stderr = _stderr_summary(result.stderr)
         _log_launchctl_error("bootstrap", f"returncode={result.returncode} stderr={stderr!r}")
+        raise RuntimeError(stderr or f"launchctl: {result.returncode}")
 
 
 def enable() -> None:

{usage_cli-0.34.11 → usage_cli-0.34.13}/installer/session_hooks.py

@@ -60,7 +60,7 @@ CODEX_CONFIG = setup_hook.CODEX_CONFIG
 # session. Off by default: enabled only via the menu toggle, never by self_heal.
 RESUME_HOOK_TARGET = Path(os.path.expanduser("~/.claude/usage-session-resume.py"))
 RESUME_PROMPT_SIDECAR = Path(os.path.expanduser("~/.claude/usage-resume-prompt.json"))
-RESUME_HOOK_VERSION = "1.12"
+RESUME_HOOK_VERSION = "1.13"
 RESUME_MATCHER = "startup|clear|resume"
 RESUME_LANGS = ("zh-TW", "zh-CN", "en", "ja", "ko")
 _RESUME_MARKER = "usage-session-resume"
@@ -95,7 +95,7 @@ _TERSE_REMINDER_MARKER = "usage-terse-reminder"
 _TERSE_REMINDER_MARKERS = (_TERSE_REMINDER_MARKER, "usage_terse_reminder")
 # Independent, opt-in Claude Code UserPromptSubmit hook.
 QUOTA_AWARE_HOOK_TARGET = Path(os.path.expanduser("~/.claude/usage-quota-aware.py"))
-QUOTA_AWARE_HOOK_VERSION = "1.3"
+QUOTA_AWARE_HOOK_VERSION = "1.5"
 QUOTA_AWARE_MATCHER = ""
 _QUOTA_AWARE_MARKER = "usage-quota-aware"
 _QUOTA_AWARE_MARKERS = (_QUOTA_AWARE_MARKER, "usage_quota_aware")
@@ -622,7 +622,9 @@ def _self_heal_codex_terse() -> None:
     script_missing = not CODEX_TERSE_HOOK_TARGET.exists()
     entry_missing = not _is_codex_terse_installed()
     old_version = _installed_codex_terse_version()
-    version_stale = CODEX_TERSE_HOOK_TARGET.exists() and old_version != TERSE_HOOK_VERSION
+    version_stale = CODEX_TERSE_HOOK_TARGET.exists() and setup_hook.is_older(
+        old_version, TERSE_HOOK_VERSION
+    )
 
     if not (script_missing or entry_missing or version_stale or not hooks_enabled):
         return
@@ -859,7 +861,7 @@ def _self_heal_resume() -> None:
         _copy_resume_script()
         _write_resume_sidecar()
         _append_self_heal_log("restore_resume_hook", detail)
-    elif _installed_resume_version() != RESUME_HOOK_VERSION:
+    elif setup_hook.is_older(_installed_resume_version(), RESUME_HOOK_VERSION):
         old = _installed_resume_version()
         _copy_resume_script()
         _write_resume_sidecar()
@@ -896,7 +898,7 @@ def _self_heal_terse_mode() -> None:
         _append_self_heal_log("restore_terse_hook", f"missing={','.join(missing)}")
     else:
         old = _installed_terse_version()
-        if old != TERSE_HOOK_VERSION:
+        if setup_hook.is_older(old, TERSE_HOOK_VERSION):
             _copy_terse_script()
             _write_terse_sidecar()
             _append_self_heal_log(
@@ -926,7 +928,7 @@ def _self_heal_terse_reminder() -> None:
         _append_self_heal_log("restore_terse_reminder_hook", f"missing={','.join(parts)}")
         return
     old = _installed_terse_reminder_version()
-    if old != TERSE_REMINDER_HOOK_VERSION:
+    if setup_hook.is_older(old, TERSE_REMINDER_HOOK_VERSION):
         _copy_terse_reminder_script()
         _append_self_heal_log(
             "update_terse_reminder_hook",
@@ -1149,8 +1151,8 @@ def _debug_self_heal_failure(action: str, exc: BaseException) -> None:
         print(f"usage self-heal {action} failed: {type(exc).__name__}: {exc}", file=sys.stderr)
 
 
-def self_heal() -> None:
-    """Best-effort startup repair for usage-owned Claude statusLine hooks."""
+def _self_heal_statuslines() -> None:
+    """Best-effort startup repair for usage-owned status lines."""
     try:
         settings = _load_settings()
         state = _detect_current_state(settings)
@@ -1158,7 +1160,11 @@ def self_heal() -> None:
             return
         _migrate_bundled_python_commands_if_needed(settings)
         setup_hook._migrate_windows_statusline_command_if_needed(settings)
-        if not is_setup() and "statusLine" not in settings:
+        usage_settings = settings.get(BACKUP_KEY)
+        statusline_disabled = (
+            isinstance(usage_settings, dict) and setup_hook.DISABLED_SL_KEY in usage_settings
+        )
+        if not is_setup() and "statusLine" not in settings and not statusline_disabled:
             exit_code = _run_quietly(setup)
             if exit_code == 0:
                 _append_self_heal_log("install_hook", "initial setup")
@@ -1257,6 +1263,11 @@ def self_heal() -> None:
             raise
         _debug_self_heal_failure("setup_codex", exc)
 
+
+def self_heal() -> None:
+    """Repair status lines and independently repair opt-in session hooks."""
+    _self_heal_statuslines()
+
     try:
         _self_heal_resume()
     except BaseException as exc:
@@ -1375,7 +1386,7 @@ def _self_heal_quota_aware() -> None:
     if not is_quota_aware_enabled():
         return
     old = _installed_quota_aware_version()
-    if old != QUOTA_AWARE_HOOK_VERSION:
+    if setup_hook.is_older(old, QUOTA_AWARE_HOOK_VERSION):
         _copy_quota_aware_script()
         _append_self_heal_log(
             "update_quota_aware_hook", f"{old or 'unknown'} -> {QUOTA_AWARE_HOOK_VERSION}"

{usage_cli-0.34.11 → usage_cli-0.34.13}/installer/setup_hook.py

@@ -86,7 +86,7 @@ PREV_SL_KEY = "previousStatusLine"
 # Where the status-line switch parks the live statusLine while it is off, so it
 # never overwrites the pre-install backup under PREV_SL_KEY.
 DISABLED_SL_KEY = "disabledStatusLine"
-HOOK_VERSION = "1.17"
+HOOK_VERSION = "1.18"
 FORWARDER_VERSION = "1.1"
 # Antigravity's Go runner hands its status-line command to cmd.exe unquoted, so
 # every character cmd.exe treats specially has to be kept out of the path.
@@ -811,9 +811,7 @@ def _replace_grok_status_line(content: str, replacement: str) -> str | None:
     else:
         start, end = section
         candidate = content[:start] + replacement + content[end:]
-    try:
-        tomllib.loads(candidate)
-    except tomllib.TOMLDecodeError:
+    if _validated_table_edit(content, candidate, "ui", "status_line") != candidate:
         return None
     return candidate
 
@@ -887,8 +885,9 @@ def _unsetup_grok() -> bool:
         restored = content[:start] + content[end:]
         if start > 0 and restored[:start].endswith("\n"):
             restored = restored[: start - 1] + restored[start:]
+    if _validated_table_edit(content, restored, "ui", "status_line") != restored:
+        return False
     try:
-        tomllib.loads(restored)
         _atomic_write_text(GROK_SETTINGS, restored)
         GROK_PREVIOUS_STATUSLINE.unlink(missing_ok=True)
     except (OSError, tomllib.TOMLDecodeError):
@@ -969,13 +968,31 @@ def _find_top_level_dotted_line(
     return dotted_line.search(content, 0, top_level_end)
 
 
+def _validated_table_edit(content: str, candidate: str, name: str, key: str) -> str:
+    """Reject edits that change anything except the requested TOML key."""
+    try:
+        before, after = tomllib.loads(content), tomllib.loads(candidate)
+    except tomllib.TOMLDecodeError:
+        return content
+
+    def without_target(table: dict[str, Any], path: list[str]) -> None:
+        part = path[0]
+        if len(path) == 1:
+            table.pop(part, None)
+        elif isinstance(child := table.get(part), dict):
+            without_target(child, path[1:])
+            if not child:
+                table.pop(part)
+
+    path = [*name.split("."), key]
+    without_target(before, path)
+    without_target(after, path)
+    return candidate if before == after else content
+
+
 def _insert_table_line(content: str, name: str, line: str) -> str:
     def validated(candidate: str) -> str:
-        try:
-            tomllib.loads(candidate)
-        except tomllib.TOMLDecodeError:
-            return content
-        return candidate
+        return _validated_table_edit(content, candidate, name, next(iter(tomllib.loads(line))))
 
     table = _find_table(content, name)
     if table is None:
@@ -1017,11 +1034,9 @@ def _replace_table_line(
     content: str, name: str, line_regex: re.Pattern[str], replacement: str
 ) -> str:
     def validated(candidate: str) -> str:
-        try:
-            tomllib.loads(candidate)
-        except tomllib.TOMLDecodeError:
-            return content
-        return candidate
+        return _validated_table_edit(
+            content, candidate, name, next(iter(tomllib.loads(replacement)))
+        )
 
     table = _find_table(content, name)
     if table is None:
@@ -1042,13 +1057,9 @@ def _replace_table_line(
     return validated(candidate)
 
 
-def _remove_table_line(content: str, name: str, line_regex: re.Pattern[str]) -> str:
+def _remove_table_line(content: str, name: str, line_regex: re.Pattern[str], key: str) -> str:
     def validated(candidate: str) -> str:
-        try:
-            tomllib.loads(candidate)
-        except tomllib.TOMLDecodeError:
-            return content
-        return candidate
+        return _validated_table_edit(content, candidate, name, key)
 
     table = _find_table(content, name)
     if table is None:
@@ -1072,11 +1083,7 @@ def _ensure_table_line(content: str, name: str, line_regex: re.Pattern[str], lin
     itself is absent."""
 
     def validated(candidate: str) -> str:
-        try:
-            tomllib.loads(candidate)
-        except tomllib.TOMLDecodeError:
-            return content
-        return candidate
+        return _validated_table_edit(content, candidate, name, next(iter(tomllib.loads(line))))
 
     table = _find_table(content, name)
     if table is None:
@@ -1097,7 +1104,7 @@ def _replace_tui_status_line(content: str, replacement: str) -> str:
 
 
 def _remove_tui_status_line(content: str) -> str:
-    return _remove_table_line(content, "tui", _SL_REGEX)
+    return _remove_table_line(content, "tui", _SL_REGEX, "status_line")
 
 
 def _read_codex_config() -> tuple[str, dict[str, Any]] | None:
@@ -1150,6 +1157,10 @@ def _setup_codex() -> None:
         print(_t("setup_codex_config_unmodifiable"))
         return
     _atomic_write_text(CODEX_CONFIG, content)
+    written = _read_codex_config()
+    if written is None or _codex_status_line(written[1]) != CODEX_STATUS_LINE:
+        print(_t("setup_codex_config_unmodifiable"))
+        return
     print(_t("setup_codex_configured"))
     if old is not None and old not in LEGACY_CODEX_STATUS_LINES:
         print(_t("setup_codex_backup_written", path=CODEX_BACKUP))
@@ -1220,16 +1231,30 @@ def _installed_forwarder_version() -> str | None:
     return None
 
 
+def is_older(installed: str | None, current: str) -> bool:
+    """True when an installed hook should be replaced: missing, unreadable, or older.
+
+    Never downgrade: an older usage build would otherwise swap back a hook that a newer
+    build installed, and the two would keep replacing each other on every self-heal.
+    """
+    if installed is None:
+        return True
+    try:
+        return tuple(map(int, installed.split("."))) < tuple(map(int, current.split(".")))
+    except ValueError:
+        return True
+
+
 def needs_update() -> bool:
     if not HOOK_TARGET.parent.exists():
         return False
-    return _installed_hook_version() != HOOK_VERSION
+    return is_older(_installed_hook_version(), HOOK_VERSION)
 
 
 def forwarder_needs_update() -> bool:
     if not FORWARDER_TARGET.exists():
         return False
-    return _installed_forwarder_version() != FORWARDER_VERSION
+    return is_older(_installed_forwarder_version(), FORWARDER_VERSION)
 
 
 def update_hook() -> None:
@@ -1335,15 +1360,20 @@ def unsetup() -> int:
         settings = _load_settings()
         sl = settings.get("statusLine")
         backup = settings.get(BACKUP_KEY)
-        parked = backup.pop(DISABLED_SL_KEY, None) if isinstance(backup, dict) else None
-        if sl is None:
-            sl = parked
+        parked = backup.get(DISABLED_SL_KEY) if isinstance(backup, dict) else None
 
-        if _is_usage_hook(sl) or _is_legacy_tt_hook(sl):
+        if _is_usage_hook(sl) or _is_legacy_tt_hook(sl) or (sl is None and parked is not None):
             legacy_backup = settings.get(LEGACY_TT_BACKUP_KEY)
             prev = backup.get(PREV_SL_KEY) if isinstance(backup, dict) else None
             if not isinstance(prev, dict) and isinstance(legacy_backup, dict):
                 prev = legacy_backup.get(PREV_SL_KEY)
+            if (
+                not isinstance(prev, dict)
+                and isinstance(parked, dict)
+                and not _is_usage_hook(parked)
+                and not _is_legacy_tt_hook(parked)
+            ):
+                prev = parked
 
             if isinstance(prev, dict):
                 settings["statusLine"] = prev
@@ -1354,6 +1384,7 @@ def unsetup() -> int:
 
             if isinstance(backup, dict):
                 backup.pop(PREV_SL_KEY, None)
+                backup.pop(DISABLED_SL_KEY, None)
                 if not backup:
                     del settings[BACKUP_KEY]
             if isinstance(legacy_backup, dict):

{usage_cli-0.34.11 → usage_cli-0.34.13}/installer/statusline_settings.py

@@ -110,7 +110,8 @@ def _disable_statusline_settings() -> int:
     _sync_agy_statusline(False)
     _sync_grok_statusline(False)
     settings = _load_claude_settings()
-    if "statusLine" not in settings:
+    # The switch can be on for agy alone; a user's own Claude status line is not ours to stash.
+    if "statusLine" not in settings or setup_hook._detect_current_state(settings) == "external":
         return 0
     usage_settings = settings.setdefault("usage", {})
     if not isinstance(usage_settings, dict):
@@ -129,7 +130,9 @@ def _enable_statusline_settings() -> int:
     _sync_grok_statusline(True)
     settings = _load_claude_settings()
     if "statusLine" in settings:
-        return 0
+        if setup_hook._detect_current_state(settings) in {"us-direct", "us-forwarder"}:
+            return 0
+        return setup_hook.setup()
     raw_usage_settings = settings.get("usage")
     usage_settings = raw_usage_settings if isinstance(raw_usage_settings, dict) else None
     # Older versions parked the switch's statusLine under previousStatusLine.
@@ -169,7 +172,9 @@ def _statusline_enabled() -> bool:
         settings = _load_claude_settings()
     except (OSError, ValueError, json.JSONDecodeError):
         return False
-    if "statusLine" in settings:
+    from installer import setup_hook
+
+    if setup_hook._detect_current_state(settings) in {"us-direct", "us-forwarder"}:
         return True
     if sys.platform not in {"darwin", "win32"}:
         return False