cctally 1.16.0 → 1.17.0

package/CHANGELOG.md

@@ -5,6 +5,14 @@ based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ## [Unreleased]
 
+## [1.17.0] - 2026-05-27
+
+### Added
+- **`--speed {auto,standard,fast}` on `cctally codex-daily`, `codex-monthly`, `codex-weekly`, and `codex-session` (and their `cctally codex <cmd>` subgroup forms)** — a drop-in for `ccusage codex --speed`. `auto` (the default) reads `service_tier` from `~/.codex/config.toml` and applies fast-tier pricing when it is `fast` or `priority`; `fast`/`standard` force the tier. Fast-tier multiplies the per-model Codex cost by a fixed factor (`gpt-5.5` ×2.5, all other models ×2.0). `--json` gains no new field; only the `costUSD` figures change. On the flat `codex-*` forms this is a cctally extension (the standalone `ccusage-codex` binary has no `--speed`); the subgroup form mirrors `ccusage codex`. (#86)
+
+### Changed
+- **`cctally codex-*` now applies fast-tier (≥2×) Codex pricing by default when `~/.codex/config.toml` sets `service_tier = "fast"` or `"priority"`.** Previously cctally always priced Codex usage at the standard tier, under-reporting cost for workstations on the fast/priority tier (who pay the premium). With the new `--speed auto` default, those costs now match what was actually billed; pass `--speed standard` to force the old behavior. Users without a fast/priority `service_tier` see identical numbers. (#86)
+
 ## [1.16.0] - 2026-05-26
 
 ### Added

package/bin/_lib_aggregators.py

@@ -363,6 +363,7 @@ class ClaudeSessionUsage:
 def _aggregate_codex_buckets(
     entries: list[CodexEntry],
     key_fn: Callable[[CodexEntry], str],
+    speed: str = "standard",
 ) -> list[CodexBucketUsage]:
     """Group CodexEntry list into per-bucket records sorted by key ascending.
 
@@ -386,6 +387,7 @@ def _aggregate_codex_buckets(
             entry.cached_input_tokens,
             entry.output_tokens,
             entry.reasoning_output_tokens,
+            speed=speed,
         )
 
         bucket["input"] += entry.input_tokens
@@ -441,6 +443,7 @@ def _aggregate_codex_buckets(
 
 def _aggregate_codex_daily(
     entries: list[CodexEntry], *, tz_name: str | None = None,
+    speed: str = "standard",
 ) -> list[CodexBucketUsage]:
     """Daily grouping. Default: local tz. With ``tz_name``: that IANA zone."""
     tz = _resolve_tz(tz_name)
@@ -448,11 +451,12 @@ def _aggregate_codex_daily(
         key_fn = lambda e: e.timestamp.astimezone(tz).strftime("%Y-%m-%d")  # noqa: E731
     else:
         key_fn = lambda e: e.timestamp.astimezone().strftime("%Y-%m-%d")    # noqa: E731
-    return _aggregate_codex_buckets(entries, key_fn=key_fn)
+    return _aggregate_codex_buckets(entries, key_fn=key_fn, speed=speed)
 
 
 def _aggregate_codex_monthly(
     entries: list[CodexEntry], *, tz_name: str | None = None,
+    speed: str = "standard",
 ) -> list[CodexBucketUsage]:
     """Monthly grouping. Default: local tz. With ``tz_name``: that IANA zone."""
     tz = _resolve_tz(tz_name)
@@ -460,13 +464,14 @@ def _aggregate_codex_monthly(
         key_fn = lambda e: e.timestamp.astimezone(tz).strftime("%Y-%m")  # noqa: E731
     else:
         key_fn = lambda e: e.timestamp.astimezone().strftime("%Y-%m")    # noqa: E731
-    return _aggregate_codex_buckets(entries, key_fn=key_fn)
+    return _aggregate_codex_buckets(entries, key_fn=key_fn, speed=speed)
 
 
 def _aggregate_codex_weekly(
     entries: list[CodexEntry],
     tz_name: str | None,
     week_start_idx: int,
+    speed: str = "standard",
 ) -> list[CodexBucketUsage]:
     """Group Codex entries by calendar week.
 
@@ -485,7 +490,7 @@ def _aggregate_codex_weekly(
         week_start = local_date - dt.timedelta(days=diff)
         return week_start.isoformat()
 
-    return _aggregate_codex_buckets(entries, key_fn=_week_key)
+    return _aggregate_codex_buckets(entries, key_fn=_week_key, speed=speed)
 
 
 def _session_path_parts(source_path: str) -> tuple[str, str, str]:
@@ -520,7 +525,7 @@ def _session_path_parts(source_path: str) -> tuple[str, str, str]:
     return str(stem), stem.name, str(stem.parent)
 
 
-def _aggregate_codex_sessions(entries: list[CodexEntry]) -> list[CodexSessionUsage]:
+def _aggregate_codex_sessions(entries: list[CodexEntry], speed: str = "standard") -> list[CodexSessionUsage]:
     """Group by session file path (upstream-compatible).
 
     Sessions are keyed by the full relative-path-without-.jsonl rather than
@@ -543,7 +548,7 @@ def _aggregate_codex_sessions(entries: list[CodexEntry]) -> list[CodexSessionUsa
         })
         cost = _calculate_codex_entry_cost(
             entry.model, entry.input_tokens, entry.cached_input_tokens,
-            entry.output_tokens, entry.reasoning_output_tokens,
+            entry.output_tokens, entry.reasoning_output_tokens, speed=speed,
         )
         sess["input"] += entry.input_tokens
         sess["cached_input"] += entry.cached_input_tokens

package/bin/_lib_pricing.py

@@ -346,6 +346,44 @@ _unknown_codex_model_warnings: set[str] = set()
 # directly comparable.
 CODEX_LEGACY_FALLBACK_MODEL = "gpt-5"
 
+# Per-model fast-tier price multipliers, ported from ryoppippi/ccusage
+# fast-multiplier-overrides.json ("exact" map — Codex/gpt entries only; the
+# upstream claude-opus-* entries are for ccusage's Claude adapter and never
+# price Codex models). Any fast-tier model NOT listed falls back to
+# CODEX_FAST_MULTIPLIER_FALLBACK — upstream's `fast_multiplier == 1.0 → 2.0`
+# rule in adapter/codex/report.rs:calculate_codex_model_cost.
+CODEX_FAST_MULTIPLIER_OVERRIDES: dict[str, float] = {
+    "gpt-5.5": 2.5,
+    "gpt-5.4": 2.0,
+    "gpt-5.3-codex": 2.0,
+}
+CODEX_FAST_MULTIPLIER_FALLBACK = 2.0
+
+
+def _codex_fast_multiplier(model: str) -> float:
+    """Fast-tier price multiplier for a Codex model (standard tier = 1.0)."""
+    return CODEX_FAST_MULTIPLIER_OVERRIDES.get(model, CODEX_FAST_MULTIPLIER_FALLBACK)
+
+
+def _codex_config_requests_fast_service_tier(content: str) -> bool:
+    """True iff any line sets ``service_tier = "fast"|"priority"``.
+
+    Naive line-scan ported from ryoppippi/ccusage adapter/codex/speed.rs
+    (NOT a TOML parse): strip the trailing ``#``-comment, split on the first
+    ``=``, the key must be exactly ``service_tier``, and the quote-stripped
+    value must be ``fast`` or ``priority``. Matches a ``service_tier`` line in
+    ANY table; ignores ``service_tier_override`` and substrings like
+    ``"breakfast"``.
+    """
+    for line in content.splitlines():
+        setting = line.split("#", 1)[0].strip()
+        key, sep, value = setting.partition("=")
+        if not sep or key.strip() != "service_tier":
+            continue
+        if value.strip().strip("\"'") in ("fast", "priority"):
+            return True
+    return False
+
 
 def _resolve_codex_pricing(model: str) -> tuple[dict[str, Any] | None, bool]:
     """Return (pricing_dict, is_fallback).
@@ -450,6 +488,7 @@ def _calculate_codex_entry_cost(
     cached_input_tokens: int,
     output_tokens: int,
     reasoning_output_tokens: int,
+    speed: str = "standard",
 ) -> float:
     """Compute USD cost for one Codex `token_count` event.
 
@@ -505,7 +544,10 @@ def _calculate_codex_entry_cost(
         "output_cost_per_token",
         "output_cost_per_token_above_272k_tokens",
     )
-    return input_cost + cached_input_cost + output_cost
+    base = input_cost + cached_input_cost + output_cost
+    if speed == "fast":
+        base *= _codex_fast_multiplier(model)
+    return base
 
 
 def _short_model_name(model: str) -> str:

package/bin/_lib_view_models.py

@@ -1703,7 +1703,7 @@ def _codex_period_start_from_month_bucket(buckets) -> "dt.datetime | None":
         return None
 
 
-def build_codex_daily_view(entries, *, now_utc, tz_name=None):
+def build_codex_daily_view(entries, *, now_utc, tz_name=None, speed="standard"):
     """Build a ``CodexDailyView`` from a list of ``CodexEntry`` (issue #58).
 
     Delegates bucketing to ``_aggregate_codex_daily`` (LiteLLM-snapshot
@@ -1712,7 +1712,7 @@ def build_codex_daily_view(entries, *, now_utc, tz_name=None):
     (None → host-local fallback inside the aggregator).
     """
     _agg = _load_lib("_lib_aggregators")
-    buckets = _agg._aggregate_codex_daily(entries, tz_name=tz_name)
+    buckets = _agg._aggregate_codex_daily(entries, tz_name=tz_name, speed=speed)
     total_cost, total_tok = _codex_bucket_totals(buckets)
     return CodexDailyView(
         rows=tuple(buckets),
@@ -1724,7 +1724,7 @@ def build_codex_daily_view(entries, *, now_utc, tz_name=None):
     )
 
 
-def build_codex_monthly_view(entries, *, now_utc, tz_name=None):
+def build_codex_monthly_view(entries, *, now_utc, tz_name=None, speed="standard"):
     """Build a ``CodexMonthlyView`` from a list of ``CodexEntry`` (issue #58).
 
     Same wrap-the-kernel posture as ``build_codex_daily_view``; bucket
@@ -1732,7 +1732,7 @@ def build_codex_monthly_view(entries, *, now_utc, tz_name=None):
     earliest visible month at UTC midnight.
     """
     _agg = _load_lib("_lib_aggregators")
-    buckets = _agg._aggregate_codex_monthly(entries, tz_name=tz_name)
+    buckets = _agg._aggregate_codex_monthly(entries, tz_name=tz_name, speed=speed)
     total_cost, total_tok = _codex_bucket_totals(buckets)
     return CodexMonthlyView(
         rows=tuple(buckets),
@@ -1745,7 +1745,7 @@ def build_codex_monthly_view(entries, *, now_utc, tz_name=None):
 
 
 def build_codex_weekly_view(entries, *, now_utc, tz_name=None,
-                            week_start_idx=0):
+                            week_start_idx=0, speed="standard"):
     """Build a ``CodexWeeklyView`` from a list of ``CodexEntry`` (issue #58).
 
     ``week_start_idx`` is the resolved Mon=0..Sun=6 index the caller
@@ -1754,7 +1754,7 @@ def build_codex_weekly_view(entries, *, now_utc, tz_name=None,
     timezone (matches ``_aggregate_codex_weekly`` contract).
     """
     _agg = _load_lib("_lib_aggregators")
-    buckets = _agg._aggregate_codex_weekly(entries, tz_name, week_start_idx)
+    buckets = _agg._aggregate_codex_weekly(entries, tz_name, week_start_idx, speed=speed)
     total_cost, total_tok = _codex_bucket_totals(buckets)
     return CodexWeeklyView(
         rows=tuple(buckets),
@@ -1766,7 +1766,7 @@ def build_codex_weekly_view(entries, *, now_utc, tz_name=None,
     )
 
 
-def build_codex_session_view(entries, *, now_utc, tz_name=None):
+def build_codex_session_view(entries, *, now_utc, tz_name=None, speed="standard"):
     """Build a ``CodexSessionView`` from a list of ``CodexEntry`` (issue #58).
 
     ``rows`` order mirrors the aggregator: descending by
@@ -1779,7 +1779,7 @@ def build_codex_session_view(entries, *, now_utc, tz_name=None):
     aggregator only tracks ``last`` per session). ``None`` on empty.
     """
     _agg = _load_lib("_lib_aggregators")
-    sessions = _agg._aggregate_codex_sessions(entries)
+    sessions = _agg._aggregate_codex_sessions(entries, speed=speed)
     total_cost = 0.0
     total_tok = 0
     earliest = None

package/bin/cctally

@@ -268,6 +268,10 @@ _resolve_model_pricing = _lib_pricing._resolve_model_pricing
 _calculate_entry_cost = _lib_pricing._calculate_entry_cost
 _warn_unknown_codex_model = _lib_pricing._warn_unknown_codex_model
 _calculate_codex_entry_cost = _lib_pricing._calculate_codex_entry_cost
+_codex_fast_multiplier = _lib_pricing._codex_fast_multiplier
+CODEX_FAST_MULTIPLIER_OVERRIDES = _lib_pricing.CODEX_FAST_MULTIPLIER_OVERRIDES
+CODEX_FAST_MULTIPLIER_FALLBACK = _lib_pricing.CODEX_FAST_MULTIPLIER_FALLBACK
+_codex_config_requests_fast_service_tier = _lib_pricing._codex_config_requests_fast_service_tier
 _short_model_name = _lib_pricing._short_model_name
 
 _lib_display_tz = _load_sibling("_lib_display_tz")
@@ -1383,7 +1387,7 @@ class _CodexCostStats:
     samples: list = field(default_factory=list)
 
 
-def _compute_codex_cost_stats(entries):
+def _compute_codex_cost_stats(entries, speed: str = "standard"):
     """Walk ``entries: Iterable[CodexEntry]`` and compute the totals +
     per-entry computed-cost samples that ``_render_codex_cost_report``
     consumes (issue #92).
@@ -1414,6 +1418,7 @@ def _compute_codex_cost_stats(entries):
             entry.cached_input_tokens,
             entry.output_tokens,
             entry.reasoning_output_tokens,
+            speed=speed,
         )
         stats.total_cost += cost
         stats.samples.append(_CodexCostSample(
@@ -1500,6 +1505,7 @@ def _emit_codex_debug_samples_if_set(
     entries,
     *,
     command_label: str,
+    speed: str = "standard",
 ) -> None:
     """Emit the codex --debug report once per process when ``args.debug``
     is True (issue #92).
@@ -1517,7 +1523,7 @@ def _emit_codex_debug_samples_if_set(
     if not getattr(args, "debug", False):
         return
     sample_limit = int(getattr(args, "debug_samples", 5))
-    stats = _compute_codex_cost_stats(entries)
+    stats = _compute_codex_cost_stats(entries, speed=speed)
     stats.command_label = command_label
     for line in _render_codex_cost_report(stats, sample_limit):
         eprint(line)
@@ -4804,6 +4810,32 @@ def cmd_weekly(args: argparse.Namespace) -> int:
     return 0
 
 
+def _detect_codex_fast_service_tier() -> bool:
+    """True iff ``~/.codex/config.toml`` requests the fast/priority tier.
+
+    Reads from ``~/.codex`` only (single root; ``$CODEX_HOME`` multi-root is
+    deferred — see #108). Tolerates an absent/unreadable config (→ False →
+    standard tier).
+    """
+    cfg = pathlib.Path.home() / ".codex" / "config.toml"
+    try:
+        content = cfg.read_text(encoding="utf-8", errors="replace")
+    except OSError:
+        return False
+    return _codex_config_requests_fast_service_tier(content)
+
+
+def _resolve_codex_speed(requested: str) -> str:
+    """Resolve a ``--speed`` value to an effective tier.
+
+    ``auto`` → ``fast`` iff ``~/.codex/config.toml`` requests it, else
+    ``standard``. ``fast``/``standard`` pass through unchanged.
+    """
+    if requested == "auto":
+        return "fast" if _detect_codex_fast_service_tier() else "standard"
+    return requested
+
+
 def cmd_codex_daily(args: argparse.Namespace) -> int:
     """Show Codex usage report grouped by date (display tz, --tz, or --timezone)."""
     config = load_config()
@@ -4823,13 +4855,14 @@ def cmd_codex_daily(args: argparse.Namespace) -> int:
     range_start, range_end = range
 
     entries = get_codex_entries(range_start, range_end)
-    _emit_codex_debug_samples_if_set(args, entries, command_label="codex-daily")
+    speed = _resolve_codex_speed(args.speed)
+    _emit_codex_debug_samples_if_set(args, entries, command_label="codex-daily", speed=speed)
     # Route through ``build_codex_daily_view`` (issue #58). The View
     # wraps ``_aggregate_codex_daily`` without changing it — preserves
     # LiteLLM token semantics, intentional dedup vs upstream, and
     # ``CODEX_LEGACY_FALLBACK_MODEL`` warning end-to-end.
     view = build_codex_daily_view(
-        entries, now_utc=_command_as_of(), tz_name=tz_name,
+        entries, now_utc=_command_as_of(), tz_name=tz_name, speed=speed,
     )
     days = list(view.rows)                  # asc — matches aggregator default
     if args.order == "desc":
@@ -4883,10 +4916,11 @@ def cmd_codex_monthly(args: argparse.Namespace) -> int:
     range_start, range_end = range
 
     entries = get_codex_entries(range_start, range_end)
-    _emit_codex_debug_samples_if_set(args, entries, command_label="codex-monthly")
+    speed = _resolve_codex_speed(args.speed)
+    _emit_codex_debug_samples_if_set(args, entries, command_label="codex-monthly", speed=speed)
     # Route through ``build_codex_monthly_view`` (issue #58).
     view = build_codex_monthly_view(
-        entries, now_utc=_command_as_of(), tz_name=tz_name,
+        entries, now_utc=_command_as_of(), tz_name=tz_name, speed=speed,
     )
     months = list(view.rows)
     if args.order == "desc":
@@ -4943,11 +4977,12 @@ def cmd_codex_weekly(args: argparse.Namespace) -> int:
     week_start_idx = WEEKDAY_MAP[week_start_name]
 
     entries = get_codex_entries(range_start, range_end)
-    _emit_codex_debug_samples_if_set(args, entries, command_label="codex-weekly")
+    speed = _resolve_codex_speed(args.speed)
+    _emit_codex_debug_samples_if_set(args, entries, command_label="codex-weekly", speed=speed)
     # Route through ``build_codex_weekly_view`` (issue #58).
     view = build_codex_weekly_view(
         entries, now_utc=now_utc, tz_name=tz_name,
-        week_start_idx=week_start_idx,
+        week_start_idx=week_start_idx, speed=speed,
     )
     weeks = list(view.rows)
     if args.order == "desc":
@@ -5004,12 +5039,13 @@ def cmd_codex_session(args: argparse.Namespace) -> int:
     range_start, range_end = range
 
     entries = get_codex_entries(range_start, range_end)
-    _emit_codex_debug_samples_if_set(args, entries, command_label="codex-session")
+    speed = _resolve_codex_speed(args.speed)
+    _emit_codex_debug_samples_if_set(args, entries, command_label="codex-session", speed=speed)
     # Route through ``build_codex_session_view`` (issue #58). View rows
     # come descending by last_activity (aggregator default + upstream
     # parity); --order asc reverses.
     view = build_codex_session_view(
-        entries, now_utc=_command_as_of(), tz_name=tz_name,
+        entries, now_utc=_command_as_of(), tz_name=tz_name, speed=speed,
     )
     sessions = list(view.rows)
     if args.order == "asc":
@@ -9959,6 +9995,12 @@ def _add_codex_shared_args(parser: argparse.ArgumentParser) -> None:
         "-O", "--offline", action=argparse.BooleanOptionalAction, default=False,
         help="Accepted for drop-in compat with ccusage-codex; we are always offline.",
     )
+    parser.add_argument(
+        "--speed", choices=("auto", "standard", "fast"), default="auto",
+        help="Codex pricing tier. auto (default) reads service_tier from "
+             "~/.codex/config.toml (fast|priority -> fast pricing); fast "
+             "forces the fast-tier multiplier; standard forces base pricing.",
+    )
     parser.add_argument(
         "--tz", default=None, type=_argparse_tz, metavar="TZ",
         help="Display timezone: local, utc, or IANA name. Overrides "

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cctally",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "Claude Code usage tracker and local dashboard for Pro/Max subscription limits - weekly cost-per-percent trend, quota forecasts, threshold alerts. ccusage-compatible.",
   "homepage": "https://github.com/omrikais/cctally",
   "repository": {