A procedure for cleaning up a Git working area when local changes, branches, or extra worktrees exist. Git is the version-control system used to track code and collaborate on changes.

Use it to classify local changes, remove unwanted branches and worktrees, update the default branch, and verify a clean status.

It restores one clean checkout on the default branch while requiring confirmation before destructive cleanup in an attended session.

git-cleanup — Skill for Claude Code and Codex by ShaftHQ/SHAFT

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.

Any agent

npx skills add ShaftHQ/SHAFT_ENGINE --skill git-cleanup

Clone the repo

git clone --depth 1 https://github.com/ShaftHQ/SHAFT_ENGINE

Made for: Claude Code, Codex.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

README.md

[![agentmods](https://agentmods.dev/badge/skills/shafthq/shaft_engine/git-cleanup/github.svg)](https://agentmods.dev/skills/shafthq/shaft_engine/git-cleanup)

Your own site

<a href="https://agentmods.dev/skills/shafthq/shaft_engine/git-cleanup"><img src="https://agentmods.dev/badge/skills/shafthq/shaft_engine/git-cleanup/github.svg" alt="Measured on agentmods" height="20"></a>

Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.

Your own site · 80×15

<a href="https://agentmods.dev/skills/shafthq/shaft_engine/git-cleanup"><img src="https://agentmods.dev/badge/skills/shafthq/shaft_engine/git-cleanup.svg" alt="Reviewed on agentmods" width="80" height="20"></a>

Per session 30 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.

When invoked 448 The whole file, excluding the scripts and references it only reads on demand.

Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe.

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.

Model	Per session	Once invoked
Fable 5.1	$0.00030	$0.00448
Opus 5.5	$0.00012	$0.00179
Sonnet 5.5	$0.00006	$0.00090
Haiku 4.5	$0.00003	$0.00045

Measured 16d ago against content hash 5fadb4989b97, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade A, and why

git-cleanup 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 16d ago.

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.

chaos-engine/skills/git-cleanup/SKILL.md · 34 lines

What it actually says

Git cleanup

One checkout on the configured default branch. HEAD equals that remote tip. git status is clean.

When

The worktree is dirty, or another local branch or linked worktree exists.

Attended: ask first, and explain this procedure before changing anything. Unattended: decide and run it.

Procedure

Name the configured default branch from the remote HEAD or the selected profile. Do not hardcode a repository branch name. This is the repository-scope recipe in cleanup-scopes. Do not fork a second policy.

Fetch and prune the configured upstream. Inventory dirty and untracked paths, extra local branches, linked worktrees, locks, and unique commits before mutation.
Classify each dirty or untracked path as land (commit, push, pull request, merge), delete, or gitignore. Halt on a locked or concurrently owned worktree.
Check out the configured default branch in the primary checkout and fast-forward it so HEAD equals the remote tip and git status is clean.
Remove extra linked worktrees only after that classification, and only when they are clean, unlocked, and not concurrently owned. Then remove a recreated local branch only when git branch -r --contains shows that exact tip on an origin ref. Also remove extra local branches that are fully merged into the remote tip, or whose unique commits were explicitly authorized for discard.
Check out the configured default branch and fast-forward it. Write the verification transcript in the same process, after that fast-forward. Do not check out another branch afterward.

Done

One checkout, only the configured default branch, HEAD equals that remote tip, and git status is clean.

Limits

Do not stash. Do not reset --hard. Do not force-push. Do not use --force-with-lease. Do not delete remote branches. Do not rewrite remote history. Do not discard unique commits without explicit authorization. Do not commit generated plugin directories.

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.

16d ago Changed · +3 lines 5fadb4989b97
17d ago First seen · 31 lines · 30 tokens per session scan A 630656457670

Subscribe to this mod's changes

git-cleanup is a skill published in the GitHub repository ShaftHQ/SHAFT_ENGINE (414 stars, last pushed yesterday), licensed MIT. It adds 30 tokens to every session and 448 once invoked, about $0.0001 per session on Opus 5.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-09-30.

Git and workflow Java automation automation-engine test-automation test-automation-framework testing-tools

release-notes

Update CHANGELOG.md and README.md for an Azure SDK for Java package based on a GitHub PR. Use when the user wants to write or update release notes, changelogs, or readme docs from a PR reference.

Azure/azure-sdk-for-java · 50 tokens

codegen

Generate code from TypeSpec via tsp-client (update, sync, generate). Requires a tsp-location.yaml in the current working directory. Supports updating the commit hash before running.

Azure/azure-sdk-for-java · 37 tokens

feature-workflow

Taking a multi-PR feature from "shape unknown" to merged without five review rounds per PR: spike until interfaces stop moving, write the contract, cut PRs along contract seams, one review per PR. Use when starting a feature that touches more than one lifecycle object or public interface, when a PR review keeps…

apache/tika · 77 tokens

git-cleanup