diff --git a/.planning/ROADMAP.md b/.planning/ROADMAP.md
index cdc810fb2..184069a17 100644
--- a/.planning/ROADMAP.md
+++ b/.planning/ROADMAP.md
@@ -17,7 +17,8 @@ None - this is internal GSD development following existing command/workflow/temp
- [ ] **Phase 1: Templates & Structure** - Create codebase map templates and folder structure
- [ ] **Phase 2: Map Codebase Command** - Build /gsd:map-codebase with parallel Explore agents
- [ ] **Phase 3: Integration** - Wire brownfield support into existing GSD workflows
-- [ ] **Phase 10: Parallel Phase Execution** - Separate single-plan vs multi-plan execution with intelligent parallelization
+- [x] **Phase 10: Parallel Phase Execution** - Separate single-plan vs multi-plan execution with intelligent parallelization
+- [ ] **Phase 11: Parallel-Aware Planning** - Update plan-phase.md to create parallelizable plans when config enables it
## Phase Details
@@ -167,6 +168,28 @@ Parallelization features (adapted from PR #43):
- Merge conflict detection as failsafe
- Configurable via `.planning/config.json` parallelization section
+### Phase 11: Parallel-Aware Planning
+
+**Goal:** Update plan-phase.md to create plans optimized for parallel execution when parallelization is enabled
+**Depends on:** Phase 10
+**Research:** Unlikely (extending existing plan-phase workflow)
+**Plans:** 4 plans
+
+Plans:
+- [ ] 11-01: Update phase-prompt template - Add parallelization frontmatter fields (parallelizable, depends_on, files_exclusive)
+- [ ] 11-02: Add parallel-aware step to plan-phase workflow - Read config, restructure for vertical slices, document independence
+- [ ] 11-03: Update execute-phase to use plan frontmatter - Use explicit markers instead of inference, backward compat
+- [ ] 11-04: Documentation and examples - Update references, add parallel vs sequential planning examples
+
+**Details:**
+Current plan-phase.md has sequential execution bias - later plans reference earlier SUMMARY.md, file overlap is acceptable, no independence markers. When parallelization enabled in config.json, planning should:
+- Group by vertical slice (feature A, feature B) not workflow stage (setup → implement → test)
+- Avoid unnecessary inter-plan dependencies (only reference SUMMARY if genuinely needed)
+- Mark explicit file ownership per plan
+- Add frontmatter: `parallelizable: true/false`, `depends_on: []`, `files_exclusive: []`
+
+This enables execute-phase to produce more Wave 1 plans (true independence) instead of sequential chains.
+
## Progress
**Execution Order:**
@@ -184,3 +207,4 @@ Phases execute in numeric order: 1 → 2 → 3 → 4 → 5 → 6
| 8. Improve Roadmap System | 1/1 | Complete | 2026-01-05 |
| 9. Integrate Verify-Work | 1/1 | Complete | 2026-01-08 |
| 10. Parallel Phase Execution | 4/4 | Complete | 2026-01-12 |
+| 11. Parallel-Aware Planning | 0/4 | Not Started | - |
diff --git a/.planning/STATE.md b/.planning/STATE.md
index caa53c324..7c5651a28 100644
--- a/.planning/STATE.md
+++ b/.planning/STATE.md
@@ -19,12 +19,12 @@
## Current Position
-Phase: 10 of 10 (Parallel Phase Execution)
-Plan: 4 of 4 in current phase
-Status: Phase complete
-Last activity: 2026-01-12 - Completed 10-04-PLAN.md
+Phase: 11 of 11 (Parallel-Aware Planning)
+Plan: 0 of 4 in current phase
+Status: Not started
+Last activity: 2026-01-12 - Added Phase 11 to roadmap
-Progress: █████████████ 100% (19 of 19 plans)
+Progress: ████████████░ 83% (19 of 23 plans)
## Performance Metrics
@@ -89,6 +89,7 @@ None yet.
- Phase 8 added: Improve roadmap system
- Phase 9 added: Integrate verify-work (community contribution from OracleGreyBeard)
- Phase 10 added: Parallel phase execution (rename workflow, create /gsd:execute-phase with parallelization)
+- Phase 11 added: Parallel-aware planning (update plan-phase.md to create parallelizable plans when enabled)
## Project Alignment
diff --git a/get-shit-done/workflows/plan-phase.md b/get-shit-done/workflows/plan-phase.md
index eb9a777e0..f7f17b666 100644
--- a/get-shit-done/workflows/plan-phase.md
+++ b/get-shit-done/workflows/plan-phase.md
@@ -54,6 +54,28 @@ Read `.planning/STATE.md` and parse:
If STATE.md missing but .planning/ exists, offer to reconstruct or continue without.
+
+Read parallelization settings from config.json:
+
+```bash
+cat .planning/config.json 2>/dev/null | jq '.parallelization'
+```
+
+**Extract settings:**
+- `enabled`: Whether parallel execution is available (default: true)
+- `plan_level`: Whether plan-level parallelization is enabled (default: true)
+
+**Store for later steps:**
+- If `parallelization.enabled && parallelization.plan_level`: Planning will optimize for independence
+ - Group tasks by vertical slice (feature A, feature B) not workflow stage (setup → implement → test)
+ - Avoid unnecessary inter-plan dependencies
+ - Mark explicit file ownership per plan via files_exclusive
+ - Set parallelizable: true when genuinely independent
+- If disabled: Planning proceeds with sequential assumptions (current behavior)
+
+**If config.json missing:** Assume parallelization enabled (new projects get it by default).
+
+
Check for codebase map: