diff --git a/autoplan/SKILL.md.tmpl b/autoplan/SKILL.md.tmpl
index f9b6df70c..0cd4b4406 100644
--- a/autoplan/SKILL.md.tmpl
+++ b/autoplan/SKILL.md.tmpl
@@ -264,12 +264,12 @@ the tasks aggregator at Phase 4. Run all applicable skills and lazy sections ful
 - Search Before Building
 - Completion Status Protocol
 - Telemetry (run last)
-- Step 0: Detect base branch
+- Step 0: Detect platform and base branch
 - Review Readiness Dashboard
 - Plan File Review Report
 - Prerequisite Skill Offer (BENEFITS_FROM)
 - Outside Voice — Independent Plan Challenge
-- Design Outside Voices (parallel)
+- Design Outside Voices (independent)
 
 Follow ONLY the review-specific methodology, sections, and required outputs.
 
@@ -328,7 +328,7 @@ Immediately after each auto-decision, append one row to the plan file using Edit
 ## Decision Audit Trail
 
 | # | Phase | Decision | Classification | Principle | Rationale | Rejected |
-|---|-------|----------|-----------|-----------|----------|
+|---|-------|----------|----------------|-----------|-----------|----------|
 ```
 
 ---
diff --git a/autoplan/sections/dx-phase.md.tmpl b/autoplan/sections/dx-phase.md.tmpl
index 94d8de6e2..f73cccb03 100644
--- a/autoplan/sections/dx-phase.md.tmpl
+++ b/autoplan/sections/dx-phase.md.tmpl
@@ -65,8 +65,10 @@ Outer tool timeout: 720000ms. Failed/incomplete outside review → unavailable;
 
 **Required execution checklist (DX):**
 
-1. Step 0 (DX Scope Assessment): Auto-detect product type. Map the developer journey.
-   Rate initial DX completeness 0-10. Assess TTHW.
+1. Step 0 (DX Investigation, 0A-0G): Auto-detect product type, then settle persona,
+   empathy narrative, competitive benchmark and TTHW target, and trace the developer
+   journey. Score only after this evidence exists; the initial DX score is the
+   pre-fix pass scores.
 
 2. Step 0.5 (Dual Voices): Present the completed calls above under {{OUTSIDE_LABEL}} SAYS
    (DX — developer experience challenge) and {{NATIVE_LABEL}} SUBAGENT (DX — independent review).
@@ -91,7 +93,7 @@ Missing/disabled voice = N/A, never CONFIRMED. Flag any single-voice critical fi
 4. DX Scorecard: Produce the full scorecard with all 8 dimensions scored.
 
 **Mandatory outputs from Phase 2.5:**
-- Developer journey map (9-stage table)
+- Developer journey map (6-stage table from Step 0F)
 - Developer empathy narrative (first-person perspective)
 - DX Scorecard with all 8 dimension scores
 - DX Implementation Checklist
diff --git a/autoplan/sections/eng-phase.md.tmpl b/autoplan/sections/eng-phase.md.tmpl
index b4463a559..4232cfde6 100644
--- a/autoplan/sections/eng-phase.md.tmpl
+++ b/autoplan/sections/eng-phase.md.tmpl
@@ -51,7 +51,7 @@ Outer tool timeout: 720000ms. Failed/incomplete outside review → unavailable;
 
 - Architecture choices: explicit over clever (P5). If {{OUTSIDE_LABEL}} disagrees with valid reason → TASTE DECISION. Scope changes both models agree on → USER CHALLENGE.
 - Evals: always include all relevant suites (P1)
-- Test plan: generate artifact at `~/.gstack/projects/$SLUG/{user}-{branch}-test-plan-{datetime}.md`
+- Test plan: generate artifact at `$GSTACK_STATE_ROOT/projects/$SLUG/{user}-{branch}-eng-review-test-plan-{datetime}.md` (the loaded eng skill's name and root)
 - TODOS.md: collect all deferred scope expansions from every prior phase (Eng runs last), auto-write
 
 **Required execution checklist (Eng):**