diff --git a/docs/HANDOFF.md b/docs/HANDOFF.md
index 2ccc7f4..65ea0d4 100644
--- a/docs/HANDOFF.md
+++ b/docs/HANDOFF.md
@@ -2,28 +2,34 @@
 
 > **Tiering rule (S40):** giữ **2-3 session gần nhất**. Cũ hơn → `docs/changelog/sessions/`. Full brief history pre-S40 → `docs/_archive/HANDOFF-preS40-fullhistory.md`.
 
-**Last updated:** 2026-05-29 (Session 40 — init audit + doc consolidation)
+**Last updated:** 2026-05-29 (Session 40 — init + consolidation + AI_INFRA bulletin 4/4 + RAG MCP recovery)
 
 ---
 
-## S40 (2026-05-29) — Init audit + doc consolidation
+## S40 (2026-05-29) — Init + consolidation + bulletin adoption + RAG recovery
 
-**Việc:** Session-init 10-mục + consolidate docs (anh main pick "Consolidate docs").
-- ✅ **7-agent registry LIVE** (CLI đã restart). Smoke verify: 🟪 test-specialist + 🟦 investigator-api load OK. 🟧 implementer-frontend chưa spawn (smoke khi task FE đầu tiên).
-- ✅ **RAG `rag-unified` connected** — 7 project / **39,798 chunks**, re-rank PASS (top 0.8789, Voyage rerank-2.5 alive). solution_erp 3076 (thiếu S37-S39 content).
-- ✅ **Test 130 PASS** confirm (58 Domain + 72 Infra).
-- ✅ **Doc consolidation:** STATUS 170KB→~15KB + HANDOFF 224KB→~12KB (full → `docs/_archive/`). Count re-ground: endpoints **211**, FE pages **65** (36+29), menu **~53**, tables **84 đúng**. CLAUDE.md root patch mig/table/test stale.
+**10 commit `d2f52ba..37536fd`** (all docs/infra → CI skip). KHÔNG product code/schema.
 
-**⚠️ Lưu ý harness:** **SendMessage KHÔNG có** trong harness này → agent "reuse" = fresh spawn (MEMORY on-disk auto-inject giữ context). agentId chỉ valid trong-session. agentId S40: investigator-codebase `a4ddb2ab3d8368f68` · test-specialist `a3d4f4511ecce0f38` · investigator-api `ac4d509631913b1c9`.
+**Done:**
+- ✅ **Init audit 10-mục** — 7-agent live, RAG re-rank PASS, 130 test confirm, state re-grounded từ code.
+- ✅ **Doc consolidation** — STATUS 170KB→5.7KB + HANDOFF 224KB→3.4KB (393KB→9KB, full archive `docs/_archive/` zero-loss). Count re-ground: endpoints **211**, FE pages **65** (36+29), menu **~53**, **tables 84 đúng** (DbSet 77 + Identity 7). CLAUDE.md root patch.
+- ✅ **Curate 4 agent MEMORY** >25KB→<8.4KB (foundation preserved + git verbatim `d2f52ba`).
+- ✅ **AI_INFRA bulletin 2026-05-29 adopt 4/4:** MỤC1 charter v2 ack · MỤC2 **Tiered Memory Policy v1** (L1 HOT ~30KB / L2 archive / L3 RAG, bỏ hard 25KB) · MỤC3 **/session-start + /session-end slash command LIVE** · MỤC4 RAG v1.3 compliant + rag.json extra_corpus slug BUG FIX.
+- ✅ **Broadcast AI_INFRA** (adoption + infra retrospective + 5 đề xuất) — file `docs/governance/BROADCAST-OUT-*` + RAG `store_memory` (rerank 0.91-0.96 cross-project discoverable).
 
-**⚠️ Defer (cumulative):** Curate 4 agent MEMORY >25KB · RAG re-ingest S37-S39 · CLAUDE.md root deep stale (test tree breakdown + migration paragraph S32-era + ef-core skill "31 migration") → cron 2026-06-01.
+**⚙️ NEW slash command LIVE:** `/session-start` + `/session-end` (`.claude/commands/`) — dùng thay paste prompt thủ công.
 
-**Next S41 (anh main pick):**
-1. **Phase 11 polish** — P11-A wire ApproveV2 + LevelOpinions 4 module (full 5-agent end-to-end)
-2. **Test coverage gaps** — 🟪 test-specialist Gap1 (Holiday UNIQUE CRITICAL) + Gap3 (gotcha #44 regression ~50 LOC)
-3. **Curate 4 agent MEMORY**
-4. **RAG re-ingest** S37-S39
-5. **Phase 9 Ops** (anh main coordinate: SMTP + rotate creds + UAT)
+**⚠️ RAG MCP outage S40:** máy treo full ổ C → MCP rớt nhiều lần. Recovery: **quit hẳn + relaunch FRESH + approve trust `.mcp.json`** (KHÔNG resume — cached config). server.py/env/key/Qdrant verified healthy (lỗi thuần Claude Code client). Memory `[[rag-mcp-recovery-and-concurrency]]`.
+
+**⚠️⚠️ CONCURRENCY CHƯA giải quyết:** session SE **thứ 2 chạy song song** S40 → append "BROADCAST 2" vào `docs/governance/BROADCAST-OUT-SOLUTION-ERP-2026-05-29.md` (**UNCOMMITTED**, M trong git) + `.mcp.json` untracked. Anh main quyết: commit chung / để session kia tự / gộp dup. **TRÁNH 2 session SE cùng sửa repo.**
+
+**⏳ Standing items đã broadcast cho AI_INFRA (infra op):** re-index SE (path fix → 27 memory entries + S38-S40 content) · registry sync · verify auto_reindex hook (last_indexed lag) · **search_code corpus gap** (chỉ index .md, thiếu src/*.cs + fe/*.tsx) · chunk 512 trial 2026-06-16.
+
+**Next S41 (anh main pick) — FOCUS PRODUCT:**
+1. **Phase 11 P11-A** — wire ApproveV2 + LevelOpinions 4 module (full 5-agent end-to-end)
+2. **Test coverage gaps** — 🟪 test-specialist Gap1 (Holiday UNIQUE CRITICAL) + Gap3 (gotcha #44 ~50 LOC)
+3. **Phase 9 Ops** (anh main coordinate: SMTP + rotate creds + UAT)
+4. (coord) Giải quyết concurrency: BROADCAST 2 uncommitted + `.mcp.json` untracked
 
 ---
 
diff --git a/docs/changelog/sessions/2026-05-29-S40-consolidate-bulletin-rag-recovery.md b/docs/changelog/sessions/2026-05-29-S40-consolidate-bulletin-rag-recovery.md
new file mode 100644
index 0000000..715b744
--- /dev/null
+++ b/docs/changelog/sessions/2026-05-29-S40-consolidate-bulletin-rag-recovery.md
@@ -0,0 +1,29 @@
+# Session 40 — 2026-05-29 — Init audit + doc consolidation + AI_INFRA bulletin 4/4 + RAG MCP recovery
+
+> **No product code/schema.** 10 commit `d2f52ba..37536fd` (docs/infra/governance → all CI skip per gotcha #41). Pure maintenance + infra alignment session.
+
+## Việc đã làm (theo thứ tự)
+
+1. **Init audit 10-mục** (session-start prompt): nạp context, 7-agent registry live verify (CLI restarted), RAG re-rank PASS (top 0.8789), 130 test confirm, cron audit 2026-06-01 chưa tới, AI_INFRA fleet report (7 project / ~39,798 chunks).
+2. **State grounding** (🟦 investigator-codebase): phát hiện 4/7 count documented drift. Verify lại: 40 mig (`AddAttendances` last) · **84 SQL tables** (`.ToTable()` ModelSnapshot = 77 DbSet + 7 Identity — "84 đúng", KHÔNG phải DbSet count) · ~211 endpoints · 65 FE pages (36 admin + 29 user) · ~53 menu keys · 130 test · 55 gotchas.
+3. **Doc consolidation** (anh main pick): STATUS 170KB→5.7KB + HANDOFF 224KB→3.4KB (**393KB→9KB**, full verbatim → `docs/_archive/{STATUS,HANDOFF}-preS40-fullhistory.md` zero-loss). Re-ground 4 count drift. Fix stale credential `admin@solutionerp.local`→`admin@solutions.com.vn`. CLAUDE.md root patch (33→40 mig, 60→84 table, 111→130 test).
+4. **Curate 4 agent MEMORY** >25KB→<8.4KB: investigator-codebase 35.7→7.6 · cicd-monitor 35.3→8.4 · implementer-backend 30.9→7.9 · reviewer 28.4→7.5. Foundation preserved + verbatim in git. Dedup split (FE patterns → implementer-frontend, test patterns → test-specialist).
+5. **AI_INFRA charter v2 ack** + memory `feedback_aiinfra_charter_v2` (infra = AI_INFRA owns PRIMARY, team = user + phản biện only; ranh giới §38 CƠ CHẾ vs content classification).
+6. **AI_INFRA bulletin 2026-05-29 adopt 4/4:** MỤC1 charter ack · MỤC2 Tiered Memory Policy v1 (README + 7 MEMORY header + investigator-codebase agent-def → L1/L2/L3, bỏ hard 25KB; archive/ đủ 7 agent) · MỤC3 `/session-start`+`/session-end` slash commands (`.claude/commands/`, adapt 7-agent + charter v2) · MỤC4 RAG v1.3 compliant.
+7. **rag.json extra_corpus slug BUG FIX:** sai `D--Dropbox-CONG-VIEC-SOLUTION` (thiếu `-SOLUTION-ERP`) suốt từ S30 → 27 user-memory entries CHƯA index. Fixed. Re-index = AI_INFRA op.
+8. **Broadcast AI_INFRA** (bulletin adoption + infra retrospective + 5 đề xuất + fair credit) — persistent files `docs/governance/BROADCAST-OUT-*` + RAG `store_memory` (chunk 1b7a28fc + e7703fb0, rerank 0.91-0.96 cross-project discoverable).
+
+## RAG MCP outage + recovery (lesson)
+Root cause: **máy treo full ổ C → 6 project mất MCP đồng loạt**. SE tốn ~5 lượt chẩn đoán (server.py/env/VOYAGE_API_KEY/deps/Qdrant ALL verified healthy → lỗi thuần Claude Code MCP client). **Recovery:** quit hẳn + relaunch FRESH + approve trust `.mcp.json` (KHÔNG `--resume`). AI_INFRA chuẩn hoá `.mcp.json` 6 project + runbook `rag-mcp-client-setup.md`. → memory `feedback_rag_mcp_recovery_concurrency`.
+
+## ⚠️ Concurrency (chưa giải quyết)
+Session SE **thứ 2 song song** append "BROADCAST 2" vào `BROADCAST-OUT-SOLUTION-ERP-2026-05-29.md` (uncommitted) + `.mcp.json` untracked. BROADCAST 2 có điểm hay: `search_code` vô dụng cho SE (corpus chỉ index `.md`, thiếu src/fe). Coordination decision pending anh main. **TRÁNH 2 session SE cùng sửa repo.**
+
+## Commit trail (10)
+`d2f52ba` consolidate · `78c9de3` curate MEMORY · `2839f3a` STATUS done · `6f08d1f` Tiered Memory v1 · `c8ff5e1` slash commands · `96d6df4` STATUS bulletin note · `9f10764` MỤC2+4 gaps · `894eb68` broadcast record · `e052db5` broadcast store done · `37536fd` infra retrospective
+
+## Sub-agent ROI
+3 spawn cho init audit (🟦 investigator-codebase `a4ddb2ab` state grounding + 🟪 test-specialist `a3d4f4511` test baseline + 🟦 investigator-api `ac4d5096` RAG fleet). Phần còn lại (consolidation/curate/bulletin/broadcast) em main solo (docs/infra, no delegate needed). 4 agent kia (implementer-backend/frontend, reviewer, cicd-monitor) KHÔNG spawn — no product work.
+
+## Next S41 → FOCUS PRODUCT
+Phase 11 P11-A (wire ApproveV2 4 module) / Test gaps (Gap1 Holiday UNIQUE + Gap3 gotcha #44) / Phase 9 Ops. + giải quyết concurrency.