git-worktree

A Git workflow for working in isolated copies of a project, called worktrees, with separate branches for each task.

In plain words
What is it for?
It helps agents create task branches, commit changes, push them, and open pull requests for review without switching away from their assigned worktree.
Why use it?
It reduces merge conflicts when multiple agents work on the same codebase and connects branches to their assigned tasks.

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

Made for: Claude Code, Codex.

Per session 31 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 498 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.00031 $0.00498
Opus 5 $0.00015 $0.00249
Sonnet 5 $0.00006 $0.00100
Haiku 4.5 $0.00003 $0.00050

Measured 3d ago against content hash 92e676e2fd40, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

git-worktree 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 3d 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.

skills/git-worktree/SKILL.md · 67 lines

What it actually says

Git Worktree Isolation

Each agent works in a dedicated git worktree with its own branch. This prevents merge conflicts between agents working simultaneously.

Branch Convention

Your worktree branch follows the pattern: swarm/<agent-name>/<date>

For example: swarm/alice/20260304

Critical Rules

  1. Do NOT switch branches. Your worktree is checked out to your assigned branch. Switching branches would break isolation. If you need to reference another branch, use git diff or git log with the branch name -- do not checkout.

  2. Do NOT run git checkout on any branch other than your assigned one. The worktree system manages branches for you.

  3. Commit frequently. Since you are on your own branch, there is no risk of conflicting with others. Commit early, commit often.

Linking Branches to Tasks

When you start working on a task, link your branch:

swarm task update <id> --branch <your-branch>

This makes it visible in the dashboard which task is associated with which branch.

Creating Pull Requests

When your task is complete:

  1. Commit and push your branch
  2. Create a PR targeting the main branch
  3. Link the PR to your task:
    swarm task update <id> --pr <number> --pr-url <url>
    
  4. If working on a GitHub issue, link that too:
    swarm task update <id> --issue <number> --issue-url <url>
    

Working with Other Agents' Branches

If you need to see what another agent has done:

git log swarm/<other-agent>/<date> --oneline -10
git diff main..swarm/<other-agent>/<date> -- <file>

Do NOT merge other agents' branches into yours unless explicitly instructed by the lead.

Handling Merge Conflicts

If your branch falls behind main and you need updates:

git fetch origin
git merge origin/main

Resolve any conflicts in your worktree. If conflicts are complex, notify the lead via swarm msg.

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. 3d ago First seen · 67 lines · 31 tokens per session scan A 92e676e2fd40

Subscribe to this mod's changes

git-worktree is a skill published in the GitHub repository tlangridge/agent-swarm (5 stars, last pushed 6mo ago), licensed MIT. It adds 31 tokens to every session and 498 once invoked, about $0.0002 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

systematic-debugging

Use when encountering any bug, test failure, or unexpected behavior, before proposing fixes.

obra/superpowers · 21 tokens

brainstorming

You MUST use this before any creative work - creating features, building components, adding functionality, or modifying behavior. Explores user intent, requirements and design before implementation.

obra/superpowers · 37 tokens

auto-perf-optimize

Run agent-driven VS Code performance or memory investigations. Use when asked to launch Code OSS, automate a VS Code scenario, run the Chat memory smoke runner, capture renderer heap snapshots, take workflow screenshots, compare run summaries, or drive a repeatable scenario before heap-snapshot analysis.

microsoft/vscode · 62 tokens

chat-perf

Run chat perf benchmarks and memory leak checks against the local dev build or any published VS Code version. Use when investigating chat rendering regressions, validating perf-sensitive changes to chat UI, or checking for memory leaks in the chat response pipeline.

microsoft/vscode · 51 tokens

chat-pet-sprite-creation

Use when creating or changing VS Code chat pet sprite art, sprite sheets, state animations, eye treatments, Stable/Insiders variants, or pet transitions under src/vs/workbench/contrib/chat/browser/widget/media/chatPet.

microsoft/vscode · 53 tokens

cpu-profile-analysis

Analyze V8/Chrome CPU profiles (.cpuprofile) and DevTools trace files (Trace-.json). Use when: profiling performance, investigating slow functions, comparing code paths, finding bottlenecks, analyzing timeToRequest, understanding call trees from sampling profiler data, analyzing layout/paint/rendering, investigating…

microsoft/vscode · 71 tokens