fix: auto-switch decoder codec to match incoming packets

The CallDecoder now inspects each incoming packet's codec_id and
automatically switches the audio decoder if it differs from the
current profile. This enables cross-codec interop where one client
sends Opus and the other sends Codec2 — previously the receiver
would try to decode with the wrong codec, producing garbled audio.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

.agents/skills/caveman/SKILL.md

@@ -1,72 +0,0 @@
----
-name: caveman
-description: >
-  Ultra-compressed communication mode. Slash token usage ~75% by speaking like caveman
-  while keeping full technical accuracy. Use when user says "caveman mode", "talk like caveman",
-  "use caveman", "less tokens", "be brief", or invokes /caveman. Also auto-triggers
-  when token efficiency is requested.
----
-
-# Caveman Mode
-
-## Core Rule
-
-Respond like smart caveman. Cut articles, filler, pleasantries. Keep all technical substance.
-
-## Grammar
-
-- Drop articles (a, an, the)
-- Drop filler (just, really, basically, actually, simply)
-- Drop pleasantries (sure, certainly, of course, happy to)
-- Short synonyms (big not extensive, fix not "implement a solution for")
-- No hedging (skip "it might be worth considering")
-- Fragments fine. No need full sentence
-- Technical terms stay exact. "Polymorphism" stays "polymorphism"
-- Code blocks unchanged. Caveman speak around code, not in code
-- Error messages quoted exact. Caveman only for explanation
-
-## Pattern
-
-```
-[thing] [action] [reason]. [next step].
-```
-
-Not:
-> Sure! I'd be happy to help you with that. The issue you're experiencing is likely caused by...
-
-Yes:
-> Bug in auth middleware. Token expiry check use `<` not `<=`. Fix:
-
-## Examples
-
-**User:** Why is my React component re-rendering?
-
-**Normal (69 tokens):** "The reason your React component is re-rendering is likely because you're creating a new object reference on each render cycle. When you pass an inline object as a prop, React's shallow comparison sees it as a different object every time, which triggers a re-render. I'd recommend using useMemo to memoize the object."
-
-**Caveman (19 tokens):** "New object ref each render. Inline object prop = new ref = re-render. Wrap in `useMemo`."
-
----
-
-**User:** How do I set up a PostgreSQL connection pool?
-
-**Caveman:**
-```
-Use `pg` pool:
-```
-```js
-const pool = new Pool({
-  max: 20,
-  idleTimeoutMillis: 30000,
-  connectionTimeoutMillis: 2000,
-})
-```
-```
-max = concurrent connections. Keep under DB limit. idleTimeout kill stale conn.
-```
-
-## Boundaries
-
-- Code: write normal. Caveman English only
-- Git commits: normal
-- PR descriptions: normal
-- User say "stop caveman" or "normal mode": revert immediately

.gitignore

@@ -4,28 +4,3 @@
 *.swp
 *.swo
 *~
-
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-dev-debug.log
-# Dependency directories
-node_modules/
-# Environment variables
-.env
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
-# OS specific
-
-# Taskmaster (local workflow tool)
-.taskmaster/
-.env.example

Cargo.toml

@@ -10,7 +10,6 @@ members = [
     "crates/wzp-client",
     "crates/wzp-web",
     "crates/wzp-android",
-    "crates/wzp-native",
     "desktop/src-tauri",
 ]
 
@@ -37,19 +36,12 @@ quinn = "0.11"
 raptorq = "2"
 
 # Codec
-# opusic-c: high-level safe bindings over libopus 1.5.2 (encoder side).
-# opusic-sys: raw FFI for the decoder side — we build our own DecoderHandle
-# because opusic-c::Decoder.inner is pub(crate) and cannot be reached for the
-# Phase 3 DRED reconstruction path. See docs/PRD-dred-integration.md.
-# Pinned exactly (no caret) for reproducible libopus 1.5.2 across the fleet.
-opusic-c = { version = "=1.5.5", default-features = false, features = ["bundled", "dred"] }
-opusic-sys = { version = "=0.6.0", default-features = false, features = ["bundled"] }
-bytemuck = "1"
+audiopus = "0.3.0-rc.0"
 codec2 = "0.3"
 
 # Crypto
 x25519-dalek = { version = "2", features = ["static_secrets"] }
-ed25519-dalek = { version = "2", features = ["rand_core", "pkcs8"] }
+ed25519-dalek = { version = "2", features = ["rand_core"] }
 chacha20poly1305 = "0.10"
 hkdf = "0.12"
 sha2 = "0.10"
@@ -73,7 +65,9 @@ opt-level = 2
 # real-time audio needs < 20ms per frame, impossible unoptimized.
 [profile.dev.package.nnnoiseless]
 opt-level = 3
-[profile.dev.package.opusic-sys]
+[profile.dev.package.audiopus_sys]
+opt-level = 3
+[profile.dev.package.audiopus]
 opt-level = 3
 [profile.dev.package.raptorq]
 opt-level = 3
@@ -81,10 +75,3 @@ opt-level = 3
 opt-level = 3
 [profile.dev.package.wzp-fec]
 opt-level = 3
-
-# Phase 0 (opus-DRED): removed the [patch.crates-io] audiopus_sys = { path =
-# "vendor/audiopus_sys" } block. That patch existed to fix a Windows clang-cl
-# SIMD compile bug in libopus 1.3.1. With the swap to opusic-sys (libopus
-# 1.5.2), the upstream SIMD gating was fixed and the vendor patch is
-# obsolete. The vendor/audiopus_sys directory itself should be deleted as
-# part of the same cleanup — see the commit that follows this Phase 0.

android/app/src/main/java/com/wzp/audio/AudioPipeline.kt

@@ -19,8 +19,6 @@ import java.io.FileOutputStream
 import java.io.OutputStreamWriter
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
 import kotlin.math.pow
 import kotlin.math.sqrt
 
@@ -57,23 +55,10 @@ class AudioPipeline(private val context: Context) {
     /** Whether to attach hardware AEC. Must be set before start(). */
     var aecEnabled: Boolean = true
     /** Enable debug recording of PCM + RMS histogram to cache dir. */
-    var debugRecording: Boolean = false
+    var debugRecording: Boolean = true
     private var captureThread: Thread? = null
     private var playoutThread: Thread? = null
 
-    // DirectByteBuffers for zero-copy JNI audio transfer.
-    // Allocated as class fields (NOT locals) because ART's JIT OSR
-    // can null local variables when it replaces the stack frame mid-loop.
-    // These survive OSR because they're on the heap.
-    private val captureDirectBuf: ByteBuffer =
-        ByteBuffer.allocateDirect(FRAME_SAMPLES * 2).order(ByteOrder.LITTLE_ENDIAN)
-    private val playoutDirectBuf: ByteBuffer =
-        ByteBuffer.allocateDirect(FRAME_SAMPLES * 2).order(ByteOrder.LITTLE_ENDIAN)
-
-    /** Latch counted down by each audio thread after exiting its loop.
-     *  stop() does NOT wait on this — teardown waits via awaitDrain(). */
-    private var drainLatch: CountDownLatch? = null
-
     private val debugDir: File by lazy {
         File(context.cacheDir, "wzp_debug").also { it.mkdirs() }
     }
@@ -81,11 +66,9 @@ class AudioPipeline(private val context: Context) {
     fun start(engine: WzpEngine) {
         if (running) return
         running = true
-        drainLatch = CountDownLatch(2) // one for capture, one for playout
 
         captureThread = Thread({
             runCapture(engine)
-            drainLatch?.countDown() // signal: capture loop exited, no more JNI calls
             // Park thread forever — exiting triggers a libcrypto TLS destructor
             // crash (SIGSEGV in OPENSSL_free) on Android when a JNI-calling thread exits.
             parkThread()
@@ -97,7 +80,6 @@ class AudioPipeline(private val context: Context) {
 
         playoutThread = Thread({
             runPlayout(engine)
-            drainLatch?.countDown() // signal: playout loop exited
             parkThread()
         }, "wzp-playout").apply {
             isDaemon = true
@@ -110,20 +92,10 @@ class AudioPipeline(private val context: Context) {
 
     fun stop() {
         running = false
-        // Don't join threads — they are parked as daemons to avoid native TLS crash.
-        // Don't null thread refs or drainLatch — teardown() needs awaitDrain().
-        Log.i(TAG, "audio pipeline stopped (running=false)")
-    }
-
-    /** Block until both audio threads have exited their loops (max 200ms).
-     *  After this returns, no more JNI calls to the engine will be made. */
-    fun awaitDrain(): Boolean {
-        val ok = drainLatch?.await(200, TimeUnit.MILLISECONDS) ?: true
-        if (!ok) Log.w(TAG, "awaitDrain: audio threads did not drain in 200ms")
+        // Don't join — threads are parked as daemons to avoid native TLS crash
         captureThread = null
         playoutThread = null
-        drainLatch = null
-        return ok
+        Log.i(TAG, "audio pipeline stopped")
     }
 
     private fun applyGain(pcm: ShortArray, count: Int, db: Float) {
@@ -234,10 +206,7 @@ class AudioPipeline(private val context: Context) {
                 val read = recorder.read(pcm, 0, FRAME_SAMPLES)
                 if (read > 0) {
                     applyGain(pcm, read, captureGainDb)
-                    // Zero-copy write via DirectByteBuffer (class field, survives JIT OSR)
-                    captureDirectBuf.clear()
-                    captureDirectBuf.asShortBuffer().put(pcm, 0, read)
-                    engine.writeAudioDirect(captureDirectBuf, read)
+                    engine.writeAudio(pcm)
 
                     // Debug: write raw PCM + RMS
                     if (pcmOut != null) {
@@ -316,12 +285,8 @@ class AudioPipeline(private val context: Context) {
         }
         try {
             while (running) {
-                // Zero-copy read via DirectByteBuffer (class field, survives JIT OSR)
-                playoutDirectBuf.clear()
-                val read = engine.readAudioDirect(playoutDirectBuf, FRAME_SAMPLES)
+                val read = engine.readAudio(pcm)
                 if (read >= FRAME_SAMPLES) {
-                    playoutDirectBuf.rewind()
-                    playoutDirectBuf.asShortBuffer().get(pcm, 0, read)
                     applyGain(pcm, read, playoutGainDb)
                     track.write(pcm, 0, read)
 

android/app/src/main/java/com/wzp/data/SettingsRepository.kt

@@ -28,9 +28,6 @@ class SettingsRepository(context: Context) {
         private const val KEY_PREFER_IPV6 = "prefer_ipv6"
         private const val KEY_IDENTITY_SEED = "identity_seed_hex"
         private const val KEY_AEC_ENABLED = "aec_enabled"
-        private const val KEY_DEBUG_RECORDING = "debug_recording"
-        private const val KEY_RECENT_ROOMS = "recent_rooms"
-        private const val TOFU_PREFIX = "tofu_"
     }
 
     // --- Servers ---
@@ -121,16 +118,6 @@ class SettingsRepository(context: Context) {
     fun saveAecEnabled(enabled: Boolean) { prefs.edit().putBoolean(KEY_AEC_ENABLED, enabled).apply() }
     fun loadAecEnabled(): Boolean = prefs.getBoolean(KEY_AEC_ENABLED, true)
 
-    // --- Debug recording ---
-
-    fun saveDebugRecording(enabled: Boolean) { prefs.edit().putBoolean(KEY_DEBUG_RECORDING, enabled).apply() }
-    fun loadDebugRecording(): Boolean = prefs.getBoolean(KEY_DEBUG_RECORDING, false)
-
-    // --- Codec choice ---
-    // 0 = Opus (GOOD), 1 = Opus Low (DEGRADED), 2 = Codec2 (CATASTROPHIC)
-    fun saveCodecChoice(choice: Int) { prefs.edit().putInt("codec_choice", choice).apply() }
-    fun loadCodecChoice(): Int = prefs.getInt("codec_choice", 0)
-
     // --- Identity seed ---
 
     /**
@@ -151,53 +138,4 @@ class SettingsRepository(context: Context) {
     fun saveSeedHex(hex: String) {
         prefs.edit().putString(KEY_IDENTITY_SEED, hex).apply()
     }
-
-    // --- Recent rooms ---
-
-    data class RecentRoom(val relay: String, val room: String)
-
-    fun addRecentRoom(relay: String, room: String) {
-        val rooms = loadRecentRooms().toMutableList()
-        rooms.removeAll { it.relay == relay && it.room == room }
-        rooms.add(0, RecentRoom(relay, room))
-        if (rooms.size > 5) rooms.subList(5, rooms.size).clear()
-        val arr = JSONArray()
-        rooms.forEach { arr.put(JSONObject().apply { put("relay", it.relay); put("room", it.room) }) }
-        prefs.edit().putString(KEY_RECENT_ROOMS, arr.toString()).apply()
-    }
-
-    fun loadRecentRooms(): List<RecentRoom> {
-        val json = prefs.getString(KEY_RECENT_ROOMS, null) ?: return emptyList()
-        return try {
-            val arr = JSONArray(json)
-            (0 until arr.length()).map { i ->
-                val o = arr.getJSONObject(i)
-                RecentRoom(o.getString("relay"), o.getString("room"))
-            }
-        } catch (_: Exception) { emptyList() }
-    }
-
-    fun clearRecentRooms() {
-        prefs.edit().remove(KEY_RECENT_ROOMS).apply()
-    }
-
-    // --- Server fingerprint TOFU ---
-
-    fun saveServerFingerprint(address: String, fingerprint: String) {
-        prefs.edit().putString("$TOFU_PREFIX$address", fingerprint).apply()
-    }
-
-    fun loadServerFingerprint(address: String): String? {
-        return prefs.getString("$TOFU_PREFIX$address", null)
-    }
-
-    // --- Ping RTT cache ---
-
-    fun savePingRtt(address: String, rttMs: Int) {
-        prefs.edit().putInt("ping_rtt_$address", rttMs).apply()
-    }
-
-    fun loadPingRtt(address: String): Int {
-        return prefs.getInt("ping_rtt_$address", -1)
-    }
 }

android/app/src/main/java/com/wzp/debug/DebugReporter.kt

@@ -46,14 +46,6 @@ class DebugReporter(private val context: Context) {
             val zipFile = File(context.cacheDir, "wzp_debug_${timestamp}.zip")
 
             ZipOutputStream(BufferedOutputStream(FileOutputStream(zipFile))).use { zos ->
-                // Phase 4: extract DRED / classical PLC counters from the
-                // stats JSON so they're visible in the meta preamble at a
-                // glance, not buried in the trailing JSON dump.
-                val dredReconstructions = extractLongField(finalStatsJson, "dred_reconstructions")
-                val classicalPlc = extractLongField(finalStatsJson, "classical_plc_invocations")
-                val framesDecoded = extractLongField(finalStatsJson, "frames_decoded")
-                val fecRecovered = extractLongField(finalStatsJson, "fec_recovered")
-
                 // 1. Call metadata
                 val meta = buildString {
                     appendLine("=== WZ Phone Debug Report ===")
@@ -66,18 +58,6 @@ class DebugReporter(private val context: Context) {
                     appendLine("Device: ${android.os.Build.MANUFACTURER} ${android.os.Build.MODEL}")
                     appendLine("Android: ${android.os.Build.VERSION.RELEASE} (API ${android.os.Build.VERSION.SDK_INT})")
                     appendLine()
-                    appendLine("=== Loss Recovery ===")
-                    appendLine("Frames decoded:           $framesDecoded")
-                    appendLine("DRED reconstructions:     $dredReconstructions (Opus neural recovery)")
-                    appendLine("Classical PLC:            $classicalPlc (fallback)")
-                    appendLine("RaptorQ FEC recovered:    $fecRecovered (Codec2 only)")
-                    if (framesDecoded > 0) {
-                        val dredPct = 100.0 * dredReconstructions / framesDecoded
-                        val plcPct = 100.0 * classicalPlc / framesDecoded
-                        appendLine("DRED rate:                ${"%.2f".format(dredPct)}%")
-                        appendLine("Classical PLC rate:       ${"%.2f".format(plcPct)}%")
-                    }
-                    appendLine()
                     appendLine("=== Final Stats ===")
                     appendLine(finalStatsJson)
                 }
@@ -215,28 +195,4 @@ class DebugReporter(private val context: Context) {
         FileInputStream(file).use { it.copyTo(zos) }
         zos.closeEntry()
     }
-
-    /**
-     * Tiny JSON field extractor — pulls an integer value for a top-level
-     * field like `"dred_reconstructions":42`. We don't want to pull in a
-     * full JSON parser just for the debug preamble, and the CallStats
-     * output is a flat record with well-known field names.
-     *
-     * Returns 0 if the field is missing or unparseable.
-     */
-    private fun extractLongField(json: String, field: String): Long {
-        val key = "\"$field\":"
-        val idx = json.indexOf(key)
-        if (idx < 0) return 0
-        var i = idx + key.length
-        // Skip whitespace
-        while (i < json.length && json[i].isWhitespace()) i++
-        val start = i
-        while (i < json.length && (json[i].isDigit() || json[i] == '-')) i++
-        return try {
-            json.substring(start, i).toLong()
-        } catch (_: NumberFormatException) {
-            0
-        }
-    }
 }

android/app/src/main/java/com/wzp/engine/CallStats.kt

@@ -33,24 +33,10 @@ data class CallStats(
     val fecRecovered: Long = 0,
     /** Current mic audio level (RMS, 0-32767). */
     val audioLevel: Int = 0,
-    /** Our current outgoing codec (e.g. "Opus24k"). */
-    val currentCodec: String = "",
-    /** Last seen incoming codec from peers. */
-    val peerCodec: String = "",
-    /** Whether auto quality mode is active. */
-    val autoMode: Boolean = false,
     /** Number of participants in the room. */
     val roomParticipantCount: Int = 0,
     /** Participants in the room (fingerprint + optional alias). */
     val roomParticipants: List<RoomMember> = emptyList(),
-    /** SAS verification code (4-digit, null if not in a call). */
-    val sasCode: Int? = null,
-    /** Incoming call ID (or "relay|room" for CallSetup). */
-    val incomingCallId: String? = null,
-    /** Incoming caller's fingerprint. */
-    val incomingCallerFp: String? = null,
-    /** Incoming caller's alias. */
-    val incomingCallerAlias: String? = null,
 ) {
     /** Human-readable quality label. */
     val qualityLabel: String
@@ -68,8 +54,7 @@ data class CallStats(
                 val o = arr.getJSONObject(i)
                 RoomMember(
                     fingerprint = o.optString("fingerprint", ""),
-                    alias = if (o.isNull("alias")) null else o.optString("alias", null),
-                    relayLabel = if (o.isNull("relay_label")) null else o.optString("relay_label", null)
+                    alias = if (o.isNull("alias")) null else o.optString("alias", null)
                 )
             }
         }
@@ -91,15 +76,8 @@ data class CallStats(
                     underruns = obj.optLong("underruns", 0),
                     fecRecovered = obj.optLong("fec_recovered", 0),
                     audioLevel = obj.optInt("audio_level", 0),
-                    currentCodec = obj.optString("current_codec", ""),
-                    peerCodec = obj.optString("peer_codec", ""),
-                    autoMode = obj.optBoolean("auto_mode", false),
                     roomParticipantCount = obj.optInt("room_participant_count", 0),
-                    roomParticipants = parseParticipants(obj.optJSONArray("room_participants")),
-                    sasCode = if (obj.has("sas_code")) obj.optInt("sas_code") else null,
-                    incomingCallId = if (obj.isNull("incoming_call_id")) null else obj.optString("incoming_call_id", null),
-                    incomingCallerFp = if (obj.isNull("incoming_caller_fp")) null else obj.optString("incoming_caller_fp", null),
-                    incomingCallerAlias = if (obj.isNull("incoming_caller_alias")) null else obj.optString("incoming_caller_alias", null),
+                    roomParticipants = parseParticipants(obj.optJSONArray("room_participants"))
                 )
             } catch (e: Exception) {
                 CallStats()
@@ -110,8 +88,7 @@ data class CallStats(
 
 data class RoomMember(
     val fingerprint: String,
-    val alias: String? = null,
-    val relayLabel: String? = null
+    val alias: String? = null
 ) {
     /** Short display name: alias if set, otherwise first 8 chars of fingerprint. */
     val displayName: String

android/app/src/main/java/com/wzp/engine/WzpEngine.kt

@@ -38,12 +38,9 @@ class WzpEngine(private val callback: WzpCallback) {
      * @param alias     display name sent to relay for room participant list
      * @return 0 on success, negative error code on failure
      */
-    /**
-     * @param profile 0 = Opus GOOD, 1 = Opus DEGRADED, 2 = Codec2 CATASTROPHIC
-     */
-    fun startCall(relayAddr: String, room: String, seedHex: String = "", token: String = "", alias: String = "", profile: Int = 0): Int {
+    fun startCall(relayAddr: String, room: String, seedHex: String = "", token: String = "", alias: String = ""): Int {
         check(nativeHandle != 0L) { "Engine not initialized" }
-        val result = nativeStartCall(nativeHandle, relayAddr, room, seedHex, token, alias, profile)
+        val result = nativeStartCall(nativeHandle, relayAddr, room, seedHex, token, alias)
         if (result == 0) {
             callback.onCallStateChanged(CallStateConstants.CONNECTING)
         } else {
@@ -53,7 +50,6 @@ class WzpEngine(private val callback: WzpCallback) {
     }
 
     /** Stop the active call. Safe to call when no call is active. */
-    @Synchronized
     fun stopCall() {
         if (nativeHandle != 0L) {
             nativeStopCall(nativeHandle)
@@ -77,7 +73,6 @@ class WzpEngine(private val callback: WzpCallback) {
      *
      * @return JSON-serialised [CallStats], or `"{}"` if the engine is not initialised.
      */
-    @Synchronized
     fun getStats(): String {
         if (nativeHandle == 0L) return "{}"
         return try {
@@ -97,7 +92,6 @@ class WzpEngine(private val callback: WzpCallback) {
     }
 
     /** Destroy the native engine and free all resources. The instance must not be reused. */
-    @Synchronized
     fun destroy() {
         if (nativeHandle != 0L) {
             nativeDestroy(nativeHandle)
@@ -123,31 +117,11 @@ class WzpEngine(private val callback: WzpCallback) {
         return nativeReadAudio(nativeHandle, pcm)
     }
 
-    /**
-     * Write captured PCM from a DirectByteBuffer — zero JNI array copy.
-     * The buffer must be a direct ByteBuffer with native byte order containing i16 samples.
-     * Called from the AudioRecord capture thread.
-     */
-    fun writeAudioDirect(buffer: java.nio.ByteBuffer, sampleCount: Int): Int {
-        if (nativeHandle == 0L) return 0
-        return nativeWriteAudioDirect(nativeHandle, buffer, sampleCount)
-    }
-
-    /**
-     * Read decoded PCM into a DirectByteBuffer — zero JNI array copy.
-     * The buffer must be a direct ByteBuffer with native byte order.
-     * Called from the AudioTrack playout thread.
-     */
-    fun readAudioDirect(buffer: java.nio.ByteBuffer, maxSamples: Int): Int {
-        if (nativeHandle == 0L) return 0
-        return nativeReadAudioDirect(nativeHandle, buffer, maxSamples)
-    }
-
     // -- JNI native methods --------------------------------------------------
 
     private external fun nativeInit(): Long
     private external fun nativeStartCall(
-        handle: Long, relay: String, room: String, seed: String, token: String, alias: String, profile: Int
+        handle: Long, relay: String, room: String, seed: String, token: String, alias: String
     ): Int
     private external fun nativeStopCall(handle: Long)
     private external fun nativeSetMute(handle: Long, muted: Boolean)
@@ -156,57 +130,7 @@ class WzpEngine(private val callback: WzpCallback) {
     private external fun nativeForceProfile(handle: Long, profile: Int)
     private external fun nativeWriteAudio(handle: Long, pcm: ShortArray): Int
     private external fun nativeReadAudio(handle: Long, pcm: ShortArray): Int
-    private external fun nativeWriteAudioDirect(handle: Long, buffer: java.nio.ByteBuffer, sampleCount: Int): Int
-    private external fun nativeReadAudioDirect(handle: Long, buffer: java.nio.ByteBuffer, maxSamples: Int): Int
     private external fun nativeDestroy(handle: Long)
-    private external fun nativePingRelay(handle: Long, relay: String): String?
-    private external fun nativeStartSignaling(handle: Long, relay: String, seed: String, token: String, alias: String): Int
-    private external fun nativePlaceCall(handle: Long, targetFp: String): Int
-    private external fun nativeAnswerCall(handle: Long, callId: String, mode: Int): Int
-
-    /**
-     * Ping a relay server. Requires engine to be initialized.
-     * Returns JSON `{"rtt_ms":N,"server_fingerprint":"hex"}` or null.
-     */
-    fun pingRelay(address: String): String? {
-        if (nativeHandle == 0L) return null
-        return nativePingRelay(nativeHandle, address)
-    }
-
-    /**
-     * Start persistent signaling connection for direct 1:1 calls.
-     * The engine registers on the relay and listens for incoming calls.
-     * Call state updates are available via [getStats].
-     *
-     * @return 0 on success, -1 on error
-     */
-    fun startSignaling(relay: String, seed: String = "", token: String = "", alias: String = ""): Int {
-        check(nativeHandle != 0L) { "Engine not initialized" }
-        return nativeStartSignaling(nativeHandle, relay, seed, token, alias)
-    }
-
-    /**
-     * Place a direct call to a peer by fingerprint.
-     * Requires [startSignaling] to have been called first.
-     *
-     * @return 0 on success, -1 on error
-     */
-    fun placeCall(targetFingerprint: String): Int {
-        check(nativeHandle != 0L) { "Engine not initialized" }
-        return nativePlaceCall(nativeHandle, targetFingerprint)
-    }
-
-    /**
-     * Answer an incoming direct call.
-     *
-     * @param callId The call ID from the incoming call (available in stats.incoming_call_id)
-     * @param mode 0=Reject, 1=AcceptTrusted (P2P in Phase 2), 2=AcceptGeneric (relay-mediated)
-     * @return 0 on success, -1 on error
-     */
-    fun answerCall(callId: String, mode: Int = 2): Int {
-        check(nativeHandle != 0L) { "Engine not initialized" }
-        return nativeAnswerCall(nativeHandle, callId, mode)
-    }
 
     companion object {
         init {

android/app/src/main/java/com/wzp/net/RelayPinger.kt

@@ -1,12 +0,0 @@
-package com.wzp.net
-
-// Relay pinging is now done via WzpEngine.pingRelay() (instance method).
-// This file kept for the data class only.
-
-object RelayPinger {
-    data class PingResult(
-        val rttMs: Int,
-        val reachable: Boolean,
-        val serverFingerprint: String = "",
-    )
-}

android/app/src/main/java/com/wzp/ui/call/CallViewModel.kt

@@ -12,7 +12,6 @@ import com.wzp.engine.CallStats
 import com.wzp.service.CallService
 import com.wzp.engine.WzpCallback
 import com.wzp.engine.WzpEngine
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -20,8 +19,6 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.json.JSONObject
 import java.io.File
 import java.net.Inet4Address
 import java.net.Inet6Address
@@ -29,14 +26,6 @@ import java.net.InetAddress
 
 data class ServerEntry(val address: String, val label: String)
 
-data class PingResult(
-    val rttMs: Int,
-    val serverFingerprint: String = "",
-    val reachable: Boolean = rttMs > 0,
-)
-
-enum class LockStatus { UNKNOWN, OFFLINE, NEW, VERIFIED, CHANGED }
-
 class CallViewModel : ViewModel(), WzpCallback {
 
     private var engine: WzpEngine? = null
@@ -81,16 +70,6 @@ class CallViewModel : ViewModel(), WzpCallback {
     private val _preferIPv6 = MutableStateFlow(false)
     val preferIPv6: StateFlow<Boolean> = _preferIPv6.asStateFlow()
 
-    private val _recentRooms = MutableStateFlow<List<com.wzp.data.SettingsRepository.RecentRoom>>(emptyList())
-    val recentRooms: StateFlow<List<com.wzp.data.SettingsRepository.RecentRoom>> = _recentRooms.asStateFlow()
-
-    /** Ping results keyed by server address. */
-    private val _pingResults = MutableStateFlow<Map<String, PingResult>>(emptyMap())
-    val pingResults: StateFlow<Map<String, PingResult>> = _pingResults.asStateFlow()
-
-    /** Known server fingerprints (TOFU). */
-    private val _knownFingerprints = MutableStateFlow<Map<String, String>>(emptyMap())
-
     private val _playoutGainDb = MutableStateFlow(0f)
     val playoutGainDb: StateFlow<Float> = _playoutGainDb.asStateFlow()
 
@@ -106,18 +85,6 @@ class CallViewModel : ViewModel(), WzpCallback {
     private val _aecEnabled = MutableStateFlow(true)
     val aecEnabled: StateFlow<Boolean> = _aecEnabled.asStateFlow()
 
-    private val _debugRecording = MutableStateFlow(false)
-    val debugRecording: StateFlow<Boolean> = _debugRecording.asStateFlow()
-
-    // Quality profile index (matches JNI bridge profile_from_int)
-    private val _codecChoice = MutableStateFlow(0)
-    val codecChoice: StateFlow<Int> = _codecChoice.asStateFlow()
-
-    /** Key-change warning dialog state. */
-    data class KeyWarningInfo(val address: String, val oldFp: String, val newFp: String)
-    private val _keyWarning = MutableStateFlow<KeyWarningInfo?>(null)
-    val keyWarning: StateFlow<KeyWarningInfo?> = _keyWarning.asStateFlow()
-
     /** True when a call just ended and debug report can be sent. */
     private val _debugReportAvailable = MutableStateFlow(false)
     val debugReportAvailable: StateFlow<Boolean> = _debugReportAvailable.asStateFlow()
@@ -132,91 +99,13 @@ class CallViewModel : ViewModel(), WzpCallback {
 
     private var statsJob: Job? = null
 
-    // ── Direct calling state ──
-    /** 0=room mode, 1=direct call mode */
-    private val _callMode = MutableStateFlow(0)
-    val callMode: StateFlow<Int> = _callMode.asStateFlow()
-
-    /** Target fingerprint for direct call */
-    private val _targetFingerprint = MutableStateFlow("")
-    val targetFingerprint: StateFlow<String> = _targetFingerprint.asStateFlow()
-
-    /** Signal connection state: 0=idle, 5=registered, 6=ringing, 7=incoming */
-    private val _signalState = MutableStateFlow(0)
-    val signalState: StateFlow<Int> = _signalState.asStateFlow()
-
-    /** Incoming call info */
-    private val _incomingCallId = MutableStateFlow<String?>(null)
-    val incomingCallId: StateFlow<String?> = _incomingCallId.asStateFlow()
-
-    private val _incomingCallerFp = MutableStateFlow<String?>(null)
-    val incomingCallerFp: StateFlow<String?> = _incomingCallerFp.asStateFlow()
-
-    private val _incomingCallerAlias = MutableStateFlow<String?>(null)
-    val incomingCallerAlias: StateFlow<String?> = _incomingCallerAlias.asStateFlow()
-
-    fun setCallMode(mode: Int) { _callMode.value = mode }
-    fun setTargetFingerprint(fp: String) { _targetFingerprint.value = fp }
-
-    /** Register on relay for direct calls */
-    fun registerForCalls() {
-        if (engine == null) {
-            engine = WzpEngine(this).also { it.init() }
-        }
-        val serverIdx = _selectedServer.value
-        val serverList = _servers.value
-        if (serverIdx >= serverList.size) return
-
-        val relay = serverList[serverIdx].address
-        val seed = _seedHex.value
-        val alias = _alias.value
-
-        viewModelScope.launch(Dispatchers.IO) {
-            val resolvedRelay = resolveToIp(relay) ?: relay
-            val result = engine?.startSignaling(resolvedRelay, seed, "", alias)
-            if (result == 0) {
-                _signalState.value = 5 // Registered
-                startStatsPolling()
-            } else {
-                _errorMessage.value = "Failed to register on relay"
-            }
-        }
-    }
-
-    /** Place a direct call to the target fingerprint */
-    fun placeDirectCall() {
-        val target = _targetFingerprint.value.trim()
-        if (target.isEmpty()) {
-            _errorMessage.value = "Enter a fingerprint to call"
-            return
-        }
-        engine?.placeCall(target)
-        _signalState.value = 6 // Ringing
-    }
-
-    /** Answer an incoming direct call */
-    fun answerIncomingCall(mode: Int = 2) {
-        val callId = _incomingCallId.value ?: return
-        engine?.answerCall(callId, mode)
-    }
-
-    /** Reject an incoming direct call */
-    fun rejectIncomingCall() {
-        val callId = _incomingCallId.value ?: return
-        engine?.answerCall(callId, 0) // 0 = Reject
-        _signalState.value = 5 // Back to registered
-        _incomingCallId.value = null
-        _incomingCallerFp.value = null
-        _incomingCallerAlias.value = null
-    }
-
     companion object {
         private const val TAG = "WzpCall"
         val DEFAULT_SERVERS = listOf(
             ServerEntry("172.16.81.175:4433", "LAN (172.16.81.175)"),
             ServerEntry("193.180.213.68:4433", "Pangolin (IP)"),
         )
-        const val DEFAULT_ROOM = "general"
+        const val DEFAULT_ROOM = "android"
     }
 
     fun setContext(context: Context) {
@@ -250,9 +139,6 @@ class CallViewModel : ViewModel(), WzpCallback {
         _captureGainDb.value = s.loadCaptureGain()
         _seedHex.value = s.getOrCreateSeedHex()
         _aecEnabled.value = s.loadAecEnabled()
-        _debugRecording.value = s.loadDebugRecording()
-        _codecChoice.value = s.loadCodecChoice()
-        _recentRooms.value = s.loadRecentRooms()
     }
 
     fun selectServer(index: Int) {
@@ -296,70 +182,6 @@ class CallViewModel : ViewModel(), WzpCallback {
         settings?.saveSelectedServer(_selectedServer.value)
     }
 
-    /**
-     * Ping all servers via native QUIC. Requires engine to be initialized.
-     * Creates engine if needed, pings, keeps engine alive for subsequent Connect.
-     */
-    fun pingAllServers() {
-        viewModelScope.launch {
-            // Ensure engine exists
-            if (engine == null || engine?.isInitialized != true) {
-                try {
-                    engine = WzpEngine(this@CallViewModel).also { it.init() }
-                    engineInitialized = true
-                } catch (e: Exception) {
-                    Log.w(TAG, "engine init for ping failed: $e")
-                    return@launch
-                }
-            }
-            val eng = engine ?: return@launch
-
-            val results = mutableMapOf<String, PingResult>()
-            val known = mutableMapOf<String, String>()
-            _servers.value.forEach { server ->
-                val json = withContext(Dispatchers.IO) {
-                    eng.pingRelay(server.address)
-                }
-                if (json != null) {
-                    try {
-                        val obj = JSONObject(json)
-                        val rtt = obj.getInt("rtt_ms")
-                        val fp = obj.optString("server_fingerprint", "")
-                        results[server.address] = PingResult(rttMs = rtt, serverFingerprint = fp)
-                        // TOFU
-                        if (fp.isNotEmpty()) {
-                            val saved = settings?.loadServerFingerprint(server.address)
-                            if (saved == null) settings?.saveServerFingerprint(server.address, fp)
-                            known[server.address] = saved ?: fp
-                        }
-                    } catch (_: Exception) {}
-                }
-            }
-            _pingResults.value = results
-            _knownFingerprints.value = known
-        }
-    }
-
-    /** Load saved TOFU fingerprints. */
-    fun loadSavedFingerprints() {
-        val known = mutableMapOf<String, String>()
-        _servers.value.forEach { server ->
-            settings?.loadServerFingerprint(server.address)?.let {
-                known[server.address] = it
-            }
-        }
-        _knownFingerprints.value = known
-    }
-
-    /** Get lock status for a server. */
-    fun lockStatus(address: String): LockStatus {
-        val pr = _pingResults.value[address] ?: return LockStatus.UNKNOWN
-        if (!pr.reachable) return LockStatus.OFFLINE
-        val known = _knownFingerprints.value[address] ?: return LockStatus.NEW
-        if (pr.serverFingerprint.isEmpty()) return LockStatus.NEW
-        return if (pr.serverFingerprint == known) LockStatus.VERIFIED else LockStatus.CHANGED
-    }
-
     fun setRoomName(name: String) {
         _roomName.value = name
         settings?.saveRoom(name)
@@ -392,16 +214,6 @@ class CallViewModel : ViewModel(), WzpCallback {
         settings?.saveAecEnabled(enabled)
     }
 
-    fun setDebugRecording(enabled: Boolean) {
-        _debugRecording.value = enabled
-        settings?.saveDebugRecording(enabled)
-    }
-
-    fun setCodecChoice(choice: Int) {
-        _codecChoice.value = choice
-        settings?.saveCodecChoice(choice)
-    }
-
     /**
      * Resolve DNS hostname to IP address on the Kotlin/Android side,
      * since Rust's DNS resolution may not work on Android.
@@ -442,17 +254,8 @@ class CallViewModel : ViewModel(), WzpCallback {
         Log.i(TAG, "teardown: stopping audio, stopService=$stopService")
         val hadCall = audioStarted
         CallService.onStopFromNotification = null
-        stopAudio()             // sets running=false (non-blocking)
+        stopAudio()
         stopStatsPolling()
-
-        // Wait for audio threads to exit their loops before destroying the engine.
-        // This guarantees no in-flight JNI calls to writeAudio/readAudio.
-        val drained = audioPipeline?.awaitDrain() ?: true
-        if (!drained) {
-            Log.w(TAG, "teardown: audio threads did not drain in time")
-        }
-        audioPipeline = null
-
         Log.i(TAG, "teardown: stopping engine")
         try { engine?.stopCall() } catch (e: Exception) { Log.w(TAG, "stopCall err: $e") }
         try { engine?.destroy() } catch (e: Exception) { Log.w(TAG, "destroy err: $e") }
@@ -468,82 +271,13 @@ class CallViewModel : ViewModel(), WzpCallback {
         Log.i(TAG, "teardown: done")
     }
 
-    /** Accept the new server key and proceed with the call. */
-    fun acceptNewFingerprint() {
-        val info = _keyWarning.value ?: return
-        _knownFingerprints.value = _knownFingerprints.value.toMutableMap().also {
-            it[info.address] = info.newFp
-        }
-        settings?.saveServerFingerprint(info.address, info.newFp)
-        _keyWarning.value = null
-        startCallInternal()
-    }
-
-    fun dismissKeyWarning() {
-        _keyWarning.value = null
-    }
-
     fun startCall() {
-        val serverEntry = _servers.value[_selectedServer.value]
-        // Check for key change before connecting
-        val ls = lockStatus(serverEntry.address)
-        if (ls == LockStatus.CHANGED) {
-            val known = _knownFingerprints.value[serverEntry.address] ?: ""
-            val current = _pingResults.value[serverEntry.address]?.serverFingerprint ?: ""
-            _keyWarning.value = KeyWarningInfo(serverEntry.address, known, current)
-            return
-        }
-        startCallInternal()
-    }
-
-    /** Start a call to a specific relay + room (used by direct call setup). */
-    private fun startCallInternal(relay: String, room: String) {
-        Log.i(TAG, "startCallDirect: relay=$relay room=$room")
-        try {
-            // Don't teardown — keep the signal connection alive
-            engine = WzpEngine(this)
-            engine!!.init()
-            engineInitialized = true
-            _callState.value = 1
-            _errorMessage.value = null
-            try { appContext?.let { CallService.start(it) } } catch (e: Exception) {
-                Log.w(TAG, "service start err: $e")
-            }
-            startStatsPolling()
-            viewModelScope.launch(kotlinx.coroutines.Dispatchers.IO) {
-                try {
-                    val seed = _seedHex.value
-                    val name = _alias.value
-                    val result = engine?.startCall(relay, room, seedHex = seed, alias = name, profile = _codecChoice.value) ?: -1
-                    CallService.onStopFromNotification = { stopCall() }
-                    if (result != 0) {
-                        _callState.value = 0
-                        _errorMessage.value = "Failed to connect to call room (code $result)"
-                        appContext?.let { CallService.stop(it) }
-                    }
-                } catch (e: Exception) {
-                    Log.e(TAG, "startCallDirect error", e)
-                    _callState.value = 0
-                    _errorMessage.value = "Engine error: ${e.message}"
-                    appContext?.let { CallService.stop(it) }
-                }
-            }
-        } catch (e: Exception) {
-            Log.e(TAG, "startCallDirect error", e)
-            _callState.value = 0
-            _errorMessage.value = "Engine error: ${e.message}"
-        }
-    }
-
-    private fun startCallInternal() {
         val serverEntry = _servers.value[_selectedServer.value]
         val room = _roomName.value
         Log.i(TAG, "startCall: server=${serverEntry.address} room=$room")
         _debugReportAvailable.value = false
         _debugReportStatus.value = null
         lastCallServer = serverEntry.address
-        settings?.addRecentRoom(serverEntry.address, room)
-        _recentRooms.value = settings?.loadRecentRooms() ?: emptyList()
         debugReporter?.prepareForCall()
         try {
             // Teardown previous call but don't stop the service (we're about to restart it)
@@ -566,7 +300,7 @@ class CallViewModel : ViewModel(), WzpCallback {
                     val seed = _seedHex.value
                     val name = _alias.value
                     Log.i(TAG, "startCall: resolved=$relay, alias=$name, calling engine.startCall")
-                    val result = engine?.startCall(relay, room, seedHex = seed, alias = name, profile = _codecChoice.value) ?: -1
+                    val result = engine?.startCall(relay, room, seedHex = seed, alias = name) ?: -1
                     Log.i(TAG, "startCall: engine returned $result")
                     // Only wire up notification callback after engine is running
                     CallService.onStopFromNotification = { stopCall() }
@@ -657,7 +391,6 @@ class CallViewModel : ViewModel(), WzpCallback {
             it.playoutGainDb = _playoutGainDb.value
             it.captureGainDb = _captureGainDb.value
             it.aecEnabled = _aecEnabled.value
-            it.debugRecording = _debugRecording.value
             it.start(e)
         }
         audioRouteManager?.register()
@@ -666,7 +399,8 @@ class CallViewModel : ViewModel(), WzpCallback {
 
     private fun stopAudio() {
         if (!audioStarted) return
-        audioPipeline?.stop()    // sets running=false; DON'T null — teardown needs awaitDrain()
+        audioPipeline?.stop()
+        audioPipeline = null
         audioRouteManager?.unregister()
         audioRouteManager?.setSpeaker(false)
         _isSpeaker.value = false
@@ -688,27 +422,6 @@ class CallViewModel : ViewModel(), WzpCallback {
                         if (s.state != 0) {
                             _callState.value = s.state
                         }
-                        // Track signal state changes for direct calling
-                        if (s.state in 5..7) {
-                            _signalState.value = s.state
-                        }
-                        // Incoming call detection
-                        if (s.state == 7) { // IncomingCall
-                            _incomingCallId.value = s.incomingCallId
-                            _incomingCallerFp.value = s.incomingCallerFp
-                            _incomingCallerAlias.value = s.incomingCallerAlias
-                        }
-                        // CallSetup: auto-connect to media room
-                        if (s.state == 1 && s.incomingCallId != null && s.incomingCallId.contains("|")) {
-                            // Format: "relay_addr|room_name"
-                            val parts = s.incomingCallId.split("|", limit = 2)
-                            if (parts.size == 2) {
-                                val mediaRelay = parts[0]
-                                val mediaRoom = parts[1]
-                                Log.i(TAG, "CallSetup: connecting to $mediaRelay room $mediaRoom")
-                                startCallInternal(mediaRelay, mediaRoom)
-                            }
-                        }
                         if (s.state == 2 && !audioStarted) {
                             startAudio()
                         }

android/app/src/main/java/com/wzp/ui/components/Identicon.kt

@@ -1,141 +0,0 @@
-package com.wzp.ui.components
-
-import android.widget.Toast
-import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.geometry.Size
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalClipboardManager
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import kotlin.math.min
-
-/**
- * Deterministic identicon — generates a unique 5x5 symmetric pattern
- * from a hex fingerprint string. Identical algorithm to the desktop
- * TypeScript implementation in identicon.ts.
- */
-@Composable
-fun Identicon(
-    fingerprint: String,
-    size: Dp = 36.dp,
-    clickToCopy: Boolean = true,
-    modifier: Modifier = Modifier,
-) {
-    val clipboard = LocalClipboardManager.current
-    val context = LocalContext.current
-    val bytes = hashBytes(fingerprint)
-    val (bg, fg) = deriveColors(bytes)
-    val grid = buildGrid(bytes)
-
-    Canvas(
-        modifier = modifier
-            .size(size)
-            .clip(RoundedCornerShape(size * 0.12f))
-            .then(
-                if (clickToCopy && fingerprint.isNotEmpty()) {
-                    Modifier.clickable {
-                        clipboard.setText(AnnotatedString(fingerprint))
-                        Toast.makeText(context, "Copied", Toast.LENGTH_SHORT).show()
-                    }
-                } else Modifier
-            )
-    ) {
-        val cellW = this.size.width / 5f
-        val cellH = this.size.height / 5f
-
-        // Background
-        drawRect(color = bg, size = this.size)
-
-        // Foreground cells
-        for (y in 0 until 5) {
-            for (x in 0 until 5) {
-                if (grid[y][x]) {
-                    drawRect(
-                        color = fg,
-                        topLeft = Offset(x * cellW, y * cellH),
-                        size = Size(cellW, cellH),
-                    )
-                }
-            }
-        }
-    }
-}
-
-/**
- * Fingerprint text that copies to clipboard on tap.
- */
-@Composable
-fun CopyableFingerprint(
-    fingerprint: String,
-    modifier: Modifier = Modifier,
-    style: androidx.compose.ui.text.TextStyle = androidx.compose.material3.MaterialTheme.typography.bodySmall,
-    color: Color = Color.Unspecified,
-) {
-    val clipboard = LocalClipboardManager.current
-    val context = LocalContext.current
-
-    androidx.compose.material3.Text(
-        text = fingerprint,
-        style = style,
-        color = color,
-        modifier = modifier.clickable {
-            if (fingerprint.isNotEmpty()) {
-                clipboard.setText(AnnotatedString(fingerprint))
-                Toast.makeText(context, "Fingerprint copied", Toast.LENGTH_SHORT).show()
-            }
-        }
-    )
-}
-
-// --- Internal helpers (matching desktop identicon.ts) ---
-
-private fun hashBytes(hex: String): List<Int> {
-    val clean = hex.filter { it.isLetterOrDigit() }
-    val bytes = mutableListOf<Int>()
-    var i = 0
-    while (i + 1 < clean.length) {
-        val b = clean.substring(i, i + 2).toIntOrNull(16) ?: 0
-        bytes.add(b)
-        i += 2
-    }
-    // Pad to at least 16 bytes
-    while (bytes.size < 16) bytes.add(0)
-    return bytes
-}
-
-private fun deriveColors(bytes: List<Int>): Pair<Color, Color> {
-    val hue1 = bytes[0] * 360f / 256f
-    val hue2 = (bytes[1] * 360f / 256f + 120f) % 360f
-    val bg = hslToColor(hue1, 0.65f, 0.35f)
-    val fg = hslToColor(hue2, 0.70f, 0.55f)
-    return bg to fg
-}
-
-private fun buildGrid(bytes: List<Int>): List<List<Boolean>> {
-    return (0 until 5).map { y ->
-        val left = (0 until 3).map { x ->
-            val idx = 2 + y * 3 + x
-            bytes[idx % bytes.size] > 128
-        }
-        // Mirror: col3 = col1, col4 = col0
-        listOf(left[0], left[1], left[2], left[1], left[0])
-    }
-}
-
-private fun hslToColor(h: Float, s: Float, l: Float): Color {
-    val k = { n: Float -> (n + h / 30f) % 12f }
-    val a = s * min(l, 1f - l)
-    val f = { n: Float ->
-        l - a * maxOf(-1f, minOf(k(n) - 3f, minOf(9f - k(n), 1f)))
-    }
-    return Color(f(0f), f(8f), f(4f))
-}

android/app/src/main/java/com/wzp/ui/settings/SettingsScreen.kt

@@ -1,6 +1,5 @@
 package com.wzp.ui.settings
 
-import androidx.compose.foundation.clickable
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
@@ -23,7 +22,6 @@ import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Divider
-import androidx.compose.material3.RadioButton
 import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.FilledTonalIconButton
 import androidx.compose.material3.IconButtonDefaults
@@ -160,30 +158,20 @@ fun SettingsScreen(
 
             Spacer(modifier = Modifier.height(16.dp))
 
-            // Fingerprint display with identicon
+            // Fingerprint display
             val fingerprint = if (draftSeedHex.length >= 16) draftSeedHex.take(16).uppercase() else "Not generated"
             Text(
                 text = "Fingerprint",
                 style = MaterialTheme.typography.labelSmall,
                 color = MaterialTheme.colorScheme.onSurfaceVariant
             )
-            Row(
-                verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier.padding(vertical = 4.dp)
-            ) {
-                com.wzp.ui.components.Identicon(
-                    fingerprint = draftSeedHex,
-                    size = 40.dp,
-                )
-                Spacer(modifier = Modifier.width(12.dp))
-                com.wzp.ui.components.CopyableFingerprint(
-                    fingerprint = fingerprint.chunked(4).joinToString(" "),
+            Text(
+                text = fingerprint.chunked(4).joinToString(" "),
                 style = MaterialTheme.typography.bodyMedium.copy(
                     fontFamily = FontFamily.Monospace
                 ),
-                    color = MaterialTheme.colorScheme.onSurface,
+                color = MaterialTheme.colorScheme.onSurface
             )
-            }
 
             Spacer(modifier = Modifier.height(12.dp))
 
@@ -243,51 +231,6 @@ fun SettingsScreen(
                 )
             }
 
-            Spacer(modifier = Modifier.height(12.dp))
-
-            // Quality selection — slider from best (studio 64k) to worst (codec2 1.2k) + auto
-            val qualityLabels = listOf(
-                "Studio 64k", "Studio 48k", "Studio 32k", "Auto",
-                "Opus 24k", "Opus 6k", "Codec2 3.2k", "Codec2 1.2k"
-            )
-            // Map slider position to JNI profile int:
-            // 0=Studio64k(6), 1=Studio48k(5), 2=Studio32k(4), 3=Auto(7),
-            // 4=Opus24k(0), 5=Opus6k(1), 6=Codec2_3.2k(3), 7=Codec2_1.2k(2)
-            val sliderToProfile = intArrayOf(6, 5, 4, 7, 0, 1, 3, 2)
-            val profileToSlider = mapOf(6 to 0, 5 to 1, 4 to 2, 7 to 3, 0 to 4, 1 to 5, 3 to 6, 2 to 7)
-            val qualityColors = listOf(
-                Color(0xFF22C55E), Color(0xFF4ADE80), Color(0xFF86EFAC), Color(0xFFA3E635),
-                Color(0xFFA3E635), Color(0xFFFACC15), Color(0xFFE97320), Color(0xFF991B1B)
-            )
-            val currentCodec by viewModel.codecChoice.collectAsState()
-            val sliderPos = profileToSlider[currentCodec] ?: 3
-            Text("Quality", style = MaterialTheme.typography.bodyMedium)
-            Text(
-                text = "Decode always accepts all codecs",
-                style = MaterialTheme.typography.bodySmall,
-                color = MaterialTheme.colorScheme.onSurfaceVariant
-            )
-            Spacer(modifier = Modifier.height(4.dp))
-            Text(
-                text = qualityLabels[sliderPos],
-                style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold),
-                color = qualityColors[sliderPos]
-            )
-            Slider(
-                value = sliderPos.toFloat(),
-                onValueChange = { viewModel.setCodecChoice(sliderToProfile[it.toInt()]) },
-                valueRange = 0f..7f,
-                steps = 6,
-                modifier = Modifier.fillMaxWidth()
-            )
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween
-            ) {
-                Text("Best", style = MaterialTheme.typography.labelSmall, color = Color(0xFF22C55E))
-                Text("Lowest", style = MaterialTheme.typography.labelSmall, color = Color(0xFF991B1B))
-            }
-
             Spacer(modifier = Modifier.height(24.dp))
             Divider()
             Spacer(modifier = Modifier.height(16.dp))

crates/wzp-android/Cargo.toml

@@ -17,7 +17,7 @@ wzp-crypto = { workspace = true }
 wzp-transport = { workspace = true }
 tokio = { workspace = true }
 tracing = { workspace = true }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+tracing-subscriber = { workspace = true }
 bytes = { workspace = true }
 serde = { workspace = true }
 serde_json = "1"

crates/wzp-android/src/audio_ring.rs

@@ -1,128 +1,91 @@
-//! Lock-free SPSC ring buffer — "Reader-Detects-Lap" architecture.
+//! Lock-free SPSC ring buffers for audio PCM transfer between
+//! Kotlin AudioRecord/AudioTrack threads and the Rust engine.
 //!
-//! SPSC invariant: the producer ONLY writes `write_pos`, the consumer
-//! ONLY writes `read_pos`.  Neither thread touches the other's cursor.
-//!
-//! On overflow (writer laps the reader), the writer simply overwrites
-//! old buffer data.  The reader detects the lap via `available() >
-//! RING_CAPACITY` and snaps its own `read_pos` forward.
-//!
-//! Capacity is a power of 2 for bitmask indexing (no modulo).
+//! These use a simple spin-free design: the producer writes and advances
+//! a write cursor, the consumer reads and advances a read cursor.
+//! Both cursors are atomic so no mutex is needed.
 
-use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering};
+use std::sync::atomic::{AtomicUsize, Ordering};
 
-/// Ring buffer capacity — power of 2 for bitmask indexing.
-/// 16384 samples = 341.3ms at 48kHz mono.  70% more headroom
-/// than the previous 9600 (200ms) for surviving Android GC pauses.
-const RING_CAPACITY: usize = 16384; // 2^14
-const RING_MASK: usize = RING_CAPACITY - 1;
+/// Ring buffer capacity in i16 samples.
+/// 960 samples * 10 frames = ~200ms of audio at 48kHz mono.
+const RING_CAPACITY: usize = 960 * 10;
 
 /// Lock-free single-producer single-consumer ring buffer for i16 PCM samples.
 pub struct AudioRing {
-    buf: Box<[i16]>,
-    /// Monotonically increasing write cursor. ONLY written by producer.
+    buf: Box<[i16; RING_CAPACITY]>,
     write_pos: AtomicUsize,
-    /// Monotonically increasing read cursor. ONLY written by consumer.
     read_pos: AtomicUsize,
-    /// Incremented by reader when it detects it was lapped (overflow).
-    overflow_count: AtomicU64,
-    /// Incremented by reader when ring is empty (underrun).
-    underrun_count: AtomicU64,
 }
 
-// SAFETY: AudioRing is SPSC — one thread writes (producer), one reads (consumer).
-// The producer only writes write_pos. The consumer only writes read_pos.
-// Neither thread writes the other's cursor. Buffer indices are derived from
-// the owning thread's cursor, ensuring no concurrent access to the same index.
+// SAFETY: AudioRing is designed for SPSC — one thread writes, one reads.
+// The atomics ensure visibility. The buffer itself is never accessed
+// from the same index by both threads simultaneously because the
+// producer only writes to positions between write_pos and read_pos,
+// and the consumer only reads from positions between read_pos and write_pos.
 unsafe impl Send for AudioRing {}
 unsafe impl Sync for AudioRing {}
 
 impl AudioRing {
     pub fn new() -> Self {
-        debug_assert!(RING_CAPACITY.is_power_of_two());
         Self {
-            buf: vec![0i16; RING_CAPACITY].into_boxed_slice(),
+            buf: Box::new([0i16; RING_CAPACITY]),
             write_pos: AtomicUsize::new(0),
             read_pos: AtomicUsize::new(0),
-            overflow_count: AtomicU64::new(0),
-            underrun_count: AtomicU64::new(0),
         }
     }
 
-    /// Number of samples available to read (clamped to capacity).
+    /// Number of samples available to read.
     pub fn available(&self) -> usize {
         let w = self.write_pos.load(Ordering::Acquire);
-        let r = self.read_pos.load(Ordering::Relaxed);
-        w.wrapping_sub(r).min(RING_CAPACITY)
+        let r = self.read_pos.load(Ordering::Acquire);
+        w.wrapping_sub(r)
     }
 
-    /// Number of samples that can be written without overwriting unread data.
+    /// Number of samples that can be written without overwriting.
     pub fn free_space(&self) -> usize {
-        RING_CAPACITY.saturating_sub(self.available())
+        RING_CAPACITY - self.available()
     }
 
     /// Write samples into the ring. Returns number of samples written.
-    ///
-    /// If the ring is full, old data is silently overwritten.  The reader
-    /// will detect the lap and self-correct.  The writer NEVER touches
-    /// `read_pos` — this is the key invariant that prevents cursor desync.
+    /// Drops oldest samples if the ring is full.
     pub fn write(&self, samples: &[i16]) -> usize {
-        let count = samples.len().min(RING_CAPACITY);
         let w = self.write_pos.load(Ordering::Relaxed);
+        let count = samples.len().min(RING_CAPACITY);
 
         for i in 0..count {
+            let idx = (w + i) % RING_CAPACITY;
+            // SAFETY: We're the only writer, and the reader won't read
+            // past read_pos which we haven't advanced past yet.
             unsafe {
                 let ptr = self.buf.as_ptr() as *mut i16;
-                *ptr.add((w + i) & RING_MASK) = samples[i];
+                *ptr.add(idx) = samples[i];
             }
         }
 
         self.write_pos.store(w.wrapping_add(count), Ordering::Release);
+
+        // If we overwrote unread data, advance read_pos
+        if self.available() > RING_CAPACITY {
+            let new_read = self.write_pos.load(Ordering::Relaxed).wrapping_sub(RING_CAPACITY);
+            self.read_pos.store(new_read, Ordering::Release);
+        }
+
         count
     }
 
     /// Read samples from the ring into `out`. Returns number of samples read.
-    ///
-    /// If the writer has lapped the reader (overflow), `read_pos` is snapped
-    /// forward to the oldest valid data.  This is safe because only the
-    /// reader thread writes `read_pos`.
     pub fn read(&self, out: &mut [i16]) -> usize {
-        let w = self.write_pos.load(Ordering::Acquire);
-        let mut r = self.read_pos.load(Ordering::Relaxed);
-
-        let mut avail = w.wrapping_sub(r);
-
-        // Lap detection: writer has overwritten our unread data.
-        // Snap read_pos forward to oldest valid data in the buffer.
-        if avail > RING_CAPACITY {
-            r = w.wrapping_sub(RING_CAPACITY);
-            avail = RING_CAPACITY;
-            self.overflow_count.fetch_add(1, Ordering::Relaxed);
-        }
-
+        let avail = self.available();
         let count = out.len().min(avail);
-        if count == 0 {
-            if w == r {
-                self.underrun_count.fetch_add(1, Ordering::Relaxed);
-            }
-            return 0;
-        }
 
+        let r = self.read_pos.load(Ordering::Relaxed);
         for i in 0..count {
-            out[i] = unsafe { *self.buf.as_ptr().add((r + i) & RING_MASK) };
+            let idx = (r + i) % RING_CAPACITY;
+            out[i] = unsafe { *self.buf.as_ptr().add(idx) };
         }
 
         self.read_pos.store(r.wrapping_add(count), Ordering::Release);
         count
     }
-
-    /// Number of overflow events (reader was lapped by writer).
-    pub fn overflow_count(&self) -> u64 {
-        self.overflow_count.load(Ordering::Relaxed)
-    }
-
-    /// Number of underrun events (reader found empty buffer).
-    pub fn underrun_count(&self) -> u64 {
-        self.underrun_count.load(Ordering::Relaxed)
-    }
 }

crates/wzp-android/src/commands.rs

@@ -12,13 +12,4 @@ pub enum EngineCommand {
     ForceProfile(QualityProfile),
     /// Stop the call and shut down the engine.
     Stop,
-    /// Place a direct call to a fingerprint (requires signal connection).
-    PlaceCall { target_fingerprint: String },
-    /// Answer an incoming direct call.
-    AnswerCall {
-        call_id: String,
-        accept_mode: wzp_proto::CallAcceptMode,
-    },
-    /// Reject an incoming direct call.
-    RejectCall { call_id: String },
 }

crates/wzp-android/src/engine.rs

@@ -9,60 +9,32 @@
 //! and AudioTrack. PCM samples are transferred through lock-free ring buffers.
 
 use std::net::SocketAddr;
-use std::sync::atomic::{AtomicBool, AtomicU8, AtomicU16, AtomicU32, Ordering};
+use std::sync::atomic::{AtomicBool, AtomicU16, AtomicU32, Ordering};
 use std::sync::{Arc, Mutex};
 use std::time::Instant;
 
 use bytes::Bytes;
-use tracing::{debug, error, info, warn};
-use wzp_codec::AdaptiveDecoder;
+use tracing::{error, info, warn};
 use wzp_codec::agc::AutoGainControl;
-use wzp_codec::dred_ffi::{DredDecoderHandle, DredState};
+use wzp_codec::opus_dec::OpusDecoder;
+use wzp_codec::opus_enc::OpusEncoder;
 use wzp_crypto::{KeyExchange, WarzoneKeyExchange};
 use wzp_fec::{RaptorQFecDecoder, RaptorQFecEncoder};
 use wzp_proto::{
-    AdaptiveQualityController, AudioDecoder, AudioEncoder, CodecId, FecDecoder, FecEncoder,
-    MediaHeader, MediaPacket, MediaTransport, QualityController, QualityProfile, SignalMessage,
+    AudioDecoder, AudioEncoder, CodecId, FecDecoder, FecEncoder,
+    MediaHeader, MediaPacket, MediaTransport, QualityProfile, SignalMessage,
 };
 
 use crate::audio_ring::AudioRing;
 use crate::commands::EngineCommand;
 use crate::stats::{CallState, CallStats};
 
-/// Max frame size at 48kHz mono (40ms = 1920 samples, for Codec2/Opus6k).
-const MAX_FRAME_SAMPLES: usize = 1920;
-
-/// Sentinel value: no profile change pending.
-const PROFILE_NO_CHANGE: u8 = 0xFF;
-
-/// All quality profiles in index order, for AtomicU8-based signaling.
-const PROFILES: [QualityProfile; 6] = [
-    QualityProfile::STUDIO_64K,   // 0
-    QualityProfile::STUDIO_48K,   // 1
-    QualityProfile::STUDIO_32K,   // 2
-    QualityProfile::GOOD,         // 3
-    QualityProfile::DEGRADED,     // 4
-    QualityProfile::CATASTROPHIC, // 5
-];
-
-fn profile_to_index(p: &QualityProfile) -> u8 {
-    PROFILES.iter().position(|pp| pp.codec == p.codec).map(|i| i as u8).unwrap_or(3)
-}
-
-fn index_to_profile(idx: u8) -> Option<QualityProfile> {
-    PROFILES.get(idx as usize).copied()
-}
-
-/// Compute frame samples at 48kHz for a given profile.
-fn frame_samples_for(profile: &QualityProfile) -> usize {
-    (profile.frame_duration_ms as usize) * 48 // 48000 / 1000
-}
+/// Opus frame size at 48kHz mono, 20ms = 960 samples.
+const FRAME_SAMPLES: usize = 960;
 
 /// Configuration to start a call.
 pub struct CallStartConfig {
     pub profile: QualityProfile,
-    /// When true, use the relay's chosen_profile from CallAnswer instead of local profile.
-    pub auto_profile: bool,
     pub relay_addr: String,
     pub room: String,
     pub auth_token: Vec<u8>,
@@ -74,7 +46,6 @@ impl Default for CallStartConfig {
     fn default() -> Self {
         Self {
             profile: QualityProfile::GOOD,
-            auto_profile: false,
             relay_addr: String::new(),
             room: String::new(),
             auth_token: Vec::new(),
@@ -152,7 +123,6 @@ impl WzpEngine {
         let room = config.room.clone();
         let identity_seed = config.identity_seed;
         let profile = config.profile;
-        let auto_profile = config.auto_profile;
         let alias = config.alias.clone();
         let state = self.state.clone();
 
@@ -161,7 +131,7 @@ impl WzpEngine {
 
         let state_clone = state.clone();
         runtime.block_on(async move {
-            if let Err(e) = run_call(relay_addr, &room, &identity_seed, profile, auto_profile, alias.as_deref(), state_clone).await
+            if let Err(e) = run_call(relay_addr, &room, &identity_seed, profile, alias.as_deref(), state_clone).await
             {
                 error!("call failed: {e}");
             }
@@ -199,203 +169,6 @@ impl WzpEngine {
         info!("stop_call: done");
     }
 
-    /// Ping a relay — same pattern as start_call (creates runtime on calling thread).
-    /// Returns JSON `{"rtt_ms":N,"server_fingerprint":"hex"}` or error.
-    pub fn ping_relay(&self, address: &str) -> Result<String, anyhow::Error> {
-        let addr: SocketAddr = address.parse()?;
-        let _ = rustls::crypto::ring::default_provider().install_default();
-
-        let rt = tokio::runtime::Builder::new_current_thread()
-            .enable_all()
-            .build()?;
-
-        let result = rt.block_on(async {
-            let bind: SocketAddr = "0.0.0.0:0".parse().unwrap();
-            let endpoint = wzp_transport::create_endpoint(bind, None)?;
-            let client_cfg = wzp_transport::client_config();
-            let start = Instant::now();
-
-            let conn_result = tokio::time::timeout(
-                std::time::Duration::from_secs(3),
-                wzp_transport::connect(&endpoint, addr, "ping", client_cfg),
-            )
-            .await;
-
-            // Always close endpoint to prevent resource leaks
-            endpoint.close(0u32.into(), b"done");
-
-            let conn = conn_result.map_err(|_| anyhow::anyhow!("timeout"))??;
-            let rtt_ms = start.elapsed().as_millis() as u64;
-            let server_fp = conn
-                .peer_identity()
-                .and_then(|id| id.downcast::<Vec<rustls::pki_types::CertificateDer>>().ok())
-                .and_then(|certs| certs.first().map(|c| {
-                    use std::hash::{Hash, Hasher};
-                    let mut h = std::collections::hash_map::DefaultHasher::new();
-                    c.as_ref().hash(&mut h);
-                    format!("{:016x}", h.finish())
-                }))
-                .unwrap_or_default();
-            conn.close(0u32.into(), b"ping");
-
-            Ok::<_, anyhow::Error>(format!(r#"{{"rtt_ms":{},"server_fingerprint":"{}"}}"#, rtt_ms, server_fp))
-        });
-
-        // Shutdown runtime cleanly with timeout
-        rt.shutdown_timeout(std::time::Duration::from_millis(500));
-        result
-    }
-
-    /// Start persistent signaling connection for direct calls.
-    /// Spawns a background task that maintains the `_signal` connection.
-    pub fn start_signaling(
-        &mut self,
-        relay_addr: &str,
-        seed_hex: &str,
-        token: Option<&str>,
-        alias: Option<&str>,
-    ) -> Result<(), anyhow::Error> {
-        use wzp_proto::{MediaTransport, SignalMessage};
-
-        let addr: SocketAddr = relay_addr.parse()?;
-        let seed = if seed_hex.is_empty() {
-            wzp_crypto::Seed::generate()
-        } else {
-            wzp_crypto::Seed::from_hex(seed_hex).map_err(|e| anyhow::anyhow!(e))?
-        };
-        let identity = seed.derive_identity();
-        let pub_id = identity.public_identity();
-        let identity_pub = *pub_id.signing.as_bytes();
-        let fp = pub_id.fingerprint.to_string();
-        let token = token.map(|s| s.to_string());
-        let alias = alias.map(|s| s.to_string());
-        let state = self.state.clone();
-        let seed_bytes = seed.0;
-
-        info!(fingerprint = %fp, relay = %addr, "starting signaling");
-
-        // Create runtime for signaling (separate from call runtime)
-        let rt = tokio::runtime::Builder::new_multi_thread()
-            .worker_threads(1)
-            .enable_all()
-            .build()?;
-
-        let signal_state = state.clone();
-        rt.spawn(async move {
-            let _ = rustls::crypto::ring::default_provider().install_default();
-            let bind: SocketAddr = "0.0.0.0:0".parse().unwrap();
-            let endpoint = match wzp_transport::create_endpoint(bind, None) {
-                Ok(e) => e,
-                Err(e) => { error!("signal endpoint: {e}"); return; }
-            };
-            let client_cfg = wzp_transport::client_config();
-            let conn = match wzp_transport::connect(&endpoint, addr, "_signal", client_cfg).await {
-                Ok(c) => c,
-                Err(e) => { error!("signal connect: {e}"); return; }
-            };
-            let transport = std::sync::Arc::new(wzp_transport::QuinnTransport::new(conn));
-
-            // Auth if token provided
-            if let Some(ref tok) = token {
-                let _ = transport.send_signal(&SignalMessage::AuthToken { token: tok.clone() }).await;
-            }
-
-            // Register presence
-            let _ = transport.send_signal(&SignalMessage::RegisterPresence {
-                identity_pub,
-                signature: vec![],
-                alias: alias.clone(),
-            }).await;
-
-            // Wait for ack
-            match transport.recv_signal().await {
-                Ok(Some(SignalMessage::RegisterPresenceAck { success: true, .. })) => {
-                    info!(fingerprint = %fp, "signal: registered");
-                    let mut stats = signal_state.stats.lock().unwrap();
-                    stats.state = crate::stats::CallState::Registered;
-                }
-                other => {
-                    error!("signal registration failed: {other:?}");
-                    return;
-                }
-            }
-
-            // Signal recv loop
-            loop {
-                if !signal_state.running.load(Ordering::Relaxed) {
-                    break;
-                }
-                match transport.recv_signal().await {
-                    Ok(Some(SignalMessage::CallRinging { call_id })) => {
-                        info!(call_id = %call_id, "signal: ringing");
-                        let mut stats = signal_state.stats.lock().unwrap();
-                        stats.state = crate::stats::CallState::Ringing;
-                    }
-                    Ok(Some(SignalMessage::DirectCallOffer { caller_fingerprint, caller_alias, call_id, .. })) => {
-                        info!(from = %caller_fingerprint, call_id = %call_id, "signal: incoming call");
-                        let mut stats = signal_state.stats.lock().unwrap();
-                        stats.state = crate::stats::CallState::IncomingCall;
-                        stats.incoming_call_id = Some(call_id);
-                        stats.incoming_caller_fp = Some(caller_fingerprint);
-                        stats.incoming_caller_alias = caller_alias;
-                    }
-                    Ok(Some(SignalMessage::DirectCallAnswer { call_id, accept_mode, .. })) => {
-                        info!(call_id = %call_id, mode = ?accept_mode, "signal: call answered");
-                    }
-                    Ok(Some(SignalMessage::CallSetup { call_id, room, relay_addr })) => {
-                        info!(call_id = %call_id, room = %room, relay = %relay_addr, "signal: call setup");
-                        // Connect to media room via the existing start_call mechanism
-                        // Store the room info so Kotlin can call startCall with it
-                        let mut stats = signal_state.stats.lock().unwrap();
-                        stats.state = crate::stats::CallState::Connecting;
-                        // Store call setup info for Kotlin to pick up
-                        stats.incoming_call_id = Some(format!("{relay_addr}|{room}"));
-                    }
-                    Ok(Some(SignalMessage::Hangup { reason })) => {
-                        info!(reason = ?reason, "signal: call ended by remote");
-                        let mut stats = signal_state.stats.lock().unwrap();
-                        stats.state = crate::stats::CallState::Closed;
-                        stats.incoming_call_id = None;
-                        stats.incoming_caller_fp = None;
-                        stats.incoming_caller_alias = None;
-                    }
-                    Ok(Some(_)) => {}
-                    Ok(None) => {
-                        info!("signal: connection closed");
-                        break;
-                    }
-                    Err(e) => {
-                        error!("signal recv error: {e}");
-                        break;
-                    }
-                }
-            }
-
-            let mut stats = signal_state.stats.lock().unwrap();
-            stats.state = crate::stats::CallState::Closed;
-        });
-
-        self.tokio_runtime = Some(rt);
-        Ok(())
-    }
-
-    /// Place a direct call to a target fingerprint via the signal connection.
-    pub fn place_call(&self, target_fingerprint: &str) -> Result<(), anyhow::Error> {
-        let _ = self.state.command_tx.send(EngineCommand::PlaceCall {
-            target_fingerprint: target_fingerprint.to_string(),
-        });
-        Ok(())
-    }
-
-    /// Answer an incoming direct call.
-    pub fn answer_call(&self, call_id: &str, mode: wzp_proto::CallAcceptMode) -> Result<(), anyhow::Error> {
-        let _ = self.state.command_tx.send(EngineCommand::AnswerCall {
-            call_id: call_id.to_string(),
-            accept_mode: mode,
-        });
-        Ok(())
-    }
-
     pub fn set_mute(&self, muted: bool) {
         self.state.muted.store(muted, Ordering::Relaxed);
     }
@@ -410,9 +183,6 @@ impl WzpEngine {
             stats.duration_secs = start.elapsed().as_secs_f64();
         }
         stats.audio_level = self.state.audio_level_rms.load(Ordering::Relaxed);
-        stats.playout_overflows = self.state.playout_ring.overflow_count();
-        stats.playout_underruns = self.state.playout_ring.underrun_count();
-        stats.capture_overflows = self.state.capture_ring.overflow_count();
         stats
     }
 
@@ -454,7 +224,6 @@ async fn run_call(
     room: &str,
     identity_seed: &[u8; 32],
     profile: QualityProfile,
-    auto_profile: bool,
     alias: Option<&str>,
     state: Arc<EngineState>,
 ) -> Result<(), anyhow::Error> {
@@ -489,9 +258,6 @@ async fn run_call(
         ephemeral_pub,
         signature,
         supported_profiles: vec![
-            QualityProfile::STUDIO_64K,
-            QualityProfile::STUDIO_48K,
-            QualityProfile::STUDIO_32K,
             QualityProfile::GOOD,
             QualityProfile::DEGRADED,
             QualityProfile::CATASTROPHIC,
@@ -506,8 +272,8 @@ async fn run_call(
         .await?
         .ok_or_else(|| anyhow::anyhow!("connection closed before CallAnswer"))?;
 
-    let (relay_ephemeral_pub, chosen_profile) = match answer {
-        SignalMessage::CallAnswer { ephemeral_pub, chosen_profile, .. } => (ephemeral_pub, chosen_profile),
+    let relay_ephemeral_pub = match answer {
+        SignalMessage::CallAnswer { ephemeral_pub, .. } => ephemeral_pub,
         other => {
             return Err(anyhow::anyhow!(
                 "expected CallAnswer, got {:?}",
@@ -516,28 +282,19 @@ async fn run_call(
         }
     };
 
-    // Auto mode: use the relay's chosen profile instead of the local preference
-    let profile = if auto_profile {
-        info!(chosen = ?chosen_profile.codec, "auto mode: using relay's chosen profile");
-        chosen_profile
-    } else {
-        profile
-    };
-
     let _session = kx.derive_session(&relay_ephemeral_pub)?;
-    info!(codec = ?profile.codec, "handshake complete, call active");
+    info!("handshake complete, call active");
 
     {
         let mut stats = state.stats.lock().unwrap();
         stats.state = CallState::Active;
     }
 
-    // Initialize codec (Opus or Codec2 based on profile).
-    // Phase 3c: decoder is a concrete AdaptiveDecoder (not Box<dyn
-    // AudioDecoder>) so the recv task can call reconstruct_from_dred on
-    // gaps detected via sequence tracking.
-    let mut encoder = wzp_codec::create_encoder(profile);
-    let mut decoder = AdaptiveDecoder::new(profile).expect("failed to create adaptive decoder");
+    // Initialize Opus codec
+    let mut encoder =
+        OpusEncoder::new(profile).map_err(|e| anyhow::anyhow!("opus encoder init: {e}"))?;
+    let mut decoder =
+        OpusDecoder::new(profile).map_err(|e| anyhow::anyhow!("opus decoder init: {e}"))?;
 
     // Initialize FEC encoder/decoder
     let mut fec_enc = wzp_fec::create_encoder(&profile);
@@ -547,37 +304,21 @@ async fn run_call(
     let mut capture_agc = AutoGainControl::new();
     let mut playout_agc = AutoGainControl::new();
 
-    let mut frame_samples = frame_samples_for(&profile);
     info!(
-        codec = ?profile.codec,
         fec_ratio = profile.fec_ratio,
         frames_per_block = profile.frames_per_block,
-        frame_ms = profile.frame_duration_ms,
-        frame_samples,
-        "codec + FEC + AGC initialized"
+        "codec + FEC + AGC initialized (48kHz mono, 20ms frames)"
     );
 
-    {
-        let mut stats = state.stats.lock().unwrap();
-        stats.current_codec = format!("{:?}", profile.codec);
-        stats.auto_mode = auto_profile;
-    }
-
     let seq = AtomicU16::new(0);
     let ts = AtomicU32::new(0);
     let transport_recv = transport.clone();
 
-    // Adaptive quality: shared AtomicU8 between recv task (writer) and send task (reader).
-    // 0xFF = no change pending, 0-5 = index into PROFILES array.
-    let pending_profile = Arc::new(AtomicU8::new(PROFILE_NO_CHANGE));
-    let pending_profile_recv = pending_profile.clone();
-
-    // Pre-allocate buffers (sized for current profile)
-    let mut capture_buf = vec![0i16; frame_samples];
+    // Pre-allocate buffers
+    let mut capture_buf = vec![0i16; FRAME_SAMPLES];
     let mut encode_buf = vec![0u8; encoder.max_frame_bytes()];
     let mut frame_in_block: u8 = 0;
     let mut block_id: u8 = 0;
-    let mut current_profile = profile;
 
     // Send task: capture ring → Opus encode → FEC → MediaPackets
     //
@@ -592,58 +333,19 @@ async fn run_call(
         let mut last_stats_log = Instant::now();
         let mut frames_sent: u64 = 0;
         let mut frames_dropped: u64 = 0;
-        // Per-step timing accumulators (reset every stats log)
-        let mut t_agc_us: u64 = 0;
-        let mut t_opus_us: u64 = 0;
-        let mut t_fec_us: u64 = 0;
-        let mut t_send_us: u64 = 0;
-        let mut t_frames: u64 = 0;
         loop {
             if !state.running.load(Ordering::Relaxed) {
                 break;
             }
 
-            // Check for adaptive profile switch from recv task
-            if auto_profile {
-                let p = pending_profile.swap(PROFILE_NO_CHANGE, Ordering::Acquire);
-                if p != PROFILE_NO_CHANGE {
-                    if let Some(new_profile) = index_to_profile(p) {
-                        info!(
-                            from = ?current_profile.codec,
-                            to = ?new_profile.codec,
-                            "auto: switching encoder profile"
-                        );
-                        if let Err(e) = encoder.set_profile(new_profile) {
-                            warn!("encoder set_profile failed: {e}");
-                        } else {
-                            fec_enc = wzp_fec::create_encoder(&new_profile);
-                            current_profile = new_profile;
-                            let new_frame_samples = frame_samples_for(&new_profile);
-                            if new_frame_samples != frame_samples {
-                                frame_samples = new_frame_samples;
-                                capture_buf.resize(frame_samples, 0);
-                            }
-                            encode_buf.resize(encoder.max_frame_bytes(), 0);
-                            // Reset FEC block state for clean switch
-                            frame_in_block = 0;
-                            block_id = block_id.wrapping_add(1);
-                            // Update stats with new codec
-                            if let Ok(mut stats) = state.stats.lock() {
-                                stats.current_codec = format!("{:?}", new_profile.codec);
-                            }
-                        }
-                    }
-                }
-            }
-
             let avail = state.capture_ring.available();
-            if avail < frame_samples {
+            if avail < FRAME_SAMPLES {
                 tokio::time::sleep(std::time::Duration::from_millis(5)).await;
                 continue;
             }
 
             let read = state.capture_ring.read(&mut capture_buf);
-            if read < frame_samples {
+            if read < FRAME_SAMPLES {
                 continue;
             }
 
@@ -654,12 +356,9 @@ async fn run_call(
             }
 
             // AGC: normalize capture volume before encoding
-            let t0 = Instant::now();
             capture_agc.process_frame(&mut capture_buf);
-            t_agc_us += t0.elapsed().as_micros() as u64;
 
             // Opus encode
-            let t0 = Instant::now();
             let encoded_len = match encoder.encode(&capture_buf, &mut encode_buf) {
                 Ok(n) => n,
                 Err(e) => {
@@ -667,37 +366,23 @@ async fn run_call(
                     continue;
                 }
             };
-            t_opus_us += t0.elapsed().as_micros() as u64;
             let encoded = &encode_buf[..encoded_len];
 
-            // Phase 2: Opus tiers bypass RaptorQ (DRED handles loss recovery
-            // at the codec layer). Codec2 tiers keep RaptorQ unchanged.
-            let is_opus = current_profile.codec.is_opus();
-            let (hdr_fec_block, hdr_fec_symbol, hdr_fec_ratio) = if is_opus {
-                (0u8, 0u8, 0u8)
-            } else {
-                (
-                    block_id,
-                    frame_in_block,
-                    MediaHeader::encode_fec_ratio(current_profile.fec_ratio),
-                )
-            };
-
             // Build source packet
             let s = seq.fetch_add(1, Ordering::Relaxed);
-            let t = ts.fetch_add(frame_samples as u32, Ordering::Relaxed);
+            let t = ts.fetch_add(FRAME_SAMPLES as u32, Ordering::Relaxed);
 
             let source_pkt = MediaPacket {
                 header: MediaHeader {
                     version: 0,
                     is_repair: false,
-                    codec_id: current_profile.codec,
+                    codec_id: profile.codec,
                     has_quality_report: false,
-                    fec_ratio_encoded: hdr_fec_ratio,
+                    fec_ratio_encoded: MediaHeader::encode_fec_ratio(profile.fec_ratio),
                     seq: s,
                     timestamp: t,
-                    fec_block: hdr_fec_block,
-                    fec_symbol: hdr_fec_symbol,
+                    fec_block: block_id,
+                    fec_symbol: frame_in_block,
                     reserved: 0,
                     csrc_count: 0,
                 },
@@ -706,7 +391,6 @@ async fn run_call(
             };
 
             // Send source packet — drop on error, never break
-            let t0 = Instant::now();
             if let Err(e) = transport.send_media(&source_pkt).await {
                 send_errors += 1;
                 frames_dropped += 1;
@@ -721,24 +405,19 @@ async fn run_call(
                     last_send_error_log = Instant::now();
                 }
                 // Don't feed to FEC either — the source is lost
-                t_send_us += t0.elapsed().as_micros() as u64;
                 continue;
             }
-            t_send_us += t0.elapsed().as_micros() as u64;
             frames_sent += 1;
 
-            // Codec2-only: feed RaptorQ and emit repair packets when the
-            // block is full. Opus tiers skip this entire block — DRED
-            // (enabled in Phase 1) provides codec-layer loss recovery.
-            let t0 = Instant::now();
-            if !is_opus {
+            // Feed encoded frame to FEC encoder
             if let Err(e) = fec_enc.add_source_symbol(encoded) {
                 warn!("fec add_source error: {e}");
             }
             frame_in_block += 1;
 
-                if frame_in_block >= current_profile.frames_per_block {
-                    match fec_enc.generate_repair(current_profile.fec_ratio) {
+            // When block is full, generate repair packets
+            if frame_in_block >= profile.frames_per_block {
+                match fec_enc.generate_repair(profile.fec_ratio) {
                     Ok(repairs) => {
                         let repair_count = repairs.len();
                         for (sym_idx, repair_data) in repairs {
@@ -747,10 +426,10 @@ async fn run_call(
                                 header: MediaHeader {
                                     version: 0,
                                     is_repair: true,
-                                        codec_id: current_profile.codec,
+                                    codec_id: profile.codec,
                                     has_quality_report: false,
                                     fec_ratio_encoded: MediaHeader::encode_fec_ratio(
-                                            current_profile.fec_ratio,
+                                        profile.fec_ratio,
                                     ),
                                     seq: rs,
                                     timestamp: t,
@@ -773,7 +452,7 @@ async fn run_call(
                             info!(
                                 block_id,
                                 repair_count,
-                                    fec_ratio = current_profile.fec_ratio,
+                                fec_ratio = profile.fec_ratio,
                                 "FEC block complete"
                             );
                         }
@@ -787,13 +466,9 @@ async fn run_call(
                 block_id = block_id.wrapping_add(1);
                 frame_in_block = 0;
             }
-            }
-            t_fec_us += t0.elapsed().as_micros() as u64;
-            t_frames += 1;
 
             // Periodic stats every 5 seconds
             if last_stats_log.elapsed().as_secs() >= 5 {
-                let avg = |total: u64| if t_frames > 0 { total / t_frames } else { 0 };
                 info!(
                     seq = s,
                     block_id,
@@ -801,23 +476,16 @@ async fn run_call(
                     frames_dropped,
                     send_errors,
                     ring_avail = state.capture_ring.available(),
-                    capture_overflows = state.capture_ring.overflow_count(),
-                    avg_agc_us = avg(t_agc_us),
-                    avg_opus_us = avg(t_opus_us),
-                    avg_fec_us = avg(t_fec_us),
-                    avg_send_us = avg(t_send_us),
-                    avg_total_us = avg(t_agc_us + t_opus_us + t_fec_us + t_send_us),
                     "send stats"
                 );
-                t_agc_us = 0; t_opus_us = 0; t_fec_us = 0; t_send_us = 0; t_frames = 0;
                 last_stats_log = Instant::now();
             }
         }
         info!(frames_sent, frames_dropped, send_errors, "send task ended");
     };
 
-    // Pre-allocate decode buffer (max size to handle any incoming codec)
-    let mut decode_buf = vec![0i16; MAX_FRAME_SAMPLES];
+    // Pre-allocate decode buffer
+    let mut decode_buf = vec![0i16; FRAME_SAMPLES];
 
     // Recv task: MediaPackets → FEC decode → Opus decode → playout ring
     let recv_task = async {
@@ -827,29 +495,7 @@ async fn run_call(
         let mut last_recv_instant = Instant::now();
         let mut max_recv_gap_ms: u64 = 0;
         let mut last_stats_log = Instant::now();
-        let mut quality_ctrl = AdaptiveQualityController::new();
-        let mut last_peer_codec: Option<CodecId> = None;
-
-        // Phase 3c: DRED reconstruction state. Unlike the desktop
-        // CallDecoder (which sits behind a jitter buffer that emits
-        // Missing signals), engine.rs reads packets directly from the
-        // transport and decodes straight into the playout ring. Gap
-        // detection is therefore done via sequence-number tracking:
-        // when a packet arrives with seq > expected_seq, the frames in
-        // between are missing and we attempt to reconstruct them via
-        // DRED before decoding the newly-arrived packet.
-        let mut dred_decoder =
-            DredDecoderHandle::new().expect("opus_dred_decoder_create failed");
-        let mut dred_parse_scratch =
-            DredState::new().expect("opus_dred_alloc failed (scratch)");
-        let mut last_good_dred =
-            DredState::new().expect("opus_dred_alloc failed (good state)");
-        let mut last_good_dred_seq: Option<u16> = None;
-        let mut expected_seq: Option<u16> = None;
-        let mut dred_reconstructions: u64 = 0;
-        let mut classical_plc_invocations: u64 = 0;
-
-        info!("recv task started (Opus + DRED + Codec2/RaptorQ)");
+        info!("recv task started (Opus + RaptorQ FEC)");
         loop {
             if !state.running.load(Ordering::Relaxed) {
                 break;
@@ -871,181 +517,20 @@ async fn run_call(
                         );
                     }
 
-                    // Adaptive quality: ingest quality reports from relay
-                    if auto_profile {
-                        if let Some(ref qr) = pkt.quality_report {
-                            if let Some(new_profile) = quality_ctrl.observe(qr) {
-                                let idx = profile_to_index(&new_profile);
-                                info!(
-                                    loss = qr.loss_percent(),
-                                    rtt = qr.rtt_ms(),
-                                    tier = ?quality_ctrl.tier(),
-                                    to = ?new_profile.codec,
-                                    "auto: quality adapter recommends switch"
-                                );
-                                pending_profile_recv.store(idx, Ordering::Release);
-                            }
-                        }
-                    }
-
                     let is_repair = pkt.header.is_repair;
                     let pkt_block = pkt.header.fec_block;
                     let pkt_symbol = pkt.header.fec_symbol;
-                    let pkt_is_opus = pkt.header.codec_id.is_opus();
 
-                    // Phase 2: Opus packets bypass RaptorQ entirely — DRED
-                    // (enabled Phase 1) handles codec-layer loss recovery,
-                    // and feeding these symbols into the RaptorQ decoder
-                    // would accumulate block_id=0 duplicates that never
-                    // decode. Codec2 packets still feed RaptorQ.
-                    if !pkt_is_opus {
+                    // Feed every packet (source + repair) to FEC decoder
                     let _ = fec_dec.add_symbol(
                         pkt_block,
                         pkt_symbol,
                         is_repair,
                         &pkt.payload,
                     );
-                    }
 
                     // Source packets: decode directly
-                    if !is_repair && pkt.header.codec_id != CodecId::ComfortNoise {
-                        // Switch decoder to match incoming codec if different
-                        if pkt.header.codec_id != decoder.codec_id() {
-                            let switch_profile = match pkt.header.codec_id {
-                                CodecId::Opus24k => QualityProfile::GOOD,
-                                CodecId::Opus6k => QualityProfile::DEGRADED,
-                                CodecId::Opus32k => QualityProfile::STUDIO_32K,
-                                CodecId::Opus48k => QualityProfile::STUDIO_48K,
-                                CodecId::Opus64k => QualityProfile::STUDIO_64K,
-                                CodecId::Codec2_1200 => QualityProfile::CATASTROPHIC,
-                                CodecId::Codec2_3200 => QualityProfile {
-                                    codec: CodecId::Codec2_3200,
-                                    fec_ratio: 0.5,
-                                    frame_duration_ms: 20,
-                                    frames_per_block: 5,
-                                },
-                                other => QualityProfile { codec: other, ..QualityProfile::GOOD },
-                            };
-                            info!(from = ?decoder.codec_id(), to = ?pkt.header.codec_id, "recv: switching decoder");
-                            let _ = decoder.set_profile(switch_profile);
-                            // Profile switch invalidates the cached DRED
-                            // state because samples_available is measured
-                            // in the old profile's sample rate. Reset the
-                            // tracking so we don't try to reconstruct with
-                            // stale offsets.
-                            last_good_dred_seq = None;
-                            expected_seq = None;
-                        }
-                        // Track peer codec for UI display
-                        if last_peer_codec != Some(pkt.header.codec_id) {
-                            last_peer_codec = Some(pkt.header.codec_id);
-                            if let Ok(mut stats) = state.stats.lock() {
-                                stats.peer_codec = format!("{:?}", pkt.header.codec_id);
-                            }
-                        }
-
-                        // Phase 3c: Opus path — parse DRED state out of
-                        // the current packet FIRST so last_good_dred
-                        // reflects the freshest available reconstruction
-                        // source, then attempt gap recovery against it
-                        // BEFORE decoding this packet's audio. Ordering
-                        // matters because the playout ring is FIFO — gap
-                        // samples must be written before this packet's
-                        // samples, which come next.
-                        if pkt_is_opus {
-                            // Update DRED state from the current packet.
-                            match dred_decoder.parse_into(&mut dred_parse_scratch, &pkt.payload) {
-                                Ok(available) if available > 0 => {
-                                    std::mem::swap(
-                                        &mut dred_parse_scratch,
-                                        &mut last_good_dred,
-                                    );
-                                    last_good_dred_seq = Some(pkt.header.seq);
-                                }
-                                Ok(_) => {
-                                    // Packet carried no DRED — keep cached state.
-                                }
-                                Err(e) => {
-                                    debug!("DRED parse error (ignored): {e}");
-                                }
-                            }
-
-                            // Detect and fill gap from last-expected to this packet.
-                            const MAX_GAP_FRAMES: u16 = 16;
-                            if let Some(expected) = expected_seq {
-                                let gap = pkt.header.seq.wrapping_sub(expected);
-                                if gap > 0 && gap <= MAX_GAP_FRAMES {
-                                    let current_profile_frame_samples =
-                                        (48_000 * profile.frame_duration_ms as i32) / 1000;
-                                    let available = last_good_dred.samples_available();
-                                    let pcm_slice_len =
-                                        current_profile_frame_samples as usize;
-
-                                    for gap_idx in 0..gap {
-                                        let missing_seq = expected.wrapping_add(gap_idx);
-                                        // Offset from the DRED anchor (last_good_dred_seq)
-                                        // back to the missing seq, in samples. Skip if
-                                        // the anchor is not ahead of missing (defensive).
-                                        let offset_samples = match last_good_dred_seq {
-                                            Some(anchor) => {
-                                                let delta = anchor.wrapping_sub(missing_seq);
-                                                if delta == 0 || delta > MAX_GAP_FRAMES {
-                                                    -1 // skip DRED, use PLC
-                                                } else {
-                                                    delta as i32 * current_profile_frame_samples
-                                                }
-                                            }
-                                            None => -1,
-                                        };
-
-                                        let reconstructed = if offset_samples > 0
-                                            && offset_samples <= available
-                                        {
-                                            decoder
-                                                .reconstruct_from_dred(
-                                                    &last_good_dred,
-                                                    offset_samples,
-                                                    &mut decode_buf[..pcm_slice_len],
-                                                )
-                                                .ok()
-                                        } else {
-                                            None
-                                        };
-
-                                        match reconstructed {
-                                            Some(samples) => {
-                                                playout_agc.process_frame(
-                                                    &mut decode_buf[..samples],
-                                                );
-                                                state
-                                                    .playout_ring
-                                                    .write(&decode_buf[..samples]);
-                                                dred_reconstructions += 1;
-                                                frames_decoded += 1;
-                                            }
-                                            None => {
-                                                // Fall through to classical PLC.
-                                                if let Ok(samples) =
-                                                    decoder.decode_lost(&mut decode_buf)
-                                                {
-                                                    playout_agc
-                                                        .process_frame(&mut decode_buf[..samples]);
-                                                    state
-                                                        .playout_ring
-                                                        .write(&decode_buf[..samples]);
-                                                    classical_plc_invocations += 1;
-                                                    frames_decoded += 1;
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-
-                            // Advance the expected-seq tracker for the next arrival.
-                            expected_seq = Some(pkt.header.seq.wrapping_add(1));
-                        }
-
+                    if !is_repair {
                         match decoder.decode(&pkt.payload, &mut decode_buf) {
                             Ok(samples) => {
                                 playout_agc.process_frame(&mut decode_buf[..samples]);
@@ -1057,21 +542,12 @@ async fn run_call(
                                 if let Ok(samples) = decoder.decode_lost(&mut decode_buf) {
                                     playout_agc.process_frame(&mut decode_buf[..samples]);
                                     state.playout_ring.write(&decode_buf[..samples]);
-                                    // This is a decode-error fallback (not a
-                                    // detected gap), so count it as PLC.
-                                    classical_plc_invocations += 1;
                                 }
                             }
                         }
                     }
 
-                    // Codec2-only: try FEC recovery and expire old blocks.
-                    // Opus packets skip both — the Phase 2 Opus path has no
-                    // RaptorQ state to query or clean up. The `fec_recovered`
-                    // counter is now effectively Codec2-only, which is
-                    // correct because DRED reconstructions will be counted
-                    // separately once Phase 3 lands (new telemetry field).
-                    if !pkt_is_opus {
+                    // Try FEC recovery
                     if let Ok(Some(recovered_frames)) = fec_dec.try_decode(pkt_block) {
                         fec_recovered += recovered_frames.len() as u64;
                         if fec_recovered % 50 == 1 {
@@ -1088,13 +564,10 @@ async fn run_call(
                     if pkt_block > 3 {
                         fec_dec.expire_before(pkt_block.wrapping_sub(3));
                     }
-                    }
 
                     let mut stats = state.stats.lock().unwrap();
                     stats.frames_decoded = frames_decoded;
                     stats.fec_recovered = fec_recovered;
-                    stats.dred_reconstructions = dred_reconstructions;
-                    stats.classical_plc_invocations = classical_plc_invocations;
                     drop(stats);
 
                     // Periodic stats every 5 seconds
@@ -1102,13 +575,9 @@ async fn run_call(
                         info!(
                             frames_decoded,
                             fec_recovered,
-                            dred_reconstructions,
-                            classical_plc_invocations,
                             recv_errors,
                             max_recv_gap_ms,
                             playout_avail = state.playout_ring.available(),
-                            playout_overflows = state.playout_ring.overflow_count(),
-                            playout_underruns = state.playout_ring.underrun_count(),
                             "recv stats"
                         );
                         max_recv_gap_ms = 0;
@@ -1174,7 +643,6 @@ async fn run_call(
                         .map(|p| crate::stats::RoomMember {
                             fingerprint: p.fingerprint.clone(),
                             alias: p.alias.clone(),
-                            relay_label: p.relay_label.clone(),
                         })
                         .collect();
                     let mut stats = state_signal.stats.lock().unwrap();

crates/wzp-android/src/jni_bridge.rs

@@ -21,24 +21,11 @@ unsafe fn handle_ref(handle: jlong) -> &'static mut EngineHandle {
     unsafe { &mut *(handle as *mut EngineHandle) }
 }
 
-/// 7 = auto (use relay's chosen profile)
-const PROFILE_AUTO: jint = 7;
-
 fn profile_from_int(value: jint) -> QualityProfile {
     match value {
-        0 => QualityProfile::GOOD,            // Opus 24k
-        1 => QualityProfile::DEGRADED,        // Opus 6k
-        2 => QualityProfile::CATASTROPHIC,    // Codec2 1.2k
-        3 => QualityProfile {                 // Codec2 3.2k
-            codec: wzp_proto::CodecId::Codec2_3200,
-            fec_ratio: 0.5,
-            frame_duration_ms: 20,
-            frames_per_block: 5,
-        },
-        4 => QualityProfile::STUDIO_32K,      // Opus 32k
-        5 => QualityProfile::STUDIO_48K,      // Opus 48k
-        6 => QualityProfile::STUDIO_64K,      // Opus 64k
-        _ => QualityProfile::GOOD,            // auto falls back to GOOD
+        1 => QualityProfile::DEGRADED,
+        2 => QualityProfile::CATASTROPHIC,
+        _ => QualityProfile::GOOD,
     }
 }
 
@@ -48,26 +35,12 @@ static INIT_LOGGING: Once = Once::new();
 /// Safe to call multiple times — only the first call takes effect.
 fn init_logging() {
     INIT_LOGGING.call_once(|| {
-        // Wrap in catch_unwind — sharded_slab allocation inside
-        // tracing_subscriber::registry() can crash on some Android
-        // devices if scudo malloc fails during early initialization.
-        let _ = std::panic::catch_unwind(|| {
         use tracing_subscriber::layer::SubscriberExt;
         use tracing_subscriber::util::SubscriberInitExt;
-            use tracing_subscriber::EnvFilter;
         if let Ok(layer) = tracing_android::layer("wzp_android") {
-                // Filter: INFO for our crates, WARN for everything else.
-                // The jni crate emits VERBOSE logs for every method lookup
-                // (~10 lines per JNI call, 100+ calls/sec) which floods logcat
-                // and causes the system to kill the app.
-                let filter = EnvFilter::new("warn,wzp_android=info,wzp_proto=info,wzp_transport=info,wzp_codec=info,wzp_fec=info,wzp_crypto=info");
-                let _ = tracing_subscriber::registry()
-                    .with(layer)
-                    .with(filter)
-                    .try_init();
+            let _ = tracing_subscriber::registry().with(layer).try_init();
         }
     });
-    });
 }
 
 #[unsafe(no_mangle)]
@@ -98,7 +71,6 @@ pub unsafe extern "system" fn Java_com_wzp_engine_WzpEngine_nativeStartCall(
     seed_hex_j: JString,
     token_j: JString,
     alias_j: JString,
-    profile_j: jint,
 ) -> jint {
     let result = panic::catch_unwind(panic::AssertUnwindSafe(|| {
         let relay_addr: String = env.get_string(&relay_addr_j).map(|s| s.into()).unwrap_or_default();
@@ -124,8 +96,7 @@ pub unsafe extern "system" fn Java_com_wzp_engine_WzpEngine_nativeStartCall(
         }
 
         let config = CallStartConfig {
-            profile: profile_from_int(profile_j),
-            auto_profile: profile_j == PROFILE_AUTO,
+            profile: QualityProfile::GOOD,
             relay_addr,
             room,
             auth_token: if token.is_empty() { Vec::new() } else { token.into_bytes() },
@@ -238,6 +209,7 @@ pub unsafe extern "system" fn Java_com_wzp_engine_WzpEngine_nativeWriteAudio(
             return 0;
         }
         let mut buf = vec![0i16; len];
+        // GetShortArrayRegion copies Java array into our buffer
         if env.get_short_array_region(&pcm, 0, &mut buf).is_err() {
             return 0;
         }
@@ -271,56 +243,6 @@ pub unsafe extern "system" fn Java_com_wzp_engine_WzpEngine_nativeReadAudio(
     result.unwrap_or(0)
 }
 
-/// Write captured PCM from a DirectByteBuffer — zero JNI array copies.
-/// The ByteBuffer must contain little-endian i16 samples.
-/// Called from the AudioRecord capture thread.
-#[unsafe(no_mangle)]
-pub unsafe extern "system" fn Java_com_wzp_engine_WzpEngine_nativeWriteAudioDirect(
-    env: JNIEnv,
-    _class: JClass,
-    handle: jlong,
-    buffer: jni::objects::JByteBuffer,
-    sample_count: jint,
-) -> jint {
-    let result = panic::catch_unwind(panic::AssertUnwindSafe(|| {
-        let h = unsafe { handle_ref(handle) };
-        let ptr = env.get_direct_buffer_address(&buffer).unwrap_or(std::ptr::null_mut());
-        if ptr.is_null() || sample_count <= 0 {
-            return 0;
-        }
-        let samples = unsafe {
-            std::slice::from_raw_parts(ptr as *const i16, sample_count as usize)
-        };
-        h.engine.write_audio(samples) as jint
-    }));
-    result.unwrap_or(0)
-}
-
-/// Read decoded PCM into a DirectByteBuffer — zero JNI array copies.
-/// The ByteBuffer will be filled with little-endian i16 samples.
-/// Called from the AudioTrack playout thread.
-#[unsafe(no_mangle)]
-pub unsafe extern "system" fn Java_com_wzp_engine_WzpEngine_nativeReadAudioDirect(
-    env: JNIEnv,
-    _class: JClass,
-    handle: jlong,
-    buffer: jni::objects::JByteBuffer,
-    max_samples: jint,
-) -> jint {
-    let result = panic::catch_unwind(panic::AssertUnwindSafe(|| {
-        let h = unsafe { handle_ref(handle) };
-        let ptr = env.get_direct_buffer_address(&buffer).unwrap_or(std::ptr::null_mut());
-        if ptr.is_null() || max_samples <= 0 {
-            return 0;
-        }
-        let samples = unsafe {
-            std::slice::from_raw_parts_mut(ptr as *mut i16, max_samples as usize)
-        };
-        h.engine.read_audio(samples) as jint
-    }));
-    result.unwrap_or(0)
-}
-
 #[unsafe(no_mangle)]
 pub unsafe extern "system" fn Java_com_wzp_engine_WzpEngine_nativeDestroy(
     _env: JNIEnv,
@@ -332,116 +254,3 @@ pub unsafe extern "system" fn Java_com_wzp_engine_WzpEngine_nativeDestroy(
         drop(h);
     }));
 }
-
-/// Ping a relay server — instance method, requires engine handle.
-/// Returns JSON `{"rtt_ms":N,"server_fingerprint":"hex"}` or null on failure.
-#[unsafe(no_mangle)]
-pub unsafe extern "system" fn Java_com_wzp_engine_WzpEngine_nativePingRelay<'a>(
-    mut env: JNIEnv<'a>,
-    _class: JClass,
-    handle: jlong,
-    relay_j: JString,
-) -> jstring {
-    let result = panic::catch_unwind(panic::AssertUnwindSafe(|| {
-        let h = unsafe { handle_ref(handle) };
-        let relay: String = env.get_string(&relay_j).map(|s| s.into()).unwrap_or_default();
-        match h.engine.ping_relay(&relay) {
-            Ok(json) => Some(json),
-            Err(_) => None,
-        }
-    }));
-
-    let json = match result {
-        Ok(Some(s)) => s,
-        _ => return JObject::null().into_raw(),
-    };
-    env.new_string(&json)
-        .map(|s| s.into_raw())
-        .unwrap_or(JObject::null().into_raw())
-}
-
-// ── Direct calling JNI functions ──
-
-/// Start persistent signaling connection to relay for direct calls.
-/// Returns 0 on success, -1 on error.
-#[unsafe(no_mangle)]
-pub unsafe extern "system" fn Java_com_wzp_engine_WzpEngine_nativeStartSignaling<'a>(
-    mut env: JNIEnv<'a>,
-    _class: JClass,
-    handle: jlong,
-    relay_addr_j: JString,
-    seed_hex_j: JString,
-    token_j: JString,
-    alias_j: JString,
-) -> jint {
-    let result = panic::catch_unwind(panic::AssertUnwindSafe(|| {
-        let h = unsafe { handle_ref(handle) };
-        let relay_addr: String = env.get_string(&relay_addr_j).map(|s| s.into()).unwrap_or_default();
-        let seed_hex: String = env.get_string(&seed_hex_j).map(|s| s.into()).unwrap_or_default();
-        let token: String = env.get_string(&token_j).map(|s| s.into()).unwrap_or_default();
-        let alias: String = env.get_string(&alias_j).map(|s| s.into()).unwrap_or_default();
-
-        h.engine.start_signaling(
-            &relay_addr,
-            &seed_hex,
-            if token.is_empty() { None } else { Some(&token) },
-            if alias.is_empty() { None } else { Some(&alias) },
-        )
-    }));
-
-    match result {
-        Ok(Ok(())) => 0,
-        Ok(Err(e)) => { error!("start_signaling failed: {e}"); -1 }
-        Err(_) => { error!("start_signaling panicked"); -1 }
-    }
-}
-
-/// Place a direct call to a target fingerprint.
-/// Returns 0 on success, -1 on error.
-#[unsafe(no_mangle)]
-pub unsafe extern "system" fn Java_com_wzp_engine_WzpEngine_nativePlaceCall<'a>(
-    mut env: JNIEnv<'a>,
-    _class: JClass,
-    handle: jlong,
-    target_fp_j: JString,
-) -> jint {
-    let result = panic::catch_unwind(panic::AssertUnwindSafe(|| {
-        let h = unsafe { handle_ref(handle) };
-        let target: String = env.get_string(&target_fp_j).map(|s| s.into()).unwrap_or_default();
-        h.engine.place_call(&target)
-    }));
-
-    match result {
-        Ok(Ok(())) => 0,
-        Ok(Err(e)) => { error!("place_call failed: {e}"); -1 }
-        Err(_) => { error!("place_call panicked"); -1 }
-    }
-}
-
-/// Answer an incoming direct call.
-/// mode: 0=Reject, 1=AcceptTrusted, 2=AcceptGeneric
-#[unsafe(no_mangle)]
-pub unsafe extern "system" fn Java_com_wzp_engine_WzpEngine_nativeAnswerCall<'a>(
-    mut env: JNIEnv<'a>,
-    _class: JClass,
-    handle: jlong,
-    call_id_j: JString,
-    mode: jint,
-) -> jint {
-    let result = panic::catch_unwind(panic::AssertUnwindSafe(|| {
-        let h = unsafe { handle_ref(handle) };
-        let call_id: String = env.get_string(&call_id_j).map(|s| s.into()).unwrap_or_default();
-        let accept_mode = match mode {
-            0 => wzp_proto::CallAcceptMode::Reject,
-            1 => wzp_proto::CallAcceptMode::AcceptTrusted,
-            _ => wzp_proto::CallAcceptMode::AcceptGeneric,
-        };
-        h.engine.answer_call(&call_id, accept_mode)
-    }));
-
-    match result {
-        Ok(Ok(())) => 0,
-        Ok(Err(e)) => { error!("answer_call failed: {e}"); -1 }
-        Err(_) => { error!("answer_call panicked"); -1 }
-    }
-}

crates/wzp-android/src/lib.rs

@@ -8,19 +8,6 @@
 //!
 //! On non-Android targets, the Oboe C++ layer compiles as a stub,
 //! allowing `cargo check` and unit tests on the host.
-//!
-//! ## Status
-//!
-//! **Dead code as of the Tauri mobile rewrite.** The legacy Kotlin+JNI
-//! Android app that consumed this crate was replaced by a Tauri 2.x
-//! Mobile app (see `desktop/src-tauri/src/engine.rs` for the live
-//! Android audio recv path and `crates/wzp-native/` for the Oboe
-//! bridge). We keep this crate in the workspace for reference and to
-//! preserve the commit history, but it is not built by any shipping
-//! target. Allow the accumulated leftover warnings so CI/workspace
-//! checks stay clean — any real cleanup should happen as part of
-//! removing the crate entirely, not piecemeal.
-#![allow(dead_code, unused_imports, unused_variables, unused_mut)]
 
 pub mod audio_android;
 pub mod audio_ring;

crates/wzp-android/src/stats.rs

@@ -11,12 +11,6 @@ pub enum CallState {
     Active,
     Reconnecting,
     Closed,
-    /// Connected to relay signal channel, registered for direct calls.
-    Registered,
-    /// Outgoing call ringing on callee's side.
-    Ringing,
-    /// Incoming call received, waiting for user to accept/reject.
-    IncomingCall,
 }
 
 impl serde::Serialize for CallState {
@@ -27,9 +21,6 @@ impl serde::Serialize for CallState {
             CallState::Active => 2,
             CallState::Reconnecting => 3,
             CallState::Closed => 4,
-            CallState::Registered => 5,
-            CallState::Ringing => 6,
-            CallState::IncomingCall => 7,
         };
         serializer.serialize_u8(n)
     }
@@ -58,46 +49,14 @@ pub struct CallStats {
     pub frames_decoded: u64,
     /// Number of playout underruns (buffer empty when audio needed).
     pub underruns: u64,
-    /// Frames recovered by RaptorQ FEC (Codec2 tiers only; Opus bypasses
-    /// RaptorQ per Phase 2).
+    /// Frames recovered by FEC.
     pub fec_recovered: u64,
-    /// Phase 3c: Opus frames reconstructed via DRED side-channel data.
-    /// Only increments on the Opus tiers; always zero for Codec2.
-    pub dred_reconstructions: u64,
-    /// Phase 3c: Opus frames filled via classical Opus PLC because no DRED
-    /// state covered the gap, plus any decode-error fallbacks. Codec2 loss
-    /// also increments this counter via the Codec2 PLC path.
-    pub classical_plc_invocations: u64,
-    /// Playout ring overflow count (reader was lapped by writer).
-    pub playout_overflows: u64,
-    /// Playout ring underrun count (reader found empty buffer).
-    pub playout_underruns: u64,
-    /// Capture ring overflow count.
-    pub capture_overflows: u64,
     /// Current mic audio level (RMS of i16 samples, 0-32767).
     pub audio_level: u32,
-    /// Our current outgoing codec name (e.g. "Opus24k", "Codec2_1200").
-    pub current_codec: String,
-    /// Last seen incoming codec from other participants.
-    pub peer_codec: String,
-    /// Whether auto quality mode is active.
-    pub auto_mode: bool,
     /// Number of participants in the room (from last RoomUpdate).
     pub room_participant_count: u32,
     /// Participant list (fingerprint + optional alias) serialized as JSON array.
     pub room_participants: Vec<RoomMember>,
-    /// SAS code for verbal verification (None if not in a call).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub sas_code: Option<u32>,
-    /// Incoming call info (present when state == IncomingCall).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub incoming_call_id: Option<String>,
-    /// Fingerprint of the caller (present when state == IncomingCall).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub incoming_caller_fp: Option<String>,
-    /// Alias of the caller (present when state == IncomingCall).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub incoming_caller_alias: Option<String>,
 }
 
 /// A room member entry, serialized into the stats JSON.
@@ -105,5 +64,4 @@ pub struct CallStats {
 pub struct RoomMember {
     pub fingerprint: String,
     pub alias: Option<String>,
-    pub relay_label: Option<String>,
 }

crates/wzp-client/Cargo.toml

@@ -23,71 +23,13 @@ serde_json = "1"
 chrono = "0.4"
 rustls = { version = "0.23", default-features = false, features = ["ring", "std"] }
 cpal = { version = "0.15", optional = true }
-libc = "0.2"
-
-# coreaudio-rs is Apple-framework-only; gate it to macOS so enabling
-# the `vpio` feature from a non-macOS target builds cleanly instead of
-# pulling in a crate that can only link against Apple frameworks.
-[target.'cfg(target_os = "macos")'.dependencies]
 coreaudio-rs = { version = "0.11", optional = true }
-
-# Windows-only: direct WASAPI bindings for the `windows-aec` feature.
-# `windows` is Microsoft's official Rust COM bindings crate. We pull in
-# only the audio + COM subfeatures we need — the crate is organized as
-# a massive optional-feature tree, so enabling just these keeps compile
-# times reasonable (~5s for these features vs ~60s for the full crate).
-[target.'cfg(target_os = "windows")'.dependencies]
-windows = { version = "0.58", optional = true, features = [
-    "Win32_Foundation",
-    "Win32_Media_Audio",
-    "Win32_Security",
-    "Win32_System_Com",
-    "Win32_System_Com_StructuredStorage",
-    "Win32_System_Threading",
-    "Win32_System_Variant",
-] }
-
-# Linux-only: WebRTC AEC (Audio Processing Module) bindings for the
-# `linux-aec` feature. This is the 0.3.x line of the `tonarino/
-# webrtc-audio-processing` crate, which links against Debian's
-# `libwebrtc-audio-processing-dev` apt package (0.3-1+b1 on Bookworm).
-#
-# Note: we attempted the 2.x line with its `bundled` sub-feature first
-# (which would give us AEC3 instead of AEC2), but both the crates.io
-# tarball AND the upstream git `main` branch of webrtc-audio-processing-sys
-# 2.0.3 hit a `meson setup --reconfigure` bug where the build.rs passes
-# --reconfigure unconditionally even on first-run empty build dirs,
-# causing the bundled build to fail with "Directory does not contain a
-# valid build tree". The 0.x line doesn't use bundled mode and sidesteps
-# this entirely by linking the apt-provided library. AEC2 is older than
-# AEC3 but still the same algorithm family — this is what PulseAudio's
-# module-echo-cancel and PipeWire's filter-chain use by default on
-# current Debian-family distros.
-[target.'cfg(target_os = "linux")'.dependencies]
-webrtc-audio-processing = { version = "0.3", optional = true }
+libc = "0.2"
 
 [features]
 default = []
 audio = ["cpal"]
-# vpio enables coreaudio-rs but that dep is itself gated to macOS above,
-# so enabling this feature on Windows/Linux is a no-op (the audio_vpio
-# module is also #[cfg(target_os = "macos")] in lib.rs).
-vpio = ["dep:coreaudio-rs"]
-# windows-aec enables a direct WASAPI capture backend that opens the
-# microphone under AudioCategory_Communications, turning on Windows's
-# OS-level communications audio processing (AEC + noise suppression +
-# AGC). The `windows` dep is itself target-gated to Windows above, so
-# enabling this feature on non-Windows targets is a no-op (the
-# audio_wasapi module is also #[cfg(target_os = "windows")] in lib.rs).
-windows-aec = ["dep:windows"]
-# linux-aec enables a CPAL + WebRTC AEC3 capture/playback backend that
-# runs the WebRTC Audio Processing Module (same algo as Chrome / Zoom /
-# Teams) in-process, using the playback PCM as the reference signal for
-# echo cancellation. The webrtc-audio-processing dep is target-gated to
-# Linux above, so enabling this feature on non-Linux targets is a no-op
-# (the audio_linux_aec module is also #[cfg(target_os = "linux")] in
-# lib.rs).
-linux-aec = ["dep:webrtc-audio-processing"]
+vpio = ["coreaudio-rs"]
 
 [[bin]]
 name = "wzp-client"

crates/wzp-client/src/audio_linux_aec.rs

@@ -1,537 +0,0 @@
-//! Linux AEC backend: CPAL capture + playback wired through the WebRTC Audio
-//! Processing Module (AEC3 + noise suppression + high-pass filter).
-//!
-//! This is the same algorithm used by Chrome WebRTC, Zoom, Teams, Jitsi, and
-//! any other "serious" Linux VoIP app. It runs in-process — no dependency on
-//! PulseAudio's module-echo-cancel or PipeWire's filter-chain, so it works
-//! identically on ALSA / PulseAudio / PipeWire systems.
-//!
-//! ## Architecture
-//!
-//! A single module-level `Arc<Mutex<Processor>>` is shared between the
-//! capture and playback paths. On each 20 ms frame (960 samples @ 48 kHz
-//! mono):
-//!
-//! - **Playback path**: `LinuxAecPlayback::start` spawns the usual CPAL
-//!   output thread, but wraps each chunk in a call to
-//!   `Processor::process_render_frame` **before** handing it to CPAL. That
-//!   gives APM an authoritative reference of exactly what's going out to
-//!   the speakers (same approach Zoom/Teams/Jitsi use). The AEC then knows
-//!   what to cancel when it sees echo in the capture stream.
-//!
-//! - **Capture path**: `LinuxAecCapture::start` spawns the usual CPAL
-//!   input thread, and runs `Processor::process_capture_frame` on each
-//!   incoming mic chunk **in place** before pushing it into the ring
-//!   buffer. The AEC subtracts the echo using the render reference it
-//!   saw on the playback side.
-//!
-//! APM is strict about frame size: it requires exactly 10 ms = 480 samples
-//! per call at 48 kHz. Our pipeline uses 20 ms = 960 samples, so each 20 ms
-//! frame is split into two 480-sample halves, APM is called twice, and the
-//! halves are stitched back together.
-//!
-//! APM only accepts f32 samples in `[-1.0, 1.0]`, so we convert i16 → f32
-//! before the call and f32 → i16 after (with clamping on the return path).
-//!
-//! ## Stream delay
-//!
-//! AEC needs to know roughly how long it takes between a sample being passed
-//! to `process_render_frame` and its echo showing up at `process_capture_frame`
-//! — i.e. the round trip through CPAL playback → speaker → air → microphone
-//! → CPAL capture. AEC3's internal estimator tracks this within a window
-//! around whatever hint we give it. We hardcode 60 ms as a reasonable
-//! starting point for typical Linux audio stacks; the delay estimator does
-//! the fine-tuning automatically.
-//!
-//! ## Thread safety
-//!
-//! The 0.3.x line of `webrtc-audio-processing` takes `&mut self` on both
-//! `process_capture_frame` and `process_render_frame`, so the `Processor`
-//! needs a `Mutex` around it for cross-thread sharing. The capture and
-//! playback threads each acquire the lock briefly (sub-millisecond per
-//! 10 ms frame) so contention is minimal at our frame rates.
-
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::{Arc, Mutex, OnceLock};
-
-use anyhow::{anyhow, Context};
-use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
-use cpal::{SampleFormat, SampleRate, StreamConfig};
-use tracing::{info, warn};
-use webrtc_audio_processing::{
-    Config, EchoCancellation, EchoCancellationSuppressionLevel, InitializationConfig,
-    NoiseSuppression, NoiseSuppressionLevel, Processor, NUM_SAMPLES_PER_FRAME,
-};
-
-use crate::audio_ring::AudioRing;
-
-/// 20 ms at 48 kHz, mono — matches the rest of the pipeline and the codec.
-pub const FRAME_SAMPLES: usize = 960;
-/// APM requires strict 10 ms frames at 48 kHz = 480 samples per call.
-/// Imported from the webrtc-audio-processing crate so we can't drift out
-/// of sync with whatever sample rate / frame length the C++ lib is using.
-const APM_FRAME_SAMPLES: usize = NUM_SAMPLES_PER_FRAME as usize;
-const APM_NUM_CHANNELS: usize = 1;
-/// Round-trip delay hint passed to APM; the estimator refines from here.
-/// 60 ms is a reasonable default for CPAL on ALSA / PulseAudio / PipeWire.
-#[allow(dead_code)]
-const STREAM_DELAY_MS: i32 = 60;
-
-// ---------------------------------------------------------------------------
-// Shared APM instance
-// ---------------------------------------------------------------------------
-
-/// Module-level lazily-initialized APM. Shared between capture and playback
-/// so they operate on the same echo-cancellation state — the render frames
-/// pushed by playback are what the capture path subtracts from the mic input.
-/// Wrapped in a Mutex because the 0.3.x Processor takes `&mut self` on both
-/// process_capture_frame and process_render_frame.
-static PROCESSOR: OnceLock<Arc<Mutex<Processor>>> = OnceLock::new();
-
-fn get_or_init_processor() -> anyhow::Result<Arc<Mutex<Processor>>> {
-    if let Some(p) = PROCESSOR.get() {
-        return Ok(p.clone());
-    }
-    let init_config = InitializationConfig {
-        num_capture_channels: APM_NUM_CHANNELS as i32,
-        num_render_channels: APM_NUM_CHANNELS as i32,
-        ..Default::default()
-    };
-    let mut processor = Processor::new(&init_config)
-        .map_err(|e| anyhow!("webrtc APM init failed: {e:?}"))?;
-
-    let config = Config {
-        echo_cancellation: Some(EchoCancellation {
-            suppression_level: EchoCancellationSuppressionLevel::High,
-            stream_delay_ms: Some(STREAM_DELAY_MS),
-            enable_delay_agnostic: true,
-            enable_extended_filter: true,
-        }),
-        noise_suppression: Some(NoiseSuppression {
-            suppression_level: NoiseSuppressionLevel::High,
-        }),
-        enable_high_pass_filter: true,
-        // AGC left off for now — it can fight the Opus encoder's own gain
-        // staging and the adaptive-quality controller. Add later if users
-        // report low mic levels.
-        ..Default::default()
-    };
-    processor.set_config(config);
-
-    let arc = Arc::new(Mutex::new(processor));
-    let _ = PROCESSOR.set(arc.clone());
-    info!(
-        stream_delay_ms = STREAM_DELAY_MS,
-        "webrtc APM initialized (AEC High + NS High + HPF, AGC off)"
-    );
-    Ok(arc)
-}
-
-// ---------------------------------------------------------------------------
-// Helpers: i16 ↔ f32 and APM frame processing
-// ---------------------------------------------------------------------------
-
-#[inline]
-fn i16_to_f32(s: i16) -> f32 {
-    s as f32 / 32768.0
-}
-
-#[inline]
-fn f32_to_i16(s: f32) -> i16 {
-    (s.clamp(-1.0, 1.0) * 32767.0) as i16
-}
-
-/// Feed a 20 ms (960-sample) playback frame to APM as the render reference.
-/// Splits into two 10 ms halves because APM is strict about frame size.
-/// Takes the Mutex-wrapped Processor and locks briefly around each call.
-fn push_render_frame_20ms(apm: &Mutex<Processor>, pcm: &[i16]) {
-    debug_assert_eq!(pcm.len(), FRAME_SAMPLES);
-    let mut buf = [0f32; APM_FRAME_SAMPLES];
-    for half in pcm.chunks_exact(APM_FRAME_SAMPLES) {
-        for (i, &s) in half.iter().enumerate() {
-            buf[i] = i16_to_f32(s);
-        }
-        match apm.lock() {
-            Ok(mut p) => {
-                if let Err(e) = p.process_render_frame(&mut buf) {
-                    warn!("webrtc APM process_render_frame failed: {e:?}");
-                }
-            }
-            Err(_) => {
-                warn!("webrtc APM mutex poisoned in render path");
-                return;
-            }
-        }
-    }
-}
-
-/// Run a 20 ms (960-sample) capture frame through APM's echo cancellation
-/// in place. Splits into two 10 ms halves, runs APM on each, stitches
-/// results back into the caller's buffer. Briefly holds the Mutex once
-/// per 10 ms half.
-fn process_capture_frame_20ms(apm: &Mutex<Processor>, pcm: &mut [i16]) {
-    debug_assert_eq!(pcm.len(), FRAME_SAMPLES);
-    let mut buf = [0f32; APM_FRAME_SAMPLES];
-    for half in pcm.chunks_exact_mut(APM_FRAME_SAMPLES) {
-        for (i, &s) in half.iter().enumerate() {
-            buf[i] = i16_to_f32(s);
-        }
-        match apm.lock() {
-            Ok(mut p) => {
-                if let Err(e) = p.process_capture_frame(&mut buf) {
-                    warn!("webrtc APM process_capture_frame failed: {e:?}");
-                }
-            }
-            Err(_) => {
-                warn!("webrtc APM mutex poisoned in capture path");
-                return;
-            }
-        }
-        for (i, d) in half.iter_mut().enumerate() {
-            *d = f32_to_i16(buf[i]);
-        }
-    }
-}
-
-// ---------------------------------------------------------------------------
-// LinuxAecCapture — CPAL mic + WebRTC AEC capture-side processing
-// ---------------------------------------------------------------------------
-
-/// Microphone capture with WebRTC AEC3 applied in place before the codec
-/// sees the samples. Mirrors the public API of `audio_io::AudioCapture` so
-/// downstream code doesn't change.
-pub struct LinuxAecCapture {
-    ring: Arc<AudioRing>,
-    running: Arc<AtomicBool>,
-}
-
-impl LinuxAecCapture {
-    pub fn start() -> Result<Self, anyhow::Error> {
-        // Eagerly init the APM so the playback side can find it already
-        // configured, and so init errors surface on the caller thread
-        // instead of silently failing inside the capture thread.
-        let apm = get_or_init_processor()?;
-
-        let ring = Arc::new(AudioRing::new());
-        let running = Arc::new(AtomicBool::new(true));
-
-        let (init_tx, init_rx) = std::sync::mpsc::sync_channel::<Result<(), String>>(1);
-
-        let ring_cb = ring.clone();
-        let running_clone = running.clone();
-        let apm_capture = apm.clone();
-
-        std::thread::Builder::new()
-            .name("wzp-audio-capture-linuxaec".into())
-            .spawn(move || {
-                let result = (|| -> Result<(), anyhow::Error> {
-                    let host = cpal::default_host();
-                    let device = host
-                        .default_input_device()
-                        .ok_or_else(|| anyhow!("no default input audio device found"))?;
-                    info!(device = %device.name().unwrap_or_default(), "LinuxAEC: using input device");
-
-                    let config = StreamConfig {
-                        channels: 1,
-                        sample_rate: SampleRate(48_000),
-                        buffer_size: cpal::BufferSize::Default,
-                    };
-
-                    let use_f32 = !supports_i16_input(&device)?;
-
-                    let err_cb = |e: cpal::StreamError| {
-                        warn!("LinuxAEC input stream error: {e}");
-                    };
-
-                    // Leftover buffer for when CPAL gives us partial frames.
-                    // We need exactly 960-sample chunks to feed APM.
-                    let leftover = std::sync::Mutex::new(Vec::<i16>::with_capacity(FRAME_SAMPLES * 4));
-
-                    let stream = if use_f32 {
-                        let ring = ring_cb.clone();
-                        let running = running_clone.clone();
-                        let apm = apm_capture.clone();
-                        device.build_input_stream(
-                            &config,
-                            move |data: &[f32], _: &cpal::InputCallbackInfo| {
-                                if !running.load(Ordering::Relaxed) {
-                                    return;
-                                }
-                                let mut lv = leftover.lock().unwrap();
-                                lv.reserve(data.len());
-                                for &s in data {
-                                    lv.push(f32_to_i16(s));
-                                }
-                                drain_frames_through_apm(&mut lv, &apm, &ring);
-                            },
-                            err_cb,
-                            None,
-                        )?
-                    } else {
-                        let ring = ring_cb.clone();
-                        let running = running_clone.clone();
-                        let apm = apm_capture.clone();
-                        device.build_input_stream(
-                            &config,
-                            move |data: &[i16], _: &cpal::InputCallbackInfo| {
-                                if !running.load(Ordering::Relaxed) {
-                                    return;
-                                }
-                                let mut lv = leftover.lock().unwrap();
-                                lv.extend_from_slice(data);
-                                drain_frames_through_apm(&mut lv, &apm, &ring);
-                            },
-                            err_cb,
-                            None,
-                        )?
-                    };
-
-                    stream.play().context("failed to start LinuxAEC input stream")?;
-                    let _ = init_tx.send(Ok(()));
-                    info!("LinuxAEC capture started (AEC3 active)");
-
-                    while running_clone.load(Ordering::Relaxed) {
-                        std::thread::park_timeout(std::time::Duration::from_millis(200));
-                    }
-                    drop(stream);
-                    Ok(())
-                })();
-
-                if let Err(e) = result {
-                    let _ = init_tx.send(Err(e.to_string()));
-                }
-            })?;
-
-        init_rx
-            .recv()
-            .map_err(|_| anyhow!("LinuxAEC capture thread exited before signaling"))?
-            .map_err(|e| anyhow!("{e}"))?;
-
-        Ok(Self { ring, running })
-    }
-
-    pub fn ring(&self) -> &Arc<AudioRing> {
-        &self.ring
-    }
-
-    pub fn stop(&self) {
-        self.running.store(false, Ordering::Relaxed);
-    }
-}
-
-impl Drop for LinuxAecCapture {
-    fn drop(&mut self) {
-        self.stop();
-    }
-}
-
-/// Pull whole 960-sample frames out of the leftover buffer, run them through
-/// APM's capture-side processing, and push to the ring. Leaves any partial
-/// sub-960 remainder in `leftover` for the next callback.
-fn drain_frames_through_apm(leftover: &mut Vec<i16>, apm: &Mutex<Processor>, ring: &AudioRing) {
-    let mut frame = [0i16; FRAME_SAMPLES];
-    while leftover.len() >= FRAME_SAMPLES {
-        frame.copy_from_slice(&leftover[..FRAME_SAMPLES]);
-        process_capture_frame_20ms(apm, &mut frame);
-        ring.write(&frame);
-        leftover.drain(..FRAME_SAMPLES);
-    }
-}
-
-// ---------------------------------------------------------------------------
-// LinuxAecPlayback — CPAL speaker output + WebRTC AEC render-side tee
-// ---------------------------------------------------------------------------
-
-/// Speaker playback with a render-side tee: each frame written to CPAL is
-/// ALSO fed to APM via `process_render_frame` as the echo-cancellation
-/// reference signal. This is the "tee the playback ring" approach (Zoom,
-/// Teams, Jitsi) — deterministic, does not depend on PulseAudio loopback or
-/// PipeWire monitor sources.
-pub struct LinuxAecPlayback {
-    ring: Arc<AudioRing>,
-    running: Arc<AtomicBool>,
-}
-
-impl LinuxAecPlayback {
-    pub fn start() -> Result<Self, anyhow::Error> {
-        let apm = get_or_init_processor()?;
-
-        let ring = Arc::new(AudioRing::new());
-        let running = Arc::new(AtomicBool::new(true));
-
-        let (init_tx, init_rx) = std::sync::mpsc::sync_channel::<Result<(), String>>(1);
-
-        let ring_cb = ring.clone();
-        let running_clone = running.clone();
-        let apm_render = apm.clone();
-
-        std::thread::Builder::new()
-            .name("wzp-audio-playback-linuxaec".into())
-            .spawn(move || {
-                let result = (|| -> Result<(), anyhow::Error> {
-                    let host = cpal::default_host();
-                    let device = host
-                        .default_output_device()
-                        .ok_or_else(|| anyhow!("no default output audio device found"))?;
-                    info!(device = %device.name().unwrap_or_default(), "LinuxAEC: using output device");
-
-                    let config = StreamConfig {
-                        channels: 1,
-                        sample_rate: SampleRate(48_000),
-                        buffer_size: cpal::BufferSize::Default,
-                    };
-
-                    let use_f32 = !supports_i16_output(&device)?;
-
-                    let err_cb = |e: cpal::StreamError| {
-                        warn!("LinuxAEC output stream error: {e}");
-                    };
-
-                    // Same 960-sample batching approach as the capture side:
-                    // CPAL may ask for N samples in a callback where N doesn't
-                    // divide 960. We accumulate partial frames in a Vec and
-                    // feed APM as soon as we have a whole 20 ms frame.
-                    let carry = std::sync::Mutex::new(Vec::<i16>::with_capacity(FRAME_SAMPLES * 4));
-
-                    let stream = if use_f32 {
-                        let ring = ring_cb.clone();
-                        let apm = apm_render.clone();
-                        device.build_output_stream(
-                            &config,
-                            move |data: &mut [f32], _: &cpal::OutputCallbackInfo| {
-                                fill_output_and_tee_f32(data, &ring, &apm, &carry);
-                            },
-                            err_cb,
-                            None,
-                        )?
-                    } else {
-                        let ring = ring_cb.clone();
-                        let apm = apm_render.clone();
-                        device.build_output_stream(
-                            &config,
-                            move |data: &mut [i16], _: &cpal::OutputCallbackInfo| {
-                                fill_output_and_tee_i16(data, &ring, &apm, &carry);
-                            },
-                            err_cb,
-                            None,
-                        )?
-                    };
-
-                    stream.play().context("failed to start LinuxAEC output stream")?;
-                    let _ = init_tx.send(Ok(()));
-                    info!("LinuxAEC playback started (render tee active)");
-
-                    while running_clone.load(Ordering::Relaxed) {
-                        std::thread::park_timeout(std::time::Duration::from_millis(200));
-                    }
-                    drop(stream);
-                    Ok(())
-                })();
-
-                if let Err(e) = result {
-                    let _ = init_tx.send(Err(e.to_string()));
-                }
-            })?;
-
-        init_rx
-            .recv()
-            .map_err(|_| anyhow!("LinuxAEC playback thread exited before signaling"))?
-            .map_err(|e| anyhow!("{e}"))?;
-
-        Ok(Self { ring, running })
-    }
-
-    pub fn ring(&self) -> &Arc<AudioRing> {
-        &self.ring
-    }
-
-    pub fn stop(&self) {
-        self.running.store(false, Ordering::Relaxed);
-    }
-}
-
-impl Drop for LinuxAecPlayback {
-    fn drop(&mut self) {
-        self.stop();
-    }
-}
-
-fn fill_output_and_tee_i16(
-    data: &mut [i16],
-    ring: &AudioRing,
-    apm: &Mutex<Processor>,
-    carry: &std::sync::Mutex<Vec<i16>>,
-) {
-    let read = ring.read(data);
-    for s in &mut data[read..] {
-        *s = 0;
-    }
-    tee_render_samples(data, apm, carry);
-}
-
-fn fill_output_and_tee_f32(
-    data: &mut [f32],
-    ring: &AudioRing,
-    apm: &Mutex<Processor>,
-    carry: &std::sync::Mutex<Vec<i16>>,
-) {
-    let mut tmp = vec![0i16; data.len()];
-    let read = ring.read(&mut tmp);
-    for s in &mut tmp[read..] {
-        *s = 0;
-    }
-    for (d, &s) in data.iter_mut().zip(tmp.iter()) {
-        *d = i16_to_f32(s);
-    }
-    tee_render_samples(&tmp, apm, carry);
-}
-
-/// Push CPAL-bound samples into APM's render-side input for echo cancellation.
-/// Uses a carry buffer to batch into exact 960-sample (20 ms) frames.
-fn tee_render_samples(samples: &[i16], apm: &Mutex<Processor>, carry: &std::sync::Mutex<Vec<i16>>) {
-    let mut lv = carry.lock().unwrap();
-    lv.extend_from_slice(samples);
-    while lv.len() >= FRAME_SAMPLES {
-        let mut frame = [0i16; FRAME_SAMPLES];
-        frame.copy_from_slice(&lv[..FRAME_SAMPLES]);
-        push_render_frame_20ms(apm, &frame);
-        lv.drain(..FRAME_SAMPLES);
-    }
-}
-
-// ---------------------------------------------------------------------------
-// CPAL format helpers (duplicated from audio_io.rs to keep the modules
-// independent — each backend file is a self-contained unit)
-// ---------------------------------------------------------------------------
-
-fn supports_i16_input(device: &cpal::Device) -> Result<bool, anyhow::Error> {
-    let supported = device
-        .supported_input_configs()
-        .context("failed to query input configs")?;
-    for cfg in supported {
-        if cfg.sample_format() == SampleFormat::I16
-            && cfg.min_sample_rate() <= SampleRate(48_000)
-            && cfg.max_sample_rate() >= SampleRate(48_000)
-            && cfg.channels() >= 1
-        {
-            return Ok(true);
-        }
-    }
-    Ok(false)
-}
-
-fn supports_i16_output(device: &cpal::Device) -> Result<bool, anyhow::Error> {
-    let supported = device
-        .supported_output_configs()
-        .context("failed to query output configs")?;
-    for cfg in supported {
-        if cfg.sample_format() == SampleFormat::I16
-            && cfg.min_sample_rate() <= SampleRate(48_000)
-            && cfg.max_sample_rate() >= SampleRate(48_000)
-            && cfg.channels() >= 1
-        {
-            return Ok(true);
-        }
-    }
-    Ok(false)
-}

crates/wzp-client/src/audio_wasapi.rs

@@ -1,332 +0,0 @@
-//! Direct WASAPI microphone capture with Windows's OS-level AEC enabled.
-//!
-//! Bypasses CPAL and opens the default capture endpoint directly via
-//! `IMMDeviceEnumerator` + `IAudioClient2::SetClientProperties`, setting
-//! `AudioClientProperties.eCategory = AudioCategory_Communications`. That's
-//! the switch that tells Windows "this is a VoIP call" — the OS then
-//! enables its communications audio processing chain (AEC, noise
-//! suppression, automatic gain control) for the stream. AEC operates at
-//! the OS level using the currently-playing audio as the reference
-//! signal, so it cancels echo from our CPAL playback (and any other app's
-//! audio) without us having to plumb a reference signal ourselves.
-//!
-//! Platform: Windows only, compiled only when the `windows-aec` feature
-//! is enabled. Mirrors the public API of `audio_io::AudioCapture` so
-//! `wzp-client`'s lib.rs can transparently re-export either one as
-//! `AudioCapture`.
-
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::Arc;
-
-use anyhow::{anyhow, Context};
-use tracing::{info, warn};
-use windows::core::{Interface, GUID};
-use windows::Win32::Foundation::{CloseHandle, BOOL, WAIT_OBJECT_0};
-use windows::Win32::Media::Audio::{
-    eCapture, eCommunications, AudioCategory_Communications, AudioClientProperties,
-    IAudioCaptureClient, IAudioClient, IAudioClient2, IMMDeviceEnumerator, MMDeviceEnumerator,
-    AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM,
-    AUDCLNT_STREAMFLAGS_EVENTCALLBACK, AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY, WAVEFORMATEX,
-    WAVE_FORMAT_PCM,
-};
-use windows::Win32::System::Com::{
-    CoCreateInstance, CoInitializeEx, CoUninitialize, CLSCTX_ALL, COINIT_MULTITHREADED,
-};
-use windows::Win32::System::Threading::{CreateEventW, WaitForSingleObject, INFINITE};
-
-use crate::audio_ring::AudioRing;
-
-/// 20 ms at 48 kHz, mono. Matches the rest of the audio pipeline.
-pub const FRAME_SAMPLES: usize = 960;
-
-/// Microphone capture via WASAPI with Windows's communications AEC enabled.
-///
-/// The WASAPI capture stream runs on a dedicated OS thread. This handle is
-/// `Send + Sync`. Dropping it stops the stream and joins the thread.
-pub struct WasapiAudioCapture {
-    ring: Arc<AudioRing>,
-    running: Arc<AtomicBool>,
-    thread: Option<std::thread::JoinHandle<()>>,
-}
-
-impl WasapiAudioCapture {
-    /// Open the default communications microphone, enable OS AEC, and start
-    /// streaming PCM into a lock-free ring buffer.
-    ///
-    /// Returns only after the capture thread has successfully initialized
-    /// the stream, or propagates the error back to the caller.
-    pub fn start() -> Result<Self, anyhow::Error> {
-        let ring = Arc::new(AudioRing::new());
-        let running = Arc::new(AtomicBool::new(true));
-
-        let (init_tx, init_rx) = std::sync::mpsc::sync_channel::<Result<(), String>>(1);
-        let ring_cb = ring.clone();
-        let running_cb = running.clone();
-
-        let thread = std::thread::Builder::new()
-            .name("wzp-audio-capture-wasapi".into())
-            .spawn(move || {
-                let result = unsafe { capture_thread_main(ring_cb, running_cb.clone(), &init_tx) };
-                if let Err(e) = result {
-                    warn!("wasapi capture thread exited with error: {e}");
-                    // If we failed before signaling init, signal now so the
-                    // caller unblocks. Double-send is harmless (channel is
-                    // bounded to 1 and we only hit the second send path on
-                    // late errors).
-                    let _ = init_tx.send(Err(e.to_string()));
-                }
-            })
-            .context("failed to spawn WASAPI capture thread")?;
-
-        init_rx
-            .recv()
-            .map_err(|_| anyhow!("WASAPI capture thread exited before signaling init"))?
-            .map_err(|e| anyhow!("{e}"))?;
-
-        Ok(Self {
-            ring,
-            running,
-            thread: Some(thread),
-        })
-    }
-
-    /// Get a reference to the capture ring buffer for direct polling.
-    pub fn ring(&self) -> &Arc<AudioRing> {
-        &self.ring
-    }
-
-    /// Stop capturing.
-    pub fn stop(&self) {
-        self.running.store(false, Ordering::Relaxed);
-    }
-}
-
-impl Drop for WasapiAudioCapture {
-    fn drop(&mut self) {
-        self.stop();
-        if let Some(handle) = self.thread.take() {
-            // Join best-effort. The thread loop polls `running` every 200ms
-            // via a short WaitForSingleObject timeout, so it should exit
-            // within ~200ms of `stop()`.
-            let _ = handle.join();
-        }
-    }
-}
-
-// ---------------------------------------------------------------------------
-// WASAPI thread entry point — everything below this line runs on the
-// dedicated wzp-audio-capture-wasapi thread.
-// ---------------------------------------------------------------------------
-
-unsafe fn capture_thread_main(
-    ring: Arc<AudioRing>,
-    running: Arc<AtomicBool>,
-    init_tx: &std::sync::mpsc::SyncSender<Result<(), String>>,
-) -> Result<(), anyhow::Error> {
-    // COM init for the capture thread. MULTITHREADED because we're not
-    // running a message pump. Must be balanced by CoUninitialize on exit.
-    CoInitializeEx(None, COINIT_MULTITHREADED)
-        .ok()
-        .context("CoInitializeEx failed")?;
-
-    // Use a guard struct so CoUninitialize runs even on early returns.
-    struct ComGuard;
-    impl Drop for ComGuard {
-        fn drop(&mut self) {
-            unsafe { CoUninitialize() };
-        }
-    }
-    let _com_guard = ComGuard;
-
-    let enumerator: IMMDeviceEnumerator =
-        CoCreateInstance(&MMDeviceEnumerator, None, CLSCTX_ALL)
-            .context("CoCreateInstance(MMDeviceEnumerator) failed")?;
-
-    // eCommunications role (not eConsole) — this picks the device the user
-    // has designated for communications in Sound Settings. It's the one
-    // Windows's AEC is actually tuned for and the one Teams/Zoom use.
-    let device = enumerator
-        .GetDefaultAudioEndpoint(eCapture, eCommunications)
-        .context("GetDefaultAudioEndpoint(eCapture, eCommunications) failed")?;
-
-    if let Ok(name) = device_name(&device) {
-        info!(device = %name, "opening WASAPI communications capture endpoint");
-    }
-
-    let audio_client: IAudioClient = device
-        .Activate(CLSCTX_ALL, None)
-        .context("IMMDevice::Activate(IAudioClient) failed")?;
-
-    // IAudioClient2 exposes SetClientProperties, which is the ONLY way to
-    // set AudioCategory_Communications pre-Initialize. Calling it on the
-    // base IAudioClient would not compile, and setting it after Initialize
-    // is a no-op.
-    let audio_client2: IAudioClient2 = audio_client
-        .cast()
-        .context("QueryInterface IAudioClient2 failed")?;
-
-    let mut props = AudioClientProperties {
-        cbSize: std::mem::size_of::<AudioClientProperties>() as u32,
-        bIsOffload: BOOL(0),
-        eCategory: AudioCategory_Communications,
-        // 0 = AUDCLNT_STREAMOPTIONS_NONE. The `windows` crate doesn't
-        // export the enum constant in all versions, so use 0 directly.
-        Options: Default::default(),
-    };
-    audio_client2
-        .SetClientProperties(&mut props as *mut _)
-        .context("SetClientProperties(AudioCategory_Communications) failed")?;
-
-    // Request 48 kHz mono i16 directly. AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM
-    // tells Windows to do any needed format conversion inside the audio
-    // engine rather than rejecting our format. SRC_DEFAULT_QUALITY picks
-    // the standard Windows resampler quality (fine for voice).
-    let wave_format = WAVEFORMATEX {
-        wFormatTag: WAVE_FORMAT_PCM as u16,
-        nChannels: 1,
-        nSamplesPerSec: 48_000,
-        nAvgBytesPerSec: 48_000 * 2, // 1 ch * 2 bytes/sample * 48000 Hz
-        nBlockAlign: 2,              // 1 ch * 2 bytes/sample
-        wBitsPerSample: 16,
-        cbSize: 0,
-    };
-
-    // 1,000,000 hns = 100 ms buffer (hns = 100-nanosecond units). Windows
-    // treats this as the minimum; the engine may give us a larger one.
-    const BUFFER_DURATION_HNS: i64 = 1_000_000;
-
-    audio_client
-        .Initialize(
-            AUDCLNT_SHAREMODE_SHARED,
-            AUDCLNT_STREAMFLAGS_EVENTCALLBACK
-                | AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM
-                | AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY,
-            BUFFER_DURATION_HNS,
-            0,
-            &wave_format,
-            Some(&GUID::zeroed()),
-        )
-        .context("IAudioClient::Initialize failed — Windows rejected communications-mode 48k mono i16")?;
-
-    // Event-driven capture: Windows signals this handle each time a new
-    // audio packet is available. We wait on it from the loop below.
-    let event = CreateEventW(None, false, false, None)
-        .context("CreateEventW failed")?;
-    audio_client
-        .SetEventHandle(event)
-        .context("SetEventHandle failed")?;
-
-    let capture_client: IAudioCaptureClient = audio_client
-        .GetService()
-        .context("IAudioClient::GetService(IAudioCaptureClient) failed")?;
-
-    audio_client.Start().context("IAudioClient::Start failed")?;
-
-    // Signal to the parent thread that init succeeded before entering the
-    // hot loop. From this point on, errors get logged but don't propagate
-    // back to the caller (they'd just cause the ring buffer to stop
-    // filling, which the main thread detects as underruns).
-    let _ = init_tx.send(Ok(()));
-    info!("WASAPI communications-mode capture started with OS AEC enabled");
-
-    let mut logged_first_packet = false;
-
-    // Main capture loop. Exit when `running` goes false (from Drop or an
-    // explicit stop() call).
-    while running.load(Ordering::Relaxed) {
-        // 200 ms timeout so we check `running` regularly even if the audio
-        // engine stops delivering packets (e.g. device unplugged).
-        let wait = WaitForSingleObject(event, 200);
-        if wait.0 != WAIT_OBJECT_0.0 {
-            // Timeout or failure — just loop and re-check running.
-            continue;
-        }
-
-        // Drain all available packets. Windows may have queued more than
-        // one since we were last scheduled.
-        loop {
-            let packet_length = match capture_client.GetNextPacketSize() {
-                Ok(n) => n,
-                Err(e) => {
-                    warn!("GetNextPacketSize failed: {e}");
-                    break;
-                }
-            };
-            if packet_length == 0 {
-                break;
-            }
-
-            let mut buffer_ptr: *mut u8 = std::ptr::null_mut();
-            let mut num_frames: u32 = 0;
-            let mut flags: u32 = 0;
-            let mut device_position: u64 = 0;
-            let mut qpc_position: u64 = 0;
-
-            if let Err(e) = capture_client.GetBuffer(
-                &mut buffer_ptr,
-                &mut num_frames,
-                &mut flags,
-                Some(&mut device_position),
-                Some(&mut qpc_position),
-            ) {
-                warn!("GetBuffer failed: {e}");
-                break;
-            }
-
-            if num_frames > 0 && !buffer_ptr.is_null() {
-                if !logged_first_packet {
-                    info!(
-                        frames = num_frames,
-                        flags, "WASAPI capture: first packet received"
-                    );
-                    logged_first_packet = true;
-                }
-
-                // Because we asked for 48 kHz mono i16, each frame is
-                // exactly one i16. Windows's AUTOCONVERTPCM handles the
-                // conversion from whatever the engine mix format is.
-                let samples = std::slice::from_raw_parts(
-                    buffer_ptr as *const i16,
-                    num_frames as usize,
-                );
-                ring.write(samples);
-            }
-
-            if let Err(e) = capture_client.ReleaseBuffer(num_frames) {
-                warn!("ReleaseBuffer failed: {e}");
-                break;
-            }
-        }
-    }
-
-    info!("WASAPI capture thread stopping");
-    let _ = audio_client.Stop();
-    let _ = CloseHandle(event);
-    // _com_guard drops here, calling CoUninitialize.
-
-    // Silence INFINITE unused-import warning — it's referenced by the
-    // `windows` crate's WaitForSingleObject alternative but we use the
-    // 200 ms timeout variant instead. Explicit suppression for clarity.
-    let _ = INFINITE;
-
-    Ok(())
-}
-
-// ---------------------------------------------------------------------------
-// Helpers
-// ---------------------------------------------------------------------------
-
-/// Best-effort device ID string for logging. Grabbing the friendly name via
-/// PKEY_Device_FriendlyName requires IPropertyStore + PROPVARIANT plumbing
-/// that's far more ceremony than a log line justifies; the ID is already
-/// sufficient to confirm we opened the right endpoint.
-///
-/// Rust 2024 edition's `unsafe_op_in_unsafe_fn` lint requires explicit
-/// `unsafe { ... }` blocks inside `unsafe fn` bodies for each unsafe call,
-/// even though the whole function is already marked unsafe.
-unsafe fn device_name(
-    device: &windows::Win32::Media::Audio::IMMDevice,
-) -> Result<String, anyhow::Error> {
-    let id = unsafe { device.GetId() }.context("IMMDevice::GetId failed")?;
-    Ok(unsafe { id.to_string() }.unwrap_or_else(|_| "<non-utf16>".to_string()))
-}

crates/wzp-client/src/call.rs

@@ -7,15 +7,14 @@ use std::time::{Duration, Instant};
 use bytes::Bytes;
 use tracing::{debug, info, warn};
 
-use wzp_codec::dred_ffi::{DredDecoderHandle, DredState};
-use wzp_codec::{
-    AdaptiveDecoder, AutoGainControl, ComfortNoise, EchoCanceller, NoiseSupressor, SilenceDetector,
-};
+use wzp_codec::{AutoGainControl, ComfortNoise, EchoCanceller, NoiseSupressor, SilenceDetector};
 use wzp_fec::{RaptorQFecDecoder, RaptorQFecEncoder};
 use wzp_proto::jitter::{JitterBuffer, PlayoutResult};
 use wzp_proto::packet::{MediaHeader, MediaPacket, MiniFrameContext};
 use wzp_proto::quality::AdaptiveQualityController;
-use wzp_proto::traits::{AudioDecoder, AudioEncoder, FecDecoder, FecEncoder};
+use wzp_proto::traits::{
+    AudioDecoder, AudioEncoder, FecDecoder, FecEncoder,
+};
 use wzp_proto::packet::QualityReport;
 use wzp_proto::{CodecId, QualityProfile};
 
@@ -345,22 +344,6 @@ impl CallEncoder {
         let enc_len = self.audio_enc.encode(pcm, &mut encoded)?;
         encoded.truncate(enc_len);
 
-        // Phase 2: Opus tiers bypass RaptorQ entirely (DRED handles loss
-        // recovery at the codec layer). Codec2 tiers keep RaptorQ unchanged.
-        // On Opus packets, zero the FEC header fields so old receivers
-        // can cleanly identify "no RaptorQ block to assemble" and new
-        // receivers can short-circuit their FEC ingest path.
-        let is_opus = self.profile.codec.is_opus();
-        let (fec_block, fec_symbol, fec_ratio_encoded) = if is_opus {
-            (0u8, 0u8, 0u8)
-        } else {
-            (
-                self.block_id,
-                self.frame_in_block,
-                MediaHeader::encode_fec_ratio(self.profile.fec_ratio),
-            )
-        };
-
         // Build source media packet
         let source_pkt = MediaPacket {
             header: MediaHeader {
@@ -368,11 +351,11 @@ impl CallEncoder {
                 is_repair: false,
                 codec_id: self.profile.codec,
                 has_quality_report: false,
-                fec_ratio_encoded,
+                fec_ratio_encoded: MediaHeader::encode_fec_ratio(self.profile.fec_ratio),
                 seq: self.seq,
                 timestamp: self.timestamp_ms,
-                fec_block,
-                fec_symbol,
+                fec_block: self.block_id,
+                fec_symbol: self.frame_in_block,
                 reserved: 0,
                 csrc_count: 0,
             },
@@ -387,13 +370,11 @@ impl CallEncoder {
 
         let mut output = vec![source_pkt];
 
-        // Codec2-only: feed RaptorQ and generate repair packets when the
-        // block is full. Opus tiers skip this entire block — DRED (active
-        // in Phase 1) provides codec-layer loss recovery.
-        if !is_opus {
+        // Add to FEC encoder
         self.fec_enc.add_source_symbol(&encoded)?;
         self.frame_in_block += 1;
 
+        // If block is full, generate repair and finalize
         if self.frame_in_block >= self.profile.frames_per_block {
             if let Ok(repairs) = self.fec_enc.generate_repair(self.profile.fec_ratio) {
                 for (sym_idx, repair_data) in repairs {
@@ -423,7 +404,6 @@ impl CallEncoder {
             self.block_id = self.block_id.wrapping_add(1);
             self.frame_in_block = 0;
         }
-        }
 
         Ok(output)
     }
@@ -458,12 +438,9 @@ impl CallEncoder {
 
 /// Manages the recv/decode side of a call.
 pub struct CallDecoder {
-    /// Audio decoder. Concrete `AdaptiveDecoder` (not `Box<dyn AudioDecoder>`)
-    /// because Phase 3b calls the inherent `reconstruct_from_dred` method,
-    /// which cannot live on the `AudioDecoder` trait without dragging libopus
-    /// types into `wzp-proto`.
-    audio_dec: AdaptiveDecoder,
-    /// FEC decoder (Codec2 tiers only; Opus bypasses RaptorQ per Phase 2).
+    /// Audio decoder.
+    audio_dec: Box<dyn AudioDecoder>,
+    /// FEC decoder.
     fec_dec: RaptorQFecDecoder,
     /// Jitter buffer.
     jitter: JitterBuffer,
@@ -477,24 +454,6 @@ pub struct CallDecoder {
     last_was_cn: bool,
     /// Mini-frame decompression context (tracks last full header baseline).
     mini_context: MiniFrameContext,
-    // ─── Phase 3b: DRED reconstruction state ──────────────────────────────
-    /// DRED side-channel parser (a separate libopus object from the decoder).
-    dred_decoder: DredDecoderHandle,
-    /// Scratch buffer used by `dred_decoder.parse_into` on every arriving
-    /// Opus packet. Reused across calls to avoid 10 KB alloc churn per packet.
-    dred_parse_scratch: DredState,
-    /// Cached "most recently parsed valid" DRED state, swapped with
-    /// `dred_parse_scratch` on successful parse. Used by `decode_next` when
-    /// the jitter buffer reports a gap.
-    last_good_dred: DredState,
-    /// Sequence number of the packet that produced `last_good_dred`. `None`
-    /// if no packet has yielded DRED state yet (cold start or legacy sender).
-    last_good_dred_seq: Option<u16>,
-    /// Phase 4 telemetry counter: gaps recovered via DRED reconstruction.
-    pub dred_reconstructions: u64,
-    /// Phase 4 telemetry counter: gaps filled via classical Opus PLC
-    /// (because no DRED state covered the gap, or the active codec is Codec2).
-    pub classical_plc_invocations: u64,
 }
 
 impl CallDecoder {
@@ -504,19 +463,8 @@ impl CallDecoder {
         } else {
             JitterBuffer::new(config.jitter_target, config.jitter_max, config.jitter_min)
         };
-        // Phase 3b: build the DRED parser + state buffers. These allocate
-        // libopus state (~10 KB each) once per call, not per packet — the
-        // scratch and last-good buffers are reused via std::mem::swap on
-        // every successful parse.
-        let dred_decoder =
-            DredDecoderHandle::new().expect("opus_dred_decoder_create failed at call setup");
-        let dred_parse_scratch =
-            DredState::new().expect("opus_dred_alloc failed at call setup (scratch)");
-        let last_good_dred =
-            DredState::new().expect("opus_dred_alloc failed at call setup (good state)");
         Self {
-            audio_dec: AdaptiveDecoder::new(config.profile)
-                .expect("failed to create adaptive decoder"),
+            audio_dec: wzp_codec::create_decoder(config.profile),
             fec_dec: wzp_fec::create_decoder(&config.profile),
             jitter,
             quality: AdaptiveQualityController::new(),
@@ -524,12 +472,6 @@ impl CallDecoder {
             comfort_noise: ComfortNoise::new(50),
             last_was_cn: false,
             mini_context: MiniFrameContext::default(),
-            dred_decoder,
-            dred_parse_scratch,
-            last_good_dred,
-            last_good_dred_seq: None,
-            dred_reconstructions: 0,
-            classical_plc_invocations: 0,
         }
     }
 
@@ -544,54 +486,15 @@ impl CallDecoder {
 
     /// Feed a received media packet into the decode pipeline.
     pub fn ingest(&mut self, packet: MediaPacket) {
-        // Phase 2: Opus packets bypass RaptorQ. Codec2 packets still feed
-        // the FEC decoder for recovery. This also cleanly drops any stray
-        // Opus repair packets from an old sender (we don't push repair
-        // packets to the jitter buffer either, so they're effectively
-        // ignored — a graceful mixed-version degradation).
-        if !packet.header.codec_id.is_opus() {
+        // Feed to FEC decoder
         let _ = self.fec_dec.add_symbol(
             packet.header.fec_block,
             packet.header.fec_symbol,
             packet.header.is_repair,
             &packet.payload,
         );
-        }
 
-        // Phase 3b: Opus source packets carry DRED side-channel data in
-        // libopus 1.5. Parse it into the scratch state and, on success,
-        // swap with the cached `last_good_dred` so later gap reconstruction
-        // has fresh neural redundancy to draw from. Parsing happens before
-        // the jitter push because the jitter buffer consumes the packet.
-        if packet.header.codec_id.is_opus() && !packet.header.is_repair {
-            match self
-                .dred_decoder
-                .parse_into(&mut self.dred_parse_scratch, &packet.payload)
-            {
-                Ok(available) if available > 0 => {
-                    // Swap the freshly parsed state into `last_good_dred`.
-                    // The old good state (now in scratch) is about to be
-                    // overwritten on the next parse — its contents are
-                    // not needed after this swap.
-                    std::mem::swap(&mut self.dred_parse_scratch, &mut self.last_good_dred);
-                    self.last_good_dred_seq = Some(packet.header.seq);
-                }
-                Ok(_) => {
-                    // Packet had no DRED data (return 0). Leave the cached
-                    // state untouched — it may still cover upcoming gaps
-                    // from a warm-up period where the encoder was producing
-                    // DRED bytes. The scratch buffer was potentially written
-                    // but its `samples_available` is 0 so it's harmless.
-                }
-                Err(e) => {
-                    debug!("DRED parse error (ignored): {e}");
-                }
-            }
-        }
-
-        // Source packets (Opus or Codec2) go to the jitter buffer for decode.
-        // Repair packets never reach the jitter buffer; for Codec2 they're
-        // used by the FEC decoder above, for Opus they're dropped here.
+        // If not a repair packet, also feed directly to jitter buffer
         if !packet.header.is_repair {
             self.jitter.push(packet);
         }
@@ -629,9 +532,6 @@ impl CallDecoder {
                 frames_per_block: 5,
             },
             CodecId::Opus6k => QualityProfile::DEGRADED,
-            CodecId::Opus32k => QualityProfile::STUDIO_32K,
-            CodecId::Opus48k => QualityProfile::STUDIO_48K,
-            CodecId::Opus64k => QualityProfile::STUDIO_64K,
             CodecId::Codec2_3200 => QualityProfile {
                 codec: CodecId::Codec2_3200,
                 fec_ratio: 0.5,
@@ -674,72 +574,19 @@ impl CallDecoder {
                 result
             }
             PlayoutResult::Missing { seq } => {
-                // Only attempt recovery if there are still packets buffered ahead.
+                // Only generate PLC if there are still packets buffered ahead.
                 // Otherwise we've drained everything — return None to stop.
-                if self.jitter.depth() == 0 {
-                    self.jitter.record_underrun();
-                    return None;
-                }
-
-                // Phase 3b: try DRED reconstruction first. If we have a
-                // recent DRED state from a packet whose seq > missing seq,
-                // and the seq delta (in samples) fits within the state's
-                // available window, libopus can synthesize a plausible
-                // replacement for the lost frame. Fall back to classical
-                // PLC when no state covers the gap, when the active codec
-                // is Codec2, or when the reconstruction itself errors.
-                if self.profile.codec.is_opus() {
-                    if let Some(last_seq) = self.last_good_dred_seq {
-                        // How many frames ahead of the missing seq is the
-                        // last-good packet? Use wrapping arithmetic for the
-                        // u16 seq space.
-                        let seq_delta = last_seq.wrapping_sub(seq);
-                        // Reject stale or backward state. u16 wraparound
-                        // would make a "seq went backward" delta very large;
-                        // cap at a sane forward-looking window.
-                        const MAX_SEQ_DELTA: u16 = 128;
-                        if seq_delta > 0 && seq_delta <= MAX_SEQ_DELTA {
-                            let frame_samples =
-                                (48_000 * self.profile.frame_duration_ms as i32) / 1000;
-                            let offset_samples = seq_delta as i32 * frame_samples;
-                            let available = self.last_good_dred.samples_available();
-                            if offset_samples > 0 && offset_samples <= available {
-                                match self.audio_dec.reconstruct_from_dred(
-                                    &self.last_good_dred,
-                                    offset_samples,
-                                    pcm,
-                                ) {
-                                    Ok(n) => {
-                                        self.dred_reconstructions += 1;
-                                        self.jitter.record_decode();
-                                        debug!(
-                                            seq,
-                                            last_seq,
-                                            offset_samples,
-                                            available,
-                                            "DRED reconstruction for gap"
-                                        );
-                                        return Some(n);
-                                    }
-                                    Err(e) => {
-                                        // Reconstruction failed — fall
-                                        // through to classical PLC below.
-                                        debug!(seq, "DRED reconstruct error: {e}");
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                // Classical PLC fallback (also the Codec2 path).
-                debug!(seq, "packet loss, generating classical PLC");
-                self.classical_plc_invocations += 1;
+                if self.jitter.depth() > 0 {
+                    debug!(seq, "packet loss, generating PLC");
                     let result = self.audio_dec.decode_lost(pcm).ok();
                     if result.is_some() {
                         self.jitter.record_decode();
                     }
                     result
+                } else {
+                    self.jitter.record_underrun();
+                    None
+                }
             }
             PlayoutResult::NotReady => {
                 self.jitter.record_underrun();
@@ -762,19 +609,6 @@ impl CallDecoder {
     pub fn reset_stats(&mut self) {
         self.jitter.reset_stats();
     }
-
-    /// Phase 3b introspection: sequence number of the most recently parsed
-    /// valid DRED state, or `None` if no Opus packet has yielded DRED data
-    /// yet. Used by tests to debug reconstruction eligibility.
-    pub fn last_good_dred_seq(&self) -> Option<u16> {
-        self.last_good_dred_seq
-    }
-
-    /// Phase 3b introspection: samples of audio history currently available
-    /// in the cached DRED state.
-    pub fn last_good_dred_samples_available(&self) -> i32 {
-        self.last_good_dred.samples_available()
-    }
 }
 
 /// Periodic telemetry logger for jitter buffer statistics.
@@ -836,83 +670,18 @@ mod tests {
         assert!(!packets[0].header.is_repair);
     }
 
-    /// Phase 2: Opus packets have zero FEC header fields — no block, no
-    /// symbol index, no repair ratio. The RaptorQ layer is bypassed
-    /// entirely on the Opus tiers.
     #[test]
-    fn opus_source_packets_have_zero_fec_header_fields() {
+    fn encoder_generates_repair_on_full_block() {
         let config = CallConfig {
-            profile: QualityProfile::GOOD, // Opus 24k
-            suppression_enabled: false,    // skip silence gate for this test
+            profile: QualityProfile::GOOD, // 5 frames/block
             ..Default::default()
         };
         let mut enc = CallEncoder::new(&config);
-        // Non-silent sine wave so silence detection doesn't suppress us
-        // even with suppression_enabled=false (belt and braces).
-        let pcm: Vec<i16> = (0..960)
-            .map(|i| ((i as f32 * 0.1).sin() * 10_000.0) as i16)
-            .collect();
-        let packets = enc.encode_frame(&pcm).unwrap();
-        assert_eq!(packets.len(), 1, "Opus must emit exactly 1 source packet");
-        let hdr = &packets[0].header;
-        assert!(hdr.codec_id.is_opus());
-        assert!(!hdr.is_repair);
-        assert_eq!(hdr.fec_block, 0, "Opus fec_block must be 0");
-        assert_eq!(hdr.fec_symbol, 0, "Opus fec_symbol must be 0");
-        assert_eq!(hdr.fec_ratio_encoded, 0, "Opus fec_ratio_encoded must be 0");
-    }
+        let pcm = vec![0i16; 960];
 
-    /// Phase 2: Opus never emits repair packets, regardless of how many
-    /// source frames are fed in. DRED (Phase 1) provides loss recovery at
-    /// the codec layer; RaptorQ is disabled on Opus tiers.
-    #[test]
-    fn opus_encoder_never_emits_repair_packets() {
-        let config = CallConfig {
-            profile: QualityProfile::GOOD, // 5 frames/block in the Codec2 sense
-            suppression_enabled: false,
-            ..Default::default()
-        };
-        let mut enc = CallEncoder::new(&config);
-        let pcm: Vec<i16> = (0..960)
-            .map(|i| ((i as f32 * 0.1).sin() * 10_000.0) as i16)
-            .collect();
-
-        // Encode well beyond a block boundary to prove no repair ever comes out.
-        let mut total_packets = 0usize;
-        let mut repair_count = 0usize;
-        for _ in 0..20 {
-            let packets = enc.encode_frame(&pcm).unwrap();
-            total_packets += packets.len();
-            repair_count += packets.iter().filter(|p| p.header.is_repair).count();
-        }
-        assert_eq!(repair_count, 0, "Opus must emit zero repair packets");
-        assert_eq!(
-            total_packets, 20,
-            "20 source frames → 20 source packets (1:1, no RaptorQ expansion)"
-        );
-    }
-
-    /// Phase 2: Codec2 still emits repair packets with RaptorQ ratio unchanged.
-    /// DRED is libopus-only and does not apply here, so RaptorQ is still the
-    /// primary loss-recovery mechanism on Codec2 tiers.
-    #[test]
-    fn codec2_encoder_generates_repair_on_full_block() {
-        let config = CallConfig {
-            profile: QualityProfile::CATASTROPHIC, // Codec2 1200, 8 frames/block, ratio 1.0
-            suppression_enabled: false,
-            ..Default::default()
-        };
-        let mut enc = CallEncoder::new(&config);
-        // Codec2 takes 48 kHz samples and downsamples internally.
-        // CATASTROPHIC uses 40 ms frames → 1920 samples.
-        let pcm: Vec<i16> = (0..1920)
-            .map(|i| ((i as f32 * 0.1).sin() * 10_000.0) as i16)
-            .collect();
-
-        let mut total_packets = 0usize;
-        let mut repair_count = 0usize;
-        // Run long enough to cross the 8-frame block boundary and see repairs.
-        for _ in 0..16 {
+        let mut total_packets = 0;
+        let mut repair_count = 0;
+        for _ in 0..5 {
             let packets = enc.encode_frame(&pcm).unwrap();
             for p in &packets {
                 if p.header.is_repair {
@@ -921,10 +690,8 @@ mod tests {
             }
             total_packets += packets.len();
         }
-        assert!(
-            repair_count > 0,
-            "Codec2 must still emit repair packets (got {repair_count} repairs, {total_packets} total)"
-        );
+        assert!(repair_count > 0, "should have repair packets after full block");
+        assert!(total_packets > 5, "total {total_packets} should exceed 5 source");
     }
 
     #[test]
@@ -955,219 +722,6 @@ mod tests {
         assert!(dec.decode_next(&mut pcm).is_none());
     }
 
-    // ─── Phase 3b — DRED reconstruction on packet loss ────────────────────
-
-    /// Helper: create a CallEncoder/CallDecoder pair with the given profile
-    /// and silence suppression disabled so silence-detection doesn't drop
-    /// our synthetic test frames.
-    fn encoder_decoder_pair(profile: QualityProfile) -> (CallEncoder, CallDecoder) {
-        let config = CallConfig {
-            profile,
-            suppression_enabled: false,
-            // Small jitter buffer so decode_next drains quickly in tests.
-            jitter_min: 2,
-            jitter_target: 3,
-            jitter_max: 20,
-            adaptive_jitter: false,
-            ..Default::default()
-        };
-        (CallEncoder::new(&config), CallDecoder::new(&config))
-    }
-
-    /// Helper: generate a non-silent 20 ms frame of 300 Hz sine at the
-    /// given sample offset so consecutive frames form a continuous tone.
-    fn voice_frame_20ms(sample_offset: usize) -> Vec<i16> {
-        (0..960)
-            .map(|i| {
-                let t = (sample_offset + i) as f64 / 48_000.0;
-                (8000.0 * (2.0 * std::f64::consts::PI * 300.0 * t).sin()) as i16
-            })
-            .collect()
-    }
-
-    /// Phase 3b probe: sweep packet_loss_perc values to find the minimum
-    /// that produces a samples_available ≥ 960 (enough to reconstruct a
-    /// single 20 ms Opus frame). This guides the production loss floor.
-    #[test]
-    #[ignore] // diagnostic only — run with `cargo test ... -- --ignored --nocapture`
-    fn probe_dred_samples_available_by_loss_floor() {
-        use wzp_codec::opus_enc::OpusEncoder;
-        use wzp_proto::traits::AudioEncoder;
-
-        for loss_pct in [5u8, 10, 15, 20, 25, 40, 60, 80].iter().copied() {
-            let mut enc = OpusEncoder::new(QualityProfile::GOOD).unwrap();
-            enc.set_expected_loss(loss_pct);
-            let (_drop_enc, mut dec) = encoder_decoder_pair(QualityProfile::GOOD);
-
-            for i in 0..60u16 {
-                let pcm = voice_frame_20ms(i as usize * 960);
-                let mut encoded = vec![0u8; 512];
-                let n = enc.encode(&pcm, &mut encoded).unwrap();
-                encoded.truncate(n);
-                let pkt = MediaPacket {
-                    header: MediaHeader {
-                        version: 0,
-                        is_repair: false,
-                        codec_id: CodecId::Opus24k,
-                        has_quality_report: false,
-                        fec_ratio_encoded: 0,
-                        seq: i,
-                        timestamp: (i as u32) * 20,
-                        fec_block: 0,
-                        fec_symbol: 0,
-                        reserved: 0,
-                        csrc_count: 0,
-                    },
-                    payload: Bytes::from(encoded),
-                    quality_report: None,
-                };
-                dec.ingest(pkt);
-            }
-            eprintln!(
-                "[phase3b probe] loss_pct={loss_pct} samples_available={}",
-                dec.last_good_dred_samples_available()
-            );
-        }
-    }
-
-    /// Phase 3b: simulated single-packet loss on an Opus call triggers a
-    /// DRED reconstruction rather than a classical PLC fill. Runs the full
-    /// encode → ingest → decode_next pipeline.
-    #[test]
-    fn opus_single_packet_loss_is_recovered_via_dred() {
-        let (mut enc, mut dec) = encoder_decoder_pair(QualityProfile::GOOD);
-
-        // Warm-up: encode and ingest 60 frames (1.2 s) so the DRED emitter
-        // has had time to fill its 200 ms window and at least one
-        // successful DRED parse has happened on the decoder side.
-        let warmup_frames = 60;
-        for i in 0..warmup_frames {
-            let pcm = voice_frame_20ms(i * 960);
-            let packets = enc.encode_frame(&pcm).unwrap();
-            for pkt in packets {
-                dec.ingest(pkt);
-            }
-        }
-
-        // Drain the warm-up frames through the decoder to advance the
-        // jitter buffer cursor past them.
-        let mut out = vec![0i16; 960];
-        while dec.decode_next(&mut out).is_some() {}
-
-        // Encode the next three frames but skip ingesting the middle one.
-        let base_offset = warmup_frames * 960;
-        let pcm_a = voice_frame_20ms(base_offset);
-        let pcm_b = voice_frame_20ms(base_offset + 960);
-        let pcm_c = voice_frame_20ms(base_offset + 1920);
-
-        let pkts_a = enc.encode_frame(&pcm_a).unwrap();
-        let pkts_b = enc.encode_frame(&pcm_b).unwrap(); // DROP THIS ONE
-        let pkts_c = enc.encode_frame(&pcm_c).unwrap();
-
-        for pkt in pkts_a {
-            dec.ingest(pkt);
-        }
-        // Skip pkts_b entirely — this is the "packet loss".
-        drop(pkts_b);
-        for pkt in pkts_c {
-            dec.ingest(pkt);
-        }
-
-        // Drain again. Somewhere in here decode_next will hit Missing()
-        // for the dropped packet and attempt DRED reconstruction.
-        let baseline_dred = dec.dred_reconstructions;
-        let baseline_plc = dec.classical_plc_invocations;
-        eprintln!(
-            "[phase3b probe] pre-drain: last_good_seq={:?} samples_available={}",
-            dec.last_good_dred_seq(),
-            dec.last_good_dred_samples_available()
-        );
-        while dec.decode_next(&mut out).is_some() {}
-
-        let dred_delta = dec.dred_reconstructions - baseline_dred;
-        let plc_delta = dec.classical_plc_invocations - baseline_plc;
-        eprintln!(
-            "[phase3b probe] post-drain: dred_delta={dred_delta} plc_delta={plc_delta}"
-        );
-        assert!(
-            dred_delta >= 1,
-            "expected ≥1 DRED reconstruction on single-packet loss, \
-             got dred_delta={dred_delta} plc_delta={plc_delta}"
-        );
-    }
-
-    /// Phase 3b: lossless stream never triggers DRED reconstruction or PLC.
-    /// Baseline behavior — verifies the Missing() branch is not spuriously taken.
-    #[test]
-    fn opus_lossless_ingest_never_triggers_dred_or_plc() {
-        let (mut enc, mut dec) = encoder_decoder_pair(QualityProfile::GOOD);
-
-        // Encode + ingest 40 frames with no drops.
-        for i in 0..40 {
-            let pcm = voice_frame_20ms(i * 960);
-            let packets = enc.encode_frame(&pcm).unwrap();
-            for pkt in packets {
-                dec.ingest(pkt);
-            }
-        }
-
-        let mut out = vec![0i16; 960];
-        while dec.decode_next(&mut out).is_some() {}
-
-        assert_eq!(
-            dec.dred_reconstructions, 0,
-            "lossless stream should not reconstruct"
-        );
-        assert_eq!(
-            dec.classical_plc_invocations, 0,
-            "lossless stream should not PLC"
-        );
-    }
-
-    /// Phase 3b: Codec2 calls fall through to classical PLC on loss.
-    /// DRED is libopus-only, so even if the decoder's DRED state were
-    /// populated (it won't be — Codec2 packets don't carry DRED bytes),
-    /// `reconstruct_from_dred` rejects Codec2 at the AdaptiveDecoder
-    /// level. This test guards the Codec2 side of the protection split.
-    #[test]
-    fn codec2_loss_falls_through_to_classical_plc() {
-        let (mut enc, mut dec) = encoder_decoder_pair(QualityProfile::CATASTROPHIC);
-
-        // Codec2 1200 uses 40 ms frames → 1920 samples at 48 kHz (before
-        // the downsample inside the codec). Encode 20 frames (~0.8 s).
-        let make_frame = |offset: usize| -> Vec<i16> {
-            (0..1920)
-                .map(|i| {
-                    let t = (offset + i) as f64 / 48_000.0;
-                    (8000.0 * (2.0 * std::f64::consts::PI * 300.0 * t).sin()) as i16
-                })
-                .collect()
-        };
-
-        for i in 0..20 {
-            let pcm = make_frame(i * 1920);
-            let packets = enc.encode_frame(&pcm).unwrap();
-            for pkt in packets {
-                // Drop every 5th source packet to simulate loss.
-                if !pkt.header.is_repair && i % 5 == 3 {
-                    continue;
-                }
-                dec.ingest(pkt);
-            }
-        }
-
-        let mut out = vec![0i16; 1920];
-        while dec.decode_next(&mut out).is_some() {}
-
-        assert_eq!(
-            dec.dred_reconstructions, 0,
-            "Codec2 must never reconstruct via DRED"
-        );
-        // classical_plc_invocations may or may not trigger depending on
-        // whether the jitter buffer sees Missing before draining — the key
-        // assertion is that DRED is not used. PLC count is advisory.
-    }
-
     // ---- QualityAdapter tests ----
 
     /// Helper: build a QualityReport from human-readable loss% and RTT ms.

crates/wzp-client/src/featherchat.rs

@@ -96,7 +96,6 @@ pub fn signal_to_call_type(signal: &SignalMessage) -> CallSignalType {
         SignalMessage::Hangup { .. } => CallSignalType::Hangup,
         SignalMessage::Rekey { .. } => CallSignalType::Offer, // reuse
         SignalMessage::QualityUpdate { .. } => CallSignalType::Offer, // reuse
-        SignalMessage::LossRecoveryUpdate { .. } => CallSignalType::Offer, // reuse (telemetry)
         SignalMessage::Ping { .. } | SignalMessage::Pong { .. } => CallSignalType::Offer,
         SignalMessage::AuthToken { .. } => CallSignalType::Offer,
         SignalMessage::Hold => CallSignalType::Hold,
@@ -111,21 +110,7 @@ pub fn signal_to_call_type(signal: &SignalMessage) -> CallSignalType {
         SignalMessage::SessionForward { .. } => CallSignalType::Offer, // reuse
         SignalMessage::SessionForwardAck { .. } => CallSignalType::Offer, // reuse
         SignalMessage::RoomUpdate { .. } => CallSignalType::Offer, // reuse
-        SignalMessage::FederationHello { .. }
-        | SignalMessage::GlobalRoomActive { .. }
-        | SignalMessage::GlobalRoomInactive { .. } => CallSignalType::Offer, // relay-only
-        SignalMessage::DirectCallOffer { .. } => CallSignalType::Offer,
-        SignalMessage::DirectCallAnswer { .. } => CallSignalType::Answer,
-        SignalMessage::CallSetup { .. } => CallSignalType::Offer, // relay-only
-        SignalMessage::CallRinging { .. } => CallSignalType::Ringing,
-        SignalMessage::RegisterPresence { .. }
-        | SignalMessage::RegisterPresenceAck { .. } => CallSignalType::Offer, // relay-only
-        // NAT reflection is a client↔relay control exchange that
-        // never crosses the featherChat bridge — if it ever reaches
-        // this mapper something is wrong, but we still have to give
-        // an answer. "Offer" is the generic catch-all.
-        SignalMessage::Reflect
-        | SignalMessage::ReflectResponse { .. } => CallSignalType::Offer, // control-plane
+        SignalMessage::SetAlias { .. } => CallSignalType::Offer, // reuse
     }
 }
 

crates/wzp-client/src/handshake.rs

@@ -38,9 +38,6 @@ pub async fn perform_handshake(
         ephemeral_pub,
         signature,
         supported_profiles: vec![
-            QualityProfile::STUDIO_64K,
-            QualityProfile::STUDIO_48K,
-            QualityProfile::STUDIO_32K,
             QualityProfile::GOOD,
             QualityProfile::DEGRADED,
             QualityProfile::CATASTROPHIC,

crates/wzp-client/src/lib.rs

@@ -10,22 +10,8 @@
 pub mod audio_io;
 #[cfg(feature = "audio")]
 pub mod audio_ring;
-// VoiceProcessingIO is an Apple Core Audio API — only compile the module
-// when the `vpio` feature is on AND we're targeting macOS. Enabling the
-// feature on Windows/Linux was previously silently broken.
-#[cfg(all(feature = "vpio", target_os = "macos"))]
+#[cfg(feature = "vpio")]
 pub mod audio_vpio;
-// WASAPI-direct capture with Windows's OS-level AEC (AudioCategory_Communications).
-// Only compiled when `windows-aec` feature is on AND target is Windows. The
-// `windows` dependency is itself gated to Windows in Cargo.toml, so enabling
-// this feature on non-Windows targets is a no-op.
-#[cfg(all(feature = "windows-aec", target_os = "windows"))]
-pub mod audio_wasapi;
-// WebRTC AEC3 (Audio Processing Module) wrapper around CPAL capture + playback
-// on Linux. Only compiled when `linux-aec` feature is on AND target is Linux.
-// The webrtc-audio-processing dep is itself gated to Linux in Cargo.toml.
-#[cfg(all(feature = "linux-aec", target_os = "linux"))]
-pub mod audio_linux_aec;
 pub mod bench;
 pub mod call;
 pub mod drift_test;
@@ -35,48 +21,7 @@ pub mod handshake;
 pub mod metrics;
 pub mod sweep;
 
-// AudioPlayback: three possible backends depending on feature flags.
-//   1. Default CPAL (`audio_io::AudioPlayback`) — baseline on every platform.
-//   2. Linux AEC (`audio_linux_aec::LinuxAecPlayback`) — CPAL + WebRTC APM
-//      render-side tee, so echo from speakers gets cancelled from the mic.
-//
-// On macOS and Windows we always use the default CPAL playback because:
-//   - macOS: VoiceProcessingIO handles AEC at the capture side (Apple's
-//     native hardware AEC uses its own reference signal handling).
-//   - Windows: WASAPI AudioCategory_Communications AEC uses the system
-//     render mix as reference — no per-process plumbing needed.
-//
-// Linux is the only platform where the in-app approach is necessary, so
-// the AEC playback path is gated to target_os = "linux".
-
-#[cfg(all(
-    feature = "audio",
-    any(not(feature = "linux-aec"), not(target_os = "linux"))
-))]
-pub use audio_io::AudioPlayback;
-
-#[cfg(all(feature = "linux-aec", target_os = "linux"))]
-pub use audio_linux_aec::LinuxAecPlayback as AudioPlayback;
-
-// AudioCapture: three possible backends depending on feature flags.
-//   1. Default CPAL (`audio_io::AudioCapture`) — baseline on every platform.
-//   2. Windows AEC (`audio_wasapi::WasapiAudioCapture`) — direct WASAPI
-//      with AudioCategory_Communications, OS APO chain does AEC.
-//   3. Linux AEC (`audio_linux_aec::LinuxAecCapture`) — CPAL + WebRTC APM
-//      capture-side echo cancellation using the playback tee as reference.
-// All three expose the same public API (`start`, `ring`, `stop`, `Drop`).
-
-#[cfg(all(
-    feature = "audio",
-    any(not(feature = "windows-aec"), not(target_os = "windows")),
-    any(not(feature = "linux-aec"), not(target_os = "linux"))
-))]
-pub use audio_io::AudioCapture;
-
-#[cfg(all(feature = "windows-aec", target_os = "windows"))]
-pub use audio_wasapi::WasapiAudioCapture as AudioCapture;
-
-#[cfg(all(feature = "linux-aec", target_os = "linux"))]
-pub use audio_linux_aec::LinuxAecCapture as AudioCapture;
+#[cfg(feature = "audio")]
+pub use audio_io::{AudioCapture, AudioPlayback};
 pub use call::{CallConfig, CallDecoder, CallEncoder};
 pub use handshake::perform_handshake;

crates/wzp-client/tests/handshake_integration.rs

@@ -83,12 +83,12 @@ async fn full_handshake_both_sides_derive_same_session() {
 
     // Run client and relay handshakes concurrently.
     let (client_result, relay_result) = tokio::join!(
-        wzp_client::handshake::perform_handshake(client_transport_clone.as_ref(), &client_seed, None),
+        wzp_client::handshake::perform_handshake(client_transport_clone.as_ref(), &client_seed),
         wzp_relay::handshake::accept_handshake(relay_transport_clone.as_ref(), &relay_seed),
     );
 
     let mut client_session = client_result.expect("client handshake should succeed");
-    let (mut relay_session, chosen_profile, _caller_fp, _caller_alias) =
+    let (mut relay_session, chosen_profile) =
         relay_result.expect("relay handshake should succeed");
 
     // Verify a profile was chosen.
@@ -151,7 +151,6 @@ async fn handshake_rejects_tampered_signature() {
             ephemeral_pub,
             signature: bad_signature,
             supported_profiles: vec![wzp_proto::QualityProfile::GOOD],
-            alias: None,
         };
         client_transport_clone
             .send_signal(&offer)

crates/wzp-codec/Cargo.toml

@@ -10,17 +10,8 @@ description = "WarzonePhone audio codec layer — Opus + Codec2 encoding/decodin
 wzp-proto = { workspace = true }
 tracing = { workspace = true }
 
-# Opus bindings — libopus 1.5.2.
-# opusic-c for the encoder (set_dred_duration lives here in Phase 1).
-# opusic-sys for the decoder — we wrap the raw *mut OpusDecoder ourselves
-# because opusic-c::Decoder.inner is pub(crate), blocking the unified
-# decoder + DRED path we need in Phase 3.
-opusic-c = { workspace = true }
-opusic-sys = { workspace = true }
-
-# Zero-cost slice reinterpretation for the i16 ↔ u16 boundary between
-# our PCM buffers and opusic-c's encode API.
-bytemuck = { workspace = true }
+# Opus bindings
+audiopus = { workspace = true }
 
 # Pure-Rust Codec2 implementation
 codec2 = { workspace = true }

crates/wzp-codec/src/adaptive.rs

@@ -199,27 +199,6 @@ impl AdaptiveDecoder {
     fn codec2_frame_samples(&self) -> usize {
         self.codec2.frame_samples()
     }
-
-    /// Reconstruct a lost frame from a previously parsed DRED state.
-    ///
-    /// Phase 3b entry point for gap reconstruction. Dispatches to the
-    /// inner Opus decoder when active. Returns an error if the active
-    /// codec is Codec2 — DRED is libopus-only and has no Codec2 equivalent,
-    /// so callers must fall back to classical PLC on Codec2 tiers.
-    pub fn reconstruct_from_dred(
-        &mut self,
-        state: &crate::dred_ffi::DredState,
-        offset_samples: i32,
-        output: &mut [i16],
-    ) -> Result<usize, CodecError> {
-        if is_codec2(self.active) {
-            return Err(CodecError::DecodeFailed(
-                "DRED reconstruction is Opus-only; Codec2 must use classical PLC".into(),
-            ));
-        }
-        self.opus
-            .reconstruct_from_dred(state, offset_samples, output)
-    }
 }
 
 // ─── Tests ───────────────────────────────────────────────────────────────────

crates/wzp-codec/src/dred_ffi.rs

@@ -1,585 +0,0 @@
-//! Raw opusic-sys FFI wrappers for libopus 1.5.2 decoder + DRED reconstruction.
-//!
-//! # Why this module exists
-//!
-//! We cannot use `opusic_c::Decoder` because its inner `*mut OpusDecoder`
-//! pointer is `pub(crate)` — not reachable from outside the opusic-c crate.
-//! Phase 3 of the DRED integration needs to hand that same pointer to
-//! `opus_decoder_dred_decode`, and running two parallel decoders (one from
-//! opusic-c for normal audio, another from opusic-sys for DRED) would cause
-//! the DRED-only decoder's internal state to drift out of sync with the
-//! audio stream because it would not see normal decode calls.
-//!
-//! The fix is to own the raw decoder ourselves and use the same handle for
-//! both normal decode AND DRED reconstruction. This module is the single
-//! owner of `*mut OpusDecoder`, `*mut OpusDREDDecoder`, and `*mut OpusDRED`
-//! in the WZP workspace.
-//!
-//! # Phase 3a scope
-//!
-//! Phase 0 added `DecoderHandle` (normal decode). Phase 3a adds:
-//! - [`DredDecoderHandle`] — wraps `*mut OpusDREDDecoder` for parsing DRED
-//!   side-channel data out of arriving Opus packets.
-//! - [`DredState`] — wraps `*mut OpusDRED` (a fixed 10,592-byte buffer
-//!   allocated by libopus) that holds parsed DRED state between the parse
-//!   and reconstruct steps.
-//! - [`DredDecoderHandle::parse_into`] — wraps `opus_dred_parse`.
-//! - [`DecoderHandle::reconstruct_from_dred`] — wraps `opus_decoder_dred_decode`.
-//!
-//! The pattern is: on every arriving Opus packet, the receiver calls
-//! `parse_into` with a reusable `DredState`, then stores (seq, state_clone)
-//! in a ring. On detected loss, the receiver computes the offset from the
-//! freshest reachable DRED state and calls `reconstruct_from_dred` to
-//! synthesize the missing audio.
-
-use std::ptr::NonNull;
-
-use opusic_sys::{
-    OPUS_OK, OpusDRED, OpusDREDDecoder, OpusDecoder as RawOpusDecoder, opus_decode,
-    opus_decoder_create, opus_decoder_destroy, opus_decoder_dred_decode, opus_dred_alloc,
-    opus_dred_decoder_create, opus_dred_decoder_destroy, opus_dred_free, opus_dred_parse,
-};
-use wzp_proto::CodecError;
-
-/// libopus operates at 48 kHz for all Opus variants we use.
-const SAMPLE_RATE_HZ: i32 = 48_000;
-/// Mono.
-const CHANNELS: i32 = 1;
-
-/// Safe owner of a `*mut OpusDecoder` allocated via `opus_decoder_create`.
-///
-/// Releases the decoder in `Drop`. All FFI access goes through `&mut self`
-/// methods, so there is no aliasing or race. The raw pointer is exposed via
-/// [`Self::as_raw_ptr`] at a crate-internal visibility for the future Phase 3
-/// DRED reconstruction path — external crates cannot reach it.
-pub struct DecoderHandle {
-    inner: NonNull<RawOpusDecoder>,
-}
-
-impl DecoderHandle {
-    /// Allocate a new Opus decoder at 48 kHz mono.
-    pub fn new() -> Result<Self, CodecError> {
-        let mut error: i32 = OPUS_OK;
-        // SAFETY: opus_decoder_create writes to `error` and returns either a
-        // valid heap pointer or null. We check both before constructing the
-        // NonNull wrapper.
-        let ptr = unsafe { opus_decoder_create(SAMPLE_RATE_HZ, CHANNELS, &mut error) };
-        if error != OPUS_OK {
-            // Even if ptr is non-null on error, libopus contracts guarantee
-            // it is unusable — do not attempt to free it.
-            return Err(CodecError::DecodeFailed(format!(
-                "opus_decoder_create failed: err={error}"
-            )));
-        }
-        let inner = NonNull::new(ptr).ok_or_else(|| {
-            CodecError::DecodeFailed("opus_decoder_create returned null".into())
-        })?;
-        Ok(Self { inner })
-    }
-
-    /// Decode an Opus packet into PCM samples.
-    ///
-    /// `pcm` must have enough capacity for the frame (960 for 20 ms, 1920
-    /// for 40 ms at 48 kHz mono). Returns the number of decoded samples
-    /// per channel — for mono streams this equals the total sample count.
-    pub fn decode(&mut self, packet: &[u8], pcm: &mut [i16]) -> Result<usize, CodecError> {
-        if packet.is_empty() {
-            return Err(CodecError::DecodeFailed("empty packet".into()));
-        }
-        if pcm.is_empty() {
-            return Err(CodecError::DecodeFailed("empty output buffer".into()));
-        }
-        // SAFETY: self.inner is a valid *mut OpusDecoder owned by this struct.
-        // `data` / `pcm` are live Rust slices, so their pointers and lengths
-        // are valid for the duration of the call. libopus reads len bytes
-        // from data and writes up to frame_size samples (per channel) to pcm.
-        let n = unsafe {
-            opus_decode(
-                self.inner.as_ptr(),
-                packet.as_ptr(),
-                packet.len() as i32,
-                pcm.as_mut_ptr(),
-                pcm.len() as i32,
-                /* decode_fec = */ 0,
-            )
-        };
-        if n < 0 {
-            return Err(CodecError::DecodeFailed(format!(
-                "opus_decode failed: err={n}"
-            )));
-        }
-        Ok(n as usize)
-    }
-
-    /// Generate packet-loss concealment audio for a missing frame.
-    ///
-    /// Implemented via `opus_decode` with a null data pointer, per the
-    /// libopus API contract. `pcm` should be sized for the expected frame.
-    pub fn decode_lost(&mut self, pcm: &mut [i16]) -> Result<usize, CodecError> {
-        if pcm.is_empty() {
-            return Err(CodecError::DecodeFailed("empty output buffer".into()));
-        }
-        // SAFETY: same invariants as decode(). libopus documents that passing
-        // a null data pointer with len=0 triggers PLC synthesis into pcm.
-        let n = unsafe {
-            opus_decode(
-                self.inner.as_ptr(),
-                std::ptr::null(),
-                0,
-                pcm.as_mut_ptr(),
-                pcm.len() as i32,
-                /* decode_fec = */ 0,
-            )
-        };
-        if n < 0 {
-            return Err(CodecError::DecodeFailed(format!(
-                "opus_decode PLC failed: err={n}"
-            )));
-        }
-        Ok(n as usize)
-    }
-
-    /// Reconstruct audio from a `DredState` into the `output` buffer.
-    ///
-    /// `offset_samples` is the sample position (positive, measured backward
-    /// from the packet anchor that produced `state`) where reconstruction
-    /// begins. `output.len()` must match the number of samples to synthesize.
-    ///
-    /// The libopus API: `opus_decoder_dred_decode(st, dred, dred_offset, pcm,
-    /// frame_size)` where `dred_offset` is "position of the redundancy to
-    /// decode, in samples before the beginning of the real audio data in the
-    /// packet." Valid values: `0 < offset_samples < state.samples_available()`.
-    ///
-    /// Returns the number of samples actually written (should equal
-    /// `output.len()` on success).
-    pub fn reconstruct_from_dred(
-        &mut self,
-        state: &DredState,
-        offset_samples: i32,
-        output: &mut [i16],
-    ) -> Result<usize, CodecError> {
-        if output.is_empty() {
-            return Err(CodecError::DecodeFailed(
-                "empty reconstruction output buffer".into(),
-            ));
-        }
-        if offset_samples <= 0 {
-            return Err(CodecError::DecodeFailed(format!(
-                "DRED offset must be positive (got {offset_samples})"
-            )));
-        }
-        if offset_samples > state.samples_available() {
-            return Err(CodecError::DecodeFailed(format!(
-                "DRED offset {offset_samples} exceeds available samples {}",
-                state.samples_available()
-            )));
-        }
-        // SAFETY: self.inner is a valid *mut OpusDecoder, state.inner is a
-        // valid *const OpusDRED populated by a prior parse_into call, and
-        // output is a live mutable slice. libopus reads from dred and writes
-        // exactly frame_size samples (the output.len()) to pcm.
-        let n = unsafe {
-            opus_decoder_dred_decode(
-                self.inner.as_ptr(),
-                state.inner.as_ptr(),
-                offset_samples,
-                output.as_mut_ptr(),
-                output.len() as i32,
-            )
-        };
-        if n < 0 {
-            return Err(CodecError::DecodeFailed(format!(
-                "opus_decoder_dred_decode failed: err={n}"
-            )));
-        }
-        Ok(n as usize)
-    }
-}
-
-impl Drop for DecoderHandle {
-    fn drop(&mut self) {
-        // SAFETY: we own the pointer and no further access happens after
-        // this call because Drop consumes self.
-        unsafe { opus_decoder_destroy(self.inner.as_ptr()) };
-    }
-}
-
-// SAFETY: The underlying OpusDecoder is a plain heap allocation with no
-// thread-local or lock-free state. It is safe to move between threads
-// (Send), and all method access is gated by &mut self so Rust's borrow
-// checker prevents simultaneous access from multiple threads (Sync).
-unsafe impl Send for DecoderHandle {}
-unsafe impl Sync for DecoderHandle {}
-
-// ─── DRED decoder (parser) ──────────────────────────────────────────────────
-
-/// Safe owner of a `*mut OpusDREDDecoder` allocated via
-/// `opus_dred_decoder_create`.
-///
-/// The DRED decoder is a **separate** libopus object from the regular
-/// `OpusDecoder`. It's used exclusively for parsing DRED side-channel data
-/// out of arriving Opus packets via [`Self::parse_into`]. Actual audio
-/// reconstruction from the parsed state uses the regular `DecoderHandle`
-/// via [`DecoderHandle::reconstruct_from_dred`].
-pub struct DredDecoderHandle {
-    inner: NonNull<OpusDREDDecoder>,
-}
-
-impl DredDecoderHandle {
-    /// Allocate a new DRED decoder.
-    pub fn new() -> Result<Self, CodecError> {
-        let mut error: i32 = OPUS_OK;
-        // SAFETY: opus_dred_decoder_create writes to `error` and returns
-        // either a valid heap pointer or null. Both are checked.
-        let ptr = unsafe { opus_dred_decoder_create(&mut error) };
-        if error != OPUS_OK {
-            return Err(CodecError::DecodeFailed(format!(
-                "opus_dred_decoder_create failed: err={error}"
-            )));
-        }
-        let inner = NonNull::new(ptr).ok_or_else(|| {
-            CodecError::DecodeFailed("opus_dred_decoder_create returned null".into())
-        })?;
-        Ok(Self { inner })
-    }
-
-    /// Parse DRED side-channel data from an Opus packet into `state`.
-    ///
-    /// Returns the number of samples of audio history available for
-    /// reconstruction, or 0 if the packet carries no DRED data. Subsequent
-    /// `DecoderHandle::reconstruct_from_dred` calls using this `state` can
-    /// reconstruct any sample position in `(0, samples_available]`.
-    ///
-    /// libopus API: `opus_dred_parse(dred_dec, dred, data, len,
-    /// max_dred_samples, sampling_rate, dred_end, defer_processing)`. We
-    /// pass `max_dred_samples = 48000` (1 s at 48 kHz, the DRED maximum),
-    /// `sampling_rate = 48000`, `defer_processing = 0` (process immediately).
-    /// The `dred_end` output is the silence gap at the tail of the DRED
-    /// window; we subtract it from the total offset to give callers the
-    /// truly usable sample count.
-    pub fn parse_into(
-        &mut self,
-        state: &mut DredState,
-        packet: &[u8],
-    ) -> Result<i32, CodecError> {
-        if packet.is_empty() {
-            state.samples_available = 0;
-            return Ok(0);
-        }
-        let mut dred_end: i32 = 0;
-        // SAFETY: self.inner is a valid *mut OpusDREDDecoder; state.inner is
-        // a valid *mut OpusDRED allocated via opus_dred_alloc; packet is a
-        // live slice; dred_end is a stack int. libopus reads packet bytes
-        // and writes parsed DRED state into *state.inner.
-        let ret = unsafe {
-            opus_dred_parse(
-                self.inner.as_ptr(),
-                state.inner.as_ptr(),
-                packet.as_ptr(),
-                packet.len() as i32,
-                /* max_dred_samples = */ 48_000, // 1s max per libopus 1.5
-                /* sampling_rate = */ 48_000,
-                &mut dred_end,
-                /* defer_processing = */ 0,
-            )
-        };
-        if ret < 0 {
-            state.samples_available = 0;
-            return Err(CodecError::DecodeFailed(format!(
-                "opus_dred_parse failed: err={ret}"
-            )));
-        }
-        // ret is the positive offset of the first decodable DRED sample,
-        // or 0 if no DRED is present. dred_end is the silence gap at the
-        // tail. The usable sample range is (dred_end, ret], so the count
-        // of usable samples is ret - dred_end. We store `ret` as the max
-        // usable offset — callers should pass dred_offset values in the
-        // range (dred_end, ret] to reconstruct_from_dred. For simplicity
-        // we expose just samples_available = ret and let callers treat
-        // the full window as valid (the silence gap is small and libopus
-        // handles minor boundary cases gracefully).
-        state.samples_available = ret;
-        Ok(ret)
-    }
-}
-
-impl Drop for DredDecoderHandle {
-    fn drop(&mut self) {
-        // SAFETY: we own the pointer and no further access happens after
-        // this call because Drop consumes self.
-        unsafe { opus_dred_decoder_destroy(self.inner.as_ptr()) };
-    }
-}
-
-// SAFETY: same reasoning as DecoderHandle — heap allocation with no
-// thread-local state, &mut self access discipline prevents races.
-unsafe impl Send for DredDecoderHandle {}
-unsafe impl Sync for DredDecoderHandle {}
-
-// ─── DRED state buffer ──────────────────────────────────────────────────────
-
-/// Safe owner of a `*mut OpusDRED` allocated via `opus_dred_alloc`.
-///
-/// Holds a fixed-size (10,592-byte per libopus 1.5) buffer that
-/// `DredDecoderHandle::parse_into` populates from an Opus packet. The state
-/// is reusable — the caller can call `parse_into` again on the same
-/// `DredState` to overwrite it with a fresh packet's data.
-///
-/// `samples_available` tracks the last-parsed result so reconstruction
-/// callers don't need to thread the return value separately. A fresh
-/// state (before any `parse_into`) has `samples_available == 0`.
-pub struct DredState {
-    inner: NonNull<OpusDRED>,
-    samples_available: i32,
-}
-
-impl DredState {
-    /// Allocate a new DRED state buffer.
-    pub fn new() -> Result<Self, CodecError> {
-        let mut error: i32 = OPUS_OK;
-        // SAFETY: opus_dred_alloc writes to `error` and returns either a
-        // valid heap pointer or null.
-        let ptr = unsafe { opus_dred_alloc(&mut error) };
-        if error != OPUS_OK {
-            return Err(CodecError::DecodeFailed(format!(
-                "opus_dred_alloc failed: err={error}"
-            )));
-        }
-        let inner = NonNull::new(ptr)
-            .ok_or_else(|| CodecError::DecodeFailed("opus_dred_alloc returned null".into()))?;
-        Ok(Self {
-            inner,
-            samples_available: 0,
-        })
-    }
-
-    /// How many samples of audio history this state currently covers.
-    ///
-    /// Returns 0 if the state is fresh or the last parse found no DRED
-    /// data. Otherwise returns the positive offset set by the most recent
-    /// `DredDecoderHandle::parse_into` call — the maximum valid
-    /// `offset_samples` value for `DecoderHandle::reconstruct_from_dred`.
-    pub fn samples_available(&self) -> i32 {
-        self.samples_available
-    }
-
-    /// Reset the state to "fresh" without freeing the underlying buffer.
-    /// The next `parse_into` will overwrite the contents.
-    pub fn reset(&mut self) {
-        self.samples_available = 0;
-    }
-}
-
-impl Drop for DredState {
-    fn drop(&mut self) {
-        // SAFETY: we own the pointer and no further access happens after
-        // this call because Drop consumes self.
-        unsafe { opus_dred_free(self.inner.as_ptr()) };
-    }
-}
-
-// SAFETY: same reasoning as DecoderHandle.
-unsafe impl Send for DredState {}
-unsafe impl Sync for DredState {}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn decoder_handle_creates_and_drops() {
-        let handle = DecoderHandle::new().expect("decoder create");
-        // Dropping the handle must not panic or leak — validated by miri
-        // and the absence of sanitizer complaints in CI.
-        drop(handle);
-    }
-
-    #[test]
-    fn decode_lost_produces_full_frame_of_silence_on_cold_start() {
-        let mut handle = DecoderHandle::new().unwrap();
-        // 20 ms @ 48 kHz mono.
-        let mut pcm = vec![0i16; 960];
-        let n = handle.decode_lost(&mut pcm).unwrap();
-        assert_eq!(n, 960);
-        // On a fresh decoder, PLC output is silence (no past audio to extend).
-        assert!(pcm.iter().all(|&s| s == 0));
-    }
-
-    #[test]
-    fn decode_empty_packet_errors() {
-        let mut handle = DecoderHandle::new().unwrap();
-        let mut pcm = vec![0i16; 960];
-        let err = handle.decode(&[], &mut pcm);
-        assert!(err.is_err());
-    }
-
-    // ─── Phase 3a — DRED decoder + state ────────────────────────────────────
-
-    #[test]
-    fn dred_decoder_handle_creates_and_drops() {
-        let h = DredDecoderHandle::new().expect("dred decoder create");
-        drop(h);
-    }
-
-    #[test]
-    fn dred_state_creates_and_drops() {
-        let s = DredState::new().expect("dred state alloc");
-        assert_eq!(s.samples_available(), 0);
-        drop(s);
-    }
-
-    #[test]
-    fn dred_state_reset_zeroes_counter() {
-        let mut s = DredState::new().unwrap();
-        s.samples_available = 480; // pretend a parse populated it
-        assert_eq!(s.samples_available(), 480);
-        s.reset();
-        assert_eq!(s.samples_available(), 0);
-    }
-
-    /// Phase 3a end-to-end: encode a DRED-enabled stream, parse state out
-    /// of packets, and reconstruct audio at a past offset. Validates the
-    /// full parse → reconstruct pipeline against a real libopus 1.5.2
-    /// encoder so we catch FFI-layer bugs early.
-    #[test]
-    fn dred_parse_and_reconstruct_roundtrip() {
-        use crate::opus_enc::OpusEncoder;
-        use wzp_proto::{AudioEncoder, QualityProfile};
-
-        // Encoder with DRED at Opus 24k / 200 ms duration (Phase 1 default
-        // for GOOD profile). The loss floor is 5% per Phase 1.
-        let mut enc = OpusEncoder::new(QualityProfile::GOOD).unwrap();
-
-        // Decode-side handles.
-        let mut dec = DecoderHandle::new().unwrap();
-        let mut dred_dec = DredDecoderHandle::new().unwrap();
-        let mut state = DredState::new().unwrap();
-
-        // Generate 60 frames (1.2 s) of a voice-like 300 Hz sine wave so
-        // the encoder's DRED emitter has real content to encode rather
-        // than compressing silence.
-        let frame_len = 960usize; // 20 ms @ 48 kHz
-        let make_frame = |offset: usize| -> Vec<i16> {
-            (0..frame_len)
-                .map(|i| {
-                    let t = (offset + i) as f64 / 48_000.0;
-                    (8000.0 * (2.0 * std::f64::consts::PI * 300.0 * t).sin()) as i16
-                })
-                .collect()
-        };
-
-        // Track the freshest packet that carried non-zero DRED state.
-        let mut best_samples_available = 0;
-        let mut best_packet: Option<Vec<u8>> = None;
-
-        for frame_idx in 0..60 {
-            let pcm = make_frame(frame_idx * frame_len);
-            let mut encoded = vec![0u8; 512];
-            let n = enc.encode(&pcm, &mut encoded).unwrap();
-            encoded.truncate(n);
-
-            // Run the packet through the normal decode path so dec's
-            // internal state mirrors the full stream — this is necessary
-            // for DRED reconstruction to produce meaningful output.
-            let mut decoded = vec![0i16; frame_len];
-            dec.decode(&encoded, &mut decoded).unwrap();
-
-            // Parse DRED state out of the same packet. Early packets may
-            // have samples_available == 0 while the DRED encoder warms up;
-            // later packets should carry the full window.
-            match dred_dec.parse_into(&mut state, &encoded) {
-                Ok(available) => {
-                    if available > best_samples_available {
-                        best_samples_available = available;
-                        best_packet = Some(encoded.clone());
-                    }
-                }
-                Err(e) => panic!("parse_into errored unexpectedly: {e:?}"),
-            }
-        }
-
-        // By the time we're 60 frames in, DRED should have emitted data.
-        assert!(
-            best_samples_available > 0,
-            "DRED emitted zero samples across 60 frames — the encoder isn't \
-             producing DRED bytes (check set_dred_duration and packet_loss floor)"
-        );
-
-        // Parse the best packet into a fresh state and reconstruct some
-        // audio from somewhere inside its DRED window. We use frame_len/2
-        // as the offset to pick a point squarely inside the reconstructable
-        // range rather than at an edge.
-        let packet = best_packet.expect("at least one packet had DRED state");
-        let mut fresh_state = DredState::new().unwrap();
-        let available = dred_dec.parse_into(&mut fresh_state, &packet).unwrap();
-        assert!(available > 0, "re-parse of known-good packet returned 0");
-
-        // Need a decoder that's in the right state to reconstruct — rewind
-        // by creating a fresh one and feeding it the same stream up to the
-        // point of the best packet. Simpler: just use a fresh decoder and
-        // accept that the reconstructed samples may not be phase-matched.
-        // The test here only asserts *non-silent energy*, not signal fidelity.
-        let mut recon_dec = DecoderHandle::new().unwrap();
-        // Warm up the decoder with one frame so its internal state is valid.
-        let warmup_pcm = vec![0i16; frame_len];
-        let warmup_encoded = {
-            let mut warmup_enc = OpusEncoder::new(QualityProfile::GOOD).unwrap();
-            let mut buf = vec![0u8; 512];
-            let n = warmup_enc.encode(&warmup_pcm, &mut buf).unwrap();
-            buf.truncate(n);
-            buf
-        };
-        let mut throwaway = vec![0i16; frame_len];
-        let _ = recon_dec.decode(&warmup_encoded, &mut throwaway);
-
-        // Reconstruct 20 ms from some position inside the DRED window.
-        let offset = (available / 2).max(480).min(available);
-        let mut recon_pcm = vec![0i16; frame_len];
-        let n = recon_dec
-            .reconstruct_from_dred(&fresh_state, offset, &mut recon_pcm)
-            .expect("reconstruct_from_dred failed");
-        assert_eq!(n, frame_len);
-
-        // Energy check: reconstructed audio should not be all zeros. A
-        // loose threshold — the DRED reconstruction won't be phase-matched
-        // to our sine wave because we fed a cold decoder only one warmup
-        // frame, but it should still produce non-silent speech-like output
-        // since the DRED state was parsed from real speech content.
-        let energy: u64 = recon_pcm.iter().map(|&s| (s as i32).unsigned_abs() as u64).sum();
-        assert!(
-            energy > 0,
-            "reconstructed audio has zero total energy — DRED reconstruction produced silence"
-        );
-    }
-
-    /// A second roundtrip variant: offset too large errors cleanly rather
-    /// than crashing the FFI.
-    #[test]
-    fn reconstruct_with_out_of_range_offset_errors() {
-        let mut dec = DecoderHandle::new().unwrap();
-        let state = DredState::new().unwrap();
-        // state has samples_available == 0 (fresh), so any positive offset
-        // should be out of range.
-        let mut out = vec![0i16; 960];
-        let err = dec.reconstruct_from_dred(&state, 480, &mut out);
-        assert!(err.is_err());
-    }
-
-    #[test]
-    fn reconstruct_with_zero_offset_errors() {
-        let mut dec = DecoderHandle::new().unwrap();
-        let state = DredState::new().unwrap();
-        let mut out = vec![0i16; 960];
-        let err = dec.reconstruct_from_dred(&state, 0, &mut out);
-        assert!(err.is_err());
-    }
-
-    #[test]
-    fn dred_parse_empty_packet_returns_zero() {
-        let mut dred_dec = DredDecoderHandle::new().unwrap();
-        let mut state = DredState::new().unwrap();
-        let result = dred_dec.parse_into(&mut state, &[]).unwrap();
-        assert_eq!(result, 0);
-        assert_eq!(state.samples_available(), 0);
-    }
-}

crates/wzp-codec/src/lib.rs

@@ -15,7 +15,6 @@ pub mod agc;
 pub mod codec2_dec;
 pub mod codec2_enc;
 pub mod denoise;
-pub mod dred_ffi;
 pub mod opus_dec;
 pub mod opus_enc;
 pub mod resample;
@@ -28,26 +27,6 @@ pub use denoise::NoiseSupressor;
 pub use silence::{ComfortNoise, SilenceDetector};
 pub use wzp_proto::{AudioDecoder, AudioEncoder, CodecId, QualityProfile};
 
-use std::sync::atomic::{AtomicBool, Ordering};
-
-/// Global verbose-logging flag for DRED. Off by default — when enabled
-/// (via the GUI debug toggle wired through Tauri), the encoder logs its
-/// DRED config + libopus version, and the recv path logs every DRED
-/// reconstruction, classical PLC fill, and parse heartbeat. Off in
-/// "normal" mode keeps logcat clean.
-static DRED_VERBOSE_LOGS: AtomicBool = AtomicBool::new(false);
-
-/// Returns whether DRED verbose logging is currently enabled.
-#[inline]
-pub fn dred_verbose_logs() -> bool {
-    DRED_VERBOSE_LOGS.load(Ordering::Relaxed)
-}
-
-/// Enable/disable DRED verbose logging at runtime.
-pub fn set_dred_verbose_logs(enabled: bool) {
-    DRED_VERBOSE_LOGS.store(enabled, Ordering::Relaxed);
-}
-
 /// Create an adaptive encoder starting at the given quality profile.
 ///
 /// The returned encoder accepts 48 kHz mono PCM regardless of the active

crates/wzp-codec/src/opus_dec.rs

@@ -1,32 +1,30 @@
-//! Opus decoder built on top of the raw opusic-sys `DecoderHandle`.
-//!
-//! Phase 0 of the DRED integration: we went straight to a custom
-//! `DecoderHandle` instead of `opusic_c::Decoder` because the latter's
-//! inner pointer is `pub(crate)` and we need to reach it in Phase 3 for
-//! `opus_decoder_dred_decode`. See `dred_ffi.rs` for the rationale and
-//! `docs/PRD-dred-integration.md` for the full plan.
+//! Opus decoder wrapping the `audiopus` crate.
 
-use crate::dred_ffi::{DecoderHandle, DredState};
+use audiopus::coder::Decoder;
+use audiopus::{Channels, MutSignals, SampleRate};
+use audiopus::packet::Packet;
 use wzp_proto::{AudioDecoder, CodecError, CodecId, QualityProfile};
 
-/// Opus decoder implementing [`AudioDecoder`].
+/// Opus decoder implementing `AudioDecoder`.
 ///
-/// Operates at 48 kHz mono output. 20 ms and 40 ms frames supported via
-/// the active `QualityProfile`. Behavior is intentionally identical to
-/// the pre-swap audiopus-based decoder at this phase — DRED reconstruction
-/// lands in Phase 3.
+/// Operates at 48 kHz mono output.
 pub struct OpusDecoder {
-    inner: DecoderHandle,
+    inner: Decoder,
     codec_id: CodecId,
     frame_duration_ms: u8,
 }
 
+// SAFETY: Same reasoning as OpusEncoder — exclusive access via &mut self.
+unsafe impl Sync for OpusDecoder {}
+
 impl OpusDecoder {
     /// Create a new Opus decoder for the given quality profile.
     pub fn new(profile: QualityProfile) -> Result<Self, CodecError> {
-        let inner = DecoderHandle::new()?;
+        let decoder = Decoder::new(SampleRate::Hz48000, Channels::Mono)
+            .map_err(|e| CodecError::DecodeFailed(format!("opus decoder init: {e}")))?;
+
         Ok(Self {
-            inner,
+            inner: decoder,
             codec_id: profile.codec,
             frame_duration_ms: profile.frame_duration_ms,
         })
@@ -36,24 +34,6 @@ impl OpusDecoder {
     pub fn frame_samples(&self) -> usize {
         (48_000 * self.frame_duration_ms as usize) / 1000
     }
-
-    /// Reconstruct a lost frame from a previously parsed `DredState`.
-    ///
-    /// Phase 3b entry point: callers (CallDecoder / engine.rs) use this to
-    /// synthesize audio for gaps detected by the jitter buffer when DRED
-    /// side-channel state from a later-arriving packet covers the gap's
-    /// sample offset. `offset_samples` is measured backward from the anchor
-    /// packet that produced `state`. See `DecoderHandle::reconstruct_from_dred`
-    /// for the full semantics.
-    pub fn reconstruct_from_dred(
-        &mut self,
-        state: &DredState,
-        offset_samples: i32,
-        output: &mut [i16],
-    ) -> Result<usize, CodecError> {
-        self.inner
-            .reconstruct_from_dred(state, offset_samples, output)
-    }
 }
 
 impl AudioDecoder for OpusDecoder {
@@ -65,7 +45,15 @@ impl AudioDecoder for OpusDecoder {
                 pcm.len()
             )));
         }
-        self.inner.decode(encoded, pcm)
+        let packet = Packet::try_from(encoded)
+            .map_err(|e| CodecError::DecodeFailed(format!("invalid packet: {e}")))?;
+        let signals = MutSignals::try_from(pcm)
+            .map_err(|e| CodecError::DecodeFailed(format!("output signals: {e}")))?;
+        let n = self
+            .inner
+            .decode(Some(packet), signals, false)
+            .map_err(|e| CodecError::DecodeFailed(format!("opus decode: {e}")))?;
+        Ok(n)
     }
 
     fn decode_lost(&mut self, pcm: &mut [i16]) -> Result<usize, CodecError> {
@@ -76,7 +64,13 @@ impl AudioDecoder for OpusDecoder {
                 pcm.len()
             )));
         }
-        self.inner.decode_lost(pcm)
+        let signals = MutSignals::try_from(pcm)
+            .map_err(|e| CodecError::DecodeFailed(format!("output signals: {e}")))?;
+        let n = self
+            .inner
+            .decode(None, signals, false)
+            .map_err(|e| CodecError::DecodeFailed(format!("opus PLC: {e}")))?;
+        Ok(n)
     }
 
     fn codec_id(&self) -> CodecId {
@@ -85,7 +79,7 @@ impl AudioDecoder for OpusDecoder {
 
     fn set_profile(&mut self, profile: QualityProfile) -> Result<(), CodecError> {
         match profile.codec {
-            c if c.is_opus() => {
+            CodecId::Opus24k | CodecId::Opus16k | CodecId::Opus6k => {
                 self.codec_id = profile.codec;
                 self.frame_duration_ms = profile.frame_duration_ms;
                 Ok(())

crates/wzp-codec/src/opus_enc.rs

@@ -1,220 +1,58 @@
-//! Opus encoder wrapping the `opusic-c` crate (libopus 1.5.2).
-//!
-//! Phase 1 of the DRED integration: encoder-side DRED is enabled on every
-//! Opus profile with a tiered duration (studio 100 ms / normal 200 ms /
-//! degraded 500 ms), and Opus inband FEC (LBRR) is disabled because DRED
-//! is the stronger mechanism for the same failure mode. The legacy behavior
-//! is preserved behind the `AUDIO_USE_LEGACY_FEC` environment variable as a
-//! runtime escape hatch for rollout. See `docs/PRD-dred-integration.md`.
-//!
-//! # DRED duration policy
-//!
-//! Rationale from the PRD:
-//! - Studio tiers (Opus 32k/48k/64k): 100 ms — loss is rare on high-quality
-//!   networks; short window keeps decoder CPU modest.
-//! - Normal tiers (Opus 16k/24k): 200 ms — balanced baseline covering common
-//!   VoIP loss patterns (20–150 ms bursts from wifi roam, transient congestion).
-//! - Degraded tier (Opus 6k): 500 ms — users on 6k are by definition on a
-//!   bad link; longer DRED buys maximum burst resilience where it matters.
-//!
-//! # Why the 15% packet loss floor
-//!
-//! libopus 1.5's DRED emitter is gated on `OPUS_SET_PACKET_LOSS_PERC` and
-//! scales the emitted window proportionally to the assumed loss:
-//!
-//! ```text
-//!   loss_pct  samples_available    effective_ms
-//!   5%         720                   15
-//!   10%        2640                  55
-//!   15%        4560                  95
-//!   20%        6480                 135
-//!   25%+       8400 (capped)        175  (≈ 87% of the 200ms configured max)
-//! ```
-//!
-//! Measured empirically against libopus 1.5.2 on Opus 24k / 200 ms DRED
-//! duration during Phase 3b. At 5% loss the window is only 15 ms — too
-//! small to even reconstruct a single 20 ms Opus frame. 15% gives 95 ms
-//! (enough for single-frame recovery plus modest burst margin) while
-//! keeping the bitrate overhead modest compared to 25%. Real measurements
-//! from the quality adapter override upward when loss exceeds the floor.
+//! Opus encoder wrapping the `audiopus` crate.
 
-use std::sync::OnceLock;
-
-use opusic_c::{Application, Bitrate, Channels, Encoder, InbandFec, SampleRate, Signal};
-use tracing::{debug, info, warn};
+use audiopus::coder::Encoder;
+use audiopus::{Application, Bitrate, Channels, SampleRate, Signal};
+use tracing::debug;
 use wzp_proto::{AudioEncoder, CodecError, CodecId, QualityProfile};
 
-/// Logged exactly once per process the first time an OpusEncoder is built.
-/// Confirms that libopus 1.5.2 (the version with DRED) is actually linked
-/// at runtime — invaluable when chasing "is the new codec loaded?"
-/// regressions on Android, where the only debug surface is logcat.
-static LIBOPUS_VERSION_LOGGED: OnceLock<()> = OnceLock::new();
-
-/// Minimum `OPUS_SET_PACKET_LOSS_PERC` value used in DRED mode. libopus
-/// scales the DRED emission window with the assumed loss percentage:
-/// empirically, 5% gives a 15 ms window (useless), 10% gives 55 ms, 15%
-/// gives 95 ms, and 25%+ saturates the configured max (~175 ms at 200 ms
-/// duration). 15% is the minimum value that produces a DRED window larger
-/// than a single 20 ms frame, making it the minimum floor that actually
-/// gives DRED something useful to reconstruct. Real loss measurements from
-/// the quality adapter override this upward.
-const DRED_LOSS_FLOOR_PCT: u8 = 15;
-
-/// Environment variable that reverts Phase 1 behavior to Phase 0 (inband FEC
-/// on, DRED off, no loss floor). Read once per encoder construction.
-const LEGACY_FEC_ENV: &str = "AUDIO_USE_LEGACY_FEC";
-
-/// Returns the DRED duration in 10 ms frame units for a given Opus codec.
-///
-/// Unit: each frame is 10 ms, so the max value of 104 corresponds to 1040 ms
-/// of reconstructable history. Returns 0 for non-Opus codecs (DRED is not
-/// emitted by the libopus encoder in that case anyway, but we avoid a
-/// pointless FFI call).
-///
-/// See the DRED duration policy in the module docs for per-tier rationale.
-pub fn dred_duration_for(codec: CodecId) -> u8 {
-    match codec {
-        // Studio tiers — loss is rare, short window.
-        CodecId::Opus32k | CodecId::Opus48k | CodecId::Opus64k => 10,
-        // Normal tiers — balanced baseline.
-        CodecId::Opus16k | CodecId::Opus24k => 20,
-        // Degraded tier — maximum burst resilience.
-        CodecId::Opus6k => 50,
-        // Non-Opus (Codec2 / CN): DRED is N/A.
-        CodecId::Codec2_1200 | CodecId::Codec2_3200 | CodecId::ComfortNoise => 0,
-    }
-}
-
-/// Returns whether the legacy-FEC escape hatch is active.
-///
-/// Read from `AUDIO_USE_LEGACY_FEC`. Any non-empty value activates legacy
-/// mode; unset or empty leaves DRED enabled.
-fn read_legacy_fec_env() -> bool {
-    match std::env::var(LEGACY_FEC_ENV) {
-        Ok(v) => !v.is_empty() && v != "0" && v.to_ascii_lowercase() != "false",
-        Err(_) => false,
-    }
-}
-
 /// Opus encoder implementing `AudioEncoder`.
 ///
-/// Operates at 48 kHz mono. Supports 20 ms and 40 ms frames via the active
-/// `QualityProfile`.
+/// Operates at 48 kHz mono. Supports frame sizes of 20 ms (960 samples)
+/// and 40 ms (1920 samples).
 pub struct OpusEncoder {
     inner: Encoder,
     codec_id: CodecId,
     frame_duration_ms: u8,
-    /// When `true`, revert to the Phase 0 behavior: inband FEC Mode1, DRED
-    /// disabled, no loss floor. Captured at construction time and not
-    /// re-read mid-call.
-    legacy_fec_mode: bool,
 }
 
 // SAFETY: OpusEncoder is only used via `&mut self` methods. The inner
-// opusic-c Encoder wraps a non-null pointer that is !Sync by default,
-// but we never share it across threads without exclusive access.
+// audiopus Encoder contains a raw pointer that is !Sync, but we never
+// share it across threads without exclusive access.
 unsafe impl Sync for OpusEncoder {}
 
 impl OpusEncoder {
     /// Create a new Opus encoder for the given quality profile.
     pub fn new(profile: QualityProfile) -> Result<Self, CodecError> {
-        // opusic-c argument order: (Channels, SampleRate, Application)
-        // — different from audiopus's (SampleRate, Channels, Application).
-        let encoder = Encoder::new(Channels::Mono, SampleRate::Hz48000, Application::Voip)
-            .map_err(|e| CodecError::EncodeFailed(format!("opus encoder init: {e:?}")))?;
-
-        let legacy_fec_mode = read_legacy_fec_env();
-        if legacy_fec_mode {
-            warn!(
-                "AUDIO_USE_LEGACY_FEC active — reverting Opus encoder to Phase 0 \
-                 behavior (inband FEC Mode1, no DRED)"
-            );
-        }
+        let encoder = Encoder::new(SampleRate::Hz48000, Channels::Mono, Application::Voip)
+            .map_err(|e| CodecError::EncodeFailed(format!("opus encoder init: {e}")))?;
 
         let mut enc = Self {
             inner: encoder,
             codec_id: profile.codec,
             frame_duration_ms: profile.frame_duration_ms,
-            legacy_fec_mode,
         };
-
-        // Common setup — bitrate, DTX, signal hint, complexity. These are
-        // identical regardless of the protection mode below.
         enc.apply_bitrate(profile.codec)?;
+        enc.set_inband_fec(true);
         enc.set_dtx(true);
+
+        // Voice signal type hint for better compression
         enc.inner
             .set_signal(Signal::Voice)
-            .map_err(|e| CodecError::EncodeFailed(format!("set signal: {e:?}")))?;
+            .map_err(|e| CodecError::EncodeFailed(format!("set signal: {e}")))?;
+
+        // Default complexity 7 — good quality/CPU trade-off for VoIP
         enc.inner
             .set_complexity(7)
-            .map_err(|e| CodecError::EncodeFailed(format!("set complexity: {e:?}")))?;
-
-        // Protection mode: DRED (Phase 1 default) or legacy inband FEC.
-        enc.apply_protection_mode(profile.codec)?;
+            .map_err(|e| CodecError::EncodeFailed(format!("set complexity: {e}")))?;
 
         Ok(enc)
     }
 
-    /// Configure the protection mode for the active codec.
-    ///
-    /// In DRED mode (default): disable inband FEC, set DRED duration for the
-    /// codec tier, clamp packet_loss to the 5% floor so DRED stays active.
-    ///
-    /// In legacy mode: enable inband FEC Mode1 (Phase 0 behavior), leave
-    /// DRED and packet_loss at libopus defaults.
-    fn apply_protection_mode(&mut self, codec: CodecId) -> Result<(), CodecError> {
-        if self.legacy_fec_mode {
-            self.inner
-                .set_inband_fec(InbandFec::Mode1)
-                .map_err(|e| CodecError::EncodeFailed(format!("set inband FEC: {e:?}")))?;
-            // Leave DRED at 0 and packet_loss at default — matches Phase 0.
-            return Ok(());
-        }
-
-        // DRED path: disable the overlapping inband FEC, enable DRED with
-        // per-profile duration, floor packet_loss so DRED emits.
-        self.inner
-            .set_inband_fec(InbandFec::Off)
-            .map_err(|e| CodecError::EncodeFailed(format!("set inband FEC off: {e:?}")))?;
-
-        let dred_frames = dred_duration_for(codec);
-        self.inner
-            .set_dred_duration(dred_frames)
-            .map_err(|e| CodecError::EncodeFailed(format!("set DRED duration: {e:?}")))?;
-
-        self.inner
-            .set_packet_loss(DRED_LOSS_FLOOR_PCT)
-            .map_err(|e| CodecError::EncodeFailed(format!("set packet loss floor: {e:?}")))?;
-
-        // Both of these are gated behind the GUI debug toggle so logcat
-        // stays clean in normal mode. Flip "DRED verbose logs" in the
-        // settings panel to see the per-encoder config + libopus version.
-        if crate::dred_verbose_logs() {
-            info!(
-                codec = ?codec,
-                dred_frames,
-                dred_ms = dred_frames as u32 * 10,
-                loss_floor_pct = DRED_LOSS_FLOOR_PCT,
-                "opus encoder: DRED enabled"
-            );
-
-            // One-shot logging of the linked libopus version so we can
-            // confirm at a glance that opusic-c (libopus 1.5.2) is loaded.
-            // Pre-Phase-0 audiopus shipped libopus 1.3 which has no DRED;
-            // if this log says "libopus 1.3" something is very wrong.
-            LIBOPUS_VERSION_LOGGED.get_or_init(|| {
-                info!(libopus_version = %opusic_c::version(), "linked libopus version");
-            });
-        }
-
-        Ok(())
-    }
-
     fn apply_bitrate(&mut self, codec: CodecId) -> Result<(), CodecError> {
-        let bps = codec.bitrate_bps();
+        let bps = codec.bitrate_bps() as i32;
         self.inner
-            .set_bitrate(Bitrate::Value(bps))
-            .map_err(|e| CodecError::EncodeFailed(format!("set bitrate: {e:?}")))?;
+            .set_bitrate(Bitrate::BitsPerSecond(bps))
+            .map_err(|e| CodecError::EncodeFailed(format!("set bitrate: {e}")))?;
         debug!(bitrate_bps = bps, "opus encoder bitrate set");
         Ok(())
     }
@@ -233,36 +71,10 @@ impl OpusEncoder {
 
     /// Hint the encoder about expected packet loss percentage (0-100).
     ///
-    /// In DRED mode, the value is floored at `DRED_LOSS_FLOOR_PCT` so the
-    /// encoder never drops DRED emission even on a perfect network. Real
-    /// loss measurements from the quality adapter override upward.
-    ///
-    /// In legacy mode, the value is passed through unchanged (min 0, max 100).
+    /// Higher values cause the encoder to use more redundancy to survive
+    /// packet loss, at the expense of slightly higher bitrate.
     pub fn set_expected_loss(&mut self, loss_pct: u8) {
-        let clamped = if self.legacy_fec_mode {
-            loss_pct.min(100)
-        } else {
-            loss_pct.max(DRED_LOSS_FLOOR_PCT).min(100)
-        };
-        let _ = self.inner.set_packet_loss(clamped);
-    }
-
-    /// Set the DRED duration in 10 ms frame units (0 disables, max 104).
-    ///
-    /// No-op in legacy mode. Normally driven automatically by the active
-    /// quality profile via `apply_protection_mode`; this setter exists for
-    /// tests and for the rare case where a caller needs to override the
-    /// per-profile default.
-    pub fn set_dred_duration(&mut self, frames: u8) {
-        if self.legacy_fec_mode {
-            return;
-        }
-        let _ = self.inner.set_dred_duration(frames.min(104));
-    }
-
-    /// Test/introspection accessor: whether legacy FEC mode is active.
-    pub fn is_legacy_fec_mode(&self) -> bool {
-        self.legacy_fec_mode
+        let _ = self.inner.set_packet_loss_perc(loss_pct.min(100));
     }
 }
 
@@ -275,14 +87,10 @@ impl AudioEncoder for OpusEncoder {
                 pcm.len()
             )));
         }
-        // opusic-c takes &[u16] for the sample input. Bit pattern is
-        // identical to i16 — the cast is zero-cost and the encoder
-        // interprets the bytes the same way as libopus internally.
-        let pcm_u16: &[u16] = bytemuck::cast_slice(pcm);
         let n = self
             .inner
-            .encode_to_slice(pcm_u16, out)
-            .map_err(|e| CodecError::EncodeFailed(format!("opus encode: {e:?}")))?;
+            .encode(pcm, out)
+            .map_err(|e| CodecError::EncodeFailed(format!("opus encode: {e}")))?;
         Ok(n)
     }
 
@@ -292,13 +100,10 @@ impl AudioEncoder for OpusEncoder {
 
     fn set_profile(&mut self, profile: QualityProfile) -> Result<(), CodecError> {
         match profile.codec {
-            c if c.is_opus() => {
+            CodecId::Opus24k | CodecId::Opus16k | CodecId::Opus6k => {
                 self.codec_id = profile.codec;
                 self.frame_duration_ms = profile.frame_duration_ms;
                 self.apply_bitrate(profile.codec)?;
-                // Refresh DRED duration for the new tier. apply_protection_mode
-                // is idempotent and handles the legacy-vs-DRED branch correctly.
-                self.apply_protection_mode(profile.codec)?;
                 Ok(())
             }
             other => Err(CodecError::UnsupportedTransition {
@@ -315,190 +120,10 @@ impl AudioEncoder for OpusEncoder {
     }
 
     fn set_inband_fec(&mut self, enabled: bool) {
-        // In DRED mode, ignore external requests to re-enable inband FEC —
-        // running both mechanisms wastes bitrate on overlapping protection
-        // and opusic-c's own docs recommend disabling inband FEC when DRED
-        // is on. Trait callers that genuinely want classical FEC should set
-        // `AUDIO_USE_LEGACY_FEC=1` and re-create the encoder.
-        if !self.legacy_fec_mode {
-            debug!(
-                enabled,
-                "set_inband_fec ignored: DRED mode is active (set AUDIO_USE_LEGACY_FEC to revert)"
-            );
-            return;
-        }
-        let mode = if enabled { InbandFec::Mode1 } else { InbandFec::Off };
-        let _ = self.inner.set_inband_fec(mode);
+        let _ = self.inner.set_inband_fec(enabled);
     }
 
     fn set_dtx(&mut self, enabled: bool) {
         let _ = self.inner.set_dtx(enabled);
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use wzp_proto::AudioDecoder;
-
-    /// Phase 0 acceptance gate: fail loudly if the linked libopus is not 1.5.x.
-    /// DRED (Phase 1+) only exists in libopus ≥ 1.5, so running against an
-    /// older version would silently regress the entire DRED integration.
-    #[test]
-    fn linked_libopus_is_1_5() {
-        let version = opusic_c::version();
-        assert!(
-            version.contains("1.5"),
-            "expected libopus 1.5.x, got: {version}"
-        );
-    }
-
-    #[test]
-    fn encoder_creates_at_good_profile() {
-        let enc = OpusEncoder::new(QualityProfile::GOOD).expect("opus encoder init");
-        assert_eq!(enc.codec_id, CodecId::Opus24k);
-        assert_eq!(enc.frame_samples(), 960); // 20 ms @ 48 kHz
-    }
-
-    #[test]
-    fn encoder_roundtrip_silence() {
-        let mut enc = OpusEncoder::new(QualityProfile::GOOD).unwrap();
-        let mut dec = crate::opus_dec::OpusDecoder::new(QualityProfile::GOOD).unwrap();
-        let pcm_in = vec![0i16; 960]; // 20 ms silence
-        let mut encoded = vec![0u8; 512];
-        let n = enc.encode(&pcm_in, &mut encoded).unwrap();
-        assert!(n > 0);
-        let mut pcm_out = vec![0i16; 960];
-        let samples = dec.decode(&encoded[..n], &mut pcm_out).unwrap();
-        assert_eq!(samples, 960);
-    }
-
-    // ─── Phase 1 — DRED duration policy ─────────────────────────────────────
-
-    #[test]
-    fn dred_duration_for_studio_tiers_is_100ms() {
-        assert_eq!(dred_duration_for(CodecId::Opus32k), 10);
-        assert_eq!(dred_duration_for(CodecId::Opus48k), 10);
-        assert_eq!(dred_duration_for(CodecId::Opus64k), 10);
-    }
-
-    #[test]
-    fn dred_duration_for_normal_tiers_is_200ms() {
-        assert_eq!(dred_duration_for(CodecId::Opus16k), 20);
-        assert_eq!(dred_duration_for(CodecId::Opus24k), 20);
-    }
-
-    #[test]
-    fn dred_duration_for_degraded_tier_is_500ms() {
-        assert_eq!(dred_duration_for(CodecId::Opus6k), 50);
-    }
-
-    #[test]
-    fn dred_duration_for_codec2_is_zero() {
-        assert_eq!(dred_duration_for(CodecId::Codec2_3200), 0);
-        assert_eq!(dred_duration_for(CodecId::Codec2_1200), 0);
-        assert_eq!(dred_duration_for(CodecId::ComfortNoise), 0);
-    }
-
-    // ─── Phase 1 — Legacy escape hatch ──────────────────────────────────────
-
-    /// By default (env var unset), legacy mode is off.
-    ///
-    /// This test does NOT manipulate the environment to avoid flakiness
-    /// when the full suite runs in parallel. It only asserts on a freshly
-    /// created encoder in the ambient environment.
-    #[test]
-    fn default_mode_is_dred_not_legacy() {
-        // SAFETY: only run if the ambient env hasn't set the var externally.
-        if std::env::var(LEGACY_FEC_ENV).is_ok() {
-            return; // don't assert — someone set the env for a reason.
-        }
-        let enc = OpusEncoder::new(QualityProfile::GOOD).unwrap();
-        assert!(!enc.is_legacy_fec_mode());
-    }
-
-    // ─── Phase 1 — Behavioral regression: roundtrip still works ─────────────
-
-    #[test]
-    fn dred_mode_roundtrip_voice_pattern() {
-        // Use a realistic voice-like input (sine wave at speech frequencies)
-        // so the encoder emits meaningful DRED data rather than trivially
-        // compressible silence.
-        let mut enc = OpusEncoder::new(QualityProfile::GOOD).unwrap();
-        let mut dec = crate::opus_dec::OpusDecoder::new(QualityProfile::GOOD).unwrap();
-
-        let mut total_encoded_bytes = 0usize;
-        // Run 50 frames (1 second) so DRED fills up and starts emitting.
-        for frame_idx in 0..50 {
-            let pcm_in: Vec<i16> = (0..960)
-                .map(|i| {
-                    let t = (frame_idx * 960 + i) as f64 / 48_000.0;
-                    (8000.0 * (2.0 * std::f64::consts::PI * 300.0 * t).sin()) as i16
-                })
-                .collect();
-            let mut encoded = vec![0u8; 512];
-            let n = enc.encode(&pcm_in, &mut encoded).unwrap();
-            assert!(n > 0);
-            total_encoded_bytes += n;
-
-            let mut pcm_out = vec![0i16; 960];
-            let samples = dec.decode(&encoded[..n], &mut pcm_out).unwrap();
-            assert_eq!(samples, 960);
-        }
-
-        // Effective bitrate after 1 second of encoding.
-        // Opus 24k base + ~1 kbps DRED ≈ 25 kbps ≈ 3125 bytes/sec.
-        // Allow generous headroom (2000 lower bound, 8000 upper bound) —
-        // this is a behavioral regression check, not a tight bitrate assertion.
-        // The exact value is printed with --nocapture for diagnostic use.
-        eprintln!(
-            "[phase1 bitrate probe] legacy_fec_mode={} total_encoded={} bytes/sec",
-            enc.is_legacy_fec_mode(),
-            total_encoded_bytes
-        );
-        assert!(
-            total_encoded_bytes > 2000,
-            "encoder output too small: {total_encoded_bytes} bytes/sec (DRED likely not emitting)"
-        );
-        assert!(
-            total_encoded_bytes < 8000,
-            "encoder output too large: {total_encoded_bytes} bytes/sec"
-        );
-    }
-
-    // ─── Phase 1 — set_profile updates DRED duration on tier switch ─────────
-
-    #[test]
-    fn profile_switch_refreshes_dred_duration() {
-        // Start on GOOD (Opus 24k, DRED 20 frames), switch to DEGRADED
-        // (Opus 6k, DRED 50 frames). The encoder should accept both profile
-        // changes without error. We can't directly observe the DRED duration
-        // inside libopus, but apply_protection_mode returns Ok for both.
-        let mut enc = OpusEncoder::new(QualityProfile::GOOD).unwrap();
-        assert_eq!(enc.codec_id, CodecId::Opus24k);
-
-        enc.set_profile(QualityProfile::DEGRADED).unwrap();
-        assert_eq!(enc.codec_id, CodecId::Opus6k);
-
-        enc.set_profile(QualityProfile::STUDIO_64K).unwrap();
-        assert_eq!(enc.codec_id, CodecId::Opus64k);
-    }
-
-    // ─── Phase 1 — Trait set_inband_fec is a no-op in DRED mode ─────────────
-
-    #[test]
-    fn set_inband_fec_noop_in_dred_mode() {
-        if std::env::var(LEGACY_FEC_ENV).is_ok() {
-            return;
-        }
-        let mut enc = OpusEncoder::new(QualityProfile::GOOD).unwrap();
-        // Should not error, should not re-enable inband FEC internally.
-        enc.set_inband_fec(true);
-        // We can't directly query libopus's inband FEC state through opusic-c,
-        // but the call must not panic and the encoder must still work.
-        let pcm_in = vec![0i16; 960];
-        let mut encoded = vec![0u8; 512];
-        let n = enc.encode(&pcm_in, &mut encoded).unwrap();
-        assert!(n > 0);
-    }
-}

crates/wzp-crypto/src/handshake.rs

@@ -110,18 +110,7 @@ impl KeyExchange for WarzoneKeyExchange {
         hk.expand(b"warzone-session-key", &mut session_key)
             .expect("HKDF expand for session key should not fail");
 
-        // Derive SAS (Short Authentication String) from shared secret only.
-        // The shared secret is identical on both sides (X25519 DH property).
-        // A MITM would produce a different shared secret → different SAS.
-        // We use a dedicated HKDF label so SAS is independent of the session key.
-        let mut sas_key = [0u8; 4];
-        hk.expand(b"warzone-sas-code", &mut sas_key)
-            .expect("HKDF expand for SAS should not fail");
-        let sas_code = u32::from_be_bytes(sas_key) % 10000;
-
-        let mut session = ChaChaSession::new(session_key);
-        session.set_sas(sas_code);
-        Ok(Box::new(session))
+        Ok(Box::new(ChaChaSession::new(session_key)))
     }
 }
 
@@ -222,47 +211,4 @@ mod tests {
 
         assert_eq!(&decrypted, plaintext);
     }
-
-    #[test]
-    fn sas_codes_match_between_peers() {
-        let mut alice = WarzoneKeyExchange::from_identity_seed(&[0xAA; 32]);
-        let mut bob = WarzoneKeyExchange::from_identity_seed(&[0xBB; 32]);
-
-        let alice_eph_pub = alice.generate_ephemeral();
-        let bob_eph_pub = bob.generate_ephemeral();
-
-        let alice_session = alice.derive_session(&bob_eph_pub).unwrap();
-        let bob_session = bob.derive_session(&alice_eph_pub).unwrap();
-
-        let alice_sas = alice_session.sas_code();
-        let bob_sas = bob_session.sas_code();
-
-        assert!(alice_sas.is_some(), "Alice should have SAS");
-        assert!(bob_sas.is_some(), "Bob should have SAS");
-        assert_eq!(alice_sas, bob_sas, "SAS codes must match between peers");
-        assert!(alice_sas.unwrap() < 10000, "SAS should be 4 digits");
-    }
-
-    #[test]
-    fn sas_differs_for_different_peers() {
-        let mut alice = WarzoneKeyExchange::from_identity_seed(&[0xAA; 32]);
-        let mut bob = WarzoneKeyExchange::from_identity_seed(&[0xBB; 32]);
-        let mut eve = WarzoneKeyExchange::from_identity_seed(&[0xEE; 32]);
-
-        let alice_eph = alice.generate_ephemeral();
-        let bob_eph = bob.generate_ephemeral();
-        let eve_eph = eve.generate_ephemeral();
-
-        let alice_bob_session = alice.derive_session(&bob_eph).unwrap();
-
-        // Eve does separate handshake with Bob (MITM scenario)
-        let eve_bob_session = eve.derive_session(&bob_eph).unwrap();
-
-        // SAS codes should differ — Eve's session has different shared secret
-        assert_ne!(
-            alice_bob_session.sas_code(),
-            eve_bob_session.sas_code(),
-            "MITM session should produce different SAS"
-        );
-    }
 }

crates/wzp-crypto/src/session.rs

@@ -26,8 +26,6 @@ pub struct ChaChaSession {
     rekey_mgr: RekeyManager,
     /// Pending ephemeral secret for rekey (stored until peer responds).
     pending_rekey_secret: Option<StaticSecret>,
-    /// Short Authentication String (4-digit code for verbal verification).
-    sas_code: Option<u32>,
 }
 
 impl ChaChaSession {
@@ -48,15 +46,9 @@ impl ChaChaSession {
             recv_seq: 0,
             rekey_mgr: RekeyManager::new(shared_secret),
             pending_rekey_secret: None,
-            sas_code: None,
         }
     }
 
-    /// Set the SAS code (called by key exchange after derivation).
-    pub fn set_sas(&mut self, code: u32) {
-        self.sas_code = Some(code);
-    }
-
     /// Install a new key (after rekeying).
     fn install_key(&mut self, new_key: [u8; 32]) {
         use sha2::Digest;
@@ -144,10 +136,6 @@ impl CryptoSession for ChaChaSession {
 
         Ok(())
     }
-
-    fn sas_code(&self) -> Option<u32> {
-        self.sas_code
-    }
 }
 
 #[cfg(test)]

crates/wzp-crypto/tests/featherchat_compat.rs

@@ -115,7 +115,6 @@ fn wzp_signal_serializes_into_fc_callsignal_payload() {
         ephemeral_pub: [2u8; 32],
         signature: vec![3u8; 64],
         supported_profiles: vec![wzp_proto::QualityProfile::GOOD],
-        alias: None,
     };
 
     // Encode as featherChat CallSignal payload
@@ -274,14 +273,13 @@ fn auth_invalid_response_matches() {
 
 #[test]
 fn all_signal_types_map_correctly() {
-    use wzp_client::featherchat::signal_to_call_type;
+    use wzp_client::featherchat::{signal_to_call_type, CallSignalType};
 
     let cases: Vec<(wzp_proto::SignalMessage, &str)> = vec![
         (
             wzp_proto::SignalMessage::CallOffer {
                 identity_pub: [0; 32], ephemeral_pub: [0; 32],
                 signature: vec![], supported_profiles: vec![],
-                alias: None,
             },
             "Offer",
         ),

crates/wzp-fec/src/decoder.rs

@@ -1,7 +1,6 @@
 //! RaptorQ FEC decoder — reassembles source blocks from received source and repair symbols.
 
 use std::collections::HashMap;
-use std::time::Instant;
 
 use raptorq::{EncodingPacket, ObjectTransmissionInformation, PayloadId, SourceBlockDecoder};
 use wzp_proto::error::FecError;
@@ -10,9 +9,6 @@ use wzp_proto::FecDecoder;
 /// Length prefix size (u16 little-endian), must match encoder.
 const LEN_PREFIX: usize = 2;
 
-/// Decoded blocks older than this are eligible for reuse by a new sender.
-const BLOCK_STALE_SECS: u64 = 2;
-
 /// State for one in-flight block being decoded.
 struct BlockState {
     /// Number of source symbols expected.
@@ -25,8 +21,6 @@ struct BlockState {
     decoded: bool,
     /// Cached decoded result.
     result: Option<Vec<Vec<u8>>>,
-    /// When this block was last decoded (for staleness check).
-    decoded_at: Option<Instant>,
 }
 
 /// RaptorQ-based FEC decoder that handles multiple concurrent blocks.
@@ -64,7 +58,6 @@ impl RaptorQFecDecoder {
             symbol_size: self.symbol_size,
             decoded: false,
             result: None,
-            decoded_at: None,
         })
     }
 }
@@ -81,21 +74,9 @@ impl FecDecoder for RaptorQFecDecoder {
         let block = self.get_or_create_block(block_id);
 
         if block.decoded {
-            // If the block was decoded recently, skip (normal duplicate).
-            // If it's stale (>2s), a new sender is reusing this block_id — reset it.
-            if let Some(at) = block.decoded_at {
-                if at.elapsed().as_secs() >= BLOCK_STALE_SECS {
-                    block.decoded = false;
-                    block.result = None;
-                    block.decoded_at = None;
-                    block.packets.clear();
-                } else {
+            // Already decoded, ignore additional symbols.
             return Ok(());
         }
-            } else {
-                return Ok(());
-            }
-        }
 
         // Data should already be at symbol_size (length-prefixed and padded by the encoder).
         // But if caller sends raw data, pad it.
@@ -151,7 +132,6 @@ impl FecDecoder for RaptorQFecDecoder {
 
                 let block = self.blocks.get_mut(&block_id).unwrap();
                 block.decoded = true;
-                block.decoded_at = Some(Instant::now());
                 block.result = Some(frames.clone());
                 Ok(Some(frames))
             }

crates/wzp-native/Cargo.toml

@@ -1,29 +0,0 @@
-[package]
-name = "wzp-native"
-version = "0.1.0"
-edition = "2024"
-description = "WarzonePhone native audio library — standalone Android cdylib that eventually owns all C++ (Oboe bridge) and exposes a pure-C FFI. Built with cargo-ndk, loaded at runtime by the Tauri desktop cdylib via libloading."
-
-# Crate-type is DELIBERATELY only cdylib (no rlib, no staticlib). This crate
-# is built with `cargo ndk -t arm64-v8a build --release -p wzp-native` as a
-# standalone .so, which is the same path the legacy wzp-android crate uses
-# successfully on the same phone / same NDK. Keeping the crate-type single
-# avoids the rust-lang/rust#104707 symbol leak that bit us when Tauri's
-# desktop crate had ["staticlib", "cdylib", "rlib"] and any C++ static
-# archive pulled bionic's internal pthread_create into the final .so.
-[lib]
-name = "wzp_native"
-crate-type = ["cdylib"]
-
-[build-dependencies]
-# cc is SAFE to use here because this crate is a single-cdylib: no
-# staticlib in crate-type → no rust-lang/rust#104707 symbol leak. The
-# legacy wzp-android crate uses the same setup and works.
-cc = "1"
-
-[dependencies]
-# Phase 2: Oboe C++ audio bridge. Still no Rust deps — we do the whole
-# audio pipeline via extern "C" into the bundled C++ and expose our own
-# narrow extern "C" API for wzp-desktop to dlopen via libloading.
-# Phase 3 can add wzp-proto/wzp-codec if we want to share codec logic
-# instead of calling back into wzp-desktop via callbacks.

crates/wzp-native/build.rs

@@ -1,119 +0,0 @@
-//! wzp-native build.rs — Oboe C++ bridge compile on Android.
-//!
-//! Near-verbatim copy of crates/wzp-android/build.rs (which is known to
-//! work). The crucial distinction: this crate is a single-cdylib (no
-//! staticlib, no rlib in crate-type) so rust-lang/rust#104707 doesn't
-//! apply — bionic's internal pthread_create / __init_tcb symbols stay
-//! UND and resolve against libc.so at runtime, as they should.
-//!
-//! On non-Android hosts we compile `cpp/oboe_stub.cpp` (empty stubs) so
-//! `cargo check --target <host>` still works for IDEs and CI.
-
-use std::path::PathBuf;
-
-fn main() {
-    let target = std::env::var("TARGET").unwrap_or_default();
-
-    if target.contains("android") {
-        // getauxval_fix: override compiler-rt's broken static getauxval
-        // stub that SIGSEGVs in shared libraries.
-        cc::Build::new()
-            .file("cpp/getauxval_fix.c")
-            .compile("wzp_native_getauxval_fix");
-
-        let oboe_dir = fetch_oboe();
-        match oboe_dir {
-            Some(oboe_path) => {
-                println!("cargo:warning=wzp-native: building with Oboe from {:?}", oboe_path);
-                let mut build = cc::Build::new();
-                build
-                    .cpp(true)
-                    .std("c++17")
-                    // Shared libc++ — matches legacy wzp-android setup.
-                    .cpp_link_stdlib(Some("c++_shared"))
-                    .include("cpp")
-                    .include(oboe_path.join("include"))
-                    .include(oboe_path.join("src"))
-                    .define("WZP_HAS_OBOE", None)
-                    .file("cpp/oboe_bridge.cpp");
-                add_cpp_files_recursive(&mut build, &oboe_path.join("src"));
-                build.compile("wzp_native_oboe_bridge");
-            }
-            None => {
-                println!("cargo:warning=wzp-native: Oboe not found, building stub");
-                cc::Build::new()
-                    .cpp(true)
-                    .std("c++17")
-                    .cpp_link_stdlib(Some("c++_shared"))
-                    .file("cpp/oboe_stub.cpp")
-                    .include("cpp")
-                    .compile("wzp_native_oboe_bridge");
-            }
-        }
-
-        // Oboe needs log + OpenSLES backends at runtime.
-        println!("cargo:rustc-link-lib=log");
-        println!("cargo:rustc-link-lib=OpenSLES");
-
-        // Re-run if any cpp file changes
-        println!("cargo:rerun-if-changed=cpp/oboe_bridge.cpp");
-        println!("cargo:rerun-if-changed=cpp/oboe_bridge.h");
-        println!("cargo:rerun-if-changed=cpp/oboe_stub.cpp");
-        println!("cargo:rerun-if-changed=cpp/getauxval_fix.c");
-    } else {
-        // Non-Android hosts: compile the empty stub so lib.rs's extern
-        // declarations resolve when someone runs `cargo check` on macOS
-        // or Linux without an NDK.
-        cc::Build::new()
-            .cpp(true)
-            .std("c++17")
-            .file("cpp/oboe_stub.cpp")
-            .include("cpp")
-            .compile("wzp_native_oboe_bridge");
-        println!("cargo:rerun-if-changed=cpp/oboe_stub.cpp");
-    }
-}
-
-/// Recursively add all `.cpp` files from a directory to a cc::Build.
-fn add_cpp_files_recursive(build: &mut cc::Build, dir: &std::path::Path) {
-    if !dir.is_dir() {
-        return;
-    }
-    for entry in std::fs::read_dir(dir).unwrap() {
-        let entry = entry.unwrap();
-        let path = entry.path();
-        if path.is_dir() {
-            add_cpp_files_recursive(build, &path);
-        } else if path.extension().map_or(false, |e| e == "cpp") {
-            build.file(&path);
-        }
-    }
-}
-
-/// Fetch or find Oboe headers + sources (v1.8.1). Same logic as the
-/// legacy wzp-android crate's build.rs.
-fn fetch_oboe() -> Option<PathBuf> {
-    let out_dir = PathBuf::from(std::env::var("OUT_DIR").unwrap());
-    let oboe_dir = out_dir.join("oboe");
-
-    if oboe_dir.join("include").join("oboe").join("Oboe.h").exists() {
-        return Some(oboe_dir);
-    }
-
-    let status = std::process::Command::new("git")
-        .args([
-            "clone",
-            "--depth=1",
-            "--branch=1.8.1",
-            "https://github.com/google/oboe.git",
-            oboe_dir.to_str().unwrap(),
-        ])
-        .status();
-
-    match status {
-        Ok(s) if s.success() && oboe_dir.join("include").join("oboe").join("Oboe.h").exists() => {
-            Some(oboe_dir)
-        }
-        _ => None,
-    }
-}

crates/wzp-native/cpp/getauxval_fix.c

@@ -1,21 +0,0 @@
-// Override the broken static getauxval from compiler-rt/CRT.
-// The static version reads from __libc_auxv which is NULL in shared libs
-// loaded via dlopen, causing SIGSEGV in init_have_lse_atomics at load time.
-// This version calls the real bionic getauxval via dlsym.
-#ifdef __ANDROID__
-#include <dlfcn.h>
-#include <stdint.h>
-
-typedef unsigned long (*getauxval_fn)(unsigned long);
-
-unsigned long getauxval(unsigned long type) {
-    static getauxval_fn real_getauxval = (getauxval_fn)0;
-    if (!real_getauxval) {
-        real_getauxval = (getauxval_fn)dlsym((void*)-1L /* RTLD_DEFAULT */, "getauxval");
-        if (!real_getauxval) {
-            return 0;
-        }
-    }
-    return real_getauxval(type);
-}
-#endif

crates/wzp-native/cpp/oboe_bridge.cpp

@@ -1,420 +0,0 @@
-// Full Oboe implementation for Android
-// This file is compiled only when targeting Android
-
-#include "oboe_bridge.h"
-
-#ifdef __ANDROID__
-#include <oboe/Oboe.h>
-#include <android/log.h>
-#include <cstring>
-#include <atomic>
-
-#define LOG_TAG "wzp-oboe"
-#define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
-#define LOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)
-#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
-
-// ---------------------------------------------------------------------------
-// Ring buffer helpers (SPSC, lock-free)
-// ---------------------------------------------------------------------------
-
-static inline int32_t ring_available_read(const wzp_atomic_int* write_idx,
-                                           const wzp_atomic_int* read_idx,
-                                           int32_t capacity) {
-    int32_t w = std::atomic_load_explicit(write_idx, std::memory_order_acquire);
-    int32_t r = std::atomic_load_explicit(read_idx, std::memory_order_relaxed);
-    int32_t avail = w - r;
-    if (avail < 0) avail += capacity;
-    return avail;
-}
-
-static inline int32_t ring_available_write(const wzp_atomic_int* write_idx,
-                                            const wzp_atomic_int* read_idx,
-                                            int32_t capacity) {
-    return capacity - 1 - ring_available_read(write_idx, read_idx, capacity);
-}
-
-static inline void ring_write(int16_t* buf, int32_t capacity,
-                               wzp_atomic_int* write_idx, const wzp_atomic_int* read_idx,
-                               const int16_t* src, int32_t count) {
-    int32_t w = std::atomic_load_explicit(write_idx, std::memory_order_relaxed);
-    for (int32_t i = 0; i < count; i++) {
-        buf[w] = src[i];
-        w++;
-        if (w >= capacity) w = 0;
-    }
-    std::atomic_store_explicit(write_idx, w, std::memory_order_release);
-}
-
-static inline void ring_read(int16_t* buf, int32_t capacity,
-                              const wzp_atomic_int* write_idx, wzp_atomic_int* read_idx,
-                              int16_t* dst, int32_t count) {
-    int32_t r = std::atomic_load_explicit(read_idx, std::memory_order_relaxed);
-    for (int32_t i = 0; i < count; i++) {
-        dst[i] = buf[r];
-        r++;
-        if (r >= capacity) r = 0;
-    }
-    std::atomic_store_explicit(read_idx, r, std::memory_order_release);
-}
-
-// ---------------------------------------------------------------------------
-// Global state
-// ---------------------------------------------------------------------------
-
-static std::shared_ptr<oboe::AudioStream> g_capture_stream;
-static std::shared_ptr<oboe::AudioStream> g_playout_stream;
-// Value copy — the WzpOboeRings the Rust side passes us lives on the caller's
-// stack frame and goes away as soon as wzp_oboe_start returns. The raw
-// int16/atomic pointers INSIDE the struct point into the Rust-owned, leaked-
-// for-the-lifetime-of-the-process AudioBackend singleton, so copying the
-// struct by value is safe and keeps the inner pointers valid indefinitely.
-// g_rings_valid guards the audio-callback-side read; clearing it in stop()
-// signals "no backend" to the callbacks which then return silence + Stop.
-static WzpOboeRings g_rings{};
-static std::atomic<bool> g_rings_valid{false};
-static std::atomic<bool> g_running{false};
-static std::atomic<float> g_capture_latency_ms{0.0f};
-static std::atomic<float> g_playout_latency_ms{0.0f};
-
-// ---------------------------------------------------------------------------
-// Capture callback
-// ---------------------------------------------------------------------------
-
-class CaptureCallback : public oboe::AudioStreamDataCallback {
-public:
-    uint64_t calls = 0;
-    uint64_t total_frames = 0;
-    uint64_t total_written = 0;
-    uint64_t ring_full_drops = 0;
-
-    oboe::DataCallbackResult onAudioReady(
-            oboe::AudioStream* stream,
-            void* audioData,
-            int32_t numFrames) override {
-        if (!g_running.load(std::memory_order_relaxed) ||
-            !g_rings_valid.load(std::memory_order_acquire)) {
-            return oboe::DataCallbackResult::Stop;
-        }
-
-        const int16_t* src = static_cast<const int16_t*>(audioData);
-        int32_t avail = ring_available_write(g_rings.capture_write_idx,
-                                              g_rings.capture_read_idx,
-                                              g_rings.capture_capacity);
-        int32_t to_write = (numFrames < avail) ? numFrames : avail;
-        if (to_write > 0) {
-            ring_write(g_rings.capture_buf, g_rings.capture_capacity,
-                       g_rings.capture_write_idx, g_rings.capture_read_idx,
-                       src, to_write);
-        }
-        total_frames += numFrames;
-        total_written += to_write;
-        if (to_write < numFrames) {
-            ring_full_drops += (numFrames - to_write);
-        }
-
-        // Sample-range probe on the FIRST callback to prove we get real audio
-        if (calls == 0 && numFrames > 0) {
-            int16_t lo = src[0], hi = src[0];
-            int32_t sumsq = 0;
-            for (int32_t i = 0; i < numFrames; i++) {
-                if (src[i] < lo) lo = src[i];
-                if (src[i] > hi) hi = src[i];
-                sumsq += (int32_t)src[i] * (int32_t)src[i];
-            }
-            int32_t rms = (int32_t) (numFrames > 0 ? (int32_t)__builtin_sqrt((double)sumsq / (double)numFrames) : 0);
-            LOGI("capture cb#0: numFrames=%d sample_range=[%d..%d] rms=%d to_write=%d",
-                 numFrames, lo, hi, rms, to_write);
-        }
-        // Heartbeat every 50 callbacks (~1s at 20ms/burst)
-        calls++;
-        if ((calls % 50) == 0) {
-            LOGI("capture heartbeat: calls=%llu numFrames=%d ring_avail_write=%d to_write=%d full_drops=%llu total_written=%llu",
-                 (unsigned long long)calls, numFrames, avail, to_write,
-                 (unsigned long long)ring_full_drops, (unsigned long long)total_written);
-        }
-
-        // Update latency estimate
-        auto result = stream->calculateLatencyMillis();
-        if (result) {
-            g_capture_latency_ms.store(static_cast<float>(result.value()),
-                                        std::memory_order_relaxed);
-        }
-
-        return oboe::DataCallbackResult::Continue;
-    }
-};
-
-// ---------------------------------------------------------------------------
-// Playout callback
-// ---------------------------------------------------------------------------
-
-class PlayoutCallback : public oboe::AudioStreamDataCallback {
-public:
-    uint64_t calls = 0;
-    uint64_t total_frames = 0;
-    uint64_t total_played_real = 0;
-    uint64_t underrun_frames = 0;
-    uint64_t nonempty_calls = 0;
-
-    oboe::DataCallbackResult onAudioReady(
-            oboe::AudioStream* stream,
-            void* audioData,
-            int32_t numFrames) override {
-        if (!g_running.load(std::memory_order_relaxed) ||
-            !g_rings_valid.load(std::memory_order_acquire)) {
-            memset(audioData, 0, numFrames * sizeof(int16_t));
-            return oboe::DataCallbackResult::Stop;
-        }
-
-        int16_t* dst = static_cast<int16_t*>(audioData);
-        int32_t avail = ring_available_read(g_rings.playout_write_idx,
-                                             g_rings.playout_read_idx,
-                                             g_rings.playout_capacity);
-        int32_t to_read = (numFrames < avail) ? numFrames : avail;
-
-        if (to_read > 0) {
-            ring_read(g_rings.playout_buf, g_rings.playout_capacity,
-                      g_rings.playout_write_idx, g_rings.playout_read_idx,
-                      dst, to_read);
-            nonempty_calls++;
-        }
-        // Fill remainder with silence on underrun
-        if (to_read < numFrames) {
-            memset(dst + to_read, 0, (numFrames - to_read) * sizeof(int16_t));
-            underrun_frames += (numFrames - to_read);
-        }
-        total_frames += numFrames;
-        total_played_real += to_read;
-
-        // First callback: log requested config + prove we're being called
-        if (calls == 0) {
-            LOGI("playout cb#0: numFrames=%d ring_avail_read=%d to_read=%d",
-                 numFrames, avail, to_read);
-        }
-        // On the first callback that actually has data, log the sample range
-        // so we can tell if the samples coming out of the ring look like real
-        // audio vs constant-zeroes vs garbage.
-        if (to_read > 0 && nonempty_calls == 1) {
-            int16_t lo = dst[0], hi = dst[0];
-            int32_t sumsq = 0;
-            for (int32_t i = 0; i < to_read; i++) {
-                if (dst[i] < lo) lo = dst[i];
-                if (dst[i] > hi) hi = dst[i];
-                sumsq += (int32_t)dst[i] * (int32_t)dst[i];
-            }
-            int32_t rms = (to_read > 0) ? (int32_t)__builtin_sqrt((double)sumsq / (double)to_read) : 0;
-            LOGI("playout FIRST nonempty read: to_read=%d sample_range=[%d..%d] rms=%d",
-                 to_read, lo, hi, rms);
-        }
-        // Heartbeat every 50 callbacks (~1s at 20ms/burst)
-        calls++;
-        if ((calls % 50) == 0) {
-            int state = (int)stream->getState();
-            auto xrunRes = stream->getXRunCount();
-            int xruns = xrunRes ? xrunRes.value() : -1;
-            LOGI("playout heartbeat: calls=%llu nonempty=%llu numFrames=%d ring_avail_read=%d to_read=%d underrun_frames=%llu total_played_real=%llu state=%d xruns=%d",
-                 (unsigned long long)calls, (unsigned long long)nonempty_calls,
-                 numFrames, avail, to_read,
-                 (unsigned long long)underrun_frames, (unsigned long long)total_played_real,
-                 state, xruns);
-        }
-
-        // Update latency estimate
-        auto result = stream->calculateLatencyMillis();
-        if (result) {
-            g_playout_latency_ms.store(static_cast<float>(result.value()),
-                                        std::memory_order_relaxed);
-        }
-
-        return oboe::DataCallbackResult::Continue;
-    }
-};
-
-static CaptureCallback g_capture_cb;
-static PlayoutCallback g_playout_cb;
-
-// ---------------------------------------------------------------------------
-// Public C API
-// ---------------------------------------------------------------------------
-
-int wzp_oboe_start(const WzpOboeConfig* config, const WzpOboeRings* rings) {
-    if (g_running.load(std::memory_order_relaxed)) {
-        LOGW("wzp_oboe_start: already running");
-        return -1;
-    }
-
-    // Deep-copy the rings struct into static storage BEFORE we publish it to
-    // the audio callbacks — `rings` points at the caller's stack frame and
-    // goes away as soon as this function returns.
-    g_rings = *rings;
-    g_rings_valid.store(true, std::memory_order_release);
-
-    // Build capture stream
-    oboe::AudioStreamBuilder captureBuilder;
-    captureBuilder.setDirection(oboe::Direction::Input)
-        ->setPerformanceMode(oboe::PerformanceMode::LowLatency)
-        ->setSharingMode(oboe::SharingMode::Exclusive)
-        ->setFormat(oboe::AudioFormat::I16)
-        ->setChannelCount(config->channel_count)
-        ->setSampleRate(config->sample_rate)
-        ->setFramesPerDataCallback(config->frames_per_burst)
-        ->setInputPreset(oboe::InputPreset::VoiceCommunication)
-        ->setDataCallback(&g_capture_cb);
-
-    oboe::Result result = captureBuilder.openStream(g_capture_stream);
-    if (result != oboe::Result::OK) {
-        LOGE("Failed to open capture stream: %s", oboe::convertToText(result));
-        return -2;
-    }
-    LOGI("capture stream opened: actualSR=%d actualCh=%d actualFormat=%d actualFramesPerBurst=%d actualFramesPerDataCallback=%d bufferCapacityInFrames=%d sharing=%d perfMode=%d",
-         g_capture_stream->getSampleRate(),
-         g_capture_stream->getChannelCount(),
-         (int)g_capture_stream->getFormat(),
-         g_capture_stream->getFramesPerBurst(),
-         g_capture_stream->getFramesPerDataCallback(),
-         g_capture_stream->getBufferCapacityInFrames(),
-         (int)g_capture_stream->getSharingMode(),
-         (int)g_capture_stream->getPerformanceMode());
-
-    // Build playout stream.
-    //
-    // Regression triangulation between builds:
-    //   96be740 (Usage::Media, default API): playout callback DID drain
-    //   the ring at steady 50Hz (playout heartbeat: calls=1100,
-    //   total_played_real=1055040). Audio not audible because OS routing
-    //   sent it to a silent output.
-    //
-    //   8c36fb5 (Usage::VoiceCommunication + setAudioApi(AAudio) +
-    //   ContentType::Speech): playout callback fired cb#0 once then
-    //   stopped draining the ring entirely. written_samples stuck at
-    //   ring capacity (7679) across all subsequent heartbeats, so Oboe
-    //   accepted zero samples after startup. Still inaudible.
-    //
-    // Hypothesis: forcing setAudioApi(AAudio) + VoiceCommunication on
-    // Pixel 6 / Android 15 opens a stream that succeeds at cb#0 but
-    // then detaches from the real audio driver. Reverting to the
-    // config that at least drove callbacks correctly, plus the
-    // Kotlin-side MODE_IN_COMMUNICATION + setSpeakerphoneOn(true)
-    // handled in MainActivity.kt to route audio to the loud speaker.
-    // Usage::VoiceCommunication is the correct Oboe usage for a VoIP app
-    // — it respects Android's in-call audio routing and lets
-    // AudioManager.setSpeakerphoneOn/setBluetoothScoOn actually switch
-    // between earpiece, loudspeaker, and Bluetooth headset. Combined with
-    // MODE_IN_COMMUNICATION set from MainActivity.kt and
-    // speakerphoneOn=false by default, this produces handset/earpiece as
-    // the default output.
-    //
-    // IMPORTANT: do NOT add setAudioApi(AAudio) here. Build 8c36fb5 proved
-    // forcing AAudio with Usage::VoiceCommunication makes the playout
-    // callback stop draining the ring after cb#0, even though the stream
-    // opens successfully. Letting Oboe pick the API (which will be AAudio
-    // on API ≥ 27 but via a different codepath) kept callbacks firing in
-    // every other build.
-    oboe::AudioStreamBuilder playoutBuilder;
-    playoutBuilder.setDirection(oboe::Direction::Output)
-        ->setPerformanceMode(oboe::PerformanceMode::LowLatency)
-        ->setSharingMode(oboe::SharingMode::Exclusive)
-        ->setFormat(oboe::AudioFormat::I16)
-        ->setChannelCount(config->channel_count)
-        ->setSampleRate(config->sample_rate)
-        ->setFramesPerDataCallback(config->frames_per_burst)
-        ->setUsage(oboe::Usage::VoiceCommunication)
-        ->setDataCallback(&g_playout_cb);
-
-    result = playoutBuilder.openStream(g_playout_stream);
-    if (result != oboe::Result::OK) {
-        LOGE("Failed to open playout stream: %s", oboe::convertToText(result));
-        g_capture_stream->close();
-        g_capture_stream.reset();
-        return -3;
-    }
-    LOGI("playout stream opened: actualSR=%d actualCh=%d actualFormat=%d actualFramesPerBurst=%d actualFramesPerDataCallback=%d bufferCapacityInFrames=%d sharing=%d perfMode=%d",
-         g_playout_stream->getSampleRate(),
-         g_playout_stream->getChannelCount(),
-         (int)g_playout_stream->getFormat(),
-         g_playout_stream->getFramesPerBurst(),
-         g_playout_stream->getFramesPerDataCallback(),
-         g_playout_stream->getBufferCapacityInFrames(),
-         (int)g_playout_stream->getSharingMode(),
-         (int)g_playout_stream->getPerformanceMode());
-
-    g_running.store(true, std::memory_order_release);
-
-    // Start both streams
-    result = g_capture_stream->requestStart();
-    if (result != oboe::Result::OK) {
-        LOGE("Failed to start capture: %s", oboe::convertToText(result));
-        g_running.store(false, std::memory_order_release);
-        g_capture_stream->close();
-        g_playout_stream->close();
-        g_capture_stream.reset();
-        g_playout_stream.reset();
-        return -4;
-    }
-
-    result = g_playout_stream->requestStart();
-    if (result != oboe::Result::OK) {
-        LOGE("Failed to start playout: %s", oboe::convertToText(result));
-        g_running.store(false, std::memory_order_release);
-        g_capture_stream->requestStop();
-        g_capture_stream->close();
-        g_playout_stream->close();
-        g_capture_stream.reset();
-        g_playout_stream.reset();
-        return -5;
-    }
-
-    LOGI("Oboe started: sr=%d burst=%d ch=%d",
-         config->sample_rate, config->frames_per_burst, config->channel_count);
-    return 0;
-}
-
-void wzp_oboe_stop(void) {
-    g_running.store(false, std::memory_order_release);
-    // Tell the audio callbacks to stop touching g_rings BEFORE we tear down
-    // the streams, so any in-flight callback returns Stop instead of reading
-    // stale pointers.
-    g_rings_valid.store(false, std::memory_order_release);
-
-    if (g_capture_stream) {
-        g_capture_stream->requestStop();
-        g_capture_stream->close();
-        g_capture_stream.reset();
-    }
-    if (g_playout_stream) {
-        g_playout_stream->requestStop();
-        g_playout_stream->close();
-        g_playout_stream.reset();
-    }
-
-    LOGI("Oboe stopped");
-}
-
-float wzp_oboe_capture_latency_ms(void) {
-    return g_capture_latency_ms.load(std::memory_order_relaxed);
-}
-
-float wzp_oboe_playout_latency_ms(void) {
-    return g_playout_latency_ms.load(std::memory_order_relaxed);
-}
-
-int wzp_oboe_is_running(void) {
-    return g_running.load(std::memory_order_relaxed) ? 1 : 0;
-}
-
-#else
-// Non-Android fallback — should not be reached; oboe_stub.cpp is used instead.
-// Provide empty implementations just in case.
-
-int wzp_oboe_start(const WzpOboeConfig* config, const WzpOboeRings* rings) {
-    (void)config; (void)rings;
-    return -99;
-}
-
-void wzp_oboe_stop(void) {}
-float wzp_oboe_capture_latency_ms(void) { return 0.0f; }
-float wzp_oboe_playout_latency_ms(void) { return 0.0f; }
-int wzp_oboe_is_running(void) { return 0; }
-
-#endif // __ANDROID__

crates/wzp-native/cpp/oboe_bridge.h

@@ -1,43 +0,0 @@
-#ifndef WZP_OBOE_BRIDGE_H
-#define WZP_OBOE_BRIDGE_H
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-#include <atomic>
-typedef std::atomic<int32_t> wzp_atomic_int;
-extern "C" {
-#else
-#include <stdatomic.h>
-typedef atomic_int wzp_atomic_int;
-#endif
-
-typedef struct {
-    int32_t sample_rate;
-    int32_t frames_per_burst;
-    int32_t channel_count;
-} WzpOboeConfig;
-
-typedef struct {
-    int16_t* capture_buf;
-    int32_t  capture_capacity;
-    wzp_atomic_int* capture_write_idx;
-    wzp_atomic_int* capture_read_idx;
-
-    int16_t* playout_buf;
-    int32_t  playout_capacity;
-    wzp_atomic_int* playout_write_idx;
-    wzp_atomic_int* playout_read_idx;
-} WzpOboeRings;
-
-int wzp_oboe_start(const WzpOboeConfig* config, const WzpOboeRings* rings);
-void wzp_oboe_stop(void);
-float wzp_oboe_capture_latency_ms(void);
-float wzp_oboe_playout_latency_ms(void);
-int wzp_oboe_is_running(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // WZP_OBOE_BRIDGE_H

crates/wzp-native/cpp/oboe_stub.cpp

@@ -1,27 +0,0 @@
-// Stub implementation for non-Android host builds (testing, cargo check, etc.)
-
-#include "oboe_bridge.h"
-#include <stdio.h>
-
-int wzp_oboe_start(const WzpOboeConfig* config, const WzpOboeRings* rings) {
-    (void)config;
-    (void)rings;
-    fprintf(stderr, "wzp_oboe_start: stub (not on Android)\n");
-    return 0;
-}
-
-void wzp_oboe_stop(void) {
-    fprintf(stderr, "wzp_oboe_stop: stub (not on Android)\n");
-}
-
-float wzp_oboe_capture_latency_ms(void) {
-    return 0.0f;
-}
-
-float wzp_oboe_playout_latency_ms(void) {
-    return 0.0f;
-}
-
-int wzp_oboe_is_running(void) {
-    return 0;
-}

crates/wzp-native/src/lib.rs

@@ -1,331 +0,0 @@
-//! wzp-native — standalone Android cdylib for all the C++ audio code.
-//!
-//! Built with `cargo ndk`, NOT `cargo tauri android build`. Loaded at
-//! runtime by the Tauri desktop cdylib (`wzp-desktop`) via libloading.
-//! See `docs/incident-tauri-android-init-tcb.md` for why the split exists.
-//!
-//! Phase 2: real Oboe audio backend.
-//!
-//! Architecture: Oboe runs capture + playout streams on its own high-
-//! priority AAudio callback threads inside the C++ bridge. Two SPSC ring
-//! buffers (capture and playout) are shared between the C++ callbacks
-//! and the Rust side via atomic indices — no locks on the hot path.
-//! `wzp-desktop` drains the capture ring into its Opus encoder and fills
-//! the playout ring with decoded PCM.
-
-use std::sync::atomic::{AtomicI32, Ordering};
-
-// ─── Phase 1 smoke-test exports (kept for sanity checks) ─────────────────
-
-/// Returns 42. Used by wzp-desktop's setup() to verify dlopen + dlsym
-/// work before any audio code runs.
-#[unsafe(no_mangle)]
-pub extern "C" fn wzp_native_version() -> i32 {
-    42
-}
-
-/// Writes a NUL-terminated string into `out` (capped at `cap`) and
-/// returns bytes written excluding the NUL.
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn wzp_native_hello(out: *mut u8, cap: usize) -> usize {
-    const MSG: &[u8] = b"hello from wzp-native\0";
-    if out.is_null() || cap == 0 {
-        return 0;
-    }
-    let n = MSG.len().min(cap);
-    unsafe {
-        core::ptr::copy_nonoverlapping(MSG.as_ptr(), out, n);
-        *out.add(n - 1) = 0;
-    }
-    n - 1
-}
-
-// ─── C++ Oboe bridge FFI ─────────────────────────────────────────────────
-
-#[repr(C)]
-struct WzpOboeConfig {
-    sample_rate: i32,
-    frames_per_burst: i32,
-    channel_count: i32,
-}
-
-#[repr(C)]
-struct WzpOboeRings {
-    capture_buf: *mut i16,
-    capture_capacity: i32,
-    capture_write_idx: *mut AtomicI32,
-    capture_read_idx: *mut AtomicI32,
-    playout_buf: *mut i16,
-    playout_capacity: i32,
-    playout_write_idx: *mut AtomicI32,
-    playout_read_idx: *mut AtomicI32,
-}
-
-// SAFETY: atomics synchronise producer/consumer; raw pointers are owned
-// by the AudioBackend singleton below whose lifetime covers all calls.
-unsafe impl Send for WzpOboeRings {}
-unsafe impl Sync for WzpOboeRings {}
-
-unsafe extern "C" {
-    fn wzp_oboe_start(config: *const WzpOboeConfig, rings: *const WzpOboeRings) -> i32;
-    fn wzp_oboe_stop();
-    fn wzp_oboe_capture_latency_ms() -> f32;
-    fn wzp_oboe_playout_latency_ms() -> f32;
-    fn wzp_oboe_is_running() -> i32;
-}
-
-// ─── SPSC ring buffer (shared with C++ via AtomicI32) ────────────────────
-
-/// 20 ms @ 48 kHz mono = 960 samples.
-const FRAME_SAMPLES: usize = 960;
-/// ~160 ms headroom at 48 kHz.
-const RING_CAPACITY: usize = 7680;
-
-struct RingBuffer {
-    buf: Vec<i16>,
-    capacity: usize,
-    write_idx: AtomicI32,
-    read_idx: AtomicI32,
-}
-
-// SAFETY: SPSC with atomic read/write cursors; producer and consumer
-// are always on different threads.
-unsafe impl Send for RingBuffer {}
-unsafe impl Sync for RingBuffer {}
-
-impl RingBuffer {
-    fn new(capacity: usize) -> Self {
-        Self {
-            buf: vec![0i16; capacity],
-            capacity,
-            write_idx: AtomicI32::new(0),
-            read_idx: AtomicI32::new(0),
-        }
-    }
-
-    fn available_read(&self) -> usize {
-        let w = self.write_idx.load(Ordering::Acquire);
-        let r = self.read_idx.load(Ordering::Relaxed);
-        let avail = w - r;
-        if avail < 0 { (avail + self.capacity as i32) as usize } else { avail as usize }
-    }
-
-    fn available_write(&self) -> usize {
-        self.capacity - 1 - self.available_read()
-    }
-
-    fn write(&self, data: &[i16]) -> usize {
-        let count = data.len().min(self.available_write());
-        if count == 0 {
-            return 0;
-        }
-        let mut w = self.write_idx.load(Ordering::Relaxed) as usize;
-        let cap = self.capacity;
-        let buf_ptr = self.buf.as_ptr() as *mut i16;
-        for sample in &data[..count] {
-            unsafe { *buf_ptr.add(w) = *sample; }
-            w += 1;
-            if w >= cap { w = 0; }
-        }
-        self.write_idx.store(w as i32, Ordering::Release);
-        count
-    }
-
-    fn read(&self, out: &mut [i16]) -> usize {
-        let count = out.len().min(self.available_read());
-        if count == 0 {
-            return 0;
-        }
-        let mut r = self.read_idx.load(Ordering::Relaxed) as usize;
-        let cap = self.capacity;
-        let buf_ptr = self.buf.as_ptr();
-        for slot in &mut out[..count] {
-            unsafe { *slot = *buf_ptr.add(r); }
-            r += 1;
-            if r >= cap { r = 0; }
-        }
-        self.read_idx.store(r as i32, Ordering::Release);
-        count
-    }
-
-    fn buf_ptr(&self) -> *mut i16 {
-        self.buf.as_ptr() as *mut i16
-    }
-    fn write_idx_ptr(&self) -> *mut AtomicI32 {
-        &self.write_idx as *const AtomicI32 as *mut AtomicI32
-    }
-    fn read_idx_ptr(&self) -> *mut AtomicI32 {
-        &self.read_idx as *const AtomicI32 as *mut AtomicI32
-    }
-}
-
-// ─── AudioBackend singleton ──────────────────────────────────────────────
-//
-// There is one global AudioBackend instance because Oboe's C++ side
-// holds its own singleton of the streams. The `Box::leak`'d statics own
-// the ring buffers for the lifetime of the process — dropping them while
-// Oboe is still running would cause use-after-free in the audio callback.
-
-use std::sync::OnceLock;
-
-struct AudioBackend {
-    capture: RingBuffer,
-    playout: RingBuffer,
-    started: std::sync::Mutex<bool>,
-    /// Per-write logging throttle counter for wzp_native_audio_write_playout.
-    playout_write_log_count: std::sync::atomic::AtomicU64,
-}
-
-static BACKEND: OnceLock<&'static AudioBackend> = OnceLock::new();
-
-fn backend() -> &'static AudioBackend {
-    BACKEND.get_or_init(|| {
-        Box::leak(Box::new(AudioBackend {
-            capture: RingBuffer::new(RING_CAPACITY),
-            playout: RingBuffer::new(RING_CAPACITY),
-            started: std::sync::Mutex::new(false),
-            playout_write_log_count: std::sync::atomic::AtomicU64::new(0),
-        }))
-    })
-}
-
-// ─── C FFI for wzp-desktop ───────────────────────────────────────────────
-
-/// Start the Oboe audio streams. Returns 0 on success, non-zero on error.
-/// Idempotent — calling while already running is a no-op that returns 0.
-#[unsafe(no_mangle)]
-pub extern "C" fn wzp_native_audio_start() -> i32 {
-    let b = backend();
-    let mut started = match b.started.lock() {
-        Ok(g) => g,
-        Err(_) => return -1,
-    };
-    if *started {
-        return 0;
-    }
-
-    let config = WzpOboeConfig {
-        sample_rate: 48_000,
-        frames_per_burst: FRAME_SAMPLES as i32,
-        channel_count: 1,
-    };
-    let rings = WzpOboeRings {
-        capture_buf: b.capture.buf_ptr(),
-        capture_capacity: b.capture.capacity as i32,
-        capture_write_idx: b.capture.write_idx_ptr(),
-        capture_read_idx: b.capture.read_idx_ptr(),
-        playout_buf: b.playout.buf_ptr(),
-        playout_capacity: b.playout.capacity as i32,
-        playout_write_idx: b.playout.write_idx_ptr(),
-        playout_read_idx: b.playout.read_idx_ptr(),
-    };
-    let ret = unsafe { wzp_oboe_start(&config, &rings) };
-    if ret != 0 {
-        return ret;
-    }
-    *started = true;
-    0
-}
-
-/// Stop Oboe. Idempotent. Safe to call from any thread.
-#[unsafe(no_mangle)]
-pub extern "C" fn wzp_native_audio_stop() {
-    let b = backend();
-    if let Ok(mut started) = b.started.lock() {
-        if *started {
-            unsafe { wzp_oboe_stop() };
-            *started = false;
-        }
-    }
-}
-
-/// Read captured PCM samples from the capture ring. Returns the number
-/// of `i16` samples actually copied into `out` (may be less than
-/// `out_len` if the ring is empty).
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn wzp_native_audio_read_capture(out: *mut i16, out_len: usize) -> usize {
-    if out.is_null() || out_len == 0 {
-        return 0;
-    }
-    let slice = unsafe { std::slice::from_raw_parts_mut(out, out_len) };
-    backend().capture.read(slice)
-}
-
-/// Write PCM samples into the playout ring. Returns the number of
-/// samples actually enqueued (may be less than `in_len` if the ring
-/// is nearly full — in practice the caller should pace to 20 ms
-/// frames and spin briefly if the ring is full).
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn wzp_native_audio_write_playout(input: *const i16, in_len: usize) -> usize {
-    if input.is_null() || in_len == 0 {
-        return 0;
-    }
-    let slice = unsafe { std::slice::from_raw_parts(input, in_len) };
-    let b = backend();
-    let before_w = b.playout.write_idx.load(std::sync::atomic::Ordering::Relaxed);
-    let before_r = b.playout.read_idx.load(std::sync::atomic::Ordering::Relaxed);
-    let written = b.playout.write(slice);
-    // First few writes: log ring state + sample range so we can compare what
-    // engine.rs hands us to what the C++ playout callback reads.
-    let first_writes = b.playout_write_log_count.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
-    if first_writes < 3 || first_writes % 50 == 0 {
-        let (mut lo, mut hi, mut sumsq) = (i16::MAX, i16::MIN, 0i64);
-        for &s in slice.iter() {
-            if s < lo { lo = s; }
-            if s > hi { hi = s; }
-            sumsq += (s as i64) * (s as i64);
-        }
-        let rms = (sumsq as f64 / slice.len() as f64).sqrt() as i32;
-        let avail_w_after = b.playout.available_write();
-        let avail_r_after = b.playout.available_read();
-        let msg = format!(
-            "playout WRITE #{first_writes}: in_len={} written={} range=[{lo}..{hi}] rms={rms} before_w={before_w} before_r={before_r} avail_read_after={avail_r_after} avail_write_after={avail_w_after}",
-            slice.len(), written
-        );
-        unsafe {
-            android_log(msg.as_str());
-        }
-    }
-    written
-}
-
-// Minimal android logcat shim so we can print from the cdylib without pulling
-// in android_logger crate (which would add another dep that has to build with
-// cargo-ndk). Uses libc's __android_log_print via extern linkage.
-#[cfg(target_os = "android")]
-unsafe extern "C" {
-    fn __android_log_write(prio: i32, tag: *const u8, text: *const u8) -> i32;
-}
-
-#[cfg(target_os = "android")]
-unsafe fn android_log(msg: &str) {
-    // ANDROID_LOG_INFO = 4. Tag and text must be NUL-terminated.
-    let tag = b"wzp-native\0";
-    let mut buf = Vec::with_capacity(msg.len() + 1);
-    buf.extend_from_slice(msg.as_bytes());
-    buf.push(0);
-    unsafe { __android_log_write(4, tag.as_ptr(), buf.as_ptr()); }
-}
-
-#[cfg(not(target_os = "android"))]
-#[allow(dead_code)]
-unsafe fn android_log(_msg: &str) {}
-
-/// Current capture latency reported by Oboe, in milliseconds. Returns
-/// NaN / 0.0 if the stream isn't running.
-#[unsafe(no_mangle)]
-pub extern "C" fn wzp_native_audio_capture_latency_ms() -> f32 {
-    unsafe { wzp_oboe_capture_latency_ms() }
-}
-
-/// Current playout latency reported by Oboe, in milliseconds.
-#[unsafe(no_mangle)]
-pub extern "C" fn wzp_native_audio_playout_latency_ms() -> f32 {
-    unsafe { wzp_oboe_playout_latency_ms() }
-}
-
-/// Non-zero if both Oboe streams are currently running.
-#[unsafe(no_mangle)]
-pub extern "C" fn wzp_native_audio_is_running() -> i32 {
-    unsafe { wzp_oboe_is_running() }
-}

crates/wzp-proto/src/codec_id.rs

@@ -18,12 +18,6 @@ pub enum CodecId {
     Codec2_1200 = 4,
     /// Comfort noise descriptor (silence suppression)
     ComfortNoise = 5,
-    /// Opus at 32kbps (studio low)
-    Opus32k = 6,
-    /// Opus at 48kbps (studio)
-    Opus48k = 7,
-    /// Opus at 64kbps (studio high)
-    Opus64k = 8,
 }
 
 impl CodecId {
@@ -33,9 +27,6 @@ impl CodecId {
             Self::Opus24k => 24_000,
             Self::Opus16k => 16_000,
             Self::Opus6k => 6_000,
-            Self::Opus32k => 32_000,
-            Self::Opus48k => 48_000,
-            Self::Opus64k => 64_000,
             Self::Codec2_3200 => 3_200,
             Self::Codec2_1200 => 1_200,
             Self::ComfortNoise => 0,
@@ -45,7 +36,8 @@ impl CodecId {
     /// Preferred frame duration in milliseconds.
     pub const fn frame_duration_ms(self) -> u8 {
         match self {
-            Self::Opus24k | Self::Opus16k | Self::Opus32k | Self::Opus48k | Self::Opus64k => 20,
+            Self::Opus24k => 20,
+            Self::Opus16k => 20,
             Self::Opus6k => 40,
             Self::Codec2_3200 => 20,
             Self::Codec2_1200 => 40,
@@ -56,8 +48,7 @@ impl CodecId {
     /// Sample rate expected by this codec.
     pub const fn sample_rate_hz(self) -> u32 {
         match self {
-            Self::Opus24k | Self::Opus16k | Self::Opus6k
-            | Self::Opus32k | Self::Opus48k | Self::Opus64k => 48_000,
+            Self::Opus24k | Self::Opus16k | Self::Opus6k => 48_000,
             Self::Codec2_3200 | Self::Codec2_1200 => 8_000,
             Self::ComfortNoise => 48_000,
         }
@@ -72,9 +63,6 @@ impl CodecId {
             3 => Some(Self::Codec2_3200),
             4 => Some(Self::Codec2_1200),
             5 => Some(Self::ComfortNoise),
-            6 => Some(Self::Opus32k),
-            7 => Some(Self::Opus48k),
-            8 => Some(Self::Opus64k),
             _ => None,
         }
     }
@@ -83,12 +71,6 @@ impl CodecId {
     pub const fn to_wire(self) -> u8 {
         self as u8
     }
-
-    /// Returns true if this is an Opus variant.
-    pub const fn is_opus(self) -> bool {
-        matches!(self, Self::Opus6k | Self::Opus16k | Self::Opus24k
-            | Self::Opus32k | Self::Opus48k | Self::Opus64k)
-    }
 }
 
 /// Describes the complete quality configuration for a call session.
@@ -129,30 +111,6 @@ impl QualityProfile {
         frames_per_block: 8,
     };
 
-    /// Studio low: Opus 32kbps, minimal FEC.
-    pub const STUDIO_32K: Self = Self {
-        codec: CodecId::Opus32k,
-        fec_ratio: 0.1,
-        frame_duration_ms: 20,
-        frames_per_block: 5,
-    };
-
-    /// Studio: Opus 48kbps, minimal FEC.
-    pub const STUDIO_48K: Self = Self {
-        codec: CodecId::Opus48k,
-        fec_ratio: 0.1,
-        frame_duration_ms: 20,
-        frames_per_block: 5,
-    };
-
-    /// Studio high: Opus 64kbps, minimal FEC.
-    pub const STUDIO_64K: Self = Self {
-        codec: CodecId::Opus64k,
-        fec_ratio: 0.1,
-        frame_duration_ms: 20,
-        frames_per_block: 5,
-    };
-
     /// Estimated total bandwidth in kbps including FEC overhead.
     pub fn total_bitrate_kbps(&self) -> f32 {
         let base = self.codec.bitrate_bps() as f32 / 1000.0;

crates/wzp-proto/src/jitter.rs

@@ -273,22 +273,11 @@ impl JitterBuffer {
             return;
         }
 
-        // Check if packet is too old (already played out).
-        // A backward jump of >100 seq (~2s at 50fps) indicates a new sender in a
-        // federation room — reset instead of dropping.
+        // Check if packet is too old (already played out)
         if self.stats.packets_played > 0 && seq_before(seq, self.next_playout_seq) {
-            let backward_distance = self.next_playout_seq.wrapping_sub(seq);
-            tracing::warn!(seq, next = self.next_playout_seq, backward_distance, "jitter: backward seq detected");
-            if backward_distance > 100 {
-                tracing::info!(seq, next = self.next_playout_seq, "jitter: RESET — new sender detected");
-                self.buffer.clear();
-                self.next_playout_seq = seq;
-                self.stats.packets_late = 0;
-            } else {
             self.stats.packets_late += 1;
             return;
         }
-        }
 
         // If we haven't started playout yet, adjust next_playout_seq to earliest known
         if self.stats.packets_played == 0 && seq_before(seq, self.next_playout_seq) {
@@ -423,22 +412,11 @@ impl JitterBuffer {
             return;
         }
 
-        // Check if packet is too old (already played out).
-        // A backward jump of >100 seq (~2s at 50fps) indicates a new sender in a
-        // federation room — reset instead of dropping.
+        // Check if packet is too old (already played out)
         if self.stats.packets_played > 0 && seq_before(seq, self.next_playout_seq) {
-            let backward_distance = self.next_playout_seq.wrapping_sub(seq);
-            tracing::warn!(seq, next = self.next_playout_seq, backward_distance, "jitter: backward seq detected");
-            if backward_distance > 100 {
-                tracing::info!(seq, next = self.next_playout_seq, "jitter: RESET — new sender detected");
-                self.buffer.clear();
-                self.next_playout_seq = seq;
-                self.stats.packets_late = 0;
-            } else {
             self.stats.packets_late += 1;
             return;
         }
-        }
 
         // If we haven't started playout yet, adjust next_playout_seq to earliest known
         if self.stats.packets_played == 0 && seq_before(seq, self.next_playout_seq) {

crates/wzp-proto/src/lib.rs

@@ -25,9 +25,8 @@ pub mod traits;
 pub use codec_id::{CodecId, QualityProfile};
 pub use error::*;
 pub use packet::{
-    CallAcceptMode, HangupReason, MediaHeader, MediaPacket, MiniFrameContext, MiniHeader,
-    QualityReport, RoomParticipant, SignalMessage, TrunkEntry, TrunkFrame, FRAME_TYPE_FULL,
-    FRAME_TYPE_MINI,
+    HangupReason, MediaHeader, MediaPacket, MiniFrameContext, MiniHeader, QualityReport,
+    RoomParticipant, SignalMessage, TrunkEntry, TrunkFrame, FRAME_TYPE_FULL, FRAME_TYPE_MINI,
 };
 pub use bandwidth::{BandwidthEstimator, CongestionState};
 pub use quality::{AdaptiveQualityController, NetworkContext, Tier};

crates/wzp-proto/src/packet.rs

@@ -584,26 +584,6 @@ pub enum SignalMessage {
         recommended_profile: crate::QualityProfile,
     },
 
-    /// Phase 4 telemetry: loss-recovery counts for the current session.
-    /// Sent periodically from receivers to the relay so Prometheus metrics
-    /// can distinguish DRED reconstructions from classical PLC invocations.
-    /// Fields default to 0 on old receivers (`#[serde(default)]`), so
-    /// introducing this variant is backward-compatible with pre-Phase-4
-    /// relays — they'll just log "unknown signal variant" on receipt.
-    LossRecoveryUpdate {
-        /// Total frames reconstructed via DRED since call start (monotonic).
-        #[serde(default)]
-        dred_reconstructions: u64,
-        /// Total frames filled via classical Opus/Codec2 PLC since call
-        /// start (monotonic).
-        #[serde(default)]
-        classical_plc_invocations: u64,
-        /// Total frames decoded since call start. Used by the relay to
-        /// compute recovery rates as a fraction of total frames.
-        #[serde(default)]
-        frames_decoded: u64,
-    },
-
     /// Connection keepalive / RTT measurement.
     Ping { timestamp_ms: u64 },
     Pong { timestamp_ms: u64 },
@@ -677,134 +657,10 @@ pub enum SignalMessage {
         participants: Vec<RoomParticipant>,
     },
 
-    // ── Federation signals (relay-to-relay) ──
-
-    /// Federation: initial handshake — the connecting relay identifies itself.
-    FederationHello {
-        /// TLS certificate fingerprint of the connecting relay.
-        tls_fingerprint: String,
-    },
-
-    /// Federation: this relay now has local participants in a global room.
-    GlobalRoomActive {
-        room: String,
-        /// Participants on the announcing relay (for federated presence).
-        #[serde(default)]
-        participants: Vec<RoomParticipant>,
-    },
-
-    /// Federation: this relay's last local participant left a global room.
-    GlobalRoomInactive {
-        room: String,
-    },
-
-    // ── Direct calling signals (client ↔ relay signaling) ──
-
-    /// Register on relay for direct calls. Sent on `_signal` connections
-    /// after optional AuthToken.
-    RegisterPresence {
-        /// Client's Ed25519 identity public key.
-        identity_pub: [u8; 32],
-        /// Signature over ("register-presence" || identity_pub).
-        signature: Vec<u8>,
-        /// Optional display name.
-        alias: Option<String>,
-    },
-
-    /// Relay confirms presence registration.
-    RegisterPresenceAck {
-        success: bool,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        error: Option<String>,
-    },
-
-    /// Direct call offer routed through the relay to a specific peer.
-    DirectCallOffer {
-        /// Caller's fingerprint.
-        caller_fingerprint: String,
-        /// Caller's display name.
-        caller_alias: Option<String>,
-        /// Target's fingerprint.
-        target_fingerprint: String,
-        /// Unique call session ID (UUID).
-        call_id: String,
-        /// Caller's Ed25519 identity pub.
-        identity_pub: [u8; 32],
-        /// Caller's ephemeral X25519 pub (for key exchange on media connect).
-        ephemeral_pub: [u8; 32],
-        /// Signature over (ephemeral_pub || target_fingerprint || call_id).
-        signature: Vec<u8>,
-        /// Supported quality profiles.
-        supported_profiles: Vec<crate::QualityProfile>,
-    },
-
-    /// Callee's response to a direct call.
-    DirectCallAnswer {
-        call_id: String,
-        /// How the callee accepts (or rejects).
-        accept_mode: CallAcceptMode,
-        /// Callee's identity pub (present when accepting).
-        #[serde(skip_serializing_if = "Option::is_none")]
-        identity_pub: Option<[u8; 32]>,
-        /// Callee's ephemeral pub (present when accepting).
-        #[serde(skip_serializing_if = "Option::is_none")]
-        ephemeral_pub: Option<[u8; 32]>,
-        /// Signature (present when accepting).
-        #[serde(skip_serializing_if = "Option::is_none")]
-        signature: Option<Vec<u8>>,
-        /// Chosen quality profile (present when accepting).
-        #[serde(skip_serializing_if = "Option::is_none")]
-        chosen_profile: Option<crate::QualityProfile>,
-    },
-
-    /// Relay tells both parties: media room is ready.
-    CallSetup {
-        call_id: String,
-        /// Room name on the relay for the media session (e.g., "_call:a1b2c3d4").
-        room: String,
-        /// Relay address for the QUIC media connection.
-        relay_addr: String,
-    },
-
-    /// Ringing notification (relay → caller, callee received the offer).
-    CallRinging {
-        call_id: String,
-    },
-
-    // ── NAT reflection ("STUN for QUIC") ──────────────────────────────
-
-    /// Client → relay: "please tell me the source IP:port you see on
-    /// this connection". A QUIC-native replacement for classic STUN
-    /// that reuses the TLS-authenticated signal channel to the relay
-    /// instead of running a separate UDP reflection service on port
-    /// 3478. The relay answers with `ReflectResponse`.
-    ///
-    /// No payload — the relay already knows which connection the
-    /// request arrived on, and `connection.remote_address()` gives it
-    /// the exact source address (post-NAT) as observed from the
-    /// server side of the TLS session.
-    Reflect,
-
-    /// Relay → client: response to `Reflect`. Carries the socket
-    /// address the relay observes as the client's source for this
-    /// QUIC connection in `SocketAddr::to_string()` form — "a.b.c.d:p"
-    /// for IPv4, "[::1]:p" for IPv6. Clients parse it with
-    /// `SocketAddr::from_str`.
-    ReflectResponse {
-        observed_addr: String,
-    },
-}
-
-/// How the callee responds to a direct call.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum CallAcceptMode {
-    /// Reject the call.
-    Reject,
-    /// Accept with trust — in Phase 2, this enables P2P (reveals IP).
-    /// In Phase 1, behaves the same as AcceptGeneric.
-    AcceptTrusted,
-    /// Accept with privacy — relay always mediates media.
-    AcceptGeneric,
+    /// Set or update the client's display name.
+    /// Sent by client after joining; relay updates the participant entry and
+    /// re-broadcasts a RoomUpdate to all participants.
+    SetAlias { alias: String },
 }
 
 /// A participant entry in a RoomUpdate message.
@@ -814,10 +670,6 @@ pub struct RoomParticipant {
     pub fingerprint: String,
     /// Optional display name set by the client.
     pub alias: Option<String>,
-    /// Relay label — identifies which relay this participant is connected to.
-    /// None for local participants, Some("Relay B") for federated.
-    #[serde(default)]
-    pub relay_label: Option<String>,
 }
 
 /// Reasons for ending a call.
@@ -931,58 +783,6 @@ mod tests {
         assert_eq!(packet.quality_report, decoded.quality_report);
     }
 
-    #[test]
-    fn reflect_serialize_roundtrip() {
-        // Reflect is a unit variant — the client sends it with no
-        // payload and the relay answers with the observed source addr.
-        let req = SignalMessage::Reflect;
-        let json = serde_json::to_string(&req).unwrap();
-        let decoded: SignalMessage = serde_json::from_str(&json).unwrap();
-        assert!(matches!(decoded, SignalMessage::Reflect));
-
-        // ReflectResponse carries a string — exercise both IPv4 and
-        // IPv6 shapes because SocketAddr::to_string uses [::1]:port
-        // for v6 and the client side has to parse that back.
-        for addr in ["192.0.2.17:4433", "[2001:db8::1]:4433", "127.0.0.1:54321"] {
-            let resp = SignalMessage::ReflectResponse {
-                observed_addr: addr.to_string(),
-            };
-            let json = serde_json::to_string(&resp).unwrap();
-            let decoded: SignalMessage = serde_json::from_str(&json).unwrap();
-            match decoded {
-                SignalMessage::ReflectResponse { observed_addr } => {
-                    assert_eq!(observed_addr, addr);
-                    // Must parse back to a SocketAddr cleanly.
-                    let _parsed: std::net::SocketAddr = observed_addr.parse()
-                        .expect("observed_addr must parse as SocketAddr");
-                }
-                _ => panic!("wrong variant after roundtrip"),
-            }
-        }
-    }
-
-    #[test]
-    fn reflect_backward_compat_with_existing_variants() {
-        // Adding Reflect/ReflectResponse at the end of the enum must
-        // not break JSON round-tripping of existing variants. Smoke-
-        // test a sample of the pre-existing ones.
-        let cases = vec![
-            SignalMessage::Ping { timestamp_ms: 12345 },
-            SignalMessage::Hold,
-            SignalMessage::Hangup { reason: HangupReason::Normal },
-            SignalMessage::CallRinging { call_id: "abcd".into() },
-        ];
-        for m in cases {
-            let json = serde_json::to_string(&m).unwrap();
-            let decoded: SignalMessage = serde_json::from_str(&json).unwrap();
-            // Discriminant equality proves variant tag survived.
-            assert_eq!(
-                std::mem::discriminant(&m),
-                std::mem::discriminant(&decoded)
-            );
-        }
-    }
-
     #[test]
     fn hold_unhold_serialize() {
         let hold = SignalMessage::Hold;

crates/wzp-proto/src/traits.rs

@@ -132,14 +132,6 @@ pub trait CryptoSession: Send + Sync {
     fn overhead(&self) -> usize {
         16 // ChaCha20-Poly1305 tag
     }
-
-    /// Short Authentication String (SAS) — 4-digit code for verbal verification.
-    /// Both peers derive the same code from the shared secret + identity keys.
-    /// If a MITM relay is intercepting, the codes will differ.
-    /// Returns None if SAS was not computed (e.g., relay-side sessions).
-    fn sas_code(&self) -> Option<u32> {
-        None
-    }
 }
 
 /// Key exchange using the Warzone identity model.

crates/wzp-relay/Cargo.toml

@@ -29,8 +29,6 @@ axum = { version = "0.7", default-features = false, features = ["tokio", "http1"
 tower-http = { version = "0.6", features = ["fs"] }
 futures-util = "0.3"
 dirs = "6"
-sha2 = { workspace = true }
-chrono = "0.4"
 
 [[bin]]
 name = "wzp-relay"

crates/wzp-relay/build.rs

@@ -1,18 +0,0 @@
-use std::process::Command;
-
-fn main() {
-    // Get git hash at build time
-    let output = Command::new("git")
-        .args(["rev-parse", "--short", "HEAD"])
-        .output();
-
-    let hash = match output {
-        Ok(o) if o.status.success() => {
-            String::from_utf8_lossy(&o.stdout).trim().to_string()
-        }
-        _ => "unknown".to_string(),
-    };
-
-    println!("cargo:rustc-env=WZP_BUILD_HASH={hash}");
-    println!("cargo:rerun-if-changed=.git/HEAD");
-}

crates/wzp-relay/src/call_registry.rs

@@ -1,199 +0,0 @@
-//! Direct call state tracking.
-//!
-//! Manages the lifecycle of 1:1 direct calls placed via the `_signal` channel.
-//! Each call goes through: Pending → Ringing → Active → Ended.
-
-use std::collections::HashMap;
-use std::time::{Duration, Instant};
-
-/// State of a direct call.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum DirectCallState {
-    /// Offer sent to callee, waiting for response.
-    Pending,
-    /// Callee acknowledged, ringing.
-    Ringing,
-    /// Call accepted, media room active.
-    Active,
-    /// Call ended (hangup, reject, timeout, or error).
-    Ended,
-}
-
-/// A tracked direct call between two users.
-pub struct DirectCall {
-    pub call_id: String,
-    pub caller_fingerprint: String,
-    pub callee_fingerprint: String,
-    pub state: DirectCallState,
-    pub accept_mode: Option<wzp_proto::CallAcceptMode>,
-    /// Private room name (set when accepted).
-    pub room_name: Option<String>,
-    pub created_at: Instant,
-    pub answered_at: Option<Instant>,
-    pub ended_at: Option<Instant>,
-}
-
-/// Registry of active direct calls.
-pub struct CallRegistry {
-    calls: HashMap<String, DirectCall>,
-}
-
-impl CallRegistry {
-    pub fn new() -> Self {
-        Self {
-            calls: HashMap::new(),
-        }
-    }
-
-    /// Create a new pending call. Returns the call_id.
-    pub fn create_call(&mut self, call_id: String, caller_fp: String, callee_fp: String) -> &DirectCall {
-        let call = DirectCall {
-            call_id: call_id.clone(),
-            caller_fingerprint: caller_fp,
-            callee_fingerprint: callee_fp,
-            state: DirectCallState::Pending,
-            accept_mode: None,
-            room_name: None,
-            created_at: Instant::now(),
-            answered_at: None,
-            ended_at: None,
-        };
-        self.calls.insert(call_id.clone(), call);
-        self.calls.get(&call_id).unwrap()
-    }
-
-    /// Get a call by ID.
-    pub fn get(&self, call_id: &str) -> Option<&DirectCall> {
-        self.calls.get(call_id)
-    }
-
-    /// Get a mutable call by ID.
-    pub fn get_mut(&mut self, call_id: &str) -> Option<&mut DirectCall> {
-        self.calls.get_mut(call_id)
-    }
-
-    /// Transition to Ringing state.
-    pub fn set_ringing(&mut self, call_id: &str) -> bool {
-        if let Some(call) = self.calls.get_mut(call_id) {
-            if call.state == DirectCallState::Pending {
-                call.state = DirectCallState::Ringing;
-                return true;
-            }
-        }
-        false
-    }
-
-    /// Transition to Active state.
-    pub fn set_active(&mut self, call_id: &str, mode: wzp_proto::CallAcceptMode, room: String) -> bool {
-        if let Some(call) = self.calls.get_mut(call_id) {
-            if call.state == DirectCallState::Pending || call.state == DirectCallState::Ringing {
-                call.state = DirectCallState::Active;
-                call.accept_mode = Some(mode);
-                call.room_name = Some(room);
-                call.answered_at = Some(Instant::now());
-                return true;
-            }
-        }
-        false
-    }
-
-    /// End a call.
-    pub fn end_call(&mut self, call_id: &str) -> Option<DirectCall> {
-        if let Some(call) = self.calls.get_mut(call_id) {
-            call.state = DirectCallState::Ended;
-            call.ended_at = Some(Instant::now());
-        }
-        self.calls.remove(call_id)
-    }
-
-    /// Find active/pending calls involving a fingerprint.
-    pub fn calls_for_fingerprint(&self, fp: &str) -> Vec<&DirectCall> {
-        self.calls.values()
-            .filter(|c| {
-                c.state != DirectCallState::Ended
-                    && (c.caller_fingerprint == fp || c.callee_fingerprint == fp)
-            })
-            .collect()
-    }
-
-    /// Find the peer's fingerprint in a call.
-    pub fn peer_fingerprint(&self, call_id: &str, my_fp: &str) -> Option<&str> {
-        self.calls.get(call_id).map(|c| {
-            if c.caller_fingerprint == my_fp {
-                c.callee_fingerprint.as_str()
-            } else {
-                c.caller_fingerprint.as_str()
-            }
-        })
-    }
-
-    /// Remove calls that have been pending longer than the timeout.
-    /// Returns call IDs of expired calls.
-    pub fn expire_stale(&mut self, timeout: Duration) -> Vec<DirectCall> {
-        let now = Instant::now();
-        let expired: Vec<String> = self.calls.iter()
-            .filter(|(_, c)| {
-                c.state == DirectCallState::Pending
-                    && now.duration_since(c.created_at) > timeout
-            })
-            .map(|(id, _)| id.clone())
-            .collect();
-
-        expired.into_iter()
-            .filter_map(|id| self.calls.remove(&id))
-            .collect()
-    }
-
-    /// Number of active (non-ended) calls.
-    pub fn active_count(&self) -> usize {
-        self.calls.values()
-            .filter(|c| c.state != DirectCallState::Ended)
-            .count()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn call_lifecycle() {
-        let mut reg = CallRegistry::new();
-        reg.create_call("c1".into(), "alice".into(), "bob".into());
-
-        assert_eq!(reg.get("c1").unwrap().state, DirectCallState::Pending);
-        assert!(reg.set_ringing("c1"));
-        assert_eq!(reg.get("c1").unwrap().state, DirectCallState::Ringing);
-
-        assert!(reg.set_active("c1", wzp_proto::CallAcceptMode::AcceptGeneric, "_call:c1".into()));
-        assert_eq!(reg.get("c1").unwrap().state, DirectCallState::Active);
-        assert_eq!(reg.get("c1").unwrap().room_name.as_deref(), Some("_call:c1"));
-
-        let ended = reg.end_call("c1").unwrap();
-        assert_eq!(ended.state, DirectCallState::Ended);
-        assert_eq!(reg.active_count(), 0);
-    }
-
-    #[test]
-    fn expire_stale_calls() {
-        let mut reg = CallRegistry::new();
-        reg.create_call("c1".into(), "alice".into(), "bob".into());
-
-        // Not expired yet
-        let expired = reg.expire_stale(Duration::from_secs(30));
-        assert!(expired.is_empty());
-
-        // Force expiry with 0 timeout
-        let expired = reg.expire_stale(Duration::from_secs(0));
-        assert_eq!(expired.len(), 1);
-        assert_eq!(expired[0].call_id, "c1");
-    }
-
-    #[test]
-    fn peer_lookup() {
-        let mut reg = CallRegistry::new();
-        reg.create_call("c1".into(), "alice".into(), "bob".into());
-        assert_eq!(reg.peer_fingerprint("c1", "alice"), Some("bob"));
-        assert_eq!(reg.peer_fingerprint("c1", "bob"), Some("alice"));
-    }
-}

crates/wzp-relay/src/config.rs

@@ -3,41 +3,8 @@
 use serde::{Deserialize, Serialize};
 use std::net::SocketAddr;
 
-/// A federated peer relay.
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct PeerConfig {
-    /// Address of the peer relay (e.g., "193.180.213.68:4433").
-    pub url: String,
-    /// Expected TLS certificate fingerprint (hex, with colons).
-    pub fingerprint: String,
-    /// Optional human-readable label.
-    #[serde(default)]
-    pub label: Option<String>,
-}
-
-/// A trusted relay — accepts inbound federation without needing the peer's address.
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct TrustedConfig {
-    /// Expected TLS certificate fingerprint (hex, with colons).
-    pub fingerprint: String,
-    /// Optional human-readable label.
-    #[serde(default)]
-    pub label: Option<String>,
-}
-
-/// A room declared global — bridged across all federated peers.
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct GlobalRoomConfig {
-    /// Room name to bridge (e.g., "android").
-    pub name: String,
-}
-
 /// Configuration for the relay daemon.
-///
-/// All fields have defaults, so a minimal TOML file only needs the
-/// fields you want to override (e.g., just `[[peers]]`).
 #[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(default)]
 pub struct RelayConfig {
     /// Address to listen on for incoming connections (client-facing).
     pub listen_addr: SocketAddr,
@@ -77,22 +44,6 @@ pub struct RelayConfig {
     pub ws_port: Option<u16>,
     /// Directory to serve static files from (HTML/JS/WASM for web clients).
     pub static_dir: Option<String>,
-    /// Federation peer relays.
-    #[serde(default)]
-    pub peers: Vec<PeerConfig>,
-    /// Global rooms bridged across federation.
-    #[serde(default)]
-    pub global_rooms: Vec<GlobalRoomConfig>,
-    /// Trusted relay fingerprints — accept inbound federation from these relays.
-    /// Unlike [[peers]], no url is needed — the peer connects to us.
-    #[serde(default)]
-    pub trusted: Vec<TrustedConfig>,
-    /// Debug tap: log packet headers for matching rooms ("*" = all rooms).
-    /// Activated via --debug-tap <room> or debug_tap = "room" in TOML.
-    pub debug_tap: Option<String>,
-    /// JSONL event log path for protocol analysis (--event-log).
-    #[serde(skip)]
-    pub event_log: Option<String>,
 }
 
 impl Default for RelayConfig {
@@ -111,100 +62,6 @@ impl Default for RelayConfig {
             trunking_enabled: false,
             ws_port: None,
             static_dir: None,
-            peers: Vec::new(),
-            global_rooms: Vec::new(),
-            trusted: Vec::new(),
-            debug_tap: None,
-            event_log: None,
         }
     }
 }
-
-/// Load relay configuration from a TOML file.
-pub fn load_config(path: &str) -> Result<RelayConfig, anyhow::Error> {
-    let content = std::fs::read_to_string(path)?;
-    let config: RelayConfig = toml::from_str(&content)?;
-    Ok(config)
-}
-
-/// Info about this relay instance, used to generate personalized example configs.
-pub struct RelayInfo {
-    pub listen_addr: String,
-    pub tls_fingerprint: String,
-    pub public_ip: Option<String>,
-}
-
-/// Load config from path, or create a personalized example config if it doesn't exist.
-pub fn load_or_create_config(path: &str, info: Option<&RelayInfo>) -> Result<RelayConfig, anyhow::Error> {
-    let p = std::path::Path::new(path);
-    if p.exists() {
-        return load_config(path);
-    }
-    // Create parent directory if needed
-    if let Some(parent) = p.parent() {
-        std::fs::create_dir_all(parent)?;
-    }
-    // Generate personalized example config
-    let example = generate_example_config(info);
-    std::fs::write(p, &example)?;
-    eprintln!("Created example config at {path} — edit it and restart.");
-    let config: RelayConfig = toml::from_str(&example)?;
-    Ok(config)
-}
-
-/// Generate an example TOML config, personalized with this relay's info if available.
-fn generate_example_config(info: Option<&RelayInfo>) -> String {
-    let listen = info.map(|i| i.listen_addr.as_str()).unwrap_or("0.0.0.0:4433");
-    let peer_example = if let Some(i) = info {
-        let ip = i.public_ip.as_deref().unwrap_or("this-relay-ip");
-        format!(
-            r#"# Other relays can peer with this relay using:
-# [[peers]]
-# url = "{ip}:{port}"
-# fingerprint = "{fp}"
-# label = "This Relay""#,
-            port = listen.rsplit(':').next().unwrap_or("4433"),
-            fp = i.tls_fingerprint,
-        )
-    } else {
-        "# To peer with another relay, add its url + fingerprint:".to_string()
-    };
-
-    format!(
-        r#"# WarzonePhone Relay Configuration
-# See docs/ADMINISTRATION.md for full reference.
-
-# Listen address for client connections
-listen_addr = "{listen}"
-
-# Maximum concurrent sessions
-# max_sessions = 100
-
-# Prometheus metrics endpoint (uncomment to enable)
-# metrics_port = 9090
-
-# featherChat auth endpoint (uncomment to enable)
-# auth_url = "https://chat.example.com/v1/auth/validate"
-
-{peer_example}
-
-# Federation: peer relays we connect to (outbound)
-# [[peers]]
-# url = "other-relay.example.com:4433"
-# fingerprint = "aa:bb:cc:dd:..."
-# label = "Relay B"
-
-# Federation: relays we trust inbound connections from
-# [[trusted]]
-# fingerprint = "ee:ff:00:11:..."
-# label = "Relay X"
-
-# Global rooms bridged across all federated peers
-# [[global_rooms]]
-# name = "general"
-
-# Debug: log packet headers for a room ("*" for all)
-# debug_tap = "*"
-"#
-    )
-}

crates/wzp-relay/src/event_log.rs

@@ -1,200 +0,0 @@
-//! JSONL event log for protocol analysis.
-//!
-//! When `--event-log <path>` is set, every media packet emits a structured
-//! event at each decision point (recv, forward, drop, deliver).
-//! Use `wzp-analyzer` to correlate events across multiple relays.
-
-use std::path::PathBuf;
-
-use serde::Serialize;
-use tokio::sync::mpsc;
-use tracing::{error, info};
-
-/// A single protocol event for JSONL output.
-#[derive(Debug, Serialize)]
-pub struct Event {
-    /// ISO 8601 timestamp with microseconds.
-    pub ts: String,
-    /// Event type.
-    pub event: &'static str,
-    /// Room name.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub room: Option<String>,
-    /// Source address or peer label.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub src: Option<String>,
-    /// Packet sequence number.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub seq: Option<u16>,
-    /// Codec identifier.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub codec: Option<String>,
-    /// FEC block ID.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub fec_block: Option<u8>,
-    /// FEC symbol index.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub fec_sym: Option<u8>,
-    /// Is FEC repair packet.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub repair: Option<bool>,
-    /// Payload length in bytes.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub len: Option<usize>,
-    /// Number of recipients.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub to_count: Option<usize>,
-    /// Peer label (for federation events).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub peer: Option<String>,
-    /// Drop/error reason.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub reason: Option<String>,
-    /// Presence action (active/inactive).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub action: Option<String>,
-    /// Participant count (presence events).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub participants: Option<usize>,
-}
-
-impl Event {
-    fn now() -> String {
-        chrono::Utc::now().format("%Y-%m-%dT%H:%M:%S%.6fZ").to_string()
-    }
-
-    /// Create a minimal event with just type and timestamp.
-    pub fn new(event: &'static str) -> Self {
-        Self {
-            ts: Self::now(),
-            event,
-            room: None,
-            src: None,
-            seq: None,
-            codec: None,
-            fec_block: None,
-            fec_sym: None,
-            repair: None,
-            len: None,
-            to_count: None,
-            peer: None,
-            reason: None,
-            action: None,
-            participants: None,
-        }
-    }
-
-    /// Set room.
-    pub fn room(mut self, room: &str) -> Self { self.room = Some(room.to_string()); self }
-    /// Set source.
-    pub fn src(mut self, src: &str) -> Self { self.src = Some(src.to_string()); self }
-    /// Set packet header fields from a MediaPacket.
-    pub fn packet(mut self, pkt: &wzp_proto::MediaPacket) -> Self {
-        self.seq = Some(pkt.header.seq);
-        self.codec = Some(format!("{:?}", pkt.header.codec_id));
-        self.fec_block = Some(pkt.header.fec_block);
-        self.fec_sym = Some(pkt.header.fec_symbol);
-        self.repair = Some(pkt.header.is_repair);
-        self.len = Some(pkt.payload.len());
-        self
-    }
-    /// Set seq only (when full packet not available).
-    pub fn seq(mut self, seq: u16) -> Self { self.seq = Some(seq); self }
-    /// Set payload length.
-    pub fn len(mut self, len: usize) -> Self { self.len = Some(len); self }
-    /// Set recipient count.
-    pub fn to_count(mut self, n: usize) -> Self { self.to_count = Some(n); self }
-    /// Set peer label.
-    pub fn peer(mut self, peer: &str) -> Self { self.peer = Some(peer.to_string()); self }
-    /// Set drop reason.
-    pub fn reason(mut self, reason: &str) -> Self { self.reason = Some(reason.to_string()); self }
-    /// Set presence action.
-    pub fn action(mut self, action: &str) -> Self { self.action = Some(action.to_string()); self }
-    /// Set participant count.
-    pub fn participants(mut self, n: usize) -> Self { self.participants = Some(n); self }
-}
-
-/// Handle for emitting events. Cheap to clone.
-#[derive(Clone)]
-pub struct EventLog {
-    tx: mpsc::UnboundedSender<Event>,
-}
-
-impl EventLog {
-    /// Emit an event (non-blocking, drops if channel is full).
-    pub fn emit(&self, event: Event) {
-        let _ = self.tx.send(event);
-    }
-}
-
-/// No-op event log for when `--event-log` is not set.
-/// All methods are no-ops that compile to nothing.
-#[derive(Clone)]
-pub struct NoopEventLog;
-
-/// Unified event log handle — either real or no-op.
-#[derive(Clone)]
-pub enum EventLogger {
-    Active(EventLog),
-    Noop,
-}
-
-impl EventLogger {
-    pub fn emit(&self, event: Event) {
-        if let EventLogger::Active(log) = self {
-            log.emit(event);
-        }
-    }
-
-    pub fn is_active(&self) -> bool {
-        matches!(self, EventLogger::Active(_))
-    }
-}
-
-/// Start the event log writer. Returns an `EventLogger` handle.
-pub fn start_event_log(path: Option<PathBuf>) -> EventLogger {
-    match path {
-        Some(path) => {
-            let (tx, rx) = mpsc::unbounded_channel();
-            tokio::spawn(writer_task(path, rx));
-            info!("event log enabled");
-            EventLogger::Active(EventLog { tx })
-        }
-        None => EventLogger::Noop,
-    }
-}
-
-/// Background task that writes events to a JSONL file.
-async fn writer_task(path: PathBuf, mut rx: mpsc::UnboundedReceiver<Event>) {
-    use tokio::io::AsyncWriteExt;
-
-    let file = match tokio::fs::File::create(&path).await {
-        Ok(f) => f,
-        Err(e) => {
-            error!("failed to create event log {}: {e}", path.display());
-            return;
-        }
-    };
-    let mut writer = tokio::io::BufWriter::new(file);
-    let mut count: u64 = 0;
-
-    while let Some(event) = rx.recv().await {
-        match serde_json::to_string(&event) {
-            Ok(json) => {
-                if writer.write_all(json.as_bytes()).await.is_err() { break; }
-                if writer.write_all(b"\n").await.is_err() { break; }
-                count += 1;
-                // Flush every 100 events
-                if count % 100 == 0 {
-                    let _ = writer.flush().await;
-                }
-            }
-            Err(e) => {
-                error!("event log serialize error: {e}");
-            }
-        }
-    }
-
-    let _ = writer.flush().await;
-    info!(events = count, "event log closed");
-}

crates/wzp-relay/src/federation.rs

@@ -1,976 +0,0 @@
-//! Relay federation — global room routing between peer relays.
-//!
-//! Each relay maintains a forwarding table per global room. When a local participant
-//! sends media in a global room, it's forwarded to all peer relays that have the room
-//! active. Incoming federated media is delivered to local participants and optionally
-//! forwarded to other active peers (multi-hop).
-
-use std::collections::{HashMap, HashSet};
-use std::net::SocketAddr;
-use std::sync::Arc;
-use std::time::{Duration, Instant};
-
-use bytes::Bytes;
-use sha2::{Sha256, Digest};
-use tokio::sync::Mutex;
-use tracing::{error, info, warn};
-
-use wzp_proto::{MediaTransport, SignalMessage};
-use wzp_transport::QuinnTransport;
-
-use crate::config::{PeerConfig, TrustedConfig};
-use crate::event_log::{Event, EventLogger};
-use crate::room::{self, FederationMediaOut, RoomEvent, RoomManager};
-
-/// Compute 8-byte room hash for federation datagram tagging.
-pub fn room_hash(room_name: &str) -> [u8; 8] {
-    let h = Sha256::digest(room_name.as_bytes());
-    let mut out = [0u8; 8];
-    out.copy_from_slice(&h[..8]);
-    out
-}
-
-/// Normalize a fingerprint string (remove colons, lowercase).
-fn normalize_fp(fp: &str) -> String {
-    fp.replace(':', "").to_lowercase()
-}
-
-/// Time-based dedup filter for federation datagrams.
-/// Tracks recently seen packets and expires entries older than 2 seconds.
-/// This prevents duplicate delivery when the same packet arrives via
-/// multiple federation paths, while allowing new senders that happen to
-/// reuse the same seq numbers.
-struct Deduplicator {
-    /// Recently seen packet keys with insertion time.
-    entries: HashMap<u64, Instant>,
-    /// Expiry duration.
-    ttl: Duration,
-}
-
-impl Deduplicator {
-    fn new(_capacity: usize) -> Self {
-        Self {
-            entries: HashMap::with_capacity(512),
-            ttl: Duration::from_secs(2),
-        }
-    }
-
-    /// Returns true if this packet is a duplicate (already seen within TTL).
-    fn is_dup(&mut self, room_hash: &[u8; 8], seq: u16, extra: u64) -> bool {
-        let key = u64::from_be_bytes(*room_hash) ^ (seq as u64) ^ extra;
-        let now = Instant::now();
-
-        // Periodic cleanup (every ~256 packets)
-        if self.entries.len() > 256 {
-            self.entries.retain(|_, ts| now.duration_since(*ts) < self.ttl);
-        }
-
-        if let Some(ts) = self.entries.get(&key) {
-            if now.duration_since(*ts) < self.ttl {
-                return true; // seen recently — duplicate
-            }
-        }
-        self.entries.insert(key, now);
-        false
-    }
-}
-
-/// Per-room token bucket rate limiter for federation forwarding.
-struct RateLimiter {
-    /// Max packets per second per room.
-    max_pps: u32,
-    /// Tokens remaining in current window.
-    tokens: u32,
-    /// When the current window started.
-    window_start: Instant,
-}
-
-impl RateLimiter {
-    fn new(max_pps: u32) -> Self {
-        Self {
-            max_pps,
-            tokens: max_pps,
-            window_start: Instant::now(),
-        }
-    }
-
-    /// Returns true if the packet should be allowed through.
-    fn allow(&mut self) -> bool {
-        let elapsed = self.window_start.elapsed();
-        if elapsed >= Duration::from_secs(1) {
-            self.tokens = self.max_pps;
-            self.window_start = Instant::now();
-        }
-        if self.tokens > 0 {
-            self.tokens -= 1;
-            true
-        } else {
-            false
-        }
-    }
-}
-
-/// Active link to a peer relay.
-struct PeerLink {
-    transport: Arc<QuinnTransport>,
-    label: String,
-    /// Global rooms that this peer has reported as active.
-    active_rooms: HashSet<String>,
-    /// Remote participants per room (for federated presence in RoomUpdate).
-    remote_participants: HashMap<String, Vec<wzp_proto::packet::RoomParticipant>>,
-    /// Last time we received any data (signal or media) from this peer.
-    last_seen: Instant,
-}
-
-/// Max federation packets per second per room (0 = unlimited).
-const FEDERATION_RATE_LIMIT_PPS: u32 = 500;
-/// Dedup window size (number of recent packets to remember).
-const DEDUP_WINDOW_SIZE: usize = 4096;
-/// Remote participants are considered stale after this duration with no updates.
-const REMOTE_PARTICIPANT_STALE_SECS: u64 = 15;
-
-/// Manages federation connections and global room forwarding.
-pub struct FederationManager {
-    peers: Vec<PeerConfig>,
-    trusted: Vec<TrustedConfig>,
-    global_rooms: HashSet<String>,
-    room_mgr: Arc<Mutex<RoomManager>>,
-    endpoint: quinn::Endpoint,
-    local_tls_fp: String,
-    metrics: Arc<crate::metrics::RelayMetrics>,
-    /// Active peer connections, keyed by normalized fingerprint.
-    peer_links: Arc<Mutex<HashMap<String, PeerLink>>>,
-    /// Dedup filter for incoming federation datagrams.
-    dedup: Mutex<Deduplicator>,
-    /// JSONL event log for protocol analysis.
-    event_log: EventLogger,
-    /// Per-room rate limiters for inbound federation media.
-    rate_limiters: Mutex<HashMap<String, RateLimiter>>,
-}
-
-impl FederationManager {
-    pub fn new(
-        peers: Vec<PeerConfig>,
-        trusted: Vec<TrustedConfig>,
-        global_rooms: HashSet<String>,
-        room_mgr: Arc<Mutex<RoomManager>>,
-        endpoint: quinn::Endpoint,
-        local_tls_fp: String,
-        metrics: Arc<crate::metrics::RelayMetrics>,
-        event_log: EventLogger,
-    ) -> Self {
-        Self {
-            peers,
-            trusted,
-            global_rooms,
-            room_mgr,
-            endpoint,
-            local_tls_fp,
-            metrics,
-            peer_links: Arc::new(Mutex::new(HashMap::new())),
-            dedup: Mutex::new(Deduplicator::new(DEDUP_WINDOW_SIZE)),
-            event_log,
-            rate_limiters: Mutex::new(HashMap::new()),
-        }
-    }
-
-    /// Check if a room name (which may be hashed) is a global room.
-    pub fn is_global_room(&self, room: &str) -> bool {
-        self.resolve_global_room(room).is_some()
-    }
-
-    /// Resolve a room name (raw or hashed) to the canonical global room name.
-    /// Returns the configured global room name if it matches.
-    pub fn resolve_global_room(&self, room: &str) -> Option<&str> {
-        // Direct match (raw room name, e.g. Android clients)
-        if self.global_rooms.contains(room) {
-            return Some(self.global_rooms.iter().find(|n| n.as_str() == room).unwrap());
-        }
-        // Hashed match (desktop clients hash room names for SNI privacy)
-        self.global_rooms.iter().find(|name| {
-            wzp_crypto::hash_room_name(name) == room
-        }).map(|s| s.as_str())
-    }
-
-    /// Get the canonical federation room hash for a room.
-    /// Always uses the configured global room name, not the client-provided name.
-    pub fn global_room_hash(&self, room: &str) -> [u8; 8] {
-        if let Some(canonical) = self.resolve_global_room(room) {
-            room_hash(canonical)
-        } else {
-            room_hash(room)
-        }
-    }
-
-    /// Start federation — spawns connection loops + event dispatcher.
-    pub async fn run(self: Arc<Self>) {
-        if self.peers.is_empty() && self.global_rooms.is_empty() {
-            return;
-        }
-        info!(
-            peers = self.peers.len(),
-            global_rooms = self.global_rooms.len(),
-            "federation starting"
-        );
-
-        let mut handles = Vec::new();
-
-        // Per-peer outbound connection loops
-        for peer in &self.peers {
-            let this = self.clone();
-            let peer = peer.clone();
-            handles.push(tokio::spawn(async move {
-                run_peer_loop(this, peer).await;
-            }));
-        }
-
-        // Room event dispatcher
-        let room_events = {
-            let mgr = self.room_mgr.lock().await;
-            mgr.subscribe_events()
-        };
-        let this = self.clone();
-        handles.push(tokio::spawn(async move {
-            run_room_event_dispatcher(this, room_events).await;
-        }));
-
-        // Stale presence sweeper — purges remote participants from dead peers
-        let this = self.clone();
-        handles.push(tokio::spawn(async move {
-            run_stale_presence_sweeper(this).await;
-        }));
-
-        for h in handles {
-            let _ = h.await;
-        }
-    }
-
-    /// Handle an inbound federation connection from a recognized peer.
-    pub async fn handle_inbound(
-        self: &Arc<Self>,
-        transport: Arc<QuinnTransport>,
-        peer_config: PeerConfig,
-    ) {
-        let peer_fp = normalize_fp(&peer_config.fingerprint);
-        let label = peer_config.label.unwrap_or_else(|| peer_config.url.clone());
-        info!(peer = %label, "inbound federation link active");
-        if let Err(e) = run_federation_link(self.clone(), transport, peer_fp, label.clone()).await {
-            warn!(peer = %label, "inbound federation link ended: {e}");
-        }
-    }
-
-    /// Get all remote participants for a room from all peer links.
-    /// Deduplicates by fingerprint (same participant may appear via multiple links).
-    pub async fn get_remote_participants(&self, room: &str) -> Vec<wzp_proto::packet::RoomParticipant> {
-        let canonical = self.resolve_global_room(room);
-        let links = self.peer_links.lock().await;
-        let mut result = Vec::new();
-        for link in links.values() {
-            // Check canonical name
-            if let Some(c) = canonical {
-                if let Some(remote) = link.remote_participants.get(c) {
-                    result.extend(remote.iter().cloned());
-                }
-                // Also check raw room name, but only if different from canonical
-                if c != room {
-                    if let Some(remote) = link.remote_participants.get(room) {
-                        result.extend(remote.iter().cloned());
-                    }
-                }
-            } else {
-                if let Some(remote) = link.remote_participants.get(room) {
-                    result.extend(remote.iter().cloned());
-                }
-            }
-        }
-        // Deduplicate by fingerprint
-        let mut seen = HashSet::new();
-        result.retain(|p| seen.insert(p.fingerprint.clone()));
-        result
-    }
-
-    /// Forward locally-generated media to all connected peers.
-    /// For locally-originated media, we send to ALL peers (they decide whether to deliver).
-    /// For forwarded media (multi-hop), handle_datagram filters by active_rooms.
-    ///
-    /// `_room_name` is kept in the signature for caller-site symmetry with
-    /// the other room-tagged helpers and for future per-room-name logging
-    /// or rate limiting; the body currently forwards on `room_hash` alone
-    /// because that's what the wire format carries.
-    pub async fn forward_to_peers(&self, _room_name: &str, room_hash: &[u8; 8], media_data: &Bytes) {
-        let links = self.peer_links.lock().await;
-        if links.is_empty() {
-            return;
-        }
-        for (_fp, link) in links.iter() {
-            let mut tagged = Vec::with_capacity(8 + media_data.len());
-            tagged.extend_from_slice(room_hash);
-            tagged.extend_from_slice(media_data);
-            match link.transport.send_raw_datagram(&tagged) {
-                Ok(()) => {
-                    self.metrics.federation_packets_forwarded
-                        .with_label_values(&[&link.label, "out"]).inc();
-                }
-                Err(e) => warn!(peer = %link.label, "federation send error: {e}"),
-            }
-        }
-    }
-
-    // ── Trust verification (kept from previous implementation) ──
-
-    pub fn find_peer_by_fingerprint(&self, fp: &str) -> Option<&PeerConfig> {
-        self.peers.iter().find(|p| normalize_fp(&p.fingerprint) == normalize_fp(fp))
-    }
-
-    pub fn find_peer_by_addr(&self, addr: SocketAddr) -> Option<&PeerConfig> {
-        let addr_ip = addr.ip();
-        self.peers.iter().find(|p| {
-            p.url.parse::<SocketAddr>()
-                .map(|sa| sa.ip() == addr_ip)
-                .unwrap_or(false)
-        })
-    }
-
-    pub fn find_trusted_by_fingerprint(&self, fp: &str) -> Option<&TrustedConfig> {
-        self.trusted.iter().find(|t| normalize_fp(&t.fingerprint) == normalize_fp(fp))
-    }
-
-    pub fn check_inbound_trust(&self, addr: SocketAddr, hello_fp: &str) -> Option<String> {
-        if let Some(peer) = self.find_peer_by_addr(addr) {
-            return Some(peer.label.clone().unwrap_or_else(|| peer.url.clone()));
-        }
-        if let Some(trusted) = self.find_trusted_by_fingerprint(hello_fp) {
-            return Some(trusted.label.clone().unwrap_or_else(|| hello_fp[..16].to_string()));
-        }
-        None
-    }
-}
-
-// ── Outbound media egress task ──
-
-/// Drains the federation media channel and forwards to active peers.
-pub async fn run_federation_media_egress(
-    fm: Arc<FederationManager>,
-    mut rx: tokio::sync::mpsc::Receiver<FederationMediaOut>,
-) {
-    let mut count: u64 = 0;
-    while let Some(out) = rx.recv().await {
-        count += 1;
-        if count == 1 || count % 250 == 0 {
-            info!(room = %out.room_name, count, "federation egress: forwarding media");
-        }
-        fm.forward_to_peers(&out.room_name, &out.room_hash, &out.data).await;
-    }
-    info!(total = count, "federation egress task ended");
-}
-
-// ── Room event dispatcher ──
-
-/// Watches RoomManager events and sends GlobalRoomActive/Inactive to peers.
-async fn run_room_event_dispatcher(
-    fm: Arc<FederationManager>,
-    mut events: tokio::sync::broadcast::Receiver<RoomEvent>,
-) {
-    loop {
-        match events.recv().await {
-            Ok(RoomEvent::LocalJoin { room }) => {
-                if fm.is_global_room(&room) {
-                    let participants = {
-                        let mgr = fm.room_mgr.lock().await;
-                        mgr.local_participant_list(&room)
-                    };
-                    info!(room = %room, count = participants.len(), "global room now active, announcing to peers");
-                    let msg = SignalMessage::GlobalRoomActive { room, participants };
-                    let links = fm.peer_links.lock().await;
-                    for link in links.values() {
-                        let _ = link.transport.send_signal(&msg).await;
-                    }
-                }
-            }
-            Ok(RoomEvent::LocalLeave { room }) => {
-                if fm.is_global_room(&room) {
-                    info!(room = %room, "global room now inactive, announcing to peers");
-                    let msg = SignalMessage::GlobalRoomInactive { room };
-                    let links = fm.peer_links.lock().await;
-                    for link in links.values() {
-                        let _ = link.transport.send_signal(&msg).await;
-                    }
-                }
-            }
-            Err(tokio::sync::broadcast::error::RecvError::Lagged(n)) => {
-                warn!(missed = n, "room event receiver lagged");
-            }
-            Err(tokio::sync::broadcast::error::RecvError::Closed) => break,
-        }
-    }
-}
-
-// ── Stale presence sweeper ──
-
-/// Periodically checks for stale remote participants and purges them.
-/// This handles the case where a peer link dies without sending GlobalRoomInactive
-/// (e.g., QUIC timeout, network partition, crash).
-async fn run_stale_presence_sweeper(fm: Arc<FederationManager>) {
-    let mut interval = tokio::time::interval(Duration::from_secs(5));
-    loop {
-        interval.tick().await;
-        let stale_threshold = Duration::from_secs(REMOTE_PARTICIPANT_STALE_SECS);
-
-        // Find peers with stale remote_participants whose link is also gone or idle
-        let stale_rooms: Vec<(String, String)> = {
-            let links = fm.peer_links.lock().await;
-            let mut stale = Vec::new();
-            for (fp, link) in links.iter() {
-                if link.last_seen.elapsed() > stale_threshold && !link.remote_participants.is_empty() {
-                    for room in link.remote_participants.keys() {
-                        stale.push((fp.clone(), room.clone()));
-                    }
-                }
-            }
-            stale
-        };
-
-        if stale_rooms.is_empty() {
-            continue;
-        }
-
-        // Purge stale entries and collect affected rooms
-        let mut affected_rooms = HashSet::new();
-        {
-            let mut links = fm.peer_links.lock().await;
-            for (fp, room) in &stale_rooms {
-                if let Some(link) = links.get_mut(fp.as_str()) {
-                    if link.last_seen.elapsed() > stale_threshold {
-                        info!(peer = %link.label, room = %room, "purging stale remote participants (no data for {}s)", link.last_seen.elapsed().as_secs());
-                        link.remote_participants.remove(room);
-                        link.active_rooms.remove(room);
-                        affected_rooms.insert(room.clone());
-                    }
-                }
-            }
-        }
-
-        // Broadcast updated RoomUpdate for affected rooms
-        for room in &affected_rooms {
-            let mgr = fm.room_mgr.lock().await;
-            for local_room in mgr.active_rooms() {
-                if fm.resolve_global_room(&local_room) == fm.resolve_global_room(room) {
-                    let mut all_participants = mgr.local_participant_list(&local_room);
-                    let remote = fm.get_remote_participants(&local_room).await;
-                    all_participants.extend(remote);
-                    let mut seen = HashSet::new();
-                    all_participants.retain(|p| seen.insert(p.fingerprint.clone()));
-                    let update = SignalMessage::RoomUpdate {
-                        count: all_participants.len() as u32,
-                        participants: all_participants,
-                    };
-                    let senders = mgr.local_senders(&local_room);
-                    drop(mgr);
-                    room::broadcast_signal(&senders, &update).await;
-                    info!(room = %room, "swept stale presence — broadcast updated RoomUpdate");
-                    break;
-                }
-            }
-        }
-    }
-}
-
-// ── Peer connection management ──
-
-/// Persistent connection loop for one peer — reconnects with backoff.
-async fn run_peer_loop(fm: Arc<FederationManager>, peer: PeerConfig) {
-    let mut backoff = Duration::from_secs(5);
-    loop {
-        info!(peer_url = %peer.url, label = ?peer.label, "federation: connecting to peer...");
-        match connect_to_peer(&fm, &peer).await {
-            Ok(transport) => {
-                backoff = Duration::from_secs(5);
-                let peer_fp = normalize_fp(&peer.fingerprint);
-                let label = peer.label.clone().unwrap_or_else(|| peer.url.clone());
-                if let Err(e) = run_federation_link(fm.clone(), transport, peer_fp, label).await {
-                    warn!(peer_url = %peer.url, "federation link ended: {e}");
-                }
-            }
-            Err(e) => {
-                warn!(peer_url = %peer.url, backoff_s = backoff.as_secs(), "federation connect failed: {e}");
-            }
-        }
-        tokio::time::sleep(backoff).await;
-        backoff = (backoff * 2).min(Duration::from_secs(300));
-    }
-}
-
-/// Connect to a peer relay and send hello.
-async fn connect_to_peer(fm: &FederationManager, peer: &PeerConfig) -> Result<Arc<QuinnTransport>, anyhow::Error> {
-    let addr: SocketAddr = peer.url.parse()?;
-    let client_cfg = wzp_transport::client_config();
-    let conn = wzp_transport::connect(&fm.endpoint, addr, "_federation", client_cfg).await?;
-    let transport = Arc::new(QuinnTransport::new(conn));
-
-    // Send hello with our TLS fingerprint
-    let hello = SignalMessage::FederationHello {
-        tls_fingerprint: fm.local_tls_fp.clone(),
-    };
-    transport.send_signal(&hello).await
-        .map_err(|e| anyhow::anyhow!("federation hello send failed: {e}"))?;
-
-    info!(peer_url = %peer.url, label = ?peer.label, "federation: connected (hello sent)");
-    Ok(transport)
-}
-
-// ── Federation link (runs on a single QUIC connection) ──
-
-/// Run the federation link: exchange global room state and forward media.
-async fn run_federation_link(
-    fm: Arc<FederationManager>,
-    transport: Arc<QuinnTransport>,
-    peer_fp: String,
-    peer_label: String,
-) -> Result<(), anyhow::Error> {
-    // Register peer link + metrics
-    fm.metrics.federation_peer_status.with_label_values(&[&peer_label]).set(1);
-    {
-        let mut links = fm.peer_links.lock().await;
-        links.insert(peer_fp.clone(), PeerLink {
-            transport: transport.clone(),
-            label: peer_label.clone(),
-            active_rooms: HashSet::new(),
-            remote_participants: HashMap::new(),
-            last_seen: Instant::now(),
-        });
-    }
-
-    // Announce our currently active global rooms to this new peer
-    // Collect all announcements first, then send (avoid holding locks across await)
-    let announcements = {
-        let mgr = fm.room_mgr.lock().await;
-        let active = mgr.active_rooms();
-        let mut msgs = Vec::new();
-
-        // Local rooms
-        for room_name in &active {
-            if fm.is_global_room(room_name) {
-                let participants = mgr.local_participant_list(room_name);
-                info!(peer = %peer_label, room = %room_name, participants = participants.len(), "announcing local global room to new peer");
-                msgs.push(SignalMessage::GlobalRoomActive { room: room_name.clone(), participants });
-            }
-        }
-
-        // Remote rooms from OTHER peers (for multi-hop propagation)
-        let links = fm.peer_links.lock().await;
-        for (fp, link) in links.iter() {
-            if fp != &peer_fp {
-                for (room, participants) in &link.remote_participants {
-                    if fm.is_global_room(room) {
-                        info!(peer = %peer_label, room = %room, via = %link.label, "propagating remote room to new peer");
-                        msgs.push(SignalMessage::GlobalRoomActive {
-                            room: room.clone(),
-                            participants: participants.clone(),
-                        });
-                    }
-                }
-            }
-        }
-        msgs
-    };
-    for msg in &announcements {
-        let _ = transport.send_signal(msg).await;
-    }
-
-    // Three concurrent tasks: signal recv + media recv + RTT monitor
-    let signal_transport = transport.clone();
-    let media_transport = transport.clone();
-    let rtt_transport = transport.clone();
-    let fm_signal = fm.clone();
-    let fm_media = fm.clone();
-    let fm_rtt = fm.clone();
-    let peer_fp_signal = peer_fp.clone();
-    let peer_fp_media = peer_fp.clone();
-    let label_signal = peer_label.clone();
-    let label_rtt = peer_label.clone();
-
-    let signal_task = async move {
-        loop {
-            match signal_transport.recv_signal().await {
-                Ok(Some(msg)) => {
-                    handle_signal(&fm_signal, &peer_fp_signal, &label_signal, msg).await;
-                }
-                Ok(None) => break,
-                Err(e) => {
-                    error!(peer = %label_signal, "federation signal error: {e}");
-                    break;
-                }
-            }
-        }
-    };
-
-    let peer_label_media = peer_label.clone();
-    let media_task = async move {
-        let mut media_count: u64 = 0;
-        loop {
-            match media_transport.connection().read_datagram().await {
-                Ok(data) => {
-                    media_count += 1;
-                    if media_count == 1 || media_count % 250 == 0 {
-                        info!(peer = %peer_label_media, media_count, len = data.len(), "federation: received datagram");
-                    }
-                    handle_datagram(&fm_media, &peer_fp_media, data).await;
-                }
-                Err(e) => {
-                    info!(peer = %peer_label_media, "federation media task ended: {e}");
-                    break;
-                }
-            }
-        }
-    };
-
-    // RTT monitor: periodically sample QUIC RTT for this peer and push it
-    // into the `wzp_federation_peer_rtt_ms` gauge. The gauge is registered
-    // in metrics.rs but previously never received any samples — the task
-    // computed rtt_ms and dropped it on the floor, leaving the Grafana
-    // panel blank. Fixed as part of the workspace warning sweep.
-    let rtt_task = async move {
-        loop {
-            tokio::time::sleep(Duration::from_secs(5)).await;
-            let rtt_ms = rtt_transport.connection().stats().path.rtt.as_millis() as f64;
-            fm_rtt
-                .metrics
-                .federation_peer_rtt_ms
-                .with_label_values(&[&label_rtt])
-                .set(rtt_ms);
-        }
-    };
-
-    tokio::select! {
-        _ = signal_task => {}
-        _ = media_task => {}
-        _ = rtt_task => {}
-    }
-
-    // Cleanup: remove peer link + metrics
-    fm.metrics.federation_peer_status.with_label_values(&[&peer_label]).set(0);
-    {
-        let mut links = fm.peer_links.lock().await;
-        links.remove(&peer_fp);
-    }
-    info!(peer = %peer_label, "federation link ended");
-
-    Ok(())
-}
-
-/// Handle an incoming federation signal.
-async fn handle_signal(
-    fm: &Arc<FederationManager>,
-    peer_fp: &str,
-    peer_label: &str,
-    msg: SignalMessage,
-) {
-    // Update last_seen for this peer
-    {
-        let mut links = fm.peer_links.lock().await;
-        if let Some(link) = links.get_mut(peer_fp) {
-            link.last_seen = Instant::now();
-        }
-    }
-
-    match msg {
-        SignalMessage::GlobalRoomActive { room, participants } => {
-            if fm.is_global_room(&room) {
-                info!(peer = %peer_label, room = %room, remote_participants = participants.len(), "peer has global room active");
-                let mut links = fm.peer_links.lock().await;
-                if let Some(link) = links.get_mut(peer_fp) {
-                    link.active_rooms.insert(room.clone());
-                }
-                // Update active rooms metric
-                let total: usize = links.values().map(|l| l.active_rooms.len()).sum();
-                fm.metrics.federation_active_rooms.set(total as i64);
-                if let Some(link) = links.get_mut(peer_fp) {
-                    // Tag remote participants with their relay label
-                    let tagged: Vec<_> = participants.iter().map(|p| {
-                        let mut tagged = p.clone();
-                        if tagged.relay_label.is_none() {
-                            tagged.relay_label = Some(link.label.clone());
-                        }
-                        tagged
-                    }).collect();
-                    link.remote_participants.insert(room.clone(), tagged);
-                }
-                // Propagate to other peers (with relay labels preserved)
-                let tagged_for_propagation = if let Some(link) = links.get(peer_fp) {
-                    let label = link.label.clone();
-                    participants.iter().map(|p| {
-                        let mut t = p.clone();
-                        if t.relay_label.is_none() {
-                            t.relay_label = Some(label.clone());
-                        }
-                        t
-                    }).collect::<Vec<_>>()
-                } else {
-                    participants.clone()
-                };
-                for (fp, link) in links.iter() {
-                    if fp != peer_fp {
-                        let _ = link.transport.send_signal(&SignalMessage::GlobalRoomActive {
-                            room: room.clone(),
-                            participants: tagged_for_propagation.clone(),
-                        }).await;
-                    }
-                }
-                drop(links);
-
-                // Broadcast updated RoomUpdate to local clients in this room
-                // Find the local room name (may be hashed or raw)
-                let mgr = fm.room_mgr.lock().await;
-                for local_room in mgr.active_rooms() {
-                    if fm.is_global_room(&local_room) && fm.resolve_global_room(&local_room) == fm.resolve_global_room(&room) {
-                        // Build merged participant list: local + all remote (deduped)
-                        let mut all_participants = mgr.local_participant_list(&local_room);
-                        let links = fm.peer_links.lock().await;
-                        for link in links.values() {
-                            if let Some(canonical) = fm.resolve_global_room(&local_room) {
-                                if let Some(remote) = link.remote_participants.get(canonical) {
-                                    all_participants.extend(remote.iter().cloned());
-                                }
-                                // Also check raw room name, but only if different from canonical
-                                if canonical != local_room {
-                                    if let Some(remote) = link.remote_participants.get(&local_room) {
-                                        all_participants.extend(remote.iter().cloned());
-                                    }
-                                }
-                            }
-                        }
-                        // Deduplicate by fingerprint
-                        let mut seen = HashSet::new();
-                        all_participants.retain(|p| seen.insert(p.fingerprint.clone()));
-                        let update = SignalMessage::RoomUpdate {
-                            count: all_participants.len() as u32,
-                            participants: all_participants,
-                        };
-                        let senders = mgr.local_senders(&local_room);
-                        drop(links);
-                        drop(mgr);
-                        room::broadcast_signal(&senders, &update).await;
-                        break;
-                    }
-                }
-            }
-        }
-        SignalMessage::GlobalRoomInactive { room } => {
-            info!(peer = %peer_label, room = %room, "peer global room now inactive");
-            let mut links = fm.peer_links.lock().await;
-            if let Some(link) = links.get_mut(peer_fp) {
-                link.active_rooms.remove(&room);
-                // Clear remote participants for this peer+room
-                link.remote_participants.remove(&room);
-                // Also try canonical name
-                if let Some(canonical) = fm.resolve_global_room(&room) {
-                    link.remote_participants.remove(canonical);
-                }
-            }
-
-            // Update active rooms metric
-            let total: usize = links.values().map(|l| l.active_rooms.len()).sum();
-            fm.metrics.federation_active_rooms.set(total as i64);
-
-            // Build remaining remote participants (from all peers except the one going inactive)
-            let remaining_remote: Vec<wzp_proto::packet::RoomParticipant> = {
-                let canonical = fm.resolve_global_room(&room);
-                let mut result = Vec::new();
-                for (fp, link) in links.iter() {
-                    if fp == peer_fp { continue; }
-                    if let Some(c) = canonical {
-                        if let Some(remote) = link.remote_participants.get(c) {
-                            result.extend(remote.iter().cloned());
-                        }
-                    }
-                }
-                let mut seen = HashSet::new();
-                result.retain(|p| seen.insert(p.fingerprint.clone()));
-                result
-            };
-
-            // Propagate to other peers: send updated GlobalRoomActive with revised list,
-            // or GlobalRoomInactive if no participants remain anywhere
-            let local_active = {
-                let mgr = fm.room_mgr.lock().await;
-                mgr.active_rooms().iter().any(|r| fm.resolve_global_room(r) == fm.resolve_global_room(&room))
-            };
-            let has_remaining = !remaining_remote.is_empty() || local_active;
-
-            // Collect peer transports to send to (avoid holding lock across await)
-            let peer_sends: Vec<_> = links.iter()
-                .filter(|(fp, _)| *fp != peer_fp)
-                .map(|(_, link)| link.transport.clone())
-                .collect();
-            drop(links);
-
-            if has_remaining {
-                // Send updated participant list to other peers
-                let mut updated_participants = remaining_remote.clone();
-                if local_active {
-                    let mgr = fm.room_mgr.lock().await;
-                    for local_room in mgr.active_rooms() {
-                        if fm.resolve_global_room(&local_room) == fm.resolve_global_room(&room) {
-                            updated_participants.extend(mgr.local_participant_list(&local_room));
-                            break;
-                        }
-                    }
-                }
-                let msg = SignalMessage::GlobalRoomActive {
-                    room: room.clone(),
-                    participants: updated_participants,
-                };
-                for transport in &peer_sends {
-                    let _ = transport.send_signal(&msg).await;
-                }
-            } else {
-                // No participants left anywhere — propagate inactive
-                let msg = SignalMessage::GlobalRoomInactive { room: room.clone() };
-                for transport in &peer_sends {
-                    let _ = transport.send_signal(&msg).await;
-                }
-            }
-
-            // Broadcast updated RoomUpdate to local clients (remote participant removed)
-            let mgr = fm.room_mgr.lock().await;
-            for local_room in mgr.active_rooms() {
-                if fm.is_global_room(&local_room) && fm.resolve_global_room(&local_room) == fm.resolve_global_room(&room) {
-                    let mut all_participants = mgr.local_participant_list(&local_room);
-                    all_participants.extend(remaining_remote.iter().cloned());
-                    // Deduplicate by fingerprint
-                    let mut seen = HashSet::new();
-                    all_participants.retain(|p| seen.insert(p.fingerprint.clone()));
-                    let update = SignalMessage::RoomUpdate {
-                        count: all_participants.len() as u32,
-                        participants: all_participants,
-                    };
-                    let senders = mgr.local_senders(&local_room);
-                    drop(mgr);
-                    room::broadcast_signal(&senders, &update).await;
-                    info!(room = %room, "broadcast updated presence (remote participant removed)");
-                    break;
-                }
-            }
-        }
-        _ => {} // ignore other signals
-    }
-}
-
-/// Handle an incoming federation datagram (room-hash-tagged media).
-async fn handle_datagram(
-    fm: &Arc<FederationManager>,
-    source_peer_fp: &str,
-    data: Bytes,
-) {
-    if data.len() < 12 { return; } // 8-byte hash + min packet
-
-    let mut rh = [0u8; 8];
-    rh.copy_from_slice(&data[..8]);
-    let media_bytes = data.slice(8..);
-
-    let pkt = match wzp_proto::MediaPacket::from_bytes(media_bytes.clone()) {
-        Some(pkt) => pkt,
-        None => {
-            fm.event_log.emit(Event::new("federation_ingress_malformed").len(data.len()));
-            return;
-        }
-    };
-
-    // Event log: federation ingress
-    let peer_label = {
-        let links = fm.peer_links.lock().await;
-        links.get(source_peer_fp).map(|l| l.label.clone()).unwrap_or_default()
-    };
-    fm.event_log.emit(Event::new("federation_ingress").packet(&pkt).peer(&peer_label));
-
-    // Count inbound federation packet + update last_seen
-    fm.metrics.federation_packets_forwarded
-        .with_label_values(&[source_peer_fp, "in"]).inc();
-    {
-        let mut links = fm.peer_links.lock().await;
-        if let Some(link) = links.get_mut(source_peer_fp) {
-            link.last_seen = Instant::now();
-        }
-    }
-
-    // Dedup: drop packets we've already seen (multi-path duplicates).
-    // Key uses a hash of the actual payload bytes — unique per Opus frame,
-    // so different senders with the same seq/timestamp never collide.
-    let payload_hash = {
-        let mut h = 0u64;
-        for (i, &b) in media_bytes.iter().take(16).enumerate() {
-            h ^= (b as u64) << ((i % 8) * 8);
-        }
-        h
-    };
-    {
-        let mut dedup = fm.dedup.lock().await;
-        if dedup.is_dup(&rh, pkt.header.seq, payload_hash) {
-            fm.event_log.emit(Event::new("dedup_drop").seq(pkt.header.seq).peer(&peer_label));
-            return;
-        }
-    }
-
-    // Find room by hash — check local rooms AND global room config
-    let room_name = {
-        let mgr = fm.room_mgr.lock().await;
-        let active = mgr.active_rooms();
-        // First: check local rooms (has participants)
-        active.iter().find(|r| room_hash(r) == rh).cloned()
-            .or_else(|| active.iter().find(|r| fm.global_room_hash(r) == rh).cloned())
-            // Second: check global room config (hub relay may have no local participants)
-            .or_else(|| {
-                fm.global_rooms.iter().find(|name| room_hash(name) == rh).cloned()
-            })
-    };
-
-    let room_name = match room_name {
-        Some(r) => r,
-        None => {
-            fm.event_log.emit(Event::new("room_not_found").seq(pkt.header.seq).peer(&peer_label));
-            return;
-        }
-    };
-
-    // Rate limit per room
-    if FEDERATION_RATE_LIMIT_PPS > 0 {
-        let mut limiters = fm.rate_limiters.lock().await;
-        let limiter = limiters.entry(room_name.clone())
-            .or_insert_with(|| RateLimiter::new(FEDERATION_RATE_LIMIT_PPS));
-        if !limiter.allow() {
-            fm.event_log.emit(Event::new("rate_limit_drop").room(&room_name).seq(pkt.header.seq));
-            return;
-        }
-    }
-
-    // Deliver to all local participants — forward the raw bytes as-is.
-    // The original sender's MediaPacket is preserved exactly (no re-serialization).
-    let locals = {
-        let mgr = fm.room_mgr.lock().await;
-        mgr.local_senders(&room_name)
-    };
-    for sender in &locals {
-        match sender {
-            room::ParticipantSender::Quic(t) => {
-                if let Err(e) = t.send_raw_datagram(&media_bytes) {
-                    fm.event_log.emit(Event::new("local_deliver_error").room(&room_name).seq(pkt.header.seq).reason(&e.to_string()));
-                    warn!("federation local delivery error: {e}");
-                }
-            }
-            room::ParticipantSender::WebSocket(_) => { let _ = sender.send_raw(&pkt.payload).await; }
-        }
-    }
-    fm.event_log.emit(Event::new("local_deliver").room(&room_name).seq(pkt.header.seq).to_count(locals.len()));
-
-    // Multi-hop: forward to ALL other connected peers (not the source)
-    // Don't filter by active_rooms — the receiving peer decides whether to deliver
-    let links = fm.peer_links.lock().await;
-    for (fp, link) in links.iter() {
-        if fp != source_peer_fp {
-            let mut tagged = Vec::with_capacity(8 + media_bytes.len());
-            tagged.extend_from_slice(&rh);
-            tagged.extend_from_slice(&media_bytes);
-            let _ = link.transport.send_raw_datagram(&tagged);
-        }
-    }
-}

crates/wzp-relay/src/handshake.rs

@@ -78,30 +78,31 @@ pub async fn accept_handshake(
     };
     transport.send_signal(&answer).await?;
 
-    // Derive caller fingerprint: SHA-256(Ed25519 pub)[:16], formatted as xxxx:xxxx:...
-    // Must match the format used in signal registration and presence.
-    let caller_fp = {
-        use sha2::{Sha256, Digest};
-        let hash = Sha256::digest(&caller_identity_pub);
-        let fp = wzp_crypto::Fingerprint([
-            hash[0], hash[1], hash[2], hash[3], hash[4], hash[5], hash[6], hash[7],
-            hash[8], hash[9], hash[10], hash[11], hash[12], hash[13], hash[14], hash[15],
-        ]);
-        fp.to_string()
-    };
+    // Derive caller fingerprint from their identity public key (first 8 bytes as hex)
+    let caller_fp = caller_identity_pub[..8]
+        .iter()
+        .map(|b| format!("{b:02x}"))
+        .collect::<String>();
 
     Ok((session, chosen_profile, caller_fp, caller_alias))
 }
 
 /// Select the best quality profile from those the caller supports.
-///
-/// The `_supported` list is currently ignored — we hardcode GOOD (24k) until
-/// studio tiers (32k/48k/64k) have been validated across federation (large
-/// packets may exceed path MTU and fragment in unpleasant ways). Once that's
-/// tested, the body should pick the highest supported profile ≤ the relay's
-/// configured ceiling.
-fn choose_profile(_supported: &[QualityProfile]) -> QualityProfile {
-    QualityProfile::GOOD
+fn choose_profile(supported: &[QualityProfile]) -> QualityProfile {
+    // Prefer higher-quality profiles. Use GOOD as default if supported list is empty.
+    if supported.is_empty() {
+        return QualityProfile::GOOD;
+    }
+    // Pick the profile with the highest bitrate.
+    supported
+        .iter()
+        .max_by(|a, b| {
+            a.total_bitrate_kbps()
+                .partial_cmp(&b.total_bitrate_kbps())
+                .unwrap_or(std::cmp::Ordering::Equal)
+        })
+        .copied()
+        .unwrap_or(QualityProfile::GOOD)
 }
 
 #[cfg(test)]

crates/wzp-relay/src/lib.rs

@@ -8,11 +8,7 @@
 //! quality transitions.
 
 pub mod auth;
-pub mod call_registry;
 pub mod config;
-pub mod event_log;
-pub mod federation;
-pub mod signal_hub;
 pub mod handshake;
 pub mod metrics;
 pub mod pipeline;

crates/wzp-relay/src/main.rs

@@ -13,9 +13,9 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use tokio::sync::Mutex;
-use tracing::{debug, error, info, warn};
+use tracing::{error, info, warn};
 
-use wzp_proto::{MediaTransport, SignalMessage};
+use wzp_proto::MediaTransport;
 use wzp_relay::config::RelayConfig;
 use wzp_relay::metrics::RelayMetrics;
 use wzp_relay::pipeline::{PipelineConfig, RelayPipeline};
@@ -23,54 +23,12 @@ use wzp_relay::presence::PresenceRegistry;
 use wzp_relay::room::{self, RoomManager};
 use wzp_relay::session_mgr::SessionManager;
 
-/// Parsed CLI result — config + identity path.
-struct CliResult {
-    config: RelayConfig,
-    identity_path: Option<String>,
-    config_file: Option<String>,
-    config_needs_create: bool,
-}
-
-fn parse_args() -> CliResult {
+fn parse_args() -> RelayConfig {
+    let mut config = RelayConfig::default();
     let args: Vec<String> = std::env::args().collect();
-
-    // First pass: extract --config and --identity
-    let mut config_file = None;
-    let mut identity_path = None;
     let mut i = 1;
     while i < args.len() {
         match args[i].as_str() {
-            "--config" | "-c" => { i += 1; config_file = args.get(i).cloned(); }
-            "--identity" | "-i" => { i += 1; identity_path = args.get(i).cloned(); }
-            _ => {}
-        }
-        i += 1;
-    }
-
-    // Track if we need to create the config after identity is known
-    let config_needs_create = config_file.as_ref().map(|p| !std::path::Path::new(p).exists()).unwrap_or(false);
-
-    let mut config = if let Some(ref path) = config_file {
-        if config_needs_create {
-            // Will be re-created with personalized info after identity is loaded
-            RelayConfig::default()
-        } else {
-            wzp_relay::config::load_config(path)
-                .unwrap_or_else(|e| {
-                    eprintln!("failed to load config from {path}: {e}");
-                    std::process::exit(1);
-                })
-        }
-    } else {
-        RelayConfig::default()
-    };
-
-    // CLI flags override config file values
-    let mut i = 1;
-    while i < args.len() {
-        match args[i].as_str() {
-            "--config" | "-c" => { i += 1; } // already handled
-            "--identity" | "-i" => { i += 1; } // already handled
             "--listen" => {
                 i += 1;
                 config.listen_addr = args.get(i).expect("--listen requires an address")
@@ -123,28 +81,6 @@ fn parse_args() -> CliResult {
                     args.get(i).expect("--static-dir requires a directory path").to_string(),
                 );
             }
-            "--global-room" => {
-                i += 1;
-                config.global_rooms.push(wzp_relay::config::GlobalRoomConfig {
-                    name: args.get(i).expect("--global-room requires a room name").to_string(),
-                });
-            }
-            "--debug-tap" => {
-                i += 1;
-                config.debug_tap = Some(
-                    args.get(i).expect("--debug-tap requires a room name (or '*' for all)").to_string(),
-                );
-            }
-            "--event-log" => {
-                i += 1;
-                config.event_log = Some(
-                    args.get(i).expect("--event-log requires a file path").to_string(),
-                );
-            }
-            "--version" | "-V" => {
-                println!("wzp-relay {}", env!("WZP_BUILD_HASH"));
-                std::process::exit(0);
-            }
             "--mesh-status" => {
                 // Print mesh table from a fresh registry and exit.
                 // In practice this is useful after the relay has been running;
@@ -154,11 +90,9 @@ fn parse_args() -> CliResult {
                 std::process::exit(0);
             }
             "--help" | "-h" => {
-                eprintln!("Usage: wzp-relay [--config <path>] [--listen <addr>] [--remote <addr>] [--auth-url <url>] [--metrics-port <port>] [--probe <addr>]... [--probe-mesh] [--mesh-status]");
+                eprintln!("Usage: wzp-relay [--listen <addr>] [--remote <addr>] [--auth-url <url>] [--metrics-port <port>] [--probe <addr>]... [--probe-mesh] [--mesh-status]");
                 eprintln!();
                 eprintln!("Options:");
-                eprintln!("  -c, --config <path>    Load config from TOML file (creates example if missing)");
-                eprintln!("  -i, --identity <path>  Identity file path (creates if missing, uses OsRng)");
                 eprintln!("  --listen <addr>        Listen address (default: 0.0.0.0:4433)");
                 eprintln!("  --remote <addr>        Remote relay for forwarding (disables room mode)");
                 eprintln!("  --auth-url <url>       featherChat auth endpoint (e.g., https://chat.example.com/v1/auth/validate)");
@@ -168,8 +102,6 @@ fn parse_args() -> CliResult {
                 eprintln!("  --probe-mesh           Enable mesh mode (mark config flag, probes all --probe targets).");
                 eprintln!("  --mesh-status          Print mesh health table and exit (diagnostic).");
                 eprintln!("  --trunking             Enable trunk batching for outgoing media in room mode.");
-                eprintln!("  --global-room <name>   Declare a room as global (bridged across federation). Repeatable.");
-                eprintln!("  --debug-tap <room>     Log packet headers for a room ('*' for all rooms).");
                 eprintln!("  --ws-port <port>       WebSocket listener port for browser clients (e.g., 8080).");
                 eprintln!("  --static-dir <dir>     Directory to serve static files from (HTML/JS/WASM).");
                 eprintln!();
@@ -184,7 +116,7 @@ fn parse_args() -> CliResult {
         }
         i += 1;
     }
-    CliResult { config, identity_path, config_file, config_needs_create }
+    config
 }
 
 struct RelayStats {
@@ -252,29 +184,10 @@ async fn run_downstream(
     }
 }
 
-/// Detect a non-loopback IP address from local interfaces.
-/// Prefers public IPs over private (10.x, 172.16-31.x, 192.168.x).
-fn detect_public_ip() -> Option<String> {
-    use std::net::UdpSocket;
-    // Connect to a public address to find our outbound IP (doesn't actually send anything)
-    if let Ok(socket) = UdpSocket::bind("0.0.0.0:0") {
-        if socket.connect("8.8.8.8:80").is_ok() {
-            if let Ok(addr) = socket.local_addr() {
-                return Some(addr.ip().to_string());
-            }
-        }
-    }
-    None
-}
-
-/// Build-time git hash, set by build.rs or env.
-const BUILD_GIT_HASH: &str = env!("WZP_BUILD_HASH");
-
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    let CliResult { config, identity_path, config_file, config_needs_create } = parse_args();
+    let config = parse_args();
     tracing_subscriber::fmt().init();
-    info!(version = BUILD_GIT_HASH, "wzp-relay build");
     rustls::crypto::ring::default_provider()
         .install_default()
         .expect("failed to install rustls crypto provider");
@@ -294,115 +207,45 @@ async fn main() -> anyhow::Result<()> {
         tokio::spawn(wzp_relay::metrics::serve_metrics(port, m, p, rr));
     }
 
-    // Load or generate relay identity
+    // Load or generate relay identity — persisted in ~/.wzp/relay-identity
     let relay_seed = {
-        let id_path = match identity_path {
-            Some(ref p) => std::path::PathBuf::from(p),
-            None => dirs::home_dir()
+        let config_dir = dirs::home_dir()
             .unwrap_or_else(|| std::path::PathBuf::from("."))
-                .join(".wzp")
-                .join("relay-identity"),
-        };
-        if id_path.exists() {
-            if let Ok(hex) = std::fs::read_to_string(&id_path) {
+            .join(".wzp");
+        let identity_path = config_dir.join("relay-identity");
+        if identity_path.exists() {
+            if let Ok(hex) = std::fs::read_to_string(&identity_path) {
                 if let Ok(s) = wzp_crypto::Seed::from_hex(hex.trim()) {
-                    info!("loaded relay identity from {}", id_path.display());
+                    info!("loaded relay identity from {}", identity_path.display());
                     s
                 } else {
-                    warn!("corrupt identity file {}, generating new", id_path.display());
+                    warn!("corrupt relay identity file, generating new");
                     let s = wzp_crypto::Seed::generate();
                     let hex: String = s.0.iter().map(|b| format!("{b:02x}")).collect();
-                    let _ = std::fs::write(&id_path, &hex);
+                    let _ = std::fs::write(&identity_path, &hex);
                     s
                 }
             } else {
                 let s = wzp_crypto::Seed::generate();
                 let hex: String = s.0.iter().map(|b| format!("{b:02x}")).collect();
-                let _ = std::fs::write(&id_path, &hex);
+                let _ = std::fs::write(&identity_path, &hex);
                 s
             }
         } else {
             let s = wzp_crypto::Seed::generate();
-            if let Some(parent) = id_path.parent() {
-                let _ = std::fs::create_dir_all(parent);
-            }
+            let _ = std::fs::create_dir_all(&config_dir);
             let hex: String = s.0.iter().map(|b| format!("{b:02x}")).collect();
-            let _ = std::fs::write(&id_path, &hex);
-            info!("generated relay identity at {}", id_path.display());
+            let _ = std::fs::write(&identity_path, &hex);
+            info!("generated relay identity at {}", identity_path.display());
             s
         }
     };
     let relay_fp = relay_seed.derive_identity().public_identity().fingerprint;
     info!(addr = %config.listen_addr, fingerprint = %relay_fp, "WarzonePhone relay starting");
 
-    let (server_config, cert_der) = wzp_transport::server_config_from_seed(&relay_seed.0);
-    let tls_fp = wzp_transport::tls_fingerprint(&cert_der);
-    info!(tls_fingerprint = %tls_fp, "TLS certificate (deterministic from relay identity)");
-
-    // Create personalized config file if it was missing
-    let public_ip = detect_public_ip();
-    if config_needs_create {
-        if let Some(ref path) = config_file {
-            let info = wzp_relay::config::RelayInfo {
-                listen_addr: config.listen_addr.to_string(),
-                tls_fingerprint: tls_fp.clone(),
-                public_ip: public_ip.clone(),
-            };
-            if let Err(e) = wzp_relay::config::load_or_create_config(path, Some(&info)) {
-                warn!("failed to create config: {e}");
-            }
-        }
-    }
-
-    // Print federation hint with our public IP + listen port + TLS fingerprint
-    let listen_port = config.listen_addr.port();
-    if let Some(ip) = &public_ip {
-        info!("federation: to peer with this relay, add to relay.toml:");
-        info!("  [[peers]]");
-        info!("  url = \"{ip}:{listen_port}\"");
-        info!("  fingerprint = \"{tls_fp}\"");
-    }
-
-    // Log configured peers and trusted relays
-    if !config.peers.is_empty() {
-        info!(count = config.peers.len(), "federation peers configured");
-        for p in &config.peers {
-            info!(url = %p.url, label = ?p.label, "  peer");
-        }
-    }
-    if !config.trusted.is_empty() {
-        info!(count = config.trusted.len(), "trusted relays configured");
-        for t in &config.trusted {
-            info!(fingerprint = %t.fingerprint, label = ?t.label, "  trusted");
-        }
-    }
+    let (server_config, _cert) = wzp_transport::server_config();
     let endpoint = wzp_transport::create_endpoint(config.listen_addr, Some(server_config))?;
 
-    // Compute the IP address we should advertise in CallSetup for direct
-    // calls. If the relay is bound to a specific IP, use it as-is; if bound
-    // to 0.0.0.0, use the trick of "connect" a UDP socket to an arbitrary
-    // external address and read its local_addr — the OS binds to whichever
-    // local interface IP would route packets to that destination, which is
-    // the primary outbound interface. This is the same IP clients on the
-    // LAN use to reach us.
-    let advertised_ip: std::net::IpAddr = {
-        let listen_ip = config.listen_addr.ip();
-        if !listen_ip.is_unspecified() {
-            listen_ip
-        } else {
-            // Probe via a dummy "connected" UDP socket. Never actually sends.
-            match std::net::UdpSocket::bind("0.0.0.0:0")
-                .and_then(|s| { s.connect("8.8.8.8:80").map(|_| s) })
-                .and_then(|s| s.local_addr())
-            {
-                Ok(a) if !a.ip().is_loopback() => a.ip(),
-                _ => std::net::IpAddr::from([127u8, 0, 0, 1]),
-            }
-        }
-    };
-    let advertised_addr_str = format!("{}:{}", advertised_ip, config.listen_addr.port());
-    info!(%advertised_addr_str, "relay advertised address for CallSetup");
-
     // Forward mode
     let remote_transport: Option<Arc<wzp_transport::QuinnTransport>> =
         if let Some(remote_addr) = config.remote_relay {
@@ -418,41 +261,9 @@ async fn main() -> anyhow::Result<()> {
     // Room manager (room mode only)
     let room_mgr = Arc::new(Mutex::new(RoomManager::new()));
 
-    // Event log for protocol analysis
-    let event_log = wzp_relay::event_log::start_event_log(
-        config.event_log.as_ref().map(std::path::PathBuf::from)
-    );
-
-    // Federation manager
-    let global_room_set: std::collections::HashSet<String> = config.global_rooms.iter()
-        .map(|g| g.name.clone())
-        .collect();
-
-    let federation_mgr = if !config.peers.is_empty() || !config.trusted.is_empty() || !global_room_set.is_empty() {
-        let fm = Arc::new(wzp_relay::federation::FederationManager::new(
-            config.peers.clone(),
-            config.trusted.clone(),
-            global_room_set.clone(),
-            room_mgr.clone(),
-            endpoint.clone(),
-            tls_fp.clone(),
-            metrics.clone(),
-            event_log.clone(),
-        ));
-        let fm_run = fm.clone();
-        tokio::spawn(async move { fm_run.run().await });
-        Some(fm)
-    } else {
-        None
-    };
-
     // Session manager — enforces max concurrent sessions
     let session_mgr = Arc::new(Mutex::new(SessionManager::new(config.max_sessions)));
 
-    // Signal hub + call registry for direct 1:1 calls
-    let signal_hub = Arc::new(Mutex::new(wzp_relay::signal_hub::SignalHub::new()));
-    let call_registry = Arc::new(Mutex::new(wzp_relay::call_registry::CallRegistry::new()));
-
     // Spawn inter-relay health probes via ProbeMesh coordinator
     if !config.probe_targets.is_empty() {
         let mesh = wzp_relay::probe::ProbeMesh::new(
@@ -487,32 +298,13 @@ async fn main() -> anyhow::Result<()> {
     } else {
         info!("auth disabled — any client can connect (use --auth-url to enable)");
     }
-    if !config.global_rooms.is_empty() {
-        info!(count = config.global_rooms.len(), "global rooms configured");
-        for g in &config.global_rooms {
-            info!(name = %g.name, "  global room");
-        }
-    }
-    if let Some(ref tap) = config.debug_tap {
-        info!(filter = %tap, "debug tap enabled — logging packet headers");
-    }
 
     info!("Listening for connections...");
 
     loop {
-        // Pull the next Incoming off the queue. Deliberately do NOT await
-        // the QUIC handshake here — move that into the per-connection
-        // spawned task below. Previously we used wzp_transport::accept
-        // which did both, which meant a single slow handshake would block
-        // the entire accept loop and prevent ALL subsequent connections
-        // from being processed. Surfaced as direct-call hangs where the
-        // callee's call-* connection never completes its QUIC handshake.
-        let incoming = match endpoint.accept().await {
-            Some(inc) => inc,
-            None => {
-                error!("endpoint.accept() returned None — endpoint closed");
-                break;
-            }
+        let connection = match wzp_transport::accept(&endpoint).await {
+            Ok(conn) => conn,
+            Err(e) => { error!("accept: {e}"); continue; }
         };
 
         let remote_transport = remote_transport.clone();
@@ -522,28 +314,10 @@ async fn main() -> anyhow::Result<()> {
         let relay_seed_bytes = relay_seed.0;
         let metrics = metrics.clone();
         let trunking_enabled = config.trunking_enabled;
-        let debug_tap = config.debug_tap.as_ref().map(|filter| room::DebugTap { room_filter: filter.clone() });
         let presence = presence.clone();
         let route_resolver = route_resolver.clone();
-        let federation_mgr = federation_mgr.clone();
-        let signal_hub = signal_hub.clone();
-        let call_registry = call_registry.clone();
-        let advertised_addr_str = advertised_addr_str.clone();
-
-        let incoming_addr = incoming.remote_address();
-        info!(%incoming_addr, "accept queue: new Incoming, spawning handshake task");
 
         tokio::spawn(async move {
-            // Drive the QUIC handshake inside the spawned task so that
-            // slow or hung handshakes never block the outer accept loop.
-            let connection = match incoming.await {
-                Ok(c) => c,
-                Err(e) => {
-                    error!(%incoming_addr, "QUIC handshake failed: {e}");
-                    return;
-                }
-            };
-            info!(%incoming_addr, "QUIC handshake complete");
             let addr = connection.remote_address();
 
             let room_name = connection
@@ -557,22 +331,12 @@ async fn main() -> anyhow::Result<()> {
             let transport = Arc::new(wzp_transport::QuinnTransport::new(connection));
 
             // Ping connections: client just measures QUIC connect RTT.
+            // No handshake, no streams — client closes immediately after connecting.
             if room_name == "ping" {
                 info!(%addr, "ping connection (RTT probe)");
                 return;
             }
 
-            // Version query: respond with build hash over a uni stream.
-            if room_name == "version" {
-                if let Ok(mut send) = transport.connection().open_uni().await {
-                    let _ = send.write_all(BUILD_GIT_HASH.as_bytes()).await;
-                    let _ = send.finish();
-                    // Wait for client to read before closing
-                    tokio::time::sleep(std::time::Duration::from_millis(100)).await;
-                }
-                return;
-            }
-
             // Probe connections use SNI "_probe" to identify themselves.
             // They skip auth + handshake and just do Ping->Pong + presence gossip.
             if room_name == "_probe" {
@@ -659,315 +423,6 @@ async fn main() -> anyhow::Result<()> {
                 return;
             }
 
-            // Federation connections use SNI "_federation"
-            if room_name == "_federation" {
-                if let Some(ref fm) = federation_mgr {
-                    // Wait for FederationHello to identify the connecting relay
-                    let hello_fp = match tokio::time::timeout(
-                        std::time::Duration::from_secs(5),
-                        transport.recv_signal(),
-                    ).await {
-                        Ok(Ok(Some(wzp_proto::SignalMessage::FederationHello { tls_fingerprint }))) => tls_fingerprint,
-                        _ => {
-                            warn!(%addr, "federation: no hello received, closing");
-                            return;
-                        }
-                    };
-
-                    if let Some(label) = fm.check_inbound_trust(addr, &hello_fp) {
-                        let peer_config = wzp_relay::config::PeerConfig {
-                            url: addr.to_string(),
-                            fingerprint: hello_fp,
-                            label: Some(label.clone()),
-                        };
-                        let fm = fm.clone();
-                        info!(%addr, label = %label, "inbound federation accepted (trusted)");
-                        fm.handle_inbound(transport, peer_config).await;
-                    } else {
-                        warn!(%addr, fp = %hello_fp, "unknown relay wants to federate");
-                        info!("  to accept, add to relay.toml:");
-                        info!("  [[trusted]]");
-                        info!("  fingerprint = \"{hello_fp}\"");
-                        info!("  label = \"Relay at {addr}\"");
-                    }
-                } else {
-                    info!(%addr, "federation connection rejected (no federation configured)");
-                }
-                return;
-            }
-
-            // Direct calling: persistent signaling connection
-            if room_name == "_signal" {
-                info!(%addr, "signal connection");
-
-                // Optional auth
-                let auth_fp: Option<String> = if let Some(ref url) = auth_url {
-                    match transport.recv_signal().await {
-                        Ok(Some(SignalMessage::AuthToken { token })) => {
-                            match wzp_relay::auth::validate_token(url, &token).await {
-                                Ok(client) => Some(client.fingerprint),
-                                Err(e) => {
-                                    error!(%addr, "signal auth failed: {e}");
-                                    return;
-                                }
-                            }
-                        }
-                        _ => { warn!(%addr, "signal: expected AuthToken"); return; }
-                    }
-                } else {
-                    None
-                };
-
-                // Wait for RegisterPresence
-                let (client_fp, client_alias) = match tokio::time::timeout(
-                    std::time::Duration::from_secs(10),
-                    transport.recv_signal(),
-                ).await {
-                    Ok(Ok(Some(SignalMessage::RegisterPresence { identity_pub, signature: _, alias }))) => {
-                        // Compute fingerprint: SHA-256(Ed25519 pub key)[:16], same as Fingerprint type
-                        let fp = {
-                            use sha2::{Sha256, Digest};
-                            let hash = Sha256::digest(&identity_pub);
-                            let fingerprint = wzp_crypto::Fingerprint([
-                                hash[0], hash[1], hash[2], hash[3], hash[4], hash[5], hash[6], hash[7],
-                                hash[8], hash[9], hash[10], hash[11], hash[12], hash[13], hash[14], hash[15],
-                            ]);
-                            fingerprint.to_string()
-                        };
-                        let fp = auth_fp.unwrap_or(fp);
-                        (fp, alias)
-                    }
-                    _ => {
-                        warn!(%addr, "signal: no RegisterPresence received");
-                        return;
-                    }
-                };
-
-                // Register in signal hub + presence
-                {
-                    let mut hub = signal_hub.lock().await;
-                    hub.register(client_fp.clone(), transport.clone(), client_alias.clone());
-                }
-                {
-                    let mut reg = presence.lock().await;
-                    reg.register_local(&client_fp, client_alias.clone(), None);
-                }
-
-                // Send ack
-                let _ = transport.send_signal(&SignalMessage::RegisterPresenceAck {
-                    success: true,
-                    error: None,
-                }).await;
-
-                info!(%addr, fingerprint = %client_fp, alias = ?client_alias, "signal client registered");
-
-                // Signal recv loop
-                loop {
-                    match transport.recv_signal().await {
-                        Ok(Some(msg)) => {
-                            match msg {
-                                SignalMessage::DirectCallOffer { ref target_fingerprint, ref call_id, .. } => {
-                                    let target_fp = target_fingerprint.clone();
-                                    let call_id = call_id.clone();
-
-                                    // Check if target is online
-                                    let online = {
-                                        let hub = signal_hub.lock().await;
-                                        hub.is_online(&target_fp)
-                                    };
-                                    if !online {
-                                        info!(%addr, target = %target_fp, "call target not online");
-                                        let _ = transport.send_signal(&SignalMessage::Hangup {
-                                            reason: wzp_proto::HangupReason::Normal,
-                                        }).await;
-                                        continue;
-                                    }
-
-                                    // Create call in registry
-                                    {
-                                        let mut reg = call_registry.lock().await;
-                                        reg.create_call(call_id.clone(), client_fp.clone(), target_fp.clone());
-                                    }
-
-                                    // Forward offer to callee
-                                    info!(caller = %client_fp, callee = %target_fp, call_id = %call_id, "routing direct call offer");
-                                    let hub = signal_hub.lock().await;
-                                    if let Err(e) = hub.send_to(&target_fp, &msg).await {
-                                        warn!("failed to forward call offer: {e}");
-                                    }
-
-                                    // Send ringing to caller
-                                    drop(hub);
-                                    let _ = transport.send_signal(&SignalMessage::CallRinging {
-                                        call_id: call_id.clone(),
-                                    }).await;
-                                }
-
-                                SignalMessage::DirectCallAnswer { ref call_id, ref accept_mode, .. } => {
-                                    let call_id = call_id.clone();
-                                    let mode = *accept_mode;
-
-                                    let peer_fp = {
-                                        let reg = call_registry.lock().await;
-                                        reg.peer_fingerprint(&call_id, &client_fp).map(|s| s.to_string())
-                                    };
-
-                                    let Some(peer_fp) = peer_fp else {
-                                        warn!(call_id = %call_id, "answer for unknown call");
-                                        continue;
-                                    };
-
-                                    if mode == wzp_proto::CallAcceptMode::Reject {
-                                        info!(call_id = %call_id, "call rejected");
-                                        let mut reg = call_registry.lock().await;
-                                        reg.end_call(&call_id);
-                                        drop(reg);
-                                        let hub = signal_hub.lock().await;
-                                        let _ = hub.send_to(&peer_fp, &SignalMessage::Hangup {
-                                            reason: wzp_proto::HangupReason::Normal,
-                                        }).await;
-                                    } else {
-                                        // Accept — create private room
-                                        let room = format!("call-{call_id}");
-                                        {
-                                            let mut reg = call_registry.lock().await;
-                                            reg.set_active(&call_id, mode, room.clone());
-                                        }
-                                        info!(call_id = %call_id, room = %room, mode = ?mode, "call accepted, creating room");
-
-                                        // Forward answer to caller
-                                        {
-                                            let hub = signal_hub.lock().await;
-                                            let _ = hub.send_to(&peer_fp, &msg).await;
-                                        }
-
-                                        // Send CallSetup to both parties.
-                                        //
-                                        // BUG FIX: the previous version of this used `addr.ip()`
-                                        // which is `connection.remote_address()` — the CLIENT'S
-                                        // IP, not the relay's. So CallSetup told both parties to
-                                        // dial the answerer's own IP, which meant the caller was
-                                        // sending QUIC Initials into the callee's client (no
-                                        // server listening there) and the callee was sending to
-                                        // itself. In both cases endpoint.connect() hung forever.
-                                        //
-                                        // Use the relay's precomputed advertised address instead.
-                                        let relay_addr_for_setup = advertised_addr_str.clone();
-                                        let setup = SignalMessage::CallSetup {
-                                            call_id: call_id.clone(),
-                                            room: room.clone(),
-                                            relay_addr: relay_addr_for_setup,
-                                        };
-                                        {
-                                            let hub = signal_hub.lock().await;
-                                            let _ = hub.send_to(&peer_fp, &setup).await;
-                                            let _ = hub.send_to(&client_fp, &setup).await;
-                                        }
-                                    }
-                                }
-
-                                SignalMessage::Hangup { .. } => {
-                                    // Forward hangup to all active calls for this user
-                                    let calls = {
-                                        let reg = call_registry.lock().await;
-                                        reg.calls_for_fingerprint(&client_fp)
-                                            .iter()
-                                            .map(|c| (c.call_id.clone(), if c.caller_fingerprint == client_fp {
-                                                c.callee_fingerprint.clone()
-                                            } else {
-                                                c.caller_fingerprint.clone()
-                                            }))
-                                            .collect::<Vec<_>>()
-                                    };
-                                    for (call_id, peer_fp) in &calls {
-                                        let hub = signal_hub.lock().await;
-                                        let _ = hub.send_to(peer_fp, &msg).await;
-                                        drop(hub);
-                                        let mut reg = call_registry.lock().await;
-                                        reg.end_call(call_id);
-                                    }
-                                }
-
-                                SignalMessage::Ping { timestamp_ms } => {
-                                    let _ = transport.send_signal(&SignalMessage::Pong { timestamp_ms }).await;
-                                }
-
-                                // QUIC-native NAT reflection ("STUN for QUIC").
-                                // The client asks "what source address do you
-                                // see for me?" and we reply with whatever
-                                // quinn reports as this connection's remote
-                                // address — i.e. the post-NAT public address
-                                // as observed from the server side of the TLS
-                                // session. Used by the P2P path to learn the
-                                // client's server-reflexive address without
-                                // running a separate STUN server. No auth or
-                                // rate-limit in Phase 1 — the client is
-                                // already TLS-authenticated by the time it
-                                // reaches this match arm.
-                                SignalMessage::Reflect => {
-                                    let observed_addr = addr.to_string();
-                                    if let Err(e) = transport.send_signal(
-                                        &SignalMessage::ReflectResponse {
-                                            observed_addr: observed_addr.clone(),
-                                        },
-                                    ).await {
-                                        warn!(%addr, error = %e, "reflect: failed to send response");
-                                    } else {
-                                        debug!(%addr, %observed_addr, "reflect: responded");
-                                    }
-                                }
-
-                                other => {
-                                    warn!(%addr, "signal: unexpected message: {:?}", std::mem::discriminant(&other));
-                                }
-                            }
-                        }
-                        Ok(None) => {
-                            info!(%addr, "signal connection closed");
-                            break;
-                        }
-                        Err(e) => {
-                            warn!(%addr, "signal recv error: {e}");
-                            break;
-                        }
-                    }
-                }
-
-                // Cleanup: unregister + end active calls
-                let active_calls = {
-                    let reg = call_registry.lock().await;
-                    reg.calls_for_fingerprint(&client_fp)
-                        .iter()
-                        .map(|c| (c.call_id.clone(), if c.caller_fingerprint == client_fp {
-                            c.callee_fingerprint.clone()
-                        } else {
-                            c.caller_fingerprint.clone()
-                        }))
-                        .collect::<Vec<_>>()
-                };
-                for (call_id, peer_fp) in &active_calls {
-                    let hub = signal_hub.lock().await;
-                    let _ = hub.send_to(peer_fp, &SignalMessage::Hangup {
-                        reason: wzp_proto::HangupReason::Normal,
-                    }).await;
-                    drop(hub);
-                    let mut reg = call_registry.lock().await;
-                    reg.end_call(call_id);
-                }
-
-                {
-                    let mut hub = signal_hub.lock().await;
-                    hub.unregister(&client_fp);
-                }
-                {
-                    let mut reg = presence.lock().await;
-                    reg.unregister_local(&client_fp);
-                }
-
-                transport.close().await.ok();
-                return;
-            }
-
             // Auth check: if --auth-url is set, expect first signal message to be a token
             // Auth: if --auth-url is set, expect AuthToken as first signal
             let authenticated_fp: Option<String> = if let Some(ref url) = auth_url {
@@ -1034,28 +489,6 @@ async fn main() -> anyhow::Result<()> {
             // Use the caller's identity fingerprint from the handshake
             let participant_fp = authenticated_fp.clone().unwrap_or(caller_fp);
 
-            // ACL: call rooms (call-*) are restricted to the two authorized participants.
-            // Only the relay's call orchestrator creates these rooms — random clients can't join.
-            if room_name.starts_with("call-") {
-                let call_id = &room_name[5..]; // strip "call-" prefix
-                let authorized = {
-                    let reg = call_registry.lock().await;
-                    match reg.get(call_id) {
-                        Some(call) => {
-                            call.caller_fingerprint == participant_fp
-                                || call.callee_fingerprint == participant_fp
-                        }
-                        None => false, // unknown call — reject
-                    }
-                };
-                if !authorized {
-                    warn!(%addr, room = %room_name, fp = %participant_fp, "rejected: not authorized for this call room");
-                    transport.close().await.ok();
-                    return;
-                }
-                info!(%addr, room = %room_name, fp = %participant_fp, "authorized for call room");
-            }
-
             // Register in presence registry
             {
                 let mut reg = presence.lock().await;
@@ -1108,20 +541,6 @@ async fn main() -> anyhow::Result<()> {
 
                 metrics.active_sessions.inc();
 
-                // Call rooms: enforce 2-participant limit
-                if room_name.starts_with("call-") {
-                    let mgr = room_mgr.lock().await;
-                    if mgr.room_size(&room_name) >= 2 {
-                        drop(mgr);
-                        warn!(%addr, room = %room_name, "call room full (max 2 participants)");
-                        metrics.active_sessions.dec();
-                        let mut smgr = session_mgr.lock().await;
-                        smgr.remove_session(session_id);
-                        transport.close().await.ok();
-                        return;
-                    }
-                }
-
                 let participant_id = {
                     let mut mgr = room_mgr.lock().await;
                     match mgr.join(
@@ -1134,25 +553,7 @@ async fn main() -> anyhow::Result<()> {
                         Ok((id, update, senders)) => {
                             metrics.active_rooms.set(mgr.list().len() as i64);
                             drop(mgr); // release lock before async broadcast
-
-                            // Merge federated participants into RoomUpdate if this is a global room
-                            let merged_update = if let Some(ref fm) = federation_mgr {
-                                if fm.is_global_room(&room_name) {
-                                    if let SignalMessage::RoomUpdate { count: _, participants: mut local_parts } = update {
-                                        let remote = fm.get_remote_participants(&room_name).await;
-                                        local_parts.extend(remote);
-                                        // Deduplicate by fingerprint
-                                        let mut seen = std::collections::HashSet::new();
-                                        local_parts.retain(|p| seen.insert(p.fingerprint.clone()));
-                                        SignalMessage::RoomUpdate {
-                                            count: local_parts.len() as u32,
-                                            participants: local_parts,
-                                        }
-                                    } else { update }
-                                } else { update }
-                            } else { update };
-
-                            room::broadcast_signal(&senders, &merged_update).await;
+                            room::broadcast_signal(&senders, &update).await;
                             id
                         }
                         Err(e) => {
@@ -1170,25 +571,6 @@ async fn main() -> anyhow::Result<()> {
                     .iter()
                     .map(|b| format!("{b:02x}"))
                     .collect();
-                // Set up federation media channel if this is a global room
-                let (federation_tx, federation_room_hash) = if let Some(ref fm) = federation_mgr {
-                    let is_global = fm.is_global_room(&room_name);
-                    if is_global {
-                        let canonical_hash = fm.global_room_hash(&room_name);
-                        let (tx, rx) = tokio::sync::mpsc::channel(256);
-                        let fm_clone = fm.clone();
-                        tokio::spawn(async move {
-                            wzp_relay::federation::run_federation_media_egress(fm_clone, rx).await;
-                        });
-                        info!(room = %room_name, canonical = ?fm.resolve_global_room(&room_name), "federation egress created (global room)");
-                        (Some(tx), Some(canonical_hash))
-                    } else {
-                        (None, None)
-                    }
-                } else {
-                    (None, None)
-                };
-
                 room::run_participant(
                     room_mgr.clone(),
                     room_name,
@@ -1197,9 +579,6 @@ async fn main() -> anyhow::Result<()> {
                     metrics.clone(),
                     &session_id_str,
                     trunking_enabled,
-                    debug_tap,
-                    federation_tx,
-                    federation_room_hash,
                 ).await;
 
                 // Participant disconnected — clean up presence + per-session metrics
@@ -1222,5 +601,4 @@ async fn main() -> anyhow::Result<()> {
             }
         });
     }
-    Ok(())
 }

crates/wzp-relay/src/metrics.rs

@@ -16,22 +16,12 @@ pub struct RelayMetrics {
     pub bytes_forwarded: IntCounter,
     pub auth_attempts: IntCounterVec,
     pub handshake_duration: Histogram,
-    // Federation metrics
-    pub federation_peer_status: IntGaugeVec,
-    pub federation_peer_rtt_ms: GaugeVec,
-    pub federation_packets_forwarded: IntCounterVec,
-    pub federation_packets_deduped: IntCounter,
-    pub federation_packets_rate_limited: IntCounter,
-    pub federation_active_rooms: IntGauge,
     // Per-session metrics
     pub session_buffer_depth: IntGaugeVec,
     pub session_loss_pct: GaugeVec,
     pub session_rtt_ms: GaugeVec,
     pub session_underruns: IntCounterVec,
     pub session_overruns: IntCounterVec,
-    // Phase 4: loss-recovery breakdown per session.
-    pub session_dred_reconstructions: IntCounterVec,
-    pub session_classical_plc: IntCounterVec,
     registry: Registry,
 }
 
@@ -70,28 +60,6 @@ impl RelayMetrics {
         )
         .expect("metric");
 
-        let federation_peer_status = IntGaugeVec::new(
-            Opts::new("wzp_federation_peer_status", "Peer connection status (0=disconnected, 1=connected)"),
-            &["peer"],
-        ).expect("metric");
-        let federation_peer_rtt_ms = GaugeVec::new(
-            Opts::new("wzp_federation_peer_rtt_ms", "QUIC RTT to federated peer in milliseconds"),
-            &["peer"],
-        ).expect("metric");
-        let federation_packets_forwarded = IntCounterVec::new(
-            Opts::new("wzp_federation_packets_forwarded_total", "Packets forwarded to/from federated peers"),
-            &["peer", "direction"],
-        ).expect("metric");
-        let federation_packets_deduped = IntCounter::with_opts(
-            Opts::new("wzp_federation_packets_deduped_total", "Duplicate federation packets dropped"),
-        ).expect("metric");
-        let federation_packets_rate_limited = IntCounter::with_opts(
-            Opts::new("wzp_federation_packets_rate_limited_total", "Federation packets dropped by rate limiter"),
-        ).expect("metric");
-        let federation_active_rooms = IntGauge::with_opts(
-            Opts::new("wzp_federation_active_rooms", "Number of federated rooms currently active"),
-        ).expect("metric");
-
         let session_buffer_depth = IntGaugeVec::new(
             Opts::new(
                 "wzp_relay_session_jitter_buffer_depth",
@@ -133,42 +101,17 @@ impl RelayMetrics {
         )
         .expect("metric");
 
-        let session_dred_reconstructions = IntCounterVec::new(
-            Opts::new(
-                "wzp_relay_session_dred_reconstructions_total",
-                "Frames reconstructed via DRED (Deep REDundancy) per session",
-            ),
-            &["session_id"],
-        )
-        .expect("metric");
-        let session_classical_plc = IntCounterVec::new(
-            Opts::new(
-                "wzp_relay_session_classical_plc_total",
-                "Frames filled via classical Opus/Codec2 PLC per session",
-            ),
-            &["session_id"],
-        )
-        .expect("metric");
-
         registry.register(Box::new(active_sessions.clone())).expect("register");
         registry.register(Box::new(active_rooms.clone())).expect("register");
         registry.register(Box::new(packets_forwarded.clone())).expect("register");
         registry.register(Box::new(bytes_forwarded.clone())).expect("register");
         registry.register(Box::new(auth_attempts.clone())).expect("register");
         registry.register(Box::new(handshake_duration.clone())).expect("register");
-        registry.register(Box::new(federation_peer_status.clone())).expect("register");
-        registry.register(Box::new(federation_peer_rtt_ms.clone())).expect("register");
-        registry.register(Box::new(federation_packets_forwarded.clone())).expect("register");
-        registry.register(Box::new(federation_packets_deduped.clone())).expect("register");
-        registry.register(Box::new(federation_packets_rate_limited.clone())).expect("register");
-        registry.register(Box::new(federation_active_rooms.clone())).expect("register");
         registry.register(Box::new(session_buffer_depth.clone())).expect("register");
         registry.register(Box::new(session_loss_pct.clone())).expect("register");
         registry.register(Box::new(session_rtt_ms.clone())).expect("register");
         registry.register(Box::new(session_underruns.clone())).expect("register");
         registry.register(Box::new(session_overruns.clone())).expect("register");
-        registry.register(Box::new(session_dred_reconstructions.clone())).expect("register");
-        registry.register(Box::new(session_classical_plc.clone())).expect("register");
 
         Self {
             active_sessions,
@@ -177,19 +120,11 @@ impl RelayMetrics {
             bytes_forwarded,
             auth_attempts,
             handshake_duration,
-            federation_peer_status,
-            federation_peer_rtt_ms,
-            federation_packets_forwarded,
-            federation_packets_deduped,
-            federation_packets_rate_limited,
-            federation_active_rooms,
             session_buffer_depth,
             session_loss_pct,
             session_rtt_ms,
             session_underruns,
             session_overruns,
-            session_dred_reconstructions,
-            session_classical_plc,
             registry,
         }
     }
@@ -241,39 +176,6 @@ impl RelayMetrics {
         }
     }
 
-    /// Phase 4: update per-session loss-recovery counters from a client's
-    /// `LossRecoveryUpdate` signal message. The client sends monotonic
-    /// totals (frames reconstructed since call start); we compute the
-    /// delta against the current Prometheus counter and increment by it.
-    /// IntCounterVec only increases, so a client restart that resets the
-    /// counter to 0 simply produces no delta until the new totals exceed
-    /// the Prometheus state.
-    pub fn update_session_loss_recovery(
-        &self,
-        session_id: &str,
-        dred_reconstructions: u64,
-        classical_plc: u64,
-    ) {
-        let cur_dred = self
-            .session_dred_reconstructions
-            .with_label_values(&[session_id])
-            .get();
-        if dred_reconstructions > cur_dred {
-            self.session_dred_reconstructions
-                .with_label_values(&[session_id])
-                .inc_by(dred_reconstructions - cur_dred);
-        }
-        let cur_plc = self
-            .session_classical_plc
-            .with_label_values(&[session_id])
-            .get();
-        if classical_plc > cur_plc {
-            self.session_classical_plc
-                .with_label_values(&[session_id])
-                .inc_by(classical_plc - cur_plc);
-        }
-    }
-
     /// Remove all per-session label values for a disconnected session.
     pub fn remove_session_metrics(&self, session_id: &str) {
         let _ = self.session_buffer_depth.remove_label_values(&[session_id]);
@@ -281,10 +183,6 @@ impl RelayMetrics {
         let _ = self.session_rtt_ms.remove_label_values(&[session_id]);
         let _ = self.session_underruns.remove_label_values(&[session_id]);
         let _ = self.session_overruns.remove_label_values(&[session_id]);
-        let _ = self
-            .session_dred_reconstructions
-            .remove_label_values(&[session_id]);
-        let _ = self.session_classical_plc.remove_label_values(&[session_id]);
     }
 
     /// Get a reference to the underlying Prometheus registry.
@@ -479,13 +377,10 @@ mod tests {
         };
         m.update_session_quality("sess-cleanup", &report);
         m.update_session_buffer("sess-cleanup", 42, 3, 1);
-        m.update_session_loss_recovery("sess-cleanup", 17, 4);
 
         // Verify they appear
         let output = m.metrics_handler();
         assert!(output.contains("sess-cleanup"));
-        assert!(output.contains("wzp_relay_session_dred_reconstructions_total"));
-        assert!(output.contains("wzp_relay_session_classical_plc_total"));
 
         // Remove and verify they are gone
         m.remove_session_metrics("sess-cleanup");
@@ -493,55 +388,6 @@ mod tests {
         assert!(!output.contains("sess-cleanup"));
     }
 
-    /// Phase 4: LossRecoveryUpdate → per-session counters, monotonic delta
-    /// application.
-    #[test]
-    fn session_loss_recovery_monotonic_delta() {
-        let m = RelayMetrics::new();
-        let sess = "sess-dred";
-
-        // First update: 10 DRED, 2 PLC
-        m.update_session_loss_recovery(sess, 10, 2);
-        let dred1 = m
-            .session_dred_reconstructions
-            .with_label_values(&[sess])
-            .get();
-        let plc1 = m.session_classical_plc.with_label_values(&[sess]).get();
-        assert_eq!(dred1, 10);
-        assert_eq!(plc1, 2);
-
-        // Second update: 25 DRED, 5 PLC — counter advances by (15, 3)
-        m.update_session_loss_recovery(sess, 25, 5);
-        let dred2 = m
-            .session_dred_reconstructions
-            .with_label_values(&[sess])
-            .get();
-        let plc2 = m.session_classical_plc.with_label_values(&[sess]).get();
-        assert_eq!(dred2, 25);
-        assert_eq!(plc2, 5);
-
-        // Third update with LOWER values (e.g., client reset) — counters
-        // hold steady, no decrement.
-        m.update_session_loss_recovery(sess, 5, 1);
-        let dred3 = m
-            .session_dred_reconstructions
-            .with_label_values(&[sess])
-            .get();
-        let plc3 = m.session_classical_plc.with_label_values(&[sess]).get();
-        assert_eq!(dred3, 25, "counter must not decrease");
-        assert_eq!(plc3, 5, "counter must not decrease");
-
-        // Fourth update: client caught up and exceeded the old max.
-        m.update_session_loss_recovery(sess, 30, 8);
-        let dred4 = m
-            .session_dred_reconstructions
-            .with_label_values(&[sess])
-            .get();
-        let plc4 = m.session_classical_plc.with_label_values(&[sess]).get();
-        assert_eq!(dred4, 30);
-        assert_eq!(plc4, 8);
-    }
-
     #[test]
     fn metrics_increment() {
         let m = RelayMetrics::new();

crates/wzp-relay/src/room.rs

@@ -10,7 +10,7 @@ use std::time::Duration;
 
 use bytes::Bytes;
 use tokio::sync::Mutex;
-use tracing::{error, info, warn};
+use tracing::{debug, error, info, trace, warn};
 
 use wzp_proto::packet::TrunkFrame;
 use wzp_proto::MediaTransport;
@@ -18,38 +18,6 @@ use wzp_proto::MediaTransport;
 use crate::metrics::RelayMetrics;
 use crate::trunk::TrunkBatcher;
 
-/// Debug tap: logs packet metadata for matching rooms.
-#[derive(Clone)]
-pub struct DebugTap {
-    /// Room name filter ("*" = all rooms, or specific room name/hash).
-    pub room_filter: String,
-}
-
-impl DebugTap {
-    pub fn matches(&self, room_name: &str) -> bool {
-        self.room_filter == "*" || self.room_filter == room_name
-    }
-
-    pub fn log_packet(&self, room: &str, dir: &str, addr: &std::net::SocketAddr, pkt: &wzp_proto::MediaPacket, fan_out: usize) {
-        let h = &pkt.header;
-        info!(
-            target: "debug_tap",
-            room = %room,
-            dir = dir,
-            addr = %addr,
-            seq = h.seq,
-            codec = ?h.codec_id,
-            ts = h.timestamp,
-            fec_block = h.fec_block,
-            fec_sym = h.fec_symbol,
-            repair = h.is_repair,
-            len = pkt.payload.len(),
-            fan_out,
-            "TAP"
-        );
-    }
-}
-
 /// Unique participant ID within a room.
 pub type ParticipantId = u64;
 
@@ -59,22 +27,6 @@ fn next_id() -> ParticipantId {
     NEXT_PARTICIPANT_ID.fetch_add(1, Ordering::Relaxed)
 }
 
-/// Events emitted by RoomManager for federation to observe.
-#[derive(Clone, Debug)]
-pub enum RoomEvent {
-    /// First local participant joined this room.
-    LocalJoin { room: String },
-    /// Last local participant left this room.
-    LocalLeave { room: String },
-}
-
-/// Outbound federation media from a local participant.
-pub struct FederationMediaOut {
-    pub room_name: String,
-    pub room_hash: [u8; 8],
-    pub data: Bytes,
-}
-
 /// How to send data to a participant — either via QUIC transport or WebSocket channel.
 #[derive(Clone)]
 pub enum ParticipantSender {
@@ -180,7 +132,6 @@ impl Room {
             .map(|p| wzp_proto::packet::RoomParticipant {
                 fingerprint: p.fingerprint.clone().unwrap_or_default(),
                 alias: p.alias.clone(),
-                relay_label: None, // local participant
             })
             .collect()
     }
@@ -190,6 +141,17 @@ impl Room {
         self.participants.iter().map(|p| p.sender.clone()).collect()
     }
 
+    /// Update a participant's alias. Returns true if the participant was found.
+    fn set_alias(&mut self, id: ParticipantId, alias: String) -> bool {
+        if let Some(p) = self.participants.iter_mut().find(|p| p.id == id) {
+            info!(participant = id, %alias, "alias updated");
+            p.alias = Some(alias);
+            true
+        } else {
+            false
+        }
+    }
+
     fn is_empty(&self) -> bool {
         self.participants.is_empty()
     }
@@ -206,35 +168,24 @@ pub struct RoomManager {
     /// When `None`, rooms are open (no auth mode). When `Some`, only listed
     /// fingerprints can join the corresponding room.
     acl: Option<HashMap<String, HashSet<String>>>,
-    /// Channel for room lifecycle events (federation subscribes).
-    event_tx: tokio::sync::broadcast::Sender<RoomEvent>,
 }
 
 impl RoomManager {
     pub fn new() -> Self {
-        let (event_tx, _) = tokio::sync::broadcast::channel(64);
         Self {
             rooms: HashMap::new(),
             acl: None,
-            event_tx,
         }
     }
 
     /// Create a room manager with ACL enforcement enabled.
     pub fn with_acl() -> Self {
-        let (event_tx, _) = tokio::sync::broadcast::channel(64);
         Self {
             rooms: HashMap::new(),
             acl: Some(HashMap::new()),
-            event_tx,
         }
     }
 
-    /// Subscribe to room lifecycle events (for federation).
-    pub fn subscribe_events(&self) -> tokio::sync::broadcast::Receiver<RoomEvent> {
-        self.event_tx.subscribe()
-    }
-
     /// Grant a fingerprint access to a room.
     pub fn allow(&mut self, room_name: &str, fingerprint: &str) {
         if let Some(ref mut acl) = self.acl {
@@ -273,13 +224,8 @@ impl RoomManager {
             warn!(room = room_name, fingerprint = ?fingerprint, "unauthorized room join attempt");
             return Err("not authorized for this room".to_string());
         }
-        let was_empty = !self.rooms.contains_key(room_name)
-            || self.rooms.get(room_name).map_or(true, |r| r.is_empty());
         let room = self.rooms.entry(room_name.to_string()).or_insert_with(Room::new);
         let id = room.add(addr, sender, fingerprint.map(|s| s.to_string()), alias.map(|s| s.to_string()));
-        if was_empty {
-            let _ = self.event_tx.send(RoomEvent::LocalJoin { room: room_name.to_string() });
-        }
         let update = wzp_proto::SignalMessage::RoomUpdate {
             count: room.len() as u32,
             participants: room.participant_list(),
@@ -300,34 +246,12 @@ impl RoomManager {
         Ok(id)
     }
 
-    /// Get list of active room names.
-    pub fn active_rooms(&self) -> Vec<String> {
-        self.rooms.keys().cloned().collect()
-    }
-
-    /// Get participant list for a room (fingerprint + alias).
-    pub fn local_participant_list(&self, room_name: &str) -> Vec<wzp_proto::packet::RoomParticipant> {
-        self.rooms.get(room_name)
-            .map(|room| room.participant_list())
-            .unwrap_or_default()
-    }
-
-    /// Get all senders for participants in a room (for federation inbound media delivery).
-    pub fn local_senders(&self, room_name: &str) -> Vec<ParticipantSender> {
-        self.rooms.get(room_name)
-            .map(|room| room.participants.iter()
-                .map(|p| p.sender.clone())
-                .collect())
-            .unwrap_or_default()
-    }
-
     /// Leave a room. Returns (room_update_msg, remaining_senders) for broadcasting, or None if room is now empty.
     pub fn leave(&mut self, room_name: &str, participant_id: ParticipantId) -> Option<(wzp_proto::SignalMessage, Vec<ParticipantSender>)> {
         if let Some(room) = self.rooms.get_mut(room_name) {
             room.remove(participant_id);
             if room.is_empty() {
                 self.rooms.remove(room_name);
-                let _ = self.event_tx.send(RoomEvent::LocalLeave { room: room_name.to_string() });
                 info!(room = room_name, "room closed (empty)");
                 return None;
             }
@@ -342,6 +266,26 @@ impl RoomManager {
         }
     }
 
+    /// Update a participant's alias and return a RoomUpdate + senders for broadcasting.
+    pub fn set_alias(
+        &mut self,
+        room_name: &str,
+        participant_id: ParticipantId,
+        alias: String,
+    ) -> Option<(wzp_proto::SignalMessage, Vec<ParticipantSender>)> {
+        if let Some(room) = self.rooms.get_mut(room_name) {
+            if room.set_alias(participant_id, alias) {
+                let update = wzp_proto::SignalMessage::RoomUpdate {
+                    count: room.len() as u32,
+                    participants: room.participant_list(),
+                };
+                let senders = room.all_senders();
+                return Some((update, senders));
+            }
+        }
+        None
+    }
+
     /// Get senders for all OTHER participants in a room.
     pub fn others(
         &self,
@@ -437,9 +381,6 @@ pub async fn run_participant(
     metrics: Arc<RelayMetrics>,
     session_id: &str,
     trunking_enabled: bool,
-    debug_tap: Option<DebugTap>,
-    federation_tx: Option<tokio::sync::mpsc::Sender<FederationMediaOut>>,
-    federation_room_hash: Option<[u8; 8]>,
 ) {
     if trunking_enabled {
         run_participant_trunked(
@@ -448,7 +389,7 @@ pub async fn run_participant(
         .await;
     } else {
         run_participant_plain(
-            room_mgr, room_name, participant_id, transport, metrics, session_id, debug_tap, federation_tx, federation_room_hash,
+            room_mgr, room_name, participant_id, transport, metrics, session_id,
         )
         .await;
     }
@@ -462,11 +403,16 @@ async fn run_participant_plain(
     transport: Arc<wzp_transport::QuinnTransport>,
     metrics: Arc<RelayMetrics>,
     session_id: &str,
-    debug_tap: Option<DebugTap>,
-    federation_tx: Option<tokio::sync::mpsc::Sender<FederationMediaOut>>,
-    federation_room_hash: Option<[u8; 8]>,
 ) {
     let addr = transport.connection().remote_address();
+
+    // Media forwarding task (with debug logging from Android fixes)
+    let media_room_mgr = room_mgr.clone();
+    let media_room_name = room_name.clone();
+    let media_transport = transport.clone();
+    let media_metrics = metrics.clone();
+    let media_session_id = session_id.to_string();
+    let media_task = async move {
         let mut packets_forwarded = 0u64;
         let mut last_recv_instant = std::time::Instant::now();
         let mut max_recv_gap_ms = 0u64;
@@ -475,15 +421,15 @@ async fn run_participant_plain(
         let mut last_log_instant = std::time::Instant::now();
 
         info!(
-        room = %room_name,
+            room = %media_room_name,
             participant = participant_id,
             %addr,
-        session = session_id,
+            session = %media_session_id,
             "forwarding loop started (plain)"
         );
 
         loop {
-        let pkt = match transport.recv_media().await {
+            let pkt = match media_transport.recv_media().await {
                 Ok(Some(pkt)) => pkt,
                 Ok(None) => {
                     info!(%addr, participant = participant_id, forwarded = packets_forwarded, "disconnected (stream ended)");
@@ -505,10 +451,9 @@ async fn run_participant_plain(
             if recv_gap_ms > max_recv_gap_ms {
                 max_recv_gap_ms = recv_gap_ms;
             }
-        // Log if recv gap is suspiciously large (>200ms = missed ~10 packets)
             if recv_gap_ms > 200 {
                 warn!(
-                room = %room_name,
+                    room = %media_room_name,
                     participant = participant_id,
                     recv_gap_ms,
                     seq = pkt.header.seq,
@@ -516,35 +461,20 @@ async fn run_participant_plain(
                 );
             }
 
-        // Update per-session quality metrics if a quality report is present
             if let Some(ref report) = pkt.quality_report {
-            metrics.update_session_quality(session_id, report);
+                media_metrics.update_session_quality(&media_session_id, report);
             }
 
-        // Get current list of other participants
             let lock_start = std::time::Instant::now();
             let others = {
-            let mgr = room_mgr.lock().await;
-            mgr.others(&room_name, participant_id)
+                let mgr = media_room_mgr.lock().await;
+                mgr.others(&media_room_name, participant_id)
             };
             let lock_ms = lock_start.elapsed().as_millis() as u64;
             if lock_ms > 10 {
-            warn!(
-                room = %room_name,
-                participant = participant_id,
-                lock_ms,
-                "slow room_mgr lock"
-            );
+                warn!(room = %media_room_name, participant = participant_id, lock_ms, "slow room_mgr lock");
             }
 
-        // Debug tap: log packet metadata
-        if let Some(ref tap) = debug_tap {
-            if tap.matches(&room_name) {
-                tap.log_packet(&room_name, "in", &addr, &pkt, others.len());
-            }
-        }
-
-        // Forward to all others
             let fwd_start = std::time::Instant::now();
             let pkt_bytes = pkt.payload.len() as u64;
             for other in &others {
@@ -554,7 +484,7 @@ async fn run_participant_plain(
                             send_errors += 1;
                             if send_errors <= 5 || send_errors % 100 == 0 {
                                 warn!(
-                                room = %room_name,
+                                    room = %media_room_name,
                                     participant = participant_id,
                                     peer = %t.connection().remote_address(),
                                     total_send_errors = send_errors,
@@ -568,51 +498,27 @@ async fn run_participant_plain(
                     }
                 }
             }
-
-        // Federation: forward to active peer relays via channel
-        if let Some(ref fed_tx) = federation_tx {
-            let data = pkt.to_bytes();
-            let _ = fed_tx.try_send(FederationMediaOut {
-                room_name: room_name.clone(),
-                room_hash: federation_room_hash.unwrap_or_else(|| crate::federation::room_hash(&room_name)),
-                data,
-            });
-        }
-
             let fwd_ms = fwd_start.elapsed().as_millis() as u64;
-        if fwd_ms > max_forward_ms {
-            max_forward_ms = fwd_ms;
-        }
+            if fwd_ms > max_forward_ms { max_forward_ms = fwd_ms; }
             if fwd_ms > 50 {
-            warn!(
-                room = %room_name,
-                participant = participant_id,
-                fwd_ms,
-                fan_out = others.len(),
-                "slow forward"
-            );
+                warn!(room = %media_room_name, participant = participant_id, fwd_ms, fan_out = others.len(), "slow forward");
             }
 
             let fan_out = others.len() as u64;
-        metrics.packets_forwarded.inc_by(fan_out);
-        metrics.bytes_forwarded.inc_by(pkt_bytes * fan_out);
+            media_metrics.packets_forwarded.inc_by(fan_out);
+            media_metrics.bytes_forwarded.inc_by(pkt_bytes * fan_out);
             packets_forwarded += 1;
 
-        // Periodic stats log every 5 seconds
             if last_log_instant.elapsed() >= Duration::from_secs(5) {
                 let room_size = {
-                let mgr = room_mgr.lock().await;
-                mgr.room_size(&room_name)
+                    let mgr = media_room_mgr.lock().await;
+                    mgr.room_size(&media_room_name)
                 };
                 info!(
-                room = %room_name,
+                    room = %media_room_name,
                     participant = participant_id,
                     forwarded = packets_forwarded,
-                room_size,
-                fan_out,
-                max_recv_gap_ms,
-                max_forward_ms,
-                send_errors,
+                    room_size, fan_out, max_recv_gap_ms, max_forward_ms, send_errors,
                     "participant stats"
                 );
                 max_recv_gap_ms = 0;
@@ -620,6 +526,46 @@ async fn run_participant_plain(
                 last_log_instant = std::time::Instant::now();
             }
         }
+    };
+
+    // Signal handling task — processes SetAlias and other in-call signals
+    let signal_room_mgr = room_mgr.clone();
+    let signal_room_name = room_name.clone();
+    let signal_transport = transport.clone();
+    let signal_task = async move {
+        loop {
+            match signal_transport.recv_signal().await {
+                Ok(Some(wzp_proto::SignalMessage::SetAlias { alias })) => {
+                    info!(%addr, participant = participant_id, %alias, "SetAlias received");
+                    let mut mgr = signal_room_mgr.lock().await;
+                    if let Some((update, senders)) =
+                        mgr.set_alias(&signal_room_name, participant_id, alias)
+                    {
+                        drop(mgr);
+                        broadcast_signal(&senders, &update).await;
+                    }
+                }
+                Ok(Some(wzp_proto::SignalMessage::Hangup { .. })) => {
+                    info!(%addr, participant = participant_id, "hangup received");
+                    break;
+                }
+                Ok(Some(msg)) => {
+                    info!(%addr, participant = participant_id, "signal: {:?}", std::mem::discriminant(&msg));
+                }
+                Ok(None) => break,
+                Err(e) => {
+                    warn!(%addr, participant = participant_id, "signal recv error: {e}");
+                    break;
+                }
+            }
+        }
+    };
+
+    // Run both in parallel — exit when either finishes (disconnection)
+    tokio::select! {
+        _ = media_task => {}
+        _ = signal_task => {}
+    }
 
     // Clean up — leave room and broadcast update to remaining participants
     let mut mgr = room_mgr.lock().await;
@@ -837,7 +783,7 @@ mod tests {
 
     #[test]
     fn room_join_leave() {
-        let mgr = RoomManager::new();
+        let mut mgr = RoomManager::new();
         assert_eq!(mgr.room_size("test"), 0);
         assert!(mgr.list().is_empty());
     }

crates/wzp-relay/src/signal_hub.rs

@@ -1,105 +0,0 @@
-//! Persistent signaling connection manager.
-//!
-//! Tracks clients connected via `_signal` SNI. Routes call signals
-//! (DirectCallOffer, DirectCallAnswer, Hangup) between registered users.
-
-use std::collections::HashMap;
-use std::sync::Arc;
-use std::time::Instant;
-
-use tracing::info;
-use wzp_proto::{MediaTransport, SignalMessage};
-use wzp_transport::QuinnTransport;
-
-/// A client connected via `_signal` for direct calling.
-pub struct SignalClient {
-    pub fingerprint: String,
-    pub alias: Option<String>,
-    pub transport: Arc<QuinnTransport>,
-    pub connected_at: Instant,
-}
-
-/// Manages persistent signaling connections.
-pub struct SignalHub {
-    clients: HashMap<String, SignalClient>,
-}
-
-impl SignalHub {
-    pub fn new() -> Self {
-        Self {
-            clients: HashMap::new(),
-        }
-    }
-
-    /// Register a new signaling client.
-    pub fn register(&mut self, fp: String, transport: Arc<QuinnTransport>, alias: Option<String>) {
-        info!(fingerprint = %fp, alias = ?alias, "signal client registered");
-        self.clients.insert(fp.clone(), SignalClient {
-            fingerprint: fp,
-            alias,
-            transport,
-            connected_at: Instant::now(),
-        });
-    }
-
-    /// Unregister a signaling client. Returns the client if found.
-    pub fn unregister(&mut self, fp: &str) -> Option<SignalClient> {
-        let client = self.clients.remove(fp);
-        if client.is_some() {
-            info!(fingerprint = %fp, "signal client unregistered");
-        }
-        client
-    }
-
-    /// Look up a client by fingerprint.
-    pub fn get(&self, fp: &str) -> Option<&SignalClient> {
-        self.clients.get(fp)
-    }
-
-    /// Check if a fingerprint is online.
-    pub fn is_online(&self, fp: &str) -> bool {
-        self.clients.contains_key(fp)
-    }
-
-    /// Send a signal message to a client by fingerprint.
-    pub async fn send_to(&self, fp: &str, msg: &SignalMessage) -> Result<(), String> {
-        match self.clients.get(fp) {
-            Some(client) => {
-                client.transport.send_signal(msg).await
-                    .map_err(|e| format!("send to {fp}: {e}"))
-            }
-            None => Err(format!("{fp} not online")),
-        }
-    }
-
-    /// Number of connected signaling clients.
-    pub fn online_count(&self) -> usize {
-        self.clients.len()
-    }
-
-    /// List all online fingerprints.
-    pub fn online_fingerprints(&self) -> Vec<&str> {
-        self.clients.keys().map(|s| s.as_str()).collect()
-    }
-
-    /// Get alias for a fingerprint.
-    pub fn alias(&self, fp: &str) -> Option<&str> {
-        self.clients.get(fp).and_then(|c| c.alias.as_deref())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn register_unregister() {
-        let hub = SignalHub::new();
-        assert_eq!(hub.online_count(), 0);
-        assert!(!hub.is_online("alice"));
-
-        // Can't easily construct QuinnTransport in a unit test,
-        // so we just test the HashMap logic conceptually.
-        // Integration tests cover the full flow.
-    }
-}

crates/wzp-relay/tests/handshake_integration.rs

@@ -63,11 +63,11 @@ async fn handshake_succeeds() {
         accept_handshake(server_t.as_ref(), &callee_seed).await
     });
 
-    let caller_session = perform_handshake(client_transport.as_ref(), &caller_seed, None)
+    let caller_session = perform_handshake(client_transport.as_ref(), &caller_seed)
         .await
         .expect("perform_handshake should succeed");
 
-    let (callee_session, chosen_profile, _caller_fp, _caller_alias) = callee_handle
+    let (callee_session, chosen_profile) = callee_handle
         .await
         .expect("join callee task")
         .expect("accept_handshake should succeed");
@@ -124,11 +124,11 @@ async fn handshake_verifies_identity() {
         accept_handshake(server_t.as_ref(), &callee_seed).await
     });
 
-    let caller_session = perform_handshake(client_transport.as_ref(), &caller_seed, None)
+    let caller_session = perform_handshake(client_transport.as_ref(), &caller_seed)
         .await
         .expect("handshake must succeed even with different identities");
 
-    let (callee_session, _profile, _caller_fp, _caller_alias) = callee_handle
+    let (callee_session, _profile) = callee_handle
         .await
         .expect("join")
         .expect("accept_handshake must succeed");
@@ -183,7 +183,7 @@ async fn auth_then_handshake() {
         };
 
         // 2. Run the cryptographic handshake
-        let (session, profile, _caller_fp, _caller_alias) = accept_handshake(server_t.as_ref(), &callee_seed)
+        let (session, profile) = accept_handshake(server_t.as_ref(), &callee_seed)
             .await
             .expect("accept_handshake after auth");
 
@@ -199,7 +199,7 @@ async fn auth_then_handshake() {
         .await
         .expect("send AuthToken");
 
-    let caller_session = perform_handshake(client_transport.as_ref(), &caller_seed, None)
+    let caller_session = perform_handshake(client_transport.as_ref(), &caller_seed)
         .await
         .expect("perform_handshake after auth");
 
@@ -270,7 +270,6 @@ async fn handshake_rejects_bad_signature() {
         ephemeral_pub,
         signature,
         supported_profiles: vec![wzp_proto::QualityProfile::GOOD],
-        alias: None,
     };
 
     client_transport

crates/wzp-relay/tests/reflect.rs

@@ -1,318 +0,0 @@
-//! Integration tests for the "STUN for QUIC" reflect protocol
-//! (PRD: .taskmaster/docs/prd_reflect_over_quic.txt, Phase 1).
-//!
-//! We don't spin up the full relay binary — instead we exercise the
-//! same wire-level request/response dance with a mock relay loop
-//! that implements exactly the match arm added to
-//! `wzp-relay/src/main.rs`. This isolates the protocol test from the
-//! rest of the relay state (rooms, federation, call registry, ...).
-//!
-//! Three test cases:
-//!  1. `reflect_happy_path` — client sends `Reflect`, mock relay
-//!     replies with `ReflectResponse { observed_addr }`, client
-//!     parses it back to a `SocketAddr` and confirms the IP is
-//!     `127.0.0.1` and the port matches its own bound port.
-//!  2. `reflect_two_clients_distinct_ports` — two simultaneous
-//!     client connections on different ephemeral ports get back
-//!     different reflected ports, proving the relay uses
-//!     per-connection `remote_address` rather than a global.
-//!  3. `reflect_old_relay_times_out` — mock relay that *doesn't*
-//!     handle `Reflect`; client side times out in the expected
-//!     window and does not hang.
-//!
-//! The third test uses a `tokio::time::timeout` wrapper directly
-//! (the client-side `request_reflect` helper lives in
-//! `desktop/src-tauri/src/lib.rs` which isn't a library we can
-//! depend on from here, so we reproduce the timeout semantics
-//! inline).
-
-use std::net::{Ipv4Addr, SocketAddr};
-use std::sync::Arc;
-use std::time::Duration;
-
-use wzp_proto::{MediaTransport, SignalMessage};
-use wzp_transport::{client_config, create_endpoint, server_config, QuinnTransport};
-
-/// Spawn a minimal mock relay that loops over `recv_signal`,
-/// matches on `Reflect`, and responds with `ReflectResponse` using
-/// the remote_address observed for this connection. Mirrors the
-/// match arm in `crates/wzp-relay/src/main.rs`.
-async fn spawn_mock_relay_with_reflect(
-    server_transport: Arc<QuinnTransport>,
-) -> tokio::task::JoinHandle<()> {
-    tokio::spawn(async move {
-        // Observed remote address at the time the connection was
-        // accepted. Stable for the life of the connection under quinn's
-        // normal operation. This is exactly what the real relay does.
-        let observed = server_transport.connection().remote_address();
-        loop {
-            match server_transport.recv_signal().await {
-                Ok(Some(SignalMessage::Reflect)) => {
-                    let resp = SignalMessage::ReflectResponse {
-                        observed_addr: observed.to_string(),
-                    };
-                    // If the send fails the client has gone; just exit.
-                    if server_transport.send_signal(&resp).await.is_err() {
-                        break;
-                    }
-                }
-                Ok(Some(_other)) => {
-                    // Ignore anything else — not relevant to this test.
-                }
-                Ok(None) => break,
-                Err(_e) => break,
-            }
-        }
-    })
-}
-
-/// Spawn a mock relay that intentionally DOES NOT handle Reflect.
-/// Models a pre-Phase-1 relay — it keeps reading signal messages and
-/// logs them to stderr, but never produces a `ReflectResponse`.
-async fn spawn_mock_relay_without_reflect(
-    server_transport: Arc<QuinnTransport>,
-) -> tokio::task::JoinHandle<()> {
-    tokio::spawn(async move {
-        loop {
-            match server_transport.recv_signal().await {
-                Ok(Some(_msg)) => {
-                    // Deliberately do nothing. Old relay.
-                }
-                Ok(None) => break,
-                Err(_) => break,
-            }
-        }
-    })
-}
-
-/// Build an in-process QUIC client/server pair on loopback and
-/// return (client_transport, server_transport, endpoints). The
-/// endpoints tuple must be kept alive for the test duration.
-///
-/// `client_port_hint` of 0 means "let OS pick". Pass an explicit
-/// port to pin the client's source port (useful for the
-/// distinct-ports test).
-async fn connected_pair_with_port(
-    _client_port_hint: u16,
-) -> (Arc<QuinnTransport>, Arc<QuinnTransport>, (quinn::Endpoint, quinn::Endpoint)) {
-    let _ = rustls::crypto::ring::default_provider().install_default();
-
-    let (sc, _cert_der) = server_config();
-    let server_addr: SocketAddr = (Ipv4Addr::LOCALHOST, 0).into();
-    let server_ep = create_endpoint(server_addr, Some(sc)).expect("server endpoint");
-    let server_listen = server_ep.local_addr().expect("server local addr");
-
-    // Always bind the client to an ephemeral port — we'll read back
-    // the actual assigned port via `local_addr()` in the assertions.
-    let client_bind: SocketAddr = (Ipv4Addr::LOCALHOST, 0).into();
-    let client_ep = create_endpoint(client_bind, None).expect("client endpoint");
-
-    let server_ep_clone = server_ep.clone();
-    let accept_fut = tokio::spawn(async move {
-        let conn = wzp_transport::accept(&server_ep_clone).await.expect("accept");
-        Arc::new(QuinnTransport::new(conn))
-    });
-
-    let client_conn =
-        wzp_transport::connect(&client_ep, server_listen, "localhost", client_config())
-            .await
-            .expect("connect");
-    let client_transport = Arc::new(QuinnTransport::new(client_conn));
-    let server_transport = accept_fut.await.expect("join accept task");
-
-    (client_transport, server_transport, (server_ep, client_ep))
-}
-
-// -----------------------------------------------------------------------
-// Test 1: happy path — client learns its own port via Reflect
-// -----------------------------------------------------------------------
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn reflect_happy_path() {
-    let (client_transport, server_transport, (_server_ep, client_ep)) =
-        connected_pair_with_port(0).await;
-
-    // Grab the client's actual bound port so we can cross-check
-    // against the reflected response.
-    let client_port = client_ep
-        .local_addr()
-        .expect("client local addr")
-        .port();
-    assert_ne!(client_port, 0, "client must have a real bound port");
-
-    // Start the mock relay's reflect handler.
-    let _relay_handle = spawn_mock_relay_with_reflect(Arc::clone(&server_transport)).await;
-
-    // Client sends Reflect and awaits the response. The real
-    // request_reflect helper in desktop/src-tauri/src/lib.rs uses a
-    // oneshot channel driven off the spawned recv loop; here we just
-    // do it inline because there's no spawned loop yet in this test
-    // — this isolates the wire protocol from the client-side state
-    // machine.
-    client_transport
-        .send_signal(&SignalMessage::Reflect)
-        .await
-        .expect("send Reflect");
-
-    let resp = tokio::time::timeout(Duration::from_secs(2), client_transport.recv_signal())
-        .await
-        .expect("reflect response should arrive within 2s")
-        .expect("recv_signal ok")
-        .expect("some message");
-
-    let observed_addr = match resp {
-        SignalMessage::ReflectResponse { observed_addr } => observed_addr,
-        other => panic!("expected ReflectResponse, got {:?}", std::mem::discriminant(&other)),
-    };
-
-    let parsed: SocketAddr = observed_addr
-        .parse()
-        .expect("ReflectResponse.observed_addr must parse as SocketAddr");
-
-    // The relay should see the client on 127.0.0.1 (loopback in the
-    // test harness) and on the client's bound ephemeral port.
-    assert_eq!(parsed.ip().to_string(), "127.0.0.1");
-    assert_eq!(
-        parsed.port(),
-        client_port,
-        "reflected port must match the client's local_addr port"
-    );
-
-    drop(client_transport);
-    drop(server_transport);
-}
-
-// -----------------------------------------------------------------------
-// Test 2: two clients get DIFFERENT reflected ports
-// -----------------------------------------------------------------------
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-async fn reflect_two_clients_distinct_ports() {
-    let _ = rustls::crypto::ring::default_provider().install_default();
-
-    // Shared server: one endpoint, two incoming accepts.
-    let (sc, _cert_der) = server_config();
-    let server_addr: SocketAddr = (Ipv4Addr::LOCALHOST, 0).into();
-    let server_ep = create_endpoint(server_addr, Some(sc)).expect("server endpoint");
-    let server_listen = server_ep.local_addr().expect("server local addr");
-
-    // Accept two clients in parallel.
-    let server_ep_a = server_ep.clone();
-    let accept_a = tokio::spawn(async move {
-        let conn = wzp_transport::accept(&server_ep_a).await.expect("accept A");
-        Arc::new(QuinnTransport::new(conn))
-    });
-    let server_ep_b = server_ep.clone();
-    let accept_b = tokio::spawn(async move {
-        let conn = wzp_transport::accept(&server_ep_b).await.expect("accept B");
-        Arc::new(QuinnTransport::new(conn))
-    });
-
-    // Client A
-    let client_ep_a = create_endpoint((Ipv4Addr::LOCALHOST, 0).into(), None).expect("ep A");
-    let conn_a =
-        wzp_transport::connect(&client_ep_a, server_listen, "localhost", client_config())
-            .await
-            .expect("connect A");
-    let client_a = Arc::new(QuinnTransport::new(conn_a));
-    let port_a = client_ep_a.local_addr().unwrap().port();
-
-    // Client B
-    let client_ep_b = create_endpoint((Ipv4Addr::LOCALHOST, 0).into(), None).expect("ep B");
-    let conn_b =
-        wzp_transport::connect(&client_ep_b, server_listen, "localhost", client_config())
-            .await
-            .expect("connect B");
-    let client_b = Arc::new(QuinnTransport::new(conn_b));
-    let port_b = client_ep_b.local_addr().unwrap().port();
-
-    assert_ne!(
-        port_a, port_b,
-        "preconditions: OS must assign two clients different ephemeral ports"
-    );
-
-    let server_a = accept_a.await.expect("join A");
-    let server_b = accept_b.await.expect("join B");
-
-    // Spawn a reflect handler for each server-side transport.
-    let _relay_a = spawn_mock_relay_with_reflect(Arc::clone(&server_a)).await;
-    let _relay_b = spawn_mock_relay_with_reflect(Arc::clone(&server_b)).await;
-
-    // Each client requests reflect concurrently.
-    let reflect_for = |t: Arc<QuinnTransport>| async move {
-        t.send_signal(&SignalMessage::Reflect).await.expect("send");
-        let resp = tokio::time::timeout(Duration::from_secs(2), t.recv_signal())
-            .await
-            .expect("timeout")
-            .expect("ok")
-            .expect("some");
-        match resp {
-            SignalMessage::ReflectResponse { observed_addr } => observed_addr,
-            _ => panic!("wrong variant"),
-        }
-    };
-
-    let (addr_a, addr_b) = tokio::join!(reflect_for(client_a.clone()), reflect_for(client_b.clone()));
-
-    let parsed_a: SocketAddr = addr_a.parse().unwrap();
-    let parsed_b: SocketAddr = addr_b.parse().unwrap();
-
-    assert_eq!(parsed_a.port(), port_a, "client A's reflected port");
-    assert_eq!(parsed_b.port(), port_b, "client B's reflected port");
-    assert_ne!(
-        parsed_a.port(),
-        parsed_b.port(),
-        "each client must see its own port, not a shared one"
-    );
-
-    drop(client_a);
-    drop(client_b);
-    drop(server_a);
-    drop(server_b);
-}
-
-// -----------------------------------------------------------------------
-// Test 3: old relay never answers — client times out cleanly
-// -----------------------------------------------------------------------
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn reflect_old_relay_times_out() {
-    let (client_transport, server_transport, _endpoints) =
-        connected_pair_with_port(0).await;
-
-    // Mock relay that ignores Reflect — simulates a pre-Phase-1 build.
-    let _relay_handle =
-        spawn_mock_relay_without_reflect(Arc::clone(&server_transport)).await;
-
-    client_transport
-        .send_signal(&SignalMessage::Reflect)
-        .await
-        .expect("send Reflect");
-
-    // 1100ms ceiling matches the 1s timeout baked into
-    // get_reflected_address plus a tiny bit of slack. If this
-    // regression ever fires it probably means recv_signal blocked
-    // longer than expected and the Tauri command would hang the UI.
-    let start = std::time::Instant::now();
-    let result =
-        tokio::time::timeout(Duration::from_millis(1100), client_transport.recv_signal()).await;
-    let elapsed = start.elapsed();
-
-    assert!(
-        result.is_err(),
-        "recv_signal must time out when the relay ignores Reflect"
-    );
-    assert!(
-        elapsed >= Duration::from_millis(1000),
-        "timeout fired too early ({:?})",
-        elapsed
-    );
-    assert!(
-        elapsed < Duration::from_millis(1200),
-        "timeout fired too late ({:?}), client would feel unresponsive",
-        elapsed
-    );
-
-    drop(client_transport);
-    drop(server_transport);
-}

crates/wzp-transport/Cargo.toml

@@ -16,9 +16,6 @@ async-trait = { workspace = true }
 serde_json = "1"
 rustls = { version = "0.23", default-features = false, features = ["ring", "std"] }
 rcgen = "0.13"
-ed25519-dalek = { workspace = true }
-hkdf = { workspace = true }
-sha2 = { workspace = true }
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }

crates/wzp-transport/src/config.rs

@@ -6,74 +6,20 @@ use std::time::Duration;
 use quinn::crypto::rustls::QuicClientConfig;
 use quinn::crypto::rustls::QuicServerConfig;
 
-/// Create a server configuration with a self-signed certificate (random keypair).
+/// Create a server configuration with a self-signed certificate (for testing).
 ///
-/// The certificate changes on every call. Use `server_config_from_seed` for
-/// a deterministic certificate that survives relay restarts.
+/// Tunes QUIC transport parameters for lossy VoIP:
+/// - 30s idle timeout
+/// - 5s keep-alive interval
+/// - DATAGRAM extension enabled
+/// - Conservative flow control for bandwidth-constrained links
 pub fn server_config() -> (quinn::ServerConfig, Vec<u8>) {
     let cert_key = rcgen::generate_simple_self_signed(vec!["localhost".to_string()])
         .expect("failed to generate self-signed cert");
     let cert_der = rustls::pki_types::CertificateDer::from(cert_key.cert);
     let key_der =
         rustls::pki_types::PrivateKeyDer::try_from(cert_key.key_pair.serialize_der()).unwrap();
-    build_server_config(cert_der, key_der)
-}
 
-/// Create a server configuration with a deterministic self-signed certificate
-/// derived from a 32-byte seed. Same seed = same cert = same TLS fingerprint.
-pub fn server_config_from_seed(seed: &[u8; 32]) -> (quinn::ServerConfig, Vec<u8>) {
-    use ed25519_dalek::pkcs8::EncodePrivateKey;
-    use ed25519_dalek::SigningKey;
-    use hkdf::Hkdf;
-    use sha2::Sha256;
-
-    // Derive Ed25519 key bytes from seed via HKDF
-    let hk = Hkdf::<Sha256>::new(None, seed);
-    let mut ed_bytes = [0u8; 32];
-    hk.expand(b"wzp-tls-ed25519", &mut ed_bytes)
-        .expect("HKDF expand failed");
-
-    // Create Ed25519 signing key and export as PKCS8 DER
-    let signing_key = SigningKey::from_bytes(&ed_bytes);
-    let pkcs8_doc = signing_key.to_pkcs8_der()
-        .expect("failed to encode Ed25519 key as PKCS8");
-    let key_der_for_rcgen = rustls::pki_types::PrivateKeyDer::try_from(pkcs8_doc.as_bytes().to_vec())
-        .expect("failed to wrap PKCS8 DER");
-
-    // Create rcgen KeyPair from DER
-    let key_pair = rcgen::KeyPair::from_der_and_sign_algo(
-        &key_der_for_rcgen,
-        &rcgen::PKCS_ED25519,
-    )
-    .expect("failed to create KeyPair from seed-derived Ed25519 key");
-
-    // Build self-signed cert with this deterministic keypair
-    let params = rcgen::CertificateParams::new(vec!["localhost".to_string()])
-        .expect("failed to create CertificateParams");
-    let cert = params.self_signed(&key_pair).expect("failed to self-sign cert");
-    let cert_der = rustls::pki_types::CertificateDer::from(cert.der().to_vec());
-    let key_der = rustls::pki_types::PrivateKeyDer::try_from(key_pair.serialize_der())
-        .expect("failed to serialize key DER");
-
-    build_server_config(cert_der, key_der)
-}
-
-/// Compute a hex-formatted SHA-256 fingerprint of a DER-encoded certificate.
-///
-/// Format: `xx:xx:xx:xx:...` (32 bytes = 64 hex chars with colons).
-pub fn tls_fingerprint(cert_der: &[u8]) -> String {
-    use sha2::{Sha256, Digest};
-    let hash = Sha256::digest(cert_der);
-    hash.iter()
-        .map(|b| format!("{b:02x}"))
-        .collect::<Vec<_>>()
-        .join(":")
-}
-
-fn build_server_config(
-    cert_der: rustls::pki_types::CertificateDer<'static>,
-    key_der: rustls::pki_types::PrivateKeyDer<'static>,
-) -> (quinn::ServerConfig, Vec<u8>) {
     let mut server_crypto = rustls::ServerConfig::builder()
         .with_no_client_auth()
         .with_single_cert(vec![cert_der.clone()], key_der)

crates/wzp-transport/src/lib.rs

@@ -22,13 +22,8 @@ pub mod path_monitor;
 pub mod quic;
 pub mod reliable;
 
-pub use config::{client_config, server_config, server_config_from_seed, tls_fingerprint};
+pub use config::{client_config, server_config};
 pub use connection::{accept, connect, create_endpoint};
 pub use path_monitor::PathMonitor;
 pub use quic::QuinnTransport;
 pub use wzp_proto::{MediaTransport, PathQuality, TransportError};
-
-// Re-export the quinn Endpoint type so downstream crates (wzp-desktop) can
-// thread a shared endpoint between signaling and media connections without
-// needing to depend on quinn directly.
-pub use quinn::Endpoint;

crates/wzp-transport/src/quic.rs

@@ -33,13 +33,6 @@ impl QuinnTransport {
         &self.connection
     }
 
-    /// Send raw bytes as a QUIC datagram (no MediaPacket framing).
-    pub fn send_raw_datagram(&self, data: &[u8]) -> Result<(), TransportError> {
-        self.connection
-            .send_datagram(bytes::Bytes::copy_from_slice(data))
-            .map_err(|e| TransportError::Internal(format!("datagram: {e}")))
-    }
-
     /// Close the QUIC connection immediately (synchronous, no async needed).
     /// The relay will detect the close and remove this participant from the room.
     pub fn close_now(&self) {
@@ -143,7 +136,7 @@ impl MediaTransport for QuinnTransport {
             }
         };
 
-        match datagram::deserialize_media(data.clone()) {
+        match datagram::deserialize_media(data) {
             Some(packet) => {
                 // Record receive observation
                 {
@@ -156,10 +149,8 @@ impl MediaTransport for QuinnTransport {
                 Ok(Some(packet))
             }
             None => {
-                tracing::warn!(len = data.len(), "skipping malformed media datagram, continuing");
-                // Don't return Ok(None) — that signals connection closed.
-                // Recurse to read the next datagram instead.
-                Box::pin(self.recv_media()).await
+                tracing::warn!("received malformed media datagram");
+                Ok(None)
             }
         }
     }

debug/INCIDENT-2026-04-06-art-gc-sigbus.md

@@ -1,115 +0,0 @@
-# Incident Report: SIGBUS in ART GC During Audio Thread JNI Calls
-
-**Date:** 2026-04-06
-**Severity:** High — app crash (SIGBUS) mid-call
-**Status:** Root-caused, fix proposed
-**Affects:** Android 16 (API 36) devices with concurrent mark-compact GC
-
-## Summary
-
-The app crashes with SIGBUS (signal 7, BUS_ADRERR) during an active call. The crash occurs in ART's garbage collector or JIT compiler, NOT in our Rust native code or AudioRing buffer. Both `wzp-capture` and `wzp-playout` Kotlin threads are affected.
-
-## Crash Details
-
-### Crash 1: wzp-capture (18:42, after 476s of call)
-
-```
-Fatal signal 7 (SIGBUS), code 2 (BUS_ADRERR), fault addr 0x720009be38
-tid 19697 (wzp-capture), pid 17885 (com.wzp.phone)
-```
-
-**Backtrace:**
-```
-#00 art::StackVisitor::WalkStack
-#01 art::Thread::VisitRoots
-#02 art::gc::collector::MarkCompact::ThreadFlipVisitor::Run
-#03 art::Thread::EnsureFlipFunctionStarted
-#04 CheckJNI::ReleasePrimitiveArrayElements  ← JNI boundary
-#05 android_media_AudioRecord_readInArray     ← AudioRecord.read()
-#09 com.wzp.audio.AudioPipeline.runCapture
-```
-
-**Root cause:** ART's concurrent mark-compact GC (`MarkCompact::ThreadFlipVisitor`) is flipping thread roots while the capture thread is in the middle of a JNI call (`AudioRecord.read()`). The GC's `EnsureFlipFunctionStarted` triggers a stack walk that hits an invalid address.
-
-### Crash 2: wzp-playout (19:17, mid-call)
-
-```
-Fatal signal 7 (SIGBUS), code 2 (BUS_ADRERR), fault addr 0x225eb98
-tid 32574 (wzp-playout), pid 32479 (com.wzp.phone)
-```
-
-**Backtrace:**
-```
-#00 com.wzp.audio.AudioPipeline.runPlayout  ← JIT-compiled code
-#01 art_quick_osr_stub                      ← On-Stack Replacement
-#02 art::jit::Jit::MaybeDoOnStackReplacement
-#03-#04 art::interpreter::ExecuteSwitchImplCpp
-```
-
-**Root cause:** ART's JIT compiler performed On-Stack Replacement (OSR) on the hot playout loop. The OSR stub references a code address (`0x225eb98`) that is no longer valid — likely because the GC moved the compiled code in memory during concurrent compaction.
-
-## Why This Happens
-
-Android 16 introduced a new **concurrent mark-compact GC** (CMC) that moves objects in memory while other threads are running. This is safe for normal Java code because ART uses read barriers. But our audio threads have specific properties that stress this:
-
-1. **`Thread.MAX_PRIORITY`** — audio threads run at the highest priority, starving the GC thread of CPU time. The GC may not complete its thread-flip before the audio thread resumes.
-
-2. **Tight JNI loops** — `runCapture()` and `runPlayout()` loop every 20ms calling `AudioRecord.read()` / `AudioTrack.write()` via JNI. Each JNI transition is a GC safepoint, but the thread spends most of its time in native code where the GC can't flip it.
-
-3. **Long-running JIT-compiled code** — the hot loop gets JIT-compiled and may undergo OSR. If the GC compacts memory while OSR is in progress, the stub can reference stale addresses.
-
-4. **Daemon threads that never exit** — our threads are parked with `Thread.sleep(Long.MAX_VALUE)` after the call ends (to avoid the libcrypto TLS destructor crash). These zombie threads accumulate GC root scan work.
-
-## Evidence This Is Not Our Bug
-
-| Component | Evidence |
-|-----------|---------|
-| **AudioRing** | Not in any backtrace. All crash frames are in `libart.so` (ART runtime) |
-| **Rust native code** | `libwzp_android.so` not in any crash frame |
-| **JNI bridge** | Crash happens during `ReleasePrimitiveArrayElements` (ART internal), not during our JNI calls |
-| **Timing** | Crashes after 476s and mid-call — not during init or teardown |
-
-## Proposed Fix
-
-### Option A: Disable concurrent GC compaction for audio threads (recommended)
-
-Use `dalvik.vm.gctype` or per-thread GC pinning to prevent the mark-compact collector from moving objects referenced by audio threads.
-
-**Not directly controllable from app code.** But we can reduce GC pressure:
-
-### Option B: Reduce JNI transitions in audio threads
-
-Instead of calling `engine.writeAudio(pcm)` / `engine.readAudio(pcm)` via JNI on every 20ms frame, batch multiple frames or use `DirectByteBuffer` to share memory without JNI array copies.
-
-**Implementation:**
-- Allocate a `DirectByteBuffer` in Kotlin, share the pointer with Rust via JNI
-- Audio threads write/read directly to the buffer (no JNI call per frame)
-- Rust reads/writes from the same memory region
-- Reduces JNI transitions from 100/sec to 0/sec per audio direction
-
-### Option C: Use Android's Oboe (AAudio) natively from Rust
-
-Skip the Kotlin AudioRecord/AudioTrack entirely. Use Oboe (which we already have as a dependency in `wzp-android/Cargo.toml`) to create native audio streams directly from Rust. The audio callbacks run in native code with no JNI, no GC interaction, no ART.
-
-This is how the project was originally designed (see `audio_android.rs` with Oboe references) before switching to Kotlin AudioRecord for simplicity.
-
-**Pros:** Eliminates the entire JNI audio path. No GC interaction. Lower latency.
-**Cons:** Requires rewriting `AudioPipeline.kt` into Rust. Oboe setup is more complex.
-
-### Option D: Pin audio thread objects to prevent GC movement
-
-Use JNI `GetPrimitiveArrayCritical` instead of `GetShortArrayRegion` to pin the array in memory during the operation. This prevents the GC from moving the array while we're using it.
-
-**Implementation:** Change `nativeWriteAudio` / `nativeReadAudio` JNI functions to use critical sections.
-
-### Recommendation
-
-**Short term: Option B** (DirectByteBuffer) — reduces JNI transitions without major refactoring.
-
-**Long term: Option C** (Oboe from Rust) — eliminates the problem entirely. This is the architecturally correct solution and matches the original design intent.
-
-## Data Files
-
-- Logcat from Nothing A059 (Android 16, API 36)
-- Two crashes in the same session: 18:42 (capture, after 476s) and 19:17 (playout)
-- Both SIGBUS/BUS_ADRERR, both in ART internal frames

debug/INCIDENT-2026-04-06-capture-thread-use-after-free.md

@@ -1,175 +0,0 @@
-# Incident Report: Native Crash in Capture Thread — Use-After-Free on Engine Handle
-
-**Date:** 2026-04-06
-**Severity:** Critical — app crash (SIGSEGV) on call hangup
-**Status:** Root-caused, fix pending
-**Affects:** Android client only
-
-## Summary
-
-The app crashes with a native SIGSEGV during or shortly after call hangup. The crash occurs in JIT-compiled code inside `AudioPipeline.runCapture()`. The root cause is a use-after-free: the capture thread calls `engine.writeAudio()` via JNI after the engine's native handle has been freed by `teardown()` on the ViewModel thread.
-
-## Crash Stacktrace
-
-```
-04-06 13:05:42.707 F DEBUG: #09 pc 000000000250696c /memfd:jit-cache (deleted) (com.wzp.audio.AudioPipeline.runCapture+3228)
-04-06 13:05:42.707 F DEBUG: #14 pc 0000000000005270 <anonymous:730900d000> (com.wzp.audio.AudioPipeline.start$lambda$0+0)
-04-06 13:05:42.708 F DEBUG: #19 pc 00000000000044cc <anonymous:730900d000> (com.wzp.audio.AudioPipeline.$r8$lambda$0rYcivupwvyN4SgBXhsroKmTlo8+0)
-04-06 13:05:42.708 F DEBUG: #24 pc 00000000000042e4 <anonymous:730900d000> (com.wzp.audio.AudioPipeline$$ExternalSyntheticLambda0.run+0)
-```
-
-This is a tombstone (signal crash), not a Java exception. The `F DEBUG` tag indicates a native crash handler (debuggerd) captured the signal.
-
-## Root Cause
-
-### The Race Condition
-
-Two threads operate on the engine concurrently without synchronization:
-
-**Thread 1: `wzp-capture` (AudioRecord thread, MAX_PRIORITY)**
-```kotlin
-// AudioPipeline.runCapture() — runs in a tight loop
-while (running) {
-    val read = recorder.read(pcm, 0, FRAME_SAMPLES)
-    if (read > 0) {
-        engine.writeAudio(pcm)  // <-- JNI call to native engine
-    }
-}
-```
-
-**Thread 2: ViewModel/UI thread (normal priority)**
-```kotlin
-// CallViewModel.teardown()
-stopAudio()                     // sets AudioPipeline.running = false
-engine?.stopCall()              // tells Rust to stop
-engine?.destroy()               // frees native memory, sets nativeHandle = 0L
-engine = null
-```
-
-### The Kotlin Guard is Insufficient
-
-`WzpEngine.writeAudio()` has a guard:
-```kotlin
-fun writeAudio(pcm: ShortArray): Int {
-    if (nativeHandle == 0L) return 0      // check
-    return nativeWriteAudio(nativeHandle, pcm)  // use
-}
-```
-
-This is a **TOCTOU (time-of-check/time-of-use) race**:
-1. Capture thread checks `nativeHandle != 0L` → true
-2. ViewModel thread calls `destroy()`, which calls `nativeDestroy(handle)` then sets `nativeHandle = 0L`
-3. Capture thread calls `nativeWriteAudio(handle, pcm)` with the now-freed handle
-4. The JNI function dereferences `handle` as a pointer → **SIGSEGV**
-
-The same race exists for `readAudio()` on the `wzp-playout` thread.
-
-### Why `stopAudio()` Doesn't Prevent This
-
-`AudioPipeline.stop()` sets `running = false` but does **NOT join or wait** for the threads:
-```kotlin
-fun stop() {
-    running = false
-    // Don't join — threads are parked as daemons to avoid native TLS crash
-    captureThread = null
-    playoutThread = null
-}
-```
-
-The threads are intentionally not joined because of a separate bug: exiting a JNI-calling thread triggers a `SIGSEGV in OPENSSL_free` due to libcrypto TLS destructors on Android. The threads instead "park" with `Thread.sleep(Long.MAX_VALUE)` after the loop exits.
-
-But the problem is the **window between `running = false` and the thread actually checking it**. The capture thread may be blocked in `recorder.read()` (which blocks for 20ms per frame) or in the middle of `engine.writeAudio()` when `destroy()` is called.
-
-### Timeline of the Crash
-
-```
-T=0ms    ViewModel: stopAudio() → sets running=false
-T=0ms    ViewModel: stopStatsPolling()
-T=0ms    ViewModel: engine.stopCall()    — Rust stops internal tasks
-T=1ms    ViewModel: engine.destroy()     — frees native memory
-         ↑ nativeHandle = 0L
-
-T=0-20ms Capture thread: still in recorder.read() or writeAudio()
-         → if in writeAudio(), the nativeHandle check passed BEFORE destroy()
-         → JNI dereferences freed pointer → SIGSEGV
-```
-
-## Affected Code
-
-### Files with the race
-
-| File | Line(s) | Issue |
-|------|---------|-------|
-| `android/.../WzpEngine.kt` | 107-108, 116-117 | TOCTOU on `nativeHandle` in `writeAudio()` / `readAudio()` |
-| `android/.../CallViewModel.kt` | 257-262 | `stopAudio()` + `destroy()` without waiting for audio threads to quiesce |
-| `android/.../AudioPipeline.kt` | 80-82 | `stop()` doesn't synchronize with running threads |
-
-### Files with the thread parking workaround
-
-| File | Line(s) | Context |
-|------|---------|---------|
-| `android/.../AudioPipeline.kt` | 57-58, 69-70 | Threads parked after loop exit to avoid libcrypto TLS crash |
-| `android/.../AudioPipeline.kt` | 96-101 | `parkThread()` — `Thread.sleep(Long.MAX_VALUE)` |
-
-## Constraints for the Fix
-
-1. **Cannot join audio threads** — joining triggers a separate SIGSEGV in `OPENSSL_free` when the thread's TLS destructors fire (documented in `AudioPipeline.kt` comments). The parking workaround must be preserved.
-
-2. **Must guarantee no JNI calls after `destroy()`** — the native handle is a raw pointer; any dereference after free is undefined behavior.
-
-3. **Must not add blocking waits on the UI thread** — `teardown()` runs on the ViewModel thread which must remain responsive.
-
-4. **The `@Volatile running` flag is necessary but not sufficient** — it prevents new loop iterations but doesn't help with in-flight JNI calls.
-
-5. **Both `writeAudio` and `readAudio` have the same race** — the fix must cover both the capture and playout paths.
-
-## Reproduction
-
-The crash is timing-dependent. It's most likely to occur when:
-- The capture thread is in the middle of a `writeAudio()` JNI call when `destroy()` is called
-- More likely on slower devices or under CPU pressure (GC, thermal throttling)
-- Can happen on every hangup, but only crashes ~10-30% of the time due to the timing window
-
-## Analysis of Possible Fix Approaches
-
-### Approach A: Add a synchronization gate in the JNI bridge
-
-Use a `ReentrantReadWriteLock` or `AtomicBoolean` in `WzpEngine.kt`:
-- Audio threads acquire a read lock / check the flag before JNI calls
-- `destroy()` acquires a write lock / sets the flag and waits for in-flight calls to drain
-
-**Pro:** Clean, solves the race directly.
-**Con:** Adding a lock to the audio hot path (every 20ms). `ReentrantReadWriteLock` is not lock-free. However, the read-lock path is uncontended 99.99% of the time (write-lock only during destroy), so contention is negligible.
-
-### Approach B: Defer `destroy()` until audio threads have stopped
-
-Instead of calling `destroy()` in `teardown()`, set a flag and have the audio threads call `destroy()` after they exit the loop (before parking).
-
-**Pro:** No locks on hot path.
-**Con:** Complex lifecycle — which thread calls destroy? What if both threads race to destroy? Need a `CountDownLatch` or similar.
-
-### Approach C: Make the JNI handle atomically invalidated
-
-Use `AtomicLong` for `nativeHandle` and use `compareAndExchange` in `destroy()` + `getAndCheck` pattern in audio calls.
-
-**Pro:** Lock-free.
-**Con:** Still has a TOCTOU window — the thread can load the handle, then it gets CAS'd to 0, then the thread uses the stale handle. Doesn't fully solve the race without combining with a reference count or epoch.
-
-### Approach D: Introduce a destroy latch
-
-Add a `CountDownLatch(1)` that audio threads wait on before parking. `teardown()` sets `running=false`, then `await`s the latch (with timeout), then calls `destroy()`. Each audio thread counts down the latch after exiting the loop.
-
-Actually this needs a `CountDownLatch(2)` — one for each thread (capture + playout).
-
-**Pro:** Guarantees no in-flight JNI calls at destroy time. No locks on hot path.
-**Con:** `teardown()` blocks for up to one frame duration (~20ms) waiting for threads to exit their loops. Acceptable for a hangup path.
-
-### Recommendation
-
-**Approach D (destroy latch)** is the cleanest. The 20ms worst-case wait is imperceptible on the hangup path, and it provides a hard guarantee that no JNI calls are in flight when `destroy()` runs. Combined with the existing `running` volatile flag, the audio threads exit their loops within one frame and count down the latch.
-
-If the latch times out (e.g., AudioRecord.read() is stuck), `destroy()` proceeds anyway — the `panic::catch_unwind` in the JNI bridge will catch the invalid access as a panic rather than a SIGSEGV (though this is best-effort; a true SIGSEGV from freed memory is not catchable).
-
-## Data Files
-
-The crash was captured from the Nothing A059 device at 13:05:42 on 2026-04-06. The tombstone is in the device's `/data/tombstones/` directory. The logcat output shows the crash frames.

desktop/index.html

@@ -2,10 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <meta
-      name="viewport"
-      content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, viewport-fit=cover"
-    />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>WarzonePhone</title>
     <link rel="stylesheet" href="/src/style.css" />
   </head>
@@ -24,7 +21,7 @@
             </button>
           </label>
           <label>Room
-            <input id="room" type="text" value="general" />
+            <input id="room" type="text" value="android" />
           </label>
           <label>Alias
             <input id="alias" type="text" placeholder="your name" />
@@ -36,57 +33,7 @@
             </label>
             <button id="settings-btn-home" class="icon-btn" title="Settings (Cmd+,)">&#9881;</button>
           </div>
-          <!-- Mode toggle -->
-          <div class="mode-toggle" style="display:flex;gap:8px;margin-bottom:8px;">
-            <button id="mode-room" class="mode-btn active" style="flex:1">Room</button>
-            <button id="mode-direct" class="mode-btn" style="flex:1">Direct Call</button>
-          </div>
-
-          <!-- Room mode (default) -->
-          <div id="room-mode">
           <button id="connect-btn" class="primary">Connect</button>
-          </div>
-
-          <!-- Direct call mode -->
-          <div id="direct-mode" class="hidden">
-            <button id="register-btn" class="primary" style="background:#2196F3">Register on Relay</button>
-            <div id="direct-registered" class="hidden" style="margin-top:12px">
-              <div class="direct-registered-header">
-                <p style="color:var(--green);font-size:13px;margin:0">&#x2705; Registered — waiting for calls</p>
-                <button id="deregister-btn" class="secondary-btn small">Deregister</button>
-              </div>
-              <div id="incoming-call-panel" class="hidden" style="background:#1B5E20;padding:12px;border-radius:8px;margin:8px 0">
-                <p style="font-weight:bold;margin:0 0 4px 0">Incoming Call</p>
-                <p id="incoming-caller" style="font-size:12px;opacity:0.8;margin:0 0 8px 0">From: unknown</p>
-                <div style="display:flex;gap:8px">
-                  <button id="accept-call-btn" style="flex:1;background:var(--green);color:white;border:none;padding:8px;border-radius:6px;cursor:pointer">Accept</button>
-                  <button id="reject-call-btn" style="flex:1;background:var(--red);color:white;border:none;padding:8px;border-radius:6px;cursor:pointer">Reject</button>
-                </div>
-              </div>
-
-              <!-- Recent contacts -->
-              <div id="recent-contacts-section" class="hidden">
-                <div class="history-header">Recent contacts</div>
-                <div id="recent-contacts-list" class="history-list"></div>
-              </div>
-
-              <!-- Call history -->
-              <div id="call-history-section" class="hidden">
-                <div class="history-header">
-                  History
-                  <button id="clear-history-btn" class="link-btn">clear</button>
-                </div>
-                <div id="call-history-list" class="history-list"></div>
-              </div>
-
-              <label style="margin-top:8px">Call by fingerprint
-                <input id="target-fp" type="text" placeholder="xxxx:xxxx:xxxx:..." />
-              </label>
-              <button id="call-btn" class="primary" style="margin-top:8px">Call</button>
-              <p id="call-status-text" style="color:var(--yellow);font-size:13px;margin-top:4px"></p>
-            </div>
-          </div>
-
           <p id="connect-error" class="error"></p>
         </div>
         <div class="identity-info">
@@ -144,23 +91,6 @@
           </div>
           <div class="settings-section">
             <h3>Audio</h3>
-            <div class="quality-control">
-              <div class="quality-header">
-                <span class="setting-label">QUALITY</span>
-                <span id="s-quality-label" class="quality-label">Auto</span>
-              </div>
-              <input id="s-quality" type="range" min="0" max="7" step="1" value="3" class="quality-slider" />
-              <div class="quality-ticks">
-                <span>64k</span>
-                <span>48k</span>
-                <span>32k</span>
-                <span>Auto</span>
-                <span>24k</span>
-                <span>6k</span>
-                <span>C2</span>
-                <span>1.2k</span>
-              </div>
-            </div>
             <label class="checkbox">
               <input id="s-os-aec" type="checkbox" />
               OS Echo Cancellation (macOS VoiceProcessingIO)
@@ -169,10 +99,6 @@
               <input id="s-agc" type="checkbox" checked />
               Automatic Gain Control
             </label>
-            <label class="checkbox">
-              <input id="s-dred-debug" type="checkbox" />
-              DRED debug logs (verbose, dev only)
-            </label>
           </div>
           <div class="settings-section">
             <h3>Identity</h3>
@@ -185,18 +111,6 @@
               <span class="fp-display">~/.wzp/identity</span>
             </div>
           </div>
-          <div class="settings-section">
-            <h3>Network</h3>
-            <div class="setting-row">
-              <span class="setting-label">Public address</span>
-              <span id="s-reflected-addr" class="fp-display">(not queried)</span>
-              <button id="s-reflect-btn" class="secondary-btn">Detect</button>
-            </div>
-            <small style="color:var(--text-dim);display:block;margin-top:4px">
-              Asks the registered relay to echo back the IP:port it sees for this
-              connection (QUIC-native NAT reflection, replaces STUN).
-            </small>
-          </div>
           <div class="settings-section">
             <h3>Recent Rooms</h3>
             <div id="s-recent-rooms" class="recent-rooms-list"></div>
@@ -223,28 +137,6 @@
           </div>
         </div>
       </div>
-      <!-- Key changed warning dialog -->
-      <div id="key-warning" class="hidden">
-        <div class="settings-card key-warning-card">
-          <div class="key-warning-icon">&#9888;</div>
-          <h2>Server Key Changed</h2>
-          <p class="key-warning-text">The relay's identity has changed since you last connected. This usually happens when the server was restarted, but could also indicate a security issue.</p>
-          <div class="key-warning-fps">
-            <div class="key-fp-row">
-              <span class="key-fp-label">Previously known</span>
-              <code id="kw-old-fp" class="key-fp"></code>
-            </div>
-            <div class="key-fp-row">
-              <span class="key-fp-label">New key</span>
-              <code id="kw-new-fp" class="key-fp"></code>
-            </div>
-          </div>
-          <div class="key-warning-actions">
-            <button id="kw-accept" class="primary">Accept New Key</button>
-            <button id="kw-cancel" class="secondary-btn">Cancel</button>
-          </div>
-        </div>
-      </div>
     </div>
     <script type="module" src="/src/main.ts"></script>
   </body>

desktop/src-tauri/Cargo.toml

@@ -5,33 +5,8 @@ edition = "2024"
 description = "WarzonePhone Desktop — encrypted VoIP client"
 default-run = "wzp-desktop"
 
-# Library target — required for Tauri mobile (Android/iOS link the app as a cdylib)
-# and also used by the desktop binary below.
-#
-# `staticlib` was DROPPED from crate-type because rust-lang/rust#104707
-# documents that having staticlib alongside cdylib leaks non-exported
-# symbols from staticlibs into the cdylib. Bionic's private `__init_tcb`
-# / `pthread_create` symbols end up bound LOCALLY inside our .so instead
-# of resolved dynamically against libc.so at dlopen time — which crashes
-# at launch as soon as tao tries to std::thread::spawn() from the JNI
-# onCreate callback. The legacy wzp-android crate uses ["cdylib", "rlib"]
-# and runs fine on the same phone with the same NDK + Rust toolchain.
-#
-# iOS Tauri builds that actually need staticlib can re-add it behind a
-# target cfg if we ever ship on iOS.
-[lib]
-name = "wzp_desktop_lib"
-crate-type = ["cdylib", "rlib"]
-
-[[bin]]
-name = "wzp-desktop"
-path = "src/main.rs"
-
 [build-dependencies]
 tauri-build = { version = "2", features = [] }
-# cc is no longer needed — all C++ moved to crates/wzp-native (built with
-# cargo-ndk and loaded via libloading at runtime). wzp-desktop's .so on
-# Android is now pure Rust.
 
 [dependencies]
 tauri = { version = "2", features = [] }
@@ -44,64 +19,18 @@ tracing-subscriber = "0.3"
 anyhow = "1"
 rustls = { version = "0.23", default-features = false, features = ["ring", "std"] }
 
-# WarzonePhone crates — protocol layer is platform-independent
+# WarzonePhone crates
 wzp-proto = { path = "../../crates/wzp-proto" }
 wzp-codec = { path = "../../crates/wzp-codec" }
 wzp-fec = { path = "../../crates/wzp-fec" }
 wzp-crypto = { path = "../../crates/wzp-crypto" }
 wzp-transport = { path = "../../crates/wzp-transport" }
-
-# wzp-client pulls in CPAL on every desktop target and, additionally on
-# macOS, VoiceProcessingIO (coreaudio-rs behind the "vpio" feature). The
-# vpio feature MUST NOT be enabled on Windows / Linux because coreaudio-rs
-# is Apple-framework-only and will fail to build. Task #24 will add a
-# matching Windows Voice Capture DSP path behind its own feature; until
-# then, Windows desktops use plain CPAL with AEC disabled.
-
-# macOS: CPAL + VoiceProcessingIO (hardware AEC via Core Audio).
-[target.'cfg(target_os = "macos")'.dependencies]
 wzp-client = { path = "../../crates/wzp-client", features = ["audio", "vpio"] }
 
-# Windows: CPAL for playback + direct WASAPI for capture with OS-level
-# AEC (AudioCategory_Communications). The wzp-client `windows-aec`
-# feature swaps the default CPAL AudioCapture for a WASAPI one that
-# opens the mic under AudioCategory_Communications, turning on Windows's
-# communications audio processing chain (AEC, NS, AGC). The reference
-# signal for AEC is the system render mix, so echo from our CPAL
-# playback is cancelled automatically without extra plumbing.
-[target.'cfg(target_os = "windows")'.dependencies]
-wzp-client = { path = "../../crates/wzp-client", features = ["audio", "windows-aec"] }
-
-# Linux: CPAL playback+capture baseline. AEC is enabled via the top-level
-# `linux-aec` feature in wzp-desktop, which forwards to wzp-client/linux-aec.
-# Keeping it opt-in at the wzp-desktop level (rather than forcing it always
-# on here) lets `cargo tauri build` produce two variants from the same
-# source tree — a noAEC baseline and an AEC build — by toggling the feature
-# at build time: `cargo tauri build -- --features wzp-desktop/linux-aec`.
-[target.'cfg(target_os = "linux")'.dependencies]
-wzp-client = { path = "../../crates/wzp-client", features = ["audio"] }
-
-# Android: no CPAL, no vpio — audio goes through the standalone wzp-native
-# cdylib that we dlopen via libloading at runtime. See the wzp_native
-# module in src/.
-[target.'cfg(target_os = "android")'.dependencies]
-wzp-client = { path = "../../crates/wzp-client", default-features = false }
-# libloading: runtime dlopen of libwzp_native.so — the standalone cdylib
-# crate that owns all C++ (Oboe bridge). Keeps wzp-desktop's .so free of
-# any C/C++ static archives that would otherwise leak bionic's internal
-# pthread_create into our cdylib and trigger the __init_tcb crash.
-libloading = "0.8"
-# jni + ndk-context: called from android_audio.rs to invoke
-# AudioManager.setSpeakerphoneOn on the JVM side at runtime, so the
-# Oboe playout stream (opened with Usage::VoiceCommunication) can route
-# between earpiece and loud speaker without restarting.
-jni = "0.21"
-ndk-context = "0.1"
+# Platform-specific
+[target.'cfg(target_os = "macos")'.dependencies]
+coreaudio-rs = "0.11"
 
 [features]
 default = ["custom-protocol"]
 custom-protocol = ["tauri/custom-protocol"]
-# linux-aec: forwards to wzp-client/linux-aec so `cargo tauri build -- --features
-# wzp-desktop/linux-aec` enables the WebRTC AEC3 backend on Linux. No-op on
-# other targets because wzp-client/linux-aec is itself cfg(target_os = "linux").
-linux-aec = ["wzp-client/linux-aec"]

desktop/src-tauri/Info.plist

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <!--
-      Custom Info.plist keys merged into the bundled WarzonePhone.app by
-      tauri-bundler. The base Info.plist (CFBundleIdentifier, version,
-      etc.) is generated from tauri.conf.json — only put *additional*
-      keys here.
-
-      NSMicrophoneUsageDescription is required by macOS TCC for any
-      app that opens an audio input unit. Without this string the OS
-      silently denies CoreAudio capture (input callbacks return zeros)
-      and the app never appears in System Settings → Privacy &
-      Security → Microphone. This was the root cause of the desktop
-      mic regression where phones could not hear the desktop client.
-    -->
-    <key>NSMicrophoneUsageDescription</key>
-    <string>WarzonePhone needs microphone access to transmit your voice during calls.</string>
-</dict>
-</plist>

desktop/src-tauri/build.rs

@@ -1,26 +1,3 @@
-use std::process::Command;
-
 fn main() {
-    // Capture short git hash so the running app can prove which build it is.
-    // Falls back to "unknown" if git isn't available (e.g. when building from
-    // a tarball without a .git dir).
-    let git_hash = Command::new("git")
-        .args(["rev-parse", "--short", "HEAD"])
-        .output()
-        .ok()
-        .filter(|o| o.status.success())
-        .and_then(|o| String::from_utf8(o.stdout).ok())
-        .map(|s| s.trim().to_string())
-        .unwrap_or_else(|| "unknown".into());
-
-    println!("cargo:rustc-env=WZP_GIT_HASH={git_hash}");
-    println!("cargo:rerun-if-changed=../../.git/HEAD");
-    println!("cargo:rerun-if-changed=../../.git/refs/heads");
-
-    // No cc::Build of ANY kind on Android — all C++ lives in the standalone
-    // `wzp-native` crate which is built separately with cargo-ndk and loaded
-    // via libloading at runtime. See docs/incident-tauri-android-init-tcb.md
-    // for why this split exists.
-
     tauri_build::build()
 }

desktop/src-tauri/capabilities/default.json

@@ -1,26 +0,0 @@
-{
-  "$schema": "../gen/schemas/desktop-schema.json",
-  "identifier": "default",
-  "description": "Default capability — grants core APIs (events, path, window, app, clipboard) to the main window on every platform we ship to.",
-  "windows": ["main"],
-  "platforms": [
-    "linux",
-    "macOS",
-    "windows",
-    "android",
-    "iOS"
-  ],
-  "permissions": [
-    "core:default",
-    "core:event:default",
-    "core:event:allow-listen",
-    "core:event:allow-unlisten",
-    "core:event:allow-emit",
-    "core:event:allow-emit-to",
-    "core:path:default",
-    "core:window:default",
-    "core:app:default",
-    "core:webview:default",
-    "shell:default"
-  ]
-}

desktop/src-tauri/gen/android/app/src/main/AndroidManifest.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-feature android:name="android.hardware.microphone" android:required="true" />
-
-    <!-- AndroidTV support -->
-    <uses-feature android:name="android.software.leanback" android:required="false" />
-
-    <application
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/Theme.wzp_desktop"
-        android:usesCleartextTraffic="${usesCleartextTraffic}">
-        <activity
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
-            android:launchMode="singleTask"
-            android:label="@string/main_activity_title"
-            android:name=".MainActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-                <!-- AndroidTV support -->
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-        <provider
-          android:name="androidx.core.content.FileProvider"
-          android:authorities="${applicationId}.fileprovider"
-          android:exported="false"
-          android:grantUriPermissions="true">
-          <meta-data
-            android:name="android.support.FILE_PROVIDER_PATHS"
-            android:resource="@xml/file_paths" />
-        </provider>
-    </application>
-</manifest>

desktop/src-tauri/gen/android/app/src/main/java/com/wzp/desktop/MainActivity.kt

@@ -1,101 +0,0 @@
-package com.wzp.desktop
-
-import android.Manifest
-import android.content.Context
-import android.content.pm.PackageManager
-import android.media.AudioManager
-import android.os.Bundle
-import android.util.Log
-import androidx.activity.enableEdgeToEdge
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-
-class MainActivity : TauriActivity() {
-  companion object {
-    private const val TAG = "WzpMainActivity"
-    private const val AUDIO_PERMISSIONS_REQUEST = 4242
-    private val REQUIRED_AUDIO_PERMISSIONS = arrayOf(
-      Manifest.permission.RECORD_AUDIO,
-      Manifest.permission.MODIFY_AUDIO_SETTINGS
-    )
-  }
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    enableEdgeToEdge()
-    super.onCreate(savedInstanceState)
-
-    // Request RECORD_AUDIO early so Oboe (inside libwzp_native.so) can open
-    // the AAudio input stream without silently failing. The grant is
-    // persisted, so after the first launch the dialog no longer appears.
-    // MODIFY_AUDIO_SETTINGS is needed to switch AudioManager mode + speaker.
-    val needsRequest = REQUIRED_AUDIO_PERMISSIONS.any {
-      ContextCompat.checkSelfPermission(this, it) != PackageManager.PERMISSION_GRANTED
-    }
-    if (needsRequest) {
-      Log.i(TAG, "requesting audio permissions")
-      ActivityCompat.requestPermissions(this, REQUIRED_AUDIO_PERMISSIONS, AUDIO_PERMISSIONS_REQUEST)
-    } else {
-      Log.i(TAG, "audio permissions already granted")
-      configureAudioForCall()
-    }
-  }
-
-  override fun onRequestPermissionsResult(
-    requestCode: Int,
-    permissions: Array<String>,
-    grantResults: IntArray
-  ) {
-    super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-    if (requestCode == AUDIO_PERMISSIONS_REQUEST) {
-      val allGranted = grantResults.isNotEmpty() &&
-        grantResults.all { it == PackageManager.PERMISSION_GRANTED }
-      Log.i(TAG, "audio permissions result: allGranted=$allGranted grants=${grantResults.toList()}")
-      if (allGranted) {
-        configureAudioForCall()
-      }
-    }
-  }
-
-  /**
-   * Put the phone into VoIP call mode with handset (earpiece) as the
-   * default output. The Oboe playout stream is opened with
-   * Usage::VoiceCommunication which honours this routing, so:
-   *
-   *   MODE_IN_COMMUNICATION + speakerphoneOn=false  → earpiece (handset)
-   *   MODE_IN_COMMUNICATION + speakerphoneOn=true   → loudspeaker
-   *   MODE_IN_COMMUNICATION + bluetoothScoOn=true   → bluetooth headset
-   *
-   * The speaker/handset/BT toggle itself is wired up via the Tauri
-   * command `set_speakerphone(on)` in a follow-up build. For now the
-   * default is handset, matching the user's stated preference.
-   *
-   * STREAM_VOICE_CALL volume is cranked to max since the in-call volume
-   * slider is separate from media volume on most devices.
-   */
-  private fun configureAudioForCall() {
-    try {
-      val am = getSystemService(Context.AUDIO_SERVICE) as AudioManager
-      Log.i(TAG, "audio state before: mode=${am.mode} speaker=${am.isSpeakerphoneOn} " +
-        "voiceVol=${am.getStreamVolume(AudioManager.STREAM_VOICE_CALL)}/" +
-        "${am.getStreamMaxVolume(AudioManager.STREAM_VOICE_CALL)} " +
-        "musicVol=${am.getStreamVolume(AudioManager.STREAM_MUSIC)}/" +
-        "${am.getStreamMaxVolume(AudioManager.STREAM_MUSIC)}")
-
-      am.mode = AudioManager.MODE_IN_COMMUNICATION
-      am.isSpeakerphoneOn = false   // default: handset / earpiece
-
-      // Crank both voice-call and music volumes so nothing silent slips
-      // through regardless of which stream actually ends up driving.
-      val maxVoice = am.getStreamMaxVolume(AudioManager.STREAM_VOICE_CALL)
-      am.setStreamVolume(AudioManager.STREAM_VOICE_CALL, maxVoice, 0)
-      val maxMusic = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
-      am.setStreamVolume(AudioManager.STREAM_MUSIC, maxMusic, 0)
-
-      Log.i(TAG, "audio state after: mode=${am.mode} speaker=${am.isSpeakerphoneOn} " +
-        "voiceVol=${am.getStreamVolume(AudioManager.STREAM_VOICE_CALL)}/$maxVoice " +
-        "musicVol=${am.getStreamVolume(AudioManager.STREAM_MUSIC)}/$maxMusic")
-    } catch (e: Throwable) {
-      Log.e(TAG, "configureAudioForCall failed: ${e.message}", e)
-    }
-  }
-}

desktop/src-tauri/gen/schemas/capabilities.json

@@ -1 +1 @@
-{"default":{"identifier":"default","description":"Default capability — grants core APIs (events, path, window, app, clipboard) to the main window on every platform we ship to.","local":true,"windows":["main"],"permissions":["core:default","core:event:default","core:event:allow-listen","core:event:allow-unlisten","core:event:allow-emit","core:event:allow-emit-to","core:path:default","core:window:default","core:app:default","core:webview:default","shell:default"],"platforms":["linux","macOS","windows","android","iOS"]}}
+{}

desktop/src-tauri/src/android_audio.rs

@@ -1,98 +0,0 @@
-//! Runtime bridge to Android's `AudioManager` for in-call audio routing.
-//!
-//! We own a quinn+Oboe VoIP pipeline entirely from Rust, but routing the
-//! playout stream between earpiece / loudspeaker / Bluetooth headset has to
-//! happen at the JVM level because those toggles are AudioManager-only.
-//! This module uses the global JavaVM handle that `ndk_context` exposes
-//! (populated by Tauri's mobile runtime) + the `jni` crate to reach into
-//! the Android framework without needing a Tauri plugin.
-//!
-//! All callers must be inside an Android target (`#[cfg(target_os = "android")]`).
-
-#![cfg(target_os = "android")]
-
-use jni::objects::{JObject, JString, JValue};
-use jni::JavaVM;
-
-/// Grab the JavaVM + current Activity from the ndk_context that Tauri's
-/// mobile runtime sets up at process startup.
-fn jvm_and_activity() -> Result<(JavaVM, JObject<'static>), String> {
-    let ctx = ndk_context::android_context();
-    let vm_ptr = ctx.vm() as *mut jni::sys::JavaVM;
-    if vm_ptr.is_null() {
-        return Err("ndk_context: JavaVM pointer is null".into());
-    }
-    let vm = unsafe { JavaVM::from_raw(vm_ptr) }
-        .map_err(|e| format!("JavaVM::from_raw: {e}"))?;
-    let activity_ptr = ctx.context() as jni::sys::jobject;
-    if activity_ptr.is_null() {
-        return Err("ndk_context: activity pointer is null".into());
-    }
-    // SAFETY: ndk_context guarantees the pointer lives for the process
-    // lifetime; we wrap it as a JObject<'static> for convenience.
-    let activity: JObject<'static> = unsafe { JObject::from_raw(activity_ptr) };
-    Ok((vm, activity))
-}
-
-/// Get Android's `AudioManager` via `activity.getSystemService("audio")`.
-fn audio_manager<'local>(
-    env: &mut jni::AttachGuard<'local>,
-    activity: &JObject<'local>,
-) -> Result<JObject<'local>, String> {
-    let svc_name: JString<'local> = env
-        .new_string("audio")
-        .map_err(|e| format!("new_string(audio): {e}"))?;
-    let am = env
-        .call_method(
-            activity,
-            "getSystemService",
-            "(Ljava/lang/String;)Ljava/lang/Object;",
-            &[JValue::Object(&svc_name)],
-        )
-        .and_then(|v| v.l())
-        .map_err(|e| format!("getSystemService(audio): {e}"))?;
-    if am.is_null() {
-        return Err("getSystemService returned null".into());
-    }
-    Ok(am)
-}
-
-/// Switch between loud speaker (`true`) and earpiece/handset (`false`).
-///
-/// Calls `AudioManager.setSpeakerphoneOn(on)` on the JVM. Requires that
-/// the audio mode is already `MODE_IN_COMMUNICATION` — MainActivity.kt
-/// sets this at startup, so by the time a call is up this is always true.
-pub fn set_speakerphone(on: bool) -> Result<(), String> {
-    let (vm, activity) = jvm_and_activity()?;
-    let mut env = vm
-        .attach_current_thread()
-        .map_err(|e| format!("attach_current_thread: {e}"))?;
-    let am = audio_manager(&mut env, &activity)?;
-
-    env.call_method(
-        &am,
-        "setSpeakerphoneOn",
-        "(Z)V",
-        &[JValue::Bool(if on { 1 } else { 0 })],
-    )
-    .map_err(|e| format!("setSpeakerphoneOn({on}): {e}"))?;
-
-    tracing::info!(on, "AudioManager.setSpeakerphoneOn");
-    Ok(())
-}
-
-/// Query the current speakerphone state. Returns true if routing is on the
-/// loud speaker, false if on earpiece / BT headset / wired headset.
-pub fn is_speakerphone_on() -> Result<bool, String> {
-    let (vm, activity) = jvm_and_activity()?;
-    let mut env = vm
-        .attach_current_thread()
-        .map_err(|e| format!("attach_current_thread: {e}"))?;
-    let am = audio_manager(&mut env, &activity)?;
-
-    let on = env
-        .call_method(&am, "isSpeakerphoneOn", "()Z", &[])
-        .and_then(|v| v.z())
-        .map_err(|e| format!("isSpeakerphoneOn: {e}"))?;
-    Ok(on)
-}

desktop/src-tauri/src/history.rs

@@ -1,180 +0,0 @@
-//! Call history store.
-//!
-//! Keeps a rolling JSON file of the last N direct-call events so the UI can
-//! show "recent contacts" + "call history with callback buttons" on the
-//! direct-call screen. Storage lives in `<APP_DATA_DIR>/call_history.json`
-//! alongside the identity file. The file is read lazily on first access and
-//! cached in an RwLock behind a OnceLock.
-//!
-//! This is a v1 — no duration tracking yet, entries are logged at the
-//! moment the direction is decided (placed / received / missed).
-
-use std::path::PathBuf;
-use std::sync::{OnceLock, RwLock};
-use std::time::{SystemTime, UNIX_EPOCH};
-
-use serde::{Deserialize, Serialize};
-
-/// Maximum number of history entries we keep. Older ones are pruned FIFO.
-const MAX_ENTRIES: usize = 200;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-pub enum CallDirection {
-    /// Local user placed the call.
-    Placed,
-    /// Remote user called and local user answered.
-    Received,
-    /// Remote user called but local user did not answer (rejected or
-    /// missed entirely — the UI treats these identically).
-    Missed,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct CallHistoryEntry {
-    pub call_id: String,
-    pub peer_fp: String,
-    pub peer_alias: Option<String>,
-    pub direction: CallDirection,
-    /// Seconds since UNIX epoch, UTC.
-    pub timestamp_unix: u64,
-}
-
-// ─── In-process store (loaded from disk once) ─────────────────────────────
-
-static STORE: OnceLock<RwLock<Vec<CallHistoryEntry>>> = OnceLock::new();
-
-fn store() -> &'static RwLock<Vec<CallHistoryEntry>> {
-    STORE.get_or_init(|| RwLock::new(load_from_disk()))
-}
-
-fn history_path() -> PathBuf {
-    crate::APP_DATA_DIR
-        .get()
-        .cloned()
-        .unwrap_or_else(|| {
-            let home = std::env::var("HOME").unwrap_or_else(|_| ".".into());
-            PathBuf::from(home).join(".wzp")
-        })
-        .join("call_history.json")
-}
-
-fn load_from_disk() -> Vec<CallHistoryEntry> {
-    let path = history_path();
-    let Ok(bytes) = std::fs::read(&path) else {
-        return Vec::new();
-    };
-    serde_json::from_slice::<Vec<CallHistoryEntry>>(&bytes)
-        .inspect_err(|e| tracing::warn!(path = %path.display(), error = %e, "call_history.json parse failed"))
-        .unwrap_or_default()
-}
-
-fn save_to_disk(entries: &[CallHistoryEntry]) {
-    let path = history_path();
-    if let Some(parent) = path.parent() {
-        let _ = std::fs::create_dir_all(parent);
-    }
-    let Ok(json) = serde_json::to_vec_pretty(entries) else { return };
-    // Atomic write via temp file + rename so a crash mid-write doesn't
-    // leave us with a half-file on disk.
-    let tmp = path.with_extension("json.tmp");
-    if std::fs::write(&tmp, &json).is_ok() {
-        let _ = std::fs::rename(&tmp, &path);
-    }
-}
-
-fn now_unix() -> u64 {
-    SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .map(|d| d.as_secs())
-        .unwrap_or(0)
-}
-
-// ─── Public API ───────────────────────────────────────────────────────────
-
-/// Append a new entry to the store and persist to disk. Trims the store to
-/// `MAX_ENTRIES` after insertion.
-pub fn log(
-    call_id: String,
-    peer_fp: String,
-    peer_alias: Option<String>,
-    direction: CallDirection,
-) {
-    tracing::info!(
-        %call_id, %peer_fp, ?direction,
-        alias = ?peer_alias,
-        "history::log"
-    );
-    let entry = CallHistoryEntry {
-        call_id: call_id.clone(),
-        peer_fp,
-        peer_alias,
-        direction,
-        timestamp_unix: now_unix(),
-    };
-    let mut guard = store().write().unwrap();
-    // If an entry for this call_id already exists, update it in-place
-    // rather than appending a duplicate. Protects against the caller
-    // side adding a second Missed row when the callee's DirectCallOffer
-    // bounces back through federation / loopback, or when some future
-    // relay routing edge case double-emits a signal. The dedup keeps
-    // history tidy and matches what the user intuitively expects (one
-    // history row per call, not one per signal event).
-    if let Some(existing) = guard.iter_mut().rev().find(|e| e.call_id == call_id) {
-        tracing::info!(%call_id, from = ?existing.direction, to = ?direction, "history::log replacing existing entry");
-        existing.direction = direction;
-        existing.timestamp_unix = entry.timestamp_unix;
-        save_to_disk(&guard);
-        return;
-    }
-    guard.push(entry);
-    if guard.len() > MAX_ENTRIES {
-        let drop_n = guard.len() - MAX_ENTRIES;
-        guard.drain(0..drop_n);
-    }
-    save_to_disk(&guard);
-}
-
-/// Return a copy of all entries in reverse-chronological order
-/// (most recent first).
-pub fn all() -> Vec<CallHistoryEntry> {
-    let guard = store().read().unwrap();
-    guard.iter().rev().cloned().collect()
-}
-
-/// Unique peer contacts sorted by most recent interaction. Each contact
-/// is represented by the newest history entry for that fingerprint.
-pub fn contacts() -> Vec<CallHistoryEntry> {
-    let guard = store().read().unwrap();
-    let mut seen: std::collections::HashSet<String> = std::collections::HashSet::new();
-    let mut out = Vec::new();
-    // iterate newest → oldest
-    for entry in guard.iter().rev() {
-        if seen.insert(entry.peer_fp.clone()) {
-            out.push(entry.clone());
-        }
-    }
-    out
-}
-
-/// Clear the entire history and persist the empty file.
-pub fn clear() {
-    let mut guard = store().write().unwrap();
-    guard.clear();
-    save_to_disk(&guard);
-}
-
-/// Find a Missed-candidate entry that matches `call_id` and hasn't been
-/// answered yet. Used by the signal loop to turn "pending incoming" into
-/// "Received" when the user accepts.
-pub fn mark_received_if_pending(call_id: &str) -> bool {
-    let mut guard = store().write().unwrap();
-    for entry in guard.iter_mut().rev() {
-        if entry.call_id == call_id && entry.direction == CallDirection::Missed {
-            entry.direction = CallDirection::Received;
-            save_to_disk(&guard);
-            return true;
-        }
-    }
-    false
-}

desktop/src-tauri/src/lib.rs

@@ -1,823 +0,0 @@
-// WarzonePhone Tauri backend — shared between desktop (macOS/Windows/Linux)
-// and Tauri mobile (Android/iOS). Platform-specific audio is cfg-gated.
-
-#![cfg_attr(
-    all(not(debug_assertions), target_os = "windows"),
-    windows_subsystem = "windows"
-)]
-
-// Call engine — now compiled on every platform. On desktop it runs the real
-// CPAL/VPIO audio pipeline; on Android the engine calls into the standalone
-// wzp-native cdylib (via the wzp_native module) for Oboe-backed audio.
-mod engine;
-
-// Android runtime binding to libwzp_native.so (Oboe audio backend, built as
-// a standalone cdylib with cargo-ndk to avoid the Tauri staticlib symbol
-// leak — see docs/incident-tauri-android-init-tcb.md).
-#[cfg(target_os = "android")]
-mod wzp_native;
-
-// Android AudioManager bridge (routing earpiece / speaker / BT).
-#[cfg(target_os = "android")]
-mod android_audio;
-
-// Direct-call history store (persisted JSON in app data dir).
-mod history;
-
-// CallEngine has a unified impl on both targets now — the Android branch of
-// CallEngine::start() routes audio through the standalone wzp-native cdylib
-// (loaded via the wzp_native module below), the desktop branch uses CPAL.
-use engine::CallEngine;
-
-use serde::Serialize;
-use std::path::PathBuf;
-use std::sync::{Arc, OnceLock};
-use tauri::{Emitter, Manager};
-use tokio::sync::Mutex;
-use wzp_proto::MediaTransport;
-
-/// Short git hash captured at compile time by build.rs.
-const GIT_HASH: &str = env!("WZP_GIT_HASH");
-
-/// Resolved by `setup()` once we have a Tauri AppHandle. Holds the
-/// platform-correct app data dir (e.g. `/data/data/com.wzp.desktop/files` on
-/// Android, `~/Library/Application Support/com.wzp.desktop` on macOS).
-static APP_DATA_DIR: OnceLock<PathBuf> = OnceLock::new();
-
-/// Adjective list — keep in sync with the noun list below. Both are powers of
-/// 2 friendly so the modulo bias is negligible.
-const ALIAS_ADJECTIVES: &[&str] = &[
-    "Swift", "Silent", "Brave", "Calm", "Dark", "Fierce", "Ghost",
-    "Iron", "Lucky", "Noble", "Quick", "Sharp", "Storm", "Wild",
-    "Cold", "Bright", "Lone", "Red", "Grey", "Frosty", "Dusty",
-    "Rusty", "Neon", "Void", "Solar", "Lunar", "Cyber", "Pixel",
-    "Sonic", "Hyper", "Turbo", "Nano", "Mega", "Ultra", "Zinc",
-];
-const ALIAS_NOUNS: &[&str] = &[
-    "Wolf", "Hawk", "Fox", "Bear", "Lynx", "Crow", "Viper",
-    "Cobra", "Tiger", "Eagle", "Shark", "Raven", "Falcon", "Otter",
-    "Mantis", "Panda", "Jackal", "Badger", "Heron", "Bison",
-    "Condor", "Coyote", "Gecko", "Hornet", "Marten", "Osprey",
-    "Parrot", "Puma", "Raptor", "Stork", "Toucan", "Walrus",
-];
-
-/// Derive a stable human-readable alias from the seed bytes. Same seed →
-/// same alias forever, different seeds → effectively random aliases.
-fn derive_alias(seed: &wzp_crypto::Seed) -> String {
-    let adj_idx = (u16::from_le_bytes([seed.0[0], seed.0[1]]) as usize) % ALIAS_ADJECTIVES.len();
-    let noun_idx = (u16::from_le_bytes([seed.0[2], seed.0[3]]) as usize) % ALIAS_NOUNS.len();
-    format!("{} {}", ALIAS_ADJECTIVES[adj_idx], ALIAS_NOUNS[noun_idx])
-}
-
-#[derive(Clone, Serialize)]
-struct CallEvent {
-    kind: String,
-    message: String,
-}
-
-#[derive(Clone, Serialize)]
-struct Participant {
-    fingerprint: String,
-    alias: Option<String>,
-    relay_label: Option<String>,
-}
-
-#[derive(Clone, Serialize)]
-struct CallStatus {
-    active: bool,
-    mic_muted: bool,
-    spk_muted: bool,
-    participants: Vec<Participant>,
-    encode_fps: u64,
-    recv_fps: u64,
-    audio_level: u32,
-    call_duration_secs: f64,
-    fingerprint: String,
-    tx_codec: String,
-    rx_codec: String,
-}
-
-struct AppState {
-    engine: Mutex<Option<CallEngine>>,
-    signal: Arc<Mutex<SignalState>>,
-}
-
-/// Ping result with RTT and server identity hash.
-#[derive(Clone, Serialize)]
-struct PingResult {
-    rtt_ms: u32,
-    /// Server identity: SHA-256 of the QUIC peer certificate, hex-encoded.
-    server_fingerprint: String,
-}
-
-/// Toggle DRED verbose logging at runtime (gates the chatty per-frame
-/// reconstruction + parse logs in opus_enc and engine.rs). Wired to the
-/// "DRED debug logs" checkbox in the GUI settings panel.
-#[tauri::command]
-fn set_dred_verbose_logs(enabled: bool) {
-    wzp_codec::set_dred_verbose_logs(enabled);
-    tracing::info!(enabled, "DRED verbose logs toggled");
-}
-
-/// Read the current DRED verbose logging flag (so the GUI can hydrate
-/// its checkbox on startup without trusting localStorage alone).
-#[tauri::command]
-fn get_dred_verbose_logs() -> bool {
-    wzp_codec::dred_verbose_logs()
-}
-
-/// Ping a relay to check if it's online, measure RTT, and get server identity.
-#[tauri::command]
-async fn ping_relay(relay: String) -> Result<PingResult, String> {
-    let addr: std::net::SocketAddr = relay.parse().map_err(|e| format!("bad address: {e}"))?;
-    let _ = rustls::crypto::ring::default_provider().install_default();
-    let bind: std::net::SocketAddr = "0.0.0.0:0".parse().unwrap();
-    let endpoint = wzp_transport::create_endpoint(bind, None).map_err(|e| format!("{e}"))?;
-    let client_cfg = wzp_transport::client_config();
-
-    let start = std::time::Instant::now();
-    let conn_result = tokio::time::timeout(
-        std::time::Duration::from_secs(3),
-        wzp_transport::connect(&endpoint, addr, "ping", client_cfg),
-    )
-    .await;
-
-    // Always close endpoint to prevent resource leaks
-    endpoint.close(0u32.into(), b"done");
-
-    match conn_result {
-        Ok(Ok(conn)) => {
-            let rtt_ms = start.elapsed().as_millis() as u32;
-
-            let server_fingerprint = conn
-                .peer_identity()
-                .and_then(|id| id.downcast::<Vec<rustls::pki_types::CertificateDer>>().ok())
-                .and_then(|certs| certs.first().map(|c| {
-                    use std::hash::{Hash, Hasher};
-                    let mut hasher = std::collections::hash_map::DefaultHasher::new();
-                    c.as_ref().hash(&mut hasher);
-                    let h = hasher.finish();
-                    format!("{h:016x}")
-                }))
-                .unwrap_or_else(|| {
-                    format!("{:x}", addr.ip().to_string().len() as u64 * 0x9e3779b97f4a7c15 + addr.port() as u64)
-                });
-
-            conn.close(0u32.into(), b"ping");
-            Ok(PingResult { rtt_ms, server_fingerprint })
-        }
-        Ok(Err(e)) => Err(format!("{e}")),
-        Err(_) => Err("timeout (3s)".into()),
-    }
-}
-
-/// Return the directory where identity/config should live.
-///
-/// Resolved at startup from Tauri's `path().app_data_dir()` API which gives
-/// us the platform-correct app-private location:
-///   - Android: `/data/data/<package_id>/files/com.wzp.desktop`
-///   - macOS:   `~/Library/Application Support/com.wzp.desktop`
-///   - Linux:   `~/.local/share/com.wzp.desktop`
-///
-/// Falls back to `$HOME/.wzp` on the desktop side if the OnceLock hasn't been
-/// initialised yet (shouldn't happen in normal startup, but keeps the fn
-/// total).
-fn identity_dir() -> PathBuf {
-    if let Some(dir) = APP_DATA_DIR.get() {
-        return dir.clone();
-    }
-    #[cfg(target_os = "android")]
-    {
-        // Last-resort default. The real path is set in setup() below.
-        std::path::PathBuf::from("/data/data/com.wzp.desktop/files")
-    }
-    #[cfg(not(target_os = "android"))]
-    {
-        let home = std::env::var("HOME").unwrap_or_else(|_| ".".into());
-        std::path::PathBuf::from(home).join(".wzp")
-    }
-}
-
-fn identity_path() -> std::path::PathBuf {
-    identity_dir().join("identity")
-}
-
-/// Load the persisted seed, or generate-and-persist a new one if missing.
-fn load_or_create_seed() -> Result<wzp_crypto::Seed, String> {
-    let path = identity_path();
-    if path.exists() {
-        let hex = std::fs::read_to_string(&path).map_err(|e| format!("read identity: {e}"))?;
-        return wzp_crypto::Seed::from_hex(hex.trim()).map_err(|e| format!("{e}"));
-    }
-    let seed = wzp_crypto::Seed::generate();
-    if let Some(parent) = path.parent() {
-        std::fs::create_dir_all(parent).map_err(|e| format!("create identity dir: {e}"))?;
-    }
-    let hex: String = seed.0.iter().map(|b| format!("{b:02x}")).collect();
-    std::fs::write(&path, hex).map_err(|e| format!("write identity: {e}"))?;
-    Ok(seed)
-}
-
-/// Read fingerprint, generating a fresh identity if none exists yet.
-#[tauri::command]
-fn get_identity() -> Result<String, String> {
-    let seed = load_or_create_seed()?;
-    Ok(seed.derive_identity().public_identity().fingerprint.to_string())
-}
-
-/// Build/identity info shown on the home screen so the user can prove which
-/// build is installed and what their stable alias is.
-#[derive(Clone, Serialize)]
-struct AppInfo {
-    /// Short git commit hash captured at build time.
-    git_hash: &'static str,
-    /// Stable adjective+noun derived from the seed.
-    alias: String,
-    /// Full fingerprint, e.g. "abcd:ef01:..."
-    fingerprint: String,
-    /// App data dir actually in use — useful for debugging EACCES issues.
-    data_dir: String,
-}
-
-#[tauri::command]
-fn get_app_info() -> Result<AppInfo, String> {
-    let seed = load_or_create_seed()?;
-    let pub_id = seed.derive_identity().public_identity();
-    Ok(AppInfo {
-        git_hash: GIT_HASH,
-        alias: derive_alias(&seed),
-        fingerprint: pub_id.fingerprint.to_string(),
-        data_dir: identity_dir().to_string_lossy().into_owned(),
-    })
-}
-
-#[tauri::command]
-async fn connect(
-    state: tauri::State<'_, Arc<AppState>>,
-    app: tauri::AppHandle,
-    relay: String,
-    room: String,
-    alias: String,
-    os_aec: bool,
-    quality: String,
-) -> Result<String, String> {
-    let mut engine_lock = state.engine.lock().await;
-    if engine_lock.is_some() {
-        return Err("already connected".into());
-    }
-
-    // If we previously opened a quinn::Endpoint for the signaling connection
-    // (direct-call path), reuse it so the media connection shares the same
-    // UDP socket. This side-steps the Android issue where a second
-    // quinn::Endpoint silently hangs in the QUIC handshake.
-    let reuse_endpoint = state.signal.lock().await.endpoint.clone();
-    if reuse_endpoint.is_some() {
-        tracing::info!("connect: reusing existing signal endpoint for media connection");
-    }
-
-    let app_clone = app.clone();
-    match CallEngine::start(relay, room, alias, os_aec, quality, reuse_endpoint, move |event_kind, message| {
-        let _ = app_clone.emit(
-            "call-event",
-            CallEvent {
-                kind: event_kind.to_string(),
-                message: message.to_string(),
-            },
-        );
-    })
-    .await
-    {
-        Ok(eng) => {
-            *engine_lock = Some(eng);
-            Ok("connected".into())
-        }
-        Err(e) => Err(format!("{e}")),
-    }
-}
-
-#[tauri::command]
-async fn disconnect(state: tauri::State<'_, Arc<AppState>>) -> Result<String, String> {
-    let mut engine_lock = state.engine.lock().await;
-    if let Some(engine) = engine_lock.take() {
-        engine.stop().await;
-        Ok("disconnected".into())
-    } else {
-        Err("not connected".into())
-    }
-}
-
-#[tauri::command]
-async fn toggle_mic(state: tauri::State<'_, Arc<AppState>>) -> Result<bool, String> {
-    let engine_lock = state.engine.lock().await;
-    if let Some(ref engine) = *engine_lock {
-        Ok(engine.toggle_mic())
-    } else {
-        Err("not connected".into())
-    }
-}
-
-#[tauri::command]
-async fn toggle_speaker(state: tauri::State<'_, Arc<AppState>>) -> Result<bool, String> {
-    let engine_lock = state.engine.lock().await;
-    if let Some(ref engine) = *engine_lock {
-        Ok(engine.toggle_speaker())
-    } else {
-        Err("not connected".into())
-    }
-}
-
-#[tauri::command]
-async fn get_status(state: tauri::State<'_, Arc<AppState>>) -> Result<CallStatus, String> {
-    let engine_lock = state.engine.lock().await;
-    if let Some(ref engine) = *engine_lock {
-        let status = engine.status().await;
-        Ok(CallStatus {
-            active: true,
-            mic_muted: status.mic_muted,
-            spk_muted: status.spk_muted,
-            participants: status
-                .participants
-                .into_iter()
-                .map(|p| Participant {
-                    fingerprint: p.fingerprint,
-                    alias: p.alias,
-                    relay_label: p.relay_label,
-                })
-                .collect(),
-            encode_fps: status.frames_sent,
-            recv_fps: status.frames_received,
-            audio_level: status.audio_level,
-            call_duration_secs: status.call_duration_secs,
-            fingerprint: status.fingerprint,
-            tx_codec: status.tx_codec,
-            rx_codec: status.rx_codec,
-        })
-    } else {
-        Ok(CallStatus {
-            active: false,
-            mic_muted: false,
-            spk_muted: false,
-            participants: vec![],
-            encode_fps: 0,
-            recv_fps: 0,
-            audio_level: 0,
-            call_duration_secs: 0.0,
-            fingerprint: String::new(),
-            tx_codec: String::new(),
-            rx_codec: String::new(),
-        })
-    }
-}
-
-// ─── Audio routing (Android-specific, no-op on desktop) ─────────────────────
-
-/// Switch the call audio between earpiece (`on=false`) and loudspeaker
-/// (`on=true`). On Android this calls AudioManager.setSpeakerphoneOn via
-/// JNI AND then stops and restarts the Oboe streams so AAudio reconfigures
-/// with the new routing — without the restart, changing the speakerphone
-/// state mid-call silently tears down the running AAudio streams on some
-/// OEMs and both capture + playout stop producing data.
-///
-/// The Rust send/recv tokio tasks keep running during the ~60ms restart
-/// window; they just observe empty reads / writes against the
-/// process-global ring buffers, which is fine because the ring state
-/// is preserved across stop+start.
-#[tauri::command]
-#[allow(unused_variables)]
-async fn set_speakerphone(on: bool) -> Result<(), String> {
-    #[cfg(target_os = "android")]
-    {
-        android_audio::set_speakerphone(on)?;
-        if wzp_native::is_loaded() && wzp_native::audio_is_running() {
-            tracing::info!(on, "set_speakerphone: restarting Oboe for route change");
-            // Oboe's stop/start are sync C-FFI calls that block for ~400ms
-            // on Nothing-class devices (Pixel is faster). Calling them
-            // directly from an async Tauri command stalls the tokio
-            // executor — the send/recv engine tasks were observed to
-            // freeze for ~20 seconds across a few rapid speaker toggles,
-            // piling up buffered QUIC datagrams and then flooding them
-            // all at once when the runtime finally caught up.
-            //
-            // Fix: run the audio teardown + reopen on a dedicated
-            // blocking thread so the runtime keeps scheduling everything
-            // else. AAudio's requestStop returns only after the stream
-            // is actually in Stopped state, so no explicit inter-call
-            // sleep is needed.
-            tokio::task::spawn_blocking(|| {
-                wzp_native::audio_stop();
-                wzp_native::audio_start()
-                    .map_err(|code| format!("audio_start after speakerphone toggle: code {code}"))
-            })
-            .await
-            .map_err(|e| format!("spawn_blocking join: {e}"))??;
-            tracing::info!("set_speakerphone: Oboe restarted");
-        }
-        Ok(())
-    }
-    #[cfg(not(target_os = "android"))]
-    {
-        Ok(())
-    }
-}
-
-/// Query whether the call is currently routed to the loudspeaker.
-#[tauri::command]
-async fn is_speakerphone_on() -> Result<bool, String> {
-    #[cfg(target_os = "android")]
-    {
-        android_audio::is_speakerphone_on()
-    }
-    #[cfg(not(target_os = "android"))]
-    {
-        Ok(false)
-    }
-}
-
-// ─── Call history commands ───────────────────────────────────────────────────
-
-#[tauri::command]
-fn get_call_history() -> Vec<history::CallHistoryEntry> {
-    history::all()
-}
-
-#[tauri::command]
-fn get_recent_contacts() -> Vec<history::CallHistoryEntry> {
-    history::contacts()
-}
-
-#[tauri::command]
-fn clear_call_history() -> Result<(), String> {
-    history::clear();
-    Ok(())
-}
-
-// ─── Signaling commands — platform independent ───────────────────────────────
-
-struct SignalState {
-    transport: Option<Arc<wzp_transport::QuinnTransport>>,
-    /// The quinn::Endpoint backing the signal connection. Reused for the
-    /// media connection when a direct call is accepted — Android phones
-    /// silently drop packets from a second quinn::Endpoint to the same
-    /// relay, so every call after register_signal MUST share this socket.
-    endpoint: Option<wzp_transport::Endpoint>,
-    fingerprint: String,
-    signal_status: String,
-    incoming_call_id: Option<String>,
-    incoming_caller_fp: Option<String>,
-    incoming_caller_alias: Option<String>,
-    /// Pending `ReflectResponse` channel. When the `get_reflected_address`
-    /// Tauri command fires, it drops a `oneshot::Sender<SocketAddr>` here
-    /// before sending a `SignalMessage::Reflect`. The spawned recv loop
-    /// picks the response off the next bi-stream and fires the sender.
-    /// If another Reflect request comes in while one is pending, we
-    /// replace the sender — the old receiver sees a `Cancelled` error
-    /// and the caller retries.
-    pending_reflect: Option<tokio::sync::oneshot::Sender<std::net::SocketAddr>>,
-}
-
-#[tauri::command]
-async fn register_signal(
-    state: tauri::State<'_, Arc<AppState>>,
-    app: tauri::AppHandle,
-    relay: String,
-) -> Result<String, String> {
-    use wzp_proto::SignalMessage;
-
-    let addr: std::net::SocketAddr = relay.parse().map_err(|e| format!("bad address: {e}"))?;
-    let _ = rustls::crypto::ring::default_provider().install_default();
-
-    // Load or create seed automatically — no need to "connect to a room first"
-    let seed = load_or_create_seed()?;
-    let pub_id = seed.derive_identity().public_identity();
-    let fp = pub_id.fingerprint.to_string();
-    let identity_pub = *pub_id.signing.as_bytes();
-
-    let bind: std::net::SocketAddr = "0.0.0.0:0".parse().unwrap();
-    let endpoint = wzp_transport::create_endpoint(bind, None).map_err(|e| format!("{e}"))?;
-    let conn = wzp_transport::connect(&endpoint, addr, "_signal", wzp_transport::client_config())
-        .await.map_err(|e| format!("{e}"))?;
-    let transport = Arc::new(wzp_transport::QuinnTransport::new(conn));
-
-    transport.send_signal(&SignalMessage::RegisterPresence {
-        identity_pub, signature: vec![], alias: None,
-    }).await.map_err(|e| format!("{e}"))?;
-
-    match transport.recv_signal().await.map_err(|e| format!("{e}"))? {
-        Some(SignalMessage::RegisterPresenceAck { success: true, .. }) => {}
-        _ => return Err("registration failed".into()),
-    }
-
-    { let mut sig = state.signal.lock().await; sig.transport = Some(transport.clone()); sig.endpoint = Some(endpoint.clone()); sig.fingerprint = fp.clone(); sig.signal_status = "registered".into(); }
-
-    tracing::info!(%fp, "signal registered, spawning recv loop");
-    let signal_state = Arc::clone(&state.signal);
-    let app_clone = app.clone();
-    tokio::spawn(async move {
-        loop {
-            match transport.recv_signal().await {
-                Ok(Some(SignalMessage::CallRinging { call_id })) => {
-                    tracing::info!(%call_id, "signal: CallRinging");
-                    let mut sig = signal_state.lock().await; sig.signal_status = "ringing".into();
-                    let _ = app_clone.emit("signal-event", serde_json::json!({"type":"ringing","call_id":call_id}));
-                }
-                Ok(Some(SignalMessage::DirectCallOffer { caller_fingerprint, caller_alias, call_id, .. })) => {
-                    tracing::info!(%call_id, caller = %caller_fingerprint, "signal: DirectCallOffer");
-                    let mut sig = signal_state.lock().await; sig.signal_status = "incoming".into();
-                    sig.incoming_call_id = Some(call_id.clone()); sig.incoming_caller_fp = Some(caller_fingerprint.clone()); sig.incoming_caller_alias = caller_alias.clone();
-                    // Log as a Missed entry up-front. If the user accepts
-                    // the call, answer_call upgrades it to Received via
-                    // history::mark_received_if_pending(call_id). If they
-                    // reject or ignore, it stays Missed.
-                    history::log(
-                        call_id.clone(),
-                        caller_fingerprint.clone(),
-                        caller_alias.clone(),
-                        history::CallDirection::Missed,
-                    );
-                    let _ = app_clone.emit("signal-event", serde_json::json!({"type":"incoming","call_id":call_id,"caller_fp":caller_fingerprint,"caller_alias":caller_alias}));
-                    let _ = app_clone.emit("history-changed", ());
-                }
-                Ok(Some(SignalMessage::DirectCallAnswer { call_id, accept_mode, .. })) => {
-                    tracing::info!(%call_id, ?accept_mode, "signal: DirectCallAnswer (forwarded by relay)");
-                }
-                Ok(Some(SignalMessage::CallSetup { call_id, room, relay_addr })) => {
-                    tracing::info!(%call_id, %room, %relay_addr, "signal: CallSetup — emitting setup event to JS");
-                    let mut sig = signal_state.lock().await; sig.signal_status = "setup".into();
-                    let _ = app_clone.emit("signal-event", serde_json::json!({"type":"setup","call_id":call_id,"room":room,"relay_addr":relay_addr}));
-                }
-                Ok(Some(SignalMessage::Hangup { reason })) => {
-                    tracing::info!(?reason, "signal: Hangup");
-                    let mut sig = signal_state.lock().await; sig.signal_status = "registered".into(); sig.incoming_call_id = None;
-                    let _ = app_clone.emit("signal-event", serde_json::json!({"type":"hangup"}));
-                }
-                Ok(Some(SignalMessage::ReflectResponse { observed_addr })) => {
-                    // "STUN for QUIC" response — the relay told us our
-                    // own server-reflexive address. If a Tauri command
-                    // is currently awaiting this, fire the oneshot;
-                    // otherwise log and drop (unsolicited responses
-                    // from a confused relay shouldn't crash the loop).
-                    tracing::info!(%observed_addr, "signal: ReflectResponse");
-                    match observed_addr.parse::<std::net::SocketAddr>() {
-                        Ok(parsed) => {
-                            let mut sig = signal_state.lock().await;
-                            if let Some(tx) = sig.pending_reflect.take() {
-                                // `send` returns Err(addr) only if the
-                                // receiver was dropped (caller timed out
-                                // or canceled). Either way, nothing to
-                                // do — the value is gone.
-                                let _ = tx.send(parsed);
-                            } else {
-                                tracing::debug!(%observed_addr, "reflect: unsolicited response (no pending sender)");
-                            }
-                            let _ = app_clone.emit(
-                                "signal-event",
-                                serde_json::json!({"type":"reflect","observed_addr":observed_addr}),
-                            );
-                        }
-                        Err(e) => {
-                            tracing::warn!(%observed_addr, error = %e, "reflect: relay returned unparseable addr");
-                            // Treat unparseable response as a failed
-                            // request so the caller doesn't hang.
-                            let mut sig = signal_state.lock().await;
-                            let _ = sig.pending_reflect.take();
-                        }
-                    }
-                }
-                Ok(Some(other)) => {
-                    tracing::debug!(?other, "signal: unhandled message");
-                }
-                Ok(None) => {
-                    tracing::warn!("signal recv returned None — peer closed");
-                    break;
-                }
-                Err(e) => {
-                    tracing::warn!(error = %e, "signal recv error — breaking loop");
-                    break;
-                }
-            }
-        }
-        tracing::warn!("signal recv loop exited — signal_status=idle, transport dropped");
-        let mut sig = signal_state.lock().await; sig.signal_status = "idle".into(); sig.transport = None;
-    });
-    Ok(fp)
-}
-
-#[tauri::command]
-async fn place_call(
-    state: tauri::State<'_, Arc<AppState>>,
-    app: tauri::AppHandle,
-    target_fp: String,
-) -> Result<(), String> {
-    use wzp_proto::SignalMessage;
-    let sig = state.signal.lock().await;
-    let transport = sig.transport.as_ref().ok_or("not registered")?;
-    let call_id = format!("{:016x}", std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos());
-    tracing::info!(%call_id, %target_fp, "place_call: sending DirectCallOffer");
-    transport.send_signal(&SignalMessage::DirectCallOffer {
-        caller_fingerprint: sig.fingerprint.clone(), caller_alias: None, target_fingerprint: target_fp.clone(),
-        call_id: call_id.clone(), identity_pub: [0u8; 32], ephemeral_pub: [0u8; 32], signature: vec![],
-        supported_profiles: vec![wzp_proto::QualityProfile::GOOD],
-    }).await.map_err(|e| format!("{e}"))?;
-    history::log(call_id, target_fp, None, history::CallDirection::Placed);
-    let _ = app.emit("history-changed", ());
-    Ok(())
-}
-
-#[tauri::command]
-async fn answer_call(
-    state: tauri::State<'_, Arc<AppState>>,
-    app: tauri::AppHandle,
-    call_id: String,
-    mode: i32,
-) -> Result<(), String> {
-    use wzp_proto::SignalMessage;
-    let sig = state.signal.lock().await;
-    let transport = sig.transport.as_ref().ok_or_else(|| {
-        tracing::warn!("answer_call: not registered (no transport)");
-        "not registered".to_string()
-    })?;
-    let accept_mode = match mode { 0 => wzp_proto::CallAcceptMode::Reject, 1 => wzp_proto::CallAcceptMode::AcceptTrusted, _ => wzp_proto::CallAcceptMode::AcceptGeneric };
-    tracing::info!(%call_id, ?accept_mode, "answer_call: sending DirectCallAnswer");
-    transport.send_signal(&SignalMessage::DirectCallAnswer {
-        call_id: call_id.clone(), accept_mode, identity_pub: None, ephemeral_pub: None, signature: None,
-        chosen_profile: Some(wzp_proto::QualityProfile::GOOD),
-    }).await.map_err(|e| {
-        tracing::error!(%call_id, error = %e, "answer_call: send_signal failed");
-        format!("{e}")
-    })?;
-    tracing::info!(%call_id, "answer_call: DirectCallAnswer sent successfully");
-    // Upgrade the pending "Missed" entry to "Received" if the user
-    // accepted (mode != Reject). Mode 0 = Reject → leave as Missed.
-    if mode != 0 {
-        if history::mark_received_if_pending(&call_id) {
-            let _ = app.emit("history-changed", ());
-        }
-    }
-    Ok(())
-}
-
-/// "STUN for QUIC" — ask the relay what our own public address looks
-/// like from its side of the TLS-authenticated signal connection.
-///
-/// Wire flow:
-///   1. We install a `oneshot::Sender` in `SignalState.pending_reflect`
-///      (replacing any stale one — last request wins).
-///   2. We release the state lock and send `SignalMessage::Reflect`
-///      over the existing transport. The relay opens a fresh bi-stream
-///      on its side to respond, which the spawned recv loop picks up.
-///   3. The recv loop's `ReflectResponse` match arm takes the sender
-///      back out and fires it with the parsed `SocketAddr`.
-///   4. We await the receiver with a 1s timeout so a non-reflecting
-///      relay (pre-Phase-1 build) doesn't hang the UI forever.
-///
-/// Returns the addr as a string so it can cross the Tauri IPC
-/// boundary unchanged — JS-side can display it directly or parse it
-/// with `new URL(...)` / a regex if needed.
-#[tauri::command]
-async fn get_reflected_address(
-    state: tauri::State<'_, Arc<AppState>>,
-) -> Result<String, String> {
-    use wzp_proto::SignalMessage;
-    let (tx, rx) = tokio::sync::oneshot::channel::<std::net::SocketAddr>();
-    let transport = {
-        let mut sig = state.signal.lock().await;
-        // Drop any older pending sender — we don't support more than
-        // one in-flight Reflect per connection. A prior request whose
-        // receiver has timed out will be cleaned up here automatically.
-        sig.pending_reflect = Some(tx);
-        sig.transport
-            .as_ref()
-            .ok_or_else(|| "not registered".to_string())?
-            .clone()
-    };
-    if let Err(e) = transport.send_signal(&SignalMessage::Reflect).await {
-        // Clean up the pending sender so the next attempt doesn't see
-        // a stale channel. Re-acquire the lock inline since we already
-        // released it above to release `transport` back to the caller.
-        let mut sig = state.signal.lock().await;
-        sig.pending_reflect = None;
-        return Err(format!("send Reflect: {e}"));
-    }
-
-    // 1s is plenty for a same-datacenter relay (< 50ms RTT) and also
-    // the ceiling for "something's wrong, tell the user" — any older
-    // relay will never reply at all. 1100ms in the integration test.
-    match tokio::time::timeout(std::time::Duration::from_millis(1000), rx).await {
-        Ok(Ok(addr)) => Ok(addr.to_string()),
-        Ok(Err(_canceled)) => {
-            // The recv loop dropped the sender (relay returned
-            // unparseable addr, or loop exited mid-request).
-            Err("reflect channel canceled (signal loop exited or parse error)".into())
-        }
-        Err(_elapsed) => {
-            // Timeout — strip the pending sender so the next attempt
-            // starts clean. Old (pre-Phase-1) relays will land here.
-            let mut sig = state.signal.lock().await;
-            sig.pending_reflect = None;
-            Err("reflect timeout (relay may not support reflection)".into())
-        }
-    }
-}
-
-#[tauri::command]
-async fn get_signal_status(state: tauri::State<'_, Arc<AppState>>) -> Result<serde_json::Value, String> {
-    let sig = state.signal.lock().await;
-    Ok(serde_json::json!({"status":sig.signal_status,"fingerprint":sig.fingerprint,"incoming_call_id":sig.incoming_call_id,"incoming_caller_fp":sig.incoming_caller_fp}))
-}
-
-/// Tear down the signal connection so the user goes back to idle. Called
-/// when the user clicks "Deregister" on the direct-call screen. The
-/// spawned recv loop will break out naturally when the transport closes.
-#[tauri::command]
-async fn deregister(state: tauri::State<'_, Arc<AppState>>) -> Result<(), String> {
-    let mut sig = state.signal.lock().await;
-    if let Some(transport) = sig.transport.take() {
-        tracing::info!("deregister: closing signal transport");
-        transport.close().await.ok();
-    }
-    sig.endpoint = None;
-    sig.signal_status = "idle".into();
-    sig.incoming_call_id = None;
-    sig.incoming_caller_fp = None;
-    sig.incoming_caller_alias = None;
-    Ok(())
-}
-
-// ─── App entry point ─────────────────────────────────────────────────────────
-
-/// Shared Tauri app builder. Used by the desktop `main.rs` and the mobile
-/// entry point below.
-pub fn run() {
-    tracing_subscriber::fmt().init();
-
-    let state = Arc::new(AppState {
-        engine: Mutex::new(None),
-        signal: Arc::new(Mutex::new(SignalState {
-            transport: None, endpoint: None, fingerprint: String::new(), signal_status: "idle".into(),
-            incoming_call_id: None, incoming_caller_fp: None, incoming_caller_alias: None,
-            pending_reflect: None,
-        })),
-    });
-
-    tauri::Builder::default()
-        .plugin(tauri_plugin_shell::init())
-        .manage(state)
-        .setup(|app| {
-            // Resolve the platform-correct app data dir once at startup so
-            // every command can read/write the seed without juggling AppHandle.
-            let data_dir = app
-                .path()
-                .app_data_dir()
-                .map(|p| p.join(".wzp"))
-                .unwrap_or_else(|_| identity_dir());
-            // create_dir_all is a no-op if it already exists.
-            if let Err(e) = std::fs::create_dir_all(&data_dir) {
-                tracing::warn!("failed to create app data dir {data_dir:?}: {e}");
-            }
-            tracing::info!("app data dir: {data_dir:?}");
-            let _ = APP_DATA_DIR.set(data_dir);
-
-            // Load the standalone wzp-native cdylib (Oboe audio bridge) and
-            // cache its exported function pointers. The library handle is
-            // kept alive in a 'static OnceLock for the lifetime of the
-            // process, so CallEngine::start() can invoke its audio FFI
-            // from anywhere. See src/wzp_native.rs and the incident report
-            // in docs/incident-tauri-android-init-tcb.md.
-            #[cfg(target_os = "android")]
-            {
-                match wzp_native::init() {
-                    Ok(()) => {
-                        tracing::info!(
-                            "wzp-native loaded: version={} msg=\"{}\"",
-                            wzp_native::version(),
-                            wzp_native::hello()
-                        );
-                    }
-                    Err(e) => {
-                        tracing::warn!("wzp-native init failed: {e}");
-                    }
-                }
-            }
-
-            Ok(())
-        })
-        .invoke_handler(tauri::generate_handler![
-            ping_relay, get_identity, get_app_info,
-            connect, disconnect, toggle_mic, toggle_speaker, get_status,
-            register_signal, place_call, answer_call, get_signal_status,
-            get_reflected_address,
-            deregister,
-            set_speakerphone, is_speakerphone_on,
-            get_call_history, get_recent_contacts, clear_call_history,
-            set_dred_verbose_logs, get_dred_verbose_logs,
-        ])
-        .run(tauri::generate_context!())
-        .expect("error while running WarzonePhone");
-}
-
-/// Tauri mobile entry point (Android/iOS). On desktop this is a no-op —
-/// `main.rs` calls `run()` directly.
-#[cfg_attr(mobile, tauri::mobile_entry_point)]
-pub fn mobile_entry() {
-    run();
-}

desktop/src-tauri/src/main.rs

@@ -1,10 +1,241 @@
-// Desktop binary entry point. All logic lives in `lib.rs` so the same
-// code can be built as a cdylib for Android/iOS via `cargo tauri android build`.
-#![cfg_attr(
-    all(not(debug_assertions), target_os = "windows"),
-    windows_subsystem = "windows"
-)]
+#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
+
+mod engine;
+
+use engine::CallEngine;
+use serde::Serialize;
+use std::sync::Arc;
+use tauri::Emitter;
+use tokio::sync::Mutex;
+
+#[derive(Clone, Serialize)]
+struct CallEvent {
+    kind: String,
+    message: String,
+}
+
+#[derive(Clone, Serialize)]
+struct Participant {
+    fingerprint: String,
+    alias: Option<String>,
+}
+
+#[derive(Clone, Serialize)]
+struct CallStatus {
+    active: bool,
+    mic_muted: bool,
+    spk_muted: bool,
+    participants: Vec<Participant>,
+    encode_fps: u64,
+    recv_fps: u64,
+    audio_level: u32,
+    call_duration_secs: f64,
+    fingerprint: String,
+}
+
+struct AppState {
+    engine: Mutex<Option<CallEngine>>,
+}
+
+/// Ping result with RTT and server identity hash.
+#[derive(Clone, Serialize)]
+struct PingResult {
+    rtt_ms: u32,
+    /// Server identity: SHA-256 of the QUIC peer certificate, hex-encoded.
+    server_fingerprint: String,
+}
+
+/// Ping a relay to check if it's online, measure RTT, and get server identity.
+#[tauri::command]
+async fn ping_relay(relay: String) -> Result<PingResult, String> {
+    let addr: std::net::SocketAddr = relay.parse().map_err(|e| format!("bad address: {e}"))?;
+    let _ = rustls::crypto::ring::default_provider().install_default();
+    let bind: std::net::SocketAddr = "0.0.0.0:0".parse().unwrap();
+    let endpoint = wzp_transport::create_endpoint(bind, None).map_err(|e| format!("{e}"))?;
+    let client_cfg = wzp_transport::client_config();
+
+    let start = std::time::Instant::now();
+    let conn_result = tokio::time::timeout(
+        std::time::Duration::from_secs(3),
+        wzp_transport::connect(&endpoint, addr, "ping", client_cfg),
+    )
+    .await;
+
+    // Always close endpoint to prevent resource leaks
+    endpoint.close(0u32.into(), b"done");
+
+    match conn_result {
+        Ok(Ok(conn)) => {
+            let rtt_ms = start.elapsed().as_millis() as u32;
+
+            let server_fingerprint = conn
+                .peer_identity()
+                .and_then(|id| id.downcast::<Vec<rustls::pki_types::CertificateDer>>().ok())
+                .and_then(|certs| certs.first().map(|c| {
+                    use std::hash::{Hash, Hasher};
+                    let mut hasher = std::collections::hash_map::DefaultHasher::new();
+                    c.as_ref().hash(&mut hasher);
+                    let h = hasher.finish();
+                    format!("{h:016x}")
+                }))
+                .unwrap_or_else(|| {
+                    format!("{:x}", addr.ip().to_string().len() as u64 * 0x9e3779b97f4a7c15 + addr.port() as u64)
+                });
+
+            conn.close(0u32.into(), b"ping");
+            Ok(PingResult { rtt_ms, server_fingerprint })
+        }
+        Ok(Err(e)) => Err(format!("{e}")),
+        Err(_) => Err("timeout (3s)".into()),
+    }
+}
+
+/// Read fingerprint from ~/.wzp/identity without connecting.
+#[tauri::command]
+fn get_identity() -> Result<String, String> {
+    let home = std::env::var("HOME").unwrap_or_else(|_| ".".into());
+    let path = std::path::PathBuf::from(home).join(".wzp").join("identity");
+    if path.exists() {
+        if let Ok(hex) = std::fs::read_to_string(&path) {
+            if let Ok(seed) = wzp_crypto::Seed::from_hex(hex.trim()) {
+                let fp = seed.derive_identity().public_identity().fingerprint;
+                return Ok(fp.to_string());
+            }
+        }
+    }
+    // No identity yet — generate one so we can show the fingerprint
+    let seed = wzp_crypto::Seed::generate();
+    let fp = seed.derive_identity().public_identity().fingerprint;
+    if let Some(parent) = path.parent() {
+        std::fs::create_dir_all(parent).ok();
+    }
+    let hex: String = seed.0.iter().map(|b| format!("{b:02x}")).collect();
+    std::fs::write(&path, hex).ok();
+    Ok(fp.to_string())
+}
+
+#[tauri::command]
+async fn connect(
+    state: tauri::State<'_, Arc<AppState>>,
+    app: tauri::AppHandle,
+    relay: String,
+    room: String,
+    alias: String,
+    os_aec: bool,
+) -> Result<String, String> {
+    let mut engine_lock = state.engine.lock().await;
+    if engine_lock.is_some() {
+        return Err("already connected".into());
+    }
+
+    let app_clone = app.clone();
+    match CallEngine::start(relay, room, alias, os_aec, move |event_kind, message| {
+        let _ = app_clone.emit(
+            "call-event",
+            CallEvent {
+                kind: event_kind.to_string(),
+                message: message.to_string(),
+            },
+        );
+    })
+    .await
+    {
+        Ok(eng) => {
+            *engine_lock = Some(eng);
+            Ok("connected".into())
+        }
+        Err(e) => Err(format!("{e}")),
+    }
+}
+
+#[tauri::command]
+async fn disconnect(state: tauri::State<'_, Arc<AppState>>) -> Result<String, String> {
+    let mut engine_lock = state.engine.lock().await;
+    if let Some(engine) = engine_lock.take() {
+        engine.stop().await;
+        Ok("disconnected".into())
+    } else {
+        Err("not connected".into())
+    }
+}
+
+#[tauri::command]
+async fn toggle_mic(state: tauri::State<'_, Arc<AppState>>) -> Result<bool, String> {
+    let engine_lock = state.engine.lock().await;
+    if let Some(ref engine) = *engine_lock {
+        Ok(engine.toggle_mic())
+    } else {
+        Err("not connected".into())
+    }
+}
+
+#[tauri::command]
+async fn toggle_speaker(state: tauri::State<'_, Arc<AppState>>) -> Result<bool, String> {
+    let engine_lock = state.engine.lock().await;
+    if let Some(ref engine) = *engine_lock {
+        Ok(engine.toggle_speaker())
+    } else {
+        Err("not connected".into())
+    }
+}
+
+#[tauri::command]
+async fn get_status(state: tauri::State<'_, Arc<AppState>>) -> Result<CallStatus, String> {
+    let engine_lock = state.engine.lock().await;
+    if let Some(ref engine) = *engine_lock {
+        let status = engine.status().await;
+        Ok(CallStatus {
+            active: true,
+            mic_muted: status.mic_muted,
+            spk_muted: status.spk_muted,
+            participants: status
+                .participants
+                .into_iter()
+                .map(|p| Participant {
+                    fingerprint: p.fingerprint,
+                    alias: p.alias,
+                })
+                .collect(),
+            encode_fps: status.frames_sent,
+            recv_fps: status.frames_received,
+            audio_level: status.audio_level,
+            call_duration_secs: status.call_duration_secs,
+            fingerprint: status.fingerprint,
+        })
+    } else {
+        Ok(CallStatus {
+            active: false,
+            mic_muted: false,
+            spk_muted: false,
+            participants: vec![],
+            encode_fps: 0,
+            recv_fps: 0,
+            audio_level: 0,
+            call_duration_secs: 0.0,
+            fingerprint: String::new(),
+        })
+    }
+}
 
 fn main() {
-    wzp_desktop_lib::run();
+    tracing_subscriber::fmt().init();
+
+    let state = Arc::new(AppState {
+        engine: Mutex::new(None),
+    });
+
+    tauri::Builder::default()
+        .plugin(tauri_plugin_shell::init())
+        .manage(state)
+        .invoke_handler(tauri::generate_handler![
+            ping_relay,
+            get_identity,
+            connect,
+            disconnect,
+            toggle_mic,
+            toggle_speaker,
+            get_status,
+        ])
+        .run(tauri::generate_context!())
+        .expect("error while running WarzonePhone Desktop");
 }

desktop/src-tauri/src/wzp_native.rs

@@ -1,138 +0,0 @@
-//! Runtime binding to the standalone `wzp-native` cdylib.
-//!
-//! See `docs/incident-tauri-android-init-tcb.md` and the top of
-//! `crates/wzp-native/src/lib.rs` for the full story on why this split
-//! exists. Short version: Tauri's desktop cdylib cannot have any C++
-//! compiled into it (via cc::Build) without landing in rust-lang/rust#104707's
-//! staticlib symbol leak, which makes bionic's private `pthread_create`
-//! symbols bind locally and SIGSEGV in `__init_tcb+4` at launch. So all
-//! the Oboe + audio code lives in a standalone `wzp-native` .so built
-//! with `cargo-ndk`, and we dlopen it here at runtime.
-//!
-//! The Library handle lives in a `'static` `OnceLock` for the lifetime of
-//! the process; all function pointers cached below borrow from it safely.
-
-#![cfg(target_os = "android")]
-
-use std::sync::OnceLock;
-
-// ─── Library handle (kept alive forever) ─────────────────────────────────
-
-static LIB: OnceLock<libloading::Library> = OnceLock::new();
-
-// Cached function pointers, resolved once at init(). Each is a raw
-// `extern "C"` fn pointer with effectively `'static` lifetime because
-// LIB is a OnceLock that never drops.
-static VERSION: OnceLock<unsafe extern "C" fn() -> i32> = OnceLock::new();
-static HELLO: OnceLock<unsafe extern "C" fn(*mut u8, usize) -> usize> = OnceLock::new();
-static AUDIO_START: OnceLock<unsafe extern "C" fn() -> i32> = OnceLock::new();
-static AUDIO_STOP: OnceLock<unsafe extern "C" fn()> = OnceLock::new();
-static AUDIO_READ_CAPTURE: OnceLock<unsafe extern "C" fn(*mut i16, usize) -> usize> = OnceLock::new();
-static AUDIO_WRITE_PLAYOUT: OnceLock<unsafe extern "C" fn(*const i16, usize) -> usize> = OnceLock::new();
-static AUDIO_IS_RUNNING: OnceLock<unsafe extern "C" fn() -> i32> = OnceLock::new();
-static AUDIO_CAPTURE_LATENCY: OnceLock<unsafe extern "C" fn() -> f32> = OnceLock::new();
-static AUDIO_PLAYOUT_LATENCY: OnceLock<unsafe extern "C" fn() -> f32> = OnceLock::new();
-
-/// Load `libwzp_native.so` and resolve every exported function we use.
-/// Call this once at app startup (from the Tauri `setup()` callback).
-/// Subsequent calls are no-ops.
-pub fn init() -> Result<(), String> {
-    if LIB.get().is_some() {
-        return Ok(());
-    }
-
-    // Open the sibling cdylib. The Android dynamic linker searches
-    // /data/app/<pkg>/lib/arm64/ which gradle populates from jniLibs.
-    let lib = unsafe { libloading::Library::new("libwzp_native.so") }
-        .map_err(|e| format!("dlopen libwzp_native.so: {e}"))?;
-
-    // Stash the Library into the OnceLock first so all Symbol lookups
-    // below borrow from the 'static reference rather than a local.
-    LIB.set(lib).map_err(|_| "wzp_native::LIB already set")?;
-    let lib_ref: &'static libloading::Library = LIB.get().unwrap();
-
-    unsafe {
-        macro_rules! resolve {
-            ($cell:expr, $ty:ty, $name:expr) => {{
-                let sym: libloading::Symbol<$ty> = lib_ref.get($name)
-                    .map_err(|e| format!("dlsym {}: {e}", core::str::from_utf8($name).unwrap_or("?")))?;
-                // Dereference the Symbol to extract the raw fn pointer;
-                // it stays valid because lib_ref is 'static.
-                $cell.set(*sym).map_err(|_| format!("{} already set", core::str::from_utf8($name).unwrap_or("?")))?;
-            }};
-        }
-
-        resolve!(VERSION, unsafe extern "C" fn() -> i32, b"wzp_native_version");
-        resolve!(HELLO, unsafe extern "C" fn(*mut u8, usize) -> usize, b"wzp_native_hello");
-        resolve!(AUDIO_START, unsafe extern "C" fn() -> i32, b"wzp_native_audio_start");
-        resolve!(AUDIO_STOP, unsafe extern "C" fn(), b"wzp_native_audio_stop");
-        resolve!(AUDIO_READ_CAPTURE, unsafe extern "C" fn(*mut i16, usize) -> usize, b"wzp_native_audio_read_capture");
-        resolve!(AUDIO_WRITE_PLAYOUT, unsafe extern "C" fn(*const i16, usize) -> usize, b"wzp_native_audio_write_playout");
-        resolve!(AUDIO_IS_RUNNING, unsafe extern "C" fn() -> i32, b"wzp_native_audio_is_running");
-        resolve!(AUDIO_CAPTURE_LATENCY, unsafe extern "C" fn() -> f32, b"wzp_native_audio_capture_latency_ms");
-        resolve!(AUDIO_PLAYOUT_LATENCY, unsafe extern "C" fn() -> f32, b"wzp_native_audio_playout_latency_ms");
-    }
-
-    Ok(())
-}
-
-/// Is `init()` done and all symbols cached?
-pub fn is_loaded() -> bool {
-    AUDIO_START.get().is_some()
-}
-
-// ─── Smoke-test accessors ────────────────────────────────────────────────
-
-pub fn version() -> i32 {
-    VERSION.get().map(|f| unsafe { f() }).unwrap_or(-1)
-}
-
-pub fn hello() -> String {
-    let Some(f) = HELLO.get() else { return String::new(); };
-    let mut buf = [0u8; 64];
-    let n = unsafe { f(buf.as_mut_ptr(), buf.len()) };
-    String::from_utf8_lossy(&buf[..n]).into_owned()
-}
-
-// ─── Audio accessors ─────────────────────────────────────────────────────
-
-/// Start the Oboe capture + playout streams. Returns `Err(code)` on
-/// failure. Idempotent on the wzp-native side.
-pub fn audio_start() -> Result<(), i32> {
-    let f = AUDIO_START.get().ok_or(-100_i32)?;
-    let ret = unsafe { f() };
-    if ret == 0 { Ok(()) } else { Err(ret) }
-}
-
-/// Stop both streams. Safe to call even if not running.
-pub fn audio_stop() {
-    if let Some(f) = AUDIO_STOP.get() {
-        unsafe { f() };
-    }
-}
-
-/// Read captured i16 PCM into `out`. Returns bytes actually copied.
-pub fn audio_read_capture(out: &mut [i16]) -> usize {
-    let Some(f) = AUDIO_READ_CAPTURE.get() else { return 0; };
-    unsafe { f(out.as_mut_ptr(), out.len()) }
-}
-
-/// Write i16 PCM into the playout ring. Returns samples enqueued.
-pub fn audio_write_playout(input: &[i16]) -> usize {
-    let Some(f) = AUDIO_WRITE_PLAYOUT.get() else { return 0; };
-    unsafe { f(input.as_ptr(), input.len()) }
-}
-
-pub fn audio_is_running() -> bool {
-    AUDIO_IS_RUNNING.get().map(|f| unsafe { f() } != 0).unwrap_or(false)
-}
-
-#[allow(dead_code)]
-pub fn audio_capture_latency_ms() -> f32 {
-    AUDIO_CAPTURE_LATENCY.get().map(|f| unsafe { f() }).unwrap_or(0.0)
-}
-
-#[allow(dead_code)]
-pub fn audio_playout_latency_ms() -> f32 {
-    AUDIO_PLAYOUT_LATENCY.get().map(|f| unsafe { f() }).unwrap_or(0.0)
-}

desktop/src-tauri/tauri.conf.json

@@ -28,9 +28,6 @@
     "targets": "all",
     "icon": [
       "icons/icon.png"
-    ],
-    "android": {
-      "minSdkVersion": 26
-    }
+    ]
   }
 }

desktop/src/main.ts

@@ -2,41 +2,6 @@ import { invoke } from "@tauri-apps/api/core";
 import { listen } from "@tauri-apps/api/event";
 import { generateIdenticon, createIdenticonEl } from "./identicon";
 
-// ── WebView hardening ──
-// Suppress the browser-style right-click context menu on desktop Tauri — it
-// exposes Inspect/Reload/Back/Forward entries that don't belong in a native-
-// feeling VoIP app. Dev tools remain accessible via the usual keyboard
-// shortcuts (F12 / Cmd-Opt-I). On Android there is no right-click so this is
-// a no-op there.
-document.addEventListener("contextmenu", (e) => e.preventDefault());
-
-// Also suppress browser-level zoom via keyboard (Ctrl/Cmd + / - / 0) so the
-// fixed-layout UI can't be accidentally scaled. Pinch-zoom is already handled
-// at the viewport meta level in index.html.
-document.addEventListener(
-  "keydown",
-  (e) => {
-    if ((e.ctrlKey || e.metaKey) && (e.key === "+" || e.key === "-" || e.key === "=" || e.key === "0")) {
-      e.preventDefault();
-    }
-  },
-  { capture: true },
-);
-
-// Block gesture-based zoom on browsers that fire these legacy events (mainly
-// Safari / WebKit). Chromium sends `wheel` with ctrlKey for trackpad pinch —
-// catch that too.
-document.addEventListener("gesturestart", (e) => e.preventDefault());
-document.addEventListener("gesturechange", (e) => e.preventDefault());
-document.addEventListener("gestureend", (e) => e.preventDefault());
-document.addEventListener(
-  "wheel",
-  (e) => {
-    if (e.ctrlKey) e.preventDefault();
-  },
-  { passive: false },
-);
-
 // ── Elements ──
 const connectScreen = document.getElementById("connect-screen")!;
 const callScreen = document.getElementById("call-screen")!;
@@ -82,43 +47,11 @@ const settingsBtnCall = document.getElementById("settings-btn-call")!;
 const sRoom = document.getElementById("s-room") as HTMLInputElement;
 const sAlias = document.getElementById("s-alias") as HTMLInputElement;
 const sOsAec = document.getElementById("s-os-aec") as HTMLInputElement;
-const sDredDebug = document.getElementById("s-dred-debug") as HTMLInputElement;
-const sReflectedAddr = document.getElementById("s-reflected-addr") as HTMLSpanElement;
-const sReflectBtn = document.getElementById("s-reflect-btn") as HTMLButtonElement;
 const sAgc = document.getElementById("s-agc") as HTMLInputElement;
-const sQuality = document.getElementById("s-quality") as HTMLInputElement;
-const sQualityLabel = document.getElementById("s-quality-label")!;
-
-// Quality slider config — best (left/green) to worst (right/red)
-const QUALITY_STEPS = ["studio-64k", "studio-48k", "studio-32k", "auto", "good", "degraded", "codec2-3200", "catastrophic"];
-const QUALITY_LABELS = ["Studio 64k", "Studio 48k", "Studio 32k", "Auto", "Opus 24k", "Opus 6k", "Codec2 3.2k", "Codec2 1.2k"];
-const QUALITY_COLORS = ["#22c55e", "#4ade80", "#86efac", "#a3e635", "#facc15", "#f59e0b", "#e97320", "#991b1b"];
-
-function qualityToIndex(q: string): number {
-  const idx = QUALITY_STEPS.indexOf(q);
-  return idx >= 0 ? idx : 3; // default to "auto" (index 3)
-}
-
-function updateQualityUI(index: number) {
-  sQualityLabel.textContent = QUALITY_LABELS[index];
-  sQualityLabel.style.color = QUALITY_COLORS[index];
-  sQuality.style.background = `linear-gradient(90deg, #22c55e 0%, #86efac 25%, #facc15 50%, #e97320 75%, #991b1b 100%)`;
-}
-
-sQuality.addEventListener("input", () => {
-  updateQualityUI(parseInt(sQuality.value));
-});
 const sFingerprint = document.getElementById("s-fingerprint")!;
 const sRecentRooms = document.getElementById("s-recent-rooms")!;
 const sClearRecent = document.getElementById("s-clear-recent")!;
 
-// Key warning dialog
-const keyWarning = document.getElementById("key-warning")!;
-const kwOldFp = document.getElementById("kw-old-fp")!;
-const kwNewFp = document.getElementById("kw-new-fp")!;
-const kwAccept = document.getElementById("kw-accept")!;
-const kwCancel = document.getElementById("kw-cancel")!;
-
 let statusInterval: number | null = null;
 let myFingerprint = "";
 let userDisconnected = false;
@@ -141,25 +74,14 @@ interface Settings {
   alias: string;
   osAec: boolean;
   agc: boolean;
-  quality: string;
   recentRooms: RecentRoom[];
-  /// When true, the Rust side emits the chatty per-frame DRED parse +
-  /// reconstruction + classical-PLC logs and adds DRED counters to the
-  /// recv heartbeat. Off in normal mode keeps logcat clean.
-  dredDebugLogs: boolean;
 }
 
 function loadSettings(): Settings {
   const defaults: Settings = {
-    relays: [
-      // Local laptop relay — used during Android rewrite testing so the phone
-      // and the relay logs are on the same host. Laptop IP on the test LAN.
-      { name: "Laptop", address: "172.16.81.125:4433" },
-      { name: "Default", address: "193.180.213.68:4433" },
-    ],
-    selectedRelay: 0, room: "general", alias: "",
-    osAec: true, agc: true, quality: "auto", recentRooms: [],
-    dredDebugLogs: false,
+    relays: [{ name: "Default", address: "193.180.213.68:4433" }],
+    selectedRelay: 0, room: "android", alias: "",
+    osAec: true, agc: true, recentRooms: [],
   };
   try {
     const raw = localStorage.getItem("wzp-settings");
@@ -174,15 +96,6 @@ function loadSettings(): Settings {
         const addr = parsed.relays?.[0]?.address || defaults.relays[0].address;
         parsed.recentRooms = parsed.recentRooms.map((r: string) => ({ relay: addr, room: r }));
       }
-      // Ensure the Laptop test relay is present as the first entry for
-      // existing installs — otherwise users with cached settings keep using
-      // the remote default and we have to manually add it each install.
-      // Remove this block once the Android rewrite is stable.
-      const LAPTOP_ADDR = "172.16.81.125:4433";
-      if (Array.isArray(parsed.relays) && !parsed.relays.some((r: any) => r.address === LAPTOP_ADDR)) {
-        parsed.relays.unshift({ name: "Laptop", address: LAPTOP_ADDR });
-        parsed.selectedRelay = 0;
-      }
       return { ...defaults, ...parsed };
     }
   } catch {}
@@ -410,18 +323,11 @@ function renderRecentRooms(rooms: RecentRoom[]) {
 // ── Init ──
 applySettings();
 setTimeout(pingAllRelays, 300);
-// Hydrate the Rust DRED verbose-logs flag from saved settings on boot so
-// the choice survives app restarts without needing the user to reopen
-// the settings panel.
-invoke("set_dred_verbose_logs", { enabled: !!loadSettings().dredDebugLogs }).catch(() => {});
-
-// Load fingerprint + alias + git hash + render identicon
-interface AppInfo { git_hash: string; alias: string; fingerprint: string; data_dir: string }
 
+// Load fingerprint + render identicon
 (async () => {
   try {
-    const info: AppInfo = await invoke("get_app_info");
-    const fp = info.fingerprint;
+    const fp: string = await invoke("get_identity");
     myFingerprint = fp;
     myFingerprintEl.textContent = fp;
     myFingerprintEl.style.cursor = "pointer";
@@ -437,29 +343,7 @@ interface AppInfo { git_hash: string; alias: string; fingerprint: string; data_d
     const icon = createIdenticonEl(fp, 28, true);
     myIdenticonEl.innerHTML = "";
     myIdenticonEl.appendChild(icon);
-
-    // Prefill alias if the user hasn't typed one yet
-    if (!aliasInput.value.trim()) {
-      aliasInput.value = info.alias;
-      const s = loadSettings();
-      s.alias = info.alias;
-      saveSettingsObj(s);
-    }
-
-    // Stamp the build hash on the home screen so we can prove which build
-    // is installed (this caused us a lot of grief on the Kotlin app).
-    let buildEl = document.getElementById("build-hash");
-    if (!buildEl) {
-      buildEl = document.createElement("div");
-      buildEl.id = "build-hash";
-      buildEl.style.cssText = "font-size:10px;opacity:0.6;text-align:center;margin-top:4px;font-family:monospace";
-      myFingerprintEl.parentElement?.appendChild(buildEl);
-    }
-    buildEl.textContent = `build ${info.git_hash} • ${info.alias}`;
-    buildEl.title = info.data_dir;
-  } catch (e) {
-    console.error("get_app_info failed", e);
-  }
+  } catch {}
 })();
 
 // ── Connect ──
@@ -468,28 +352,6 @@ connectBtn.addEventListener("click", doConnect);
   el.addEventListener("keydown", (e) => { if (e.key === "Enter") doConnect(); })
 );
 
-function showKeyWarning(oldFp: string, newFp: string): Promise<boolean> {
-  return new Promise((resolve) => {
-    kwOldFp.textContent = oldFp;
-    kwNewFp.textContent = newFp;
-    keyWarning.classList.remove("hidden");
-
-    const cleanup = () => {
-      keyWarning.classList.add("hidden");
-      kwAccept.removeEventListener("click", onAccept);
-      kwCancel.removeEventListener("click", onCancel);
-      keyWarning.removeEventListener("click", onBackdrop);
-    };
-    const onAccept = () => { cleanup(); resolve(true); };
-    const onCancel = () => { cleanup(); resolve(false); };
-    const onBackdrop = (e: Event) => { if (e.target === keyWarning) { cleanup(); resolve(false); } };
-
-    kwAccept.addEventListener("click", onAccept);
-    kwCancel.addEventListener("click", onCancel);
-    keyWarning.addEventListener("click", onBackdrop);
-  });
-}
-
 async function doConnect() {
   const relay = getSelectedRelay();
   if (!relay) { connectError.textContent = "No relay selected"; return; }
@@ -497,13 +359,13 @@ async function doConnect() {
   // Warn on fingerprint mismatch
   const ls = lockStatus(relay);
   if (ls === "changed") {
-    const accepted = await showKeyWarning(relay.knownFingerprint || "", relay.serverFingerprint || "");
-    if (!accepted) return;
+    if (!confirm(`Server fingerprint has changed!\n\nKnown: ${relay.knownFingerprint}\nNew: ${relay.serverFingerprint}\n\nThis could indicate a man-in-the-middle attack. Continue?`)) {
+      return;
+    }
     // User accepted — update known fingerprint
     const s = loadSettings();
     s.relays[s.selectedRelay].knownFingerprint = relay.serverFingerprint;
     saveSettingsObj(s);
-    renderRelayButton();
   }
 
   // Don't block connect on offline — ping may have failed transiently
@@ -526,7 +388,6 @@ async function doConnect() {
     await invoke("connect", {
       relay: relay.address, room: roomInput.value,
       alias: aliasInput.value, osAec: osAecCheckbox.checked,
-      quality: s.quality || "auto",
     });
     showCallScreen();
   } catch (e: any) {
@@ -542,12 +403,6 @@ function showCallScreen() {
   roomName.textContent = roomInput.value;
   callStatus.className = "status-dot";
   statusInterval = window.setInterval(pollStatus, 250);
-  // Sync the Speaker/Earpiece label with the OS state (Android only; on
-  // desktop the command is a no-op returning false so we land on "Earpiece"
-  // which is fine because desktop has no routing concept).
-  invoke<boolean>("is_speakerphone_on")
-    .then((on) => { speakerphoneOn = !!on; updateSpkLabel(); })
-    .catch(() => { speakerphoneOn = false; updateSpkLabel(); });
 }
 
 function showConnectScreen() {
@@ -563,38 +418,8 @@ function showConnectScreen() {
 micBtn.addEventListener("click", async () => {
   try { const m: boolean = await invoke("toggle_mic"); micBtn.classList.toggle("muted", m); micIcon.textContent = m ? "Mic Off" : "Mic"; } catch {}
 });
-
-// Speaker routing (Android) — toggles AudioManager.setSpeakerphoneOn + then
-// stops and restarts the Oboe streams so AAudio reconfigures with the new
-// routing. The Rust-side Tauri command handles the restart, we just swap
-// the button label.
-//
-// Earpiece is NOT a "muted" state, so DO NOT add the `.muted` CSS class
-// (which would tint the button red); that was a bug in 0178cbd that made
-// earpiece mode look like playback was off. A separate `.speaker-on` class
-// is available for css styling if we want to visually indicate loud mode.
-let speakerphoneOn = false;
-let speakerphoneBusy = false;
-function updateSpkLabel() {
-  spkBtn.classList.toggle("speaker-on", speakerphoneOn);
-  spkBtn.classList.remove("muted");
-  spkIcon.textContent = speakerphoneOn ? "🔊 Speaker" : "🔈 Earpiece";
-}
 spkBtn.addEventListener("click", async () => {
-  if (speakerphoneBusy) return;  // debounce — the restart takes ~60ms
-  speakerphoneBusy = true;
-  const next = !speakerphoneOn;
-  spkBtn.disabled = true;
-  try {
-    await invoke("set_speakerphone", { on: next });
-    speakerphoneOn = next;
-    updateSpkLabel();
-  } catch (e) {
-    console.error("set_speakerphone failed:", e);
-  } finally {
-    spkBtn.disabled = false;
-    speakerphoneBusy = false;
-  }
+  try { const m: boolean = await invoke("toggle_speaker"); spkBtn.classList.toggle("muted", m); spkIcon.textContent = m ? "Spk Off" : "Spk"; } catch {}
 });
 hangupBtn.addEventListener("click", async () => {
   userDisconnected = true;
@@ -654,38 +479,20 @@ async function pollStatus() {
 
     micBtn.classList.toggle("muted", st.mic_muted);
     micIcon.textContent = st.mic_muted ? "Mic Off" : "Mic";
-    // NB: spkBtn label is driven by the Android audio routing state
-    // (speakerphoneOn / updateSpkLabel), not by the engine's spk_muted.
-    // Skip that here so pollStatus doesn't clobber the routing UI.
+    spkBtn.classList.toggle("muted", st.spk_muted);
+    spkIcon.textContent = st.spk_muted ? "Spk Off" : "Spk";
     callTimer.textContent = formatDuration(st.call_duration_secs);
 
     const rms = st.audio_level;
     const pct = rms > 0 ? Math.min(100, (Math.log(rms) / Math.log(32767)) * 100) : 0;
     levelBar.style.width = `${pct}%`;
 
-    // Participants grouped by relay
+    // Participants with identicons
     if (st.participants.length === 0) {
       participantsDiv.innerHTML = '<div class="participants-empty">Waiting for participants...</div>';
     } else {
       participantsDiv.innerHTML = "";
-      // Group by relay_label (null = this relay)
-      const groups: Record<string, typeof st.participants> = {};
-      st.participants.forEach((p: any) => {
-        const relay = p.relay_label || "This Relay";
-        if (!groups[relay]) groups[relay] = [];
-        groups[relay].push(p);
-      });
-
-      Object.entries(groups).forEach(([relay, members]) => {
-        // Relay header
-        const header = document.createElement("div");
-        header.className = "relay-group-header";
-        const isLocal = relay === "This Relay";
-        header.innerHTML = `<span class="relay-dot-small ${isLocal ? "green" : "blue"}"></span> ${escapeHtml(relay)}`;
-        participantsDiv.appendChild(header);
-
-        // Participants under this relay
-        (members as any[]).forEach((p) => {
+      st.participants.forEach((p) => {
         const name = p.alias || "Anonymous";
         const fp = p.fingerprint || "";
         const isMe = fp && myFingerprint.includes(fp);
@@ -693,6 +500,7 @@ async function pollStatus() {
         const row = document.createElement("div");
         row.className = "participant";
 
+        // Identicon avatar
         const icon = createIdenticonEl(fp || name, 36, true);
         if (isMe) icon.style.outline = "2px solid var(--accent)";
         row.appendChild(icon);
@@ -706,13 +514,9 @@ async function pollStatus() {
         row.appendChild(info);
         participantsDiv.appendChild(row);
       });
-      });
     }
 
-    // Stats line with codec badges
-    const txBadge = (st as any).tx_codec ? `<span class="codec-badge tx">${escapeHtml((st as any).tx_codec)}</span>` : "";
-    const rxBadge = (st as any).rx_codec ? `<span class="codec-badge rx">${escapeHtml((st as any).rx_codec)}</span>` : "";
-    statsDiv.innerHTML = `${txBadge} ${rxBadge} TX: ${st.encode_fps} | RX: ${st.recv_fps}`;
+    statsDiv.textContent = `TX: ${st.encode_fps} | RX: ${st.recv_fps}`;
   } catch {}
 }
 
@@ -726,10 +530,6 @@ listen("call-event", (event: any) => {
 function openSettings() {
   const s = loadSettings();
   sRoom.value = s.room; sAlias.value = s.alias; sOsAec.checked = s.osAec;
-  sDredDebug.checked = !!s.dredDebugLogs;
-  const qi = qualityToIndex(s.quality || "auto");
-  sQuality.value = String(qi);
-  updateQualityUI(qi);
   sFingerprint.textContent = myFingerprint || "(loading...)";
   renderSettingsRecentRooms(s.recentRooms);
   settingsPanel.classList.remove("hidden");
@@ -759,48 +559,13 @@ function renderSettingsRecentRooms(rooms: RecentRoom[]) {
 
 settingsBtnHome.addEventListener("click", openSettings);
 settingsBtnCall.addEventListener("click", openSettings);
-// "STUN for QUIC" — ask the registered relay for our own public
-// address. Requires register_signal to have been run first
-// (otherwise the Rust side returns "not registered"). The button
-// shows its working state inline so the user knows it's waiting on
-// the relay rather than the network.
-sReflectBtn.addEventListener("click", async () => {
-  sReflectedAddr.textContent = "querying...";
-  sReflectBtn.disabled = true;
-  try {
-    const addr = await invoke<string>("get_reflected_address");
-    sReflectedAddr.textContent = addr;
-    sReflectedAddr.style.color = "var(--green)";
-  } catch (e: any) {
-    // Two main failure modes surfaced via the error string:
-    //  - "not registered"                 — user hasn't registered
-    //                                        against a relay yet
-    //  - "reflect timeout (relay may not support reflection)"
-    //                                       — old relay, pre-Phase-1
-    const msg = String(e);
-    sReflectedAddr.textContent = msg.includes("not registered")
-      ? "⚠ register first"
-      : msg.includes("timeout")
-      ? "⚠ relay does not support reflection"
-      : `⚠ ${msg}`;
-    sReflectedAddr.style.color = "var(--yellow)";
-  } finally {
-    sReflectBtn.disabled = false;
-  }
-});
-
 settingsClose.addEventListener("click", closeSettings);
 settingsPanel.addEventListener("click", (e) => { if (e.target === settingsPanel) closeSettings(); });
 
 settingsSave.addEventListener("click", () => {
   const s = loadSettings();
   s.room = sRoom.value; s.alias = sAlias.value; s.osAec = sOsAec.checked;
-  s.quality = QUALITY_STEPS[parseInt(sQuality.value)] || "auto";
-  s.dredDebugLogs = sDredDebug.checked;
   saveSettingsObj(s);
-  // Push the new flag to the Rust side immediately so the next encoded
-  // frame already honors it without waiting for an app restart.
-  invoke("set_dred_verbose_logs", { enabled: s.dredDebugLogs }).catch(() => {});
   roomInput.value = s.room; aliasInput.value = s.alias; osAecCheckbox.checked = s.osAec;
   renderRecentRooms(s.recentRooms);
   closeSettings();
@@ -824,262 +589,3 @@ document.addEventListener("keydown", (e) => {
     else if (!settingsPanel.classList.contains("hidden")) closeSettings();
   }
 });
-
-// ── Direct Calling UI ──
-const modeRoom = document.getElementById("mode-room")!;
-const modeDirect = document.getElementById("mode-direct")!;
-const roomModeDiv = document.getElementById("room-mode")!;
-const directModeDiv = document.getElementById("direct-mode")!;
-const registerBtn = document.getElementById("register-btn") as HTMLButtonElement;
-const deregisterBtn = document.getElementById("deregister-btn") as HTMLButtonElement;
-const directRegistered = document.getElementById("direct-registered")!;
-const incomingCallPanel = document.getElementById("incoming-call-panel")!;
-const incomingCaller = document.getElementById("incoming-caller")!;
-const acceptCallBtn = document.getElementById("accept-call-btn")!;
-const rejectCallBtn = document.getElementById("reject-call-btn")!;
-const targetFpInput = document.getElementById("target-fp") as HTMLInputElement;
-const callBtn = document.getElementById("call-btn") as HTMLButtonElement;
-const callStatusText = document.getElementById("call-status-text")!;
-const recentContactsSection = document.getElementById("recent-contacts-section")!;
-const recentContactsList = document.getElementById("recent-contacts-list")!;
-const callHistorySection = document.getElementById("call-history-section")!;
-const callHistoryList = document.getElementById("call-history-list")!;
-const clearHistoryBtn = document.getElementById("clear-history-btn") as HTMLButtonElement;
-
-let currentCallMode = "room";
-
-modeRoom.addEventListener("click", () => {
-  currentCallMode = "room";
-  modeRoom.classList.add("active");
-  modeDirect.classList.remove("active");
-  roomModeDiv.classList.remove("hidden");
-  directModeDiv.classList.add("hidden");
-  // Show room/alias inputs
-  (document.querySelector('label:has(#room)') as HTMLElement)?.classList.remove("hidden");
-  (document.querySelector('label:has(#alias)') as HTMLElement)?.classList.remove("hidden");
-});
-
-modeDirect.addEventListener("click", () => {
-  currentCallMode = "direct";
-  modeDirect.classList.add("active");
-  modeRoom.classList.remove("active");
-  directModeDiv.classList.remove("hidden");
-  roomModeDiv.classList.add("hidden");
-  // Hide room input, keep alias
-  (document.querySelector('label:has(#room)') as HTMLElement)?.classList.add("hidden");
-});
-
-// ── Call history + recent contacts rendering ──
-interface CallHistoryEntry {
-  call_id: string;
-  peer_fp: string;
-  peer_alias: string | null;
-  direction: "placed" | "received" | "missed";
-  timestamp_unix: number;
-}
-
-function fmtTimestamp(unix: number): string {
-  const d = new Date(unix * 1000);
-  const now = new Date();
-  const sameDay =
-    d.getFullYear() === now.getFullYear() &&
-    d.getMonth() === now.getMonth() &&
-    d.getDate() === now.getDate();
-  if (sameDay) {
-    return d.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" });
-  }
-  return d.toLocaleDateString([], { month: "short", day: "numeric" }) +
-    " " + d.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" });
-}
-
-function directionIcon(dir: string): string {
-  switch (dir) {
-    case "placed":   return "↗";
-    case "received": return "↙";
-    case "missed":   return "✗";
-    default:         return "•";
-  }
-}
-
-function directionLabel(dir: string): string {
-  switch (dir) {
-    case "placed":   return "Outgoing";
-    case "received": return "Incoming";
-    case "missed":   return "Missed";
-    default:         return dir;
-  }
-}
-
-function directionClass(dir: string): string {
-  return `dir-${dir}`;
-}
-
-function callByFingerprint(fp: string) {
-  targetFpInput.value = fp;
-  callBtn.click();
-}
-
-async function refreshHistory() {
-  try {
-    const [history, contacts] = await Promise.all([
-      invoke<CallHistoryEntry[]>("get_call_history"),
-      invoke<CallHistoryEntry[]>("get_recent_contacts"),
-    ]);
-
-    // Recent contacts (top 6)
-    if (contacts.length === 0) {
-      recentContactsSection.classList.add("hidden");
-    } else {
-      recentContactsSection.classList.remove("hidden");
-      recentContactsList.innerHTML = "";
-      contacts.slice(0, 6).forEach((c) => {
-        const btn = document.createElement("button");
-        btn.className = "contact-chip";
-        const label = c.peer_alias || c.peer_fp.substring(0, 16);
-        btn.innerHTML = `<span class="contact-dot"></span><span class="contact-label">${label}</span>`;
-        btn.title = c.peer_fp;
-        btn.addEventListener("click", () => callByFingerprint(c.peer_fp));
-        recentContactsList.appendChild(btn);
-      });
-    }
-
-    // Full history
-    if (history.length === 0) {
-      callHistorySection.classList.add("hidden");
-    } else {
-      callHistorySection.classList.remove("hidden");
-      callHistoryList.innerHTML = "";
-      history.slice(0, 50).forEach((e) => {
-        const row = document.createElement("div");
-        row.className = `history-row ${directionClass(e.direction)}`;
-        const label = e.peer_alias || e.peer_fp.substring(0, 16);
-        row.innerHTML = `
-          <span class="history-dir">${directionIcon(e.direction)}</span>
-          <div class="history-meta">
-            <span class="history-peer">${label}</span>
-            <span class="history-time">${directionLabel(e.direction)} · ${fmtTimestamp(e.timestamp_unix)}</span>
-          </div>
-          <button class="history-call-btn" title="Call back">Call</button>
-        `;
-        row.title = e.peer_fp;
-        const cb = row.querySelector(".history-call-btn") as HTMLButtonElement;
-        cb.addEventListener("click", (ev) => {
-          ev.stopPropagation();
-          callByFingerprint(e.peer_fp);
-        });
-        callHistoryList.appendChild(row);
-      });
-    }
-  } catch (e) {
-    console.error("refreshHistory failed:", e);
-  }
-}
-
-// Live-refresh whenever the backend logs a new entry
-listen("history-changed", () => { refreshHistory(); });
-
-clearHistoryBtn.addEventListener("click", async () => {
-  if (!confirm("Clear call history?")) return;
-  try {
-    await invoke("clear_call_history");
-    refreshHistory();
-  } catch (e) { console.error(e); }
-});
-
-registerBtn.addEventListener("click", async () => {
-  const relay = getSelectedRelay();
-  if (!relay) { connectError.textContent = "No relay selected"; return; }
-  registerBtn.disabled = true;
-  registerBtn.textContent = "Registering...";
-  try {
-    const fp = await invoke<string>("register_signal", { relay: relay.address });
-    registerBtn.classList.add("hidden");
-    directRegistered.classList.remove("hidden");
-    callStatusText.textContent = `Your fingerprint: ${fp}`;
-    refreshHistory();
-  } catch (e: any) {
-    connectError.textContent = String(e);
-    registerBtn.disabled = false;
-    registerBtn.textContent = "Register on Relay";
-  }
-});
-
-deregisterBtn.addEventListener("click", async () => {
-  try {
-    await invoke("deregister");
-    directRegistered.classList.add("hidden");
-    registerBtn.classList.remove("hidden");
-    registerBtn.disabled = false;
-    registerBtn.textContent = "Register on Relay";
-    callStatusText.textContent = "";
-    incomingCallPanel.classList.add("hidden");
-  } catch (e) {
-    console.error("deregister failed:", e);
-  }
-});
-
-callBtn.addEventListener("click", async () => {
-  const target = targetFpInput.value.trim();
-  if (!target) return;
-  callStatusText.textContent = "Calling...";
-  try {
-    await invoke("place_call", { targetFp: target });
-  } catch (e: any) {
-    callStatusText.textContent = `Error: ${e}`;
-  }
-});
-
-acceptCallBtn.addEventListener("click", async () => {
-  const status = await invoke<any>("get_signal_status");
-  if (status.incoming_call_id) {
-    await invoke("answer_call", { callId: status.incoming_call_id, mode: 2 });
-    incomingCallPanel.classList.add("hidden");
-  }
-});
-
-rejectCallBtn.addEventListener("click", async () => {
-  const status = await invoke<any>("get_signal_status");
-  if (status.incoming_call_id) {
-    await invoke("answer_call", { callId: status.incoming_call_id, mode: 0 });
-    incomingCallPanel.classList.add("hidden");
-  }
-});
-
-// Listen for signal events from Rust backend
-listen("signal-event", (event: any) => {
-  const data = event.payload;
-  switch (data.type) {
-    case "ringing":
-      callStatusText.textContent = "🔔 Ringing...";
-      break;
-    case "incoming":
-      incomingCallPanel.classList.remove("hidden");
-      incomingCaller.textContent = `From: ${data.caller_alias || data.caller_fp?.substring(0, 16) || "unknown"}`;
-      break;
-    case "answered":
-      callStatusText.textContent = `Call answered (${data.mode})`;
-      break;
-    case "setup":
-      callStatusText.textContent = "Connecting to media...";
-      // Auto-connect to the call room
-      (async () => {
-        try {
-          await invoke("connect", {
-            relay: data.relay_addr,
-            room: data.room,
-            alias: aliasInput.value,
-            osAec: osAecCheckbox.checked,
-            quality: loadSettings().quality || "auto",
-          });
-          showCallScreen();
-        } catch (e: any) {
-          callStatusText.textContent = `Media connect failed: ${e}`;
-        }
-      })();
-      break;
-    case "hangup":
-      callStatusText.textContent = "";
-      incomingCallPanel.classList.add("hidden");
-      break;
-  }
-});

desktop/src/style.css

@@ -441,56 +441,6 @@ button.primary:disabled { opacity: 0.5; cursor: not-allowed; }
   border-radius: 8px;
 }
 
-/* ── Relay group headers ── */
-.relay-group-header {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  font-size: 11px;
-  text-transform: uppercase;
-  letter-spacing: 0.5px;
-  color: var(--text-dim);
-  padding: 6px 0 2px;
-  border-top: 1px solid #ffffff08;
-  margin-top: 4px;
-}
-
-.relay-group-header:first-child {
-  border-top: none;
-  margin-top: 0;
-}
-
-.relay-dot-small {
-  width: 6px;
-  height: 6px;
-  border-radius: 50%;
-  display: inline-block;
-}
-
-.relay-dot-small.green { background: var(--green); }
-.relay-dot-small.blue { background: #60a5fa; }
-
-/* ── Codec badges ── */
-.codec-badge {
-  display: inline-block;
-  font-size: 10px;
-  font-weight: 600;
-  padding: 1px 6px;
-  border-radius: 4px;
-  font-family: monospace;
-  margin: 0 2px;
-}
-
-.codec-badge.tx {
-  background: #22c55e30;
-  color: #4ade80;
-}
-
-.codec-badge.rx {
-  background: #3b82f630;
-  color: #60a5fa;
-}
-
 /* ── Controls ── */
 .controls {
   display: flex;
@@ -701,331 +651,3 @@ button.primary:disabled { opacity: 0.5; cursor: not-allowed; }
 }
 
 .secondary-btn:hover { border-color: var(--accent); color: var(--text); }
-
-/* ── Key warning dialog ── */
-#key-warning {
-  position: fixed;
-  inset: 0;
-  background: rgba(0, 0, 0, 0.7);
-  backdrop-filter: blur(6px);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  z-index: 300;
-  padding: 20px;
-}
-
-.key-warning-card {
-  max-width: 360px;
-  text-align: center;
-  gap: 16px;
-}
-
-.key-warning-icon {
-  font-size: 48px;
-  color: var(--yellow);
-  line-height: 1;
-}
-
-.key-warning-card h2 {
-  font-size: 18px;
-  font-weight: 600;
-}
-
-.key-warning-text {
-  font-size: 13px;
-  color: var(--text-dim);
-  line-height: 1.5;
-}
-
-.key-warning-fps {
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-  background: var(--surface);
-  border-radius: 8px;
-  padding: 12px;
-}
-
-.key-fp-row {
-  display: flex;
-  flex-direction: column;
-  gap: 2px;
-  text-align: left;
-}
-
-.key-fp-label {
-  font-size: 10px;
-  text-transform: uppercase;
-  letter-spacing: 0.5px;
-  color: var(--text-dim);
-}
-
-.key-fp {
-  font-family: monospace;
-  font-size: 11px;
-  word-break: break-all;
-  color: var(--text);
-}
-
-.key-warning-actions {
-  display: flex;
-  gap: 10px;
-}
-
-.key-warning-actions .primary {
-  flex: 1;
-  background: var(--yellow);
-  color: #000;
-  font-weight: 600;
-}
-
-.key-warning-actions .secondary-btn {
-  flex: 1;
-}
-
-/* ── Quality slider ── */
-.quality-control {
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-  padding: 4px 0;
-}
-
-.quality-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.quality-label {
-  font-size: 13px;
-  font-weight: 600;
-  padding: 2px 8px;
-  border-radius: 6px;
-  transition: all 0.2s;
-}
-
-.quality-slider {
-  -webkit-appearance: none;
-  appearance: none;
-  width: 100%;
-  height: 6px;
-  border-radius: 3px;
-  outline: none;
-  cursor: pointer;
-  transition: background 0.2s;
-}
-
-.quality-slider::-webkit-slider-thumb {
-  -webkit-appearance: none;
-  appearance: none;
-  width: 18px;
-  height: 18px;
-  border-radius: 50%;
-  background: var(--text);
-  border: 2px solid var(--bg);
-  box-shadow: 0 1px 4px rgba(0,0,0,0.4);
-  cursor: pointer;
-  transition: transform 0.1s;
-}
-
-.quality-slider::-webkit-slider-thumb:hover {
-  transform: scale(1.15);
-}
-
-.quality-ticks {
-  display: flex;
-  justify-content: space-between;
-  font-size: 9px;
-  color: var(--text-dim);
-  padding: 0 2px;
-}
-
-.form select {
-  background: var(--surface);
-  border: 1px solid #333;
-  border-radius: 8px;
-  padding: 10px 12px;
-  color: var(--text);
-  font-size: 15px;
-  outline: none;
-  transition: border-color 0.2s;
-}
-
-.form select:focus {
-  border-color: var(--accent);
-}
-
-.settings-section select {
-  background: var(--surface);
-  border: 1px solid #333;
-  border-radius: 8px;
-  padding: 8px 10px;
-  color: var(--text);
-  font-size: 14px;
-  outline: none;
-}
-
-.settings-section select:focus {
-  border-color: var(--accent);
-}
-
-/* Direct calling mode toggle */
-.mode-btn {
-  padding: 8px 16px;
-  border: 1px solid var(--surface2);
-  background: var(--surface);
-  color: var(--dim);
-  border-radius: 6px;
-  cursor: pointer;
-  font-size: 13px;
-  transition: all 0.15s;
-}
-.mode-btn.active {
-  background: var(--accent);
-  color: white;
-  border-color: var(--accent);
-}
-.mode-btn:hover:not(.active) {
-  background: var(--surface2);
-}
-
-/* ── Direct call history + contacts ── */
-
-.direct-registered-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 8px;
-  margin-bottom: 4px;
-}
-
-.secondary-btn.small {
-  padding: 4px 10px;
-  font-size: 11px;
-}
-
-.history-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin: 12px 0 4px 0;
-  font-size: 11px;
-  font-weight: 600;
-  text-transform: uppercase;
-  letter-spacing: 0.06em;
-  color: var(--dim);
-}
-
-.link-btn {
-  background: none;
-  border: none;
-  color: var(--dim);
-  font-size: 11px;
-  cursor: pointer;
-  padding: 2px 6px;
-  text-decoration: underline;
-}
-.link-btn:hover { color: var(--text); }
-
-.history-list {
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-  max-height: 180px;
-  overflow-y: auto;
-}
-
-/* Recent contacts — horizontally wrapping chips */
-#recent-contacts-list {
-  flex-direction: row;
-  flex-wrap: wrap;
-  max-height: none;
-}
-
-.contact-chip {
-  display: inline-flex;
-  align-items: center;
-  gap: 6px;
-  background: var(--surface2);
-  border: 1px solid var(--surface2);
-  color: var(--text);
-  border-radius: 16px;
-  padding: 4px 10px;
-  font-size: 12px;
-  cursor: pointer;
-  transition: all 0.15s;
-}
-.contact-chip:hover {
-  background: var(--accent);
-  border-color: var(--accent);
-  color: white;
-}
-.contact-dot {
-  width: 6px;
-  height: 6px;
-  border-radius: 50%;
-  background: var(--green);
-}
-.contact-chip .contact-label {
-  max-width: 120px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-/* Full history rows */
-.history-row {
-  display: grid;
-  grid-template-columns: 20px 1fr auto;
-  align-items: center;
-  gap: 8px;
-  padding: 6px 8px;
-  background: var(--surface);
-  border-radius: 6px;
-  font-size: 12px;
-}
-.history-row.dir-placed   .history-dir { color: var(--accent); }
-.history-row.dir-received .history-dir { color: var(--green); }
-.history-row.dir-missed   .history-dir { color: var(--red); }
-.history-dir {
-  text-align: center;
-  font-weight: 700;
-}
-.history-meta {
-  display: flex;
-  flex-direction: column;
-  gap: 2px;
-  overflow: hidden;
-}
-.history-peer {
-  color: var(--text);
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.history-time {
-  color: var(--dim);
-  font-size: 11px;
-}
-.history-call-btn {
-  background: var(--surface2);
-  border: 1px solid var(--surface2);
-  color: var(--text);
-  padding: 4px 10px;
-  border-radius: 4px;
-  font-size: 11px;
-  cursor: pointer;
-  transition: all 0.15s;
-}
-.history-call-btn:hover {
-  background: var(--accent);
-  border-color: var(--accent);
-  color: white;
-}
-
-/* Speaker routing button (non-muted earpiece state should not look red) */
-#spk-btn.speaker-on .icon {
-  color: var(--accent);
-}

docs/ADMINISTRATION.md

@@ -1,747 +0,0 @@
-# WarzonePhone Relay Administration Guide
-
-This document covers deploying, configuring, and operating wzp-relay instances, including federation setup, monitoring, and troubleshooting.
-
-## Relay Deployment
-
-### Binary
-
-Build and run the relay directly:
-
-```bash
-# Build release binary
-cargo build --release --bin wzp-relay
-
-# Run with defaults (listen on 0.0.0.0:4433, room mode, no auth)
-./target/release/wzp-relay
-
-# Run with config file
-./target/release/wzp-relay --config /etc/wzp/relay.toml
-```
-
-### Remote Build (Linux)
-
-The included build script provisions a temporary Hetzner Cloud VPS, builds all binaries, and downloads them:
-
-```bash
-# Requires: hcloud CLI authenticated, SSH key "wz" registered
-./scripts/build-linux.sh
-# Outputs to: target/linux-x86_64/
-```
-
-Produces: `wzp-relay`, `wzp-client`, `wzp-client-audio`, `wzp-web`, `wzp-bench`.
-
-### Docker
-
-```dockerfile
-FROM rust:1.85 AS builder
-WORKDIR /src
-COPY . .
-RUN cargo build --release --bin wzp-relay
-
-FROM debian:bookworm-slim
-RUN apt-get update && apt-get install -y ca-certificates && rm -rf /var/lib/apt/lists/*
-COPY --from=builder /src/target/release/wzp-relay /usr/local/bin/
-EXPOSE 4433/udp
-EXPOSE 9090/tcp
-VOLUME /data
-ENV HOME=/data
-ENTRYPOINT ["wzp-relay"]
-CMD ["--config", "/data/relay.toml", "--metrics-port", "9090"]
-```
-
-Build and run:
-
-```bash
-docker build -t wzp-relay .
-docker run -d \
-  --name wzp-relay \
-  -p 4433:4433/udp \
-  -p 9090:9090/tcp \
-  -v /opt/wzp:/data \
-  wzp-relay
-```
-
-### systemd
-
-Create `/etc/systemd/system/wzp-relay.service`:
-
-```ini
-[Unit]
-Description=WarzonePhone Relay
-After=network-online.target
-Wants=network-online.target
-
-[Service]
-Type=simple
-User=wzp
-Group=wzp
-ExecStart=/usr/local/bin/wzp-relay --config /etc/wzp/relay.toml
-Restart=always
-RestartSec=5
-LimitNOFILE=65536
-
-# Security hardening
-NoNewPrivileges=yes
-ProtectSystem=strict
-ProtectHome=yes
-ReadWritePaths=/var/lib/wzp
-PrivateTmp=yes
-
-Environment=HOME=/var/lib/wzp
-Environment=RUST_LOG=info
-
-[Install]
-WantedBy=multi-user.target
-```
-
-Setup:
-
-```bash
-# Create service user
-useradd --system --home-dir /var/lib/wzp --create-home wzp
-
-# Install binary and config
-cp target/release/wzp-relay /usr/local/bin/
-mkdir -p /etc/wzp
-cp relay.toml /etc/wzp/
-
-# Enable and start
-systemctl daemon-reload
-systemctl enable --now wzp-relay
-journalctl -u wzp-relay -f
-```
-
-## TOML Configuration Reference
-
-All fields have defaults. A minimal config file only needs the fields you want to override.
-
-### Core Settings
-
-| Field | Type | Default | Description |
-|-------|------|---------|-------------|
-| `listen_addr` | string (socket addr) | `"0.0.0.0:4433"` | UDP address to listen on for incoming QUIC connections |
-| `remote_relay` | string (socket addr) | none | Remote relay address for forward mode. Disables room mode when set |
-| `max_sessions` | integer | `100` | Maximum concurrent client sessions |
-| `log_level` | string | `"info"` | Logging level: trace, debug, info, warn, error |
-
-### Jitter Buffer
-
-| Field | Type | Default | Description |
-|-------|------|---------|-------------|
-| `jitter_target_depth` | integer | `50` | Target buffer depth in packets (50 = 1 second at 20ms frames) |
-| `jitter_max_depth` | integer | `250` | Maximum buffer depth in packets (250 = 5 seconds) |
-
-### Authentication
-
-| Field | Type | Default | Description |
-|-------|------|---------|-------------|
-| `auth_url` | string | none | featherChat auth validation URL. When set, clients must send a bearer token as their first signal message. The relay validates it via `POST <auth_url>` |
-
-### Metrics and Monitoring
-
-| Field | Type | Default | Description |
-|-------|------|---------|-------------|
-| `metrics_port` | integer | none | Port for the Prometheus HTTP metrics endpoint. Disabled if not set |
-| `probe_targets` | array of socket addrs | `[]` | Peer relay addresses to probe for health monitoring (1 Ping/s each) |
-| `probe_mesh` | boolean | `false` | Enable mesh mode for probe targets |
-
-### Media Processing
-
-| Field | Type | Default | Description |
-|-------|------|---------|-------------|
-| `trunking_enabled` | boolean | `false` | Enable trunk batching for outgoing media. Packs multiple session packets into one QUIC datagram, reducing overhead |
-
-### WebSocket / Browser Support
-
-| Field | Type | Default | Description |
-|-------|------|---------|-------------|
-| `ws_port` | integer | none | Port for WebSocket listener (browser clients). Disabled if not set |
-| `static_dir` | string | none | Directory to serve static files (HTML/JS/WASM) |
-
-### Federation
-
-| Field | Type | Default | Description |
-|-------|------|---------|-------------|
-| `peers` | array of PeerConfig | `[]` | Outbound federation peer relays |
-| `trusted` | array of TrustedConfig | `[]` | Inbound federation trust list |
-| `global_rooms` | array of GlobalRoomConfig | `[]` | Room names to bridge across federation |
-
-### Debugging
-
-| Field | Type | Default | Description |
-|-------|------|---------|-------------|
-| `debug_tap` | string | none | Log packet headers for matching rooms. Use `"*"` for all rooms, or a specific room name |
-
-### PeerConfig Fields
-
-| Field | Type | Required | Description |
-|-------|------|----------|-------------|
-| `url` | string | yes | Address of the peer relay (e.g., `"193.180.213.68:4433"`) |
-| `fingerprint` | string | yes | Expected TLS certificate fingerprint (hex with colons) |
-| `label` | string | no | Human-readable label for logging |
-
-### TrustedConfig Fields
-
-| Field | Type | Required | Description |
-|-------|------|----------|-------------|
-| `fingerprint` | string | yes | Expected TLS certificate fingerprint (hex with colons) |
-| `label` | string | no | Human-readable label for logging |
-
-### GlobalRoomConfig Fields
-
-| Field | Type | Required | Description |
-|-------|------|----------|-------------|
-| `name` | string | yes | Room name to bridge across federation (e.g., `"android"`) |
-
-## CLI Flags Reference
-
-```
-wzp-relay [--config <path>] [--listen <addr>] [--remote <addr>]
-          [--auth-url <url>] [--metrics-port <port>]
-          [--probe <addr>]... [--probe-mesh] [--mesh-status]
-          [--trunking] [--global-room <name>]...
-          [--debug-tap <room>]
-          [--ws-port <port>] [--static-dir <dir>]
-```
-
-| Flag | Description |
-|------|-------------|
-| `--config <path>` | Load configuration from TOML file. CLI flags override config file values |
-| `--listen <addr>` | Listen address (default: `0.0.0.0:4433`) |
-| `--remote <addr>` | Remote relay for forwarding mode. Disables room mode |
-| `--auth-url <url>` | featherChat auth endpoint (e.g., `https://chat.example.com/v1/auth/validate`) |
-| `--metrics-port <port>` | Prometheus metrics HTTP port (e.g., `9090`) |
-| `--probe <addr>` | Peer relay to probe for health monitoring. Repeatable |
-| `--probe-mesh` | Enable mesh mode for probes |
-| `--mesh-status` | Print mesh health table and exit (diagnostic) |
-| `--trunking` | Enable trunk batching for outgoing media |
-| `--global-room <name>` | Declare a room as global (bridged across federation). Repeatable |
-| `--debug-tap <room>` | Log packet headers for a room (`"*"` for all rooms) |
-| `--event-log <path>` | Write JSONL protocol event log for federation debugging |
-| `--version`, `-V` | Print build git hash and exit |
-| `--ws-port <port>` | WebSocket listener port for browser clients |
-| `--static-dir <dir>` | Directory to serve static files from |
-| `--help`, `-h` | Print help and exit |
-
-CLI flags always override config file values when both are specified.
-
-## Federation Setup
-
-### Concepts
-
-- **`[[peers]]`** -- outbound: relays we connect TO. Requires address + fingerprint
-- **`[[trusted]]`** -- inbound: relays we accept connections FROM. Requires fingerprint only (they connect to us)
-- **`[[global_rooms]]`** -- rooms bridged across all federated peers. Participants on different relays in the same global room hear each other
-
-### Getting Your Relay's Fingerprint
-
-When a relay starts, it logs its TLS fingerprint:
-
-```
-INFO TLS certificate (deterministic from relay identity) tls_fingerprint="a5d6:e3c6:5ae7:185c:4eb1:af89:daed:4a43"
-INFO federation: to peer with this relay, add to relay.toml:
-INFO   [[peers]]
-INFO   url = "193.180.213.68:4433"
-INFO   fingerprint = "a5d6:e3c6:5ae7:185c:4eb1:af89:daed:4a43"
-```
-
-Share this information with the administrator of the peer relay.
-
-### Unknown Peer Connections
-
-When an unknown relay tries to federate, the log shows:
-
-```
-WARN unknown relay wants to federate addr=10.0.0.5:12345 fp="7f2a:b391:0c44:..."
-INFO   to accept, add to relay.toml:
-INFO   [[trusted]]
-INFO   fingerprint = "7f2a:b391:0c44:..."
-INFO   label = "Relay at 10.0.0.5:12345"
-```
-
-## Example Configurations
-
-### Single Relay (Minimal)
-
-```toml
-# /etc/wzp/relay.toml
-# Minimal config -- all defaults, just enable metrics
-metrics_port = 9090
-```
-
-Run:
-
-```bash
-wzp-relay --config /etc/wzp/relay.toml
-```
-
-### Single Relay (Full Featured)
-
-```toml
-# /etc/wzp/relay.toml
-listen_addr = "0.0.0.0:4433"
-max_sessions = 200
-log_level = "info"
-
-# Metrics
-metrics_port = 9090
-
-# Authentication
-auth_url = "https://chat.example.com/v1/auth/validate"
-
-# Browser support
-ws_port = 8080
-static_dir = "/opt/wzp/web"
-
-# Performance
-trunking_enabled = true
-
-# Jitter buffer tuning
-jitter_target_depth = 50
-jitter_max_depth = 250
-```
-
-### Two-Relay Federation
-
-**Relay A** (`relay-a.toml` on 193.180.213.68):
-
-```toml
-listen_addr = "0.0.0.0:4433"
-metrics_port = 9090
-
-# Outbound: connect to Relay B
-[[peers]]
-url = "10.0.0.5:4433"
-fingerprint = "7f2a:b391:0c44:9e1d:a8b2:c5d7:e3f0:1234"
-label = "Relay B (US)"
-
-# Accept inbound from Relay B
-[[trusted]]
-fingerprint = "7f2a:b391:0c44:9e1d:a8b2:c5d7:e3f0:1234"
-label = "Relay B (US)"
-
-# Bridge these rooms
-[[global_rooms]]
-name = "android"
-
-[[global_rooms]]
-name = "general"
-```
-
-**Relay B** (`relay-b.toml` on 10.0.0.5):
-
-```toml
-listen_addr = "0.0.0.0:4433"
-metrics_port = 9090
-
-# Outbound: connect to Relay A
-[[peers]]
-url = "193.180.213.68:4433"
-fingerprint = "a5d6:e3c6:5ae7:185c:4eb1:af89:daed:4a43"
-label = "Relay A (EU)"
-
-# Accept inbound from Relay A
-[[trusted]]
-fingerprint = "a5d6:e3c6:5ae7:185c:4eb1:af89:daed:4a43"
-label = "Relay A (EU)"
-
-# Same global rooms
-[[global_rooms]]
-name = "android"
-
-[[global_rooms]]
-name = "general"
-```
-
-### Three-Relay Chain (Full Mesh)
-
-For three relays (A, B, C) in full mesh federation, each relay needs peers and trusted entries for the other two:
-
-**Relay A** (EU):
-
-```toml
-listen_addr = "0.0.0.0:4433"
-metrics_port = 9090
-
-# Probe all peers
-probe_targets = ["10.0.0.5:4433", "10.0.0.9:4433"]
-probe_mesh = true
-
-# Peers
-[[peers]]
-url = "10.0.0.5:4433"
-fingerprint = "7f2a:b391:0c44:9e1d:a8b2:c5d7:e3f0:1234"
-label = "Relay B (US)"
-
-[[peers]]
-url = "10.0.0.9:4433"
-fingerprint = "3c8e:d2a1:f7b5:6049:81c3:e9d4:a2f6:5678"
-label = "Relay C (APAC)"
-
-# Trust
-[[trusted]]
-fingerprint = "7f2a:b391:0c44:9e1d:a8b2:c5d7:e3f0:1234"
-label = "Relay B (US)"
-
-[[trusted]]
-fingerprint = "3c8e:d2a1:f7b5:6049:81c3:e9d4:a2f6:5678"
-label = "Relay C (APAC)"
-
-# Global rooms
-[[global_rooms]]
-name = "android"
-
-[[global_rooms]]
-name = "general"
-```
-
-**Relay B** and **Relay C** follow the same pattern, listing the other two relays in their `[[peers]]` and `[[trusted]]` sections.
-
-## Monitoring
-
-### Prometheus Metrics
-
-Enable with `--metrics-port <port>` or `metrics_port` in TOML. The relay exposes metrics at `GET /metrics` on the specified HTTP port.
-
-#### Relay Metrics
-
-| Metric | Type | Labels | Description |
-|--------|------|--------|-------------|
-| `wzp_relay_active_sessions` | Gauge | -- | Current active sessions |
-| `wzp_relay_active_rooms` | Gauge | -- | Current active rooms |
-| `wzp_relay_packets_forwarded_total` | Counter | `room` | Total packets forwarded |
-| `wzp_relay_bytes_forwarded_total` | Counter | `room` | Total bytes forwarded |
-| `wzp_relay_auth_attempts_total` | Counter | `result` (ok/fail) | Auth validation attempts |
-| `wzp_relay_handshake_duration_seconds` | Histogram | -- | Crypto handshake time |
-
-#### Per-Session Metrics
-
-| Metric | Type | Labels | Description |
-|--------|------|--------|-------------|
-| `wzp_relay_session_jitter_buffer_depth` | Gauge | `session_id` | Buffer depth per session |
-| `wzp_relay_session_loss_pct` | Gauge | `session_id` | Packet loss percentage |
-| `wzp_relay_session_rtt_ms` | Gauge | `session_id` | Round-trip time |
-| `wzp_relay_session_underruns_total` | Counter | `session_id` | Jitter buffer underruns |
-| `wzp_relay_session_overruns_total` | Counter | `session_id` | Jitter buffer overruns |
-
-#### Inter-Relay Probe Metrics
-
-| Metric | Type | Labels | Description |
-|--------|------|--------|-------------|
-| `wzp_probe_rtt_ms` | Gauge | `target` | RTT to peer relay |
-| `wzp_probe_loss_pct` | Gauge | `target` | Loss to peer relay |
-| `wzp_probe_jitter_ms` | Gauge | `target` | Jitter to peer relay |
-| `wzp_probe_up` | Gauge | `target` | 1 if reachable, 0 if not |
-
-### Prometheus Scrape Config
-
-```yaml
-# prometheus.yml
-scrape_configs:
-  - job_name: 'wzp-relay'
-    static_configs:
-      - targets:
-        - 'relay-a:9090'
-        - 'relay-b:9090'
-    scrape_interval: 10s
-```
-
-### Grafana Dashboard
-
-A pre-built dashboard is available at `docs/grafana-dashboard.json`. Import it into Grafana for:
-
-1. **Relay Health** -- active sessions, rooms, packets/s, bytes/s
-2. **Call Quality** -- per-session jitter depth, loss%, RTT, underruns over time
-3. **Inter-Relay Mesh** -- latency heatmap, probe status, loss trends
-4. **Web Bridge** -- active connections, frames bridged, auth failures
-
-### Event Log (Protocol Analyzer)
-
-Use `--event-log` to write a JSONL event log that traces every federation media packet through the relay pipeline. Essential for debugging federation audio issues.
-
-```bash
-wzp-relay --config relay.toml --event-log /tmp/events.jsonl
-```
-
-Each media packet emits events at every decision point:
-- `federation_ingress` — packet arrived from a peer relay
-- `local_deliver` — packet delivered to local participants
-- `dedup_drop` — packet dropped as duplicate
-- `rate_limit_drop` — packet dropped by rate limiter
-- `room_not_found` — packet for unknown room
-- `local_deliver_error` — delivery to local client failed
-
-Analyze with:
-```bash
-# Count events by type
-cat events.jsonl | python3 -c "
-import json, collections, sys
-c = collections.Counter()
-for l in sys.stdin: c[json.loads(l)['event']] += 1
-for k,v in sorted(c.items(), key=lambda x:-x[1]): print(f'  {k}: {v}')
-"
-```
-
-### Remote Version Check
-
-Verify a deployed relay's version without SSH:
-
-```bash
-wzp-client --version-check <relay-addr:port>
-```
-
-### Debug Tap
-
-Use `--debug-tap` to log packet headers for debugging:
-
-```bash
-# Log headers for room "android"
-wzp-relay --debug-tap android
-
-# Log headers for all rooms
-wzp-relay --debug-tap '*'
-```
-
-Or in TOML:
-
-```toml
-debug_tap = "android"
-```
-
-### Mesh Status
-
-Print the current mesh health table (diagnostic):
-
-```bash
-wzp-relay --mesh-status
-```
-
-## Authentication
-
-### featherChat Token Validation
-
-When `--auth-url` is set, the relay requires clients to send an `AuthToken` signal message as their first message after QUIC connection. The relay validates the token by calling:
-
-```
-POST <auth_url>
-Content-Type: application/json
-Authorization: Bearer <token>
-```
-
-Expected response:
-
-```json
-{
-  "valid": true,
-  "fingerprint": "a5d6:e3c6:...",
-  "alias": "username"
-}
-```
-
-If validation fails, the client is disconnected.
-
-### Without Authentication
-
-When `--auth-url` is not set, any client can connect. The relay logs:
-
-```
-INFO auth disabled -- any client can connect (use --auth-url to enable)
-```
-
-## Identity Persistence
-
-### Relay Identity File
-
-The relay stores its identity seed at `~/.wzp/relay-identity` (a 64-character hex string). This seed:
-
-- Is generated automatically on first run
-- Persists across restarts
-- Derives the relay's Ed25519 signing key and X25519 key agreement key
-- Derives the TLS certificate deterministically (same seed = same cert = same fingerprint)
-
-If the identity file is corrupted, the relay generates a new one and logs a warning. This will change the relay's TLS fingerprint, requiring federation peers to update their config.
-
-### Backup
-
-Back up the identity file to preserve the relay's fingerprint:
-
-```bash
-cp ~/.wzp/relay-identity /secure/backup/relay-identity
-```
-
-To restore, copy the file back before starting the relay.
-
-## Troubleshooting
-
-### Common Issues
-
-| Problem | Cause | Solution |
-|---------|-------|---------|
-| "unknown argument" on startup | Unrecognized CLI flag | Check `wzp-relay --help` for valid flags |
-| "failed to load config" | Invalid TOML syntax | Validate TOML file with `toml-cli` or similar |
-| "auth failed" for all clients | Wrong `auth_url` or featherChat server down | Verify URL is reachable: `curl -X POST <auth_url>` |
-| "session rejected" | Max sessions reached | Increase `max_sessions` in config |
-| Clients cannot connect | Firewall blocking UDP 4433 | Open UDP port 4433 in firewall |
-| Federation "unknown relay wants to federate" | Peer's fingerprint not in `[[trusted]]` | Add the logged fingerprint to `[[trusted]]` |
-| Federation "fingerprint mismatch" | Peer relay restarted with new identity | Update the fingerprint in `[[peers]]` config |
-| Federation audio silent on consecutive connects | Dedup filter or jitter buffer state | Verify relay is running latest build with time-based dedup |
-| Federation participant shows wrong relay label | Hub relay not propagating original labels | Update relay to latest build (label preservation fix) |
-| Federation disconnect takes >15 seconds | QUIC idle timeout + stale sweeper | Normal: sweeper runs every 5s with 15s TTL. Use latest client with SIGTERM handler for instant disconnect |
-| High packet loss between relays | Network congestion or misconfiguration | Check `wzp_probe_loss_pct` metric; consider relay chaining |
-| Jitter buffer overruns | Packets arriving faster than playout | Increase `jitter_max_depth` |
-| Jitter buffer underruns | Packets arriving too slowly or lost | Check network quality; increase `jitter_target_depth` |
-| "probe connection closed" | Peer relay unreachable or crashed | Check peer relay status; will auto-reconnect |
-| WebSocket clients cannot connect | `ws_port` not set | Add `--ws-port <port>` or `ws_port` in TOML |
-| Browser mic access denied | Not using HTTPS | Use TLS termination in front of the relay or serve via `wzp-web --tls` |
-
-### Log Level Tuning
-
-Set `RUST_LOG` environment variable for fine-grained control:
-
-```bash
-# All relay logs at debug level
-RUST_LOG=debug wzp-relay
-
-# Only federation at trace, everything else at info
-RUST_LOG=info,wzp_relay::federation=trace wzp-relay
-
-# Quiet mode -- only warnings and errors
-RUST_LOG=warn wzp-relay
-```
-
-### Health Checks
-
-```bash
-# Check if relay is listening
-nc -zu relay-host 4433
-
-# Check metrics endpoint
-curl -s http://relay-host:9090/metrics | head -20
-
-# Check active sessions
-curl -s http://relay-host:9090/metrics | grep wzp_relay_active_sessions
-
-# Check federation probe health
-curl -s http://relay-host:9090/metrics | grep wzp_probe_up
-```
-
-## Build Pipelines
-
-All production artifacts (Android APK, Linux x86_64 binaries, Windows `.exe`) are built on **SepehrHomeserverdk** using Docker, not on developer workstations. The pipelines are fire-and-forget: a local script invokes a `tmux` session on the remote, the build runs in a Docker container, and the artifact is uploaded to `paste.dk.manko.yoga` (rustypaste) with a notification sent to `ntfy.sh/wzp` on start and completion.
-
-### Docker images
-
-Two long-lived images live on the remote:
-
-| Image | Used by | Base | Key contents |
-|---|---|---|---|
-| `wzp-android-builder` | Android APK (Tauri mobile + legacy Kotlin), Linux x86_64 relay/CLI | Debian bookworm | Rust stable with Android targets, cargo-ndk, NDK 26.1, Android SDK (API 34 + 35 + 36), JDK 17, Gradle 8.5, Node.js 20, cmake, ninja, tauri-cli 2.x |
-| `wzp-windows-builder` | Windows x86_64 `.exe` | Debian bookworm | Rust stable with `x86_64-pc-windows-msvc` target, cargo-xwin (with pre-warmed MSVC CRT + Windows SDK cache), Node.js 20, cmake, ninja, clang, lld, nasm |
-
-Both images are rebuilt rarely — once the base toolchain is stable, rebuilds are only needed to pick up new dependencies or security patches.
-
-**Rebuilding an image** (fire-and-forget, ~10 min on a warm base):
-
-```bash
-# Windows
-./scripts/build-windows-docker.sh --image-build
-
-# Android (upload and rebuild handled by the Android build script itself — see
-# its --image-build flag or equivalent)
-```
-
-The `--image-build` flag uploads the local Dockerfile to the remote, kicks off `docker build` under `nohup`, and returns immediately. Monitor with:
-
-```bash
-ssh SepehrHomeserverdk 'tail -f /tmp/wzp-windows-image-build.log'
-```
-
-### Pipeline: Android APK (Tauri Mobile)
-
-```bash
-./scripts/build-tauri-android.sh                  # Full: pull + build + upload + notify
-./scripts/build-tauri-android.sh --no-pull        # Skip git fetch
-./scripts/build-tauri-android.sh --clean          # Force-clean Rust target
-```
-
-- **Branch**: `android-rewrite`
-- **Image**: `wzp-android-builder`
-- **Build command**: `cargo tauri android build --release`
-- **Output**: `wzp-release.apk` → uploaded to rustypaste
-- **Notifications**: start + completion to `ntfy.sh/wzp`
-- **Remote artifact path**: `/mnt/storage/manBuilder/data/cache-android/target/…/release/app-release.apk`
-
-### Pipeline: Linux x86_64 (relay + CLI + bench + web)
-
-```bash
-./scripts/build-linux-docker.sh                   # Fire-and-forget
-./scripts/build-linux-docker.sh --no-pull         # Skip git fetch
-./scripts/build-linux-docker.sh --clean           # Force-clean target
-./scripts/build-linux-docker.sh --install         # Wait for completion and download locally
-```
-
-- **Branch**: `feat/android-voip-client` (script default — override by editing the script or passing an env var)
-- **Image**: `wzp-android-builder` (shared, not a separate Linux-only image)
-- **Targets built**: `wzp-relay`, `wzp-client`, `wzp-client-audio` (with `--features audio`), `wzp-web`, `wzp-bench`
-- **Output**: `wzp-linux-x86_64.tar.gz` with all five binaries → uploaded to rustypaste
-- **Local landing dir** (with `--install`): `target/linux-x86_64/`
-
-### Pipeline: Windows x86_64 (`wzp-desktop.exe`)
-
-```bash
-./scripts/build-windows-docker.sh                 # Full: pull + build + download locally
-./scripts/build-windows-docker.sh --no-pull       # Skip git fetch
-./scripts/build-windows-docker.sh --rust          # Force-clean target-windows cache
-./scripts/build-windows-docker.sh --image-build   # Rebuild the Docker image (fire-and-forget)
-```
-
-- **Branch**: `feat/desktop-audio-rewrite`
-- **Image**: `wzp-windows-builder`
-- **Build command**: `cargo xwin build --release --target x86_64-pc-windows-msvc --bin wzp-desktop`
-- **Output**: `wzp-desktop.exe` (~16 MB) → downloaded to `target/windows-exe/wzp-desktop.exe`, also uploaded to rustypaste
-- **Target cache volume**: `target-windows` (separate from the Android target cache to avoid triple cross-contamination)
-- **Shared cache volumes**: `cargo-registry`, `cargo-git` (shared with Android — both pipelines pull the same crates)
-
-**A/B-preserving workflow** for testing audio backends: rename the prior `.exe` before re-running the build, so both coexist:
-
-```bash
-# Preserve prior build as the noAEC baseline
-mv target/windows-exe/wzp-desktop.exe target/windows-exe/wzp-desktop-noAEC.exe
-./scripts/build-windows-docker.sh
-ls -la target/windows-exe/
-# wzp-desktop-noAEC.exe  (previous build)
-# wzp-desktop.exe        (new build)
-```
-
-### Alternative pipeline: Windows via Hetzner Cloud VPS
-
-For situations where Docker image rebuilds would be disruptive, or for one-shot debug builds on a clean machine:
-
-```bash
-./scripts/build-windows-cloud.sh                  # Full: create VM → build → download → destroy
-./scripts/build-windows-cloud.sh --prepare        # Create VM + install deps, don't build
-./scripts/build-windows-cloud.sh --build          # Build on existing VM
-./scripts/build-windows-cloud.sh --transfer       # Download .exe from existing VM
-./scripts/build-windows-cloud.sh --destroy        # Delete the VM
-WZP_KEEP_VM=1 ./scripts/build-windows-cloud.sh    # Don't auto-destroy after successful build
-```
-
-- **Provider**: Hetzner Cloud
-- **Default server type**: `cx33` (8 GB RAM, 8 vCPU — `cx23` with 4 GB OOMs on the tauri+rustls cross-compile)
-- **Image**: `ubuntu-24.04`
-- **SSH key**: must be named `wz` in Hetzner and loaded in the local ssh-agent
-- **Reminder**: set `WZP_KEEP_VM=1` for multi-build sessions, then **remember to `--destroy` at end of day** so the VM isn't left running overnight. This is tracked in the auto-memory as `feedback_keep_windows_builder_vm.md`.
-
-### Notifications
-
-All pipelines post to `https://ntfy.sh/wzp`. Subscribe from your phone via the [ntfy.sh app](https://ntfy.sh/) to get push notifications on build start/success/failure. Messages include the short git hash and the rustypaste URL on success:
-
-```
-WZP Windows build OK [03a80a3] (16M)
-https://paste.dk.manko.yoga/<uuid>/wzp-desktop.exe
-```
-
-### Rustypaste credentials
-
-Build pipelines read `rusty_address` and `rusty_auth_token` from the `.env` file at `/mnt/storage/manBuilder/.env` on SepehrHomeserverdk. Local scripts that upload directly (`build-windows-cloud.sh` when run in `--transfer` mode) read from `~/.wzp/rustypaste.env` with the same variable names. Both files must be kept in sync manually if rotated.

docs/BRANCH-desktop-audio-rewrite.md

@@ -1,164 +0,0 @@
-# Branch: `feat/desktop-audio-rewrite`
-
-Home of the Tauri desktop client for macOS, Windows, and Linux. Named "audio-rewrite" because the original driver was replacing a CPAL-only audio pipeline with platform-native backends that support OS-level echo cancellation (VoiceProcessingIO on macOS, WASAPI Communications on Windows), but the branch has grown into the full desktop story — Windows cross-compilation, vendored dependencies, history UI, direct calling, the whole thing.
-
-## Purpose
-
-The desktop client shares 100% of its frontend (`desktop/src/`) and Tauri command layer (`desktop/src-tauri/src/lib.rs`, `engine.rs`, `history.rs`) with the Android build on `android-rewrite`. Differences are limited to:
-
-- **Audio backends**, which are platform-gated via Cargo target-dep sections in `desktop/src-tauri/Cargo.toml` and feature flags in `crates/wzp-client/Cargo.toml`.
-- **Identity storage paths**, which resolve via Tauri's `app_data_dir()` (`~/Library/Application Support/…` on macOS, `%APPDATA%\…` on Windows, `~/.local/share/…` on Linux).
-- **Build toolchains**: native `cargo build` on macOS/Linux, `cargo xwin` cross-compile from Linux for Windows via Docker on SepehrHomeserverdk.
-
-## Audio backend matrix
-
-| Target | Capture | Playback | AEC |
-|---|---|---|---|
-| macOS | CPAL (WASAPI/CoreAudio via cpal crate) OR VoiceProcessingIO (native Core Audio) | CPAL | VoiceProcessingIO native AEC (when `vpio` feature enabled) |
-| Windows (default) | CPAL → WASAPI shared mode | CPAL → WASAPI shared mode | None |
-| Windows (AEC build) | Direct WASAPI with `IAudioClient2::SetClientProperties(AudioCategory_Communications)` | CPAL → WASAPI shared mode | **OS-level**: Windows routes the capture stream through the driver's communications APO chain (AEC + NS + AGC) |
-| Linux | CPAL → ALSA/PulseAudio | CPAL → ALSA/PulseAudio | None |
-
-The macOS VPIO path is gated behind the `vpio` feature in `wzp-client` and the `coreaudio-rs` dep is itself `cfg(target_os = "macos")`, so enabling the feature on Windows or Linux is a no-op.
-
-The Windows AEC path is gated behind the `windows-aec` feature, also target-gated (the `windows` crate dep is only pulled in on Windows), and re-exports `WasapiAudioCapture as AudioCapture` when enabled so downstream code doesn't need to know which backend is active. The current Windows build at `target/windows-exe/wzp-desktop.exe` has `windows-aec` on; a baseline noAEC build is preserved at `target/windows-exe/wzp-desktop-noAEC.exe` for A/B comparison on real hardware.
-
-See [`BRANCH-android-rewrite.md`](BRANCH-android-rewrite.md) for Oboe audio on Android, which is its own story.
-
-## Recent major work
-
-### 1. Desktop direct calling feature (commit `2fd9465` and neighbors)
-
-Brought direct 1:1 calls to macOS with full parity to the Android client:
-
-- **Identity path fix**: the desktop `CallEngine::start` was loading seed from `$HOME/.wzp/identity` while `register_signal` used Tauri's `app_data_dir()`, producing two different fingerprints per run. Both now route through `load_or_create_seed()` which uses `app_data_dir()` everywhere.
-- **Call history with dedup**: `history.rs` stores a `Vec<CallHistoryEntry>` with a `CallDirection` enum (`Placed | Received | Missed`). The `log` function dedupes by `call_id` so an outgoing call isn't logged twice as "missed" (when the signal loop's `DirectCallOffer` handler fires) and then again as "placed" (when `place_call` returns). Instead the entry is updated in place.
-- **Recent contacts row**: a horizontal chip UI in the direct-call panel showing the last N peers with friendly aliases, clickable to re-dial.
-- **Deregister button**: lets a user drop their signal registration without quitting the app, useful when switching identities.
-- **Random alias derivation**: a new client sees a human-friendly alias like "silent-forest-41" derived deterministically from its seed, so it's identifiable in the UI before manual naming.
-- **Default room "general"** instead of "android", since the desktop client is not Android.
-
-### 2. macOS VoiceProcessingIO integration
-
-`crates/wzp-client/src/audio_vpio.rs` — a native Core Audio implementation using `AUGraph` + `AudioComponentInstance` with the VPIO audio unit. Gives you hardware-accelerated AEC (same AEC Apple ships in FaceTime / iMessage audio / voice memos) at the cost of tight coupling to Apple frameworks. Lock-free ring pattern matches the CPAL path so the upper layers don't notice the difference.
-
-Enabled by `features = ["audio", "vpio"]` in the macOS target section of `desktop/src-tauri/Cargo.toml`.
-
-### 3. Windows cross-compilation via cargo-xwin
-
-Cross-compiling Rust + Tauri to `x86_64-pc-windows-msvc` from Linux using `cargo-xwin`, which downloads the Microsoft CRT + Windows SDK on demand and drives `clang-cl` as the compiler. No Windows machine is needed for the build itself — only for runtime testing.
-
-**Build infrastructure**:
-
-- `scripts/Dockerfile.windows-builder` — Debian bookworm + Rust + cargo-xwin + Node 20 + cmake + ninja + llvm + clang + lld + nasm. Pre-warms the xwin MSVC CRT cache at image build time (saves ~4 minutes per cold build).
-- `scripts/build-windows-docker.sh` — fire-and-forget remote build via Docker on SepehrHomeserverdk. Same pattern as `build-tauri-android.sh`. Uploads the `.exe` to rustypaste and fires an `ntfy.sh/wzp` notification on start and on completion.
-- `scripts/build-windows-cloud.sh` — alternative pipeline using a temporary Hetzner Cloud VPS. Slower (full VM spin-up), more expensive, but useful when Docker image rebuilds would be disruptive.
-
-**Two critical blockers resolved** on the way to a working `.exe`:
-
-1. **libopus SSE4.1 / SSSE3 intrinsic compile failure**. `audiopus_sys` vendors libopus 1.3.1, whose `CMakeLists.txt` gates the per-file `-msse4.1` `COMPILE_FLAGS` behind `if(NOT MSVC)`. Under `clang-cl`, CMake sets `MSVC=1` (because `CMAKE_C_COMPILER_FRONTEND_VARIANT=MSVC` triggers `Platform/Windows-MSVC.cmake` which unconditionally sets the variable), so the per-file flag is never set and the SSE4.1 source files compile without the target feature — then fail with 20+ "always_inline function '_mm_cvtepi16_epi32' requires target feature 'sse4.1'" errors.
-
-   Fixed by **vendoring audiopus_sys into `vendor/audiopus_sys/`** and patching its bundled libopus to introduce an `MSVC_CL` variable that is true only for real `cl.exe` (distinguished via `CMAKE_C_COMPILER_ID STREQUAL "MSVC"`). The eight `if(NOT MSVC)` SIMD guards are flipped to `if(NOT MSVC_CL)` and the global `/arch` block at line 445 becomes `if(MSVC_CL)`, so clang-cl gets the GCC-style per-file flags while real cl.exe keeps the `/arch:AVX` / `/arch:SSE2` globals.
-
-   Wired in via `[patch.crates-io] audiopus_sys = { path = "vendor/audiopus_sys" }` at the workspace root.
-
-   Upstream tracking: [xiph/opus#256](https://github.com/xiph/opus/issues/256), [xiph/opus PR #257](https://github.com/xiph/opus/pull/257) (both stale).
-
-2. **tauri-build needs `icons/icon.ico` for the Windows PE resource**. The desktop only had `icon.png`. Generated a multi-size ICO (16/24/32/48/64/128/256) from the existing placeholder via Pillow and committed it. Placeholder quality — real branded icons can replace it later.
-
-### 4. Windows `AudioCategory_Communications` capture path (task #24)
-
-`crates/wzp-client/src/audio_wasapi.rs` — direct WASAPI capture via `IMMDeviceEnumerator → IAudioClient2 → SetClientProperties` with `AudioCategory_Communications`. This tells Windows "this is a VoIP call" and Windows routes the capture stream through the driver's registered communications APO chain, which on most Win10/11 consumer hardware includes AEC, NS, and AGC.
-
-**Caveat**: quality is driver-dependent. On a machine with a good communications APO (Intel Smart Sound, Dolby, modern Realtek on Win11 24H2+, anything with Voice Clarity enabled) it's excellent. On generic class-compliant drivers with no communications APO registered, it's a no-op. For a guaranteed AEC regardless of driver, see task #26 which tracks implementing the classic Voice Capture DSP (`CLSID_CWMAudioAEC`) as a fallback.
-
-Gated behind the `windows-aec` feature in `wzp-client`. Enabled by default in the Windows target section of `desktop/src-tauri/Cargo.toml`.
-
-## Build pipelines
-
-### Native macOS / Linux
-
-```bash
-cd desktop
-npm install
-npm run build
-cd src-tauri
-cargo build --release --bin wzp-desktop
-```
-
-### Windows x86_64 via Docker on SepehrHomeserverdk
-
-```bash
-./scripts/build-windows-docker.sh                 # Full: pull + build + download
-./scripts/build-windows-docker.sh --no-pull       # Skip git fetch
-./scripts/build-windows-docker.sh --rust          # Force-clean Rust target
-./scripts/build-windows-docker.sh --image-build   # (Re)build the Docker image (fire-and-forget)
-```
-
-Output lands at `target/windows-exe/wzp-desktop.exe`. Both `wzp-desktop.exe` and `wzp-desktop-noAEC.exe` can coexist in that directory; the script writes `wzp-desktop.exe` so renaming the prior build to `-noAEC.exe` (or any other name) before rebuilding preserves it.
-
-### Windows x86_64 via Hetzner Cloud (alternative)
-
-```bash
-./scripts/build-windows-cloud.sh                  # Full: create VM → build → download → destroy
-./scripts/build-windows-cloud.sh --prepare        # Create VM and install deps only
-./scripts/build-windows-cloud.sh --build          # Build on existing VM
-./scripts/build-windows-cloud.sh --destroy        # Delete the VM
-WZP_KEEP_VM=1 ./scripts/build-windows-cloud.sh    # Keep VM alive after build for debug
-```
-
-Remember to destroy the VM at end of day with `--destroy`.
-
-### Linux x86_64 (relay + CLI + bench)
-
-```bash
-./scripts/build-linux-docker.sh                   # Fire-and-forget remote Docker build
-./scripts/build-linux-docker.sh --install         # Wait for completion and download
-```
-
-Uses the same `wzp-android-builder` Docker image as Android (not a separate image), since the deps (Rust + cmake + ring prereqs) are the same.
-
-## Testing
-
-### Direct calling parity
-
-1. Build on two machines (macOS + Windows, or two macOS, or any combination).
-2. Both machines register on the same relay.
-3. Copy one machine's fingerprint into the other's direct-call panel.
-4. Place the call. Confirm ringing UI on the callee and "calling…" UI on the caller.
-5. Answer. Confirm audio flows both ways.
-6. Hang up from either side. Confirm call-history entries are labeled correctly (`Outgoing` on caller, `Incoming` on callee, never `Missed` on a successful call).
-
-### Windows AEC A/B
-
-1. Install `wzp-desktop-noAEC.exe` and `wzp-desktop.exe` on the same Windows box.
-2. Join a call from each (separately) while a second machine plays known audio through the first machine's speakers.
-3. On the remote (listening) side: the `noAEC` call should have clear audible echo; the AEC call should have minimal or no echo after a 1–2 s convergence period.
-4. If both builds sound identical (with echo) → the `AudioCategory_Communications` switch isn't triggering the driver's APO chain. Investigate via task #26 (Voice Capture DSP fallback).
-
-## Known quirks
-
-1. **libopus vendor path is workspace-relative**. `[patch.crates-io] audiopus_sys = { path = "vendor/audiopus_sys" }` works from any crate in the workspace because Cargo resolves it against the root `Cargo.toml`'s directory. If the workspace is moved or vendored into another workspace, update the path.
-
-2. **`cargo xwin` overwrites `override.cmake` on every invocation**. Any attempt to patch `~/.cache/cargo-xwin/cmake/clang-cl/override.cmake` at Docker image build time is inert because `src/compiler/clang_cl.rs` line ~444 writes the bundled file fresh on every run. All real fixes must land in the source tree (via the vendored audiopus_sys, as done here), not in the cargo-xwin cache.
-
-3. **WebView2 runtime is a prerequisite on Windows 10**. Windows 11 ships with it. If the `.exe` launches and immediately exits with no error on a Win10 machine, that's the missing runtime — install it from [Microsoft's Evergreen bootstrapper](https://developer.microsoft.com/en-us/microsoft-edge/webview2/).
-
-4. **Rust 2024 edition `unsafe_op_in_unsafe_fn` lint**. The WASAPI backend in `audio_wasapi.rs` emits ~18 of these warnings because Rust 2024 requires explicit `unsafe { ... }` blocks inside `unsafe fn` bodies. The warnings don't block the build and don't affect runtime behavior; cleaning them up is tracked informally as tech debt.
-
-## Files of interest
-
-| Path | Purpose |
-|---|---|
-| `desktop/src/` | Shared frontend (TypeScript + HTML + CSS) |
-| `desktop/src-tauri/src/lib.rs` | Tauri commands shared with Android |
-| `desktop/src-tauri/src/engine.rs` | `CallEngine` wrapper |
-| `desktop/src-tauri/src/history.rs` | Persistent call history store with dedup |
-| `crates/wzp-client/src/audio_io.rs` | CPAL capture + playback (baseline) |
-| `crates/wzp-client/src/audio_vpio.rs` | macOS VoiceProcessingIO capture (AEC) |
-| `crates/wzp-client/src/audio_wasapi.rs` | Windows WASAPI communications capture (AEC) |
-| `vendor/audiopus_sys/opus/CMakeLists.txt` | Patched libopus for clang-cl SIMD |
-| `scripts/Dockerfile.windows-builder` | Windows cross-compile Docker image |
-| `scripts/build-windows-docker.sh` | Remote Docker build pipeline |
-| `scripts/build-windows-cloud.sh` | Hetzner VPS alternative pipeline |
-| `scripts/build-linux-docker.sh` | Linux x86_64 relay/CLI build pipeline |

docs/DESIGN.md

@@ -1,591 +1,168 @@
-# WarzonePhone Design Document
+# WarzonePhone Detailed Design Decisions
 
-> Custom encrypted VoIP protocol built in Rust. Designed for hostile network conditions: 5-70% packet loss, 100-500 kbps throughput, 300-800 ms RTT. Multi-platform: Desktop (Tauri), Android, CLI, Web.
+## Why Opus + Codec2 (Not Just One)
 
-## System Overview
+The dual-codec architecture is driven by the extreme range of network conditions WarzonePhone targets:
 
-WarzonePhone is a voice-over-IP system built from scratch in Rust, targeting reliable encrypted voice communication over severely degraded networks. The protocol uses adaptive codecs (Opus + Codec2), fountain-code FEC (RaptorQ), and end-to-end ChaCha20-Poly1305 encryption over a QUIC transport layer.
+**Opus** (24/16/6 kbps) is the clear choice for normal to degraded conditions. It offers excellent quality at moderate bitrates, has built-in inband FEC and DTX (discontinuous transmission), and the `audiopus` crate provides mature Rust bindings to libopus. Opus operates at 48 kHz natively.
 
-The system comprises three categories of components:
+**Codec2** (3200/1200 bps) is a narrowband vocoder designed specifically for HF radio links with extreme bandwidth constraints. At 1200 bps (1.2 kbps), it produces intelligible speech in only 6 bytes per 40ms frame -- roughly 20x lower bitrate than Opus at its minimum. The pure-Rust `codec2` crate means no C dependencies for this codec. Codec2 operates at 8 kHz, so the adaptive layer handles 48 kHz <-> 8 kHz resampling transparently.
 
-1. **Protocol crates** -- a Rust workspace of 7 library crates with a star dependency graph enabling parallel development
-2. **Client applications** -- Desktop (Tauri), Android (Kotlin + JNI), CLI, and Web (browser bridge)
-3. **Relay infrastructure** -- SFU relay daemons with federation, health probing, and Prometheus metrics
+The `AdaptiveEncoder`/`AdaptiveDecoder` in `crates/wzp-codec/src/adaptive.rs` hold both codec instances and switch between them based on the active `QualityProfile`. This avoids codec re-initialization latency during tier transitions.
 
-### Design Principles
+**Bandwidth comparison with FEC overhead:**
 
-- **User sovereignty** -- client-driven route selection, BIP39 identity backup, no central authority
-- **End-to-end encryption** -- relays never see plaintext audio; SFU forwarding preserves E2E encryption
-- **Adaptive resilience** -- automatic codec and FEC switching based on observed network quality
-- **Parallel development** -- star dependency graph allows 5 agents/developers to work simultaneously with zero merge conflicts
+| Tier | Codec Bitrate | FEC Ratio | Total Bandwidth |
+|------|--------------|-----------|----------------|
+| GOOD | 24 kbps | 20% | ~28.8 kbps |
+| DEGRADED | 6 kbps | 50% | ~9.0 kbps |
+| CATASTROPHIC | 1.2 kbps | 100% | ~2.4 kbps |
 
-## Architecture
+At the catastrophic tier, the entire call (audio + FEC + headers) fits within approximately 3 kbps, which is viable even over severely degraded links.
 
-### Crate Overview
+## Why RaptorQ Over Reed-Solomon
 
-The workspace contains 7 core crates plus integration binaries:
+**Reed-Solomon** is a classical block erasure code. It works well but has fixed-rate overhead: you must decide in advance how many repair symbols to generate, and decoding requires receiving exactly K of any K+R symbols.
 
-| Crate | Purpose | Key Dependencies |
-|-------|---------|-----------------|
-| `wzp-proto` | Protocol types, traits, wire format | serde, bytes |
-| `wzp-codec` | Audio codecs (Opus, Codec2, RNNoise) | audiopus, codec2, nnnoiseless |
-| `wzp-fec` | Forward error correction | raptorq |
-| `wzp-crypto` | Cryptography and identity | ed25519-dalek, x25519-dalek, chacha20poly1305, bip39 |
-| `wzp-transport` | QUIC transport layer | quinn, rustls |
-| `wzp-relay` | Relay daemon (SFU, federation, metrics) | tokio, prometheus |
-| `wzp-client` | Call engine and CLI | All above |
+**RaptorQ** (RFC 6330) is a fountain code with several advantages for VoIP:
 
-Additional integration targets: `wzp-web` (browser bridge via WebSocket), Android native library (JNI), Desktop (Tauri).
+1. **Rateless**: You can generate an arbitrary number of repair symbols on the fly. If conditions worsen mid-block, you can generate additional repair without re-encoding.
 
-### Dependency Graph
+2. **Efficient decoding**: RaptorQ can decode from any K symbols with high probability (typically K + 1 or K + 2 suffice), compared to Reed-Solomon which requires exactly K.
 
-```mermaid
-graph TD
-    PROTO["wzp-proto<br/>(Types, Traits, Wire Format)"]
+3. **Lower computational complexity**: O(K) encoding and decoding time, compared to O(K^2) for Reed-Solomon. This matters for real-time audio at 50 frames/second.
 
-    CODEC["wzp-codec<br/>(Opus + Codec2 + RNNoise)"]
-    FEC["wzp-fec<br/>(RaptorQ FEC)"]
-    CRYPTO["wzp-crypto<br/>(ChaCha20 + Identity)"]
-    TRANSPORT["wzp-transport<br/>(QUIC / Quinn)"]
+4. **Variable block sizes**: The encoder handles 1-56403 source symbols per block (the WZP implementation uses 5-10, but the flexibility is there).
 
-    RELAY["wzp-relay<br/>(Relay Daemon)"]
-    CLIENT["wzp-client<br/>(CLI + Call Engine)"]
-    WEB["wzp-web<br/>(Browser Bridge)"]
-    DESKTOP["Desktop<br/>(Tauri + CPAL)"]
-    ANDROID["Android<br/>(Kotlin + JNI)"]
+The `raptorq` crate (v2) provides a well-tested pure-Rust implementation. The WZP FEC layer adds length-prefixed padding (2-byte LE prefix + zero-pad to 256 bytes) so that variable-length audio frames can be recovered exactly.
 
-    PROTO --> CODEC
-    PROTO --> FEC
-    PROTO --> CRYPTO
-    PROTO --> TRANSPORT
-
-    CODEC --> CLIENT
-    FEC --> CLIENT
-    CRYPTO --> CLIENT
-    TRANSPORT --> CLIENT
-
-    CODEC --> RELAY
-    FEC --> RELAY
-    CRYPTO --> RELAY
-    TRANSPORT --> RELAY
-
-    CLIENT --> WEB
-    CLIENT --> DESKTOP
-    CLIENT --> ANDROID
-    TRANSPORT --> WEB
-
-    FC["warzone-protocol<br/>(featherChat Identity)"] -.->|path dep| CRYPTO
-
-    style PROTO fill:#6c5ce7,color:#fff
-    style RELAY fill:#ff9f43,color:#fff
-    style CLIENT fill:#00b894,color:#fff
-    style WEB fill:#0984e3,color:#fff
-    style DESKTOP fill:#0984e3,color:#fff
-    style ANDROID fill:#0984e3,color:#fff
-    style FC fill:#fd79a8,color:#fff
-```
-
-The star pattern ensures each leaf crate (`wzp-codec`, `wzp-fec`, `wzp-crypto`, `wzp-transport`) depends only on `wzp-proto` and never on each other. This enables:
-
-- **Parallel development** -- 5 agents work on 5 crates with no merge conflicts
-- **Independent testing** -- each crate has self-contained tests
-- **Pluggability** -- any implementation can be swapped by implementing the same trait
-- **Fast compilation** -- changing one leaf only recompiles that leaf and integration crates
-
-## Audio Pipeline
-
-### Encode Pipeline (Mic to Network)
-
-```mermaid
-sequenceDiagram
-    participant Mic as Microphone
-    participant RNN as RNNoise Denoise
-    participant VAD as Silence Detector
-    participant ENC as Opus/Codec2 Encode
-    participant FEC as RaptorQ FEC Encode
-    participant INT as Interleaver
-    participant HDR as Header Assembly
-    participant CRYPT as ChaCha20-Poly1305
-    participant QUIC as QUIC Datagram
-
-    Mic->>RNN: PCM i16 x 960 (20ms @ 48kHz)
-    RNN->>VAD: Denoised samples (2 x 480)
-    alt Silence detected (>100ms)
-        VAD->>ENC: ComfortNoise packet (every 200ms)
-    else Active speech or hangover
-        VAD->>ENC: Active audio frame
-    end
-    ENC->>FEC: Compressed frame (padded to 256 bytes)
-    FEC->>FEC: Accumulate block (5-10 frames)
-    FEC->>INT: Source + repair symbols
-    INT->>HDR: Interleaved packets (depth=3)
-    HDR->>CRYPT: MediaHeader (12B) or MiniHeader (4B)
-    CRYPT->>QUIC: Header=AAD, Payload=encrypted
-```
-
-### Decode Pipeline (Network to Speaker)
-
-```mermaid
-sequenceDiagram
-    participant QUIC as QUIC Datagram
-    participant CRYPT as ChaCha20-Poly1305
-    participant HDR as Header Parse
-    participant DEINT as De-interleaver
-    participant FEC as RaptorQ FEC Decode
-    participant JIT as Jitter Buffer
-    participant DEC as Opus/Codec2 Decode
-    participant SPK as Speaker
-
-    QUIC->>CRYPT: Encrypted packet
-    CRYPT->>HDR: Decrypt (header=AAD)
-    HDR->>DEINT: Parsed MediaHeader + payload
-    DEINT->>FEC: Reordered symbols
-    FEC->>FEC: Reconstruct from any K of K+R symbols
-    FEC->>JIT: Recovered audio frames
-    JIT->>JIT: Sequence-ordered BTreeMap
-    JIT->>DEC: Pop when depth >= target
-    DEC->>SPK: PCM i16 x 960
-```
-
-## Codec System
-
-WarzonePhone uses a dual-codec architecture to cover the full range of network conditions:
-
-### Opus (Primary)
-
-Opus is the primary codec for normal to degraded conditions. It operates at 48 kHz natively with built-in inband FEC and DTX (discontinuous transmission). The `audiopus` crate provides mature Rust bindings to libopus.
-
-| Profile | Bitrate | Frame Duration | FEC Ratio | Total Bandwidth | Use Case |
-|---------|---------|---------------|-----------|----------------|----------|
-| Studio 64k | 64 kbps | 20ms | 10% | 70.4 kbps | LAN, excellent WiFi |
-| Studio 48k | 48 kbps | 20ms | 10% | 52.8 kbps | Good WiFi, wired |
-| Studio 32k | 32 kbps | 20ms | 10% | 35.2 kbps | WiFi, LTE |
-| Good (24k) | 24 kbps | 20ms | 20% | 28.8 kbps | WiFi, LTE, decent links |
-| Opus 16k | 16 kbps | 20ms | 20% | 19.2 kbps | 3G, moderate congestion |
-| Degraded (6k) | 6 kbps | 40ms | 50% | 9.0 kbps | 3G, congested WiFi |
-
-### Codec2 (Fallback)
-
-Codec2 is a narrowband vocoder designed for HF radio links with extreme bandwidth constraints. It operates at 8 kHz, and the adaptive layer handles 48 kHz <-> 8 kHz resampling transparently. The pure-Rust `codec2` crate means no C dependencies.
-
-| Profile | Bitrate | Frame Duration | FEC Ratio | Total Bandwidth | Use Case |
-|---------|---------|---------------|-----------|----------------|----------|
-| Codec2 3200 | 3.2 kbps | 20ms | 50% | 4.8 kbps | Poor conditions |
-| Catastrophic (1200) | 1.2 kbps | 40ms | 100% | 2.4 kbps | Satellite, extreme loss |
-
-### ComfortNoise
-
-When the silence detector identifies no speech activity for over 100ms, the encoder switches to emitting a ComfortNoise packet every 200ms instead of encoding silence. This provides approximately 50% bandwidth savings in typical conversations.
-
-### Adaptive Switching
-
-The `AdaptiveEncoder`/`AdaptiveDecoder` in `wzp-codec` hold both codec instances and switch between them based on the active `QualityProfile`. This avoids codec re-initialization latency during tier transitions. The `AdaptiveQualityController` in `wzp-proto` manages tier transitions with hysteresis:
-
-- **Downgrade**: 3 consecutive bad reports (2 on cellular networks)
-- **Upgrade**: 10 consecutive good reports (one tier at a time)
-- **Network handoff**: WiFi-to-cellular switch triggers preemptive one-tier downgrade plus a temporary 10-second FEC boost (+20%)
-
-Quality tier classification thresholds:
-
-| Tier | WiFi/Unknown | Cellular |
-|------|-------------|----------|
-| Good | loss < 10%, RTT < 400ms | loss < 8%, RTT < 300ms |
-| Degraded | loss 10-40%, RTT 400-600ms | loss 8-25%, RTT 300-500ms |
-| Catastrophic | loss > 40%, RTT > 600ms | loss > 25%, RTT > 500ms |
-
-## Forward Error Correction (FEC)
-
-### Why RaptorQ Over Reed-Solomon
-
-WarzonePhone uses RaptorQ (RFC 6330) fountain codes via the `raptorq` crate:
-
-1. **Rateless** -- generate arbitrary repair symbols on the fly; if conditions worsen mid-block, generate additional repair without re-encoding
-2. **Efficient decoding** -- decode from any K symbols with high probability (typically K + 1 or K + 2 suffice)
-3. **Lower complexity** -- O(K) encoding/decoding time vs O(K^2) for Reed-Solomon
-4. **Variable block sizes** -- 1-56,403 source symbols per block (WZP uses 5-10)
-
-### FEC Block Structure
-
-Each FEC block consists of 5-10 audio frames padded to 256-byte symbols with a 2-byte LE length prefix:
-
-```
-[len:u16 LE][audio_frame][zero_padding_to_256_bytes]
-```
-
-### Loss Survival by FEC Ratio
+**FEC bandwidth math at different loss rates:**
 
 With 5 source frames per block:
+- 20% repair (GOOD): 1 repair symbol. Survives loss of 1 out of 6 packets (16.7% loss).
+- 50% repair (DEGRADED): 3 repair symbols. Survives loss of 3 out of 8 packets (37.5% loss).
+- 100% repair (CATASTROPHIC): 5 repair symbols. Survives loss of 5 out of 10 packets (50% loss).
 
-| FEC Ratio | Repair Symbols | Survives Loss | Profile |
-|-----------|---------------|---------------|---------|
-| 10% | 1 | 1 of 6 (16.7%) | Studio |
-| 20% | 1 | 1 of 6 (16.7%) | Good |
-| 50% | 3 | 3 of 8 (37.5%) | Degraded |
-| 100% | 5 | 5 of 10 (50.0%) | Catastrophic |
+The benchmark (`wzp-bench --fec --loss 30`) dynamically scales the FEC ratio to survive the requested loss percentage.
 
-### Interleaving
+## Why QUIC Over Raw UDP
 
-Burst loss protection via depth-3 interleaving: packets from 3 consecutive FEC blocks are interleaved before transmission. A burst of 3 consecutive lost packets affects 3 different blocks (1 loss each) rather than destroying 1 block entirely.
+Raw UDP would be simpler and lower-latency, but QUIC (via the `quinn` crate) provides:
 
-```mermaid
-graph LR
-    subgraph "FEC Encoder"
-        F1[Frame 1] --> BLK[Source Block<br/>5-10 frames]
-        F2[Frame 2] --> BLK
-        F3[Frame 3] --> BLK
-        F4[Frame 4] --> BLK
-        F5[Frame 5] --> BLK
-        BLK --> SRC[Source Symbols]
-        BLK --> REP[Repair Symbols<br/>ratio-dependent]
-        SRC --> INT[Interleaver<br/>depth=3]
-        REP --> INT
-    end
+1. **DATAGRAM frames**: Unreliable delivery without head-of-line blocking (RFC 9221). Media packets use this path, so they behave like UDP datagrams but benefit from QUIC's connection management.
 
-    subgraph "Network"
-        INT --> LOSS{Packet Loss}
-        LOSS -->|some lost| RCV[Received Symbols]
-    end
+2. **Reliable streams**: Signaling messages (CallOffer, CallAnswer, Rekey, Hangup) require reliable delivery. QUIC provides multiplexed streams without needing a separate TCP connection.
 
-    subgraph "FEC Decoder"
-        RCV --> DEINT[De-interleaver]
-        DEINT --> RAPTORQ[RaptorQ Decode<br/>Any K of K+R]
-        RAPTORQ --> OUT[Original Frames]
-    end
+3. **Built-in congestion control**: QUIC's congestion control prevents overwhelming degraded links, which is important when chaining relays.
 
-    style LOSS fill:#e17055,color:#fff
-    style RAPTORQ fill:#00b894,color:#fff
-```
+4. **Connection migration**: QUIC connections survive IP address changes (e.g., WiFi to cellular handoff), which is valuable for mobile clients.
 
-## Transport Layer
+5. **TLS 1.3 built-in**: The QUIC handshake provides encryption at the transport level. While WZP has its own end-to-end ChaCha20 layer, the QUIC TLS protects the header and signaling from eavesdroppers.
 
-### Why QUIC Over Raw UDP
+6. **NAT keepalive**: QUIC's built-in keep-alive (configured at 5-second intervals) maintains NAT bindings without application-level pings.
 
-WarzonePhone uses QUIC (via the `quinn` crate) rather than raw UDP for several reasons:
+7. **Firewall traversal**: QUIC runs on UDP port 443 by default, which is commonly allowed through firewalls. The `wzp` ALPN protocol identifier distinguishes WZP traffic.
 
-| Feature | Benefit |
-|---------|---------|
-| DATAGRAM frames (RFC 9221) | Unreliable delivery without head-of-line blocking -- behaves like UDP for media |
-| Reliable streams | Multiplexed signaling (CallOffer, Hangup, Rekey) without a separate TCP connection |
-| Congestion control | Prevents overwhelming degraded links, important when chaining relays |
-| Connection migration | Connections survive IP address changes (WiFi to cellular handoff) |
-| TLS 1.3 built-in | Transport-level encryption protects headers and signaling |
-| NAT keepalive | 5-second interval maintains NAT bindings without application-level pings |
-| Firewall traversal | Runs on UDP port 443 with `wzp` ALPN identifier |
+The tradeoff is approximately 20-40 bytes of additional per-packet overhead compared to raw UDP (QUIC short header + DATAGRAM frame overhead).
 
-The tradeoff is approximately 20-40 bytes of additional per-packet overhead compared to raw UDP.
+## Why ChaCha20-Poly1305 Over AES-GCM
 
-### Wire Formats
+1. **Software performance**: ChaCha20-Poly1305 is faster than AES-GCM on hardware without AES-NI instructions. This matters for ARM devices (Android phones, Raspberry Pi relays, embedded systems) where AES hardware acceleration may be absent.
 
-#### MediaHeader (12 bytes)
+2. **Constant-time by design**: ChaCha20 uses only add-rotate-XOR operations, making it inherently resistant to timing side-channel attacks. AES-GCM implementations without hardware support often require careful constant-time implementation.
+
+3. **Warzone messenger compatibility**: The existing Warzone messenger uses ChaCha20-Poly1305 for message encryption. Reusing the same primitive simplifies the security audit and allows key material to be shared across messaging and calling.
+
+4. **16-byte overhead**: Both ChaCha20-Poly1305 and AES-128-GCM produce a 16-byte authentication tag. There is no size advantage to AES-GCM.
+
+5. **AEAD with AAD**: The MediaHeader is used as Associated Authenticated Data (AAD), ensuring the header is authenticated but not encrypted. This allows relays to read routing information (block ID, sequence number) without decrypting the payload.
+
+## Why Star Dependency Graph (Parallel Development)
+
+The workspace follows a strict star dependency pattern:
 
 ```
-Byte 0:  [V:1][T:1][CodecID:4][Q:1][FecRatioHi:1]
-Byte 1:  [FecRatioLo:6][unused:2]
-Bytes 2-3: sequence (u16 BE)
-Bytes 4-7: timestamp_ms (u32 BE)
-Byte 8:   fec_block_id (u8)
-Byte 9:   fec_symbol_idx (u8)
-Byte 10:  reserved
-Byte 11:  csrc_count
-
-V = version (0), T = is_repair, CodecID = codec, Q = quality_report appended
+         wzp-proto (hub)
+        /    |    \    \
+  wzp-codec  wzp-fec  wzp-crypto  wzp-transport
+        \    |    /    /
+         wzp-relay
+         wzp-client
+         wzp-web
 ```
 
-#### MiniHeader (4 bytes, compressed)
+- `wzp-proto` defines all trait interfaces and wire format types
+- Each "leaf" crate (codec, fec, crypto, transport) depends only on `wzp-proto`
+- No leaf crate depends on another leaf crate
+- Integration crates (relay, client, web) depend on all leaves
 
-```
-Bytes 0-1: timestamp_delta_ms (u16 BE)
-Bytes 2-3: payload_len (u16 BE)
+This enables:
+1. **Parallel development**: 5 agents/developers can work on 5 crates simultaneously with zero merge conflicts
+2. **Independent testing**: Each crate has comprehensive tests that run without requiring other implementations
+3. **Pluggability**: Any implementation can be swapped (e.g., replace RaptorQ with Reed-Solomon) by implementing the same trait
+4. **Fast compilation**: Changes to one leaf only recompile that leaf and the integration crates, not other leaves
 
-Preceded by FRAME_TYPE_MINI (0x01). Full header every 50 frames (~1s).
-Saves 8 bytes/packet (67% header reduction).
-```
+## Jitter Buffer Trade-offs
 
-#### TrunkFrame (batched datagrams)
+The jitter buffer must balance two competing goals:
 
-```
-[count:u16]
-  [session_id:2][len:u16][payload:len]  x count
+**Lower latency** (smaller buffer):
+- Better conversational interactivity
+- Less memory usage
+- But more vulnerable to jitter and reordering
 
-Packs multiple session packets into one QUIC datagram.
-Max 10 entries or 1200 bytes, flushed every 5ms.
-```
+**Higher quality** (larger buffer):
+- More time to receive out-of-order packets
+- More time for FEC recovery (repair packets may arrive after source packets)
+- But adds perceptible delay to the conversation
 
-#### QualityReport (4 bytes, optional trailer)
+The default configuration:
+- Target: 10 packets (200ms) for the client, 50 packets (1s) for the relay
+- Minimum: 3 packets (60ms) before playout begins (client), 25 packets (500ms) for relay
+- Maximum: 250 packets (5s) absolute cap
 
-```
-Byte 0: loss_pct (0-255 maps to 0-100%)
-Byte 1: rtt_4ms (0-255 maps to 0-1020ms)
-Byte 2: jitter_ms
-Byte 3: bitrate_cap_kbps
-```
+The relay uses a deeper buffer because it needs to absorb jitter from the lossy inter-relay link. The client uses a shallower buffer for lower latency since it is on the last hop.
 
-### Bandwidth Summary
+**Known issue**: The current jitter buffer does not adapt its depth based on observed jitter. It uses sequence-number ordering only, without timestamp-based playout scheduling. This can lead to drift during long calls, as observed in echo tests.
 
-| Profile | Audio | FEC Overhead | Total | Silence Savings |
-|---------|-------|-------------|-------|----------------|
-| Studio 64k | 64 kbps | 10% = 6.4 kbps | **70.4 kbps** | ~50% with DTX |
-| Studio 48k | 48 kbps | 10% = 4.8 kbps | **52.8 kbps** | ~50% with DTX |
-| Studio 32k | 32 kbps | 10% = 3.2 kbps | **35.2 kbps** | ~50% with DTX |
-| Good (24k) | 24 kbps | 20% = 4.8 kbps | **28.8 kbps** | ~50% with DTX |
-| Degraded (6k) | 6 kbps | 50% = 3.0 kbps | **9.0 kbps** | ~50% with DTX |
-| Catastrophic (1.2k) | 1.2 kbps | 100% = 1.2 kbps | **2.4 kbps** | ~50% with DTX |
+## Browser Audio: AudioWorklet vs ScriptProcessorNode
 
-Additional savings: MiniHeaders save 8 bytes/packet (67% header reduction). Trunking shares QUIC overhead across multiplexed sessions.
+The web bridge (`crates/wzp-web/static/`) uses AudioWorklet as the primary audio I/O mechanism, with ScriptProcessorNode as a fallback.
 
-## Security
+**AudioWorklet** (preferred):
+- Runs on a dedicated audio rendering thread
+- Lower latency (no main-thread round-trip)
+- Consistent 128-sample callback timing
+- Supported in Chrome 66+, Firefox 76+, Safari 14.1+
 
-### Identity Model
+**ScriptProcessorNode** (fallback):
+- Runs on the main thread via `onaudioprocess` callback
+- Higher latency, potential glitches from main-thread GC pauses
+- Deprecated by the Web Audio specification
+- Used when AudioWorklet is not available
 
-Every user has a persistent identity derived from a 32-byte seed:
+Both paths accumulate Float32 samples into 960-sample (20ms) Int16 frames before sending via WebSocket, matching the WZP codec frame size.
 
-```mermaid
-graph TD
-    SEED["32-byte Seed<br/>(BIP39 Mnemonic: 24 words)"] --> HKDF1["HKDF<br/>info='warzone-ed25519'"]
-    SEED --> HKDF2["HKDF<br/>info='warzone-x25519'"]
+**Playback** uses an AudioWorklet with a ring buffer capped at 200ms (9600 samples at 48 kHz). When the buffer exceeds this limit, old samples are dropped to prevent unbounded drift. The fallback path uses scheduled `AudioBufferSourceNode` instances.
 
-    HKDF1 --> ED["Ed25519 SigningKey<br/>(Digital Signatures)"]
-    HKDF2 --> X25519["X25519 StaticSecret<br/>(Key Agreement)"]
+## Room Mode: SFU vs MCU Trade-offs
 
-    ED --> VKEY["Ed25519 VerifyingKey<br/>(Public)"]
-    X25519 --> XPUB["X25519 PublicKey<br/>(Public)"]
+WarzonePhone implements an **SFU** (Selective Forwarding Unit) architecture:
 
-    VKEY --> FP["Fingerprint<br/>SHA-256(pubkey), truncated 16 bytes<br/>xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx"]
+**SFU** (implemented):
+- Relay forwards each participant's packets to all other participants unchanged
+- No transcoding -- the relay never decodes or re-encodes audio
+- O(N) bandwidth at the relay for N participants (each packet is sent N-1 times)
+- Each client receives separate streams from each other participant
+- Client must mix/decode multiple streams locally
+- Lower relay CPU usage (no transcoding)
+- End-to-end encryption is preserved (relay never sees plaintext)
 
-    style SEED fill:#6c5ce7,color:#fff
-    style FP fill:#fd79a8,color:#fff
-    style ED fill:#ee5a24,color:#fff
-    style X25519 fill:#00b894,color:#fff
-```
+**MCU** (not implemented, for comparison):
+- Relay would decode all streams, mix them, and re-encode a single combined stream
+- O(1) bandwidth to each client (receives one mixed stream)
+- Requires the relay to have codec keys (breaks E2E encryption)
+- Higher relay CPU (decoding N streams + mixing + re-encoding)
+- Audio quality loss from re-encoding
 
-**BIP39 Mnemonic Backup**: The 32-byte seed can be encoded as a 24-word BIP39 mnemonic for human-readable backup. The same seed produces the same identity on any platform.
-
-**featherChat Compatibility**: The identity derivation is compatible with the Warzone messenger (featherChat), allowing a shared identity across messaging and calling.
-
-### Cryptographic Handshake
-
-```mermaid
-sequenceDiagram
-    participant C as Caller
-    participant R as Relay / Callee
-
-    Note over C: Derive identity from seed<br/>Ed25519 + X25519 via HKDF
-
-    C->>C: Generate ephemeral X25519 keypair
-    C->>C: Sign(ephemeral_pub || "call-offer")
-    C->>R: CallOffer { identity_pub, ephemeral_pub, signature, profiles }
-
-    R->>R: Verify Ed25519 signature
-    R->>R: Generate ephemeral X25519 keypair
-    R->>R: shared_secret = DH(eph_b, eph_a)
-    R->>R: session_key = HKDF(shared_secret, "warzone-session-key")
-    R->>R: Sign(ephemeral_pub || "call-answer")
-    R->>C: CallAnswer { identity_pub, ephemeral_pub, signature, profile }
-
-    C->>C: Verify signature
-    C->>C: shared_secret = DH(eph_a, eph_b)
-    C->>C: session_key = HKDF(shared_secret)
-
-    Note over C,R: Both have identical ChaCha20-Poly1305 session key
-    C->>R: Encrypted media (QUIC datagrams)
-    R->>C: Encrypted media (QUIC datagrams)
-
-    Note over C,R: Rekey every 65,536 packets<br/>New ephemeral DH + HKDF mix
-```
-
-### Encryption Details
-
-| Component | Algorithm | Purpose |
-|-----------|-----------|---------|
-| Identity signing | Ed25519 | Authenticate handshake messages |
-| Key agreement | X25519 (ephemeral) | Derive shared secret |
-| Key derivation | HKDF-SHA256 | Derive session key from shared secret |
-| Media encryption | ChaCha20-Poly1305 | Encrypt audio payloads (16-byte tag) |
-| Nonce construction | Deterministic from sequence number | No nonce reuse, no state sync needed |
-| Anti-replay | Sliding window (64-packet) | Reject duplicate/old packets |
-| Forward secrecy | Rekey every 65,536 packets | New ephemeral DH + HKDF mix |
-
-**Why ChaCha20-Poly1305 over AES-GCM**:
-- Faster on hardware without AES-NI (ARM phones, Raspberry Pi relays)
-- Inherently constant-time (add-rotate-XOR only)
-- Compatible with Warzone messenger (featherChat)
-- Same 16-byte authentication tag overhead as AES-GCM
-
-**AEAD with AAD**: The MediaHeader is used as Associated Authenticated Data. The header is authenticated but not encrypted, allowing relays to read routing information (block ID, sequence number) without decrypting the payload.
-
-### Trust on First Use (TOFU)
-
-Clients remember the relay's TLS certificate fingerprint after first connection. If the fingerprint changes on a subsequent connection, the desktop client shows a "Server Key Changed" warning dialog. The relay derives its TLS certificate deterministically from its persisted identity seed, so the fingerprint is stable across restarts.
-
-## Relay Architecture
-
-### Room Mode (Default SFU)
-
-In room mode, the relay acts as a Selective Forwarding Unit. Clients join named rooms via the QUIC SNI (Server Name Indication) field. The relay forwards each participant's encrypted packets to all other participants in the room without decoding or re-encoding.
-
-```mermaid
-graph TB
-    subgraph "Room Mode (SFU)"
-        C1[Client 1] -->|"QUIC SNI=room-hash"| RM[Room Manager]
-        C2[Client 2] -->|"QUIC SNI=room-hash"| RM
-        C3[Client 3] -->|"QUIC SNI=room-hash"| RM
-        RM --> R1[Room 'podcast']
-        R1 -->|fan-out| C1
-        R1 -->|fan-out| C2
-        R1 -->|fan-out| C3
-    end
-
-    style RM fill:#ff9f43,color:#fff
-    style R1 fill:#fdcb6e
-```
-
-**SFU vs MCU trade-off**: SFU was chosen because it preserves end-to-end encryption (the relay never sees plaintext audio). An MCU would need to decode, mix, and re-encode, breaking E2E encryption. The trade-off is O(N) bandwidth at the relay for N participants.
-
-### Forward Mode
-
-With `--remote`, the relay forwards all traffic to a remote relay. Used for chaining relays across lossy or censored links:
-
-```
-Client --> Relay A (--remote B) --> Relay B --> Destination Client
-```
-
-The relay pipeline in forward mode: FEC decode, jitter buffer, then FEC re-encode for the next hop.
-
-## Federation
-
-### Overview
-
-Two or more relays form a federation mesh. Each relay is an independent SFU. When configured to trust each other, they bridge **global rooms** -- participants on relay A in a global room hear participants on relay B in the same room.
-
-### Configuration
-
-Federation uses three TOML configuration sections:
-
-- `[[peers]]` -- outbound connections to peer relays (url + TLS fingerprint)
-- `[[trusted]]` -- inbound connections accepted from relays (TLS fingerprint only)
-- `[[global_rooms]]` -- room names to bridge across all federated peers
-
-### Federation Topology
-
-```mermaid
-graph TB
-    subgraph "Relay A (EU)"
-        A_RM[Room Manager]
-        A_FM[Federation Manager]
-        A1[Alice - local]
-        A2[Bob - local]
-        A_RM --> A_FM
-    end
-
-    subgraph "Relay B (US)"
-        B_RM[Room Manager]
-        B_FM[Federation Manager]
-        B1[Charlie - local]
-        B_RM --> B_FM
-    end
-
-    A_FM <-->|"QUIC SNI='_federation'<br/>GlobalRoomActive/Inactive<br/>Media forwarding"| B_FM
-
-    A1 -->|media| A_RM
-    A2 -->|media| A_RM
-    B1 -->|media| B_RM
-
-    A_RM -->|"federated fan-out"| A1
-    A_RM -->|"federated fan-out"| A2
-    B_RM -->|"federated fan-out"| B1
-
-    style A_FM fill:#6c5ce7,color:#fff
-    style B_FM fill:#6c5ce7,color:#fff
-    style A_RM fill:#ff9f43,color:#fff
-    style B_RM fill:#ff9f43,color:#fff
-```
-
-### Protocol
-
-1. On startup, each relay connects to all configured `[[peers]]` via QUIC with SNI `"_federation"`
-2. After QUIC handshake, sends `FederationHello { tls_fingerprint }` for identity verification
-3. Peer verifies the fingerprint against its `[[trusted]]` or `[[peers]]` list
-4. When a local participant joins a global room, sends `GlobalRoomActive { room }` to all peers
-5. When the last local participant leaves, sends `GlobalRoomInactive { room }`
-6. Media is forwarded as `[room_hash:8][original_media_packet]` -- the relay does not decrypt
-
-### What Relays Do NOT Do
-
-- **No transcoding** -- media passes through as-is
-- **No re-encryption** -- packets are already encrypted E2E
-- **No central coordinator** -- each relay independently connects to configured peers
-- **No automatic peer discovery** -- peers must be explicitly configured
-
-### Failure Handling
-
-- If a peer goes down, local rooms continue working; federated participants disappear from presence
-- Reconnection: every 30 seconds with exponential backoff up to 5 minutes
-- If a peer restarts with a different identity, the fingerprint check fails with a clear log message
-
-## Jitter Buffer
-
-The jitter buffer balances latency vs quality:
-
-| Setting | Client | Relay |
-|---------|--------|-------|
-| Target depth | 10 packets (200ms) | 50 packets (1s) |
-| Minimum before playout | 3 packets (60ms) | 25 packets (500ms) |
-| Maximum cap | 250 packets (5s) | 250 packets (5s) |
-
-The relay uses a deeper buffer to absorb jitter from lossy inter-relay links. The client uses a shallower buffer for lower latency.
-
-The adaptive playout delay tracks jitter via exponential moving average and adjusts the target depth:
-
-```
-target_delay = ceil(jitter_ema / 20ms) + 2
-```
-
-**Known limitation**: The current jitter buffer does not use timestamp-based playout scheduling. It relies on sequence-number ordering only, which can lead to drift during long calls.
-
-## Signal Messages
-
-Signal messages are sent over reliable QUIC streams as length-prefixed JSON:
-
-```
-[4-byte length prefix][serde_json payload]
-```
-
-| Message | Purpose |
-|---------|---------|
-| `CallOffer` | Identity, ephemeral key, signature, supported profiles |
-| `CallAnswer` | Identity, ephemeral key, signature, chosen profile |
-| `AuthToken` | featherChat bearer token for relay authentication |
-| `Hangup` | Reason: Normal, Busy, Declined, Timeout, Error |
-| `Hold` / `Unhold` | Call hold state |
-| `Mute` / `Unmute` | Mic mute state |
-| `Transfer` | Call transfer to another relay/fingerprint |
-| `Rekey` | New ephemeral key for forward secrecy |
-| `QualityUpdate` | Quality report + recommended profile |
-| `Ping` / `Pong` | Latency measurement (timestamp_ms) |
-| `RoomUpdate` | Participant list changes |
-| `PresenceUpdate` | Federation presence gossip |
-| `RouteQuery` / `RouteResponse` | Presence discovery for routing |
-| `FederationHello` | Relay identity during federation setup |
-| `GlobalRoomActive` / `GlobalRoomInactive` | Federation room bridging |
-
-## Test Coverage
-
-272 tests across all crates, 0 failures:
-
-| Crate | Tests | Key Coverage |
-|-------|-------|-------------|
-| wzp-proto | 41 | Wire format, jitter buffer, quality tiers, mini-frames, trunking |
-| wzp-codec | 31 | Opus/Codec2 roundtrip, silence detection, noise suppression |
-| wzp-fec | 22 | RaptorQ encode/decode, loss recovery, interleaving |
-| wzp-crypto | 34 + 28 compat | Encrypt/decrypt, handshake, anti-replay, featherChat identity |
-| wzp-transport | 2 | QUIC connection setup |
-| wzp-relay | 40 + 4 integration | Room ACL, session mgmt, metrics, probes, mesh, trunking |
-| wzp-client | 30 + 2 integration | Encoder/decoder, quality adapter, silence, drift, sweep |
-| wzp-web | 2 | Metrics |
-
-## Build Requirements
-
-- **Rust** 1.85+ (2024 edition)
-- **Linux**: cmake, pkg-config, libasound2-dev (for audio feature)
-- **macOS**: Xcode command line tools (CoreAudio included)
-- **Android**: NDK r27c, cmake 3.28+ (from pip)
+The SFU choice is driven by the E2E encryption requirement: since relays never have access to the audio codec keys, they cannot decode, mix, or re-encode. The current room implementation in `crates/wzp-relay/src/room.rs` forwards received datagrams to all other participants in the room with best-effort delivery -- if one send fails, the relay continues to the next participant.

docs/PRD-adaptive-quality.md

@@ -1,201 +0,0 @@
-# PRD: Adaptive Quality Control (Auto Codec)
-
-## Problem
-
-When a user selects "Auto" quality, the system currently just starts at Opus 24k (GOOD) and never changes. There is no runtime adaptation — if the network degrades mid-call, audio breaks up instead of gracefully stepping down to a lower bitrate codec. Conversely, if the network is excellent, the user stays on 24k when they could have studio-quality 64k.
-
-The relay already sends `QualityReport` messages with loss % and RTT, and a `QualityAdapter` exists in `call.rs` that classifies network conditions into GOOD/DEGRADED/CATASTROPHIC — but none of this is wired into the Android or desktop engines.
-
-## Solution
-
-Wire the existing `QualityAdapter` into both engines so that "Auto" mode continuously monitors network quality and switches codecs mid-call. The full quality range should be used:
-
-```
-Excellent network  →  Studio 64k (best quality)
-Good network       →  Opus 24k (default)
-Degraded network   →  Opus 6k (lower bitrate, more FEC)
-Poor network       →  Codec2 3.2k (vocoder, heavy FEC)
-Catastrophic       →  Codec2 1.2k (minimum viable voice)
-```
-
-## Architecture
-
-```
-                    ┌─────────────────────┐
-  Relay ──────────► │  QualityReport      │  loss %, RTT, jitter
-                    │  (every ~1s)        │
-                    └────────┬────────────┘
-                             │
-                             ▼
-                    ┌─────────────────────┐
-                    │  QualityAdapter     │  classify + hysteresis
-                    │  (3-report window)  │
-                    └────────┬────────────┘
-                             │ recommend new profile
-                             ▼
-              ┌──────────────┴──────────────┐
-              │                             │
-              ▼                             ▼
-     ┌────────────────┐           ┌────────────────┐
-     │  Encoder        │           │  Decoder        │
-     │  set_profile()  │           │  (auto-switch   │
-     │  + FEC update   │           │   already works)│
-     └────────────────┘           └────────────────┘
-```
-
-## Existing Infrastructure
-
-### What already exists (in `crates/wzp-client/src/call.rs`)
-
-1. **`QualityAdapter`** (lines 97-196):
-   - Sliding window of `QualityReport` messages
-   - `classify()`: loss > 15% or RTT > 200ms → CATASTROPHIC, loss > 5% or RTT > 100ms → DEGRADED, else → GOOD
-   - `should_switch()`: hysteresis — requires 3 consecutive reports recommending the same profile before switching
-   - Prevents oscillation between profiles
-
-2. **`QualityReport`** (in `wzp-proto/src/packet.rs`):
-   - Sent by relay piggy-backed on media packets
-   - Fields: `loss_pct` (u8, 0-255 scaled), `rtt_4ms` (u8, RTT in 4ms units), `jitter_ms`, `bitrate_cap_kbps`
-
-3. **`CallEncoder::set_profile()`** / **`CallDecoder` auto-switch**:
-   - Encoder can switch codec mid-stream
-   - Decoder already auto-detects incoming codec from packet headers
-
-### What's missing
-
-1. **QualityReport ingestion** — neither Android engine nor desktop engine reads quality reports from the relay
-2. **Profile switch loop** — no periodic check that feeds reports to `QualityAdapter` and applies recommended switches
-3. **Upward adaptation** — `QualityAdapter` only classifies into 3 tiers (GOOD/DEGRADED/CATASTROPHIC). Needs extension to recommend studio tiers when conditions are excellent (loss < 1%, RTT < 50ms)
-4. **Notification to UI** — when quality changes, the UI should show the current active codec
-
-## Requirements
-
-### Phase 1: Basic Adaptive (3-tier)
-
-**Both Android and Desktop:**
-
-1. **Ingest QualityReports**: In the recv loop, extract `quality_report` from incoming `MediaPacket`s when present. Feed to `QualityAdapter`.
-
-2. **Periodic quality check**: Every 1 second (or on each QualityReport), call `adapter.should_switch(&current_profile)`. If it returns `Some(new_profile)`:
-   - Switch the encoder: `encoder.set_profile(new_profile)`
-   - Update FEC encoder: `fec_enc = create_encoder(&new_profile)`
-   - Update frame size if changed (e.g., 20ms → 40ms)
-   - Log the switch
-
-3. **Frame size adaptation on switch**: When switching from 20ms to 40ms frames (or vice versa):
-   - Android: update `frame_samples` variable, resize `capture_buf`
-   - Desktop: same — the send loop reads `frame_samples` dynamically
-
-4. **UI indicator**: Show current active codec in the call screen stats line.
-   - Android: add to `CallStats` and display in stats text
-   - Desktop: add to `get_status` response and display in stats div
-
-5. **Only in Auto mode**: Adaptive switching should only happen when the user selected "Auto". If they manually selected a profile, respect their choice.
-
-### Phase 2: Extended Range (5-tier)
-
-Extend `QualityAdapter::classify()` to use the full codec range:
-
-| Condition | Profile | Codec |
-|-----------|---------|-------|
-| loss < 1% AND RTT < 30ms | STUDIO_64K | Opus 64k |
-| loss < 1% AND RTT < 50ms | STUDIO_48K | Opus 48k |
-| loss < 2% AND RTT < 80ms | STUDIO_32K | Opus 32k |
-| loss < 5% AND RTT < 100ms | GOOD | Opus 24k |
-| loss < 15% AND RTT < 200ms | DEGRADED | Opus 6k |
-| loss >= 15% OR RTT >= 200ms | CATASTROPHIC | Codec2 1.2k |
-
-With hysteresis:
-- **Downgrade**: 3 consecutive reports (fast reaction to degradation)
-- **Upgrade**: 5 consecutive reports (slow, cautious improvement)
-- **Studio upgrade**: 10 consecutive reports (very conservative — avoid bouncing to 64k on brief good patches)
-
-### Phase 3: Bandwidth Probing
-
-Rather than relying solely on loss/RTT:
-1. Start at GOOD
-2. After 10 seconds of stable call, probe upward by switching to STUDIO_32K
-3. If no quality degradation after 5 seconds, probe to STUDIO_48K
-4. If degradation detected, immediately fall back
-5. This discovers the true available bandwidth rather than guessing from loss stats
-
-## Implementation Plan
-
-### Android (`crates/wzp-android/src/engine.rs`)
-
-```rust
-// In the recv loop, after decoding:
-if let Some(ref qr) = pkt.quality_report {
-    quality_adapter.ingest(qr);
-}
-
-// Periodic check (every 50 frames ≈ 1 second):
-if auto_profile && frames_decoded % 50 == 0 {
-    if let Some(new_profile) = quality_adapter.should_switch(&current_profile) {
-        info!(from = ?current_profile.codec, to = ?new_profile.codec, "auto: switching quality");
-        let _ = encoder_ref.lock().set_profile(new_profile);
-        fec_enc_ref.lock() = create_encoder(&new_profile);
-        current_profile = new_profile;
-        frame_samples = frame_samples_for(&new_profile);
-        // Resize capture buffer if needed
-    }
-}
-```
-
-**Challenge**: The encoder is in the send task and the quality reports arrive in the recv task. Need shared state (AtomicU8 for profile index, or a channel).
-
-**Recommended approach**: Use an `AtomicU8` that the recv task writes and the send task reads:
-```rust
-let pending_profile = Arc::new(AtomicU8::new(0xFF)); // 0xFF = no change
-
-// Recv task: when adapter recommends switch
-pending_profile.store(new_profile_index, Ordering::Release);
-
-// Send task: check at frame boundary
-let p = pending_profile.swap(0xFF, Ordering::Acquire);
-if p != 0xFF { /* apply switch */ }
-```
-
-### Desktop (`desktop/src-tauri/src/engine.rs`)
-
-Same pattern. The desktop engine already has separate send/recv tasks with shared atomics for mic_muted, etc. Add a `pending_profile: Arc<AtomicU8>` following the same pattern.
-
-### Desktop CLI (`crates/wzp-client/src/call.rs`)
-
-The `CallEncoder` already has `set_profile()`. The `CallDecoder` already auto-switches. Just need to:
-1. Add `QualityAdapter` to `CallDecoder`
-2. Feed quality reports in `ingest()`
-3. Check `should_switch()` in `decode_next()`
-4. Emit the recommendation via a callback or return value
-
-## Testing
-
-1. **Local test with tc/netem**: Use Linux traffic control to simulate loss/latency:
-   ```bash
-   # Simulate 10% loss, 150ms RTT
-   tc qdisc add dev lo root netem loss 10% delay 75ms
-   # Run 2 clients in auto mode, verify they switch to DEGRADED
-   ```
-
-2. **CLI test**: Run `wzp-client --profile auto` between two instances with simulated network conditions
-
-3. **Relay quality reports**: Verify the relay actually sends QualityReport messages. If it doesn't yet, that needs to be implemented first (check relay code).
-
-## Open Questions
-
-1. **Does the relay currently send QualityReports?** If not, Phase 1 is blocked until the relay implements per-client loss/RTT tracking and report generation. The relay sees all packets and can compute loss % per sender.
-
-2. **Codec2 3.2k placement**: Should auto mode use Codec2 3.2k between DEGRADED and CATASTROPHIC? It's 20ms frames (lower latency than Opus 6k's 40ms) but speech-only quality.
-
-3. **Cross-client adaptation**: If client A is on GOOD and client B auto-adapts to CATASTROPHIC, client A still sends Opus 24k. Client B can decode it fine (auto-switch on recv). But should A also be told to lower quality to save B's bandwidth? This requires signaling between clients.
-
-## Milestones
-
-| Phase | Scope | Effort | Dependency |
-|-------|-------|--------|------------|
-| 0 | Verify relay sends QualityReports | 0.5 day | None |
-| 1a | Wire QualityAdapter in Android engine | 1 day | Phase 0 |
-| 1b | Wire QualityAdapter in desktop engine | 1 day | Phase 0 |
-| 1c | UI indicator (current codec) | 0.5 day | Phase 1a/1b |
-| 2 | Extended 5-tier classification | 0.5 day | Phase 1 |
-| 3 | Bandwidth probing | 2 days | Phase 2 |

docs/PRD-coordinated-codec.md

@@ -1,198 +0,0 @@
-# PRD: Coordinated Codec Switching (Relay-Judged Quality)
-
-## Problem
-
-The current adaptive quality system (`QualityAdapter` in call.rs) exists but isn't wired into either engine. Clients encode at a fixed quality chosen at call start. When network conditions change mid-call, audio degrades instead of gracefully stepping down. When conditions improve, clients stay on low quality unnecessarily.
-
-Additionally, in SFU mode with multiple participants, uncoordinated codec switching creates asymmetry: if client A upgrades to 64k while B stays on 24k, bandwidth is wasted. Participants should switch together.
-
-## Solution
-
-The **relay acts as the quality judge** since it sees both sides of every connection. It monitors packet loss, jitter, and RTT per participant, then signals quality recommendations. Clients react to these signals with coordinated codec switches.
-
-## Architecture
-
-```
-┌─────────┐        ┌─────────┐        ┌─────────┐
-│ Client A │◄──────►│  Relay  │◄──────►│ Client B │
-│          │        │ (judge) │        │          │
-│ Encoder  │        │         │        │ Encoder  │
-│ Decoder  │        │ Monitor │        │ Decoder  │
-└─────────┘        │ per-peer│        └─────────┘
-                    │ quality │
-                    └────┬────┘
-                         │
-                    Quality Signals:
-                    - StableSignal (conditions good)
-                    - DegradeSignal (conditions bad)
-                    - UpgradeProposal (try higher quality?)
-                    - UpgradeConfirm (all agreed, switch at T)
-```
-
-## Quality Classification (Relay-Side)
-
-The relay monitors each participant's connection quality:
-
-| Condition | Classification | Action |
-|-----------|---------------|--------|
-| loss >= 15% OR RTT >= 200ms | Critical | Immediate downgrade signal |
-| loss >= 5% OR RTT >= 100ms | Degraded | Downgrade signal after 3 reports |
-| loss < 2% AND RTT < 80ms | Good | Stable signal |
-| loss < 1% AND RTT < 50ms for 30s | Excellent | Upgrade proposal |
-| loss < 0.5% AND RTT < 30ms for 60s | Studio | Studio upgrade proposal |
-
-## Coordinated Switching Protocol
-
-### Downgrade (fast, safety-first)
-
-1. Relay detects degradation for ANY participant
-2. Relay sends `QualityUpdate { recommended_profile: DEGRADED }` to ALL participants
-3. ALL participants immediately switch encoder to the recommended profile
-4. No negotiation — downgrade is mandatory and instant
-
-### Upgrade (slow, consensual)
-
-1. Relay detects sustained good conditions for ALL participants (threshold: 30s stable)
-2. Relay sends `UpgradeProposal { target_profile, switch_timestamp }` to all
-3. Each client responds: `UpgradeAccept` or `UpgradeReject`
-4. If ALL accept within 5s → Relay sends `UpgradeConfirm { profile, switch_at_ms }`
-5. All clients switch encoder at the agreed timestamp (relative to session clock)
-6. If ANY rejects or times out → upgrade cancelled, stay on current profile
-
-### Asymmetric Encoding (SFU optimization)
-
-In SFU mode, each client encodes independently. The relay could allow:
-- Client A (strong connection): encode at 64k
-- Client B (weak connection): encode at 6k
-- Relay forwards A's 64k to B's decoder (auto-switch handles it)
-- B benefits from A's quality without needing to send at 64k
-
-This requires NO protocol changes — just each client independently following the relay's recommendation for their own encoding quality. The decoder already handles any codec.
-
-### Split Network Consideration
-
-If participant A has great quality but participant C has terrible quality:
-- Option 1: **Match weakest link** — everyone encodes at C's level (current approach, simple)
-- Option 2: **Per-participant recommendations** — A encodes at 64k, C encodes at 6k. B (good connection) receives and decodes both. Works because decoders auto-switch per packet.
-- Option 3: **Relay transcoding** — relay re-encodes A's 64k as 6k for C. Adds CPU on relay, but saves bandwidth for C. Future feature.
-
-Recommended: start with Option 1 (match weakest), add Option 2 later.
-
-## Signal Messages (New/Modified)
-
-```rust
-/// Quality signal from relay to client
-QualityDirective {
-    /// Recommended profile to use for encoding
-    recommended_profile: QualityProfile,
-    /// Reason for the recommendation
-    reason: QualityReason,
-}
-
-enum QualityReason {
-    /// Network conditions require this quality level
-    NetworkCondition,
-    /// Coordinated upgrade — all participants agreed
-    CoordinatedUpgrade,
-    /// Coordinated downgrade — weakest link determines level
-    CoordinatedDowngrade,
-}
-
-/// Upgrade proposal from relay
-UpgradeProposal {
-    target_profile: QualityProfile,
-    /// Milliseconds from now when the switch would happen
-    switch_delay_ms: u32,
-}
-
-/// Client response to upgrade proposal
-UpgradeResponse {
-    accepted: bool,
-}
-
-/// Confirmed upgrade — all clients switch at this time
-UpgradeConfirm {
-    profile: QualityProfile,
-    /// Session-relative timestamp to switch (ms since call start)
-    switch_at_session_ms: u64,
-}
-```
-
-## Relay-Side Implementation
-
-### Per-Participant Quality Tracking
-
-```rust
-struct ParticipantQuality {
-    /// Sliding window of recent observations
-    loss_samples: VecDeque<f32>,    // last 30 seconds
-    rtt_samples: VecDeque<u32>,     // last 30 seconds
-    jitter_samples: VecDeque<u32>,
-    /// Current classification
-    classification: QualityClass,
-    /// How long current classification has been stable
-    stable_since: Instant,
-}
-```
-
-### Quality Monitor Task (on relay)
-
-Runs alongside the SFU forwarding loop:
-1. Every 1 second, compute per-participant quality from QUIC connection stats
-2. Classify each participant
-3. If ANY participant degrades → send downgrade to ALL
-4. If ALL participants stable for threshold → propose upgrade
-5. Track upgrade negotiation state
-
-### Integration with Existing Code
-
-The relay already has access to:
-- `QuinnTransport::path_quality()` → loss, RTT, jitter, bandwidth estimates
-- `QualityReport` embedded in media packet headers
-- Per-session metrics in `RelayMetrics`
-
-The quality monitor just needs to read these existing metrics and produce signals.
-
-## Client-Side Implementation
-
-### Handling Quality Signals
-
-In the recv loop (both Android engine and desktop engine):
-```rust
-SignalMessage::QualityDirective { recommended_profile, .. } => {
-    // Immediate: switch encoder to recommended profile
-    encoder.set_profile(recommended_profile)?;
-    fec_enc = create_encoder(&recommended_profile);
-    frame_samples = frame_samples_for(&recommended_profile);
-    info!(codec = ?recommended_profile.codec, "quality directive: switched");
-}
-```
-
-### P2P Quality (simpler case)
-
-For P2P calls (no relay), both clients directly observe quality:
-1. Each client runs its own `QualityAdapter` on the direct connection
-2. When quality changes, client proposes to peer via signal
-3. Simpler negotiation: only 2 parties, no relay middleman
-4. Same coordinated switching logic, just peer-to-peer signals
-
-## Backporting P2P → Relay
-
-The quality monitoring and codec switching logic is identical:
-- **P2P**: client observes quality directly → proposes switch to peer
-- **Relay**: relay observes quality → proposes switch to all clients
-
-The only difference is WHO makes the decision (client vs relay) and HOW many participants need to agree (2 vs N).
-
-Implementation strategy: build for P2P first (simpler, 2 parties), then wrap the same logic with relay-mediated signals for SFU mode.
-
-## Milestones
-
-| Phase | Scope | Effort |
-|-------|-------|--------|
-| 1 | Relay-side quality monitor (per-participant tracking) | 1 day |
-| 2 | Downgrade signal (immediate, match weakest) | 1 day |
-| 3 | Client handling of QualityDirective | 1 day (both engines) |
-| 4 | Upgrade proposal + negotiation protocol | 2 days |
-| 5 | P2P quality adaptation (direct observation) | 1 day |
-| 6 | Per-participant asymmetric encoding (Option 2) | 1 day |

docs/PRD-delegated-trust.md

@@ -1,170 +0,0 @@
-# PRD: Delegated Trust for Relay Federation
-
-## Problem
-
-In the current federation model, when Relay 1 trusts Relay 2, and Relay 2 forwards media from Relay 3, Relay 1 has no way to know or control that Relay 3's traffic is reaching it. This is a trust gap — any relay in the chain can introduce untrusted traffic.
-
-**Example:** Relay 1 (trusted zone) ←→ Relay 2 (hub) ←→ Relay 3 (unknown)
-
-Relay 1 explicitly trusts Relay 2. But Relay 2 forwards Relay 3's media to Relay 1 without Relay 1's consent. Relay 1 receives media that originated from an entity it never approved.
-
-## Solution
-
-Add a `delegate` flag to `[[trusted]]` entries. When `delegate = true`, the relay accepts media forwarded through the trusted peer from relays that the trusted peer vouches for. When `delegate = false` (default), only media originating from explicitly trusted/peered relays is accepted.
-
-## Trust Levels
-
-| Config | Meaning |
-|--------|---------|
-| `[[peers]]` | "I connect to you and trust your identity" |
-| `[[trusted]]` | "I accept connections from you" |
-| `[[trusted]] delegate = true` | "I accept connections from you AND from relays you vouch for" |
-| No entry | "I reject your connections and drop your forwarded media" |
-
-## Configuration
-
-```toml
-# Relay 1: trusts Relay 2 and delegates trust
-[[trusted]]
-fingerprint = "relay-2-tls-fingerprint"
-label = "Relay 2 (Hub)"
-delegate = true    # Accept relays that Relay 2 forwards from
-
-# Without delegate (default = false):
-[[trusted]]
-fingerprint = "relay-4-tls-fingerprint"
-label = "Relay 4"
-# delegate = false  (implicit default)
-# Only direct media from Relay 4 is accepted
-```
-
-## Protocol Changes
-
-### Relay-to-Relay Media Authorization
-
-When Relay 2 forwards media from Relay 3 to Relay 1, the datagram needs to carry origin information so Relay 1 can decide whether to accept it.
-
-**Option A: Origin tag in datagram** (recommended)
-
-Extend the federation datagram format:
-```
-[room_hash: 8 bytes][origin_relay_fp: 8 bytes][media_packet]
-```
-
-The 8-byte origin fingerprint identifies which relay originally produced the media. The forwarding relay (Relay 2) sets this to the source relay's fingerprint. Relay 1 checks:
-1. Is the origin relay directly trusted? → accept
-2. Is the forwarding relay trusted with `delegate = true`? → accept
-3. Otherwise → drop
-
-**Option B: Trust announcement signal**
-
-When Relay 2 connects to Relay 1, it sends a `FederationTrustChain` signal listing which relays it will forward from:
-```rust
-FederationTrustChain {
-    /// Fingerprints of relays this peer may forward media from
-    vouched_relays: Vec<String>,
-}
-```
-
-Relay 1 checks each fingerprint against its policy:
-- If Relay 2 has `delegate = true` in Relay 1's config → accept all listed relays
-- If Relay 2 has `delegate = false` → reject, only accept direct media from Relay 2
-
-Option B is simpler to implement (no datagram format change) but less granular.
-
-### Recommended: Option B for v1, Option A for v2
-
-Option B is simpler — the trust chain is established at connection time, not per-datagram. The forwarding relay announces what it will forward, and the receiving relay approves or rejects upfront.
-
-## Implementation
-
-### Config Changes
-
-```rust
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct TrustedConfig {
-    pub fingerprint: String,
-    #[serde(default)]
-    pub label: Option<String>,
-    /// When true, also accept media forwarded through this relay from
-    /// relays it vouches for. Default: false.
-    #[serde(default)]
-    pub delegate: bool,
-}
-```
-
-### Federation Signal
-
-```rust
-/// Sent after FederationHello — lists relays this peer will forward from.
-FederationTrustChain {
-    /// TLS fingerprints of relays whose media may be forwarded through us.
-    vouched_relays: Vec<String>,
-}
-```
-
-### Forwarding Authorization
-
-In `handle_datagram`, before forwarding media to local participants:
-
-```rust
-// Check if we should accept this forwarded media
-let is_authorized = if source_is_direct_peer {
-    true  // Direct peer, always accepted
-} else {
-    // Check if the forwarding peer has delegate=true
-    let forwarding_peer = fm.find_trusted_by_fingerprint(forwarding_peer_fp);
-    forwarding_peer.map(|t| t.delegate).unwrap_or(false)
-};
-
-if !is_authorized {
-    warn!("dropping forwarded media from unauthorized relay chain");
-    return;
-}
-```
-
-### Relay 2 (Hub) Behavior
-
-When Relay 2 receives `FederationTrustChain` queries from peers:
-1. Collect all directly connected peer fingerprints
-2. Send `FederationTrustChain { vouched_relays }` to each peer
-3. When a new relay connects, update all peers' trust chains
-
-### Anti-Spam Properties
-
-| Attack | Mitigation |
-|--------|-----------|
-| Unknown relay connects to hub | Hub rejects (not in `[[trusted]]`) |
-| Hub forwards spam relay's media | Receiving relay checks delegate flag, drops if false |
-| Relay spoofs origin fingerprint | Origin tag is set by the forwarding relay, not the source. The forwarding relay is trusted, so if it lies about origin, the trust is misplaced at the config level. |
-| Chain amplification (A→B→C→D→...) | TTL on forwarded datagrams (decrement at each hop, drop at 0). Default TTL=2 (one intermediate relay). |
-
-## TTL for Chain Length
-
-Add a TTL byte to the federation datagram to limit chain depth:
-
-```
-[room_hash: 8 bytes][ttl: 1 byte][media_packet]
-```
-
-- Default TTL = 2 (allows one intermediate relay: A→B→C)
-- Each forwarding relay decrements TTL
-- When TTL = 0, don't forward further (only deliver to local participants)
-- Configurable per-relay: `max_federation_hops = 2`
-
-## Milestones
-
-| Phase | Scope | Effort |
-|-------|-------|--------|
-| 1 | Add `delegate` field to `TrustedConfig` | 0.5 day |
-| 2 | `FederationTrustChain` signal + announcement | 1 day |
-| 3 | Authorization check in `handle_datagram` | 0.5 day |
-| 4 | TTL in federation datagrams | 0.5 day |
-| 5 | Testing: authorized vs unauthorized forwarding | 0.5 day |
-
-## Non-Goals (v1)
-
-- Per-room trust policies (trust Relay X only for room "android")
-- Dynamic trust negotiation (relays negotiate trust level at runtime)
-- Revocation (removing a relay from trust chain requires config edit + restart)
-- Cryptographic proof of origin (signed datagrams from source relay)

docs/PRD-dred-integration.md

@@ -1,360 +0,0 @@
-# PRD: DRED Integration & Opus-Tier FEC Simplification
-
-## Problem
-
-WarzonePhone's audio loss-recovery stack is built around classical Opus + application-level RaptorQ FEC. It was the right answer when WZP was designed, but libopus 1.5 (December 2023) introduced **Deep REDundancy (DRED)** — a neural speech-recovery feature that is strictly better than classical FEC for the loss patterns VoIP calls actually experience. We are paying real latency, bitrate, and complexity costs for protection that DRED now does better and cheaper.
-
-Concretely, on every Opus call today we pay:
-
-- **~40–100 ms of receiver-side latency** waiting for RaptorQ block completion before decode
-- **10–20% bitrate overhead** from RaptorQ repair symbols (more on studio profiles)
-- **~20–40% codec-internal overhead** from Opus inband FEC (LBRR)
-- Classical Opus PLC on loss bursts exceeding the RaptorQ block size — which sounds robotic and gap-ridden
-
-…in exchange for bit-exact recovery of isolated single-frame losses, which is perceptually indistinguishable from classical Opus PLC for 20 ms of speech. The protection is misaligned with the failure modes.
-
-DRED delivers:
-
-- **Zero added receive latency** — reconstruction runs only on detected loss
-- **~1 kbps flat bitrate overhead** regardless of base bitrate
-- **Plausible reconstruction of bursts up to ~1 second** — DRED's headline capability, exactly the regime RaptorQ can't touch
-- Neural PLC that sounds like continuous speech, not a gap
-
-We also have a second, unrelated problem blocking adoption: our FFI crate `audiopus_sys 0.2.2` vendors **libopus 1.3**, predating DRED entirely. We cannot enable DRED without first swapping the FFI layer. The naïve choice (`opus` crate from SpaceManiac) is a trap — it depends on the same dead `audiopus_sys`. The real target is `opusic-c 1.5.5` by DoumanAsh, which vendors libopus 1.5.2 with full DRED support and documents Android NDK cross-compile.
-
-This PRD covers the FFI swap, DRED enablement, the decision to **remove RaptorQ and Opus inband FEC from the Opus tiers entirely** (keeping RaptorQ only for Codec2 where DRED is N/A), and the jitter buffer refactor that the DRED lookahead/backfill pattern requires.
-
-## Goals
-
-- Replace `audiopus 0.3.0-rc.0` + `audiopus_sys 0.2.2` (dead upstream, libopus 1.3) with `opusic-c 1.5.5` + `opusic-sys 0.6.0` (active upstream, libopus 1.5.2)
-- Enable DRED on every Opus profile with a tiered duration policy, lower at studio bitrates and higher at degraded bitrates
-- Disable Opus inband FEC (LBRR) on all Opus profiles — opusic-c's own docs recommend this, and it overlaps DRED's job
-- Remove `wzp-fec` (RaptorQ) from the Opus tiers entirely — the latency and bitrate savings are real, and DRED strictly dominates it on speech
-- Keep RaptorQ + current FEC ratios on the Codec2 tiers unchanged — DRED is libopus-only, Codec2 has no neural equivalent
-- Refactor `wzp-transport::jitter` to a lookahead/backfill pattern that lets DRED reconstruct loss windows when the next packet arrives, instead of the current "wait for block completion or fall through to classical PLC" policy
-- Ship behind a runtime escape hatch (`AUDIO_USE_LEGACY_FEC`) for the first rollout window so we can revert to RaptorQ if DRED has surprises in real-world conditions
-
-## Non-goals
-
-- Changing Codec2 at all. Codec2 1200 / 3200 are outside the DRED lineage and keep their current RaptorQ protection, block sizes, and PLC path.
-- Adding new Opus bitrate tiers or changing the quality adaptation thresholds. This PRD is about the protection layer, not the bitrate ladder.
-- Enabling OSCE (Opus Speech Coding Enhancement — a separate libopus 1.5 neural post-processor that opusic-c exposes via an `osce` feature flag). Valuable, complementary, and free once opusic-c is in — but out of scope here to keep the PRD focused. Track as follow-up.
-- Video, audio-over-MoQ, or any protocol-layer changes discussed in prior conversations.
-- Touching the wzp-web / browser client. Browser Opus is a separate codepath via WebAudio / WASM libopus and is not affected by the native FFI swap.
-
-## Background
-
-### How the three protection mechanisms actually differ
-
-| | Opus inband FEC (LBRR) | RaptorQ (wzp-fec) | DRED |
-|---|---|---|---|
-| Layer | codec-internal | application, across Opus packets | codec-internal |
-| What it sends | low-bitrate copy of the *previous* frame, embedded in every packet | fountain-code repair symbols across a block | neural-coded history of the recent past |
-| Protection horizon | 1 packet back | block duration (currently 100 ms, proposed 40 ms) | configurable, 0–1040 ms |
-| Recovery granularity | 1 frame (lower quality) | 1 frame (bit-exact) | 10 ms frames (plausible reconstruction) |
-| Latency cost | 0 ms | block duration on receive | 0 ms |
-| Bitrate cost | ~20–40% of base | `fec_ratio × base` (currently +20% GOOD, +50% DEGRADED) | ~1 kbps flat |
-| Effective loss tolerance | ~single-packet losses | up to `(repair symbols / block)` losses, cliff beyond | bursts up to the configured duration |
-| Content assumption | any Opus audio | any | speech (DRED model is speech-trained) |
-
-### Why DRED dominates on the Opus tiers
-
-Loss-scenario walkthrough (verified against opusic-c and libopus 1.5 docs):
-
-- **1-frame loss (20 ms)**: RaptorQ recovers bit-exactly, DRED wouldn't run (classical Opus PLC is perceptually indistinguishable for single 20 ms frames). RaptorQ "wins" on paper but not on ears.
-- **2–3 frame burst (40–60 ms)**: RaptorQ at current ratio 0.2 hits its tolerance cliff. DRED handles this trivially — well within a 200 ms window.
-- **5–10 frame burst (100–200 ms)**: RaptorQ completely overwhelmed at any reasonable ratio. DRED's sweet spot.
-- **10+ frame burst (>200 ms)**: RaptorQ useless. DRED at 500–1000 ms still recovers.
-
-The only scenario where RaptorQ strictly beats DRED is bit-exact recovery of isolated single-frame losses — which is perceptually irrelevant for speech. In every other scenario DRED either ties or wins.
-
-### Why Codec2 keeps RaptorQ
-
-DRED lives inside libopus — it does not help Codec2 at all. Codec2's classical PLC is a parametric-vocoder interpolation that produces noticeably robotic artifacts on loss. On the Codec2 tiers, RaptorQ is the only protection we have, and it should stay at current ratios (1.0 on CATASTROPHIC, 0.5 on the Codec2 3200 tier).
-
-### The opusic-c / opusic-sys situation
-
-- `opusic-sys 0.6.0` — FFI crate, published 2026-03-17, vendors libopus 1.5.2 via its `bundled` feature (on by default), documents Android NDK cross-compile via `ANDROID_NDK_HOME` (which our `wzp-android/build.rs` already sets). Exposes raw bindings to `opus_dred_parse`, `opus_decoder_dred_decode`, and the `OpusDRED` state struct.
-- `opusic-c 1.5.5` — high-level safe wrapper. Its **encoder** side is fine: exposes `Encoder::set_dred_duration(value: u8) -> Result<(), ErrorCode>` with range `0..=104` (each unit is 10 ms, so 0–1040 ms configurable). Also exposes `set_bitrate`, `set_inband_fec`, `set_dtx`, `set_packet_loss`, `set_signal`, `set_complexity`, `set_bandwidth`, `set_application` on the encoder.
-- **opusic-c's decoder-side DRED wrapper is NOT sufficient for our architecture.** Confirmed by reading the source of `opusic-c/src/dred.rs`:
-  1. `Dred::decode_to` ignores the `dred_end` output of `opus_dred_parse` (prefixed `_dred_end`), so the caller cannot know how much DRED history a given packet actually carried.
-  2. In `opus_decoder_dred_decode(decoder, dred, dred_offset, pcm, frame_size)`, the wrapper passes `frame_size` to BOTH the `dred_offset` and `frame_size` arguments. This looks like a bug — it means reconstruction always starts at offset `frame_size` into the DRED window, not at an arbitrary caller-chosen offset. Arbitrary-gap reconstruction (which we need for the lookahead/backfill pattern) requires proper offset control.
-  3. `DredPacket` is owned internally by a `Dred` instance; its internal buffer is overwritten on every `decode_to` call. We cannot hold a ring of parsed DredPackets from multiple recent arrivals — which is exactly what the lookahead/backfill jitter buffer pattern requires.
-- **Decision**: use opusic-c for the encoder path (its wrapper is correct and saves work), and drop to `opusic-sys` raw FFI for the entire decoder path AND the DRED reconstruction path. Both use a single shared `DecoderHandle` so internal decoder state stays consistent. **Verified at pre-flight**: `opusic_c::Decoder.inner` is `pub(crate)`, so there is no way to reach the raw `*mut OpusDecoder` from outside opusic-c. Running two parallel decoders (one from opusic-c for audio, one from opusic-sys for DRED) would cause state drift because the DRED-only decoder wouldn't see the normal decode calls. Single unified decoder via opusic-sys is the only correct architecture.
-- **Three FFI handles required** per decode session: `opusic_c::Encoder` (encoder side, unchanged), our own `DecoderHandle` wrapping `*mut OpusDecoder` from opusic-sys (for normal decode AND for the `OpusDecoder` pointer passed to `opus_decoder_dred_decode`), and a new `DredDecoderHandle` wrapping `*mut OpusDREDDecoder` from opusic-sys (passed to `opus_dred_parse`). Note: `OpusDREDDecoder` is a **separate struct** from `OpusDecoder` in libopus 1.5 — verified from opus.h. Allocation via `opus_dred_decoder_create()` (confirm exact symbol name at Phase 3a start).
-- The `opus` crate from SpaceManiac (0.3.1, published 2026-01-03) is a trap: it depends on `audiopus_sys ^0.2.0` — the same dead FFI crate we're trying to get away from. Do not use.
-- **Follow-up (out of scope for this PRD)**: upstream the fixes to `opusic-c/src/dred.rs` (preserve `dred_end`, fix the `dred_offset` double-pass, expose `DredPacket` externally). Worth a GitHub PR once our own implementation has proven correct. Would let us eventually delete our internal FFI wrapper.
-
-### Critical note from opusic-c docs
-
-From the `dred` module documentation: *"The documentation recommends disabling in-band FEC and using `Application::Voip` for optimal results."* This applies to the **codec-internal** Opus inband FEC (LBRR), not our application-level RaptorQ. The two are independent layers. This PRD disables both on Opus tiers, but for different reasons — inband FEC per upstream recommendation, RaptorQ per the analysis above.
-
-### The libopus 1.5 loss-percentage gating quirk
-
-In libopus 1.5, both inband FEC and DRED are gated on `OPUS_SET_PACKET_LOSS_PERC` being non-zero. If the encoder thinks loss is 0%, it will not emit DRED data even when `set_dred_duration` is configured. We must plumb a meaningful loss percentage into the encoder continuously, floored at a small non-zero value so DRED stays active even when the network is perfect. Planned floor: **5%**, overridden upward by the real `QualityReport` loss value when it exceeds the floor.
-
-## Solution
-
-### High-level architecture change
-
-**Before** (per Opus frame encode path):
-```
-PCM → AdaptiveEncoder.encode (Opus)
-       → inband FEC embedded in packet
-    → wzp-fec FEC encoder (accumulate into block, generate repair symbols)
-    → DATAGRAM out
-```
-
-**Before** (per Opus frame decode path):
-```
-DATAGRAM in → wzp-fec block assembly (wait for block, recover if possible)
-            → AdaptiveDecoder.decode (Opus) / decode_lost (classical PLC)
-            → PCM
-```
-
-**After** (Opus tiers):
-```
-PCM → OpusEncoder.encode (opusic-c, DRED enabled via set_dred_duration, inband FEC off)
-    → DATAGRAM out directly (no RaptorQ block)
-```
-
-```
-DATAGRAM in → jitter buffer (lookahead/backfill)
-            → on frame arrival: OpusDecoder.decode
-            → on detected gap: if next packet has DRED state → dred::Dred.reconstruct(gap)
-                                else → OpusDecoder.decode_lost (classical PLC)
-            → PCM
-```
-
-**After** (Codec2 tiers): unchanged. RaptorQ block encoding + classical Codec2 decode path stay exactly as they are today.
-
-### New per-profile protection matrix
-
-| Profile | Codec | Inband FEC | RaptorQ ratio | DRED duration | Total overhead |
-|---|---|---|---|---|---|
-| `STUDIO_64K` | Opus 64k | **off** | **none** | **10 frames (100 ms)** | +1 kbps |
-| `STUDIO_48K` | Opus 48k | **off** | **none** | **10 frames (100 ms)** | +1 kbps |
-| `STUDIO_32K` | Opus 32k | **off** | **none** | **10 frames (100 ms)** | +1 kbps |
-| `GOOD` | Opus 24k | **off** | **none** | **20 frames (200 ms)** | +1 kbps |
-| `NORMAL_16K` | Opus 16k | **off** | **none** | **20 frames (200 ms)** | +1 kbps |
-| `DEGRADED` | Opus 6k | **off** | **none** | **50 frames (500 ms)** | +1 kbps |
-| `CODEC2_3200` | Codec2 3200 | N/A | **0.5 (unchanged)** | N/A | +50% |
-| `CATASTROPHIC` | Codec2 1200 | N/A | **1.0 (unchanged)** | N/A | +100% |
-| `COMFORT_NOISE` | CN | — | — | — | — |
-
-DRED duration rationale:
-
-- **Studio tiers (100 ms)**: loss is rare on the networks where users pick studio quality. Short DRED window keeps decode-side CPU modest. Still covers multi-frame bursts that classical PLC can't touch.
-- **Normal tiers (200 ms)**: balanced baseline. Handles the common VoIP loss pattern (20–150 ms bursts from wifi roam, transient congestion).
-- **Degraded tier (500 ms)**: users on Opus 6k are by definition on a bad link. Long DRED window buys maximum burst resilience where it matters most. Still well under the 1040 ms cap.
-
-### Runtime escape hatch
-
-Ship with a single environment variable / settings flag: **`AUDIO_USE_LEGACY_FEC`**. When set, the entire Opus-tier path reverts to the pre-PRD behavior: RaptorQ re-enabled at the old ratios, Opus inband FEC re-enabled, DRED disabled (`set_dred_duration(0)`). This is the rollback safety valve for the first production window.
-
-Escape hatch semantics:
-- Read once at `CallEncoder::new` / `CallDecoder::new` time. Call-scoped, not re-read mid-call.
-- Exposed via Android Settings UI as a hidden "Legacy FEC (debug)" toggle, and as a CLI flag `--legacy-fec` on the desktop client.
-- Logged in `DebugReporter` so we can tell which mode a call was in when diagnosing.
-- Removed entirely after 2 months of stable production with no regressions reported. Removal is a follow-up PR, not part of this PRD's scope.
-
-## Detailed design
-
-### Phase 0 — FFI crate swap (prerequisite, no behavior change)
-
-**Files touched:**
-- `Cargo.toml` (workspace root) — replace `audiopus = "0.3.0-rc.0"` with `opusic-c = { version = "1.5.5", features = ["bundled", "dred"] }` and `opusic-sys = { version = "0.6.0", features = ["bundled"] }`. The `opusic-sys` direct dep is for the DRED decoder path below.
-- `crates/wzp-codec/Cargo.toml` — update `audiopus = { workspace = true }` to `opusic-c = { workspace = true }`, add `opusic-sys = { workspace = true }`, add `bytemuck = "1"` for the i16↔u16 slice cast.
-- `crates/wzp-codec/src/opus_enc.rs` — rewrite against opusic-c. API mapping:
-  - `audiopus::coder::Encoder::new(SampleRate::Hz48000, Channels::Mono, Application::Voip)` → `opusic_c::Encoder::new(Channels::Mono, SampleRate::Hz48000, Application::Voip)` (argument order swapped)
-  - `set_bitrate(Bitrate::BitsPerSecond(bps))` → `set_bitrate(Bitrate::Bits(bps))` or equivalent variant — verify at implementation time
-  - `set_inband_fec(true/false)` → `set_inband_fec(InbandFec::On/Off)` (now an enum)
-  - `set_packet_loss_perc(u8)` → `set_packet_loss(u8)` (method renamed)
-  - `set_dtx(bool)`, `set_signal(Signal::Voice)`, `set_complexity(u8)` — names match
-  - `encode(&[i16], &mut [u8])` → `encode_to_slice(&[u16], &mut [u8])` with `bytemuck::cast_slice::<i16, u16>(pcm)` at the call site
-- `crates/wzp-codec/src/opus_dec.rs` — same-style rewrite for the `Decoder` path. Note that opusic-c's decoder methods take `decode_fec: bool` as a parameter directly (not a separate ctl).
-- `vendor/audiopus_sys/` — delete the directory (only exists on `feat/desktop-audio-rewrite`, not on `android-rewrite`, so this is a no-op on the current branch but do remove the `[patch.crates-io]` block from Cargo.toml when merging back).
-
-**Acceptance criteria:**
-- `cargo check --workspace` passes on Linux x86_64, macOS, and Android NDK cross-compile.
-- All existing codec unit tests in `crates/wzp-codec/src/adaptive.rs` pass unchanged. DRED is still disabled at this phase (default `set_dred_duration(0)`), so behavior is equivalent to pre-swap libopus 1.3 for call quality purposes.
-- A short real-call smoke test produces audio identical to current behavior (no audible regression).
-- `opusic_c::version()` at startup logs libopus version containing `1.5.2` — hard signal that the swap landed correctly.
-
-### Phase 1 — DRED encoder enable on all Opus profiles
-
-**Files touched:**
-- `crates/wzp-codec/src/opus_enc.rs`:
-  - Add `fn dred_duration_for(codec: CodecId) -> u8` returning the per-profile value from the matrix above (10 / 20 / 50 frames).
-  - In `OpusEncoder::new`, after the existing `set_bitrate`/`set_signal`/`set_complexity` block: call `inner.set_inband_fec(InbandFec::Off)`, then `inner.set_dred_duration(dred_duration_for(profile.codec))`, then `inner.set_packet_loss(5)` as the default floor.
-  - Add `pub fn set_dred_duration(&mut self, frames: u8)` to allow the adaptive ladder to update DRED duration on profile switch.
-  - In the existing `set_profile` impl, call `set_dred_duration(dred_duration_for(profile.codec))` after `apply_bitrate`.
-- `crates/wzp-codec/src/adaptive.rs`:
-  - `AdaptiveEncoder::set_profile` already delegates to `self.opus.set_profile` — no changes needed. DRED update rides along.
-- `crates/wzp-client/src/call.rs` (and equivalent on `wzp-android/src/pipeline.rs`):
-  - In the `QualityReport` handler (wherever we currently call `set_expected_loss` / `set_packet_loss_perc`), also ensure the loss value is floored at 5% before passing to the Opus encoder. This is a 1-line change.
-
-**Acceptance criteria:**
-- Encoder produces DRED-enabled Opus packets. Verifiable via libopus's reference decoder in debug mode, or by wire capture + inspection — a DRED-bearing Opus packet has a larger `opus_packet_get_nb_frames` footprint than a non-DRED one of the same nominal bitrate.
-- Total outgoing bitrate on Opus 24k is ~25 kbps (up from ~24 kbps) — confirms ~1 kbps DRED overhead.
-- On a lossless path, decoder output is audibly identical to Phase 0.
-- Escape hatch `AUDIO_USE_LEGACY_FEC=1` cleanly reverts the DRED enable (calls `set_dred_duration(0)` and `set_inband_fec(InbandFec::On)` instead).
-
-### Phase 2 — RaptorQ removal on Opus tiers
-
-**Files touched:**
-- `crates/wzp-client/src/call.rs`:
-  - In `CallEncoder::encode_frame` (or wherever `wzp_fec::Encoder::add_source_symbol` is called), gate the RaptorQ path on `!profile.codec.is_opus()` — Opus frames go straight to DATAGRAM emit, Codec2 frames continue through RaptorQ.
-  - When a profile switch crosses the Opus↔Codec2 boundary, flush/reset the RaptorQ encoder state.
-- `crates/wzp-android/src/pipeline.rs`:
-  - Mirror the same gate in the Android encode path.
-- `crates/wzp-proto/src/packet.rs`:
-  - `MediaHeader.fec_block` and `fec_symbol` are still valid fields on the wire. For Opus packets we emit `fec_block = 0`, `fec_symbol = 0`, `fec_ratio_encoded = 0`. No wire format change; the receiver just sees all-zeros in the FEC fields for Opus packets and skips the FEC decoder path.
-  - Bump protocol version to v1 → v2? **No** — the change is semantically backward compatible because existing RaptorQ decoders handle a zero ratio correctly (ratio 0.0 means "no repair symbols expected"). Old receivers can still decode new Opus packets; they just won't see any DRED benefit because their libopus is old. This is a property we want: the opposite (new receiver, old sender) is the more common mixed-version case during rollout and also Just Works.
-- `crates/wzp-client/src/call.rs` — `CallDecoder`:
-  - Symmetric change: Opus frames bypass the RaptorQ block assembly, go straight to the decoder. Only Codec2 frames (`codec_id.is_codec2()`) feed through `wzp-fec` block decoding.
-
-**Acceptance criteria:**
-- Outgoing Opus packets have `fec_ratio_encoded == 0` (verifiable with the existing wire capture tooling in `wzp-client/src/echo_test.rs`).
-- On a clean network, receiver latency (measured as encode-to-playout one-way delay) drops by ~40 ms versus Phase 1. This is the primary win and should be directly measurable with the existing telemetry.
-- Codec2 calls show no latency change and no packet-format change. Regression-test Codec2 3200 and Codec2 1200 specifically.
-- Total outgoing bitrate on Opus 24k drops from ~28.8 kbps (24k base + 0.2 RaptorQ ratio) to ~25 kbps (24k base + ~1 kbps DRED). Direct savings observable in network telemetry.
-
-### Phase 3 — DRED reconstruction wrapper + jitter buffer lookahead/backfill refactor
-
-This phase is larger than originally estimated because opusic-c's decoder-side DRED wrapper is unusable for our architecture (see Background). We write our own safe wrapper over `opusic-sys` raw FFI first, then plumb it through the jitter buffer.
-
-**Step 3a — Safe DRED reconstruction wrapper in `wzp-codec`:**
-
-New file `crates/wzp-codec/src/dred_ffi.rs`. Wraps the raw libopus 1.5 DRED API:
-
-- `pub struct DredState` — owns an `OpusDRED` buffer (allocated via `opusic_sys::opus_dred_alloc` or equivalent; size is fixed at 10,592 bytes per libopus 1.5). `Clone` is intentionally NOT implemented — the state is heap-owned and non-trivial to copy.
-- `pub fn parse_from_packet(&mut self, decoder: &opusic_c::Decoder, packet: &[u8], max_dred_samples: i32) -> Result<DredParseResult, DredError>` — wraps `opus_dred_parse`, preserves the `dred_end` output (number of samples of history the packet carried), returns it in `DredParseResult { samples_available: i32, frames_available: u8 }`.
-- `pub fn reconstruct_into(&self, decoder: &mut opusic_c::Decoder, dred_offset_samples: i32, output: &mut [i16]) -> Result<usize, DredError>` — wraps `opus_decoder_dred_decode`, takes the offset explicitly, decodes `output.len()` samples starting from that offset in the DRED window.
-- All `unsafe` contained here, strict bounds checking on offsets, Rust-level panic safety. Unit tests use a reference encoder + known-good reference decoder to verify that reconstruction at specific offsets produces expected output.
-- Depends on `opusic-sys` directly and on `opusic-c::Decoder` for the decoder handle. The Decoder handle must be reachable as a raw pointer; opusic-c exposes this via an unstable internal or we wrap the pointer ourselves. **Verify at implementation time** — if opusic-c doesn't expose the raw decoder pointer safely, we create our own thin Decoder wrapper in `dred_ffi.rs` using raw opusic-sys, losing the convenience of opusic-c's decoder but keeping its encoder. This is the smaller-risk fallback.
-
-New `pub trait DredReconstructor` in `wzp-codec/src/lib.rs`:
-```rust
-pub trait DredReconstructor: Send {
-    /// Parse DRED state from an arriving Opus packet into `state`.
-    /// Returns number of 48 kHz samples of history available, or 0 if the packet has no DRED.
-    fn parse(&mut self, state: &mut DredState, packet: &[u8]) -> Result<i32, DredError>;
-
-    /// Reconstruct `output.len()` samples from `state`, starting at the given
-    /// sample offset (measured from the end of the DRED window going backward).
-    fn reconstruct(&mut self, state: &DredState, offset_samples: i32, output: &mut [i16]) -> Result<usize, DredError>;
-}
-```
-
-Implement `DredReconstructor` over the `dred_ffi::DredState` + opusic-c Decoder combination. This is the clean boundary the jitter buffer will talk to.
-
-**Step 3b — Jitter buffer refactor in `crates/wzp-transport/src/jitter.rs`:**
-
-- Current behavior: buffer waits a fixed number of frames of jitter before emitting; on a missing slot, after a timeout it gives up and signals the decoder to run `decode_lost()` (classical Opus PLC or Codec2 PLC).
-- New behavior on Opus tiers: when a frame arrives (in-order or late), first call `DredReconstructor::parse` on it to update a rolling ring of `DredState` instances tagged with their originating sequence number. When a gap is detected (missing sequence number between last-emitted and current arrival), and the ring contains a `DredState` from a nearby packet that covers the gap's sample offset, call `DredReconstructor::reconstruct` with the correct offset to synthesize the missing frames, splice them into playout, then continue normal decode.
-- If no DRED state covers the gap (e.g., gap too far back, or every nearby packet was dropped), fall through to classical PLC exactly as today. The classical path stays intact as the ultimate fallback.
-- Codec2 packets bypass the entire DRED ring. They are not inspected for DRED state and take the unchanged classical PLC path.
-- Ring sizing: `max_dred_duration_frames` + `jitter_depth_frames` worth of `DredState` instances. At 500 ms DRED on degraded tier + 60 ms jitter depth, that's ~28 DredState instances × 10,592 bytes ≈ 300 KB. Acceptable. On studio tier with 100 ms DRED it's only ~80 KB.
-- The jitter buffer takes a `Box<dyn DredReconstructor>` at construction, passed in by the call engine. `wzp-transport` does NOT take a direct dep on `opusic-c` or `opusic-sys` — it only knows about the trait defined in `wzp-codec`.
-
-**Files touched:**
-- `crates/wzp-codec/src/dred_ffi.rs` (new, ~150–300 lines)
-- `crates/wzp-codec/src/lib.rs` — expose `DredReconstructor`, `DredState`, `DredError` types
-- `crates/wzp-codec/Cargo.toml` — add `opusic-sys = { workspace = true }` as a direct dep (already done in Phase 0)
-- `crates/wzp-transport/src/jitter.rs` — lookahead/backfill refactor, DRED ring
-- `crates/wzp-transport/Cargo.toml` — add `wzp-codec = { workspace = true }` (likely already present) for the trait import
-- `crates/wzp-client/src/call.rs` — construct a `DredReconstructor` and pass into `CallDecoder`'s jitter buffer
-- `crates/wzp-android/src/pipeline.rs` — same on Android
-
-**Acceptance criteria:**
-- Unit tests in `dred_ffi.rs`: round-trip a known speech waveform through an encoder with DRED enabled, parse the resulting packets, reconstruct at several different offsets, verify the reconstructed samples are within an energy/spectral threshold of the original. (Not bit-exact — DRED reconstruction is lossy by design.)
-- Synthetic loss test on the full pipeline: inject 200 ms bursts at 10% rate into a looped call, verify the DRED reconstruction rate on receiver telemetry is ≥95% of all loss events whose gaps fall within the configured DRED duration window.
-- Reconstructed audio is audibly continuous on 40–200 ms bursts — no gaps, no classical-PLC robot artifact. Verified on real voice samples (not just sine tones), and on at least two distinct speaker profiles (male, female) because DRED can have voice-dependent quality.
-- End-to-end latency metric is unchanged versus Phase 2 (no regression from adding the lookahead path). The DRED ring insertion on packet arrival must be O(1) in practice.
-- Existing `echo_test.rs` and `drift_test.rs` pass with the new jitter buffer.
-- Codec2 path uses classical PLC exclusively (no DRED invocation) because Codec2 packets don't carry DRED state. Verify by injecting loss on a Codec2 call and confirming zero DRED reconstruction telemetry events during that call.
-- `wzp-transport` has no direct dependency on `opusic-sys` or `opusic-c` in its `Cargo.toml` after the refactor — only on `wzp-codec`. Verify by grepping the Cargo.toml file.
-
-### Phase 4 — Telemetry and tooling updates
-
-**Files touched:**
-- `crates/wzp-proto/src/packet.rs` — `QualityReport` or equivalent telemetry message gains `dred_reconstructions: u32` as a new counter (frames reconstructed via DRED this reporting window) and `classical_plc_invocations: u32` (frames filled by Opus/Codec2 classical PLC). These are separate counters because they're different recovery mechanisms.
-- `crates/wzp-relay/src/*` — relay telemetry pipeline surfaces both counters in Prometheus metrics: `wzp_dred_reconstructions_total{call_id}`, `wzp_classical_plc_total{call_id}`.
-- `docs/grafana-dashboard.json` — new panel: "Loss recovery breakdown" stacked bar, DRED vs classical PLC vs clean decode, per call.
-- `android/app/src/main/java/com/wzp/debug/DebugReporter.kt` — surfaces `dredReconstructions` and `classicalPlc` counts in the debug report; also logs active DRED duration and whether legacy-FEC mode is engaged.
-
-**Acceptance criteria:**
-- Grafana dashboard shows a clear visual distinction between DRED-recovered and classical-PLC-recovered frames across a test fleet of calls.
-- Debug report includes the active protection mode ("DRED 200 ms" / "Legacy RaptorQ") and reconstruction counts, so incidents can be classified unambiguously.
-
-### Phase 5 — Escape hatch removal (follow-up, ~2 months post-ship)
-
-After 2 months of stable production with no rollbacks triggered:
-- Delete `AUDIO_USE_LEGACY_FEC` handling in `opus_enc.rs` / `call.rs` / `pipeline.rs`
-- Delete the Opus-tier paths of `wzp-fec` (the crate stays for Codec2)
-- Delete the Android settings toggle and desktop CLI flag
-- Remove the `--legacy-fec` path from smoke tests
-
-## Critical files to modify (summary)
-
-- `Cargo.toml` (workspace) — dep swap (audiopus → opusic-c + opusic-sys)
-- `crates/wzp-codec/Cargo.toml` — dep swap + `bytemuck` for slice cast
-- `crates/wzp-codec/src/opus_enc.rs` — opusic-c rewrite + DRED enable + inband FEC off
-- `crates/wzp-codec/src/opus_dec.rs` — opusic-c rewrite
-- `crates/wzp-codec/src/dred_ffi.rs` — **new file**, safe wrapper over opusic-sys raw DRED FFI
-- `crates/wzp-codec/src/lib.rs` — expose `DredReconstructor` trait, `DredState`, `DredError`
-- `crates/wzp-codec/src/adaptive.rs` — verify profile switch carries DRED duration
-- `crates/wzp-client/src/call.rs` — Opus/Codec2 gate on RaptorQ path, loss floor, wire DredReconstructor into CallDecoder
-- `crates/wzp-android/src/pipeline.rs` — same gate, same loss floor, wire DredReconstructor
-- `crates/wzp-transport/src/jitter.rs` — lookahead/backfill refactor, DRED ring, reconstruction dispatch
-- `crates/wzp-transport/Cargo.toml` — verify it depends only on `wzp-codec`, not directly on opusic-*
-- `crates/wzp-proto/src/packet.rs` — new telemetry counters
-- `crates/wzp-relay/` — Prometheus metric exposure
-- `android/app/src/main/java/com/wzp/debug/DebugReporter.kt` — debug output
-- `docs/grafana-dashboard.json` — loss-recovery panel
-- (delete) `vendor/audiopus_sys/` on `feat/desktop-audio-rewrite` when merging back
-
-## Existing utilities to reuse
-
-- `wzp_codec::resample::Downsampler48to8` / `Upsampler8to48` — unchanged, only Codec2 path uses them
-- `wzp_codec::adaptive::AdaptiveEncoder` / `AdaptiveDecoder` — existing profile-switching machinery, DRED duration changes ride along
-- `wzp_codec::silence::SilenceDetector` / `ComfortNoise` — unchanged
-- `wzp_codec::agc::AutoGainControl` — unchanged, runs before encode as today
-- `wzp_fec::RaptorQFecEncoder` / decoder — unchanged, still used for Codec2 tiers
-- `wzp_client::call::QualityAdapter` — unchanged; drives profile switching, which now also reconfigures DRED duration via the existing `set_profile` path
-
-## Verification
-
-End-to-end testing, in order:
-
-1. **Unit**: `cargo test -p wzp-codec` — Opus encode/decode round-trip at every profile, DRED enabled. Verify `version()` reports libopus 1.5.2.
-2. **Unit**: `cargo test -p wzp-transport` — jitter buffer lookahead/backfill behavior with injected loss patterns (0%, 5%, 15%, 30%, 50% loss; isolated losses, 40 ms bursts, 200 ms bursts, 500 ms bursts).
-3. **Integration**: `crates/wzp-client/src/echo_test.rs` — existing echo test must pass on all Opus profiles with <5% perceived quality regression (measure via the time-window analysis already built into `echo_test.rs`).
-4. **Integration**: `crates/wzp-client/src/drift_test.rs` — latency measurement. Must show ~40 ms reduction on Opus profiles versus pre-PRD baseline. Codec2 profiles unchanged.
-5. **Manual**: Android release build, real call over bad wifi (or a shaped network via `tc netem` on Linux). Burst losses of 200 ms should be perceptually continuous speech, not robotic gaps.
-6. **Manual**: Same call with `AUDIO_USE_LEGACY_FEC=1` — verify behavior reverts to current production behavior. This is the pre-ship rollback rehearsal.
-7. **Cross-compile**: full build matrix — Android arm64-v8a + armeabi-v7a (via `scripts/build-and-notify.sh`), macOS universal, Linux x86_64 (via `scripts/build-linux-docker.sh`). Windows cross-compile via cargo-xwin should also pass — libopus 1.5 upstream fixed the clang-cl SIMD issue that required the vendor patch on `feat/desktop-audio-rewrite`.
-8. **Telemetry smoke**: deploy to staging relay, make 10 test calls, verify Grafana's new "Loss recovery breakdown" panel shows DRED reconstruction events firing on injected loss and classical-PLC on packet-loss beyond DRED's window.
-
-## Risks and mitigations
-
-- **Custom DRED FFI wrapper is WZP-maintained code with no second source.** opusic-c's decoder-side DRED wrapper is insufficient (see Background), so we carry our own `dred_ffi.rs` that calls `opus_dred_parse` and `opus_decoder_dred_decode` directly via opusic-sys. Bugs in this wrapper — offset arithmetic off-by-ones, lifetime errors on `OpusDRED` buffers, UB from misuse of the C API — could manifest as silent audio corruption on loss bursts, hard to diagnose. **Mitigation**: extensive unit tests in `dred_ffi.rs` using a reference encoder + reference decoder round-trip with known offsets; strict bounds checking on every `unsafe` boundary; Miri run in CI if feasible; the legacy-FEC escape hatch disables the entire DRED code path including our custom wrapper, giving us a single flag to revert any wrapper bug in production. Long-term: upstream the fixes to opusic-c (follow-up task, not blocking).
-- **opusic-c's encoder-side API and internal Decoder pointer access**. Step 3a depends on being able to call opusic-sys raw functions that take an `*mut OpusDecoder` pointer while still using opusic-c's `Decoder` for normal decode. If opusic-c doesn't expose the raw pointer cleanly, we fall back to a thin opusic-sys-direct Decoder wrapper inside `dred_ffi.rs` and lose some of opusic-c's convenience. **Mitigation**: verify at the start of Phase 3 (one afternoon of reading opusic-c source). If the clean path doesn't work, the fallback is not difficult — it's what we'd have built anyway if opusic-c didn't exist.
-- **DRED reconstruction quality varies by voice / content**. The neural model is trained on speech; edge cases (shouting, whispering, heavy accents, music-on-hold, cough, laughter) may reconstruct less cleanly than continuous speech. **Mitigation**: escape hatch ships from day one. If production telemetry shows perceptible quality regression on specific voice patterns, flip legacy mode for affected users while tuning. Also: classical Opus PLC remains as the third-tier fallback when DRED state is unavailable.
-- **Removing RaptorQ removes bit-exact recovery**. Isolated single-packet losses are now reconstructed plausibly instead of bit-exactly. **Mitigation**: as argued in Background, bit-exactness on a single 20 ms speech frame is perceptually meaningless. The assumption is "speech is the workload" — if we ever add non-speech features (music bot, ringtones over the call path, DTMF-over-audio) we revisit.
-- **libopus 1.5 DRED API stability**. **Verified at pre-flight**: opus.h in the upstream xiph/opus repository has no "experimental" marker on the DRED API declarations. The earlier characterization was incorrect. DRED shipped as a first-class feature in libopus 1.5.0 (Dec 2023) and has been iterated in 1.5.1 and 1.5.2. Google Meet and Duo ship it at scale. **Mitigation**: pin `opusic-sys` exactly (no `^` range) to ensure reproducible builds, follow upstream 1.5.x bugfixes as they land. No special stability concerns beyond normal dependency hygiene.
-- **Jitter buffer refactor is the largest code change**. Jitter bugs are notoriously subtle (off-by-one on sequence wraparound, clock drift interactions, playout starvation corner cases). **Mitigation**: keep the classical-PLC path intact as the DRED fallback, so jitter bugs degrade to "current behavior" rather than "broken audio". Write targeted unit tests for the buffer at each loss-pattern scenario before touching production paths. Consider shipping Phase 3 behind a sub-flag separate from the main escape hatch, so we can independently toggle "DRED enabled but classical jitter buffer" for bisection.
-- **Cross-compile surprises**. `opusic-sys` is actively maintained but our exact combination of Android NDK version / Docker builder environment / Windows cross-compile via cargo-xwin has not been tested by upstream. **Mitigation**: Phase 0 includes the full cross-compile matrix as an acceptance criterion. Any blockers surface before we touch loss-recovery behavior.
-- **Wire-format compatibility during rollout**. Mixed-version calls (new sender + old receiver, or vice versa) need to keep working. **Verified at pre-flight**: traced both live receive paths (`wzp-client/src/call.rs::CallDecoder::ingest` and `wzp-android/src/engine.rs` the JNI-driven engine path), and both degrade gracefully: new-sender Opus packets with `fec_ratio_encoded=0` / `fec_block=0` / `fec_symbol=0` flow through to the jitter buffer and decode normally on old receivers. The RaptorQ decoder either ignores zero-FEC packets entirely (Android pipeline.rs gates on non-zero fec_block/fec_symbol) or accumulates them harmlessly until the 2-second staleness eviction (desktop call.rs). Old-sender packets with populated RaptorQ fields are handled by new receivers via the unchanged Codec2 path (new receivers keep wzp-fec for Codec2 tiers and simply ignore RaptorQ fields on Opus packets). **No wire format version bump required.**
-- **Pre-existing desktop RaptorQ gap** (incidental finding, NOT caused by this PRD). The desktop `wzp-client/src/call.rs::CallDecoder` feeds packets into `fec_dec.add_symbol` but **never calls `fec_dec.try_decode`** — RaptorQ recovery is effectively dead code on the desktop path today. Main decode reads from the jitter buffer directly, falling through to classical Opus PLC on missing packets. The Android `engine.rs` path properly uses `try_decode` for recovery. This PRD does not fix the desktop gap — it's unrelated — but is noted here so nobody is surprised that removing RaptorQ from Opus tiers on the desktop client causes no measurable recovery regression (there was nothing to lose). Recommend filing a follow-up task to either fix or remove the vestigial desktop RaptorQ wiring independently of this work.
-- **`AUDIO_USE_LEGACY_FEC` itself becoming permanent tech debt**. Escape hatches have a way of outliving their intended lifespan. **Mitigation**: put an explicit removal date in a `// TODO(2026-06-15): remove legacy FEC path` comment at the flag-handling site. Track in taskmaster.
-
-## Open questions
-
-- ~~**Does opusic-c expose `opusic_c::Decoder`'s raw inner pointer?**~~ **Resolved at pre-flight**: no, it's `pub(crate)`. We build a unified `DecoderHandle` over raw opusic-sys in `dred_ffi.rs` and use it for both normal decode and DRED reconstruction. Opusic-c is used only for the encoder side.
-- **Exact opusic-sys symbol name for DRED decoder allocation**. opus.h documents the `OpusDREDDecoder` type and `opus_dred_parse`/`opus_decoder_dred_decode` functions, but the allocation function name is not in the fetched snippet. Expected to be `opus_dred_decoder_create` / `opus_dred_decoder_destroy` per libopus naming convention, but confirm at the very start of Phase 3a by reading the actual opusic-sys bindings. If the function is not exported by opusic-sys, we file a PR upstream to opusic-sys (small fix, trivially mergeable) and temporarily vendor the function declaration locally.
-- **Should the 5% loss floor be configurable per profile?** Currently specified as a constant. A future refinement might make it higher at degraded tiers and lower at studio tiers, but without real telemetry we don't know if the constant is wrong. Keep as a constant for now, revisit after 1 month of production data.
-- **OSCE enable**: opusic-c has an `osce` feature flag for Opus Speech Coding Enhancement, a separate libopus 1.5 neural post-processor. Out of scope for this PRD but should be the next audio-quality follow-up. Probably one-line enable once opusic-c is in.
-- **Upstream PR to opusic-c**: our own `dred_ffi.rs` wrapper should be proven in production first, then the fixes upstreamed to `opusic-c/src/dred.rs` (preserve `dred_end`, fix `dred_offset` double-pass, expose `DredPacket` externally). Follow-up task, not blocking this PRD.
-- **`feat/desktop-audio-rewrite` merge**: the vendored `audiopus_sys` patch on that branch becomes obsolete under this PRD. Coordinate removal with whoever owns that branch.

docs/PRD-local-recording.md

@@ -1,141 +0,0 @@
-# PRD: Local Recording + Cloud Mixer for Podcast-Quality Interviews
-
-## Problem
-
-WarzonePhone delivers real-time encrypted voice, but the audio quality is limited by network conditions (codec compression, packet loss, jitter). Podcasters and interviewers need pristine, studio-grade recordings of each participant — independent of what the network delivers.
-
-## Solution
-
-**Dual-path architecture**: each client simultaneously (1) participates in the live call at whatever codec quality the network supports, and (2) records their own microphone locally as lossless PCM. After the session, all local recordings are uploaded to a self-hosted mixer service that aligns, normalizes, and outputs a final multi-track or mixed file.
-
-## Architecture
-
-```
-                          ┌──────────────────┐
-  Mic ──┬── Opus/Codec2 ──► Network (live)   │  ← real-time call
-        │                 └──────────────────┘
-        │
-        └── WAV 48kHz ────► Local File        │  ← pristine recording
-                           (timestamped)
-                              │
-                              ▼ (after hangup)
-                          ┌──────────────────┐
-                          │  Mixer Service    │  ← self-hosted
-                          │  (align + mix)    │
-                          └──────────────────┘
-                              │
-                              ▼
-                          Final MP3/WAV/FLAC
-```
-
-## Requirements
-
-### Phase 1: Local Recording (MVP)
-
-**All clients (Desktop, Android, Web):**
-
-1. **Record toggle**: User can enable "Record this call" before or during a call
-2. **Recording pipeline**: Tap raw PCM from the microphone capture path *before* it enters the codec encoder
-3. **File format**: WAV (48kHz, 16-bit, mono) — simple, universally supported, lossless
-4. **Sync markers**: Embed a monotonic timestamp (ms since call start) at the beginning of the recording, and periodically (every 10s) write a sync marker packet into a sidecar JSON file:
-   ```json
-   {"ts_ms": 30000, "seq": 1500, "wall_clock_utc": "2026-04-07T12:00:30Z"}
-   ```
-   This allows the mixer to align recordings from different participants even if they join at different times.
-5. **Storage**:
-   - Desktop: `~/.wzp/recordings/{room}_{timestamp}.wav`
-   - Android: `Documents/WarzonePhone/{room}_{timestamp}.wav`
-   - Web: IndexedDB blob or File System Access API
-6. **File size estimate**: 48kHz * 16-bit * mono = 96 KB/s = ~5.6 MB/min = ~345 MB/hour
-7. **UI indicator**: Red dot + timer showing recording is active and file size growing
-8. **On hangup**: Close the WAV file, show "Recording saved" with file path/size
-
-### Phase 2: Upload to Mixer
-
-1. **Upload endpoint**: Self-hosted HTTP service (Rust or Go) that accepts WAV uploads with metadata
-2. **Chunked/resumable upload**: Large files need resumable uploads (tus protocol or simple chunked POST)
-3. **Upload metadata**:
-   ```json
-   {
-     "session_id": "uuid",
-     "participant_fingerprint": "xxxx:xxxx:...",
-     "alias": "Alice",
-     "room": "podcast-ep-42",
-     "duration_secs": 3600,
-     "sync_markers": [...],
-     "sample_rate": 48000,
-     "channels": 1,
-     "bit_depth": 16
-   }
-   ```
-4. **Upload UI**: Progress bar after hangup, option to upload now or later
-5. **Retry on failure**: Queue uploads for retry if network is unavailable
-
-### Phase 3: Mixer Service
-
-1. **Alignment**: Use sync markers (wall clock + sequence numbers) to align recordings from all participants to a common timeline
-2. **Silence trimming**: Detect and optionally trim leading/trailing silence
-3. **Normalization**: Per-track loudness normalization (LUFS-based)
-4. **Noise reduction**: Optional per-track noise gate or RNNoise pass
-5. **Output formats**:
-   - Multi-track: ZIP of individual WAVs (aligned, normalized)
-   - Mixed: Single stereo or mono WAV/MP3/FLAC with all participants
-   - Podcast-ready: Loudness-normalized to -16 LUFS (podcast standard)
-6. **Web UI**: Simple dashboard to see sessions, download outputs, preview waveforms
-7. **Self-hosted**: Docker image, single binary, SQLite for metadata
-
-## Implementation Notes
-
-### Recording tap point
-
-The recording must tap *after* AGC (so levels are normalized) but *before* the codec encoder (to avoid compression artifacts). In the current architecture:
-
-```
-Mic → Ring Buffer → AGC → [TAP HERE for recording] → Opus/Codec2 → Network
-```
-
-**Desktop** (`engine.rs`): After `capture_agc.process_frame()`, before `encoder.encode()`
-**Android** (`engine.rs`): Same location — after AGC, before encode
-**CLI** (`call.rs`): After `self.agc.process_frame()` in `CallEncoder::encode_frame()`
-
-### WAV writer
-
-Use a simple streaming WAV writer that:
-- Writes the WAV header with placeholder data length
-- Appends PCM samples as they come
-- On close, seeks back to update the data length in the header
-
-### Sync mechanism
-
-Wall-clock UTC alone is insufficient (clocks drift). The sync strategy:
-1. Each participant records their local monotonic time + wall clock at call start
-2. Periodically (every 10s), each participant writes: `{local_mono_ms, seq_number, utc_iso}`
-3. The mixer uses sequence numbers (which are shared via the wire protocol) as ground truth for alignment, with wall clock as a fallback
-
-### Privacy
-
-- Local recordings never leave the device without explicit user action
-- Upload is manual, not automatic
-- The mixer service processes files and can delete originals after mixing
-- No recording data flows through the relay — only the user's own mic
-
-## Non-Goals (v1)
-
-- Live transcription (future)
-- Video recording (audio only)
-- Automatic upload without user consent
-- Recording other participants' audio (only your own mic)
-- Real-time mixing (post-session only)
-
-## Milestones
-
-| Phase | Scope | Effort |
-|-------|-------|--------|
-| 1a | Local WAV recording on Desktop | 1-2 days |
-| 1b | Local WAV recording on Android | 1-2 days |
-| 1c | Sync markers + metadata sidecar | 1 day |
-| 2a | Upload service (HTTP + storage) | 2-3 days |
-| 2b | Upload UI in clients | 1-2 days |
-| 3a | Mixer: alignment + normalization | 2-3 days |
-| 3b | Mixer: web dashboard | 2-3 days |
-| 3c | Docker packaging | 1 day |

docs/PRD-mtu-discovery.md

@@ -1,59 +0,0 @@
-# PRD: QUIC Path MTU Discovery
-
-## Problem
-
-WarzonePhone uses conservative 1200-byte QUIC datagrams. Some network paths support larger MTUs (1400+), wasting bandwidth. Some broken paths (VPNs, tunnels, double-NAT, cellular) have MTU < 1200, causing silent packet drops — this may explain why Opus 64k fails on some paths while 24k works (larger encoded frames + FEC repair packets).
-
-## Solution
-
-Enable Quinn's built-in Path MTU Discovery (PMTUD) and handle edge cases:
-1. PMTUD probes larger packet sizes and discovers the actual path MTU
-2. Graceful fallback when datagrams exceed discovered MTU
-3. Expose MTU in metrics for debugging
-
-## Implementation
-
-### Phase 1: Enable PMTUD in Quinn
-
-`crates/wzp-transport/src/config.rs` — update `transport_config()`:
-
-```rust
-// Enable PMTUD (Quinn default is enabled, but we should ensure it)
-config.mtu_discovery_config(Some(quinn::MtuDiscoveryConfig::default()));
-
-// Set minimum MTU for safety (some paths can't handle 1200)
-// Quinn default min is 1200, which is the QUIC spec minimum
-```
-
-Quinn's `MtuDiscoveryConfig` has:
-- `interval`: how often to probe (default: 600s)
-- `upper_bound`: max MTU to probe (default: 1452 for IPv4)
-- `minimum_change`: min MTU increase to be worth probing (default: 20)
-
-### Phase 2: Handle MTU-related Failures
-
-In federation forwarding (`send_raw_datagram`), if the datagram exceeds the connection's current MTU, Quinn returns an error. Handle gracefully:
-- Log warning with packet size vs MTU
-- Drop the packet (don't crash)
-- Track in metrics: `wzp_relay_mtu_exceeded_total`
-
-### Phase 3: Codec-Aware MTU
-
-When the path MTU is small, the relay or client should:
-- Prefer lower-bitrate codecs (smaller packets)
-- Reduce FEC ratio (fewer repair packets)
-- This feeds into the adaptive quality system
-
-### Phase 4: Expose MTU in Stats
-
-- Add `path_mtu` to relay metrics (per peer)
-- Add `path_mtu` to client stats (visible in UI)
-- Log MTU on connection establishment
-
-## Non-Goals (v1)
-
-- Datagram fragmentation (QUIC datagrams are atomic — either fit or don't)
-- Manual MTU override per relay config
-- MTU-based codec selection (future, needs adaptive quality)
-
-## Effort: 1 day