메뉴
Use when branches in a stacked-PR chain have diverged from their parents and need rebasing — runs the full stack rebase using --update-refs, then force-pushes each moved branch and reconciles its PR body.
Codex 또는 Claude로 설치 이 Prompt를 복사해 Codex, Claude 또는 다른 어시스턴트에 붙여 넣으면 Skill 페이지를 검토하고 설치를 진행할 수 있습니다.
SOC 직업 분류 기준
| name | stack-restack |
| description | Use when branches in a stacked-PR chain have diverged from their parents and need rebasing — runs the full stack rebase using --update-refs, then force-pushes each moved branch and reconciles its PR body. |
| when_to_use | Reach for this after a teammate pushes to a parent branch or after you amend a commit mid-stack and subsequent branches fall behind. Run /stack-status first to confirm which branches are diverged, then run this to rebase the whole chain in one shot. Do NOT use when the parent branch was squash-merged and its commits now appear duplicated on the child — that is the squash-merge re-parent case; use /stack-reparent instead. |
| disable-model-invocation | true |
| allowed-tools | ["Bash(git *)","Bash(gh *)"] |
| argument-hint | [<top-branch> [<base>]] |
| scheduling | one or more branches in the stack are diverged from their parent and need rebasing |
| structural | ["Run pre-flight checks via preflight.sh (detached-head, dirty-tree, rebase-in-progress)","Run restack.sh to rebase the chain with --update-refs","Force-push each branch restack.sh reports as moved via safe-push.sh","Refresh each moved PR body via pr-body.sh piped to gh pr edit"] |
| logical | every branch in the stack is rebased onto its parent, its remote ref matches its local tip, and its PR body reflects the updated diff |
Rebase every branch in a stacked-PR chain onto its recorded parent, force-push each moved branch, and refresh each PR body so the diff shown on GitHub stays accurate.
/stack-restack
/stack-restack <top-branch>
/stack-restack <top-branch> <base>
With no arguments the skill uses the current branch as the top and reads its base from the stack graph.
# 1. Pre-flight checks
bash plugins/stack-flow/skills/_lib/preflight.sh detached-head
bash plugins/stack-flow/skills/_lib/preflight.sh dirty-tree
bash plugins/stack-flow/skills/_lib/preflight.sh rebase-in-progress
# 2. Rebase the chain
MOVED=$(bash plugins/stack-flow/skills/_lib/restack.sh <top-branch> [<base>])
# 3. For each branch printed by restack.sh
for branch in $MOVED; do
bash plugins/stack-flow/skills/_lib/safe-push.sh "$branch"
bash plugins/stack-flow/skills/_lib/pr-body.sh "$branch" | gh pr edit "$branch" --body-file -
done
restack.sh uses git rebase --update-refs so intermediate branches are rebased in a single pass; it prints the names of every branch whose tip moved to stdout.
bash plugins/stack-flow/skills/_lib/preflight.sh detached-headbash plugins/stack-flow/skills/_lib/preflight.sh dirty-treebash plugins/stack-flow/skills/_lib/preflight.sh rebase-in-progressbash plugins/stack-flow/skills/_lib/restack.sh <top-branch> [<base>] — capture stdout (list of moved branches)bash plugins/stack-flow/skills/_lib/safe-push.sh <branch>bash plugins/stack-flow/skills/_lib/pr-body.sh <branch> | gh pr edit <branch> --body-file -restack.sh calls git rebase --abort on conflict and exits non-zero, leaving no partial state behind. The working tree is restored to its pre-rebase position. Resolve the conflict on the specific branch first, then re-run.safe-push.sh rejects the push when another process pushed to the same branch since the last fetch. Fetch (git fetch origin <branch>) then retry.preflight.sh rebase-in-progress exits non-zero before any rebase runs. Resolve the in-progress rebase (git rebase --continue or --abort) then re-run.preflight.sh dirty-tree stops the run if tracked files are modified. Commit or stash changes before restacking.Use when the user describes a multi-step feature or refactor and you need to decide whether to handle it solo, dispatch a parallel `/fan-out`, or run a `/worktree-team` planner→generator→reviewer pipeline. Outputs a routing recommendation with the reasoning behind it.
Use whenever the user asks to apply the same operation to many independent files or components — bulk migration, batch refactor across controllers, parallel exploration of unrelated subsystems. Dispatches one subagent per file with a shared prompt template, then collects the results.
Use to toggle the safe-mode flag at .claude/safe-mode. The flag is written automatically by consecutive-failure-guard once tool failures hit FORGE_SAFE_MODE_THRESHOLD (default 5), and block-destructive.sh denies every Bash/Write/Edit while it exists. /safe-mode off clears the flag, logs the exit, and prompts /postmortem; /safe-mode on enters manually; /safe-mode status reports current state.
Run the 5-stage Token Transformation Pipeline (TRAE §5.2.2) over the current session state — Collection, Ranking, Compression, Budgeting, Assembly. Emits a concrete next-action recommendation (/compact, /lean-md, or /progress-log + fresh session) instead of a generic warning.
Audit or scaffold a CLAUDE.md against the Karpathy 4-section structure (Think Before Coding · Simplicity First · Surgical Changes · Goal-Driven Execution). Companion to /lean-md — structure audit, not size trim.
Print every policy enforcement point declared in plugins/diagnostics/registry/policies.json — id, verdict, plugin, hook event, severity, bypass — grouped by verdict. Single discoverable index of what the harness blocks, anchors, nudges, or logs at runtime.