rollback

A recovery procedure for undoing changes in a Git repository, such as local edits, commits, pushes, or merged pull requests. It first identifies the current state and then selects a reversal method.

In plain words
What is it for?
Use it to undo uncommitted work, local commits, pushed commits, broken changes on the main branch, merged pull requests, or accidentally deleted branches.
Why use it?
It helps restore a project after a bad change while accounting for whether the change was shared with others.

Skill for Claude CodeCodex

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

agentmods
npx agentmods add skills/fo0/clawstash/rollback
Any agent
npx skills add fo0/clawstash --skill rollback
Clone the repo
git clone --depth 1 https://github.com/fo0/clawstash

Made for: Claude Code, Codex.

Per session 82 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,263 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5 $0.00082 $0.01263
Opus 5 $0.00041 $0.00632
Sonnet 5 $0.00016 $0.00253
Haiku 4.5 $0.00008 $0.00126

Measured yesterday against content hash a3e159bd1ce0, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

rollback scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured yesterday.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

.claude/skills/rollback/SKILL.md · 143 lines

How it starts

The opening of the file, as written. The whole thing — 143 lines — stays where its author put it; the contents beside it link to each section on GitHub.

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

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)

Phase A — Discard uncommitted changes

User must explicitly confirm. Loses local work.

git diff --stat            # show what will be lost
# Wait for user "yes"
git restore --staged .
git restore .

Phase B — Reset local-only commits

git log @{u}..HEAD --oneline    # confirm range
# Wait for user "yes"
git reset --hard HEAD~N         # N = number of unpushed commits

Phase C — Revert pushed commits on feature branch

Default: revert (preserves history). Force-push only on explicit user request.

Read the full file on GitHub · 143 lines

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. yesterday First seen · 143 lines · 82 tokens per session scan A a3e159bd1ce0

Subscribe to this mod's changes

rollback is a skill published in the GitHub repository fo0/clawstash (1 stars, last pushed yesterday), licensed MIT. It adds 82 tokens to every session and 1,263 once invoked, about $0.0004 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-31.

Related

Other skills, from other repositories

design-mcp-server

Design the tool surface, resources, and service layer for a new MCP server. Use when starting a new server, planning a major feature expansion, or when the user describes a domain/API they want to expose via MCP. Produces a design doc at docs/design.md that drives implementation.

cyanheads/obsidian-mcp-server · 62 tokens

api-canvas

DataCanvas primitive reference — a Tier 3 SQL/analytical workspace for tabular MCP servers, backed by DuckDB. Use when registering tables from upstream APIs, running ad-hoc SQL across them, and exporting results. Covers the acquire → register → query → export flow, per-table TTL, the token-sharing pattern for…

cyanheads/obsidian-mcp-server · 85 tokens

api-telemetry

Catalog of OpenTelemetry instrumentation built into framework @cyanheads/mcp-ts-core — spans, metrics, completion logs, env config, runtime caveats, custom instrumentation patterns, and cardinality rules. Use when enabling OTel export, adding custom spans or metrics in services, debugging missing telemetry, looking up…

cyanheads/obsidian-mcp-server · 85 tokens

maintenance

Investigate, adopt, and verify dependency updates — with special handling for @cyanheads/mcp-ts-core. Captures what changed, understands why, cross-references against the codebase, adopts framework improvements, syncs project skills, and runs final checks. Supports two entry modes: run the full flow end-to-end, or…

cyanheads/obsidian-mcp-server · 75 tokens

add-test

Scaffold a test file for an existing tool, resource, or service. Use when the user asks to add tests, improve coverage, or when a definition exists without a matching test file.

cyanheads/obsidian-mcp-server · 41 tokens

polish-docs-meta

Finalize documentation and project metadata for a ship-ready MCP server. Use after implementation is complete, tests pass, and devcheck is clean. Safe to run at any stage — each step checks current state and only acts on what still needs work.

cyanheads/obsidian-mcp-server · 54 tokens