Overview

Orchestrates git worktrees to enable parallel feature development while avoiding conflicts. It uses a wave-aware execution strategy and coordinates multiple Claude sessions to streamline worktree creation and workflow alignment.

How This Skill Works

On trigger, it immediately reads agent-prompt.md from the skill directory, spawns a single subagent with subagent_type: "general-purpose" and passes the prompt plus the user request, current working directory, and any arguments. The subagent handles the strategy selection (including AskUserQuestion), worktree creation, and Docker setup, returning a summary to present to the user. The parent agent does not execute the worktree workflow in this session.

When to Use It

• Creating feature branches across multiple worktrees for parallel development.
• Starting parallel work sessions to speed feature delivery while preventing conflicts.
• Merging worktree-based PRs into main branches.
• Coordinating multiple Claude sessions to align on a common workflow.
• Managing wave-aware task scheduling to stagger worktree operations and reduce contention.

Quick Start

1. Step 1: Trigger Worktree Manager with a request or the explicit /worktree command.
2. Step 2: The system reads agent-prompt.md and launches a general-purpose subagent with the prompt plus context.
3. Step 3: Review the summary presented by the agent and proceed with follow-up prompts or actions.

Best Practices

• Define clear worktree naming conventions to map branches to worktrees.
• Use a consistent wave ordering to schedule tasks and avoid conflicts.
• Validate status and tests in each worktree before merging PRs.
• Document worktree associations in repository documentation or READMEs.
• Keep agent-prompt.md updated with current workflow steps and constraints.

Example Use Cases

• Spawn separate worktrees for frontend and backend feature work simultaneously.
• Parallelize refactors by dedicating a worktree per module and coordinating merges.
• Handle PRs that touch multiple worktrees by coordinating PRs and merges.
• Coordinate Claude sessions for build, test, and deploy steps in a wave sequence.
• Use /worktree to initiate parallel experiments during sprint planning.

Frequently Asked Questions