paulund/pr-fix

PR Fix

Action external review feedback and CI failures on an existing PR. Single-purpose: focuses on the fixes; does not handle merge conflicts (use merge-main) and does not open new PRs (use pr-open).

Inputs

When invoked with arguments, the first line of the prompt may carry a context envelope as JSON:

{ "pr": 123, "branch": "agent/issue-582-foo" }

When invoked without context, detect the PR from the current branch:

gh pr view --json number,headRefName,state,reviewDecision,statusCheckRollup

If no PR exists for the current branch, stop and report. (Use pr-open to create one.)

Workflow

Step 1 — Assess

gh pr view <pr> --json mergeStateStatus,reviewDecision,statusCheckRollup
gh pr checks <pr> --json name,state,conclusion

Report a one-line summary: review decision, failing-check count, mergeable state.

If mergeStateStatus == DIRTY: stop and tell the caller to invoke merge-main first. This skill does not resolve merge conflicts.

Step 2 — Fetch unresolved review comments

gh api repos/{owner}/{repo}/pulls/<pr>/comments \
  --jq '.[] | select(.in_reply_to_id == null) | {id, path, line, body, diff_hunk}'

Each top-level comment is a review thread. Skip threads where the latest reply is from the agent (already actioned).

Step 3 — Action each thread

For every unresolved thread:

1. Read the file + surrounding context.
2. If the comment includes a suggested change block, apply it as-is.
3. Otherwise, edit the code to satisfy the comment.
4. Reply to the thread:

gh api repos/{owner}/{repo}/pulls/<pr>/comments \
  -f body="Done in <commit-sha-after-step-5>" \
  -F in_reply_to=<comment_id>

For threads you decline (genuinely out of scope), reply with a one-line reason and a tracking-issue link if you create one.

Step 4 — Fix CI failures

Only touch failing checks that the review comments did not already resolve:

gh run list --branch <branch> --status failure --limit 1 --json databaseId
gh run view <run-id> --log-failed

Diagnose the root cause from the logs. Fix the code. Do not skip the failure or comment-out the check.

Step 5 — Commit and push

Group changes by concern. Commit messages should describe the why:

git add <files>
git commit -m "Address review: <one-line summary>"
git push origin HEAD

After push, post the commit SHA into each thread's reply if it wasn't known when you replied.

Step 6 — Report

{ "pr": <N>, "threadsActioned": <count>, "threadsDeclined": <count>, "ciFixed": <bool> }

Constraints

MUST DO

• Detect the PR from the current branch first — only ask the user when ambiguous.
• Reply to every thread you actioned or declined.
• Reference the commit SHA in replies once it exists.
• Stop and surface to the caller when mergeStateStatus == DIRTY (caller invokes merge-main).

MUST NOT DO

• Resolve merge conflicts. That's merge-main.
• Open a PR. That's pr-open.
• Run the quality gate — that's quality-gate's job.
• Force-push to a branch that already has a PR open unless explicitly asked.
• Mark a thread as resolved without making the requested change or replying.
• Action a thread whose latest reply is already from the agent (idempotency).
• Merge the PR.