diff --git a/get-shit-done/workflows/complete-milestone.md b/get-shit-done/workflows/complete-milestone.md
index 82bb4a7f5..b2fd0c4d3 100644
--- a/get-shit-done/workflows/complete-milestone.md
+++ b/get-shit-done/workflows/complete-milestone.md
@@ -66,20 +66,13 @@ Appears to include:
 Total: 4 phases, 8 plans, all complete
 ```
 
-**Check workflow config for gate behavior:**
-
+<config-check>
 ```bash
 cat .planning/config.json 2>/dev/null
 ```
+</config-check>
 
-Parse the config:
-
-- If `mode: "yolo"` → auto-approve
-- If `mode: "interactive"` → prompt user
-- If `mode: "custom"` → check `gates.confirm_milestone_scope` (if exists)
-
-**If auto-approved:**
-
+<if mode="yolo">
 ```
 ⚡ Auto-approved: Milestone scope verification
 
@@ -88,8 +81,10 @@ Parse the config:
 Proceeding to stats gathering...
 ```
 
-**If prompting (interactive mode):**
+Proceed directly to gather_stats step.
+</if>
 
+<if mode="interactive" OR="custom with gates.confirm_milestone_scope true">
 ```
 Ready to mark this milestone as shipped?
 (yes / wait / adjust scope)
@@ -99,6 +94,7 @@ Wait for confirmation.
 
 If "adjust scope": Ask which phases should be included.
 If "wait": Stop, user will return when ready.
+</if>
 </step>
 
 <step name="gather_stats">
diff --git a/get-shit-done/workflows/create-milestone.md b/get-shit-done/workflows/create-milestone.md
index 571de7bae..c382198a8 100644
--- a/get-shit-done/workflows/create-milestone.md
+++ b/get-shit-done/workflows/create-milestone.md
@@ -147,20 +147,13 @@ Does this look right? (yes / adjust)
 </step>
 
 <step name="confirm_phases">
-**Check workflow config for gate behavior:**
-
+<config-check>
 ```bash
 cat .planning/config.json 2>/dev/null
 ```
+</config-check>
 
-Parse the config:
-
-- If `mode: "yolo"` → auto-approve
-- If `mode: "interactive"` or missing → prompt user
-- If `mode: "custom"` → check `gates.confirm_phases`
-
-**If auto-approved:**
-
+<if mode="yolo">
 ```
 ⚡ Auto-approved: Milestone phases ([N] phases)
 
@@ -171,8 +164,10 @@ Parse the config:
 Proceeding to create milestone structure...
 ```
 
-**If prompting:**
+Proceed directly to update_roadmap step.
+</if>
 
+<if mode="interactive" OR="missing OR custom with gates.confirm_phases true">
 Present the phase breakdown:
 
 ```
diff --git a/get-shit-done/workflows/create-roadmap.md b/get-shit-done/workflows/create-roadmap.md
index a3b41f2d8..052591bfe 100644
--- a/get-shit-done/workflows/create-roadmap.md
+++ b/get-shit-done/workflows/create-roadmap.md
@@ -264,22 +264,14 @@ Does this look right? (yes / adjust)
 </step>
 
 <step name="confirm_phases">
-**Check workflow config for gate behavior:**
-
+<config-check>
 ```bash
 cat .planning/config.json 2>/dev/null
 ```
+Note: Config may not exist yet (project initialization). If missing, default to interactive mode.
+</config-check>
 
-**Note:** Config may not exist yet (this is project initialization). If missing, default to interactive mode.
-
-Parse the config (if exists):
-
-- If `mode: "yolo"` → auto-approve
-- If `mode: "interactive"` or missing → prompt user
-- If `mode: "custom"` → check `gates.confirm_phases`
-
-**If auto-approved:**
-
+<if mode="yolo">
 ```
 ⚡ Auto-approved: Phase breakdown ([N] phases)
 
@@ -290,10 +282,10 @@ Parse the config (if exists):
 Proceeding to research detection...
 ```
 
-Proceed directly to detect_research_needs.
-
-**If prompting:**
+Proceed directly to detect_research_needs step.
+</if>
 
+<if mode="interactive" OR="missing OR custom with gates.confirm_phases true">
 Present the phase breakdown inline:
 
 "Here's how I'd break this down:
@@ -309,28 +301,17 @@ If "adjust": Ask what to change, revise, present again.
 </step>
 
 <step name="decision_gate">
-After phases confirmed (or auto-approved):
-
-**Check workflow config for gate behavior:**
-
-Read config from previous step (already parsed, or default to interactive if missing).
-
-- If `mode: "yolo"` → auto-approve
-- If `mode: "interactive"` or missing → prompt user
-- If `mode: "custom"` → check `gates.confirm_roadmap`
-
-**If auto-approved:**
-
+<if mode="yolo">
 ```
 ⚡ Auto-approved: Create roadmap with [N] phases
 
 Proceeding to create .planning/ROADMAP.md...
 ```
 
-Proceed directly to create_structure.
-
-**If prompting:**
+Proceed directly to create_structure step.
+</if>
 
+<if mode="interactive" OR="missing OR custom with gates.confirm_roadmap true">
 Use AskUserQuestion:
 
 - header: "Ready"
diff --git a/get-shit-done/workflows/execute-phase.md b/get-shit-done/workflows/execute-phase.md
index ec2ff797e..9a73beb2b 100644
--- a/get-shit-done/workflows/execute-phase.md
+++ b/get-shit-done/workflows/execute-phase.md
@@ -78,20 +78,13 @@ SUMMARY naming follows same pattern:
 
 Confirm with user if ambiguous.
 
-**Check workflow config for gate behavior:**
-
+<config-check>
 ```bash
 cat .planning/config.json 2>/dev/null
 ```
+</config-check>
 
-Parse the config:
-
-- If `mode: "yolo"` → auto-approve execution
-- If `mode: "interactive"` → prompt user
-- If `mode: "custom"` → check `gates.execute_next_plan`
-
-**If auto-approved:**
-
+<if mode="yolo">
 ```
 ⚡ Auto-approved: Execute {phase}-{plan}-PLAN.md
 [Plan X of Y for Phase Z]
@@ -99,10 +92,10 @@ Parse the config:
 Starting execution...
 ```
 
-Proceed directly to parse_segments.
-
-**If prompting:**
+Proceed directly to parse_segments step.
+</if>
 
+<if mode="interactive" OR="custom with gates.execute_next_plan true">
 Present:
 
 ```
@@ -112,7 +105,8 @@ Found plan to execute: {phase}-{plan}-PLAN.md
 Proceed with execution?
 ```
 
-Wait for confirmation.
+Wait for confirmation before proceeding.
+</if>
 </step>
 
 <step name="record_start_time">
@@ -413,7 +407,7 @@ cat .planning/phases/XX-name/{phase}-{plan}-PLAN.md
 This IS the execution instructions. Follow it exactly.
 
 **If plan references CONTEXT.md:**
-The CONTEXT.md file provides phase-level objectives, constraints, and success indicators gathered before planning. This context informs implementation decisions throughout execution.
+The CONTEXT.md file provides the user's vision for this phase — how they imagine it working, what's essential, and what's out of scope. Honor this context throughout execution.
 </step>
 
 <step name="previous_phase_check">
diff --git a/get-shit-done/workflows/plan-phase.md b/get-shit-done/workflows/plan-phase.md
index e60617313..4901b3e0e 100644
--- a/get-shit-done/workflows/plan-phase.md
+++ b/get-shit-done/workflows/plan-phase.md
@@ -415,17 +415,15 @@ This file contains comprehensive ecosystem research for niche/complex domains. I
 - `<code_examples>` → reference in task actions when applicable
 
 **If {phase}-CONTEXT.md exists:**
-This file contains the user's input gathered through pre-planning questions. It captures their intent, preferences, constraints, and decisions BEFORE you plan.
+This file contains the user's vision gathered through pre-planning discussion. It captures how they imagine this phase working, what's essential, and what's out of scope.
 
 **You MUST use this context to inform your planning:**
 
-- `<phase_objectives>` → defines what to build (don't guess scope)
-- `<constraints>` → technical/timeline limits to respect
-- `<risks>` → inform verification criteria and task ordering
-- `<success_indicators>` → become plan success criteria
-- `<codebase_context>` → patterns to follow, files to reference
-- `<decisions_needed>` → resolve during task breakdown or flag as checkpoints
-- `<notes>` → user clarifications that override assumptions
+- `<vision>` → how the user imagines this working (honor their intent)
+- `<essential>` → what must be nailed in this phase (prioritize these)
+- `<boundaries>` → what's explicitly out of scope (don't add these)
+- `<specifics>` → particular look/feel/behavior mentioned (incorporate these)
+- `<notes>` → additional context that informs approach
 
 **If neither RESEARCH.md nor CONTEXT.md exist:**
 For niche domains (3D, games, audio, shaders, etc.), suggest `/gsd:research-phase {phase}` first.
@@ -507,14 +505,13 @@ See ~/.claude/get-shit-done/references/scope-estimation.md for complete splittin
 </step>
 
 <step name="confirm_breakdown">
-**FIRST: Check if confirmation gate is disabled**
-
+<config-check>
 ```bash
 cat .planning/config.json 2>/dev/null
 ```
+</config-check>
 
-**If `mode: "yolo"`** → Show summary below, then SKIP directly to write_phase_prompt step. Do NOT ask questions. Do NOT wait for confirmation.
-
+<if mode="yolo">
 ```
 ⚡ Auto-approved: Phase [X] breakdown ([N] tasks, [M] plan(s))
 
@@ -523,10 +520,10 @@ cat .planning/config.json 2>/dev/null
 Proceeding to plan creation...
 ```
 
----
-
-**Only if mode is "interactive" OR (mode is "custom" AND gates.confirm_breakdown is true), continue below:**
+Skip directly to write_phase_prompt step.
+</if>
 
+<if mode="interactive" OR="custom with gates.confirm_breakdown true">
 Present the breakdown inline and wait for confirmation:
 
 **If single plan (2-3 tasks):**
@@ -571,6 +568,7 @@ Wait for confirmation before proceeding.
 
 If "adjust": Ask what to change, revise, present again.
 If "start over": Return to gather_phase_context step.
+</if>
 </step>
 
 <step name="approach_ambiguity">
@@ -589,18 +587,15 @@ Only ask if genuinely ambiguous. Don't ask obvious choices.
 </step>
 
 <step name="decision_gate">
-**FIRST: Check mode from config (already parsed in confirm_breakdown)**
-
-**If `mode: "yolo"`** → Output the message below, then SKIP directly to write_phase_prompt. Do NOT ask questions.
-
+<if mode="yolo">
 ```
 ⚡ Auto-approved: Create phase prompt for Phase [X]
 ```
 
----
-
-**Only if mode is "interactive" OR (mode is "custom" AND gates.confirm_plan is true), continue below:**
+Skip directly to write_phase_prompt step.
+</if>
 
+<if mode="interactive" OR="custom with gates.confirm_plan true">
 Use AskUserQuestion:
 
 - header: "Ready"
@@ -611,6 +606,7 @@ Use AskUserQuestion:
   - "Let me add context" - I want to provide more information
 
 Loop until "Create phase prompt" selected.
+</if>
 </step>
 
 <step name="write_phase_prompt">
diff --git a/get-shit-done/workflows/resume-project.md b/get-shit-done/workflows/resume-project.md
index 6dc184d99..602eecf7f 100644
--- a/get-shit-done/workflows/resume-project.md
+++ b/get-shit-done/workflows/resume-project.md
@@ -127,7 +127,7 @@ Based on project state, determine the most logical next action:
 → Check if CONTEXT.md exists for this phase:
 
 - If CONTEXT.md missing:
-  → Primary: Discuss phase context (gather objectives, constraints, success indicators)
+  → Primary: Discuss phase vision (how user imagines it working)
   → Secondary: Plan directly (skip context gathering)
 - If CONTEXT.md exists:
   → Primary: Plan the phase
diff --git a/get-shit-done/workflows/transition.md b/get-shit-done/workflows/transition.md
index 182dc41a1..ef15c0afc 100644
--- a/get-shit-done/workflows/transition.md
+++ b/get-shit-done/workflows/transition.md
@@ -42,22 +42,15 @@ ls .planning/phases/XX-current/*-SUMMARY.md 2>/dev/null | sort
 - If counts match: all plans complete
 - If counts don't match: incomplete
 
-**Check workflow config for gate behavior:**
-
+<config-check>
 ```bash
 cat .planning/config.json 2>/dev/null
 ```
-
-Parse the config:
-
-- If `mode: "yolo"` → auto-approve transition (if all complete)
-- If `mode: "interactive"` → prompt user
-- If `mode: "custom"` → check `gates.confirm_transition`
+</config-check>
 
 **If all plans complete:**
 
-**If auto-approved:**
-
+<if mode="yolo">
 ```
 ⚡ Auto-approved: Transition Phase [X] → Phase [X+1]
 Phase [X] complete - all [Y] plans finished.
@@ -65,11 +58,15 @@ Phase [X] complete - all [Y] plans finished.
 Proceeding to mark done and advance...
 ```
 
-Proceed directly to cleanup_handoff.
+Proceed directly to cleanup_handoff step.
+</if>
 
-**If prompting:**
+<if mode="interactive" OR="custom with gates.confirm_transition true">
 Ask: "Phase [X] complete - all [Y] plans finished. Ready to mark done and move to Phase [X+1]?"
 
+Wait for confirmation before proceeding.
+</if>
+
 **If plans incomplete:**
 
 **SAFETY RAIL: always_confirm_destructive applies here.**