cctally 1.7.3 → 1.8.0

package/bin/_lib_diff_kernel.py

@@ -116,11 +116,25 @@ _resolve_tz = _lib_display_tz._resolve_tz
 format_display_dt = _lib_display_tz.format_display_dt
 
 
-# Module-level back-ref shims. Each shim resolves
-# ``sys.modules['cctally'].X`` at CALL TIME (not bind time), so
-# monkeypatches on cctally's namespace propagate into the moved code
-# unchanged. Mirrors the precedent established in
-# ``bin/_lib_render.py`` / ``bin/_cctally_record.py``.
+# === Honest imports from extracted homes ===================================
+# Spec 2026-05-17-cctally-core-kernel-extraction.md §3.3: kernel symbols
+# (Z-leaf + Z-mid) import from _cctally_core. The legacy shim functions
+# for these names are deleted.
+from _cctally_core import (
+    open_db,
+    _command_as_of,
+    _canonicalize_optional_iso,
+    parse_iso_datetime,
+)
+
+
+# === Module-level back-ref shims for helpers that STAY in bin/cctally ======
+# Each shim resolves ``sys.modules['cctally'].X`` at CALL TIME (not bind
+# time), so monkeypatches on cctally's namespace propagate into the moved
+# code unchanged. `get_claude_session_entries` STAYS as a shim even though
+# its natural home is _cctally_cache — tests monkeypatch it via ``ns["X"]``
+# (audited 2026-05-17); a direct import would silently bypass the patches.
+# See spec §3.5 (carve-out) and §3.7 (stays-on-shim allowlist).
 def get_claude_session_entries(*args, **kwargs):
     return sys.modules["cctally"].get_claude_session_entries(*args, **kwargs)
 
@@ -129,10 +143,6 @@ def _resolve_project_key(*args, **kwargs):
     return sys.modules["cctally"]._resolve_project_key(*args, **kwargs)
 
 
-def open_db(*args, **kwargs):
-    return sys.modules["cctally"].open_db(*args, **kwargs)
-
-
 def _iso_z(*args, **kwargs):
     return sys.modules["cctally"]._iso_z(*args, **kwargs)
 
@@ -145,18 +155,6 @@ def _style_ansi(*args, **kwargs):
     return sys.modules["cctally"]._style_ansi(*args, **kwargs)
 
 
-def _command_as_of(*args, **kwargs):
-    return sys.modules["cctally"]._command_as_of(*args, **kwargs)
-
-
-def _canonicalize_optional_iso(*args, **kwargs):
-    return sys.modules["cctally"]._canonicalize_optional_iso(*args, **kwargs)
-
-
-def parse_iso_datetime(*args, **kwargs):
-    return sys.modules["cctally"].parse_iso_datetime(*args, **kwargs)
-
-
 # Private eprint shim per spec §5.3 (pure layer does not back-import
 # cctally for ubiquitous helpers; eprint isn't actually called by the
 # moved code, but kept here as the canonical pure-layer pattern so

package/bin/_lib_subscription_weeks.py

@@ -73,6 +73,18 @@ _resolve_tz = _lib_display_tz._resolve_tz
 _local_tz_name = _lib_display_tz._local_tz_name
 
 
+# === Honest imports from extracted homes ===================================
+# Spec 2026-05-17-cctally-core-kernel-extraction.md §3.3: kernel symbols
+# import from _cctally_core. `load_config` stays on the _cctally()
+# accessor per spec §3.5 monkeypatch carve-out (tests reach it via
+# ``ns["load_config"]``).
+from _cctally_core import (
+    parse_iso_datetime,
+    get_week_start_name,
+    WEEKDAY_MAP,
+)
+
+
 @dataclass(frozen=True)
 class SubWeek:
     """One subscription-week bounded interval.
@@ -142,7 +154,6 @@ def _clamp_end_ats_to_next_start(
     `pairs` must be sorted by start_at ascending. None values are
     passed through unchanged and never participate in clamping.
     """
-    parse_iso_datetime = _cctally().parse_iso_datetime
     n = len(pairs)
     if n < 2:
         return [p[1] for p in pairs]
@@ -182,7 +193,6 @@ def _apply_overlap_clamp_to_subweeks(weeks: list[SubWeek]) -> list[SubWeek]:
     Input must be sorted by start_ts ascending (invariant of
     _compute_subscription_weeks in all three branches).
     """
-    parse_iso_datetime = _cctally().parse_iso_datetime
     if len(weeks) < 2:
         return weeks
     pairs: list[tuple[str | None, str | None]] = [(w.start_ts, w.end_ts) for w in weeks]
@@ -217,7 +227,6 @@ def _apply_reset_events_to_subweeks(
     raw snapshot strings that may be written in non-UTC offsets while
     `week_reset_events.{old,new}_week_end_at` are canonicalized UTC.
     """
-    parse_iso_datetime = _cctally().parse_iso_datetime
     rows = conn.execute(
         "SELECT old_week_end_at, new_week_end_at, effective_reset_at_utc "
         "FROM week_reset_events"
@@ -289,9 +298,6 @@ def _compute_subscription_weeks(
     dates that miss actual snapshot boundaries for middle weeks. Using
     snapshot rows directly for weeks they cover avoids that drift.
     """
-    cctally = _cctally()
-    parse_iso_datetime = cctally.parse_iso_datetime
-
     # Case A: snapshots exist.
     snap_rows = conn.execute(
         "SELECT "
@@ -460,9 +466,11 @@ def _compute_subscription_weeks(
         return _apply_overlap_clamp_to_subweeks(weeks)
 
     # Case B: no snapshots — config-based calendar-week fallback.
-    config = cctally.load_config()
-    week_start_name = cctally.get_week_start_name(config)
-    week_start_idx = cctally.WEEKDAY_MAP[week_start_name]
+    # `load_config` stays on the _cctally() accessor per spec §3.5
+    # monkeypatch carve-out — tests reach it via ``ns["load_config"]``.
+    config = _cctally().load_config()
+    week_start_name = get_week_start_name(config)
+    week_start_idx = WEEKDAY_MAP[week_start_name]
     # internal fallback: host-local intentional
     local_start_date = range_start.astimezone().date()
     diff = (local_start_date.weekday() - week_start_idx) % 7