claude-dev-env 1.82.0 → 1.84.0

package/skills/log-audit/scripts/test_mine_copilot_findings.py

@@ -0,0 +1,126 @@
+"""Tests for mine_copilot_findings — defect classification and clustering."""
+
+import sys
+from pathlib import Path
+
+_script_directory = str(Path(__file__).resolve().parent)
+if _script_directory not in sys.path:
+    sys.path.insert(0, _script_directory)
+
+from mine_copilot_findings import (  # noqa: E402
+    ReviewerComment,
+    _flatten_pages,
+    _pull_number_from_url,
+    _reviewer_comment_from_payload,
+    classify_defect,
+    cluster_defects,
+    proposal_for_defect_class,
+)
+from log_audit_constants.mine_copilot_findings_constants import (  # noqa: E402
+    PROPOSAL_BY_DEFECT_CLASS,
+)
+
+
+class TestClassifyDefect:
+    def test_recognizes_a_missing_type_hint_comment(self) -> None:
+        assert (
+            classify_defect("This function is missing a type hint on the return")
+            == "missing-type-hint"
+        )
+
+    def test_recognizes_a_broad_except_comment(self) -> None:
+        assert classify_defect("There is a broad except swallowing errors") == (
+            "broad-except"
+        )
+
+    def test_recognizes_a_magic_value_comment(self) -> None:
+        assert classify_defect("42 is a magic number, extract it") == "magic-value"
+
+    def test_returns_none_for_praise(self) -> None:
+        assert classify_defect("Looks great, nicely done!") is None
+
+
+class TestClusterDefects:
+    def test_groups_comments_by_class_and_ranks_by_count(self) -> None:
+        comments = [
+            ReviewerComment(1, "cursor[bot]", "missing type hint here"),
+            ReviewerComment(2, "cursor[bot]", "another missing annotation"),
+            ReviewerComment(3, "cursor[bot]", "this is a broad except"),
+            ReviewerComment(4, "cursor[bot]", "nice work"),
+        ]
+        clusters = cluster_defects(comments)
+        assert clusters[0].defect_class == "missing-type-hint"
+        assert clusters[0].count == 2
+        assert len(clusters) == 2
+
+    def test_caps_the_number_of_example_bodies(self) -> None:
+        comments = [
+            ReviewerComment(
+                each_index, "cursor[bot]", f"missing type hint number {each_index}"
+            )
+            for each_index in range(10)
+        ]
+        clusters = cluster_defects(comments)
+        assert clusters[0].count == 10
+        assert len(clusters[0].example_bodies) == 3
+
+
+class TestProposalForDefectClass:
+    def test_maps_a_class_to_its_skill_edit_proposal(self) -> None:
+        proposal = proposal_for_defect_class("broad-except")
+        assert proposal.defect_class == "broad-except"
+        assert proposal.proposal == PROPOSAL_BY_DEFECT_CLASS["broad-except"]
+
+
+class TestPullNumberFromUrl:
+    def test_reads_the_trailing_pull_number(self) -> None:
+        url = "https://api.github.com/repos/owner/name/pulls/867"
+        assert _pull_number_from_url(url) == 867
+
+    def test_returns_none_when_the_last_segment_is_not_a_number(self) -> None:
+        assert _pull_number_from_url("https://api.github.com/repos/owner/name") is None
+
+
+class TestReviewerCommentFromPayload:
+    def test_builds_a_comment_from_a_reviewer_bot_payload(self) -> None:
+        payload = {
+            "user": {"login": "cursor[bot]"},
+            "body": "missing type hint",
+            "pull_request_url": "https://api.github.com/repos/owner/name/pulls/12",
+        }
+        parsed_comment = _reviewer_comment_from_payload(payload)
+        assert parsed_comment == ReviewerComment(
+            pull_number=12, author="cursor[bot]", body="missing type hint"
+        )
+
+    def test_skips_a_comment_from_a_non_reviewer_login(self) -> None:
+        payload = {
+            "user": {"login": "some-human"},
+            "body": "looks good",
+            "pull_request_url": "https://api.github.com/repos/owner/name/pulls/12",
+        }
+        assert _reviewer_comment_from_payload(payload) is None
+
+    def test_skips_a_payload_that_is_not_a_dict(self) -> None:
+        assert _reviewer_comment_from_payload("not a payload") is None
+
+    def test_skips_a_payload_missing_the_pull_request_url(self) -> None:
+        payload = {"user": {"login": "cursor[bot]"}, "body": "missing type hint"}
+        assert _reviewer_comment_from_payload(payload) is None
+
+    def test_skips_a_payload_whose_url_has_no_numeric_pull_number(self) -> None:
+        payload = {
+            "user": {"login": "cursor[bot]"},
+            "body": "missing type hint",
+            "pull_request_url": "https://api.github.com/repos/owner/name/pulls",
+        }
+        assert _reviewer_comment_from_payload(payload) is None
+
+
+class TestFlattenPages:
+    def test_flattens_multiple_pages_into_one_list(self) -> None:
+        slurped_payload = [[{"id": 1}, {"id": 2}], [{"id": 3}]]
+        assert _flatten_pages(slurped_payload) == [{"id": 1}, {"id": 2}, {"id": 3}]
+
+    def test_returns_empty_list_for_a_non_list_payload(self) -> None:
+        assert _flatten_pages({"message": "not a list"}) == []

package/skills/monitor-open-prs/SKILL.md

@@ -27,7 +27,7 @@ description: >-
 
 Refusals — first match wins; respond with the quoted line exactly and stop:
 
-- **Disabled via environment.** When `CLAUDE_REVIEWS_DISABLED` (comma-separated, case-insensitive, whitespace-tolerant) contains the token `bugteam`: `/monitor-open-prs is a /bugteam dispatcher and /bugteam is disabled via CLAUDE_REVIEWS_DISABLED.`
+- **Disabled via environment.** When `CLAUDE_REVIEWS_DISABLED` (comma-separated, case-insensitive, whitespace-tolerant) has the token `bugteam`: `/monitor-open-prs is a /bugteam dispatcher and /bugteam is disabled via CLAUDE_REVIEWS_DISABLED.` Gate semantics live in the `reviewer-gates` skill ([../reviewer-gates/SKILL.md](../reviewer-gates/SKILL.md)).
 - **GitHub API not accessible.** `get_me failed. /monitor-open-prs needs active GitHub MCP credentials.`
 - **Dirty tree on the caller's repo.** `Uncommitted changes detected. Stash, commit, or revert before /monitor-open-prs.`
 - **Required subagents missing.** Confirm `code-quality-agent` and `clean-coder` exist. Else: `Required subagent type <name> not installed.`
@@ -41,7 +41,7 @@ Call `scripts/discover_open_prs.discover_open_prs(all_owners=["jl-cmd", "JonEcho
 For each discovered PR:
 
 1. Resolve the PR's repo checkout (existing worktree or fresh `git clone`).
-2. From that checkout, invoke `/bugteam --bugbot-retrigger <pr_number>`. When `CLAUDE_REVIEWS_DISABLED` (comma-separated, case-insensitive, whitespace-tolerant) contains the token `bugbot`, omit `--bugbot-retrigger` from the dispatched command so the bugbot leg sits out the run.
+2. From that checkout, invoke `/bugteam --bugbot-retrigger <pr_number>`. When `python "$HOME/.claude/_shared/pr-loop/scripts/reviews_disabled.py" --reviewer bugbot` exits 0 (bugbot disabled), omit `--bugbot-retrigger` from the dispatched command so the bugbot leg sits out the run.
 3. The `--bugbot-retrigger` flag tells bugteam to post `bugbot run` as an issue comment after every successful FIX push so Cursor's bugbot re-evaluates the new commit.
 4. Bugteam runs its own 20-loop audit/fix cycle per PR; this skill waits for each bugteam invocation to return before dispatching the next (or fanning out — see below).
 

package/skills/post-audit-findings/SKILL.md

@@ -0,0 +1,84 @@
+---
+name: post-audit-findings
+description: >-
+  Publishes an audit pass as one GitHub PR review via the shared
+  post_audit_thread.py: maps audit findings to the {path, line, side,
+  severity, description, fix_summary} JSON shape (splitting failure_mode at
+  the literal `Fix:` heading), partitions anchored vs unanchored findings so
+  one bad anchor cannot reject the whole POST, handles the self-PR reviewer
+  toggle via BUGTEAM_REVIEWER_ACCOUNT, and harvests finding comment ids and
+  PRRT thread node ids for the fix loop. Invoked by audit skills (bugteam,
+  qbug, findbugs) after each audit pass, CLEAN or DIRTY; not for ad-hoc PR
+  comments or review replies.
+---
+
+# Post Audit Findings
+
+**Core principle:** every audit pass — CLEAN or DIRTY — lands on the PR as exactly one review, so the unresolved-thread gate sees the pass and each finding becomes its own resolvable thread.
+
+## How callers invoke this
+
+- **Skill-capable contexts** (a lead session with the `Skill` tool): `Skill({skill: "post-audit-findings", args: "--skill <caller> --owner <O> --repo <R> --pr-number <N> --commit <head_sha> --state <CLEAN|DIRTY> --findings-json <path>"})`.
+- **Fallback** (a subagent or teammate without the `Skill` tool): the caller's spawn prompt says "Read `~/.claude/skills/post-audit-findings/SKILL.md` and apply it with the parameters below."
+
+`--skill <caller>` is required — the posted review names the audit skill that produced it. Capture `<head_sha>` once, at the start of the posting step, via `git rev-parse HEAD` in the worktree the diff was scoped against.
+
+## Findings-JSON mapping
+
+The findings file's root is a list of objects shaped `{path, line, side, severity, description, fix_summary}`. Map each audit finding:
+
+- Finding `file` → `path`.
+- The `failure_mode` field carries both the failure narrative AND the `Fix:` / `Validation:` text (per [`agents/code-quality-agent.md`](../../agents/code-quality-agent.md), "The `failure_mode` field is the audit-to-fix handoff"). Split it at the literal `Fix:` heading: the prefix becomes `description`; the suffix starting at `Fix:` (including the trailing `Validation:` clause) becomes `fix_summary`. When a finding omits the `Fix:` heading, write the full `failure_mode` text to BOTH fields so the script's `INLINE_COMMENT_BODY_TEMPLATE` still renders coherently.
+- Set `side="RIGHT"` for every entry.
+- On CLEAN, the file holds an empty array (`[]`).
+
+## Anchored vs unanchored partition
+
+Before serializing, partition findings into **anchored** (the line appears in the diff at `--commit`) and **unanchored** (it does not). Only anchored findings go into the JSON — the GitHub reviews API rejects the ENTIRE POST when any inline comment targets a line outside the diff, so a single unanchored entry breaks the whole review. Surface unanchored findings in the caller's user-facing report instead.
+
+Zero anchored findings → `--state CLEAN`; one or more → `--state DIRTY`.
+
+## Posting
+
+```bash
+python "$HOME/.claude/_shared/pr-loop/scripts/post_audit_thread.py" \
+  --skill <caller> \
+  --owner <owner> \
+  --repo <repo> \
+  --pr-number <N> \
+  --commit <head_sha> \
+  --state <CLEAN|DIRTY> \
+  --findings-json <path>
+```
+
+The script POSTs one review to `/repos/{owner}/{repo}/pulls/{N}/reviews`: `event=APPROVE` on CLEAN (GitHub stores it as `state=APPROVED`; empty `comments[]`; body documents "no findings"), `event=REQUEST_CHANGES` on DIRTY (one inline anchored comment per finding; each becomes its own resolvable thread).
+
+**Self-PR auto-toggle.** GitHub rejects both `APPROVE` and `REQUEST_CHANGES` with HTTP 422 when the authenticated identity matches the PR author. `post_audit_thread.py` detects this via `gh api user` + `gh api repos/<o>/<r>/pulls/<n>` and auto-resolves an alternate gh account's token for the reviews POST — the active `gh auth` account is not mutated; only the bearer token on the request changes, so no swap-back step exists.
+
+Configuration:
+
+- `GH_TOKEN` / `GITHUB_TOKEN` env vars take precedence over the toggle — set one to pin a reviewer identity by token.
+- `BUGTEAM_REVIEWER_ACCOUNT` names which authenticated alternate to prefer (for example `BUGTEAM_REVIEWER_ACCOUNT=jl-cmd`). The env var name is shared across every skill that invokes `post_audit_thread.py`. When unset, the script falls back to the first alternate account `gh auth status` reports.
+- The named alternate must be logged in (`gh auth login -h github.com -u <login>`) before the audit runs; on self-PR with no usable alternate the script exits 1 with a message pointing at `gh auth login`.
+
+**Exit codes:** `0` — success; the new review's `html_url` prints to stdout (surface it in the caller's report). `1` — user input error. `2` — retry exhaustion (1s / 4s / 16s backoff across four attempts): a hard blocker. On exit 2 the caller halts the loop (`error: post_audit_thread retry exhausted`) or tells the user the review post failed and the unresolved-thread gate will not see this pass — never a silent retry.
+
+## Harvest ids for the fix loop
+
+After a DIRTY post, fetch the new review's threads once and record, per finding: the finding comment's URL, its numeric comment id (the reply anchor), and its thread node id (`PRRT_…`, the `resolve_thread` handle):
+
+```
+pull_request_read(method="get_review_comments", ...) → match comments to the new review id
+```
+
+Hand the id triple to the fix step — `pr-fix-protocol` consumes it for the reply-and-resolve unit. Harvesting at post time saves the fix executor a second fetch and pins the mapping before any thread state changes.
+
+## Gotchas
+
+- **One unanchored comment voids the whole review.** The partition is not an optimization; skipping it makes every DIRTY post a coin flip.
+- **CLEAN still posts.** A pass that finds nothing and posts nothing is invisible to the unresolved-thread gate and to anyone auditing the loop's history.
+- **Exit 2 is a stop, not a retry.** The script already retried with backoff; a caller looping on top of it hammers the API to no effect.
+
+## Folder map
+
+- `SKILL.md` — this file. The posting script and its body template constants live in `_shared/pr-loop/scripts/` (`post_audit_thread.py`, `pr_loop_shared_constants/post_audit_thread_constants.py`); the review-payload reference is `_shared/pr-loop/gh-payloads.md`.

package/skills/pr-converge/CLAUDE.md

@@ -27,3 +27,5 @@ Drives a draft PR to convergence by looping Cursor Bugbot, a code-review pass, a
 - The pre-flight gate requires `EnterWorktree` before any file read or API call, and confirms `ScheduleWakeup` is in the tool list.
 - All findings and PR reports state verified facts only — no hedging language.
 - The GitHub MCP (`pull_request_read`, `pull_request_review_write`) is the primary path for PR inspection; `gh api` is the fallback.
+- Three step-scoped agents (`fix_executor`, `thread_sweep`, `copilot_watch`) persist across ticks via the `persistent_agents` map in loop state; each tick resumes them with `SendMessage` and spawns a fresh named agent when a stored id is dead.
+- The tick delegates shared mechanics to five sibling sub-skills: `reviewer-gates` (opt-out, Copilot quota, Bugbot trigger), `pr-scope-resolve` (target resolution), `pr-fix-protocol` (fix sequence + unresolved-thread sweep), `post-audit-findings` (audit posting), and `pr-loop-lifecycle` (run open/close).

package/skills/pr-converge/SKILL.md

@@ -45,23 +45,15 @@ the session worktree before teardown. See
 
 ## Copilot quota pre-check (start of run)
 
-On the first tick, before Step 4, run the Copilot quota pre-check once:
-`python "$HOME/.claude/_shared/pr-loop/scripts/copilot_quota.py"`. It reads the
-account's remaining Copilot premium-request quota via `gh api
-copilot_internal/user` and prints one line — log that line. Exit 0 means Copilot
-has quota, so leave `copilot_down` false. Any non-zero exit means skip Copilot
-for the whole run — the account is out of quota, the quota API or account access
-is down, or no account is set — so set `copilot_down = true` in
-`pr-converge-state.json`. The account comes from the `COPILOT_QUOTA_ACCOUNT`
-environment variable or a git-ignored `.env` file, and the no-account line names
-the exact `.env` path and key to set.
-
-Run the pre-check once, not per tick. Every tick reads `copilot_down` from
-state. When `copilot_down` is true, skip the Copilot gate outright — no fetch,
-no request, no poll, no agent — and export `CLAUDE_REVIEWS_DISABLED="copilot"`
-in that tick's shell before the convergence check, so `check_convergence.py`
-bypasses the Copilot review gate and the pending-requested-reviews gate and the
-run still marks ready on the remaining signals.
+On the first tick, apply the `reviewer-gates` skill's Copilot quota gate
+(`../reviewer-gates/SKILL.md` § Gate 2) — once per run, never per tick. The
+flag lives in `pr-converge-state.json` as `copilot_down`, and every tick reads
+it. While `copilot_down` is true, the tick skips all Copilot work — no fetch,
+no request, no poll, no agent — and exports
+`CLAUDE_REVIEWS_DISABLED="copilot"` in that tick's shell before
+`check_convergence.py`, so the check bypasses the Copilot review gate and the
+pending-requested-reviews gate and the run still marks ready on the remaining
+signals.
 
 ## Budget-aware tick boundaries
 
@@ -94,7 +86,39 @@ so the next tick resumes with accurate state.
 Fields: `phase`, `tick_count`, `bugbot_clean_at`, `code_review_clean_at`,
 `bugteam_clean_at`, `copilot_clean_at`, `current_head`,
 `bugbot_acknowledged_at`, `bugbot_down`, `copilot_down`,
-`bugteam_skill_invoked_at_head`, `bugteam_skill_invoked_at_tick`.
+`bugteam_skill_invoked_at_head`, `bugteam_skill_invoked_at_tick`,
+`agents_session_id`, `persistent_agents`.
+
+## Persistent per-step agents
+
+Three step-scoped agents persist across ticks so their context carries
+forward: `fix_executor`, `thread_sweep`, and `copilot_watch`, recorded in
+the `persistent_agents` map
+([`reference/state-schema.md`](reference/state-schema.md)).
+
+- **Resume:** read `persistent_agents.<key>`. When an entry exists,
+  `SendMessage` to the stored `agent_id` with a tick payload that restates
+  the PR scope, `current_head`, the PR worktree path, this tick's findings
+  or threads, and the report-back contract. Bump `last_used_tick`, then
+  await completion.
+- **First spawn:** `Agent(subagent_type: "clean-coder", name:
+  "prc-fix-<PR#>")` — the `name` makes the agent a persistent teammate
+  that idles awaiting messages. Record `{agent_id, created_tick,
+  last_used_tick}` under the step key. Keep the spawn prompt fix-shaped,
+  never audit-shaped: the `pr_converge_bugteam_enforcer` hook blocks
+  audit-shaped clean-coder spawns during the BUGTEAM phase.
+- **Stale or dead id:** on a `SendMessage` failure, or no acknowledgment
+  within one bounded wait, drop the map entry, spawn a fresh named agent,
+  record it, and continue the tick. Never abort a tick on a stale id;
+  never retry the same dead id.
+- **Fresh every round (never persisted):** the Step 5 `/code-review --fix`
+  pass and the Step 6 bugteam audit (unbiased eyes each round; the
+  enforcer needs the formal Skill call), and every `code-verifier` — a
+  named code-verifier never fires `SubagentStop`, so no verdict mints (see
+  the named-`code-verifier` entry in the Gotchas list below).
+- **Shutdown:** at loop end (convergence or a stop condition), send each
+  persistent agent a shutdown request and clear `persistent_agents` before
+  the `pr-loop-lifecycle` Close.
 
 ## Gotchas
 
@@ -159,13 +183,9 @@ script invocations, decision criteria. Every "return to Step N" means the next
 tick starts fresh from that step.
 
 **Hard gate: do not advance from any step while ANY unresolved review
-thread exists on the PR.** The thread-count filter is purely
-`is_resolved == false` — author, commit anchor, and `is_outdated` are
-all irrelevant. After every fix, reply to each finding comment and
-resolve the thread via `pull_request_review_write(method="resolve_thread")`.
-For each unresolved thread, verify the concern against current HEAD;
-either fix-and-resolve, or reply-with-note-and-resolve when the concern
-no longer applies.
+thread exists on the PR.** The sweep semantics and per-thread handling live
+in the `pr-fix-protocol` skill's unresolved-thread sweep
+(`../pr-fix-protocol/SKILL.md`).
 
 **Full-PR-diff rule: every CODE-REVIEW round (Step 5) and every BUGTEAM
 round (Step 6) covers the FULL `origin/main...HEAD` diff — every file
@@ -176,11 +196,13 @@ against a partial diff is not a valid clean. Re-run the round against the
 full diff before recording `code_review_clean_at` or treating the bugteam
 round as converged. This rule holds every tick, every loop, every PR.
 
-- [ ] **Step 0: Grant project permissions**
-      `python "$HOME/.claude/skills/bugteam/scripts/grant_project_claude_permissions.py"`
+- [ ] **Step 0: Open the run**
+      Apply the `pr-loop-lifecycle` skill's Open section
+      (`../pr-loop-lifecycle/SKILL.md`): permission grant + worktree preflight.
 
 - [ ] **Step 1: Resolve PR scope + PR worktree**
-      Capture owner, repo, number, head SHA, branch. Resolve the **PR
+      Apply the `pr-scope-resolve` skill (`../pr-scope-resolve/SKILL.md`)
+      with caller `pr-converge`. Resolve the **PR
       worktree** — the local checkout every local step this tick targets:
       the `EnterWorktree` checkout when the PR shares the session's repo,
       else a checkout of the PR's repo that the working directory routes
@@ -205,6 +227,8 @@ round as converged. This rule holds every tick, every loop, every PR.
       See: [`reference/per-tick.md` § Step 2 BUGBOT + Step 3](reference/per-tick.md)
 
       - [ ] **Opt-out gate (runs first, every BUGBOT entry).**
+            Gate semantics live in the `reviewer-gates` skill
+            (`../reviewer-gates/SKILL.md` § Gate 1).
             `python "$HOME/.claude/_shared/pr-loop/scripts/reviews_disabled.py" --reviewer bugbot`
             - [ ] Exit 0 (`CLAUDE_REVIEWS_DISABLED` lists `bugbot`) → set `bugbot_down = true`, `phase = CODE_REVIEW`, advance to Step 5 (bypass). Cursor Bugbot is skipped for the entire run.
             - [ ] Exit 1 → continue below.
@@ -212,9 +236,7 @@ round as converged. This rule holds every tick, every loop, every PR.
       Fetch bugbot reviews + inline comments on `current_head`.
 
       - [ ] **dirty** (findings on `current_head`) →
-            - [ ] Fix each finding (spawn `clean-coder`)
-            - [ ] Reply to each finding comment via `python ~/.claude/skills/pr-converge/scripts/post_fix_reply.py`
-            - [ ] Resolve each addressed thread via `pull_request_review_write(method="resolve_thread")`
+            - [ ] Apply the `pr-fix-protocol` skill (`../pr-fix-protocol/SKILL.md`) to this tick's findings
             - [ ] Push → return to Step 4
       - [ ] **clean** (no findings on `current_head`) →
             - [ ] Count ALL unresolved threads on PR (`is_resolved == false`) → zero? advance; >0? fix + resolve first
@@ -222,14 +244,12 @@ round as converged. This rule holds every tick, every loop, every PR.
             - [ ] `phase = CODE_REVIEW`
             - [ ] Advance to Step 5
       - [ ] **no review yet / commit_id mismatch** →
-            - [ ] Run `python ~/.claude/skills/pr-converge/scripts/check_bugbot_ci.py --owner <O> --repo <R> --check-clean --sha <current_head>`
-            - [ ] Exit 0 (bugbot CI completed with success/neutral conclusion and no review = silent pass) → `bugbot_clean_at = current_head` → `phase = CODE_REVIEW` → advance to Step 5
-            - [ ] Exit 1 (not a silent pass) or Exit 2 (gh CLI error — silent pass not confirmable) → Run `python ~/.claude/skills/pr-converge/scripts/check_bugbot_ci.py --owner <O> --repo <R> --check-active --sha <current_head>`
-            - [ ] Exit 0 (already queued) → schedule 360s wakeup → return to Step 4 next tick
-            - [ ] Exit 1 → post exactly `bugbot run` via `add_issue_comment` (no `@cursor[bot]` mention, no other text), wait 8s
-            - [ ] Run `python ~/.claude/skills/pr-converge/scripts/check_bugbot_ci.py --owner <O> --repo <R> --sha <current_head>`
-            - [ ] Exit non-zero → `bugbot_down = true` → `phase = CODE_REVIEW` → advance to Step 5 (bypass)
-            - [ ] Exit 0 → record `bugbot_acknowledged_at`, schedule 360s wakeup → return to Step 4
+            Apply the `reviewer-gates` skill's Bugbot flow
+            (`../reviewer-gates/SKILL.md` § Gate 3) against `current_head`,
+            then map its outcomes:
+            - [ ] Silent pass → `bugbot_clean_at = current_head` → `phase = CODE_REVIEW` → advance to Step 5
+            - [ ] Already queued, or trigger acknowledged → schedule 360s wakeup → return to Step 4 next tick
+            - [ ] Bugbot down → `bugbot_down = true` → `phase = CODE_REVIEW` → advance to Step 5 (bypass)
 - [ ] **Step 5: CODE-REVIEW — run, fix, reset, advance**
       See: [`reference/per-tick.md` § Step 2 CODE_REVIEW](reference/per-tick.md)
 
@@ -264,13 +284,13 @@ round as converged. This rule holds every tick, every loop, every PR.
             - [ ] Re-trigger bugbot (Step 4 "no review yet" checklist)
             - [ ] `phase = BUGBOT` → schedule 360s wakeup → return to Step 4
       - [ ] **clean** (no changes applied) →
-            - [ ] Count ALL unresolved threads on PR (`is_resolved == false`) → zero? advance; >0? fix + resolve first
+            - [ ] Zero unresolved threads per the `pr-fix-protocol` sweep (`../pr-fix-protocol/SKILL.md`) → advance; else fix + resolve first (same skill)
             - [ ] `code_review_clean_at = current_head`
             - [ ] `phase = BUGTEAM` → advance to Step 6
 
 - [ ] **Step 6: BUGTEAM — run, decide, fix, reply, resolve**
       See: [`reference/per-tick.md` § Step 2 BUGTEAM](reference/per-tick.md);
-      [`../../bugteam/SKILL.md`](../../bugteam/SKILL.md)
+      [`../bugteam/SKILL.md`](../bugteam/SKILL.md)
 
       Pre-condition: `code_review_clean_at == current_head`.
 
@@ -300,9 +320,7 @@ round as converged. This rule holds every tick, every loop, every PR.
       - [ ] **converged + `bugbot_clean_at ≠ current_head`** →
             `phase = BUGBOT` → schedule 360s wakeup → return to Step 4
       - [ ] **findings without committed fixes** →
-            - [ ] Fix each finding (spawn `clean-coder`)
-            - [ ] Reply to each finding comment via `python ~/.claude/skills/pr-converge/scripts/post_fix_reply.py`
-            - [ ] Resolve each addressed thread via `pull_request_review_write(method="resolve_thread")`
+            - [ ] Apply the `pr-fix-protocol` skill (`../pr-fix-protocol/SKILL.md`) to the findings
             - [ ] Push → `phase = BUGBOT` → return to Step 4
 
 - [ ] **Step 7: Convergence gates**
@@ -317,15 +335,13 @@ round as converged. This rule holds every tick, every loop, every PR.
             pull_request_read(method="get_review_comments")
               → filter threads where is_resolved == false
             ```
-      - [ ] Any unresolved? → For each: verify concern against current HEAD;
-            if still applies → Fix (spawn `clean-coder`) → reply → resolve;
-            if no longer applies → reply-with-note → resolve. Push if any code changed → return to Step 4
+      - [ ] Any unresolved? → apply the `pr-fix-protocol` skill's unresolved-thread sweep (`../pr-fix-protocol/SKILL.md`). Push if any code changed → return to Step 4
       - [ ] When `copilot_down == true` (start-of-run quota pre-check), skip the Copilot fetch below — no request, no poll, no agent — and continue to gate (b); the Copilot gate is bypassed for the whole run.
       - [ ] Fetch Copilot review on `current_head` (top-level review state — uses get_reviews, identifies by reviewer):
             ```
             python ~/.claude/skills/pr-converge/scripts/fetch_copilot_reviews.py --owner <O> --repo <R> --pr-number <N>
             ```
-      - [ ] dirty → Fix (spawn `clean-coder`) → reply → resolve threads → push → return to Step 4
+      - [ ] dirty → apply the `pr-fix-protocol` skill (`../pr-fix-protocol/SKILL.md`) → push → return to Step 4
       - [ ] clean (no findings) → `copilot_clean_at = current_head` → gate (b)
       - [ ] no review yet → gate (b)
 
@@ -357,10 +373,7 @@ round as converged. This rule holds every tick, every loop, every PR.
         → count threads where is_resolved == false
       ```
       - [ ] zero unresolved → gate (e)
-      - [ ] unresolved → For each: verify against HEAD;
-            still applies → Fix (spawn `clean-coder`) → reply → resolve;
-            no longer applies → reply-with-note → resolve.
-            Push if code changed → return to Step 4
+      - [ ] unresolved → apply the `pr-fix-protocol` skill's unresolved-thread sweep (`../pr-fix-protocol/SKILL.md`). Push if code changed → return to Step 4
 
       **(e) Mark ready**
       - [ ] When `copilot_down == true`, export `CLAUDE_REVIEWS_DISABLED="copilot"` in this tick's shell before the check below, so it bypasses the Copilot review gate and the pending-requested-reviews gate.
@@ -384,22 +397,22 @@ round as converged. This rule holds every tick, every loop, every PR.
       - [ ] **clean (no findings)** →
             `copilot_clean_at = current_head` → return to Step 7 (re-validate gates b, d, e)
       - [ ] **dirty (findings present)** →
-            - [ ] Fix each finding (spawn `clean-coder`)
-            - [ ] Reply to each finding comment via `python ~/.claude/skills/pr-converge/scripts/post_fix_reply.py`
-            - [ ] Resolve each addressed thread via `pull_request_review_write(method="resolve_thread")`
+            - [ ] Apply the `pr-fix-protocol` skill (`../pr-fix-protocol/SKILL.md`) to the findings
             - [ ] Push → `phase = BUGBOT` → return to Step 4
       - [ ] **no review yet** →
             increment `copilot_wait_count` → ≥ 3 = hard blocker → stop
             schedule 360s wakeup → return to Step 7a next tick
 
 - [ ] **Step 8: Clean working tree**
-      See: [`bugteam/reference/teardown-publish-permissions.md` § Step 4](../../bugteam/reference/teardown-publish-permissions.md)
+      `pr-loop-lifecycle` Close (`../pr-loop-lifecycle/SKILL.md`).
+      See: [`pr-loop-lifecycle/reference/teardown-publish-permissions.md` § Clean working tree](../pr-loop-lifecycle/reference/teardown-publish-permissions.md)
 
 - [ ] **Step 9: Rewrite PR description**
-      See: [`bugteam/reference/teardown-publish-permissions.md` § Step 4.5](../../bugteam/reference/teardown-publish-permissions.md)
+      `pr-loop-lifecycle` Close.
+      See: [`pr-loop-lifecycle/reference/teardown-publish-permissions.md` § Publish the final PR description](../pr-loop-lifecycle/reference/teardown-publish-permissions.md)
 
-- [ ] **Step 10: Revoke project permissions**
-      `python "$HOME/.claude/skills/bugteam/scripts/revoke_project_claude_permissions.py"`
+- [ ] **Step 10: Revoke project permissions (always)**
+      `pr-loop-lifecycle` Close (`../pr-loop-lifecycle/SKILL.md` § Close).
 
 - [ ] **Step 11: Print final report**
       Print this block verbatim — no paraphrase, no extra commentary:

package/skills/pr-converge/reference/CLAUDE.md

@@ -8,7 +8,7 @@ Reference documents for the `pr-converge` skill. These files define the per-tick
 |---|---|
 | `per-tick.md` | Step-by-step procedure for one tick (resolve HEAD, run BUGBOT, CODE_REVIEW, BUGTEAM, COPILOT_WAIT phases, schedule next wakeup) |
 | `convergence-gates.md` | Six gates that must all pass before the PR is marked ready for review |
-| `fix-protocol.md` | How to apply fixes: TDD first, one commit per fix round, reply to each finding inline |
+| `fix-protocol.md` | pr-converge deltas on the `pr-fix-protocol` skill: multi-PR teammate obligations and the same-tick bugbot re-trigger rule |
 | `ground-rules.md` | Non-negotiable constraints for the convergence loop |
 | `stop-conditions.md` | Conditions that end the loop without convergence (cap reached, stuck, user stop) |
 | `state-schema.md` | Fields in `pr-converge-state.json` and their meanings |

package/skills/pr-converge/reference/convergence-gates.md

@@ -35,22 +35,21 @@ Decide (four branches; match first whose predicate holds):
 
 - **`classification == "dirty"` with non-empty inline comments matching
   `pull_request_review_id`:** Fix protocol input (same shape as bugbot
-  dirty). Spawn Agent (subagent_type: clean-coder) to implement → push → reply inline on each thread via
-  `python ~/.claude/skills/pr-converge/scripts/post_fix_reply.py` → Step 3 in same tick (see
-  [Single-PR fix workflow](fix-protocol.md#single-pr-fix-workflow) for
-  full contract).
+  dirty). Apply the `pr-fix-protocol` skill
+  (`../../pr-fix-protocol/SKILL.md`) → Step 3 in same tick.
   Reset `bugbot_clean_at = null` AND `copilot_clean_at = null`, `phase =
   BUGBOT`, schedule next wakeup, return. Full back-to-back-clean cycle
   plus all six gates must hold again on new HEAD.
 - **`classification == "dirty"` with empty inline comments matching
   `pull_request_review_id`:** Copilot posted findings only in review body
   (`CHANGES_REQUESTED` or `COMMENTED` with non-empty body, no inline
-  threads). Parse body for actionable findings. Spawn Agent (subagent_type: clean-coder) to implement → push → post
-  top-level review reply via `python ~/.claude/skills/pr-converge/scripts/post_fix_reply.py` citing new HEAD SHA → Step 3 in same tick.
-  Reset
+  threads). Parse body for actionable findings. Apply the
+  `pr-fix-protocol` skill (`../../pr-fix-protocol/SKILL.md`), whose reply
+  step for body-only findings posts a top-level review reply citing the
+  new HEAD SHA → Step 3 in same tick. Reset
   `bugbot_clean_at = null` AND
   `copilot_clean_at = null`, `phase = BUGBOT`, Step 3 on new HEAD,
-  schedule next wakeup, return. Convergence requires full
+  schedule next wakeup, return. Convergence needs full
   back-to-back-clean on new HEAD.
 - **`classification == "clean"` (state `APPROVED`):** Set
   `copilot_clean_at = current_head`. Record evidence: "Copilot APPROVED at <SHA>".
@@ -77,14 +76,15 @@ Decide (four branches; match first whose predicate holds):
 
 - **`classification == "dirty"` with non-empty inline comments matching
   `pull_request_review_id`:** Treat identically to gate (a) dirty+inline
-  path — spawn Agent (subagent_type: clean-coder) to fix → push → reply inline on each thread. Reset
+  path — apply the `pr-fix-protocol` skill
+  (`../../pr-fix-protocol/SKILL.md`). Reset
   `bugbot_clean_at = null` AND `copilot_clean_at = null`, `phase = BUGBOT`,
   schedule next wakeup, return.
 - **`classification == "dirty"` with empty inline comments matching
   `pull_request_review_id`:** Claude posted findings only in review body
   (`CHANGES_REQUESTED` or `COMMENTED` with non-empty body, no inline
-  threads). Treat identically to gate (a) dirty+body path — spawn Agent
-  (subagent_type: clean-coder) to implement → push → post top-level review reply via `python ~/.claude/skills/pr-converge/scripts/post_fix_reply.py`. Reset
+  threads). Treat identically to gate (a) dirty+body path — apply the
+  `pr-fix-protocol` skill (`../../pr-fix-protocol/SKILL.md`). Reset
   `bugbot_clean_at = null` AND `copilot_clean_at = null`, `phase = BUGBOT`,
   schedule next wakeup, return.
 - **`classification == "clean"` (state `APPROVED`):** Record evidence:
@@ -176,19 +176,16 @@ pull_request_read(owner=OWNER, repo=REPO, pullNumber=NUMBER, method="get_review_
   → count
 ```
 
-When you address an unresolved thread, you still need its author and
-anchor commit so you can decide how to fix it — but the gate doesn't
-filter on those fields.
+This count is the `pr-fix-protocol` unresolved-thread sweep
+(`../../pr-fix-protocol/SKILL.md`).
 
 Decide:
 
 - **Zero unresolved threads:** Record evidence:
   "0 unresolved threads across PR at <SHA>". Continue to gate (f).
-- **One or more unresolved threads:** Do **not** mark ready. For each
-  unresolved thread, verify the concern against current HEAD. If still
-  applies, apply Fix protocol (test → fix → push → reply → resolve). If
-  no longer applies (e.g. code already changed), reply-with-note
-  explaining why and resolve. Push if any code changed → reset
+- **One or more unresolved threads:** Do **not** mark ready. Apply the
+  `pr-fix-protocol` skill's unresolved-thread sweep
+  (`../../pr-fix-protocol/SKILL.md`). Push if any code changed → reset
   `bugbot_clean_at = null` AND `copilot_clean_at = null`,
   `phase = BUGBOT`, schedule next wakeup, return. If only resolutions
   (no code changes), re-check this gate without resetting.

package/skills/pr-converge/reference/examples.md

@@ -54,9 +54,8 @@ sufficient. Runs `convergence-gates.md` gates in order:
     Next tick: re-run gate (a) fetch → Copilot `APPROVED` at `current_head`
     → set `copilot_clean_at = current_head`, record evidence: "Copilot
     APPROVED at <SHA>", set `phase = BUGTEAM`, re-validate gates (b) and (c).
-  Gate (e): `pull_request_read(method="get_review_comments")` → count
-    threads where `is_resolved == false` (no author/commit/outdated
-    filter) → zero across PR → record evidence.
+  Gate (e): the `pr-fix-protocol` unresolved-thread sweep
+    (`../../pr-fix-protocol/SKILL.md`) → zero across PR → record evidence.
   Gate (f): all six gates pass → `update_pull_request(pullNumber=NUMBER,
     owner=OWNER, repo=REPO, draft=false)`.
 Reports "PR #N converged: bugbot CLEAN at <SHA>, bugteam CLEAN at <SHA>,
@@ -100,8 +99,9 @@ Copilot review `state: APPROVED` at `current_head`. Claude: [re-runs
 gate (a) fetch → APPROVED → sets `copilot_clean_at = current_head`,
 records evidence: "Copilot APPROVED at <SHA>", sets `phase = BUGTEAM`;
 re-validates gates (b) Claude absent and (c) mergeability clean,
-records evidence for both; gate (e) zero unresolved threads passes
-trivially, record evidence: "0 unresolved threads across PR at <SHA>";
+records evidence for both; gate (e) — the `pr-fix-protocol`
+unresolved-thread sweep — passes trivially, record evidence:
+"0 unresolved threads across PR at <SHA>";
 runs `update_pull_request(pullNumber=NUMBER,
 owner=OWNER, repo=REPO, draft=false)`; reports "PR #N converged: bugbot CLEAN
 at <SHA>, bugteam CLEAN at <SHA>, mergeable_state clean, copilot CLEAN at