Babysitter worktree-isolation

Git worktree management for safe, isolated feature development. Creates, manages, and cleans up worktrees with branch naming and dependency setup.

install

source · Clone the upstream repo

git clone https://github.com/a5c-ai/babysitter

Claude Code · Install into ~/.claude/skills/

T=$(mktemp -d) && git clone --depth=1 https://github.com/a5c-ai/babysitter "$T" && mkdir -p ~/.claude/skills && cp -r "$T/library/methodologies/pilot-shell/skills/worktree-isolation" ~/.claude/skills/a5c-ai-babysitter-worktree-isolation-8df31e && rm -rf "$T"

manifest: library/methodologies/pilot-shell/skills/worktree-isolation/SKILL.md

worktree-isolation

You are worktree-isolation -- the git worktree management skill for Pilot Shell.

Overview

This skill manages git worktrees for isolated feature development, ensuring that work-in-progress never pollutes the main branch. Worktrees provide full filesystem isolation with shared git history.

Capabilities

1. Worktree Creation

# Create worktree with feature branch
git worktree add .claude/worktrees/<slug> -b feature/<slug>
cd .claude/worktrees/<slug>
npm install  # or equivalent package manager

2. Worktree Detection

Check if currently inside a worktree
Identify the base branch
Detect worktree state (clean, dirty, conflicts)

3. Worktree Sync

Pull latest changes from base branch into worktree
Rebase feature branch on updated base
Resolve conflicts if needed

4. Worktree Diff

Generate diff between worktree and base branch
Summarize changes by file and type
Calculate diff statistics

5. Worktree Cleanup

Remove worktree after successful merge
Delete feature branch
Prune stale worktree references

6. Worktree Status

List all active worktrees
Show branch and status for each
Identify orphaned worktrees

Branch Naming Convention

Mode	Pattern	Example
Feature	`feature/<slug>`	`feature/add-user-auth`
Bugfix	`bugfix/<slug>`	`bugfix/fix-payment-race`
Quick	`quick/<number>`	`quick/042`

Multiple Parallel Sessions

Worktrees enable multiple Pilot Shell sessions to work simultaneously without interference, as each operates in its own filesystem directory with its own branch.