Iterate on PR Until CI Passes

Continuously iterate on the current branch until all CI checks pass and review feedback is addressed.

Requires: GitHub CLI (gh) authenticated.

Requires: Python 3.9+.

Important: Run scripts from the repository root directory (where .git is located).

Running the Bundled Scripts

Every script below accepts either runner - they only use the standard library, so no dependency installation is needed either way:

• Preferred: uv - uv run <script>. Faster startup, isolated from system Python.
• Fallback: python3 <script> - used automatically when uv is not on PATH.

Before running any script command shown in this skill, check for uv first and prefer it; fall back to python3 only if uv is unavailable:

if command -v uv >/dev/null 2>&1; then
  uv run .claude/skills/iterate-pr/scripts/<script>.py [args]
else
  python3 .claude/skills/iterate-pr/scripts/<script>.py [args]
fi

The rest of this document shows invocations in the shorter python3 <script> form for readability - substitute uv run per the rule above whenever uv is available.

Invocation and Modes

Invoke as:

• /iterate-pr
• /iterate-pr --merge
• /iterate-pr --release
• /iterate-pr --merge --release

In Claude Desktop, arguments are hints, not strict CLI parsing. Treat whatever follows /iterate-pr as a mode hint string.

Argument Hint Interpretation (Claude Desktop)

Use this deterministic precedence:

1. If hints include --release or terms like release, publish, ship → run release mode.
2. Else if hints include --merge or terms like autonomous, merge → run merge mode.
3. Else run default mode.

Do not fail because hints are missing or unrecognized; default safely.

Bundled Scripts

scripts/fetch_pr_checks.py

Fetches CI check status and extracts failure snippets from logs.

python3 .claude/skills/iterate-pr/scripts/fetch_pr_checks.py [--pr NUMBER]

Returns JSON:

{
  "pr": {"number": 123, "branch": "feat/foo"},
  "summary": {"total": 5, "passed": 3, "failed": 2, "pending": 0},
  "checks": [
    {"name": "tests", "status": "fail", "log_snippet": "...", "run_id": 123},
    {"name": "lint", "status": "pass"}
  ]
}

scripts/fetch_pr_feedback.py

Fetches and categorizes PR review feedback using the LOGAF scale.

python3 .claude/skills/iterate-pr/scripts/fetch_pr_feedback.py [--pr NUMBER]

Returns JSON with feedback categorized as:

• high - Must address before merge (h:, blocker, changes requested)
• medium - Should address (m:, standard feedback)
• low - Optional (l:, nit, style, suggestion)
• bot - Informational automated comments (Codecov, Dependabot, etc.)
• resolved - Already resolved threads

Review bot feedback (from Sentry, Warden, Cursor, Bugbot, CodeQL, etc.) appears in high/medium/low with review_bot: true — it is NOT placed in the bot bucket.

Each feedback item may also include:

• thread_id - GraphQL node ID for inline review comments (used for replies via reply_to_thread.py)

scripts/reply_to_thread.py

Replies to PR review threads. Batches multiple replies into a single GraphQL call.

python3 .claude/skills/iterate-pr/scripts/reply_to_thread.py THREAD_ID "body" [THREAD_ID "body" ...]

Arguments are alternating (thread_id, body) pairs. The script sends the reply body without adding signatures, attribution, or sign-off text. Example:

python3 .claude/skills/iterate-pr/scripts/reply_to_thread.py \
  PRRT_abc "Fixed the null check." \
  PRRT_def "Replaced with path-segment counting."

Workflow

1. Identify PR

gh pr view --json number,url,headRefName

Stop if no PR exists for the current branch.

2. Gather Review Feedback

Run python3 .claude/skills/iterate-pr/scripts/fetch_pr_feedback.py to get categorized feedback already posted on the PR.

3. Handle Feedback by Priority and Mode

Determine mode from invocation (/iterate-pr, /iterate-pr --merge, /iterate-pr --release).

Default mode (/iterate-pr)

Auto-fix (no prompt):

• high - must address (blockers, security, changes requested)
• medium - should address (standard feedback)

Prompt user for selection:

• low - present numbered list and ask which to address:

Found 3 low-priority suggestions:
1. [l] "Consider renaming this variable" - @reviewer in api.py:42
2. [nit] "Could use a list comprehension" - @reviewer in utils.py:18
3. [style] "Add a docstring" - @reviewer in models.py:55

Which would you like to address? (e.g., "1,3" or "all" or "none")

Skip silently:

• resolved threads
• bot comments (informational only — Codecov, Dependabot, etc.)

Merge modes (/iterate-pr --merge, /iterate-pr --merge --release)

Operate autonomously. Process every non-resolved feedback item returned by fetch_pr_feedback.py (high, medium, low, and bot).

For each item:

• Decide whether the feedback is justified
• If justified, implement the change
• If not justified, reject it with a concise technical reason
• Never leave an item without an explicit decision

When fixing feedback (all modes):

• Understand the root cause, not just the surface symptom
• Check for similar issues in nearby code or related files
• Fix all instances, not just the one mentioned

This includes review bot feedback (items with review_bot: true). Treat it the same as human feedback:

• Real issue found → fix it
• False positive → reject with explanation
• Never silently ignore review bot feedback — always verify the finding

Replying to Comments

After processing feedback, reply to PR comments/threads to acknowledge the action taken.

Scope by mode:

• Default mode: reply to high/medium; reply to low only when fixed or declined by the user
• Merge modes: reply to every non-resolved feedback item, including informational bot feedback

How to reply:

• If thread_id exists (inline review thread), use python3 .claude/skills/iterate-pr/scripts/reply_to_thread.py
• If no thread_id exists, post a PR comment with gh pr comment <PR_NUMBER> --body "..."
• In merge modes, a feedback round is incomplete until every item has a corresponding reply

Batch inline replies for a round into a single call:

python3 .claude/skills/iterate-pr/scripts/reply_to_thread.py \
  PRRT_abc "Fixed — description of change." \
  PRRT_def "Not applicable — reason."

Reply format:

• 1-2 sentences: what was changed, why it's not an issue, or acknowledgment of declined items
• Never add a signature, attribution line, tag, or vendor/model mention in replies
• Keep replies tool-agnostic and identity-free
• If the script fails, log and continue — do not block the workflow

4. Check CI Status

Run python3 .claude/skills/iterate-pr/scripts/fetch_pr_checks.py to get structured failure data.

Wait if pending: If review bot checks (sentry, warden, cursor, bugbot, seer, codeql) are still running, wait before proceeding—they post actionable feedback that must be evaluated. Informational bots (codecov) are not worth waiting for.

5. Fix CI Failures

For each failure in the script output:

1. Read the log_snippet and trace backwards from the error to understand WHY it failed — not just what failed
2. Read the relevant code and check for related issues (e.g., if a type error in one call site, check other call sites)
3. Fix the root cause with minimal, targeted changes
4. Find existing tests for the affected code and run them. If the fix introduces behavior not covered by existing tests, extend them to cover it (add a test case, not a whole new test file)

Do NOT assume what failed based on check name alone—always read the logs. Do NOT "quick fix and hope" — understand the failure thoroughly before changing code.

6. Verify Locally, Then Commit and Push

Before committing, verify your fixes locally:

• If you fixed a test failure: re-run that specific test locally
• If you fixed a lint/type error: re-run the linter or type checker on affected files
• For any code fix: run existing tests covering the changed code

If local verification fails, fix before proceeding — do not push known-broken code.

git add <files>
gh auth status -a
git commit --signoff -m "fix: <descriptive message>"
git push

Always add exactly one sign-off to each commit for the active authenticated GitHub user. Check gh auth status -a before committing to confirm the active account, use git commit --signoff, and do not add any other trailers, signatures, or tool attribution to commits or PR comments.

7. Monitor CI and Address Feedback

Poll CI status and review feedback in a loop instead of blocking:

1. Run python3 .claude/skills/iterate-pr/scripts/fetch_pr_checks.py to get current CI status
2. If all checks passed → proceed to exit conditions
3. If any checks failed (none pending) → return to step 5
4. If checks are still pending: a. Run python3 .claude/skills/iterate-pr/scripts/fetch_pr_feedback.py for new review feedback b. Address feedback based on mode:
   • Default mode: new high/medium
   • Merge modes: every new non-resolved item (high/medium/low/bot) and reply to each item c. If changes were needed, commit and push (this restarts CI) d. In merge modes, after each push, explicitly re-request review:
   • Prefer Gemini review command (/gemini review) when available
   • Otherwise request Copilot review by commenting @copilot review on the PR e. Sleep 30 seconds (don't increase on subsequent iterations), then repeat from sub-step 1
5. After all checks pass, do a final feedback check: sleep 10, then run python3 .claude/skills/iterate-pr/scripts/fetch_pr_feedback.py.
   • Default mode: address any new high/medium feedback; if changes are needed, return to step 6
   • Merge modes: address any new non-resolved item; if changes are needed, return to step 6 and re-request review

8. Repeat

If step 7 required code changes (from new feedback after CI passed), return to step 2 for a fresh cycle. CI failures during monitoring are already handled within step 7's polling loop.

In merge modes, continue looping until both conditions are true:

• CI checks are green
• No new non-resolved feedback is returned after the latest review request

9. Finish by Mode

• Default mode: stop after success conditions are met (do not merge automatically)
• merge: once CI is green and no new feedback remains, merge administratively - do not wait for a required-approval status to clear:

gh pr merge <PR_NUMBER> --admin --delete-branch

--admin uses the authenticated account's admin/maintainer permissions to bypass the required-approving-review branch-protection rule; it does not bypass or skip the CI-green and feedback-resolved checks this skill already enforces in steps 4-7, and it never fabricates or requests an approving review from another account. If the command fails (e.g. the authenticated account lacks admin/maintainer rights on the repo, or a check can't be bypassed), stop and surface the gh error to the user - do not retry under a different identity and do not fall back silently.

• --release: complete --merge mode merge, then cut a release:
  1. Find the draft release tag:
     bashCopy

     gh release list --repo layer5io/meshery-cloud --json tagName,isDraft --jq '.[] | select(.isDraft) | .tagName'
     

  2. Review draft notes:
     bashCopy

     gh release view vX.Y.Z --repo layer5io/meshery-cloud
     

  3. Publish the release:
     bashCopy

     gh release edit vX.Y.Z --repo layer5io/meshery-cloud --draft=false --latest
     

Exit Conditions

Success (default): All checks pass, post-CI feedback re-check is clean (no new unaddressed high/medium feedback including review bot findings), user has decided on low-priority items.

Success (merge): All checks pass, no new non-resolved feedback remains after the latest review request, every feedback item has a reply, and the PR is administratively merged (no wait on a required-approval status).

Success (--release): --merge success criteria are met and the draft GitHub release has been published.

Ask for help: Same failure after 2 attempts, feedback needs clarification, infrastructure issues, or gh pr merge --admin fails (insufficient permissions or an unbypassable check) - surface the error rather than retrying under a different identity or falling back silently.

Stop: No PR exists, branch needs rebase.

Fallback

If scripts fail, use gh CLI directly:

• gh pr checks --json name,state,bucket,link
• gh run view <run-id> --log-failed
• gh api repos/{owner}/{repo}/pulls/{number}/comments