Git Worktrees

📋 WHEN TO USE

Use before:

• Starting new feature development
• Implementing plans from @planning-mastery
• Making experimental changes
• Working on multiple features in parallel Skip for:
• Quick bug fixes on current branch
• Documentation updates
• Configuration changes

📁 DIRECTORY SELECTION PROCESS

Follow this priority order:

1. Check Existing Directories

Unix/macOS:

ls -d .worktrees 2>/dev/null     # Preferred (hidden)
ls -d worktrees 2>/dev/null      # Alternative

Windows (PowerShell):

if (Test-Path ".worktrees") { ".worktrees" }
elseif (Test-Path "worktrees") { "worktrees" }

If found: Use that directory. If both exist, .worktrees wins.

2. Check CLAUDE.md

grep -i "worktree.*director" CLAUDE.md 2>/dev/null

If preference specified: Use it without asking.

3. Ask User

If no directory exists and no CLAUDE.md preference:

No worktree directory found. Where should I create worktrees?
1. .worktrees/ (project-local, hidden)
2. %USERPROFILE%\.config\maestro\worktrees\<project>\ (global location)
Which would you prefer?

Windows (PowerShell):

# Node.js
if (Test-Path "package.json") { npm install }

# Python
if (Test-Path "requirements.txt") { pip install -r requirements.txt }
if (Test-Path "pyproject.toml") { poetry install }

# Rust
if (Test-Path "Cargo.toml") { cargo build }

# Go
if (Test-Path "go.mod") { go mod download }

4. Verify Clean Baseline

Run tests to ensure worktree starts clean:

# Use project-appropriate command
npm test
pytest
cargo test
go test ./...

If tests fail: Report failures, ask whether to proceed or investigate. If tests pass: Report ready.

5. Report Location

Worktree ready at <full-path>
Tests passing (<N> tests, 0 failures)
Ready to implement <feature-name>

Skipping ignore verification

• Problem: Worktree contents get tracked, pollute git status
  • Fix: Always use git check-ignore before creating project-local worktree

Assuming directory location

• Problem: Creates inconsistency, violates project conventions
  • Fix: Follow priority: existing > CLAUDE.md > ask

Proceeding with failing tests

• Problem: Can't distinguish new bugs from pre-existing issues
  • Fix: Report failures, get explicit permission to proceed

Hardcoding setup commands

• Problem: Breaks on projects using different tools
  • Fix: Auto-detect from project files (package.json, etc.)

Forgetting to cleanup

• Problem: Disk space consumed, stale branches accumulate
  • Fix: Remove worktree when feature is merged

📝 EXAMPLE WORKFLOW

You: I'm using the git-worktrees skill to set up an isolated workspace.
[Check .worktrees/ - exists]
[Verify ignored - git check-ignore confirms .worktrees/ is ignored]
[Create worktree: git worktree add .worktrees/auth -b feature/auth]
[Run npm install]
[Run npm test - 47 passing]
Worktree ready at C:\Users\Dev\myproject\.worktrees\auth
Tests passing (47 tests, 0 failures)
Ready to implement auth feature

🚨 RED FLAGS

Never:

• Create worktree without verifying it's ignored (project-local)
• Skip baseline test verification
• Proceed with failing tests without asking
• Assume directory location when ambiguous
• Skip CLAUDE.md check Always:
• Follow directory priority: existing > CLAUDE.md > ask
• Verify directory is ignored for project-local
• Auto-detect and run project setup
• Verify clean test baseline
• Report full path when done

🔗 INTEGRATION

Called by:

• @brainstorming - After design approved, before implementation
• @planning-mastery - When executing plan

Pairs with:

• @planning-mastery - Work happens in this worktree
• @tdd-mastery - Implementation methodology
• @verification-mastery - Complete development after all tasks

🔗 RALPH WIGGUM INTEGRATION

When Ralph Wiggum is active:

1. Before first iteration: Create worktree for isolated work
2. During iterations: All work happens in worktree
3. After completion: Merge or create PR from worktree
4. Cleanup: Remove worktree after merge

🔗 RELATED SKILLS

• @brainstorming - Design before worktree creation
• @planning-mastery - Plan to execute in worktree
• @verification-mastery - Verify before finishing branch