fix: close retained pr264 incident gap (#559)

* fix: close retained pr264 incident gap

* 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,
     )

tests/integration/reviewer_bot/test_app_preview_overdue.py

@@ -97,6 +97,77 @@ def test_execute_run_preview_check_overdue_uses_frozen_pr264_operational_project
     }
 
 
+def test_execute_run_preview_check_overdue_backfills_claim_cycle_from_pr_creation(monkeypatch, capsys):
+    harness = AppHarness(monkeypatch)
+    harness.set_event(
+        EVENT_NAME="workflow_dispatch",
+        EVENT_ACTION="",
+        MANUAL_ACTION="preview-check-overdue",
+        ISSUE_NUMBER=264,
+        VALIDATION_NONCE="nonce-pr264-claim",
+        GITHUB_SHA="workflow-head",
+    )
+
+    state = make_state()
+    review = make_tracked_review_state(
+        state,
+        264,
+        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:77",
+        timestamp="2026-03-18T01:09:05Z",
+        actor="iglesias",
+        reviewed_head_sha="head-old",
+    )
+
+    routes = RouteGitHubApi().add_request(
+        "GET",
+        "issues/264",
+        status_code=200,
+        payload={
+            "number": 264,
+            "state": "open",
+            "pull_request": {},
+            "labels": [],
+            "created_at": "2026-02-10T17:20:07Z",
+        },
+    ).add_request(
+        "GET",
+        "pulls/264",
+        status_code=200,
+        payload={
+            **pull_request_payload(264, head_sha="head-live", author="manhatsu"),
+            "requested_reviewers": [],
+            "labels": [],
+        },
+    ).add_pull_request_reviews(
+        264,
+        [review_payload(501, state="APPROVED", submitted_at="2026-03-18T12:10:42Z", commit_id="head-live", author="plaindocs")],
+    )
+    harness.runtime.github.stub(routes)
+    harness.stub_load_state(lambda *, fail_on_unavailable=False: state)
+    harness.stub_lock(acquire=lambda: (_ for _ in ()).throw(AssertionError("preview should not acquire lock")))
+    harness.stub_pass_until(lambda current: (_ for _ in ()).throw(AssertionError("preview should skip pass-until processing")))
+    harness.stub_sync_members(lambda current: (_ for _ in ()).throw(AssertionError("preview should skip member sync")))
+    harness.stub_save_state(lambda current: (_ for _ in ()).throw(AssertionError("preview should not save state")))
+    harness.stub_sync_status_labels(lambda current, issue_numbers: (_ for _ in ()).throw(AssertionError("preview should not sync labels")))
+    harness.runtime.github.get_user_permission_status = lambda username, required_permission="push": "granted"
+
+    result = harness.run_execute()
+
+    assert result.exit_code == 0
+    payload = json.loads(capsys.readouterr().out)
+    assert payload["current_scope_key"] == "reviewer=iglesias|head=head-live|cycle=2026-02-10T17:20:07Z|anchor=none"
+    assert payload["current_scope_basis"] == "alternate_current_head_approval"
+    assert payload["suppression_reason"] == "current_head_alternate_approval_present"
+    assert payload["would_post_warning"] is False
+    assert payload["would_post_transition"] is False
+
+
 def test_preview_check_overdue_matches_real_overdue_scope_and_posting_decision(monkeypatch, capsys):
     harness = AppHarness(monkeypatch)
     harness.set_event(

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")