Merge main and re-derive the formatting pass

Conflicting files take main's version and ktlint and the comment
pipeline are re-run on them.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

engine/src/test/kotlin/io/flamenet/e2e/MailboxStateTest.kt

@@ -31,8 +31,8 @@ class MailboxStateTest {
 
     private val storage = MapStorage()
 
-    // / Held so a SECOND vault can be opened over the same storage, which is
-    // / what a restart is, and the only way to test that anything persisted.
+    // / Held so a SECOND vault can be opened over the same storage, which is /
+    // what a restart is, and the only way to test that anything persisted.
     private val key = KeyGenerator.getInstance("AES").apply { init(256) }.generateKey()
     private val vault = Vault(storage, key)
 

engine/src/test/kotlin/io/flamenet/e2e/QrCodeRenderForDecodingTest.kt

@@ -52,8 +52,8 @@ class QrCodeRenderForDecodingTest {
                 "flamenet:fnid:kx7q2m", // v1
                 "flamenet:fnid:" + "a".repeat(52) + "@relay1.flamenet.io", // a real address
                 "flamenet:fnid:" + "b".repeat(52) + "@" + "long".repeat(8) + ".example.com",
-                // Exactly full, version by version: data codewords minus the mode
-                // nibble and character count.
+                // Exactly full, version by version: data codewords minus the
+                // mode nibble and character count.
                 "x".repeat(14), // v1
                 "x".repeat(26), // v2
                 "x".repeat(42), // v3