ugh, sorry. https://github.com/matrix-org/matrix-spec-proposals/pull/424... should help significantly with this, and is due to happen in 2026 (it's required for Hydra Phase 2). But it's not there yet.