Skip to content

a5c-ai/babysitter / library/methodologies/pilot-shell/skills/worktree-isolation

worktree-isolation

Verified

Create worktree with feature branch

git worktree add .claude/worktrees/ -b feature/ cd .claude/worktrees/ 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.
slack-gif-creatoranthropics/skillsKnowledge and utilities for creating animated GIFs optimized for Slack. Provides constraints, validation tools, and animation concepts. Use when users request animated GIFs for Slack like "make me a GIF of X doing Y for Slack."Stars: 197kUpdated Claude CodeCodexVerifiedInstall
ponytailDietrichGebert/ponytailLazy senior dev mode for any coding task: the smallest change that fully solves it, and a reply a busy human understands in one read.Stars: 194kUpdated Claude CodeCodexVerifiedInstall
ponytail-debtDietrichGebert/ponytailHarvest every shortcut: comment into one debt ledger, so deferrals get tracked instead of forgotten. One-shot report.Stars: 194kUpdated Claude CodeCodexVerifiedInstall
ponytail-debtDietrichGebert/ponytailList every `shortcut:` comment (and older `ponytail:` ones) as a debt ledger. One-shot report, changes nothing. Use for "ponytail debt", "what did ponytail defer", "list the shortcuts", /ponytail-debt.Stars: 194kUpdated Claude CodeCodexVerifiedInstall