fix: complete Matrix E2EE room recovery #2

Merged

ksamaschke merged 4 commits from fix/matrix-e2ee-followups into main

2026-08-24 15:40:41 +00:00

ksamaschke commented

2026-08-24 15:29:32 +00:00

Owner

Summary

Keep Matrix connected when one encrypted room cannot reconcile; outbound sends remain fail-closed.
Validate Mautrix typed KeyID device keys correctly.
Recreate Olm sessions for current eligible peer devices during room recovery.
Include credential-redacted reconciliation diagnostics.

Verification

249 passed, 2 skipped, 1 xfailed
Ruff passed
Python compilation passed
git diff --check passed
No crypto database reset, token rotation, or live Matrix infrastructure change.

This follows the already-merged E2EE key-delivery patch on main.

## Summary - Keep Matrix connected when one encrypted room cannot reconcile; outbound sends remain fail-closed. - Validate Mautrix typed KeyID device keys correctly. - Recreate Olm sessions for current eligible peer devices during room recovery. - Include credential-redacted reconciliation diagnostics. ## Verification - 249 passed, 2 skipped, 1 xfailed - Ruff passed - Python compilation passed - git diff --check passed - No crypto database reset, token rotation, or live Matrix infrastructure change. This follows the already-merged E2EE key-delivery patch on main.

ksamaschke added 4 commits

2026-08-24 15:29:32 +00:00

fix: keep Matrix connected after room reconciliation failure 0a2dab9a89

fix: expose redacted Matrix reconciliation errors 8fe0fa4abd

fix: validate typed Matrix device keys 08b2ee23b9

fix: recreate Olm sessions during room recovery

Upstream drift report / report (pull_request) Successful in 7m9s

Details

25a5cc1c39

ksamaschke merged commit aa0ab3a96d into main

2026-08-24 15:40:41 +00:00