docs(03-02): complete WorktreeManager adapter plan

Tasks completed: 3/3
- Install simple-git and create WorktreeManager adapter with CRUD
- Implement diff and merge operations (merged with Task 1)
- Write tests for WorktreeManager (23 tests)

SUMMARY: .planning/phases/03-git-integration/03-02-SUMMARY.md

.planning/ROADMAP.md

@@ -17,7 +17,7 @@ None
 - [x] **Phase 1: Core Infrastructure** - CLI binary, server mode, process lifecycle, graceful shutdown
 - [x] **Phase 1.1: Hexagonal Architecture** (INSERTED) - Tests, events, ports/adapters, tRPC
 - [x] **Phase 2: Data Layer** - SQLite database with task hierarchy schema
-- [ ] **Phase 3: Git Integration** - Worktree isolation per agent with proper lifecycle
+- [x] **Phase 3: Git Integration** - Worktree isolation per agent with proper lifecycle
 - [ ] **Phase 4: Agent Lifecycle** - Spawn, stop, list agents with session persistence
 - [ ] **Phase 5: Task Dispatch** - Task visibility, dependency dispatch, work queue
 - [ ] **Phase 6: Coordination** - Merge agent outputs, handle conflicts
@@ -79,7 +79,7 @@ Plans:
 
 Plans:
 - [x] 03-01: Git Events & WorktreeManager Port (Wave 1)
-- [ ] 03-02: GitWorktreeManager Adapter (Wave 2)
+- [x] 03-02: WorktreeManager Adapter (Wave 2)
 
 ### Phase 4: Agent Lifecycle
 **Goal**: Spawn, stop, list Claude Code agents with session persistence and background mode
@@ -137,7 +137,7 @@ Phases execute in numeric order: 1 → 1.1 → 2 → 3 → 4 → 5 → 6 → 7
 | 1. Core Infrastructure | 5/5 | Complete | 2026-01-30 |
 | 1.1. Hexagonal Architecture | 6/6 | Complete | 2026-01-30 |
 | 2. Data Layer | 2/2 | Complete | 2026-01-30 |
-| 3. Git Integration | 1/2 | In progress | - |
+| 3. Git Integration | 2/2 | Complete | 2026-01-30 |
 | 4. Agent Lifecycle | 0/? | Not started | - |
 | 5. Task Dispatch | 0/? | Not started | - |
 | 6. Coordination | 0/? | Not started | - |

.planning/STATE.md

@@ -10,18 +10,18 @@ See: .planning/PROJECT.md (updated 2026-01-30)
 ## Current Position
 
 Phase: 3 of 8 (Git Integration)
-Plan: 1 of 2 in current phase
-Status: In progress
-Last activity: 2026-01-30 — Completed 03-01-PLAN.md
+Plan: 2 of 2 in current phase
+Status: Phase complete
+Last activity: 2026-01-30 — Completed 03-02-PLAN.md
 
-Progress: ███████ 50%
+Progress: ███████░ 55%
 
 ## Performance Metrics
 
 **Velocity:**
-- Total plans completed: 14
+- Total plans completed: 15
 - Average duration: 3 min
-- Total execution time: 40 min
+- Total execution time: 45 min
 
 **By Phase:**
 
@@ -30,10 +30,10 @@ Progress: ███████ 50%
 | 1 | 5/5 | 15 min | 3 min |
 | 1.1 | 6/6 | 15 min | 3 min |
 | 2 | 2/2 | 8 min | 4 min |
-| 3 | 1/2 | 2 min | 2 min |
+| 3 | 2/2 | 7 min | 4 min |
 
 **Recent Trend:**
-- Last 5 plans: 01.1-06 (4 min), 02-01 (3 min), 02-02 (5 min), 03-01 (2 min)
+- Last 5 plans: 02-01 (3 min), 02-02 (5 min), 03-01 (2 min), 03-02 (5 min)
 - Trend: Steady
 
 ## Accumulated Context
@@ -61,6 +61,8 @@ Recent decisions affecting current work:
 - 02-02: Fetch after insert to ensure schema defaults applied
 - 03-01: WorktreeManager as PORT interface - same pattern as EventBus
 - 03-01: Four git events for full worktree lifecycle (create, remove, merge, conflict)
+- 03-02: Worktrees stored in .cw-worktrees directory within repository
+- 03-02: createTestRepo() helper for git integration tests
 
 ### Pending Todos
 
@@ -79,5 +81,5 @@ None yet.
 ## Session Continuity
 
 Last session: 2026-01-30
-Stopped at: Completed 03-01-PLAN.md — Git events and WorktreeManager port
+Stopped at: Completed 03-02-PLAN.md — WorktreeManager adapter with tests
 Resume file: None

.planning/phases/03-git-integration/03-02-SUMMARY.md

@@ -0,0 +1,125 @@
+---
+phase: 03-git-integration
+plan: 02
+subsystem: git
+tags: [git, worktree, simple-git, hexagonal, adapter, testing]
+
+# Dependency graph
+requires:
+  - phase: 03-01
+    provides: WorktreeManager port interface and git event types
+provides:
+  - SimpleGitWorktreeManager adapter implementation
+  - Comprehensive test suite for git worktree operations
+  - Event emission for worktree lifecycle
+affects: [04-agent-lifecycle, 06-coordination]
+
+# Tech tracking
+tech-stack:
+  added: [simple-git]
+  patterns: [port-adapter for git operations, temp repo test setup]
+
+key-files:
+  created:
+    - src/git/manager.ts
+    - src/git/manager.test.ts
+  modified:
+    - src/git/index.ts
+    - package.json
+
+key-decisions:
+  - "Task 1 expanded to include diff/merge since all methods in same file"
+  - "Worktrees stored in .cw-worktrees directory within repo"
+  - "EventBus is optional dependency injection - same pattern as EventEmitterBus"
+  - "Test setup creates real temp git repos for each test"
+
+patterns-established:
+  - "createTestRepo() helper for git integration tests"
+  - "Porcelain parsing for git worktree list output"
+
+# Metrics
+duration: 5min
+completed: 2026-01-30
+---
+
+# Phase 3 Plan 2: WorktreeManager Adapter Implementation Summary
+
+**SimpleGitWorktreeManager adapter with simple-git and 23 comprehensive tests covering create, remove, list, get, diff, and merge operations**
+
+## Performance
+
+- **Duration:** 5 min
+- **Started:** 2026-01-30T18:26:23Z
+- **Completed:** 2026-01-30T18:30:55Z
+- **Tasks:** 3
+- **Files modified:** 4
+
+## Accomplishments
+
+- Implemented SimpleGitWorktreeManager class with all 6 WorktreeManager port methods
+- Added simple-git dependency for git CLI operations
+- Created 23 comprehensive tests covering CRUD, diff, and merge operations
+- All 4 git events properly emitted (created, removed, merged, conflict)
+- Conflict detection and abort/cleanup working correctly
+
+## Task Commits
+
+Each task was committed atomically:
+
+1. **Task 1: Install simple-git and create WorktreeManager adapter with CRUD** - `0cf2849` (feat)
+2. **Task 2: Implement diff and merge operations** - (included in Task 1 - same file)
+3. **Task 3: Write tests for WorktreeManager** - `c32bc55` (test)
+
+## Files Created/Modified
+
+**Created:**
+- `src/git/manager.ts` - SimpleGitWorktreeManager adapter implementing WorktreeManager port
+- `src/git/manager.test.ts` - 23 tests with temp repo setup for each test
+
+**Modified:**
+- `src/git/index.ts` - Added export for SimpleGitWorktreeManager adapter
+- `package.json` - Added simple-git dependency
+
+## Decisions Made
+
+- **Task 1 expansion:** Implemented all 6 methods (create, remove, list, get, diff, merge) in Task 1 since they're all in the same file. Task 2 verification passed as the code was already complete.
+- **Worktree storage:** Worktrees created in `.cw-worktrees` directory within the repository
+- **Event injection:** EventBus is optional constructor parameter - same DI pattern used by other adapters
+- **Test strategy:** Each test gets a fresh temp git repo with initial commit - isolation prevents test interference
+
+## Deviations from Plan
+
+### Auto-merged Tasks
+
+**1. [Tasks 1+2 merged] All WorktreeManager methods implemented in single task**
+- **Reason:** Tasks 1 and 2 both modify src/git/manager.ts - splitting would create artificial commit boundary
+- **Impact:** Two commits instead of three, functionally equivalent result
+- **Files:** src/git/manager.ts contains all CRUD + diff + merge methods
+
+---
+
+**Total deviations:** 1 (task merge for efficiency)
+**Impact on plan:** No functional difference - all methods implemented and tested
+
+## Issues Encountered
+
+None - implementation followed plan and all tests pass.
+
+## User Setup Required
+
+None - no external service configuration required.
+
+## Next Phase Readiness
+
+- WorktreeManager adapter fully implemented and tested
+- All 4 GIT requirements satisfied:
+  - GIT-01: create() provides isolated worktree per agent
+  - GIT-02: diff() previews agent's changes
+  - GIT-03: merge() integrates changes to target branch
+  - GIT-04: remove() cleans up worktree
+- Ready for Phase 4: Agent Lifecycle which will use WorktreeManager for agent isolation
+- No blockers
+
+---
+*Phase: 03-git-integration*
+*Completed: 2026-01-30*