borghei/Claude-Skills / engineering/git-worktree-manager
git-worktree-manager
VerifiedRun parallel Git worktrees without collisions: a port block per worktree, .env sync, health checks for stale or dirty trees, and safe cleanup of merged ones. Use when several branches or agents need running dev servers at once.
| File | Kind | Size |
|---|---|---|
| SKILL.md | skill md | 7.9 KB |
| references/cleanup-and-workflows.md | markdown | 3.6 KB |
| references/operations-playbook.md | markdown | 3.9 KB |
| references/setup-and-ports.md | markdown | 5.0 KB |
| scripts/port_allocator.pyexecutable | script | 15.0 KB |
| scripts/worktree_manager.pyexecutable | script | 13.5 KB |
| scripts/worktree_validator.pyexecutable | script | 16.2 KB |
references/cleanup-and-workflows.md
View on GitHub# Cleanup Automation & Multi-Agent Workflows
Read this when automating worktree cleanup, coordinating multiple agents across worktrees, or deciding whether a scenario warrants a new worktree.
## Cleanup Automation
```bash
#!/bin/bash
# cleanup-worktrees.sh — Safe worktree cleanup
set -euo pipefail
STALE_DAYS="${1:-14}"
DRY_RUN="${2:-true}"
echo "Scanning worktrees (stale threshold: ${STALE_DAYS} days)..."
echo ""
git worktree list --porcelain | while read -r line; do
case "$line" in
worktree\ *)
WT_PATH="${line#worktree }"
;;
branch\ *)
BRANCH="${line#branch refs/heads/}"
# Skip main worktree
if [ "$WT_PATH" = "$(git rev-parse --show-toplevel)" ]; then
continue
fi
# Check if branch is merged
MERGED=""
if git branch --merged main | grep -q "$BRANCH" 2>/dev/null; then
MERGED=" [MERGED]"
fi
# Check for uncommitted changes
DIRTY=""
if [ -d "$WT_PATH" ]; then
cd "$WT_PATH"
if [ -n "$(git status --porcelain)" ]; then
DIRTY=" [DIRTY - has uncommitted changes]"
fi
cd - > /dev/null
fi
# Check age
if [ -d "$WT_PATH" ]; then
AGE_DAYS=$(( ($(date +%s) - $(stat -f %m "$WT_PATH" 2>/dev/null || stat -c %Y "$WT_PATH" 2>/dev/null)) / 86400 ))
STALE=""
if [ "$AGE_DAYS" -gt "$STALE_DAYS" ]; then
STALE=" [STALE: ${AGE_DAYS} days old]"
fi
fi
echo "$WT_PATH ($BRANCH)$MERGED$DIRTY$STALE"
if [ -n "$MERGED" ] && [ -z "$DIRTY" ] && [ "$DRY_RUN" = "false" ]; then
echo " -> Removing merged clean worktree..."
git worktree remove "$WT_PATH"
fi
;;
esac
done
echo ""
git worktree prune
echo "Done. Run with 'false' as second arg to actually remove."
```
## Multi-Agent Workflow Pattern
When running multiple AI agents (Claude Code, Cursor, Copilot) on the same repo:
```
Agent Assignment:
───────────────────────────────────────────────────
Agent 1 (Claude Code) → wt-feature-auth (port 3010)
Agent 2 (Cursor) → wt-feature-billing (port 3020)
Agent 3 (Copilot) → wt-bugfix-login (port 3030)
Main repo → integration (main) (port 3000)
───────────────────────────────────────────────────
Rules:
- Each agent works ONLY in its assigned worktree
- No agent modifies another agent's worktree
- Integration happens via PRs to main, not direct merges
- Port conflicts are impossible due to deterministic allocation
```
## Decision Matrix
| Scenario | Action |
|----------|--------|
| Need isolated dev server for a feature | Create a new worktree |
| Quick diff review of a branch | `git diff` in current tree (no worktree needed) |
| Hotfix while feature branch is dirty | Create dedicated hotfix worktree |
| Bug triage with reproduction branch | Temporary worktree, cleanup same day |
| PR review with running code | Worktree at PR branch, run tests |
| Multiple agents on same repo | One worktree per agent |
## Validation Checklist
After creating a worktree, verify:
1. `git worktree list` shows the expected path and branch
2. `.worktree-ports.json` exists with unique port assignments
3. `.env` files are present and contain worktree-specific ports
4. `pnpm install` (or equivalent) completed without errors
5. Dev server starts on the allocated port
6. Database connects on the allocated DB port
7. No port conflicts with other worktrees or services
Related skills
| Skill | Stars | Updated | Works with | Status | Install |
|---|---|---|---|---|---|
| reverse-engineer-anythingmorluto/reaReverse engineer native, managed, Electron/JavaScript, packaged, firmware, and browser targets with REA, and build agent environments (AgentEnv bundles) of web applications from a live instance or a capture, and of Linux desktop apps with a task from a request. Use shipped-artifact or requested runtime evidence to explain features, compare versions, decompile code, or guide a reconstruction. Skip REA for ordinary source-repository architecture analysis. | Stars: 471k | Updated | Claude CodeCodex | Verified | Install |
| diagnosing-superpowersobra/superpowersUse when a superpowers session went wrong and your human partner wants to know why — repeated work, ignored plans, stumbles, poor results, a skill that didn't fire, "it took too long", "why is it so expensive", "what is it doing" — or wants to build a bug report for the superpowers maintainers, for the current session or a past one identified by id or path, on any harness. | Stars: 322k | Updated | Claude CodeCodex | Verified | Install |
| dispatching-parallel-agentsobra/superpowersUse when facing 2+ independent tasks that can be worked on without shared state or sequential dependencies | Stars: 322k | Updated | Claude CodeCodex | Verified | Install |
| executing-plansobra/superpowersUse when executing an implementation plan in the current session as the implementer yourself — your human partner chose inline execution, or no subagent tool is available | Stars: 322k | Updated | Claude CodeCodex | Verified | Install |