From 12373d2f2a364cedd132affa751762d62b8164e9 Mon Sep 17 00:00:00 2001
From: Lex Christopherson <lex@glittercowboy.com>
Date: Fri, 16 Jan 2026 16:33:10 -0600
Subject: [PATCH] fix(execute-phase): commit orchestrator corrections before
 verification

Orchestrator sometimes makes small fixes between executor completions
(missing imports, wiring fixes). These were left uncommitted. Now
checks for dirty state after all waves complete and commits if needed.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 commands/gsd/execute-phase.md | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/commands/gsd/execute-phase.md b/commands/gsd/execute-phase.md
index 65d3b91c0..9a656549e 100644
--- a/commands/gsd/execute-phase.md
+++ b/commands/gsd/execute-phase.md
@@ -62,19 +62,32 @@ Phase: $ARGUMENTS
    - Collect summaries from all plans
    - Report phase completion status
 
-6. **Verify phase goal**
+6. **Commit any orchestrator corrections**
+   Check for uncommitted changes before verification:
+   ```bash
+   git status --porcelain
+   ```
+
+   **If changes exist:** Orchestrator made corrections between executor completions. Commit them:
+   ```bash
+   git add -u && git commit -m "fix({phase}): orchestrator corrections"
+   ```
+
+   **If clean:** Continue to verification.
+
+7. **Verify phase goal**
    - Spawn `gsd-verifier` subagent with phase directory and goal
    - Verifier checks must_haves against actual codebase (not SUMMARY claims)
    - Creates VERIFICATION.md with detailed report
    - Route by status:
-     - `passed` → continue to step 7
+     - `passed` → continue to step 8
      - `human_needed` → present items, get approval or feedback
      - `gaps_found` → present gaps, offer `/gsd:plan-phase {X} --gaps`
 
-7. **Update roadmap and state**
+8. **Update roadmap and state**
    - Update ROADMAP.md, STATE.md
 
-8. **Update requirements**
+9. **Update requirements**
    Mark phase requirements as Complete:
    - Read ROADMAP.md, find this phase's `Requirements:` line (e.g., "AUTH-01, AUTH-02")
    - Read REQUIREMENTS.md traceability table
@@ -82,13 +95,13 @@ Phase: $ARGUMENTS
    - Write updated REQUIREMENTS.md
    - Skip if: REQUIREMENTS.md doesn't exist, or phase has no Requirements line
 
-9. **Commit phase completion**
-   Bundle all phase metadata updates in one commit:
-   - Stage: `git add .planning/ROADMAP.md .planning/STATE.md`
-   - Stage REQUIREMENTS.md if updated: `git add .planning/REQUIREMENTS.md`
-   - Commit: `docs({phase}): complete {phase-name} phase`
+10. **Commit phase completion**
+    Bundle all phase metadata updates in one commit:
+    - Stage: `git add .planning/ROADMAP.md .planning/STATE.md`
+    - Stage REQUIREMENTS.md if updated: `git add .planning/REQUIREMENTS.md`
+    - Commit: `docs({phase}): complete {phase-name} phase`
 
-10. **Offer next steps**
+11. **Offer next steps**
     - Route to next action (see `<offer_next>`)
 </process>