Arguments

$ARGUMENTS should be a GitHub PR URL (e.g., https://github.com/owner/repo/pull/123)

Instructions

Parse the PR URL from $ARGUMENTS to extract:
- Owner
- Repository name
- PR number
If $ARGUMENTS is empty or not a valid GitHub PR URL, ask the user to provide one.
Ask the user which rebase method they prefer:
- Local rebase (signed commits) - Rebases locally using your GPG key, then pushes. Commits will show as "Verified" with your signature.
- Remote rebase (unsigned) - Uses GitHub API to rebase server-side. Faster but commits won't be signed.

If remote rebase: Use the GitHub CLI:

gh api repos/{owner}/{repo}/pulls/{pr_number}/update-branch \
  -X PUT \
  -f update_method=rebase

If local rebase: Perform a safe local rebase:

a. Get PR details (head branch, base branch):
```
gh pr view {pr_number} --repo {owner}/{repo} --json headRefName,baseRefName
```
b. Check if the current branch matches the PR's head branch:
```
git branch --show-current
```
c. If on the same branch as the PR (current branch == head branch):

Fetch and rebase directly:
```
git fetch origin
git rebase origin/{base_branch}
```
If rebase succeeds, force push:
```
git push --force-with-lease
```
d. If on a different branch: Use a temporary worktree to avoid disrupting the current working state:

i. Create a temporary worktree (run from main repo, not /tmp): bash git worktree add /tmp/rebase-pr-{pr_number} -b temp-rebase-{pr_number}

ii. Fetch latest refs and reset the temp branch to the PR head. Important: Don't use gh pr checkout - it fails if the branch is checked out elsewhere. Instead, fetch and reset: bash git -C /tmp/rebase-pr-{pr_number} fetch origin git -C /tmp/rebase-pr-{pr_number} reset --hard origin/{head_branch}

iii. Rebase onto the base branch: bash git -C /tmp/rebase-pr-{pr_number} rebase origin/{base_branch}

iv. If rebase succeeds, force push to the PR branch: Important: Push from temp branch to the actual PR branch name. bash git -C /tmp/rebase-pr-{pr_number} push origin temp-rebase-{pr_number}:{head_branch} --force-with-lease

v. Clean up the temporary worktree. Important: Run cleanup from the main repo directory, never from inside the worktree. bash git worktree remove /tmp/rebase-pr-{pr_number} git branch -D temp-rebase-{pr_number}

After a successful rebase, comment on the PR:

gh pr comment {pr_number} --repo {owner}/{repo} --body "Rebased with Claude Code."

Report the result to the user:
- On success: Confirm the PR was rebased (and whether commits are signed)
- On failure: Explain the error (common issues: conflicts exist, rebase not allowed, PR already up to date)
- If conflicts occur during local rebase, clean up the worktree and inform the user they need to resolve conflicts manually