New: 98,000+ skills indexed from GitHub repos with 100+ stars · every skill safety-checkedBrowse top skillsTop skills
Esc to closeBrowse all skills
Submit a skillBrowse skills
Submit a skillBrowse skills

Agent skill

Add Worktree

by niki914 in niki914/zafiro

A skill your agent uses when the user wants to start work in a new git worktree — "new worktree", "spin up a worktree/branch for this", "work on X in another worktree", "branch this off".

MITAuto-check passedDevelopment

Install Add Worktree

skills CLI
$ npx skills add niki914/zafiro --skill add-worktree -a claude-code

Project install by default; add -g for ~/.claude/skills/.

GitHub CLI
$ gh skill install niki914/zafiro add-worktree --agent claude-code

Project scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).

Manual copy
$ git clone --depth 1 https://github.com/niki914/zafiro.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.agents/skills/add-worktree .claude/skills/add-worktree && rm -rf skills-src

Use ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.

Claude Code skills documentation · loads skills from .claude/skills/

Facts

Skill name
add-worktree
GitHub stars
231
Token cost
~669 tokens
SKILL.md length
237 words
Files
1
Skills in repo
7
Repo updated
First seen
Licence
MIT

At a glance

A skill your agent uses when the user wants to start work in a new git worktree — "new worktree", "spin up a worktree/branch for this", "work on X in another worktree", "branch this off".

  • Works in 4 steps: Name the branch from the requirement → Resolve the paths → Create it → …
  • The user wants to start work in a new git worktree — new worktree
  • SKILL.md covers 1 — Name the branch from the…, 2 — Resolve the paths, 3 — Create it and 4 — Remove it
  • Calls git

What it does

Add Worktree is an agent skill from niki914/zafiro. Use when the user wants to start work in a new git worktree — "new worktree", "spin up a worktree/branch for this", "work on X in another worktree", "branch this off". Names the branch from the request and creates <repo parent/zafiro-worktrees/<branch off origin/main.

Its SKILL.md is about 670 tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.

It sits in Development, covering Git worktrees. It works with Git, Android and LaTeX. The repository describes itself as: Open-source BYOK AI agent for Android. Full phone control, native Shell & Python 3, with Skills and MCP support. Built with Material 3 Expressive. Works via Shizuku (root… The licence is MIT.

When your agent uses it

  • The user wants to start work in a new git worktree — new worktree
  • Spin up a worktree/branch for this
  • Work on X in another worktree
  • Branch this off

Example prompts

  • “new worktree”
  • “spin up a worktree/branch for this”
  • “work on X in another worktree”
  • “/add-worktree”

Workflow steps

4 steps, taken from the step headings in SKILL.md.

  1. Name the branch from the requirement
  2. Resolve the paths
  3. Create it
  4. Remove it

What it can do on your machine

Read from SKILL.md and the folder at commit d50b2ab. It shows what the files ask for, not the result of running them.

  • Tool permissions

    Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.

    From allowed-tools in the SKILL.md frontmatter.

  • Runs code

    Shell commands in SKILL.md call:

    • git

    From the folder's file list and the shell code blocks in SKILL.md.

  • Network

    No URLs in SKILL.md. Its commands use git, which can reach the network depending on how they are called.

    From URLs in SKILL.md, links to its own repository left out.

  • Credentials

    Names no API keys, tokens, secrets or passwords.

    From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.

Context cost

Add Worktree loads about 669 tokens when it runs. Until then it costs about 71 tokens; SKILL.md has 237 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~71
When it runs · the whole SKILL.md, loaded when a task matches
~669

Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.

Safety

Auto-check passed

The automated check found no risky patterns in SKILL.md.

Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.

SKILL.md

The full file from niki914/zafiro at commit d50b2ab, republished under its MIT licence (© niki914). 237 words, ~669 tokens.

Download SKILL.mdSave it as .claude/skills/add-worktree/SKILL.md (or your agent's skills folder).
name
add-worktree
description
Use when the user wants to start work in a new git worktree — "new worktree", "spin up a worktree/branch for this", "work on X in another worktree", "branch this off". Names the branch from the request and creates `<repo parent>/zafiro-worktrees/<branch>` off origin/main.

Add Worktree

Worktrees live in a sibling directory of the primary repo, one directory per branch:

<parent of primary repo>/zafiro-worktrees/<branch name>

The directory is the branch name, character for character. A slashed name (fix/latex-render) nests: zafiro-worktrees/fix/latex-render. dev-to-main at /Users/niki/.repo/android/zafiro-worktrees/dev-to-main is a lived example of the layout.

1 — Name the branch from the requirement

<type>/<kebab-case summary>, following the repo's existing branch convention (feat/agent-status, refactor/aidl-state-sync).

TypeFor
featnew capability
fixbug fix
refactorbehaviour-preserving restructure
perfspeed / memory
chorebuild, deps, tooling
testtests only
docsdocs only

Rules: lowercase ASCII, hyphens only, summary describes the change (fix/latex-blank-render, not fix/niki-work); ≤ 40 characters total, since the name is also the directory name; no ticket numbers, no dates.

The summary comes from what the user asked for. If the user asked for a worktree without saying what the work is, ask before naming — a branch name guessed from nothing is a rename later.

2 — Resolve the paths

bash
REPO=$(dirname "$(git rev-parse --path-format=absolute --git-common-dir)")   # primary repo, even from inside a worktree
WT_ROOT="$(dirname "$REPO")/zafiro-worktrees"
BRANCH=fix/latex-blank-render          # from step 1
git worktree list                      # refuse to reuse a path or branch already listed

Derive WT_ROOT from the primary repo; do not hardcode an absolute path. Use --git-common-dir, not --show-toplevel: inside a worktree --show-toplevel returns that worktree, which nests zafiro-worktrees/... inside itself.

3 — Create it

Base is origin/main unless the user names another base (dev, a release tag).

bash
git fetch origin
git worktree add -b "$BRANCH" "$WT_ROOT/$BRANCH" origin/main
git -C "$WT_ROOT/$BRANCH" status -sb | head -3

To continue an existing branch instead of creating one, drop -b.

Report the absolute worktree path back to the user.

4 — Remove it

bash
git worktree remove "$WT_ROOT/<branch>"
git worktree prune

Run removal only on explicit request; leftover worktrees with uncommitted work are the user's to discard.

© niki914, MIT. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file

Files

Just SKILL.md in .agents/skills/add-worktree of niki914/zafiro.

Open the folder on GitHubat commit d50b2ab

Compare with similar skills

Add Worktree next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.

Add Worktree compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Add Worktree this skillniki914/zafiro231—~669Automated safety check: PassMIT
Using Git Worktreec5inco/compose-pokedexer143—~1.4kAutomated safety check: PassMIT
Finishing a Development Branchobra/superpowers297k5 repos~1.9kAutomated safety check: PassMIT
Finishing A Development Branchfarm-fe/farm5.6k34 repos~1.8kAutomated safety check: PassMIT
Git Worktree Cleanuplobehub/lobehub83k—~2.8kAutomated safety check: PassCustom licence
Pre-Release PR Triagejamiepine/voicebox57k—~3.1kAutomated safety check: PassMIT

Similar skills

  • Using Git Worktree

    c5inco/compose-pokedexer

    Creates and manages isolated Git worktrees with safe directory selection, explicit approval, clean-baseline verification, and Gradle-specific safeguards.

    143 GitHub stars~1.4k tokensUpdated 6 days ago
    DevelopmentAuto-check passed

  • Finishing a Development Branch

    obra/superpowers

    Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.

    297k GitHub starsUsed in 5 repos~1.9k tokens
    DevelopmentAuto-check passed

  • Finishing A Development Branch

    farm-fe/farm

    A skill your agent uses when implementation is complete, all tests pass, and you need to decide how to integrate the work - guides completion of development work by presenting structured options for…

    5.6k GitHub starsUsed in 34 repos~1.8k tokens
    DevelopmentAuto-check passed

  • Git Worktree Cleanup

    lobehub/lobehub

    Audits stale Git worktrees and branches with a bundled script, classifies each one, and deletes only after you approve the exact candidates.

    83k GitHub stars~2.8k tokensUpdated today
    DevelopmentAuto-check passed

  • Pre-Release PR Triage

    jamiepine/voicebox

    Sorts a backlog of open pull requests into must-merge, candidate, superseded and deferred, writes a triage doc and works the merge loop before a release.

    57k GitHub stars~3.1k tokensUpdated 2 days ago
    DevelopmentAuto-check passed

  • Ccmanager Config

    kbwo/ccmanager

    Set up, review, or repair a CCManager config — .ccmanager.json at a git repository root, or the global ~/.config/ccmanager/config.json.

    1.3k GitHub stars~1.5k tokensUpdated yesterday
    DevelopmentAuto-check passed

More from niki914/zafiro

  • Release New Version

    niki914/zafiro

    A skill your agent uses when the user wants to release a new Zafiro version — drafting bilingual release notes, deciding the next version number, bumping app/build.gradle.kts, tagging, and…

    231 GitHub stars~2.1k tokensUpdated yesterday
    Auto-check passed

  • Install Skill From GitHub

    niki914/zafiro

    Install a skill from a public GitHub repository onto this device.

    231 GitHub stars~1.2k tokensUpdated yesterday
    Auto-check passed

  • Skill Creator

    niki914/zafiro

    Create new skills, modify and improve existing skills, and measure skill performance.

    231 GitHub stars~2.9k tokensUpdated yesterday
    Auto-check passed

  • Termux

    niki914/zafiro

    Load this skill for anything involving Termux (com.termux) — first-time SSH setup, connecting to Termux, or a Termux connection that stopped working.

    231 GitHub stars~688 tokensUpdated yesterday
    Auto-check passed

  • Test Triage

    niki914/zafiro

    Use before writing, adding, or modifying any unit test in this repo — before creating a Test.kt file or a @Test function, and before touching an existing test after a refactor.

    231 GitHub stars~935 tokensUpdated yesterday
    Auto-check passed

  • Prompt Engineering

    niki914/zafiro

    Guidelines to writing prompts, docs, or tasks for AI to read or execute, with strict context isolation.

    231 GitHub stars~666 tokensUpdated yesterday
    Auto-check passed

Works with

Categories

Questions about Add Worktree

What does Add Worktree do?

A skill your agent uses when the user wants to start work in a new git worktree — "new worktree", "spin up a worktree/branch for this", "work on X in another worktree", "branch this off". Add Worktree is an agent skill from niki914/zafiro. Use when the user wants to start work in a new git worktree — "new worktree", "spin up a worktree/branch for this", "work on X in another worktree", "branch this off".

When should I use Add Worktree?

Add Worktree fits situations like: the user wants to start work in a new git worktree — new worktree; spin up a worktree/branch for this; work on X in another worktree; branch this off.

How do I install Add Worktree in Claude Code?

Run `npx skills add niki914/zafiro --skill add-worktree -a claude-code`. Or copy the skill folder (.agents/skills/add-worktree in niki914/zafiro) into .claude/skills/add-worktree in your project. Claude Code loads it when a task matches its description.

How do I install Add Worktree in Codex?

Run `npx skills add niki914/zafiro --skill add-worktree -a codex`. Or copy the skill folder (.agents/skills/add-worktree in niki914/zafiro) into .agents/skills/add-worktree in your project. Codex loads it when a task matches its description.

Can I use Add Worktree in Cursor, Gemini CLI or GitHub Copilot?

Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add niki914/zafiro --skill add-worktree -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/add-worktree, .gemini/skills/add-worktree, .github/skills/add-worktree and .opencode/skills/add-worktree in your project.

What does Add Worktree need to run?

Going by SKILL.md and its folder, Add Worktree needs the command-line tools its instructions call (git).

Does Add Worktree access the network?

SKILL.md contains no URLs. Its commands use git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.

Is Add Worktree safe to install?

Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.

What licence does Add Worktree use?

Add Worktree is published under the MIT licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Add Worktree use?

About 669 tokens (SKILL.md is roughly 2.7k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.

What are the alternatives to Add Worktree?

Skills that share tags, products or a category with Add Worktree: Using Git Worktree (c5inco/compose-pokedexer, 143 stars), Finishing a Development Branch (obra/superpowers, 297k stars), Finishing A Development Branch (farm-fe/farm, 5.6k stars) and Git Worktree Cleanup (lobehub/lobehub, 83k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Add Worktree?

niki914 (a GitHub user) maintains it in niki914/zafiro, which has 231 GitHub stars. The repository holds 7 skills in this directory. The repository was last updated on October 8, 2026.

Source: niki914/zafiro on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.