docs(08-02): complete edge case E2E tests plan

Tasks completed: 3/3
- Create E2E edge case tests (crash, waiting, blocking)
- Add merge conflict scenario tests
- Add test module index export

SUMMARY: .planning/phases/08-e2e-scenario-tests/08-02-SUMMARY.md

.planning/ROADMAP.md

@@ -138,8 +138,8 @@ Plans:
 **Plans**: 2 plans
 
 Plans:
-- [ ] 08-01: Happy Path E2E Tests
+- [x] 08-01: Happy Path E2E Tests
-- [ ] 08-02: Edge Case E2E Tests
+- [x] 08-02: Edge Case E2E Tests
 
 #### Phase 9: Extended Scenarios & CI
 
@@ -166,7 +166,7 @@ Phases execute in numeric order: 1 → 1.1 → 2 → 3 → 4 → 5 → 6 → 7
 | 5. Task Dispatch | v1.0 | 5/5 | Complete | 2026-01-30 |
 | 6. Coordination | v1.0 | 3/3 | Complete | 2026-01-30 |
 | 7. Mock Agent & Test Harness | v1.1 | 2/2 | Complete | 2026-01-31 |
-| 8. E2E Scenario Tests | v1.1 | 0/2 | Not started | - |
+| 8. E2E Scenario Tests | v1.1 | 2/2 | Complete | 2026-01-31 |
 | 9. Extended Scenarios & CI | v1.1 | 0/? | Not started | - |
 
 ---

.planning/STATE.md

@@ -9,19 +9,19 @@ See: .planning/PROJECT.md (updated 2026-01-30)
 
 ## Current Position
 
-Phase: 7 of 9 (Mock Agent & Test Harness)
+Phase: 8 of 9 (E2E Scenario Tests)
 Plan: 2 of 2 in current phase
 Status: Phase complete
-Last activity: 2026-01-31 — Completed 07-02-PLAN.md
+Last activity: 2026-01-31 — Completed 08-02-PLAN.md
 
-Progress: ██░░░░░░░░ 20%
+Progress: ████████░░ 80%
 
 ## Performance Metrics
 
 **Velocity:**
-- Total plans completed: 29
+- Total plans completed: 31
 - Average duration: 3 min
-- Total execution time: 90 min
+- Total execution time: 96 min
 
 **By Phase (v1.0):**
 
@@ -36,7 +36,7 @@ Progress: ██░░░░░░░░ 20%
 | 6 | 3/3 | 9 min | 3 min |
 
 **Recent Trend:**
-- Last 5 plans: 07-02 (4 min), 07-01 (2 min), 06-03 (3 min), 06-02 (4 min), 06-01 (2 min)
+- Last 5 plans: 08-02 (3 min), 08-01 (3 min), 07-02 (4 min), 07-01 (2 min), 06-03 (3 min)
 - Trend: Steady
 
 ## Accumulated Context
@@ -104,6 +104,9 @@ Recent decisions affecting current work:
 - 07-02: DispatchManager requires pre-seeded idle agent before spawning new ones
 - 07-02: Fixtures use name-to-ID mapping for dependency resolution
 - 07-02: MockWorktreeManager allows custom merge results for conflict testing
+- 08-02: Agent crash tests verify task stays in_progress (not completed)
+- 08-02: Merge conflict tests require manual agentRepository seeding
+- 08-02: MockWorktreeManager setMergeResult for conflict scenarios
 
 ### Pending Todos
 
@@ -123,5 +126,5 @@ None yet.
 ## Session Continuity
 
 Last session: 2026-01-31
-Stopped at: Completed 07-02-PLAN.md (Phase 7 complete)
+Stopped at: Completed 08-02-PLAN.md (Phase 8 complete)
 Resume file: None

.planning/phases/08-e2e-scenario-tests/08-02-SUMMARY.md

@@ -0,0 +1,104 @@
+---
+phase: 08-e2e-scenario-tests
+plan: 02
+subsystem: testing
+tags: [vitest, e2e, edge-cases, crash-handling, merge-conflicts]
+
+# Dependency graph
+requires:
+  - phase: 07-02
+    provides: TestHarness, MockAgentManager, MockWorktreeManager, fixtures
+provides:
+  - E2E tests for agent crash scenarios
+  - E2E tests for agent waiting/resume flow
+  - E2E tests for task blocking
+  - E2E tests for merge conflict handling
+affects: [09-extended-scenarios]
+
+# Tech tracking
+tech-stack:
+  added: []
+  patterns:
+    - setAgentScenario before dispatch for deterministic behavior
+    - agentRepository seeding for coordination tests
+
+key-files:
+  created:
+    - src/test/e2e/edge-cases.test.ts
+    - src/test/e2e/index.ts
+  modified: []
+
+key-decisions:
+  - "Agent crash tests verify task stays in_progress (not completed)"
+  - "Merge conflict tests require manual agentRepository seeding"
+  - "MockWorktreeManager setMergeResult for conflict scenarios"
+
+patterns-established:
+  - "Pre-seed idle agent before dispatchNext for DispatchManager requirements"
+  - "Use vi.useFakeTimers() + vi.runAllTimersAsync() for async agent completion"
+
+# Metrics
+duration: 3 min
+completed: 2026-01-31
+---
+
+# Phase 8 Plan 02: Edge Case E2E Tests Summary
+
+**E2E tests proving agent crash recovery, waiting/resume flow, task blocking, and merge conflict handling work correctly with proper event emission**
+
+## Performance
+
+- **Duration:** 3 min
+- **Started:** 2026-01-31T09:12:00Z
+- **Completed:** 2026-01-31T09:15:00Z
+- **Tasks:** 3
+- **Files modified:** 2
+
+## Accomplishments
+
+- 14 edge case E2E tests covering crash, waiting, blocking, and conflict scenarios
+- Agent crash tests proving spawned->crashed events and task status retention
+- Agent waiting/resume tests proving question surfacing and successful completion after resume
+- Task blocking tests proving blocked tasks not dispatchable
+- Merge conflict tests proving conflict detection, event emission, and resolution task creation
+
+## Task Commits
+
+Each task was committed atomically:
+
+1. **Task 1: Create E2E edge case tests (crash, waiting, blocking)** - `e0d8fc8` (test)
+2. **Task 2: Add merge conflict scenario tests** - `ebeb538` (test)
+3. **Task 3: Add test module index export** - `ac08128` (docs)
+
+## Files Created/Modified
+
+- `src/test/e2e/edge-cases.test.ts` - 14 tests for crash, waiting, blocking, conflict scenarios
+- `src/test/e2e/index.ts` - Module documentation and empty export
+
+## Decisions Made
+
+- **Agent crash tests verify task stays in_progress:** After crash, task status should NOT be completed. Tests verify task remains in_progress state.
+- **Merge conflict tests require manual agentRepository seeding:** CoordinationManager.queueMerge looks up agent by taskId. Since MockAgentManager doesn't persist to agentRepository, tests manually create agent records.
+- **MockWorktreeManager setMergeResult for conflict scenarios:** Use worktreeManager.setMergeResult() to configure specific merge failure with conflict files.
+
+## Deviations from Plan
+
+None - plan executed exactly as written.
+
+## Issues Encountered
+
+None
+
+## User Setup Required
+
+None - no external service configuration required.
+
+## Next Phase Readiness
+
+- All 20 E2E tests pass (6 happy path + 14 edge cases)
+- Test patterns established for Phase 9 extended scenarios
+- No flaky tests (verified with double run)
+
+---
+*Phase: 08-e2e-scenario-tests*
+*Completed: 2026-01-31*