prepare-pr-v1_skill

Overview

This skill prepares a GitHub pull request head branch for merge by rebasing onto origin/main, applying required review fixes, running required gates, committing prep changes, and pushing only to the PR head branch. It produces deterministic handoff artifacts (.local/prep.md and .local/prep.env) and finishes with a clear ready signal for the merge step. It never merges or pushes to main.

How this skill works

The skill creates an isolated Git worktree and loads existing review artifacts (.local/review.md and .local/pr-meta.env). It fetches PR metadata, fetches and rebases the PR head onto origin/main, applies BLOCKER and IMPORTANT fixes, runs build/check/test gates (with a documented docs-only skip option), commits prep changes with a standardized subject, and pushes back to the PR head repo and branch using a force-with-lease flow. On success it writes .local/prep.md and .local/prep.env and prints the final ready message.

When to use it

• After completing /review-pr and saving .local/review.md and .local/pr-meta.env
• When the PR must be rebased onto latest origin/main and prepared for handoff
• When BLOCKER or IMPORTANT review items require code changes before merge
• Before a maintainer performs the final merge step (/mergepr)
• When you need deterministic artifacts for the merge handoff

Best practices

• Always work in the isolated worktree produced by the skill; do not modify the main worktree
• Fix only BLOCKER and IMPORTANT review items; keep scope tight and log changes in .local/prep.md
• Do not run destructive git or system commands (never git clean -fdx, never kill processes, never push to main)
• Use the provided committer script and required commit subject format that includes openclaw#<PR> and thanks @<author>
• Run pnpm build and pnpm check; run pnpm test unless the change meets high-confidence docs-only criteria and that skip is recorded

Example use cases

• Rebasing a contributor branch onto the latest main and resolving merge conflicts before handoff
• Applying reviewer-blocking fixes discovered during /review-pr and re-running gates
• Preparing a docs-only PR for merge with recorded skip of tests and clear prep artifacts
• Retrying a push when the remote branch moved by validating remote SHA and rerunning gates
• Producing .local/prep.md and .local/prep.env to hand off deterministic details to the merger