| name | worktree |
| description | Create and manage git worktrees with automatic environment setup. Creates worktrees at ../model-share-<branch>, copies .env, and runs pnpm install. |
Worktree Setup Skill
Creates git worktrees with all necessary setup for running the dev server. Handles the tedious setup steps so you can start working immediately.
Quick Start
node .claude/skills/worktree/cli.mjs create feature/my-feature
node .claude/skills/worktree/cli.mjs create existing-branch
node .claude/skills/worktree/cli.mjs list
node .claude/skills/worktree/cli.mjs remove feature/my-feature
What It Does
When you create a worktree, the skill:
- Creates the git worktree at
../model-share-<branch-name> (slashes in branch names are replaced with dashes)
- Initializes git submodules (
git submodule update --init --recursive) - required for event-engine-common
- Copies
.env from the main worktree to the new worktree
- Runs
pnpm install to set up dependencies (leverages pnpm's content-addressable store for fast installs)
CLI Commands
| Command | Description |
|---|
create <branch> | Create a new worktree for the specified branch |
list | List all worktrees |
remove <branch> | Remove a worktree (deletes directory and prunes git worktree) |
Examples
node .claude/skills/worktree/cli.mjs create feature/user-auth
node .claude/skills/worktree/cli.mjs create fix/login-issue
node .claude/skills/worktree/cli.mjs remove fix/login-issue
Merging a Worktree to Main
When the user asks to "merge the worktree" or "merge to main", follow this workflow:
-
Commit changes in the worktree:
cd /path/to/worktree
git add <files>
git commit -m "feat/fix: description"
-
Update and merge to main:
cd /path/to/main-worktree
git fetch origin && git checkout main && git pull origin main
git merge <branch-name> --no-edit
git push origin main
-
Clean up the worktree and branch:
rm -rf /path/to/worktree
git branch -d <branch-name>
git push origin --delete <branch-name>
Example
cd ../model-share-fix-my-bug
git add src/file.ts
git commit -m "fix: resolve the bug"
cd ../model-share
git fetch origin && git checkout main && git pull origin main
git merge fix/my-bug --no-edit
git push origin main
rm -rf ../model-share-fix-my-bug
git branch -d fix/my-bug
Notes
- Branch names with slashes are converted to dashes in the directory name
- The
.env file is copied (not symlinked) so you can customize environment per worktree if needed
- Uses pnpm's content-addressable store, so subsequent worktree installs are fast
- After creation, use
/dev-server skill to start the dev server in the new worktree