菜单
Phase 4 of the PLEXI ship pipeline. Takes an approved PR number, squash-merges to alpha, closes the issue, and cleans up. Input: PR number. Output: merged alpha.
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
基于 SOC 职业分类
| name | merge-pr |
| description | Phase 4 of the PLEXI ship pipeline. Takes an approved PR number, squash-merges to alpha, closes the issue, and cleans up. Input: PR number. Output: merged alpha. |
| risk | medium |
| source | local |
| date_added | 2026-05-20 |
Phase 4 of the ship pipeline. Input: approved PR number. Output: clean alpha with the PR merged. Version bumps happen later at release-batch or promotion time.
Labels are the live state. On success, all
pipeline:*labels are removed when the issue closes. On failure, remove allpipeline:*labels andin progress, addready.
Stint timing closure. Close linked stint tasks with
stint done <task-id>after the script exits 0.Pane slots. Source
.agents/skills/_lib/pipeline-slots.shand publishpipeline_slots_set merge "$ISSUE" "$PR_NUMBER" <status> "" <last-error>at status changes.
Entry: /merge-pr <pr-number>
cd "$(git rev-parse --show-toplevel)"
plexi${PLEXI_CHANNEL:+-$PLEXI_CHANNEL} pane name "#<n> · merging"
pipeline_slots_set merge "$ISSUE" "$PR_NUMBER" merging "" ""
Labels are already correct when invoked inline from validate-pr. No label edit needed here.
just merge-pr <PR_NUMBER>
Handles: rebase, squash-merge, alpha sync, artifact cleanup, issue close, ship log.
If it exits non-zero, read the error and recover with sub-steps:
| Error | Recovery |
|---|---|
| Rebase conflict | Resolve in worktrees/$BRANCH, then: just merge-rebase $BRANCH → just merge-squash $PR → continue below |
| PR already merged | just merge-sync && just merge-cleanup $PR $BRANCH && just merge-close $ISSUE $PR |
| Dirty root worktree | Commit or restore changed files, re-run just merge-pr $PR |
>1 unexpected commits on local alpha | Investigate before proceeding; do not force-reset blindly |
could not resolve GitHub issue or stint tasks | Only if the PR genuinely has nothing to close (standalone follow-up): just merge-pr $PR no-issue. Otherwise fix the PR body's closing keyword first. |
Available sub-steps:
just merge-rebase <BRANCH> # fetch + rebase feature branch on origin/alpha + force-push
just merge-squash <PR> # squash-merge only
just merge-sync # reset local alpha to origin/alpha (safe: fails if >1 unexpected commit)
just merge-cleanup <PR> <BRANCH> # channel-clean + wtp remove + remote branch delete
just merge-close <ISSUE> <PR> # strip pipeline labels + close issue + append ship log
rg -l 'gh_issue: .*"<issue>"|gh_issue: .*\[<issue>\]' .stint/tasks
stint done <task-id>
If estimate was off >2x, add one sentence to the task body explaining why. If no linked task exists, note it in the ship log.
Do not run a full whats-next audit here. stint list + stint status + git log + gh pr list followed by a rewrite of WHATS_NEXT.md costs four commands and a regenerated file on every merge; in a babysitter queue that repeats per batch and the intermediate rewrites are all thrown away by the next one.
Run /whats-next once at the end of a session (or after a batch of merges lands) instead. If you are merging a single PR interactively and want the file current, invoking /whats-next yourself afterward is the cheap path — it is the same work, done once.
gh issue-ext blocking list $ISSUE --json number,title,state 2>/dev/null
For each open blocked issue, check if all blockers are now closed. If so:
gh issue edit <n> --remove-label "blocked" --add-label "ready"
git status # must be clean
Output exactly this block — nothing after it, no RECOMMENDATION:
[COMPLETE]
| | |
|---|---|
| PR | #<n> — <title> |
| Issue | #<issue> — <title> / no-issue |
| Alpha | <short-sha> |
| Stint | <task-id> closed / none |
plexi${PLEXI_CHANNEL:+-$PLEXI_CHANNEL} pane name "#<n> · done"
pipeline_slots_set merge "$ISSUE" "$PR_NUMBER" done "" ""
plexi pane close
Soft exit (deferred threads): use needs-you pane status instead of done; do not call plexi pane close.
just install is the user's responsibility post-merge--delete-branch to gh pr merge — git refuses to delete a branch checked out by a worktreejust merge-pr exits 0blocked, run pipeline_slots_set merge "$ISSUE" "$PR_NUMBER" blocked "" "<error summary>", comment on issue, remove in progress + all pipeline:* labels, add ready, exitLand a queue of stint tasks as fast as possible by orchestrating agent instances (Claude or Codex, launched via size-tier aliases) in Plexi panes. You give it stints (or sprints); it spawns every pane it needs: a WORKER pane implements each batch and opens one PR, a separate fresh TESTER pane validates the PR against the real install build, bugs route between them until it passes, then merge and fresh panes for the next batch. The head relays itself to a fresh pane after every merge via RUN_STATE.md. You are the router, never the coder. Checks in every 10 min. Triggered by /babysitter, "babysit the queue", "queue these stints".
Phase 1 of the PLEXI ship pipeline when work is selected from .stint. Resolves a stint task, claims it (stint owns state — no git commit needed), branches a feature worktree from alpha HEAD, implements the task, pushes the branch, then hands off to /open-pr.
Phase 2 of the PLEXI ship pipeline. Takes a pushed feature branch, creates a PR targeting alpha, updates pipeline labels, and invokes /validate-pr inline. Input: branch name or auto-detect from CWD. Output: PR URL.
Phase 3 of the PLEXI ship pipeline. Installs a PR build, generates test instructions, handles user pass/fail/modify responses, and manages the retry loop (max 3 soft rejects before escalating to hard reject). Input: PR number. Output: approved PR number or hard-reject.
Use this skill when the user wants to add a stint task, create a ticket, track a unit of work, file a bug, propose a feature, or log something to .stint/. Triggered by phrases like "add a task", "create a stint", "new task", "track this", "file a bug", "log a ticket", or when planning work that should go in the operating graph.
Agent self-validation before push. Classifies the diff (host logic / host UI / PGAP app), runs the matching harness tests, generates headless render screenshots as evidence, and writes a Test Evidence block for the Ship Log that validate-pr uses to decide whether binary install can be skipped. Invoked inline by implement-issue and implement-stint after cargo build passes, before git push.