fix(reviewer-bot): honor approval suppression semantics

Author: PLeVasseur

scripts/reviewer_bot_core/approval_policy.py

@@ -22,14 +22,22 @@
 def compute_pr_approval_state_from_reviews(
     survivors: dict[str, dict],
     *,
+    current_reviewer: str | None,
     current_head: str,
     permission_statuses: dict[str, str],
 ) -> dict[str, object]:
     approvals = [review for review in survivors.values() if str(review.get("state", "")).upper() == "APPROVED"]
+    current_reviewer_approvals = []
+    current_reviewer_key = current_reviewer.lower() if isinstance(current_reviewer, str) and current_reviewer.strip() else None
+    if current_reviewer_key is not None:
+        for review in approvals:
+            author = review.get("user", {}).get("login")
+            if isinstance(author, str) and author.lower() == current_reviewer_key:
+                current_reviewer_approvals.append(review)
     completion = {
-        "completed": bool(approvals),
+        "completed": bool(current_reviewer_approvals),
         "current_head_sha": current_head,
-        "qualifying_review_ids": [review.get("id") for review in approvals],
+        "qualifying_review_ids": [review.get("id") for review in current_reviewer_approvals],
     }
 
     has_write_approval = False
@@ -100,6 +108,7 @@ def compute_pr_approval_state_result(
     )
     result = compute_pr_approval_state_from_reviews(
         survivors,
+        current_reviewer=review_data.get("current_reviewer"),
         current_head=current_head,
         permission_statuses=permission_cache,
     )

scripts/reviewer_bot_core/reviewer_response_policy.py

@@ -201,6 +201,7 @@ def derive_reviewer_response_state(
     had_reviewer_review: bool = False,
     approval_result: dict[str, object] | None = None,
     current_head_approval_authors: tuple[str, ...] | None = None,
+    stored_reviewer_review: dict | None | object = _UNSET,
 ) -> dict[str, object]:
     current_reviewer = review_data.get("current_reviewer")
     if not isinstance(current_reviewer, str) or not current_reviewer.strip():
@@ -214,6 +215,8 @@ def derive_reviewer_response_state(
         reviewer_comment = review_data.get("reviewer_comment", {}).get("accepted")
     if reviewer_review is _UNSET:
         reviewer_review = review_data.get("reviewer_review", {}).get("accepted")
+    if stored_reviewer_review is _UNSET:
+        stored_reviewer_review = reviewer_review
     if contributor_comment is _UNSET:
         contributor_comment = review_data.get("contributor_comment", {}).get("accepted")
 
@@ -353,7 +356,7 @@ def derive_reviewer_response_state(
     approval_authors = tuple(author for author in (current_head_approval_authors or ()) if isinstance(author, str) and author.strip())
     normalized_approval_authors = {author.lower() for author in approval_authors}
     if current_reviewer.lower() in normalized_approval_authors:
-        latest_review_head = reviewer_review.get("reviewed_head_sha") if isinstance(reviewer_review, dict) else None
+        latest_review_head = stored_reviewer_review.get("reviewed_head_sha") if isinstance(stored_reviewer_review, dict) else None
         if not isinstance(latest_review_head, str) or latest_review_head != current_head:
             return _decorate_response(
                 state="projection_failed",
@@ -478,6 +481,7 @@ def compute_reviewer_response_state(
 
     reviewer_comment = review_data.get("reviewer_comment", {}).get("accepted")
     reviewer_review = review_data.get("reviewer_review", {}).get("accepted")
+    stored_reviewer_review = reviewer_review
     contributor_comment = review_data.get("contributor_comment", {}).get("accepted")
     had_reviewer_review = isinstance(reviewer_review, dict)
 
@@ -580,4 +584,5 @@ def compute_reviewer_response_state(
         had_reviewer_review=had_reviewer_review,
         approval_result=approval_result,
         current_head_approval_authors=approval_authors,
+        stored_reviewer_review=stored_reviewer_review,
     )

tests/unit/reviewer_bot/test_approval_policy_equivalence.py

@@ -128,6 +128,7 @@ def _legacy_compute_pr_approval_state_result(
     )
     result = compute_pr_approval_state_from_reviews(
         survivors,
+        current_reviewer=review_data.get("current_reviewer"),
         current_head=current_head,
         permission_statuses=permission_cache,
     )

tests/unit/reviewer_bot/test_reviews_live_fetch.py

@@ -241,6 +241,58 @@ def test_compute_reviewer_response_state_reports_awaiting_write_approval_after_c
     assert response_state["reason"] == "current_head_alternate_approval_present"
 
 
+def test_compute_reviewer_response_state_blocks_public_current_head_approval_contradiction_before_refresh(monkeypatch):
+    state = make_state()
+    review = make_tracked_review_state(state, 42, reviewer="alice", active_cycle_started_at="2026-03-17T09:00:00Z")
+    accept_reviewer_review(
+        review,
+        semantic_key="pull_request_review:99",
+        timestamp="2026-03-17T09:30:00Z",
+        actor="alice",
+        reviewed_head_sha="head-0",
+        source_precedence=1,
+    )
+    routes = RouteGitHubApi().add_pull_request_snapshot(42, pull_request_payload(42, head_sha="head-1")).add_pull_request_reviews(
+        42,
+        [review_payload(10, state="APPROVED", submitted_at="2026-03-17T10:01:00Z", commit_id="head-1", author="alice")],
+    )
+    runtime = _runtime(monkeypatch, routes)
+    runtime.github.get_user_permission_status = lambda username, required_permission="push": "granted"
+
+    response_state = reviews.compute_reviewer_response_state(runtime, 42, review)
+
+    assert response_state["state"] == "projection_failed"
+    assert response_state["reason"] == "public_current_head_approval_contradiction"
+    assert response_state["suppression_reason"] == "public_current_head_approval_contradiction"
+
+
+def test_rebuild_pr_approval_state_does_not_persist_completion_from_alternate_approval(monkeypatch):
+    state = make_state()
+    review = make_tracked_review_state(state, 42, reviewer="alice", active_cycle_started_at="2026-03-17T09:00:00Z")
+    accept_reviewer_review(review, semantic_key="pull_request_review:10", timestamp="2026-03-17T10:01:00Z", actor="alice", reviewed_head_sha="head-1", source_precedence=1)
+    routes = RouteGitHubApi().add_pull_request_snapshot(42, pull_request_payload(42, head_sha="head-1")).add_pull_request_reviews(
+        42,
+        [review_payload(11, state="APPROVED", submitted_at="2026-03-17T10:05:00Z", commit_id="head-1", author="bob")],
+    )
+    runtime = _runtime(monkeypatch, routes)
+    runtime.github.get_user_permission_status = lambda username, required_permission="push": "granted"
+
+    completion, write_approval = reviews.rebuild_pr_approval_state(runtime, 42, review)
+
+    assert completion == {
+        "completed": False,
+        "current_head_sha": "head-1",
+        "qualifying_review_ids": [],
+    }
+    assert write_approval == {
+        "has_write_approval": True,
+        "write_approvers": ["bob"],
+        "current_head_sha": "head-1",
+    }
+    assert review["review_completed_at"] is None
+    assert review["review_completion_source"] is None
+
+
 def test_compute_reviewer_response_state_keeps_contributor_handoff_when_stored_review_is_stale(monkeypatch):
     state = make_state()
     review = make_tracked_review_state(state, 42, reviewer="alice", active_cycle_started_at="2026-03-17T09:00:00Z")

tests/unit/reviewer_bot/test_reviews_projection.py

@@ -176,6 +176,7 @@ def test_compute_pr_approval_state_from_reviews_is_pure():
 
     result = approval_policy.compute_pr_approval_state_from_reviews(
         survivors,
+        current_reviewer="alice",
         current_head="head-1",
         permission_statuses={"alice": "granted"},
     )
@@ -185,6 +186,37 @@ def test_compute_pr_approval_state_from_reviews_is_pure():
     assert before["survivors"]["alice"]["id"] == 10
 
 
+def test_compute_pr_approval_state_from_reviews_does_not_mint_completion_from_alternate_approval():
+    survivors = {
+        "bob": {
+            "id": 10,
+            "state": "APPROVED",
+            "submitted_at": reviews.parse_github_timestamp("2026-03-17T10:01:00Z"),
+            "commit_id": "head-1",
+            "user": {"login": "bob"},
+        }
+    }
+
+    result = approval_policy.compute_pr_approval_state_from_reviews(
+        survivors,
+        current_reviewer="alice",
+        current_head="head-1",
+        permission_statuses={"bob": "granted"},
+    )
+
+    assert result["ok"] is True
+    assert result["completion"] == {
+        "completed": False,
+        "current_head_sha": "head-1",
+        "qualifying_review_ids": [],
+    }
+    assert result["write_approval"] == {
+        "has_write_approval": True,
+        "write_approvers": ["bob"],
+        "current_head_sha": "head-1",
+    }
+
+
 def test_normalize_reviews_with_parsed_timestamps_is_pure():
     review_items = [
         {