@seanyao/roll 2026.523.1 → 2026.523.2

package/lib/roll-loop-status.py

@@ -153,7 +153,11 @@ def load_backlog(project_root: Optional[Path] = None) -> Dict[str, str]:
 # ════════════════════════════════════════════════════════════════════════════
 # Cycle aggregation — group events by cycle label; attach cron + story id
 # ════════════════════════════════════════════════════════════════════════════
-_STORY_ID_PAT = re.compile(r"\b([A-Z]+(?:-[A-Z]+)*-\d+)\b")
+# FIX-108: each segment was [A-Z]+ (letters only), so alphanumeric segments
+# like I18N / K8S / D2 / S3 / 2FA failed to match — dashboard silently dropped
+# any story id with a mixed-letter-digit segment (US-I18N-001 etc.). First
+# char must still be a letter so "001-002" doesn't false-positive as an id.
+_STORY_ID_PAT = re.compile(r"\b([A-Z][A-Z0-9]*(?:-[A-Z][A-Z0-9]*)*-\d+)\b")
 _PR_NUM_PAT = re.compile(r"/pull/(\d+)")
 
 def _extract_story_id(ev_detail: str) -> Optional[str]:
@@ -361,18 +365,24 @@ def backfill_usage_from_claude_sessions(cycles: List[Dict[str, Any]], slug: str)
             cy["cache_creation_tokens"] = int(ue.get("cache_creation_tokens") or 0)
             cy["cache_read_tokens"]     = int(ue.get("cache_read_tokens")     or 0)
             cy["model"] = ue.get("model")
-            # US-VIEW-010: aggregate now sums per-turn usage tokens, so the
-            # totals in `ue` reflect the whole cycle. Always compute cost at
-            # list price for cross-account comparability — supersedes FIX-060
-            # which preferred cost_reported_usd as a workaround for
-            # last-event-only token counts (that root cause is now gone).
-            cy["cost_list"] = mp.compute_list_cost(
-                ue.get("model"),
-                input_tokens=ue.get("input_tokens", 0),
-                output_tokens=ue.get("output_tokens", 0),
-                cache_creation_tokens=ue.get("cache_creation_tokens", 0),
-                cache_read_tokens=ue.get("cache_read_tokens", 0),
-            )
+            # US-VIEW-014: prefer the cost frozen at cycle_end so a later
+            # prices refresh never rewrites a historical cycle's cost. Only
+            # legacy events (pre-US-VIEW-014) fall back to recomputing — and
+            # the row gets a muted [legacy] tag so it can't be mistaken for
+            # the authoritative value.
+            persisted = ue.get("cost_list_usd")
+            if persisted is not None:
+                cy["cost_list"]        = float(persisted)
+                cy["cost_list_legacy"] = False
+            else:
+                cy["cost_list"] = mp.compute_list_cost(
+                    ue.get("model"),
+                    input_tokens=ue.get("input_tokens", 0),
+                    output_tokens=ue.get("output_tokens", 0),
+                    cache_creation_tokens=ue.get("cache_creation_tokens", 0),
+                    cache_read_tokens=ue.get("cache_read_tokens", 0),
+                )
+                cy["cost_list_legacy"] = True
             if ue.get("duration_ms") and not cy.get("duration_s"):
                 cy["duration_s"] = int(ue["duration_ms"] / 1000)
             continue
@@ -394,25 +404,39 @@ def backfill_usage_from_claude_sessions(cycles: List[Dict[str, Any]], slug: str)
             cache_creation_tokens=u["cache_creation_tokens"],
             cache_read_tokens=u["cache_read_tokens"],
         )
+        # US-VIEW-014: session salvage never has a frozen cycle_end cost, so
+        # this path is always legacy.
+        cy["cost_list_legacy"] = True
         if u.get("duration_ms") and not cy.get("duration_s"):
             cy["duration_s"] = int(u["duration_ms"] / 1000)
 
 def load_pr_merges_from_git(days: int) -> Dict[str, Dict[str, Any]]:
     """Repair fallback: when events.ndjson dropped the pr / cycle_end events
-    for a cycle (events writer regressions), git log still has the merge
-    commit `Merge pull request #N from seanyao/loop/cycle-LABEL`. Extract
-    PR number + story IDs from the merge subject + body so orphan cycles
-    can be reclassified done instead of permanently '⏵ running'."""
+    for a cycle (events writer regressions, or cycle_end fired before PR
+    merged), git log still has the merge commit. Two known subject formats:
+
+      - Branch-named (Merge commit / older squash): "Merge pull request #N
+        from seanyao/loop/cycle-LABEL" — the branch name carries the label.
+      - Squash with default-title (newer GitHub UI / `gh pr merge --squash`):
+        "loop cycle LABEL (#N)" — space-separated, no slash.
+
+    FIX-107: the old --grep="loop/cycle-" + label_re missed the squash
+    subject entirely, so PRs merged AFTER cycle_end never got their
+    pr_outcome promoted to 'merged' on the dashboard.
+    """
     try:
         out = subprocess.check_output(
             ["git", "log", f"--since={days + 1} days ago",
-             "--grep=loop/cycle-", "--format=%H|||%s|||%b<<<END>>>"],
+             "--grep=loop[ /]cycle", "--extended-regexp",
+             "--format=%H|||%s|||%b<<<END>>>"],
             text=True, errors="ignore"
         )
     except Exception:
         return {}
     result: Dict[str, Dict[str, Any]] = {}
-    label_re  = re.compile(r"loop/cycle-([A-Za-z0-9-]+)")
+    # Accept both `loop/cycle-LABEL` and `loop cycle LABEL` (with or without
+    # the leading `-` separator after `cycle`). LABEL = YYYYMMDD-HHMMSS-PID.
+    label_re  = re.compile(r"loop[ /]cycle[-\s](\d{8}-\d+-\d+)")
     pr_re     = re.compile(r"#(\d+)")
     story_re  = re.compile(r"\b([A-Z]+(?:-[A-Z]+)*-\d+)\b")
     for chunk in out.split("<<<END>>>"):

package/lib/roll_render.py

@@ -350,6 +350,11 @@ def cycle_row(cy: Dict[str, Any], backlog: Dict[str, str]) -> None:
             "open":   ("dim",   "…"),
         }.get(pr_outcome, ("dim", "…"))
         pr_marker = " " + c(mark_c, f"#{pr_num} {mark_sym}")
+    # US-VIEW-014: pre-US-VIEW-014 events (no frozen cost_list_usd at
+    # cycle_end) get a muted [legacy] suffix — the number is recomputed on
+    # the fly and can shift with future price changes, unlike the frozen
+    # values written by current loop-fmt.
+    legacy_marker = " " + c("muted", "[legacy]") if cy.get("cost_list_legacy") else ""
     inner = (
         "  " + c(glyph_c, glyph, bold=True) + "  " +
         c(time_c, pad(time_str, 5), bold=(outcome == "fail")) + "   " +
@@ -357,7 +362,7 @@ def cycle_row(cy: Dict[str, Any], backlog: Dict[str, str]) -> None:
         c("muted", pad(tok, 26)) + "  " +
         model_seg +
         c("muted", pad(cost, 7, "r")) + "   " +
-        c(sid_c, ids_str, bold=True) + pr_marker
+        c(sid_c, ids_str, bold=True) + pr_marker + legacy_marker
     )
     # Subtle red bg on failure rows so a fail can't be missed at a glance.
     if outcome == "fail" and USE_COLOR:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seanyao/roll",
-  "version": "2026.523.1",
+  "version": "2026.523.2",
   "description": "Roll — Roll out features with AI agents",
   "scripts": {
     "test": "bash tests/run.sh"