fix(reviewer-bot): close reminder authority and completion gaps

Prevent stale reviewer authority, duplicate reminder spam, and missing issue-review completion handling from diverging across reminders, lifecycle events, and operator-visible projection.

Author: PLeVasseur

.github/workflows/reviewer-bot-issues.yml

@@ -2,7 +2,7 @@ name: Reviewer Bot Issues
 
 on:
   issues:
-    types: [opened, labeled, edited, closed]
+    types: [opened, edited, labeled, unlabeled, assigned, unassigned, reopened, closed]
 
 permissions:
   contents: read
@@ -50,6 +50,8 @@ jobs:
           EVENT_NAME: issues
           EVENT_ACTION: ${{ github.event.action }}
           ISSUE_NUMBER: ${{ github.event.issue.number }}
+          IS_PULL_REQUEST: 'false'
+          ISSUE_STATE: ${{ github.event.issue.state }}
           ISSUE_TITLE: ${{ github.event.issue.title }}
           ISSUE_BODY: ${{ github.event.issue.body }}
           ISSUE_UPDATED_AT: ${{ github.event.issue.updated_at }}

REVIEWING.md

@@ -6,7 +6,7 @@ If you are contributing a guideline, start with [CONTRIBUTING.md](CONTRIBUTING.m
 ## Reviewer Bot Commands
 
 > [!NOTE]
-> These commands only apply in the context of coding guideline issues.
+> These commands apply to tracked reviewer-bot issue reviews. Some commands remain specific to coding-guideline or FLS-audit issues.
 
 Before we continue, here's a preamble on how the reviewer bot helps reviewers do their job.
 
@@ -98,6 +98,23 @@ What it does (for the current PR only):
 @guidelines-bot /rectify
 ```
 
+### Mark a Tracked Issue Review Complete
+
+```
+@guidelines-bot /done
+```
+
+Use this to mark a tracked non-PR issue review complete when the review work is finished.
+
+- Available on generic tracked issues and FLS audit issues
+- Not available on pull requests
+- Not available on coding guideline issues, which still use `sign-off: create pr`
+
+**Example:**
+```
+@guidelines-bot /done
+```
+
 ### Assign a Specific Reviewer
 
 ```

scripts/reviewer_bot_core/comment_command_policy.py

@@ -11,6 +11,7 @@
 class OrdinaryCommandId(StrEnum):
     PASS = "pass"
     AWAY = "away"
+    DONE = "done"
     LABEL = "label"
     SYNC_MEMBERS = "sync-members"
     QUEUE = "queue"
@@ -102,6 +103,14 @@ def decide_comment_command(bot, request, classified, *, actor_class: str, comman
             success=False,
             react=True,
         )
+    if command == OrdinaryCommandId.DONE.value:
+        return ExecuteOrdinaryCommandDecision(
+            command_id=OrdinaryCommandId.DONE,
+            issue_number=issue_number,
+            actor=comment_author,
+            raw_args=args,
+            needs_assignment_request=True,
+        )
     if command == OrdinaryCommandId.LABEL.value:
         return ExecuteOrdinaryCommandDecision(
             command_id=OrdinaryCommandId.LABEL,

scripts/reviewer_bot_core/review_state_machine.py

@@ -193,6 +193,21 @@ def set_current_reviewer(
     _reset_cycle_state(review_data)
 
 
+def clear_current_reviewer(state: dict, issue_number: int) -> bool:
+    review_data = ensure_review_entry(state, issue_number)
+    if review_data is None:
+        return False
+    changed = False
+    if review_data.get("current_reviewer") is not None:
+        review_data["current_reviewer"] = None
+        changed = True
+    if review_data.get("assignment_method") is not None:
+        review_data["assignment_method"] = None
+        changed = True
+    clear_transition_timers(review_data)
+    return changed
+
+
 def update_reviewer_activity(state: dict, issue_number: int, reviewer: str, *, now: str) -> bool:
     review_data = ensure_review_entry(state, issue_number)
     if review_data is None:

scripts/reviewer_bot_core/reviewer_response_policy.py

@@ -55,6 +55,17 @@ def _initial_reviewer_anchor(review_data: dict) -> str | None:
     return None
 
 
+def _record_for_current_reviewer(record: dict | None | object, current_reviewer: str) -> dict | None:
+    if not isinstance(record, dict):
+        return None
+    actor = record.get("actor")
+    if not isinstance(actor, str) or not actor.strip():
+        return record
+    if actor.lower() != current_reviewer.lower():
+        return None
+    return record
+
+
 def _contributor_revision_handoff_record(review_data: dict, current_head: str | None, reviewer_review: dict | None) -> dict | None:
     contributor_revision = review_data.get("contributor_revision", {}).get("accepted")
     if not isinstance(contributor_revision, dict):
@@ -93,33 +104,69 @@ def derive_reviewer_response_state(
         contributor_comment = review_data.get("contributor_comment", {}).get("accepted")
 
     if not issue_is_pull_request:
-        if not reviewer_comment and not reviewer_review:
+        reviewer_comment = _record_for_current_reviewer(reviewer_comment, current_reviewer)
+        reviewer_review = _record_for_current_reviewer(reviewer_review, current_reviewer)
+        latest_reviewer_response = reviewer_comment
+        if reviewer_review_helpers.compare_records(
+            reviewer_review,
+            latest_reviewer_response,
+            parse_timestamp=live_review_support.parse_github_timestamp,
+        ) > 0:
+            latest_reviewer_response = reviewer_review
+        completion = review_data.get("current_cycle_completion")
+        if isinstance(completion, dict) and completion.get("completed"):
+            return {
+                "state": "done",
+                "reason": None,
+                "anchor_timestamp": latest_reviewer_response.get("timestamp") if isinstance(latest_reviewer_response, dict) else None,
+                "reviewer_comment": reviewer_comment,
+                "reviewer_review": reviewer_review,
+                "contributor_comment": contributor_comment,
+                "contributor_handoff": contributor_comment,
+            }
+        if review_data.get("review_completed_at"):
+            return {
+                "state": "done",
+                "reason": None,
+                "anchor_timestamp": latest_reviewer_response.get("timestamp") if isinstance(latest_reviewer_response, dict) else None,
+                "reviewer_comment": reviewer_comment,
+                "reviewer_review": reviewer_review,
+                "contributor_comment": contributor_comment,
+                "contributor_handoff": contributor_comment,
+            }
+        if not latest_reviewer_response:
             return {
                 "state": "awaiting_reviewer_response",
                 "reason": "no_reviewer_activity",
                 "anchor_timestamp": _initial_reviewer_anchor(review_data),
                 "reviewer_comment": reviewer_comment,
                 "reviewer_review": reviewer_review,
                 "contributor_comment": contributor_comment,
-                "contributor_handoff": None,
+                "contributor_handoff": contributor_comment,
             }
-        latest_reviewer_response = reviewer_comment
-        if reviewer_review_helpers.compare_records(
-            reviewer_review,
+        if _compare_cross_channel_conversation(
+            contributor_comment,
             latest_reviewer_response,
             parse_timestamp=live_review_support.parse_github_timestamp,
         ) > 0:
-            latest_reviewer_response = reviewer_review
-        completion = review_data.get("current_cycle_completion")
-        if not isinstance(completion, dict) or not completion.get("completed"):
-            if review_data.get("review_completed_at"):
-                return {"state": "done", "reason": None}
             return {
-                "state": "awaiting_contributor_response",
-                "reason": "completion_missing",
-                "anchor_timestamp": latest_reviewer_response.get("timestamp") if isinstance(latest_reviewer_response, dict) else None,
+                "state": "awaiting_reviewer_response",
+                "reason": "contributor_comment_newer",
+                "anchor_timestamp": contributor_comment.get("timestamp") if isinstance(contributor_comment, dict) else None,
+                "reviewer_comment": reviewer_comment,
+                "reviewer_review": reviewer_review,
+                "contributor_comment": contributor_comment,
+                "contributor_handoff": contributor_comment,
             }
-        return {"state": "done", "reason": None}
+        return {
+            "state": "awaiting_contributor_response",
+            "reason": "completion_missing",
+            "anchor_timestamp": latest_reviewer_response.get("timestamp") if isinstance(latest_reviewer_response, dict) else None,
+            "reviewer_comment": reviewer_comment,
+            "reviewer_review": reviewer_review,
+            "contributor_comment": contributor_comment,
+            "contributor_handoff": contributor_comment,
+        }
 
     if not isinstance(current_head, str) or not current_head.strip():
         return {"state": "projection_failed", "reason": "pull_request_head_unavailable"}

scripts/reviewer_bot_lib/app.py

@@ -51,7 +51,17 @@ def _classify_event_intent_from_context(bot: AppEventContextRuntime, context: Ev
     event_action = context.event_action
 
     if event_name in {"issues", "pull_request_target"}:
-        if event_action in {"opened", "labeled", "edited", "closed", "synchronize"}:
+        if event_action in {
+            "opened",
+            "edited",
+            "labeled",
+            "unlabeled",
+            "assigned",
+            "unassigned",
+            "reopened",
+            "closed",
+            "synchronize",
+        }:
             return bot.EVENT_INTENT_MUTATING
         return bot.EVENT_INTENT_NON_MUTATING_READONLY
 
@@ -174,10 +184,18 @@ def execute_run(bot: AppExecutionRuntime, context: EventContext) -> ExecutionRes
         if event_name == "issues":
             if event_action == "opened":
                 state_changed = bot.handlers.handle_issue_or_pr_opened(state)
+            elif event_action == "assigned":
+                state_changed = bot.handlers.handle_assigned_event(state)
+            elif event_action == "unassigned":
+                state_changed = bot.handlers.handle_unassigned_event(state)
             elif event_action == "labeled":
                 state_changed = bot.handlers.handle_labeled_event(state)
+            elif event_action == "unlabeled":
+                state_changed = bot.handlers.handle_unlabeled_event(state)
             elif event_action == "edited":
                 state_changed = bot.handlers.handle_issue_edited_event(state)
+            elif event_action == "reopened":
+                state_changed = bot.handlers.handle_reopened_event(state)
             elif event_action == "closed":
                 state_changed = bot.handlers.handle_closed_event(state)