@windyroad/risk-scorer 0.16.0 → 0.16.1

package/.claude-plugin/plugin.json

@@ -310,5 +310,5 @@
     }
   },
   "name": "wr-risk-scorer",
-  "version": "0.16.0"
+  "version": "0.16.1"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@windyroad/risk-scorer",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "description": "Pipeline risk scoring, commit/push gates, and secret leak detection",
   "bin": {
     "windyroad-risk-scorer": "./bin/install.mjs"

package/scripts/evaluate-graduation.sh

@@ -41,7 +41,10 @@
 #   - Resolves the ticket file via dual-tolerant glob (ADR-031 + RFC-002):
 #       docs/problems/<NNN>-*.md (flat) AND docs/problems/*/<NNN>-*.md (per-state)
 #   - Extracts the Priority value from the ticket's `**Priority**: N (...)` line.
-#   - Detects Rule 2 VP carve-out (ticket file ends in .verifying.md).
+#   - Detects Rule 2 VP carve-out (ticket file ends in .verifying.md) — narrowed
+#     per P398: a verifying ticket graduates (resolved) when its `## Fix Released`
+#     section is populated (code already shipped, only the changelog is held);
+#     it stays vp-blocked only while the fix is not yet shipped.
 #   - Parses docs/changesets-holding/README.md "Currently held" section and
 #     groups entries by normalised reinstate-trigger prose (Phase 2b).
 #   - Multi-member groups emit class=3b + cohort=<id> with cohort-level
@@ -121,6 +124,12 @@ held_files = sys.argv[3:]
 FILENAME_TICKET_RE = re.compile(r'-p(\d+)-', re.IGNORECASE)
 BODY_TICKET_RE = re.compile(r'\bP(\d+)\b')
 PRIORITY_LINE_RE = re.compile(r'^\*\*Priority\*\*:\s*(\d+)\b')
+FIX_RELEASED_HEADING_RE = re.compile(r'^##\s+Fix Released\s*$', re.IGNORECASE)
+# Placeholder-only tokens that do NOT count as a populated `## Fix Released`
+# section (a fix that is scaffolded-but-not-shipped). Kept mechanical per
+# ADR-015 — this is deterministic detection, not prose judgement.
+FIX_RELEASED_PLACEHOLDERS = frozenset({'tbd', 'n/a', 'na', 'pending', '(pending)',
+                                       '(deferred)', 'deferred', '(none)', 'none'})
 
 # Phase 2b — README "Currently held" bullet parser.
 # Matches `- \`<filename>\` ... **Reinstate trigger**: <trigger-text>`.
@@ -168,6 +177,39 @@ def extract_priority(ticket_path: str):
     return None
 
 
+def fix_shipped(ticket_path: str) -> bool:
+    """True when the ticket carries a populated `## Fix Released` section.
+
+    A verifying ticket whose fix has shipped carries real prose under
+    `## Fix Released` (per ADR-022 / manage-problem closing contract); an
+    absent, empty, or placeholder-only section means the fix has not actually
+    shipped yet. Mechanical predicate per ADR-015 (ADR-061 Rule 2 amended,
+    P398): section present AND ≥1 non-blank line that is not a placeholder
+    token counts as shipped.
+    """
+    try:
+        with open(ticket_path, 'r', encoding='utf-8') as f:
+            lines = f.readlines()
+    except (OSError, IOError):
+        return False
+    in_section = False
+    for line in lines:
+        if FIX_RELEASED_HEADING_RE.match(line.strip()):
+            in_section = True
+            continue
+        if not in_section:
+            continue
+        stripped = line.strip()
+        if stripped.startswith('## '):
+            break  # next section reached with no real content
+        if not stripped:
+            continue
+        if stripped.lower() in FIX_RELEASED_PLACEHOLDERS:
+            continue
+        return True  # real content under the heading
+    return False
+
+
 def resolve_ticket_ids(changeset_path: str):
     """Apply Rule 1a join: filename convention primary, body-grep fallback.
 
@@ -325,7 +367,7 @@ for changeset_path in held_files:
         priority = extract_priority(path)
         if priority is None:
             continue
-        resolutions.append((tid, priority, suffix))
+        resolutions.append((tid, priority, suffix, path))
 
     if not resolutions:
         per_changeset[basename] = {
@@ -336,14 +378,20 @@ for changeset_path in held_files:
         continue
 
     resolutions.sort(key=lambda r: r[1], reverse=True)
-    chosen_tid, chosen_priority, chosen_suffix = resolutions[0]
-    if chosen_suffix == 'verifying':
+    chosen_tid, chosen_priority, chosen_suffix, chosen_path = resolutions[0]
+    if chosen_suffix == 'verifying' and not fix_shipped(chosen_path):
+        # ADR-061 Rule 2 (narrowed per P398): the VP carve-out holds a changeset
+        # only while its fix is NOT yet shipped. A verifying ticket with no
+        # populated `## Fix Released` section is still mid-flight — hold it.
         per_changeset[basename] = {
             'ticket_label': f'P{chosen_tid}',
             'priority': chosen_priority,
             'status': 'vp-blocked',
         }
         continue
+    # A verifying ticket whose `## Fix Released` is populated means the code is
+    # already live on npm; only the changelog-attribution changeset is held, so
+    # it graduates as `resolved` rather than stranding indefinitely (P398).
 
     per_changeset[basename] = {
         'ticket_label': f'P{chosen_tid}',

package/scripts/test/evaluate-graduation.bats

@@ -202,6 +202,66 @@ EOF
   echo "$output" | grep -q 'GRADUATION_SUMMARY: total=1 resolved=0 vp_blocked=1 halts=0'
 }
 
+# ----- P398: Rule 2 narrowed — shipped verifying graduates, unshipped holds -----
+
+# Case (h.1) — verifying ticket WITH populated `## Fix Released` graduates (code shipped)
+@test "case (h.1): shipped verifying (populated Fix Released) → resolved (P398)" {
+  seed_problem "310" "verifying" "9" "## Fix Released
+
+Deployed in v0.42.0. Awaiting user verification."
+  seed_changeset "wr-itil-p310-shipped.md"
+  run bash "$SCRIPT" "$WORK_DIR"
+  [ "$status" -eq 0 ]
+  echo "$output" | grep -q 'changeset=wr-itil-p310-shipped.md'
+  echo "$output" | grep -q 'ticket=P310'
+  echo "$output" | grep -q 'status=resolved'
+  echo "$output" | grep -q 'GRADUATION_SUMMARY: total=1 resolved=1 vp_blocked=0 halts=0'
+}
+
+# Case (h.2) — verifying ticket with placeholder-only `## Fix Released` stays held
+@test "case (h.2): unshipped verifying (placeholder Fix Released) → vp-blocked (P398)" {
+  seed_problem "311" "verifying" "9" "## Fix Released
+
+(pending)"
+  seed_changeset "wr-itil-p311-pending.md"
+  run bash "$SCRIPT" "$WORK_DIR"
+  [ "$status" -eq 0 ]
+  echo "$output" | grep -q 'ticket=P311'
+  echo "$output" | grep -q 'status=vp-blocked'
+}
+
+# Case (h.3) — verifying ticket with NO `## Fix Released` section stays held (case (e) invariant)
+@test "case (h.3): verifying with no Fix Released section → vp-blocked (P398 unshipped branch)" {
+  seed_problem "312" "verifying" "9"
+  seed_changeset "wr-itil-p312-no-section.md"
+  run bash "$SCRIPT" "$WORK_DIR"
+  [ "$status" -eq 0 ]
+  echo "$output" | grep -q 'ticket=P312'
+  echo "$output" | grep -q 'status=vp-blocked'
+}
+
+# Case (h.4) — an all-shipped-verifying cohort rolls up to resolved and graduates atomically
+@test "case (h.4): cohort of all-shipped-verifying members rolls up to resolved (P398)" {
+  seed_problem "320" "verifying" "9" "## Fix Released
+
+Shipped in v0.50.0."
+  seed_problem "321" "verifying" "12" "## Fix Released
+
+Shipped in v0.50.0."
+  seed_changeset "wr-itil-p320-slice-a.md"
+  seed_changeset "wr-itil-p321-slice-b.md"
+  seed_holding_readme \
+    "- \`wr-itil-p320-slice-a.md\` — patch. **Reinstate trigger**: shipped cohort graduates." \
+    "- \`wr-itil-p321-slice-b.md\` — patch. **Reinstate trigger**: shipped cohort graduates."
+  run bash "$SCRIPT" "$WORK_DIR"
+  [ "$status" -eq 0 ]
+  # Both members class=3b, both resolved (shipped), cohort priority = max(9,12) = 12
+  echo "$output" | grep 'changeset=wr-itil-p320-slice-a.md' | grep -q 'class=3b'
+  echo "$output" | grep 'changeset=wr-itil-p320-slice-a.md' | grep -q 'status=resolved'
+  echo "$output" | grep 'changeset=wr-itil-p321-slice-b.md' | grep -q 'status=resolved'
+  echo "$output" | grep 'changeset=wr-itil-p320-slice-a.md' | grep -q 'priority=12'
+}
+
 # Case (f) — status-agnostic Priority lookup (open, known-error, closed all resolve)
 @test "case (f.1): open ticket resolves" {
   seed_problem "400" "open" "8"