PR Review Fix Skill

Automated workflow to resolve all issues surfaced in a pr-review report — parse summary → detect PR status → create fix branch or checkout original branch → fix by priority → quality gate → commit → publish → verify.

Announce at start: "I'm using pr-fix skill to fix all review issues."

Usage

/pr-fix [pr_number]

pr_number is optional. If omitted, the skill uses the review report already present in the current session.

---

Steps

Step 0 — Identify the Review Report Source

Case A — Report is in the current session

The pr-review skill was just executed. The review report (containing a "汇总" table) is already in the conversation. Extract the PR number from the report header:

## Code Review：<PR 标题> (#<PR_NUMBER>)

Case B — User provides a PR number (or no report in session)

If pr_number argument is non-empty, use it. Otherwise run:

gh pr view --json number -q .number

Fetch the review comment:

gh pr view <PR_NUMBER> --json comments \
  --jq '.comments[] | select(.body | startswith("<!-- pr-review-bot -->")) | .body'

If no review comment is found, abort with:

No pr-review report found. Please run /pr-review <pr_number> first.

---

Step 1 — Parse the Summary Table

Locate the 汇总 section in the review report:

| #   | 严重级别    | 文件        | 问题 |
| --- | ----------- | ----------- | ---- |
| 1   | 🔴 CRITICAL | `file.ts:N` | ...  |

Build an ordered issue list, grouped by severity:

Priority	Severity	Emoji
1	CRITICAL	🔴
2	HIGH	🟠
3	MEDIUM	🟡
4	LOW	🔵

If the 汇总 table is empty, abort with:

No issues found in the review summary. Nothing to fix.

LOW issues — ask user once:

检测到 N 个 LOW 级别问题。是否一并修复？(yes/no)

If no, exclude LOW issues from this run.

---

Step 2 — Pre-flight Checks

Run in parallel:

git status --porcelain

gh pr view <PR_NUMBER> --json headRefName,baseRefName \
  -q '{head: .headRefName, base: .baseRefName}'

# Check whether the PR has been merged
gh pr view <PR_NUMBER> --json state -q '.state'
# Returns: "MERGED" or "OPEN"

# Check whether the PR is from a fork
gh pr view <PR_NUMBER> --json isCrossRepository -q '.isCrossRepository'
# Returns: true (fork) or false (internal branch)

If working tree is dirty, abort with:

Working tree has uncommitted changes. Please commit or stash them before running pr-fix.

Save <head_branch>, <base_branch>, <state>, and <isCrossRepository> for Step 3.

Determine path based on results:

state	isCrossRepository	Path
MERGED	any	Path A — create follow-up PR
OPEN	false	Path B — push to original branch
OPEN	true	ABORT

If state is OPEN and isCrossRepository is true, abort with:

PR #<PR_NUMBER> is still open and was submitted from an external fork. Direct push is not possible. Please wait for the PR to be merged, then run /pr-fix again.

---

Step 3 — Prepare Working Branch

Path A — Create follow-up PR (state=MERGED, any source)

Derive the fix branch name from <head_branch>:

Original branch	Scope	Fix branch
feat/webui-file-upload	webui	fix/webui-review-followup
fix/cron-timezone	cron	fix/cron-review-followup
feat/image-generation-mcp	image-generation-mcp	fix/image-generation-mcp-review-followup

Rule: Split on /, take segment after the first /, use that as scope.

git fetch origin <base_branch>
git checkout <base_branch>
git pull origin <base_branch>
git checkout -b fix/<scope>-review-followup

Path B — Push to original branch (state=OPEN, isCrossRepository=false)

Check out the existing head branch directly — no new branch needed:

git fetch origin <head_branch>
git checkout <head_branch>
git pull origin <head_branch>

Fixes will be committed directly onto this branch, and the open PR will update automatically.

---

Step 4 — Fix Issues by Priority

Process issues CRITICAL → HIGH → MEDIUM → LOW. For each issue:

1. Read the target file (use Read tool at the file path from the summary table)
2. Locate the exact problem — match the review report's quoted code and line number
3. Apply the fix described in the review report's "修复建议" section
4. After fixing each file batch, run a quick type check:

bunx tsc --noEmit

Resolve any type errors before moving to the next issue.

Batching: Group issues in the same file into a single pass.

---

Step 5 — Full Quality Gate

bun run lint:fix
bun run format
bunx tsc --noEmit
bun run test

All four must pass. Fix any failures caused by the current changes before proceeding.

---

Step 6 — Commit

Follow the commit skill workflow. Commit message must reference the original PR:

fix(<scope>): address review issues from PR #<PR_NUMBER>

- Fix <CRITICAL/HIGH issue 1 description>
- Fix <issue 2 description>
- ...

Review follow-up for #<PR_NUMBER>

---

Step 7 — Publish

Path A — Create follow-up PR

Follow the pr skill — skip Step 2 (Issue Association), do NOT create a new issue.

gh pr create \
  --title "fix(<scope>): address review issues from PR #<PR_NUMBER>" \
  --body "$(cat <<'EOF'
## Summary

Follow-up to #<PR_NUMBER> — addresses all issues identified in the code review.

## Issues Fixed

| # | Severity | File | Issue | Fix Applied |
|---|----------|------|-------|-------------|
| 1 | 🔴 CRITICAL | `file.ts:N` | <description> | <what was done> |
| 2 | 🟠 HIGH | `file.ts:N` | <description> | <what was done> |

## Related

Follow-up to #<PR_NUMBER>

## Test Plan

- [ ] `bun run test` — all tests pass
- [ ] `bunx tsc --noEmit` — no type errors
- [ ] `bun run lint:fix` — lint clean
- [ ] Manually verify each fixed issue in the changed files
EOF
)"

Save <NEW_PR_NUMBER> from the output. Output the new PR URL to the user.

Path B — Push to original branch

git push origin <head_branch>

Output to user:

已推送到 <head_branch>，PR #<PR_NUMBER> 已自动更新。无需创建新 PR。

---

Step 8 — Verification Report

For each issue in the original summary table, verify the fix exists in actual code:

1. Read the relevant file (Read tool)
2. Grep for the original problematic pattern to confirm it is gone
3. Confirm the corrected code is in place

Both paths must post the verification report as a PR comment AND output it in the conversation.

Path A — Post comment to follow-up PR

gh pr comment <NEW_PR_NUMBER> --body "$(cat <<'EOF'
<!-- pr-fix-verification -->
## PR Fix 验证报告

**原始 PR:** #<PR_NUMBER>
**Follow-up PR:** #<NEW_PR_NUMBER>

| # | 严重级别 | 文件 | 问题 | 修复方式 | 状态 |
|---|---------|------|------|---------|------|
| 1 | 🔴 CRITICAL | `file.ts:N` | <原始问题> | <修复措施> | ✅ 已修复 |
| 2 | 🟠 HIGH     | `file.ts:N` | <原始问题> | <修复措施> | ✅ 已修复 |
| 3 | 🔵 LOW      | `file.ts:N` | <原始问题> | —       | ⏭️ 跳过 |

**总结：** ✅ 已修复 N 个 | ❌ 未能修复 N 个 | ⏭️ 跳过 N 个
EOF
)"

Path B — Post comment to original PR

gh pr comment <PR_NUMBER> --body "$(cat <<'EOF'
<!-- pr-fix-verification -->
## PR Fix 验证报告

**原始 PR:** #<PR_NUMBER>
**修复方式:** 直接推送到 `<head_branch>`

| # | 严重级别 | 文件 | 问题 | 修复方式 | 状态 |
|---|---------|------|------|---------|------|
| 1 | 🔴 CRITICAL | `file.ts:N` | <原始问题> | <修复措施> | ✅ 已修复 |
| 2 | 🟠 HIGH     | `file.ts:N` | <原始问题> | <修复措施> | ✅ 已修复 |
| 3 | 🔵 LOW      | `file.ts:N` | <原始问题> | —       | ⏭️ 跳过 |

**总结：** ✅ 已修复 N 个 | ❌ 未能修复 N 个 | ⏭️ 跳过 N 个
EOF
)"

After posting, output the same verification table in the conversation for immediate review.

---

Mandatory Rules

• No AI signature — no Co-Authored-By, Generated with, or any AI byline
• Always reference original PR — every commit and PR body must include Follow-up to #<PR_NUMBER>
• No issue creation — this skill skips the issue-association step in pr skill
• Fix, don't workaround — no // @ts-ignore, no lint suppression; address the root cause

---

Quick Reference

0. Get review report (current session OR fetch from PR comments)
1. Parse 汇总 table → ordered issue list; ask about LOW issues
2. Pre-flight: clean working tree + fetch PR branch info
   + detect: state (merged/open) + isCrossRepository (fork/internal)
   → Path A: state=MERGED (any source) — create follow-up PR
   → Path B: state=OPEN + isCrossRepository=false — push to original branch
   → ABORT: state=OPEN + isCrossRepository=true — wait for merge
3a. [Path A] git checkout <base> && git pull && git checkout -b fix/<scope>-review-followup
3b. [Path B] git checkout <head_branch> && git pull
4.  Fix issues CRITICAL→HIGH→MEDIUM→LOW; bunx tsc --noEmit after each file batch
5.  bun run lint:fix && bun run format && bunx tsc --noEmit && bun run test
6.  Commit: fix(<scope>): address review issues from PR #N
7a. [Path A] gh pr create — Follow-up to #N → record NEW_PR_NUMBER
7b. [Path B] git push origin <head_branch> (PR auto-updated, no new PR)
8a. [Path A] Verify → post as gh pr comment NEW_PR_NUMBER + output in conversation
8b. [Path B] Verify → post as gh pr comment PR_NUMBER + output in conversation