[fix] Address review feedback on stale-PR bot fix

Author: Eeshu-Yadav

.github/actions/bot-autoassign/stale_pr_bot.py

@@ -296,10 +296,9 @@ def mark_pr_stale(self, pr, days_inactive):
                 ),
                 "",
                 (
-                    "As a result, **the linked issue(s)"
-                    " have been unassigned** from you"
-                    " to allow other contributors"
-                    " to work on it."
+                    "As a result, **any linked issues are being"
+                    " unassigned** from you so other contributors"
+                    " can pick them up."
                 ),
                 "",
                 (
@@ -325,7 +324,7 @@ def mark_pr_stale(self, pr, days_inactive):
             except Exception as e:
                 print(f"Could not add stale label: {e}")
             print(
-                f"Marked PR #{pr.number} as stale after {days_inactive} days,"
+                f"Marked PR #{pr.number} stale at {days_inactive} days,"
                 f" unassigned {unassigned_count} issues"
             )
             return True
@@ -398,6 +397,9 @@ def process_stale_prs(self):
                         pr, all_reviews
                     )
                     if not last_changes_requested:
+                        # No active block — unwind any prior stale state.
+                        if self._clear_stale_label(pr):
+                            self._reassign_unassigned_linked_issues(pr)
                         continue
                     issue_comments = list(pr.get_issue_comments())
                     review_comments = list(pr.get_review_comments())
@@ -411,8 +413,7 @@ def process_stale_prs(self):
                         review_comments,
                     )
                     print(
-                        f"PR #{pr.number}: {days_inactive} days since"
-                        " contributor activity"
+                        f"PR #{pr.number}: {days_inactive} days since contributor activity"
                     )
                     if self.is_waiting_for_maintainer(
                         pr,
@@ -427,8 +428,7 @@ def process_stale_prs(self):
                         if self._clear_stale_label(pr):
                             self._reassign_unassigned_linked_issues(pr)
                         print(
-                            f"PR #{pr.number}: waiting for maintainer review,"
-                            " skipping"
+                            f"PR #{pr.number}: waiting for maintainer review, skipping"
                         )
                         continue
                     stages = (

.github/actions/bot-autoassign/tests/test_stale_pr_bot.py

@@ -749,6 +749,37 @@ def test_clears_stale_label_when_contributor_responds(self, mock_datetime, bot_e
         mock_issue.add_to_assignees.assert_called_once_with("contributor")
         mock_pr.create_issue_comment.assert_not_called()
 
+    @patch("stale_pr_bot.datetime")
+    def test_clears_stale_label_when_no_active_block(self, mock_datetime, bot_env):
+        mock_datetime.now.return_value = datetime(2024, 2, 1, tzinfo=timezone.utc)
+        mock_datetime.side_effect = lambda *a, **kw: datetime(*a, **kw)
+        bot = StalePRBot()
+        mock_pr = Mock()
+        mock_pr.body = "Fixes #42"
+        mock_pr.number = 1
+        mock_pr.user.login = "contributor"
+        # Reviewer approved after their CR → no active CHANGES_REQUESTED.
+        approve = Mock()
+        approve.state = "APPROVED"
+        approve.submitted_at = datetime(2024, 1, 20, tzinfo=timezone.utc)
+        approve.user.login = "maintainer"
+        approve.user.type = "User"
+        mock_pr.get_reviews.return_value = [approve]
+        stale_label = Mock()
+        stale_label.name = "stale"
+        mock_pr.get_labels.return_value = [stale_label]
+        mock_issue = Mock()
+        mock_issue.number = 42
+        mock_issue.pull_request = None
+        mock_issue.assignees = []
+        mock_issue.repository.full_name = "openwisp/openwisp-utils"
+        bot_env["repo"].get_issue.return_value = mock_issue
+        bot_env["repo"].get_pulls.return_value = [mock_pr]
+        bot.process_stale_prs()
+        mock_pr.remove_from_labels.assert_called_once_with("stale")
+        mock_issue.add_to_assignees.assert_called_once_with("contributor")
+        mock_pr.create_issue_comment.assert_not_called()
+
 
 class TestRun:
     def test_no_github_client(self, bot_env):

docs/developer/reusable-github-utils.rst

@@ -96,8 +96,9 @@ The Stale PR job runs daily. For each open PR:
 
    - **7–13 days:** posts a stale-warning comment.
    - **≥ 14 days:** adds the ``stale`` label and unassigns the contributor
-     from linked issues. An author comment on the PR clears the label and
-     reassigns the issues; a push alone only resets the inactivity timer.
+     from linked issues. Any subsequent author activity (push or comment)
+     unwinds the label and reassigns linked issues on the next daily run;
+     an author comment also triggers the immediate recovery bot.
    - **≥ 60 days:** posts a final follow-up comment asking whether the
      contributor is still working on it. The PR is not auto-closed;
      maintainers may close manually if needed.