okstra 0.185.0 → 0.186.0

package/runtime/validators/validate-run.py

@@ -4178,10 +4178,11 @@ def _stage_scope_bucket(item: dict, pbv: dict) -> str:
 
     Returns `in-scope` (may block), `observed` (only frozen stages), or
     `deferred` (only stages not yet startable). Anything unresolvable is
-    `in-scope`: an absent ledger is no basis to narrow, and an item with no
-    `stageScope` belongs to the plan as a whole — `P-Opt-*` and `P-Var-*` live
-    there permanently, and scoping them out would stop an unrequested-work
-    verdict from blocking a start.
+    `in-scope`: an absent ledger is no basis to narrow. Plan-wide items
+    (`P-Opt-*`, `P-Var-*`, `P-Dep-*`, `P-Dir-1`) with no `stageScope` stay
+    in-scope. An unscoped `P-Val-*` / `P-Req-*` / `P-Rb-*` stays in-scope only
+    until a stage is `done`; after that it is `deferred` so a re-plan does not
+    re-score the whole checklist.
 
     디스패치 큐와 같은 함수를 쓴다. 검증기가 다른 통을 내면 워커가 안 본
     항목이 승인을 막거나, 본 항목이 게이트에서 빠진다.
@@ -6161,12 +6162,13 @@ def _validate_approval_clarification_backtrace(
             f"final-report data.json: clarification `{row_id}` blocks approval "
             "and is linked, but the link resolves to no stage. `incremental-"
             "scope` reads the stage from a `P-Step-<stage>.<step>` / `P-Prep-"
-            "S<stage>-<kind>` plan-item id, or from a `Stage N` citation in the "
-            f"blocked coverage row's `coveredBy`. A `P-Req-*` / `P-Val-*` id "
-            "carries no stage number, so a row linked only that way must cite "
-            "the stage in `coveredBy`. A blocker whose blast radius resolves to "
-            "no stage cannot auto-narrow the next re-run; this report fails "
-            "rather than forcing a full re-run."
+            "S<stage>-<kind>` plan-item id, from `stageScope` / `stageRefs` on "
+            "the linked plan item or coverage row, or from a `Stage N` citation "
+            f"in the blocked coverage row's `coveredBy`. A `P-Req-*` / `P-Val-*` "
+            "id carries no stage number, so a row linked only that way must "
+            "carry `stageRefs` or cite the stage in `coveredBy`. A blocker "
+            "whose blast radius resolves to no stage cannot auto-narrow the "
+            "next re-run; this report fails rather than forcing a full re-run."
         )
 
 
@@ -8238,11 +8240,11 @@ def _validate_plan_body_clarification_matching(
     failures: list[str],
     accepted_item_ids: set[str] | None = None,
 ) -> None:
-    """H5 — every plan item that the recorded verdicts make `majority-disagree`
-    must point (via `clarificationId`) at an existing `blocks: approval`
-    clarification row. Closes the hole where a majority-disagree item blocks the
-    gate but no §1 Clarification row is raised, so the user never sees why
-    approval is withheld (implementation-planning.md self-review step 7).
+    """H5 — every plan item whose *gate class after stage scope* is
+    `majority-disagree` must point at an existing `blocks: approval`
+    clarification row. Observed / deferred / record items stay in `setAside`
+    and must not become a new C row — that is what grew the clarification
+    list while the next stage was already executable.
     """
     ip = data.get("implementationPlanning")
     if not isinstance(ip, dict):
@@ -8264,9 +8266,7 @@ def _validate_plan_body_clarification_matching(
     for item in pbv.get("planItems") or []:
         if not isinstance(item, dict):
             continue
-        if _classify_plan_item_gate(item) != "majority-disagree":
-            continue
-        if _is_dissent_downgraded(item, pbv, accepted):
+        if _plan_item_gate_class(item, pbv, accepted) != "majority-disagree":
             continue
         item_id = item.get("id") or "<unknown>"
         cids = _plan_item_clarification_ids(item)
@@ -8319,7 +8319,7 @@ def _validate_self_fix_before_clarification(data: dict, failures: list[str]) ->
     for item in pbv.get("planItems") or []:
         if not isinstance(item, dict):
             continue
-        if _classify_plan_item_gate(item) != "majority-disagree":
+        if _plan_item_gate_class(item, pbv, set()) != "majority-disagree":
             continue
         if _has_planner_fixable_majority(item):
             allowed = " / ".join(sorted(_SELF_FIX_EXHAUSTED_REASONS))