clawstash: Skill for Claude Code

Rollback — Recovery Workflow

When to Use

• User says "/rollback", "rollback", "revert", "undo", "restore"
• Agent broke main / merged a bad PR / pushed a defect / corrupted a branch

Scope Boundaries

Owns: reversing git state that already exists — uncommitted changes, local commits, pushed commits, an open or merged PR, a deleted branch. Does not own: diagnosing why it broke (stuck), fixing a red build forward instead of backward (ci), reversing a deployment (CLAUDE.md → Deployment). Reaching for it to escape a confusing state rather than a broken one is the wrong skill: that is stuck.

Auto-Detect Target

git rev-parse --abbrev-ref HEAD
git status --porcelain
git log -1 --pretty='%H %s'
git log @{u}..HEAD --oneline 2>/dev/null  # local-only commits
git log HEAD..@{u} --oneline 2>/dev/null  # behind upstream
gh pr list --head $(git rev-parse --abbrev-ref HEAD) --json number,state 2>/dev/null

Decision matrix:

State	Action
Uncommitted local changes only	Phase A (discard working tree, opt-in)
Local commits, not pushed	Phase B (reset back N commits)
Pushed commits on feature branch	Phase C (revert + push, or force-with-lease — explicit)
Pushed to main + bad commit on top	Phase D (revert + push)
Merged PR causing breakage	Phase E (revert PR via gh)
Branch deleted by mistake	Phase F (restore from reflog / origin)

Always print the detected state and proposed action before executing:

Detected: pushed 2 commits to feature/x; latest broke build.
Proposed: git revert HEAD~1..HEAD && git push (no force).
Proceed? (yes/no)

Unattended ($CLAUDE_CODE_REMOTE=true): nobody answers Proceed?, and a run that waits for it is a dead run (CLAUDE.md → Autonomy). The phases split by what they destroy. Phases C, E and F add commits or restore a ref — they run without the prompt, and the detection line above becomes a report line. Phase D is the exception among the additive phases: its direct push to the default branch is interactive-only. Unattended, a bad commit on the default branch takes the Phase E path — revert commit on its own branch, revert PR, merge through the pr skill's gate — because a run that pushes straight to the default branch breaks the repo's own branch rule, whatever it pushes. Phases A and B and every force operation destroy work: they run unattended only when the instruction that invoked this skill ordered exactly that (the stuck skill's unattended step ordering the loop work discarded is one); otherwise skip, report the proposed command, and continue with what does not depend on it.