cctally 1.67.1 → 1.69.0

package/bin/_cctally_cache_report.py

@@ -918,13 +918,13 @@ def _resolve_cache_report_window(
     return since, until
 
 
-def _emit_cache_report_json(
+def _cache_report_json_payload(
     rows: list["crk.CacheRow"],
     mode: str,
     *,
     now_utc: dt.datetime | None = None,
-) -> str:
-    """Serialize rows + totals to JSON matching the spec schema.
+) -> dict[str, Any]:
+    """Build rows + totals matching the cache-report JSON schema.
 
     Daily mode keeps the top-level `days` key and per-row `totalCost` /
     totals.totalCost aliases for backward compat. Session mode uses
@@ -1010,7 +1010,19 @@ def _emit_cache_report_json(
         for row_dict in output[top_key]:
             row_dict["totalCost"] = row_dict["cost"]
         output["totals"]["totalCost"] = output["totals"]["cost"]
-    return json.dumps(_cctally().stamp_schema_version(output), indent=2)
+    return _cctally().stamp_schema_version(output)
+
+
+def _emit_cache_report_json(
+    rows: list["crk.CacheRow"],
+    mode: str,
+    *,
+    now_utc: dt.datetime | None = None,
+) -> str:
+    """Serialize :func:`_cache_report_json_payload` without changing bytes."""
+    return json.dumps(
+        _cache_report_json_payload(rows, mode, now_utc=now_utc), indent=2,
+    )
 
 
 def _build_cache_report_title(args: argparse.Namespace, mode: str) -> str:
@@ -1094,6 +1106,7 @@ def _sort_cache_rows(
 
 def cmd_cache_report(args: argparse.Namespace) -> int:
     c = _cctally()
+    c._share_validate_args(args)
     config = c._load_claude_config_for_args(args)
     # Session A (spec §7.2): bridge -z/--timezone into args.tz so the
     # existing resolve_display_tz precedence absorbs the new alias. The
@@ -1140,12 +1153,15 @@ def cmd_cache_report(args: argparse.Namespace) -> int:
 
     if since == until:
         if args.json:
-            print(json.dumps(
-                c.stamp_schema_version(
-                    {top_key: [], "totals": None,
-                     "generatedAt": now_utc_iso(now_utc=now_utc)}),
-                indent=2,
-            ))
+            payload = c.stamp_schema_version(
+                {top_key: [], "totals": None,
+                 "generatedAt": now_utc_iso(now_utc=now_utc)}
+            )
+            sink = getattr(args, "_source_result_sink", None)
+            if sink is not None:
+                sink(payload)
+            else:
+                print(json.dumps(payload, indent=2))
         else:
             print("(no cache activity in window)")
         return 0
@@ -1163,12 +1179,15 @@ def cmd_cache_report(args: argparse.Namespace) -> int:
 
     if not rows:
         if args.json:
-            print(json.dumps(
-                c.stamp_schema_version(
-                    {top_key: [], "totals": None,
-                     "generatedAt": now_utc_iso(now_utc=now_utc)}),
-                indent=2,
-            ))
+            payload = c.stamp_schema_version(
+                {top_key: [], "totals": None,
+                 "generatedAt": now_utc_iso(now_utc=now_utc)}
+            )
+            sink = getattr(args, "_source_result_sink", None)
+            if sink is not None:
+                sink(payload)
+            else:
+                print(json.dumps(payload, indent=2))
         else:
             print("(no cache activity in window)")
         return 0
@@ -1186,7 +1205,12 @@ def cmd_cache_report(args: argparse.Namespace) -> int:
     _sort_cache_rows(rows, resolved_sort, mode)
 
     if args.json:
-        print(_emit_cache_report_json(rows, mode, now_utc=now_utc))
+        payload = _cache_report_json_payload(rows, mode, now_utc=now_utc)
+        sink = getattr(args, "_source_result_sink", None)
+        if sink is not None:
+            sink(payload)
+        else:
+            print(json.dumps(payload, indent=2))
         return 0
 
     title = _build_cache_report_title(args, mode)

package/bin/_cctally_codex.py

@@ -37,10 +37,14 @@ import json
 import os
 import sys
 from dataclasses import dataclass, field
+from datetime import timezone
 
 from _cctally_core import WEEKDAY_MAP, _command_as_of, eprint, get_week_start_name
 
 
+UTC = timezone.utc
+
+
 def _cctally():
     """Resolve the current `cctally` module at call-time (spec §3.1)."""
     return sys.modules["cctally"]
@@ -279,10 +283,84 @@ def _resolve_codex_speed(requested: str) -> str:
     return requested
 
 
+def _build_codex_share_snapshot(command: str, view, rows):
+    """Build the four established Codex report artifacts without path fields."""
+    c = _cctally()
+    lib = c._share_load_lib()
+    end = getattr(view, "period_end", None) or _command_as_of()
+    start = getattr(view, "period_start", None) or end
+    if end < start:
+        start = end
+    display_tz = getattr(view, "display_tz_label", "UTC") or "UTC"
+    period_label = f"{start.date().isoformat()} → {end.date().isoformat()} ({display_tz})"
+    titles = {
+        "codex-daily": "Codex Token Usage — Daily",
+        "codex-monthly": "Codex Token Usage — Monthly",
+        "codex-weekly": "Codex Token Usage — Weekly",
+        "codex-session": "Codex Token Usage — Sessions",
+    }
+    if command not in titles:
+        raise ValueError(f"unknown Codex share command: {command}")
+    if command == "codex-session":
+        columns = (
+            lib.ColumnSpec(key="session", label="Session"),
+            lib.ColumnSpec(key="last", label="Last Activity"),
+            lib.ColumnSpec(key="tokens", label="Tokens", align="right"),
+            lib.ColumnSpec(key="cost", label="$ Cost", align="right"),
+        )
+        table_rows = tuple(
+            lib.Row(cells={
+                "session": lib.TextCell(f"Session {index + 1}"),
+                "last": lib.TextCell(getattr(row, "last_activity").astimezone(UTC).date().isoformat()),
+                "tokens": lib.TextCell(f"{int(getattr(row, 'total_tokens', 0)):,}"),
+                "cost": lib.MoneyCell(float(getattr(row, "cost_usd", 0.0))),
+            })
+            for index, row in enumerate(rows)
+        )
+    else:
+        first_label = {
+            "codex-daily": "Date",
+            "codex-monthly": "Month",
+            "codex-weekly": "Week",
+        }[command]
+        columns = (
+            lib.ColumnSpec(key="bucket", label=first_label),
+            lib.ColumnSpec(key="tokens", label="Tokens", align="right"),
+            lib.ColumnSpec(key="cost", label="$ Cost", align="right"),
+        )
+        table_rows = tuple(
+            lib.Row(cells={
+                "bucket": lib.TextCell(str(getattr(row, "bucket", "—"))),
+                "tokens": lib.TextCell(f"{int(getattr(row, 'total_tokens', 0)):,}"),
+                "cost": lib.MoneyCell(float(getattr(row, "cost_usd", 0.0))),
+            })
+            for row in rows
+        )
+    return lib.ShareSnapshot(
+        cmd=command,
+        title=titles[command],
+        subtitle=period_label,
+        period=lib.PeriodSpec(start=start, end=end, display_tz=display_tz, label=period_label),
+        columns=columns,
+        rows=table_rows,
+        chart=None,
+        totals=(
+            lib.Totalled(label="Total", value=f"${float(getattr(view, 'total_cost_usd', 0.0)):,.2f}"),
+        ),
+        notes=(),
+        generated_at=end,
+        version=c._share_resolve_version(),
+        source="codex",
+        source_label="Codex",
+        availability="empty" if not rows else "ok",
+    )
+
+
 def cmd_codex_daily(args: argparse.Namespace) -> int:
     """Show Codex usage report grouped by date (display tz, --tz, or --timezone)."""
     c = _cctally()
-    config = c.load_config()
+    c._share_validate_args(args)
+    config = c.load_config(getattr(args, "config", None))
     tz_obj = c.resolve_display_tz(args, config)
     args._resolved_tz = tz_obj
     # Codex aggregators take a tz_name string. F2 fix: precedence is
@@ -312,6 +390,12 @@ def cmd_codex_daily(args: argparse.Namespace) -> int:
     if args.order == "desc":
         days = list(reversed(days))
 
+    if getattr(args, "format", None):
+        c._share_render_and_emit(
+            _build_codex_share_snapshot("codex-daily", view, days), args,
+        )
+        return 0
+
     if not days:
         # Match upstream's no-data sentinel (see _emit_codex_no_data docstring).
         c._emit_codex_no_data(args, "daily")
@@ -347,7 +431,8 @@ def cmd_codex_daily(args: argparse.Namespace) -> int:
 def cmd_codex_monthly(args: argparse.Namespace) -> int:
     """Show Codex usage report grouped by calendar month (display tz, --tz, or --timezone)."""
     c = _cctally()
-    config = c.load_config()
+    c._share_validate_args(args)
+    config = c.load_config(getattr(args, "config", None))
     tz_obj = c.resolve_display_tz(args, config)
     args._resolved_tz = tz_obj
     # F2 fix: see cmd_codex_daily.
@@ -371,6 +456,12 @@ def cmd_codex_monthly(args: argparse.Namespace) -> int:
     if args.order == "desc":
         months = list(reversed(months))
 
+    if getattr(args, "format", None):
+        c._share_render_and_emit(
+            _build_codex_share_snapshot("codex-monthly", view, months), args,
+        )
+        return 0
+
     if not months:
         # Match upstream's no-data sentinel (see _emit_codex_no_data docstring).
         c._emit_codex_no_data(args, "monthly")
@@ -407,7 +498,8 @@ def cmd_codex_weekly(args: argparse.Namespace) -> int:
     """Show Codex usage grouped by week (display tz, --tz, or --timezone)."""
     c = _cctally()
     now_utc = _command_as_of()
-    config = c.load_config()
+    c._share_validate_args(args)
+    config = c.load_config(getattr(args, "config", None))
     tz_obj = c.resolve_display_tz(args, config)
     args._resolved_tz = tz_obj
     # F2 fix: see cmd_codex_daily.
@@ -434,6 +526,12 @@ def cmd_codex_weekly(args: argparse.Namespace) -> int:
     if args.order == "desc":
         weeks = list(reversed(weeks))
 
+    if getattr(args, "format", None):
+        c._share_render_and_emit(
+            _build_codex_share_snapshot("codex-weekly", view, weeks), args,
+        )
+        return 0
+
     if not weeks:
         # Match upstream's no-data sentinel (same string daily/monthly use).
         c._emit_codex_no_data(args, "weekly")
@@ -472,7 +570,8 @@ def cmd_codex_weekly(args: argparse.Namespace) -> int:
 def cmd_codex_session(args: argparse.Namespace) -> int:
     """Show Codex usage report grouped by session (sorted by last activity)."""
     c = _cctally()
-    config = c.load_config()
+    c._share_validate_args(args)
+    config = c.load_config(getattr(args, "config", None))
     tz_obj = c.resolve_display_tz(args, config)
     args._resolved_tz = tz_obj
     # F2 fix: see cmd_codex_daily.
@@ -498,6 +597,12 @@ def cmd_codex_session(args: argparse.Namespace) -> int:
     if args.order == "asc":
         sessions = list(reversed(sessions))
 
+    if getattr(args, "format", None):
+        c._share_render_and_emit(
+            _build_codex_share_snapshot("codex-session", view, sessions), args,
+        )
+        return 0
+
     if not sessions:
         # Match upstream's no-data sentinel (plural "sessions" matches upstream
         # — confirmed in @ccusage/codex@18.0.8 dist/index.js around line 7962).