handle-code-review-comments

Files (1)

• SKILL.md

SKILL.md (first lines)

# Handle Code Review Comments

Walk the user through every unresolved human review comment on the current branch's pull request, one at a time: propose a fix, show it, ask how to proceed, then optionally reply to the reviewer.

## Workflow

### 1. Locate the PR for the current branch

```bash
# If GITHUB_TOKEN is set in the environment but lacks repo access,
# unset it for this command so gh falls back to the keyring token.
gh auth status 2>&1 | grep -q "GITHUB_TOKEN" && UNSET_TOKEN="GITHUB_TOKEN= " || UNSET_TOKEN=""
eval "${UNSET_TOKEN}gh pr view --json number,url,headRefName,baseRefName,state"
```

If the command fails with "no pull requests found", stop and tell the user there is no PR for this branch. Do not create one.

Capture: `OWNER`, `REPO`, `PR_NUMBER`. Derive owner/repo from `gh repo view --json owner,name`.

### 2. Fetch unresolved human review threads

Use the GraphQL API, REST does not expose `isResolved` for review threads.

```bash
eval "${UNSET_TOKEN}gh api graphql -F owner='$OWNER' -F name='$REPO' -F number=$PR_NUMBER -f query='
query(\$owner: String!, \$name: String!, \$number: Int!) {
  repository(owner: \$owner, name: \$name) {
    pullRequest(number: \$number) {
      reviewThreads(first: 100) {
        nodes {
          id
          isResolved
          isOutdated
          path
          line
          comments(first: 50) {
            nodes {
              id
              databaseId
              author { login __typename }
              body
              path
              line
              originalLine
              startLine
              diffHunk
              url
              createdAt
            }
          }
        }
      }
    }
  }
}'"
```

Filter the returned threads:

- Drop threads where `isResolved == true`.
- Drop threads where the **first** comment's author has `__typename == "Bot"` or `login` ends with `[bot]` (e.g. `coderabbitai[bot]`, `sonarcloud[bot]`, `github-actions[bot]`).
- Keep `isOutdated` threads but flag them, the line numbers may not match current HEAD.

If zero threads remain, tell the user "No unresolved human review comments." and stop.

### 3. Build the work queue

For each remaining thread, extract:

- `thread_id` (GraphQL node ID, needed to resolve later)
- `first_comment_id` (REST `databaseId` of the first comment, needed to reply)
- `author`, `path`, `line`, `body`, `diffHunk`, `url`
- All follow-up comments in the thread (for context, the reviewer may have clarified)

Order the queue by `path` then `line` so related comments cluster together.

### 4. Loop through comments one at a time

For each thread in the queue:

#### 4a. Present the comment

Show the user, in this exact shape:

```
Comment N of M  •  @<author>  •  <path>:<line>
<url>

> <comment body, blockquoted, preserving line breaks>

[follow-ups, if any, indented and labeled with author]
```

#### 4b. Read the surrounding code

Read the file at `path`. Read at least 30 lines of context around `line`. If the thread is `isOutdated`, search for the original code in the diff hunk to locate the current equivalent, say "thread is outdated, line numbers shifted" if you cannot find an exact match.

#### 4c. Propose a fix

Decide what the reviewer is asking for. If the comment is:

- **A concrete change request** ("rename X to Y", "extract this", "use Z instead"), propose the exact edit.
- **A question** ("why are we doing X?"), propose a reply that answers it; no code change unless the answer reveals a bug.
- **A nit / style preference**, propose the smallest possible edit.
- **Ambiguous**, say so explicitly. Propose your best interpretation but flag the ambiguity in the question to the user.
- **Already addressed** in the current code (common with outdated threads), say so; propose only a reply.

Show the proposed fix as a unified diff (file path + before/after hunks). For reply-only proposals, show the draft reply text in a fenced block.

#### 4d. Ask how to proceed

Use `AskUserQuestion` with these options (omit options that don't apply):

- **Apply**, write the edit to disk.
- **Apply + reply**, write the edit and post a reply to the reviewer.
- **Reply only**, post the reply without editing code.
- **Skip**, leave this comment for later, move to next.
- **Stop**, exit the loop entirely.

From rabihkodeih/agentic-workflow, MIT.

More from rabihkodeih/agentic-workflow