cctally 1.77.0 → 1.79.0

package/bin/_cctally_dashboard_conversation.py

@@ -38,7 +38,6 @@ edits — the forwarders hit ``sys.modules["_cctally_dashboard"]`` at call time
 """
 from __future__ import annotations
 
-import json
 import re
 import socket
 import sqlite3
@@ -51,6 +50,7 @@ from _cctally_cache import (
     sync_codex_conversations,
     _codex_provider_roots,
 )
+from _lib_dashboard_json import encode_dashboard_json
 
 # Live-tail watch-loop tuning — used ONLY by _handle_get_conversation_events_impl
 # below, so moved here with the events handler (spec §4.1 / §6).
@@ -709,7 +709,8 @@ def _run_conversation_events_stream(
     import time as _time
     watch = sys.modules["cctally"]._load_sibling("_lib_conversation_watch")
     tail_frame = (
-        "event: tail\ndata: " + json.dumps(tail_data) + "\n\n").encode("utf-8")
+        "event: tail\ndata: " + encode_dashboard_json(tail_data) + "\n\n"
+    ).encode("utf-8")
 
     if passive:
         # Frozen-data contract: no ingest, no emit. Keep-alive only.
@@ -1056,7 +1057,7 @@ def _handle_get_conversation_payload_impl(handler, path: str) -> None:
     q = _u.parse_qs(handler.path.partition("?")[2])
     if session_id.startswith("v1."):
         # Qualified payload readback (§3.4): Codex uses block_key + which={call,
-        # output}; a v1.claude key keeps the tool_use_id + which={input,result}
+        # output,event}; a v1.claude key keeps the tool_use_id + which={input,result}
         # selector. neutral_payload picks per the resolved source; gone → 410.
         which_q = _qs_str(q, "which", "")
         tool_use_id_q = _qs_str(q, "tool_use_id", "") or None

package/bin/_cctally_dashboard_envelope.py

@@ -1287,6 +1287,12 @@ def snapshot_to_envelope(snap: "DataSnapshot", *,
     update_envelope = {
         "state":    _update_state_envelope,
         "suppress": _update_suppress_envelope,
+        # Beta-channel (spec 2026-07-21 §3): the configured release channel,
+        # derived DIRECTLY from config (never from cached state — a cached
+        # producer field can't seed the settings toggle after a failed fetch
+        # or on brew). The resolved-target fields (latest_version /
+        # resolved_dist_tag / latest_version_channel) ride inside `state`.
+        "configured_channel": sys.modules["cctally"].resolve_update_channel(config),
     }
 
     # Doctor aggregate block (spec §5.5). Only the small severity tree
@@ -1427,6 +1433,12 @@ def snapshot_to_envelope(snap: "DataSnapshot", *,
                 # bound or the data source crashed during sync
                 # (recorded on ``last_sync_error``).
                 "five_hour_milestones":     getattr(snap, "five_hour_milestones", []) or [],
+                # Hero-modal historical-milestone navigation index (spec §3).
+                # Additive/optional: newest-first per-week entries built on the
+                # non-idle rebuild and stored on the snapshot; ``getattr``
+                # default keeps legacy/positional fixture snapshots serializing
+                # (they emit ``[]``). Historical rows never ride the envelope.
+                "week_index":               getattr(snap, "week_index", []) or [],
             },
 
         "forecast":

package/bin/_cctally_dashboard_sources.py

@@ -49,7 +49,10 @@ from _lib_jsonl import CodexEntry, codex_model_scoped_quota_pool
 from _lib_fmt import stable_sum
 from _lib_aggregators import _aggregate_codex_buckets
 from _lib_five_hour import _FIVE_HOUR_JITTER_FLOOR_SECONDS
-from _lib_source_analytics import build_codex_project_result
+from _lib_source_analytics import (
+    build_codex_project_result,
+    collision_safe_project_label_map,
+)
 from _lib_view_models import (
     CodexWeeklyView,
     build_codex_daily_view,
@@ -1783,12 +1786,17 @@ def _partial_projects_wire(
             model_totals[field] += value
             session_totals[field] += value
 
+    label_map = collision_safe_project_label_map(
+        (f"{root_key}\0{project_key}", str(group["label"]))
+        for (root_key, project_key), group in groups.items()
+    )
     rows = []
     for (root_key, _project_key), group in groups.items():
+        internal_identity = f"{root_key}\0{group['project_key']}"
         rows.append({
             "key": dashboard_resource_key("project", "codex", root_key, group["project_key"]),
             "source": "codex",
-            "label": group["label"],
+            "label": label_map[internal_identity],
             "session_count": len(group["sessions"]),
             "first_seen": group["first_seen"].astimezone(UTC).isoformat(),
             "last_seen": group["last_seen"].astimezone(UTC).isoformat(),
@@ -2072,7 +2080,21 @@ def build_codex_source_state(
         now_utc=context.now_utc,
         display_tz_name=context.display_tz_name,
     )
-    quota = {**quota, "blocks": quota_blocks}
+    # Hero-modal historical-milestone navigation index (spec §1c, §3). Built
+    # here on the non-idle codex source rebuild (idle ticks reuse the stored
+    # bundle) over the durable projection — a pure serializer never touches it.
+    # Guarded: an index failure must never fail the codex source build.
+    cycle_index: tuple = ()
+    if cycle is not None and not hero_failure:
+        try:
+            cycle_index = tuple(
+                sys.modules["cctally"].build_codex_cycle_index(
+                    context.stats_conn, identity=cycle, now_utc=context.now_utc,
+                )
+            )
+        except sqlite3.Error:
+            cycle_index = ()
+    quota = {**quota, "blocks": quota_blocks, "cycle_index": cycle_index}
     budget_rows = _budget_wire(context.stats_conn)
     projected_budget_rows = _projected_budget_wire(context.stats_conn)
     budget_cost_events = _codex_budget_cost_events(context, budget_entries)

package/bin/_cctally_doctor.py

@@ -27,6 +27,7 @@ import argparse
 import datetime as dt
 import fcntl
 import json
+import math
 import pathlib
 import shutil
 import sqlite3
@@ -35,6 +36,7 @@ import sys
 import _cctally_core
 import _lib_changelog
 from _cctally_core import _now_utc, eprint, now_utc_iso, parse_iso_datetime
+from _lib_dashboard_json import encode_dashboard_json
 
 
 def _cctally():
@@ -53,11 +55,25 @@ def _gather_statusline_pipeline(c, *, now_utc: dt.datetime) -> dict:
         "tombstones": {"fiveHour": "absent", "sevenDay": "absent"},
     }
     try:
-        result["transport_age_seconds"] = c._statusline_transport_age_seconds()
+        age = c._statusline_transport_age_seconds()
+        result["transport_age_seconds"] = (
+            age
+            if isinstance(age, (int, float))
+            and not isinstance(age, bool)
+            and math.isfinite(float(age))
+            else None
+        )
     except Exception:
         pass
     try:
-        result["selected_age_seconds"] = c._statusline_observe_age_seconds()
+        age = c._statusline_observe_age_seconds()
+        result["selected_age_seconds"] = (
+            age
+            if isinstance(age, (int, float))
+            and not isinstance(age, bool)
+            and math.isfinite(float(age))
+            else None
+        )
     except Exception:
         pass
     try:
@@ -784,14 +800,28 @@ def doctor_gather_state(
     # on corruption — both behaviors would hide diagnostic state
     # (codex H1).
     config_json_error = None
+    config_parsed: dict = {}
     try:
         if _cctally_core.CONFIG_PATH.exists():
-            json.loads(_cctally_core.CONFIG_PATH.read_text(encoding="utf-8"))
+            config_parsed = json.loads(
+                _cctally_core.CONFIG_PATH.read_text(encoding="utf-8")
+            )
     except json.JSONDecodeError as exc:
         config_json_error = f"{type(exc).__name__}: {exc}"
     except OSError as exc:
         config_json_error = f"OSError: {exc}"
 
+    # Configured update (release) channel (beta-channel, spec 2026-07-21 §3):
+    # derived from the SAME raw read (never load_config, which auto-creates on
+    # first run). Fail-soft to "stable" — resolve_update_channel already
+    # tolerates a non-dict block / junk value.
+    try:
+        update_channel = c.resolve_update_channel(
+            config_parsed if isinstance(config_parsed, dict) else {}
+        )
+    except Exception:
+        update_channel = "stable"
+
     update_state = None
     update_state_error = None
     try:
@@ -864,6 +894,7 @@ def doctor_gather_state(
         codex_jsonl_present=codex_jsonl_present,
         codex_project_metadata_health=codex_project_metadata_health,
         codex_project_metadata_error=codex_project_metadata_error,
+        update_channel=update_channel,
         dashboard_bind_stored=dashboard_bind_stored,
         runtime_bind=runtime_bind,
         # Conversation viewer (Plan 2, spec §5): only consulted on a LAN bind.
@@ -943,7 +974,7 @@ def cmd_doctor(args: argparse.Namespace) -> int:
     state = c.doctor_gather_state(deep=True)
     report = _lib_doctor.run_checks(state)
     if getattr(args, "json", False):
-        print(json.dumps(
+        print(encode_dashboard_json(
             _lib_doctor.serialize_json(report), indent=2, sort_keys=True,
         ))
     else: