|
|
|
|
@@ -66,13 +66,15 @@ The default is always Step 4. Step 3 requires an explicit "yes, create a worktre
|
|
|
|
|
|
|
|
|
|
You have two mechanisms. Try them in this order.
|
|
|
|
|
|
|
|
|
|
### 3a. Native Worktree Tools (preferred)
|
|
|
|
|
### 3a. Native Worktree Tools (preferred — STOP HERE if available)
|
|
|
|
|
|
|
|
|
|
Do you already have a way to create a worktree? It might be a tool with a name like `EnterWorktree`, `WorktreeCreate`, a `/worktree` command, or a `--worktree` flag. If you do, use it and skip to Step 4.
|
|
|
|
|
Check your available tools — do you have `EnterWorktree`, `WorktreeCreate`, a `/worktree` command, or a `--worktree` flag? **If YES: use it now and skip to Step 4.**
|
|
|
|
|
|
|
|
|
|
Native tools handle directory placement, branch creation, and cleanup automatically. Using `git worktree add` when you have a native tool creates phantom state your harness can't see or manage.
|
|
|
|
|
Native tools handle directory placement, branch creation, and cleanup automatically. Using `git worktree add` when you have a native tool creates phantom state — your harness can't see or manage worktrees it didn't create, and cleanup becomes impossible.
|
|
|
|
|
|
|
|
|
|
Only proceed to Step 3b if you have no native worktree tool available.
|
|
|
|
|
**Even if `.worktrees/` already exists, even under time pressure, even if `git worktree add` feels faster — use your native tool.** There are no exceptions.
|
|
|
|
|
|
|
|
|
|
**Only proceed to Step 3b if you have confirmed you have NO native worktree/isolation tool.**
|
|
|
|
|
|
|
|
|
|
### 3b. Git Worktree Fallback
|
|
|
|
|
|
|
|
|
|
@@ -80,25 +82,25 @@ Only proceed to Step 3b if you have no native worktree tool available.
|
|
|
|
|
|
|
|
|
|
#### Directory Selection
|
|
|
|
|
|
|
|
|
|
Follow this priority order. Explicit user preference always beats observed filesystem state.
|
|
|
|
|
Follow this priority order:
|
|
|
|
|
|
|
|
|
|
1. **Check global and project agent instruction files** (`~/.claude/CLAUDE.md`, `~/.config/gemini/AGENTS.md`, project-level `CLAUDE.md`, `AGENTS.md`, `GEMINI.md`, `.cursorrules`, or equivalent) for a declared worktree directory preference. If specified, use it without asking.
|
|
|
|
|
|
|
|
|
|
2. **Check for an existing project-local worktree directory:**
|
|
|
|
|
1. **Check existing directories:**
|
|
|
|
|
```bash
|
|
|
|
|
ls -d .worktrees 2>/dev/null # Preferred (hidden)
|
|
|
|
|
ls -d worktrees 2>/dev/null # Alternative
|
|
|
|
|
```
|
|
|
|
|
If found, use it. If both exist, `.worktrees` wins.
|
|
|
|
|
If found, use that directory. If both exist, `.worktrees` wins.
|
|
|
|
|
|
|
|
|
|
3. **Check for an existing global directory:**
|
|
|
|
|
2. **Check for existing global directory:**
|
|
|
|
|
```bash
|
|
|
|
|
project=$(basename "$(git rev-parse --show-toplevel)")
|
|
|
|
|
ls -d ~/.config/superpowers/worktrees/$project 2>/dev/null
|
|
|
|
|
```
|
|
|
|
|
If found, use it (backward compatibility with legacy global path).
|
|
|
|
|
|
|
|
|
|
4. **If there is no other guidance available**, default to `.worktrees/` at the project root.
|
|
|
|
|
3. **Check your project's agent instruction file** (CLAUDE.md, GEMINI.md, AGENTS.md, .cursorrules, or equivalent) for a worktree directory preference. If specified, use it without asking.
|
|
|
|
|
|
|
|
|
|
4. **Default to `.worktrees/`.**
|
|
|
|
|
|
|
|
|
|
#### Safety Verification (project-local directories only)
|
|
|
|
|
|
|
|
|
|
@@ -127,7 +129,7 @@ git worktree add "$path" -b "$BRANCH_NAME"
|
|
|
|
|
cd "$path"
|
|
|
|
|
```
|
|
|
|
|
|
|
|
|
|
**Sandbox fallback:** If `git worktree add` fails with a permission error (sandbox denial), tell the user the sandbox blocked worktree creation and you're working in the current directory instead. Then run setup and baseline tests in place.
|
|
|
|
|
**Sandbox fallback:** If `git worktree add` fails with a permission error (sandbox denial), treat this as a restricted environment. Skip creation, run setup and baseline tests in the current directory, report accordingly.
|
|
|
|
|
|
|
|
|
|
## Step 4: Project Setup
|
|
|
|
|
|
|
|
|
|
@@ -197,7 +199,7 @@ Ready to implement <feature-name>
|
|
|
|
|
| Tests fail during baseline | Report failures + ask |
|
|
|
|
|
| No package.json/Cargo.toml | Skip dependency install |
|
|
|
|
|
| User gives no worktree preference | Work in place (Step 2 default) |
|
|
|
|
|
| Plan touches multiple repos | Offer a matching worktree per repo, same branch name |
|
|
|
|
|
| Plan touches multiple repos | Offer worktree per repo (same Step 1→2→3 flow, matching branch names) |
|
|
|
|
|
|
|
|
|
|
## Common Mistakes
|
|
|
|
|
|
|
|
|
|
|