address-pr-comments

CRITICAL: This skill makes PUBLIC changes — commits pushed to the PR branch and replies visible to the PR author, reviewers, and all watchers. Every commit must follow project conventions (signed off, GPG-signed where configured, conventional message). Every reply must be accurate, justified, and in English.

Arguments

Parse $ARGUMENTS as a space-separated list of PR refs.

• Each ref: bare number (e.g. 2395, uses the repo from gh repo view --json owner,name) OR owner/repo#N (e.g. cozystack/cozystack#2395).
• If no args: fall back to detection from the current branch via gh pr view --json number,headRepositoryOwner,headRepository --jq '.headRepositoryOwner.login + "/" + .headRepository.name + "#" + (.number|tostring)' — single-PR mode.
• If no args and no PR can be inferred: report the error and stop.

Normalize each ref into OWNER, REPO, PR_NUMBER.

Step 0: Record the starting state

Before touching any PR branch:

ORIGINAL_REF=$(git symbolic-ref --quiet --short HEAD || git rev-parse HEAD)
if [ -z "$(git status --porcelain)" ]; then CLEAN_START=1; else CLEAN_START=0; fi

• ORIGINAL_REF is the branch to return to at the end.
• CLEAN_START == 1 means the working tree was clean — safe to restore later.
• If the working tree is dirty, ask the user how to handle it (abort, stash, or proceed without final restore) BEFORE doing any git checkout.

Step 1: Outer loop over PR refs

For each PR ref in the parsed list, execute Steps 2–10 in order. Between PRs, print a visible separator (e.g. ────── PR #N ──────) so progress is easy to follow.

On a per-PR unrecoverable error (PR not found, branch push rejected and user chose not to force, etc.): print the error, skip the remaining steps for that PR, continue with the next ref. Do not abort the whole run.

Step 2: Check out the PR branch

PR_BRANCH=$(gh pr view $PR_NUMBER --repo $OWNER/$REPO --json headRefName --jq .headRefName)
git fetch origin "$PR_BRANCH"
git checkout "$PR_BRANCH"
git log --oneline -5