fix: resolve conflicts for PR #385

Merge prgs/master into feat/issue-139-role-aware-work-issue-routing and
keep both work-issue task routing entries and reconcile-landed-pr entries
in task_capability_map.py.

review_proofs.py

@@ -18,6 +18,11 @@ import hashlib
 import re
 
 import issue_duplicate_gate
+from reconciliation_workflow import (
+    RECONCILE_TASK_MARKERS,
+    RECONCILE_WORKFLOW_MARKERS,
+    assess_reconcile_workflow_source,
+)
 from reviewer_worktree import assess_reviewer_worktree_proof
 
 _FULL_SHA = re.compile(r"^[0-9a-f]{40}$")
@@ -1742,6 +1747,17 @@ def build_final_report(checkout_proof, inventory, validation, contamination,
             "reasons": [],
             "violations": [],
         }
+    if report_text:
+        already_landed_classification = assess_already_landed_classification_report(
+            report_text
+        )
+    else:
+        already_landed_classification = {
+            "proven": True,
+            "block": False,
+            "reasons": [],
+            "violations": [],
+        }
 
     contamination_status = contamination.get("status", "unknown")
     checkout_proven = bool(checkout_proof.get("proven"))
@@ -1921,6 +1937,11 @@ def build_final_report(checkout_proof, inventory, validation, contamination,
             "reviewer baseline validation proof missing or failed (#325)"
         )
         downgrade_reasons.extend(baseline_validation.get("reasons", []))
+    if not already_landed_classification.get("proven"):
+        downgrade_reasons.append(
+            "already-landed classification wording missing or invalid (#295)"
+        )
+        downgrade_reasons.extend(already_landed_classification.get("reasons", []))
 
     merge_allowed = (
         identity_eligible
@@ -2035,6 +2056,12 @@ def build_final_report(checkout_proof, inventory, validation, contamination,
         "baseline_validation_violations": list(
             baseline_validation.get("violations") or []
         ),
+        "already_landed_classification_proven": bool(
+            already_landed_classification.get("proven")
+        ),
+        "already_landed_classification_violations": list(
+            already_landed_classification.get("reasons") or []
+        ),
     }
 
 
@@ -5453,6 +5480,15 @@ def assess_validation_integrity_report(report_text, **kwargs):
     return _assess(report_text, **kwargs)
 
 
+def assess_already_landed_classification_report(report_text, **kwargs):
+    """#295: already-landed PRs are reconciliation-only, not review eligible."""
+    from reviewer_already_landed_classification import (
+        assess_already_landed_classification_report as _assess,
+    )
+
+    return _assess(report_text, **kwargs)
+
+
 def assess_prior_blocker_skip_proof(report_text, **kwargs):
     """#318: require live blocker proof before skipping earlier open PRs."""
     from reviewer_blocker_skip import assess_prior_blocker_skip_proof as _assess