usage-cli 0.33.3__tar.gz → 0.33.4__tar.gz

{usage_cli-0.33.3/usage_cli.egg-info → usage_cli-0.33.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usage-cli
-Version: 0.33.3
+Version: 0.33.4
 Summary: usage — 在 macOS menu bar 與 Windows 系統匣顯示 Claude Code、Codex、Antigravity 用量的小工具（也提供終端機 TUI）
 License-Expression: AGPL-3.0-only
 Requires-Python: >=3.13
@@ -138,7 +138,7 @@ Once set up, the bottom of the Claude Code window will show a status line like t
 
 See your quota, other conversations, and background jobs without leaving Claude Code. Available on macOS and Windows.
 
-<p align="center"><img src="docs/side-pane.png" alt="Claude Code side pane showing quotas, conversations, and background jobs" width="637"></p>
+<p align="center"><img src="docs/side-pane.en.png" alt="Claude Code side pane showing quotas, conversations, and background jobs" width="637"></p>
 
 **What you’ll see**
 

{usage_cli-0.33.3 → usage_cli-0.33.4}/README.md

@@ -116,7 +116,7 @@ Once set up, the bottom of the Claude Code window will show a status line like t
 
 See your quota, other conversations, and background jobs without leaving Claude Code. Available on macOS and Windows.
 
-<p align="center"><img src="docs/side-pane.png" alt="Claude Code side pane showing quotas, conversations, and background jobs" width="637"></p>
+<p align="center"><img src="docs/side-pane.en.png" alt="Claude Code side pane showing quotas, conversations, and background jobs" width="637"></p>
 
 **What you’ll see**
 

{usage_cli-0.33.3 → usage_cli-0.33.4}/installer/session_hooks.py

@@ -59,7 +59,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.10"
+RESUME_HOOK_VERSION = "1.11"
 RESUME_MATCHER = "startup|clear|resume"
 RESUME_LANGS = ("zh-TW", "zh-CN", "en", "ja", "ko")
 _RESUME_MARKER = "usage-session-resume"

{usage_cli-0.33.3 → usage_cli-0.33.4}/pyproject.toml

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

{usage_cli-0.33.3 → usage_cli-0.33.4}/tests/test_pricing.py

@@ -383,7 +383,7 @@ def test_fallback_pricing_contains_expected_models() -> None:
         "input_cost_per_token": 2e-6,
         "output_cost_per_token": 10e-6,
         "cache_creation_input_token_cost": 2.5e-6,
-        "cache_read_input_token_cost": 0.2e-6,
+        "cache_read_input_token_cost": 0.1e-6,
     }
     assert pricing._resolve_model_key("claude-sonnet-5", fallback) == "claude-sonnet-5"
     assert fallback["claude-haiku-5-5"] == {

{usage_cli-0.33.3 → usage_cli-0.33.4}/tests/test_project_resolver.py

@@ -214,7 +214,10 @@ def test_project_from_encoded_path_matches_names_claude_flattens(tmp_path: Path,
 def test_project_from_encoded_path_matches_truncated_long_path(tmp_path: Path) -> None:
     # Claude Code keeps the first 200 encoded characters and appends "-<hash>".
     projects_dir = tmp_path / "projects"
-    name = "long-project-" + "x" * 220
+    # Size the path below Windows' MAX_PATH limit while keeping it over 200.
+    prefix = "long-project-"
+    padding = 220 - len(_claude_encode(tmp_path / "work")) - len(prefix) - 1
+    name = prefix + "x" * padding
     real_project = tmp_path / "work" / name
     real_project.mkdir(parents=True)
     encoded = _claude_encode(real_project)

{usage_cli-0.33.3 → usage_cli-0.33.4}/tests/test_session_resume.py

@@ -1398,3 +1398,173 @@ def test_build_prompt_skips_diagnosis_reminder_when_snapshot_is_stale(
     )
 
     assert "Health check:" not in prompt
+
+
+def _register_session(tmp_path: Path, session_id: str, pid: int) -> None:
+    sessions = tmp_path / "sessions"
+    sessions.mkdir(exist_ok=True)
+    (sessions / f"{pid}.json").write_text(
+        json.dumps({"pid": pid, "sessionId": session_id, "kind": "interactive"}),
+        encoding="utf-8",
+    )
+
+
+def _two_sessions(tmp_path: Path, *, neighbour_age: timedelta) -> tuple[Path, Path]:
+    """An older finished session plus a neighbour whose log was written ``neighbour_age`` ago."""
+    project = _project_dir(tmp_path)
+    now = datetime.now().astimezone()
+    finished = project / "finished.jsonl"
+    _write_session(finished, when=now - timedelta(hours=1), request="finish the release notes")
+    stamp = now.timestamp() - 3600
+    os.utime(finished, (stamp, stamp))
+    neighbour = project / "neighbour.jsonl"
+    _write_session(neighbour, when=now - neighbour_age, request="plan the kyoto trip app")
+    stamp = now.timestamp() - neighbour_age.total_seconds()
+    os.utime(neighbour, (stamp, stamp))
+    current = project / "current.jsonl"
+    current.write_text("", encoding="utf-8")
+    return neighbour, current
+
+
+def _resume_prompt(current: Path) -> str:
+    return mod._build_prompt({"transcript_path": str(current), "cwd": "/Users/me/Developer/myproj"})
+
+
+def test_build_prompt_skips_session_another_window_is_still_writing(
+    monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+) -> None:
+    monkeypatch.setenv("USAGE_LANG", "en")
+    _sidecar(tmp_path, monkeypatch)
+    monkeypatch.delenv("CLAUDE_PID", raising=False)
+    neighbour, current = _two_sessions(tmp_path, neighbour_age=timedelta(minutes=1))
+    _register_session(tmp_path, neighbour.stem, os.getpid())
+
+    prompt = _resume_prompt(current)
+
+    assert "finish the release notes" in prompt
+    assert "kyoto" not in prompt
+
+
+def test_build_prompt_keeps_session_closed_a_moment_ago(
+    monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+) -> None:
+    # Closing a window and opening a new one is the main resume case: the closed session
+    # is no longer registered, so its fresh log must still be handed over.
+    monkeypatch.setenv("USAGE_LANG", "en")
+    _sidecar(tmp_path, monkeypatch)
+    _neighbour, current = _two_sessions(tmp_path, neighbour_age=timedelta(minutes=1))
+    _register_session(tmp_path, "some-other-session", os.getpid())
+
+    assert "plan the kyoto trip app" in _resume_prompt(current)
+
+
+@pytest.mark.parametrize("via", ["env", "parent"])
+def test_build_prompt_keeps_session_this_window_just_cleared(
+    monkeypatch: pytest.MonkeyPatch, tmp_path: Path, via: str
+) -> None:
+    # After /clear the registry may still list this window's pre-clear session.
+    monkeypatch.setenv("USAGE_LANG", "en")
+    _sidecar(tmp_path, monkeypatch)
+    cleared, current = _two_sessions(tmp_path, neighbour_age=timedelta(minutes=1))
+    _register_session(tmp_path, cleared.stem, 4242)
+    monkeypatch.setattr(mod, "_pid_running", lambda pid: True)
+    if via == "env":
+        monkeypatch.setenv("CLAUDE_PID", "4242")
+    else:
+        monkeypatch.delenv("CLAUDE_PID", raising=False)
+        monkeypatch.setattr(os, "getppid", lambda: 4242)
+
+    assert "plan the kyoto trip app" in _resume_prompt(current)
+
+
+def test_build_prompt_keeps_open_window_that_went_quiet(
+    monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+) -> None:
+    monkeypatch.setenv("USAGE_LANG", "en")
+    _sidecar(tmp_path, monkeypatch)
+    neighbour, current = _two_sessions(tmp_path, neighbour_age=timedelta(minutes=30))
+    _register_session(tmp_path, neighbour.stem, os.getpid())
+
+    assert "plan the kyoto trip app" in _resume_prompt(current)
+
+
+def test_build_prompt_keeps_session_whose_window_crashed(
+    monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+) -> None:
+    monkeypatch.setenv("USAGE_LANG", "en")
+    _sidecar(tmp_path, monkeypatch)
+    neighbour, current = _two_sessions(tmp_path, neighbour_age=timedelta(minutes=1))
+    _register_session(tmp_path, neighbour.stem, 4242)
+    monkeypatch.setattr(mod, "_pid_running", lambda pid: False)
+
+    assert "plan the kyoto trip app" in _resume_prompt(current)
+
+
+def test_build_prompt_ignores_unreadable_session_registry(
+    monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+) -> None:
+    monkeypatch.setenv("USAGE_LANG", "en")
+    _sidecar(tmp_path, monkeypatch)
+    _neighbour, current = _two_sessions(tmp_path, neighbour_age=timedelta(minutes=1))
+    sessions = tmp_path / "sessions"
+    sessions.mkdir()
+    (sessions / "1.json").write_text("{not json", encoding="utf-8")
+    (sessions / "2.json").write_text("[]", encoding="utf-8")
+    (sessions / "3.json").write_text(json.dumps({"pid": "x", "sessionId": 7}), encoding="utf-8")
+
+    assert "plan the kyoto trip app" in _resume_prompt(current)
+
+
+def test_pid_running_detects_exited_process() -> None:
+    child = subprocess.Popen([sys.executable, "-c", ""])
+    child.wait()
+
+    assert mod._pid_running(os.getpid()) is True
+    if os.name != "nt":
+        assert mod._pid_running(child.pid) is False
+
+
+@pytest.mark.parametrize("pid", [None, "123", True, 0, -1])
+def test_pid_running_rejects_invalid_pid(pid: object) -> None:
+    assert mod._pid_running(pid) is False
+
+
+def test_pid_running_trusts_registry_on_windows(monkeypatch: pytest.MonkeyPatch) -> None:
+    def fail_kill(pid: int, sig: int) -> None:
+        raise AssertionError("os.kill must not run on Windows")
+
+    monkeypatch.setattr(mod, "os", SimpleNamespace(name="nt", kill=fail_kill))
+
+    assert mod._pid_running(4242) is True
+
+
+@pytest.mark.parametrize(
+    "value",
+    [
+        "<task-notification>\n<task-id>b1</task-id>\n<status>completed</status>"
+        "\n<summary>Background agent finished the research</summary>\n</task-notification>",
+        "<bash-input>rm -rf /tmp/frames</bash-input>",
+        "<bash-stdout>(Bash completed with no output)</bash-stdout><bash-stderr></bash-stderr>",
+        "<local-command-stdout>Set effort level to high for new sessions</local-command-stdout>",
+        "<command-name>/clear</command-name>\n            <command-message>clear</command-message>"
+        "\n            <command-args></command-args>",
+        "<command-message>effort</command-message>\n<command-name>/effort</command-name>",
+    ],
+)
+def test_clean_request_drops_turns_claude_code_writes(value: str) -> None:
+    assert mod._clean_request(value) == ""
+
+
+def test_clean_request_keeps_slash_command_arguments() -> None:
+    value = (
+        "<command-name>/loop</command-name>\n            <command-message>loop</command-message>"
+        "\n            <command-args>5m check the deploy</command-args>"
+    )
+
+    assert mod._clean_request(value) == "/loop 5m check the deploy"
+
+
+def test_clean_request_keeps_user_tagged_prompt() -> None:
+    value = "<Task>split the settings panel</Task> <Constraints>keep the old API</Constraints>"
+
+    assert mod._clean_request(value) == value

{usage_cli-0.33.3 → usage_cli-0.33.4}/tests/test_wintray.py

@@ -1814,7 +1814,7 @@ def test_run_app_wires_pystray_and_pywebview(
     fake_pystray = SimpleNamespace(Icon=FakeIcon, Menu=FakeMenu, MenuItem=FakeMenuItem)
     fake_webview = SimpleNamespace(
         create_window=create_window,
-        start=lambda **kwargs: events.append(("start", kwargs["gui"])),
+        start=lambda **kwargs: events.append(("start", kwargs["gui"], kwargs["storage_path"])),
     )
     monkeypatch.setitem(sys.modules, "pystray", fake_pystray)
     monkeypatch.setitem(sys.modules, "webview", fake_webview)
@@ -1826,12 +1826,14 @@ def test_run_app_wires_pystray_and_pywebview(
 
     wintray.run_app(mock=True, interval=60)
 
+    assert wintray._WEBVIEW_STORAGE_DIR.name == "webview"
+    assert wintray._WEBVIEW_STORAGE_DIR.parent == Path.home() / ".usage"
     assert events == [
         ("window", "usage", True, "#eef2f7"),
         "loaded_handler",
         ("icon", "usage"),
         "run_detached",
-        ("start", "edgechromium"),
+        ("start", "edgechromium", str(wintray._WEBVIEW_STORAGE_DIR)),
     ]
 
 

{usage_cli-0.33.3 → usage_cli-0.33.4/usage_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usage-cli
-Version: 0.33.3
+Version: 0.33.4
 Summary: usage — 在 macOS menu bar 與 Windows 系統匣顯示 Claude Code、Codex、Antigravity 用量的小工具（也提供終端機 TUI）
 License-Expression: AGPL-3.0-only
 Requires-Python: >=3.13
@@ -138,7 +138,7 @@ Once set up, the bottom of the Claude Code window will show a status line like t
 
 See your quota, other conversations, and background jobs without leaving Claude Code. Available on macOS and Windows.
 
-<p align="center"><img src="docs/side-pane.png" alt="Claude Code side pane showing quotas, conversations, and background jobs" width="637"></p>
+<p align="center"><img src="docs/side-pane.en.png" alt="Claude Code side pane showing quotas, conversations, and background jobs" width="637"></p>
 
 **What you’ll see**
 

{usage_cli-0.33.3 → usage_cli-0.33.4}/usage_common/pricing.py

@@ -33,7 +33,7 @@ FALLBACK_RETRY_SECONDS = 600
 MISSING_MODEL_REFRESH_SECONDS = FALLBACK_RETRY_SECONDS
 USER_AGENT = "usage/0.9"
 # The date when the hard-coded fallback table was last manually checked upstream.
-FALLBACK_PRICING_AS_OF: str = "2026-09-04"
+FALLBACK_PRICING_AS_OF: str = "2026-10-12"
 # Anthropic's official cache write/read prices relative to input pricing. These
 # are only fallbacks for missing upstream fields and may be wrong for other providers.
 CACHE_WRITE_COST_MULTIPLIER = 1.25
@@ -484,7 +484,7 @@ def _fallback_pricing() -> PricingTable:
             "input_cost_per_token": 2e-6,
             "output_cost_per_token": 10e-6,
             "cache_creation_input_token_cost": 2.5e-6,
-            "cache_read_input_token_cost": 0.2e-6,
+            "cache_read_input_token_cost": 0.1e-6,
         },
         "claude-fable-5": {
             "input_cost_per_token": 10e-6,

{usage_cli-0.33.3 → usage_cli-0.33.4}/usage_hooks/usage_session_resume.py

@@ -50,7 +50,7 @@ from datetime import datetime, timedelta, timezone
 from pathlib import Path
 from typing import Any, TypedDict, cast
 
-__version__ = "1.10"
+__version__ = "1.11"
 
 
 class _HiddenConsoleKwargs(TypedDict, total=False):
@@ -100,6 +100,20 @@ _MAX_REQUESTS = 3
 _MAX_REQUEST_CHARS = 280
 _MIN_SUBSTANTIVE_CHARS = 7
 _IMAGE_MARKER = re.compile(r"\[Image(?:\s+#[0-9]+)?\]", re.I)
+# User turns Claude Code writes on the user's behalf: background-task notices, `!` shell
+# runs, and local command output. Matched exactly so a user's own `<Task>` prompt survives.
+_SYSTEM_TURN_PREFIXES = (
+    "<task-notification>",
+    "<bash-input>",
+    "<bash-stdout>",
+    "<local-command-stdout>",
+)
+_SLASH_COMMAND_PREFIXES = ("<command-name>", "<command-message>")
+_SLASH_COMMAND_NAME = re.compile(r"<command-name>(.*?)</command-name>")
+_SLASH_COMMAND_ARGS = re.compile(r"<command-args>(.*?)</command-args>")
+# A session another window still has open and wrote to this recently is that window's
+# work in progress, not this window's previous session.
+_LIVE_SESSION_WINDOW = timedelta(minutes=10)
 _DIAGNOSIS_MAX_AGE = timedelta(hours=48)
 _DIAGNOSIS_REMINDER_COOLDOWN = timedelta(days=7)
 _DIAGNOSIS_CAUSE_KEYS = (
@@ -520,7 +534,12 @@ def _other_jsonls_by_mtime(project_dir: Path, exclude: str) -> list[Path]:
 
     Newest-first so the caller can skip a freshly-written but empty/corrupt log and
     still fall back to the previous session that actually has progress to report.
+    Sessions another window still has open and is still writing are left out: with
+    several windows in one project, the newest log is usually a neighbour's live work.
+    A session closed a moment ago is no longer registered, so it stays a candidate.
     """
+    live_ids = _live_session_ids(project_dir.parent.parent / "sessions")
+    busy_since = (datetime.now() - _LIVE_SESSION_WINDOW).timestamp()
     candidates: list[tuple[float, Path]] = []
     for jsonl in project_dir.glob("*.jsonl"):
         if jsonl.name == exclude:
@@ -529,11 +548,60 @@ def _other_jsonls_by_mtime(project_dir: Path, exclude: str) -> list[Path]:
             mtime = jsonl.stat().st_mtime
         except OSError:
             continue
+        if mtime >= busy_since and jsonl.stem in live_ids:
+            continue
         candidates.append((mtime, jsonl))
     candidates.sort(key=lambda item: item[0], reverse=True)
     return [path for _, path in candidates]
 
 
+def _live_session_ids(sessions_dir: Path) -> set[str]:
+    """Session IDs that open Claude Code windows list in ``~/.claude/sessions/<pid>.json``."""
+    ids: set[str] = set()
+    try:
+        entries = list(sessions_dir.glob("*.json"))
+    except OSError:
+        return ids
+    own_pids = _own_window_pids()
+    for entry in entries:
+        data = _read_json_file(entry)
+        if data is None:
+            continue
+        session_id = data.get("sessionId")
+        pid = data.get("pid")
+        if pid in own_pids:
+            continue
+        if isinstance(session_id, str) and session_id and _pid_running(pid):
+            ids.add(session_id)
+    return ids
+
+
+def _own_window_pids() -> set[int]:
+    """This window's Claude Code process. After /clear its registry entry may still name
+    the session just cleared, which is the one to hand over."""
+    pids = {os.getppid()}
+    with contextlib.suppress(ValueError):
+        pids.add(int(os.environ.get("CLAUDE_PID", "")))
+    return pids
+
+
+def _pid_running(pid: object) -> bool:
+    """False for a registry entry a crashed window left behind."""
+    if not isinstance(pid, int) or isinstance(pid, bool) or pid <= 0:
+        return False
+    # On Windows os.kill(pid, 0) sends CTRL_C_EVENT instead of probing, so the entry
+    # is trusted as is.
+    if os.name == "nt":
+        return True
+    try:
+        os.kill(pid, 0)
+    except PermissionError:
+        return True
+    except OSError:
+        return False
+    return True
+
+
 def _parse_session(path: Path) -> tuple[datetime, str, list[str], list[str], list[str]] | None:
     """Return (last_active, recent_requests, commits, todos, edited_files) for the previous session.
 
@@ -625,6 +693,16 @@ def _clean_request(value: object) -> str:
     if not isinstance(value, str):
         return ""
     text = " ".join(value.split())
+    if text.startswith(_SYSTEM_TURN_PREFIXES):
+        return ""
+    if text.startswith(_SLASH_COMMAND_PREFIXES):
+        # Keep a slash command only when it carries arguments: `/loop 5m check CI` is a
+        # request, a bare `/clear` is not.
+        name = _SLASH_COMMAND_NAME.search(text)
+        args = _SLASH_COMMAND_ARGS.search(text)
+        if name is None or args is None or not args.group(1).strip():
+            return ""
+        text = f"{name.group(1).strip()} {args.group(1).strip()}"
     # Skip the interruption marker Claude Code writes as a user turn — it is noise,
     # not a request.
     if not text or text.startswith("[Request interrupted"):

{usage_cli-0.33.3 → usage_cli-0.33.4}/wintray/app.py

@@ -18,6 +18,7 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from datetime import date, datetime, timedelta
 from enum import IntEnum
+from pathlib import Path
 from typing import TYPE_CHECKING, Any
 from uuid import UUID
 
@@ -84,6 +85,8 @@ UPDATE_ALERT_BODY_LIMIT = 2000
 # szTip is 128 WCHARs including the terminator; pystray raises ValueError past that.
 TOOLTIP_MAX_LENGTH = 127
 PANEL_WIDTH = 380
+# Abnormal exits reuse one dir; pywebview private mode deletes on clean exit: subdir, never ~/.usage
+_WEBVIEW_STORAGE_DIR = Path.home() / ".usage" / "webview"
 _TOAST_AUMID = "com.lollapalooza.usage"
 _TOAST_OPEN_PANEL_ACTION = "open_panel"
 WINDOWS_PANELS = tuple((spec.id, spec.i18n_key, spec.html_filename) for spec in PANEL_SPECS)
@@ -2639,7 +2642,11 @@ def run_app(
 
     start(_current_version(), snapshot, controller.language)
     try:
-        webview.start(gui="edgechromium", debug=os.environ.get("USAGE_DEBUG") == "1")
+        webview.start(
+            gui="edgechromium",
+            debug=os.environ.get("USAGE_DEBUG") == "1",
+            storage_path=str(_WEBVIEW_STORAGE_DIR),
+        )
     finally:
         controller.stopping.set()
         _release_single_instance_lock()