fix: correct pr264 follow-up scope fallback

Author: PLeVasseur

scripts/reviewer_bot_core/reviewer_response_policy.py

@@ -63,6 +63,19 @@ def _initial_cycle_boundary(review_data: dict) -> tuple[str | None, str | None]:
     return None, None
 
 
+def _alternate_current_head_cycle_boundary(review_data: dict, issue_snapshot: dict | None) -> str | None:
+    if not isinstance(issue_snapshot, dict) or not isinstance(issue_snapshot.get("pull_request"), dict):
+        return None
+    if review_data.get("assignment_method") != "claim":
+        return None
+    for field in ("active_cycle_started_at", "cycle_started_at"):
+        value = review_data.get(field)
+        if isinstance(value, str) and value:
+            return None
+    created_at = issue_snapshot.get("created_at")
+    return created_at if isinstance(created_at, str) and created_at else None
+
+
 def _scope_basis_and_anchor(review_data: dict, contributor_handoff: dict | None) -> tuple[str | None, str | None]:
     if isinstance(contributor_handoff, dict):
         semantic_key = str(contributor_handoff.get("semantic_key", ""))
@@ -97,8 +110,11 @@ def _current_scope_fields(
     contributor_handoff: dict | None,
     *,
     alternate_current_head_approval: bool = False,
+    alternate_current_head_cycle_boundary: str | None = None,
 ) -> dict[str, object]:
     _, cycle_boundary = _initial_cycle_boundary(review_data)
+    if alternate_current_head_approval and alternate_current_head_cycle_boundary:
+        cycle_boundary = alternate_current_head_cycle_boundary
     if alternate_current_head_approval:
         anchor_timestamp = None
         basis = "alternate_current_head_approval"
@@ -202,6 +218,7 @@ def derive_reviewer_response_state(
     approval_result: dict[str, object] | None = None,
     current_head_approval_authors: tuple[str, ...] | None = None,
     stored_reviewer_review: dict | None | object = _UNSET,
+    alternate_current_head_cycle_boundary: str | None = None,
 ) -> dict[str, object]:
     current_reviewer = review_data.get("current_reviewer")
     if not isinstance(current_reviewer, str) or not current_reviewer.strip():
@@ -379,6 +396,7 @@ def derive_reviewer_response_state(
                 current_head,
                 contributor_handoff,
                 alternate_current_head_approval=True,
+                alternate_current_head_cycle_boundary=alternate_current_head_cycle_boundary,
             ),
             anchor_timestamp=latest_reviewer_response.get("timestamp") if isinstance(latest_reviewer_response, dict) else None,
             current_head_sha=current_head,
@@ -573,6 +591,7 @@ def compute_reviewer_response_state(
         reviews,
         parse_timestamp=bot.parse_iso8601_timestamp,
     )
+    alternate_current_head_cycle_boundary = _alternate_current_head_cycle_boundary(review_data, issue_snapshot)
 
     return derive_reviewer_response_state(
         review_data,
@@ -585,4 +604,5 @@ def compute_reviewer_response_state(
         approval_result=approval_result,
         current_head_approval_authors=approval_authors,
         stored_reviewer_review=stored_reviewer_review,
+        alternate_current_head_cycle_boundary=alternate_current_head_cycle_boundary,
     )

scripts/reviewer_bot_lib/overdue.py

@@ -210,32 +210,13 @@ def _transport_result(bot, *, failure_kind: str | None, status_code: int | None
     )
 
 
-def _normalize_review_data_scope_cycle(review_data: dict, issue_snapshot: dict | None) -> dict:
-    if not isinstance(review_data, dict):
-        return {}
-    if not isinstance(issue_snapshot, dict) or not isinstance(issue_snapshot.get("pull_request"), dict):
-        return review_data
-    if not isinstance(review_data.get("current_reviewer"), str) or not review_data.get("current_reviewer"):
-        return review_data
-    if any(isinstance(review_data.get(field), str) and review_data.get(field) for field in ("active_cycle_started_at", "cycle_started_at")):
-        return review_data
-    if review_data.get("assignment_method") != "claim":
-        return review_data
-    created_at = issue_snapshot.get("created_at")
-    if not isinstance(created_at, str) or not created_at:
-        return review_data
-    # Claim-era PR rows can miss explicit cycle timestamps; use PR creation to keep same-scope dedupe stable.
-    return {**review_data, "active_cycle_started_at": created_at}
-
-
 def evaluate_overdue_review_preview(bot, state: dict, issue_number: int) -> dict[str, object]:
     active_reviews = state.get("active_reviews") if isinstance(state, dict) else None
     review_data = active_reviews.get(str(issue_number)) if isinstance(active_reviews, dict) else None
     if not isinstance(review_data, dict):
         review_data = {}
     issue_snapshot_result = bot.github.get_issue_or_pr_snapshot_result(issue_number)
     issue_snapshot = issue_snapshot_result.payload if issue_snapshot_result.ok and isinstance(issue_snapshot_result.payload, dict) else None
-    normalized_review_data = _normalize_review_data_scope_cycle(review_data, issue_snapshot)
     is_pull_request = isinstance((issue_snapshot or {}).get("pull_request"), dict)
     authority = assignment_flow.resolve_reviewer_authority(
         bot,
@@ -245,7 +226,7 @@ def evaluate_overdue_review_preview(bot, state: dict, issue_number: int) -> dict
     )
     response_state = bot.adapters.review_state.compute_reviewer_response_state(
         issue_number,
-        normalized_review_data,
+        review_data,
         issue_snapshot=issue_snapshot,
     )
     response_name = str(response_state.get("response_state") or response_state.get("state") or "projection_failed")
@@ -351,7 +332,6 @@ def check_overdue_reviews(bot, state: dict) -> list[dict]:
         _clear_transport_failure(bot, review_data, issue_number, phase="issue_snapshot_read")
         if str(issue_snapshot.get("state", "")).lower() == "closed":
             continue
-        normalized_review_data = _normalize_review_data_scope_cycle(review_data, issue_snapshot)
         authority = assignment_flow.resolve_reviewer_authority(
             bot,
             issue_number,
@@ -386,7 +366,7 @@ def check_overdue_reviews(bot, state: dict) -> list[dict]:
         _clear_transport_failure(bot, review_data, issue_number, phase="assignment_confirm_read")
         response_state = bot.adapters.review_state.compute_reviewer_response_state(
             issue_number,
-            normalized_review_data,
+            review_data,
             issue_snapshot=issue_snapshot,
         )
         response_name = str(response_state.get("response_state") or response_state.get("state") or "")

tests/unit/reviewer_bot/test_overdue.py

@@ -375,56 +375,6 @@ def test_check_overdue_reviews_uses_contributor_comment_timestamp_when_turn_retu
     assert overdue[0]["days_overdue"] == 0
 
 
-def test_check_overdue_reviews_backfills_claim_cycle_from_pr_creation(monkeypatch):
-    runtime = FakeReviewerBotRuntime(monkeypatch)
-    now = runtime.datetime.now(runtime.timezone.utc)
-    created_at = iso_z(now - timedelta(days=runtime.REVIEW_DEADLINE_DAYS + 20))
-    assigned_at = iso_z(now - timedelta(days=runtime.REVIEW_DEADLINE_DAYS + 1))
-    state = make_state()
-    review = make_tracked_review_state(state, 42, reviewer="alice", assigned_at=assigned_at)
-    review["assignment_method"] = "claim"
-    routes = RouteGitHubApi().add_pull_request_snapshot(42, pull_request_payload(42, head_sha="head-1")).add_pull_request_reviews(42, [])
-    runtime = _runtime(monkeypatch, routes)
-    runtime.github.get_issue_or_pr_snapshot_result = lambda issue_number: runtime.GitHubApiResult(
-        200,
-        {**issue_snapshot(issue_number, state="open", is_pull_request=True), "created_at": created_at},
-        {},
-        "ok",
-        True,
-        None,
-        0,
-        None,
-    )
-    runtime.github.get_issue_assignees_result = lambda issue_number, is_pull_request=None: runtime.GitHubApiResult(
-        200,
-        ["alice"],
-        {},
-        "ok",
-        True,
-        None,
-        0,
-        None,
-    )
-    monkeypatch.setattr(approval_policy, "compute_pr_approval_state_result", _approval_incomplete_result)
-
-    overdue = maintenance.check_overdue_reviews(runtime, state)
-
-    assert overdue == [
-        {
-            "issue_number": 42,
-            "reviewer": "alice",
-            "days_overdue": 1,
-            "days_since_warning": 0,
-            "needs_warning": True,
-            "needs_transition": False,
-            "anchor_reason": "no_reviewer_activity",
-            "anchor_timestamp": created_at,
-            "current_scope_key": f"reviewer=alice|head=head-1|cycle={created_at}|anchor={created_at}",
-            "current_scope_basis": "active_cycle_started_at",
-        }
-    ]
-
-
 def test_check_overdue_reviews_uses_contributor_revision_timestamp_when_head_changes_after_review(monkeypatch):
     runtime = FakeReviewerBotRuntime(monkeypatch)
     now = runtime.datetime.now(runtime.timezone.utc)

tests/unit/reviewer_bot/test_reviews_live_fetch.py

@@ -241,6 +241,41 @@ 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_uses_issue_created_at_for_claim_alternate_approval_scope(monkeypatch):
+    state = make_state()
+    review = make_tracked_review_state(
+        state,
+        42,
+        reviewer="iglesias",
+        assigned_at="2026-02-26T04:58:03.401345+00:00",
+    )
+    review["assignment_method"] = "claim"
+    accept_reviewer_review(
+        review,
+        semantic_key="pull_request_review:99",
+        timestamp="2026-03-18T01:09:05Z",
+        actor="iglesias",
+        reviewed_head_sha="head-old",
+        source_precedence=1,
+    )
+    routes = RouteGitHubApi().add_pull_request_snapshot(42, pull_request_payload(42, head_sha="head-live")).add_pull_request_reviews(
+        42,
+        [review_payload(10, state="APPROVED", submitted_at="2026-03-18T12:10:42Z", commit_id="head-live", author="plaindocs")],
+    )
+    runtime = _runtime(monkeypatch, routes)
+    runtime.github.get_issue_or_pr_snapshot = lambda issue_number: {
+        **issue_snapshot(issue_number, state="open", is_pull_request=True),
+        "created_at": "2026-02-10T17:20:07Z",
+    }
+
+    response_state = reviews.compute_reviewer_response_state(runtime, 42, review)
+
+    assert response_state["state"] == "awaiting_contributor_response"
+    assert response_state["reason"] == "current_head_alternate_approval_present"
+    assert response_state["current_scope_basis"] == "alternate_current_head_approval"
+    assert response_state["current_scope_key"] == "reviewer=iglesias|head=head-live|cycle=2026-02-10T17:20:07Z|anchor=none"
+
+
 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")