diff --git a/docs/tasks.md b/docs/tasks.md
index 036bde0..d570435 100644
--- a/docs/tasks.md
+++ b/docs/tasks.md
@@ -74,3 +74,41 @@
 | CI-FIX6-002 | done   | Move spec file removal to builder stage (layer-aware); add tar CVEs to .trivyignore          |       | orchestrator | fix/ci-366 |                         | CI-FIX6-004 | w-15  | 2026-02-12T21:00Z | 2026-02-12T21:15Z | 3K       | 5K   |
 | CI-FIX6-003 | done   | Add React.ChangeEvent types to ~10 web files with untyped event handlers (49 lint + 19 TS)   |       | web          | fix/ci-366 | CI-FIX6-001             | CI-FIX6-004 | w-16  | 2026-02-12T21:02Z | 2026-02-12T21:08Z | 12K      | 8K   |
 | CI-FIX6-004 | done   | Verification: pnpm lint && pnpm typecheck && pnpm test on web; Dockerfile find validation    |       | all          | fix/ci-366 | CI-FIX6-002,CI-FIX6-003 |             | orch  | 2026-02-12T21:08Z | 2026-02-12T21:10Z | 5K       | 2K   |
+
+---
+
+## M12-MatrixBridge (0.0.12) — Matrix/Element Bridge Integration
+
+**Orchestrator:** Claude Code
+**Started:** 2026-02-15
+**Branch:** feature/m12-matrix-bridge
+**Epic:** #377
+
+| id | status | description | issue | repo | branch | depends_on | blocks | agent | started_at | completed_at | estimate | used |
+|---|---|---|---|---|---|---|---|---|---|---|---|---|
+| MB-001 | not-started | Install matrix-bot-sdk and create MatrixService skeleton | #378 | api | feature/m12-matrix-bridge | | MB-003,MB-004,MB-005,MB-006,MB-007,MB-008 | | | | 20K | |
+| MB-002 | not-started | Add Synapse + Element Web to docker-compose for dev | #384 | docker | feature/m12-matrix-bridge | | | | | | 15K | |
+| MB-003 | not-started | Register MatrixService in BridgeModule with conditional loading | #379 | api | feature/m12-matrix-bridge | MB-001 | MB-008 | | | | 12K | |
+| MB-004 | not-started | Workspace-to-Matrix-Room mapping and provisioning | #380 | api | feature/m12-matrix-bridge | MB-001 | MB-005,MB-006,MB-008 | | | | 20K | |
+| MB-005 | not-started | Matrix command handling — receive and dispatch commands | #381 | api | feature/m12-matrix-bridge | MB-001,MB-004 | MB-007,MB-008 | | | | 20K | |
+| MB-006 | not-started | Herald Service: Add Matrix output adapter | #382 | api | feature/m12-matrix-bridge | MB-001,MB-004 | MB-008 | | | | 18K | |
+| MB-007 | not-started | Streaming AI responses via Matrix message edits | #383 | api | feature/m12-matrix-bridge | MB-001,MB-005 | MB-008 | | | | 20K | |
+| MB-008 | not-started | Matrix bridge E2E integration tests | #385 | api | feature/m12-matrix-bridge | MB-001,MB-003,MB-004,MB-005,MB-006,MB-007 | MB-009 | | | | 25K | |
+| MB-009 | not-started | Documentation: Matrix bridge setup and architecture | #386 | docs | feature/m12-matrix-bridge | MB-008 | | | | | 10K | |
+| MB-010 | done | Sample Matrix swarm deployment compose file | #387 | docker | feature/m12-matrix-bridge | | | | | 2026-02-15 | 0 | 0 |
+
+### Phase Summary
+
+| Phase | Tasks | Description |
+|---|---|---|
+| 1 - Foundation | MB-001, MB-002 | SDK install, dev infrastructure |
+| 2 - Module Integration | MB-003, MB-004 | Module registration, DB mapping |
+| 3 - Core Features | MB-005, MB-006 | Command handling, Herald adapter |
+| 4 - Advanced Features | MB-007 | Streaming responses |
+| 5 - Testing | MB-008 | E2E integration tests |
+| 6 - Documentation | MB-009 | Setup guide, architecture docs |
+
+### Notes
+
+- #387 already completed in commit 6e20fc5
+- #377 is the EPIC issue — close when all child issues are done