okstra 0.171.0 → 0.173.0

package/runtime/validators/validate-run.py

@@ -71,7 +71,12 @@ from okstra_ctl.incremental_scope import (  # noqa: E402
     coverage_row_blocked_on,
     stages_for_clarification,
 )
-from okstra_ctl.workflow import DEFAULT_NEXT_PHASE, PHASE_SEQUENCE  # noqa: E402
+from okstra_ctl.workflow import (  # noqa: E402
+    DEFAULT_NEXT_PHASE,
+    ERROR_ANALYSIS_ROUTING_DIRECTIONS,
+    PHASE_SEQUENCE,
+    REQUIREMENTS_DISCOVERY_ROUTING_TARGETS,
+)
 from okstra_ctl.md_table import (  # noqa: E402
     is_separator_row as _is_markdown_separator,
     split_pipe_row as _split_pipe_row,
@@ -80,9 +85,16 @@ from okstra_ctl.final_report_paths import final_report_data_path as _data_path_f
 from okstra_ctl.improvement_assignment import (  # noqa: E402
     validate_primary_lens_assignments,
 )
+from okstra_ctl.implementation_options import (  # noqa: E402
+    validate_implementation_option_selection,
+)
+from okstra_ctl.implementation_direction import (  # noqa: E402
+    validate_selected_direction_plan,
+)
 from okstra_ctl.worker_prompt_policy import GRILLING_LOG_HEADER  # noqa: E402
 from okstra_ctl.scope_provenance import (  # noqa: E402
     brief_citation_problem,
+    brief_end_state_id_sequence,
     brief_end_state_ids,
     brief_headings,
     parse_source,
@@ -113,6 +125,7 @@ from okstra_ctl.agent_invocation import (  # noqa: E402
     agent_model_assignment_from_payload,
     verify_agent_invocation,
 )
+from okstra_ctl.lead_events import LeadEventParseError, read_lead_events  # noqa: E402
 from okstra_ctl.worker_audit_ledger import (  # noqa: E402
     READING_CONFIRMATION_HEADING_RE,
     check_worker_results_audit,
@@ -405,7 +418,28 @@ def _error_analysis_next_phase(data: Mapping[str, Any]) -> str | None:
     if not isinstance(routing, Mapping):
         return None
     target = routing.get("nextTaskType")
-    if target in {"error-analysis", "implementation-planning"}:
+    if target in ERROR_ANALYSIS_ROUTING_DIRECTIONS:
+        return str(target)
+    return None
+
+
+def _requirements_discovery_next_phase(data: Mapping[str, Any]) -> str | None:
+    if not isinstance(data, Mapping):
+        return None
+    header = data.get("header")
+    if (
+        not isinstance(header, Mapping)
+        or header.get("taskType") != "requirements-discovery"
+    ):
+        return None
+    requirements = data.get("requirementsDiscovery")
+    if not isinstance(requirements, Mapping):
+        return None
+    routing = requirements.get("routing")
+    if not isinstance(routing, Mapping):
+        return None
+    target = routing.get("nextTaskType")
+    if target in REQUIREMENTS_DISCOVERY_ROUTING_TARGETS:
         return str(target)
     return None
 
@@ -444,11 +478,12 @@ def update_workflow_metadata(
         # Validation just passed → actively advance to the next phase in
         # the sequence rather than preserving a stale value that may equal
         # current_phase (which would cause the lifecycle pointer to stall).
-        report_next_phase = (
-            _error_analysis_next_phase(report_data or {})
-            if current_phase == "error-analysis"
-            else None
-        )
+        if current_phase == "requirements-discovery":
+            report_next_phase = _requirements_discovery_next_phase(report_data or {})
+        elif current_phase == "error-analysis":
+            report_next_phase = _error_analysis_next_phase(report_data or {})
+        else:
+            report_next_phase = None
         next_recommended_phase = report_next_phase or advance_next_phase(
             current_phase, phase_sequence
         )
@@ -3141,10 +3176,15 @@ def _validate_error_analysis_consistency(
     target = routing.get("nextTaskType")
     leading_cause_id = routing.get("leadingCauseId")
     candidate_id_set = set(candidate_ids)
-    if target == "implementation-planning":
+    if isinstance(target, str) and target not in ERROR_ANALYSIS_ROUTING_DIRECTIONS:
+        failures.append(
+            "final-report data.json: errorAnalysis.routing has unsupported "
+            f"routing target `{target}`."
+        )
+    if target == "implementation-option-selection":
         if not candidates:
             failures.append(
-                "final-report data.json: implementation-planning routing requires "
+                "final-report data.json: implementation-option-selection routing requires "
                 "at least one cause candidate."
             )
         if (
@@ -3152,7 +3192,7 @@ def _validate_error_analysis_consistency(
             or leading_cause_id not in candidate_id_set
         ):
             failures.append(
-                "final-report data.json: implementation-planning routing "
+                "final-report data.json: implementation-option-selection routing "
                 "leadingCauseId must reference a cause candidate."
             )
     elif target == "error-analysis" and (
@@ -3164,10 +3204,7 @@ def _validate_error_analysis_consistency(
             "empty or reference a cause candidate."
         )
 
-    expected_direction = {
-        "implementation-planning": "begin-planning",
-        "error-analysis": "continue-investigation",
-    }.get(target)
+    expected_direction = ERROR_ANALYSIS_ROUTING_DIRECTIONS.get(target)
     verdict_card_value = data.get("verdictCard")
     verdict_card = (
         verdict_card_value if isinstance(verdict_card_value, Mapping) else {}
@@ -3229,7 +3266,7 @@ def _validate_error_analysis_consistency(
 
     if isinstance(target, str) and target in {
         "error-analysis",
-        "implementation-planning",
+        "implementation-option-selection",
     }:
         for field_name, value in (
             ("verdictCard.nextStep", verdict_card.get("nextStep")),
@@ -3343,11 +3380,15 @@ def validate_final_report_data(
     if errors:
         return data
 
+    manifest = run_manifest or {}
+    _validate_approval_context(data, manifest, failures, report_path)
+    _validate_activity_contract_plan_limits(data, manifest, failures)
+
     analysis_result = validate_analysis_report(
         data=data,
         report_path=report_path,
         project_root=project_root or report_path.parent,
-        run_manifest=run_manifest or {},
+        run_manifest=manifest,
         clarification_text=clarification_text,
     )
     manifest_task_type = str((run_manifest or {}).get("taskType") or "")
@@ -3368,7 +3409,25 @@ def validate_final_report_data(
 
     task_type = (data.get("header") or {}).get("taskType")
     _validate_verifier_fail_blocks_verdict(data, failures)
-    if task_type == "implementation":
+    if task_type == "implementation-option-selection":
+        selection = data.get("implementationOptionSelection") or {}
+        validation_root = project_root or report_path.parent
+        original_ids = brief_end_state_id_sequence(
+            _brief_path_from_manifest(manifest, validation_root)
+        )
+        roster = manifest.get("recommendedWorkers") or ()
+        participating_analysers = tuple(
+            worker for worker in roster if worker != "report-writer"
+        )
+        failures.extend(
+            f"implementation-option-selection: {error}"
+            for error in validate_implementation_option_selection(
+                selection,
+                original_ids,
+                participating_analysers,
+            )
+        )
+    elif task_type == "implementation":
         _validate_stage_carry_sidecar_exists(data, report_path, failures)
     if task_type == "error-analysis":
         _validate_error_analysis_consistency(data, failures)
@@ -3377,6 +3436,31 @@ def validate_final_report_data(
         _validate_verified_row_recorded(data, report_path, failures)
     elif task_type == "implementation-planning":
         active_report_contracts = report_contracts or set()
+        planning = data.get("implementationPlanning") or {}
+        selected_direction_contract = (
+            isinstance(planning, Mapping)
+            and planning.get("planningContract") == "selected-direction"
+        )
+        if selected_direction_contract:
+            validation_root = project_root or report_path.parent
+            try:
+                brief_path = _brief_path_from_manifest(manifest, validation_root)
+            except (OSError, ValueError) as exc:
+                failures.append(
+                    "implementation-planning selected-direction: run manifest "
+                    f"taskBriefPath is malformed: {exc}"
+                )
+                brief_path = validation_root / "__invalid-brief__"
+            task_root = _task_root_from_run_dir(report_path.parent.parent)
+            snapshot_path = task_root / "instruction-set" / "selected-direction.json"
+            failures.extend(
+                f"implementation-planning selected-direction: {error}"
+                for error in validate_selected_direction_plan(
+                    data, brief_path, snapshot_path
+                )
+            )
+            if planning.get("outcome") == "direction-invalidated":
+                return data
         _validate_implementation_planning_cross_project(data, failures)
         _validate_implementation_planning_decision_drafts(data, failures)
         for warning in validate_plan_body_section(data, report_path, failures):
@@ -3396,8 +3480,9 @@ def validate_final_report_data(
             resolve_architecture(_project_root_from_report(report_path)),
             failures,
         )
-        _validate_requirement_deviations(data, failures)
-        _validate_requirement_coverage_covered_by(data, failures)
+        if not selected_direction_contract:
+            _validate_requirement_deviations(data, failures)
+            _validate_requirement_coverage_covered_by(data, failures)
         warnings = _validate_design_prep_contract(
             data,
             report_path,
@@ -3750,32 +3835,66 @@ def _state_classification(item: dict, gate_class: str) -> str:
     return "dissent-isolated" if dissenting == 1 else "partial-consensus"
 
 
-def _is_dissent_downgraded(item: dict, pbv: dict) -> bool:
+def _resolved_noncritical_dissent_ids(data: dict) -> set[str]:
+    """Plan items whose remaining dissent the user explicitly accepted."""
+    accepted: set[str] = set()
+    for row in data.get("clarificationItems") or []:
+        if not isinstance(row, dict) or row.get("blocks") != "approval":
+            continue
+        context = row.get("approvalContext")
+        if not isinstance(context, dict):
+            continue
+        resolution = context.get("resolution")
+        if (
+            row.get("status") == "resolved"
+            and context.get("classification") == "noncritical-dissent"
+            and isinstance(resolution, dict)
+            and resolution.get("disposition") == "accept-risk"
+            and str(resolution.get("userText") or "").strip()
+            and _approval_context_activity_refs_exist(
+                data, str(row.get("id") or ""), context, resolution
+            )
+        ):
+            accepted.update(
+                item_id
+                for item_id in context.get("planItemIds") or []
+                if isinstance(item_id, str)
+            )
+    return accepted
+
+
+def _is_dissent_downgraded(
+    item: dict,
+    pbv: dict,
+    accepted_item_ids: set[str],
+) -> bool:
     """Whether a surviving `majority-disagree` item stops blocking approval.
 
-    A planner-fixable defect the planner failed to fix is still a *planner*
-    defect; promoting it to a `Blocks=approval` row asks the user to proofread
-    the plan document. Once the self-fix budget is exhausted, such an item is
-    recorded as a Working Assumption in `## 5. Missing Information and Risks`
-    instead of blocking the gate. Defects that would make the implementation
-    itself wrong or unsafe (`_is_correctness_critical`) are excluded and keep
-    blocking, so correctness never trades away for throughput.
+    Exhausting the automatic self-fix budget records the unresolved dissent but
+    does not accept it. Only an explicit, resolved noncritical risk-acceptance
+    row can lower the item to `has-dissent`. Correctness-critical defects remain
+    blocking regardless of the user's selected disposition.
     """
     return (
         _classify_plan_item_gate(item) == "majority-disagree"
         and not _is_correctness_critical(item)
         and _has_planner_fixable_majority(item)
         and _self_fix_budget_exhausted(pbv)
+        and str(item.get("id") or "") in accepted_item_ids
     )
 
 
-def _recompute_plan_body_gate(pbv: dict) -> str | None:
+def _recompute_plan_body_gate(
+    pbv: dict,
+    accepted_item_ids: set[str] | None = None,
+) -> str | None:
     """Recompute the whole §5.5.9 gate value from ``planItems[].verdicts``.
     Returns a value in ``PLAN_VERIFY_GATE_VALUES`` or ``None`` when there are
     no plan items to judge (disabled / empty round)."""
+    accepted = accepted_item_ids or set()
     classes = [
         "has-dissent"
-        if _is_dissent_downgraded(it, pbv)
+        if _is_dissent_downgraded(it, pbv, accepted)
         else _classify_plan_item_gate(it)
         for it in (pbv.get("planItems") or [])
         if isinstance(it, dict)
@@ -3791,7 +3910,11 @@ def _recompute_plan_body_gate(pbv: dict) -> str | None:
     return "passed"
 
 
-def _validate_plan_body_gate_recompute(data: dict, failures: list[str]) -> None:
+def _validate_plan_body_gate_recompute(
+    data: dict,
+    failures: list[str],
+    accepted_item_ids: set[str] | None = None,
+) -> None:
     """H1 — the declared `Gate result` must not claim a healthier outcome than
     the recorded per-worker verdicts support. Closes the forgery hole where a
     lead writes `gateResult: passed` while workers actually voted DISAGREE:
@@ -3805,7 +3928,12 @@ def _validate_plan_body_gate_recompute(data: dict, failures: list[str]) -> None:
     if not isinstance(pbv, dict):
         return
     declared = str(pbv.get("gateResult") or "").strip().lower()
-    recomputed = _recompute_plan_body_gate(pbv)
+    accepted = (
+        _resolved_noncritical_dissent_ids(data)
+        if accepted_item_ids is None
+        else accepted_item_ids
+    )
+    recomputed = _recompute_plan_body_gate(pbv, accepted)
     if recomputed is None or declared not in _PLAN_GATE_RANK:
         return
     if _PLAN_GATE_RANK[declared] > _PLAN_GATE_RANK[recomputed]:
@@ -3869,10 +3997,14 @@ def _independent_coverage_blockers(ip: dict, pbv: dict) -> list[str]:
     ]
 
 
-def _gate_blocking_causes(pbv: dict, coverage_blockers: list[str]) -> set[str]:
+def _gate_blocking_causes(
+    pbv: dict,
+    coverage_blockers: list[str],
+    accepted_item_ids: set[str] | None = None,
+) -> set[str]:
     """Which inputs actually block approval, as `gateBlockedBy` enum values."""
     causes = set()
-    recomputed = _recompute_plan_body_gate(pbv)
+    recomputed = _recompute_plan_body_gate(pbv, accepted_item_ids)
     if recomputed == "blocked-by-disagreement":
         causes.add("majority-disagree")
     elif recomputed == "aborted-non-result":
@@ -3882,6 +4014,885 @@ def _gate_blocking_causes(pbv: dict, coverage_blockers: list[str]) -> set[str]:
     return causes
 
 
+_APPROVAL_DISPOSITIONS_BY_CLASSIFICATION = {
+    "user-decision": frozenset({"select", "request-revision", "reject"}),
+    "noncritical-dissent": frozenset(
+        {"accept-risk", "request-revision", "reject"}
+    ),
+    "correctness-critical": frozenset({"request-revision", "reject"}),
+}
+
+
+def _is_activity_contract_v1_planning(run_manifest: dict) -> bool:
+    return (
+        run_manifest.get("activityContractVersion") == 1
+        and run_manifest.get("taskType") == "implementation-planning"
+    )
+
+
+def _independent_coverage_clarification_ids(ip: dict, pbv: dict) -> set[str]:
+    promoted = _plan_body_promoted_clarification_ids(pbv)
+    return {
+        clarification_id
+        for row in (ip.get("requirementCoverage") or [])
+        if isinstance(row, dict) and _blocks_approval(row)
+        for clarification_id in [_cited_clarification_id(row)]
+        if clarification_id and clarification_id not in promoted
+    }
+
+
+def _expected_approval_classification(
+    row: dict,
+    plan_items_by_id: dict[str, dict],
+    independent_coverage_clarification_ids: set[str],
+) -> str:
+    linked = [
+        plan_items_by_id[item_id]
+        for item_id in (row.get("approvalContext") or {}).get("planItemIds") or []
+        if item_id in plan_items_by_id
+    ]
+    if any(_is_correctness_critical(item) for item in linked):
+        return "correctness-critical"
+    if str(row.get("id") or "") in independent_coverage_clarification_ids:
+        return "correctness-critical"
+    for item in linked:
+        disagree_votes = [
+            verdict
+            for verdict in (item.get("verdicts") or [])
+            if isinstance(verdict, dict)
+            and str(verdict.get("verdict") or "").upper() == "DISAGREE"
+        ]
+        needs_user_input = sum(
+            verdict.get("fixability") == "needs-user-input"
+            for verdict in disagree_votes
+        )
+        if disagree_votes and needs_user_input * 2 > len(disagree_votes):
+            return "user-decision"
+    if any(_classify_plan_item_gate(item) == "majority-disagree" for item in linked):
+        return "noncritical-dissent"
+    return "user-decision"
+
+
+_STATE_DISAGREE_VOTE_RE = re.compile(r"^DISAGREE\(([a-f])\)$")
+_APPROVAL_CLARIFICATION_ID_RE = re.compile(r"^C-\d{3,}$")
+
+
+def _state_round_as_plan_item(item_id: str, round_row: dict) -> dict:
+    verdicts = []
+    votes = round_row.get("votes")
+    for worker, raw_vote in (votes.items() if isinstance(votes, dict) else ()):
+        vote = str(raw_vote or "").strip()
+        match = _STATE_DISAGREE_VOTE_RE.fullmatch(vote)
+        if match:
+            verdicts.append(
+                {"worker": worker, "verdict": "DISAGREE", "breakageKind": match.group(1)}
+            )
+        elif vote in {"AGREE", "SUPPLEMENT", "verification-error"}:
+            verdicts.append({"worker": worker, "verdict": vote})
+    return {"id": item_id, "verdicts": verdicts}
+
+
+def _historical_plan_item_evidence(state: dict) -> tuple[dict[str, str], set[str]]:
+    classifications: dict[str, str] = {}
+    item_ids: set[str] = set()
+    for item in state.get("planItems") or []:
+        if not isinstance(item, dict):
+            continue
+        item_id = str(item.get("id") or "").strip()
+        if not item_id:
+            continue
+        item_ids.add(item_id)
+        for round_row in item.get("rounds") or []:
+            if not isinstance(round_row, dict):
+                continue
+            historical = _state_round_as_plan_item(item_id, round_row)
+            if _is_correctness_critical(historical):
+                classifications[item_id] = "correctness-critical"
+                break
+            if _classify_plan_item_gate(historical) == "majority-disagree":
+                classifications.setdefault(item_id, "noncritical-dissent")
+    return classifications, item_ids
+
+
+def _historical_coverage_clarification_ids(
+    state: dict,
+    plan_classifications: dict[str, str],
+) -> set[str]:
+    coverage_gap_rounds = {
+        round_row.get("round")
+        for round_row in (state.get("roundHistory") or [])
+        if isinstance(round_row, dict)
+        and isinstance(round_row.get("round"), int)
+        and "coverage-gap" in (round_row.get("gateBlockedBy") or [])
+    }
+    return {
+        clarification_id
+        for item in (state.get("planItems") or [])
+        if isinstance(item, dict)
+        for item_id in [str(item.get("id") or "").strip()]
+        for clarification_id in [str(item.get("clarificationId") or "").strip()]
+        if item_id
+        and item_id not in plan_classifications
+        and _APPROVAL_CLARIFICATION_ID_RE.fullmatch(clarification_id)
+        and any(
+            isinstance(round_row, dict)
+            and round_row.get("round") in coverage_gap_rounds
+            for round_row in (item.get("rounds") or [])
+        )
+    }
+
+
+def _read_approval_history(
+    report_path: Path | None,
+) -> tuple[dict[str, str], set[str], set[str], dict, Path | None]:
+    if report_path is None or (seq := _report_run_seq(report_path)) is None:
+        return {}, set(), set(), {}, None
+    state_path = (
+        report_path.parent.parent
+        / "state"
+        / f"plan-body-verification-implementation-planning-{seq}.json"
+    )
+    try:
+        state = json.loads(state_path.read_text(encoding="utf-8"))
+    except (OSError, json.JSONDecodeError):
+        return {}, set(), set(), {}, None
+    if not isinstance(state, dict):
+        return {}, set(), set(), {}, None
+    classifications, item_ids = _historical_plan_item_evidence(state)
+    coverage_ids = _historical_coverage_clarification_ids(
+        state,
+        classifications,
+    )
+    return classifications, item_ids, coverage_ids, state, state_path
+
+
+def _nonblocking_coverage_clarification_ids(ip: dict) -> set[str]:
+    return {
+        ref
+        for row in (ip.get("requirementCoverage") or [])
+        if isinstance(row, dict) and not _blocks_approval(row)
+        for ref in (row.get("decisionRefs") or [])
+        if isinstance(ref, str) and _APPROVAL_CLARIFICATION_ID_RE.fullmatch(ref)
+    }
+
+
+def _historical_approval_classification(
+    row_id: str,
+    linked_ids: list[str],
+    historical_plan_classifications: dict[str, str],
+    historical_coverage_ids: set[str],
+) -> str | None:
+    if row_id in historical_coverage_ids:
+        return "correctness-critical"
+    classes = {
+        historical_plan_classifications[item_id]
+        for item_id in linked_ids
+        if item_id in historical_plan_classifications
+    }
+    if "correctness-critical" in classes:
+        return "correctness-critical"
+    if "noncritical-dissent" in classes:
+        return "noncritical-dissent"
+    return None
+
+
+def _approval_activities_by_id(data: dict) -> dict[str, dict]:
+    return {
+        activity_id: activity
+        for activity in (data.get("agentActivity") or [])
+        if isinstance(activity, dict)
+        for activity_id in [activity.get("activityId")]
+        if isinstance(activity_id, str) and activity_id
+    }
+
+
+def _canonical_activity_timestamps(
+    run_manifest: Mapping[str, Any],
+    report_path: Path | None,
+) -> dict[str, str]:
+    raw_path = run_manifest.get("leadEventsPath")
+    if not isinstance(raw_path, str) or not raw_path.strip():
+        return {}
+    path = Path(raw_path)
+    if not path.is_absolute() and report_path is not None:
+        path = _project_root_from_report(report_path) / path
+    try:
+        events = read_lead_events(path)
+    except (LeadEventParseError, OSError):
+        return {}
+    return {
+        str(event.details.get("activityId")): event.timestamp
+        for event in events
+        if event.event_type == "activity"
+        and isinstance(event.details.get("activityId"), str)
+    }
+
+
+def _is_decision_required_activity(activity: dict | None) -> bool:
+    return bool(
+        activity
+        and activity.get("kind") == "user-decision-required"
+        and activity.get("outcome") == "blocked"
+    )
+
+
+def _is_applied_decision_check(activity: dict | None) -> bool:
+    commands = (activity or {}).get("commands")
+    return bool(
+        activity
+        and activity.get("kind") == "user-decision-evaluated"
+        and activity.get("outcome") == "resolved"
+        and str(activity.get("resultPath") or "").strip()
+        and isinstance(commands, list)
+        and bool(commands)
+        and all(
+            isinstance(command, dict) and command.get("exitCode") == 0
+            for command in commands
+        )
+    )
+
+
+def _activity_matches_approval_context(
+    activity: dict | None,
+    row_id: str,
+    context: dict,
+) -> bool:
+    if not activity:
+        return False
+    evidence_refs = {
+        ref
+        for ref in (activity.get("evidenceRefs") or [])
+        if isinstance(ref, str)
+    }
+    activity_item_ids = {
+        item_id
+        for item_id in (activity.get("planItemIds") or [])
+        if isinstance(item_id, str)
+    }
+    context_item_ids = {
+        item_id
+        for item_id in (context.get("planItemIds") or [])
+        if isinstance(item_id, str)
+    }
+    clarification_refs = {
+        ref for ref in evidence_refs if _APPROVAL_CLARIFICATION_ID_RE.fullmatch(ref)
+    }
+    return clarification_refs == {row_id} and context_item_ids == activity_item_ids
+
+
+_TARGETED_REVERIFICATION_REF_RE = re.compile(
+    r"^plan-body-verification:round-(?P<round>\d+)$"
+)
+
+
+def _targeted_reverification_round(activity: dict | None) -> int | None:
+    rounds = {
+        int(match.group("round"))
+        for ref in ((activity or {}).get("evidenceRefs") or [])
+        if isinstance(ref, str)
+        for match in [_TARGETED_REVERIFICATION_REF_RE.fullmatch(ref)]
+        if match is not None
+    }
+    if len(rounds) != 1:
+        return None
+    return next(iter(rounds))
+
+
+def _approval_context_activity_refs_exist(
+    data: dict,
+    row_id: str,
+    context: dict,
+    resolution: dict,
+) -> bool:
+    activities = _approval_activities_by_id(data)
+    activity_ids = {
+        value for value in (context.get("activityIds") or []) if isinstance(value, str)
+    }
+    check_refs = {
+        value for value in (resolution.get("checkRefs") or []) if isinstance(value, str)
+    }
+    activity_order = {
+        activity.get("activityId"): index
+        for index, activity in enumerate(data.get("agentActivity") or [])
+        if isinstance(activity, dict)
+    }
+    ordered = bool(activity_ids and check_refs) and max(
+        activity_order.get(ref, -1) for ref in activity_ids
+    ) < min(activity_order.get(ref, -1) for ref in check_refs)
+    return (
+        bool(activity_ids)
+        and bool(check_refs)
+        and all(
+            _is_decision_required_activity(activities.get(ref))
+            and _activity_matches_approval_context(
+                activities.get(ref), row_id, context
+            )
+            for ref in activity_ids
+        )
+        and all(
+            _is_applied_decision_check(activities.get(ref))
+            and _targeted_reverification_round(activities.get(ref)) is not None
+            and _activity_matches_approval_context(
+                activities.get(ref), row_id, context
+            )
+            for ref in check_refs
+        )
+        and ordered
+    )
+
+
+def _validate_approval_activity_refs(
+    row_id: str,
+    context: dict,
+    activities: dict[str, dict],
+    failures: list[str],
+) -> None:
+    activity_ids = {
+        value for value in (context.get("activityIds") or []) if isinstance(value, str)
+    }
+    unknown_activity_ids = sorted(activity_ids - set(activities))
+    if not activity_ids or unknown_activity_ids:
+        failures.append(
+            f"final-report data.json: approval clarification `{row_id}` activityIds "
+            f"must reference agentActivity[].activityId values; unknown="
+            f"{unknown_activity_ids or 'none'}, recorded={sorted(activity_ids)}."
+        )
+    elif not all(
+        _is_decision_required_activity(activities.get(ref)) for ref in activity_ids
+    ):
+        failures.append(
+            f"final-report data.json: approval clarification `{row_id}` activityIds "
+            "must reference blocked user-decision-required activities."
+        )
+    elif not all(
+        _activity_matches_approval_context(activities.get(ref), row_id, context)
+        for ref in activity_ids
+    ):
+        failures.append(
+            f"final-report data.json: approval clarification `{row_id}` activityIds "
+            f"must cite exactly one clarification (`{row_id}`) in evidenceRefs "
+            "and exactly match approvalContext.planItemIds."
+        )
+    resolution = context.get("resolution")
+    if not isinstance(resolution, dict):
+        return
+    check_refs = {
+        value for value in (resolution.get("checkRefs") or []) if isinstance(value, str)
+    }
+    unknown_check_refs = sorted(check_refs - set(activities))
+    if check_refs and unknown_check_refs:
+        failures.append(
+            f"final-report data.json: approval clarification `{row_id}` resolution."
+            f"checkRefs must reference agentActivity[].activityId values; unknown="
+            f"{unknown_check_refs}."
+        )
+    elif check_refs and not all(
+        _is_applied_decision_check(activities.get(ref))
+        and _targeted_reverification_round(activities.get(ref)) is not None
+        for ref in check_refs
+    ):
+        failures.append(
+            f"final-report data.json: approval clarification `{row_id}` resolution."
+            "checkRefs must reference resolved user-decision-evaluated activities "
+            "with successful check evidence and one "
+            "`plan-body-verification:round-N` evidenceRef."
+        )
+    elif check_refs and not all(
+        _activity_matches_approval_context(activities.get(ref), row_id, context)
+        for ref in check_refs
+    ):
+        failures.append(
+            f"final-report data.json: approval clarification `{row_id}` resolution."
+            f"checkRefs must cite exactly one clarification (`{row_id}`) in "
+            "evidenceRefs and exactly match approvalContext.planItemIds."
+        )
+    elif check_refs:
+        order = {
+            activity.get("activityId"): index
+            for index, activity in enumerate(activities.values())
+        }
+        if activity_ids and max(order.get(ref, -1) for ref in activity_ids) >= min(
+            order.get(ref, -1) for ref in check_refs
+        ):
+            failures.append(
+                f"final-report data.json: approval clarification `{row_id}` "
+                "user-decision-evaluated activity must occur after every "
+                "user-decision-required activity."
+            )
+
+
+def _validate_approval_dispositions(
+    row: dict,
+    context: dict,
+    failures: list[str],
+) -> None:
+    row_id = str(row.get("id") or "<unknown>")
+    classification = str(context.get("classification") or "")
+    allowed = _APPROVAL_DISPOSITIONS_BY_CLASSIFICATION.get(classification, frozenset())
+    candidates = [("recommendedDisposition", context.get("recommendedDisposition"))]
+    candidates.extend(
+        (f"options[{index}].disposition", option.get("disposition"))
+        for index, option in enumerate(row.get("options") or [])
+        if isinstance(option, dict)
+    )
+    resolution = context.get("resolution")
+    if isinstance(resolution, dict):
+        candidates.append(("resolution.disposition", resolution.get("disposition")))
+    for field, disposition in candidates:
+        if disposition not in allowed:
+            failures.append(
+                f"final-report data.json: approval clarification `{row_id}` "
+                f"classification `{classification}` does not allow `{disposition}` "
+                f"in {field}; allowed dispositions are {sorted(allowed)}."
+            )
+
+
+def _validate_resolved_approval(
+    row: dict,
+    context: dict,
+    failures: list[str],
+) -> None:
+    if row.get("status") != "resolved":
+        return
+    row_id = str(row.get("id") or "<unknown>")
+    resolution = context.get("resolution")
+    if not isinstance(resolution, dict):
+        failures.append(
+            f"final-report data.json: resolved approval clarification `{row_id}` "
+            "requires resolution.userText and non-empty resolution.checkRefs."
+        )
+        return
+    if not str(resolution.get("userText") or "").strip():
+        failures.append(
+            f"final-report data.json: resolved approval clarification `{row_id}` "
+            "requires non-empty resolution.userText."
+        )
+    check_refs = resolution.get("checkRefs")
+    if not isinstance(check_refs, list) or not any(
+        isinstance(value, str) and value for value in check_refs
+    ):
+        failures.append(
+            f"final-report data.json: resolved approval clarification `{row_id}` "
+            "requires non-empty resolution.checkRefs."
+        )
+    if (
+        context.get("classification") == "noncritical-dissent"
+        and resolution.get("disposition") != "accept-risk"
+    ):
+        failures.append(
+            f"final-report data.json: resolved noncritical-dissent `{row_id}` "
+            "requires an explicit accept-risk disposition."
+        )
+
+
+def _has_successful_targeted_reverification(item: dict) -> bool:
+    verdicts = [
+        str(verdict.get("verdict") or "").strip().upper()
+        for verdict in (item.get("verdicts") or [])
+        if isinstance(verdict, dict)
+    ]
+    return bool(verdicts) and all(
+        verdict in {"AGREE", "SUPPLEMENT"} for verdict in verdicts
+    )
+
+
+def _parse_approval_timestamp(value: Any) -> datetime | None:
+    if not isinstance(value, str) or not value.strip():
+        return None
+    try:
+        parsed = datetime.fromisoformat(value.strip().replace("Z", "+00:00"))
+    except ValueError:
+        return None
+    if parsed.tzinfo is None or parsed.utcoffset() != timezone.utc.utcoffset(parsed):
+        return None
+    return parsed
+
+
+def _referenced_approval_timestamps(
+    refs: Any,
+    activity_timestamps: dict[str, str],
+) -> list[datetime | None]:
+    return [
+        _parse_approval_timestamp(activity_timestamps.get(ref))
+        for ref in (refs or [])
+        if isinstance(ref, str)
+    ]
+
+
+def _target_round_completed_at(
+    approval_state: dict,
+    target_round: int,
+) -> datetime | None:
+    matching_rounds = [
+        row
+        for row in (approval_state.get("roundHistory") or [])
+        if isinstance(row, dict) and row.get("round") == target_round
+    ]
+    if len(matching_rounds) != 1:
+        return None
+    return _parse_approval_timestamp(matching_rounds[0].get("completedAt"))
+
+
+def _validate_target_round_causality(
+    row_id: str,
+    target_round: int,
+    approval_state: dict,
+    context: dict,
+    resolution: dict,
+    activity_timestamps: dict[str, str],
+    failures: list[str],
+) -> None:
+    completed_at = _target_round_completed_at(approval_state, target_round)
+    required_at = _referenced_approval_timestamps(
+        context.get("activityIds"),
+        activity_timestamps,
+    )
+    evaluated_at = _referenced_approval_timestamps(
+        resolution.get("checkRefs"),
+        activity_timestamps,
+    )
+    if (
+        completed_at is None
+        or not required_at
+        or not evaluated_at
+        or None in required_at
+        or None in evaluated_at
+    ):
+        failures.append(
+            f"final-report data.json: correctness-critical clarification `{row_id}` "
+            f"state round {target_round} requires one UTC completedAt plus canonical "
+            "timestamps for every required and evaluated activity."
+        )
+        return
+    if completed_at <= max(required_at):
+        failures.append(
+            f"final-report data.json: correctness-critical clarification `{row_id}` "
+            f"state round {target_round} completedAt must be after every referenced "
+            "user-decision-required activity."
+        )
+    if completed_at > min(evaluated_at):
+        failures.append(
+            f"final-report data.json: correctness-critical clarification `{row_id}` "
+            f"state round {target_round} completedAt must be no later than every "
+            "referenced user-decision-evaluated activity."
+        )
+
+
+def _required_activity_plan_item_ids(
+    context: dict,
+    activities: dict[str, dict],
+) -> set[str]:
+    return {
+        item_id
+        for ref in (context.get("activityIds") or [])
+        if isinstance(ref, str) and _is_decision_required_activity(activities.get(ref))
+        for item_id in (activities[ref].get("planItemIds") or [])
+        if isinstance(item_id, str)
+    }
+
+
+def _terminal_unknown_plan_items_are_historical(
+    row: dict,
+    context: dict,
+    unknown_ids: set[str],
+    historical_item_ids: set[str],
+    historical_coverage_ids: set[str],
+    activities: dict[str, dict],
+) -> bool:
+    status = row.get("status")
+    if status not in {"resolved", "obsolete"}:
+        return False
+    if status == "resolved" and str(row.get("id") or "") not in historical_coverage_ids:
+        return False
+    required_item_ids = _required_activity_plan_item_ids(context, activities)
+    return bool(unknown_ids) and unknown_ids <= historical_item_ids & required_item_ids
+
+
+def _validate_correctness_resolution(
+    row: dict,
+    linked_ids: list[str],
+    linked_items: list[dict],
+    independent_coverage_clarification_ids: set[str],
+    activities: dict[str, dict],
+    approval_state: dict,
+    approval_state_path: Path | None,
+    activity_timestamps: dict[str, str],
+    failures: list[str],
+) -> None:
+    context = row.get("approvalContext") or {}
+    if (
+        context.get("classification") != "correctness-critical"
+        or row.get("status") != "resolved"
+    ):
+        return
+    row_id = str(row.get("id") or "<unknown>")
+    resolution = context.get("resolution") or {}
+    target_rounds = {
+        round_number
+        for ref in (resolution.get("checkRefs") or [])
+        if isinstance(ref, str)
+        for round_number in [_targeted_reverification_round(activities.get(ref))]
+        if round_number is not None
+    }
+    if len(target_rounds) != 1:
+        failures.append(
+            f"final-report data.json: correctness-critical clarification `{row_id}` "
+            "requires exactly one evidenced targeted reverification state round."
+        )
+        return
+    target_round = next(iter(target_rounds))
+    _validate_target_round_causality(
+        row_id,
+        target_round,
+        approval_state,
+        context,
+        resolution,
+        activity_timestamps,
+        failures,
+    )
+    state_name = approval_state_path.name if approval_state_path is not None else ""
+    result_paths_match = bool(state_name) and all(
+        tuple(
+            Path(str(activities[ref].get("resultPath") or "")).parts[-2:]
+        ) == ("state", state_name)
+        for ref in (resolution.get("checkRefs") or [])
+        if isinstance(ref, str) and ref in activities
+    )
+    if not result_paths_match:
+        failures.append(
+            f"final-report data.json: correctness-critical clarification `{row_id}` "
+            "evaluation resultPath must reference the matching plan-body "
+            "verification state artifact."
+        )
+    state_items = {
+        str(item.get("id") or ""): item
+        for item in (approval_state.get("planItems") or [])
+        if isinstance(item, dict) and str(item.get("id") or "")
+    }
+    state_failures: dict[str, str] = {}
+    current_by_id = {str(item.get("id") or ""): item for item in linked_items}
+    for item_id in linked_ids:
+        state_item = state_items.get(item_id)
+        rounds = state_item.get("rounds") if isinstance(state_item, dict) else None
+        target_state_round = next(
+            (
+                round_row
+                for round_row in (rounds or [])
+                if isinstance(round_row, dict)
+                and round_row.get("round") == target_round
+            ),
+            None,
+        )
+        blocking_rounds = [
+            round_row.get("round")
+            for round_row in (rounds or [])
+            if isinstance(round_row, dict)
+            and isinstance(round_row.get("round"), int)
+            and round_row.get("round") < target_round
+            and (
+                _is_correctness_critical(
+                    _state_round_as_plan_item(item_id, round_row)
+                )
+                or _classify_plan_item_gate(
+                    _state_round_as_plan_item(item_id, round_row)
+                )
+                == "majority-disagree"
+            )
+        ]
+        if (
+            isinstance(state_item, dict)
+            and state_item.get("clarificationId") == row_id
+        ):
+            blocking_rounds.extend(
+                round_row.get("round")
+                for round_row in (approval_state.get("roundHistory") or [])
+                if isinstance(round_row, dict)
+                and isinstance(round_row.get("round"), int)
+                and round_row.get("round") < target_round
+                and "coverage-gap" in (round_row.get("gateBlockedBy") or [])
+            )
+        target_votes = (
+            target_state_round.get("votes")
+            if isinstance(target_state_round, dict)
+            else None
+        )
+        successful = bool(target_votes) and all(
+            vote in {"AGREE", "SUPPLEMENT"} for vote in target_votes.values()
+        )
+        if not blocking_rounds or not successful:
+            state_failures[item_id] = (
+                f"state round {target_round} is not a successful post-blocker round"
+            )
+            continue
+        current = current_by_id.get(item_id)
+        if current is not None:
+            report_votes = {
+                str(verdict.get("worker") or ""): str(verdict.get("verdict") or "")
+                for verdict in (current.get("verdicts") or [])
+                if isinstance(verdict, dict)
+            }
+            if report_votes != target_votes:
+                state_failures[item_id] = (
+                    f"state round {target_round} votes do not match final report verdicts"
+                )
+    if state_failures:
+        failures.append(
+            f"final-report data.json: correctness-critical clarification `{row_id}` "
+            f"targeted reverification state round {target_round} is not bound to "
+            f"the resolved evidence; failures={state_failures}."
+        )
+    unresolved = {
+        str(item.get("id") or "<unknown>"): [
+            str(verdict.get("verdict") or "")
+            for verdict in (item.get("verdicts") or [])
+            if isinstance(verdict, dict)
+        ]
+        for item in linked_items
+        if not _has_successful_targeted_reverification(item)
+    }
+    if unresolved:
+        failures.append(
+            f"final-report data.json: correctness-critical clarification `{row_id}` "
+            "cannot resolve until targeted reverification records only AGREE or "
+            f"acceptable SUPPLEMENT verdicts; unresolved plan items={unresolved}."
+        )
+    if row_id in independent_coverage_clarification_ids:
+        failures.append(
+            f"final-report data.json: correctness-critical clarification `{row_id}` "
+            "cannot resolve while an independent requirement coverage blocker remains."
+        )
+
+
+def _validate_approval_context(
+    data: dict,
+    run_manifest: dict,
+    failures: list[str],
+    report_path: Path | None = None,
+) -> None:
+    if not _is_activity_contract_v1_planning(run_manifest):
+        return
+    ip = data.get("implementationPlanning") or {}
+    pbv = ip.get("planBodyVerification") or {}
+    plan_items_by_id = {
+        str(item.get("id")): item
+        for item in (pbv.get("planItems") or [])
+        if isinstance(item, dict) and str(item.get("id") or "")
+    }
+    coverage_ids = _independent_coverage_clarification_ids(ip, pbv)
+    (
+        historical_classes,
+        historical_item_ids,
+        historical_coverage_ids,
+        approval_state,
+        approval_state_path,
+    ) = _read_approval_history(report_path)
+    historical_coverage_ids &= _nonblocking_coverage_clarification_ids(
+        ip
+    )
+    activities = _approval_activities_by_id(data)
+    activity_timestamps = _canonical_activity_timestamps(run_manifest, report_path)
+    report_approved = (data.get("frontmatter") or {}).get("approved") is True
+    for row in data.get("clarificationItems") or []:
+        if not isinstance(row, dict) or row.get("blocks") != "approval":
+            continue
+        row_id = str(row.get("id") or "<unknown>")
+        context = row.get("approvalContext")
+        if not isinstance(context, dict):
+            failures.append(
+                f"final-report data.json: approval clarification `{row_id}` requires "
+                "approvalContext under activity contract v1."
+            )
+            continue
+        linked_ids = [
+            value
+            for value in context.get("planItemIds") or []
+            if isinstance(value, str)
+        ]
+        unknown_ids = set(linked_ids) - set(plan_items_by_id)
+        if unknown_ids and not _terminal_unknown_plan_items_are_historical(
+            row,
+            context,
+            unknown_ids,
+            historical_item_ids,
+            historical_coverage_ids,
+            activities,
+        ):
+            failures.append(
+                f"final-report data.json: approval clarification `{row_id}` planItemIds "
+                f"reference unknown plan items {sorted(unknown_ids)}."
+            )
+        linked_items = [
+            plan_items_by_id[item_id]
+            for item_id in linked_ids
+            if item_id in plan_items_by_id
+        ]
+        current_expected = _expected_approval_classification(
+            row, plan_items_by_id, coverage_ids
+        )
+        historical_expected = _historical_approval_classification(
+            row_id, linked_ids, historical_classes, historical_coverage_ids
+        )
+        expected = (
+            historical_expected
+            if row.get("status") in {"resolved", "obsolete"} and historical_expected
+            else current_expected
+        )
+        if context.get("classification") != expected:
+            failures.append(
+                f"final-report data.json: approval clarification `{row_id}` classification "
+                f"is `{context.get('classification')}` but plan evidence requires `{expected}`."
+            )
+        obsolete_has_active_cause = current_expected != "user-decision" or any(
+            item_id in plan_items_by_id for item_id in linked_ids
+        )
+        if row.get("status") == "obsolete" and obsolete_has_active_cause:
+            failures.append(
+                f"final-report data.json: obsolete approval clarification `{row_id}` "
+                f"still has an active `{current_expected}` cause in the current plan."
+            )
+        _validate_approval_activity_refs(row_id, context, activities, failures)
+        _validate_approval_dispositions(row, context, failures)
+        _validate_resolved_approval(row, context, failures)
+        _validate_correctness_resolution(
+            row,
+            linked_ids,
+            linked_items,
+            coverage_ids,
+            activities,
+            approval_state,
+            approval_state_path,
+            activity_timestamps,
+            failures,
+        )
+        if report_approved and row.get("status") in {"open", "answered"}:
+            failures.append(
+                f"final-report data.json: approval is true while clarification `{row_id}` "
+                f"has status `{row.get('status')}`; open and answered approval "
+                "rows remain blocking."
+            )
+
+
+def _validate_activity_contract_plan_limits(
+    data: dict,
+    run_manifest: dict,
+    failures: list[str],
+) -> None:
+    if not _is_activity_contract_v1_planning(run_manifest):
+        return
+    pbv = (data.get("implementationPlanning") or {}).get("planBodyVerification") or {}
+    rounds_applied = pbv.get("selfFixRoundsApplied", 0)
+    if isinstance(rounds_applied, int) and rounds_applied > 1:
+        failures.append(
+            "final-report data.json: activity contract v1 selfFixRoundsApplied "
+            "must be at most one automatic self-fix round"
+        )
+    if pbv.get("selfFixStopReason") == "cause-group-recurrence":
+        failures.append(
+            "final-report data.json: activity contract v1 cannot newly emit "
+            "cause-group-recurrence"
+        )
+
+
 _CHECKLIST_REF_RE = re.compile(r"VC-\d+")
 
 
@@ -4172,7 +5183,11 @@ def _validate_participating_analysers(data: dict, failures: list[str]) -> None:
         )
 
 
-def _validate_gate_blocked_by(data: dict, failures: list[str]) -> None:
+def _validate_gate_blocked_by(
+    data: dict,
+    failures: list[str],
+    accepted_item_ids: set[str] | None = None,
+) -> None:
     """The gate value names an *outcome*; `gateBlockedBy` names the *cause*.
 
     Two independent inputs can block approval — a `majority-disagree` plan item
@@ -4200,7 +5215,12 @@ def _validate_gate_blocked_by(data: dict, failures: list[str]) -> None:
         if isinstance(c, str) and str(c).strip()
     }
     coverage_blockers = _independent_coverage_blockers(ip, pbv)
-    actual_causes = _gate_blocking_causes(pbv, coverage_blockers)
+    accepted = (
+        _resolved_noncritical_dissent_ids(data)
+        if accepted_item_ids is None
+        else accepted_item_ids
+    )
+    actual_causes = _gate_blocking_causes(pbv, coverage_blockers, accepted)
 
     if actual_causes and declared_gate in ("passed", "passed-with-dissent"):
         failures.append(
@@ -6227,7 +7247,11 @@ def _validate_plan_item_subject_substance(data: dict, failures: list[str]) -> No
             )
 
 
-def _validate_plan_body_clarification_matching(data: dict, failures: list[str]) -> None:
+def _validate_plan_body_clarification_matching(
+    data: dict,
+    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
@@ -6243,6 +7267,11 @@ def _validate_plan_body_clarification_matching(data: dict, failures: list[str])
     round_count = pbv.get("roundCount")
     if not isinstance(round_count, int) or round_count < 1:
         return
+    accepted = (
+        _resolved_noncritical_dissent_ids(data)
+        if accepted_item_ids is None
+        else accepted_item_ids
+    )
     clar_rows = [r for r in (data.get("clarificationItems") or []) if isinstance(r, dict)]
     all_ids = {r.get("id") for r in clar_rows if r.get("id")}
     approval_ids = {r.get("id") for r in clar_rows if r.get("blocks") == "approval" and r.get("id")}
@@ -6251,7 +7280,7 @@ def _validate_plan_body_clarification_matching(data: dict, failures: list[str])
             continue
         if _classify_plan_item_gate(item) != "majority-disagree":
             continue
-        if _is_dissent_downgraded(item, pbv):
+        if _is_dissent_downgraded(item, pbv, accepted):
             continue
         item_id = item.get("id") or "<unknown>"
         cid = item.get("clarificationId")
@@ -6427,8 +7456,9 @@ def validate_plan_body_section(
     spent against a mis-scored gate.
     """
     pbv = (data.get("implementationPlanning") or {}).get("planBodyVerification") or {}
-    _validate_plan_body_gate_recompute(data, failures)
-    _validate_gate_blocked_by(data, failures)
+    accepted_item_ids = _resolved_noncritical_dissent_ids(data)
+    _validate_plan_body_gate_recompute(data, failures, accepted_item_ids)
+    _validate_gate_blocked_by(data, failures, accepted_item_ids)
     _validate_participating_analysers(data, failures)
     _validate_self_fix_rewrite_scope(data, failures)
     _validate_self_fix_grouping(data, failures)
@@ -6440,17 +7470,21 @@ def validate_plan_body_section(
     _validate_verdict_rounds_outlive_self_fix(data, failures)
     _validate_plan_item_extraction_completeness(data, failures)
     _validate_plan_item_subject_substance(data, failures)
-    _validate_plan_body_clarification_matching(data, failures)
+    _validate_plan_body_clarification_matching(data, failures, accepted_item_ids)
     _validate_disagree_has_fixability(data, failures)
     _validate_self_fix_before_clarification(data, failures)
     return [*_detect_self_fix_recurrence(pbv), *_detect_uniform_verifier(pbv)]
 
 
-def _gate_summary_item(item: dict, pbv: dict) -> dict:
+def _gate_summary_item(
+    item: dict,
+    pbv: dict,
+    accepted_item_ids: set[str],
+) -> dict:
     """One `gate.items[]` row: the gate class plus its state-file counterpart."""
     classification = (
         "has-dissent"
-        if _is_dissent_downgraded(item, pbv)
+        if _is_dissent_downgraded(item, pbv, accepted_item_ids)
         else _classify_plan_item_gate(item)
     )
     return {
@@ -6478,11 +7512,12 @@ def plan_body_gate_summary(data: dict) -> dict | None:
     pbv = ip.get("planBodyVerification")
     if not isinstance(pbv, dict):
         return None
-    recomputed = _recompute_plan_body_gate(pbv)
+    accepted_item_ids = _resolved_noncritical_dissent_ids(data)
+    recomputed = _recompute_plan_body_gate(pbv, accepted_item_ids)
     if recomputed is None:
         return None
     items = [
-        _gate_summary_item(item, pbv)
+        _gate_summary_item(item, pbv, accepted_item_ids)
         for item in (pbv.get("planItems") or [])
         if isinstance(item, dict)
     ]
@@ -6493,7 +7528,9 @@ def plan_body_gate_summary(data: dict) -> dict | None:
         "declaredBlockedBy": sorted(
             str(c) for c in (pbv.get("gateBlockedBy") or []) if isinstance(c, str)
         ),
-        "blockedBy": sorted(_gate_blocking_causes(pbv, coverage_blockers)),
+        "blockedBy": sorted(
+            _gate_blocking_causes(pbv, coverage_blockers, accepted_item_ids)
+        ),
         "coverageBlockers": coverage_blockers,
         "blockingItems": [
             item["id"] for item in items if item["classification"] == "majority-disagree"
@@ -6846,6 +7883,13 @@ def _validate_stage_has_requirement(data: dict, failures: list[str]) -> None:
         )
 
 
+_FINAL_VERIFICATION_ROUTING_TOKEN_RE = re.compile(
+    r"(?<![A-Za-z-])(?:release-handoff\(stage-group\)|release-handoff|done|"
+    r"implementation|error-analysis|implementation-option-selection|"
+    r"implementation-planning)(?![A-Za-z-])"
+)
+
+
 def _validate_final_verification_consistency(data: dict, failures: list[str]) -> None:
     """Enforce verdict ↔ blocker/condition/routing consistency on the
     final-verification data.json (SSOT). The schema guarantees field SHAPE;
@@ -6860,7 +7904,16 @@ def _validate_final_verification_consistency(data: dict, failures: list[str]) ->
     fv = data.get("finalVerification") or {}
     blockers = fv.get("acceptanceBlockers") or []
     conditions = verdict.get("conditionalAcceptanceConditions") or []
-    routing = fv.get("routingRecommendation") or ""
+    routing_value = fv.get("routingRecommendation")
+    routing = routing_value if isinstance(routing_value, str) else ""
+    routing_tokens = _FINAL_VERIFICATION_ROUTING_TOKEN_RE.findall(routing)
+    routing_token = routing_tokens[0] if len(routing_tokens) == 1 else None
+
+    if routing_token is None:
+        failures.append(
+            "final-verification: routingRecommendation must contain exactly one "
+            "supported routing token."
+        )
 
     if token == "accepted" and blockers:
         failures.append(
@@ -6877,7 +7930,10 @@ def _validate_final_verification_consistency(data: dict, failures: list[str]) ->
             "final-verification: verdict `conditional-accept` but "
             "conditionalAcceptanceConditions is empty — list every condition."
         )
-    if "release-handoff" in routing and token != "accepted":
+    if (
+        routing_token in {"release-handoff", "release-handoff(stage-group)"}
+        and token != "accepted"
+    ):
         failures.append(
             f"final-verification: routingRecommendation cites `release-handoff` "
             f"but verdict is `{token}` — release-handoff routing is allowed only "
@@ -6890,8 +7946,7 @@ def _validate_final_verification_consistency(data: dict, failures: list[str]) ->
             f"final-verification: verificationScope must be `whole-task` or "
             f"`single-stage`, got {scope!r}."
         )
-    if (scope == "single-stage" and "release-handoff" in routing
-            and "release-handoff(stage-group)" not in routing):
+    if scope == "single-stage" and routing_token == "release-handoff":
         failures.append(
             "final-verification: verificationScope `single-stage` cannot recommend "
             "plain release-handoff routing — a single-stage accepted verdict may "
@@ -7290,14 +8345,15 @@ def _validate_fix_cycle(run_manifest: dict, data: dict, failures: list[str]) ->
 def _validate_session_conformance(
     team_state: dict,
     team_state_path: Path,
+    run_manifest: Mapping[str, Any],
     project_root: Path,
     report_path: Path,
     task_type: str,
     claude_projects_dir: str | None,
     failures: list[str],
 ) -> None:
-    """prompts/lead/okstra-lead-contract.md BLOCKING 계약 3종(PROGRESS 체크포인트 / claude-worker
-    heartbeat / implementation entry guard)의 post-hoc 검사를 위임하고 실패를
+    """prompts/lead/okstra-lead-contract.md의 PROGRESS / activity / heartbeat /
+    implementation entry guard 사후 검사를 위임하고 실패를
     ``session-conformance: `` 접두로 folding 한다. 설계:
     docs/superpowers/specs/2026-06-10-blocking-contract-posthoc-conformance-design.md
     """
@@ -7314,6 +8370,7 @@ def _validate_session_conformance(
     result = validate_session_conformance(
         team_state=team_state,
         team_state_path=team_state_path,
+        run_manifest=run_manifest,
         project_root=project_root,
         report_path=report_path,
         task_type=task_type,
@@ -8149,6 +9206,7 @@ def main() -> int:
         _validate_session_conformance(
             team_state,
             team_state_path,
+            run_manifest,
             project_root,
             report_path,
             task_type,
@@ -8184,16 +9242,28 @@ def main() -> int:
         for warning in conformance_warnings:
             print(f"validate-run: warning: {warning}", file=sys.stderr)
     if task_type in _BRIEF_DERIVED_PHASES:
-        brief_path = _brief_path_from_manifest(task_manifest, project_root)
+        planning = validation_data.get("implementationPlanning")
+        selected_direction_plan = (
+            task_type == "implementation-planning"
+            and isinstance(planning, Mapping)
+            and planning.get("planningContract") == "selected-direction"
+        )
+        brief_path = (
+            project_root / "__selected-direction-brief-validated-from-run-manifest__"
+            if selected_direction_plan
+            else _brief_path_from_manifest(task_manifest, project_root)
+        )
         if task_type in _END_STATE_PHASES:
             if task_type == "implementation-planning":
                 _validate_planning_conformance_declared(report_path, failures)
-            _validate_end_state_coverage(validation_data, brief_path, failures)
-            if task_type == "implementation-planning":
+            if not selected_direction_plan:
+                _validate_end_state_coverage(validation_data, brief_path, failures)
+            if task_type == "implementation-planning" and not selected_direction_plan:
                 _validate_requirement_provenance(
                     validation_data, brief_path, failures
                 )
                 _validate_stage_has_requirement(validation_data, failures)
+            if task_type == "implementation-planning":
                 _append_stage_data_failures(validation_data, failures)
         if task_type == "improvement-discovery":
             run_dir = report_path.parent.parent