diff --git a/skills/executing-plans/SKILL.md b/skills/executing-plans/SKILL.md
index a5918627..ea286496 100644
--- a/skills/executing-plans/SKILL.md
+++ b/skills/executing-plans/SKILL.md
@@ -65,6 +65,6 @@ After all tasks complete and verified:
 ## Integration
 
 **Required workflow skills:**
-- **superpowers:using-git-worktrees** - Ensures isolated workspace (creates one or verifies existing)
+- **superpowers:using-git-worktrees** - Detects workspace environment and offers worktree isolation on request
 - **superpowers:writing-plans** - Creates the plan this skill executes
 - **superpowers:finishing-a-development-branch** - Complete development after all tasks
diff --git a/skills/subagent-driven-development/SKILL.md b/skills/subagent-driven-development/SKILL.md
index 7eff5bdd..f1c230ac 100644
--- a/skills/subagent-driven-development/SKILL.md
+++ b/skills/subagent-driven-development/SKILL.md
@@ -265,7 +265,7 @@ Done!
 ## Integration
 
 **Required workflow skills:**
-- **superpowers:using-git-worktrees** - Ensures isolated workspace (creates one or verifies existing)
+- **superpowers:using-git-worktrees** - Detects workspace environment and offers worktree isolation on request
 - **superpowers:writing-plans** - Creates the plan this skill executes
 - **superpowers:requesting-code-review** - Code review template for reviewer subagents
 - **superpowers:finishing-a-development-branch** - Complete development after all tasks
diff --git a/skills/using-git-worktrees/SKILL.md b/skills/using-git-worktrees/SKILL.md
index 2229645d..09ca0bb8 100644
--- a/skills/using-git-worktrees/SKILL.md
+++ b/skills/using-git-worktrees/SKILL.md
@@ -56,7 +56,7 @@ Tell the user their options, then **wait for a reply**:
 - **User explicitly asks for a worktree** → proceed to Step 3
 - **User says work in place** → skip to Step 4
 - **User gives no clear worktree preference** → skip to Step 4 (default is in-place)
-- **Silence or unrelated reply** → skip to Step 4 (default is in-place)
+- **Silence or unrelated reply** → ask once more, then skip to Step 4 if still unclear
 
 The default is always Step 4. Step 3 requires an explicit "yes, create a worktree" from the user.
 
diff --git a/skills/using-superpowers/references/codex-tools.md b/skills/using-superpowers/references/codex-tools.md
index 539b2b1c..6828f64a 100644
--- a/skills/using-superpowers/references/codex-tools.md
+++ b/skills/using-superpowers/references/codex-tools.md
@@ -84,8 +84,8 @@ BRANCH=$(git branch --show-current)
 - `GIT_DIR != GIT_COMMON` → already in a linked worktree (skip creation)
 - `BRANCH` empty → detached HEAD (cannot branch/push/PR from sandbox)
 
-See `using-git-worktrees` Step 0 and `finishing-a-development-branch`
-Step 1 for how each skill uses these signals.
+See `using-git-worktrees` Step 1 and `finishing-a-development-branch`
+Step 2 for how each skill uses these signals.
 
 ## Codex App Finishing