Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
170 changes: 170 additions & 0 deletions .agents/skills/fix-ready-prs/SKILL.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
---
name: fix-ready-prs
description: Inspect every open non-draft PR for CI failures and unresolved Cursor Bugbot findings, then fix them on the existing PR branches. Use when asked to check active PRs, triage ready PRs, fix CI, or address Bugbot comments.
metadata:
internal: true
---

# Fix Ready PRs

Work through every **open, non-draft** pull request. Fix CI failures and
unresolved Bugbot findings on the existing PR branch. Do not open a new PR for
an existing one.

Drafts are out of scope unless the user names them.

## 1. Inventory

```bash
gh pr list --state open --limit 200 \
--json number,title,isDraft,headRefName,headRepositoryOwner,isCrossRepository,url,mergeStateStatus
```

Keep only `isDraft == false`. Record number, branch, URL, and whether the head
is a fork (`isCrossRepository`).

## 2. Collect failures

For each ready PR, gather **current-head** CI and **unresolved** Bugbot threads.
Do not treat an in-progress check as green.

### CI

```bash
gh pr checks <n>
gh pr view <n> --json statusCheckRollup,headRefOid
```

Treat as a failure when a required or repo workflow check is `FAILURE`,
`TIMED_OUT`, `ACTION_REQUIRED`, or `CANCELLED` on the current head and has not
been superseded by a newer run.

Ignore:

- `SKIPPED` / `NEUTRAL`
- Netlify header/pages/redirect checks and canceled deploy previews
- Mintlify Deployment skips
- macOS/Windows/iOS jobs that this repo skips on pull requests

If a failing job has logs, pull them:

```bash
gh run view <run-id> --log-failed
```

If checks are still `IN_PROGRESS` / `pending`, wait until they finish or fail
before declaring the PR clean. Re-poll rather than guessing.

### Bugbot

Use review threads, not only the Bugbot check conclusion. A green Bugbot check
can still leave unresolved comments, and an older finding may already be
fixed.

GitHub returns `reviewThreads` oldest-first with no unresolved-only filter.
Page until `hasNextPage` is false. Do not stop at the first 50 threads.

```bash
after=""
while :; do
if [ -n "$after" ]; then
page=$(gh api graphql -f query="$THREADS_QUERY" -F n=<n> -F after="$after")
else
page=$(gh api graphql -f query="$THREADS_QUERY" -F n=<n>)
fi
echo "$page" | jq '.data.repository.pullRequest.reviewThreads.nodes[]'
has_next=$(echo "$page" | jq -r '.data.repository.pullRequest.reviewThreads.pageInfo.hasNextPage')
after=$(echo "$page" | jq -r '.data.repository.pullRequest.reviewThreads.pageInfo.endCursor')
[ "$has_next" = true ] || break
done
```

`$THREADS_QUERY` is:

```graphql
query($n: Int!, $after: String) {
repository(owner: "fastrepl", name: "anarlog") {
pullRequest(number: $n) {
reviewThreads(first: 50, after: $after) {
pageInfo { hasNextPage endCursor }
nodes {
isResolved
isOutdated
comments(first: 5) {
nodes { author { login } path line body }
}
}
}
}
}
}
```

Fix a thread when:

- the author is `cursor` / `cursor[bot]`
- `isResolved` is false
- the comment is a Bugbot finding (`<!-- BUGBOT_BUG_ID:` or a severity heading)
- it still applies to the current head (`isOutdated` is false, or outdated but
the same bug is still in the code)

Skip resolved threads and outdated findings whose code already changed.

Also paginate review comments in case Bugbot posted one that is not yet a
thread:

```bash
gh api --paginate repos/fastrepl/anarlog/pulls/<n>/comments
gh pr view <n> --comments
```

## 3. Fix on the PR branch

For each PR that has work, check out **that PR's head**, including fork heads:

```bash
gh pr checkout <n>
```

Do not `git fetch origin <headRefName>` or `git push origin <headRefName>`.
Fork PRs keep the branch on the contributor remote; `origin/<headRefName>` is
missing or is a different branch. Pushing to `origin` can create a stray
branch that is not the PR head.

Then:

1. Reproduce from the failing log or Bugbot location
2. Make the smallest change that fixes the failure or finding
3. Run the locally available checks from the CI workflows that the changed
paths trigger (`AGENTS.md` pre-commit verification)
4. Commit on that branch (do not amend someone else's commit)
5. `git push` (uses the tracking remote from `gh pr checkout`)

If `gh pr checkout` or `git push` cannot update a fork, stop and report that.
Do not open a replacement PR on `origin`.

Do not bundle unrelated PR fixes onto one branch. Do not retarget or close PRs.

If a finding is a false positive, leave it. Do not resolve GitHub review
threads unless the user asked; the code change is the fix.

## 4. Recheck

After pushing, re-run the inventory for that PR. Confirm:

- new CI is running or green
- the previous failure is gone or replaced by a new run
- the Bugbot thread is outdated or will be re-reviewed on the new commit

If a new failure or finding appears, fix it too.

## 5. Report

Summarize every ready PR:

- clean (CI green, no unresolved Bugbot)
- waiting (checks still running)
- fixed (what changed, PR number)
- skipped draft

Do not merge.
16 changes: 16 additions & 0 deletions .claude/skills/fix-ready-prs/SKILL.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
name: fix-ready-prs
description: Inspect every open non-draft PR for CI failures and unresolved Cursor Bugbot findings, then fix them on the existing PR branches. Use when asked to check active PRs, triage ready PRs, fix CI, or address Bugbot comments.
metadata:
internal: true
---

# Fix Ready PRs

This is a compatibility entry for Claude-specific skill discovery. The
canonical, universal instructions live at:

`../../../.agents/skills/fix-ready-prs/SKILL.md`

Read that file completely and follow it. Do not maintain a second checklist
here; changes belong in `.agents/skills/fix-ready-prs/`.
Loading