cctally 1.95.0 → 1.95.1

package/CHANGELOG.md

@@ -5,6 +5,13 @@ based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ## [Unreleased]
 
+## [1.95.1] - 2026-08-09
+
+### Fixed
+- Corruption recovery now preserves both incidents when two database families are quarantined within the same second. The second incident atomically reserves a distinct retention-compatible directory instead of reusing the first incident's path and failing because the old and new `stats.db` generations both exist.
+- The authoritative test gate now runs its rollback-contention wall-clock checks after the parallel pytest estate, alongside the existing serial rebuild benchmark. Whole-estate CPU contention can no longer consume those latency ceilings while isolated regressions still fail the release.
+- Concurrent usage ingestion no longer derives five-hour blocks or milestones from a snapshot that a retained suppression event deliberately removed. A duplicate observation now respects the absent Model-A target instead of passing `None` into the derivation path and repeatedly failing every ingester behind it.
+
 ## [1.95.0] - 2026-08-09
 
 ### Changed

package/bin/_cctally_db.py

@@ -1300,6 +1300,37 @@ def _load_pending_quarantine(db_path: pathlib.Path) -> "dict[str, Any] | None":
 _QUARANTINE_MISSING_CONTEXT_WARNED = False  # one-shot warn flag
 
 
+def _reserve_quarantine_incident(
+    root: pathlib.Path, db_name: str, timestamp: str
+) -> pathlib.Path:
+    """Atomically reserve a retention-compatible incident directory."""
+    root.mkdir(parents=True, exist_ok=True)
+    primary = root / f"{db_name}-{timestamp}"
+    try:
+        primary.mkdir()
+        return primary
+    except FileExistsError:
+        pass
+
+    match = re.fullmatch(r"(\d{8}T\d{6})(?:Z|_(\d{6}))", timestamp)
+    if match is None:
+        stem = dt.datetime.now(dt.timezone.utc).strftime("%Y%m%dT%H%M%S")
+        first = 1
+    else:
+        stem = match.group(1)
+        first = int(match.group(2) or "0") + 1
+    for microsecond in range(first, 1_000_000):
+        candidate = root / f"{db_name}-{stem}_{microsecond:06d}"
+        try:
+            candidate.mkdir()
+            return candidate
+        except FileExistsError:
+            continue
+    raise OSError(
+        f"could not allocate a unique quarantine incident for {db_name}"
+    )
+
+
 def _warn_quarantine_created_without_context(incident: pathlib.Path) -> None:
     """Report a creation that supplied no `QuarantineContext` (#496 S6 §4.2).
 
@@ -1352,8 +1383,7 @@ def _quarantine_db_family_strict(
     if state is None:
         ts = ts or _db_backup_timestamp()
         root = _cctally_core.APP_DIR / "quarantine"
-        incident = root / f"{db_path.name}-{ts}"
-        incident.mkdir(parents=True, exist_ok=True)
+        incident = _reserve_quarantine_incident(root, db_path.name, ts)
         for directory in (root, incident):
             try:
                 os.chmod(directory, 0o700)

package/bin/_cctally_record.py

@@ -5812,6 +5812,15 @@ def _pipeline_claude_usage(ctx, rec):
             columns=cols,
             at=capture_at,
         )
+        # An exact retry can meet effective event metadata whose physical row a
+        # later suppression deliberately deleted.  emit_model_a must not
+        # resurrect that row and therefore returns None; deriving milestones or
+        # blocks from the absent target would either create dangling references
+        # or attempt int(None).  This is distinct from an ordinary fold-decision
+        # skip, which resolves a real latest snapshot below and still runs the
+        # idempotent side-effect chokepoints.
+        if rowid is None:
+            return
         saved["id"] = rowid
     else:
         latest = conn.execute(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cctally",
-  "version": "1.95.0",
+  "version": "1.95.1",
   "description": "Claude Code usage tracker and local dashboard for Pro/Max subscription limits - weekly cost-per-percent trend, quota forecasts, threshold alerts. ccusage-compatible.",
   "homepage": "https://github.com/omrikais/cctally",
   "repository": {