Update template and docs

templates/commands/tasks.md

@@ -18,37 +18,57 @@ You **MUST** consider the user input before proceeding (if not empty).
 1. **Setup**: Run `{SCRIPT}` from repo root and parse FEATURE_DIR and AVAILABLE_DOCS list. All paths must be absolute.
 
 2. **Load design documents**: Read from FEATURE_DIR:
-   - **Required**: plan.md (tech stack, libraries, structure)
+   - **Required**: plan.md (tech stack, libraries, structure), spec.md (user stories with priorities)
    - **Optional**: data-model.md (entities), contracts/ (API endpoints), research.md (decisions), quickstart.md (test scenarios)
    - Note: Not all projects have all documents. Generate tasks based on what's available.
 
 3. **Execute task generation workflow** (follow the template structure):
    - Load plan.md and extract tech stack, libraries, project structure
-   - If data-model.md exists: Extract entities → generate model tasks
-   - If contracts/ exists: Each file → generate endpoint/API tasks
+   - **Load spec.md and extract user stories with their priorities (P1, P2, P3, etc.)**
+   - If data-model.md exists: Extract entities → map to user stories
+   - If contracts/ exists: Each file → map endpoints to user stories
    - If research.md exists: Extract decisions → generate setup tasks
-   - Generate tasks by category: Setup, Core Implementation, Integration, Polish
+   - **Generate tasks ORGANIZED BY USER STORY**:
+     - Setup tasks (shared infrastructure needed by all stories)
+     - **Foundational tasks (prerequisites that must complete before ANY user story can start)**
+     - For each user story (in priority order P1, P2, P3...):
+       - Group all tasks needed to complete JUST that story
+       - Include models, services, endpoints, UI components specific to that story
+       - Mark which tasks are [P] parallelizable
+       - If tests requested: Include tests specific to that story
+     - Polish/Integration tasks (cross-cutting concerns)
    - **Tests are OPTIONAL**: Only generate test tasks if explicitly requested in the feature spec or user asks for TDD approach
    - Apply task rules:
-     * Different files = mark [P] for parallel
-     * Same file = sequential (no [P])
-     * If tests requested: Tests before implementation (TDD order)
+     - Different files = mark [P] for parallel
+     - Same file = sequential (no [P])
+     - If tests requested: Tests before implementation (TDD order)
    - Number tasks sequentially (T001, T002...)
-   - Generate dependency graph
-   - Create parallel execution examples
-   - Validate task completeness (all entities have implementations, all endpoints covered)
+   - Generate dependency graph showing user story completion order
+   - Create parallel execution examples per user story
+   - Validate task completeness (each user story has all needed tasks, independently testable)
 
 4. **Generate tasks.md**: Use `.specify/templates/tasks-template.md` as structure, fill with:
    - Correct feature name from plan.md
-   - Numbered tasks (T001, T002...) in dependency order
+   - Phase 1: Setup tasks (project initialization)
+   - Phase 2: Foundational tasks (blocking prerequisites for all user stories)
+   - Phase 3+: One phase per user story (in priority order from spec.md)
+     - Each phase includes: story goal, independent test criteria, tests (if requested), implementation tasks
+     - Clear [Story] labels (US1, US2, US3...) for each task
+     - [P] markers for parallelizable tasks within each story
+     - Checkpoint markers after each story phase
+   - Final Phase: Polish & cross-cutting concerns
+   - Numbered tasks (T001, T002...) in execution order
    - Clear file paths for each task
-   - [P] markers for parallelizable tasks
-   - Phase groupings based on what's needed (Setup, Core Implementation, Integration, Polish)
-   - If tests requested: Include separate "Tests First (TDD)" phase before Core Implementation
-   - Dependency notes
+   - Dependencies section showing story completion order
+   - Parallel execution examples per story
+   - Implementation strategy section (MVP first, incremental delivery)
 
-5. **Report**: Output path to generated tasks.md and summary of task counts by phase.
-   - Parallel execution guidance
+5. **Report**: Output path to generated tasks.md and summary:
+   - Total task count
+   - Task count per user story
+   - Parallel opportunities identified
+   - Independent test criteria for each story
+   - Suggested MVP scope (typically just User Story 1)
 
 Context for task generation: {ARGS}
 
@@ -58,20 +78,38 @@ The tasks.md should be immediately executable - each task must be specific enoug
 
 **IMPORTANT**: Tests are optional. Only generate test tasks if the user explicitly requested testing or TDD approach in the feature specification.
 
-1. **From Contracts**:
-   - Each contract/endpoint → implementation task
-   - If tests requested: Each contract → contract test task [P] before implementation
-   
-2. **From Data Model**:
-   - Each entity → model creation task [P]
-   - Relationships → service layer tasks
-   
-3. **From User Stories**:
-   - Each story → implementation tasks
-   - If tests requested: Each story → integration test [P]
-   - If quickstart.md exists: Validation tasks
+**CRITICAL**: Tasks MUST be organized by user story to enable independent implementation and testing.
+
+1. **From User Stories (spec.md)** - PRIMARY ORGANIZATION:
+   - Each user story (P1, P2, P3...) gets its own phase
+   - Map all related components to their story:
+     - Models needed for that story
+     - Services needed for that story
+     - Endpoints/UI needed for that story
+     - If tests requested: Tests specific to that story
+   - Mark story dependencies (most stories should be independent)
+   
+2. **From Contracts**:
+   - Map each contract/endpoint → to the user story it serves
+   - If tests requested: Each contract → contract test task [P] before implementation in that story's phase
+   
+3. **From Data Model**:
+   - Map each entity → to the user story(ies) that need it
+   - If entity serves multiple stories: Put in earliest story or Setup phase
+   - Relationships → service layer tasks in appropriate story phase
+   
+4. **From Setup/Infrastructure**:
+   - Shared infrastructure → Setup phase (Phase 1)
+   - Foundational/blocking tasks → Foundational phase (Phase 2)
+     - Examples: Database schema setup, authentication framework, core libraries, base configurations
+     - These MUST complete before any user story can be implemented
+   - Story-specific setup → within that story's phase
+
+5. **Ordering**:
+   - Phase 1: Setup (project initialization)
+   - Phase 2: Foundational (blocking prerequisites - must complete before user stories)
+   - Phase 3+: User Stories in priority order (P1, P2, P3...)
+     - Within each story: Tests (if requested) → Models → Services → Endpoints → Integration
+   - Final Phase: Polish & Cross-Cutting Concerns
+   - Each user story phase should be a complete, independently testable increment
 
-4. **Ordering**:
-   - Without tests: Setup → Models → Services → Endpoints → Integration → Polish
-   - With tests (TDD): Setup → Tests → Models → Services → Endpoints → Integration → Polish
-   - Dependencies block parallel execution