get-shit-done-cc 1.5.29 → 1.6.0

package/commands/gsd/new-project.md

@@ -842,10 +842,15 @@ Present completion with next steps:
 
 **Phase 1: [Phase Name]** — [Goal from ROADMAP.md]
 
-`/gsd:plan-phase 1`
+`/gsd:discuss-phase 1` — gather context and clarify approach
 
 <sub>`/clear` first → fresh context window</sub>
 
+---
+
+**Also available:**
+- `/gsd:plan-phase 1` — skip discussion, plan directly
+
 ───────────────────────────────────────────────────────────────
 ```
 
@@ -887,7 +892,7 @@ Present completion with next steps:
 - [ ] STATE.md initialized
 - [ ] REQUIREMENTS.md traceability updated
 - [ ] Phase directories created → **committed**
-- [ ] User knows next step is `/gsd:plan-phase 1`
+- [ ] User knows next step is `/gsd:discuss-phase 1`
 
 **Atomic commits:** Each phase commits its artifacts immediately. If context is lost, artifacts persist.
 

package/commands/gsd/plan-phase.md

@@ -419,7 +419,13 @@ Wait for user response.
 
 ## 13. Present Final Status
 
-```
+Route to `<offer_next>`.
+
+</process>
+
+<offer_next>
+Output this markdown directly (not as a code block):
+
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
  GSD ► PHASE {X} PLANNED ✓
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
@@ -440,20 +446,18 @@ Verification: {Passed | Passed with override | Skipped}
 
 **Execute Phase {X}** — run all {N} plans
 
-`/gsd:execute-phase {X}`
+/gsd:execute-phase {X}
 
-<sub>`/clear` first → fresh context window</sub>
+<sub>/clear first → fresh context window</sub>
 
 ───────────────────────────────────────────────────────────────
 
 **Also available:**
-- `cat .planning/phases/{phase-dir}/*-PLAN.md` — review plans
-- `/gsd:plan-phase {X} --research` — re-research first
+- cat .planning/phases/{phase-dir}/*-PLAN.md — review plans
+- /gsd:plan-phase {X} --research — re-research first
 
 ───────────────────────────────────────────────────────────────
-```
-
-</process>
+</offer_next>
 
 <success_criteria>
 - [ ] .planning/ directory validated

package/commands/gsd/progress.md

@@ -193,14 +193,14 @@ Check if `{phase}-CONTEXT.md` exists in phase directory.
 
 **Phase {N}: {Name}** — {Goal from ROADMAP.md}
 
-`/gsd:plan-phase {phase}`
+`/gsd:discuss-phase {phase}` — gather context and clarify approach
 
 <sub>`/clear` first → fresh context window</sub>
 
 ---
 
 **Also available:**
-- `/gsd:discuss-phase {phase}` — gather context first
+- `/gsd:plan-phase {phase}` — skip discussion, plan directly
 - `/gsd:list-phase-assumptions {phase}` — see Claude's assumptions
 
 ---
@@ -266,15 +266,15 @@ Read ROADMAP.md to get the next phase's name and goal.
 
 **Phase {Z+1}: {Name}** — {Goal from ROADMAP.md}
 
-`/gsd:plan-phase {Z+1}`
+`/gsd:discuss-phase {Z+1}` — gather context and clarify approach
 
 <sub>`/clear` first → fresh context window</sub>
 
 ---
 
 **Also available:**
+- `/gsd:plan-phase {Z+1}` — skip discussion, plan directly
 - `/gsd:verify-work {Z}` — user acceptance test before continuing
-- `/gsd:discuss-phase {Z+1}` — gather context first
 
 ---
 ```
@@ -323,21 +323,12 @@ Ready to plan the next milestone.
 
 ## ▶ Next Up
 
-**Discuss Next Milestone** — figure out what to build next
+**Start Next Milestone** — questioning → research → requirements → roadmap
 
-`/gsd:discuss-milestone`
+`/gsd:new-milestone`
 
 <sub>`/clear` first → fresh context window</sub>
 
----
-
-**Next milestone flow:**
-1. `/gsd:discuss-milestone` — thinking partner, creates context file
-2. `/gsd:new-milestone` — update PROJECT.md with new goals
-3. `/gsd:research-project` — (optional) research ecosystem
-4. `/gsd:define-requirements` — scope what to build
-5. `/gsd:create-roadmap` — plan how to build it
-
 ---
 ```
 

package/commands/gsd/verify-work.md

@@ -9,14 +9,15 @@ allowed-tools:
   - Grep
   - Edit
   - Write
+  - Task
 ---
 
 <objective>
 Validate built features through conversational testing with persistent state.
 
-Purpose: Confirm what Claude built actually works from user's perspective. One test at a time, plain text responses, no interrogation.
+Purpose: Confirm what Claude built actually works from user's perspective. One test at a time, plain text responses, no interrogation. When issues are found, automatically diagnose, plan fixes, and prepare for execution.
 
-Output: {phase}-UAT.md tracking all test results, gaps logged for /gsd:plan-phase --gaps
+Output: {phase}-UAT.md tracking all test results. If issues found: diagnosed gaps, verified fix plans ready for /gsd:execute-phase
 </objective>
 
 <execution_context>
@@ -43,7 +44,13 @@ Phase: $ARGUMENTS (optional)
    - Wait for plain text response
    - "yes/y/next" = pass, anything else = issue (severity inferred)
 6. Update UAT.md after each response
-7. On completion: commit, present summary, offer next steps
+7. On completion: commit, present summary
+8. If issues found:
+   - Spawn parallel debug agents to diagnose root causes
+   - Spawn gsd-planner in --gaps mode to create fix plans
+   - Spawn gsd-plan-checker to verify fix plans
+   - Iterate planner ↔ checker until plans pass (max 3)
+   - Present ready status with `/clear` then `/gsd:execute-phase`
 </process>
 
 <anti_patterns>
@@ -51,9 +58,153 @@ Phase: $ARGUMENTS (optional)
 - Don't ask severity — infer from description
 - Don't present full checklist upfront — one test at a time
 - Don't run automated tests — this is manual user validation
-- Don't fix issues during testing — log as gaps for /gsd:plan-phase --gaps
+- Don't fix issues during testing — log as gaps, diagnose after all tests complete
 </anti_patterns>
 
+<offer_next>
+Output this markdown directly (not as a code block). Route based on UAT results:
+
+| Status | Route |
+|--------|-------|
+| All tests pass + more phases | Route A (next phase) |
+| All tests pass + last phase | Route B (milestone complete) |
+| Issues found + fix plans ready | Route C (execute fixes) |
+| Issues found + planning blocked | Route D (manual intervention) |
+
+---
+
+**Route A: All tests pass, more phases remain**
+
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+ GSD ► PHASE {Z} VERIFIED ✓
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+**Phase {Z}: {Name}**
+
+{N}/{N} tests passed
+UAT complete ✓
+
+───────────────────────────────────────────────────────────────
+
+## ▶ Next Up
+
+**Phase {Z+1}: {Name}** — {Goal from ROADMAP.md}
+
+/gsd:discuss-phase {Z+1} — gather context and clarify approach
+
+<sub>/clear first → fresh context window</sub>
+
+───────────────────────────────────────────────────────────────
+
+**Also available:**
+- /gsd:plan-phase {Z+1} — skip discussion, plan directly
+- /gsd:execute-phase {Z+1} — skip to execution (if already planned)
+
+───────────────────────────────────────────────────────────────
+
+---
+
+**Route B: All tests pass, milestone complete**
+
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+ GSD ► PHASE {Z} VERIFIED ✓
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+**Phase {Z}: {Name}**
+
+{N}/{N} tests passed
+Final phase verified ✓
+
+───────────────────────────────────────────────────────────────
+
+## ▶ Next Up
+
+**Audit milestone** — verify requirements, cross-phase integration, E2E flows
+
+/gsd:audit-milestone
+
+<sub>/clear first → fresh context window</sub>
+
+───────────────────────────────────────────────────────────────
+
+**Also available:**
+- /gsd:complete-milestone — skip audit, archive directly
+
+───────────────────────────────────────────────────────────────
+
+---
+
+**Route C: Issues found, fix plans ready**
+
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+ GSD ► PHASE {Z} ISSUES FOUND ⚠
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+**Phase {Z}: {Name}**
+
+{N}/{M} tests passed
+{X} issues diagnosed
+Fix plans verified ✓
+
+### Issues Found
+
+{List issues with severity from UAT.md}
+
+───────────────────────────────────────────────────────────────
+
+## ▶ Next Up
+
+**Execute fix plans** — run diagnosed fixes
+
+/gsd:execute-phase {Z}
+
+<sub>/clear first → fresh context window</sub>
+
+───────────────────────────────────────────────────────────────
+
+**Also available:**
+- cat .planning/phases/{phase_dir}/*-PLAN.md — review fix plans
+- /gsd:plan-phase {Z} --gaps — regenerate fix plans
+
+───────────────────────────────────────────────────────────────
+
+---
+
+**Route D: Issues found, planning blocked**
+
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+ GSD ► PHASE {Z} BLOCKED ✗
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+**Phase {Z}: {Name}**
+
+{N}/{M} tests passed
+Fix planning blocked after {X} iterations
+
+### Unresolved Issues
+
+{List blocking issues from planner/checker output}
+
+───────────────────────────────────────────────────────────────
+
+## ▶ Next Up
+
+**Manual intervention required**
+
+Review the issues above and either:
+1. Provide guidance for fix planning
+2. Manually address blockers
+3. Accept current state and continue
+
+───────────────────────────────────────────────────────────────
+
+**Options:**
+- /gsd:plan-phase {Z} --gaps — retry fix planning with guidance
+- /gsd:discuss-phase {Z} — gather more context before replanning
+
+───────────────────────────────────────────────────────────────
+</offer_next>
+
 <success_criteria>
 - [ ] UAT.md created with tests from SUMMARY.md
 - [ ] Tests presented one at a time with expected behavior
@@ -61,5 +212,8 @@ Phase: $ARGUMENTS (optional)
 - [ ] Severity inferred, never asked
 - [ ] Batched writes: on issue, every 5 passes, or completion
 - [ ] Committed on completion
-- [ ] Clear next steps based on results
+- [ ] If issues: parallel debug agents diagnose root causes
+- [ ] If issues: gsd-planner creates fix plans from diagnosed gaps
+- [ ] If issues: gsd-plan-checker verifies fix plans (max 3 iterations)
+- [ ] Ready for `/gsd:execute-phase` when complete
 </success_criteria>

package/get-shit-done/references/continuation-format.md

@@ -167,18 +167,12 @@ All 4 phases shipped
 
 ## ▶ Next Up
 
-**Plan v1.1** — Enhanced features and optimizations
+**Start v1.1** — questioning → research → requirements → roadmap
 
-`/gsd:discuss-milestone`
+`/gsd:new-milestone`
 
 <sub>`/clear` first → fresh context window</sub>
 
----
-
-**Also available:**
-- `/gsd:new-milestone` — create directly if scope is clear
-- Review accomplishments before moving on
-
 ---
 ```
 

package/get-shit-done/references/questioning.md

@@ -16,8 +16,9 @@ Don't interrogate. Collaborate. Don't follow a script. Follow the thread.
 
 By the end of questioning, you need enough clarity to write a PROJECT.md that downstream phases can act on:
 
-- **research-project** needs: what domain to research, what the user already knows, what unknowns exist
-- **create-roadmap** needs: clear enough vision to decompose into phases, what "done" looks like
+- **Research** needs: what domain to research, what the user already knows, what unknowns exist
+- **Requirements** needs: clear enough vision to scope v1 features
+- **Roadmap** needs: clear enough vision to decompose into phases, what "done" looks like
 - **plan-phase** needs: specific requirements to break into tasks, context for implementation choices
 - **execute-phase** needs: success criteria to verify against, the "why" behind requirements
 

package/get-shit-done/templates/requirements.md

@@ -52,7 +52,7 @@ Explicitly excluded. Documented to prevent scope creep.
 
 ## Traceability
 
-Which phases cover which requirements. Updated by create-roadmap.
+Which phases cover which requirements. Updated during roadmap creation.
 
 | Requirement | Phase | Status |
 |-------------|-------|--------|
@@ -97,9 +97,9 @@ Which phases cover which requirements. Updated by create-roadmap.
 - Anti-features from research belong here with warnings
 
 **Traceability:**
-- Empty initially, populated by create-roadmap
+- Empty initially, populated during roadmap creation
 - Each requirement maps to exactly one phase
-- Unmapped requirements = roadmap gap (error in create-roadmap)
+- Unmapped requirements = roadmap gap
 
 **Status Values:**
 - Pending: Not started

package/get-shit-done/templates/research-project/SUMMARY.md

@@ -151,7 +151,7 @@ Phases with standard patterns (skip research-phase):
 
 **Implications for Roadmap:**
 - This is the most important section
-- Directly informs create-roadmap workflow
+- Directly informs roadmap creation
 - Be explicit about phase suggestions and rationale
 - Include research flags for each suggested phase
 
@@ -162,9 +162,9 @@ Phases with standard patterns (skip research-phase):
 - MEDIUM = community consensus, multiple sources agree
 - LOW = single source or inference
 
-**Integration with create-roadmap:**
-- This file is loaded as @context in create-roadmap
+**Integration with roadmap creation:**
+- This file is loaded as context during roadmap creation
 - Phase suggestions here become starting point for roadmap
-- Research flags inform detect_research_needs step
+- Research flags inform phase planning
 
 </guidelines>

package/get-shit-done/workflows/complete-milestone.md

@@ -528,7 +528,7 @@ Archive requirements and prepare for fresh requirements in next milestone.
    ✅ REQUIREMENTS.md deleted (fresh one needed for next milestone)
    ```
 
-**Important:** The next milestone workflow starts with `/gsd:define-requirements` to create a fresh REQUIREMENTS.md. PROJECT.md's Validated section carries the cumulative record across milestones.
+**Important:** The next milestone workflow starts with `/gsd:new-milestone` which includes requirements definition. PROJECT.md's Validated section carries the cumulative record across milestones.
 
 </step>
 
@@ -681,21 +681,12 @@ Tag: v[X.Y]
 
 ## ▶ Next Up
 
-**Discuss Next Milestone** — figure out what to build next
+**Start Next Milestone** — questioning → research → requirements → roadmap
 
-`/gsd:discuss-milestone`
+`/gsd:new-milestone`
 
 <sub>`/clear` first → fresh context window</sub>
 
----
-
-**Next milestone flow:**
-1. `/gsd:discuss-milestone` — thinking partner, creates context file
-2. `/gsd:new-milestone` — update PROJECT.md with new goals
-3. `/gsd:research-project` — (optional) research ecosystem
-4. `/gsd:define-requirements` — scope what to build
-5. `/gsd:create-roadmap` — plan how to build it
-
 ---
 ```
 
@@ -754,6 +745,6 @@ Milestone completion is successful when:
 - [ ] STATE.md updated with fresh project reference
 - [ ] Git tag created (v[X.Y])
 - [ ] Milestone commit made (includes archive files and deletion)
-- [ ] User knows next steps (starting with /gsd:define-requirements)
+- [ ] User knows next step (/gsd:new-milestone)
 
 </success_criteria>

package/get-shit-done/workflows/diagnose-issues.md

@@ -164,10 +164,13 @@ git commit -m "docs({phase}): add root causes from diagnosis"
 </step>
 
 <step name="report_results">
-**Report diagnosis results:**
+**Report diagnosis results and hand off:**
 
+Display:
 ```
-## Diagnosis Complete
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+ GSD ► DIAGNOSIS COMPLETE
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
 | Gap (Truth) | Root Cause | Files |
 |-------------|------------|-------|
@@ -175,26 +178,13 @@ git commit -m "docs({phase}): add root causes from diagnosis"
 | Reply button positioned correctly | CSS flex order incorrect | ReplyButton.tsx |
 | Delete removes comment | API missing auth header | api/comments.ts |
 
-Debug sessions saved to ${DEBUG_DIR}/
+Debug sessions: ${DEBUG_DIR}/
 
----
-
-Next steps:
-- `/gsd:plan-phase {phase} --gaps` — Create fix plans from diagnosed gaps
-- Review debug sessions for details
+Proceeding to plan fixes...
 ```
-</step>
 
-<step name="offer_next">
-**Offer gap closure:**
-
-```
-Root causes identified. Ready to plan fixes?
-
-`/gsd:plan-phase {phase} --gaps`
-
-The fix plans will use diagnosed root causes for targeted fixes.
-```
+Return to verify-work orchestrator for automatic planning.
+Do NOT offer manual next steps - verify-work handles the rest.
 </step>
 
 </process>
@@ -239,5 +229,5 @@ The fix plans will use diagnosed root causes for targeted fixes.
 - [ ] Root causes collected from all agents
 - [ ] UAT.md gaps updated with artifacts and missing
 - [ ] Debug sessions saved to ${DEBUG_DIR}/
-- [ ] User knows next steps (plan-phase --gaps)
+- [ ] Hand off to verify-work for automatic planning
 </success_criteria>