cctally 1.82.0 → 1.83.0

package/bin/_cctally_reporting.py

@@ -376,64 +376,69 @@ def cmd_weekly(args: argparse.Namespace) -> int:
 
     conn = open_db()
 
-    # Build the subscription-week list spanning the range. Boundaries are
-    # anchored in `weekly_usage_snapshots` when available and otherwise
-    # extrapolated (see `_compute_subscription_weeks`). Pass the
-    # `--config`-honoring resolved config (issue #88) so the no-snapshot
-    # calendar-week fallback uses the explicit override's `week_start`.
-    weeks = c._compute_subscription_weeks(
-        conn, range_start, range_end, config=config,
-        account_key=acct_key,  # #341: None = merged (all-accounts) read
-    )
+    try:
+        # Build the subscription-week list spanning the range. Boundaries are
+        # anchored in `weekly_usage_snapshots` when available and otherwise
+        # extrapolated (see `_compute_subscription_weeks`). Pass the
+        # `--config`-honoring resolved config (issue #88) so the no-snapshot
+        # calendar-week fallback uses the explicit override's `week_start`.
+        weeks = c._compute_subscription_weeks(
+            conn, range_start, range_end, config=config,
+            account_key=acct_key,  # #341: None = merged (all-accounts) read
+        )
 
-    # Fetch entries and aggregate.
-    # Cover each SubWeek's full [start_ts, end_ts) on the range_start side —
-    # `_compute_subscription_weeks` can emit weeks whose start_ts precedes
-    # range_start (any week overlapping the range). Without widening, boundary
-    # weeks get tail-only cost divided by full-week usedPct → understated
-    # totalCost and $/1%. range_end stays as the upper bound so historical
-    # `--until <past>` queries still clip the tail week (paired with the
-    # as_of_utc bound on get_latest_usage_for_week below).
-    if weeks:
-        fetch_start = min(
-            range_start,
-            parse_iso_datetime(weeks[0].start_ts, "week_start_at"),
+        # Fetch entries and aggregate.
+        # Cover each SubWeek's full [start_ts, end_ts) on the range_start side —
+        # `_compute_subscription_weeks` can emit weeks whose start_ts precedes
+        # range_start (any week overlapping the range). Without widening,
+        # boundary weeks get tail-only cost divided by full-week usedPct →
+        # understated totalCost and $/1%. range_end stays as the upper bound so
+        # historical `--until <past>` queries still clip the tail week (paired
+        # with the as_of_utc bound on get_latest_usage_for_week below).
+        if weeks:
+            fetch_start = min(
+                range_start,
+                parse_iso_datetime(weeks[0].start_ts, "week_start_at"),
+            )
+        else:
+            fetch_start = range_start
+        all_entries = c.get_entries(
+            fetch_start, range_end, account_key=acct_key
         )
-    else:
-        fetch_start = range_start
-    all_entries = c.get_entries(fetch_start, range_end, account_key=acct_key)
 
-    c._emit_debug_samples_if_set(
-        args, all_entries, command_label="weekly",
-    )
+        c._emit_debug_samples_if_set(
+            args, all_entries, command_label="weekly",
+        )
 
-    # Bound the usage-snapshot lookup to `<= range_end` so historical
-    # `--until <past date>` queries pick the usage% that was current at
-    # the end of the requested window rather than the globally latest
-    # snapshot for the week. Cost is already truncated to `range_end` by
-    # `_aggregate_weekly`, so using a later usedPct would produce a
-    # silently wrong $/1%. Match the stored `captured_at_utc` format
-    # (see now_utc_iso): UTC, seconds precision, `Z` suffix — otherwise
-    # lexicographic string compare inside SQLite would misorder `+00:00`
-    # vs. `Z` at the same instant.
-    as_of_utc = (
-        range_end.astimezone(dt.timezone.utc)
-        .replace(microsecond=0)
-        .isoformat()
-        .replace("+00:00", "Z")
-    )
+        # Bound the usage-snapshot lookup to `<= range_end` so historical
+        # `--until <past date>` queries pick the usage% that was current at
+        # the end of the requested window rather than the globally latest
+        # snapshot for the week. Cost is already truncated to `range_end` by
+        # `_aggregate_weekly`, so using a later usedPct would produce a
+        # silently wrong $/1%. Match the stored `captured_at_utc` format
+        # (see now_utc_iso): UTC, seconds precision, `Z` suffix — otherwise
+        # lexicographic string compare inside SQLite would misorder `+00:00`
+        # vs. `Z` at the same instant.
+        as_of_utc = (
+            range_end.astimezone(dt.timezone.utc)
+            .replace(microsecond=0)
+            .isoformat()
+            .replace("+00:00", "Z")
+        )
 
-    # Build the unified weekly view (spec §5.3): runs _aggregate_weekly,
-    # overlays weekly_usage_snapshots per WeekRef. view.aggregated is
-    # the BucketUsage tuple newest-first; view.overlay is the parallel
-    # (used_pct, dollar_per_pct) tuple. We reverse both for CLI's
-    # default asc rendering so the existing renderer's len-equality
-    # assertions stay aligned.
-    view = c.build_weekly_view(
-        conn, all_entries, weeks=weeks, now_utc=now_utc,
-        display_tz=args._resolved_tz, as_of_utc=as_of_utc, mode=args.mode,
-        account_key=acct_key,
-    )
+        # Build the unified weekly view (spec §5.3): runs _aggregate_weekly,
+        # overlays weekly_usage_snapshots per WeekRef. view.aggregated is
+        # the BucketUsage tuple newest-first; view.overlay is the parallel
+        # (used_pct, dollar_per_pct) tuple. We reverse both for CLI's
+        # default asc rendering so the existing renderer's len-equality
+        # assertions stay aligned.
+        view = c.build_weekly_view(
+            conn, all_entries, weeks=weeks, now_utc=now_utc,
+            display_tz=args._resolved_tz, as_of_utc=as_of_utc, mode=args.mode,
+            account_key=acct_key,
+        )
+    finally:
+        conn.close()
     buckets = list(reversed(view.aggregated))
     overlay = list(reversed(view.overlay))
 

package/bin/_cctally_setup.py

@@ -2733,6 +2733,7 @@ def _setup_install(args: argparse.Namespace) -> int:
                             lambda active_conn: c.sync_cache(
                                 active_conn, progress=progress.sync_callback
                             ),
+                            origin="setup.bootstrap.claude_sync",
                         )
                     )
                 finally:

package/bin/_cctally_source_analytics.py

@@ -489,7 +489,9 @@ def load_qualified_codex_entries(
         if sync:
             cache_mod = c._load_sibling("_cctally_cache")
             stats, conn = cache_mod._run_cache_operation_with_recovery(
-                conn, lambda active_conn: c.sync_codex_cache(active_conn)
+                conn,
+                lambda active_conn: c.sync_codex_cache(active_conn),
+                origin="source.analytics.codex_sync",
             )
             if stats.lock_contended:
                 raise QualifiedMetadataUnavailable("Codex qualified project metadata is unavailable")
@@ -2334,6 +2336,7 @@ def cmd_source_report(args: object) -> int:
                     cache_mod._run_cache_operation_with_recovery(
                         cache,
                         lambda active_conn: c.sync_codex_cache(active_conn),
+                        origin="source.report.codex_sync",
                     )
                 )
             finally:

package/bin/_cctally_statusline.py

@@ -1497,7 +1497,7 @@ def _build_statusline_injections(warn_once):
                 "SELECT se.timestamp_utc, se.model, "
                 "  se.input_tokens, se.output_tokens, "
                 "  se.cache_create_tokens, se.cache_read_tokens, "
-                "  se.cost_usd_raw "
+                "  se.cost_usd_raw, se.cache_create_1h_tokens, se.speed "
                 "FROM session_entries se "
                 "LEFT JOIN session_files sf ON sf.path = se.source_path "
                 "WHERE sf.session_id = ?"
@@ -1514,16 +1514,16 @@ def _build_statusline_injections(warn_once):
             return None
         total = 0.0
         for r in rows:
-            usage = {
-                "input_tokens":                r[2] or 0,
-                "output_tokens":               r[3] or 0,
-                "cache_creation_input_tokens": r[4] or 0,
-                "cache_read_input_tokens":     r[5] or 0,
-            }
-            # #181: cost is token-only (_calculate_entry_cost ignores `speed`),
-            # so the statusline cost path no longer selects or json.loads the
-            # usage_extra_json blob — output is byte-identical. r[6] is still
-            # cost_usd_raw (the dropped column was the trailing slot).
+            usage = c.claude_usage_dict(   # #195 chokepoint
+                input_tokens=r[2],
+                output_tokens=r[3],
+                cache_creation_tokens=r[4],
+                cache_read_tokens=r[5],
+                cache_1h_tokens=r[7],
+                speed=r[8],
+            )
+            # #413: speed is materialized, so the hot statusline path keeps the
+            # effective tier without parsing the legacy usage_extra_json blob.
             try:
                 total += c._calculate_entry_cost(
                     r[1], usage, mode="auto", cost_usd=r[6],