usage-cli 0.34.7__tar.gz → 0.34.8__tar.gz

{usage_cli-0.34.7/usage_cli.egg-info → usage_cli-0.34.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usage-cli
-Version: 0.34.7
+Version: 0.34.8
 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.7 → usage_cli-0.34.8}/installer/session_hooks.py

@@ -11,6 +11,7 @@ from __future__ import annotations
 import contextlib
 import io
 import json
+import logging
 import os
 import re
 import shutil
@@ -59,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.11"
+RESUME_HOOK_VERSION = "1.12"
 RESUME_MATCHER = "startup|clear|resume"
 RESUME_LANGS = ("zh-TW", "zh-CN", "en", "ja", "ko")
 _RESUME_MARKER = "usage-session-resume"
@@ -545,6 +546,11 @@ def _setup_codex_terse() -> None:
         new_content = _ensure_table_line(content, "features", _FEATURES_HOOKS_REGEX, "hooks = true")
         if new_content != content:
             _atomic_write_text(CODEX_CONFIG, new_content)
+        else:
+            logging.getLogger(__name__).warning(
+                "Could not enable Codex hooks in %s: config update failed TOML validation",
+                CODEX_CONFIG,
+            )
 
     hooks = data.get("hooks")
     if not isinstance(hooks, dict):

{usage_cli-0.34.7 → usage_cli-0.34.8}/installer/setup_hook.py

@@ -1070,14 +1070,22 @@ def _ensure_table_line(content: str, name: str, line_regex: re.Pattern[str], lin
     """Make sure ``line`` is in table ``name``: replace an existing ``line_regex`` match if
     present, else insert ``line`` fresh. Appends a new ``[name]`` table at EOF when the table
     itself is absent."""
+
+    def validated(candidate: str) -> str:
+        try:
+            tomllib.loads(candidate)
+        except tomllib.TOMLDecodeError:
+            return content
+        return candidate
+
     table = _find_table(content, name)
     if table is None:
-        return content.rstrip() + f"\n\n[{name}]\n{line}\n"
+        return validated(content.rstrip() + f"\n\n[{name}]\n{line}\n")
     start, end = _table_section(content, table)
     section = content[start:end]
     if line_regex.search(section):
-        return content[:start] + line_regex.sub(line, section, count=1) + content[end:]
-    return content[:start] + f"\n{line}" + content[start:]
+        return validated(content[:start] + line_regex.sub(line, section, count=1) + content[end:])
+    return validated(content[:start] + f"\n{line}" + content[start:])
 
 
 def _insert_tui_status_line(content: str, replacement: str) -> str:

{usage_cli-0.34.7 → usage_cli-0.34.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "usage-cli"
-version = "0.34.7"
+version = "0.34.8"
 description = "usage — 在 macOS menu bar 與 Windows 系統匣顯示 Claude Code、Codex、Antigravity 用量的小工具（也提供終端機 TUI）"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -64,6 +64,10 @@ dev = [
 ]
 build = [
     "py2app>=0.28; sys_platform == 'darwin'",
+    "pyinstaller>=6.22.3; sys_platform == 'win32'",
+    # The [build-system] backend, locked here so release.yml can build the
+    # PyPI wheel with --no-build-isolation instead of fetching an unpinned one.
+    "setuptools>=84.0.0",
 ]
 
 [tool.ruff]

{usage_cli-0.34.7 → usage_cli-0.34.8}/setup_app.py

@@ -65,7 +65,6 @@ if __name__ == "__main__":
             "assets/usage_uhoh.wav",
             "assets/critters",
             "assets/panels",
-            "assets/windows",
             "i18n.json",
             "claude_pane",
             "pyproject.toml",

{usage_cli-0.34.7 → usage_cli-0.34.8}/tests/test_html_report_snapshot.py

@@ -7,6 +7,8 @@
 from __future__ import annotations
 
 import base64
+import csv
+import io
 import os
 import re
 import sys
@@ -799,6 +801,19 @@ def test_build_csv_data_contains_projects_and_models() -> None:
     assert "model,claude-sonnet-4,52.4,1229345,23.91\r\n" in csv_text
 
 
+@pytest.mark.parametrize("name", ["=1+1", "-cmd", "+cmd", "@cmd", "\tcmd", "\rcmd", '=1,"x"'])
+def test_build_csv_data_escapes_formula_names_only(name: str) -> None:
+    data = {
+        "by_project": [{"project": name, "pct": -1.5, "tokens": -2, "cost": -3.0}],
+        "by_model": [{"model": name, "pct": -1.5, "tokens": -2, "cost": -3.0}],
+    }
+
+    rows = list(csv.reader(io.StringIO(html_report._build_csv_data(data, "en"))))
+
+    assert rows[1] == ["project", "'" + name, "-1.5", "-2", "-3.00"]
+    assert rows[2] == ["model", "'" + name, "-1.5", "-2", "-3.00"]
+
+
 def test_build_csv_data_masks_project_names() -> None:
     csv_text = html_report._build_csv_data(_full_report_data(), "en", mask_projects=True)
 

{usage_cli-0.34.7 → usage_cli-0.34.8}/tests/test_packaged_resources.py

@@ -126,7 +126,7 @@ def test_parse_setup_app_resources() -> None:
     resources = parse_setup_app_resources()
 
     assert "i18n.json" in resources
-    assert "assets/windows" in resources
+    assert "assets/panels" in resources
 
 
 def test_local_data_files_are_declared_as_py2app_resources() -> None:

{usage_cli-0.34.7 → usage_cli-0.34.8}/tests/test_pricing.py

@@ -467,6 +467,8 @@ def test_compare_fallback_pricing_reports_all_difference_categories() -> None:
         },
         "claude-sonnet-5": {"input_cost_per_token": 1.0},
         "anthropic/claude-haiku-5": {"input_cost_per_token": 1.0},
+        "gpt-6.1-terra": {"input_cost_per_token": 1.0},
+        "azure/gpt-6.1-terra": {"input_cost_per_token": 1.0},
     }
 
     result = CHECK_FALLBACK_PRICING["compare_pricing"](fallback, upstream)
@@ -476,7 +478,7 @@ def test_compare_fallback_pricing_reports_all_difference_categories() -> None:
         for mismatch in result.mismatches
     ] == [("claude-opus-5", "output_cost_per_token", 9.0, 2.0)]
     assert result.missing_upstream == ("claude-fable-5",)
-    assert result.missing_fallback == ("claude-sonnet-5",)
+    assert result.missing_fallback == ("claude-sonnet-5", "gpt-6.1-terra")
     assert result.has_differences is True
 
 

{usage_cli-0.34.7 → usage_cli-0.34.8}/tests/test_report_filter_js.py

@@ -851,6 +851,25 @@ for (const [peak, ceiling] of [
   assert.equal(axisEnv.trendSection.querySelector('.daily-y-label').textContent, ceiling);
 }
 console.log('daily chart: date range rebuilds pricing; tokens/cost toggle redraws');
+
+// Name fields must stay text in spreadsheet apps; numeric fields remain numeric.
+for (const name of ['=1+1', '-cmd', '+cmd', '@cmd', '\tcmd', '\rcmd', '=1,"x"']) {
+  const formulaCube = {
+    dates: ['2026-05-21'],
+    agents: [{id: 'codex', name: 'Codex'}],
+    models: [{name, cost_known: true}],
+    projects: [name],
+    rows: [[0, 0, 0, 0, 10, 0, 0, 0, -3, 1]],
+  };
+  run(makeEnvironment(formulaCube, {}));
+  const safeName = "'" + name;
+  const field = /[",\r\n]/.test(safeName)
+    ? `"${safeName.replace(/"/g, '""')}"` : safeName;
+  assert.equal(
+    window.usageReportFilter.buildCsv(false),
+    `type,name,share_pct,tokens,cost_usd\r\nproject,${field},100.0,10,-3.00\r\nmodel,${field},100.0,10,-3.00\r\n`
+  );
+}
 """
 
 

{usage_cli-0.34.7 → usage_cli-0.34.8}/tests/test_report_share_mask.py

@@ -11,23 +11,47 @@ from ui.report_scripts import REPORT_JS_TEMPLATE
 
 
 @pytest.mark.skipif(shutil.which("node") is None, reason="Node.js is unavailable")
-def test_project_mask_skips_other_without_consuming_a_number(tmp_path: Path) -> None:
+def test_project_mask_covers_accessibility_attributes_and_restores_them(tmp_path: Path) -> None:
     start = REPORT_JS_TEMPLATE.index("async function withShareableReport(")
     end = REPORT_JS_TEMPLATE.index("\nasync function downloadHtml", start)
     script = r"""
 const assert = require('node:assert/strict');
-const make = (text, other = false) => ({
+const make = (text, other = false, attributes = {}) => ({
   textContent: text,
+  attributes,
+  getAttribute: (name) => attributes[name] ?? null,
+  setAttribute: (name, value) => { attributes[name] = value; },
   closest: (selector) => selector === '[data-project-other]' && other ? {} : null,
 });
-const names = [make('alpha'), make('Other projects', true), make('beta')];
-const legend = [make('alpha'), make('Other projects', true), make('beta')];
+const names = [make(' alpha '), make('Other projects', true), make('beta[.]')];
+const legend = [make('alpha'), make('Other projects', true), make('beta[.]')];
+const toggle = make('', false, {
+  'aria-label': 'Expand alpha; alpha / beta[.]',
+  'aria-description': 'Details for beta[.]',
+  title: 'alpha and beta[.]',
+  alt: 'alpha logo',
+  class: 'alpha',
+  id: 'beta',
+  'data-project-name': 'alpha',
+});
+const untouched = make('', false, {title: 'Other projects betaX'});
+const originalAttributes = {...toggle.attributes};
+const assertMasked = () => {
+  assert.deepEqual(toggle.attributes, {
+    ...originalAttributes,
+    'aria-label': 'Expand Project 1; Project 1 / Project 2',
+    'aria-description': 'Details for Project 2',
+    title: 'Project 1 and Project 2',
+    alt: 'Project 1 logo',
+  });
+  assert.deepEqual(untouched.attributes, {title: 'Other projects betaX'});
+};
 const document = {
   querySelectorAll: (selector) => selector === '.project-section .rank-line .name'
     ? names : selector === '.project-section .lg-name' ? legend : [],
   querySelector: () => null,
 };
-const reportRoot = {};
+const reportRoot = {querySelectorAll: () => [toggle, untouched]};
 function closeShareModal() {}
 function stopSnakeAndRestore() {}
 eval(__FUNCTION__);
@@ -36,12 +60,19 @@ eval(__FUNCTION__);
   await withShareableReport(true, async () => {
     assert.deepEqual(names.map((el) => el.textContent), expected);
     assert.deepEqual(legend.map((el) => el.textContent), expected);
+    assertMasked();
+  });
+  assert.deepEqual(names.map((el) => el.textContent), [' alpha ', 'Other projects', 'beta[.]']);
+  assert.deepEqual(toggle.attributes, originalAttributes);
+  await withShareableReport(false, async () => {
+    assert.deepEqual(toggle.attributes, originalAttributes);
   });
-  assert.deepEqual(names.map((el) => el.textContent), ['alpha', 'Other projects', 'beta']);
   await assert.rejects(withShareableReport(true, async () => {
+    assertMasked();
     throw new Error('export failed');
-  }));
-  assert.deepEqual(legend.map((el) => el.textContent), ['alpha', 'Other projects', 'beta']);
+  }), /export failed/);
+  assert.deepEqual(legend.map((el) => el.textContent), ['alpha', 'Other projects', 'beta[.]']);
+  assert.deepEqual(toggle.attributes, originalAttributes);
 })();
 """.replace("__FUNCTION__", json.dumps(REPORT_JS_TEMPLATE[start:end]))
     script_path = tmp_path / "mask.cjs"

{usage_cli-0.34.7 → usage_cli-0.34.8}/tests/test_session_resume.py

@@ -296,6 +296,48 @@ def test_git_dirty_includes_untracked_directory_and_keeps_other_paths(tmp_path:
     assert "new-feature" in files
 
 
+def test_git_dirty_disables_repository_fsmonitor(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    monkeypatch.setenv("GIT_CONFIG_NOSYSTEM", "1")
+    monkeypatch.setenv("GIT_CONFIG_GLOBAL", os.devnull)
+    repo = tmp_path / "repo"
+    repo.mkdir()
+    subprocess.run(["git", "init", str(repo)], check=True, capture_output=True)
+    (repo / "tracked.py").write_text("before\n", encoding="utf-8")
+    subprocess.run(["git", "-C", str(repo), "add", "."], check=True)
+    subprocess.run(
+        [
+            "git",
+            "-C",
+            str(repo),
+            "-c",
+            "user.name=Test User",
+            "-c",
+            "user.email=test@example.com",
+            "-c",
+            "commit.gpgsign=false",
+            "commit",
+            "-m",
+            "initial",
+        ],
+        check=True,
+        capture_output=True,
+    )
+    monitor = tmp_path / "fsmonitor"
+    marker = tmp_path / "fsmonitor.marker"
+    monitor.write_text('#!/bin/sh\n: > "$0.marker"\n', encoding="utf-8")
+    monitor.chmod(0o700)
+    subprocess.run(["git", "-C", str(repo), "config", "core.fsmonitor", str(monitor)], check=True)
+    (repo / "tracked.py").write_text("after\n", encoding="utf-8")
+
+    dirty = mod._git_dirty(str(repo))
+
+    assert not marker.exists()
+    assert dirty is not None
+    assert dirty[1:] == (1, ["tracked.py"])
+
+
 def test_build_prompt_reads_previous_session(
     monkeypatch: pytest.MonkeyPatch, tmp_path: Path
 ) -> None:

{usage_cli-0.34.7 → usage_cli-0.34.8}/tests/test_setup_hook_terse.py

@@ -361,6 +361,22 @@ def test_setup_codex_terse_keeps_unreadable_hooks_json_unchanged(
     assert not terse_paths.codex_terse_target.exists()
 
 
+@pytest.mark.parametrize("content", ["features = { hooks = false }\n", "features.hooks = false\n"])
+def test_setup_codex_terse_preserves_unsupported_features_syntax(
+    terse_paths: TerseHookPaths, caplog: pytest.LogCaptureFixture, content: str
+) -> None:
+    terse_paths.codex_config.write_text(content, encoding="utf-8")
+
+    session_hooks._setup_codex_terse()
+
+    actual = terse_paths.codex_config.read_text(encoding="utf-8")
+    assert actual == content
+    assert tomllib.loads(actual)["features"]["hooks"] is False
+    assert "Could not enable Codex hooks" in caplog.text
+    assert len(caplog.records) == 1
+    assert caplog.records[0].levelname == "WARNING"
+
+
 def test_setup_codex_terse_creates_missing_hooks_json(terse_paths: TerseHookPaths) -> None:
     terse_paths.codex_config.write_text('model = "gpt-5"\n', encoding="utf-8")
 

{usage_cli-0.34.7 → usage_cli-0.34.8}/tests/test_usage_statusline.py

@@ -10,6 +10,7 @@ import errno
 import io
 import json
 import os
+import subprocess
 import sys
 import tempfile
 import time
@@ -226,23 +227,25 @@ def test_exclusive_lock_times_out_when_another_process_holds_it(
     tmp_path: Path,
 ) -> None:
     lock_path = tmp_path / "usage-status.lock"
-    fcntl = vars(usage_statusline).get("fcntl")
-    assert fcntl is not None
-    ready_read, ready_write = os.pipe()
-    # os.fork is POSIX-only; this test is skipped on Windows, but mypy still
-    # type-checks the line there.
-    child_pid = os.fork()  # type: ignore[attr-defined]
-    if child_pid == 0:
-        os.close(ready_read)
-        lock_fd = os.open(lock_path, os.O_CREAT | os.O_RDWR, 0o600)
-        fcntl.flock(lock_fd, fcntl.LOCK_EX)
-        os.write(ready_write, b"1")
-        time.sleep(0.3)
-        os._exit(0)
-
-    os.close(ready_write)
+    # A fresh interpreter holds the lock until we close its stdin. os.fork()
+    # here would warn: pytest's process is already multi-threaded.
+    holder = subprocess.Popen(
+        [
+            sys.executable,
+            "-c",
+            "import fcntl, os, sys\n"
+            "fd = os.open(sys.argv[1], os.O_CREAT | os.O_RDWR, 0o600)\n"
+            "fcntl.flock(fd, fcntl.LOCK_EX)\n"
+            "print('1', flush=True)\n"
+            "sys.stdin.read()\n",
+            str(lock_path),
+        ],
+        stdin=subprocess.PIPE,
+        stdout=subprocess.PIPE,
+    )
+    assert holder.stdin is not None and holder.stdout is not None
     try:
-        assert os.read(ready_read, 1) == b"1"
+        assert holder.stdout.readline() == b"1\n"
         monkeypatch.setattr(usage_statusline, "_LOCK_TIMEOUT_S", 0.01)
         lock_fd = os.open(lock_path, os.O_CREAT | os.O_RDWR, 0o600)
         try:
@@ -253,8 +256,9 @@ def test_exclusive_lock_times_out_when_another_process_holds_it(
         finally:
             os.close(lock_fd)
     finally:
-        os.close(ready_read)
-        os.waitpid(child_pid, 0)
+        holder.stdin.close()
+        holder.wait(timeout=5)
+        holder.stdout.close()
 
 
 def test_acquire_msvcrt_lock_waits_out_a_contended_lock(

{usage_cli-0.34.7 → usage_cli-0.34.8}/ui/html_report.py

@@ -1277,23 +1277,29 @@ def _build_csv_data(data: Mapping[str, Any], lang: str, *, mask_projects: bool =
     writer = csv.writer(out, lineterminator="\r\n")
     writer.writerow(["type", "name", "share_pct", "tokens", "cost_usd"])
     for idx, item in enumerate(data.get("by_project", []), start=1):
+        name = f"Project {idx}" if mask_projects else _display_name(item.get("project"), lang)
+        if name.startswith(("=", "+", "-", "@", "\t", "\r")):
+            name = "'" + name
         writer.writerow(
             [
                 "project",
-                f"Project {idx}" if mask_projects else _display_name(item.get("project"), lang),
+                name,
                 f"{float(item.get('pct', 0.0)):.1f}",
                 str(int(item.get("tokens", 0))),
                 _csv_cost(float(item.get("cost", 0.0))),
             ]
         )
     for model_item in data.get("by_model", []):
+        name = _display_name(model_item.get("model"), lang)
+        if name.startswith(("=", "+", "-", "@", "\t", "\r")):
+            name = "'" + name
         cost_val = (
             None if not model_item.get("cost_known", True) else float(model_item.get("cost", 0.0))
         )
         writer.writerow(
             [
                 "model",
-                _display_name(model_item.get("model"), lang),
+                name,
                 f"{float(model_item.get('pct', 0.0)):.1f}",
                 str(int(model_item.get("tokens", 0))),
                 _csv_cost(cost_val),

{usage_cli-0.34.7 → usage_cli-0.34.8}/ui/report_filter.py

@@ -1003,7 +1003,8 @@ REPORT_FILTER_JS = r"""(() => {
   }
 
   function csvField(value) {
-    const text = String(value);
+    let text = String(value);
+    if (/^[=+\-@\t\r]/.test(text)) text = "'" + text;
     if (/[",\r\n]/.test(text)) return `"${text.replace(/"/g, '""')}"`;
     return text;
   }

{usage_cli-0.34.7 → usage_cli-0.34.8}/ui/report_scripts.py

@@ -199,6 +199,26 @@ async function withShareableReport(maskProjects, callback) {
       restores.push({el, original: el.textContent});
       el.textContent = '—';
     });
+    const masks = new Map();
+    restores.forEach(({el, original}) => {
+      const name = (original || '').trim();
+      if (name && original !== el.textContent && !masks.has(name)) masks.set(name, el.textContent);
+    });
+    const names = Array.from(masks.keys()).sort((a, b) => b.length - a.length);
+    if (names.length) {
+      const pattern = new RegExp(names.map((name) => name.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&')).join('|'), 'g');
+      reportRoot.querySelectorAll('*').forEach((el) => {
+        ['aria-label', 'aria-description', 'title', 'alt'].forEach((attribute) => {
+          const original = el.getAttribute(attribute);
+          if (original === null) return;
+          const masked = original.replace(pattern, (name) => masks.get(name));
+          if (masked !== original) {
+            restores.push({el, attribute, original});
+            el.setAttribute(attribute, masked);
+          }
+        });
+      });
+    }
     ['#usage-csv-data', '#usage-cube-data', '#usage-session-data'].forEach((selector) => {
       const dataNode = document.querySelector(selector);
       if (dataNode) {
@@ -218,7 +238,8 @@ async function withShareableReport(maskProjects, callback) {
       item.parent.insertBefore(item.el, item.next);
     });
     restores.forEach((item) => {
-      item.el.textContent = item.original;
+      if (item.attribute) item.el.setAttribute(item.attribute, item.original);
+      else item.el.textContent = item.original;
     });
   }
 }

{usage_cli-0.34.7 → usage_cli-0.34.8/usage_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usage-cli
-Version: 0.34.7
+Version: 0.34.8
 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.7 → usage_cli-0.34.8}/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-10-12"
+FALLBACK_PRICING_AS_OF: str = "2026-10-30"
 # 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
@@ -539,6 +539,12 @@ def _fallback_pricing() -> PricingTable:
             "cache_creation_input_token_cost": 2.5e-6,
             "cache_read_input_token_cost": 0.1e-6,
         },
+        "gpt-6.1-terra": {
+            "input_cost_per_token": 1e-6,
+            "output_cost_per_token": 5e-6,
+            "cache_creation_input_token_cost": 1.25e-6,
+            "cache_read_input_token_cost": 0.05e-6,
+        },
         "gpt-6-luna": {
             "input_cost_per_token": 0.1e-6,
             "output_cost_per_token": 0.5e-6,

{usage_cli-0.34.7 → usage_cli-0.34.8}/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.11"
+__version__ = "1.12"
 
 
 class _HiddenConsoleKwargs(TypedDict, total=False):
@@ -496,7 +496,7 @@ def _git_dirty(cwd: str) -> tuple[str, int, list[str]] | None:
         if not branch:
             return None
         status_proc = subprocess.run(
-            ["git", "-C", cwd, "status", "--porcelain"],
+            ["git", "-C", cwd, "-c", "core.fsmonitor=false", "status", "--porcelain"],
             stdout=subprocess.PIPE,
             stderr=subprocess.DEVNULL,
             timeout=2,