Revert "feat(lvl5): P1 — 5-rung ladder (L5=abra recipe lint) + de-capped level semantics"

This reverts commit e219a7891d.

runner/harness/card.py

@@ -21,24 +21,23 @@ from __future__ import annotations
 import html
 import os
 
-# Level → colour ramp (YunoHost-ish): red at the floor, climbing to green at the top (L5 = full
-# clean climb incl. lint — phase lvl5).
+# Level → colour ramp (YunoHost-ish): red at the floor, climbing to green at the top.
 LEVEL_COLOR = {
     0: "#e5534b",  # red — install failed
     1: "#e0823d",  # orange
     2: "#e0823d",
     3: "#d9b343",  # amber
-    4: "#a0b93f",  # yellow-green — above functional, lint not earned
-    5: "#3fb950",  # bright green — full climb (lint passed)
+    4: "#a0b93f",  # yellow-green
+    5: "#57ab5a",  # green
+    6: "#3fb950",  # bright green — full climb
 }
-STATUS_MARK = {"pass": "✔", "fail": "✘", "skip": "–", "error": "✘", "na": "–", "unver": "⊘"}
+STATUS_MARK = {"pass": "✔", "fail": "✘", "skip": "–", "error": "✘", "na": "–"}
 STATUS_COLOR = {
     "pass": "#3fb950",
     "fail": "#f85149",
     "error": "#f85149",
     "skip": "#8b949e",
     "na": "#8b949e",
-    "unver": "#d29922",  # amber — exercised? no: should have run and wasn't verified
 }
 
 
@@ -80,15 +79,44 @@ def render_badge_svg(label: str, message: str, color: str) -> str:
     )
 
 
-# Amber for UNVERIFIED rung rows in the table (a rung that should have run and wasn't checked).
+# Third-segment colours for the level badge: amber = an UNINTENTIONAL skip (a rung skipped but not
+# in the recipe's intentional list — likely missing coverage) capped the climb; muted = an
+# INTENTIONAL skip (declared in recipe_meta.EXPECTED_NA — nothing to fix). Font-safe text labels
+# (no emoji) so the SVG renders anywhere.
 GAP_COLOR = "#d29922"
+EXPECT_COLOR = "#6e7681"
 
 
-def level_badge_svg(level: int) -> str:
-    """Per-recipe/-run LEVEL badge: 'cc-ci | level N' coloured by level — NUMBER + COLOUR ONLY
-    (operator-specified, phase lvl5). 'Why isn't it higher' lives in the card's per-rung table,
-    never on the badge."""
-    return render_badge_svg("cc-ci", f"level {int(level)}", level_color(level))
+def level_badge_svg(level: int, cap_reason: str = "", cap_skip: str = "") -> str:
+    """Per-recipe/-run LEVEL badge: 'cc-ci | level N' coloured by level (R6), with a THIRD segment
+    that differentiates *why* the climb stopped when a SKIP capped it (`cap_skip`):
+      - "unintentional" (a rung skipped but not in the recipe's intentional list): amber 'gap?'.
+      - "intentional"   (a skip declared in recipe_meta.EXPECTED_NA): muted 'expected'.
+      - "" (clean cap / full climb / a real failure): no third segment (the level + card carry it).
+    The badge never inflates — it only annotates the cap the level already reflects."""
+    label, msg = "cc-ci", f"level {int(level)}"
+    lw, mw = _text_width(label), _text_width(msg)
+    third: tuple[str, str] | None = None
+    if cap_skip == "unintentional":
+        third = ("gap?", GAP_COLOR)
+    elif cap_skip == "intentional":
+        third = ("expected", EXPECT_COLOR)
+    if third is None:
+        return render_badge_svg(label, msg, level_color(level))
+    txt, tcolor = third
+    tw = _text_width(txt)
+    w = lw + mw + tw
+    return (
+        f'<svg xmlns="http://www.w3.org/2000/svg" width="{w}" height="20" role="img" '
+        f'aria-label="{html.escape(label)}: {html.escape(msg)} ({html.escape(txt)})">'
+        f'<rect width="{lw}" height="20" fill="#555"/>'
+        f'<rect x="{lw}" width="{mw}" height="20" fill="{level_color(level)}"/>'
+        f'<rect x="{lw + mw}" width="{tw}" height="20" fill="{tcolor}"/>'
+        f'<g fill="#fff" font-family="Verdana,Geneva,sans-serif" font-size="11">'
+        f'<text x="6" y="14">{html.escape(label)}</text>'
+        f'<text x="{lw + 6}" y="14">{html.escape(msg)}</text>'
+        f'<text x="{lw + mw + 6}" y="14">{html.escape(txt)}</text></g></svg>'
+    )
 
 
 def _stage_rows(stages: list[dict]) -> str:
@@ -113,13 +141,12 @@ def _stage_rows(stages: list[dict]) -> str:
     return "\n".join(rows) or '<tr><td colspan="3">no stages</td></tr>'
 
 
-# Friendly rung labels for the skip/unverified rows (the five essential rungs).
+# Friendly rung labels for the skip rows (the four essential rungs).
 RUNG_LABEL = {
     "install": "install",
     "upgrade": "upgrade",
     "backup_restore": "backup/restore",
     "functional": "functional",
-    "lint": "lint",
 }
 SKIP_GREEN = (
     "#57ab5a"  # muted green — an intentional skip reads like a pass (but labelled, never inflating)
@@ -127,10 +154,9 @@ SKIP_GREEN = (
 
 
 def _skip_rows(skips: dict) -> str:
-    """Render the non-run rungs as stage-like rows (phase lvl5 semantics). An INTENTIONAL skip
-    (declared/structural — the rung does not apply, the climb continues past it) is muted green
-    with its reason on the line below; an UNVERIFIED rung (should have run, wasn't checked — the
-    level cannot rise above it) is amber 'unverified'."""
+    """Render SKIPPED rungs as stage-like rows. An intentional (declared) skip looks like a pass row
+    but its status says 'INTENTIONAL SKIP' (muted green) with the declared reason on the line below;
+    an unintentional skip is amber 'UNINTENTIONAL SKIP' with a prompt to add a test or declare it."""
     rows = []
     for rung, reason in (skips.get("intentional") or {}).items():
         rows.append(
@@ -145,11 +171,11 @@ def _skip_rows(skips: dict) -> str:
         rows.append(
             f'<tr class="stage"><td colspan="2"><span class="mark" style="color:{GAP_COLOR}">⊘</span>'
             f"<b>{html.escape(RUNG_LABEL.get(rung, rung))}</b></td>"
-            f'<td class="st" style="color:{GAP_COLOR}">unverified</td></tr>'
+            f'<td class="st" style="color:{GAP_COLOR}">unintentional skip</td></tr>'
         )
         rows.append(
-            '<tr class="skipreason"><td></td><td colspan="2">rung did not run / could not be '
-            "checked — the level cannot rise above an unverified rung</td></tr>"
+            '<tr class="skipreason"><td></td><td colspan="2">not declared in EXPECTED_NA — add the '
+            "missing test/label, or declare the skip with a reason</td></tr>"
         )
     return "\n".join(rows)
 
@@ -158,15 +184,13 @@ def render_card_html(data: dict, screenshot_rel: str | None = "screenshot.png")
     """Build the summary-card HTML from a results.json dict. `screenshot_rel` is the relative path to
     the screenshot PNG (same dir as the card) — omitted from the card if None / absent.
 
-    The card shows exactly what the data says: recipe + version, the level, the per-stage/per-test
-    ✔/✘ table (+ skip/unverified rung rows — the SOLE carrier of "why isn't the level higher"),
-    the invariant flags, and the app screenshot. No computation here. Tolerates old (schema-1)
-    artifacts: the ladder height is read off the rungs the artifact actually has."""
+    The card shows exactly what the data says: recipe + version, the level badge + cap reason, the
+    per-stage/per-test ✔/✘ table, the invariant flags, and the app screenshot. No computation here."""
     recipe = html.escape(str(data.get("recipe", "?")))
     version = html.escape(str(data.get("version") or data.get("ref") or ""))
     level = int(data.get("level", 0))
-    # Old (pre-lvl5) artifacts have a 4-rung ladder — render their "of N" honestly.
-    ladder_top = 5 if "lint" in (data.get("rungs") or {}) else 4
+    cap_reason = str(data.get("level_cap_reason") or "")
+    cap = html.escape(cap_reason)
     sk = data.get("skips", {}) or {}
     color = level_color(level)
     flags = data.get("flags", {}) or {}
@@ -197,7 +221,7 @@ body{{margin:0;font-family:system-ui,-apple-system,Segoe UI,sans-serif;backgroun
 .lvl .num{{display:inline-block;min-width:64px;padding:.3rem .7rem;border-radius:10px;
   font-size:1.6rem;font-weight:700;color:#0d1117;background:{color}}}
 .lvl .lbl{{display:block;color:#8b949e;font-size:.72rem;text-transform:uppercase;margin-top:.2rem}}
-.ladder{{padding:.4rem 1.3rem;color:#8b949e;font-size:.82rem;border-bottom:1px solid #21262d}}
+.cap{{padding:.4rem 1.3rem;color:#8b949e;font-size:.82rem;border-bottom:1px solid #21262d}}
 .body{{display:flex;gap:1rem;padding:1rem 1.3rem}}
 .tbl{{flex:1}}
 table{{border-collapse:collapse;width:100%;font-size:.85rem}}
@@ -214,12 +238,12 @@ tr.skipreason td{{color:#8b949e;font-size:.78rem;font-style:italic;padding-top:0
 .shot.noshot{{display:flex;align-items:center;justify-content:center;height:225px;color:#8b949e;font-size:.85rem}}
 .flags{{display:flex;gap:.6rem;padding:.6rem 1.3rem 1rem}}
 .flag{{border:1px solid;border-radius:6px;padding:.15rem .5rem;font-size:.78rem;color:#c9d1d9}}
-.ladder b{{color:#c9d1d9}}
+.cap b{{color:#c9d1d9}}
 </style></head><body><div class="card">
 <div class="hd">{FLOWER_SVG}
 <div class="title"><h1>{recipe}</h1><span class="ver">{version}</span></div>
 <div class="lvl"><span class="num">{level}</span><span class="lbl">level</span></div></div>
-<div class="ladder"><b>level {level} of {ladder_top}</b></div>
+<div class="cap">{("<b>capped:</b> " + cap) if cap else "<b>full clean climb</b> — top level (4)"}</div>
 <div class="body"><div class="tbl"><table>{rows}</table></div>{shot_html}</div>
 <div class="flags">{"".join(flag_bits)}</div>
 </div></body></html>"""