Menu
Rebases one branch onto a new base with conflict delegation and optional force-push lease. Use when a branch needs safe direct rebasing.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Based on SOC occupation classification
Build a throwaway prototype to answer a design question. Use when the user wants to sanity-check whether a state model or logic feels right, or explore what a UI should look like.
Splits a large branch or PR into smaller, independently reviewable units by grouping changes and proposing parallel PRs or a stacked series. Use when a changeset is too big to review well and should be broken up.
Captures the portable, non-secret pi config from a live ~/.pi/agent into this repo's pi/ directory and commits it, without reading or copying secrets. Use when live pi config or extensions have drifted from the repo and need to be synced back.
Refreshes PR titles and descriptions to match the current branch changeset. Use when the PR title or body has drifted from the code.
Reviews the current session for problems and their eventual fixes, then proposes durable improvements to repo skills, scripts, or docs that prevent recurrence. Use when a session hit avoidable friction worth turning into a lasting fix.
Runs discovery and uncertainty resolution for a change, then writes a terse plan document covering purpose, behaviour, validation, architecture, and phased vertical slices. Use before building when a change needs a clear, agreed design.
| name | rebase |
| description | Rebases one branch onto a new base with conflict delegation and optional force-push lease. Use when a branch needs safe direct rebasing. |
Single-branch rebase executor for standard and transplant (--onto) rebases.
Delegate conflict handling to conflicts.
Follow CLAUDE.md / AGENTS.md on conflict.
branch (default current).new_base (required).old_base_tip for transplant mode.push (default true).expected_remote_sha for strict lease.--onto) per inputs.conflicts until rebase completes.--force-with-lease when enabled.--force-with-lease, never plain --force.conflicts.--force-with-lease is rejected, stop and reconcile rather than overwriting.old_base_tip; require explicit input from the caller or ask.Report branch and before -> after SHA, mode used, conflict handling status, push/lease result, and any stop-and-ask gates.