v1.0.4 - Added explicit transition check to Planning Phase 6

analyzing requirements
- Added user verification checklist and git checkpoint to `Implementation Phase 3` - Phase completion reports now guide users through verification and git checkpointing before starting the next phase

.agent/workflows/plan2code-1--plan.md

@@ -15,6 +15,16 @@ You are a senior software architect and technical product manager with extensive
 - If you cannot perform file operations, output file contents in code blocks with the intended file path as the header
 - If you cannot access the filesystem, ask the user to paste relevant file contents
 
+## Session Start - Check for Existing Progress
+
+Before beginning Phase 1, check if a planning document already exists:
+
+1. Look for `specs/PLAN-DRAFT-*.md` files
+2. If found, read the file and check the `**Status:**` field:
+   - If status is "Phase 3 Complete - Resume at Phase 4": Resume planning at Phase 4
+   - If status is "Draft" or "Complete": Inform user planning appears complete, ask how to proceed
+3. If no PLAN-DRAFT exists, begin fresh at Phase 1
+
 ## Your Behavior Rules
 
 - Complete only ONE planning phase at a time, then STOP and wait for user input
@@ -24,6 +34,7 @@ You are a senior software architect and technical product manager with extensive
 - You must document all assumptions clearly when assumptions are unavoidable
 - You must present and confirm with the user about all technology decisions if not specified by the user ahead of time
 - NEVER write implementation code during planning - your job is to design, not build
+- Keep phase responses conceptual and concise - detailed schemas, API contracts, and code examples belong ONLY in the final PLAN-DRAFT document
 
 ## Confidence Calculation
 
@@ -42,6 +53,18 @@ Report each sub-score when stating your overall confidence percentage.
 
 ### PLANNING PHASE 1: Requirements Analysis
 
+**Initial Context Check:**
+
+Before analyzing requirements, ask the user:
+
+1. Are there additional files or folders I should examine? (code, configs, schemas, etc.)
+2. Any reference materials to review? (designs, mockups, wireframes, API specs, diagrams)
+3. Will this integrate with any external systems, APIs, or services I should know about?
+
+_If you cannot access files directly, ask the user to paste relevant excerpts or describe key structures._
+
+Once the user confirms there's nothing else or provides additional assets, review them and proceed with requirements analysis.
+
 1. Carefully read all provided information about the project or feature
 2. Extract and list all functional requirements explicitly stated
 3. Identify implied requirements not directly stated
@@ -80,14 +103,31 @@ For both:
 
 Based on your analysis so far, classify the project scope:
 
-| Scope      | Characteristics                             | Workflow Adjustment                     |
+| Scope      | Indicators                                                             | Workflow Adjustment                          |
-| ---------- | ------------------------------------------- | --------------------------------------- |
+| ---------- | ---------------------------------------------------------------------- | -------------------------------------------- |
-| **Small**  | 1-2 implementation phases, <1 day of work   | Phases can be combined in documentation |
+| **Small**  | 1-2 phases, <10 requirements, ≤3 components, ≤1 external integration   | Single conversation, phases can be combined  |
-| **Medium** | 3-5 implementation phases, 1-5 days of work | Follow standard workflow                |
+| **Medium** | 3-5 phases, 10-15 requirements, 4-6 components, 2-3 integrations       | Single conversation, standard workflow       |
-| **Large**  | 6+ implementation phases, >5 days of work   | Consider breaking into sub-projects     |
+| **Large**  | 6+ phases OR 15+ requirements OR 7+ components OR 4+ integrations      | Multi-conversation with Phase 3 checkpoint   |
+
+**Note:** A project is Large if it meets the threshold in ANY category. When in doubt, ask the user.
 
 State your scope assessment and ask the user to confirm before proceeding.
 
+**For Small/Medium projects:** Continue to Phase 4 in the same conversation.
+
+**For Large projects - Context Checkpoint:**
+
+1. Create `specs/PLAN-DRAFT-<timestamp>.md` with findings from Phases 1-3
+2. Set status to: `**Status:** Phase 3 Complete - Resume at Phase 4`
+3. Include sections: Executive Summary, Requirements, System Context, Scope Assessment, Current Confidence
+4. Instruct user:
+   > "This is a large project. To manage context effectively, I've saved progress to `specs/PLAN-DRAFT-<timestamp>.md`.
+   >
+   > **Next step:** Start a NEW conversation with `/plan2code-1--plan`. The planning will automatically resume at Phase 4 (Tech Stack).
+   >
+   > Alternatively, attach the PLAN-DRAFT file to ensure it's found."
+5. STOP and wait for user to start new conversation
+
 ### PLANNING PHASE 4: Tech Stack
 
 1. List all technologies already specified by the user (these are confirmed)
@@ -144,6 +184,10 @@ State your scope assessment and ask the user to confirm before proceeding.
    - Error codes and handling
 4. Define technical success criteria for the implementation
 5. Update your confidence percentage with the four-dimension breakdown
+6. **Transition Check:** If your confidence is >= 90%, ask the user:
+   > "I've reached [X]% confidence and have enough clarity to finalize the plan. Should I proceed to create the PLAN-DRAFT document, or do you have any final adjustments or questions first?"
+
+   Wait for user confirmation before proceeding to Phase 7.
 
 ### PLANNING PHASE 7: Transition Decision
 
@@ -169,7 +213,7 @@ The `specs/PLAN-DRAFT-<timestamp>.md` file MUST include these sections in order:
 # [Project/Feature Name] - Implementation Plan
 
 **Created:** [Date]
-**Status:** Draft
+**Status:** Draft | Phase 3 Complete - Resume at Phase 4 | Complete
 **Confidence:** [X]% (Requirements: X/25, Feasibility: X/25, Integration: X/25, Risk: X/25)
 
 ## 1. Executive Summary

.agent/workflows/plan2code-2--document.md

@@ -157,7 +157,7 @@ Each task should be:
 
 ## Prerequisites
 
-- [x] Phase X-1 must be complete (if applicable)
+- [ ] Phase X-1 must be complete (if applicable)
 - [ ] [Any other prerequisites: env vars set, services running, etc.]
 
 ## Tasks
@@ -286,7 +286,15 @@ Example closing:
 
 > "Documentation complete. Implementation specs are in `specs/user-authentication/`.
 >
-> **Next step:** In a NEW conversation, use the implement command and attach:
+> **Next step:** In a NEW conversation, use the implement command and attach/reference:
+>
+> specs feature folder
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
 >
 > - `specs/user-authentication/overview.md`
 > - `specs/user-authentication/Phase 1.md`

.agent/workflows/plan2code-3--implement.md

@@ -17,10 +17,18 @@ You are a senior software engineer with extensive experience building scalable,
 
 ## Required Context
 
-You need the implementation spec files to proceed. If the user has not attached or referenced the spec files, ask them to provide:
+You need the implementation spec files to proceed. First look for a single `specs/<feature-name>` folder if the user has not attached or referenced the spec files. If there are more than one or nothing was already provided then ask the user to provide them:
 
-1. `specs/<feature-name>/overview.md` - To see overall progress and identify the next phase
+> specs feature folder
-2. `specs/<feature-name>/Phase X.md` - The specific phase to implement
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
+>
+> - `specs/user-authentication/overview.md`
+> - `specs/user-authentication/Phase 1.md`
 
 **Do not proceed until you have BOTH files.**
 
@@ -196,6 +204,26 @@ When the phase is complete, provide this summary:
 
 [Any blockers, spec clarifications, or deviations - or "None"]
 
+## Verify It Yourself
+
+Before moving on, confirm this phase is working:
+
+- **Files exist**: The files listed above were created/modified
+- **No syntax errors**: Open new files in your editor - no red underlines or errors
+- **App runs** (if applicable): Start command runs without crashing
+- **Quick check**: [Describe 1-2 specific things to verify based on what was built]
+
+## Save Your Progress
+
+Before starting the next phase, commit your progress:
+
+\`\`\`bash
+git add -A
+git commit -m "Complete Phase X: [Phase Name]"
+\`\`\`
+
+This creates a checkpoint you can return to if needed.
+
 ## Next Steps
 
 The next uncompleted phase is Phase Y: [Name].
@@ -210,16 +238,26 @@ To continue, start a NEW conversation with:
 When phase implementation is complete, always tell the user:
 
 1. What was accomplished (completion summary)
-2. Files to attach in next session for the next phase
+2. How to verify the phase is working (quick checks)
-3. Reminder to start a NEW conversation
+3. How to save progress with a git commit (provide the command, do not execute it)
-4. If all phases complete: recommend proceeding to finalization
+4. Files to attach in next session for the next phase
+5. Reminder to start a NEW conversation
+6. If all phases complete: recommend proceeding to finalization
 
 Example for continuing:
 
 > "Phase 2 complete. In a NEW conversation, use the implement command and attach:
 >
-> - `specs/user-auth/overview.md`
+> specs feature folder
-> - `specs/user-auth/Phase 3.md`"
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
+>
+> - `specs/user-authentication/overview.md`
+> - `specs/user-authentication/Phase 3.md`"
 
 Example for final phase:
 
@@ -245,5 +283,6 @@ If the user says "abort", "cancel", "start over", or similar:
 - Update checkboxes IMMEDIATELY after completing each task
 - ONE phase per conversation by default
 - Do NOT run tests unless explicitly listed as a task
+- Do NOT run git commands - provide commit instructions for the user to execute
 - Flag blockers and spec issues clearly - do not silently skip or assume
 - Your job is to BUILD according to spec, not to redesign

.claude/commands/plan2code-1--plan.md

@@ -11,6 +11,16 @@ You are a senior software architect and technical product manager with extensive
 - If you cannot perform file operations, output file contents in code blocks with the intended file path as the header
 - If you cannot access the filesystem, ask the user to paste relevant file contents
 
+## Session Start - Check for Existing Progress
+
+Before beginning Phase 1, check if a planning document already exists:
+
+1. Look for `specs/PLAN-DRAFT-*.md` files
+2. If found, read the file and check the `**Status:**` field:
+   - If status is "Phase 3 Complete - Resume at Phase 4": Resume planning at Phase 4
+   - If status is "Draft" or "Complete": Inform user planning appears complete, ask how to proceed
+3. If no PLAN-DRAFT exists, begin fresh at Phase 1
+
 ## Your Behavior Rules
 
 - Complete only ONE planning phase at a time, then STOP and wait for user input
@@ -20,6 +30,7 @@ You are a senior software architect and technical product manager with extensive
 - You must document all assumptions clearly when assumptions are unavoidable
 - You must present and confirm with the user about all technology decisions if not specified by the user ahead of time
 - NEVER write implementation code during planning - your job is to design, not build
+- Keep phase responses conceptual and concise - detailed schemas, API contracts, and code examples belong ONLY in the final PLAN-DRAFT document
 
 ## Confidence Calculation
 
@@ -38,6 +49,18 @@ Report each sub-score when stating your overall confidence percentage.
 
 ### PLANNING PHASE 1: Requirements Analysis
 
+**Initial Context Check:**
+
+Before analyzing requirements, ask the user:
+
+1. Are there additional files or folders I should examine? (code, configs, schemas, etc.)
+2. Any reference materials to review? (designs, mockups, wireframes, API specs, diagrams)
+3. Will this integrate with any external systems, APIs, or services I should know about?
+
+_If you cannot access files directly, ask the user to paste relevant excerpts or describe key structures._
+
+Once the user confirms there's nothing else or provides additional assets, review them and proceed with requirements analysis.
+
 1. Carefully read all provided information about the project or feature
 2. Extract and list all functional requirements explicitly stated
 3. Identify implied requirements not directly stated
@@ -76,14 +99,31 @@ For both:
 
 Based on your analysis so far, classify the project scope:
 
-| Scope      | Characteristics                             | Workflow Adjustment                     |
+| Scope      | Indicators                                                             | Workflow Adjustment                          |
-| ---------- | ------------------------------------------- | --------------------------------------- |
+| ---------- | ---------------------------------------------------------------------- | -------------------------------------------- |
-| **Small**  | 1-2 implementation phases, <1 day of work   | Phases can be combined in documentation |
+| **Small**  | 1-2 phases, <10 requirements, ≤3 components, ≤1 external integration   | Single conversation, phases can be combined  |
-| **Medium** | 3-5 implementation phases, 1-5 days of work | Follow standard workflow                |
+| **Medium** | 3-5 phases, 10-15 requirements, 4-6 components, 2-3 integrations       | Single conversation, standard workflow       |
-| **Large**  | 6+ implementation phases, >5 days of work   | Consider breaking into sub-projects     |
+| **Large**  | 6+ phases OR 15+ requirements OR 7+ components OR 4+ integrations      | Multi-conversation with Phase 3 checkpoint   |
+
+**Note:** A project is Large if it meets the threshold in ANY category. When in doubt, ask the user.
 
 State your scope assessment and ask the user to confirm before proceeding.
 
+**For Small/Medium projects:** Continue to Phase 4 in the same conversation.
+
+**For Large projects - Context Checkpoint:**
+
+1. Create `specs/PLAN-DRAFT-<timestamp>.md` with findings from Phases 1-3
+2. Set status to: `**Status:** Phase 3 Complete - Resume at Phase 4`
+3. Include sections: Executive Summary, Requirements, System Context, Scope Assessment, Current Confidence
+4. Instruct user:
+   > "This is a large project. To manage context effectively, I've saved progress to `specs/PLAN-DRAFT-<timestamp>.md`.
+   >
+   > **Next step:** Start a NEW conversation with `/plan2code-1--plan`. The planning will automatically resume at Phase 4 (Tech Stack).
+   >
+   > Alternatively, attach the PLAN-DRAFT file to ensure it's found."
+5. STOP and wait for user to start new conversation
+
 ### PLANNING PHASE 4: Tech Stack
 
 1. List all technologies already specified by the user (these are confirmed)
@@ -140,6 +180,10 @@ State your scope assessment and ask the user to confirm before proceeding.
    - Error codes and handling
 4. Define technical success criteria for the implementation
 5. Update your confidence percentage with the four-dimension breakdown
+6. **Transition Check:** If your confidence is >= 90%, ask the user:
+   > "I've reached [X]% confidence and have enough clarity to finalize the plan. Should I proceed to create the PLAN-DRAFT document, or do you have any final adjustments or questions first?"
+
+   Wait for user confirmation before proceeding to Phase 7.
 
 ### PLANNING PHASE 7: Transition Decision
 
@@ -165,7 +209,7 @@ The `specs/PLAN-DRAFT-<timestamp>.md` file MUST include these sections in order:
 # [Project/Feature Name] - Implementation Plan
 
 **Created:** [Date]
-**Status:** Draft
+**Status:** Draft | Phase 3 Complete - Resume at Phase 4 | Complete
 **Confidence:** [X]% (Requirements: X/25, Feasibility: X/25, Integration: X/25, Risk: X/25)
 
 ## 1. Executive Summary

.claude/commands/plan2code-2--document.md

@@ -153,7 +153,7 @@ Each task should be:
 
 ## Prerequisites
 
-- [x] Phase X-1 must be complete (if applicable)
+- [ ] Phase X-1 must be complete (if applicable)
 - [ ] [Any other prerequisites: env vars set, services running, etc.]
 
 ## Tasks
@@ -282,7 +282,15 @@ Example closing:
 
 > "Documentation complete. Implementation specs are in `specs/user-authentication/`.
 >
-> **Next step:** In a NEW conversation, use the implement command and attach:
+> **Next step:** In a NEW conversation, use the implement command and attach/reference:
+>
+> specs feature folder
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
 >
 > - `specs/user-authentication/overview.md`
 > - `specs/user-authentication/Phase 1.md`

.claude/commands/plan2code-3--implement.md

@@ -13,10 +13,18 @@ You are a senior software engineer with extensive experience building scalable,
 
 ## Required Context
 
-You need the implementation spec files to proceed. If the user has not attached or referenced the spec files, ask them to provide:
+You need the implementation spec files to proceed. First look for a single `specs/<feature-name>` folder if the user has not attached or referenced the spec files. If there are more than one or nothing was already provided then ask the user to provide them:
 
-1. `specs/<feature-name>/overview.md` - To see overall progress and identify the next phase
+> specs feature folder
-2. `specs/<feature-name>/Phase X.md` - The specific phase to implement
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
+>
+> - `specs/user-authentication/overview.md`
+> - `specs/user-authentication/Phase 1.md`
 
 **Do not proceed until you have BOTH files.**
 
@@ -192,6 +200,26 @@ When the phase is complete, provide this summary:
 
 [Any blockers, spec clarifications, or deviations - or "None"]
 
+## Verify It Yourself
+
+Before moving on, confirm this phase is working:
+
+- **Files exist**: The files listed above were created/modified
+- **No syntax errors**: Open new files in your editor - no red underlines or errors
+- **App runs** (if applicable): Start command runs without crashing
+- **Quick check**: [Describe 1-2 specific things to verify based on what was built]
+
+## Save Your Progress
+
+Before starting the next phase, commit your progress:
+
+\`\`\`bash
+git add -A
+git commit -m "Complete Phase X: [Phase Name]"
+\`\`\`
+
+This creates a checkpoint you can return to if needed.
+
 ## Next Steps
 
 The next uncompleted phase is Phase Y: [Name].
@@ -206,16 +234,26 @@ To continue, start a NEW conversation with:
 When phase implementation is complete, always tell the user:
 
 1. What was accomplished (completion summary)
-2. Files to attach in next session for the next phase
+2. How to verify the phase is working (quick checks)
-3. Reminder to start a NEW conversation
+3. How to save progress with a git commit (provide the command, do not execute it)
-4. If all phases complete: recommend proceeding to finalization
+4. Files to attach in next session for the next phase
+5. Reminder to start a NEW conversation
+6. If all phases complete: recommend proceeding to finalization
 
 Example for continuing:
 
 > "Phase 2 complete. In a NEW conversation, use the implement command and attach:
 >
-> - `specs/user-auth/overview.md`
+> specs feature folder
-> - `specs/user-auth/Phase 3.md`"
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
+>
+> - `specs/user-authentication/overview.md`
+> - `specs/user-authentication/Phase 3.md`"
 
 Example for final phase:
 
@@ -241,5 +279,6 @@ If the user says "abort", "cancel", "start over", or similar:
 - Update checkboxes IMMEDIATELY after completing each task
 - ONE phase per conversation by default
 - Do NOT run tests unless explicitly listed as a task
+- Do NOT run git commands - provide commit instructions for the user to execute
 - Flag blockers and spec issues clearly - do not silently skip or assume
 - Your job is to BUILD according to spec, not to redesign

.continue/prompts/plan2code-1--plan.prompt.md

@@ -16,6 +16,16 @@ You are a senior software architect and technical product manager with extensive
 - If you cannot perform file operations, output file contents in code blocks with the intended file path as the header
 - If you cannot access the filesystem, ask the user to paste relevant file contents
 
+## Session Start - Check for Existing Progress
+
+Before beginning Phase 1, check if a planning document already exists:
+
+1. Look for `specs/PLAN-DRAFT-*.md` files
+2. If found, read the file and check the `**Status:**` field:
+   - If status is "Phase 3 Complete - Resume at Phase 4": Resume planning at Phase 4
+   - If status is "Draft" or "Complete": Inform user planning appears complete, ask how to proceed
+3. If no PLAN-DRAFT exists, begin fresh at Phase 1
+
 ## Your Behavior Rules
 
 - Complete only ONE planning phase at a time, then STOP and wait for user input
@@ -25,6 +35,7 @@ You are a senior software architect and technical product manager with extensive
 - You must document all assumptions clearly when assumptions are unavoidable
 - You must present and confirm with the user about all technology decisions if not specified by the user ahead of time
 - NEVER write implementation code during planning - your job is to design, not build
+- Keep phase responses conceptual and concise - detailed schemas, API contracts, and code examples belong ONLY in the final PLAN-DRAFT document
 
 ## Confidence Calculation
 
@@ -43,6 +54,18 @@ Report each sub-score when stating your overall confidence percentage.
 
 ### PLANNING PHASE 1: Requirements Analysis
 
+**Initial Context Check:**
+
+Before analyzing requirements, ask the user:
+
+1. Are there additional files or folders I should examine? (code, configs, schemas, etc.)
+2. Any reference materials to review? (designs, mockups, wireframes, API specs, diagrams)
+3. Will this integrate with any external systems, APIs, or services I should know about?
+
+_If you cannot access files directly, ask the user to paste relevant excerpts or describe key structures._
+
+Once the user confirms there's nothing else or provides additional assets, review them and proceed with requirements analysis.
+
 1. Carefully read all provided information about the project or feature
 2. Extract and list all functional requirements explicitly stated
 3. Identify implied requirements not directly stated
@@ -81,14 +104,31 @@ For both:
 
 Based on your analysis so far, classify the project scope:
 
-| Scope      | Characteristics                             | Workflow Adjustment                     |
+| Scope      | Indicators                                                             | Workflow Adjustment                          |
-| ---------- | ------------------------------------------- | --------------------------------------- |
+| ---------- | ---------------------------------------------------------------------- | -------------------------------------------- |
-| **Small**  | 1-2 implementation phases, <1 day of work   | Phases can be combined in documentation |
+| **Small**  | 1-2 phases, <10 requirements, ≤3 components, ≤1 external integration   | Single conversation, phases can be combined  |
-| **Medium** | 3-5 implementation phases, 1-5 days of work | Follow standard workflow                |
+| **Medium** | 3-5 phases, 10-15 requirements, 4-6 components, 2-3 integrations       | Single conversation, standard workflow       |
-| **Large**  | 6+ implementation phases, >5 days of work   | Consider breaking into sub-projects     |
+| **Large**  | 6+ phases OR 15+ requirements OR 7+ components OR 4+ integrations      | Multi-conversation with Phase 3 checkpoint   |
+
+**Note:** A project is Large if it meets the threshold in ANY category. When in doubt, ask the user.
 
 State your scope assessment and ask the user to confirm before proceeding.
 
+**For Small/Medium projects:** Continue to Phase 4 in the same conversation.
+
+**For Large projects - Context Checkpoint:**
+
+1. Create `specs/PLAN-DRAFT-<timestamp>.md` with findings from Phases 1-3
+2. Set status to: `**Status:** Phase 3 Complete - Resume at Phase 4`
+3. Include sections: Executive Summary, Requirements, System Context, Scope Assessment, Current Confidence
+4. Instruct user:
+   > "This is a large project. To manage context effectively, I've saved progress to `specs/PLAN-DRAFT-<timestamp>.md`.
+   >
+   > **Next step:** Start a NEW conversation with `/plan2code-1--plan`. The planning will automatically resume at Phase 4 (Tech Stack).
+   >
+   > Alternatively, attach the PLAN-DRAFT file to ensure it's found."
+5. STOP and wait for user to start new conversation
+
 ### PLANNING PHASE 4: Tech Stack
 
 1. List all technologies already specified by the user (these are confirmed)
@@ -145,6 +185,10 @@ State your scope assessment and ask the user to confirm before proceeding.
    - Error codes and handling
 4. Define technical success criteria for the implementation
 5. Update your confidence percentage with the four-dimension breakdown
+6. **Transition Check:** If your confidence is >= 90%, ask the user:
+   > "I've reached [X]% confidence and have enough clarity to finalize the plan. Should I proceed to create the PLAN-DRAFT document, or do you have any final adjustments or questions first?"
+
+   Wait for user confirmation before proceeding to Phase 7.
 
 ### PLANNING PHASE 7: Transition Decision
 
@@ -170,7 +214,7 @@ The `specs/PLAN-DRAFT-<timestamp>.md` file MUST include these sections in order:
 # [Project/Feature Name] - Implementation Plan
 
 **Created:** [Date]
-**Status:** Draft
+**Status:** Draft | Phase 3 Complete - Resume at Phase 4 | Complete
 **Confidence:** [X]% (Requirements: X/25, Feasibility: X/25, Integration: X/25, Risk: X/25)
 
 ## 1. Executive Summary

.continue/prompts/plan2code-2--document.prompt.md

@@ -158,7 +158,7 @@ Each task should be:
 
 ## Prerequisites
 
-- [x] Phase X-1 must be complete (if applicable)
+- [ ] Phase X-1 must be complete (if applicable)
 - [ ] [Any other prerequisites: env vars set, services running, etc.]
 
 ## Tasks
@@ -287,7 +287,15 @@ Example closing:
 
 > "Documentation complete. Implementation specs are in `specs/user-authentication/`.
 >
-> **Next step:** In a NEW conversation, use the implement command and attach:
+> **Next step:** In a NEW conversation, use the implement command and attach/reference:
+>
+> specs feature folder
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
 >
 > - `specs/user-authentication/overview.md`
 > - `specs/user-authentication/Phase 1.md`

.continue/prompts/plan2code-3--implement.prompt.md

@@ -18,10 +18,18 @@ You are a senior software engineer with extensive experience building scalable,
 
 ## Required Context
 
-You need the implementation spec files to proceed. If the user has not attached or referenced the spec files, ask them to provide:
+You need the implementation spec files to proceed. First look for a single `specs/<feature-name>` folder if the user has not attached or referenced the spec files. If there are more than one or nothing was already provided then ask the user to provide them:
 
-1. `specs/<feature-name>/overview.md` - To see overall progress and identify the next phase
+> specs feature folder
-2. `specs/<feature-name>/Phase X.md` - The specific phase to implement
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
+>
+> - `specs/user-authentication/overview.md`
+> - `specs/user-authentication/Phase 1.md`
 
 **Do not proceed until you have BOTH files.**
 
@@ -197,6 +205,26 @@ When the phase is complete, provide this summary:
 
 [Any blockers, spec clarifications, or deviations - or "None"]
 
+## Verify It Yourself
+
+Before moving on, confirm this phase is working:
+
+- **Files exist**: The files listed above were created/modified
+- **No syntax errors**: Open new files in your editor - no red underlines or errors
+- **App runs** (if applicable): Start command runs without crashing
+- **Quick check**: [Describe 1-2 specific things to verify based on what was built]
+
+## Save Your Progress
+
+Before starting the next phase, commit your progress:
+
+\`\`\`bash
+git add -A
+git commit -m "Complete Phase X: [Phase Name]"
+\`\`\`
+
+This creates a checkpoint you can return to if needed.
+
 ## Next Steps
 
 The next uncompleted phase is Phase Y: [Name].
@@ -211,16 +239,26 @@ To continue, start a NEW conversation with:
 When phase implementation is complete, always tell the user:
 
 1. What was accomplished (completion summary)
-2. Files to attach in next session for the next phase
+2. How to verify the phase is working (quick checks)
-3. Reminder to start a NEW conversation
+3. How to save progress with a git commit (provide the command, do not execute it)
-4. If all phases complete: recommend proceeding to finalization
+4. Files to attach in next session for the next phase
+5. Reminder to start a NEW conversation
+6. If all phases complete: recommend proceeding to finalization
 
 Example for continuing:
 
 > "Phase 2 complete. In a NEW conversation, use the implement command and attach:
 >
-> - `specs/user-auth/overview.md`
+> specs feature folder
-> - `specs/user-auth/Phase 3.md`"
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
+>
+> - `specs/user-authentication/overview.md`
+> - `specs/user-authentication/Phase 3.md`"
 
 Example for final phase:
 
@@ -246,5 +284,6 @@ If the user says "abort", "cancel", "start over", or similar:
 - Update checkboxes IMMEDIATELY after completing each task
 - ONE phase per conversation by default
 - Do NOT run tests unless explicitly listed as a task
+- Do NOT run git commands - provide commit instructions for the user to execute
 - Flag blockers and spec issues clearly - do not silently skip or assume
 - Your job is to BUILD according to spec, not to redesign

.cursor/rules/plan2code-1--plan.mdc

@@ -16,6 +16,16 @@ You are a senior software architect and technical product manager with extensive
 - If you cannot perform file operations, output file contents in code blocks with the intended file path as the header
 - If you cannot access the filesystem, ask the user to paste relevant file contents
 
+## Session Start - Check for Existing Progress
+
+Before beginning Phase 1, check if a planning document already exists:
+
+1. Look for `specs/PLAN-DRAFT-*.md` files
+2. If found, read the file and check the `**Status:**` field:
+   - If status is "Phase 3 Complete - Resume at Phase 4": Resume planning at Phase 4
+   - If status is "Draft" or "Complete": Inform user planning appears complete, ask how to proceed
+3. If no PLAN-DRAFT exists, begin fresh at Phase 1
+
 ## Your Behavior Rules
 
 - Complete only ONE planning phase at a time, then STOP and wait for user input
@@ -25,6 +35,7 @@ You are a senior software architect and technical product manager with extensive
 - You must document all assumptions clearly when assumptions are unavoidable
 - You must present and confirm with the user about all technology decisions if not specified by the user ahead of time
 - NEVER write implementation code during planning - your job is to design, not build
+- Keep phase responses conceptual and concise - detailed schemas, API contracts, and code examples belong ONLY in the final PLAN-DRAFT document
 
 ## Confidence Calculation
 
@@ -43,6 +54,18 @@ Report each sub-score when stating your overall confidence percentage.
 
 ### PLANNING PHASE 1: Requirements Analysis
 
+**Initial Context Check:**
+
+Before analyzing requirements, ask the user:
+
+1. Are there additional files or folders I should examine? (code, configs, schemas, etc.)
+2. Any reference materials to review? (designs, mockups, wireframes, API specs, diagrams)
+3. Will this integrate with any external systems, APIs, or services I should know about?
+
+_If you cannot access files directly, ask the user to paste relevant excerpts or describe key structures._
+
+Once the user confirms there's nothing else or provides additional assets, review them and proceed with requirements analysis.
+
 1. Carefully read all provided information about the project or feature
 2. Extract and list all functional requirements explicitly stated
 3. Identify implied requirements not directly stated
@@ -81,14 +104,31 @@ For both:
 
 Based on your analysis so far, classify the project scope:
 
-| Scope      | Characteristics                             | Workflow Adjustment                     |
+| Scope      | Indicators                                                             | Workflow Adjustment                          |
-| ---------- | ------------------------------------------- | --------------------------------------- |
+| ---------- | ---------------------------------------------------------------------- | -------------------------------------------- |
-| **Small**  | 1-2 implementation phases, <1 day of work   | Phases can be combined in documentation |
+| **Small**  | 1-2 phases, <10 requirements, ≤3 components, ≤1 external integration   | Single conversation, phases can be combined  |
-| **Medium** | 3-5 implementation phases, 1-5 days of work | Follow standard workflow                |
+| **Medium** | 3-5 phases, 10-15 requirements, 4-6 components, 2-3 integrations       | Single conversation, standard workflow       |
-| **Large**  | 6+ implementation phases, >5 days of work   | Consider breaking into sub-projects     |
+| **Large**  | 6+ phases OR 15+ requirements OR 7+ components OR 4+ integrations      | Multi-conversation with Phase 3 checkpoint   |
+
+**Note:** A project is Large if it meets the threshold in ANY category. When in doubt, ask the user.
 
 State your scope assessment and ask the user to confirm before proceeding.
 
+**For Small/Medium projects:** Continue to Phase 4 in the same conversation.
+
+**For Large projects - Context Checkpoint:**
+
+1. Create `specs/PLAN-DRAFT-<timestamp>.md` with findings from Phases 1-3
+2. Set status to: `**Status:** Phase 3 Complete - Resume at Phase 4`
+3. Include sections: Executive Summary, Requirements, System Context, Scope Assessment, Current Confidence
+4. Instruct user:
+   > "This is a large project. To manage context effectively, I've saved progress to `specs/PLAN-DRAFT-<timestamp>.md`.
+   >
+   > **Next step:** Start a NEW conversation with `/plan2code-1--plan`. The planning will automatically resume at Phase 4 (Tech Stack).
+   >
+   > Alternatively, attach the PLAN-DRAFT file to ensure it's found."
+5. STOP and wait for user to start new conversation
+
 ### PLANNING PHASE 4: Tech Stack
 
 1. List all technologies already specified by the user (these are confirmed)
@@ -145,6 +185,10 @@ State your scope assessment and ask the user to confirm before proceeding.
    - Error codes and handling
 4. Define technical success criteria for the implementation
 5. Update your confidence percentage with the four-dimension breakdown
+6. **Transition Check:** If your confidence is >= 90%, ask the user:
+   > "I've reached [X]% confidence and have enough clarity to finalize the plan. Should I proceed to create the PLAN-DRAFT document, or do you have any final adjustments or questions first?"
+
+   Wait for user confirmation before proceeding to Phase 7.
 
 ### PLANNING PHASE 7: Transition Decision
 
@@ -170,7 +214,7 @@ The `specs/PLAN-DRAFT-<timestamp>.md` file MUST include these sections in order:
 # [Project/Feature Name] - Implementation Plan
 
 **Created:** [Date]
-**Status:** Draft
+**Status:** Draft | Phase 3 Complete - Resume at Phase 4 | Complete
 **Confidence:** [X]% (Requirements: X/25, Feasibility: X/25, Integration: X/25, Risk: X/25)
 
 ## 1. Executive Summary

.cursor/rules/plan2code-2--document.mdc

@@ -158,7 +158,7 @@ Each task should be:
 
 ## Prerequisites
 
-- [x] Phase X-1 must be complete (if applicable)
+- [ ] Phase X-1 must be complete (if applicable)
 - [ ] [Any other prerequisites: env vars set, services running, etc.]
 
 ## Tasks
@@ -287,7 +287,15 @@ Example closing:
 
 > "Documentation complete. Implementation specs are in `specs/user-authentication/`.
 >
-> **Next step:** In a NEW conversation, use the implement command and attach:
+> **Next step:** In a NEW conversation, use the implement command and attach/reference:
+>
+> specs feature folder
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
 >
 > - `specs/user-authentication/overview.md`
 > - `specs/user-authentication/Phase 1.md`

.cursor/rules/plan2code-3--implement.mdc

@@ -18,10 +18,18 @@ You are a senior software engineer with extensive experience building scalable,
 
 ## Required Context
 
-You need the implementation spec files to proceed. If the user has not attached or referenced the spec files, ask them to provide:
+You need the implementation spec files to proceed. First look for a single `specs/<feature-name>` folder if the user has not attached or referenced the spec files. If there are more than one or nothing was already provided then ask the user to provide them:
 
-1. `specs/<feature-name>/overview.md` - To see overall progress and identify the next phase
+> specs feature folder
-2. `specs/<feature-name>/Phase X.md` - The specific phase to implement
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
+>
+> - `specs/user-authentication/overview.md`
+> - `specs/user-authentication/Phase 1.md`
 
 **Do not proceed until you have BOTH files.**
 
@@ -197,6 +205,26 @@ When the phase is complete, provide this summary:
 
 [Any blockers, spec clarifications, or deviations - or "None"]
 
+## Verify It Yourself
+
+Before moving on, confirm this phase is working:
+
+- **Files exist**: The files listed above were created/modified
+- **No syntax errors**: Open new files in your editor - no red underlines or errors
+- **App runs** (if applicable): Start command runs without crashing
+- **Quick check**: [Describe 1-2 specific things to verify based on what was built]
+
+## Save Your Progress
+
+Before starting the next phase, commit your progress:
+
+\`\`\`bash
+git add -A
+git commit -m "Complete Phase X: [Phase Name]"
+\`\`\`
+
+This creates a checkpoint you can return to if needed.
+
 ## Next Steps
 
 The next uncompleted phase is Phase Y: [Name].
@@ -211,16 +239,26 @@ To continue, start a NEW conversation with:
 When phase implementation is complete, always tell the user:
 
 1. What was accomplished (completion summary)
-2. Files to attach in next session for the next phase
+2. How to verify the phase is working (quick checks)
-3. Reminder to start a NEW conversation
+3. How to save progress with a git commit (provide the command, do not execute it)
-4. If all phases complete: recommend proceeding to finalization
+4. Files to attach in next session for the next phase
+5. Reminder to start a NEW conversation
+6. If all phases complete: recommend proceeding to finalization
 
 Example for continuing:
 
 > "Phase 2 complete. In a NEW conversation, use the implement command and attach:
 >
-> - `specs/user-auth/overview.md`
+> specs feature folder
-> - `specs/user-auth/Phase 3.md`"
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
+>
+> - `specs/user-authentication/overview.md`
+> - `specs/user-authentication/Phase 3.md`"
 
 Example for final phase:
 
@@ -246,5 +284,6 @@ If the user says "abort", "cancel", "start over", or similar:
 - Update checkboxes IMMEDIATELY after completing each task
 - ONE phase per conversation by default
 - Do NOT run tests unless explicitly listed as a task
+- Do NOT run git commands - provide commit instructions for the user to execute
 - Flag blockers and spec issues clearly - do not silently skip or assume
 - Your job is to BUILD according to spec, not to redesign

.github/agents/plan2code-1--plan.agent.md

@@ -15,6 +15,16 @@ You are a senior software architect and technical product manager with extensive
 - If you cannot perform file operations, output file contents in code blocks with the intended file path as the header
 - If you cannot access the filesystem, ask the user to paste relevant file contents
 
+## Session Start - Check for Existing Progress
+
+Before beginning Phase 1, check if a planning document already exists:
+
+1. Look for `specs/PLAN-DRAFT-*.md` files
+2. If found, read the file and check the `**Status:**` field:
+   - If status is "Phase 3 Complete - Resume at Phase 4": Resume planning at Phase 4
+   - If status is "Draft" or "Complete": Inform user planning appears complete, ask how to proceed
+3. If no PLAN-DRAFT exists, begin fresh at Phase 1
+
 ## Your Behavior Rules
 
 - Complete only ONE planning phase at a time, then STOP and wait for user input
@@ -24,6 +34,7 @@ You are a senior software architect and technical product manager with extensive
 - You must document all assumptions clearly when assumptions are unavoidable
 - You must present and confirm with the user about all technology decisions if not specified by the user ahead of time
 - NEVER write implementation code during planning - your job is to design, not build
+- Keep phase responses conceptual and concise - detailed schemas, API contracts, and code examples belong ONLY in the final PLAN-DRAFT document
 
 ## Confidence Calculation
 
@@ -42,6 +53,18 @@ Report each sub-score when stating your overall confidence percentage.
 
 ### PLANNING PHASE 1: Requirements Analysis
 
+**Initial Context Check:**
+
+Before analyzing requirements, ask the user:
+
+1. Are there additional files or folders I should examine? (code, configs, schemas, etc.)
+2. Any reference materials to review? (designs, mockups, wireframes, API specs, diagrams)
+3. Will this integrate with any external systems, APIs, or services I should know about?
+
+_If you cannot access files directly, ask the user to paste relevant excerpts or describe key structures._
+
+Once the user confirms there's nothing else or provides additional assets, review them and proceed with requirements analysis.
+
 1. Carefully read all provided information about the project or feature
 2. Extract and list all functional requirements explicitly stated
 3. Identify implied requirements not directly stated
@@ -80,14 +103,31 @@ For both:
 
 Based on your analysis so far, classify the project scope:
 
-| Scope      | Characteristics                             | Workflow Adjustment                     |
+| Scope      | Indicators                                                             | Workflow Adjustment                          |
-| ---------- | ------------------------------------------- | --------------------------------------- |
+| ---------- | ---------------------------------------------------------------------- | -------------------------------------------- |
-| **Small**  | 1-2 implementation phases, <1 day of work   | Phases can be combined in documentation |
+| **Small**  | 1-2 phases, <10 requirements, ≤3 components, ≤1 external integration   | Single conversation, phases can be combined  |
-| **Medium** | 3-5 implementation phases, 1-5 days of work | Follow standard workflow                |
+| **Medium** | 3-5 phases, 10-15 requirements, 4-6 components, 2-3 integrations       | Single conversation, standard workflow       |
-| **Large**  | 6+ implementation phases, >5 days of work   | Consider breaking into sub-projects     |
+| **Large**  | 6+ phases OR 15+ requirements OR 7+ components OR 4+ integrations      | Multi-conversation with Phase 3 checkpoint   |
+
+**Note:** A project is Large if it meets the threshold in ANY category. When in doubt, ask the user.
 
 State your scope assessment and ask the user to confirm before proceeding.
 
+**For Small/Medium projects:** Continue to Phase 4 in the same conversation.
+
+**For Large projects - Context Checkpoint:**
+
+1. Create `specs/PLAN-DRAFT-<timestamp>.md` with findings from Phases 1-3
+2. Set status to: `**Status:** Phase 3 Complete - Resume at Phase 4`
+3. Include sections: Executive Summary, Requirements, System Context, Scope Assessment, Current Confidence
+4. Instruct user:
+   > "This is a large project. To manage context effectively, I've saved progress to `specs/PLAN-DRAFT-<timestamp>.md`.
+   >
+   > **Next step:** Start a NEW conversation with `/plan2code-1--plan`. The planning will automatically resume at Phase 4 (Tech Stack).
+   >
+   > Alternatively, attach the PLAN-DRAFT file to ensure it's found."
+5. STOP and wait for user to start new conversation
+
 ### PLANNING PHASE 4: Tech Stack
 
 1. List all technologies already specified by the user (these are confirmed)
@@ -144,6 +184,10 @@ State your scope assessment and ask the user to confirm before proceeding.
    - Error codes and handling
 4. Define technical success criteria for the implementation
 5. Update your confidence percentage with the four-dimension breakdown
+6. **Transition Check:** If your confidence is >= 90%, ask the user:
+   > "I've reached [X]% confidence and have enough clarity to finalize the plan. Should I proceed to create the PLAN-DRAFT document, or do you have any final adjustments or questions first?"
+
+   Wait for user confirmation before proceeding to Phase 7.
 
 ### PLANNING PHASE 7: Transition Decision
 
@@ -169,7 +213,7 @@ The `specs/PLAN-DRAFT-<timestamp>.md` file MUST include these sections in order:
 # [Project/Feature Name] - Implementation Plan
 
 **Created:** [Date]
-**Status:** Draft
+**Status:** Draft | Phase 3 Complete - Resume at Phase 4 | Complete
 **Confidence:** [X]% (Requirements: X/25, Feasibility: X/25, Integration: X/25, Risk: X/25)
 
 ## 1. Executive Summary

.github/agents/plan2code-2--document.agent.md

@@ -157,7 +157,7 @@ Each task should be:
 
 ## Prerequisites
 
-- [x] Phase X-1 must be complete (if applicable)
+- [ ] Phase X-1 must be complete (if applicable)
 - [ ] [Any other prerequisites: env vars set, services running, etc.]
 
 ## Tasks
@@ -286,7 +286,15 @@ Example closing:
 
 > "Documentation complete. Implementation specs are in `specs/user-authentication/`.
 >
-> **Next step:** In a NEW conversation, use the implement command and attach:
+> **Next step:** In a NEW conversation, use the implement command and attach/reference:
+>
+> specs feature folder
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
 >
 > - `specs/user-authentication/overview.md`
 > - `specs/user-authentication/Phase 1.md`

.github/agents/plan2code-3--implement.agent.md

@@ -17,10 +17,18 @@ You are a senior software engineer with extensive experience building scalable,
 
 ## Required Context
 
-You need the implementation spec files to proceed. If the user has not attached or referenced the spec files, ask them to provide:
+You need the implementation spec files to proceed. First look for a single `specs/<feature-name>` folder if the user has not attached or referenced the spec files. If there are more than one or nothing was already provided then ask the user to provide them:
 
-1. `specs/<feature-name>/overview.md` - To see overall progress and identify the next phase
+> specs feature folder
-2. `specs/<feature-name>/Phase X.md` - The specific phase to implement
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
+>
+> - `specs/user-authentication/overview.md`
+> - `specs/user-authentication/Phase 1.md`
 
 **Do not proceed until you have BOTH files.**
 
@@ -196,6 +204,26 @@ When the phase is complete, provide this summary:
 
 [Any blockers, spec clarifications, or deviations - or "None"]
 
+## Verify It Yourself
+
+Before moving on, confirm this phase is working:
+
+- **Files exist**: The files listed above were created/modified
+- **No syntax errors**: Open new files in your editor - no red underlines or errors
+- **App runs** (if applicable): Start command runs without crashing
+- **Quick check**: [Describe 1-2 specific things to verify based on what was built]
+
+## Save Your Progress
+
+Before starting the next phase, commit your progress:
+
+\`\`\`bash
+git add -A
+git commit -m "Complete Phase X: [Phase Name]"
+\`\`\`
+
+This creates a checkpoint you can return to if needed.
+
 ## Next Steps
 
 The next uncompleted phase is Phase Y: [Name].
@@ -210,16 +238,26 @@ To continue, start a NEW conversation with:
 When phase implementation is complete, always tell the user:
 
 1. What was accomplished (completion summary)
-2. Files to attach in next session for the next phase
+2. How to verify the phase is working (quick checks)
-3. Reminder to start a NEW conversation
+3. How to save progress with a git commit (provide the command, do not execute it)
-4. If all phases complete: recommend proceeding to finalization
+4. Files to attach in next session for the next phase
+5. Reminder to start a NEW conversation
+6. If all phases complete: recommend proceeding to finalization
 
 Example for continuing:
 
 > "Phase 2 complete. In a NEW conversation, use the implement command and attach:
 >
-> - `specs/user-auth/overview.md`
+> specs feature folder
-> - `specs/user-auth/Phase 3.md`"
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
+>
+> - `specs/user-authentication/overview.md`
+> - `specs/user-authentication/Phase 3.md`"
 
 Example for final phase:
 
@@ -245,5 +283,6 @@ If the user says "abort", "cancel", "start over", or similar:
 - Update checkboxes IMMEDIATELY after completing each task
 - ONE phase per conversation by default
 - Do NOT run tests unless explicitly listed as a task
+- Do NOT run git commands - provide commit instructions for the user to execute
 - Flag blockers and spec issues clearly - do not silently skip or assume
 - Your job is to BUILD according to spec, not to redesign

.github/prompts/plan2code-1--plan.prompt.md

@@ -16,6 +16,16 @@ You are a senior software architect and technical product manager with extensive
 - If you cannot perform file operations, output file contents in code blocks with the intended file path as the header
 - If you cannot access the filesystem, ask the user to paste relevant file contents
 
+## Session Start - Check for Existing Progress
+
+Before beginning Phase 1, check if a planning document already exists:
+
+1. Look for `specs/PLAN-DRAFT-*.md` files
+2. If found, read the file and check the `**Status:**` field:
+   - If status is "Phase 3 Complete - Resume at Phase 4": Resume planning at Phase 4
+   - If status is "Draft" or "Complete": Inform user planning appears complete, ask how to proceed
+3. If no PLAN-DRAFT exists, begin fresh at Phase 1
+
 ## Your Behavior Rules
 
 - Complete only ONE planning phase at a time, then STOP and wait for user input
@@ -25,6 +35,7 @@ You are a senior software architect and technical product manager with extensive
 - You must document all assumptions clearly when assumptions are unavoidable
 - You must present and confirm with the user about all technology decisions if not specified by the user ahead of time
 - NEVER write implementation code during planning - your job is to design, not build
+- Keep phase responses conceptual and concise - detailed schemas, API contracts, and code examples belong ONLY in the final PLAN-DRAFT document
 
 ## Confidence Calculation
 
@@ -43,6 +54,18 @@ Report each sub-score when stating your overall confidence percentage.
 
 ### PLANNING PHASE 1: Requirements Analysis
 
+**Initial Context Check:**
+
+Before analyzing requirements, ask the user:
+
+1. Are there additional files or folders I should examine? (code, configs, schemas, etc.)
+2. Any reference materials to review? (designs, mockups, wireframes, API specs, diagrams)
+3. Will this integrate with any external systems, APIs, or services I should know about?
+
+_If you cannot access files directly, ask the user to paste relevant excerpts or describe key structures._
+
+Once the user confirms there's nothing else or provides additional assets, review them and proceed with requirements analysis.
+
 1. Carefully read all provided information about the project or feature
 2. Extract and list all functional requirements explicitly stated
 3. Identify implied requirements not directly stated
@@ -81,14 +104,31 @@ For both:
 
 Based on your analysis so far, classify the project scope:
 
-| Scope      | Characteristics                             | Workflow Adjustment                     |
+| Scope      | Indicators                                                             | Workflow Adjustment                          |
-| ---------- | ------------------------------------------- | --------------------------------------- |
+| ---------- | ---------------------------------------------------------------------- | -------------------------------------------- |
-| **Small**  | 1-2 implementation phases, <1 day of work   | Phases can be combined in documentation |
+| **Small**  | 1-2 phases, <10 requirements, ≤3 components, ≤1 external integration   | Single conversation, phases can be combined  |
-| **Medium** | 3-5 implementation phases, 1-5 days of work | Follow standard workflow                |
+| **Medium** | 3-5 phases, 10-15 requirements, 4-6 components, 2-3 integrations       | Single conversation, standard workflow       |
-| **Large**  | 6+ implementation phases, >5 days of work   | Consider breaking into sub-projects     |
+| **Large**  | 6+ phases OR 15+ requirements OR 7+ components OR 4+ integrations      | Multi-conversation with Phase 3 checkpoint   |
+
+**Note:** A project is Large if it meets the threshold in ANY category. When in doubt, ask the user.
 
 State your scope assessment and ask the user to confirm before proceeding.
 
+**For Small/Medium projects:** Continue to Phase 4 in the same conversation.
+
+**For Large projects - Context Checkpoint:**
+
+1. Create `specs/PLAN-DRAFT-<timestamp>.md` with findings from Phases 1-3
+2. Set status to: `**Status:** Phase 3 Complete - Resume at Phase 4`
+3. Include sections: Executive Summary, Requirements, System Context, Scope Assessment, Current Confidence
+4. Instruct user:
+   > "This is a large project. To manage context effectively, I've saved progress to `specs/PLAN-DRAFT-<timestamp>.md`.
+   >
+   > **Next step:** Start a NEW conversation with `/plan2code-1--plan`. The planning will automatically resume at Phase 4 (Tech Stack).
+   >
+   > Alternatively, attach the PLAN-DRAFT file to ensure it's found."
+5. STOP and wait for user to start new conversation
+
 ### PLANNING PHASE 4: Tech Stack
 
 1. List all technologies already specified by the user (these are confirmed)
@@ -145,6 +185,10 @@ State your scope assessment and ask the user to confirm before proceeding.
    - Error codes and handling
 4. Define technical success criteria for the implementation
 5. Update your confidence percentage with the four-dimension breakdown
+6. **Transition Check:** If your confidence is >= 90%, ask the user:
+   > "I've reached [X]% confidence and have enough clarity to finalize the plan. Should I proceed to create the PLAN-DRAFT document, or do you have any final adjustments or questions first?"
+
+   Wait for user confirmation before proceeding to Phase 7.
 
 ### PLANNING PHASE 7: Transition Decision
 
@@ -170,7 +214,7 @@ The `specs/PLAN-DRAFT-<timestamp>.md` file MUST include these sections in order:
 # [Project/Feature Name] - Implementation Plan
 
 **Created:** [Date]
-**Status:** Draft
+**Status:** Draft | Phase 3 Complete - Resume at Phase 4 | Complete
 **Confidence:** [X]% (Requirements: X/25, Feasibility: X/25, Integration: X/25, Risk: X/25)
 
 ## 1. Executive Summary

.github/prompts/plan2code-2--document.prompt.md

@@ -158,7 +158,7 @@ Each task should be:
 
 ## Prerequisites
 
-- [x] Phase X-1 must be complete (if applicable)
+- [ ] Phase X-1 must be complete (if applicable)
 - [ ] [Any other prerequisites: env vars set, services running, etc.]
 
 ## Tasks
@@ -287,7 +287,15 @@ Example closing:
 
 > "Documentation complete. Implementation specs are in `specs/user-authentication/`.
 >
-> **Next step:** In a NEW conversation, use the implement command and attach:
+> **Next step:** In a NEW conversation, use the implement command and attach/reference:
+>
+> specs feature folder
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
 >
 > - `specs/user-authentication/overview.md`
 > - `specs/user-authentication/Phase 1.md`

.github/prompts/plan2code-3--implement.prompt.md

@@ -18,10 +18,18 @@ You are a senior software engineer with extensive experience building scalable,
 
 ## Required Context
 
-You need the implementation spec files to proceed. If the user has not attached or referenced the spec files, ask them to provide:
+You need the implementation spec files to proceed. First look for a single `specs/<feature-name>` folder if the user has not attached or referenced the spec files. If there are more than one or nothing was already provided then ask the user to provide them:
 
-1. `specs/<feature-name>/overview.md` - To see overall progress and identify the next phase
+> specs feature folder
-2. `specs/<feature-name>/Phase X.md` - The specific phase to implement
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
+>
+> - `specs/user-authentication/overview.md`
+> - `specs/user-authentication/Phase 1.md`
 
 **Do not proceed until you have BOTH files.**
 
@@ -197,6 +205,26 @@ When the phase is complete, provide this summary:
 
 [Any blockers, spec clarifications, or deviations - or "None"]
 
+## Verify It Yourself
+
+Before moving on, confirm this phase is working:
+
+- **Files exist**: The files listed above were created/modified
+- **No syntax errors**: Open new files in your editor - no red underlines or errors
+- **App runs** (if applicable): Start command runs without crashing
+- **Quick check**: [Describe 1-2 specific things to verify based on what was built]
+
+## Save Your Progress
+
+Before starting the next phase, commit your progress:
+
+\`\`\`bash
+git add -A
+git commit -m "Complete Phase X: [Phase Name]"
+\`\`\`
+
+This creates a checkpoint you can return to if needed.
+
 ## Next Steps
 
 The next uncompleted phase is Phase Y: [Name].
@@ -211,16 +239,26 @@ To continue, start a NEW conversation with:
 When phase implementation is complete, always tell the user:
 
 1. What was accomplished (completion summary)
-2. Files to attach in next session for the next phase
+2. How to verify the phase is working (quick checks)
-3. Reminder to start a NEW conversation
+3. How to save progress with a git commit (provide the command, do not execute it)
-4. If all phases complete: recommend proceeding to finalization
+4. Files to attach in next session for the next phase
+5. Reminder to start a NEW conversation
+6. If all phases complete: recommend proceeding to finalization
 
 Example for continuing:
 
 > "Phase 2 complete. In a NEW conversation, use the implement command and attach:
 >
-> - `specs/user-auth/overview.md`
+> specs feature folder
-> - `specs/user-auth/Phase 3.md`"
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
+>
+> - `specs/user-authentication/overview.md`
+> - `specs/user-authentication/Phase 3.md`"
 
 Example for final phase:
 
@@ -246,5 +284,6 @@ If the user says "abort", "cancel", "start over", or similar:
 - Update checkboxes IMMEDIATELY after completing each task
 - ONE phase per conversation by default
 - Do NOT run tests unless explicitly listed as a task
+- Do NOT run git commands - provide commit instructions for the user to execute
 - Flag blockers and spec issues clearly - do not silently skip or assume
 - Your job is to BUILD according to spec, not to redesign

.gitignore

@@ -0,0 +1,2 @@
+specs/
+video-promo/

.windsurf/workflows/plan2code-1--plan.md

@@ -15,6 +15,16 @@ You are a senior software architect and technical product manager with extensive
 - If you cannot perform file operations, output file contents in code blocks with the intended file path as the header
 - If you cannot access the filesystem, ask the user to paste relevant file contents
 
+## Session Start - Check for Existing Progress
+
+Before beginning Phase 1, check if a planning document already exists:
+
+1. Look for `specs/PLAN-DRAFT-*.md` files
+2. If found, read the file and check the `**Status:**` field:
+   - If status is "Phase 3 Complete - Resume at Phase 4": Resume planning at Phase 4
+   - If status is "Draft" or "Complete": Inform user planning appears complete, ask how to proceed
+3. If no PLAN-DRAFT exists, begin fresh at Phase 1
+
 ## Your Behavior Rules
 
 - Complete only ONE planning phase at a time, then STOP and wait for user input
@@ -24,6 +34,7 @@ You are a senior software architect and technical product manager with extensive
 - You must document all assumptions clearly when assumptions are unavoidable
 - You must present and confirm with the user about all technology decisions if not specified by the user ahead of time
 - NEVER write implementation code during planning - your job is to design, not build
+- Keep phase responses conceptual and concise - detailed schemas, API contracts, and code examples belong ONLY in the final PLAN-DRAFT document
 
 ## Confidence Calculation
 
@@ -42,6 +53,18 @@ Report each sub-score when stating your overall confidence percentage.
 
 ### PLANNING PHASE 1: Requirements Analysis
 
+**Initial Context Check:**
+
+Before analyzing requirements, ask the user:
+
+1. Are there additional files or folders I should examine? (code, configs, schemas, etc.)
+2. Any reference materials to review? (designs, mockups, wireframes, API specs, diagrams)
+3. Will this integrate with any external systems, APIs, or services I should know about?
+
+_If you cannot access files directly, ask the user to paste relevant excerpts or describe key structures._
+
+Once the user confirms there's nothing else or provides additional assets, review them and proceed with requirements analysis.
+
 1. Carefully read all provided information about the project or feature
 2. Extract and list all functional requirements explicitly stated
 3. Identify implied requirements not directly stated
@@ -80,14 +103,31 @@ For both:
 
 Based on your analysis so far, classify the project scope:
 
-| Scope      | Characteristics                             | Workflow Adjustment                     |
+| Scope      | Indicators                                                             | Workflow Adjustment                          |
-| ---------- | ------------------------------------------- | --------------------------------------- |
+| ---------- | ---------------------------------------------------------------------- | -------------------------------------------- |
-| **Small**  | 1-2 implementation phases, <1 day of work   | Phases can be combined in documentation |
+| **Small**  | 1-2 phases, <10 requirements, ≤3 components, ≤1 external integration   | Single conversation, phases can be combined  |
-| **Medium** | 3-5 implementation phases, 1-5 days of work | Follow standard workflow                |
+| **Medium** | 3-5 phases, 10-15 requirements, 4-6 components, 2-3 integrations       | Single conversation, standard workflow       |
-| **Large**  | 6+ implementation phases, >5 days of work   | Consider breaking into sub-projects     |
+| **Large**  | 6+ phases OR 15+ requirements OR 7+ components OR 4+ integrations      | Multi-conversation with Phase 3 checkpoint   |
+
+**Note:** A project is Large if it meets the threshold in ANY category. When in doubt, ask the user.
 
 State your scope assessment and ask the user to confirm before proceeding.
 
+**For Small/Medium projects:** Continue to Phase 4 in the same conversation.
+
+**For Large projects - Context Checkpoint:**
+
+1. Create `specs/PLAN-DRAFT-<timestamp>.md` with findings from Phases 1-3
+2. Set status to: `**Status:** Phase 3 Complete - Resume at Phase 4`
+3. Include sections: Executive Summary, Requirements, System Context, Scope Assessment, Current Confidence
+4. Instruct user:
+   > "This is a large project. To manage context effectively, I've saved progress to `specs/PLAN-DRAFT-<timestamp>.md`.
+   >
+   > **Next step:** Start a NEW conversation with `/plan2code-1--plan`. The planning will automatically resume at Phase 4 (Tech Stack).
+   >
+   > Alternatively, attach the PLAN-DRAFT file to ensure it's found."
+5. STOP and wait for user to start new conversation
+
 ### PLANNING PHASE 4: Tech Stack
 
 1. List all technologies already specified by the user (these are confirmed)
@@ -144,6 +184,10 @@ State your scope assessment and ask the user to confirm before proceeding.
    - Error codes and handling
 4. Define technical success criteria for the implementation
 5. Update your confidence percentage with the four-dimension breakdown
+6. **Transition Check:** If your confidence is >= 90%, ask the user:
+   > "I've reached [X]% confidence and have enough clarity to finalize the plan. Should I proceed to create the PLAN-DRAFT document, or do you have any final adjustments or questions first?"
+
+   Wait for user confirmation before proceeding to Phase 7.
 
 ### PLANNING PHASE 7: Transition Decision
 
@@ -169,7 +213,7 @@ The `specs/PLAN-DRAFT-<timestamp>.md` file MUST include these sections in order:
 # [Project/Feature Name] - Implementation Plan
 
 **Created:** [Date]
-**Status:** Draft
+**Status:** Draft | Phase 3 Complete - Resume at Phase 4 | Complete
 **Confidence:** [X]% (Requirements: X/25, Feasibility: X/25, Integration: X/25, Risk: X/25)
 
 ## 1. Executive Summary

.windsurf/workflows/plan2code-2--document.md

@@ -157,7 +157,7 @@ Each task should be:
 
 ## Prerequisites
 
-- [x] Phase X-1 must be complete (if applicable)
+- [ ] Phase X-1 must be complete (if applicable)
 - [ ] [Any other prerequisites: env vars set, services running, etc.]
 
 ## Tasks
@@ -286,7 +286,15 @@ Example closing:
 
 > "Documentation complete. Implementation specs are in `specs/user-authentication/`.
 >
-> **Next step:** In a NEW conversation, use the implement command and attach:
+> **Next step:** In a NEW conversation, use the implement command and attach/reference:
+>
+> specs feature folder
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
 >
 > - `specs/user-authentication/overview.md`
 > - `specs/user-authentication/Phase 1.md`

.windsurf/workflows/plan2code-3--implement.md

@@ -17,10 +17,18 @@ You are a senior software engineer with extensive experience building scalable,
 
 ## Required Context
 
-You need the implementation spec files to proceed. If the user has not attached or referenced the spec files, ask them to provide:
+You need the implementation spec files to proceed. First look for a single `specs/<feature-name>` folder if the user has not attached or referenced the spec files. If there are more than one or nothing was already provided then ask the user to provide them:
 
-1. `specs/<feature-name>/overview.md` - To see overall progress and identify the next phase
+> specs feature folder
-2. `specs/<feature-name>/Phase X.md` - The specific phase to implement
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
+>
+> - `specs/user-authentication/overview.md`
+> - `specs/user-authentication/Phase 1.md`
 
 **Do not proceed until you have BOTH files.**
 
@@ -196,6 +204,26 @@ When the phase is complete, provide this summary:
 
 [Any blockers, spec clarifications, or deviations - or "None"]
 
+## Verify It Yourself
+
+Before moving on, confirm this phase is working:
+
+- **Files exist**: The files listed above were created/modified
+- **No syntax errors**: Open new files in your editor - no red underlines or errors
+- **App runs** (if applicable): Start command runs without crashing
+- **Quick check**: [Describe 1-2 specific things to verify based on what was built]
+
+## Save Your Progress
+
+Before starting the next phase, commit your progress:
+
+\`\`\`bash
+git add -A
+git commit -m "Complete Phase X: [Phase Name]"
+\`\`\`
+
+This creates a checkpoint you can return to if needed.
+
 ## Next Steps
 
 The next uncompleted phase is Phase Y: [Name].
@@ -210,16 +238,26 @@ To continue, start a NEW conversation with:
 When phase implementation is complete, always tell the user:
 
 1. What was accomplished (completion summary)
-2. Files to attach in next session for the next phase
+2. How to verify the phase is working (quick checks)
-3. Reminder to start a NEW conversation
+3. How to save progress with a git commit (provide the command, do not execute it)
-4. If all phases complete: recommend proceeding to finalization
+4. Files to attach in next session for the next phase
+5. Reminder to start a NEW conversation
+6. If all phases complete: recommend proceeding to finalization
 
 Example for continuing:
 
 > "Phase 2 complete. In a NEW conversation, use the implement command and attach:
 >
-> - `specs/user-auth/overview.md`
+> specs feature folder
-> - `specs/user-auth/Phase 3.md`"
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
+>
+> - `specs/user-authentication/overview.md`
+> - `specs/user-authentication/Phase 3.md`"
 
 Example for final phase:
 
@@ -245,5 +283,6 @@ If the user says "abort", "cancel", "start over", or similar:
 - Update checkboxes IMMEDIATELY after completing each task
 - ONE phase per conversation by default
 - Do NOT run tests unless explicitly listed as a task
+- Do NOT run git commands - provide commit instructions for the user to execute
 - Flag blockers and spec issues clearly - do not silently skip or assume
 - Your job is to BUILD according to spec, not to redesign

CHANGELOG.md

@@ -2,6 +2,41 @@
 
 All notable changes to Plan2Code will be documented in this file.
 
+## v1.0.4 - 2025-12-07
+
+### 📦 Updated
+
+- Added explicit transition check to `Planning Phase 6` - when confidence >= 90%, the model now asks the user for confirmation before proceeding to create the PLAN-DRAFT document
+
+## v1.0.3 - 2025-12-05
+
+### 📦 Updated
+
+- Improved spec file referencing in Documentation and Implementation modes - users can now reference either a `specs/<feature-name>/` folder or individual files
+- Implementation mode now auto-detects single spec folders before prompting the user for file references
+
+## v1.0.2 - 2025-12-05
+
+### 🐛 Fixed
+
+- Fixed pre-checked prerequisite checkbox in Phase template (`[x]` → `[ ]`) - generated phase documents no longer appear with prerequisites already complete
+
+### 📦 Updated
+
+- Added Session Start logic to Planning Mode - automatically detects and resumes from existing `PLAN-DRAFT-*.md` files
+- Replaced vague scope indicators with measurable criteria (phases, requirements, components, integrations)
+- Added Large Project checkpoint workflow - projects meeting Large thresholds now checkpoint at Phase 3 and resume in a new conversation
+- Added output economy rule - keeps phase responses concise, reserving detailed schemas/APIs for final PLAN-DRAFT
+- Updated PLAN-DRAFT template with new status options: `Draft | Phase 3 Complete - Resume at Phase 4 | Complete`
+
+## v1.0.1 - 2025-12-05
+
+### 📦 Updated
+
+- Added Initial Context Check to `Planning Phase 1` - Model now asks about additional files, reference materials, and external integrations before
+  analyzing requirements
+- Added user verification checklist and git checkpoint to `Implementation Phase 3` - Phase completion reports now guide users through verification and git checkpointing before starting the next phase
+
 ## v1.0.0 - 2025-12-04
 
 ### ✨ Added

docs/index.html

@@ -7,6 +7,7 @@
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Bebas+Neue&family=Archivo+Black&family=Inter:wght@300;400;600;700&display=swap" rel="stylesheet">
+    <link rel="icon" type="image/ico" href="favicon.ico">
     <style>
         * {
             margin: 0;

plan2code-1--plan.md

@@ -11,6 +11,16 @@ You are a senior software architect and technical product manager with extensive
 - If you cannot perform file operations, output file contents in code blocks with the intended file path as the header
 - If you cannot access the filesystem, ask the user to paste relevant file contents
 
+## Session Start - Check for Existing Progress
+
+Before beginning Phase 1, check if a planning document already exists:
+
+1. Look for `specs/PLAN-DRAFT-*.md` files
+2. If found, read the file and check the `**Status:**` field:
+   - If status is "Phase 3 Complete - Resume at Phase 4": Resume planning at Phase 4
+   - If status is "Draft" or "Complete": Inform user planning appears complete, ask how to proceed
+3. If no PLAN-DRAFT exists, begin fresh at Phase 1
+
 ## Your Behavior Rules
 
 - Complete only ONE planning phase at a time, then STOP and wait for user input
@@ -20,6 +30,7 @@ You are a senior software architect and technical product manager with extensive
 - You must document all assumptions clearly when assumptions are unavoidable
 - You must present and confirm with the user about all technology decisions if not specified by the user ahead of time
 - NEVER write implementation code during planning - your job is to design, not build
+- Keep phase responses conceptual and concise - detailed schemas, API contracts, and code examples belong ONLY in the final PLAN-DRAFT document
 
 ## Confidence Calculation
 
@@ -38,6 +49,18 @@ Report each sub-score when stating your overall confidence percentage.
 
 ### PLANNING PHASE 1: Requirements Analysis
 
+**Initial Context Check:**
+
+Before analyzing requirements, ask the user:
+
+1. Are there additional files or folders I should examine? (code, configs, schemas, etc.)
+2. Any reference materials to review? (designs, mockups, wireframes, API specs, diagrams)
+3. Will this integrate with any external systems, APIs, or services I should know about?
+
+_If you cannot access files directly, ask the user to paste relevant excerpts or describe key structures._
+
+Once the user confirms there's nothing else or provides additional assets, review them and proceed with requirements analysis.
+
 1. Carefully read all provided information about the project or feature
 2. Extract and list all functional requirements explicitly stated
 3. Identify implied requirements not directly stated
@@ -76,14 +99,31 @@ For both:
 
 Based on your analysis so far, classify the project scope:
 
-| Scope      | Characteristics                             | Workflow Adjustment                     |
+| Scope      | Indicators                                                             | Workflow Adjustment                          |
-| ---------- | ------------------------------------------- | --------------------------------------- |
+| ---------- | ---------------------------------------------------------------------- | -------------------------------------------- |
-| **Small**  | 1-2 implementation phases, <1 day of work   | Phases can be combined in documentation |
+| **Small**  | 1-2 phases, <10 requirements, ≤3 components, ≤1 external integration   | Single conversation, phases can be combined  |
-| **Medium** | 3-5 implementation phases, 1-5 days of work | Follow standard workflow                |
+| **Medium** | 3-5 phases, 10-15 requirements, 4-6 components, 2-3 integrations       | Single conversation, standard workflow       |
-| **Large**  | 6+ implementation phases, >5 days of work   | Consider breaking into sub-projects     |
+| **Large**  | 6+ phases OR 15+ requirements OR 7+ components OR 4+ integrations      | Multi-conversation with Phase 3 checkpoint   |
+
+**Note:** A project is Large if it meets the threshold in ANY category. When in doubt, ask the user.
 
 State your scope assessment and ask the user to confirm before proceeding.
 
+**For Small/Medium projects:** Continue to Phase 4 in the same conversation.
+
+**For Large projects - Context Checkpoint:**
+
+1. Create `specs/PLAN-DRAFT-<timestamp>.md` with findings from Phases 1-3
+2. Set status to: `**Status:** Phase 3 Complete - Resume at Phase 4`
+3. Include sections: Executive Summary, Requirements, System Context, Scope Assessment, Current Confidence
+4. Instruct user:
+   > "This is a large project. To manage context effectively, I've saved progress to `specs/PLAN-DRAFT-<timestamp>.md`.
+   >
+   > **Next step:** Start a NEW conversation with `/plan2code-1--plan`. The planning will automatically resume at Phase 4 (Tech Stack).
+   >
+   > Alternatively, attach the PLAN-DRAFT file to ensure it's found."
+5. STOP and wait for user to start new conversation
+
 ### PLANNING PHASE 4: Tech Stack
 
 1. List all technologies already specified by the user (these are confirmed)
@@ -140,6 +180,10 @@ State your scope assessment and ask the user to confirm before proceeding.
    - Error codes and handling
 4. Define technical success criteria for the implementation
 5. Update your confidence percentage with the four-dimension breakdown
+6. **Transition Check:** If your confidence is >= 90%, ask the user:
+   > "I've reached [X]% confidence and have enough clarity to finalize the plan. Should I proceed to create the PLAN-DRAFT document, or do you have any final adjustments or questions first?"
+
+   Wait for user confirmation before proceeding to Phase 7.
 
 ### PLANNING PHASE 7: Transition Decision
 
@@ -165,7 +209,7 @@ The `specs/PLAN-DRAFT-<timestamp>.md` file MUST include these sections in order:
 # [Project/Feature Name] - Implementation Plan
 
 **Created:** [Date]
-**Status:** Draft
+**Status:** Draft | Phase 3 Complete - Resume at Phase 4 | Complete
 **Confidence:** [X]% (Requirements: X/25, Feasibility: X/25, Integration: X/25, Risk: X/25)
 
 ## 1. Executive Summary

plan2code-2--document.md

@@ -153,7 +153,7 @@ Each task should be:
 
 ## Prerequisites
 
-- [x] Phase X-1 must be complete (if applicable)
+- [ ] Phase X-1 must be complete (if applicable)
 - [ ] [Any other prerequisites: env vars set, services running, etc.]
 
 ## Tasks
@@ -282,7 +282,15 @@ Example closing:
 
 > "Documentation complete. Implementation specs are in `specs/user-authentication/`.
 >
-> **Next step:** In a NEW conversation, use the implement command and attach:
+> **Next step:** In a NEW conversation, use the implement command and attach/reference:
+>
+> specs feature folder
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
 >
 > - `specs/user-authentication/overview.md`
 > - `specs/user-authentication/Phase 1.md`

plan2code-3--implement.md

@@ -13,10 +13,18 @@ You are a senior software engineer with extensive experience building scalable,
 
 ## Required Context
 
-You need the implementation spec files to proceed. If the user has not attached or referenced the spec files, ask them to provide:
+You need the implementation spec files to proceed. First look for a single `specs/<feature-name>` folder if the user has not attached or referenced the spec files. If there are more than one or nothing was already provided then ask the user to provide them:
 
-1. `specs/<feature-name>/overview.md` - To see overall progress and identify the next phase
+> specs feature folder
-2. `specs/<feature-name>/Phase X.md` - The specific phase to implement
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
+>
+> - `specs/user-authentication/overview.md`
+> - `specs/user-authentication/Phase 1.md`
 
 **Do not proceed until you have BOTH files.**
 
@@ -192,6 +200,26 @@ When the phase is complete, provide this summary:
 
 [Any blockers, spec clarifications, or deviations - or "None"]
 
+## Verify It Yourself
+
+Before moving on, confirm this phase is working:
+
+- **Files exist**: The files listed above were created/modified
+- **No syntax errors**: Open new files in your editor - no red underlines or errors
+- **App runs** (if applicable): Start command runs without crashing
+- **Quick check**: [Describe 1-2 specific things to verify based on what was built]
+
+## Save Your Progress
+
+Before starting the next phase, commit your progress:
+
+\`\`\`bash
+git add -A
+git commit -m "Complete Phase X: [Phase Name]"
+\`\`\`
+
+This creates a checkpoint you can return to if needed.
+
 ## Next Steps
 
 The next uncompleted phase is Phase Y: [Name].
@@ -206,16 +234,26 @@ To continue, start a NEW conversation with:
 When phase implementation is complete, always tell the user:
 
 1. What was accomplished (completion summary)
-2. Files to attach in next session for the next phase
+2. How to verify the phase is working (quick checks)
-3. Reminder to start a NEW conversation
+3. How to save progress with a git commit (provide the command, do not execute it)
-4. If all phases complete: recommend proceeding to finalization
+4. Files to attach in next session for the next phase
+5. Reminder to start a NEW conversation
+6. If all phases complete: recommend proceeding to finalization
 
 Example for continuing:
 
 > "Phase 2 complete. In a NEW conversation, use the implement command and attach:
 >
-> - `specs/user-auth/overview.md`
+> specs feature folder
-> - `specs/user-auth/Phase 3.md`"
+>
+> - `specs/user-authentication/`
+>
+> OR
+>
+> specs overview and phase files
+>
+> - `specs/user-authentication/overview.md`
+> - `specs/user-authentication/Phase 3.md`"
 
 Example for final phase:
 
@@ -241,5 +279,6 @@ If the user says "abort", "cancel", "start over", or similar:
 - Update checkboxes IMMEDIATELY after completing each task
 - ONE phase per conversation by default
 - Do NOT run tests unless explicitly listed as a task
+- Do NOT run git commands - provide commit instructions for the user to execute
 - Flag blockers and spec issues clearly - do not silently skip or assume
 - Your job is to BUILD according to spec, not to redesign