usage-cli 0.33.1__tar.gz → 0.33.2__tar.gz

{usage_cli-0.33.1 → usage_cli-0.33.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usage-cli
-Version: 0.33.1
+Version: 0.33.2
 Summary: usage — 在 macOS menu bar 與 Windows 系統匣顯示 Claude Code、Codex、Antigravity 用量的小工具（也提供終端機 TUI）
 License-Expression: AGPL-3.0-only
 Requires-Python: >=3.13
@@ -70,7 +70,7 @@ It lands in your Applications folder automatically. Open it once; if macOS 15 or
 - **Grok CLI Support:** A fourth card reads Grok CLI's weekly credit percentage straight from its own local debug log. 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. 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.
+- **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. The context figure turns yellow at 50% or 200K tokens and red at 80% or 400K tokens, whichever comes first. When it changes color, the status line shows the image count and the estimated share of files and command output.
 - **Prompt Cache Health:** The status line shows Claude Code's prompt cache hit rate. For 10 minutes after the cache misses, it also says why — the model changed, the tools changed, you sat idle past the 5-minute TTL, and so on — so you can tell whether the extra tokens came from something you did. The hit rate needs Claude Code 2.1.251 or newer and the reason needs 2.1.260 or newer; on older versions those parts simply don't appear.
 - **Hide Sections:** Only use one or two of the tools? Hide the Claude Code, Codex, Grok CLI, or Antigravity section from the menu bar and panels completely with a single click.
 
@@ -79,15 +79,16 @@ It lands in your Applications folder automatically. Open it once; if macOS 15 or
 - **Progress Concierge:** Open a new Claude Code session and `usage` hands your last progress straight to the AI, including your last request, uncommitted changes, and unfinished todos. No `/resume`, no recap. When you do `/resume` a conversation that sat long enough for its cache to expire, it warns you how many tokens the next message will re-send and suggests `/compact` first. Off by default.
 - **Token Saver:** A menu-bar toggle asks Claude Code and Codex to answer more tersely and in plainer language, saving output tokens while keeping code and error messages byte-exact. A light reminder keeps long conversations from drifting back to verbose — in an A/B test on real sessions, late replies stayed ~40% shorter instead of drifting 84% longer.
 - **Claude Code side pane (macOS and Windows):** Quotas, conversations, and background jobs inside Claude Code. [See the side pane](#claude-code-side-pane).
-- **Beginner Mode (macOS):** Off by default. After Claude Code answers, up to three technical terms from that answer appear above the prompt, each with a one-line plain explanation in your UI language. Press 9 to mark them understood; terms you skip come back after 1, 3, then 7 days. Understood terms return as a one-question multiple-choice quiz 7, 21, then 60 days later, at most one a day; a wrong answer puts the term back in the hints. `/terms` opens your term history. Picking terms asks Claude Haiku through your Claude Code, so it uses a little Claude quota, and it pauses while your 5-hour quota is at 90% or more.
-- **Quota-Aware Mode (macOS):** Off by default. When a 5-hour quota passes 80%, 90%, or 95%, or a weekly quota passes 95%, Claude Code gets one line with what is left and when it resets. Before a big task, Claude then tells you and lets you pick a smaller part or wait for the reset. It covers Claude Code, Codex, and Antigravity quota, says each level once per conversation, and makes no extra model calls.
-- **Auto-start 5-hour Session:** Off by default. Turn it on and, right after a 5-hour quota resets, `usage` sends one tiny message to each tool (Claude with Haiku, Antigravity with Gemini 3.5 Flash Low, Codex with its cheapest model) so the next 5-hour window starts counting right away. Those messages do use a little quota, but the amount is negligible. Checking your quota never sends a message; only this switch does.
+- **Beginner Mode (macOS and Windows):** Off by default. After Claude Code answers, up to three technical terms from that answer appear above the prompt, each with a one-line plain explanation in your UI language. Press 9 to mark them understood; terms you skip come back after 1, 3, then 7 days. Understood terms return as a one-question multiple-choice quiz 7, 21, then 60 days later, at most one a day; a wrong answer puts the term back in the hints. `/terms` opens your term history. Picking terms asks Claude Haiku through your Claude Code, so it uses a little Claude quota, and it pauses while your 5-hour quota is at 90% or more.
+- **Quota-Aware Mode (macOS and Windows):** Off by default. When a 5-hour quota passes 80%, 90%, or 95%, or a weekly quota passes 95%, Claude Code gets one line with what is left and when it resets. Before a big task, Claude then tells you and lets you pick a smaller part or wait for the reset. It covers Claude Code, Codex, and Antigravity quota, says each level once per conversation, and makes no extra model calls.
+- **Auto-start 5-hour Session:** Off by default. Turn it on and, right after a 5-hour quota resets, `usage` sends one tiny message to each tool (Claude with Haiku, Antigravity with Gemini 3.8 Flash Low, Codex with its cheapest model) so the next 5-hour window starts counting right away. Those messages do use a little quota, but the amount is negligible. Checking your quota never sends a message; only this switch does.
 - **Terminal Integration:** `usage status --json` hands your Claude Code, Codex, Antigravity, and Grok quota to any tool that can run a command — Starship, tmux, or your own scripts. Reads the same local files as the menu bar. [Ready-made snippets](docs/DEVELOPMENT.md#quota-status-for-other-tools-usage-status).
 - **Token-waste Health Check:** A daily background diagnosis scans your logs for waste, including repeated file reads, polluter directories, and noisy Bash output. If it finds issues, a one-line heads-up appears; say "show me" and the AI walks you through fixes.
 
 ### Stay Current
 
 - **AI Update Daily:** Opens a daily-updated public [page](https://aqua5230.github.io/ai-updates/) covering Claude Code, Codex, and Antigravity, with the full history kept. Reviewed items get a plain-language summary in all five UI languages; unreviewed ones show the original source text.
+- **Release Notes After an Update:** The first launch after an update shows what changed in that version in your UI language, once. Fresh installs skip it.
 
 ### Reporting & Insight
 
@@ -164,11 +165,13 @@ See your quota, other conversations, and background jobs without leaving Claude
 
 - **Quotas:** Your 5-hour and weekly limits.
 - **Claude conversations:** Conversations waiting for your permission or MCP input are marked in yellow.
+- **Conversation notifications:** A notification appears when another Claude conversation finishes or starts waiting for you.
+- **Latest reply:** Each conversation row shows the latest assistant reply on its second line.
 - **Background jobs:** Includes subagents started by Claude with the Agent tool and their status.
 
 **How to enable**
 
-1. In the usage menu bar menu (macOS) or the system-tray panel menu (Windows), check **Claude Code side pane**. On macOS it sits under the **Claude Code** submenu as **Side pane**.
+1. In the usage menu bar menu (macOS) or system-tray menu (Windows), open the **Claude Code** submenu and check **Side pane**.
 2. Open a new conversation or run `/reload-plugins`.
 3. At terminal widths ≥144 columns, the pane opens on the right automatically. In narrower terminals, enter `/usage-dash`.
 
@@ -188,7 +191,7 @@ Windows has the full core experience: the system-tray UI, Claude Code status-lin
 
 The system-tray icon shows the remaining session quota percentage for Claude or Codex. Choose **Tray Display Source → Claude Code / Codex** in the right-click menu or panel menu; the change applies immediately and survives restarts (default: Claude). If Codex has no session window, the icon uses its weekly quota instead and the tooltip identifies that window. Missing quota data shows `--`. The tooltip summarizes both tools, with the selected source first. Left-click opens the same 16 quota themes available on macOS (Default plus the other fifteen) in WebView2. Right-click also provides Reset Panel Position and Quit; panel switching, refresh, launch at login, and update checks are in the panel menu.
 
-Enable **Show Taskbar Quota** in either menu for a transparent `Codex: 92%` label inside the taskbar, immediately left of the notification area. It follows taskbar position, scaling, and light/dark theme, and hides during fullscreen use or taskbar auto-hide. Click the label to open the panel. If buttons leave insufficient space, it moves just outside the taskbar. The normal app icon remains as a menu entry point; the label follows the selected source and quota window.
+Enable **Show Taskbar Quota** in either menu for a transparent `Codex: 92%` label inside the taskbar, immediately left of the notification area. It follows taskbar position, scaling, and light/dark theme, and hides during fullscreen use or taskbar auto-hide. Click the label to open the panel. If buttons leave insufficient space, it moves just outside the taskbar. The normal app icon remains as a menu entry point; the label follows the selected source and quota window. Right-click the label to open the same menu as the tray icon.
 
 Windows differences: the panel opens at the bottom-right of the working area rather than next to the tray icon; update prompts use a system Yes/No dialog.
 

{usage_cli-0.33.1 → usage_cli-0.33.2}/README.md

@@ -48,7 +48,7 @@ It lands in your Applications folder automatically. Open it once; if macOS 15 or
 - **Grok CLI Support:** A fourth card reads Grok CLI's weekly credit percentage straight from its own local debug log. 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. 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.
+- **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. The context figure turns yellow at 50% or 200K tokens and red at 80% or 400K tokens, whichever comes first. When it changes color, the status line shows the image count and the estimated share of files and command output.
 - **Prompt Cache Health:** The status line shows Claude Code's prompt cache hit rate. For 10 minutes after the cache misses, it also says why — the model changed, the tools changed, you sat idle past the 5-minute TTL, and so on — so you can tell whether the extra tokens came from something you did. The hit rate needs Claude Code 2.1.251 or newer and the reason needs 2.1.260 or newer; on older versions those parts simply don't appear.
 - **Hide Sections:** Only use one or two of the tools? Hide the Claude Code, Codex, Grok CLI, or Antigravity section from the menu bar and panels completely with a single click.
 
@@ -57,15 +57,16 @@ It lands in your Applications folder automatically. Open it once; if macOS 15 or
 - **Progress Concierge:** Open a new Claude Code session and `usage` hands your last progress straight to the AI, including your last request, uncommitted changes, and unfinished todos. No `/resume`, no recap. When you do `/resume` a conversation that sat long enough for its cache to expire, it warns you how many tokens the next message will re-send and suggests `/compact` first. Off by default.
 - **Token Saver:** A menu-bar toggle asks Claude Code and Codex to answer more tersely and in plainer language, saving output tokens while keeping code and error messages byte-exact. A light reminder keeps long conversations from drifting back to verbose — in an A/B test on real sessions, late replies stayed ~40% shorter instead of drifting 84% longer.
 - **Claude Code side pane (macOS and Windows):** Quotas, conversations, and background jobs inside Claude Code. [See the side pane](#claude-code-side-pane).
-- **Beginner Mode (macOS):** Off by default. After Claude Code answers, up to three technical terms from that answer appear above the prompt, each with a one-line plain explanation in your UI language. Press 9 to mark them understood; terms you skip come back after 1, 3, then 7 days. Understood terms return as a one-question multiple-choice quiz 7, 21, then 60 days later, at most one a day; a wrong answer puts the term back in the hints. `/terms` opens your term history. Picking terms asks Claude Haiku through your Claude Code, so it uses a little Claude quota, and it pauses while your 5-hour quota is at 90% or more.
-- **Quota-Aware Mode (macOS):** Off by default. When a 5-hour quota passes 80%, 90%, or 95%, or a weekly quota passes 95%, Claude Code gets one line with what is left and when it resets. Before a big task, Claude then tells you and lets you pick a smaller part or wait for the reset. It covers Claude Code, Codex, and Antigravity quota, says each level once per conversation, and makes no extra model calls.
-- **Auto-start 5-hour Session:** Off by default. Turn it on and, right after a 5-hour quota resets, `usage` sends one tiny message to each tool (Claude with Haiku, Antigravity with Gemini 3.5 Flash Low, Codex with its cheapest model) so the next 5-hour window starts counting right away. Those messages do use a little quota, but the amount is negligible. Checking your quota never sends a message; only this switch does.
+- **Beginner Mode (macOS and Windows):** Off by default. After Claude Code answers, up to three technical terms from that answer appear above the prompt, each with a one-line plain explanation in your UI language. Press 9 to mark them understood; terms you skip come back after 1, 3, then 7 days. Understood terms return as a one-question multiple-choice quiz 7, 21, then 60 days later, at most one a day; a wrong answer puts the term back in the hints. `/terms` opens your term history. Picking terms asks Claude Haiku through your Claude Code, so it uses a little Claude quota, and it pauses while your 5-hour quota is at 90% or more.
+- **Quota-Aware Mode (macOS and Windows):** Off by default. When a 5-hour quota passes 80%, 90%, or 95%, or a weekly quota passes 95%, Claude Code gets one line with what is left and when it resets. Before a big task, Claude then tells you and lets you pick a smaller part or wait for the reset. It covers Claude Code, Codex, and Antigravity quota, says each level once per conversation, and makes no extra model calls.
+- **Auto-start 5-hour Session:** Off by default. Turn it on and, right after a 5-hour quota resets, `usage` sends one tiny message to each tool (Claude with Haiku, Antigravity with Gemini 3.8 Flash Low, Codex with its cheapest model) so the next 5-hour window starts counting right away. Those messages do use a little quota, but the amount is negligible. Checking your quota never sends a message; only this switch does.
 - **Terminal Integration:** `usage status --json` hands your Claude Code, Codex, Antigravity, and Grok quota to any tool that can run a command — Starship, tmux, or your own scripts. Reads the same local files as the menu bar. [Ready-made snippets](docs/DEVELOPMENT.md#quota-status-for-other-tools-usage-status).
 - **Token-waste Health Check:** A daily background diagnosis scans your logs for waste, including repeated file reads, polluter directories, and noisy Bash output. If it finds issues, a one-line heads-up appears; say "show me" and the AI walks you through fixes.
 
 ### Stay Current
 
 - **AI Update Daily:** Opens a daily-updated public [page](https://aqua5230.github.io/ai-updates/) covering Claude Code, Codex, and Antigravity, with the full history kept. Reviewed items get a plain-language summary in all five UI languages; unreviewed ones show the original source text.
+- **Release Notes After an Update:** The first launch after an update shows what changed in that version in your UI language, once. Fresh installs skip it.
 
 ### Reporting & Insight
 
@@ -142,11 +143,13 @@ See your quota, other conversations, and background jobs without leaving Claude
 
 - **Quotas:** Your 5-hour and weekly limits.
 - **Claude conversations:** Conversations waiting for your permission or MCP input are marked in yellow.
+- **Conversation notifications:** A notification appears when another Claude conversation finishes or starts waiting for you.
+- **Latest reply:** Each conversation row shows the latest assistant reply on its second line.
 - **Background jobs:** Includes subagents started by Claude with the Agent tool and their status.
 
 **How to enable**
 
-1. In the usage menu bar menu (macOS) or the system-tray panel menu (Windows), check **Claude Code side pane**. On macOS it sits under the **Claude Code** submenu as **Side pane**.
+1. In the usage menu bar menu (macOS) or system-tray menu (Windows), open the **Claude Code** submenu and check **Side pane**.
 2. Open a new conversation or run `/reload-plugins`.
 3. At terminal widths ≥144 columns, the pane opens on the right automatically. In narrower terminals, enter `/usage-dash`.
 
@@ -166,7 +169,7 @@ Windows has the full core experience: the system-tray UI, Claude Code status-lin
 
 The system-tray icon shows the remaining session quota percentage for Claude or Codex. Choose **Tray Display Source → Claude Code / Codex** in the right-click menu or panel menu; the change applies immediately and survives restarts (default: Claude). If Codex has no session window, the icon uses its weekly quota instead and the tooltip identifies that window. Missing quota data shows `--`. The tooltip summarizes both tools, with the selected source first. Left-click opens the same 16 quota themes available on macOS (Default plus the other fifteen) in WebView2. Right-click also provides Reset Panel Position and Quit; panel switching, refresh, launch at login, and update checks are in the panel menu.
 
-Enable **Show Taskbar Quota** in either menu for a transparent `Codex: 92%` label inside the taskbar, immediately left of the notification area. It follows taskbar position, scaling, and light/dark theme, and hides during fullscreen use or taskbar auto-hide. Click the label to open the panel. If buttons leave insufficient space, it moves just outside the taskbar. The normal app icon remains as a menu entry point; the label follows the selected source and quota window.
+Enable **Show Taskbar Quota** in either menu for a transparent `Codex: 92%` label inside the taskbar, immediately left of the notification area. It follows taskbar position, scaling, and light/dark theme, and hides during fullscreen use or taskbar auto-hide. Click the label to open the panel. If buttons leave insufficient space, it moves just outside the taskbar. The normal app icon remains as a menu entry point; the label follows the selected source and quota window. Right-click the label to open the same menu as the tray icon.
 
 Windows differences: the panel opens at the bottom-right of the working area rather than next to the tray icon; update prompts use a system Yes/No dialog.
 

{usage_cli-0.33.1 → usage_cli-0.33.2}/adapters/agy.py

@@ -8,7 +8,7 @@ from __future__ import annotations
 
 from loaders import agy_loader as shared_agy_loader
 
-from i18n import t
+from usage_common.i18n import t
 
 from .types import AgentInfo, UsageEntry
 

{usage_cli-0.33.1 → usage_cli-0.33.2}/adapters/claude.py

@@ -15,7 +15,7 @@ from typing import Any
 
 from loaders.claude_paths import claude_config_dirs
 from loaders.jsonl_utils import iter_jsonl_dicts
-from project_resolver import resolve_project_name
+from usage_common.project_resolver import resolve_project_name
 
 from .types import AgentInfo
 

{usage_cli-0.33.1 → usage_cli-0.33.2}/adapters/grok.py

@@ -9,7 +9,7 @@ from __future__ import annotations
 from loaders import grok_loader as shared_grok_loader
 from loaders.history_loader import UsageEntry as GrokUsageEntry
 
-from i18n import t
+from usage_common.i18n import t
 
 from .types import AgentInfo, UsageEntry
 

{usage_cli-0.33.1 → usage_cli-0.33.2}/adapters/muse.py

@@ -6,7 +6,7 @@ from __future__ import annotations
 from loaders import muse_loader
 from loaders.history_loader import UsageEntry as MuseUsageEntry
 
-from i18n import t
+from usage_common.i18n import t
 
 from .types import AgentInfo, UsageEntry
 

{usage_cli-0.33.1 → usage_cli-0.33.2}/adapters/rate_limits.py

@@ -10,7 +10,7 @@ import os
 from datetime import datetime, timezone
 from typing import Any
 
-import usage_client
+from loaders import claude_usage as usage_client
 
 from .types import RateLimits
 

{usage_cli-0.33.1 → usage_cli-0.33.2}/analyzer/aggregator.py

@@ -7,7 +7,7 @@
 from collections import defaultdict
 
 from adapters.types import DailyStats, MonthlyStats, SessionStats, UsageEntry, WeeklyStats
-from pricing import calculate_cost
+from usage_common.pricing import calculate_cost
 
 
 def aggregate_daily(entries: list[UsageEntry]) -> list[DailyStats]:

{usage_cli-0.33.1 → usage_cli-0.33.2}/analyzer/blocks.py

@@ -8,7 +8,7 @@ from collections.abc import Sequence
 from datetime import datetime, timedelta, timezone
 
 from adapters.types import DailyStats, P90Limits, SessionBlock, UsageEntry
-from pricing import calculate_cost
+from usage_common.pricing import calculate_cost
 
 BLOCK_DURATION = timedelta(hours=5)
 

{usage_cli-0.33.1 → usage_cli-0.33.2}/analyzer/persona_loader.py

@@ -17,7 +17,7 @@ from typing import Any
 
 from loaders.claude_paths import claude_config_dirs
 from loaders.jsonl_utils import iter_jsonl_dicts
-from project_resolver import project_from_encoded_path, resolve_project_name
+from usage_common.project_resolver import project_from_encoded_path, resolve_project_name
 from usage_common.time_utils import parse_optional_iso8601_utc
 
 logger = logging.getLogger(__name__)

{usage_cli-0.33.1 → usage_cli-0.33.2}/analyzer/reporter.py

@@ -24,7 +24,7 @@ from analyzer import persona_loader
 from analyzer import subscription
 from adapters import agy, claude, codex, grok, muse
 from adapters.types import AgentInfo, UsageEntry
-from pricing import calculate_cost, is_model_priced
+from usage_common.pricing import calculate_cost, is_model_priced
 
 from .aggregator import aggregate_sessions
 from . import diagnoser, dispatch_ledger, usage_snapshot

{usage_cli-0.33.1 → usage_cli-0.33.2}/analyzer/usage_snapshot.py

@@ -27,7 +27,7 @@ from typing import NotRequired, TypeGuard, TypedDict
 
 from adapters.types import UsageEntry
 from loaders import cache_quarantine
-from pricing import calculate_cost
+from usage_common.pricing import calculate_cost
 
 logger = logging.getLogger(__name__)
 

{usage_cli-0.33.1 → usage_cli-0.33.2}/i18n.json

@@ -52,11 +52,6 @@
     "hook_installed_restart": "已安裝完成，請重開 Claude Code 一次",
     "hook_install_failed": "安裝 hook 失敗",
     "hook_install_failed_default": "setup_hook.setup() 回傳失敗",
-    "repair_dialog_title": "狀態列設定衝突",
-    "repair_dialog_message": "偵測到其他工具佔用了 Claude Code 狀態列。\n要切換成共存模式嗎？usage app 與其他工具可以同時運作。",
-    "repair_dialog_repair": "立即修復",
-    "repair_dialog_skip": "稍後再說",
-    "repair_dialog_never": "不要再問",
     "alert_forwarder_title": "啟用共存模式？",
     "alert_forwarder_body": "偵測到其他 Claude Code 狀態列工具。啟用共存模式後，usage 會透過轉發器與現有工具一起運作。",
     "alert_forwarder_enable": "啟用共存模式",
@@ -599,11 +594,6 @@
     "hook_installed_restart": "Hook installed. Restart Claude Code once.",
     "hook_install_failed": "Hook installation failed",
     "hook_install_failed_default": "setup_hook.setup() returned failure",
-    "repair_dialog_title": "Status Line Conflict",
-    "repair_dialog_message": "Another tool is using the Claude Code status line.\nSwitch to coexistence mode? usage app can run alongside other tools.",
-    "repair_dialog_repair": "Repair Now",
-    "repair_dialog_skip": "Later",
-    "repair_dialog_never": "Do Not Ask Again",
     "alert_forwarder_title": "Enable coexistence mode?",
     "alert_forwarder_body": "Another Claude Code status line tool was detected. In coexistence mode, usage runs through a forwarder alongside your existing tool.",
     "alert_forwarder_enable": "Enable Coexistence Mode",
@@ -1146,11 +1136,6 @@
     "hook_installed_restart": "已安装完成，请重开 Claude Code 一次",
     "hook_install_failed": "安装 hook 失败",
     "hook_install_failed_default": "setup_hook.setup() 返回失败",
-    "repair_dialog_title": "状态栏设置冲突",
-    "repair_dialog_message": "检测到其他工具占用了 Claude Code 状态栏。\n要切换成共存模式吗？usage app 可以和其他工具同时运行。",
-    "repair_dialog_repair": "立即修复",
-    "repair_dialog_skip": "稍后再说",
-    "repair_dialog_never": "不要再问",
     "alert_forwarder_title": "启用共存模式？",
     "alert_forwarder_body": "检测到其他 Claude Code 状态栏工具。启用共存模式后，usage 会通过转发器和现有工具一起运行。",
     "alert_forwarder_enable": "启用共存模式",
@@ -1693,11 +1678,6 @@
     "hook_installed_restart": "フックをインストールしました。Claude Code を一度再起動してください。",
     "hook_install_failed": "フックのインストールに失敗しました",
     "hook_install_failed_default": "setup_hook.setup() が失敗を返しました",
-    "repair_dialog_title": "ステータスライン設定の競合",
-    "repair_dialog_message": "別のツールが Claude Code のステータスラインを使用しています。\n共存モードに切り替えますか？usage app と他のツールを同時に動かせます。",
-    "repair_dialog_repair": "今すぐ修復",
-    "repair_dialog_skip": "あとで",
-    "repair_dialog_never": "今後表示しない",
     "alert_forwarder_title": "共存モードを有効にしますか？",
     "alert_forwarder_body": "他の Claude Code ステータスラインツールを検出しました。共存モードでは、usage はフォワーダー経由で既存のツールと一緒に動作します。",
     "alert_forwarder_enable": "共存モードを有効化",
@@ -2240,11 +2220,6 @@
     "hook_installed_restart": "훅 설치가 완료되었습니다. Claude Code를 한 번 다시 시작하세요.",
     "hook_install_failed": "훅 설치에 실패했습니다",
     "hook_install_failed_default": "setup_hook.setup()가 실패를 반환했습니다",
-    "repair_dialog_title": "상태 표시줄 설정 충돌",
-    "repair_dialog_message": "다른 도구가 Claude Code 상태 표시줄을 사용 중입니다.\n공존 모드로 전환할까요? usage app과 다른 도구를 함께 실행할 수 있습니다.",
-    "repair_dialog_repair": "지금 복구",
-    "repair_dialog_skip": "나중에",
-    "repair_dialog_never": "다시 묻지 않기",
     "alert_forwarder_title": "공존 모드를 활성화할까요?",
     "alert_forwarder_body": "다른 Claude Code 상태 표시줄 도구를 감지했습니다. 공존 모드에서는 usage가 포워더를 통해 기존 도구와 함께 실행됩니다.",
     "alert_forwarder_enable": "공존 모드 활성화",

{usage_cli-0.33.1 → usage_cli-0.33.2}/installer/claude_pane.py

@@ -9,8 +9,8 @@ import shutil
 import sys
 from pathlib import Path
 
-from i18n import t as _t
 from installer import setup_hook
+from usage_common.i18n import t as _t
 from usage_common.usage_lang import detect_lang
 
 INSTALL_DIR = Path.home() / ".usage" / "claude-pane" / "usage-dash"
@@ -62,7 +62,7 @@ def _status_argv() -> list[str]:
             f"import sys;sys.path[:0]=[{resources!r}+'/lib/python{major}{minor}.zip',"
             f"{resources!r}+'/lib/python{major}.{minor}',"
             f"{resources!r}+'/lib/python{major}.{minor}/lib-dynload',{resources!r}];"
-            "import usage_cli;sys.argv=['usage','status','--json'];usage_cli.main()"
+            "from usage_app import cli;sys.argv=['usage','status','--json'];cli.main()"
         )
         return [
             "/usr/bin/env",
@@ -72,16 +72,17 @@ def _status_argv() -> list[str]:
             "-c",
             bootstrap,
         ]
+    root = str(Path(__file__).resolve().parent.parent)
     return [
         sys.executable,
-        str(Path(__file__).resolve().parent.parent / "usage_cli.py"),
-        "status",
-        "--json",
+        "-c",
+        f"import sys;sys.path.insert(0,{root!r});from usage_app import cli;"
+        "sys.argv=['usage','status','--json'];cli.main()",
     ]
 
 
 def _sidecar_text(mod: str = "usage-dash") -> str:
-    from i18n import I18N_PATH
+    from usage_common.i18n import I18N_PATH
 
     bundle = json.loads(I18N_PATH.read_text(encoding="utf-8"))
     english = bundle["en"]

{usage_cli-0.33.1 → usage_cli-0.33.2}/installer/session_hooks.py

@@ -20,7 +20,6 @@ from datetime import UTC, datetime
 from pathlib import Path
 from typing import Any
 
-from i18n import t as _t
 from installer import setup_hook
 from installer.setup_hook import (
     BACKUP_KEY,
@@ -50,8 +49,9 @@ from installer.setup_hook import (
     update_hook,
 )
 from loaders.codex_paths import codex_home
+from usage_common.i18n import t as _t
 from usage_common.usage_lang import detect_lang
-from usage_statusline import _exclusive_lock
+from usage_hooks.usage_statusline import _exclusive_lock
 
 CODEX_CONFIG = setup_hook.CODEX_CONFIG
 
@@ -94,7 +94,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.0"
+QUOTA_AWARE_HOOK_VERSION = "1.1"
 QUOTA_AWARE_MATCHER = ""
 _QUOTA_AWARE_MARKER = "usage-quota-aware"
 _QUOTA_AWARE_MARKERS = (_QUOTA_AWARE_MARKER, "usage_quota_aware")
@@ -205,9 +205,9 @@ def _migrate_bundled_python_commands_if_needed(
 
 
 def _resolve_resume_source() -> Path:
-    # installer/ is one level below the repo root, where the hook scripts remain.
+    # installer/ is one level below the repo root; hook sources live in usage_hooks/.
     paths = [
-        Path(__file__).resolve().parent.parent / "usage_session_resume.py",
+        Path(__file__).resolve().parent.parent / "usage_hooks" / "usage_session_resume.py",
         Path(sys.executable).resolve().parent.parent / "Resources" / "usage_session_resume.py",
     ]
     for path in paths:
@@ -219,7 +219,7 @@ def _resolve_resume_source() -> Path:
 
 def _resolve_terse_source() -> Path:
     paths = [
-        Path(__file__).resolve().parent.parent / "usage_terse_mode.py",
+        Path(__file__).resolve().parent.parent / "usage_hooks" / "usage_terse_mode.py",
         Path(sys.executable).resolve().parent.parent / "Resources" / "usage_terse_mode.py",
     ]
     for path in paths:
@@ -231,7 +231,7 @@ def _resolve_terse_source() -> Path:
 
 def _resolve_terse_reminder_source() -> Path:
     paths = [
-        Path(__file__).resolve().parent.parent / "usage_terse_reminder.py",
+        Path(__file__).resolve().parent.parent / "usage_hooks" / "usage_terse_reminder.py",
         (Path(sys.executable).resolve().parent.parent / "Resources" / "usage_terse_reminder.py"),
     ]
     for path in paths:
@@ -286,7 +286,7 @@ def _copy_terse_reminder_script() -> None:
 def _write_resume_sidecar() -> None:
     """Mirror i18n.json's rw_prompt/rw_none into a sidecar the stdlib hook can read,
     so the injected wording stays single-sourced and the hook needs no app imports."""
-    from i18n import I18N_PATH
+    from usage_common.i18n import I18N_PATH
 
     try:
         bundle = json.loads(I18N_PATH.read_text(encoding="utf-8"))
@@ -350,7 +350,7 @@ def _write_resume_sidecar() -> None:
 
 
 def _write_terse_sidecar() -> None:
-    from i18n import I18N_PATH
+    from usage_common.i18n import I18N_PATH
 
     try:
         bundle = json.loads(I18N_PATH.read_text(encoding="utf-8"))
@@ -1275,7 +1275,7 @@ def self_heal() -> None:
 
 def _resolve_quota_aware_source() -> Path:
     paths = [
-        Path(__file__).resolve().parent.parent / "usage_quota_aware.py",
+        Path(__file__).resolve().parent.parent / "usage_hooks" / "usage_quota_aware.py",
         Path(sys.executable).resolve().parent.parent / "Resources" / "usage_quota_aware.py",
     ]
     for path in paths:

{usage_cli-0.33.1 → usage_cli-0.33.2}/installer/setup_hook.py

@@ -8,7 +8,7 @@
 
 Claude Code calls the command configured in ~/.claude/settings.json statusLine
 and sends session JSON on stdin whenever it refreshes the status line. The
-installer copies usage_statusline.py to ~/.claude/usage-statusline.py and points
+installer copies usage_hooks/usage_statusline.py to ~/.claude/usage-statusline.py and points
 statusLine at it, so the main app can read a local status file.
 
 The previous statusLine is backed up under settings["usage"]["previousStatusLine"]
@@ -34,9 +34,9 @@ from datetime import UTC, datetime
 from pathlib import Path
 from typing import Any, cast
 
-from i18n import t as _t
 from loaders.claude_paths import claude_home
 from loaders.codex_paths import codex_home
+from usage_common.i18n import t as _t
 from usage_common.subprocess_utils import hidden_console_kwargs
 
 HOOK_TARGET = Path(os.path.expanduser("~/.claude/usage-statusline.py"))
@@ -118,9 +118,9 @@ def configure_windows_utf8_output() -> None:
 
 
 def _resolve_hook_source() -> Path:
-    # installer/ is one level below the repo root, where the hook scripts remain.
+    # installer/ is one level below the repo root; hook sources live in usage_hooks/.
     paths = [
-        Path(__file__).resolve().parent.parent / "usage_statusline.py",
+        Path(__file__).resolve().parent.parent / "usage_hooks" / "usage_statusline.py",
         Path(sys.executable).resolve().parent.parent / "Resources" / "usage_statusline.py",
     ]
     for path in paths:
@@ -132,7 +132,7 @@ def _resolve_hook_source() -> Path:
 
 def _resolve_forwarder_source() -> Path:
     paths = [
-        Path(__file__).resolve().parent.parent / "usage_statusline_forwarder.py",
+        Path(__file__).resolve().parent.parent / "usage_hooks" / "usage_statusline_forwarder.py",
         (
             Path(sys.executable).resolve().parent.parent
             / "Resources"
@@ -148,7 +148,7 @@ def _resolve_forwarder_source() -> Path:
 
 def _resolve_agy_hook_source() -> Path | None:
     paths = [
-        Path(__file__).resolve().parent.parent / "usage_statusline_agy.py",
+        Path(__file__).resolve().parent.parent / "usage_hooks" / "usage_statusline_agy.py",
         Path(sys.executable).resolve().parent.parent / "Resources" / "usage_statusline_agy.py",
     ]
     return next((path for path in paths if path.exists()), None)
@@ -166,7 +166,7 @@ def _agy_hook_script_is_stale() -> bool:
 
 def _resolve_grok_hook_source() -> Path | None:
     paths = [
-        Path(__file__).resolve().parent.parent / "usage_statusline_grok.py",
+        Path(__file__).resolve().parent.parent / "usage_hooks" / "usage_statusline_grok.py",
         Path(sys.executable).resolve().parent.parent / "Resources" / "usage_statusline_grok.py",
     ]
     return next((path for path in paths if path.exists()), None)
@@ -1080,10 +1080,6 @@ def _ensure_table_line(content: str, name: str, line_regex: re.Pattern[str], lin
     return content[:start] + f"\n{line}" + content[start:]
 
 
-def _find_tui_table(content: str) -> re.Match[str] | None:
-    return _find_table(content, "tui")
-
-
 def _insert_tui_status_line(content: str, replacement: str) -> str:
     return _insert_table_line(content, "tui", replacement)
 
@@ -1277,7 +1273,7 @@ def is_codex_setup() -> bool:
 
 
 def _install_forwarder(settings: dict[str, Any]) -> None:
-    """Copy usage_statusline_forwarder.py to ~/.claude/ and update settings.json."""
+    """Copy usage_hooks/usage_statusline_forwarder.py to ~/.claude/ and update settings.json."""
     _copy_hook_script()
     _copy_forwarder_script()
     _backup_existing_statusline(settings)

{usage_cli-0.33.1 → usage_cli-0.33.2}/loaders/agy_loader.py

@@ -28,7 +28,7 @@ from loaders.disk_cache_lifecycle import (
 from loaders.disk_cache_lifecycle import (
     flush_caches_on_terminate as _flush_caches_on_terminate,
 )
-from project_resolver import resolve_project_name
+from usage_common.project_resolver import resolve_project_name
 
 logger = logging.getLogger(__name__)
 

usage_cli-0.33.1/usage_client.py → usage_cli-0.33.2/loaders/claude_usage.py

@@ -18,10 +18,10 @@ from enum import StrEnum
 from pathlib import Path
 from typing import Any
 
-from i18n import _t
 from installer.setup_hook import current_hook_state
 from loaders import claude_desktop
 from loaders.claude_paths import claude_config_dirs, claude_json_path
+from usage_common.i18n import _t
 from usage_common.usage_lang import detect_lang
 
 logger = logging.getLogger(__name__)

{usage_cli-0.33.1 → usage_cli-0.33.2}/loaders/codex_loader.py

@@ -61,7 +61,7 @@ from loaders.disk_cache_lifecycle import (
 )
 from loaders.history_loader import UsageEntry
 from loaders.jsonl_limits import read_bounded_jsonl_line
-from project_resolver import resolve_project_name
+from usage_common.project_resolver import resolve_project_name
 from usage_common.time_utils import parse_optional_iso8601_utc
 
 logger = logging.getLogger(__name__)

{usage_cli-0.33.1 → usage_cli-0.33.2}/loaders/grok_loader.py

@@ -26,7 +26,7 @@ from urllib.parse import unquote_to_bytes
 
 from loaders.history_loader import UsageEntry
 from loaders.jsonl_limits import read_bounded_jsonl_line
-from project_resolver import resolve_project_name
+from usage_common.project_resolver import resolve_project_name
 from usage_common.time_utils import parse_optional_iso8601_utc
 
 logger = logging.getLogger(__name__)

{usage_cli-0.33.1 → usage_cli-0.33.2}/loaders/history_loader.py

@@ -30,7 +30,7 @@ from loaders.disk_cache_lifecycle import (
 )
 from loaders.history_disk_cache import _shard_index, flush_caches, seed_caches
 from loaders.jsonl_limits import read_bounded_jsonl_line
-from project_resolver import project_from_encoded_path, resolve_project_name
+from usage_common.project_resolver import project_from_encoded_path, resolve_project_name
 from usage_common.time_utils import parse_optional_iso8601_utc
 
 logger = logging.getLogger(__name__)

{usage_cli-0.33.1 → usage_cli-0.33.2}/loaders/muse_loader.py

@@ -13,7 +13,7 @@ from pathlib import Path
 from typing import Any
 
 from loaders.history_loader import UsageEntry
-from project_resolver import resolve_project_name
+from usage_common.project_resolver import resolve_project_name
 
 logger = logging.getLogger(__name__)
 MUSE_SESSIONS_DIR = Path(os.path.expanduser("~/.local/share/muse/sessions"))