cctally 1.72.0 → 1.74.0

package/bin/_lib_view_models.py

@@ -1884,20 +1884,8 @@ def build_codex_weekly_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
-    ``last_activity`` (upstream parity).
-    ``cmd_codex_session`` reverses to ASC when ``--order asc``.
-
-    ``period_start`` is set to ``min(s.last_activity)`` across emitted
-    sessions when any exist — best-available approximation since
-    ``CodexSessionUsage`` doesn't carry a ``first_activity`` field (the
-    aggregator only tracks ``last`` per session). ``None`` on empty.
-    """
-    _agg = _load_lib("_lib_aggregators")
-    sessions = _agg._aggregate_codex_sessions(entries, speed=speed)
+def _build_codex_session_view_from_rows(sessions, *, now_utc, tz_name):
+    """Wrap already-aggregated Codex sessions in the public view contract."""
     total_cost = 0.0
     total_tok = 0
     earliest = None
@@ -1915,3 +1903,51 @@ def build_codex_session_view(entries, *, now_utc, tz_name=None, speed="standard"
         period_end=now_utc,
         display_tz_label=_codex_tz_label(tz_name),
     )
+
+
+def build_codex_session_view(entries, *, now_utc, tz_name=None, speed="standard"):
+    """Build a ``CodexSessionView`` from CLI ``CodexEntry`` rows (issue #58)."""
+    _agg = _load_lib("_lib_aggregators")
+    return _build_codex_session_view_from_rows(
+        _agg._aggregate_codex_sessions(entries, speed=speed),
+        now_utc=now_utc,
+        tz_name=tz_name,
+    )
+
+
+def build_rooted_codex_session_view(entries, *, now_utc, tz_name=None, speed="standard"):
+    """Build dashboard sessions from cache-rooted accounting without I/O.
+
+    The file identity is lexical: ``(source_root_key, source_path)``.  It
+    deliberately does not inspect configured roots or touch the filesystem,
+    and a native session id remains payload rather than a grouping key.
+    """
+    _agg = _load_lib("_lib_aggregators")
+    keyed = []
+    for entry in entries:
+        source_path = str(getattr(entry, "source_path"))
+        source_root_key = str(getattr(entry, "source_root_key"))
+        path = pathlib.PurePosixPath(source_path)
+        codex_entry = _agg.CodexEntry(
+            timestamp=getattr(entry, "timestamp"),
+            session_id=str(getattr(entry, "session_id") or ""),
+            model=str(getattr(entry, "model")),
+            input_tokens=int(getattr(entry, "input_tokens")),
+            cached_input_tokens=int(getattr(entry, "cached_input_tokens")),
+            output_tokens=int(getattr(entry, "output_tokens")),
+            reasoning_output_tokens=int(getattr(entry, "reasoning_output_tokens")),
+            total_tokens=int(getattr(entry, "total_tokens")),
+            source_path=source_path,
+        )
+        keyed.append((codex_entry, _agg.CodexSessionIdentity(
+            group_key=(source_root_key, source_path),
+            session_id_path=source_path,
+            session_file=path.stem,
+            directory=str(path.parent),
+            codex_root=source_root_key,
+        )))
+    return _build_codex_session_view_from_rows(
+        _agg._aggregate_codex_sessions_keyed(keyed, speed=speed),
+        now_utc=now_utc,
+        tz_name=tz_name,
+    )

package/bin/cctally

@@ -312,11 +312,17 @@ HOOK_TICK_LOG_ROTATED_PATH = _cctally_core.HOOK_TICK_LOG_ROTATED_PATH
 HOOK_TICK_THROTTLE_PATH = _cctally_core.HOOK_TICK_THROTTLE_PATH
 HOOK_TICK_THROTTLE_LOCK_PATH = _cctally_core.HOOK_TICK_THROTTLE_LOCK_PATH
 
-# Statusline usage-persistence markers + tunables (spec 2026-07-17).
+# Statusline candidate-arbitration paths + tunables (#318).
 STATUSLINE_OBSERVE_MARKER_PATH = _cctally_core.STATUSLINE_OBSERVE_MARKER_PATH
 STATUSLINE_PERSIST_LOCK_PATH = _cctally_core.STATUSLINE_PERSIST_LOCK_PATH
+STATUSLINE_CANDIDATE_DIR = _cctally_core.STATUSLINE_CANDIDATE_DIR
+STATUSLINE_SELECTED_PATH = _cctally_core.STATUSLINE_SELECTED_PATH
+STATUSLINE_TRANSPORT_MARKER_PATH = _cctally_core.STATUSLINE_TRANSPORT_MARKER_PATH
+STATUSLINE_AUTHORITATIVE_7D_PATH = _cctally_core.STATUSLINE_AUTHORITATIVE_7D_PATH
+STATUSLINE_AUTHORITATIVE_5H_PATH = _cctally_core.STATUSLINE_AUTHORITATIVE_5H_PATH
 OAUTH_BACKOFF_MARKER_PATH = _cctally_core.OAUTH_BACKOFF_MARKER_PATH
-STATUSLINE_PERSIST_THROTTLE_SECONDS = _cctally_core.STATUSLINE_PERSIST_THROTTLE_SECONDS
+STATUSLINE_CANDIDATE_TTL_SECONDS = _cctally_core.STATUSLINE_CANDIDATE_TTL_SECONDS
+STATUSLINE_CANDIDATE_FUTURE_SKEW_SECONDS = _cctally_core.STATUSLINE_CANDIDATE_FUTURE_SKEW_SECONDS
 OAUTH_BACKFILL_STALE_SECONDS = _cctally_core.OAUTH_BACKFILL_STALE_SECONDS
 OAUTH_BACKOFF_BASE_SECONDS = _cctally_core.OAUTH_BACKOFF_BASE_SECONDS
 OAUTH_BACKOFF_CAP_SECONDS = _cctally_core.OAUTH_BACKOFF_CAP_SECONDS
@@ -1037,12 +1043,14 @@ _build_credit_plan = _cctally_record._build_credit_plan
 _resolve_reset_aware_hwm = _cctally_record._resolve_reset_aware_hwm
 _insert_credit_snapshot = _cctally_record._insert_credit_snapshot
 _resolve_prior_5h = _cctally_record._resolve_prior_5h
+_resolve_active_five_hour_reset_event_id = _cctally_record._resolve_active_five_hour_reset_event_id
 _apply_credit = _cctally_record._apply_credit
 _fire_in_place_credit = _cctally_record._fire_in_place_credit
 _force_clear_credit = _cctally_record._force_clear_credit
 _count_stale_replays = _cctally_record._count_stale_replays
 _credit_preview_text = _cctally_record._credit_preview_text
 _credit_json = _cctally_record._credit_json
+_revalidate_credit_plan = _cctally_record._revalidate_credit_plan
 _arm_reset_zero_marker = _cctally_record._arm_reset_zero_marker
 _read_reset_zero_marker = _cctally_record._read_reset_zero_marker
 _clear_reset_zero_marker = _cctally_record._clear_reset_zero_marker
@@ -1055,6 +1063,8 @@ _hook_tick_throttle_touch = _cctally_record._hook_tick_throttle_touch
 # `cctally.X` (the `_cctally()` accessor + test monkeypatch surface) resolves.
 _statusline_observe_age_seconds = _cctally_record._statusline_observe_age_seconds
 _statusline_observe_touch = _cctally_record._statusline_observe_touch
+_statusline_transport_age_seconds = _cctally_record._statusline_transport_age_seconds
+_statusline_transport_touch = _cctally_record._statusline_transport_touch
 _oauth_backoff_remaining_seconds = _cctally_record._oauth_backoff_remaining_seconds
 _oauth_backoff_set = _cctally_record._oauth_backoff_set
 _oauth_backoff_clear = _cctally_record._oauth_backoff_clear
@@ -1322,6 +1332,25 @@ _fork_persist = _cctally_statusline._fork_persist
 _record_args = _cctally_statusline._record_args
 _try_acquire_persist_lock = _cctally_statusline._try_acquire_persist_lock
 _release_persist_lock = _cctally_statusline._release_persist_lock
+_atomic_write_json = _cctally_statusline._atomic_write_json
+_load_candidate_spool = _cctally_statusline._load_candidate_spool
+_scan_active_candidate_spool = _cctally_statusline._scan_active_candidate_spool
+_read_db_projection_stable = _cctally_statusline._read_db_projection_stable
+_read_db_projection_once = _cctally_statusline._read_db_projection_once
+_read_control_state = _cctally_statusline._read_control_state
+_statusline_control_db_agreement = _cctally_statusline._statusline_control_db_agreement
+_write_control_state = _cctally_statusline._write_control_state
+_reconcile_selected_control = _cctally_statusline._reconcile_selected_control
+_read_tombstone = _cctally_statusline._read_tombstone
+_write_tombstone = _cctally_statusline._write_tombstone
+_selected_state_lock = _cctally_statusline._selected_state_lock
+_authoritative_begin = _cctally_statusline._authoritative_begin
+_authoritative_commit = _cctally_statusline._authoritative_commit
+_authoritative_record_usage = _cctally_statusline._authoritative_record_usage
+_authoritative_repair_required = _cctally_statusline._authoritative_repair_required
+_after_authoritative_record = _cctally_statusline._after_authoritative_record
+_statusline_reduce_and_publish = _cctally_statusline._statusline_reduce_and_publish
+_build_publication_plan = _cctally_statusline._build_publication_plan
 
 
 # Eager re-export of bin/_cctally_codex.py — the four cmd_codex_* are the