docs(06-03): complete coordination tRPC & CLI plan

Tasks completed: 2/2
- Add coordination tRPC procedures
- Add CLI commands for merge coordination

SUMMARY: .planning/phases/06-coordination/06-03-SUMMARY.md

.planning/ROADMAP.md

@@ -20,7 +20,7 @@ None
 - [x] **Phase 3: Git Integration** - Worktree isolation per agent with proper lifecycle
 - [x] **Phase 4: Agent Lifecycle** - Spawn, stop, list agents with session persistence
 - [x] **Phase 5: Task Dispatch** - Task visibility, dependency dispatch, work queue
-- [ ] **Phase 6: Coordination** - Merge agent outputs, handle conflicts
+- [x] **Phase 6: Coordination** - Merge agent outputs, handle conflicts
 - [ ] **Phase 7: File System UI** - Bidirectional SQLite/filesystem sync
 
 ## Phase Details
@@ -118,8 +118,8 @@ Plans:
 
 Plans:
 - [x] 06-01: Coordination Events & Port (Wave 1)
-- [ ] 06-02: CoordinationManager Adapter (Wave 2)
+- [x] 06-02: CoordinationManager Adapter (Wave 2)
-- [ ] 06-03: tRPC & CLI Integration (Wave 3)
+- [x] 06-03: tRPC & CLI Integration (Wave 3)
 
 ### Phase 7: File System UI
 **Goal**: Bidirectional sync between SQLite state and filesystem — agent messages as files, user responds via files
@@ -146,7 +146,7 @@ Phases execute in numeric order: 1 → 1.1 → 2 → 3 → 4 → 5 → 6 → 7
 | 3. Git Integration | 2/2 | Complete | 2026-01-30 |
 | 4. Agent Lifecycle | 4/4 | Complete | 2026-01-30 |
 | 5. Task Dispatch | 5/5 | Complete | 2026-01-30 |
-| 6. Coordination | 1/3 | In progress | - |
+| 6. Coordination | 3/3 | Complete | 2026-01-30 |
 | 7. File System UI | 0/? | Not started | - |
 
 ---

.planning/STATE.md

@@ -10,18 +10,18 @@ See: .planning/PROJECT.md (updated 2026-01-30)
 ## Current Position
 
 Phase: 6 of 8 (Merge Coordination)
-Plan: 1 of 3 in current phase
+Plan: 3 of 3 in current phase
-Status: In progress
+Status: Phase complete
-Last activity: 2026-01-30 — Completed 06-01-PLAN.md
+Last activity: 2026-01-30 — Completed 06-03-PLAN.md
 
-Progress: █████████░ 93%
+Progress: ██████████ 100%
 
 ## Performance Metrics
 
 **Velocity:**
-- Total plans completed: 25
+- Total plans completed: 27
 - Average duration: 3 min
-- Total execution time: 77 min
+- Total execution time: 84 min
 
 **By Phase:**
 
@@ -33,10 +33,10 @@ Progress: █████████░ 93%
 | 3 | 2/2 | 7 min | 4 min |
 | 4 | 4/4 | 12 min | 3 min |
 | 5 | 5/5 | 18 min | 4 min |
-| 6 | 1/3 | 2 min | 2 min |
+| 6 | 3/3 | 9 min | 3 min |
 
 **Recent Trend:**
-- Last 5 plans: 06-01 (2 min), 05-05 (4 min), 05-04 (4 min), 05-03 (3 min), 05-02 (3 min)
+- Last 5 plans: 06-03 (3 min), 06-02 (4 min), 06-01 (2 min), 05-05 (4 min), 05-04 (4 min)
 - Trend: Steady
 
 ## Accumulated Context
@@ -94,6 +94,10 @@ Recent decisions affecting current work:
 - 05-04: Agent name generated from taskId prefix
 - 06-01: MergeResult mirrors git MergeResult but adds taskId for coordination context
 - 06-01: Events use merge: prefix to distinguish from worktree: events
+- 06-02: MessageRepository is optional - conflict messages only sent if configured
+- 06-02: In-memory queue same pattern as DispatchManager (no persistence for v1)
+- 06-03: getMergeQueueStatus named distinctly from getQueueState (dispatch)
+- 06-03: coordinate as top-level CLI command for primary workflow action
 
 ### Pending Todos
 
@@ -112,5 +116,5 @@ None yet.
 ## Session Continuity
 
 Last session: 2026-01-30
-Stopped at: Completed 06-01-PLAN.md — Coordination events and port interface
+Stopped at: Completed 06-03-PLAN.md — Coordination tRPC & CLI
 Resume file: None

.planning/phases/06-coordination/06-03-SUMMARY.md

@@ -0,0 +1,98 @@
+---
+phase: 06-coordination
+plan: 03
+subsystem: coordination
+tags: [trpc, cli, merge-queue, commander]
+
+# Dependency graph
+requires:
+  - phase: 06-coordination
+    plan: 01
+    provides: CoordinationManager port interface, merge events
+  - phase: 06-coordination
+    plan: 02
+    provides: DefaultCoordinationManager adapter implementation
+  - phase: 05-dispatch
+    provides: dispatch CLI commands pattern
+provides:
+  - Coordination tRPC procedures (queueMerge, processMerges, getMergeQueueStatus, getNextMergeable)
+  - CLI merge command group (queue, status, next)
+  - CLI coordinate command for processing merges
+affects: [07-integration, future-cli-wiring]
+
+# Tech tracking
+tech-stack:
+  added: []
+  patterns: [tRPC coordination procedures, CLI command groups for coordination]
+
+key-files:
+  modified: [src/trpc/router.ts, src/trpc/context.ts, src/cli/index.ts]
+
+key-decisions:
+  - "getMergeQueueStatus named distinctly to avoid confusion with getQueueState (dispatch)"
+  - "coordinate as top-level command (not subcommand) for primary workflow action"
+
+patterns-established:
+  - "CoordinationManager follows same optional context pattern as other managers"
+  - "CLI merge command group mirrors dispatch command structure"
+
+# Metrics
+duration: 3min
+completed: 2026-01-30
+---
+
+# Phase 6 Plan 3: Coordination tRPC & CLI Summary
+
+**Exposes merge coordination via tRPC procedures and CLI commands (cw merge, cw coordinate).**
+
+## Performance
+
+- **Duration:** 3 min
+- **Started:** 2026-01-30T21:15:00Z
+- **Completed:** 2026-01-30T21:18:00Z
+- **Tasks:** 2
+- **Files modified:** 3
+
+## Accomplishments
+- Added coordinationManager to tRPC context with optional pattern
+- Added four coordination tRPC procedures for merge queue management
+- Added cw merge command group with queue/status/next subcommands
+- Added cw coordinate command for processing all ready merges
+
+## Task Commits
+
+Each task was committed atomically:
+
+1. **Task 1: Add coordination tRPC procedures** - `1a4de26` (feat)
+2. **Task 2: Add CLI commands for merge coordination** - `ae8d303` (feat)
+
+## Files Created/Modified
+- `src/trpc/context.ts` - Added coordinationManager to TRPCContext and CreateContextOptions
+- `src/trpc/router.ts` - Added queueMerge, processMerges, getMergeQueueStatus, getNextMergeable procedures
+- `src/cli/index.ts` - Added merge command group and coordinate command
+
+## Decisions Made
+- Named the merge queue status procedure `getMergeQueueStatus` to distinguish from `getQueueState` (dispatch queue)
+- Made `coordinate` a top-level command rather than a subcommand since it's the primary workflow action for processing merges
+
+## 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 coordination tRPC procedures available for server wiring
+- CLI commands ready for user interaction
+- Phase 6 complete - all coordination infrastructure in place
+- Ready for Phase 7 (if applicable) or integration testing
+
+---
+*Phase: 06-coordination*
+*Completed: 2026-01-30*