worktree-done

A cleanup procedure for removing a Git worktree, returning the main checkout to its base branch, and deleting the related feature branch. A worktree is a separate working directory linked to the same Git repository.

In plain words
What is it for?
Use it after completing work started in a worktree, for requests such as removing or cleaning up the current worktree.
Why use it?
It removes temporary worktree and branch state after feature work is finished, while first checking that the current directory really is a worktree.

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/dkmqflx/git-workflow-plugin/worktree-done
Any agent
npx skills add dkmqflx/git-workflow-plugin --skill worktree-done
Clone the repo
git clone --depth 1 https://github.com/dkmqflx/git-workflow-plugin

Made for: Claude Code, Codex.

Per session 111 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 749 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.00111 $0.00749
Opus 5 $0.00056 $0.00375
Sonnet 5 $0.00022 $0.00150
Haiku 4.5 $0.00011 $0.00075

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

Security

Grade A, and why

worktree-done 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.

plugins/git-workflow/skills/worktree-done/SKILL.md · 53 lines

How it starts

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

Worktree Done

Remove the current git worktree, switch the main checkout to the base branch, and delete the feature branch.

Use this when finishing work that was started with the worktree skill (or /worktree).

When to apply

Cleaning up after work done inside a worktree. Do not apply from the main checkout — that is branch-done.

Steps

  1. Verify the current directory is inside a worktree (not the main checkout).
    • Compare git rev-parse --git-dir and git rev-parse --git-common-dir. If they are equal, this is the main checkout — stop and tell the user to use the branch-done skill instead.
  2. Record the current worktree path (git rev-parse --show-toplevel) and current branch name (git rev-parse --abbrev-ref HEAD).
  3. Determine the base branch:
    • If a dev branch exists locally or on the remote (git show-ref --verify --quiet refs/heads/dev or refs/remotes/origin/dev), the base is always dev. Stop here — do not fall through, whatever origin/HEAD points at.
    • Otherwise try git symbolic-ref refs/remotes/origin/HEAD and strip the refs/remotes/origin/ prefix.
    • If that fails, use the first of main, master that exists locally (git show-ref --verify --quiet refs/heads/<name>).
    • If none exist, stop and ask the user which branch is the base.
  4. If the recorded branch is the base branch (or is itself dev, main, or master), stop and notify the user.
  5. Check for uncommitted changes (git status --porcelain). If any exist, stop and report them — do not force removal.
  6. Resolve the main checkout path: parse git worktree list --porcelain and take the first worktree <path> entry.
  7. cd into the main checkout path.
  8. Checkout the base branch and pull latest:
    git checkout <base branch> && git pull
    
  9. Remove the worktree:
    git worktree remove <recorded worktree path>
    
  10. Delete the feature branch locally:
    git branch -D <recorded branch>
    
  11. Confirm in one line: Worktree removed → back on <base branch>, deleted <branch>

Read the full file on GitHub · 53 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 · 53 lines · 111 tokens per session scan A 12cbce10e1d9

Subscribe to this mod's changes

worktree-done is a skill published in the GitHub repository dkmqflx/git-workflow-plugin (1 stars, last pushed 1mo ago), licensed MIT. It adds 111 tokens to every session and 749 once invoked, about $0.0006 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

lov-app-generator

Use when the user asks for "App生成器", "生成 Web App", "生成 Tauri App", "生成原生 macOS App", "Finder Quick Action", "只创建 web", or to standardize an existing app with branding, CI/CD, native integration, and Lovinsp where applicable.

lovstudio/skills · 66 tokens

lov-maintain-partners

Maintain the Skill Publisher website's partners section AND align partner logo rows on event posters / hero strips: reuse lov-find-logo for brand logo discovery, normalize collected logos to a 240px-tall content canvas (retina-ready), rasterize SVGs via rsvg-convert before normalizing (so SVG viewBox padding gets…

lovstudio/skills · 294 tokens

dsh-plugin-publisher

Publish a validated DSH plugin package (@deepseek-ai/dsh- or @lovstudio/dsh-) to npm, git, or tarball channels and verify it loads in the DeepSeek Harness. Use when the user asks to publish, release, or ship a plugin. 触发:发布插件 / 上架插件 / release dsh 插件。.

lovstudio/skills · 82 tokens

lov-human-writing

用作者性账本、篇章审计和 30 项中文表层度量改进稿件,保留真实判断并定位过度解释、 单线因果和强行收束。Use when users say“去 AI 味”“保留我的判断”或 "humanize this Chinese draft".

lovstudio/skills · 71 tokens

lov-any2deck

Generate professional slide deck images from content (Markdown, text, URLs). Creates outlines with style instructions, then generates individual slide images. Supports 16 visual styles, CJK/Latin mixed text, branding overlays, and PPTX/PDF export. Use when the user asks to "create slides", "make a presentation"…

lovstudio/skills · 110 tokens

lov-bp

Orchestrate a complete investor BP workflow or route to one focused module: source-backed outline, PPTX/PDF production, or evidence/content/visual polishing. Use when the user wants to create a business plan end to end, combine BP stages, continue from an existing BP workspace, or is unsure which BP skill to use.…

lovstudio/skills · 109 tokens