Skip to content

fix(skills): approve after trivial follow-up to COMMENTED review #1659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
worktrunk-bot wants to merge 2 commits into from
Closed

fix(skills): approve after trivial follow-up to COMMENTED review #1659

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11d475c
fix(skills): approve after trivial follow-up to COMMENTED review
worktrunk-bot Mar 22, 2026
4b2bd9c
fix(skills): scope jq pipe in LAST_REVIEW filter to prevent runtime e…
worktrunk-bot Mar 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions .claude/skills/review-pr/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@ PR_AUTHOR=$(gh pr view <number> --json author --jq '.author.login')
# Uses "| length > 0" instead of "!= \"\"" to avoid bash ! history expansion.
# IMPORTANT: `gh pr view --json reviews` returns `.commit.oid` (NOT `.commit_id`).
# The REST API (`gh api .../reviews`) uses `.commit_id` — don't confuse the two.
LAST_REVIEW_SHA=$(gh pr view <number> --json reviews \
--jq "[.reviews[] | select(.author.login == \"$BOT_LOGIN\" and (.body | length > 0 or .state == \"APPROVED\"))] | last | .commit.oid // empty")
LAST_REVIEW=$(gh pr view <number> --json reviews \
--jq "[.reviews[] | select(.author.login == \"$BOT_LOGIN\" and ((.body | length) > 0 or .state == \"APPROVED\"))] | last | {sha: (.commit.oid // empty), state: (.state // empty)}")
LAST_REVIEW_SHA=$(echo "$LAST_REVIEW" | jq -r '.sha // empty')
LAST_REVIEW_STATE=$(echo "$LAST_REVIEW" | jq -r '.state // empty')
```

If `LAST_REVIEW_SHA == HEAD_SHA`, this commit has already been reviewed — exit
Expand All @@ -50,13 +52,21 @@ gh api "repos/$REPO/compare/$LAST_REVIEW_SHA...$HEAD_SHA" \
--jq '{total: ([.files[] | .additions + .deletions] | add), files: [.files[] | "\(.filename)\t+\(.additions)/-\(.deletions)"]}'
```

If the incremental changes are trivial, skip the full review **and do not
submit a new approval** — the existing review stands. Go directly to step 7 to
resolve any bot threads addressed by the new changes, then exit. Do NOT proceed
If the incremental changes are trivial, skip the full review — go directly to
step 7 to resolve any bot threads addressed by the new changes. Do NOT proceed
to steps 2, 3, or 4. Rough heuristic: changes under ~20 added+deleted lines
that don't introduce new functions, types, or control flow are typically
trivial.

After resolving threads, check `LAST_REVIEW_STATE`:
- **`APPROVED`** — the existing approval stands, do not submit a new one. Exit.
- **`COMMENTED`** (or any non-APPROVED state) — the prior review requested
changes that the trivial follow-up now addresses. Submit an approval:
```bash
gh pr review <number> --approve -b ""
```
Then proceed to step 6 (monitor CI).

@worktrunk-bot worktrunk-bot Mar 22, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This path doesn't check for self-authored PRs. Step 5 says "Do NOT attempt gh pr review --approve — GitHub rejects self-approvals." Consider:

Suggested change
Then proceed to step 6 (monitor CI).
gh pr review <number> --approve -b ""

Skip this step for self-authored PRs (PR_AUTHOR == BOT_LOGIN) —
GitHub rejects self-approvals.


Then read all previous bot feedback and conversation:

```bash
Expand Down
Loading