Using Git Worktrees

Using Git Worktrees

> Adapted skill — discipline originating in Superpowers v5.1.0 (MIT, Jesse Vincent), rewritten in mattpocock-skills style. Used by /mp-implement-issue step 3 and both pipelines' Phase 3 to give each slice an isolated workspace.

Isolate the work before touching code: detect existing isolation first, use the harness's native worktree tool if one exists, fall back to git worktree only without one.

1. Detect existing isolation

Run detection before creating anything.

GIT_DIR=$(cd "$(git rev-parse --git-dir)" && pwd -P)
GIT_COMMON=$(cd "$(git rev-parse --git-common-dir)" && pwd -P)
git rev-parse --show-superproject-working-tree 2>/dev/null

• GIT_DIR != GIT_COMMON and the superproject check prints nothing → already in a linked worktree; skip to setup (step 3). On detached HEAD, note the worktree is externally managed and branch creation happens at finish time.
• The superproject check prints a path → you're in a submodule; treat it as a normal repo.

In a normal checkout, honor any declared worktree preference without asking. With none declared, ask one consent question; declined → work in place and skip to setup.

2. Create the worktree

Native tool first. If the harness offers one (EnterWorktree-style tool, /worktree command, --worktree flag), use it — it manages placement, branching, and cleanup that the git fallback leaves to you. Then skip to setup.

Git fallback — only with no native tool. Directory priority: declared preference > existing .worktrees/ or worktrees/ (.worktrees/ wins if both) > default .worktrees/ at the repo root.

Verify the directory is git-ignored before creating:

git check-ignore -q  || echo "/" >> .git/info/exclude

git worktree add .worktrees/ -b 
cd .worktrees/

A permission error here means the sandbox blocked creation — say so, then run setup and baseline in place.

3. Setup

Auto-detect and install:

[ -f package.json ] && npm install
[ -f Cargo.toml ] && cargo build
[ -f requirements.txt ] && pip install -r requirements.txt
[ -f pyproject.toml ] && poetry install
[ -f go.mod ] && go mod download

4. Baseline

Run the project test suite (npm test / cargo test / pytest / go test ./...). Green before any work begins; red → report the failures and stop — never start from a broken baseline.

Report

Worktree ready at  on branch 
Tests passing ( tests, 0 failures)
Ready to implement 

Source & license

This open-source skill is cataloged on AgentStack and links to its original source — we do not rehost the code.

• Author: skywalkercyt
• Source: skywalkercyt/mp-implement
• License: MIT

Install and usage instructions live in the source repository linked above.