Back to Skills

addressing-pr-comments

verified

Address review feedback in comments of a GitHub pull request (PR). Use when working through PR feedback, resolving review threads, or applying fixes based on reviewer suggestions.

View on GitHub

Marketplace

tenzir

tenzir/claude-plugins

Plugin

dev

Repository
Verified Org

tenzir/claude-plugins
2stars

plugins/dev/skills/addressing-pr-comments/SKILL.md

Last Verified

January 22, 2026

Install Skill

Select agents to install to:

Scope:
npx add-skill https://github.com/tenzir/claude-plugins/blob/main/plugins/dev/skills/addressing-pr-comments/SKILL.md -a claude-code --skill addressing-pr-comments

Installation paths:

Claude
.claude/skills/addressing-pr-comments/
Powered by add-skill CLI

Instructions

---

# Address PR Review Comments

Work through GitHub PR review comments, creating one commit per comment (or
group of related comments), then reply with the commit SHA and resolve the
thread.

## 1. Identify the PR

If a PR number was provided, use it. Otherwise, get the PR for the current branch:

```sh
gh pr view --json number --jq '.number'
```

If no PR exists for the current branch, report and stop.

## 2. Fetch review comments

Get all unresolved review threads using GraphQL:

```sh
gh api graphql -f query='
{
  repository(owner: "OWNER", name: "REPO") {
    pullRequest(number: PR_NUMBER) {
      reviewThreads(first: 50) {
        nodes {
          id
          isResolved
          comments(first: 10) {
            nodes {
              body
              path
              line
              startLine
            }
          }
        }
      }
    }
  }
}'
```

When `startLine` is present (not null), the comment applies to a range from
`startLine` to `line` (inclusive). This typically indicates the reviewer
selected multiple lines when adding the comment.

Extract owner and repo from `gh repo view --json owner,name`.

If all threads are resolved, report "No unresolved comments" and stop.

## 3. Group comments by theme

Analyze the unresolved comments and group them if they share a common theme:

- Same type of fix across multiple files (e.g., renaming, terminology)
- Related changes in the same file
- Comments that reference each other ("Same here", "Ditto")

Present the grouping to the user for confirmation before proceeding.

## 4. Address each comment or group

Process all comments or groups in sequence. For each one:

### 4.1 Understand the feedback

Read the referenced file(s) and understand the requested change. If the comment
includes a `suggestion` code block, that's the exact change requested.

If the comment is unclear or seems incorrect, use `AskUserQuestion` to ask the
user how to proceed:

- Apply the suggestion as-is
- Apply with modification

Validation Details

Front Matter
Required Fields
Valid Name Format
Valid Description
Has Sections
Allowed Tools
Instruction Length:
2735 chars