pull-requests
GitHub提供仓库内 Pull Request 的创建、管理及合并规范,包括署名脚注格式、生命周期规则及 CI 验证流程。指导 Agent 如何正确提交 PR、处理冲突及等待检查状态,确保代码合并符合团队标准。
Trigger Scenarios
Install
npx skills add coder/xum --skill pull-requests -g -y
SKILL.md
Frontmatter
{
"name": "pull-requests",
"description": "Guidelines for creating and managing Pull Requests in this repo"
}
Pull Request Guidelines
Attribution Footer
Public work (issues/PRs/commits) must use 🤖 in the title and include this footer in the body:
---
_Generated with `xum` • Model: `<modelString>` • Thinking: `<thinkingLevel>` • Cost: `$<costs>`_
<!-- mux-attribution: model=<modelString> thinking=<thinkingLevel> costs=<costs> -->
Always check $XUM_MODEL_STRING, $XUM_THINKING_LEVEL, and $XUM_COSTS_USD via bash before creating or updating PRs—include them in the footer if set.
Scheduled automation (non-AI) commits and PRs from GitHub Actions workflows use this footer instead, since model/thinking/cost do not apply:
---
_Automated by the `<workflow-name>` workflow (GitHub Actions)._
<!-- xum-attribution: workflow=<workflow-name> -->
Lifecycle Rules
- Before submitting a PR, ensure the branch name reflects the work and the base branch is correct.
- PRs are always squash-merged into
main. - Often, work begins from another PR's merged state; rebase onto
mainbefore submitting a new PR.
- PRs are always squash-merged into
- Reuse existing PRs; never close or recreate without instruction.
- Force-push minor PR updates; otherwise add a new commit to preserve the change timeline.
- If a PR is already open for your change, keep it up to date with the latest commits; don't leave it stale.
- When updating a PR, ensure the title and body describe the entire diff against the base branch—not just the most recent commit or push.
- Never enable auto-merge or merge into
mainyourself. The user must explicitly merge PRs.
CI & Validation
- Prefer local validation first (e.g.,
make static-checkor a targeted test subset) because CI waiting can take 10+ minutes. - Use
./scripts/wait_pr_ready.sh <pr_number>as the default last-step helper when there's no more useful local work left. wait_pr_ready.shpolls the Codex, CI checks, and (when requested)coder-agents-reviewgates together and fails fast on the first terminal failure.- Use
./scripts/wait_pr_checks.sh <pr_number>and./scripts/wait_pr_codex.sh <pr_number>directly only when you need to debug a specific gate. - If asked to fix an issue in CI, first replicate it locally, get it to pass locally, then use
wait_pr_ready.sh.
Status Decoding
| Field | Value | Meaning |
|---|---|---|
mergeable |
MERGEABLE |
Clean, no conflicts |
mergeable |
CONFLICTING |
Needs resolution |
mergeStateStatus |
CLEAN |
Ready to merge |
mergeStateStatus |
BLOCKED |
Waiting for CI |
mergeStateStatus |
BEHIND |
Needs rebase |
mergeStateStatus |
DIRTY |
Has conflicts |
If behind: git fetch origin && git rebase origin/main && git push --force-with-lease.
Codex Review Workflow
When posting multi-line comments with gh (e.g., @codex review), do not rely on \n escapes inside quoted --body strings (they will be sent as literal text). Prefer --body-file - with a heredoc to preserve real newlines:
gh pr comment <pr_number> --body-file - <<'EOF'
@codex review
<message>
EOF
Handling Codex Comments
Use these scripts to check, resolve, and wait on Codex review comments:
./scripts/check_codex_comments.sh <pr_number>— Lists unresolved Codex comments (both regular comments and review threads). Outputs thread IDs needed for resolution../scripts/resolve_pr_comment.sh <thread_id>— Resolves a review thread by its ID (e.g.,PRRT_abc123)../scripts/wait_pr_codex.sh <pr_number>— Waits for Codex-only status (or one-shot status with--once)../scripts/wait_pr_ready.sh <pr_number>— Unified Codex + CI gate poller (preferred for normal PR readiness loops).
The PR readiness definition, the review loop, and its early-stop cases live in the PR Workflow section of AGENTS.md; follow them there.
Coder Agents Review Workflow
When /coder-agents-review is used or the coder-agents-review bot has participated:
- Address each substantive finding.
- Reply to the bot before resolving threads: either inline on each finding or with a PR comment that explicitly lists the finding IDs and your response.
- Resolve addressed review threads.
- Re-request review with
/coder-agents-review. - Run
./scripts/wait_pr_ready.sh <pr_number>.
Do not silently resolve coder-agents-review threads. The bot treats resolved-but-unanswered findings as blocked review rounds.
PR Title Conventions
- Title prefixes:
perf|refactor|fix|feat|ci|tests|bench - Example:
🤖 fix: handle workspace rename edge cases - Use
tests:for test-only changes (test helpers, flaky test fixes, storybook) - Use
ci:for CI config changes
PR Bodies
Structure
PR bodies should generally follow this structure; omit sections that are N/A or trivially inferable from the code.
- Summary
- Single-paragraph executive summary of the change
- Background
- The "why" behind the change
- What problem this solves
- Relevant commits, issues, or PRs that capture more context
- Implementation
- Explain anything novel or unclear about the implementation approach
- Keep it generally high-level and architectural
- Validation
- Steps taken to prove the change works as intended
- Avoid boilerplate like
ran tests; include this section only for novel, change-specific steps - Do not include steps implied by passing PR checks
- Risks
- PRs that touch intricate logic must include an assessment of regression risk
- Explain regression risk in terms of severity and affected product areas
- Pains
- Only include for non-trivial changes that took multiple iteration cycles
- Explain codebase or environment pains that slowed down planning, implementation, or validation
Edits
Always use mktemp to create a unique temp file for the PR body — never use a
hard-coded path like /tmp/pr-body.md (concurrent agents will race):
PR_BODY=$(mktemp /tmp/pr-XXXXXX.md)
Use file edit tools to build the body in $PR_BODY, then:
gh pr edit <num> --body-file "$PR_BODY"
rm -f "$PR_BODY"
When updating the PR body, consider condensing information that is no longer important into a toggle.
Upkeep
Once the code is pushed to the remote (even if not yet a Pull Request), commit and push all changes before responding so they are visible to the user. Commits on the working branch are for yourself to understand the change, they do not have to follow repository conventions as the PR body and title become the commit subject and body respectively.
Whenever generating a compaction summary, include whether or not a Pull Request was opened and the general state of the remote (e.g. CI checks, known reviews, divergence).
Version History
- 39414c7 Current 2026-09-28 10:28
- c3aa2a6 2026-08-28 21:04


