diff --git a/.claude/memory/journal.md b/.claude/memory/journal.md
index e6551bb..66b92d9 100644
--- a/.claude/memory/journal.md
+++ b/.claude/memory/journal.md
@@ -50,3 +50,12 @@ menu. Fix: source dtach-router from bashrc-linux (every interactive shell); inst
 unwire_dtach_profile() strips stale ~/.profile block (avoids double-prompt on plain SSH). User chose simplest
 (per-tab) over once-per-connection sentinel. shellcheck install.sh CLEAN, bash -n OK, strip proven idempotent
 on .profile copy. BDR-009 (supersedes BDR-007) + LRN-008. Live needs ./install.sh re-run.
+
+## 2026-09-22 — /tmp on disk + SSH OOM guard + cloudpex conf
+User: swap for /tmp? keep RAM for ssh, old-server rules, cloudpex README+installer. Found /tmp = tmpfs 50% RAM
+→ swap rejected, mask tmp.mount offer (BDR-010). Old rules in NAS RECOVERY/40-systeme: ssh drop-in + earlyoom →
+end-of-install offers (BDR-011). cloudpex tracked; site values → /etc/cloudpex.conf prompted by installer
+(BDR-012). shellcheck/bash -n CLEAN, stub harnesses (LRN-011; EVAL-002 open until live apply). Reconciled
+main→develop (a210d01 dtach was main-only), feature finished via lib → develop 836bb67. Not applied live.
+Flagged: secrets in NAS transfert/root (BLK-005), remote-install.sh BRANCH=master stale vs main, gitea-deploy/
+untracked, remote feature branch left on origin (lib deletes local only).
diff --git a/.claude/tasks/TODO.md b/.claude/tasks/TODO.md
index efadf73..0df7da2 100644
--- a/.claude/tasks/TODO.md
+++ b/.claude/tasks/TODO.md
@@ -47,6 +47,6 @@ Root cause: /tmp is tmpfs (50% RAM) → agents fill it → RAM halved + ENOSPC b
 - [x] cloudpex/install.sh: prompt host/share/user/mnt/vers (regex-validated), keep-existing [Y/n], no-TTY skip
 - [x] cloudpex/README.md + README.md + CLAUDE.md: no site values, describe prompts + conf file
 - [x] registries: BDR-010/011/012, LRN-009/010/011, BLK-005/006, EVAL-002, journal
-- [ ] reconcile: merge main (a210d01 dtach) into develop via lib helper
-- [ ] gitflow finish feature → develop (explicit user signal: "puis merge")
-- [ ] runbook for live apply on this machine
+- [x] reconcile: merge main (a210d01 dtach) into develop via lib helper
+- [x] gitflow finish feature → develop (explicit user signal: "puis merge")
+- [x] runbook for live apply on this machine