Skip bug issues that already have an open PR (jaredlockhart#784) (jaredlockhart#784)

Worker was starting duplicate work on bug issues that already had an
open PR. The bug fix workflow (Step 2) had no PR-awareness, unlike the
in-progress workflow (Step 3). Fix in Python-space: enrich bug issues
with open-PR detection and skip them in pick_actionable_issue.

Co-authored-by: Jared Lockhart <119884+jaredlockhart@users.noreply.github.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: 3 people

penny-team/penny_team/base.py

@@ -349,7 +349,7 @@ def run(self) -> AgentRun:
                 self.required_labels, trusted_users=self.trusted_users, api=self.github_api
             )
 
-            # Enrich in-review issues with CI and merge conflict status (no-op if none match)
+            # Enrich issues: CI/merge status for in-review, open-PR detection for bugs
             from penny_team.utils.pr_checks import enrich_issues_with_pr_status
 
             processed = self._load_processed()

penny-team/penny_team/utils/issue_filter.py

@@ -41,6 +41,7 @@ class FilteredIssue:
     ci_failure_details: str | None = None
     merge_conflict: bool = False
     merge_conflict_branch: str | None = None
+    has_open_pr: bool = False
     has_review_feedback: bool = False
     review_comments: str | None = None
 
@@ -156,6 +157,10 @@ def pick_actionable_issue(
     sorted_issues = sorted(issues, key=lambda i: TeamConstants.Label.BUG not in i.labels)
 
     for issue in sorted_issues:
+        # Bug already has an open PR — worker would duplicate work
+        if issue.has_open_pr:
+            continue
+
         # Check if external signals require attention regardless of comments
         if issue.ci_status == TeamConstants.CI_STATUS_FAILING:
             return issue

penny-team/penny_team/utils/pr_checks.py

@@ -40,17 +40,20 @@ def enrich_issues_with_pr_status(
     bot_logins: set[str] | None = None,
     processed_at: dict[str, str] | None = None,
 ) -> None:
-    """Enrich in-review issues with CI check and merge conflict status from their PRs.
+    """Enrich issues with PR status: CI checks, merge conflicts, and open-PR detection.
 
-    Mutates FilteredIssue objects in place, setting ci_status,
-    ci_failure_details, merge_conflict, and merge_conflict_branch.
+    For in-review issues: sets ci_status, ci_failure_details, merge_conflict,
+    merge_conflict_branch, has_review_feedback, and review_comments.
+    For bug issues: sets has_open_pr when a matching PR already exists,
+    so the worker skips duplicate work.
     When processed_at is provided, only review feedback newer than
     the agent's last processing time is included (prevents re-addressing
     already-handled comments).
     Fail-open: if the API fails, issues are left unchanged.
     """
     in_review = [i for i in issues if TeamConstants.Label.IN_REVIEW in i.labels]
-    if not in_review:
+    bugs = [i for i in issues if TeamConstants.Label.BUG in i.labels]
+    if not in_review and not bugs:
         return
 
     try:
@@ -59,6 +62,12 @@ def enrich_issues_with_pr_status(
         logger.warning("Failed to fetch PR statuses, skipping CI/merge detection")
         return
 
+    # Flag bug issues that already have an open PR (prevents duplicate work)
+    _flag_bugs_with_open_prs(prs, bugs)
+
+    if not in_review:
+        return
+
     pr_by_issue = _match_prs_to_issues(prs, in_review)
 
     for issue in in_review:
@@ -120,6 +129,24 @@ def enrich_issues_with_pr_status(
         issue.ci_failure_details = details
 
 
+def _flag_bugs_with_open_prs(
+    prs: list[PullRequest],
+    bugs: list[FilteredIssue],
+) -> None:
+    """Flag bug issues that already have an open PR matching their issue number."""
+    if not bugs:
+        return
+    pr_by_issue = _match_prs_to_issues(prs, bugs)
+    for issue in bugs:
+        if issue.number in pr_by_issue:
+            issue.has_open_pr = True
+            pr = pr_by_issue[issue.number]
+            logger.info(
+                f"Bug #{issue.number} already has open PR "
+                f"#{pr.number} ({pr.head_ref_name}), skipping"
+            )
+
+
 def _fetch_open_prs(
     api: GitHubAPI | None = None,
 ) -> list[PullRequest]:

penny-team/penny_team/worker/CLAUDE.md

@@ -194,7 +194,16 @@ If no merge conflicts and no unaddressed review comments, check the pre-fetched
 
 Look at the pre-fetched issues for any with the `bug` label. Bug issues are prioritized over `in-progress` features.
 
-If a `bug` issue exists, follow the **Bug Fix Workflow** below instead of the normal feature workflow.
+If a `bug` issue exists:
+- Check if a PR already exists for it:
+  ```bash
+  gh pr list --state open --json number,title,headRefName --limit 10
+  ```
+- **PR exists for this bug** → Move to `in-review` and exit:
+  ```bash
+  gh issue edit <N> --remove-label bug --add-label in-review
+  ```
+- **No PR exists** → Follow the **Bug Fix Workflow** below.
 
 #### Bug Fix Workflow
 

penny-team/tests/test_worker.py

@@ -867,6 +867,101 @@ def test_bug_issue_triggers_worker(
         assert "Search fails when query is empty" in prompt
         assert "Issue #50" in prompt
 
+    def test_bug_with_open_pr_skipped(
+        self, tmp_path, mock_github_api, capture_popen, monkeypatch
+    ):
+        """Bug issue that already has an open PR → skipped (no duplicate work).
+
+        Flow: issue #50 is labeled 'bug', PR #10 exists on branch issue-50-fix
+        → enrich_issues_with_pr_status flags has_open_pr=True
+        → pick_actionable_issue skips it → agent does not run Claude.
+        """
+        agent = make_agent(
+            tmp_path, name="worker", required_labels=["in-progress", "in-review", "bug"],
+            github_api=mock_github_api,
+        )
+        monkeypatch.setattr(type(agent), "_bot_logins", property(lambda self: BOT_LOGINS))
+
+        mock_github_api.set_issues("in-progress", [])
+        mock_github_api.set_issues("in-review", [])
+        mock_github_api.set_issues("bug", make_issue_list_items((50, "2024-01-01T00:00:00Z")))
+        mock_github_api.set_issues_detailed("in-progress", [])
+        mock_github_api.set_issues_detailed("in-review", [])
+        mock_github_api.set_issues_detailed("bug", [
+            make_issue_detail(
+                number=50,
+                title="Search fails when query is empty",
+                body="When a user sends an empty search query, the app crashes.",
+                labels=["bug"],
+                comments=[],
+            ),
+        ])
+        mock_github_api.set_prs([
+            make_pull_request(10, "issue-50-fix-empty-search"),
+        ])
+
+        calls = capture_popen(stdout_lines=[result_event()], returncode=0)
+
+        result = agent.run()
+
+        assert result.success is True
+        assert result.output == "No actionable issues"
+        assert len(calls) == 0
+
+    def test_bug_with_open_pr_falls_through_to_feature(
+        self, tmp_path, mock_github_api, capture_popen, monkeypatch
+    ):
+        """Bug has open PR, but in-progress feature exists → works on feature.
+
+        Flow: bug #50 has open PR → skipped, but feature #43 is actionable
+        → Worker works on the feature instead of doing nothing.
+        """
+        agent = make_agent(
+            tmp_path, name="worker", required_labels=["in-progress", "in-review", "bug"],
+            github_api=mock_github_api,
+        )
+        monkeypatch.setattr(type(agent), "_bot_logins", property(lambda self: BOT_LOGINS))
+
+        mock_github_api.set_issues("in-progress", make_issue_list_items((43, "2024-01-01T00:00:00Z")))
+        mock_github_api.set_issues("in-review", [])
+        mock_github_api.set_issues("bug", make_issue_list_items((50, "2024-01-01T00:00:00Z")))
+        mock_github_api.set_issues_detailed("in-progress", [
+            make_issue_detail(
+                number=43,
+                title="Add user profiles",
+                labels=["in-progress"],
+                comments=[
+                    {
+                        "author": {"login": "alice"},
+                        "body": "Go ahead and implement this.",
+                        "createdAt": "2024-01-07T00:00:00Z",
+                    },
+                ],
+            ),
+        ])
+        mock_github_api.set_issues_detailed("in-review", [])
+        mock_github_api.set_issues_detailed("bug", [
+            make_issue_detail(
+                number=50,
+                title="Search fails when query is empty",
+                body="Crash on empty query",
+                labels=["bug"],
+                comments=[],
+            ),
+        ])
+        mock_github_api.set_prs([
+            make_pull_request(10, "issue-50-fix-empty-search"),
+        ])
+
+        calls = capture_popen(stdout_lines=[result_event()], returncode=0)
+
+        result = agent.run()
+
+        assert result.success is True
+        prompt = extract_prompt(calls)
+        assert "Add user profiles" in prompt
+        assert "Issue #43" in prompt
+
     def test_bug_prioritized_over_in_progress(
         self, tmp_path, mock_github_api, capture_popen, monkeypatch
     ):