feat(voice): unified mobile voice bar with gesture-isolated PTT row

Replace separate VoiceStatusChip + VoicePttButton with a single CompactVoiceBar widget that combines both into a two-row layout: - Control row (tap): status text, mute, deafen, settings chevron - PTT row (hold): full-width hold-to-talk, shown only in PTT mode Gesture isolation prevents mis-touch between rows: the control row uses tap-only InkWell/IconButton while the PTT row uses a raw Listener for pointer-down/up events. Key changes: - Add CompactVoiceBar widget with state-colored container (normal, muted, talk-power-blocked) - Remove mute/deafen IconButtons from AppBar headerActions - Restructure voice details sheet into primary section + collapsible ExpansionTiles (audio processing, PTT capability, debug) - Optimistic state updates for mute/deafen to eliminate tap delay - Instant PTT visual feedback (no AnimatedContainer fade) - Constant geometry across all states (no layout shift on toggle)
feat(macos): add macOS permissions service for Input Monitoring, Local Network, and Notifications
2026-06-04 22:46:19 +09:00 · 2026-06-04 08:21:07 +09:00 · 2026-06-04 00:51:25 +09:00
158 changed files with 3837 additions and 16975 deletions
@@ -1,49 +1,34 @@
-# audiopus_sys calls cmake::build(opus_path), so downstream Cargo env cannot
+# Environment variables set for all cargo invocations in this workspace.
-# call cmake-rs Config::define() to override CMake's MSVC Debug CRT defaults.
+# CMAKE_POLICY_VERSION_MINIMUM is required for audiopus_sys's bundled
-# Instead, point cmake-rs at a small wrapper that injects -D cache/policy
+# Opus CMake build to succeed on CMake 4.x (which removed compatibility
-# variables during configure while passing cmake --build / --version / -E /
+# with cmake_minimum_required < 3.5). audiopus_sys v0.2.2 bundles
-# --install / --open through unchanged.  This keeps Opus Debug builds on
+# Opus 1.3.1 whose CMakeLists.txt uses a very old minimum version.
 # Rust's release dynamic CRT (/MD) instead of CMake's default debug CRT
 # (/MDd), which otherwise pulls in unresolved __imp__CrtDbgReportW symbols
 # at test link.
 #
 # IMPORTANT: Cargo's `[target.<triple>]` config sections only forward a
 # fixed allowlist of keys (linker, runner, rustflags, rustdocflags, ar)
 # to build scripts.  Arbitrary keys such as `CMAKE` placed under
 # `[target.<triple>]` are silently ignored and never reach the
 # audiopus_sys build script.  cmake-rs (via cc-style env resolution)
 # looks up CMAKE in this order:
 #   1. CMAKE_<target-triple-with-dashes>
 #   2. CMAKE_<target_triple_with_underscores>
 #   3. TARGET_CMAKE  (or HOST_CMAKE when host == target)
 #   4. CMAKE
 # We therefore scope the wrapper to Windows MSVC targets by setting the
 # target-suffixed variant in the global [env] section.  Non-Windows
 # hosts (macOS, Linux, iOS, Android) never see CMAKE set and invoke
 # `cmake` directly.
 #
 # NOTE: CMAKE_POLICY_DEFAULT_CMP0091 and CMAKE_MSVC_RUNTIME_LIBRARY cannot
 # be set via the process environment because CMake does NOT auto-import
 # them into its cache; they must be passed as `-D` definitions, which the
 # wrapper does.
 #
 # iOS deployment target (DEC-003: iOS 13.0 minimum) is NOT set here. It is
 # enforced in two places that own the iOS build:
 #   1. tools/build-ios.sh — sets IPHONEOS_DEPLOYMENT_TARGET for the cargo
 #      invocation and bypasses audiopus_sys's CMake build via
 #      LIBOPUS_STATIC=1 / LIBOPUS_NO_PKG=1 / LIBOPUS_LIB_DIR.
 #   2. apps/chanora_flutter/ios/Runner.xcodeproj — sets the Xcode
 #      IPHONEOS_DEPLOYMENT_TARGET build setting for the final link.
 # Setting it globally here would make native macOS `cargo check` runs try
 # to link iPhone objects against the macOS SDK.
 [env]
 CMAKE_POLICY_VERSION_MINIMUM = "3.5"
-# Scope the cmake wrapper to Windows MSVC targets only via the
+# iOS builds must set IPHONEOS_DEPLOYMENT_TARGET in the invoking script
-# target-suffixed env var name that cc/cmake-rs already resolve.
+# or Xcode build phase. Do not set it globally here: native macOS cargo
-# Force = true so a developer's pre-existing CMAKE_x86_64-pc-windows-msvc
+# checks also compile bundled C/C++ dependencies, and a global iOS
-# does not silently bypass the wrapper.  Relative = true so the path
+# deployment target makes clang try to link iPhone objects against the
-# resolves from the workspace root regardless of where cargo is invoked.
+# macOS SDK.
-CMAKE_x86_64-pc-windows-msvc = { value = "tools/cmake-msvc-release-crt.cmd", force = true, relative = true }
+
-CMAKE_aarch64-pc-windows-msvc = { value = "tools/cmake-msvc-release-crt.cmd", force = true, relative = true }
+# iOS target linker flags (DEC-003: minimum deployment target iOS 13.0).
 #
 # These rustflags pass -miphoneos-version-min=13.0 to the linker, ensuring
 # the final binary targets iOS 13.0+.  This is defense-in-depth alongside
 # the IPHONEOS_DEPLOYMENT_TARGET env var above — the env var affects C
 # compilation (cc crate, CMake), while these rustflags affect the final
 # link step.
 #
 # NOTE: The canonical iOS build is done via tools/build-ios.sh, which
 # sets LIBOPUS_STATIC=1, LIBOPUS_NO_PKG=1, and LIBOPUS_LIB_DIR to
 # bypass audiopus_sys's CMake build entirely.
 [target.aarch64-apple-ios]
 rustflags = ["-C", "link-arg=-miphoneos-version-min=13.0"]
 [target.aarch64-apple-ios-sim]
 rustflags = ["-C", "link-arg=-miphonesimulator-version-min=13.0"]
 [target.x86_64-apple-ios]
 rustflags = ["-C", "link-arg=-miphonesimulator-version-min=13.0"]
@@ -117,23 +117,6 @@ opencode.json
 # iOS framework build artifacts produced by chanora_bridge.podspec
 /apps/chanora_flutter/ios/Frameworks/
 # macOS framework build artifacts produced by chanora_bridge.podspec
 # (prepare_command + script_phase rm -rf and regenerate this tree on
 # every pod install AND every Xcode build, so tracking it in git is
 # pure waste — the committed binary was ~40 MB per commit).
 /apps/chanora_flutter/macos/Frameworks/
 .opencode/
 .omo/
 AGENTS.md
 Screenshot 2026-05-17 at 22.23.07.png
 # Xcode archive / export bundles (generated by Product > Archive > Distribute)
 **/Chanora */
 **/*.xcarchive/
 **/*.ipa
 **/*.dSYM/
 # macOS release zip bundles produced by local release scripts
 /chanora-v*.zip
@@ -8,10 +8,8 @@ This project follows a Conventional Commits style workflow.
 The v0.3.0 milestone transitions Chanora from an internal-beta voice
 prototype to a cross-platform baseline client with event-driven UI,
-visible per-client audio state, non-self client info parity, and
+per-user audio controls, non-self client info parity, and CI-hardened
-documented host Rust workspace plus Flutter validation gates. Android
+Android / iOS / macOS / Linux builds.
 target compile/install/smoke evidence remains blocked locally pending the
 required NDK compiler and an authorized ADB target.
 ### Added
@@ -19,9 +17,10 @@ required NDK compiler and an authorized ADB target.
  deltas (client join/leave/move/update, channel add/remove/update)
  flow through a typed `ProtocolDelta` enum and update the Flutter UI
  in real time. Channel switching is instant.
- **Per-client audio state visibility.** Client rows surface
+- **Per-user volume controls.** Each client in the snapshot gets an
-  muted/deafened state in avatar badges. Per-user volume UI, persistence,
+  independent volume slider persisted in the bridge layer. Avatar
-  and mixer wiring remain tracked as follow-up work.
+  badges show muted/deafened state. Volume adjustments take effect
  immediately on the audio mix.
 - **Non-self client info parity with Qint.** The Info tab now populates
  connection metadata (name, description, created, last connected,
  connections, transfer, ping deviation) for other clients via an
@@ -30,10 +29,9 @@ required NDK compiler and an authorized ADB target.
 - **Ping deviation in client profiles.** `ping_deviation_milliseconds`
  propagated from protocol DTO through bridge API to Dart, with a
  conditional l10n row in the client info sheet (en + zh).
- **Apple CoreML Silero VAD scaffolding/assets** for iOS / macOS when
+- **Apple CoreML Silero VAD** as the preferred voice activity detector
-  the private `silero-coreml` SwiftPM package is available. Product
+  on iOS / macOS when the private `silero-coreml` SwiftPM submodule is
-  `VoiceActivity` remains reserved/disabled per DEC-030 until a later
+  available. WebRTC VAD remains the runtime fallback.
  baseline enables and verifies it.
 - **TeamSpeak address resolver** (`chanora_resolver`) for DNS SRV
  lookups and `ts3server://` URI handling.
 - **Per-ABI Android APK splitting.** `flutter build apk
@@ -52,9 +50,8 @@ required NDK compiler and an authorized ADB target.
 - **iOS / macOS audio lifecycle hardened.** Voice unit restart-in-place,
  serialized lifecycle events, WebRTC VAD on iOS, unblocked connect-time
  audio startup.
- **Linux native audio path promoted** with ONNX Runtime VAD assets
+- **Linux native audio path promoted** with ONNX Runtime bundled for
-  bundled for future `VoiceActivity` work. Desktop voice I/O works on
+  VAD. Desktop voice I/O works on PipeWire / PulseAudio.
  PipeWire / PulseAudio; product `VoiceActivity` remains disabled.
 - **Android audio routing** uses `MODE_IN_COMMUNICATION`, proper
  startup permission flow, and system back-button integration.
 - **`SnapshotChanged` event removed.** Replaced by the typed delta
@@ -62,8 +59,7 @@ required NDK compiler and an authorized ADB target.
  Flutter).
 - **Prefetch crate renamed** from the PoC-era name to
  `chanora_prefetch`. All docs, specs, and code updated.
- **Flutter app version/build bumped to `0.3.0+100`.** Rust workspace
+- **Build number bumped to 76.**
  packages remain versioned separately at `0.2.0-beta.1`.
 - **Flutter bridge regenerated** for `flutter_rust_bridge` 2.12.0.
 ### Fixed
@@ -70,15 +70,6 @@ dependencies = [
 "backtrace",
 ]
 [[package]]
 name = "alloca"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5a7d05ea6aea7e9e64d25b9156ba2fee3fdd659e34e41063cd2fc7cd020d7f4"
 dependencies = [
 "cc",
 ]
 [[package]]
 name = "alsa"
 version = "0.11.0"
@@ -148,111 +139,12 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532"
 dependencies = [
- "event-listener 5.4.1",
+ "event-listener",
 "event-listener-strategy",
 "futures-core",
 "pin-project-lite",
 ]
 [[package]]
 name = "async-channel"
 version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
 dependencies = [
 "concurrent-queue",
 "event-listener 2.5.3",
 "futures-core",
 ]
 [[package]]
 name = "async-channel"
 version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
 dependencies = [
 "concurrent-queue",
 "event-listener-strategy",
 "futures-core",
 "pin-project-lite",
 ]
 [[package]]
 name = "async-executor"
 version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c96bf972d85afc50bf5ab8fe2d54d1586b4e0b46c97c50a0c9e71e2f7bcd812a"
 dependencies = [
 "async-task",
 "concurrent-queue",
 "fastrand",
 "futures-lite",
 "pin-project-lite",
 "slab",
 ]
 [[package]]
 name = "async-global-executor"
 version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
 dependencies = [
 "async-channel 2.5.0",
 "async-executor",
 "async-io",
 "async-lock",
 "blocking",
 "futures-lite",
 "once_cell",
 ]
 [[package]]
 name = "async-io"
 version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc"
 dependencies = [
 "autocfg",
 "cfg-if",
 "concurrent-queue",
 "futures-io",
 "futures-lite",
 "parking",
 "polling",
 "rustix",
 "slab",
 "windows-sys 0.61.2",
 ]
 [[package]]
 name = "async-lock"
 version = "3.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311"
 dependencies = [
 "event-listener 5.4.1",
 "event-listener-strategy",
 "pin-project-lite",
 ]
 [[package]]
 name = "async-process"
 version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75"
 dependencies = [
 "async-channel 2.5.0",
 "async-io",
 "async-lock",
 "async-signal",
 "async-task",
 "blocking",
 "cfg-if",
 "event-listener 5.4.1",
 "futures-lite",
 "rustix",
 ]
 [[package]]
 name = "async-recursion"
 version = "1.1.1"
@@ -264,57 +156,6 @@ dependencies = [
 "syn",
 ]
 [[package]]
 name = "async-signal"
 version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52b5aaafa020cf5053a01f2a60e8ff5dccf550f0f77ec54a4e47285ac2bab485"
 dependencies = [
 "async-io",
 "async-lock",
 "atomic-waker",
 "cfg-if",
 "futures-core",
 "futures-io",
 "rustix",
 "signal-hook-registry",
 "slab",
 "windows-sys 0.61.2",
 ]
 [[package]]
 name = "async-std"
 version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c8e079a4ab67ae52b7403632e4618815d6db36d2a010cfe41b02c1b1578f93b"
 dependencies = [
 "async-channel 1.9.0",
 "async-global-executor",
 "async-io",
 "async-lock",
 "async-process",
 "crossbeam-utils",
 "futures-channel",
 "futures-core",
 "futures-io",
 "futures-lite",
 "gloo-timers",
 "kv-log-macro",
 "log",
 "memchr",
 "once_cell",
 "pin-project-lite",
 "pin-utils",
 "slab",
 "wasm-bindgen-futures",
 ]
 [[package]]
 name = "async-task"
 version = "4.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 [[package]]
 name = "async-trait"
 version = "0.1.89"
@@ -407,12 +248,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
 [[package]]
 name = "base64"
 version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -464,19 +299,6 @@ dependencies = [
 "objc2",
 ]
 [[package]]
 name = "blocking"
 version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
 dependencies = [
 "async-channel 2.5.0",
 "async-task",
 "futures-io",
 "futures-lite",
 "piper",
 ]
 [[package]]
 name = "build-target"
 version = "0.4.0"
@@ -521,32 +343,6 @@ version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
 [[package]]
 name = "cacache"
 version = "13.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c5063741c7b2e260bbede781cf4679632dd90e2718e99f7715e46824b65670b"
 dependencies = [
 "async-std",
 "digest 0.10.7",
 "either",
 "futures",
 "hex",
 "libc",
 "memmap2",
 "miette",
 "reflink-copy",
 "serde",
 "serde_derive",
 "serde_json",
 "sha1",
 "sha2",
 "ssri",
 "tempfile",
 "thiserror 1.0.69",
 "walkdir",
 ]
 [[package]]
 name = "cast"
 version = "0.3.0"
@@ -623,21 +419,21 @@ name = "chanora_audio"
 version = "0.2.0-beta.1"
 dependencies = [
 "audiopus",
 "bytemuck",
 "chanora_protocol",
 "coreaudio-rs",
 "cpal",
 "criterion",
 "crossbeam",
 "crossbeam-utils",
 "dhat",
 "dispatch2",
 "futures-util",
- "jni 0.22.4",
+ "jni 0.21.1",
 "ndarray",
 "ndk-context",
 "oboe",
 "ort",
- "rand 0.10.1",
+ "rand 0.8.6",
 "rustfft",
 "sdl2",
 "serde_json",
@@ -648,7 +444,7 @@ dependencies = [
 "tracing-subscriber",
 "tsclientlib",
 "webrtc-vad",
- "windows",
+ "windows 0.54.0",
 "zbus",
 ]
@@ -670,23 +466,11 @@ dependencies = [
 "tracing-subscriber",
 ]
 [[package]]
 name = "chanora_cache"
 version = "0.2.0-beta.1"
 dependencies = [
 "cacache",
 "tempfile",
 "thiserror 2.0.18",
 "tokio",
 "tracing",
 ]
 [[package]]
 name = "chanora_core"
 version = "0.2.0-beta.1"
 dependencies = [
 "chanora_audio",
 "chanora_cache",
 "chanora_diagnostics",
 "chanora_prefetch",
 "chanora_protocol",
@@ -722,7 +506,7 @@ name = "chanora_protocol"
 version = "0.2.0-beta.1"
 dependencies = [
 "async-trait",
- "base64 0.22.1",
+ "base64",
 "chanora_resolver",
 "futures",
 "reqwest 0.13.4",
@@ -739,7 +523,7 @@ dependencies = [
 [[package]]
 name = "chanora_resolver"
-version = "0.2.0-beta.1"
+version = "0.1.0"
 dependencies = [
 "anyhow",
 "hickory-resolver",
@@ -761,7 +545,7 @@ dependencies = [
 name = "chanora_storage"
 version = "0.2.0-beta.1"
 dependencies = [
- "base64 0.22.1",
+ "base64",
 "chacha20poly1305",
 "keyring",
 "rand 0.8.6",
@@ -933,15 +717,14 @@ dependencies = [
 [[package]]
 name = "cpal"
-version = "0.18.0"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9dd2b2151ebb4d5866c804d89fe28244bfb6b74481b9b4d406e4ec4d7f88ce5"
+checksum = "d8942da362c0f0d895d7cac616263f2f9424edc5687364dfd1d25ef7eba506d7"
 dependencies = [
 "alsa",
 "block2",
 "coreaudio-rs",
 "dasp_sample",
- "jni 0.22.4",
+ "jni 0.21.1",
 "js-sys",
 "libc",
 "mach2",
@@ -956,9 +739,10 @@ dependencies = [
 "objc2-core-audio-types",
 "objc2-core-foundation",
 "objc2-foundation",
 "wasm-bindgen",
 "wasm-bindgen-futures",
 "web-sys",
- "windows",
+ "windows 0.62.2",
 "windows-core",
 ]
 [[package]]
@@ -981,24 +765,25 @@ dependencies = [
 [[package]]
 name = "criterion"
-version = "0.8.2"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "950046b2aa2492f9a536f5f4f9a3de7b9e2476e575e05bd6c333371add4d98f3"
+checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
 dependencies = [
 "alloca",
 "anes",
 "cast",
 "ciborium",
 "clap",
 "criterion-plot",
- "itertools 0.13.0",
+ "is-terminal",
 "itertools 0.10.5",
 "num-traits",
 "once_cell",
 "oorandom",
 "page_size",
 "plotters",
 "rayon",
 "regex",
 "serde",
 "serde_derive",
 "serde_json",
 "tinytemplate",
 "walkdir",
@@ -1006,12 +791,12 @@ dependencies = [
 [[package]]
 name = "criterion-plot"
-version = "0.8.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8d80a2f4f5b554395e47b5d8305bc3d27813bacb73493eb1001e8f76dae29ea"
+checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
 dependencies = [
 "cast",
- "itertools 0.13.0",
+ "itertools 0.10.5",
 ]
 [[package]]
@@ -1446,12 +1231,6 @@ dependencies = [
 "windows-sys 0.61.2",
 ]
 [[package]]
 name = "event-listener"
 version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 [[package]]
 name = "event-listener"
 version = "5.4.1"
@@ -1469,7 +1248,7 @@ version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
 dependencies = [
- "event-listener 5.4.1",
+ "event-listener",
 "pin-project-lite",
 ]
@@ -1772,18 +1551,6 @@ dependencies = [
 "time",
 ]
 [[package]]
 name = "gloo-timers"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
 dependencies = [
 "futures-channel",
 "futures-core",
 "js-sys",
 "wasm-bindgen",
 ]
 [[package]]
 name = "group"
 version = "0.13.0"
@@ -2062,7 +1829,7 @@ version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0"
 dependencies = [
- "base64 0.22.1",
+ "base64",
 "bytes",
 "futures-channel",
 "futures-util",
@@ -2218,7 +1985,7 @@ dependencies = [
 "socket2",
 "widestring",
 "windows-registry",
- "windows-result",
+ "windows-result 0.4.1",
 "windows-sys 0.61.2",
 ]
@@ -2232,10 +1999,21 @@ dependencies = [
 ]
 [[package]]
-name = "itertools"
+name = "is-terminal"
-version = "0.13.0"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
 dependencies = [
 "hermit-abi",
 "libc",
 "windows-sys 0.61.2",
 ]
 [[package]]
 name = "itertools"
 version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
 dependencies = [
 "either",
 ]
@@ -2367,15 +2145,6 @@ dependencies = [
 "zeroize",
 ]
 [[package]]
 name = "kv-log-macro"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
 dependencies = [
 "log",
 ]
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -2460,9 +2229,6 @@ name = "log"
 version = "0.4.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "113b30b4cd05f7c06868fdb2854f66a7b9fece9a48425351cd532e810d74024f"
 dependencies = [
 "value-bag",
 ]
 [[package]]
 name = "lru-slab"
@@ -2472,9 +2238,12 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
 [[package]]
 name = "mach2"
-version = "0.6.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dae608c151f68243f2b000364e1f7b186d9c29845f7d2d85bd31b9ad77ad552b"
+checksum = "6a1b95cd5421ec55b445b5ae102f5ea0e768de1f82bd3001e11f426c269c3aea"
 dependencies = [
 "libc",
 ]
 [[package]]
 name = "matchers"
@@ -2511,15 +2280,6 @@ version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8"
 [[package]]
 name = "memmap2"
 version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
 dependencies = [
 "libc",
 ]
 [[package]]
 name = "memoffset"
 version = "0.9.1"
@@ -2529,29 +2289,6 @@ dependencies = [
 "autocfg",
 ]
 [[package]]
 name = "miette"
 version = "5.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
 dependencies = [
 "miette-derive",
 "once_cell",
 "thiserror 1.0.69",
 "unicode-width",
 ]
 [[package]]
 name = "miette-derive"
 version = "5.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
 dependencies = [
 "proc-macro2",
 "quote",
 "syn",
 ]
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -2803,7 +2540,6 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13a380031deed8e99db00065c45937da434ca987c034e13b87e4441f9e4090be"
 dependencies = [
 "bitflags 2.12.1",
 "objc2",
 "objc2-foundation",
 ]
@@ -3016,16 +2752,6 @@ dependencies = [
 "sha2",
 ]
 [[package]]
 name = "page_size"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da"
 dependencies = [
 "libc",
 "winapi",
 ]
 [[package]]
 name = "parking"
 version = "2.2.1"
@@ -3082,17 +2808,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 [[package]]
 name = "piper"
 version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c835479a4443ded371d6c535cbfd8d31ad92c5d23ae9770a61bc155e4992a3c1"
 dependencies = [
 "atomic-waker",
 "fastrand",
 "futures-io",
 ]
 [[package]]
 name = "pkcs8"
 version = "0.10.2"
@@ -3137,20 +2852,6 @@ dependencies = [
 "plotters-backend",
 ]
 [[package]]
 name = "polling"
 version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218"
 dependencies = [
 "cfg-if",
 "concurrent-queue",
 "hermit-abi",
 "pin-project-lite",
 "rustix",
 "windows-sys 0.61.2",
 ]
 [[package]]
 name = "poly1305"
 version = "0.8.0"
@@ -3477,18 +3178,6 @@ dependencies = [
 "syn",
 ]
 [[package]]
 name = "reflink-copy"
 version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13362233b147e57674c37b802d216b7c5e3dcccbed8967c84f0d8d223868ae27"
 dependencies = [
 "cfg-if",
 "libc",
 "rustix",
 "windows",
 ]
 [[package]]
 name = "regex"
 version = "1.12.3"
@@ -3524,7 +3213,7 @@ version = "0.12.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147"
 dependencies = [
- "base64 0.22.1",
+ "base64",
 "bytes",
 "futures-core",
 "http",
@@ -3562,7 +3251,7 @@ version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3"
 dependencies = [
- "base64 0.22.1",
+ "base64",
 "bytes",
 "encoding_rs",
 "futures-core",
@@ -3809,9 +3498,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 [[package]]
 name = "sdl2"
-version = "0.38.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d42407afc6a8ab67e36f92e80b8ba34cbdc55aaeed05249efe9a2e8d0e9feef"
+checksum = "3b498da7d14d1ad6c839729bd4ad6fc11d90a57583605f3b4df2cd709a9cd380"
 dependencies = [
 "bitflags 1.3.2",
 "lazy_static",
@@ -3821,9 +3510,9 @@ dependencies = [
 [[package]]
 name = "sdl2-sys"
-version = "0.38.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff61407fc75d4b0bbc93dc7e4d6c196439965fbef8e4a4f003a36095823eac0"
+checksum = "951deab27af08ed9c6068b7b0d05a93c91f0a8eb16b6b816a5e73452a43521d3"
 dependencies = [
 "cfg-if",
 "libc",
@@ -3978,17 +3667,6 @@ dependencies = [
 "digest 0.10.7",
 ]
 [[package]]
 name = "sha1"
 version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
 "cfg-if",
 "cpufeatures 0.2.17",
 "digest 0.10.7",
 ]
 [[package]]
 name = "sha2"
 version = "0.10.9"
@@ -4168,23 +3846,6 @@ dependencies = [
 "der",
 ]
 [[package]]
 name = "ssri"
 version = "9.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da7a2b3c2bc9693bcb40870c4e9b5bf0d79f9cb46273321bf855ec513e919082"
 dependencies = [
 "base64 0.21.7",
 "digest 0.10.7",
 "hex",
 "miette",
 "serde",
 "sha-1",
 "sha2",
 "thiserror 1.0.69",
 "xxhash-rust",
 ]
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.1"
@@ -4683,7 +4344,7 @@ name = "ts-bookkeeping"
 version = "0.1.0"
 source = "git+https://github.com/ReSpeak/tsclientlib.git?rev=04aa2491#04aa24917abbf6a0c8442a79742d6d2d40ecf71e"
 dependencies = [
- "base64 0.22.1",
+ "base64",
 "heck",
 "itertools 0.14.0",
 "num-derive",
@@ -4704,7 +4365,7 @@ version = "0.2.0"
 source = "git+https://github.com/ReSpeak/tsclientlib.git?rev=04aa2491#04aa24917abbf6a0c8442a79742d6d2d40ecf71e"
 dependencies = [
 "audiopus",
- "base64 0.22.1",
+ "base64",
 "futures",
 "git-testament",
 "hickory-net",
@@ -4732,7 +4393,7 @@ version = "0.2.0"
 source = "git+https://github.com/ReSpeak/tsclientlib.git?rev=04aa2491#04aa24917abbf6a0c8442a79742d6d2d40ecf71e"
 dependencies = [
 "aes",
- "base64 0.22.1",
+ "base64",
 "curve25519-dalek-ng",
 "eax",
 "futures",
@@ -4761,7 +4422,7 @@ name = "tsproto-packets"
 version = "0.1.0"
 source = "git+https://github.com/ReSpeak/tsclientlib.git?rev=04aa2491#04aa24917abbf6a0c8442a79742d6d2d40ecf71e"
 dependencies = [
- "base64 0.22.1",
+ "base64",
 "bitflags 2.12.1",
 "num-derive",
 "num-traits",
@@ -4776,7 +4437,7 @@ name = "tsproto-structs"
 version = "0.2.0"
 source = "git+https://github.com/EdisonJwa/tsclientlib.git?branch=fix%2Fp256-short-coordinate-pad#8b7a3226c692319b714ea1d32fd5ded05911aa40"
 dependencies = [
- "base64 0.22.1",
+ "base64",
 "csv",
 "heck",
 "once_cell",
@@ -4789,7 +4450,7 @@ name = "tsproto-structs"
 version = "0.2.0"
 source = "git+https://github.com/ReSpeak/tsclientlib.git?rev=04aa2491#04aa24917abbf6a0c8442a79742d6d2d40ecf71e"
 dependencies = [
- "base64 0.22.1",
+ "base64",
 "csv",
 "heck",
 "once_cell",
@@ -4802,7 +4463,7 @@ name = "tsproto-types"
 version = "0.1.0"
 source = "git+https://github.com/EdisonJwa/tsclientlib.git?branch=fix%2Fp256-short-coordinate-pad#8b7a3226c692319b714ea1d32fd5ded05911aa40"
 dependencies = [
- "base64 0.22.1",
+ "base64",
 "bitflags 2.12.1",
 "curve25519-dalek-ng",
 "elliptic-curve",
@@ -4846,12 +4507,6 @@ version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 [[package]]
 name = "unicode-width"
 version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 [[package]]
 name = "unicode-xid"
 version = "0.2.6"
@@ -4910,12 +4565,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 [[package]]
 name = "value-bag"
 version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ba6f5989077681266825251a52748b8c1d8a4ad098cc37e440103d0ea717fc0"
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
@@ -5119,22 +4768,6 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72069c3113ab32ab29e5584db3c6ec55d416895e60715417b5b883a357c3e471"
 [[package]]
 name = "winapi"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 dependencies = [
 "winapi-i686-pc-windows-gnu",
 "winapi-x86_64-pc-windows-gnu",
 ]
 [[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 [[package]]
 name = "winapi-util"
 version = "0.1.11"
@@ -5145,10 +4778,14 @@ dependencies = [
 ]
 [[package]]
-name = "winapi-x86_64-pc-windows-gnu"
+name = "windows"
-version = "0.4.0"
+version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
 dependencies = [
 "windows-core 0.54.0",
 "windows-targets 0.52.6",
 ]
 [[package]]
 name = "windows"
@@ -5157,7 +4794,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
 dependencies = [
 "windows-collections",
- "windows-core",
+ "windows-core 0.62.2",
 "windows-future",
 "windows-numerics",
 ]
@@ -5168,7 +4805,17 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"
 dependencies = [
- "windows-core",
+ "windows-core 0.62.2",
 ]
 [[package]]
 name = "windows-core"
 version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
 dependencies = [
 "windows-result 0.1.2",
 "windows-targets 0.52.6",
 ]
 [[package]]
@@ -5180,7 +4827,7 @@ dependencies = [
 "windows-implement",
 "windows-interface",
 "windows-link",
- "windows-result",
+ "windows-result 0.4.1",
 "windows-strings",
 ]
@@ -5190,7 +4837,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
 dependencies = [
- "windows-core",
+ "windows-core 0.62.2",
 "windows-link",
 "windows-threading",
 ]
@@ -5229,7 +4876,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"
 dependencies = [
- "windows-core",
+ "windows-core 0.62.2",
 "windows-link",
 ]
@@ -5240,10 +4887,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720"
 dependencies = [
 "windows-link",
- "windows-result",
+ "windows-result 0.4.1",
 "windows-strings",
 ]
 [[package]]
 name = "windows-result"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
 dependencies = [
 "windows-targets 0.52.6",
 ]
 [[package]]
 name = "windows-result"
 version = "0.4.1"
@@ -5602,12 +5258,6 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
 [[package]]
 name = "xxhash-rust"
 version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3"
 [[package]]
 name = "yoke"
 version = "0.8.2"
@@ -5641,7 +5291,7 @@ dependencies = [
 "async-recursion",
 "async-trait",
 "enumflags2",
- "event-listener 5.4.1",
+ "event-listener",
 "futures-core",
 "futures-lite",
 "hex",
@@ -10,7 +10,6 @@
 #   crates/chanora_resolver/     — TeamSpeak address resolution
 #   crates/chanora_state/        — snapshot, deltas, reducers
 #   crates/chanora_audio/        — capture, DSP, Opus, jitter, mixer
 #   crates/chanora_cache/        — avatar/icon blob cache (cacache-backed)
 #   crates/chanora_storage/      — bookmarks, settings, identity refs
 #   crates/chanora_diagnostics/  — logs, redaction, export
 #   crates/chanora_prefetch — server-resolution prefetch cache/policy
@@ -31,7 +30,6 @@ members = [
    "crates/chanora_state",
    "crates/chanora_audio",
    "crates/chanora_storage",
    "crates/chanora_cache",
    "crates/chanora_diagnostics",
    "crates/chanora_prefetch",
    "crates/chanora_bridge",
@@ -84,17 +82,3 @@ tsproto-types = { git = "https://github.com/EdisonJwa/tsclientlib.git", branch =
 [patch.crates-io]
 cmake = { git = "https://github.com/pr2502/cmake-rs", rev = "bdad5edc569d82151922c5c6c4685b1563f12aa1" }
 # Apple-only DWARF emission for archive validation lives in the iOS and
 # macOS chanora_bridge podspecs (apps/chanora_flutter/{ios,macos}/
 # chanora_bridge.podspec) as per-build environment overrides:
 #
 #   CARGO_PROFILE_RELEASE_DEBUG=true
 #   CARGO_PROFILE_RELEASE_SPLIT_DEBUGINFO=off
 #   CARGO_PROFILE_RELEASE_STRIP=false
 #
 # This keeps Android, Linux, and Windows release binaries on the cargo
 # default release profile (no DWARF, no extra ~10MB symbol payload).
 # Apple builds need the DWARF so dsymutil can emit a usable
 # chanora_bridge.framework.dSYM that the archive validator accepts.
@@ -14,10 +14,10 @@ Flutter UI + Rust Core + tsclientlib
 ## Status
-Chanora is currently a baseline-candidate Flutter + Rust workspace. It is not production-ready and is not approved for public or store release.
+Chanora is currently in early planning and baseline-candidate design.
 ```text
-Current documentation baseline: v0.9.x document set
+Current documentation baseline: v0.9.2
 Current status: Baseline Candidate
 Implementation status: Not production-ready
 ```
@@ -25,7 +25,7 @@ Implementation status: Not production-ready
 The current engineering focus is:
 - defining the system and software architecture;
- hardening the Flutter + Rust application structure;
+- preparing the Flutter + Rust application structure;
 - validating TeamSpeak-compatible protocol integration through `tsclientlib`;
 - defining cross-platform audio behavior;
 - preparing release, verification, security, privacy, and legal gates.
@@ -49,7 +49,7 @@ Current platform policy:
 | iOS / iPadOS runtime target | iOS 16+ while Apple CoreML Silero VAD is linked |
 | macOS runtime target | macOS 13+ while Apple CoreML Silero VAD is linked |
 | App Store Connect upload gate | Xcode 26+ with iOS 26 / iPadOS 26 SDK+ for upload on or after 2026-04-28 |
-| Android runtime target | Android API 28+ per DEC-004, SysRS-288, SRS-187, and Gradle `minSdk = 28` |
+| Android runtime target | Android API 24+ unless Flutter, plugin, audio, or product constraints require raising it |
 | Google Play target API | Target the Google Play-required API level on upload date |
 The App Store / Play Store upload gates are release requirements. They are separate from local development and internal testing requirements.
@@ -230,7 +230,7 @@ docs/
    aspice-swe2-swe3-integration-note.md
 ```
-Implementation source folders are present in this workspace. The current high-level structure is:
+Implementation source folders may be added later. A likely structure is:
 ```text
 apps/
@@ -248,7 +248,7 @@ crates/
  chanora_bridge/
 ```
-The exact implementation layout may continue to evolve as maintainability reviews split or merge Modules, but the repository scaffold exists.
+The exact implementation layout should be finalized when the repository scaffold is created.
 ---
@@ -395,7 +395,9 @@ docs/governance/git-commit-message-convention.md
 ## Development
-Common local commands include:
+Implementation commands will be added after the repository scaffold is finalized.
 Expected future commands may include:
 ```bash
 flutter pub get
@@ -405,7 +407,7 @@ cargo clippy
 cargo fmt
 ```
-Android runtime success also requires an available Android NDK toolchain and an authorized device or emulator for build/install/smoke verification.
+Do not treat these as authoritative until the actual Flutter/Rust workspace has been created.
 ---
@@ -59,15 +59,12 @@ android {
    ndkVersion = flutter.ndkVersion
    compileOptions {
        isCoreLibraryDesugaringEnabled = true
        sourceCompatibility = JavaVersion.VERSION_17
        targetCompatibility = JavaVersion.VERSION_17
    }
-    kotlin {
+    kotlinOptions {
-        compilerOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
            jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
        }
    }
    defaultConfig {
@@ -199,7 +196,6 @@ android {
 // armeabi-v7a, x86_64, x86.  AGP merges these into the APK/AAB.
 dependencies {
    implementation("com.microsoft.onnxruntime:onnxruntime-android:1.26.0")
    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
 }
 flutter {
@@ -1,10 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
        android:fillColor="@android:color/white"
        android:pathData="M12,3C8.69,3 6,5.69 6,9V13C6,16.31 8.69,19 12,19C15.31,19 18,16.31 18,13V9C18,5.69 15.31,3 12,3ZM12,5C14.21,5 16,6.79 16,9V13C16,15.21 14.21,17 12,17C9.79,17 8,15.21 8,13V9C8,6.79 9.79,5 12,5ZM11,20V22H13V20H11Z" />
 </vector>
@@ -1,3 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools"
    tools:keep="@drawable/ic_chanora_notification" />
@@ -1,6 +1,2 @@
 org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 # This builtInKotlin flag was added automatically by Flutter migrator
 android.builtInKotlin=false
 # This newDsl flag was added automatically by Flutter migrator
 android.newDsl=false
@@ -19,8 +19,8 @@ pluginManagement {
 plugins {
    id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.13.1" apply false
+    id("com.android.application") version "8.11.1" apply false
-    id("org.jetbrains.kotlin.android") version "2.3.0" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
 }
 include(":app")
@@ -1,25 +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>
 	<key>method</key>
 	<string>ad-hoc</string>
 	<key>destination</key>
 	<string>export</string>
 	<key>signingStyle</key>
 	<string>manual</string>
 	<key>stripSwiftSymbols</key>
 	<true/>
 	<key>uploadBitcode</key>
 	<false/>
 	<key>uploadSymbols</key>
 	<true/>
 	<key>teamID</key>
 	<string>ZNVDEVDRX3</string>
 	<key>provisioningProfiles</key>
 	<dict>
 		<key>app.teamspeak.chanora</key>
 		<string>Chanora_Ad_Hoc</string>
 	</dict>
 </dict>
 </plist>
@@ -1,9 +1,2 @@
-#include? "Pods/Target Support Files/Pods-Chanora/Pods-Chanora.debug.xcconfig"
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
 // Mirror Release.xcconfig (see explanation there). `-u` is the load-bearing
 // flag: without it the linker drops Swift @_cdecl symbols (no Swift caller)
 // before `-exported_symbol` can re-export them, and the verify_silero_exports
 // build phase fails the build.
 OTHER_LDFLAGS = $(inherited) -Xlinker -u -Xlinker _chanora_silero_vad_create -Xlinker -u -Xlinker _chanora_silero_vad_destroy -Xlinker -u -Xlinker _chanora_silero_vad_reset -Xlinker -u -Xlinker _chanora_silero_vad_process -Xlinker -u -Xlinker _chanora_silero_vad_last_error -Xlinker -u -Xlinker _chanora_silero_vad_free_string -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_create -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_destroy -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_reset -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_process -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_last_error -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_free_string
 STRIP_STYLE = non-global
@@ -1,27 +1,2 @@
-#include? "Pods/Target Support Files/Pods-Chanora/Pods-Chanora.release.xcconfig"
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
 // Force the linker to retain Swift @_cdecl symbols that the chanora_bridge
 // Rust framework resolves at runtime via dlsym(RTLD_DEFAULT). Two flags per
 // symbol, intentionally redundant:
 //
 //   -u _sym                marks the symbol as force-undefined at link time,
 //                          which keeps the object that defines it from being
 //                          dropped and prevents dead-strip from removing the
 //                          definition. This is the load-bearing flag.
 //   -exported_symbol _sym  re-exports the symbol in the final binary's
 //                          dynamic symbol table so dlsym(RTLD_DEFAULT) can
 //                          find it from the Rust framework at runtime.
 //
 // Without -u, Xcode Archive's -dead_strip (WMO + LTO) can remove the
 // symbol before the export list is applied, and CoreML VAD silently falls
 // back to WebRTC on TestFlight / App Store. The Swift-side static
 // `unsafeBitCast` references in SileroCoreMLBridge.swift are belt-and-
 // suspenders defense-in-depth, NOT the primary guarantee.
 OTHER_LDFLAGS = $(inherited) -Xlinker -u -Xlinker _chanora_silero_vad_create -Xlinker -u -Xlinker _chanora_silero_vad_destroy -Xlinker -u -Xlinker _chanora_silero_vad_reset -Xlinker -u -Xlinker _chanora_silero_vad_process -Xlinker -u -Xlinker _chanora_silero_vad_last_error -Xlinker -u -Xlinker _chanora_silero_vad_free_string -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_create -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_destroy -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_reset -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_process -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_last_error -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_free_string
 // `STRIP_STYLE = all` (Xcode default for archive installs) runs `strip` without
 // `-x`, which removes even the global @_cdecl symbols the linker exported above
 // via -exported_symbol. `non-global` runs `strip -x`, preserving globals so the
 // Rust framework's dlsym(RTLD_DEFAULT) can find them. 264-byte cost in the app.
 STRIP_STYLE = non-global
@@ -27,7 +27,7 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe
 flutter_ios_podfile_setup
-target 'Chanora' do
+target 'Runner' do
  use_frameworks!
  # Chanora Rust bridge as a vendored framework. The podspec runs
@@ -1,33 +1,70 @@
 PODS:
  - audio_session (0.0.1):
    - Flutter
  - chanora_bridge (1.0.0)
  - connectivity_plus (0.0.1):
    - Flutter
  - Flutter (1.0.0)
  - flutter_foreground_task (0.0.1):
    - Flutter
  - haptic_kit (1.0.0):
    - Flutter
  - package_info_plus (0.4.5):
    - Flutter
  - share_plus (0.0.1):
    - Flutter
  - shared_preferences_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
  - url_launcher_ios (0.0.1):
    - Flutter
 DEPENDENCIES:
  - audio_session (from `.symlinks/plugins/audio_session/ios`)
  - chanora_bridge (from `.`)
  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
  - Flutter (from `Flutter`)
  - flutter_foreground_task (from `.symlinks/plugins/flutter_foreground_task/ios`)
  - haptic_kit (from `.symlinks/plugins/haptic_kit/ios`)
  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
  - share_plus (from `.symlinks/plugins/share_plus/ios`)
  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
 EXTERNAL SOURCES:
  audio_session:
    :path: ".symlinks/plugins/audio_session/ios"
  chanora_bridge:
    :path: "."
  connectivity_plus:
    :path: ".symlinks/plugins/connectivity_plus/ios"
  Flutter:
    :path: Flutter
  flutter_foreground_task:
    :path: ".symlinks/plugins/flutter_foreground_task/ios"
  haptic_kit:
    :path: ".symlinks/plugins/haptic_kit/ios"
  package_info_plus:
    :path: ".symlinks/plugins/package_info_plus/ios"
  share_plus:
    :path: ".symlinks/plugins/share_plus/ios"
  shared_preferences_foundation:
    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
  url_launcher_ios:
    :path: ".symlinks/plugins/url_launcher_ios/ios"
 SPEC CHECKSUMS:
-  chanora_bridge: 27a03592058709f6f38701343eb51c3a55b02da0
+  audio_session: 9bb7f6c970f21241b19f5a3658097ae459681ba0
  chanora_bridge: 2ed7c2ba427fab135dd9eab66c507b09cfee113a
  connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
  flutter_foreground_task: a159d2c2173b33699ddb3e6c2a067045d7cebb89
  haptic_kit: b22c4fbb2aa7b0d66f2891f81a9e950ad2de5758
  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
  shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
  url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
-PODFILE CHECKSUM: 85b93b53f958f1ff700a147e9da4374c8b1c6970
+PODFILE CHECKSUM: e2123068539aeb66d53dc1612b383d13f489ede2
 COCOAPODS: 1.16.2
@@ -8,18 +8,17 @@
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		1E3B5BCCA481234F14E64D44 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B4754099284EEDCD859A973 /* Pods_Runner.framework */; };
 		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		3EF79A791760D95CE0F41CFF /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63497078A621E2A73B102C46 /* Pods_RunnerTests.framework */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		7884E8682EC3CC0700C636F2 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */; };
 		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
 		8C5000012DD0000000000001 /* SileroCoreMLBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C5000002DD0000000000001 /* SileroCoreMLBridge.swift */; };
 		8C5000042DD0000000000001 /* SileroCoreML in Frameworks */ = {isa = PBXBuildFile; productRef = 8C5000032DD0000000000001 /* SileroCoreML */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
 		C8BACE02E6EE5F840EE3F174 /* Pods_Chanora.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC4F9695FDCB1E0D04E08974 /* Pods_Chanora.framework */; };
 		FD3C80659716BF7A0C95C7AF /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 1937FD83C5CC909094CDC137 /* PrivacyInfo.xcprivacy */; };
 /* End PBXBuildFile section */
@@ -48,10 +47,10 @@
 /* Begin PBXFileReference section */
 		076D9E9796600FBC91FD7714 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
 		0B4754099284EEDCD859A973 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
 		1937FD83C5CC909094CDC137 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		2EA1142FBFD36E2ED564A5AA /* Pods-Chanora.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Chanora.release.xcconfig"; path = "Target Support Files/Pods-Chanora/Pods-Chanora.release.xcconfig"; sourceTree = "<group>"; };
 		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
@@ -60,23 +59,19 @@
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
-		78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
+		8C5000002DD0000000000001 /* SileroCoreMLBridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SileroCoreMLBridge.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		7E043103010958FC2C6CA47F /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		89E01DD0E6B92DA93A02E9D6 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		8C5000002DD0000000000001 /* SileroCoreMLBridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SileroCoreMLBridge.swift; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
-		97C146EE1CF9000F007C117D /* Chanora.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Chanora.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A23C02505CD7E5092CA7958C /* Pods-Chanora.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Chanora.profile.xcconfig"; path = "Target Support Files/Pods-Chanora/Pods-Chanora.profile.xcconfig"; sourceTree = "<group>"; };
 		C10A61C706CAF223682AC397 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		DC4F9695FDCB1E0D04E08974 /* Pods_Chanora.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Chanora.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		E469085D9AE850FF6BD35704 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		EAE6402BFC041304D1D0896D /* Pods-Chanora.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Chanora.debug.xcconfig"; path = "Target Support Files/Pods-Chanora/Pods-Chanora.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -84,9 +79,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
 				8C5000042DD0000000000001 /* SileroCoreML in Frameworks */,
-				C8BACE02E6EE5F840EE3F174 /* Pods_Chanora.framework in Frameworks */,
+				1E3B5BCCA481234F14E64D44 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -112,8 +106,8 @@
 		4351F25046559EFA4C03047A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
 				0B4754099284EEDCD859A973 /* Pods_Runner.framework */,
 				63497078A621E2A73B102C46 /* Pods_RunnerTests.framework */,
 				DC4F9695FDCB1E0D04E08974 /* Pods_Chanora.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -127,9 +121,6 @@
 				73171B86DD76CC3E5A58E160 /* Pods-RunnerTests.debug.xcconfig */,
 				E469085D9AE850FF6BD35704 /* Pods-RunnerTests.release.xcconfig */,
 				076D9E9796600FBC91FD7714 /* Pods-RunnerTests.profile.xcconfig */,
 				EAE6402BFC041304D1D0896D /* Pods-Chanora.debug.xcconfig */,
 				2EA1142FBFD36E2ED564A5AA /* Pods-Chanora.release.xcconfig */,
 				A23C02505CD7E5092CA7958C /* Pods-Chanora.profile.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -137,7 +128,6 @@
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
 				78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -161,7 +151,7 @@
 		97C146EF1CF9000F007C117D /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				97C146EE1CF9000F007C117D /* Chanora.app */,
+				97C146EE1CF9000F007C117D /* Runner.app */,
 				331C8081294A63A400263BE5 /* RunnerTests.xctest */,
 			);
 			name = Products;
@@ -207,15 +197,14 @@
 			productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
-		97C146ED1CF9000F007C117D /* Chanora */ = {
+		97C146ED1CF9000F007C117D /* Runner */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Chanora" */;
+			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
 				7FE733EE83086540AF5D21CB /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				CA110001000000000000A100 /* Verify Silero Exports */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
@@ -225,13 +214,12 @@
 			);
 			dependencies = (
 			);
-			name = Chanora;
+			name = Runner;
 			packageProductDependencies = (
 				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
 				8C5000032DD0000000000001 /* SileroCoreML */,
 			);
 			productName = Runner;
-			productReference = 97C146EE1CF9000F007C117D /* Chanora.app */;
+			productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -264,14 +252,13 @@
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
 			packageReferences = (
 				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
 				8C5000022DD0000000000001 /* XCLocalSwiftPackageReference "silero-coreml" */,
 			);
 			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				97C146ED1CF9000F007C117D /* Chanora */,
+				97C146ED1CF9000F007C117D /* Runner */,
 				331C8080294A63A400263BE5 /* RunnerTests */,
 			);
 		};
@@ -344,15 +331,15 @@
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Chanora/Pods-Chanora-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Chanora/Pods-Chanora-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Chanora/Pods-Chanora-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		7FE733EE83086540AF5D21CB /* [CP] Check Pods Manifest.lock */ = {
@@ -370,7 +357,7 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Chanora-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -392,21 +379,6 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
 		CA110001000000000000A100 /* Verify Silero Exports */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
 			name = "Verify Silero Exports";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/../scripts/verify_silero_exports.sh\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 /* Begin PBXSourcesBuildPhase section */
@@ -434,7 +406,7 @@
 /* Begin PBXTargetDependency section */
 		331C8086294A63A400263BE5 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 97C146ED1CF9000F007C117D /* Chanora */;
+			target = 97C146ED1CF9000F007C117D /* Runner */;
 			targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
@@ -518,23 +490,18 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Automatic;
-				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				CURRENT_PROJECT_VERSION = 101;
+				DEVELOPMENT_TEAM = 349G7M4TQQ;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ZNVDEVDRX3;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Chanora;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = app.teamspeak.chanora;
+				PRODUCT_BUNDLE_IDENTIFIER = app.chanora.chanoraFlutter;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "Chanora_iOS_Ad Hoc";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Chanora_iOS_Ad Hoc";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -555,7 +522,7 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Chanora.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Chanora";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
 			};
 			name = Debug;
 		};
@@ -571,7 +538,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = app.chanora.chanoraFlutter.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Chanora.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Chanora";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
 			};
 			name = Release;
 		};
@@ -587,7 +554,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = app.chanora.chanoraFlutter.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Chanora.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Chanora";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
 			};
 			name = Profile;
 		};
@@ -709,23 +676,18 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
-				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				CURRENT_PROJECT_VERSION = 101;
+				DEVELOPMENT_TEAM = 349G7M4TQQ;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ZNVDEVDRX3;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Chanora;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = app.teamspeak.chanora;
+				PRODUCT_BUNDLE_IDENTIFIER = app.chanora.chanoraFlutter;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = Chanora_ios_Development;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = Chanora_ios_Development;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -740,23 +702,18 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Automatic;
-				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				CURRENT_PROJECT_VERSION = 101;
+				DEVELOPMENT_TEAM = 349G7M4TQQ;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ZNVDEVDRX3;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Chanora;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = app.teamspeak.chanora;
+				PRODUCT_BUNDLE_IDENTIFIER = app.chanora.chanoraFlutter;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "Chanora_App Store";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Chanora_App Store";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -786,7 +743,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Chanora" */ = {
+		97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				97C147061CF9000F007C117D /* Debug */,
@@ -799,21 +756,13 @@
 /* End XCConfigurationList section */
 /* Begin XCLocalSwiftPackageReference section */
 		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
 			isa = XCLocalSwiftPackageReference;
 			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
 		};
 		8C5000022DD0000000000001 /* XCLocalSwiftPackageReference "silero-coreml" */ = {
 			isa = XCLocalSwiftPackageReference;
-			relativePath = "../../../silero-coreml";
+			relativePath = ../../../silero-coreml;
 		};
 /* End XCLocalSwiftPackageReference section */
 /* Begin XCSwiftPackageProductDependency section */
 		78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = FlutterGeneratedPluginSwiftPackage;
 		};
 		8C5000032DD0000000000001 /* SileroCoreML */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 8C5000022DD0000000000001 /* XCLocalSwiftPackageReference "silero-coreml" */;
@@ -1,28 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
   LastUpgradeVersion = "1510"
-   version = "1.7">
+   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
      buildImplicitDependencies = "YES">
      <PreActions>
         <ExecutionAction
            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
            <ActionContent
               title = "Run Prepare Flutter Framework Script"
               scriptText = "/bin/sh &quot;$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh&quot; prepare&#10;">
               <EnvironmentBuildable>
                  <BuildableReference
                     BuildableIdentifier = "primary"
                     BlueprintIdentifier = "97C146ED1CF9000F007C117D"
                     BuildableName = "Chanora.app"
                     BlueprintName = "Chanora"
                     ReferencedContainer = "container:Runner.xcodeproj">
                  </BuildableReference>
               </EnvironmentBuildable>
            </ActionContent>
         </ExecutionAction>
      </PreActions>
      <BuildActionEntries>
         <BuildActionEntry
            buildForTesting = "YES"
@@ -33,8 +15,8 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-               BuildableName = "Chanora.app"
+               BuildableName = "Runner.app"
-               BlueprintName = "Chanora"
+               BlueprintName = "Runner"
               ReferencedContainer = "container:Runner.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
@@ -50,8 +32,8 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "Chanora.app"
+            BuildableName = "Runner.app"
-            BlueprintName = "Chanora"
+            BlueprintName = "Runner"
            ReferencedContainer = "container:Runner.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
@@ -86,8 +68,8 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "Chanora.app"
+            BuildableName = "Runner.app"
-            BlueprintName = "Chanora"
+            BlueprintName = "Runner"
            ReferencedContainer = "container:Runner.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
@@ -103,8 +85,8 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "Chanora.app"
+            BuildableName = "Runner.app"
-            BlueprintName = "Chanora"
+            BlueprintName = "Runner"
            ReferencedContainer = "container:Runner.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
@@ -6,54 +6,95 @@ import AVFoundation
@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
  private var iosAudioLifecycleChannel: FlutterMethodChannel?
  private var iosPlatformChannel: FlutterMethodChannel?
  private var iosAudioSessionChannel: FlutterMethodChannel?
  /// Tracks whether a voice channel is currently active.
  ///
  /// The AVAudioSession is intentionally not configured for VoIP at
  /// app launch — that would interrupt other apps' audio (Spotify,
  /// Apple Music, podcasts) the moment the user opens Chanora, even
  /// when they're just reading chat. Production VoIP apps (Telegram
  /// group calls, Signal, Discord, Element) only switch the session
  /// to `.playAndRecord` + `.voiceChat` when the user actually joins
  /// a voice channel. See `docs/architecture/sad.md` and the
  /// `chanora/ios_audio_session` MethodChannel contract.
  ///
  /// This flag gates lifecycle handlers (interruption-ended,
  /// media-services-reset) so we only rebuild the VoIP session if a
  /// call is actually in progress. When false, those handlers leave
  /// the session in the inactive `.ambient` baseline.
  private var voiceSessionActive: Bool = false
  override func application(
    _ application: UIApplication,
    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
  ) -> Bool {
-    DispatchQueue.global(qos: .utility).async {
+    // Configure the iOS AVAudioSession **category + mode** at
-      ChanoraSileroSelfTest.run()
+    // app-launch time, but DEFER setActive(true) until the scene
    // is foregrounded. Calling setActive in didFinishLaunching is
    // racy on iOS 17+ devices: if the user launches the app from a
    // cold state, the UIApplication isn't yet `.active` and
    // setActive returns `AVAudioSessionErrorCodeCannotStartPlaying`
    // (561017449) — the iOS audio policy server refuses to grant
    // the audio session because the app is not yet considered the
    // foreground priority owner. Symptom in production builds:
    // 'AVAudioSession setup failed: Error 561017449 "Session
    // activation failed"' in NSLog, after which the audio engine
    // is unusable until the user backgrounds + foregrounds the
    // app.
    //
    // The category itself can be set whenever; only the active
    // state needs to be deferred. We listen for
    // didBecomeActiveNotification and activate then. Most
    // production iOS voice apps (Discord, Zoom, FaceTime) follow
    // this same shape.
    do {
      let session = AVAudioSession.sharedInstance()
      try session.setCategory(
        .playAndRecord,
        mode: .voiceChat,
        // Mode rationale (May 2026, .voiceChat reinstated):
        //
        // We previously used .default mode after discovering that
        // .voiceChat routed output through iOS's in-call audio
        // channel, which made speaker output barely audible. That
        // bug was caused by cpal's RemoteIO unit binding to a stale
        // physical transducer — after migrating to coreaudio-rs +
        // kAudioUnitSubType_VoiceProcessingIO (see
        // crates/chanora_audio/src/ios_voice_unit.rs) the route
        // binding is correct under either mode because VPIO re-binds
        // on overrideOutputAudioPort.
        //
        // .voiceChat advantages over .default:
        //   * Tells iOS this is a VoIP session — other apps' audio
        //     is properly ducked/paused instead of competing.
        //   * Enables correct Bluetooth HFP negotiation without
        //     manual workarounds.
        //   * iOS treats the audio session as a "call" for priority
        //     purposes (won't be interrupted by notification sounds).
        //   * System-level CallKit integration (lock-screen controls).
        //
        // .defaultToSpeaker ensures output goes to the main speaker
        // (not the earpiece) by default when no headphones are
        // connected, compensating for the in-call channel's tendency
        // to route to the earpiece.
        //
        // References:
        //   * https://github.com/twilio/video-quickstart-ios/issues/522
        //   * https://stackoverflow.com/questions/79834998 (Daily.co)
        //
        // Options:
        //   .defaultToSpeaker   : route output to the main speaker
        //                         (not the earpiece) by default
        //                         when no headphones are connected.
        //   .allowBluetoothHFP  : permit Bluetooth Hands-Free
        //                         Profile headsets as both input
        //                         and output.
        //   .allowBluetoothA2DP : permit higher-quality A2DP
        //                         output-only Bluetooth devices.
        options: [.defaultToSpeaker, .allowBluetoothHFP, .allowBluetoothA2DP]
      )
      // Match VPIO / Opus frame cadence to reduce callback pressure.
      try session.setPreferredIOBufferDuration(0.02)
      try session.setPreferredSampleRate(48000.0)
      logAudioSessionState(context: "setCategory")
    } catch {
      NSLog("chanora_flutter: AVAudioSession setCategory failed: \(error)")
    }
-    // AVAudioSession lifecycle policy (DEC-2026-06-08, supersedes
+    // Activate the session once the app is actually foreground. The
-    // the launch-time .playAndRecord setup):
+    // notification fires immediately after the cold-launch settles,
-    //
+    // and again on every resume-from-background — both safe
-    // At launch we set the category to .ambient and leave the
+    // moments to call setActive(true). Repeated activation while
-    // session INACTIVE — matching the Telegram / Signal / Discord /
+    // already-active is a no-op per the docs.
-    // Element / Jitsi pattern and Apple's guidance that "a VoIP
+    NotificationCenter.default.addObserver(
-    // app's audio session should not be active" while idle.
+      self,
-    // Configuring .playAndRecord + .voiceChat at launch stops other
+      selector: #selector(activateAudioSession),
-    // apps' music (Spotify, Apple Music, podcasts) the moment the
+      name: UIApplication.didBecomeActiveNotification,
-    // user opens Chanora, even when they are just reading text chat.
+      object: nil
-    //
+    )
    // VoIP configuration is engaged on voice-channel join via the
    // `chanora/ios_audio_session` MethodChannel, driven from Dart
    // before `voiceJoin` starts VoiceProcessingIO and again as an
    // idempotent guard on the AudioStarted lifecycle.
    do {
      try AVAudioSession.sharedInstance().setCategory(.ambient, mode: .default)
      logAudioSessionState(context: "launch-ambient")
    } catch {
      NSLog("chanora_flutter: AVAudioSession .ambient baseline failed: \(error)")
    }
    NotificationCenter.default.addObserver(
      self,
@@ -79,60 +120,37 @@ import AVFoundation
    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
  }
-  /// Activate the VoIP audio session. Called from Dart via the
+  /// Called by `didBecomeActiveNotification` (cold-launch settle +
-  /// `chanora/ios_audio_session` channel before a voice channel join
+  /// every resume-from-background). Activates the AVAudioSession.
-  /// starts VoiceProcessingIO. Configures
+  /// Repeated activation is a no-op when the session is already
-  /// .playAndRecord + .voiceChat with .mixWithOthers so other apps
+  /// active so this is safe to call on every foreground.
-  /// (Spotify, podcasts) can keep playing alongside the voice
+  @objc private func activateAudioSession() {
  /// channel — matching the Telegram group-call UX. Idempotent:
  /// repeated calls while already active are a no-op.
  private func activateVoiceSession() {
    do {
-      let session = AVAudioSession.sharedInstance()
+      try AVAudioSession.sharedInstance().setActive(true, options: [])
-      try session.setCategory(
+      NSLog("chanora_flutter: AVAudioSession activated on foreground")
-        .playAndRecord,
+      // Read back the ACTUAL session state. preferredSampleRate /
-        mode: .voiceChat,
+      // preferredIOBufferDuration are hints; iOS may pick something
-        options: [.defaultToSpeaker, .allowBluetoothHFP, .allowBluetoothA2DP, .mixWithOthers]
+      // else depending on hardware + currently-engaged effects.
-      )
+      // Without these we can't tell whether VPIO is running at
-      try session.setPreferredIOBufferDuration(0.02)
+      // 48 kHz mono (what our render callback assumes) or at e.g.
-      try session.setPreferredSampleRate(48000.0)
+      // 44.1 kHz (which would explain the user's broken playback
-      try session.setActive(true, options: [])
+      // \u2014 our render callback would be writing samples at the
-      voiceSessionActive = true
+      // wrong rate, causing pitch + timing artifacts).
-      logAudioSessionState(context: "activateVoiceSession")
+      logAudioSessionState(context: "setActive")
-      let ins = session.currentRoute.inputs.map { $0.portType.rawValue }.joined(separator: ",")
+      let s = AVAudioSession.sharedInstance()
      let ins = s.currentRoute.inputs.map { $0.portType.rawValue }.joined(separator: ",")
      NSLog(
-        "chanora_flutter: voice session active: " +
+        "chanora_flutter: AVAudioSession actual: " +
-        "sampleRate=\(session.sampleRate) " +
+        "sampleRate=\(s.sampleRate) " +
-        "ioBufferDuration=\(String(format: "%.4f", session.ioBufferDuration)) " +
+        "ioBufferDuration=\(String(format: "%.4f", s.ioBufferDuration)) " +
-        "inputs=[\(ins)] outputVolume=\(session.outputVolume)"
+        "inputs=[\(ins)] " +
        "outputVolume=\(s.outputVolume)"
      )
    } catch {
-      NSLog("chanora_flutter: activateVoiceSession failed: \(error)")
+      NSLog("chanora_flutter: AVAudioSession setActive failed: \(error)")
    }
  }
  /// Deactivate the VoIP audio session and return to the idle
  /// .ambient baseline. Called from Dart on `BridgeEvent::AudioStopped`
  /// (intentional leave, disconnect, or connection lost).
  /// `.notifyOthersOnDeactivation` lets other audio apps know they
  /// can resume — best-effort: Apple Music / Podcasts resume
  /// reliably, Spotify is not guaranteed.
  private func deactivateVoiceSession() {
    let session = AVAudioSession.sharedInstance()
    do {
      try session.setActive(false, options: [.notifyOthersOnDeactivation])
    } catch {
      NSLog("chanora_flutter: deactivateVoiceSession setActive(false) failed: \(error)")
    }
    do {
      try session.setCategory(.ambient, mode: .default)
    } catch {
      NSLog("chanora_flutter: deactivateVoiceSession setCategory(.ambient) failed: \(error)")
    }
    voiceSessionActive = false
    logAudioSessionState(context: "deactivateVoiceSession")
  }
  /// Reads back the actual AVAudioSession state and logs it for
  /// SDD-098 compliance. Called after both setCategory and setActive
  /// to verify that the session accepted the requested configuration.
@@ -197,30 +215,25 @@ import AVFoundation
  }
  @objc private func handleMediaServicesReset(_ notification: Notification) {
-    NSLog("chanora_flutter: media services reset voiceActive=\(voiceSessionActive)")
+    NSLog("chanora_flutter: media services reset")
    if voiceSessionActive {
    do {
      let session = AVAudioSession.sharedInstance()
      try session.setCategory(
        .playAndRecord,
        mode: .voiceChat,
-          options: [.defaultToSpeaker, .allowBluetoothHFP, .allowBluetoothA2DP, .mixWithOthers]
+        options: [.defaultToSpeaker, .allowBluetoothHFP, .allowBluetoothA2DP]
      )
      try session.setPreferredIOBufferDuration(0.02)
      try session.setPreferredSampleRate(48000.0)
      try session.setActive(true, options: [])
-        logAudioSessionState(context: "mediaServicesWereReset-voip")
+      logAudioSessionState(context: "mediaServicesWereReset")
    } catch {
      NSLog("chanora_flutter: AVAudioSession media-services reset rebuild failed: \(error)")
    }
-    } else {
+    // P1: After rebuilding the session, send the current route class to
-      do {
+    // Rust so it can recompute the processing policy and reset the
-        try AVAudioSession.sharedInstance().setCategory(.ambient, mode: .default)
+    // AudioUnit. The Rust side handles this via ios_handle_media_services_reset
-        logAudioSessionState(context: "mediaServicesWereReset-ambient")
+    // which calls ios_restart_voice_unit.
      } catch {
        NSLog("chanora_flutter: AVAudioSession media-services reset ambient restore failed: \(error)")
      }
    }
    let routeClass = classifyAudioRoute(AVAudioSession.sharedInstance().currentRoute)
    NSLog("chanora_flutter: media services reset complete, route=\(routeClass)")
    iosAudioLifecycleChannel?.invokeMethod("handleMediaServicesReset", arguments: routeClass)
@@ -252,26 +265,6 @@ import AVFoundation
      name: "chanora/ios_platform",
      binaryMessenger: engineBridge.applicationRegistrar.messenger()
    )
    iosAudioSessionChannel = FlutterMethodChannel(
      name: "chanora/ios_audio_session",
      binaryMessenger: engineBridge.applicationRegistrar.messenger()
    )
    iosAudioSessionChannel?.setMethodCallHandler { [weak self] call, result in
      guard let self = self else {
        result(FlutterError(code: "delegate_gone", message: "AppDelegate deallocated", details: nil))
        return
      }
      switch call.method {
      case "activateVoiceSession":
        self.activateVoiceSession()
        result(nil)
      case "deactivateVoiceSession":
        self.deactivateVoiceSession()
        result(nil)
      default:
        result(FlutterMethodNotImplemented)
      }
    }
    iosPlatformChannel?.setMethodCallHandler { call, result in
      switch call.method {
      case "getMicrophonePermissionState":
@@ -4,6 +4,9 @@
 <dict>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
 	<!-- Opt into ProMotion / high-refresh-rate CADisplayLink ranges on
 	     supported iPhones. Flutter's iOS embedder reads this key; no
 	     additional Flutter package is required for dynamic refresh. -->
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -24,18 +27,10 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>LSSupportsOpeningDocumentsInPlace</key>
 	<true/>
 	<key>NSLocalNetworkUsageDescription</key>
 	<string>Chanora needs local network access to connect to your voice servers.</string>
 	<key>NSMicrophoneUsageDescription</key>
-	<string>Chanora needs microphone access so you can talk on your voice server.</string>
+	<string>Chanora needs microphone access so you can talk on your TeamSpeak-compatible voice server.</string>
 	<key>NSUserNotificationsUsageDescription</key>
 	<string>Chanora sends you a notification when another user pokes you.</string>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>
@@ -63,8 +58,8 @@
 	<array>
 		<string>audio</string>
 	</array>
-	<key>UIFileSharingEnabled</key>
+	<key>NSLocalNetworkUsageDescription</key>
-	<true/>
+	<string>Chanora needs local network access to connect to TeamSpeak-compatible voice servers.</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -82,5 +77,9 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UIFileSharingEnabled</key>
 	<true/>
 	<key>LSSupportsOpeningDocumentsInPlace</key>
 	<true/>
 </dict>
 </plist>
@@ -1,5 +1,4 @@
 import CoreML
 import Darwin
 import Foundation
 import SileroCoreML
@@ -97,136 +96,3 @@ public func chanoraSileroVadFreeString(_ string: UnsafeMutablePointer<CChar>?) {
    guard let string else { return }
    free(string)
 }
@objc public final class ChanoraSileroSelfTest: NSObject {
    // Validates the same code path the Rust framework uses: dlsym(RTLD_DEFAULT) for all
    // six @_cdecl symbols, then exercises create -> reset -> process -> destroy. Catches
    // the dead-strip / linker-export class of bug that broke TestFlight; calling the Swift
    // functions directly would mask it because direct calls bypass the dynamic symbol table.
    @objc public static func run() {
        let started = DispatchTime.now()
        // Static linker references: keep the Swift compiler / linker from
        // dead-stripping the @_cdecl symbols under Whole-Module-Optimization
        // + LTO in Archive builds. dlsym(RTLD_DEFAULT) below does NOT count
        // as a static reference for the dead-stripper — these `_ = ` lines
        // do. Without them, TestFlight builds shipped without the symbols
        // even though Debug builds (no LTO) worked.
        //
        // The `withoutActuallyEscaping` dance prevents the optimizer from
        // proving the references are unused: assigning the function value
        // to a `@convention(c)` typealias forces address-taken semantics.
        _ = unsafeBitCast(
            chanoraSileroVadCreate as @convention(c) () -> UnsafeMutableRawPointer?,
            to: UnsafeRawPointer.self,
        )
        _ = unsafeBitCast(
            chanoraSileroVadDestroy as @convention(c) (UnsafeMutableRawPointer?) -> Void,
            to: UnsafeRawPointer.self,
        )
        _ = unsafeBitCast(
            chanoraSileroVadReset as @convention(c) (UnsafeMutableRawPointer?) -> Int32,
            to: UnsafeRawPointer.self,
        )
        _ = unsafeBitCast(
            chanoraSileroVadProcess
                as @convention(c) (
                    UnsafeMutableRawPointer?, UnsafePointer<Float>?, Int,
                    UnsafeMutablePointer<Float>?
                ) -> Int32,
            to: UnsafeRawPointer.self,
        )
        _ = unsafeBitCast(
            chanoraSileroVadLastError as @convention(c) () -> UnsafeMutablePointer<CChar>?,
            to: UnsafeRawPointer.self,
        )
        _ = unsafeBitCast(
            chanoraSileroVadFreeString as @convention(c) (UnsafeMutablePointer<CChar>?) -> Void,
            to: UnsafeRawPointer.self,
        )
        typealias CreateFn = @convention(c) () -> UnsafeMutableRawPointer?
        typealias DestroyFn = @convention(c) (UnsafeMutableRawPointer?) -> Void
        typealias ResetFn = @convention(c) (UnsafeMutableRawPointer?) -> Int32
        typealias ProcessFn = @convention(c) (
            UnsafeMutableRawPointer?, UnsafePointer<Float>?, Int, UnsafeMutablePointer<Float>?
        ) -> Int32
        typealias LastErrorFn = @convention(c) () -> UnsafeMutablePointer<CChar>?
        typealias FreeStringFn = @convention(c) (UnsafeMutablePointer<CChar>?) -> Void
        func resolve<T>(_ name: String, as type: T.Type) -> T? {
            guard let raw = dlsym(UnsafeMutableRawPointer(bitPattern: -2), name) else {
                return nil
            }
            return unsafeBitCast(raw, to: type)
        }
        let names = [
            "chanora_silero_vad_create",
            "chanora_silero_vad_destroy",
            "chanora_silero_vad_reset",
            "chanora_silero_vad_process",
            "chanora_silero_vad_last_error",
            "chanora_silero_vad_free_string",
        ]
        let missing = names.filter { dlsym(UnsafeMutableRawPointer(bitPattern: -2), $0) == nil }
        if !missing.isEmpty {
            NSLog("chanora_flutter: SileroCoreML self-test FAILED dlsym missing=\(missing.joined(separator: ","))")
            return
        }
        guard
            let create = resolve("chanora_silero_vad_create", as: CreateFn.self),
            let destroy = resolve("chanora_silero_vad_destroy", as: DestroyFn.self),
            let reset = resolve("chanora_silero_vad_reset", as: ResetFn.self),
            let process = resolve("chanora_silero_vad_process", as: ProcessFn.self),
            let lastError = resolve("chanora_silero_vad_last_error", as: LastErrorFn.self),
            let freeString = resolve("chanora_silero_vad_free_string", as: FreeStringFn.self)
        else {
            NSLog("chanora_flutter: SileroCoreML self-test FAILED unsafeBitCast resolution")
            return
        }
        func readError() -> String {
            guard let ptr = lastError() else { return "unknown" }
            let msg = String(cString: ptr)
            freeString(ptr)
            return msg
        }
        guard let handle = create() else {
            let elapsedMs = elapsedMs(since: started)
            NSLog("chanora_flutter: SileroCoreML self-test FAILED at create err=\(readError()) elapsed_ms=\(elapsedMs)")
            return
        }
        let resetRc = reset(handle)
        if resetRc != 0 {
            destroy(handle)
            let elapsedMs = elapsedMs(since: started)
            NSLog("chanora_flutter: SileroCoreML self-test FAILED at reset rc=\(resetRc) err=\(readError()) elapsed_ms=\(elapsedMs)")
            return
        }
        let chunkSize = SileroVADRunner.chunkSize
        var probability: Float = 0
        let samples = [Float](repeating: 0, count: chunkSize)
        let processRc = samples.withUnsafeBufferPointer { buf -> Int32 in
            process(handle, buf.baseAddress, chunkSize, &probability)
        }
        destroy(handle)
        let elapsedMs = elapsedMs(since: started)
        if processRc == 0 {
            NSLog("chanora_flutter: SileroCoreML self-test OK probability=\(probability) elapsed_ms=\(elapsedMs)")
        } else {
            NSLog("chanora_flutter: SileroCoreML self-test FAILED at process rc=\(processRc) err=\(readError()) elapsed_ms=\(elapsedMs)")
        }
    }
    private static func elapsedMs(since start: DispatchTime) -> String {
        let ns = DispatchTime.now().uptimeNanoseconds &- start.uptimeNanoseconds
        return String(format: "%.1f", Double(ns) / 1_000_000.0)
    }
 }
@@ -85,13 +85,6 @@ Pod::Spec.new do |s|
    }
    CARGO_BIN="$(find_cargo)"
    RUSTC_BIN="$(find_rustc)"
    # Prepend Homebrew's bin dir to PATH so `cmake` (used by
    # audiopus_sys's libopus source build) is found. Xcode's
    # script_phase PATH sanitisation strips /opt/homebrew/bin,
    # which on Apple Silicon hosts is where Homebrew tools live.
    export PATH="/opt/homebrew/bin:$PATH"
    echo "[chanora_bridge.podspec] cargo build aarch64-apple-ios"
    cd "$REPO_ROOT"
    HOME="$USER_HOME" \\
@@ -102,9 +95,6 @@ Pod::Spec.new do |s|
      IPHONEOS_DEPLOYMENT_TARGET=16.0 \\
      CMAKE_POLICY_VERSION_MINIMUM=3.5 \\
      CMAKE_OSX_DEPLOYMENT_TARGET=16.0 \\
      CARGO_PROFILE_RELEASE_DEBUG=true \\
      CARGO_PROFILE_RELEASE_SPLIT_DEBUGINFO=off \\
      CARGO_PROFILE_RELEASE_STRIP=false \\
      "$CARGO_BIN" build --release --target aarch64-apple-ios -p chanora_bridge
    if [ ! -f "$BRIDGE" ]; then
@@ -139,21 +129,7 @@ PLIST
    install_name_tool -id "@rpath/chanora_bridge.framework/chanora_bridge" \\
                      "$FW/chanora_bridge"
-
+    echo "[chanora_bridge.podspec] framework ready at $FW"
    # Generate the framework's dSYM bundle. Apple's archive validator
    # rejects uploads when an embedded framework has no matching dSYM
    # (UUID lookup miss in the archive's dSYMs/ folder), which is the
    # failure mode that produced this prepare_command in the first
    # place. dsymutil reads the DWARF that cargo emitted (enabled by
    # [profile.release] debug = true at the workspace root) and writes
    # chanora_bridge.framework.dSYM next to the framework. We then
    # strip the in-framework binary so the shipped app stays slim —
    # the symbols live exclusively in the dSYM bundle, which is the
    # layout xcodebuild -exportArchive and App Store Connect expect.
    rm -rf "$FW.dSYM"
    xcrun dsymutil "$FW/chanora_bridge" -o "$FW.dSYM"
    xcrun strip -S -x "$FW/chanora_bridge"
    echo "[chanora_bridge.podspec] framework + dSYM ready at $FW"
  SCRIPT
  # Pod CocoaPods picks this up; the framework gets embedded into
@@ -209,13 +185,6 @@ PLIST
      }
      CARGO_BIN="$(find_cargo)"
      RUSTC_BIN="$(find_rustc)"
      # Prepend Homebrew's bin dir to PATH so `cmake` (used by
      # audiopus_sys's libopus source build) is found. Xcode's
      # script_phase PATH sanitisation strips /opt/homebrew/bin,
      # which on Apple Silicon hosts is where Homebrew tools live.
      export PATH="/opt/homebrew/bin:$PATH"
      if [ "${PLATFORM_NAME:-iphoneos}" = "iphonesimulator" ]; then
        RUST_TARGET="aarch64-apple-ios-sim"
        SUPPORTED_PLATFORM="iPhoneSimulator"
@@ -234,9 +203,6 @@ PLIST
        IPHONEOS_DEPLOYMENT_TARGET=16.0 \\
        CMAKE_POLICY_VERSION_MINIMUM=3.5 \\
        CMAKE_OSX_DEPLOYMENT_TARGET=16.0 \\
        CARGO_PROFILE_RELEASE_DEBUG=true \\
        CARGO_PROFILE_RELEASE_SPLIT_DEBUGINFO=off \\
        CARGO_PROFILE_RELEASE_STRIP=false \\
        "$CARGO_BIN" build --release --target "$RUST_TARGET" -p chanora_bridge
      cd "$REPO_ROOT/apps/chanora_flutter/ios"
@@ -244,16 +210,12 @@ PLIST
      # Skip the wrap step if the framework's binary is already
      # up-to-date with the cargo output (fast no-op on incremental
-      # builds where Rust didn't change). We still publish the dSYM
+      # builds where Rust didn't change).
      # into DWARF_DSYM_FOLDER_PATH below so archive builds always
      # have the symbols, even when the framework itself is cached.
      FW_UP_TO_DATE=0
      if [ -f "$FW/chanora_bridge" ] && [ "$FW/chanora_bridge" -nt "$BRIDGE" ]; then
        echo "[chanora_bridge script_phase] framework already up-to-date"
-        FW_UP_TO_DATE=1
+        exit 0
      fi
      if [ "$FW_UP_TO_DATE" = 0 ]; then
      mkdir -p "$FW"
      cp "$BRIDGE" "$FW/chanora_bridge"
      cat > "$FW/Info.plist" <<PLIST
@@ -274,26 +236,7 @@ PLIST
 PLIST
      install_name_tool -id "@rpath/chanora_bridge.framework/chanora_bridge" \\
                        "$FW/chanora_bridge"
-        rm -rf "$FW.dSYM"
+      echo "[chanora_bridge script_phase] framework refreshed"
        xcrun dsymutil "$FW/chanora_bridge" -o "$FW.dSYM"
        xcrun strip -S -x "$FW/chanora_bridge"
        echo "[chanora_bridge script_phase] framework refreshed (with dSYM)"
      fi
      # Publish the dSYM into Xcode's archive dSYM folder on every
      # build (cached or not). Without this the archive validator
      # fails with "archive did not include a dSYM for the
      # chanora_bridge.framework with the UUIDs [<uuid>]" and the
      # IPA cannot be uploaded to App Store Connect / TestFlight.
      # ${DWARF_DSYM_FOLDER_PATH} resolves to <ARCHIVE>/dSYMs for
      # archive builds and <BUILT_PRODUCTS_DIR> otherwise; both paths
      # are the ones xcodebuild scans when collecting symbols.
      if [ -n "${DWARF_DSYM_FOLDER_PATH:-}" ] && [ -d "$FW.dSYM" ]; then
        mkdir -p "$DWARF_DSYM_FOLDER_PATH"
        rm -rf "$DWARF_DSYM_FOLDER_PATH/chanora_bridge.framework.dSYM"
        cp -R "$FW.dSYM" "$DWARF_DSYM_FOLDER_PATH/chanora_bridge.framework.dSYM"
        echo "[chanora_bridge script_phase] dSYM published to $DWARF_DSYM_FOLDER_PATH"
      fi
    SCRIPT
    :execution_position => :before_compile,
  }
@@ -1,69 +0,0 @@
 // SPDX-License-Identifier: Apache-2.0
 // Canonical layout breakpoints for Chanora.
 //
 // Aligned with Material 3 adaptive layout guidance:
 //   compact  < 600dp  — phone, narrow tablet
 //   medium   600–1023 — tablet portrait, small desktop window
 //   expanded ≥ 1024dp — desktop, tablet landscape
 //
 // 1024dp was chosen as the expanded threshold based on production app
 // research: Discord (member list at 1024px), Mattermost (RHS docked at
 // ≥ 1024px), and Rocket.Chat (contextual bar persistent at lg/1024px).
 /// Canonical breakpoint thresholds in logical pixels.
 ///
 /// Use these instead of hardcoded pixel values in layout decisions.
 /// Migrate existing `_wideBreakpoint` / `_chatMobileBreakpoint` references
 /// to these named constants.
 class ChanoraBreakpoints {
  ChanoraBreakpoints._();
  /// Width at which the layout switches from compact to medium.
  /// Below this: single-column mobile layout.
  /// At/above: two-panel side-by-side layout.
  static const double medium = 600;
  /// Width at which the layout switches from medium to expanded.
  /// Below this: chat opens as a pushed route.
  /// At/above: three-panel layout with inline chat panel.
  static const double expanded = 1024;
  // Panel sizing constants.
  /// Fixed width of the left voice/control panel.
  static const double voicePanelWidth = 320;
  /// Fixed width of the right chat panel (expanded layout only).
  static const double chatPanelWidth = 380;
  /// Horizontal gap between panels.
  static const double panelGap = 12;
  /// Desktop snackbar width cap (used when width ≥ [medium]).
  static const double snackBarDesktopCap = 560;
  /// Connect form action buttons switch from row to column below this width.
  static const double connectActionsStackMaxWidth = 400;
  /// Modal bottom sheet max height as fraction of screen height.
  static const double modalSheetHeightFraction = 0.72;
 }
 /// Semantic layout class derived from viewport width.
 enum LayoutClass {
  /// < 600dp — single-column mobile layout.
  compact,
  /// 600–1023dp — two-panel side-by-side layout.
  medium,
  /// ≥ 1024dp — three-panel layout with inline chat.
  expanded,
 }
 /// Computes the current [LayoutClass] from viewport [width].
 LayoutClass layoutClassFromWidth(double width) {
  if (width >= ChanoraBreakpoints.expanded) return LayoutClass.expanded;
  if (width >= ChanoraBreakpoints.medium) return LayoutClass.medium;
  return LayoutClass.compact;
 }
@@ -1,67 +0,0 @@
 // SPDX-License-Identifier: Apache-2.0
 // Viewport info inherited widget for Chanora.
 //
 // Computes [LayoutClass] once per frame from the current [MediaQuery] size
 // and provides it to the entire widget subtree. Downstream widgets read
 // `ViewportInfo.of(context)` instead of calling `LayoutBuilder` or
 // `MediaQuery.sizeOf` directly for layout-class decisions.
 import 'package:flutter/widgets.dart';
 import 'breakpoints.dart';
 /// Inherited widget that exposes the current layout class and viewport
 /// dimensions to the entire subtree.
 ///
 /// Insert this once near the top of the widget tree (inside the Scaffold
 /// body or equivalent). All descendants can then read
 /// `ViewportInfo.of(context)` to determine their layout behaviour.
 class ViewportInfo extends InheritedWidget {
  /// Creates a [ViewportInfo].
  const ViewportInfo({
    super.key,
    required this.layoutClass,
    required this.width,
    required this.height,
    required super.child,
  });
  /// Current layout class derived from viewport width.
  final LayoutClass layoutClass;
  /// Current viewport width in logical pixels.
  final double width;
  /// Current viewport height in logical pixels.
  final double height;
  /// Returns the nearest [ViewportInfo] in the widget tree.
  ///
  /// Asserts that a [ViewportInfo] ancestor exists.
  static ViewportInfo of(BuildContext context) {
    final info = context.dependOnInheritedWidgetOfExactType<ViewportInfo>();
    assert(info != null, 'No ViewportInfo found in widget tree');
    return info!;
  }
  /// Whether the current layout is compact (< 600dp).
  bool get isCompact => layoutClass == LayoutClass.compact;
  /// Whether the current layout is medium (600–1023dp).
  bool get isMedium => layoutClass == LayoutClass.medium;
  /// Whether the current layout is expanded (≥ 1024dp).
  bool get isExpanded => layoutClass == LayoutClass.expanded;
  /// Whether the layout has room for at least two panels (medium or expanded).
  bool get isWide => !isCompact;
  @override
  bool updateShouldNotify(ViewportInfo old) => layoutClass != old.layoutClass;
  // NOTE: width/height changes within the same layout class do NOT trigger
  // notification. Dependents who genuinely need pixel-level dimensions
  // (rare — most layouts should switch on layoutClass) must use a local
  // LayoutBuilder. Notifying on every pixel would rebuild every dependent
  // on every resize frame, which is the exact pessimisation this
  // InheritedWidget exists to avoid.
 }
@@ -46,7 +46,6 @@
  "retryAction": "Retry",
  "chatAction": "Chat",
  "chatCloseAction": "Close chat",
  "chatPanelCollapsedHint": "Tap the chat button to continue your conversation",
  "chatNewPrivateAction": "New private chat",
  "chatSearchClientsHint": "Search clients...",
  "chatDirectMessageAction": "Private message",
@@ -242,30 +241,19 @@
  "clientInfoUnknown": "Unknown",
  "clientInfoHidden": "Hidden",
  "clientInfoNone": "None",
-  "pokeSettingsAction": "Poke notifications",
+  "pokeSnackBarClearAction": "Clear",
-  "pokeSettingsTitle": "Poke notifications",
+  "pokeSnackBarMoreIndicator": "...",
-  "pokeSettingsEnableLabel": "Notify me about pokes",
+  "pokeSnackBarIncomingNoMessage": "{sender} pokes you",
-  "pokeSettingsEnableDescription": "Show local notifications for incoming pokes when this is on.",
+  "@pokeSnackBarIncomingNoMessage": {
  "pokeSettingsMutedSendersHeader": "Muted senders",
  "pokeSettingsMutedSendersEmpty": "No muted poke senders.",
  "pokeSettingsMutedSenderLabel": "Client ID {senderId}",
  "@pokeSettingsMutedSenderLabel": {
    "placeholders": {
      "senderId": { "type": "String" }
    }
  },
  "pokeSettingsUnmuteSenderAction": "Unmute",
  "pokeOverflowMutePrompt": "Repeated pokes from {sender} were suppressed. Mute this sender?",
  "@pokeOverflowMutePrompt": {
    "placeholders": {
      "sender": { "type": "String" }
    }
  },
-  "pokeOverflowMuteAction": "Mute",
+  "pokeSnackBarIncomingWithMessage": "{sender} pokes you: {message}",
-  "pokeMutedSenderConfirmation": "Muted pokes from {sender}",
+  "@pokeSnackBarIncomingWithMessage": {
  "@pokeMutedSenderConfirmation": {
    "placeholders": {
-      "sender": { "type": "String" }
+      "sender": { "type": "String" },
      "message": { "type": "String" }
    }
  },
  "pokeHistorySelfNoMessage": "<{time}> You poked \"{target}\".",
@@ -310,6 +298,5 @@
  "clientVolumeMuteAction": "Mute user",
  "clientVolumeUnmuteAction": "Unmute user",
  "clientVolumeResetAction": "Reset to default",
-  "permissionDenied": "Permission Denied",
+  "permissionDenied": "Permission Denied"
  "voiceTalkPowerBlocked": "Insufficient talk power to speak in this channel"
 }
@@ -39,7 +39,6 @@
  "retryAction": "重试",
  "chatAction": "聊天",
  "chatCloseAction": "关闭聊天",
  "chatPanelCollapsedHint": "点击聊天按钮以继续对话",
  "chatNewPrivateAction": "新建私聊",
  "chatSearchClientsHint": "搜索用户...",
  "chatDirectMessageAction": "私聊",
@@ -191,30 +190,19 @@
  "clientInfoUnknown": "未知",
  "clientInfoHidden": "隐藏",
  "clientInfoNone": "无",
-  "pokeSettingsAction": "戳一戳通知",
+  "pokeSnackBarClearAction": "清除",
-  "pokeSettingsTitle": "戳一戳通知",
+  "pokeSnackBarMoreIndicator": "...",
-  "pokeSettingsEnableLabel": "接收戳一戳通知",
+  "pokeSnackBarIncomingNoMessage": "{sender} 戳了你一下",
-  "pokeSettingsEnableDescription": "开启后，收到戳一戳时会显示本地通知。",
+  "@pokeSnackBarIncomingNoMessage": {
  "pokeSettingsMutedSendersHeader": "已静音的发送者",
  "pokeSettingsMutedSendersEmpty": "没有已静音的戳一戳发送者。",
  "pokeSettingsMutedSenderLabel": "用户 ID {senderId}",
  "@pokeSettingsMutedSenderLabel": {
    "placeholders": {
      "senderId": { "type": "String" }
    }
  },
  "pokeSettingsUnmuteSenderAction": "取消静音",
  "pokeOverflowMutePrompt": "来自 {sender} 的重复戳一戳已被抑制。要静音此发送者吗？",
  "@pokeOverflowMutePrompt": {
    "placeholders": {
      "sender": { "type": "String" }
    }
  },
-  "pokeOverflowMuteAction": "静音",
+  "pokeSnackBarIncomingWithMessage": "{sender} 戳了你一下：{message}",
-  "pokeMutedSenderConfirmation": "已静音来自 {sender} 的戳一戳",
+  "@pokeSnackBarIncomingWithMessage": {
  "@pokeMutedSenderConfirmation": {
    "placeholders": {
-      "sender": { "type": "String" }
+      "sender": { "type": "String" },
      "message": { "type": "String" }
    }
  },
  "pokeHistorySelfNoMessage": "<{time}> 你戳了“{target}”一下。",
@@ -253,6 +241,5 @@
  "clientVolumeMuteAction": "静音该用户",
  "clientVolumeUnmuteAction": "取消静音",
  "clientVolumeResetAction": "恢复默认",
-  "permissionDenied": "权限被拒绝",
+  "permissionDenied": "权限被拒绝"
  "voiceTalkPowerBlocked": "发言权限不足，无法在此频道发言"
 }
@@ -307,12 +307,6 @@ abstract class AppL10n {
  /// **'Close chat'**
  String get chatCloseAction;
  /// No description provided for @chatPanelCollapsedHint.
  ///
  /// In en, this message translates to:
  /// **'Tap the chat button to continue your conversation'**
  String get chatPanelCollapsedHint;
  /// No description provided for @chatNewPrivateAction.
  ///
  /// In en, this message translates to:
@@ -1159,71 +1153,29 @@ abstract class AppL10n {
  /// **'None'**
  String get clientInfoNone;
-  /// No description provided for @pokeSettingsAction.
+  /// No description provided for @pokeSnackBarClearAction.
  ///
  /// In en, this message translates to:
-  /// **'Poke notifications'**
+  /// **'Clear'**
-  String get pokeSettingsAction;
+  String get pokeSnackBarClearAction;
-  /// No description provided for @pokeSettingsTitle.
+  /// No description provided for @pokeSnackBarMoreIndicator.
  ///
  /// In en, this message translates to:
-  /// **'Poke notifications'**
+  /// **'...'**
-  String get pokeSettingsTitle;
+  String get pokeSnackBarMoreIndicator;
-  /// No description provided for @pokeSettingsEnableLabel.
+  /// No description provided for @pokeSnackBarIncomingNoMessage.
  ///
  /// In en, this message translates to:
-  /// **'Notify me about pokes'**
+  /// **'{sender} pokes you'**
-  String get pokeSettingsEnableLabel;
+  String pokeSnackBarIncomingNoMessage(String sender);
-  /// No description provided for @pokeSettingsEnableDescription.
+  /// No description provided for @pokeSnackBarIncomingWithMessage.
  ///
  /// In en, this message translates to:
-  /// **'Show local notifications for incoming pokes when this is on.'**
+  /// **'{sender} pokes you: {message}'**
-  String get pokeSettingsEnableDescription;
+  String pokeSnackBarIncomingWithMessage(String sender, String message);
  /// No description provided for @pokeSettingsMutedSendersHeader.
  ///
  /// In en, this message translates to:
  /// **'Muted senders'**
  String get pokeSettingsMutedSendersHeader;
  /// No description provided for @pokeSettingsMutedSendersEmpty.
  ///
  /// In en, this message translates to:
  /// **'No muted poke senders.'**
  String get pokeSettingsMutedSendersEmpty;
  /// No description provided for @pokeSettingsMutedSenderLabel.
  ///
  /// In en, this message translates to:
  /// **'Client ID {senderId}'**
  String pokeSettingsMutedSenderLabel(String senderId);
  /// No description provided for @pokeSettingsUnmuteSenderAction.
  ///
  /// In en, this message translates to:
  /// **'Unmute'**
  String get pokeSettingsUnmuteSenderAction;
  /// No description provided for @pokeOverflowMutePrompt.
  ///
  /// In en, this message translates to:
  /// **'Repeated pokes from {sender} were suppressed. Mute this sender?'**
  String pokeOverflowMutePrompt(String sender);
  /// No description provided for @pokeOverflowMuteAction.
  ///
  /// In en, this message translates to:
  /// **'Mute'**
  String get pokeOverflowMuteAction;
  /// No description provided for @pokeMutedSenderConfirmation.
  ///
  /// In en, this message translates to:
  /// **'Muted pokes from {sender}'**
  String pokeMutedSenderConfirmation(String sender);
  /// No description provided for @pokeHistorySelfNoMessage.
  ///
@@ -1294,12 +1246,6 @@ abstract class AppL10n {
  /// In en, this message translates to:
  /// **'Permission Denied'**
  String get permissionDenied;
  /// No description provided for @voiceTalkPowerBlocked.
  ///
  /// In en, this message translates to:
  /// **'Insufficient talk power to speak in this channel'**
  String get voiceTalkPowerBlocked;
 }
 class _AppL10nDelegate extends LocalizationsDelegate<AppL10n> {
@@ -123,10 +123,6 @@ class AppL10nEn extends AppL10n {
  @override
  String get chatCloseAction => 'Close chat';
  @override
  String get chatPanelCollapsedHint =>
      'Tap the chat button to continue your conversation';
  @override
  String get chatNewPrivateAction => 'New private chat';
@@ -590,43 +586,19 @@ class AppL10nEn extends AppL10n {
  String get clientInfoNone => 'None';
  @override
-  String get pokeSettingsAction => 'Poke notifications';
+  String get pokeSnackBarClearAction => 'Clear';
  @override
-  String get pokeSettingsTitle => 'Poke notifications';
+  String get pokeSnackBarMoreIndicator => '...';
  @override
-  String get pokeSettingsEnableLabel => 'Notify me about pokes';
+  String pokeSnackBarIncomingNoMessage(String sender) {
-
+    return '$sender pokes you';
  @override
  String get pokeSettingsEnableDescription =>
      'Show local notifications for incoming pokes when this is on.';
  @override
  String get pokeSettingsMutedSendersHeader => 'Muted senders';
  @override
  String get pokeSettingsMutedSendersEmpty => 'No muted poke senders.';
  @override
  String pokeSettingsMutedSenderLabel(String senderId) {
    return 'Client ID $senderId';
  }
  @override
-  String get pokeSettingsUnmuteSenderAction => 'Unmute';
+  String pokeSnackBarIncomingWithMessage(String sender, String message) {
-
+    return '$sender pokes you: $message';
  @override
  String pokeOverflowMutePrompt(String sender) {
    return 'Repeated pokes from $sender were suppressed. Mute this sender?';
  }
  @override
  String get pokeOverflowMuteAction => 'Mute';
  @override
  String pokeMutedSenderConfirmation(String sender) {
    return 'Muted pokes from $sender';
  }
  @override
@@ -681,8 +653,4 @@ class AppL10nEn extends AppL10n {
  @override
  String get permissionDenied => 'Permission Denied';
  @override
  String get voiceTalkPowerBlocked =>
      'Insufficient talk power to speak in this channel';
 }
@@ -120,9 +120,6 @@ class AppL10nZh extends AppL10n {
  @override
  String get chatCloseAction => '关闭聊天';
  @override
  String get chatPanelCollapsedHint => '点击聊天按钮以继续对话';
  @override
  String get chatNewPrivateAction => '新建私聊';
@@ -577,42 +574,19 @@ class AppL10nZh extends AppL10n {
  String get clientInfoNone => '无';
  @override
-  String get pokeSettingsAction => '戳一戳通知';
+  String get pokeSnackBarClearAction => '清除';
  @override
-  String get pokeSettingsTitle => '戳一戳通知';
+  String get pokeSnackBarMoreIndicator => '...';
  @override
-  String get pokeSettingsEnableLabel => '接收戳一戳通知';
+  String pokeSnackBarIncomingNoMessage(String sender) {
-
+    return '$sender 戳了你一下';
  @override
  String get pokeSettingsEnableDescription => '开启后，收到戳一戳时会显示本地通知。';
  @override
  String get pokeSettingsMutedSendersHeader => '已静音的发送者';
  @override
  String get pokeSettingsMutedSendersEmpty => '没有已静音的戳一戳发送者。';
  @override
  String pokeSettingsMutedSenderLabel(String senderId) {
    return '用户 ID $senderId';
  }
  @override
-  String get pokeSettingsUnmuteSenderAction => '取消静音';
+  String pokeSnackBarIncomingWithMessage(String sender, String message) {
-
+    return '$sender 戳了你一下：$message';
  @override
  String pokeOverflowMutePrompt(String sender) {
    return '来自 $sender 的重复戳一戳已被抑制。要静音此发送者吗？';
  }
  @override
  String get pokeOverflowMuteAction => '静音';
  @override
  String pokeMutedSenderConfirmation(String sender) {
    return '已静音来自 $sender 的戳一戳';
  }
  @override
@@ -667,7 +641,4 @@ class AppL10nZh extends AppL10n {
  @override
  String get permissionDenied => '权限被拒绝';
  @override
  String get voiceTalkPowerBlocked => '发言权限不足，无法在此频道发言';
 }
@@ -15,22 +15,15 @@ typedef StorageDirectoryProvider = Future<Directory> Function();
 typedef StorageInitializer = Future<void> Function(String dir);
 Future<void>? _storageInitFuture;
 Future<void>? _cacheInitFuture;
 Future<void>? _vadBootstrapFuture;
 StorageDirectoryProvider _storageDirectoryProvider =
    getApplicationSupportDirectory;
 StorageDirectoryProvider _cacheDirectoryProvider = getApplicationCacheDirectory;
 StorageInitializer _storageInitializer = _defaultStorageInitializer;
 StorageInitializer _cacheInitializer = _defaultCacheInitializer;
 Future<void> _defaultStorageInitializer(String dir) {
  return rust.initStorage(dir: dir);
 }
 Future<void> _defaultCacheInitializer(String dir) {
  return rust.initCache(dir: dir);
 }
 Future<File> _copyBundledAssetToDocuments({
  required String assetPath,
  required String fileName,
@@ -128,50 +121,16 @@ Future<void> _wireStorageImpl() async {
  }
 }
 Future<void> wireCache() async {
  final existing = _cacheInitFuture;
  if (existing != null) {
    await existing;
    return;
  }
  final initFuture = _wireCacheImpl();
  _cacheInitFuture = initFuture;
  await initFuture;
 }
 Future<void> _wireCacheImpl() async {
  var initialized = false;
  try {
    final dir = await _cacheDirectoryProvider();
    await _cacheInitializer(dir.path);
    initialized = true;
  } catch (_) {
    // Best-effort; missing cache just means protocol-owned assets are
    // re-downloaded this session.
  } finally {
    if (!initialized) {
      _cacheInitFuture = null;
    }
  }
 }
@visibleForTesting
 void debugResetStorageBootstrap({
  StorageDirectoryProvider? storageDirectoryProvider,
  StorageDirectoryProvider? cacheDirectoryProvider,
  StorageInitializer? storageInitializer,
  StorageInitializer? cacheInitializer,
 }) {
  _storageInitFuture = null;
  _cacheInitFuture = null;
  _vadBootstrapFuture = null;
  _storageDirectoryProvider =
      storageDirectoryProvider ?? getApplicationSupportDirectory;
  _cacheDirectoryProvider =
      cacheDirectoryProvider ?? getApplicationCacheDirectory;
  _storageInitializer = storageInitializer ?? _defaultStorageInitializer;
  _cacheInitializer = cacheInitializer ?? _defaultCacheInitializer;
 }
 rust.BridgeNetworkState _mapConnectivity(List<ConnectivityResult> results) {
@@ -6,22 +6,7 @@ import '../src/rust/api.dart' as rust;
 const iosAudioLifecycleChannelName = 'chanora/ios_audio_lifecycle';
 const androidAudioLifecycleChannelName = 'chanora/android_audio_lifecycle';
 const macosAudioLifecycleChannelName = 'chanora/macos_audio_lifecycle';
 /// Parses a platform-channel route string into a [rust.BridgeAudioRoute].
 ///
 /// The producer contract is:
 /// - iOS: `AppDelegate.classifyAudioRoute(_:)` emits one of
 ///   `Earpiece`, `Speaker`, `WiredHeadset`, `BluetoothHfp`, `BluetoothA2dp`,
 ///   `Unknown`.
 /// - Android: `AndroidAudioLifecycleController.classifyDevice` emits one of
 ///   `Earpiece`, `Speaker`, `WiredHeadset`, `UsbHeadset`, `BluetoothHfp`,
 ///   `BluetoothA2dp`, `Hdmi`, `Unknown`.
 ///
 /// Both producers emit exact PascalCase strings. Case variants (`USB_HEADSET`,
 /// `usb_headset`, `UsbHeadphone`) are NOT handled and will fall through to
 /// `unknown`. If either platform classifier changes its string contract,
 /// update both producers and this parser together.
 rust.BridgeAudioRoute parseBridgeAudioRoute(String value) {
  switch (value) {
    case 'Earpiece':
@@ -29,15 +14,11 @@ rust.BridgeAudioRoute parseBridgeAudioRoute(String value) {
    case 'Speaker':
      return rust.BridgeAudioRoute.speaker;
    case 'WiredHeadset':
    case 'UsbHeadset':
      return rust.BridgeAudioRoute.wiredHeadset;
    case 'BluetoothHfp':
      return rust.BridgeAudioRoute.bluetoothHfp;
    case 'BluetoothA2dp':
      return rust.BridgeAudioRoute.bluetoothA2Dp;
    case 'Hdmi':
    case 'Unknown':
      return rust.BridgeAudioRoute.unknown;
    default:
      return rust.BridgeAudioRoute.unknown;
  }
@@ -46,7 +27,6 @@ rust.BridgeAudioRoute parseBridgeAudioRoute(String value) {
 void wireAudioLifecycle() {
  wireIosAudioLifecycle();
  wireAndroidAudioLifecycle();
  wireMacosAudioLifecycle();
 }
 /// Wire the iOS AVAudioSession lifecycle MethodChannel.
@@ -125,42 +105,3 @@ void wireAndroidAudioLifecycle({
    }
  });
 }
 /// Wire the macOS audio lifecycle MethodChannel.
 ///
 /// Swift side (`MacOSAudioLifecycle`) posts `handleDefaultDeviceChange`
 /// (with `role: 'input' | 'output'`) when Core Audio HAL default-input /
 /// default-output device changes, and `handleConfigurationChange` when
 /// the VPIO AudioUnit reports a stream-format change. Closes the
 /// iOS/macOS asymmetry noted in SysRS-051.
 ///
 /// Current scope: events are received and logged. The FRB
 /// `macosDefaultDeviceChanged` function that triggers a VPIO
 /// re-bind on the engine is a follow-up; until it's exposed, the
 /// macOS path mirrors the iOS `chanora/ios_audio_lifecycle` event
 /// surface but does not yet trigger an engine-side restart.
 void wireMacosAudioLifecycle({
  bool isMacos = false,
  MethodChannel channel = const MethodChannel(macosAudioLifecycleChannelName),
 }) {
  if (!isMacos && !Platform.isMacOS) return;
  channel.setMethodCallHandler((call) async {
    try {
      switch (call.method) {
        case 'handleDefaultDeviceChange':
          // TODO: call rust.macosDefaultDeviceChanged() once exposed
          // via flutter_rust_bridge; until then the event is captured
          // here for observability.
          break;
        case 'handleConfigurationChange':
          // TODO: same — currently captured, no engine action yet.
          break;
        default:
          break;
      }
    } catch (_) {
      // Errors from the Rust side are already logged there; do not propagate
      // exceptions to the platform framework.
    }
  });
 }
@@ -1,31 +0,0 @@
 class HardMuteOwners {
  const HardMuteOwners({
    this.manual = false,
    this.permission = false,
    this.talkPower = false,
  });
  final bool manual;
  final bool permission;
  final bool talkPower;
  bool get effective => manual || permission || talkPower;
  HardMuteOwners withBridgeManualMute(bool muted) {
    return copyWith(
      manual: muted && (manual || !permission && !talkPower),
    );
  }
  HardMuteOwners copyWith({
    bool? manual,
    bool? permission,
    bool? talkPower,
  }) {
    return HardMuteOwners(
      manual: manual ?? this.manual,
      permission: permission ?? this.permission,
      talkPower: talkPower ?? this.talkPower,
    );
  }
 }
@@ -1,66 +0,0 @@
 import 'dart:io' show Platform;
 import 'package:flutter/services.dart';
 const iosAudioSessionChannelName = 'chanora/ios_audio_session';
 /// Controls the iOS AVAudioSession VoIP lifecycle from Dart.
 ///
 /// The Swift `AppDelegate` configures the session to `.ambient` at
 /// launch and leaves it inactive. The session is only switched to
 /// `.playAndRecord` + `.voiceChat` (with `.mixWithOthers`) while a
 /// voice channel is actually active. This controller is the Dart
 /// side of that contract — call [activate] before the Rust engine
 /// starts VoiceProcessingIO and [deactivate] on
 /// `BridgeEvent::AudioStopped` or failed joins.
 ///
 /// On non-iOS platforms both methods are no-ops; the platforms
 /// handle their own session lifecycle elsewhere (Android via
 /// `AndroidAudioLifecycleController`, macOS via
 /// `MacOSAudioLifecycle`, desktop has no exclusive session).
 class IosAudioSessionController {
  IosAudioSessionController({
    MethodChannel? channel,
    bool? isIos,
  })  : _channel = channel ?? const MethodChannel(iosAudioSessionChannelName),
        _isIos = isIos ?? Platform.isIOS;
  final MethodChannel _channel;
  final bool _isIos;
  Future<void> activate() async {
    if (!_isIos) return;
    try {
      await _channel.invokeMethod<void>('activateVoiceSession');
    } on PlatformException {
      // Swift side logs the failure via NSLog; surfacing the
      // exception to the event handler would be noise. The Rust
      // engine remains alive and will produce silence until the
      // next route change or a manual leave/rejoin.
    } on MissingPluginException {
      // Test hosts and mispackaged builds may not have registered
      // the iOS channel. Keep event dispatch alive rather than
      // surfacing an unhandled async error.
    }
  }
  Future<void> deactivate() async {
    if (!_isIos) return;
    try {
      await _channel.invokeMethod<void>('deactivateVoiceSession');
    } on PlatformException {
      // Same rationale as activate(): the Swift side logs.
      // Worst case the session stays in .playAndRecord until the
      // app is backgrounded — at which point iOS reclaims the
      // session automatically.
    } on MissingPluginException {
      // Same rationale as activate(): missing channel should not
      // break bridge event handling.
    }
  }
 }
 /// Default singleton used by [main.dart] event dispatch. Tests
 /// should construct their own [IosAudioSessionController] with a
 /// mocked channel rather than mutating this instance.
 final iosAudioSessionController = IosAudioSessionController();
@@ -63,8 +63,6 @@ const String methodTriggerLocalNetworkPrompt = 'triggerLocalNetworkPrompt';
@visibleForTesting
 const String methodCheckLocalNetwork = 'checkLocalNetwork';
@visibleForTesting
 const String methodCheckLocalNetworkAccess = 'checkLocalNetworkAccess';
@visibleForTesting
 const String methodRequestNotifications = 'requestNotifications';
@visibleForTesting
 const String methodCheckNotifications = 'checkNotifications';
@@ -311,14 +309,12 @@ class MacOSPermissionsService {
          _inputMonitoringState.value = state;
          _pttCapabilityState.value = _pttCapabilityLevel(state);
        }
        break;
      case methodLocalNetworkStateChanged:
        final args = call.arguments;
        if (args is Map) {
          _localNetworkState.value =
              _parseLocalNetworkState(args['state'] as String?);
        }
        break;
      default:
        break;
    }
@@ -442,37 +438,6 @@ class MacOSPermissionsService {
    }
  }
  /// Probe whether Local Network access is currently denied for [host]:[port]
  /// by creating a short-lived NWConnection and checking
  /// `unsatisfiedReason == .localNetworkDenied`.
  ///
  /// This does NOT trigger a new system prompt — it is a read-only check.
  /// Returns [MacOSLocalNetworkState.unsupported] on non-macOS platforms.
  Future<MacOSLocalNetworkState> checkLocalNetworkAccess({
    required String host,
    required int port,
  }) async {
    final ch = _channel;
    if (ch == null) return MacOSLocalNetworkState.unsupported;
    try {
      final raw = await ch.invokeMethod<String>(
        methodCheckLocalNetworkAccess,
        <String, dynamic>{'host': host, 'port': port},
      );
      final state = _parseLocalNetworkState(raw);
      _localNetworkState.value = state;
      return state;
    } catch (e, st) {
      developer.log(
        'checkLocalNetworkAccess failed',
        name: 'MacOSPermissionsService',
        error: e,
        stackTrace: st,
      );
      return _localNetworkState.value;
    }
  }
  // -- Outbound: Notifications ----------------------------------------------
  Future<MacOSPermissionState> _checkNotifications() async {
@@ -1,179 +0,0 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import '../src/rust/api.dart' as rust;
 class PokeNotificationService {
  PokeNotificationService({FlutterLocalNotificationsPlugin? notifications})
    : _notifications = notifications ?? FlutterLocalNotificationsPlugin();
  static const _strongAndroidChannelId = 'chanora_pokes_strong_v1';
  static const _defaultAndroidChannelId = 'chanora_pokes_default_v1';
  static const _groupKey = 'chanora.pokes';
  static const _darwinThreadId = 'chanora.pokes';
  static const _windowsHeader = WindowsHeader(
    id: 'chanora.pokes',
    title: 'Pokes',
    arguments: 'pokes',
  );
  static const _windowsAppUserModelId = 'Chanora.Client';
  static const _windowsGuid = '6B7F3DCB-4418-4E0A-8CC7-02B7C95B675E';
  final FlutterLocalNotificationsPlugin _notifications;
  bool _initialized = false;
  Future<void> init() async {
    if (_initialized) return;
    await _notifications.initialize(
      settings: const InitializationSettings(
        android: AndroidInitializationSettings('ic_chanora_notification'),
        iOS: DarwinInitializationSettings(
          requestAlertPermission: false,
          requestBadgePermission: false,
          // TODO(event-sounds): handled by future EventSoundService, not the OS channel.
          requestSoundPermission: false,
          // TODO(event-sounds): handled by future EventSoundService, not the OS channel.
          defaultPresentSound: false,
        ),
        macOS: DarwinInitializationSettings(
          requestAlertPermission: false,
          requestBadgePermission: false,
          // TODO(event-sounds): handled by future EventSoundService, not the OS channel.
          requestSoundPermission: false,
          // TODO(event-sounds): handled by future EventSoundService, not the OS channel.
          defaultPresentSound: false,
        ),
        linux: LinuxInitializationSettings(
          defaultActionName: 'Open',
          // TODO(event-sounds): handled by future EventSoundService, not the OS channel.
          defaultSuppressSound: true,
        ),
        windows: WindowsInitializationSettings(
          appName: 'Chanora',
          appUserModelId: _windowsAppUserModelId,
          guid: _windowsGuid,
        ),
      ),
    );
    _initialized = true;
  }
  Future<bool> requestPermission() async {
    await init();
    if (kIsWeb) return true;
    final android = _notifications
        .resolvePlatformSpecificImplementation<
          AndroidFlutterLocalNotificationsPlugin
        >();
    if (android != null) {
      return await android.requestNotificationsPermission() ?? true;
    }
    final ios = _notifications
        .resolvePlatformSpecificImplementation<
          IOSFlutterLocalNotificationsPlugin
        >();
    if (ios != null) {
      return await ios.requestPermissions(alert: true, badge: true) ?? false;
    }
    final macOS = _notifications
        .resolvePlatformSpecificImplementation<
          MacOSFlutterLocalNotificationsPlugin
        >();
    if (macOS != null) {
      return await macOS.requestPermissions(alert: true, badge: true) ?? false;
    }
    return true;
  }
  Future<void> show({
    required String senderName,
    required String message,
    required BigInt senderId,
    required rust.BridgePokeStrength strength,
  }) async {
    await init();
    final permitted = await requestPermission();
    if (!permitted) return;
    final trimmedMessage = message.trim();
    final body = trimmedMessage.isEmpty
        ? '$senderName pokes you'
        : trimmedMessage;
    await _notifications.show(
      id: senderId.toUnsigned(31).toInt(),
      title: 'Poke from $senderName',
      body: body,
      notificationDetails: NotificationDetails(
        android: _androidDetails(strength),
        iOS: _darwinDetails(strength),
        macOS: _darwinDetails(strength),
        linux: _linuxDetails(strength),
        windows: _windowsDetails(strength),
      ),
      payload: 'poke:$senderId',
    );
  }
  AndroidNotificationDetails _androidDetails(rust.BridgePokeStrength strength) {
    final isStrong = strength == rust.BridgePokeStrength.strong;
    return AndroidNotificationDetails(
      isStrong ? _strongAndroidChannelId : _defaultAndroidChannelId,
      isStrong ? 'Pokes' : 'Pokes (quiet)',
      channelDescription: 'TeamSpeak poke notifications',
      importance: isStrong ? Importance.max : Importance.defaultImportance,
      priority: isStrong ? Priority.high : Priority.defaultPriority,
      // TODO(event-sounds): handled by future EventSoundService, not the OS channel.
      playSound: false,
      // TODO(event-sounds): handled by future EventSoundService, not the OS channel.
      silent: true,
      groupKey: _groupKey,
      category: AndroidNotificationCategory.message,
      visibility: NotificationVisibility.private,
    );
  }
  DarwinNotificationDetails _darwinDetails(rust.BridgePokeStrength strength) {
    return DarwinNotificationDetails(
      // TODO(event-sounds): handled by future EventSoundService, not the OS channel.
      presentSound: false,
      threadIdentifier: _darwinThreadId,
      interruptionLevel: switch (strength) {
        rust.BridgePokeStrength.strong => InterruptionLevel.timeSensitive,
        rust.BridgePokeStrength.suppressed => InterruptionLevel.active,
        rust.BridgePokeStrength.suppressedOverflow => InterruptionLevel.passive,
      },
    );
  }
  LinuxNotificationDetails _linuxDetails(rust.BridgePokeStrength strength) {
    return LinuxNotificationDetails(
      // TODO(event-sounds): handled by future EventSoundService, not the OS channel.
      suppressSound: true,
      urgency: switch (strength) {
        rust.BridgePokeStrength.strong => LinuxNotificationUrgency.critical,
        rust.BridgePokeStrength.suppressed => LinuxNotificationUrgency.normal,
        rust.BridgePokeStrength.suppressedOverflow =>
          LinuxNotificationUrgency.low,
      },
    );
  }
  WindowsNotificationDetails _windowsDetails(rust.BridgePokeStrength strength) {
    return WindowsNotificationDetails(
      // TODO(event-sounds): handled by future EventSoundService, not the OS channel.
      audio: WindowsNotificationAudio.silent(),
      header: _windowsHeader,
      scenario: strength == rust.BridgePokeStrength.strong
          ? WindowsNotificationScenario.urgent
          : null,
      duration: strength == rust.BridgePokeStrength.strong
          ? WindowsNotificationDuration.long
          : WindowsNotificationDuration.short,
    );
  }
 }
@@ -1,58 +0,0 @@
 import 'package:flutter/foundation.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 class PokePreferencesService {
  static const _enabledKey = 'pokes.enabled';
  static const _mutedSendersKey = 'pokes.muted_senders';
  final ValueNotifier<bool> _pokesEnabled = ValueNotifier<bool>(true);
  final ValueNotifier<Set<BigInt>> _mutedSenders = ValueNotifier<Set<BigInt>>(
    const <BigInt>{},
  );
  ValueListenable<bool> get pokesEnabled => _pokesEnabled;
  ValueListenable<Set<BigInt>> get mutedSenders => _mutedSenders;
  Future<void> load() async {
    final prefs = await SharedPreferences.getInstance();
    _pokesEnabled.value = prefs.getBool(_enabledKey) ?? true;
    _mutedSenders.value = (prefs.getStringList(_mutedSendersKey) ?? const [])
        .map(BigInt.parse)
        .toSet();
  }
  Future<void> setPokesEnabled(bool enabled) async {
    _pokesEnabled.value = enabled;
    final prefs = await SharedPreferences.getInstance();
    await prefs.setBool(_enabledKey, enabled);
  }
  Future<void> muteSender(BigInt senderId) async {
    if (_mutedSenders.value.contains(senderId)) return;
    _mutedSenders.value = {..._mutedSenders.value, senderId};
    await _saveMutedSenders();
  }
  Future<void> unmuteSender(BigInt senderId) async {
    if (!_mutedSenders.value.contains(senderId)) return;
    _mutedSenders.value = _mutedSenders.value
        .where((mutedSender) => mutedSender != senderId)
        .toSet();
    await _saveMutedSenders();
  }
  bool isMuted(BigInt senderId) => _mutedSenders.value.contains(senderId);
  Future<void> _saveMutedSenders() async {
    final prefs = await SharedPreferences.getInstance();
    await prefs.setStringList(
      _mutedSendersKey,
      _mutedSenders.value.map((senderId) => senderId.toString()).toList(),
    );
  }
  void dispose() {
    _pokesEnabled.dispose();
    _mutedSenders.dispose();
  }
 }
@@ -1,36 +0,0 @@
 typedef VoiceJoinCallback = Future<void> Function({
  required BigInt channelId,
  required String password,
 });
 typedef IosVoiceSessionActivation = Future<void> Function();
 typedef IosVoiceSessionDeactivation = Future<void> Function();
 /// Predicate used to recognise `voiceJoin` errors that the caller treats as a
 /// successful join outcome (e.g. the server replied "already in channel").
 ///
 /// When this returns `true` for a thrown error, the iOS audio session is kept
 /// active because the user is still considered joined to the channel. The
 /// error is still rethrown so the caller can run its success-on-already-joined
 /// branch and update local state.
 typedef VoiceJoinSuccessPredicate = bool Function(Object error);
 Future<void> joinVoiceChannelWithIosAudioSession({
  required BigInt channelId,
  required String password,
  required VoiceJoinCallback voiceJoin,
  required IosVoiceSessionActivation activateIosAudioSession,
  required IosVoiceSessionDeactivation deactivateIosAudioSession,
  VoiceJoinSuccessPredicate? isJoinSuccess,
 }) async {
  await activateIosAudioSession();
  try {
    await voiceJoin(channelId: channelId, password: password);
  } catch (e) {
    if (isJoinSuccess != null && isJoinSuccess(e)) {
      rethrow;
    }
    await deactivateIosAudioSession();
    rethrow;
  }
 }
@@ -11,7 +11,7 @@ part 'api.freezed.dart';
 // These functions are ignored because they are not marked as `pub`: `dispatch_platform_audio_event`, `install_panic_diagnostic_hook`, `log_file_path`, `log_sink`, `map_join_error_code`, `map_join_sync_state`, `open_log_file`, `permission_events`, `platform_audio_events`, `process`, `publish_permission_state`, `runtime`, `session`, `task_join_error`, `transmit_mode_from_u8`
 // These types are ignored because they are neither used by any `pub` functions nor (for structs and enums) marked `#[frb(unignore)]`: `PlatformAudioEvent`
-// These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `eq`, `eq`, `eq`, `eq`, `eq`, `eq`, `eq`, `eq`, `eq`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`
+// These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `eq`, `eq`, `eq`, `eq`, `eq`, `eq`, `eq`, `eq`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`
 // These functions are ignored (category: IgnoreBecauseExplicitAttribute): `from_kotlin_str`, `to_permission_gate`
 /// Return the platform-conventional log-file path as a string, or
@@ -226,29 +226,6 @@ String exportDiagnostics() => RustLib.instance.api.crateApiExportDiagnostics();
 Future<void> initStorage({required String dir}) =>
    RustLib.instance.api.crateApiInitStorage(dir: dir);
 /// Configure the bridge blob cache root.
 Future<void> initCache({required String dir}) =>
    RustLib.instance.api.crateApiInitCache(dir: dir);
 /// Resolve avatar bytes through the bridge.
 Future<Uint8List?> downloadAvatar({
  required String avatarHash,
  required String clientUid,
 }) => RustLib.instance.api.crateApiDownloadAvatar(
  avatarHash: avatarHash,
  clientUid: clientUid,
 );
 /// Resolve icon bytes through the bridge.
 Future<Uint8List?> downloadIcon({required BigInt iconId}) =>
    RustLib.instance.api.crateApiDownloadIcon(iconId: iconId);
 /// Purge cached protocol-owned assets.
 Future<void> clearFileCache() => RustLib.instance.api.crateApiClearFileCache();
 /// Report the configured file-cache size.
 Future<BigInt> fileCacheSize() => RustLib.instance.api.crateApiFileCacheSize();
 /// List persisted bookmarks.
 Future<List<BridgeBookmark>> listBookmarks() =>
    RustLib.instance.api.crateApiListBookmarks();
@@ -284,13 +261,6 @@ Stream<BridgeEvent> eventsStream() =>
 Future<BridgeAudioStats> audioStats() =>
    RustLib.instance.api.crateApiAudioStats();
 /// Subscribe to real-time microphone input level at ~30 Hz.
 /// Values are dBFS (-120 = silence, 0 = clipping). The stream ends
 /// when the Dart subscriber cancels, the session is dropped, or
 /// the session becomes persistently unavailable.
 Stream<double> inputLevelStream() =>
    RustLib.instance.api.crateApiInputLevelStream();
 /// Apply the P1 audio-processing config.
 Future<void> setAudioProcessingConfig({
  required BridgeAudioProcessingConfig config,
@@ -711,22 +681,15 @@ class BridgeAudioStats {
  /// Current push-to-talk state.
  final bool pttActive;
  /// Current microphone input level in dBFS (-120.0 = silence, 0.0 = clipping).
  final double inputLevel;
  const BridgeAudioStats({
    required this.framesSent,
    required this.framesReceived,
    required this.pttActive,
    required this.inputLevel,
  });
  @override
  int get hashCode =>
-      framesSent.hashCode ^
+      framesSent.hashCode ^ framesReceived.hashCode ^ pttActive.hashCode;
      framesReceived.hashCode ^
      pttActive.hashCode ^
      inputLevel.hashCode;
  @override
  bool operator ==(Object other) =>
@@ -735,8 +698,7 @@ class BridgeAudioStats {
          runtimeType == other.runtimeType &&
          framesSent == other.framesSent &&
          framesReceived == other.framesReceived &&
-          pttActive == other.pttActive &&
+          pttActive == other.pttActive;
          inputLevel == other.inputLevel;
 }
 /// Bookmark DTO mirroring [`chanora_core::Bookmark`].
@@ -1233,9 +1195,6 @@ sealed class BridgeEvent with _$BridgeEvent {
    /// Target scope (server/channel/private/poke).
    required BridgeMessageTarget target,
    /// Poke notification strength, present only for poke messages.
    BridgePokeStrength? pokeStrength,
  }) = BridgeEvent_ChatMessage;
  /// Human-readable server activity surfaced from protocol bookkeeping events.
@@ -1246,124 +1205,59 @@ sealed class BridgeEvent with _$BridgeEvent {
  /// Audio route changed (speaker/earpiece/BT/wired).
  const factory BridgeEvent.audioRouteChanged({
    /// New audio output route.
    required BridgeAudioRoute route,
  }) = BridgeEvent_AudioRouteChanged;
  /// A client moved to a different channel.
  const factory BridgeEvent.clientMoved({
    /// Unique client identifier.
    required BigInt clientId,
    /// Destination channel.
    required BigInt newChannelId,
  }) = BridgeEvent_ClientMoved;
  /// A new client connected.
  const factory BridgeEvent.clientJoined({
    /// Unique client identifier.
    required BigInt clientId,
    /// Channel the client joined.
    required BigInt channelId,
    /// Display nickname.
    required String name,
    /// Microphone muted state.
    required bool inputMuted,
    /// Speaker muted state.
    required bool outputMuted,
    /// True for server query (bot) clients.
    required bool isServerQuery,
    /// Client's talk power value.
    required int talkPower,
    /// Whether the server granted temporary talk power.
    required bool talkPowerGranted,
  }) = BridgeEvent_ClientJoined;
  /// A client disconnected.
  const factory BridgeEvent.clientLeft({
    /// Unique client identifier.
    required BigInt clientId,
    /// Display nickname at time of disconnect.
    required String name,
  }) = BridgeEvent_ClientLeft;
  /// Client properties changed.
  const factory BridgeEvent.clientUpdated({
    /// Unique client identifier.
    required BigInt clientId,
    /// Microphone muted state.
    required bool inputMuted,
    /// Speaker muted state.
    required bool outputMuted,
    /// True for server query (bot) clients.
    required bool isServerQuery,
    /// Client's talk power value.
    required int talkPower,
    /// Whether the server granted temporary talk power.
    required bool talkPowerGranted,
  }) = BridgeEvent_ClientUpdated;
  /// A new channel appeared.
  const factory BridgeEvent.channelAdded({
    /// Unique channel identifier.
    required BigInt id,
    /// Parent channel ID.
    required BigInt parent,
    /// Channel name.
    required String name,
    /// Predecessor channel ID within the same parent (TeamSpeak
    /// linked-list ordering hint). Zero means first child.
    required PlatformInt64 order,
    /// Whether the channel requires a password.
    required bool hasPassword,
    /// Talk power required to speak; `None` means no restriction.
    int? neededTalkPower,
  }) = BridgeEvent_ChannelAdded;
-
+  const factory BridgeEvent.channelRemoved({required BigInt id}) =
-  /// A channel was deleted.
+      BridgeEvent_ChannelRemoved;
  const factory BridgeEvent.channelRemoved({
    /// Channel identifier.
    required BigInt id,
  }) = BridgeEvent_ChannelRemoved;
  /// Channel properties changed.
  const factory BridgeEvent.channelUpdated({
    /// Unique channel identifier.
    required BigInt id,
    /// Channel name.
    required String name,
    /// Whether the channel requires a password.
    required bool hasPassword,
    /// Talk power required to speak; `None` means no restriction.
    int? neededTalkPower,
  }) = BridgeEvent_ChannelUpdated;
 }
 /// Bridge iOS voice-processing mode.
 enum BridgeIosVoiceProcessingMode {
-  /// Apple VoiceProcessingIO path.
+  /// Shipping VPIO path.
  platformVoiceProcessing,
  /// Experimental Sonora path.
  sonoraExperimental,
 }
@freezed
@@ -1398,18 +1292,6 @@ enum BridgeNetworkState {
  offline,
 }
 /// Bridge poke notification strength.
 enum BridgePokeStrength {
  /// Poke should be surfaced at full strength.
  strong,
  /// Poke is rate-limited but below overflow severity.
  suppressed,
  /// Poke remains suppressed after repeated suppressed pokes.
  suppressedOverflow,
 }
 /// Persisted PTT binding display state for the UI.
 class BridgePttBinding {
  /// Stable input category string (`""`, `"keyboard"`, or
@@ -173,7 +173,7 @@ return channelUpdated(_that);case _:
 /// }
 /// ```
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>({TResult Function( String serverName)?  connected,TResult Function( String reason)?  lost,TResult Function( int attempt,  int delaySecs)?  reconnecting,TResult Function( String reason)?  disconnected,TResult Function()?  audioStarted,TResult Function()?  audioStopped,TResult Function( String level,  String backendId,  String boundInputClass)?  pttCapability,TResult Function( bool inChannel,  BridgeTransmitMode transmitMode,  bool mute,  int releaseTailMs,  BigInt? currentChannelId,  BigInt? pendingTargetChannelId,  bool canJoin,  bool canLeave,  BridgeVoiceJoinSyncState joinSyncState,  BridgeVoiceJoinErrorCode? joinErrorCode)?  voiceState,TResult Function( bool began,  bool shouldResume)?  interruptionState,TResult Function( String permission,  PermissionStateKind state)?  permissionState,TResult Function( BigInt senderId,  String senderName,  String message,  BridgeMessageTarget target,  BridgePokeStrength? pokeStrength)?  chatMessage,TResult Function( String message)?  serverActivity,TResult Function( BridgeAudioRoute route)?  audioRouteChanged,TResult Function( BigInt clientId,  BigInt newChannelId)?  clientMoved,TResult Function( BigInt clientId,  BigInt channelId,  String name,  bool inputMuted,  bool outputMuted,  bool isServerQuery,  int talkPower,  bool talkPowerGranted)?  clientJoined,TResult Function( BigInt clientId,  String name)?  clientLeft,TResult Function( BigInt clientId,  bool inputMuted,  bool outputMuted,  bool isServerQuery,  int talkPower,  bool talkPowerGranted)?  clientUpdated,TResult Function( BigInt id,  BigInt parent,  String name,  PlatformInt64 order,  bool hasPassword,  int? neededTalkPower)?  channelAdded,TResult Function( BigInt id)?  channelRemoved,TResult Function( BigInt id,  String name,  bool hasPassword,  int? neededTalkPower)?  channelUpdated,required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>({TResult Function( String serverName)?  connected,TResult Function( String reason)?  lost,TResult Function( int attempt,  int delaySecs)?  reconnecting,TResult Function( String reason)?  disconnected,TResult Function()?  audioStarted,TResult Function()?  audioStopped,TResult Function( String level,  String backendId,  String boundInputClass)?  pttCapability,TResult Function( bool inChannel,  BridgeTransmitMode transmitMode,  bool mute,  int releaseTailMs,  BigInt? currentChannelId,  BigInt? pendingTargetChannelId,  bool canJoin,  bool canLeave,  BridgeVoiceJoinSyncState joinSyncState,  BridgeVoiceJoinErrorCode? joinErrorCode)?  voiceState,TResult Function( bool began,  bool shouldResume)?  interruptionState,TResult Function( String permission,  PermissionStateKind state)?  permissionState,TResult Function( BigInt senderId,  String senderName,  String message,  BridgeMessageTarget target)?  chatMessage,TResult Function( String message)?  serverActivity,TResult Function( BridgeAudioRoute route)?  audioRouteChanged,TResult Function( BigInt clientId,  BigInt newChannelId)?  clientMoved,TResult Function( BigInt clientId,  BigInt channelId,  String name,  bool inputMuted,  bool outputMuted,  bool isServerQuery,  int talkPower,  bool talkPowerGranted)?  clientJoined,TResult Function( BigInt clientId,  String name)?  clientLeft,TResult Function( BigInt clientId,  bool inputMuted,  bool outputMuted,  bool isServerQuery,  int talkPower,  bool talkPowerGranted)?  clientUpdated,TResult Function( BigInt id,  BigInt parent,  String name,  PlatformInt64 order,  bool hasPassword,  int? neededTalkPower)?  channelAdded,TResult Function( BigInt id)?  channelRemoved,TResult Function( BigInt id,  String name,  bool hasPassword,  int? neededTalkPower)?  channelUpdated,required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case BridgeEvent_Connected() when connected != null:
 return connected(_that.serverName);case BridgeEvent_Lost() when lost != null:
@@ -186,7 +186,7 @@ return pttCapability(_that.level,_that.backendId,_that.boundInputClass);case Bri
 return voiceState(_that.inChannel,_that.transmitMode,_that.mute,_that.releaseTailMs,_that.currentChannelId,_that.pendingTargetChannelId,_that.canJoin,_that.canLeave,_that.joinSyncState,_that.joinErrorCode);case BridgeEvent_InterruptionState() when interruptionState != null:
 return interruptionState(_that.began,_that.shouldResume);case BridgeEvent_PermissionState() when permissionState != null:
 return permissionState(_that.permission,_that.state);case BridgeEvent_ChatMessage() when chatMessage != null:
-return chatMessage(_that.senderId,_that.senderName,_that.message,_that.target,_that.pokeStrength);case BridgeEvent_ServerActivity() when serverActivity != null:
+return chatMessage(_that.senderId,_that.senderName,_that.message,_that.target);case BridgeEvent_ServerActivity() when serverActivity != null:
 return serverActivity(_that.message);case BridgeEvent_AudioRouteChanged() when audioRouteChanged != null:
 return audioRouteChanged(_that.route);case BridgeEvent_ClientMoved() when clientMoved != null:
 return clientMoved(_that.clientId,_that.newChannelId);case BridgeEvent_ClientJoined() when clientJoined != null:
@@ -213,7 +213,7 @@ return channelUpdated(_that.id,_that.name,_that.hasPassword,_that.neededTalkPowe
 /// }
 /// ```
-@optionalTypeArgs TResult when<TResult extends Object?>({required TResult Function( String serverName)  connected,required TResult Function( String reason)  lost,required TResult Function( int attempt,  int delaySecs)  reconnecting,required TResult Function( String reason)  disconnected,required TResult Function()  audioStarted,required TResult Function()  audioStopped,required TResult Function( String level,  String backendId,  String boundInputClass)  pttCapability,required TResult Function( bool inChannel,  BridgeTransmitMode transmitMode,  bool mute,  int releaseTailMs,  BigInt? currentChannelId,  BigInt? pendingTargetChannelId,  bool canJoin,  bool canLeave,  BridgeVoiceJoinSyncState joinSyncState,  BridgeVoiceJoinErrorCode? joinErrorCode)  voiceState,required TResult Function( bool began,  bool shouldResume)  interruptionState,required TResult Function( String permission,  PermissionStateKind state)  permissionState,required TResult Function( BigInt senderId,  String senderName,  String message,  BridgeMessageTarget target,  BridgePokeStrength? pokeStrength)  chatMessage,required TResult Function( String message)  serverActivity,required TResult Function( BridgeAudioRoute route)  audioRouteChanged,required TResult Function( BigInt clientId,  BigInt newChannelId)  clientMoved,required TResult Function( BigInt clientId,  BigInt channelId,  String name,  bool inputMuted,  bool outputMuted,  bool isServerQuery,  int talkPower,  bool talkPowerGranted)  clientJoined,required TResult Function( BigInt clientId,  String name)  clientLeft,required TResult Function( BigInt clientId,  bool inputMuted,  bool outputMuted,  bool isServerQuery,  int talkPower,  bool talkPowerGranted)  clientUpdated,required TResult Function( BigInt id,  BigInt parent,  String name,  PlatformInt64 order,  bool hasPassword,  int? neededTalkPower)  channelAdded,required TResult Function( BigInt id)  channelRemoved,required TResult Function( BigInt id,  String name,  bool hasPassword,  int? neededTalkPower)  channelUpdated,}) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>({required TResult Function( String serverName)  connected,required TResult Function( String reason)  lost,required TResult Function( int attempt,  int delaySecs)  reconnecting,required TResult Function( String reason)  disconnected,required TResult Function()  audioStarted,required TResult Function()  audioStopped,required TResult Function( String level,  String backendId,  String boundInputClass)  pttCapability,required TResult Function( bool inChannel,  BridgeTransmitMode transmitMode,  bool mute,  int releaseTailMs,  BigInt? currentChannelId,  BigInt? pendingTargetChannelId,  bool canJoin,  bool canLeave,  BridgeVoiceJoinSyncState joinSyncState,  BridgeVoiceJoinErrorCode? joinErrorCode)  voiceState,required TResult Function( bool began,  bool shouldResume)  interruptionState,required TResult Function( String permission,  PermissionStateKind state)  permissionState,required TResult Function( BigInt senderId,  String senderName,  String message,  BridgeMessageTarget target)  chatMessage,required TResult Function( String message)  serverActivity,required TResult Function( BridgeAudioRoute route)  audioRouteChanged,required TResult Function( BigInt clientId,  BigInt newChannelId)  clientMoved,required TResult Function( BigInt clientId,  BigInt channelId,  String name,  bool inputMuted,  bool outputMuted,  bool isServerQuery,  int talkPower,  bool talkPowerGranted)  clientJoined,required TResult Function( BigInt clientId,  String name)  clientLeft,required TResult Function( BigInt clientId,  bool inputMuted,  bool outputMuted,  bool isServerQuery,  int talkPower,  bool talkPowerGranted)  clientUpdated,required TResult Function( BigInt id,  BigInt parent,  String name,  PlatformInt64 order,  bool hasPassword,  int? neededTalkPower)  channelAdded,required TResult Function( BigInt id)  channelRemoved,required TResult Function( BigInt id,  String name,  bool hasPassword,  int? neededTalkPower)  channelUpdated,}) {final _that = this;
 switch (_that) {
 case BridgeEvent_Connected():
 return connected(_that.serverName);case BridgeEvent_Lost():
@@ -226,7 +226,7 @@ return pttCapability(_that.level,_that.backendId,_that.boundInputClass);case Bri
 return voiceState(_that.inChannel,_that.transmitMode,_that.mute,_that.releaseTailMs,_that.currentChannelId,_that.pendingTargetChannelId,_that.canJoin,_that.canLeave,_that.joinSyncState,_that.joinErrorCode);case BridgeEvent_InterruptionState():
 return interruptionState(_that.began,_that.shouldResume);case BridgeEvent_PermissionState():
 return permissionState(_that.permission,_that.state);case BridgeEvent_ChatMessage():
-return chatMessage(_that.senderId,_that.senderName,_that.message,_that.target,_that.pokeStrength);case BridgeEvent_ServerActivity():
+return chatMessage(_that.senderId,_that.senderName,_that.message,_that.target);case BridgeEvent_ServerActivity():
 return serverActivity(_that.message);case BridgeEvent_AudioRouteChanged():
 return audioRouteChanged(_that.route);case BridgeEvent_ClientMoved():
 return clientMoved(_that.clientId,_that.newChannelId);case BridgeEvent_ClientJoined():
@@ -249,7 +249,7 @@ return channelUpdated(_that.id,_that.name,_that.hasPassword,_that.neededTalkPowe
 /// }
 /// ```
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>({TResult? Function( String serverName)?  connected,TResult? Function( String reason)?  lost,TResult? Function( int attempt,  int delaySecs)?  reconnecting,TResult? Function( String reason)?  disconnected,TResult? Function()?  audioStarted,TResult? Function()?  audioStopped,TResult? Function( String level,  String backendId,  String boundInputClass)?  pttCapability,TResult? Function( bool inChannel,  BridgeTransmitMode transmitMode,  bool mute,  int releaseTailMs,  BigInt? currentChannelId,  BigInt? pendingTargetChannelId,  bool canJoin,  bool canLeave,  BridgeVoiceJoinSyncState joinSyncState,  BridgeVoiceJoinErrorCode? joinErrorCode)?  voiceState,TResult? Function( bool began,  bool shouldResume)?  interruptionState,TResult? Function( String permission,  PermissionStateKind state)?  permissionState,TResult? Function( BigInt senderId,  String senderName,  String message,  BridgeMessageTarget target,  BridgePokeStrength? pokeStrength)?  chatMessage,TResult? Function( String message)?  serverActivity,TResult? Function( BridgeAudioRoute route)?  audioRouteChanged,TResult? Function( BigInt clientId,  BigInt newChannelId)?  clientMoved,TResult? Function( BigInt clientId,  BigInt channelId,  String name,  bool inputMuted,  bool outputMuted,  bool isServerQuery,  int talkPower,  bool talkPowerGranted)?  clientJoined,TResult? Function( BigInt clientId,  String name)?  clientLeft,TResult? Function( BigInt clientId,  bool inputMuted,  bool outputMuted,  bool isServerQuery,  int talkPower,  bool talkPowerGranted)?  clientUpdated,TResult? Function( BigInt id,  BigInt parent,  String name,  PlatformInt64 order,  bool hasPassword,  int? neededTalkPower)?  channelAdded,TResult? Function( BigInt id)?  channelRemoved,TResult? Function( BigInt id,  String name,  bool hasPassword,  int? neededTalkPower)?  channelUpdated,}) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>({TResult? Function( String serverName)?  connected,TResult? Function( String reason)?  lost,TResult? Function( int attempt,  int delaySecs)?  reconnecting,TResult? Function( String reason)?  disconnected,TResult? Function()?  audioStarted,TResult? Function()?  audioStopped,TResult? Function( String level,  String backendId,  String boundInputClass)?  pttCapability,TResult? Function( bool inChannel,  BridgeTransmitMode transmitMode,  bool mute,  int releaseTailMs,  BigInt? currentChannelId,  BigInt? pendingTargetChannelId,  bool canJoin,  bool canLeave,  BridgeVoiceJoinSyncState joinSyncState,  BridgeVoiceJoinErrorCode? joinErrorCode)?  voiceState,TResult? Function( bool began,  bool shouldResume)?  interruptionState,TResult? Function( String permission,  PermissionStateKind state)?  permissionState,TResult? Function( BigInt senderId,  String senderName,  String message,  BridgeMessageTarget target)?  chatMessage,TResult? Function( String message)?  serverActivity,TResult? Function( BridgeAudioRoute route)?  audioRouteChanged,TResult? Function( BigInt clientId,  BigInt newChannelId)?  clientMoved,TResult? Function( BigInt clientId,  BigInt channelId,  String name,  bool inputMuted,  bool outputMuted,  bool isServerQuery,  int talkPower,  bool talkPowerGranted)?  clientJoined,TResult? Function( BigInt clientId,  String name)?  clientLeft,TResult? Function( BigInt clientId,  bool inputMuted,  bool outputMuted,  bool isServerQuery,  int talkPower,  bool talkPowerGranted)?  clientUpdated,TResult? Function( BigInt id,  BigInt parent,  String name,  PlatformInt64 order,  bool hasPassword,  int? neededTalkPower)?  channelAdded,TResult? Function( BigInt id)?  channelRemoved,TResult? Function( BigInt id,  String name,  bool hasPassword,  int? neededTalkPower)?  channelUpdated,}) {final _that = this;
 switch (_that) {
 case BridgeEvent_Connected() when connected != null:
 return connected(_that.serverName);case BridgeEvent_Lost() when lost != null:
@@ -262,7 +262,7 @@ return pttCapability(_that.level,_that.backendId,_that.boundInputClass);case Bri
 return voiceState(_that.inChannel,_that.transmitMode,_that.mute,_that.releaseTailMs,_that.currentChannelId,_that.pendingTargetChannelId,_that.canJoin,_that.canLeave,_that.joinSyncState,_that.joinErrorCode);case BridgeEvent_InterruptionState() when interruptionState != null:
 return interruptionState(_that.began,_that.shouldResume);case BridgeEvent_PermissionState() when permissionState != null:
 return permissionState(_that.permission,_that.state);case BridgeEvent_ChatMessage() when chatMessage != null:
-return chatMessage(_that.senderId,_that.senderName,_that.message,_that.target,_that.pokeStrength);case BridgeEvent_ServerActivity() when serverActivity != null:
+return chatMessage(_that.senderId,_that.senderName,_that.message,_that.target);case BridgeEvent_ServerActivity() when serverActivity != null:
 return serverActivity(_that.message);case BridgeEvent_AudioRouteChanged() when audioRouteChanged != null:
 return audioRouteChanged(_that.route);case BridgeEvent_ClientMoved() when clientMoved != null:
 return clientMoved(_that.clientId,_that.newChannelId);case BridgeEvent_ClientJoined() when clientJoined != null:
@@ -929,7 +929,7 @@ as PermissionStateKind,
 class BridgeEvent_ChatMessage extends BridgeEvent {
-  const BridgeEvent_ChatMessage({required this.senderId, required this.senderName, required this.message, required this.target, this.pokeStrength}): super._();
+  const BridgeEvent_ChatMessage({required this.senderId, required this.senderName, required this.message, required this.target}): super._();
 /// Client id of the sender.
@@ -940,8 +940,6 @@ class BridgeEvent_ChatMessage extends BridgeEvent {
 final  String message;
 /// Target scope (server/channel/private/poke).
 final  BridgeMessageTarget target;
 /// Poke notification strength, present only for poke messages.
 final  BridgePokeStrength? pokeStrength;
 /// Create a copy of BridgeEvent
 /// with the given fields replaced by the non-null parameter values.
@@ -953,16 +951,16 @@ $BridgeEvent_ChatMessageCopyWith<BridgeEvent_ChatMessage> get copyWith => _$Brid
@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is BridgeEvent_ChatMessage&&(identical(other.senderId, senderId) || other.senderId == senderId)&&(identical(other.senderName, senderName) || other.senderName == senderName)&&(identical(other.message, message) || other.message == message)&&(identical(other.target, target) || other.target == target)&&(identical(other.pokeStrength, pokeStrength) || other.pokeStrength == pokeStrength));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is BridgeEvent_ChatMessage&&(identical(other.senderId, senderId) || other.senderId == senderId)&&(identical(other.senderName, senderName) || other.senderName == senderName)&&(identical(other.message, message) || other.message == message)&&(identical(other.target, target) || other.target == target));
 }
@override
-int get hashCode => Object.hash(runtimeType,senderId,senderName,message,target,pokeStrength);
+int get hashCode => Object.hash(runtimeType,senderId,senderName,message,target);
@override
 String toString() {
-  return 'BridgeEvent.chatMessage(senderId: $senderId, senderName: $senderName, message: $message, target: $target, pokeStrength: $pokeStrength)';
+  return 'BridgeEvent.chatMessage(senderId: $senderId, senderName: $senderName, message: $message, target: $target)';
 }
@@ -973,7 +971,7 @@ abstract mixin class $BridgeEvent_ChatMessageCopyWith<$Res> implements $BridgeEv
  factory $BridgeEvent_ChatMessageCopyWith(BridgeEvent_ChatMessage value, $Res Function(BridgeEvent_ChatMessage) _then) = _$BridgeEvent_ChatMessageCopyWithImpl;
@useResult
 $Res call({
- BigInt senderId, String senderName, String message, BridgeMessageTarget target, BridgePokeStrength? pokeStrength
+ BigInt senderId, String senderName, String message, BridgeMessageTarget target
 });
@@ -990,14 +988,13 @@ class _$BridgeEvent_ChatMessageCopyWithImpl<$Res>
 /// Create a copy of BridgeEvent
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') $Res call({Object? senderId = null,Object? senderName = null,Object? message = null,Object? target = null,Object? pokeStrength = freezed,}) {
+@pragma('vm:prefer-inline') $Res call({Object? senderId = null,Object? senderName = null,Object? message = null,Object? target = null,}) {
  return _then(BridgeEvent_ChatMessage(
 senderId: null == senderId ? _self.senderId : senderId // ignore: cast_nullable_to_non_nullable
 as BigInt,senderName: null == senderName ? _self.senderName : senderName // ignore: cast_nullable_to_non_nullable
 as String,message: null == message ? _self.message : message // ignore: cast_nullable_to_non_nullable
 as String,target: null == target ? _self.target : target // ignore: cast_nullable_to_non_nullable
-as BridgeMessageTarget,pokeStrength: freezed == pokeStrength ? _self.pokeStrength : pokeStrength // ignore: cast_nullable_to_non_nullable
+as BridgeMessageTarget,
 as BridgePokeStrength?,
  ));
 }
@@ -1087,7 +1084,6 @@ class BridgeEvent_AudioRouteChanged extends BridgeEvent {
  const BridgeEvent_AudioRouteChanged({required this.route}): super._();
 /// New audio output route.
 final  BridgeAudioRoute route;
 /// Create a copy of BridgeEvent
@@ -1154,9 +1150,7 @@ class BridgeEvent_ClientMoved extends BridgeEvent {
  const BridgeEvent_ClientMoved({required this.clientId, required this.newChannelId}): super._();
 /// Unique client identifier.
 final  BigInt clientId;
 /// Destination channel.
 final  BigInt newChannelId;
 /// Create a copy of BridgeEvent
@@ -1224,21 +1218,13 @@ class BridgeEvent_ClientJoined extends BridgeEvent {
  const BridgeEvent_ClientJoined({required this.clientId, required this.channelId, required this.name, required this.inputMuted, required this.outputMuted, required this.isServerQuery, required this.talkPower, required this.talkPowerGranted}): super._();
 /// Unique client identifier.
 final  BigInt clientId;
 /// Channel the client joined.
 final  BigInt channelId;
 /// Display nickname.
 final  String name;
 /// Microphone muted state.
 final  bool inputMuted;
 /// Speaker muted state.
 final  bool outputMuted;
 /// True for server query (bot) clients.
 final  bool isServerQuery;
 /// Client's talk power value.
 final  int talkPower;
 /// Whether the server granted temporary talk power.
 final  bool talkPowerGranted;
 /// Create a copy of BridgeEvent
@@ -1312,9 +1298,7 @@ class BridgeEvent_ClientLeft extends BridgeEvent {
  const BridgeEvent_ClientLeft({required this.clientId, required this.name}): super._();
 /// Unique client identifier.
 final  BigInt clientId;
 /// Display nickname at time of disconnect.
 final  String name;
 /// Create a copy of BridgeEvent
@@ -1382,17 +1366,11 @@ class BridgeEvent_ClientUpdated extends BridgeEvent {
  const BridgeEvent_ClientUpdated({required this.clientId, required this.inputMuted, required this.outputMuted, required this.isServerQuery, required this.talkPower, required this.talkPowerGranted}): super._();
 /// Unique client identifier.
 final  BigInt clientId;
 /// Microphone muted state.
 final  bool inputMuted;
 /// Speaker muted state.
 final  bool outputMuted;
 /// True for server query (bot) clients.
 final  bool isServerQuery;
 /// Client's talk power value.
 final  int talkPower;
 /// Whether the server granted temporary talk power.
 final  bool talkPowerGranted;
 /// Create a copy of BridgeEvent
@@ -1464,18 +1442,11 @@ class BridgeEvent_ChannelAdded extends BridgeEvent {
  const BridgeEvent_ChannelAdded({required this.id, required this.parent, required this.name, required this.order, required this.hasPassword, this.neededTalkPower}): super._();
 /// Unique channel identifier.
 final  BigInt id;
 /// Parent channel ID.
 final  BigInt parent;
 /// Channel name.
 final  String name;
 /// Predecessor channel ID within the same parent (TeamSpeak
 /// linked-list ordering hint). Zero means first child.
 final  PlatformInt64 order;
 /// Whether the channel requires a password.
 final  bool hasPassword;
 /// Talk power required to speak; `None` means no restriction.
 final  int? neededTalkPower;
 /// Create a copy of BridgeEvent
@@ -1547,7 +1518,6 @@ class BridgeEvent_ChannelRemoved extends BridgeEvent {
  const BridgeEvent_ChannelRemoved({required this.id}): super._();
 /// Channel identifier.
 final  BigInt id;
 /// Create a copy of BridgeEvent
@@ -1614,13 +1584,9 @@ class BridgeEvent_ChannelUpdated extends BridgeEvent {
  const BridgeEvent_ChannelUpdated({required this.id, required this.name, required this.hasPassword, this.neededTalkPower}): super._();
 /// Unique channel identifier.
 final  BigInt id;
 /// Channel name.
 final  String name;
 /// Whether the channel requires a password.
 final  bool hasPassword;
 /// Talk power required to speak; `None` means no restriction.
 final  int? neededTalkPower;
 /// Create a copy of BridgeEvent
@@ -67,7 +67,7 @@ class RustLib extends BaseEntrypoint<RustLibApi, RustLibApiImpl, RustLibWire> {
  String get codegenVersion => '2.12.0';
  @override
-  int get rustContentHash => 635684021;
+  int get rustContentHash => 281698435;
  static const kDefaultExternalLibraryLoaderConfig =
      ExternalLibraryLoaderConfig(
@@ -87,8 +87,6 @@ abstract class RustLibApi extends BaseApi {
  Future<void> crateApiBridgeInit();
  Future<void> crateApiClearFileCache();
  Future<BridgeClientProfile> crateApiClientProfile({required BigInt clientId});
  Future<BridgeSnapshot> crateApiConnect({
@@ -101,21 +99,12 @@ abstract class RustLibApi extends BaseApi {
  Future<void> crateApiDisconnect();
  Future<Uint8List?> crateApiDownloadAvatar({
    required String avatarHash,
    required String clientUid,
  });
  Future<Uint8List?> crateApiDownloadIcon({required BigInt iconId});
  Future<void> crateApiEnableAudioDebugWavDump({required bool enabled});
  Stream<BridgeEvent> crateApiEventsStream();
  String crateApiExportDiagnostics();
  Future<BigInt> crateApiFileCacheSize();
  Future<BridgeAudioProcessingConfig> crateApiGetAudioProcessingConfig();
  Future<BridgePttBinding> crateApiGetPttBinding();
@@ -132,12 +121,8 @@ abstract class RustLibApi extends BaseApi {
  void crateApiHandleRouteChange({required BridgeAudioRoute route});
  Future<void> crateApiInitCache({required String dir});
  Future<void> crateApiInitStorage({required String dir});
  Stream<double> crateApiInputLevelStream();
  Future<bool> crateApiIsConnected();
  Future<BridgeAudioDeviceList> crateApiListAudioDevices();
@@ -333,33 +318,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
  TaskConstMeta get kCrateApiBridgeInitConstMeta =>
      const TaskConstMeta(debugName: "bridge_init", argNames: []);
  @override
  Future<void> crateApiClearFileCache() {
    return handler.executeNormal(
      NormalTask(
        callFfi: (port_) {
          final serializer = SseSerializer(generalizedFrbRustBinding);
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
            funcId: 5,
            port: port_,
          );
        },
        codec: SseCodec(
          decodeSuccessData: sse_decode_unit,
          decodeErrorData: sse_decode_bridge_error,
        ),
        constMeta: kCrateApiClearFileCacheConstMeta,
        argValues: [],
        apiImpl: this,
      ),
    );
  }
  TaskConstMeta get kCrateApiClearFileCacheConstMeta =>
      const TaskConstMeta(debugName: "clear_file_cache", argNames: []);
  @override
  Future<BridgeClientProfile> crateApiClientProfile({
    required BigInt clientId,
@@ -372,7 +330,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 6,
+            funcId: 5,
            port: port_,
          );
        },
@@ -406,7 +364,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 7,
+            funcId: 6,
            port: port_,
          );
        },
@@ -436,7 +394,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 8,
+            funcId: 7,
            port: port_,
          );
        },
@@ -463,7 +421,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 9,
+            funcId: 8,
            port: port_,
          );
        },
@@ -481,68 +439,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
  TaskConstMeta get kCrateApiDisconnectConstMeta =>
      const TaskConstMeta(debugName: "disconnect", argNames: []);
  @override
  Future<Uint8List?> crateApiDownloadAvatar({
    required String avatarHash,
    required String clientUid,
  }) {
    return handler.executeNormal(
      NormalTask(
        callFfi: (port_) {
          final serializer = SseSerializer(generalizedFrbRustBinding);
          sse_encode_String(avatarHash, serializer);
          sse_encode_String(clientUid, serializer);
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
            funcId: 10,
            port: port_,
          );
        },
        codec: SseCodec(
          decodeSuccessData: sse_decode_opt_list_prim_u_8_strict,
          decodeErrorData: sse_decode_bridge_error,
        ),
        constMeta: kCrateApiDownloadAvatarConstMeta,
        argValues: [avatarHash, clientUid],
        apiImpl: this,
      ),
    );
  }
  TaskConstMeta get kCrateApiDownloadAvatarConstMeta => const TaskConstMeta(
    debugName: "download_avatar",
    argNames: ["avatarHash", "clientUid"],
  );
  @override
  Future<Uint8List?> crateApiDownloadIcon({required BigInt iconId}) {
    return handler.executeNormal(
      NormalTask(
        callFfi: (port_) {
          final serializer = SseSerializer(generalizedFrbRustBinding);
          sse_encode_u_64(iconId, serializer);
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
            funcId: 11,
            port: port_,
          );
        },
        codec: SseCodec(
          decodeSuccessData: sse_decode_opt_list_prim_u_8_strict,
          decodeErrorData: sse_decode_bridge_error,
        ),
        constMeta: kCrateApiDownloadIconConstMeta,
        argValues: [iconId],
        apiImpl: this,
      ),
    );
  }
  TaskConstMeta get kCrateApiDownloadIconConstMeta =>
      const TaskConstMeta(debugName: "download_icon", argNames: ["iconId"]);
  @override
  Future<void> crateApiEnableAudioDebugWavDump({required bool enabled}) {
    return handler.executeNormal(
@@ -553,7 +449,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 12,
+            funcId: 9,
            port: port_,
          );
        },
@@ -586,7 +482,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
            pdeCallFfi(
              generalizedFrbRustBinding,
              serializer,
-              funcId: 13,
+              funcId: 10,
              port: port_,
            );
          },
@@ -612,7 +508,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
      SyncTask(
        callFfi: () {
          final serializer = SseSerializer(generalizedFrbRustBinding);
-          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 14)!;
+          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 11)!;
        },
        codec: SseCodec(
          decodeSuccessData: sse_decode_String,
@@ -628,33 +524,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
  TaskConstMeta get kCrateApiExportDiagnosticsConstMeta =>
      const TaskConstMeta(debugName: "export_diagnostics", argNames: []);
  @override
  Future<BigInt> crateApiFileCacheSize() {
    return handler.executeNormal(
      NormalTask(
        callFfi: (port_) {
          final serializer = SseSerializer(generalizedFrbRustBinding);
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
            funcId: 15,
            port: port_,
          );
        },
        codec: SseCodec(
          decodeSuccessData: sse_decode_u_64,
          decodeErrorData: sse_decode_bridge_error,
        ),
        constMeta: kCrateApiFileCacheSizeConstMeta,
        argValues: [],
        apiImpl: this,
      ),
    );
  }
  TaskConstMeta get kCrateApiFileCacheSizeConstMeta =>
      const TaskConstMeta(debugName: "file_cache_size", argNames: []);
  @override
  Future<BridgeAudioProcessingConfig> crateApiGetAudioProcessingConfig() {
    return handler.executeNormal(
@@ -664,7 +533,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 16,
+            funcId: 12,
            port: port_,
          );
        },
@@ -694,7 +563,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 17,
+            funcId: 13,
            port: port_,
          );
        },
@@ -721,7 +590,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 18,
+            funcId: 14,
            port: port_,
          );
        },
@@ -748,7 +617,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 19,
+            funcId: 15,
            port: port_,
          );
        },
@@ -772,7 +641,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
      SyncTask(
        callFfi: () {
          final serializer = SseSerializer(generalizedFrbRustBinding);
-          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 20)!;
+          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 16)!;
        },
        codec: SseCodec(
          decodeSuccessData: sse_decode_unit,
@@ -795,7 +664,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
        callFfi: () {
          final serializer = SseSerializer(generalizedFrbRustBinding);
          sse_encode_bool(shouldResume, serializer);
-          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 21)!;
+          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 17)!;
        },
        codec: SseCodec(
          decodeSuccessData: sse_decode_unit,
@@ -821,7 +690,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
        callFfi: () {
          final serializer = SseSerializer(generalizedFrbRustBinding);
          sse_encode_String(routeClass, serializer);
-          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 22)!;
+          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 18)!;
        },
        codec: SseCodec(
          decodeSuccessData: sse_decode_unit,
@@ -847,7 +716,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
        callFfi: () {
          final serializer = SseSerializer(generalizedFrbRustBinding);
          sse_encode_bridge_audio_route(route, serializer);
-          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 23)!;
+          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 19)!;
        },
        codec: SseCodec(
          decodeSuccessData: sse_decode_unit,
@@ -865,34 +734,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    argNames: ["route"],
  );
  @override
  Future<void> crateApiInitCache({required String dir}) {
    return handler.executeNormal(
      NormalTask(
        callFfi: (port_) {
          final serializer = SseSerializer(generalizedFrbRustBinding);
          sse_encode_String(dir, serializer);
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
            funcId: 24,
            port: port_,
          );
        },
        codec: SseCodec(
          decodeSuccessData: sse_decode_unit,
          decodeErrorData: sse_decode_bridge_error,
        ),
        constMeta: kCrateApiInitCacheConstMeta,
        argValues: [dir],
        apiImpl: this,
      ),
    );
  }
  TaskConstMeta get kCrateApiInitCacheConstMeta =>
      const TaskConstMeta(debugName: "init_cache", argNames: ["dir"]);
  @override
  Future<void> crateApiInitStorage({required String dir}) {
    return handler.executeNormal(
@@ -903,7 +744,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 25,
+            funcId: 20,
            port: port_,
          );
        },
@@ -921,38 +762,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
  TaskConstMeta get kCrateApiInitStorageConstMeta =>
      const TaskConstMeta(debugName: "init_storage", argNames: ["dir"]);
  @override
  Stream<double> crateApiInputLevelStream() {
    final sink = RustStreamSink<double>();
    unawaited(
      handler.executeNormal(
        NormalTask(
          callFfi: (port_) {
            final serializer = SseSerializer(generalizedFrbRustBinding);
            sse_encode_StreamSink_f_32_Sse(sink, serializer);
            pdeCallFfi(
              generalizedFrbRustBinding,
              serializer,
              funcId: 26,
              port: port_,
            );
          },
          codec: SseCodec(
            decodeSuccessData: sse_decode_unit,
            decodeErrorData: sse_decode_bridge_error,
          ),
          constMeta: kCrateApiInputLevelStreamConstMeta,
          argValues: [sink],
          apiImpl: this,
        ),
      ),
    );
    return sink.stream;
  }
  TaskConstMeta get kCrateApiInputLevelStreamConstMeta =>
      const TaskConstMeta(debugName: "input_level_stream", argNames: ["sink"]);
  @override
  Future<bool> crateApiIsConnected() {
    return handler.executeNormal(
@@ -962,7 +771,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 27,
+            funcId: 21,
            port: port_,
          );
        },
@@ -989,7 +798,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 28,
+            funcId: 22,
            port: port_,
          );
        },
@@ -1016,7 +825,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 29,
+            funcId: 23,
            port: port_,
          );
        },
@@ -1040,7 +849,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
      SyncTask(
        callFfi: () {
          final serializer = SseSerializer(generalizedFrbRustBinding);
-          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 30)!;
+          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 24)!;
        },
        codec: SseCodec(
          decodeSuccessData: sse_decode_String,
@@ -1070,7 +879,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 31,
+            funcId: 25,
            port: port_,
          );
        },
@@ -1100,7 +909,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 32,
+            funcId: 26,
            port: port_,
          );
        },
@@ -1127,7 +936,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 33,
+            funcId: 27,
            port: port_,
          );
        },
@@ -1152,7 +961,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
        callFfi: () {
          final serializer = SseSerializer(generalizedFrbRustBinding);
          sse_encode_String(state, serializer);
-          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 34)!;
+          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 28)!;
        },
        codec: SseCodec(
          decodeSuccessData: sse_decode_unit,
@@ -1185,7 +994,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 35,
+            funcId: 29,
            port: port_,
          );
        },
@@ -1212,7 +1021,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
        callFfi: () {
          final serializer = SseSerializer(generalizedFrbRustBinding);
          sse_encode_bridge_audio_route(route, serializer);
-          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 36)!;
+          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 30)!;
        },
        codec: SseCodec(
          decodeSuccessData: sse_decode_unit,
@@ -1246,7 +1055,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 37,
+            funcId: 31,
            port: port_,
          );
        },
@@ -1281,7 +1090,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 38,
+            funcId: 32,
            port: port_,
          );
        },
@@ -1311,7 +1120,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 39,
+            funcId: 33,
            port: port_,
          );
        },
@@ -1339,7 +1148,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 40,
+            funcId: 34,
            port: port_,
          );
        },
@@ -1367,7 +1176,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 41,
+            funcId: 35,
            port: port_,
          );
        },
@@ -1397,7 +1206,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 42,
+            funcId: 36,
            port: port_,
          );
        },
@@ -1425,7 +1234,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
        callFfi: () {
          final serializer = SseSerializer(generalizedFrbRustBinding);
          sse_encode_bridge_network_state(state, serializer);
-          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 43)!;
+          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 37)!;
        },
        codec: SseCodec(
          decodeSuccessData: sse_decode_unit,
@@ -1451,7 +1260,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 44,
+            funcId: 38,
            port: port_,
          );
        },
@@ -1479,7 +1288,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 45,
+            funcId: 39,
            port: port_,
          );
        },
@@ -1507,7 +1316,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 46,
+            funcId: 40,
            port: port_,
          );
        },
@@ -1535,7 +1344,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 47,
+            funcId: 41,
            port: port_,
          );
        },
@@ -1567,7 +1376,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 48,
+            funcId: 42,
            port: port_,
          );
        },
@@ -1597,7 +1406,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 49,
+            funcId: 43,
            port: port_,
          );
        },
@@ -1625,7 +1434,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 50,
+            funcId: 44,
            port: port_,
          );
        },
@@ -1653,7 +1462,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 51,
+            funcId: 45,
            port: port_,
          );
        },
@@ -1680,7 +1489,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 52,
+            funcId: 46,
            port: port_,
          );
        },
@@ -1708,7 +1517,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 53,
+            funcId: 47,
            port: port_,
          );
        },
@@ -1740,7 +1549,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 54,
+            funcId: 48,
            port: port_,
          );
        },
@@ -1769,7 +1578,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 55,
+            funcId: 49,
            port: port_,
          );
        },
@@ -1801,12 +1610,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    throw UnimplementedError();
  }
  @protected
  RustStreamSink<double> dco_decode_StreamSink_f_32_Sse(dynamic raw) {
    // Codec=Dco (DartCObject based), see doc to use other codecs
    throw UnimplementedError();
  }
  @protected
  String dco_decode_String(dynamic raw) {
    // Codec=Dco (DartCObject based), see doc to use other codecs
@@ -1840,12 +1643,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    return dco_decode_bridge_message_target(raw);
  }
  @protected
  BridgePokeStrength dco_decode_box_autoadd_bridge_poke_strength(dynamic raw) {
    // Codec=Dco (DartCObject based), see doc to use other codecs
    return dco_decode_bridge_poke_strength(raw);
  }
  @protected
  BridgeVoiceJoinErrorCode dco_decode_box_autoadd_bridge_voice_join_error_code(
    dynamic raw,
@@ -1984,13 +1781,12 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
  BridgeAudioStats dco_decode_bridge_audio_stats(dynamic raw) {
    // Codec=Dco (DartCObject based), see doc to use other codecs
    final arr = raw as List<dynamic>;
-    if (arr.length != 4)
+    if (arr.length != 3)
-      throw Exception('unexpected arr length: expect 4 but see ${arr.length}');
+      throw Exception('unexpected arr length: expect 3 but see ${arr.length}');
    return BridgeAudioStats(
      framesSent: dco_decode_u_32(arr[0]),
      framesReceived: dco_decode_u_32(arr[1]),
      pttActive: dco_decode_bool(arr[2]),
      inputLevel: dco_decode_f_32(arr[3]),
    );
  }
@@ -2170,7 +1966,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          senderName: dco_decode_String(raw[2]),
          message: dco_decode_String(raw[3]),
          target: dco_decode_box_autoadd_bridge_message_target(raw[4]),
          pokeStrength: dco_decode_opt_box_autoadd_bridge_poke_strength(raw[5]),
        );
      case 11:
        return BridgeEvent_ServerActivity(message: dco_decode_String(raw[1]));
@@ -2262,12 +2057,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    return BridgeNetworkState.values[raw as int];
  }
  @protected
  BridgePokeStrength dco_decode_bridge_poke_strength(dynamic raw) {
    // Codec=Dco (DartCObject based), see doc to use other codecs
    return BridgePokeStrength.values[raw as int];
  }
  @protected
  BridgePttBinding dco_decode_bridge_ptt_binding(dynamic raw) {
    // Codec=Dco (DartCObject based), see doc to use other codecs
@@ -2404,16 +2193,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    return raw == null ? null : dco_decode_String(raw);
  }
  @protected
  BridgePokeStrength? dco_decode_opt_box_autoadd_bridge_poke_strength(
    dynamic raw,
  ) {
    // Codec=Dco (DartCObject based), see doc to use other codecs
    return raw == null
        ? null
        : dco_decode_box_autoadd_bridge_poke_strength(raw);
  }
  @protected
  BridgeVoiceJoinErrorCode?
  dco_decode_opt_box_autoadd_bridge_voice_join_error_code(dynamic raw) {
@@ -2447,12 +2226,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    return raw == null ? null : dco_decode_box_autoadd_u_64(raw);
  }
  @protected
  Uint8List? dco_decode_opt_list_prim_u_8_strict(dynamic raw) {
    // Codec=Dco (DartCObject based), see doc to use other codecs
    return raw == null ? null : dco_decode_list_prim_u_8_strict(raw);
  }
  @protected
  PermissionStateKind dco_decode_permission_state_kind(dynamic raw) {
    // Codec=Dco (DartCObject based), see doc to use other codecs
@@ -2498,14 +2271,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    throw UnimplementedError('Unreachable ()');
  }
  @protected
  RustStreamSink<double> sse_decode_StreamSink_f_32_Sse(
    SseDeserializer deserializer,
  ) {
    // Codec=Sse (Serialization based), see doc to use other codecs
    throw UnimplementedError('Unreachable ()');
  }
  @protected
  String sse_decode_String(SseDeserializer deserializer) {
    // Codec=Sse (Serialization based), see doc to use other codecs
@@ -2544,14 +2309,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    return (sse_decode_bridge_message_target(deserializer));
  }
  @protected
  BridgePokeStrength sse_decode_box_autoadd_bridge_poke_strength(
    SseDeserializer deserializer,
  ) {
    // Codec=Sse (Serialization based), see doc to use other codecs
    return (sse_decode_bridge_poke_strength(deserializer));
  }
  @protected
  BridgeVoiceJoinErrorCode sse_decode_box_autoadd_bridge_voice_join_error_code(
    SseDeserializer deserializer,
@@ -2731,12 +2488,10 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    var var_framesSent = sse_decode_u_32(deserializer);
    var var_framesReceived = sse_decode_u_32(deserializer);
    var var_pttActive = sse_decode_bool(deserializer);
    var var_inputLevel = sse_decode_f_32(deserializer);
    return BridgeAudioStats(
      framesSent: var_framesSent,
      framesReceived: var_framesReceived,
      pttActive: var_pttActive,
      inputLevel: var_inputLevel,
    );
  }
@@ -3003,15 +2758,11 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
        var var_target = sse_decode_box_autoadd_bridge_message_target(
          deserializer,
        );
        var var_pokeStrength = sse_decode_opt_box_autoadd_bridge_poke_strength(
          deserializer,
        );
        return BridgeEvent_ChatMessage(
          senderId: var_senderId,
          senderName: var_senderName,
          message: var_message,
          target: var_target,
          pokeStrength: var_pokeStrength,
        );
      case 11:
        var var_message = sse_decode_String(deserializer);
@@ -3139,15 +2890,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    return BridgeNetworkState.values[inner];
  }
  @protected
  BridgePokeStrength sse_decode_bridge_poke_strength(
    SseDeserializer deserializer,
  ) {
    // Codec=Sse (Serialization based), see doc to use other codecs
    var inner = sse_decode_i_32(deserializer);
    return BridgePokeStrength.values[inner];
  }
  @protected
  BridgePttBinding sse_decode_bridge_ptt_binding(SseDeserializer deserializer) {
    // Codec=Sse (Serialization based), see doc to use other codecs
@@ -3339,19 +3081,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    }
  }
  @protected
  BridgePokeStrength? sse_decode_opt_box_autoadd_bridge_poke_strength(
    SseDeserializer deserializer,
  ) {
    // Codec=Sse (Serialization based), see doc to use other codecs
    if (sse_decode_bool(deserializer)) {
      return (sse_decode_box_autoadd_bridge_poke_strength(deserializer));
    } else {
      return null;
    }
  }
  @protected
  BridgeVoiceJoinErrorCode?
  sse_decode_opt_box_autoadd_bridge_voice_join_error_code(
@@ -3412,17 +3141,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    }
  }
  @protected
  Uint8List? sse_decode_opt_list_prim_u_8_strict(SseDeserializer deserializer) {
    // Codec=Sse (Serialization based), see doc to use other codecs
    if (sse_decode_bool(deserializer)) {
      return (sse_decode_list_prim_u_8_strict(deserializer));
    } else {
      return null;
    }
  }
  @protected
  PermissionStateKind sse_decode_permission_state_kind(
    SseDeserializer deserializer,
@@ -3481,23 +3199,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    );
  }
  @protected
  void sse_encode_StreamSink_f_32_Sse(
    RustStreamSink<double> self,
    SseSerializer serializer,
  ) {
    // Codec=Sse (Serialization based), see doc to use other codecs
    sse_encode_String(
      self.setupAndSerialize(
        codec: SseCodec(
          decodeSuccessData: sse_decode_f_32,
          decodeErrorData: sse_decode_AnyhowException,
        ),
      ),
      serializer,
    );
  }
  @protected
  void sse_encode_String(String self, SseSerializer serializer) {
    // Codec=Sse (Serialization based), see doc to use other codecs
@@ -3537,15 +3238,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    sse_encode_bridge_message_target(self, serializer);
  }
  @protected
  void sse_encode_box_autoadd_bridge_poke_strength(
    BridgePokeStrength self,
    SseSerializer serializer,
  ) {
    // Codec=Sse (Serialization based), see doc to use other codecs
    sse_encode_bridge_poke_strength(self, serializer);
  }
  @protected
  void sse_encode_box_autoadd_bridge_voice_join_error_code(
    BridgeVoiceJoinErrorCode self,
@@ -3688,7 +3380,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    sse_encode_u_32(self.framesSent, serializer);
    sse_encode_u_32(self.framesReceived, serializer);
    sse_encode_bool(self.pttActive, serializer);
    sse_encode_f_32(self.inputLevel, serializer);
  }
  @protected
@@ -3884,17 +3575,12 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
        senderName: final senderName,
        message: final message,
        target: final target,
        pokeStrength: final pokeStrength,
      ):
        sse_encode_i_32(10, serializer);
        sse_encode_u_64(senderId, serializer);
        sse_encode_String(senderName, serializer);
        sse_encode_String(message, serializer);
        sse_encode_box_autoadd_bridge_message_target(target, serializer);
        sse_encode_opt_box_autoadd_bridge_poke_strength(
          pokeStrength,
          serializer,
        );
      case BridgeEvent_ServerActivity(message: final message):
        sse_encode_i_32(11, serializer);
        sse_encode_String(message, serializer);
@@ -4016,15 +3702,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    sse_encode_i_32(self.index, serializer);
  }
  @protected
  void sse_encode_bridge_poke_strength(
    BridgePokeStrength self,
    SseSerializer serializer,
  ) {
    // Codec=Sse (Serialization based), see doc to use other codecs
    sse_encode_i_32(self.index, serializer);
  }
  @protected
  void sse_encode_bridge_ptt_binding(
    BridgePttBinding self,
@@ -4201,19 +3878,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    }
  }
  @protected
  void sse_encode_opt_box_autoadd_bridge_poke_strength(
    BridgePokeStrength? self,
    SseSerializer serializer,
  ) {
    // Codec=Sse (Serialization based), see doc to use other codecs
    sse_encode_bool(self != null, serializer);
    if (self != null) {
      sse_encode_box_autoadd_bridge_poke_strength(self, serializer);
    }
  }
  @protected
  void sse_encode_opt_box_autoadd_bridge_voice_join_error_code(
    BridgeVoiceJoinErrorCode? self,
@@ -4270,19 +3934,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
    }
  }
  @protected
  void sse_encode_opt_list_prim_u_8_strict(
    Uint8List? self,
    SseSerializer serializer,
  ) {
    // Codec=Sse (Serialization based), see doc to use other codecs
    sse_encode_bool(self != null, serializer);
    if (self != null) {
      sse_encode_list_prim_u_8_strict(self, serializer);
    }
  }
  @protected
  void sse_encode_permission_state_kind(
    PermissionStateKind self,
@@ -27,9 +27,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
    dynamic raw,
  );
  @protected
  RustStreamSink<double> dco_decode_StreamSink_f_32_Sse(dynamic raw);
  @protected
  String dco_decode_String(dynamic raw);
@@ -46,9 +43,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
  @protected
  BridgeMessageTarget dco_decode_box_autoadd_bridge_message_target(dynamic raw);
  @protected
  BridgePokeStrength dco_decode_box_autoadd_bridge_poke_strength(dynamic raw);
  @protected
  BridgeVoiceJoinErrorCode dco_decode_box_autoadd_bridge_voice_join_error_code(
    dynamic raw,
@@ -123,9 +117,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
  @protected
  BridgeNetworkState dco_decode_bridge_network_state(dynamic raw);
  @protected
  BridgePokeStrength dco_decode_bridge_poke_strength(dynamic raw);
  @protected
  BridgePttBinding dco_decode_bridge_ptt_binding(dynamic raw);
@@ -180,11 +171,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
  @protected
  String? dco_decode_opt_String(dynamic raw);
  @protected
  BridgePokeStrength? dco_decode_opt_box_autoadd_bridge_poke_strength(
    dynamic raw,
  );
  @protected
  BridgeVoiceJoinErrorCode?
  dco_decode_opt_box_autoadd_bridge_voice_join_error_code(dynamic raw);
@@ -201,9 +187,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
  @protected
  BigInt? dco_decode_opt_box_autoadd_u_64(dynamic raw);
  @protected
  Uint8List? dco_decode_opt_list_prim_u_8_strict(dynamic raw);
  @protected
  PermissionStateKind dco_decode_permission_state_kind(dynamic raw);
@@ -227,11 +210,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
    SseDeserializer deserializer,
  );
  @protected
  RustStreamSink<double> sse_decode_StreamSink_f_32_Sse(
    SseDeserializer deserializer,
  );
  @protected
  String sse_decode_String(SseDeserializer deserializer);
@@ -254,11 +232,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
    SseDeserializer deserializer,
  );
  @protected
  BridgePokeStrength sse_decode_box_autoadd_bridge_poke_strength(
    SseDeserializer deserializer,
  );
  @protected
  BridgeVoiceJoinErrorCode sse_decode_box_autoadd_bridge_voice_join_error_code(
    SseDeserializer deserializer,
@@ -347,11 +320,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
    SseDeserializer deserializer,
  );
  @protected
  BridgePokeStrength sse_decode_bridge_poke_strength(
    SseDeserializer deserializer,
  );
  @protected
  BridgePttBinding sse_decode_bridge_ptt_binding(SseDeserializer deserializer);
@@ -424,11 +392,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
  @protected
  String? sse_decode_opt_String(SseDeserializer deserializer);
  @protected
  BridgePokeStrength? sse_decode_opt_box_autoadd_bridge_poke_strength(
    SseDeserializer deserializer,
  );
  @protected
  BridgeVoiceJoinErrorCode?
  sse_decode_opt_box_autoadd_bridge_voice_join_error_code(
@@ -447,9 +410,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
  @protected
  BigInt? sse_decode_opt_box_autoadd_u_64(SseDeserializer deserializer);
  @protected
  Uint8List? sse_decode_opt_list_prim_u_8_strict(SseDeserializer deserializer);
  @protected
  PermissionStateKind sse_decode_permission_state_kind(
    SseDeserializer deserializer,
@@ -479,12 +439,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
    SseSerializer serializer,
  );
  @protected
  void sse_encode_StreamSink_f_32_Sse(
    RustStreamSink<double> self,
    SseSerializer serializer,
  );
  @protected
  void sse_encode_String(String self, SseSerializer serializer);
@@ -509,12 +463,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
    SseSerializer serializer,
  );
  @protected
  void sse_encode_box_autoadd_bridge_poke_strength(
    BridgePokeStrength self,
    SseSerializer serializer,
  );
  @protected
  void sse_encode_box_autoadd_bridge_voice_join_error_code(
    BridgeVoiceJoinErrorCode self,
@@ -626,12 +574,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
    SseSerializer serializer,
  );
  @protected
  void sse_encode_bridge_poke_strength(
    BridgePokeStrength self,
    SseSerializer serializer,
  );
  @protected
  void sse_encode_bridge_ptt_binding(
    BridgePttBinding self,
@@ -725,12 +667,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
  @protected
  void sse_encode_opt_String(String? self, SseSerializer serializer);
  @protected
  void sse_encode_opt_box_autoadd_bridge_poke_strength(
    BridgePokeStrength? self,
    SseSerializer serializer,
  );
  @protected
  void sse_encode_opt_box_autoadd_bridge_voice_join_error_code(
    BridgeVoiceJoinErrorCode? self,
@@ -752,12 +688,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
  @protected
  void sse_encode_opt_box_autoadd_u_64(BigInt? self, SseSerializer serializer);
  @protected
  void sse_encode_opt_list_prim_u_8_strict(
    Uint8List? self,
    SseSerializer serializer,
  );
  @protected
  void sse_encode_permission_state_kind(
    PermissionStateKind self,
@@ -29,9 +29,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
    dynamic raw,
  );
  @protected
  RustStreamSink<double> dco_decode_StreamSink_f_32_Sse(dynamic raw);
  @protected
  String dco_decode_String(dynamic raw);
@@ -48,9 +45,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
  @protected
  BridgeMessageTarget dco_decode_box_autoadd_bridge_message_target(dynamic raw);
  @protected
  BridgePokeStrength dco_decode_box_autoadd_bridge_poke_strength(dynamic raw);
  @protected
  BridgeVoiceJoinErrorCode dco_decode_box_autoadd_bridge_voice_join_error_code(
    dynamic raw,
@@ -125,9 +119,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
  @protected
  BridgeNetworkState dco_decode_bridge_network_state(dynamic raw);
  @protected
  BridgePokeStrength dco_decode_bridge_poke_strength(dynamic raw);
  @protected
  BridgePttBinding dco_decode_bridge_ptt_binding(dynamic raw);
@@ -182,11 +173,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
  @protected
  String? dco_decode_opt_String(dynamic raw);
  @protected
  BridgePokeStrength? dco_decode_opt_box_autoadd_bridge_poke_strength(
    dynamic raw,
  );
  @protected
  BridgeVoiceJoinErrorCode?
  dco_decode_opt_box_autoadd_bridge_voice_join_error_code(dynamic raw);
@@ -203,9 +189,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
  @protected
  BigInt? dco_decode_opt_box_autoadd_u_64(dynamic raw);
  @protected
  Uint8List? dco_decode_opt_list_prim_u_8_strict(dynamic raw);
  @protected
  PermissionStateKind dco_decode_permission_state_kind(dynamic raw);
@@ -229,11 +212,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
    SseDeserializer deserializer,
  );
  @protected
  RustStreamSink<double> sse_decode_StreamSink_f_32_Sse(
    SseDeserializer deserializer,
  );
  @protected
  String sse_decode_String(SseDeserializer deserializer);
@@ -256,11 +234,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
    SseDeserializer deserializer,
  );
  @protected
  BridgePokeStrength sse_decode_box_autoadd_bridge_poke_strength(
    SseDeserializer deserializer,
  );
  @protected
  BridgeVoiceJoinErrorCode sse_decode_box_autoadd_bridge_voice_join_error_code(
    SseDeserializer deserializer,
@@ -349,11 +322,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
    SseDeserializer deserializer,
  );
  @protected
  BridgePokeStrength sse_decode_bridge_poke_strength(
    SseDeserializer deserializer,
  );
  @protected
  BridgePttBinding sse_decode_bridge_ptt_binding(SseDeserializer deserializer);
@@ -426,11 +394,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
  @protected
  String? sse_decode_opt_String(SseDeserializer deserializer);
  @protected
  BridgePokeStrength? sse_decode_opt_box_autoadd_bridge_poke_strength(
    SseDeserializer deserializer,
  );
  @protected
  BridgeVoiceJoinErrorCode?
  sse_decode_opt_box_autoadd_bridge_voice_join_error_code(
@@ -449,9 +412,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
  @protected
  BigInt? sse_decode_opt_box_autoadd_u_64(SseDeserializer deserializer);
  @protected
  Uint8List? sse_decode_opt_list_prim_u_8_strict(SseDeserializer deserializer);
  @protected
  PermissionStateKind sse_decode_permission_state_kind(
    SseDeserializer deserializer,
@@ -481,12 +441,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
    SseSerializer serializer,
  );
  @protected
  void sse_encode_StreamSink_f_32_Sse(
    RustStreamSink<double> self,
    SseSerializer serializer,
  );
  @protected
  void sse_encode_String(String self, SseSerializer serializer);
@@ -511,12 +465,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
    SseSerializer serializer,
  );
  @protected
  void sse_encode_box_autoadd_bridge_poke_strength(
    BridgePokeStrength self,
    SseSerializer serializer,
  );
  @protected
  void sse_encode_box_autoadd_bridge_voice_join_error_code(
    BridgeVoiceJoinErrorCode self,
@@ -628,12 +576,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
    SseSerializer serializer,
  );
  @protected
  void sse_encode_bridge_poke_strength(
    BridgePokeStrength self,
    SseSerializer serializer,
  );
  @protected
  void sse_encode_bridge_ptt_binding(
    BridgePttBinding self,
@@ -727,12 +669,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
  @protected
  void sse_encode_opt_String(String? self, SseSerializer serializer);
  @protected
  void sse_encode_opt_box_autoadd_bridge_poke_strength(
    BridgePokeStrength? self,
    SseSerializer serializer,
  );
  @protected
  void sse_encode_opt_box_autoadd_bridge_voice_join_error_code(
    BridgeVoiceJoinErrorCode? self,
@@ -754,12 +690,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
  @protected
  void sse_encode_opt_box_autoadd_u_64(BigInt? self, SseSerializer serializer);
  @protected
  void sse_encode_opt_list_prim_u_8_strict(
    Uint8List? self,
    SseSerializer serializer,
  );
  @protected
  void sse_encode_permission_state_kind(
    PermissionStateKind self,
@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
 import '../design/breakpoints.dart';
 /// Semantic tones for lightweight, Material 3 SnackBars.
 enum AppSnackBarVariant { neutral, success, warning, error }
@@ -9,6 +7,7 @@ enum AppSnackBarVariant { neutral, success, warning, error }
 class AppSnackBar {
  const AppSnackBar._();
  static const double _desktopMaxWidth = 560;
  static const double _radius = 16;
  static const double _elevation = 3;
@@ -40,9 +39,9 @@ class AppSnackBar {
  }) {
    final scheme = Theme.of(context).colorScheme;
    final viewWidth = MediaQuery.sizeOf(context).width;
-    final useDesktopCap = viewWidth >= ChanoraBreakpoints.medium;
+    final useDesktopCap = viewWidth >= 600;
    final snackBarWidth = useDesktopCap && margin == null
-        ? ChanoraBreakpoints.snackBarDesktopCap
+        ? _desktopMaxWidth
        : null;
    final effectiveMargin = useDesktopCap && margin != null
        ? _desktopCappedMargin(context, margin)
@@ -77,11 +76,7 @@ class AppSnackBar {
    final viewWidth = MediaQuery.sizeOf(context).width;
    final resolved = margin.resolve(Directionality.of(context));
    final extraHorizontal =
-        (viewWidth - ChanoraBreakpoints.snackBarDesktopCap).clamp(
+        (viewWidth - _desktopMaxWidth).clamp(0.0, viewWidth) / 2;
          0.0,
          viewWidth,
        ) /
        2;
    return EdgeInsets.fromLTRB(
      resolved.left + extraHorizontal,
      resolved.top,
@@ -1,88 +0,0 @@
 // SPDX-License-Identifier: Apache-2.0
 import 'package:flutter/material.dart';
 import '../design/breakpoints.dart';
 import '../l10n/generated/app_localizations.dart';
 import '../services/snapshot_state_mapper.dart';
 import '../services/ts3_server_link.dart';
 import '../src/rust/api.dart' as rust;
 import 'chat_views.dart';
 /// Fixed-width inline chat panel for expanded desktop layouts.
 class ChatPanel extends StatelessWidget {
  /// Construct an inline chat panel.
  const ChatPanel({
    super.key,
    required this.messages,
    required this.snapshot,
    required this.target,
    required this.clientName,
    required this.onClose,
    this.restoredDraft,
    this.onDraftChanged,
    this.onTs3ServerLink,
  });
  /// Backing chat messages shared with the chat route.
  final List<ChatEntry> messages;
  /// Latest TeamSpeak snapshot.
  final rust.BridgeSnapshot snapshot;
  /// Chat target shown in the panel.
  final rust.BridgeMessageTarget target;
  /// Client display name for direct-message and poke targets.
  final String clientName;
  /// Handle TeamSpeak server links embedded in chat messages.
  final Ts3ServerLinkHandler? onTs3ServerLink;
  /// Called when the user closes the inline panel.
  final VoidCallback onClose;
  /// External draft text to restore in the chat detail view.
  final String? restoredDraft;
  /// Called when the draft text changes.
  final ValueChanged<String>? onDraftChanged;
  @override
  Widget build(BuildContext context) {
    final currentChannelId = ownClientSnapshotState(snapshot)?.channelId;
    final channelName = snapshotChannelName(snapshot, currentChannelId);
    final l10n = AppL10n.of(context);
    return SizedBox(
      width: ChanoraBreakpoints.chatPanelWidth,
      child: DecoratedBox(
        decoration: BoxDecoration(
          color: Theme.of(context).colorScheme.surface,
          border: BorderDirectional(
            start: BorderSide(
              color: Theme.of(context).colorScheme.outlineVariant,
            ),
          ),
        ),
        child: ChatDetailView(
          messages: messages,
          snapshot: snapshot,
          target: target,
          clientName: clientName,
          currentChannelId: currentChannelId,
          channelName: channelName,
          onTs3ServerLink: onTs3ServerLink,
          restoredDraft: restoredDraft,
          onDraftChanged: onDraftChanged,
          messageMaxWidth: 500,
          headerTrailing: IconButton(
            tooltip: l10n.chatCloseAction,
            icon: const Icon(Icons.close),
            onPressed: onClose,
          ),
        ),
      ),
    );
  }
 }
@@ -2,7 +2,6 @@ import 'dart:async' show unawaited;
 import 'package:flutter/material.dart';
 import '../design/breakpoints.dart';
 import '../l10n/generated/app_localizations.dart';
 import '../services/channel_spacer.dart';
 import '../services/link_trust_service.dart';
@@ -14,12 +13,7 @@ import 'bbcode_text.dart';
 const double _chatSidebarTileExtent = 92;
 const double _chatSidebarCompactTileExtent = 76;
 const double _chatSidebarCompactHeight = 84;
-
+const double _chatMobileBreakpoint = 600;
 typedef ChatMessageSender =
    Future<void> Function({
      required String message,
      required rust.BridgeMessageTarget target,
    });
 /// One chat/activity message shown in the chat hub.
 class ChatEntry {
@@ -503,7 +497,7 @@ String chatInputPlaceholder(
    case rust.BridgeMessageTarget_Client():
      return 'Message $clientName...';
    case rust.BridgeMessageTarget_Poke():
-      return 'Poke message optional...';
+      return 'Poke message...';
  }
 }
@@ -519,16 +513,6 @@ bool canSendToChatTarget(
  }
 }
 bool canSendChatMessage(
  rust.BridgeMessageTarget target,
  BigInt? currentChannelId,
  String text,
 ) {
  if (!canSendToChatTarget(target, currentChannelId)) return false;
  if (target is rust.BridgeMessageTarget_Poke) return true;
  return text.trim().isNotEmpty;
 }
 String? chatSendBlockedReason(
  rust.BridgeMessageTarget target,
  BigInt? currentChannelId,
@@ -632,7 +616,7 @@ class _ChatPageState extends State<ChatPage> {
    final currentChannelId = _currentChannelId;
    final channelName = snapshotChannelName(snapshot, currentChannelId);
    final l10n = AppL10n.of(context);
-    final detail = ChatDetailView(
+    final detail = _ChatDetailView(
      target: _selectedTarget,
      clientName: _selectedClientName,
      snapshot: snapshot,
@@ -657,7 +641,7 @@ class _ChatPageState extends State<ChatPage> {
      body: LayoutBuilder(
        builder: (context, constraints) {
          final sidebar = _ChatSidebar(
-            compact: constraints.maxWidth < ChanoraBreakpoints.medium,
+            compact: constraints.maxWidth < _chatMobileBreakpoint,
            selectedTarget: _selectedTarget,
            privateChats: _privateChats,
            onSelect: _selectTarget,
@@ -666,7 +650,7 @@ class _ChatPageState extends State<ChatPage> {
              _selectTarget(rust.BridgeMessageTarget.client(id), name: name);
            }),
          );
-          if (constraints.maxWidth < ChanoraBreakpoints.medium) {
+          if (constraints.maxWidth < _chatMobileBreakpoint) {
            return Column(
              children: [
                sidebar,
@@ -1066,11 +1050,8 @@ class _ChannelGroup extends StatelessWidget {
  }
 }
-/// Detail view for a single chat target, including message history and input.
+class _ChatDetailView extends StatefulWidget {
-class ChatDetailView extends StatefulWidget {
+  const _ChatDetailView({
  /// Construct a chat detail view.
  const ChatDetailView({
    super.key,
    required this.target,
    required this.clientName,
    required this.snapshot,
@@ -1078,54 +1059,21 @@ class ChatDetailView extends StatefulWidget {
    required this.currentChannelId,
    required this.channelName,
    this.onTs3ServerLink,
    this.headerTrailing,
    this.messageMaxWidth,
    this.restoredDraft,
    this.onDraftChanged,
    this.sendChatMessage,
  });
  /// Chat target displayed by this detail view.
  final rust.BridgeMessageTarget target;
  /// Client display name for direct-message and poke targets.
  final String clientName;
  /// Latest TeamSpeak snapshot.
  final rust.BridgeSnapshot snapshot;
  /// Backing message list. Self-sent messages are appended here.
  final List<ChatEntry> messages;
  /// Current voice channel id for channel-chat send gating.
  final BigInt? currentChannelId;
  /// Current voice channel name for labels and placeholders.
  final String channelName;
  /// Handle TeamSpeak server links embedded in chat messages.
  final Ts3ServerLinkHandler? onTs3ServerLink;
  /// Optional widget shown at the trailing edge of the header.
  final Widget? headerTrailing;
  /// Optional max width for message content.
  final double? messageMaxWidth;
  /// External draft text to restore when the widget initializes or the target changes.
  final String? restoredDraft;
  /// Called with the current draft text whenever the target changes or the widget is about to be replaced.
  final ValueChanged<String>? onDraftChanged;
  /// Sends a chat message. Defaults to the Rust bridge send path.
  final ChatMessageSender? sendChatMessage;
  @override
-  State<ChatDetailView> createState() => _ChatDetailViewState();
+  State<_ChatDetailView> createState() => _ChatDetailViewState();
 }
-class _ChatDetailViewState extends State<ChatDetailView> {
+class _ChatDetailViewState extends State<_ChatDetailView> {
  final _textCtl = TextEditingController();
  final _scrollCtl = ScrollController();
  int _lastRenderedMessageCount = -1;
@@ -1152,35 +1100,8 @@ class _ChatDetailViewState extends State<ChatDetailView> {
    clientName: widget.clientName,
  );
  @override
  void initState() {
    super.initState();
    if (widget.restoredDraft != null && widget.restoredDraft!.isNotEmpty) {
      _textCtl.text = widget.restoredDraft!;
    }
  }
  @override
  void didUpdateWidget(covariant ChatDetailView oldWidget) {
    super.didUpdateWidget(oldWidget);
    if (oldWidget.target != widget.target) {
      // Propagate the OUTGOING draft unconditionally, including empty
      // text. The empty case is load-bearing: if the user typed text,
      // saved it, restored it, then deleted everything, the parent
      // map must learn the draft is now empty — otherwise the stale
      // entry resurrects on the next target swap.
      oldWidget.onDraftChanged?.call(_textCtl.text);
      _textCtl.text = widget.restoredDraft ?? '';
      _lastRenderedTarget = null;
    }
  }
  @override
  void dispose() {
    // Same unconditional flush on tear-down. The `isNotEmpty` guard
    // here would silently drop "user cleared the field then closed
    // the panel" into the same stale-entry bug class as didUpdateWidget.
    widget.onDraftChanged?.call(_textCtl.text);
    _textCtl.dispose();
    _scrollCtl.dispose();
    super.dispose();
@@ -1188,12 +1109,9 @@ class _ChatDetailViewState extends State<ChatDetailView> {
  void _send() {
    final text = _textCtl.text.trim();
-    if (!canSendChatMessage(widget.target, widget.currentChannelId, text)) {
+    if (text.isEmpty || !_canSend) return;
      return;
    }
    _textCtl.clear();
-    final sendChatMessage = widget.sendChatMessage ?? rust.sendChatMessage;
+    unawaited(rust.sendChatMessage(message: text, target: widget.target));
    unawaited(sendChatMessage(message: text, target: widget.target));
    final ownId = widget.snapshot.ownClientId;
    setState(() {
      widget.messages.add(
@@ -1246,9 +1164,6 @@ class _ChatDetailViewState extends State<ChatDetailView> {
      channelName: widget.channelName,
      clientName: widget.clientName,
    );
    final sendTooltip = widget.target is rust.BridgeMessageTarget_Poke
        ? 'Poke'
        : 'Send';
    return Column(
      children: [
@@ -1261,12 +1176,7 @@ class _ChatDetailViewState extends State<ChatDetailView> {
              bottom: BorderSide(color: theme.colorScheme.outlineVariant),
            ),
          ),
-          child: Row(
+          child: Text(_title, style: theme.textTheme.titleMedium),
            children: [
              Expanded(child: Text(_title, style: theme.textTheme.titleMedium)),
              if (widget.headerTrailing != null) widget.headerTrailing!,
            ],
          ),
        ),
        Expanded(
          child: msgs.isEmpty
@@ -1306,19 +1216,12 @@ class _ChatDetailViewState extends State<ChatDetailView> {
                  controller: _scrollCtl,
                  padding: const EdgeInsets.symmetric(vertical: 8),
                  itemCount: msgs.length,
-                  itemBuilder: (_, i) => Center(
+                  itemBuilder: (_, i) => _MessageBubble(
                    child: ConstrainedBox(
                      constraints: BoxConstraints(
                        maxWidth: widget.messageMaxWidth ?? double.infinity,
                      ),
                      child: _MessageBubble(
                    entry: msgs[i],
                    onTs3ServerLink: widget.onTs3ServerLink,
                  ),
                ),
        ),
                ),
        ),
        if (_blockedReason != null)
          Container(
            width: double.infinity,
@@ -1358,7 +1261,7 @@ class _ChatDetailViewState extends State<ChatDetailView> {
                IconButton.filled(
                  icon: const Icon(Icons.send),
                  onPressed: _send,
-                  tooltip: sendTooltip,
+                  tooltip: 'Send',
                ),
              ],
            ),
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import '../design/breakpoints.dart';
 import '../l10n/generated/app_localizations.dart';
 import '../src/rust/api.dart' as rust;
@@ -115,6 +114,7 @@ class _ConnectFormState extends State<ConnectForm> {
        const SizedBox(height: 16),
        LayoutBuilder(
          builder: (context, constraints) {
            const stackedActionsMaxWidth = 400.0;
            final connectButton = FilledButton.icon(
              icon: const Icon(Icons.login),
              label: Text(l10n.connectAction),
@@ -125,8 +125,7 @@ class _ConnectFormState extends State<ConnectForm> {
              label: Text(l10n.bookmarkAddAction),
              onPressed: widget.onAddBookmark,
            );
-            if (constraints.maxWidth <=
+            if (constraints.maxWidth <= stackedActionsMaxWidth) {
                ChanoraBreakpoints.connectActionsStackMaxWidth) {
              return Column(
                crossAxisAlignment: CrossAxisAlignment.stretch,
                children: [
@@ -1,89 +0,0 @@
 import 'package:flutter/material.dart';
 import '../l10n/generated/app_localizations.dart';
 import '../services/poke_preferences_service.dart';
 import 'voice_settings_controls.dart';
 class PokeNotificationSettingsDialog extends StatelessWidget {
  const PokeNotificationSettingsDialog({super.key, required this.preferences});
  final PokePreferencesService preferences;
  @override
  Widget build(BuildContext context) {
    final l10n = AppL10n.of(context);
    final theme = Theme.of(context);
    return AlertDialog(
      title: Text(l10n.pokeSettingsTitle),
      contentPadding: const EdgeInsets.fromLTRB(24, 16, 24, 0),
      content: SizedBox(
        width: 400,
        child: SingleChildScrollView(
          child: Column(
            mainAxisSize: MainAxisSize.min,
            crossAxisAlignment: CrossAxisAlignment.start,
            children: [
              ValueListenableBuilder<bool>(
                valueListenable: preferences.pokesEnabled,
                builder: (context, enabled, _) => SwitchListTile(
                  dense: true,
                  contentPadding: EdgeInsets.zero,
                  title: Text(l10n.pokeSettingsEnableLabel),
                  subtitle: Text(l10n.pokeSettingsEnableDescription),
                  value: enabled,
                  onChanged: (value) => preferences.setPokesEnabled(value),
                ),
              ),
              const Divider(height: 24),
              VoiceSectionHeader(l10n.pokeSettingsMutedSendersHeader),
              ValueListenableBuilder<Set<BigInt>>(
                valueListenable: preferences.mutedSenders,
                builder: (context, mutedSenders, _) {
                  final senders = mutedSenders.toList()..sort();
                  if (senders.isEmpty) {
                    return Padding(
                      padding: const EdgeInsets.only(top: 8, bottom: 8),
                      child: Text(
                        l10n.pokeSettingsMutedSendersEmpty,
                        style: theme.textTheme.bodyMedium?.copyWith(
                          color: theme.colorScheme.onSurfaceVariant,
                        ),
                      ),
                    );
                  }
                  return Column(
                    mainAxisSize: MainAxisSize.min,
                    children: [
                      for (final senderId in senders)
                        ListTile(
                          dense: true,
                          contentPadding: EdgeInsets.zero,
                          leading: const Icon(Icons.notifications_off_outlined),
                          title: Text(
                            l10n.pokeSettingsMutedSenderLabel(
                              senderId.toString(),
                            ),
                          ),
                          trailing: TextButton(
                            onPressed: () => preferences.unmuteSender(senderId),
                            child: Text(l10n.pokeSettingsUnmuteSenderAction),
                          ),
                        ),
                    ],
                  );
                },
              ),
              const SizedBox(height: 8),
            ],
          ),
        ),
      ),
      actions: [
        TextButton(
          onPressed: () => Navigator.of(context).pop(),
          child: Text(l10n.closeAction),
        ),
      ],
    );
  }
 }
@@ -23,14 +23,12 @@ class SnapshotView extends StatefulWidget {
    required this.localOutputMuted,
    required this.hasJoinPending,
    required this.canJoinVoiceChannel,
    required this.unreadChannelIds,
    required this.onJoinChannel,
    required this.onJoinChannelWithPassword,
    this.enableClientLongPressMenu = false,
    this.onOpenClientInfo,
    this.onOpenClientChat,
    this.onOpenClientPoke,
    this.onOpenChannelChat,
    this.onTs3ServerLink,
  });
@@ -58,9 +56,6 @@ class SnapshotView extends StatefulWidget {
  /// True when the local client may join voice channels.
  final bool canJoinVoiceChannel;
  /// Set of channel IDs that have unread chat messages.
  final Set<BigInt> unreadChannelIds;
  /// Join an unlocked channel.
  final ValueChanged<rust.BridgeChannel> onJoinChannel;
@@ -79,9 +74,6 @@ class SnapshotView extends StatefulWidget {
  /// Open a poke composer for a non-self client.
  final ValueChanged<rust.BridgeClient>? onOpenClientPoke;
  /// Open chat for a channel.
  final ValueChanged<rust.BridgeChannel>? onOpenChannelChat;
  /// Handle TeamSpeak server links embedded in server-provided text.
  final Ts3ServerLinkHandler? onTs3ServerLink;
@@ -248,12 +240,7 @@ class _SnapshotViewState extends State<SnapshotView> {
      );
    }
-    return _ChannelContextMenu(
+    return InkWell(
      channel: channel,
      onChat: widget.onOpenChannelChat != null
          ? () => widget.onOpenChannelChat!(channel)
          : null,
      child: InkWell(
      onTap: onTap,
      child: ConstrainedBox(
        constraints: const BoxConstraints(minHeight: 40),
@@ -284,17 +271,6 @@ class _SnapshotViewState extends State<SnapshotView> {
                overflow: TextOverflow.ellipsis,
              ),
            ),
                if (widget.unreadChannelIds.contains(channel.id)) ...[
                  const SizedBox(width: 8),
                  Container(
                    width: 8,
                    height: 8,
                    decoration: BoxDecoration(
                      color: theme.colorScheme.primary,
                      shape: BoxShape.circle,
                    ),
                  ),
                ],
            if (channel.hasPassword) ...[
              const SizedBox(width: 8),
              Icon(
@@ -305,7 +281,6 @@ class _SnapshotViewState extends State<SnapshotView> {
          ],
        ),
      ),
        ),
    );
  }
@@ -1107,60 +1082,3 @@ class _ClientVolumeSheetState extends State<_ClientVolumeSheet> {
    );
  }
 }
 /// Context menu for channel tiles. Shows a "Chat" option on right-click or
 /// long-press. Primary tap passes through to the child for voice join.
 class _ChannelContextMenu extends StatelessWidget {
  const _ChannelContextMenu({
    required this.channel,
    this.onChat,
    required this.child,
  });
  final rust.BridgeChannel channel;
  final VoidCallback? onChat;
  final Widget child;
  @override
  Widget build(BuildContext context) {
    if (onChat == null) return child;
    return GestureDetector(
      behavior: HitTestBehavior.opaque,
      onSecondaryTapDown: (details) =>
          _show(context, details.globalPosition),
      onLongPressStart: (details) =>
          _show(context, details.globalPosition),
      child: child,
    );
  }
  void _show(BuildContext context, Offset globalPosition) {
    final overlay =
        Overlay.of(context).context.findRenderObject() as RenderBox;
    final position = RelativeRect.fromLTRB(
      globalPosition.dx,
      globalPosition.dy,
      overlay.size.width - globalPosition.dx,
      overlay.size.height - globalPosition.dy,
    );
    showMenu<String>(
      context: context,
      position: position,
      items: [
        PopupMenuItem(
          value: 'chat',
          child: Row(
            children: [
              const Icon(Icons.chat_bubble_outline, size: 18),
              const SizedBox(width: 12),
              Text(AppL10n.of(context).chatAction),
            ],
          ),
        ),
      ],
    ).then((value) {
      if (value == 'chat') onChat?.call();
    });
  }
 }
@@ -33,7 +33,6 @@ class VoiceBar extends StatelessWidget {
    required this.onConfigure,
    required this.onPttHeldChanged,
    this.talkPowerBlocked = false,
    this.inputLevel,
  });
  final bool inChannel;
@@ -54,10 +53,6 @@ class VoiceBar extends StatelessWidget {
  /// level meter. Pass `null` to render an idle meter.
  final rust.BridgeAudioStats? audioStats;
  /// Real-time input level from the 30 Hz stream (dBFS).
  /// When non-null, takes precedence over `audioStats.inputLevel`.
  final double? inputLevel;
  /// PTT capability badge inputs — passed through to
  /// [`PttCapabilityBadge`].
  final String pttLevel;
@@ -201,7 +196,7 @@ class VoiceBar extends StatelessWidget {
                ),
              const SizedBox(height: 6),
              // Row 4: level meter
-              VoiceLevelMeter(active: levelActive, level: inputLevel ?? stats?.inputLevel),
+              VoiceLevelMeter(active: levelActive),
              const SizedBox(height: 4),
              if (stats != null)
                Text(
@@ -1,13 +1,17 @@
-// Compact voice UI for narrow / mobile layouts (Plan E hybrid:
+// Compact voice UI for narrow / mobile layouts.
 // AppBar mutes + status chip with 2-line live readout + wide bottom-
 // anchored PTT button + modal sheet for non-essential controls).
 //
-// rc.8 follow-up: the AppBar gear icon was removed; the modal sheet
+// Two-zone voice bar pinned to the bottom:
-// is now the **single** voice-controls surface on mobile. Mode +
+//   • Control row: status text + mute + deafen + settings chevron
-// release-tail are surfaced inline (radio buttons + slider) inside
+//   • PTT row:     full-width hold-to-talk (PTT mode only)
-// the modal.
+// Both share a single container whose background colour reflects
 // the current voice state (normal / muted / talk-power-blocked).
 //
 // Gesture isolation: the control row uses tap-only InkWell /
 // IconButton; the PTT row uses a raw Listener for pointer-down /
 // pointer-up.  Because each row is a disjoint hit-test region, a
 // finger holding PTT cannot accidentally toggle mute or deafen.
-import 'dart:async' show StreamSubscription, Timer, unawaited;
+import 'dart:async' show Timer, unawaited;
 import 'dart:io' show Platform;
 import 'package:flutter/foundation.dart' show kIsWeb;
@@ -53,11 +57,8 @@ class VoiceStatusChip extends StatelessWidget {
    required this.audioStats,
    required this.isTouchOnly,
    required this.onTap,
    required this.onToggleInputMute,
    required this.onToggleOutputMute,
    this.inputMuted = false,
    this.outputMuted = false,
    this.hardMuteByTalkPower = false,
    this.talkPower,
    this.neededTalkPower,
    this.talkPowerGranted,
@@ -84,9 +85,6 @@ class VoiceStatusChip extends StatelessWidget {
  /// True when local speaker is muted.
  final bool outputMuted;
  /// True when the server talk-power gate forces local hard mute.
  final bool hardMuteByTalkPower;
  /// Own client's talk power.
  final int? talkPower;
@@ -99,12 +97,6 @@ class VoiceStatusChip extends StatelessWidget {
  /// Open the voice details modal.
  final VoidCallback onTap;
  /// Toggle local input hard mute.
  final VoidCallback onToggleInputMute;
  /// Toggle local output mute/deafen.
  final VoidCallback onToggleOutputMute;
  @override
  Widget build(BuildContext context) {
    final theme = Theme.of(context);
@@ -125,9 +117,18 @@ class VoiceStatusChip extends StatelessWidget {
    );
    return Semantics(
      button: true,
      label: '${l10n.voiceSheetTitle}: ${summary.line1}, ${summary.line2}',
      hint: l10n.voiceSettingsTitle,
      child: Material(
        type: MaterialType.transparency,
        child: InkWell(
          onTap: () {
            HapticFeedback.lightImpact();
            onTap();
          },
          borderRadius: BorderRadius.circular(12),
          child: ExcludeSemantics(
            child: Container(
              padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
              decoration: BoxDecoration(
@@ -159,14 +160,6 @@ class VoiceStatusChip extends StatelessWidget {
                  ),
                  const SizedBox(width: 8),
                  Expanded(
                child: InkWell(
                  onTap: () {
                    HapticFeedback.lightImpact();
                    onTap();
                  },
                  borderRadius: BorderRadius.circular(8),
                  child: Padding(
                    padding: const EdgeInsets.symmetric(vertical: 2),
                    child: Column(
                      crossAxisAlignment: CrossAxisAlignment.start,
                      mainAxisSize: MainAxisSize.min,
@@ -190,63 +183,18 @@ class VoiceStatusChip extends StatelessWidget {
                      ],
                    ),
                  ),
-                ),
+                  const SizedBox(width: 8),
-              ),
+                  Icon(
              const SizedBox(width: 4),
              IconButton(
                tooltip: hardMuteByTalkPower
                    ? l10n.voiceTalkPowerBlocked
                    : l10n.voiceHardMuteLabel,
                icon: Icon(inputMuted ? Icons.mic_off : Icons.mic),
                color: inputMuted ? theme.colorScheme.error : null,
                onPressed: hardMuteByTalkPower ? null : onToggleInputMute,
                visualDensity: VisualDensity.compact,
                constraints: const BoxConstraints.tightFor(
                  width: 40,
                  height: 40,
                ),
                padding: EdgeInsets.zero,
                style: const ButtonStyle(
                  tapTargetSize: MaterialTapTargetSize.shrinkWrap,
                ),
              ),
              IconButton(
                tooltip: l10n.voiceOutputMuteLabel,
                icon: Icon(outputMuted ? Icons.headset_off : Icons.headset),
                color: outputMuted ? theme.colorScheme.error : null,
                onPressed: onToggleOutputMute,
                visualDensity: VisualDensity.compact,
                constraints: const BoxConstraints.tightFor(
                  width: 40,
                  height: 40,
                ),
                padding: EdgeInsets.zero,
                style: const ButtonStyle(
                  tapTargetSize: MaterialTapTargetSize.shrinkWrap,
                ),
              ),
              IconButton(
                tooltip: l10n.voiceSettingsTitle,
                icon: Icon(
                    Icons.expand_less,
                    size: 18,
                    color: theme.colorScheme.onSurfaceVariant,
                  ),
                onPressed: onTap,
                visualDensity: VisualDensity.compact,
                constraints: const BoxConstraints.tightFor(
                  width: 40,
                  height: 40,
                ),
                padding: EdgeInsets.zero,
                style: const ButtonStyle(
                  tapTargetSize: MaterialTapTargetSize.shrinkWrap,
                ),
              ),
                ],
              ),
            ),
          ),
        ),
      ),
    );
  }
 }
@@ -318,15 +266,6 @@ class _VoicePttButtonState extends State<VoicePttButton> {
    playVoicePttHaptic(held);
  }
  @override
  void dispose() {
    if (_pressed) {
      _pressed = false;
      widget.onHeldChanged(false);
    }
    super.dispose();
  }
  @override
  Widget build(BuildContext context) {
    final theme = Theme.of(context);
@@ -520,8 +459,6 @@ class _VoiceSheetBodyState extends State<_VoiceSheetBody> {
  int _rateTickCount = 0;
  late final AudioProcessingConfigState _audioProcessing;
  double? _streamLevel;
  StreamSubscription<double>? _levelSub;
  @override
  void initState() {
@@ -530,12 +467,8 @@ class _VoiceSheetBodyState extends State<_VoiceSheetBody> {
      widget.initialAudioConfig,
    );
-    _levelSub = rust.inputLevelStream().listen((level) {
+    // Poll audio stats at 250 ms so TX/RX counters and the level meter
-      if (mounted) setState(() => _streamLevel = level);
+    // update in real time while the sheet is open, independent of the parent.
    });
    // Poll audio stats at 250 ms so TX/RX counters update in real time
    // while the sheet is open.
    _statsTimer = Timer.periodic(const Duration(milliseconds: 250), (_) async {
      try {
        final s = await rust.audioStats();
@@ -543,6 +476,7 @@ class _VoiceSheetBodyState extends State<_VoiceSheetBody> {
        setState(() {
          _stats = s;
          _rateTickCount++;
          // Compute rates every ~1 s (4 × 250 ms).
          if (_rateTickCount >= 4) {
            _txRate = s.framesSent - _prevSent;
            _rxRate = s.framesReceived - _prevReceived;
@@ -557,7 +491,6 @@ class _VoiceSheetBodyState extends State<_VoiceSheetBody> {
  @override
  void dispose() {
    _levelSub?.cancel();
    _statsTimer?.cancel();
    super.dispose();
  }
@@ -610,6 +543,8 @@ class _VoiceSheetBodyState extends State<_VoiceSheetBody> {
            Text(l10n.voiceSheetTitle, style: theme.textTheme.titleLarge),
            const SizedBox(height: 12),
            // ── Primary section (always visible) ────────────────────
            // 1) Audio output route picker tile (mobile only).
            if (showRoutePicker) ...[
              const AudioOutputTile(),
@@ -638,13 +573,6 @@ class _VoiceSheetBodyState extends State<_VoiceSheetBody> {
              selected: _mode == rust.BridgeTransmitMode.continuous,
              onTap: () => _setMode(rust.BridgeTransmitMode.continuous),
            ),
            // Voice-activity transmit is only honoured by the engine on
            // hosts that ship a Chanora-owned VAD pipeline (DEC-030:
            // Windows + Linux desktop and Android).  iOS / macOS rely
            // on Apple VoiceProcessingIO and have no VAD bridge, so
            // hiding the row prevents the UI from advertising a
            // transmit mode the engine cannot honour.
            if (voiceActivityTransmitAvailable)
            _ModeRow(
              label: l10n.voiceModeVoiceActivity,
              icon: Icons.graphic_eq,
@@ -652,7 +580,7 @@ class _VoiceSheetBodyState extends State<_VoiceSheetBody> {
              onTap: () => _setMode(rust.BridgeTransmitMode.voiceActivity),
            ),
-            // 3) Release-tail slider (PTT only).
+            // Release-tail slider (PTT only).
            if (isPtt) ...[
              const SizedBox(height: 8),
              Row(
@@ -702,8 +630,8 @@ class _VoiceSheetBodyState extends State<_VoiceSheetBody> {
            Divider(height: 1, color: theme.colorScheme.outlineVariant),
            const SizedBox(height: 12),
-            // 4) Level meter + live TX/RX stats.
+            // Level meter + live TX/RX stats.
-            VoiceLevelMeter(active: levelActive, level: _streamLevel ?? stats?.inputLevel),
+            VoiceLevelMeter(active: levelActive),
            const SizedBox(height: 6),
            _StatsRow(
              txRate: _txRate,
@@ -726,18 +654,76 @@ class _VoiceSheetBodyState extends State<_VoiceSheetBody> {
              ),
            ],
            // Audio processing.
            const SizedBox(height: 12),
            Divider(height: 1, color: theme.colorScheme.outlineVariant),
            const SizedBox(height: 8),
-            Text(
+
            // ── Collapsible: Audio processing ───────────────────────
            ExpansionTile(
              initiallyExpanded: false,
              shape: const Border(),
              collapsedShape: const Border(),
              tilePadding: const EdgeInsets.symmetric(horizontal: 0),
              title: Text(
                'Audio processing',
                style: theme.textTheme.labelLarge?.copyWith(
                  color: theme.colorScheme.onSurfaceVariant,
                ),
              ),
-            const SizedBox(height: 4),
+              children: [
                _buildAudioProcessingSection(theme),
              ],
            ),
            // ── Collapsible: PTT capability (PTT mode only) ─────────
            if (isPtt)
              ExpansionTile(
                initiallyExpanded: false,
                tilePadding: const EdgeInsets.symmetric(horizontal: 0),
                shape: const Border(),
                collapsedShape: const Border(),
                title: Text(
                  'PTT capability',
                  style: theme.textTheme.labelLarge?.copyWith(
                    color: theme.colorScheme.onSurfaceVariant,
                  ),
                ),
                children: [
                  PttCapabilityBadge(
                    level: widget.pttLevel,
                    backendId: widget.pttBackendId,
                    boundInputClass: widget.pttBoundInputClass,
                  ),
                  const SizedBox(height: 8),
                ],
              ),
            // ── Collapsible: Debug ──────────────────────────────────
            ExpansionTile(
              initiallyExpanded: false,
              shape: const Border(),
              collapsedShape: const Border(),
              tilePadding: const EdgeInsets.symmetric(horizontal: 0),
              title: Text(
                'Debug',
                style: theme.textTheme.labelLarge?.copyWith(
                  color: theme.colorScheme.onSurfaceVariant,
                ),
              ),
              children: [
                _buildDebugSection(theme),
              ],
            ),
          ],
        ),
      ),
    );
  }
  // ── Audio processing section (inside ExpansionTile) ─────────────────
  Widget _buildAudioProcessingSection(ThemeData theme) {
    return Column(
      crossAxisAlignment: CrossAxisAlignment.stretch,
      children: [
        // Android HW/SW selector.
        if (Platform.isAndroid) ...[
          const VoiceSubHeader('Processing backend'),
@@ -864,16 +850,17 @@ class _VoiceSheetBodyState extends State<_VoiceSheetBody> {
            _notifyAudioConfig();
          },
        ),
            // Debug.
        const SizedBox(height: 8),
-            Text(
+      ],
-              'Debug',
+    );
-              style: theme.textTheme.labelLarge?.copyWith(
+  }
-                color: theme.colorScheme.onSurfaceVariant,
+
-              ),
+  // ── Debug section (inside ExpansionTile) ─────────────────────────────
-            ),
+
-            const SizedBox(height: 2),
+  Widget _buildDebugSection(ThemeData theme) {
    return Column(
      crossAxisAlignment: CrossAxisAlignment.stretch,
      children: [
        AudioProcessingToggleRow(
          dense: true,
          label: 'WAV dump',
@@ -884,23 +871,8 @@ class _VoiceSheetBodyState extends State<_VoiceSheetBody> {
            _notifyAudioConfig();
          },
        ),
-
+        const SizedBox(height: 8),
            // 6) PTT capability badge. On iOS this must remain
            // visible even though the resolved level is always
            // `L0Focused`, because the P0 acceptance flow requires
            // honest capability advertising with an explanation of
            // the sandbox limitation.
            if (isPtt) ...[
              const SizedBox(height: 12),
              PttCapabilityBadge(
                level: widget.pttLevel,
                backendId: widget.pttBackendId,
                boundInputClass: widget.pttBoundInputClass,
              ),
      ],
          ],
        ),
      ),
    );
  }
 }
@@ -1026,3 +998,424 @@ class _ModeRow extends StatelessWidget {
    );
  }
 }
 // ── Unified mobile voice bar ──────────────────────────────────────────────
 /// A unified bottom-anchored voice bar for compact / mobile layouts.
 ///
 /// Combines the former [VoiceStatusChip] and [VoicePttButton] into one
 /// visual zone with two rows:
 ///
 ///   ┌──────────────────────────────────────────────┐
 ///   │ 🟢 PTT · Connected           [🔇] [🎧] [▲] │  ← control row (tap)
 ///   ├──────────────────────────────────────────────┤
 ///   │           ════ hold to talk ════             │  ← PTT row (hold)
 ///   └──────────────────────────────────────────────┘
 ///
 /// The PTT row is shown only when [transmitMode] is PTT; for continuous
 /// or voice-activity modes the bar shrinks to the control row alone.
 ///
 /// State colour is applied to the entire container:
 ///   - normal:           `surfaceContainerHigh`
 ///   - muted:            `errorContainer` (35 % alpha)
 ///   - talk-power-block: amber (18 % alpha)
 class CompactVoiceBar extends StatelessWidget {
  /// Construct a compact voice bar.
  const CompactVoiceBar({
    super.key,
    required this.inChannel,
    required this.transmitMode,
    required this.releaseTailMs,
    required this.pttBoundKeyLabel,
    required this.audioStats,
    required this.isTouchOnly,
    required this.inputMuted,
    required this.outputMuted,
    required this.onToggleInputMute,
    required this.onToggleOutputMute,
    required this.onOpenDetails,
    required this.onPttHeldChanged,
    this.talkPower,
    this.neededTalkPower,
    this.talkPowerGranted,
    this.hardMuteByTalkPower = false,
  });
  /// True when the client is inside a channel (gates PTT row visibility).
  final bool inChannel;
  /// Current transmit mode.
  final rust.BridgeTransmitMode transmitMode;
  /// Release-tail in milliseconds.
  final int releaseTailMs;
  /// Bound key label (empty on touch-only hosts).
  final String pttBoundKeyLabel;
  /// Current audio stats; null while audio engine not running.
  final rust.BridgeAudioStats? audioStats;
  /// True on iOS / iPadOS / Android.
  final bool isTouchOnly;
  /// True when local mic is muted.
  final bool inputMuted;
  /// True when local speaker is muted.
  final bool outputMuted;
  /// Toggle hard-mute on / off.
  final VoidCallback onToggleInputMute;
  /// Toggle output mute on / off.
  final VoidCallback onToggleOutputMute;
  /// Open the voice details modal sheet.
  final VoidCallback onOpenDetails;
  /// Called with `true` on finger-down, `false` on finger-up / cancel.
  final ValueChanged<bool> onPttHeldChanged;
  /// Own client's talk power.
  final int? talkPower;
  /// Talk power required to speak in current channel.
  final int? neededTalkPower;
  /// True when server granted talk power.
  final bool? talkPowerGranted;
  /// True when talk power prevents speaking.
  final bool hardMuteByTalkPower;
  @override
  Widget build(BuildContext context) {
    final theme = Theme.of(context);
    final l10n = AppL10n.of(context);
    final isPtt = transmitMode == rust.BridgeTransmitMode.ptt;
    final pttActive = audioStats?.pttActive ?? false;
    final summary = voiceStatusSummary(
      l10n: l10n,
      transmitMode: transmitMode,
      releaseTailMs: releaseTailMs,
      pttBoundKeyLabel: pttBoundKeyLabel,
      isTouchOnly: isTouchOnly,
      inputMuted: inputMuted,
      outputMuted: outputMuted,
      pttActive: pttActive,
      talkPower: talkPower,
      neededTalkPower: neededTalkPower,
      talkPowerGranted: talkPowerGranted,
    );
    // Container colour based on voice state.
    final containerColor = summary.talkPowerBlocked
        ? Colors.amber.withValues(alpha: 0.18)
        : summary.muted
            ? theme.colorScheme.errorContainer.withValues(alpha: 0.35)
            : theme.colorScheme.surfaceContainerHigh;
    final borderColor = summary.talkPowerBlocked
        ? Colors.amber.shade700
        : summary.muted
            ? theme.colorScheme.error
            : theme.colorScheme.outlineVariant;
    final borderWidth = 1.0;
    return Semantics(
      label: '${l10n.voiceSheetTitle}: ${summary.line1}, ${summary.line2}',
      child: Material(
        type: MaterialType.transparency,
        child: Container(
          decoration: BoxDecoration(
            color: containerColor,
            borderRadius: BorderRadius.circular(20),
            border: Border.all(color: borderColor, width: borderWidth),
          ),
          clipBehavior: Clip.antiAlias,
          child: AnimatedSize(
            duration: const Duration(milliseconds: 180),
            curve: Curves.easeOutCubic,
            alignment: Alignment.bottomCenter,
            child: Column(
              mainAxisSize: MainAxisSize.min,
              children: [
                // ── Control row ──────────────────────────────────────
                _ControlRow(
                  summary: summary,
                  inputMuted: inputMuted,
                  outputMuted: outputMuted,
                  hardMuteByTalkPower: hardMuteByTalkPower,
                  onToggleInputMute: onToggleInputMute,
                  onToggleOutputMute: onToggleOutputMute,
                  onOpenDetails: onOpenDetails,
                ),
                // ── PTT row (in-channel + PTT mode only) ──────────────
                if (isPtt && inChannel) ...[
                  Divider(
                    height: 1,
                    thickness: 0.5,
                    color: borderColor,
                    indent: 12,
                    endIndent: 12,
                  ),
                  _PttRow(
                    active: pttActive,
                    enabled: !hardMuteByTalkPower,
                    onHeldChanged: onPttHeldChanged,
                  ),
                ],
              ],
            ),
          ),
        ),
      ),
    );
  }
 }
 // ── Control row (tap-only zone) ───────────────────────────────────────────
 class _ControlRow extends StatelessWidget {
  const _ControlRow({
    required this.summary,
    required this.inputMuted,
    required this.outputMuted,
    required this.hardMuteByTalkPower,
    required this.onToggleInputMute,
    required this.onToggleOutputMute,
    required this.onOpenDetails,
  });
  final VoiceStatusSummary summary;
  final bool inputMuted;
  final bool outputMuted;
  final bool hardMuteByTalkPower;
  final VoidCallback onToggleInputMute;
  final VoidCallback onToggleOutputMute;
  final VoidCallback onOpenDetails;
  @override
  Widget build(BuildContext context) {
    final theme = Theme.of(context);
    return Padding(
      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
      child: Row(
        children: [
          // Status dot.
          Icon(
            summary.micOn ? Icons.fiber_manual_record : Icons.fiber_manual_record_outlined,
            size: 10,
            color: summary.micOn ? theme.colorScheme.primary : theme.colorScheme.outline,
          ),
          const SizedBox(width: 8),
          // Status text (tappable → open details).
          Expanded(
            child: Semantics(
              button: true,
              label: summary.line1,
              child: InkWell(
                onTap: onOpenDetails,
                borderRadius: BorderRadius.circular(8),
                child: Padding(
                  padding: const EdgeInsets.symmetric(vertical: 2),
                  child: Column(
                    crossAxisAlignment: CrossAxisAlignment.start,
                    mainAxisSize: MainAxisSize.min,
                    children: [
                      Text(
                        summary.line1,
                        maxLines: 1,
                        overflow: TextOverflow.ellipsis,
                        style: theme.textTheme.bodyMedium?.copyWith(
                          fontWeight: FontWeight.w500,
                        ),
                      ),
                      Text(
                        summary.line2,
                        maxLines: 1,
                        overflow: TextOverflow.ellipsis,
                        style: theme.textTheme.bodySmall?.copyWith(
                          color: theme.colorScheme.onSurfaceVariant,
                        ),
                      ),
                    ],
                  ),
                ),
              ),
            ),
          ),
          const SizedBox(width: 4),
          // Mute button.
          _ToggleButton(
            icon: inputMuted ? Icons.mic_off : Icons.mic,
            isActive: inputMuted,
            tooltip: 'Mute mic',
            onPressed: hardMuteByTalkPower ? null : onToggleInputMute,
          ),
          // Deafen button.
          _ToggleButton(
            icon: outputMuted ? Icons.headset_off : Icons.headset,
            isActive: outputMuted,
            tooltip: 'Deafen',
            onPressed: onToggleOutputMute,
          ),
          // Settings / expand chevron.
          IconButton(
            icon: Icon(Icons.expand_less, size: 20, color: theme.colorScheme.onSurfaceVariant),
            tooltip: 'Voice settings',
            onPressed: onOpenDetails,
            visualDensity: VisualDensity.compact,
            constraints: const BoxConstraints(minWidth: 40, minHeight: 40),
            padding: EdgeInsets.zero,
          ),
        ],
      ),
    );
  }
 }
 // ── Toggle button (mute / deafen) ─────────────────────────────────────────
 class _ToggleButton extends StatelessWidget {
  const _ToggleButton({
    required this.icon,
    required this.isActive,
    required this.tooltip,
    required this.onPressed,
  });
  final IconData icon;
  final bool isActive;
  final String tooltip;
  final VoidCallback? onPressed;
  @override
  Widget build(BuildContext context) {
    final theme = Theme.of(context);
    return IconButton(
      icon: Icon(icon, size: 22),
      tooltip: tooltip,
      color: isActive ? theme.colorScheme.error : null,
      onPressed: onPressed,
      visualDensity: VisualDensity.compact,
      constraints: const BoxConstraints(minWidth: 44, minHeight: 44),
      padding: EdgeInsets.zero,
    );
  }
 }
 // ── PTT row (hold-only zone) ──────────────────────────────────────────────
 class _PttRow extends StatefulWidget {
  const _PttRow({
    required this.active,
    required this.enabled,
    required this.onHeldChanged,
  });
  /// True while the engine reports the gate open.
  final bool active;
  /// Whether the PTT button can be engaged.
  final bool enabled;
  /// Called with `true` on pointer-down, `false` on pointer-up / cancel.
  final ValueChanged<bool> onHeldChanged;
  @override
  State<_PttRow> createState() => _PttRowState();
 }
 class _PttRowState extends State<_PttRow> {
  int? _activePointer;
  bool _held = false;
  @override
  void initState() {
    super.initState();
    prepareVoiceHaptics();
  }
  void _begin(PointerDownEvent event) {
    if (!widget.enabled || _activePointer != null) return;
    _activePointer = event.pointer;
    _held = true;
    widget.onHeldChanged(true);
    playVoicePttHaptic(true);
    setState(() {});
  }
  void _end(int pointer) {
    if (_activePointer != pointer) return;
    _activePointer = null;
    _held = false;
    widget.onHeldChanged(false);
    playVoicePttHaptic(false);
    setState(() {});
  }
  @override
  Widget build(BuildContext context) {
    final theme = Theme.of(context);
    final l10n = AppL10n.of(context);
    final activeNow = _held || widget.active;
    return Semantics(
      button: true,
      liveRegion: true,
      label: activeNow ? l10n.pttTransmitting : l10n.pttHoldToTalk,
      hint: l10n.pttHoldToTalkSemanticsHint,
      child: Listener(
        behavior: HitTestBehavior.opaque,
        onPointerDown: _begin,
        onPointerUp: (e) => _end(e.pointer),
        onPointerCancel: (e) => _end(e.pointer),
        child: ExcludeSemantics(
          child: Container(
            padding: const EdgeInsets.symmetric(vertical: 16),
            decoration: BoxDecoration(
              color: activeNow
                  ? theme.colorScheme.primary
                  : Colors.transparent,
            ),
            child: Center(
              child: Row(
                mainAxisSize: MainAxisSize.min,
                children: [
                  Icon(
                    activeNow ? Icons.mic : Icons.mic_none_outlined,
                    size: 22,
                    color: activeNow
                        ? theme.colorScheme.onPrimary
                        : theme.colorScheme.onSurfaceVariant,
                  ),
                  const SizedBox(width: 8),
                  Text(
                    activeNow ? l10n.voiceMicOn : l10n.voiceModePtt,
                    style: theme.textTheme.bodyMedium?.copyWith(
                      fontWeight: FontWeight.w600,
                      letterSpacing: 0.3,
                      color: activeNow
                          ? theme.colorScheme.onPrimary
                          : theme.colorScheme.onSurfaceVariant,
                    ),
                  ),
                ],
              ),
            ),
          ),
        ),
      ),
    );
  }
 }
@@ -1,78 +1,28 @@
 import 'dart:math' show max;
 import 'package:flutter/material.dart';
 /// Shared compact level meter used by voice surfaces.
-///
+class VoiceLevelMeter extends StatelessWidget {
-/// When [level] is null (no stats available yet), falls back to [active]
+  const VoiceLevelMeter({super.key, required this.active});
 /// for a binary indicator. When [level] is provided it is interpreted as
 /// dBFS and mapped to a 0–1 fill fraction via [dbfsToFraction] (floors
 /// at -60 dBFS).
 class VoiceLevelMeter extends StatefulWidget {
  const VoiceLevelMeter({super.key, this.active = false, this.level});
  /// Binary fallback when no dBFS value is available.
  final bool active;
  /// Real input level in dBFS (-120 = silence, 0 = clipping).
  /// Null means stats are not yet available; [active] is used instead.
  final double? level;
  /// Map dBFS [-60, 0] → [0.0, 1.0].
  static double dbfsToFraction(double dbfs) {
    const floor = -60.0;
    if (dbfs <= floor) return 0.0;
    if (dbfs >= 0.0) return 1.0;
    return (dbfs - floor) / -floor;
  }
  @override
  State<VoiceLevelMeter> createState() => _VoiceLevelMeterState();
 }
 class _VoiceLevelMeterState extends State<VoiceLevelMeter> {
  double _previousFill = 0.0;
  @override
  Widget build(BuildContext context) {
    final theme = Theme.of(context);
    final double fill;
    final Color color;
    if (widget.level != null) {
      fill = VoiceLevelMeter.dbfsToFraction(widget.level!);
      color = fill > 0.0
          ? theme.colorScheme.primary
          : theme.colorScheme.outlineVariant;
    } else {
      fill = widget.active ? 0.75 : 0.05;
      color = widget.active
          ? theme.colorScheme.primary
          : theme.colorScheme.outlineVariant;
    }
    final begin = _previousFill;
    _previousFill = fill;
    return Container(
      height: 8,
      decoration: BoxDecoration(
        color: theme.colorScheme.surfaceContainerHighest,
        borderRadius: BorderRadius.circular(4),
      ),
-      child: TweenAnimationBuilder<double>(
+      child: FractionallySizedBox(
        tween: Tween<double>(begin: begin, end: fill),
        duration: const Duration(milliseconds: 120),
        curve: Curves.easeOut,
        builder: (context, animatedFill, child) {
          return FractionallySizedBox(
        alignment: AlignmentDirectional.centerStart,
-            widthFactor: max(animatedFill, 0.02),
+        widthFactor: active ? 0.75 : 0.05,
            child: child,
          );
        },
        child: Container(
          decoration: BoxDecoration(
-            color: color,
+            color: active
                ? theme.colorScheme.primary
                : theme.colorScheme.outlineVariant,
            borderRadius: BorderRadius.circular(4),
          ),
        ),
@@ -128,12 +128,7 @@ class _VoiceSettingsDialogState extends State<VoiceSettingsDialog> {
              VoiceSectionHeader(l10n.voiceModeLabel),
              SegmentedButton<rust.BridgeTransmitMode>(
                style: voiceSegmentedButtonStyle(theme),
-                // DEC-030: hide the voice-activity segment on hosts
+                segments: transmitModeSegments,
                // that ship no Chanora-owned VAD pipeline (iOS,
                // macOS, web).
                segments: transmitModeSegmentsFor(
                  voiceActivityAvailable: voiceActivityTransmitAvailable,
                ),
                selected: {_mode},
                onSelectionChanged: (s) => setState(() => _mode = s.first),
              ),
@@ -1,6 +1,3 @@
 import 'dart:io' show Platform;
 import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:flutter/material.dart';
 import '../src/rust/api.dart' as rust;
@@ -13,11 +10,7 @@ ButtonStyle voiceSegmentedButtonStyle(ThemeData theme) {
  );
 }
-/// Transmit mode selector segments — full set, all three modes.
+/// Transmit mode selector segments.
 ///
 /// This list is kept stable for legacy call sites and tests; UI
 /// surfaces that must respect DEC-030 platform gating should prefer
 /// [transmitModeSegmentsFor] with [voiceActivityTransmitAvailable].
 const transmitModeSegments = [
  ButtonSegment(
    value: rust.BridgeTransmitMode.ptt,
@@ -36,43 +29,6 @@ const transmitModeSegments = [
  ),
 ];
 /// Transmit mode selector segments, optionally dropping the
 /// voice-activity entry on hosts that do not ship a VAD pipeline.
 ///
 /// Voice activity transmit is gated by [voiceActivityTransmitAvailable]
 /// because the underlying VAD pipeline ships only on Windows, Linux, and
 /// Android per DEC-030.  Builds for unsupported platforms (iOS, macOS,
 /// web) drop the VAD segment entirely so the UI never advertises a
 /// transmit mode the engine cannot honour.
 List<ButtonSegment<rust.BridgeTransmitMode>> transmitModeSegmentsFor({
  required bool voiceActivityAvailable,
 }) {
  if (voiceActivityAvailable) return transmitModeSegments;
  return const [
    ButtonSegment(
      value: rust.BridgeTransmitMode.ptt,
      label: Text('PTT'),
      icon: Icon(Icons.radio_button_checked, size: 14),
    ),
    ButtonSegment(
      value: rust.BridgeTransmitMode.continuous,
      label: Text('Always'),
      icon: Icon(Icons.podcasts, size: 14),
    ),
  ];
 }
 /// True when this host advertises VAD transmit per DEC-030.
 ///
 /// The desktop Silero ONNX + WebRTC fallback ships on Windows and
 /// Linux; the Android Oboe + WebRTC path covers Android; iOS uses the
 /// Apple CoreML Silero VAD pipeline via `vad::apple_coreml`. macOS is
 /// still gated until its VAD pipeline is confirmed.
 bool get voiceActivityTransmitAvailable {
  if (kIsWeb) return false;
  return Platform.isWindows || Platform.isLinux || Platform.isAndroid || Platform.isIOS;
 }
 /// Android hardware/WebRTC selector segments.
 const androidProcessingSegments = [
  ButtonSegment(
@@ -1,6 +1,2 @@
 #include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "ephemeral/Flutter-Generated.xcconfig"
 // Mirror Flutter-Release.xcconfig (see explanation there).
 OTHER_LDFLAGS = $(inherited) -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_create -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_destroy -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_reset -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_process -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_last_error -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_free_string
 STRIP_STYLE = non-global
@@ -1,11 +1,2 @@
 #include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "ephemeral/Flutter-Generated.xcconfig"
 // macOS Release defaults to DEAD_CODE_STRIPPING = YES. See
 // ios/Flutter/Release.xcconfig for the full rationale; -u is the
 // load-bearing flag, -exported_symbol re-exports for dlsym, both
 // are intentionally present per @_cdecl symbol.
 OTHER_LDFLAGS = $(inherited) -Xlinker -u -Xlinker _chanora_silero_vad_create -Xlinker -u -Xlinker _chanora_silero_vad_destroy -Xlinker -u -Xlinker _chanora_silero_vad_reset -Xlinker -u -Xlinker _chanora_silero_vad_process -Xlinker -u -Xlinker _chanora_silero_vad_last_error -Xlinker -u -Xlinker _chanora_silero_vad_free_string -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_create -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_destroy -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_reset -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_process -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_last_error -Xlinker -exported_symbol -Xlinker _chanora_silero_vad_free_string
 // See ios/Flutter/Release.xcconfig for the STRIP_STYLE rationale.
 STRIP_STYLE = non-global
@@ -0,0 +1 @@
 Versions/Current/Resources
@@ -0,0 +1,14 @@
 <?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>
  <key>CFBundleExecutable</key><string>chanora_bridge</string>
  <key>CFBundleIdentifier</key><string>app.chanora.bridge</string>
  <key>CFBundleName</key><string>chanora_bridge</string>
  <key>CFBundlePackageType</key><string>FMWK</string>
  <key>CFBundleShortVersionString</key><string>1.0.0</string>
  <key>CFBundleVersion</key><string>1</string>
  <key>CFBundleSupportedPlatforms</key><array><string>MacOSX</string></array>
  <key>MinimumOSVersion</key><string>10.15</string>
 </dict>
 </plist>
@@ -0,0 +1 @@
 A
@@ -0,0 +1 @@
 Versions/Current/chanora_bridge
@@ -1,20 +1,57 @@
 PODS:
  - audio_session (0.0.1):
    - FlutterMacOS
  - chanora_bridge (1.0.0)
  - connectivity_plus (0.0.1):
    - FlutterMacOS
  - FlutterMacOS (1.0.0)
  - package_info_plus (0.0.1):
    - FlutterMacOS
  - share_plus (0.0.1):
    - FlutterMacOS
  - shared_preferences_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
  - url_launcher_macos (0.0.1):
    - FlutterMacOS
 DEPENDENCIES:
  - audio_session (from `Flutter/ephemeral/.symlinks/plugins/audio_session/macos`)
  - chanora_bridge (from `/Users/edison/dev/chanora/apps/chanora_flutter/macos`)
  - connectivity_plus (from `Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos`)
  - FlutterMacOS (from `Flutter/ephemeral`)
  - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
  - share_plus (from `Flutter/ephemeral/.symlinks/plugins/share_plus/macos`)
  - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)
  - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
 EXTERNAL SOURCES:
  audio_session:
    :path: Flutter/ephemeral/.symlinks/plugins/audio_session/macos
  chanora_bridge:
    :path: "/Users/edison/dev/chanora/apps/chanora_flutter/macos"
  connectivity_plus:
    :path: Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos
  FlutterMacOS:
    :path: Flutter/ephemeral
  package_info_plus:
    :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos
  share_plus:
    :path: Flutter/ephemeral/.symlinks/plugins/share_plus/macos
  shared_preferences_foundation:
    :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin
  url_launcher_macos:
    :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
 SPEC CHECKSUMS:
-  chanora_bridge: 9d1469952801a1caa3bb56d5d3bce91df8dca4ad
+  audio_session: eaca2512cf2b39212d724f35d11f46180ad3a33e
  chanora_bridge: 4105993843b5421ee4ce72220a74c63f6fd99103
  connectivity_plus: 4adf20a405e25b42b9c9f87feff8f4b6fde18a4e
  FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1
  package_info_plus: f0052d280d17aa382b932f399edf32507174e870
  share_plus: 510bf0af1a42cd602274b4629920c9649c52f4cc
  shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
  url_launcher_macos: f87a979182d112f911de6820aefddaf56ee9fbfd
 PODFILE CHECKSUM: 99f0d126cab50f07c488b8550ebf033d2e8bcaeb
@@ -32,7 +32,6 @@
 		45F255D1DE0134185DB5423D /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 06E1AA7E1FB968C1D78DA8DE /* PrivacyInfo.xcprivacy */; };
 		9B86175918197ECC64969956 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EFEADEEFAB54DFEAAD7A70E9 /* Pods_Runner.framework */; };
 		C2DC22E19FDCE26B9D79442E /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE04BBB936AA14C2B58FA0E /* Pods_RunnerTests.framework */; };
 		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
@@ -94,7 +93,6 @@
 		ED6F5EE0C5FD4DA22D79188C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		EFEADEEFAB54DFEAAD7A70E9 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		FDE04BBB936AA14C2B58FA0E /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -110,7 +108,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
 				8C6000042DD0000000000001 /* SileroCoreML in Frameworks */,
 				9B86175918197ECC64969956 /* Pods_Runner.framework in Frameworks */,
 			);
@@ -173,7 +170,6 @@
 		33CEB47122A05771004F2AC0 /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
 				78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */,
 				335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */,
 				33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */,
 				33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */,
@@ -248,7 +244,6 @@
 				4287874B577AE59BBE39386D /* [CP] Check Pods Manifest.lock */,
 				33CC10E92044A3C60003C045 /* Sources */,
 				33CC10EA2044A3C60003C045 /* Frameworks */,
 				CA110002000000000000A200 /* Verify Silero Exports */,
 				33CC10EB2044A3C60003C045 /* Resources */,
 				33CC110E2044A8840003C045 /* Bundle Framework */,
 				3399D490228B24CF009A79C7 /* ShellScript */,
@@ -261,7 +256,6 @@
 			);
 			name = Runner;
 			packageProductDependencies = (
 				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
 				8C6000032DD0000000000001 /* SileroCoreML */,
 			);
 			productName = Runner;
@@ -308,7 +302,6 @@
 			);
 			mainGroup = 33CC10E42044A3C60003C045;
 			packageReferences = (
 				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
 				8C6000022DD0000000000001 /* XCLocalSwiftPackageReference "silero-coreml" */,
 			);
 			productRefGroup = 33CC10EE2044A3C60003C045 /* Products */;
@@ -442,21 +435,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		CA110002000000000000A200 /* Verify Silero Exports */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
 			name = "Verify Silero Exports";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/../scripts/verify_silero_exports.sh\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 /* Begin PBXSourcesBuildPhase section */
@@ -887,10 +865,6 @@
 			isa = XCLocalSwiftPackageReference;
 			relativePath = ../../../silero-coreml;
 		};
 		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
 			isa = XCLocalSwiftPackageReference;
 			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
 		};
 /* End XCLocalSwiftPackageReference section */
 /* Begin XCSwiftPackageProductDependency section */
@@ -899,10 +873,6 @@
 			package = 8C6000022DD0000000000001 /* XCLocalSwiftPackageReference "silero-coreml" */;
 			productName = SileroCoreML;
 		};
 		78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = FlutterGeneratedPluginSwiftPackage;
 		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 33CC10E52044A3C60003C045 /* Project object */;
@@ -5,24 +5,6 @@
   <BuildAction
      parallelizeBuildables = "YES"
      buildImplicitDependencies = "YES">
      <PreActions>
         <ExecutionAction
            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
            <ActionContent
               title = "Run Prepare Flutter Framework Script"
               scriptText = "&quot;$FLUTTER_ROOT&quot;/packages/flutter_tools/bin/macos_assemble.sh prepare&#10;">
               <EnvironmentBuildable>
                  <BuildableReference
                     BuildableIdentifier = "primary"
                     BlueprintIdentifier = "33CC10EC2044A3C60003C045"
                     BuildableName = "chanora_flutter.app"
                     BlueprintName = "Runner"
                     ReferencedContainer = "container:Runner.xcodeproj">
                  </BuildableReference>
               </EnvironmentBuildable>
            </ActionContent>
         </ExecutionAction>
      </PreActions>
      <BuildActionEntries>
         <BuildActionEntry
            buildForTesting = "YES"
@@ -7,10 +7,6 @@ class AppDelegate: FlutterAppDelegate {
  override func applicationDidFinishLaunching(_ notification: Notification) {
    super.applicationDidFinishLaunching(notification)
    DispatchQueue.global(qos: .utility).async {
      ChanoraSileroSelfTest.run()
    }
    // Ask for microphone access on launch rather than on first
    // voice-channel join. Matches user expectations for a voice
    // chat client and saves the user from a surprising prompt
@@ -2,10 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<!-- Flutter default: app-sandbox + JIT for the Dart VM. network.server is
+	<!-- Flutter default: app-sandbox + JIT for the Dart VM + server
-	     required for the `flutter run` hot-reload listener AND, on macOS, for
+	     listener for `flutter run` hot-reload. -->
 	     every UDP bind() the app does (tsclientlib binds 0.0.0.0:0 for
 	     outbound TS3 traffic and the sandbox treats that as a server op). -->
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
 	<key>com.apple.security.cs.allow-jit</key>
@@ -22,8 +22,6 @@
 	<string>$(FLUTTER_BUILD_NAME)</string>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<true/>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>
@@ -42,8 +40,6 @@
 	<string>Chanora uses Input Monitoring so push-to-talk keys work even when other apps are focused. Chanora never records what you type — only the key you bound for talking.</string>
 	<key>NSLocalNetworkUsageDescription</key>
 	<string>Chanora needs local network access to connect to TeamSpeak-compatible voice servers.</string>
 	<key>NSUserNotificationsUsageDescription</key>
 	<string>Chanora sends you a notification when another user pokes you.</string>
 	<key>NSBonjourServices</key>
 	<array>
 		<string>_ts3._tcp</string>
@@ -1,106 +0,0 @@
 import Cocoa
 import CoreAudio
 import FlutterMacOS
 import os.log
 // ---------------------------------------------------------------------------
 // MacOSAudioLifecycle
 //
 // Native-side MethodChannel handler for macOS audio lifecycle events.
 // Closes the iOS / macOS asymmetry that the iOS AppDelegate handles via
 // AVAudioSession (no AVAudioSession equivalent on macOS). The macOS
 // equivalents of the iOS lifecycle events are:
 //
 //   * Default audio device change  — Core Audio HAL default-input /
 //     default-output device property listeners (mirrors iOS route
 //     change). Posted as `handleDefaultDeviceChange` with payload
 //     `{role: 'input' | 'output'}`.
 //
 //   * VPIO AudioUnit configuration change — observed via the VPIO
 //     unit's `kAudioUnitProperty_StreamFormat` property listener.
 //     Posted as `handleConfigurationChange` with no payload.
 //
 // Channel name: `chanora/macos_audio_lifecycle`. The Dart side wires the
 // matching `chanora/ios_audio_lifecycle`-shaped event surface in
 // `audio_lifecycle_service.dart` and currently logs the events; the
 // engine-restart call (FRB `macos_default_device_changed`) is a
 // follow-up.
 //
 // Trace: SysRS-051 (macOS audio-lifecycle asymmetry), SysRS-311
 // (the deferred macOS audio-lifecycle platform-adapter allocation).
 // ---------------------------------------------------------------------------
 private let kLogTag = "chanora_flutter.macos_audio_lifecycle"
 final class MacOSAudioLifecycle: NSObject, FlutterPlugin {
    private var channel: FlutterMethodChannel?
    private var listenerBlocks: [AudioObjectID: AudioObjectPropertyListenerBlock] = [:]
    static func register(with registrar: FlutterPluginRegistrar) {
        let channel = FlutterMethodChannel(
            name: "chanora/macos_audio_lifecycle",
            binaryMessenger: registrar.messenger
        )
        let instance = MacOSAudioLifecycle()
        instance.channel = channel
        registrar.addMethodCallDelegate(instance, channel: channel)
        instance.startObserving()
    }
    func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
        // macOS audio lifecycle is a one-way push: Swift → Dart.
        // The Dart side never invokes methods on this channel.
        result(FlutterMethodNotImplemented)
    }
    // MARK: - Core Audio HAL listeners
    private func startObserving() {
        registerDefaultDeviceListener(role: "output")
        registerDefaultDeviceListener(role: "input")
    }
    private func registerDefaultDeviceListener(role: String) {
        let selector: AudioObjectPropertySelector = (role == "input")
            ? kAudioHardwarePropertyDefaultInputDevice
            : kAudioHardwarePropertyDefaultOutputDevice
        var address = AudioObjectPropertyAddress(
            mSelector: selector,
            mScope: kAudioObjectPropertyScopeGlobal,
            mElement: kAudioObjectPropertyElementMain
        )
        let objectID: AudioObjectID = AudioObjectID(kAudioObjectSystemObject)
        let channel = self.channel
        let block: AudioObjectPropertyListenerBlock = { _, _ in
            os_log("default %{public}@ device changed", log: OSLog(subsystem: kLogTag, category: "lifecycle"), type: .info, role)
            channel?.invokeMethod("handleDefaultDeviceChange", arguments: ["role": role])
        }
        let status = AudioObjectAddPropertyListener(objectID, &address, block, nil)
        if status == noErr {
            listenerBlocks[objectID + UInt32(role.hashValue & 0xFFFF)] = block
            os_log("registered default %{public}@ device listener", log: OSLog(subsystem: kLogTag, category: "lifecycle"), type: .info, role)
        } else {
            os_log("failed to register default %{public}@ device listener (OSStatus %{public}d)",
                   log: OSLog(subsystem: kLogTag, category: "lifecycle"),
                   type: .error, role, Int(status))
        }
    }
    deinit {
        // Best-effort cleanup; AudioObjectRemovePropertyListener only
        // matters if the system still holds the block.
        for (id, block) in listenerBlocks {
            for selector in [
                kAudioHardwarePropertyDefaultInputDevice,
                kAudioHardwarePropertyDefaultOutputDevice,
            ] {
                var address = AudioObjectPropertyAddress(
                    mSelector: selector,
                    mScope: kAudioObjectPropertyScopeGlobal,
                    mElement: kAudioObjectPropertyElementMain
                )
                _ = AudioObjectRemovePropertyListener(id, &address, block, nil)
            }
        }
    }
 }
@@ -48,7 +48,6 @@ class MacOSPermissionsHandler: NSObject, FlutterPlugin {
    // -- Input Monitoring ---------------------------------------------------
    case "checkInputMonitoring":
      result(inputMonitoringStateString())
      startInputMonitoringPolling()
    case "requestInputMonitoring":
      requestInputMonitoring(result: result)
@@ -63,18 +62,6 @@ class MacOSPermissionsHandler: NSObject, FlutterPlugin {
    case "triggerLocalNetworkPrompt":
      triggerLocalNetworkPrompt(result: result)
    case "checkLocalNetworkAccess":
      guard let args = call.arguments as? [String: Any],
            let host = args["host"] as? String,
            let port = args["port"] as? Int else {
        result(FlutterError(
          code: "INVALID_ARGS",
          message: "checkLocalNetworkAccess requires host (String) and port (Int)",
          details: nil))
        return
      }
      checkLocalNetworkAccess(host: host, port: port, result: result)
    // -- Notifications ------------------------------------------------------
    case "checkNotifications":
      checkNotifications(result: result)
@@ -211,10 +198,10 @@ class MacOSPermissionsHandler: NSObject, FlutterPlugin {
      case .failed(let error):
        if !resolved {
          resolved = true
-          // Check for DNS policy-denied error (kDNSServiceErr_PolicyDenied = -65570).
+          let code = error.errorCode
-          // This is the canonical signal that the user denied the Local Network prompt.
+          // POSIX permission-denied or network-down signals that
-          if case .dns(let dnsError) = error,
+          // the user denied the Local Network prompt.
-             dnsError == DNSServiceErrorType(kDNSServiceErr_PolicyDenied) {
+          if code == ENETDOWN || code == EACCES || code == EPERM {
            result("Denied")
            self?.channel?.invokeMethod("localNetworkStateChanged", arguments: [
              "state": "Denied",
@@ -226,23 +213,11 @@ class MacOSPermissionsHandler: NSObject, FlutterPlugin {
          }
        }
        browser.cancel()
-      case .waiting(let error):
+      case .waiting:
-        // The browser is waiting for network. If the specific DNS error
+        // The browser is waiting for network — this is normal and
-        // is kDNSServiceErr_PolicyDenied, the user explicitly denied
+        // may mean the permission dialog is showing. Don't resolve
-        // the Local Network prompt — report immediately.
+        // yet; wait for .ready or .failed or the timeout.
-        if case .dns(let dnsError) = error,
+        break
           dnsError == DNSServiceErrorType(kDNSServiceErr_PolicyDenied) {
          if !resolved {
            resolved = true
            result("Denied")
            self?.channel?.invokeMethod("localNetworkStateChanged", arguments: [
              "state": "Denied",
            ])
          }
          browser.cancel()
        }
        // Otherwise the system dialog may be showing — wait for
        // .ready, .failed, or the timeout.
      case .setup, .cancelled:
        break
      @unknown default:
@@ -271,77 +246,6 @@ class MacOSPermissionsHandler: NSObject, FlutterPlugin {
    }
  }
  /// Probe whether Local Network access is currently denied for a specific
  /// host:port by creating a short-lived NWConnection and checking
  /// `unsatisfiedReason == .localNetworkDenied`.  This does NOT trigger a
  /// new system prompt — it is a read-only check.
  private func checkLocalNetworkAccess(
    host: String, port: Int, result: @escaping FlutterResult
  ) {
    if #available(macOS 15.0, *) {
      checkLocalNetworkAccessImpl(host: host, port: port, result: result)
    } else {
      result("Unsupported")
    }
  }
  @available(macOS 15.0, *)
  private func checkLocalNetworkAccessImpl(
    host: String, port: Int, result: @escaping FlutterResult
  ) {
    guard let endpointPort = NWEndpoint.Port(rawValue: UInt16(port)) else {
      result("NotDetermined")
      return
    }
    let endpointHost = NWEndpoint.Host(host)
    let connection = NWConnection(
      host: endpointHost, port: endpointPort, using: .tcp)
    let queue = DispatchQueue(
      label: "app.chanora.macos_permissions.local_network_check")
    var didComplete = false
    func finish(_ state: String) {
      guard !didComplete else { return }
      didComplete = true
      connection.cancel()
      result(state)
    }
    connection.stateUpdateHandler = { state in
      switch state {
      case .waiting, .failed:
        if connection.currentPath?.unsatisfiedReason
            == .localNetworkDenied {
          finish("Denied")
        } else {
          finish("NotDetermined")
        }
      case .ready:
        finish("Granted")
      case .cancelled:
        finish("NotDetermined")
      case .setup, .preparing:
        break
      @unknown default:
        break
      }
    }
    connection.start(queue: queue)
    DispatchQueue.main.asyncAfter(deadline: .now() + 1.5) {
      if !didComplete {
        if connection.currentPath?.unsatisfiedReason
            == .localNetworkDenied {
          finish("Denied")
        } else {
          finish("NotDetermined")
        }
      }
    }
  }
  // =========================================================================
  // Notifications
  // =========================================================================
@@ -399,8 +303,6 @@ class MainFlutterWindow: NSWindow {
    // Register the macOS permissions MethodChannel handler.
    MacOSPermissionsHandler.register(with: flutterViewController.registrar(forPlugin: "MacOSPermissionsHandler"))
    // Register the macOS audio-lifecycle MethodChannel handler (closes the iOS/macOS asymmetry in SysRS-051).
    MacOSAudioLifecycle.register(with: flutterViewController.registrar(forPlugin: "MacOSAudioLifecycle"))
    super.awakeFromNib()
  }
@@ -2,26 +2,12 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<!-- Release builds omit cs.allow-jit (Flutter hot-reload only). They keep
+	<!-- Release builds omit the cs.allow-jit + network.server entitlements
-	     network.server because the macOS App Sandbox classifies UDP bind()
+	     used only by Flutter's debug hot-reload. -->
 	     against a local port - including the ephemeral 0.0.0.0:0 that
 	     tsclientlib's tokio::net::UdpSocket::bind() issues for outbound
 	     voice traffic - as a server operation that requires
 	     com.apple.security.network.server, regardless of whether the
 	     socket is later used only to sendto() a remote peer. Without it,
 	     bind() returns EPERM and the sandbox log records
 	     "Sandbox: chanora(...) deny(1) network-bind". network.client
 	     alone gates outbound connect()-style flows (TCP, connected UDP)
 	     and is insufficient for the bind()-then-sendto() pattern Tokio's
 	     UdpSocket uses. See Apple's App Sandbox entitlement reference:
 	     "Network Server" covers any process that listens on, or binds
 	     to, a network port. -->
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
 	<key>com.apple.security.network.client</key>
 	<true/>
 	<key>com.apple.security.network.server</key>
 	<true/>
 	<key>com.apple.security.device.audio-input</key>
 	<true/>
 </dict>
@@ -1,5 +1,4 @@
 import CoreML
 import Darwin
 import Foundation
 import SileroCoreML
@@ -97,136 +96,3 @@ public func chanoraSileroVadFreeString(_ string: UnsafeMutablePointer<CChar>?) {
    guard let string else { return }
    free(string)
 }
@objc public final class ChanoraSileroSelfTest: NSObject {
    // Validates the same code path the Rust framework uses: dlsym(RTLD_DEFAULT) for all
    // six @_cdecl symbols, then exercises create -> reset -> process -> destroy. Catches
    // the dead-strip / linker-export class of bug that broke TestFlight; calling the Swift
    // functions directly would mask it because direct calls bypass the dynamic symbol table.
    @objc public static func run() {
        let started = DispatchTime.now()
        // Static linker references: keep the Swift compiler / linker from
        // dead-stripping the @_cdecl symbols under Whole-Module-Optimization
        // + LTO in Archive builds. dlsym(RTLD_DEFAULT) below does NOT count
        // as a static reference for the dead-stripper — these `_ = ` lines
        // do. Without them, TestFlight builds shipped without the symbols
        // even though Debug builds (no LTO) worked.
        //
        // The `withoutActuallyEscaping` dance prevents the optimizer from
        // proving the references are unused: assigning the function value
        // to a `@convention(c)` typealias forces address-taken semantics.
        _ = unsafeBitCast(
            chanoraSileroVadCreate as @convention(c) () -> UnsafeMutableRawPointer?,
            to: UnsafeRawPointer.self,
        )
        _ = unsafeBitCast(
            chanoraSileroVadDestroy as @convention(c) (UnsafeMutableRawPointer?) -> Void,
            to: UnsafeRawPointer.self,
        )
        _ = unsafeBitCast(
            chanoraSileroVadReset as @convention(c) (UnsafeMutableRawPointer?) -> Int32,
            to: UnsafeRawPointer.self,
        )
        _ = unsafeBitCast(
            chanoraSileroVadProcess
                as @convention(c) (
                    UnsafeMutableRawPointer?, UnsafePointer<Float>?, Int,
                    UnsafeMutablePointer<Float>?
                ) -> Int32,
            to: UnsafeRawPointer.self,
        )
        _ = unsafeBitCast(
            chanoraSileroVadLastError as @convention(c) () -> UnsafeMutablePointer<CChar>?,
            to: UnsafeRawPointer.self,
        )
        _ = unsafeBitCast(
            chanoraSileroVadFreeString as @convention(c) (UnsafeMutablePointer<CChar>?) -> Void,
            to: UnsafeRawPointer.self,
        )
        typealias CreateFn = @convention(c) () -> UnsafeMutableRawPointer?
        typealias DestroyFn = @convention(c) (UnsafeMutableRawPointer?) -> Void
        typealias ResetFn = @convention(c) (UnsafeMutableRawPointer?) -> Int32
        typealias ProcessFn = @convention(c) (
            UnsafeMutableRawPointer?, UnsafePointer<Float>?, Int, UnsafeMutablePointer<Float>?
        ) -> Int32
        typealias LastErrorFn = @convention(c) () -> UnsafeMutablePointer<CChar>?
        typealias FreeStringFn = @convention(c) (UnsafeMutablePointer<CChar>?) -> Void
        func resolve<T>(_ name: String, as type: T.Type) -> T? {
            guard let raw = dlsym(UnsafeMutableRawPointer(bitPattern: -2), name) else {
                return nil
            }
            return unsafeBitCast(raw, to: type)
        }
        let names = [
            "chanora_silero_vad_create",
            "chanora_silero_vad_destroy",
            "chanora_silero_vad_reset",
            "chanora_silero_vad_process",
            "chanora_silero_vad_last_error",
            "chanora_silero_vad_free_string",
        ]
        let missing = names.filter { dlsym(UnsafeMutableRawPointer(bitPattern: -2), $0) == nil }
        if !missing.isEmpty {
            NSLog("chanora_flutter: SileroCoreML self-test FAILED dlsym missing=\(missing.joined(separator: ","))")
            return
        }
        guard
            let create = resolve("chanora_silero_vad_create", as: CreateFn.self),
            let destroy = resolve("chanora_silero_vad_destroy", as: DestroyFn.self),
            let reset = resolve("chanora_silero_vad_reset", as: ResetFn.self),
            let process = resolve("chanora_silero_vad_process", as: ProcessFn.self),
            let lastError = resolve("chanora_silero_vad_last_error", as: LastErrorFn.self),
            let freeString = resolve("chanora_silero_vad_free_string", as: FreeStringFn.self)
        else {
            NSLog("chanora_flutter: SileroCoreML self-test FAILED unsafeBitCast resolution")
            return
        }
        func readError() -> String {
            guard let ptr = lastError() else { return "unknown" }
            let msg = String(cString: ptr)
            freeString(ptr)
            return msg
        }
        guard let handle = create() else {
            let elapsedMs = elapsedMs(since: started)
            NSLog("chanora_flutter: SileroCoreML self-test FAILED at create err=\(readError()) elapsed_ms=\(elapsedMs)")
            return
        }
        let resetRc = reset(handle)
        if resetRc != 0 {
            destroy(handle)
            let elapsedMs = elapsedMs(since: started)
            NSLog("chanora_flutter: SileroCoreML self-test FAILED at reset rc=\(resetRc) err=\(readError()) elapsed_ms=\(elapsedMs)")
            return
        }
        let chunkSize = SileroVADRunner.chunkSize
        var probability: Float = 0
        let samples = [Float](repeating: 0, count: chunkSize)
        let processRc = samples.withUnsafeBufferPointer { buf -> Int32 in
            process(handle, buf.baseAddress, chunkSize, &probability)
        }
        destroy(handle)
        let elapsedMs = elapsedMs(since: started)
        if processRc == 0 {
            NSLog("chanora_flutter: SileroCoreML self-test OK probability=\(probability) elapsed_ms=\(elapsedMs)")
        } else {
            NSLog("chanora_flutter: SileroCoreML self-test FAILED at process rc=\(processRc) err=\(readError()) elapsed_ms=\(elapsedMs)")
        }
    }
    private static func elapsedMs(since start: DispatchTime) -> String {
        let ns = DispatchTime.now().uptimeNanoseconds &- start.uptimeNanoseconds
        return String(format: "%.1f", Double(ns) / 1_000_000.0)
    }
 }
@@ -52,25 +52,19 @@ Pod::Spec.new do |s|
    echo "[chanora_bridge.podspec] cargo build aarch64-apple-darwin"
    cd "$REPO_ROOT"
-    PATH="$HOME/.cargo/bin:/opt/homebrew/opt/rustup/bin:/opt/homebrew/bin:$PATH" \\
+    PATH="$HOME/.cargo/bin:$PATH" \\
      MACOSX_DEPLOYMENT_TARGET=#{MACOS_BRIDGE_DEPLOYMENT_TARGET} \\
      CMAKE_POLICY_VERSION_MINIMUM=3.5 \\
      LIBOPUS_STATIC=1 \\
      LIBOPUS_NO_PKG=1 \\
      CARGO_PROFILE_RELEASE_DEBUG=true \\
      CARGO_PROFILE_RELEASE_SPLIT_DEBUGINFO=off \\
      CARGO_PROFILE_RELEASE_STRIP=false \\
      cargo build --release --target aarch64-apple-darwin -p chanora_bridge
    echo "[chanora_bridge.podspec] cargo build x86_64-apple-darwin"
-    PATH="$HOME/.cargo/bin:/opt/homebrew/opt/rustup/bin:/opt/homebrew/bin:$PATH" \\
+    PATH="$HOME/.cargo/bin:$PATH" \\
      MACOSX_DEPLOYMENT_TARGET=#{MACOS_BRIDGE_DEPLOYMENT_TARGET} \\
      CMAKE_POLICY_VERSION_MINIMUM=3.5 \\
      LIBOPUS_STATIC=1 \\
      LIBOPUS_NO_PKG=1 \\
      CARGO_PROFILE_RELEASE_DEBUG=true \\
      CARGO_PROFILE_RELEASE_SPLIT_DEBUGINFO=off \\
      CARGO_PROFILE_RELEASE_STRIP=false \\
      cargo build --release --target x86_64-apple-darwin -p chanora_bridge
    if [ ! -f "$BRIDGE_ARM64" ]; then
@@ -118,19 +112,7 @@ PLIST
    install_name_tool -id "@rpath/chanora_bridge.framework/Versions/A/chanora_bridge" \\
                      "$FW/Versions/A/chanora_bridge"
-
+    echo "[chanora_bridge.podspec] framework ready at $FW"
    # Generate the framework's dSYM bundle. Apple's archive validator
    # rejects uploads when an embedded framework has no matching dSYM
    # (UUID lookup miss in the archive's dSYMs/ folder). dsymutil reads
    # the DWARF that cargo emitted (enabled by [profile.release]
    # debug = true at the workspace root) and writes the bundle next
    # to the framework. We then strip the in-framework binary so the
    # shipped app stays slim; symbols live in the dSYM bundle, which
    # is the layout xcodebuild -exportArchive and notarisation expect.
    rm -rf "$FW.dSYM"
    xcrun dsymutil "$FW/Versions/A/chanora_bridge" -o "$FW.dSYM"
    xcrun strip -S -x "$FW/Versions/A/chanora_bridge"
    echo "[chanora_bridge.podspec] framework + dSYM ready at $FW"
  SCRIPT
  # Pod CocoaPods picks this up; the framework gets embedded into
@@ -159,42 +141,32 @@ PLIST
      echo "[chanora_bridge script_phase] cargo build aarch64-apple-darwin"
      cd "$REPO_ROOT"
-      PATH="$HOME/.cargo/bin:/opt/homebrew/opt/rustup/bin:/opt/homebrew/bin:$PATH" \
+      PATH="$HOME/.cargo/bin:$PATH" \
        MACOSX_DEPLOYMENT_TARGET=#{MACOS_BRIDGE_DEPLOYMENT_TARGET} \
        CMAKE_POLICY_VERSION_MINIMUM=3.5 \
        LIBOPUS_STATIC=1 \
        LIBOPUS_NO_PKG=1 \
        CARGO_PROFILE_RELEASE_DEBUG=true \
        CARGO_PROFILE_RELEASE_SPLIT_DEBUGINFO=off \
        CARGO_PROFILE_RELEASE_STRIP=false \
        cargo build --release --target aarch64-apple-darwin -p chanora_bridge
      echo "[chanora_bridge script_phase] cargo build x86_64-apple-darwin"
-      PATH="$HOME/.cargo/bin:/opt/homebrew/opt/rustup/bin:/opt/homebrew/bin:$PATH" \
+      PATH="$HOME/.cargo/bin:$PATH" \
        MACOSX_DEPLOYMENT_TARGET=#{MACOS_BRIDGE_DEPLOYMENT_TARGET} \
        CMAKE_POLICY_VERSION_MINIMUM=3.5 \
        LIBOPUS_STATIC=1 \
        LIBOPUS_NO_PKG=1 \
        CARGO_PROFILE_RELEASE_DEBUG=true \
        CARGO_PROFILE_RELEASE_SPLIT_DEBUGINFO=off \
        CARGO_PROFILE_RELEASE_STRIP=false \
        cargo build --release --target x86_64-apple-darwin -p chanora_bridge
      cd "$REPO_ROOT/apps/chanora_flutter/macos"
      FW=Frameworks/chanora_bridge.framework
      FW_UP_TO_DATE=0
      # Skip the wrap step if the framework's binary is already
      # up-to-date with the cargo output (fast no-op on incremental
-      # builds where Rust didn't change). We still publish the dSYM
+      # builds where Rust didn't change).
      # into DWARF_DSYM_FOLDER_PATH below so archive builds always
      # have the symbols, even when the framework itself is cached.
      if [ -f "$FW/Versions/A/chanora_bridge" ] && [ "$FW/Versions/A/chanora_bridge" -nt "$BRIDGE_ARM64" ] && [ "$FW/Versions/A/chanora_bridge" -nt "$BRIDGE_X86_64" ]; then
        echo "[chanora_bridge script_phase] framework already up-to-date"
-        FW_UP_TO_DATE=1
+        exit 0
      fi
      if [ "$FW_UP_TO_DATE" = 0 ]; then
      # Create universal binary with lipo.
      mkdir -p "$(dirname "$UNIVERSAL")"
      lipo -create "$BRIDGE_ARM64" "$BRIDGE_X86_64" -output "$UNIVERSAL"
@@ -225,22 +197,7 @@ PLIST
      install_name_tool -id "@rpath/chanora_bridge.framework/Versions/A/chanora_bridge" \
                        "$FW/Versions/A/chanora_bridge"
-        rm -rf "$FW.dSYM"
+      echo "[chanora_bridge script_phase] framework refreshed"
        xcrun dsymutil "$FW/Versions/A/chanora_bridge" -o "$FW.dSYM"
        xcrun strip -S -x "$FW/Versions/A/chanora_bridge"
        echo "[chanora_bridge script_phase] framework refreshed (with dSYM)"
      fi
      # Publish the dSYM into Xcode's archive dSYM folder on every
      # build (cached or not). See the iOS podspec for the full
      # rationale — same constraint applies to macOS notarisation
      # and archive-based distribution.
      if [ -n "${DWARF_DSYM_FOLDER_PATH:-}" ] && [ -d "$FW.dSYM" ]; then
        mkdir -p "$DWARF_DSYM_FOLDER_PATH"
        rm -rf "$DWARF_DSYM_FOLDER_PATH/chanora_bridge.framework.dSYM"
        cp -R "$FW.dSYM" "$DWARF_DSYM_FOLDER_PATH/chanora_bridge.framework.dSYM"
        echo "[chanora_bridge script_phase] dSYM published to $DWARF_DSYM_FOLDER_PATH"
      fi
    SCRIPT
    :execution_position => :before_compile,
  }
@@ -5,18 +5,18 @@ packages:
    dependency: transitive
    description:
      name: _fe_analyzer_shared
-      sha256: "3b19a47f6ea7c2632760777c78174f47f6aec1e05f0cd611380d4593b8af1dbc"
+      sha256: "8d7ff3948166b8ec5da0fbb5962000926b8e02f2ed9b3e51d1738905fbd4c98d"
      url: "https://pub.dev"
    source: hosted
-    version: "96.0.0"
+    version: "93.0.0"
  analyzer:
    dependency: transitive
    description:
      name: analyzer
-      sha256: "0c516bc4ad36a1a75759e54d5047cb9d15cded4459df01aa35a0b5ec7db2c2a0"
+      sha256: de7148ed2fcec579b19f122c1800933dfa028f6d9fd38a152b04b1516cec120b
      url: "https://pub.dev"
    source: hosted
-    version: "10.2.0"
+    version: "10.0.1"
  args:
    dependency: transitive
    description:
@@ -133,10 +133,10 @@ packages:
    dependency: transitive
    description:
      name: code_assets
-      sha256: bf394f466ba9205f1812a0433b392d6af280f155f56651eda7c18cc32ed493b8
+      sha256: "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687"
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.1"
+    version: "1.0.0"
  collection:
    dependency: transitive
    description:
@@ -197,10 +197,10 @@ packages:
    dependency: transitive
    description:
      name: dbus
-      sha256: "792974a4007974fbc5c1b5433eb2330a9db3e368c3f906253af4c007d0f49a91"
+      sha256: d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.13"
+    version: "0.7.12"
  fake_async:
    dependency: transitive
    description:
@@ -262,46 +262,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "6.0.0"
  flutter_local_notifications:
    dependency: "direct main"
    description:
      name: flutter_local_notifications
      sha256: be38e3854d2baabcda8e16966a5fe8748cebb655bb94701494da0f052c2fc352
      url: "https://pub.dev"
    source: hosted
    version: "22.0.0"
  flutter_local_notifications_linux:
    dependency: transitive
    description:
      name: flutter_local_notifications_linux
      sha256: "9ca97e63776f29ab1b955725c09999fc2c150523269db150c39274f2a43c5a8b"
      url: "https://pub.dev"
    source: hosted
    version: "8.0.1"
  flutter_local_notifications_platform_interface:
    dependency: transitive
    description:
      name: flutter_local_notifications_platform_interface
      sha256: ff0013eae795e8dc8fad4a8992a209e64d3ba2fbd8bf5e43c36bf448f95bd814
      url: "https://pub.dev"
    source: hosted
    version: "12.0.0"
  flutter_local_notifications_web:
    dependency: transitive
    description:
      name: flutter_local_notifications_web
      sha256: "516afaf97a2d1e67a036c6617321b00d205d72f7a67b6eccf936cd565f985878"
      url: "https://pub.dev"
    source: hosted
    version: "1.0.0"
  flutter_local_notifications_windows:
    dependency: transitive
    description:
      name: flutter_local_notifications_windows
      sha256: "5aeed973a0c1480706784fad05c5c3a911335ebb561b2274b47fe80b375201e1"
      url: "https://pub.dev"
    source: hosted
    version: "3.1.0"
  flutter_localizations:
    dependency: "direct main"
    description: flutter
@@ -361,18 +321,18 @@ packages:
    dependency: "direct main"
    description:
      name: haptic_kit
-      sha256: "457f825a3413be2651954639bed27bb2987570f75d90c4e8e1cb9be62db2e59d"
+      sha256: "39efffa513c9f8ce3cdded8a4423797f69d71c9281779b83727337f3ee1ed9b8"
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.1"
+    version: "1.0.0"
  hooks:
    dependency: transitive
    description:
      name: hooks
-      sha256: "9a62a50b50b769a737bc0a8ff381f333529df3ab746b2f6b02e83760231455ba"
+      sha256: "025f060e86d2d4c3c47b56e33caf7f93bf9283340f26d23424ebcfccf34f621e"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.2"
+    version: "1.0.3"
  http:
    dependency: transitive
    description:
@@ -497,10 +457,10 @@ packages:
    dependency: transitive
    description:
      name: meta
-      sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
      url: "https://pub.dev"
    source: hosted
-    version: "1.18.0"
+    version: "1.17.0"
  mime:
    dependency: transitive
    description:
@@ -509,6 +469,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.0.0"
  native_toolchain_c:
    dependency: transitive
    description:
      name: native_toolchain_c
      sha256: "6ba77bb18063eebe9de401f5e6437e95e1438af0a87a3a39084fbd37c90df572"
      url: "https://pub.dev"
    source: hosted
    version: "0.17.6"
  nm:
    dependency: transitive
    description:
@@ -521,10 +489,10 @@ packages:
    dependency: transitive
    description:
      name: objective_c
-      sha256: "6cb691c686fa2838c6deb34980d426145c2a5d537491cb83d463c33cdbc726ed"
+      sha256: "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52"
      url: "https://pub.dev"
    source: hosted
-    version: "9.4.1"
+    version: "9.3.0"
  package_config:
    dependency: transitive
    description:
@@ -697,10 +665,10 @@ packages:
    dependency: transitive
    description:
      name: shared_preferences_android
-      sha256: a2c49fc1fed7140cadd892d765bd47edbe4ac0b9c7e7e3c493dcb58126f99cf0
+      sha256: e8d4762b1e2e8578fc4d0fd548cebf24afd24f49719c08974df92834565e2c53
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.25"
+    version: "2.4.23"
  shared_preferences_foundation:
    dependency: transitive
    description:
@@ -822,18 +790,10 @@ packages:
    dependency: transitive
    description:
      name: test_api
-      sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
+      sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.11"
+    version: "0.7.10"
  timezone:
    dependency: transitive
    description:
      name: timezone
      sha256: "784a5e34d2eb62e1326f24d6f600aaaee452eb8ca8ef2f384a59244e292d158b"
      url: "https://pub.dev"
    source: hosted
    version: "0.11.0"
  typed_data:
    dependency: transitive
    description:
@@ -854,10 +814,10 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_android
-      sha256: b413d49b73867ac08dd2f9890efd3cc11f2a0e577618d50843440a1fb3776c32
+      sha256: "17bc677f0b301615530dd1d67e0a9828cafa2d0b6b6eae4cd3679b7eac4a273c"
      url: "https://pub.dev"
    source: hosted
-    version: "6.3.32"
+    version: "6.3.30"
  url_launcher_ios:
    dependency: transitive
    description:
@@ -966,10 +926,10 @@ packages:
    dependency: transitive
    description:
      name: win32
-      sha256: ba6f4bba816c8d7e3c1580e170f3786d216951cc6b94babc3b814c08d2cb2738
+      sha256: a1fc9eb9248baa05dfc12ed5b66e377b3e23f095eec078e0371622b9033810d9
      url: "https://pub.dev"
    source: hosted
-    version: "6.3.0"
+    version: "6.2.0"
  xdg_directories:
    dependency: transitive
    description:
@@ -982,10 +942,10 @@ packages:
    dependency: transitive
    description:
      name: xml
-      sha256: "67f0aff7be013d107995e9b75bf4e7f2c3ef2dfdb2c8e68024bba0a7fd5756a4"
+      sha256: "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025"
      url: "https://pub.dev"
    source: hosted
-    version: "7.0.1"
+    version: "6.6.1"
  yaml:
    dependency: transitive
    description:
@@ -995,5 +955,5 @@ packages:
    source: hosted
    version: "3.1.3"
 sdks:
-  dart: ">=3.12.0 <4.0.0"
+  dart: ">=3.11.5 <4.0.0"
-  flutter: ">=3.44.0"
+  flutter: ">=3.38.4"
@@ -75,7 +75,6 @@ dependencies:
  # DEC-003 iOS 13 floor; haptic_kit supports iOS 12+).
  haptic_kit: ^1.0.0
  flutter_foreground_task: ^9.2.2
  flutter_local_notifications: ^22.0.0
  url_launcher: ^6.3.2
  shared_preferences: ^2.5.5
  share_plus: ^13.1.0
@@ -1,91 +0,0 @@
 #!/bin/sh
 # verify_silero_exports.sh
 #
 # Asserts that all six chanora_silero_vad_* C symbols that the Rust
 # chanora_bridge framework resolves via dlsym(RTLD_DEFAULT) are present
 # in the linked app binary's dynamic export table — verified per
 # architecture slice for macOS universal builds, because `nm` on a
 # universal Mach-O without -arch will succeed if a symbol exists in ANY
 # slice, not every slice. A missing symbol in just the x86_64 slice
 # would silently break Intel Macs.
 #
 # Without this check, Xcode Archive's -dead_strip can remove these
 # Swift @_cdecl symbols (no Swift caller exists) and CoreML VAD falls
 # back to WebRTC on TestFlight/App Store with no compile-time,
 # link-time, or runtime warning. We hit that bug once; this script
 # ensures we never ship it again.
 #
 # Runs as an Xcode build phase after Link Binary, on iOS and macOS.
 set -e
 if [ -z "${TARGET_BUILD_DIR}" ] || [ -z "${EXECUTABLE_PATH}" ]; then
    echo "error: verify_silero_exports.sh requires TARGET_BUILD_DIR and EXECUTABLE_PATH (run from Xcode build phase)" >&2
    exit 1
 fi
 BINARY="${TARGET_BUILD_DIR}/${EXECUTABLE_PATH}"
 if [ ! -f "${BINARY}" ]; then
    echo "error: app binary not found at ${BINARY}" >&2
    exit 1
 fi
 # Flutter Debug builds split user code into a sibling `<App>.debug.dylib`
 # alongside a tiny launcher executable; the @_cdecl symbols live in the
 # dylib. Release/Profile builds put everything in the main executable.
 # Prefer the dylib when both exist so the check verifies the slice that
 # actually carries the symbols.
 EXECUTABLE_DIR=$(dirname "${BINARY}")
 EXECUTABLE_NAME=$(basename "${BINARY}")
 DEBUG_DYLIB="${EXECUTABLE_DIR}/${EXECUTABLE_NAME}.debug.dylib"
 if [ -f "${DEBUG_DYLIB}" ]; then
    BINARY="${DEBUG_DYLIB}"
 fi
 REQUIRED_SYMBOLS="
 _chanora_silero_vad_create
 _chanora_silero_vad_destroy
 _chanora_silero_vad_reset
 _chanora_silero_vad_process
 _chanora_silero_vad_last_error
 _chanora_silero_vad_free_string
 "
 # Enumerate slices. `lipo -archs` prints arches space-separated for
 # universal Mach-O; for thin binaries it prints the single arch.
 ARCHS=$(xcrun lipo -archs "${BINARY}" 2>/dev/null || echo "")
 if [ -z "${ARCHS}" ]; then
    echo "error: xcrun lipo -archs failed for ${BINARY}; cannot enumerate slices" >&2
    exit 1
 fi
 FAILED=0
 for arch in ${ARCHS}; do
    EXPORTED=$(xcrun nm -arch "${arch}" -gU "${BINARY}" 2>/dev/null | awk '{print $NF}')
    if [ -z "${EXPORTED}" ]; then
        echo "error: xcrun nm produced no output for arch=${arch} on ${BINARY}" >&2
        FAILED=1
        continue
    fi
    MISSING=""
    for sym in ${REQUIRED_SYMBOLS}; do
        if ! echo "${EXPORTED}" | grep -qx "${sym}"; then
            MISSING="${MISSING} ${sym}"
        fi
    done
    if [ -n "${MISSING}" ]; then
        echo "error: chanora_silero_vad exports missing from $(basename "${BINARY}") [arch=${arch}]:${MISSING}" >&2
        FAILED=1
    fi
 done
 if [ "${FAILED}" -ne 0 ]; then
    echo "error: Rust dlsym(RTLD_DEFAULT) resolution will fail and CoreML VAD will fall back to WebRTC." >&2
    echo "error: Check OTHER_LDFLAGS -exported_symbol entries in Flutter/*.xcconfig and the @_cdecl exports in Runner/SileroCoreMLBridge.swift." >&2
    exit 1
 fi
 echo "verify_silero_exports: all 6 chanora_silero_vad_* symbols present in $(basename "${BINARY}") [arches: ${ARCHS}]"
@@ -4,7 +4,7 @@ import 'package:chanora_flutter/services/audio_lifecycle_service.dart';
 import 'package:chanora_flutter/src/rust/api.dart' as rust;
 void main() {
-  test('parseBridgeAudioRoute maps iOS-classified route strings', () {
+  test('parseBridgeAudioRoute maps platform route names', () {
    expect(parseBridgeAudioRoute('Earpiece'), rust.BridgeAudioRoute.earpiece);
    expect(parseBridgeAudioRoute('Speaker'), rust.BridgeAudioRoute.speaker);
    expect(
@@ -22,34 +22,4 @@ void main() {
    expect(parseBridgeAudioRoute('Unknown'), rust.BridgeAudioRoute.unknown);
    expect(parseBridgeAudioRoute('Other'), rust.BridgeAudioRoute.unknown);
  });
  test('parseBridgeAudioRoute maps Android UsbHeadset to wiredHeadset', () {
    // AndroidAudioLifecycleController.classifyDevice emits 'UsbHeadset' for
    // AudioDeviceInfo.TYPE_USB_HEADSET. USB audio is functionally a
    // wired-class device — the Kotlin classifier's own preference ordering
    // (line 176 of AndroidAudioLifecycleController.kt) groups it with
    // WiredHeadset/BluetoothHfp/BluetoothA2dp.
    expect(parseBridgeAudioRoute('UsbHeadset'),
        rust.BridgeAudioRoute.wiredHeadset);
  });
  test('parseBridgeAudioRoute maps Android Hdmi to unknown', () {
    // HDMI is a display-out transport, not a voice-call audio path; no
    // existing BridgeAudioRoute variant fits. Treat as unknown rather
    // than misclassify as Speaker.
    expect(parseBridgeAudioRoute('Hdmi'), rust.BridgeAudioRoute.unknown);
  });
  test('wireMacosAudioLifecycle is a no-op on non-macOS and registers on macOS', () {
    // MethodChannel needs a binary messenger, which requires the test
    // binding to be initialised first.
    TestWidgetsFlutterBinding.ensureInitialized();
    // Channel name constant matches the Swift side (MacOSAudioLifecycle.swift).
    expect(macosAudioLifecycleChannelName, 'chanora/macos_audio_lifecycle');
    // The wire is a no-op on the test platform (CI defaults to host OS
    // which may be macOS or Linux). On Linux it returns early; on macOS
    // it installs a handler. Either way, it must not throw.
    expect(() => wireMacosAudioLifecycle(), returnsNormally);
  });
 }
@@ -1,36 +0,0 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:chanora_flutter/services/hard_mute_owners.dart';
 void main() {
  group('HardMuteOwners', () {
    test('manual mute survives talk-power block and restore', () {
      const owners = HardMuteOwners(manual: true);
      final blocked = owners.copyWith(talkPower: true);
      expect(blocked.effective, isTrue);
      final restored = blocked.copyWith(talkPower: false);
      expect(restored.manual, isTrue);
      expect(restored.talkPower, isFalse);
      expect(restored.effective, isTrue);
    });
    test('effective mute is the union of independent owners', () {
      expect(const HardMuteOwners().effective, isFalse);
      expect(const HardMuteOwners(manual: true).effective, isTrue);
      expect(const HardMuteOwners(permission: true).effective, isTrue);
      expect(const HardMuteOwners(talkPower: true).effective, isTrue);
    });
    test('bridge mute does not convert talk-power owner into manual owner', () {
      const owners = HardMuteOwners(talkPower: true);
      final synced = owners.withBridgeManualMute(true);
      expect(synced.manual, isFalse);
      expect(synced.talkPower, isTrue);
      expect(synced.effective, isTrue);
    });
  });
 }
@@ -1,99 +0,0 @@
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:chanora_flutter/services/ios_audio_session_controller.dart';
 void main() {
  TestWidgetsFlutterBinding.ensureInitialized();
  group('IosAudioSessionController', () {
    const channel = MethodChannel(iosAudioSessionChannelName);
    final messenger = TestDefaultBinaryMessengerBinding
        .instance.defaultBinaryMessenger;
    tearDown(() {
      messenger.setMockMethodCallHandler(channel, null);
    });
    test('channel name matches Swift contract', () {
      expect(iosAudioSessionChannelName, 'chanora/ios_audio_session');
    });
    test('activate invokes activateVoiceSession on iOS', () async {
      final calls = <MethodCall>[];
      messenger.setMockMethodCallHandler(channel, (call) async {
        calls.add(call);
        return null;
      });
      final controller = IosAudioSessionController(
        channel: channel,
        isIos: true,
      );
      await controller.activate();
      expect(calls.map((c) => c.method), ['activateVoiceSession']);
      expect(calls.single.arguments, isNull);
    });
    test('deactivate invokes deactivateVoiceSession on iOS', () async {
      final calls = <MethodCall>[];
      messenger.setMockMethodCallHandler(channel, (call) async {
        calls.add(call);
        return null;
      });
      final controller = IosAudioSessionController(
        channel: channel,
        isIos: true,
      );
      await controller.deactivate();
      expect(calls.map((c) => c.method), ['deactivateVoiceSession']);
      expect(calls.single.arguments, isNull);
    });
    test('activate is a no-op on non-iOS platforms', () async {
      var invoked = false;
      messenger.setMockMethodCallHandler(channel, (call) async {
        invoked = true;
        return null;
      });
      final controller = IosAudioSessionController(
        channel: channel,
        isIos: false,
      );
      await controller.activate();
      await controller.deactivate();
      expect(invoked, isFalse);
    });
    test('activate swallows PlatformException so engine keeps running',
        () async {
      messenger.setMockMethodCallHandler(channel, (call) async {
        throw PlatformException(code: 'avaudiosession_failed');
      });
      final controller = IosAudioSessionController(
        channel: channel,
        isIos: true,
      );
      await expectLater(controller.activate(), completes);
      await expectLater(controller.deactivate(), completes);
    });
    test('activate swallows MissingPluginException when channel is absent',
        () async {
      final controller = IosAudioSessionController(
        channel: channel,
        isIos: true,
      );
      await expectLater(controller.activate(), completes);
      await expectLater(controller.deactivate(), completes);
    });
  });
 }
@@ -301,61 +301,6 @@ void main() {
    },
  );
  test(
    'SWE4-UV / SRS-300: checkLocalNetworkAccess() emits outbound '
    'checkLocalNetworkAccess MethodCall with host and port arguments',
    () async {
      final svc = MacOSPermissionsService(channel: channel)..start();
      outgoingResponder = (call) async {
        if (call.method == methodCheckLocalNetworkAccess) {
          return 'Denied';
        }
        return null;
      };
      final result = await svc.checkLocalNetworkAccess(
        host: '192.168.1.42',
        port: 9987,
      );
      final calls = outgoingCalls
          .where((c) => c.method == methodCheckLocalNetworkAccess)
          .toList();
      expect(calls, hasLength(1));
      final args = calls.single.arguments as Map;
      expect(args['host'], '192.168.1.42');
      expect(args['port'], 9987);
      expect(result, MacOSLocalNetworkState.denied);
      expect(svc.localNetworkState.value, MacOSLocalNetworkState.denied);
      svc.dispose();
    },
  );
  test(
    'SWE4-UV / SRS-300: checkLocalNetworkAccess() parses Granted and updates '
    'localNetworkState',
    () async {
      final svc = MacOSPermissionsService(channel: channel)..start();
      outgoingResponder = (call) async {
        if (call.method == methodCheckLocalNetworkAccess) {
          return 'Granted';
        }
        return null;
      };
      final result = await svc.checkLocalNetworkAccess(
        host: 'ts.example.com',
        port: 9987,
      );
      expect(result, MacOSLocalNetworkState.granted);
      expect(svc.localNetworkState.value, MacOSLocalNetworkState.granted);
      svc.dispose();
    },
  );
  test(
    'SWE4-UV / SysRS-166: requestNotifications() emits outbound '
    'requestNotifications MethodCall; returns the platform response',
@@ -557,30 +502,4 @@ void main() {
      svc.dispose();
    },
  );
  test(
    'SWE4-UV / SRS-300: checkLocalNetworkAccess() returns cached state '
    'when the channel throws',
    () async {
      final svc = MacOSPermissionsService(channel: channel)..start();
      outgoingResponder = (call) async {
        if (call.method == methodCheckLocalNetworkAccess) {
          throw PlatformException(code: 'probe-failed');
        }
        return null;
      };
      // Probe path failures (e.g. NWConnection couldn't establish a
      // listener, or the Swift side threw) must not crash callers
      // — they must fall back to whatever the service already cached.
      final result = await svc.checkLocalNetworkAccess(
        host: '127.0.0.1',
        port: 9987,
      );
      expect(result, isNotNull);
      svc.dispose();
    },
  );
 }
@@ -1,48 +0,0 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:chanora_flutter/main.dart';
 import 'package:chanora_flutter/src/rust/api.dart' as rust;
 void main() {
  test('active poke chat suppresses same sender notification only', () {
    final sender = BigInt.from(42);
    expect(
      isPokeSenderActiveChat(
        chatOpen: true,
        inlineChatTarget: rust.BridgeMessageTarget.poke(sender),
        senderId: sender,
      ),
      isTrue,
    );
    expect(
      isPokeSenderActiveChat(
        chatOpen: true,
        inlineChatTarget: rust.BridgeMessageTarget.poke(BigInt.from(7)),
        senderId: sender,
      ),
      isFalse,
    );
  });
  test('active private chat also suppresses same sender poke notification', () {
    final sender = BigInt.from(42);
    expect(
      isPokeSenderActiveChat(
        chatOpen: true,
        inlineChatTarget: rust.BridgeMessageTarget.client(sender),
        senderId: sender,
      ),
      isTrue,
    );
    expect(
      isPokeSenderActiveChat(
        chatOpen: false,
        inlineChatTarget: rust.BridgeMessageTarget.client(sender),
        senderId: sender,
      ),
      isFalse,
    );
  });
 }
@@ -1,81 +0,0 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:chanora_flutter/services/poke_notification_service.dart';
 import 'package:chanora_flutter/src/rust/api.dart' as rust;
 void main() {
  TestWidgetsFlutterBinding.ensureInitialized();
  const channel = MethodChannel('dexterous.com/flutter/local_notifications');
  late List<MethodCall> calls;
  setUp(() {
    debugDefaultTargetPlatformOverride = TargetPlatform.android;
    AndroidFlutterLocalNotificationsPlugin.registerWith();
    calls = <MethodCall>[];
    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
        .setMockMethodCallHandler(channel, (call) async {
          calls.add(call);
          return switch (call.method) {
            'initialize' => true,
            'requestNotificationsPermission' => true,
            _ => null,
          };
        });
  });
  tearDown(() {
    debugDefaultTargetPlatformOverride = null;
    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
        .setMockMethodCallHandler(channel, null);
  });
  test(
    'show dispatches a silent poke notification with sender payload',
    () async {
      final service = PokeNotificationService();
      await service.show(
        senderName: 'Alice',
        message: 'wake up',
        senderId: BigInt.from(42),
        strength: rust.BridgePokeStrength.strong,
      );
      final showCall = calls.singleWhere((call) => call.method == 'show');
      final arguments = Map<Object?, Object?>.from(showCall.arguments as Map);
      expect(arguments['id'], 42);
      expect(arguments['title'], 'Poke from Alice');
      expect(arguments['body'], 'wake up');
      expect(arguments['payload'], 'poke:42');
      final specifics = Map<Object?, Object?>.from(
        arguments['platformSpecifics'] as Map,
      );
      expect(specifics['silent'], true);
      expect(specifics['playSound'], false);
      expect(specifics['groupKey'], 'chanora.pokes');
    },
  );
  test('show uses fallback body for empty poke messages', () async {
    final service = PokeNotificationService();
    await service.show(
      senderName: 'Alice',
      message: '   ',
      senderId: BigInt.from(42),
      strength: rust.BridgePokeStrength.strong,
    );
    final showCall = calls.singleWhere((call) => call.method == 'show');
    final arguments = Map<Object?, Object?>.from(showCall.arguments as Map);
    expect(arguments['title'], 'Poke from Alice');
    expect(arguments['body'], 'Alice pokes you');
    expect(arguments['payload'], 'poke:42');
  });
 }
@@ -1,58 +0,0 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:chanora_flutter/services/poke_preferences_service.dart';
 void main() {
  late PokePreferencesService service;
  setUp(() {
    SharedPreferences.setMockInitialValues({});
    service = PokePreferencesService();
  });
  test('loads defaults when preferences are unset', () async {
    await service.load();
    expect(service.pokesEnabled.value, isTrue);
    expect(service.mutedSenders.value, isEmpty);
  });
  test('persists global enabled state', () async {
    await service.load();
    await service.setPokesEnabled(false);
    final reloaded = PokePreferencesService();
    await reloaded.load();
    expect(reloaded.pokesEnabled.value, isFalse);
  });
  test('persists muted senders and removes them on unmute', () async {
    await service.load();
    final alice = BigInt.from(42);
    final bob = BigInt.from(7);
    await service.muteSender(alice);
    await service.muteSender(bob);
    await service.unmuteSender(alice);
    final reloaded = PokePreferencesService();
    await reloaded.load();
    expect(reloaded.mutedSenders.value, {bob});
  });
  test('isMuted reflects in-memory changes synchronously', () async {
    await service.load();
    final sender = BigInt.from(99);
    expect(service.isMuted(sender), isFalse);
    await service.muteSender(sender);
    expect(service.isMuted(sender), isTrue);
    await service.unmuteSender(sender);
    expect(service.isMuted(sender), isFalse);
  });
 }
@@ -1,123 +0,0 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:chanora_flutter/services/voice_join_ordering.dart';
 void main() {
  group('joinVoiceChannelWithIosAudioSession', () {
    test('activates the iOS audio session before Rust voiceJoin', () async {
      final calls = <String>[];
      await joinVoiceChannelWithIosAudioSession(
        channelId: BigInt.from(42),
        password: 'secret',
        activateIosAudioSession: () async {
          calls.add('activateIosAudioSession');
        },
        deactivateIosAudioSession: () async {
          calls.add('deactivateIosAudioSession');
        },
        voiceJoin: ({required channelId, required password}) async {
          expect(channelId, BigInt.from(42));
          expect(password, 'secret');
          calls.add('voiceJoin');
        },
      );
      expect(calls, ['activateIosAudioSession', 'voiceJoin']);
    });
    test('deactivates the iOS audio session when Rust voiceJoin fails',
        () async {
      final calls = <String>[];
      await expectLater(
        joinVoiceChannelWithIosAudioSession(
          channelId: BigInt.from(42),
          password: '',
          activateIosAudioSession: () async {
            calls.add('activateIosAudioSession');
          },
          deactivateIosAudioSession: () async {
            calls.add('deactivateIosAudioSession');
          },
          voiceJoin: ({required channelId, required password}) async {
            calls.add('voiceJoin');
            throw StateError('join rejected');
          },
        ),
        throwsStateError,
      );
      expect(calls, [
        'activateIosAudioSession',
        'voiceJoin',
        'deactivateIosAudioSession',
      ]);
    });
    test(
      'keeps the iOS audio session active when voiceJoin throws but the '
      'error is recognised as already-in-channel (treated as success); '
      'still rethrows so the caller runs its success-on-already-joined branch',
      () async {
        final calls = <String>[];
        await expectLater(
          joinVoiceChannelWithIosAudioSession(
            channelId: BigInt.from(42),
            password: '',
            activateIosAudioSession: () async {
              calls.add('activateIosAudioSession');
            },
            deactivateIosAudioSession: () async {
              calls.add('deactivateIosAudioSession');
            },
            voiceJoin: ({required channelId, required password}) async {
              calls.add('voiceJoin');
              throw _FakeAlreadyInChannel();
            },
            isJoinSuccess: (error) => error is _FakeAlreadyInChannel,
          ),
          throwsA(isA<_FakeAlreadyInChannel>()),
        );
        expect(calls, ['activateIosAudioSession', 'voiceJoin']);
      },
    );
    test(
      'deactivates the iOS audio session when isJoinSuccess returns false '
      'for a non-success error',
      () async {
        final calls = <String>[];
        await expectLater(
          joinVoiceChannelWithIosAudioSession(
            channelId: BigInt.from(42),
            password: '',
            activateIosAudioSession: () async {
              calls.add('activateIosAudioSession');
            },
            deactivateIosAudioSession: () async {
              calls.add('deactivateIosAudioSession');
            },
            voiceJoin: ({required channelId, required password}) async {
              calls.add('voiceJoin');
              throw StateError('join rejected');
            },
            isJoinSuccess: (error) => error is _FakeAlreadyInChannel,
          ),
          throwsStateError,
        );
        expect(calls, [
          'activateIosAudioSession',
          'voiceJoin',
          'deactivateIosAudioSession',
        ]);
      },
    );
  });
 }
 class _FakeAlreadyInChannel implements Exception {}
@@ -1,201 +0,0 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:chanora_flutter/l10n/generated/app_localizations.dart';
 import 'package:chanora_flutter/src/rust/api.dart' as rust;
 import 'package:chanora_flutter/widgets/chat_panel.dart';
 import 'package:chanora_flutter/widgets/chat_views.dart';
 void main() {
  rust.BridgeSnapshot snapshot() {
    final channelId = BigInt.from(10);
    return rust.BridgeSnapshot(
      serverName: 'Server',
      welcomeMessage: '',
      platform: '',
      version: '',
      channels: [
        rust.BridgeChannel(
          id: channelId,
          parent: BigInt.zero,
          name: 'Lobby',
          order: 0,
          hasPassword: false,
          neededTalkPower: 0,
        ),
      ],
      clients: [
        rust.BridgeClient(
          id: BigInt.one,
          channel: channelId,
          name: 'Me',
          inputMuted: false,
          outputMuted: false,
          isSpeaking: false,
          isServerQuery: false,
          talkPower: 0,
          talkPowerGranted: true,
        ),
      ],
      ownClientId: BigInt.one,
    );
  }
  testWidgets('inline chat panel renders target, messages, and close action', (
    tester,
  ) async {
    var closed = false;
    final messages = [
      ChatEntry(
        senderId: BigInt.from(2),
        senderName: 'Alice',
        message: 'Hello from channel',
        target: const rust.BridgeMessageTarget.channel(),
      ),
    ];
    await tester.pumpWidget(
      MaterialApp(
        localizationsDelegates: AppL10n.localizationsDelegates,
        supportedLocales: AppL10n.supportedLocales,
        home: Scaffold(
          body: ChatPanel(
            messages: messages,
            snapshot: snapshot(),
            target: const rust.BridgeMessageTarget.channel(),
            clientName: '',
            onClose: () => closed = true,
          ),
        ),
      ),
    );
    expect(find.text('# Lobby'), findsOneWidget);
    expect(find.text('Hello from channel'), findsOneWidget);
    await tester.tap(find.byTooltip('Close chat'));
    await tester.pump();
    expect(closed, isTrue);
  });
  testWidgets('chat detail restores target drafts when the target changes', (
    tester,
  ) async {
    String? savedDraft;
    final messages = <ChatEntry>[];
    Widget detail({
      required rust.BridgeMessageTarget target,
      required String? restoredDraft,
    }) {
      return MaterialApp(
        localizationsDelegates: AppL10n.localizationsDelegates,
        supportedLocales: AppL10n.supportedLocales,
        home: Scaffold(
          body: ChatDetailView(
            messages: messages,
            snapshot: snapshot(),
            target: target,
            clientName: '',
            currentChannelId: BigInt.from(10),
            channelName: 'Lobby',
            restoredDraft: restoredDraft,
            onDraftChanged: (text) => savedDraft = text,
          ),
        ),
      );
    }
    await tester.pumpWidget(
      detail(
        target: const rust.BridgeMessageTarget.channel(),
        restoredDraft: 'channel draft',
      ),
    );
    expect(
      tester.widget<TextField>(find.byType(TextField)).controller!.text,
      'channel draft',
    );
    await tester.enterText(find.byType(TextField), 'typed channel draft');
    await tester.pumpWidget(
      detail(
        target: const rust.BridgeMessageTarget.server(),
        restoredDraft: 'server draft',
      ),
    );
    expect(savedDraft, 'typed channel draft');
    expect(
      tester.widget<TextField>(find.byType(TextField)).controller!.text,
      'server draft',
    );
  });
  testWidgets(
    'chat detail propagates empty draft when the user clears it before switching target',
    (tester) async {
      // Regression: previously, _ChatDetailViewState only emitted
      // onDraftChanged when the text was non-empty. If the user
      // restored a saved draft, deleted it, then switched target,
      // the stale entry stayed in the parent's draft map and
      // resurrected on the next target swap.
      String? savedDraft = 'sentinel-unset';
      final messages = <ChatEntry>[];
      Widget detail({
        required rust.BridgeMessageTarget target,
        required String? restoredDraft,
      }) {
        return MaterialApp(
          localizationsDelegates: AppL10n.localizationsDelegates,
          supportedLocales: AppL10n.supportedLocales,
          home: Scaffold(
            body: ChatDetailView(
              messages: messages,
              snapshot: snapshot(),
              target: target,
              clientName: '',
              currentChannelId: BigInt.from(10),
              channelName: 'Lobby',
              restoredDraft: restoredDraft,
              onDraftChanged: (text) => savedDraft = text,
            ),
          ),
        );
      }
      await tester.pumpWidget(
        detail(
          target: const rust.BridgeMessageTarget.channel(),
          restoredDraft: 'previously saved channel draft',
        ),
      );
      expect(
        tester.widget<TextField>(find.byType(TextField)).controller!.text,
        'previously saved channel draft',
      );
      // User clears the field, then switches target.
      await tester.enterText(find.byType(TextField), '');
      await tester.pumpWidget(
        detail(
          target: const rust.BridgeMessageTarget.server(),
          restoredDraft: null,
        ),
      );
      // The empty string MUST reach the parent so the stale entry
      // is overwritten in the draft map. With the previous guarded
      // implementation, savedDraft would still hold the sentinel.
      expect(
        savedDraft,
        '',
        reason: 'empty draft must overwrite stale entry on target swap',
      );
    },
  );
 }
@@ -455,7 +455,7 @@ void main() {
        channelName: '',
        clientName: 'Alpha',
      ),
-      'Poke message optional...',
+      'Poke message...',
    );
  });
@@ -737,179 +737,6 @@ void main() {
    refresh.dispose();
  });
  test('evaluates target-aware chat message send policy', () {
    final clientTarget = rust.BridgeMessageTarget.client(BigInt.from(2));
    final pokeTarget = rust.BridgeMessageTarget.poke(BigInt.from(2));
    expect(canSendChatMessage(pokeTarget, null, ''), isTrue);
    expect(canSendChatMessage(pokeTarget, null, '   '), isTrue);
    expect(canSendChatMessage(pokeTarget, null, 'wake up'), isTrue);
    expect(
      canSendChatMessage(const rust.BridgeMessageTarget.server(), null, ''),
      isFalse,
    );
    expect(
      canSendChatMessage(
        const rust.BridgeMessageTarget.channel(),
        BigInt.from(10),
        '',
      ),
      isFalse,
    );
    expect(canSendChatMessage(clientTarget, null, ''), isFalse);
    expect(
      canSendChatMessage(
        const rust.BridgeMessageTarget.channel(),
        null,
        'hello',
      ),
      isFalse,
    );
    expect(
      canSendChatMessage(
        const rust.BridgeMessageTarget.channel(),
        BigInt.from(10),
        'hello',
      ),
      isTrue,
    );
  });
  testWidgets('poke detail sends an empty poke when the composer is empty', (
    tester,
  ) async {
    String? sentMessage;
    rust.BridgeMessageTarget? sentTarget;
    final messages = <ChatEntry>[];
    final target = rust.BridgeMessageTarget.poke(BigInt.from(2));
    await tester.pumpWidget(
      MaterialApp(
        localizationsDelegates: AppL10n.localizationsDelegates,
        supportedLocales: AppL10n.supportedLocales,
        home: Scaffold(
          body: ChatDetailView(
            messages: messages,
            snapshot: snapshot(
              channels: const [],
              clients: [
                client(id: BigInt.one, name: 'Me', channelId: BigInt.zero),
              ],
            ),
            target: target,
            clientName: 'Alpha',
            currentChannelId: null,
            channelName: '',
            sendChatMessage: ({required message, required target}) async {
              sentMessage = message;
              sentTarget = target;
            },
          ),
        ),
      ),
    );
    expect(find.byTooltip('Poke'), findsOneWidget);
    expect(find.byTooltip('Send'), findsNothing);
    await tester.tap(find.byTooltip('Poke'));
    await tester.pump();
    expect(sentMessage, '');
    expect(sentTarget, target);
    expect(messages, hasLength(1));
    expect(messages.single.isPoke, isTrue);
    expect(messages.single.message, '');
    expect(find.textContaining('You poked "Alpha"'), findsOneWidget);
    expect(find.byType(CircleAvatar), findsNothing);
  });
  testWidgets('poke detail sends typed optional poke message', (tester) async {
    String? sentMessage;
    rust.BridgeMessageTarget? sentTarget;
    final messages = <ChatEntry>[];
    final target = rust.BridgeMessageTarget.poke(BigInt.from(2));
    await tester.pumpWidget(
      MaterialApp(
        localizationsDelegates: AppL10n.localizationsDelegates,
        supportedLocales: AppL10n.supportedLocales,
        home: Scaffold(
          body: ChatDetailView(
            messages: messages,
            snapshot: snapshot(
              channels: const [],
              clients: [
                client(id: BigInt.one, name: 'Me', channelId: BigInt.zero),
              ],
            ),
            target: target,
            clientName: 'Alpha',
            currentChannelId: null,
            channelName: '',
            sendChatMessage: ({required message, required target}) async {
              sentMessage = message;
              sentTarget = target;
            },
          ),
        ),
      ),
    );
    await tester.enterText(find.byType(TextField), 'wake up');
    await tester.tap(find.byTooltip('Poke'));
    await tester.pump();
    expect(sentMessage, 'wake up');
    expect(sentTarget, target);
    expect(messages.single.message, 'wake up');
    expect(
      find.textContaining('You poked "Alpha" with message: wake up'),
      findsOneWidget,
    );
  });
  testWidgets('channel detail blocks empty sends with a joined channel', (
    tester,
  ) async {
    var sendCount = 0;
    final messages = <ChatEntry>[];
    await tester.pumpWidget(
      MaterialApp(
        localizationsDelegates: AppL10n.localizationsDelegates,
        supportedLocales: AppL10n.supportedLocales,
        home: Scaffold(
          body: ChatDetailView(
            messages: messages,
            snapshot: snapshot(
              channels: [channel(BigInt.from(10), 'Lobby')],
              clients: [
                client(id: BigInt.one, name: 'Me', channelId: BigInt.from(10)),
              ],
            ),
            target: const rust.BridgeMessageTarget.channel(),
            clientName: '',
            currentChannelId: BigInt.from(10),
            channelName: 'Lobby',
            sendChatMessage: ({required message, required target}) async {
              sendCount++;
            },
          ),
        ),
      ),
    );
    expect(find.byTooltip('Send'), findsOneWidget);
    await tester.tap(find.byTooltip('Send'));
    await tester.pump();
    expect(sendCount, 0);
    expect(messages, isEmpty);
  });
  test('blocks channel chat when no voice channel is joined', () {
    expect(
      canSendToChatTarget(const rust.BridgeMessageTarget.channel(), null),
@@ -1,37 +0,0 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:chanora_flutter/l10n/generated/app_localizations.dart';
 import 'package:chanora_flutter/services/poke_preferences_service.dart';
 import 'package:chanora_flutter/widgets/poke_notification_settings.dart';
 void main() {
  testWidgets('toggles poke notifications and unmutes senders', (tester) async {
    SharedPreferences.setMockInitialValues({});
    final preferences = PokePreferencesService();
    await preferences.load();
    await preferences.muteSender(BigInt.from(42));
    addTearDown(preferences.dispose);
    await tester.pumpWidget(
      MaterialApp(
        localizationsDelegates: AppL10n.localizationsDelegates,
        supportedLocales: AppL10n.supportedLocales,
        home: PokeNotificationSettingsDialog(preferences: preferences),
      ),
    );
    expect(find.text('Poke notifications'), findsOneWidget);
    expect(find.text('Client ID 42'), findsOneWidget);
    await tester.tap(find.byType(Switch));
    await tester.pumpAndSettle();
    expect(preferences.pokesEnabled.value, isFalse);
    await tester.tap(find.text('Unmute'));
    await tester.pumpAndSettle();
    expect(preferences.isMuted(BigInt.from(42)), isFalse);
    expect(find.text('No muted poke senders.'), findsOneWidget);
  });
 }
@@ -52,13 +52,11 @@ void main() {
    String welcomeMessage = '',
    BigInt? ownClientId,
    BigInt? currentVoiceChannelId,
    Set<BigInt> unreadChannelIds = const {},
    rust.BridgeAudioStats? audioStats,
    bool enableClientLongPressMenu = false,
    ValueChanged<rust.BridgeClient>? onOpenClientInfo,
    ValueChanged<rust.BridgeClient>? onOpenClientChat,
    ValueChanged<rust.BridgeClient>? onOpenClientPoke,
    ValueChanged<rust.BridgeChannel>? onOpenChannelChat,
  }) {
    return MaterialApp(
      localizationsDelegates: AppL10n.localizationsDelegates,
@@ -81,14 +79,12 @@ void main() {
          localOutputMuted: false,
          hasJoinPending: false,
          canJoinVoiceChannel: true,
          unreadChannelIds: unreadChannelIds,
          onJoinChannel: (_) {},
          onJoinChannelWithPassword: (_) {},
          enableClientLongPressMenu: enableClientLongPressMenu,
          onOpenClientInfo: onOpenClientInfo,
          onOpenClientChat: onOpenClientChat,
          onOpenClientPoke: onOpenClientPoke,
          onOpenChannelChat: onOpenChannelChat,
        ),
      ),
    );
@@ -137,32 +133,6 @@ void main() {
    );
  });
  testWidgets('renders unread dot on channels with unread chat messages', (
    tester,
  ) async {
    await tester.pumpWidget(
      snapshotHarness(
        channels: [channel(id: 1, name: 'Lobby')],
        clients: const [],
        unreadChannelIds: {BigInt.one},
      ),
    );
    await tester.pumpAndSettle();
    expect(
      find.byWidgetPredicate(
        (widget) =>
            widget is Container &&
            widget.constraints?.maxWidth == 8 &&
            widget.constraints?.maxHeight == 8 &&
            widget.decoration is BoxDecoration &&
            (widget.decoration! as BoxDecoration).shape == BoxShape.circle,
      ),
      findsOneWidget,
    );
  });
  testWidgets('collapsing a channel hides users and child channels', (
    tester,
  ) async {
@@ -523,7 +493,6 @@ void main() {
            framesSent: 1,
            framesReceived: 0,
            pttActive: true,
            inputLevel: -30.0,
          ),
        ),
      );
@@ -580,7 +549,6 @@ void main() {
            localOutputMuted: false,
            hasJoinPending: false,
            canJoinVoiceChannel: true,
            unreadChannelIds: const {},
            onJoinChannel: (channel) => tapped = channel,
            onJoinChannelWithPassword: (_) {},
          ),
@@ -608,64 +576,6 @@ void main() {
    expect(tapped!.neededTalkPower, 12);
  });
  testWidgets('channel context menu opens chat without replacing voice join', (
    tester,
  ) async {
    final lobby = channel(id: 1, name: 'Lobby');
    rust.BridgeChannel? joined;
    rust.BridgeChannel? openedChat;
    await tester.pumpWidget(
      MaterialApp(
        localizationsDelegates: AppL10n.localizationsDelegates,
        supportedLocales: AppL10n.supportedLocales,
        home: Scaffold(
          body: SnapshotView(
            snapshot: rust.BridgeSnapshot(
              serverName: 'Server',
              welcomeMessage: '',
              platform: '',
              version: '',
              channels: [lobby],
              clients: const [],
              ownClientId: BigInt.one,
            ),
            audioStats: null,
            currentVoiceChannelId: null,
            pendingVoiceChannelId: null,
            localInputMuted: false,
            localOutputMuted: false,
            hasJoinPending: false,
            canJoinVoiceChannel: true,
            unreadChannelIds: const {},
            onJoinChannel: (channel) => joined = channel,
            onJoinChannelWithPassword: (_) {},
            onOpenChannelChat: (channel) => openedChat = channel,
          ),
        ),
      ),
    );
    await tester.pumpAndSettle();
    await tester.tap(find.text('Lobby'));
    await tester.pump();
    expect(joined, lobby);
    expect(openedChat, isNull);
    expect(find.text('Chat'), findsNothing);
    await tester.tap(find.text('Lobby'), buttons: kSecondaryMouseButton);
    await tester.pumpAndSettle();
    expect(find.text('Chat'), findsOneWidget);
    await tester.tap(find.text('Chat'));
    await tester.pumpAndSettle();
    expect(openedChat, lobby);
  });
  testWidgets('separator spacers render as line painters without raw text', (
    tester,
  ) async {
@@ -700,7 +610,6 @@ void main() {
            localOutputMuted: false,
            hasJoinPending: false,
            canJoinVoiceChannel: true,
            unreadChannelIds: const {},
            onJoinChannel: (_) {},
            onJoinChannelWithPassword: (_) {},
          ),
@@ -755,7 +664,6 @@ void main() {
            localOutputMuted: false,
            hasJoinPending: false,
            canJoinVoiceChannel: true,
            unreadChannelIds: const {},
            onJoinChannel: (_) {},
            onJoinChannelWithPassword: (_) {},
          ),
@@ -1,38 +0,0 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:chanora_flutter/l10n/generated/app_localizations.dart';
 import 'package:chanora_flutter/widgets/voice_compact.dart';
 void main() {
  testWidgets('touch PTT releases when disposed while held', (tester) async {
    final heldChanges = <bool>[];
    await tester.pumpWidget(
      MaterialApp(
        localizationsDelegates: AppL10n.localizationsDelegates,
        supportedLocales: AppL10n.supportedLocales,
        home: Scaffold(
          body: VoicePttButton(
            active: false,
            onHeldChanged: heldChanges.add,
          ),
        ),
      ),
    );
    final center = tester.getCenter(find.byType(VoicePttButton));
    final gesture = await tester.startGesture(center);
    await tester.pump();
    expect(heldChanges, [true]);
    await tester.pumpWidget(const MaterialApp(home: Scaffold()));
    expect(heldChanges, [true, false]);
    await gesture.cancel();
    expect(heldChanges, [true, false]);
  });
 }
@@ -13,24 +13,6 @@ void main() {
    ]);
  });
  test('gated transmit mode segments drop VAD when unsupported', () {
    expect(
      transmitModeSegmentsFor(voiceActivityAvailable: false).map((s) => s.value),
      [rust.BridgeTransmitMode.ptt, rust.BridgeTransmitMode.continuous],
    );
  });
  test('gated transmit mode segments include VAD when supported', () {
    expect(
      transmitModeSegmentsFor(voiceActivityAvailable: true).map((s) => s.value),
      [
        rust.BridgeTransmitMode.ptt,
        rust.BridgeTransmitMode.continuous,
        rust.BridgeTransmitMode.voiceActivity,
      ],
    );
  });
  test('shared Android processing segments expose hardware and WebRTC', () {
    expect(androidProcessingSegments.map((s) => s.value), [true, false]);
  });
@@ -9,7 +9,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
 )
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
  flutter_local_notifications_windows
  jni
 )
@@ -10,7 +10,6 @@ repository.workspace = true
 publish.workspace = true
 [dependencies]
 chanora_cache = { path = "../../crates/chanora_cache" }
 chanora_protocol = { path = "../../crates/chanora_protocol" }
 chanora_state    = { path = "../../crates/chanora_state" }
 chanora_audio    = { path = "../../crates/chanora_audio" }
@@ -19,7 +18,7 @@ chanora_diagnostics = { path = "../../crates/chanora_diagnostics" }
 chanora_prefetch = { path = "../../crates/chanora_prefetch" }
 thiserror.workspace = true
 tracing.workspace = true
-tokio = { version = "1", features = ["sync", "rt", "macros", "time"] }
+tokio = { version = "1", features = ["sync", "rt", "macros"] }
 [dev-dependencies]
 # Used by integration tests to inspect the bookmark DB row layout
@@ -1,287 +0,0 @@
 use chanora_audio::{AudioRoute, PttBackendDescriptor};
 use chanora_protocol::{MessageTarget, PokeStrength};
 /// Privacy-safe snapshot of the active PTT capability.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct PttDescriptorSnapshot {
    /// Stable capability level name.
    pub level: String,
    /// Stable backend identifier.
    pub backend_id: String,
    /// Coarse bound input class; empty when no binding is active.
    pub bound_input_class: String,
 }
 impl From<PttBackendDescriptor> for PttDescriptorSnapshot {
    fn from(desc: PttBackendDescriptor) -> Self {
        Self {
            level: desc.level.as_str().to_string(),
            backend_id: desc.backend_id.to_string(),
            bound_input_class: desc.bound_input_class.unwrap_or("").to_string(),
        }
    }
 }
 /// Persisted PTT binding state exposed to callers.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct PersistedPttBinding {
    /// Stable input category string (`""`, `"keyboard"`, or
    /// `"mouse-side-button"`).
    pub input_class: String,
    /// Display-only key label; empty when no binding is active.
    pub key_label: String,
 }
 impl PersistedPttBinding {
    pub(crate) fn empty() -> Self {
        Self {
            input_class: String::new(),
            key_label: String::new(),
        }
    }
 }
 /// High-level lifecycle event surfaced to subscribers.
 ///
 /// This is the minimal set needed for A.6 (reconnect banner). The
 /// full event catalogue lands in A.4.
 #[derive(Debug, Clone)]
 pub enum SessionEvent {
    /// Initial connect succeeded, or reconnect attempt succeeded.
    Connected {
        /// Server name reported in the snapshot.
        server_name: String,
    },
    /// Connection lost; the supervisor will retry.
    Lost {
        /// Reason classification from the protocol layer.
        reason: String,
    },
    /// Supervisor is sleeping before its next reconnect attempt.
    Reconnecting {
        /// 1-based attempt counter for the current outage.
        attempt: u32,
        /// Seconds the supervisor will sleep before this attempt.
        delay_secs: u32,
    },
    /// Supervisor gave up after `attempt` failed retries (or the
    /// user explicitly disconnected mid-outage).
    Disconnected {
        /// Reason classification from the protocol layer.
        reason: String,
    },
    /// Audio engine started (e.g. after a successful reconnect with
    /// reattachment).
    AudioStarted,
    /// Audio engine stopped (e.g. before a reconnect cycle, or by
    /// explicit user action).
    AudioStopped,
    /// Detected desktop Push-to-Talk capability (gen2 v0.9.3 /
    /// DEC-023..028). Published when the audio engine starts or
    /// when the active backend transitions (for example macOS
    /// permission state change). Carries only the privacy-safe
    /// descriptor — capability level, backend identifier, bound
    /// input class — per SRS-202 / DEC-027.
    PttCapability {
        /// Stable level name from `PttCapabilityLevel::as_str()`.
        level: String,
        /// Stable backend identifier (e.g. `"focused"`).
        backend_id: String,
        /// Coarse bound input class (e.g. `"keyboard"`); empty when
        /// no binding is active.
        bound_input_class: String,
    },
    /// Voice subsystem state snapshot (SDD-094). Emitted on
    /// `voice_join` / `voice_leave`, transmit-mode changes,
    /// hard-mute toggles, and release-tail edits.
    VoiceState {
        /// True when the user has joined a voice channel via
        /// `voice_join` and the audio engine is running.
        in_channel: bool,
        /// Active transmit mode encoded as
        /// [`chanora_audio::TransmitMode::as_u8`].
        transmit_mode: u8,
        /// True when the hard-mute clamp is engaged.
        mute: bool,
        /// Current release-tail in milliseconds (0..=500).
        release_tail_ms: u32,
        /// Last confirmed authoritative channel id from the
        /// `channel_join` reducer projection.
        current_channel_id: Option<u64>,
        /// Non-authoritative pending target channel id from the
        /// reducer projection.
        pending_target_channel_id: Option<u64>,
        /// Whether the reducer currently allows a new join intent.
        can_join: bool,
        /// Whether the reducer currently allows leave intent.
        can_leave: bool,
        /// Join projection synchronization state.
        join_sync_state: VoiceJoinSyncState,
        /// Last stable sanitized join error code, if any.
        join_error_code: Option<VoiceJoinErrorCode>,
    },
    /// iOS audio-session interruption state (SDD-101). Emitted when
    /// interruption begins and when it ends (with the platform hint
    /// indicating whether audio should resume).
    InterruptionState {
        /// True when interruption began, false when interruption ended.
        began: bool,
        /// Platform-provided resume hint. For begin events this is false.
        should_resume: bool,
    },
    /// A text message was received from the server.
    ChatMessage {
        /// Client id of the sender.
        sender_id: u64,
        /// Nickname of the sender.
        sender_name: String,
        /// Message content.
        message: String,
        /// Target scope (server/channel/private/poke).
        target: MessageTarget,
        /// Poke notification strength, present only for poke messages.
        poke_strength: Option<PokeStrength>,
    },
    /// Human-readable TeamSpeak-style server activity.
    ServerActivity {
        /// Activity line text.
        message: String,
    },
    /// Audio route changed (speaker/earpiece/BT/wired headset).
    AudioRouteChanged {
        /// New audio output route.
        route: AudioRoute,
    },
    /// A client moved to a different channel.
    ClientMoved {
        /// Unique client identifier.
        client_id: u64,
        /// Destination channel.
        new_channel_id: u64,
    },
    /// A new client connected.
    ClientJoined {
        /// Unique client identifier.
        client_id: u64,
        /// Channel the client joined.
        channel_id: u64,
        /// Display nickname.
        name: String,
        /// Microphone muted state.
        input_muted: bool,
        /// Speaker muted state.
        output_muted: bool,
        /// Whether this is a server query (bot) client.
        is_server_query: bool,
        /// Client's talk power value.
        talk_power: i32,
        /// Whether the server granted temporary talk power.
        talk_power_granted: bool,
    },
    /// A client disconnected.
    ClientLeft {
        /// Unique client identifier.
        client_id: u64,
        /// Display nickname at time of disconnect.
        name: String,
    },
    /// Client properties changed.
    ClientUpdated {
        /// Unique client identifier.
        client_id: u64,
        /// Microphone muted state.
        input_muted: bool,
        /// Speaker muted state.
        output_muted: bool,
        /// Whether this is a server query (bot) client.
        is_server_query: bool,
        /// Client's talk power value.
        talk_power: i32,
        /// Whether the server granted temporary talk power.
        talk_power_granted: bool,
    },
    /// A new channel appeared.
    ChannelAdded {
        /// Unique channel identifier.
        id: u64,
        /// Parent channel ID.
        parent: u64,
        /// Channel name.
        name: String,
        /// Predecessor channel ID within the same parent (TeamSpeak
        /// linked-list ordering hint). Zero means first child.
        order: i64,
        /// Whether the channel requires a password.
        has_password: bool,
        /// Talk power required to speak, or `None` when unrestricted.
        needed_talk_power: Option<i32>,
    },
    /// A channel was deleted.
    ChannelRemoved {
        /// Channel identifier.
        id: u64,
    },
    /// Channel properties changed.
    ChannelUpdated {
        /// Unique channel identifier.
        id: u64,
        /// Channel name.
        name: String,
        /// Whether the channel requires a password.
        has_password: bool,
        /// Talk power required to speak, or `None` when unrestricted.
        needed_talk_power: Option<i32>,
    },
 }
 /// Bridge-safe mirror of channel-join projection sync state.
 #[derive(Debug, Clone, Copy)]
 pub enum VoiceJoinSyncState {
    /// Reducer is ready to accept channel actions.
    Ready,
    /// Reducer is synchronizing against an initial snapshot.
    SynchronizingInitialSnapshot,
    /// Reducer is synchronizing after reconnect.
    SynchronizingReconnect,
 }
 /// Bridge-safe mirror of stable channel-join error codes.
 #[derive(Debug, Clone, Copy)]
 pub enum VoiceJoinErrorCode {
    /// Duplicate same-target join intent was coalesced.
    DuplicateSameTargetCoalesced,
    /// A different target was requested while one is already pending.
    JoinAlreadyPendingDifferentTarget,
    /// Join denied by server policy/permission.
    JoinDenied,
    /// Join failed due to protocol-level error.
    JoinProtocolFailure,
    /// Join failed due to transport/network error.
    JoinNetworkFailure,
    /// Join timed out awaiting confirmation.
    JoinTimeout,
    /// Pending join was superseded by user leave.
    JoinSupersededByLeave,
    /// Stale join outcome was ignored.
    JoinStaleOutcomeIgnored,
    /// Authoritative membership reconciled to different channel.
    JoinReconciledDifferentChannel,
    /// Join command was rejected before send acceptance.
    JoinCommandRejectedBeforeSend,
    /// Join intent rejected while reducer synchronizing.
    JoinCannotStartWhileSynchronizing,
 }
 /// Coarse OS-reported network state. Populated by the Flutter side
 /// via `connectivity_plus`; on platforms where no signal is wired
 /// we stay at `Unknown` forever and the supervisor falls back to
 /// pure watchdog/backoff behaviour.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum NetworkState {
    /// No signal seen yet — treat as ambiguous; don't change behaviour.
    Unknown,
    /// OS reports at least one network with internet capability.
    Online,
    /// OS reports no networks available.
    Offline,
 }
@@ -1,344 +0,0 @@
 use std::collections::HashMap;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 use chanora_cache::{BlobCache, BlobCacheError, PREFIX_AVATAR, PREFIX_ICON};
 use chanora_protocol::{ProtocolClient, ProtocolError};
 use tokio::sync::{Mutex, Semaphore, oneshot};
 use tracing::warn;
 const MAX_CONCURRENT_DOWNLOADS: usize = 2;
 const NEGATIVE_CACHE_TTL: Duration = Duration::from_secs(5 * 60);
 type InFlightWaiters = Vec<oneshot::Sender<Result<Option<Vec<u8>>, FileTransferError>>>;
 /// Errors raised while resolving protocol-owned file assets.
 #[derive(Debug, thiserror::Error)]
 pub enum FileTransferError {
    /// No live protocol client is available for a download.
    #[error("not connected")]
    NotConnected,
    /// The protocol layer failed while downloading the asset.
    #[error("protocol error: {0}")]
    Protocol(#[from] ProtocolError),
    /// The blob cache failed while reading or writing the asset.
    #[error("cache error: {0}")]
    Cache(#[from] BlobCacheError),
 }
 impl Clone for FileTransferError {
    fn clone(&self) -> Self {
        match self {
            Self::NotConnected => Self::NotConnected,
            Self::Protocol(error) => Self::Protocol(clone_protocol_error(error)),
            Self::Cache(error) => Self::Cache(clone_blob_cache_error(error)),
        }
    }
 }
 pub struct FileTransferService {
    cache: BlobCache,
    protocol: Arc<Mutex<Option<ProtocolClient>>>,
    semaphore: Arc<Semaphore>,
    in_flight: Arc<Mutex<HashMap<String, InFlightWaiters>>>,
    negative_cache: Arc<Mutex<HashMap<String, Instant>>>,
 }
 impl FileTransferService {
    pub fn new(cache: BlobCache, protocol: Arc<Mutex<Option<ProtocolClient>>>) -> Self {
        Self {
            cache,
            protocol,
            semaphore: Arc::new(Semaphore::new(MAX_CONCURRENT_DOWNLOADS)),
            in_flight: Arc::new(Mutex::new(HashMap::new())),
            negative_cache: Arc::new(Mutex::new(HashMap::new())),
        }
    }
    pub async fn set_protocol(&self, client: Option<ProtocolClient>) {
        *self.protocol.lock().await = client;
    }
    pub async fn get_avatar(
        &self,
        avatar_hash: &str,
        client_uid: &str,
    ) -> Result<Option<Vec<u8>>, FileTransferError> {
        if let Some(bytes) = self.cache.get(PREFIX_AVATAR, avatar_hash).await? {
            return Ok(Some(bytes));
        }
        if self.is_negative_cache_hit(avatar_hash).await {
            return Ok(None);
        }
        let rx = {
            let mut in_flight = self.in_flight.lock().await;
            if let Some(waiters) = in_flight.get_mut(avatar_hash) {
                let (tx, rx) = oneshot::channel();
                waiters.push(tx);
                Some(rx)
            } else {
                in_flight.insert(avatar_hash.to_string(), Vec::new());
                None
            }
        };
        if let Some(rx) = rx {
            return rx.await.unwrap_or_else(|_| {
                Err(FileTransferError::Protocol(ProtocolError::Lost(
                    "coalesced avatar download waiter dropped".to_string(),
                )))
            });
        }
        let _permit = self
            .semaphore
            .acquire()
            .await
            .expect("file transfer semaphore should stay open");
        let result = self.do_download_avatar(avatar_hash, client_uid).await;
        self.finish_in_flight(avatar_hash, &result).await;
        result
    }
    pub async fn get_icon(&self, icon_id: u64) -> Result<Option<Vec<u8>>, FileTransferError> {
        let icon_key = icon_id.to_string();
        let negative_key = format!("ic_{icon_id}");
        let in_flight_key = format!("icon_{icon_id}");
        if let Some(bytes) = self.cache.get(PREFIX_ICON, &icon_key).await? {
            return Ok(Some(bytes));
        }
        if self.is_negative_cache_hit(&negative_key).await {
            return Ok(None);
        }
        let rx = {
            let mut in_flight = self.in_flight.lock().await;
            if let Some(waiters) = in_flight.get_mut(&in_flight_key) {
                let (tx, rx) = oneshot::channel();
                waiters.push(tx);
                Some(rx)
            } else {
                in_flight.insert(in_flight_key.clone(), Vec::new());
                None
            }
        };
        if let Some(rx) = rx {
            return rx.await.unwrap_or_else(|_| {
                Err(FileTransferError::Protocol(ProtocolError::Lost(
                    "coalesced icon download waiter dropped".to_string(),
                )))
            });
        }
        let _permit = self
            .semaphore
            .acquire()
            .await
            .expect("file transfer semaphore should stay open");
        let result = self.do_download_icon(icon_id).await;
        self.finish_in_flight(&in_flight_key, &result).await;
        result
    }
    pub async fn clear_cache(&self) -> Result<(), FileTransferError> {
        self.cache.clear().await?;
        self.negative_cache.lock().await.clear();
        Ok(())
    }
    pub async fn cache_size(&self) -> Result<u64, FileTransferError> {
        Ok(self.cache.total_size().await?)
    }
    async fn do_download_avatar(
        &self,
        avatar_hash: &str,
        client_uid: &str,
    ) -> Result<Option<Vec<u8>>, FileTransferError> {
        if let Some(bytes) = self.cache.get(PREFIX_AVATAR, avatar_hash).await? {
            return Ok(Some(bytes));
        }
        if self.is_negative_cache_hit(avatar_hash).await {
            return Ok(None);
        }
        let protocol = self.protocol.lock().await;
        let client = protocol.as_ref().ok_or(FileTransferError::NotConnected)?;
        match client.download_avatar(client_uid).await {
            Ok(bytes) => {
                self.cache.put(PREFIX_AVATAR, avatar_hash, &bytes).await?;
                self.negative_cache.lock().await.remove(avatar_hash);
                Ok(Some(bytes))
            }
            Err(ProtocolError::ServerRejected { .. }) => {
                self.negative_cache
                    .lock()
                    .await
                    .insert(avatar_hash.to_string(), Instant::now() + NEGATIVE_CACHE_TTL);
                Ok(None)
            }
            Err(error) => Err(FileTransferError::Protocol(error)),
        }
    }
    async fn do_download_icon(&self, icon_id: u64) -> Result<Option<Vec<u8>>, FileTransferError> {
        let icon_key = icon_id.to_string();
        let negative_key = format!("ic_{icon_id}");
        if let Some(bytes) = self.cache.get(PREFIX_ICON, &icon_key).await? {
            return Ok(Some(bytes));
        }
        if self.is_negative_cache_hit(&negative_key).await {
            return Ok(None);
        }
        let protocol = self.protocol.lock().await;
        let client = protocol.as_ref().ok_or(FileTransferError::NotConnected)?;
        match client.download_icon(icon_id).await {
            Ok(bytes) => {
                self.cache.put(PREFIX_ICON, &icon_key, &bytes).await?;
                self.negative_cache.lock().await.remove(&negative_key);
                Ok(Some(bytes))
            }
            Err(ProtocolError::ServerRejected { .. }) => {
                self.negative_cache
                    .lock()
                    .await
                    .insert(negative_key, Instant::now() + NEGATIVE_CACHE_TTL);
                Ok(None)
            }
            Err(error) => Err(FileTransferError::Protocol(error)),
        }
    }
    async fn finish_in_flight(
        &self,
        avatar_hash: &str,
        result: &Result<Option<Vec<u8>>, FileTransferError>,
    ) {
        let waiters = self.in_flight.lock().await.remove(avatar_hash).unwrap_or_default();
        for waiter in waiters {
            if waiter.send(result.clone()).is_err() {
                warn!(target: "chanora_core", avatar_hash, "avatar download waiter dropped");
            }
        }
    }
    async fn is_negative_cache_hit(&self, avatar_hash: &str) -> bool {
        let now = Instant::now();
        let mut negative_cache = self.negative_cache.lock().await;
        match negative_cache.get(avatar_hash).copied() {
            Some(expires_at) if expires_at > now => true,
            Some(_) => {
                negative_cache.remove(avatar_hash);
                false
            }
            None => false,
        }
    }
 }
 fn clone_protocol_error(error: &ProtocolError) -> ProtocolError {
    match error {
        ProtocolError::Invalid(message) => ProtocolError::Invalid(message.clone()),
        ProtocolError::DnsFailed { host, reason } => ProtocolError::DnsFailed {
            host: host.clone(),
            reason: reason.clone(),
        },
        ProtocolError::Connect(message) => ProtocolError::Connect(message.clone()),
        ProtocolError::DisconnectedEarly(message) => {
            ProtocolError::DisconnectedEarly(message.clone())
        }
        ProtocolError::Lost(message) => ProtocolError::Lost(message.clone()),
        ProtocolError::Identity(message) => ProtocolError::Identity(message.clone()),
        ProtocolError::Timeout => ProtocolError::Timeout,
        ProtocolError::ServerRejected { code, message } => ProtocolError::ServerRejected {
            code: *code,
            message: message.clone(),
        },
        ProtocolError::Backend(message) => ProtocolError::Backend(message.clone()),
        ProtocolError::FileTransfer(message) => ProtocolError::FileTransfer(message.clone()),
    }
 }
 fn clone_blob_cache_error(error: &BlobCacheError) -> BlobCacheError {
    match error {
        BlobCacheError::Io(message) => BlobCacheError::Io(message.clone()),
        BlobCacheError::InvalidKey(message) => BlobCacheError::InvalidKey(message.clone()),
    }
 }
 #[cfg(test)]
 mod tests {
    use super::*;
    fn test_cache_dir(name: &str) -> std::path::PathBuf {
        let mut path = std::env::temp_dir();
        let nanos = std::time::SystemTime::now()
            .duration_since(std::time::UNIX_EPOCH)
            .unwrap()
            .as_nanos();
        path.push(format!("chanora-core-file-transfer-{name}-{nanos}"));
        path
    }
    #[tokio::test]
    async fn returns_cached_avatar_without_connection() {
        let cache_dir = test_cache_dir("cache-hit");
        let cache = BlobCache::new(&cache_dir, 1024).unwrap();
        cache.put(PREFIX_AVATAR, "a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6", b"avatar")
            .await
            .unwrap();
        let service = FileTransferService::new(cache, Arc::new(Mutex::new(None)));
        let avatar = service
            .get_avatar("a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6", "client")
            .await
            .unwrap();
        assert_eq!(avatar, Some(b"avatar".to_vec()));
        let _ = std::fs::remove_dir_all(cache_dir);
    }
    #[tokio::test]
    async fn negative_cache_short_circuits_not_connected() {
        let cache_dir = test_cache_dir("negative-cache");
        let cache = BlobCache::new(&cache_dir, 1024).unwrap();
        let service = FileTransferService::new(cache, Arc::new(Mutex::new(None)));
        service
            .negative_cache
            .lock()
            .await
            .insert("a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6".to_string(), Instant::now() + NEGATIVE_CACHE_TTL);
        let avatar = service
            .get_avatar("a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6", "client")
            .await
            .unwrap();
        assert_eq!(avatar, None);
        let _ = std::fs::remove_dir_all(cache_dir);
    }
    #[tokio::test]
    async fn returns_cached_icon_without_connection() {
        let cache_dir = test_cache_dir("icon-cache-hit");
        let cache = BlobCache::new(&cache_dir, 1024).unwrap();
        cache.put(PREFIX_ICON, "12345", b"icon").await.unwrap();
        let service = FileTransferService::new(cache, Arc::new(Mutex::new(None)));
        let icon = service.get_icon(12345).await.unwrap();
        assert_eq!(icon, Some(b"icon".to_vec()));
        let _ = std::fs::remove_dir_all(cache_dir);
    }
 }
@@ -52,9 +52,6 @@ use chanora_state::channel_join::{
    ConnectionEpoch, JoinFailureKind,
 };
 mod events;
 mod file_transfer;
 mod network_diagnostics;
 pub mod ptt;
 pub use chanora_audio::{
@@ -69,15 +66,49 @@ pub use chanora_diagnostics::{
 };
 pub use chanora_protocol::{
    ChannelInfo, ChatMessage, ClientInfo, ClientProfile, ConnectConfig, DisconnectReason,
-    MessageTarget, PokeStrength, ProtocolError, ServerActivity, ServerSnapshot,
+    MessageTarget, ProtocolError, ServerActivity, ServerSnapshot,
 };
 pub use chanora_storage::{Bookmark, BookmarkRepository, IdentityFileStore};
-pub use events::{
+
-    NetworkState, PersistedPttBinding, PttDescriptorSnapshot, SessionEvent, VoiceJoinErrorCode,
+/// Privacy-safe snapshot of the active PTT capability.
-    VoiceJoinSyncState,
+#[derive(Debug, Clone, PartialEq, Eq)]
-};
+pub struct PttDescriptorSnapshot {
-pub use file_transfer::FileTransferError;
+    /// Stable capability level name.
-use network_diagnostics::NetworkDiagnostics;
+    pub level: String,
    /// Stable backend identifier.
    pub backend_id: String,
    /// Coarse bound input class; empty when no binding is active.
    pub bound_input_class: String,
 }
 impl From<PttBackendDescriptor> for PttDescriptorSnapshot {
    fn from(desc: PttBackendDescriptor) -> Self {
        Self {
            level: desc.level.as_str().to_string(),
            backend_id: desc.backend_id.to_string(),
            bound_input_class: desc.bound_input_class.unwrap_or("").to_string(),
        }
    }
 }
 /// Persisted PTT binding state exposed to callers.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct PersistedPttBinding {
    /// Stable input category string (`""`, `"keyboard"`, or
    /// `"mouse-side-button"`).
    pub input_class: String,
    /// Display-only key label; empty when no binding is active.
    pub key_label: String,
 }
 impl PersistedPttBinding {
    fn empty() -> Self {
        Self {
            input_class: String::new(),
            key_label: String::new(),
        }
    }
 }
 /// Errors that can arise during top-level orchestration.
 #[derive(Debug, Error)]
@@ -94,12 +125,6 @@ pub enum CoreError {
    /// Storage error.
    #[error("storage: {0}")]
    Storage(#[from] chanora_storage::StorageError),
    /// Blob-cache failure.
    #[error("cache: {0}")]
    Cache(#[from] chanora_cache::BlobCacheError),
    /// File-transfer failure.
    #[error("file transfer: {0}")]
    FileTransfer(#[from] FileTransferError),
    /// Diagnostics error.
    #[error("diagnostics: {0}")]
    Diagnostics(#[from] chanora_diagnostics::DiagnosticsError),
@@ -122,11 +147,253 @@ pub enum CoreError {
    Ptt(#[from] ptt::PttControllerError),
 }
 /// High-level lifecycle event surfaced to subscribers.
 ///
 /// This is the minimal set needed for A.6 (reconnect banner). The
 /// full event catalogue lands in A.4.
 #[derive(Debug, Clone)]
 pub enum SessionEvent {
    /// Initial connect succeeded, or reconnect attempt succeeded.
    Connected {
        /// Server name reported in the snapshot.
        server_name: String,
    },
    /// Connection lost; the supervisor will retry.
    Lost {
        /// Reason classification from the protocol layer.
        reason: String,
    },
    /// Supervisor is sleeping before its next reconnect attempt.
    Reconnecting {
        /// 1-based attempt counter for the current outage.
        attempt: u32,
        /// Seconds the supervisor will sleep before this attempt.
        delay_secs: u32,
    },
    /// Supervisor gave up after `attempt` failed retries (or the
    /// user explicitly disconnected mid-outage).
    Disconnected {
        /// Reason classification from the protocol layer.
        reason: String,
    },
    /// Audio engine started (e.g. after a successful reconnect with
    /// reattachment).
    AudioStarted,
    /// Audio engine stopped (e.g. before a reconnect cycle, or by
    /// explicit user action).
    AudioStopped,
    /// Detected desktop Push-to-Talk capability (gen2 v0.9.3 /
    /// DEC-023..028). Published when the audio engine starts or
    /// when the active backend transitions (for example macOS
    /// permission state change). Carries only the privacy-safe
    /// descriptor — capability level, backend identifier, bound
    /// input class — per SRS-202 / DEC-027.
    PttCapability {
        /// Stable level name from `PttCapabilityLevel::as_str()`.
        level: String,
        /// Stable backend identifier (e.g. `"focused"`).
        backend_id: String,
        /// Coarse bound input class (e.g. `"keyboard"`); empty when
        /// no binding is active.
        bound_input_class: String,
    },
    /// Voice subsystem state snapshot (SDD-094). Emitted on
    /// `voice_join` / `voice_leave`, transmit-mode changes,
    /// hard-mute toggles, and release-tail edits.
    VoiceState {
        /// True when the user has joined a voice channel via
        /// `voice_join` and the audio engine is running.
        in_channel: bool,
        /// Active transmit mode encoded as
        /// [`chanora_audio::TransmitMode::as_u8`].
        transmit_mode: u8,
        /// True when the hard-mute clamp is engaged.
        mute: bool,
        /// Current release-tail in milliseconds (0..=500).
        release_tail_ms: u32,
        /// Last confirmed authoritative channel id from the
        /// `channel_join` reducer projection.
        current_channel_id: Option<u64>,
        /// Non-authoritative pending target channel id from the
        /// reducer projection.
        pending_target_channel_id: Option<u64>,
        /// Whether the reducer currently allows a new join intent.
        can_join: bool,
        /// Whether the reducer currently allows leave intent.
        can_leave: bool,
        /// Join projection synchronization state.
        join_sync_state: VoiceJoinSyncState,
        /// Last stable sanitized join error code, if any.
        join_error_code: Option<VoiceJoinErrorCode>,
    },
    /// iOS audio-session interruption state (SDD-101). Emitted when
    /// interruption begins and when it ends (with the platform hint
    /// indicating whether audio should resume).
    InterruptionState {
        /// True when interruption began, false when interruption ended.
        began: bool,
        /// Platform-provided resume hint. For begin events this is false.
        should_resume: bool,
    },
    /// A text message was received from the server.
    ChatMessage {
        /// Client id of the sender.
        sender_id: u64,
        /// Nickname of the sender.
        sender_name: String,
        /// Message content.
        message: String,
        /// Target scope (server/channel/private/poke).
        target: MessageTarget,
    },
    /// Human-readable TeamSpeak-style server activity.
    ServerActivity {
        /// Activity line text.
        message: String,
    },
    /// Audio route changed (speaker/earpiece/BT/wired headset).
    AudioRouteChanged {
        route: AudioRoute,
    },
    ClientMoved {
        client_id: u64,
        new_channel_id: u64,
    },
    ClientJoined {
        client_id: u64,
        channel_id: u64,
        name: String,
        input_muted: bool,
        output_muted: bool,
        is_server_query: bool,
        talk_power: i32,
        talk_power_granted: bool,
    },
    ClientLeft {
        client_id: u64,
        name: String,
    },
    ClientUpdated {
        client_id: u64,
        input_muted: bool,
        output_muted: bool,
        is_server_query: bool,
        talk_power: i32,
        talk_power_granted: bool,
    },
    ChannelAdded {
        id: u64,
        parent: u64,
        name: String,
        order: i64,
        has_password: bool,
        needed_talk_power: Option<i32>,
    },
    ChannelRemoved {
        id: u64,
    },
    ChannelUpdated {
        id: u64,
        name: String,
        has_password: bool,
        needed_talk_power: Option<i32>,
    },
 }
 /// Bridge-safe mirror of channel-join projection sync state.
 #[derive(Debug, Clone, Copy)]
 pub enum VoiceJoinSyncState {
    /// Reducer is ready to accept channel actions.
    Ready,
    /// Reducer is synchronizing against an initial snapshot.
    SynchronizingInitialSnapshot,
    /// Reducer is synchronizing after reconnect.
    SynchronizingReconnect,
 }
 /// Bridge-safe mirror of stable channel-join error codes.
 #[derive(Debug, Clone, Copy)]
 pub enum VoiceJoinErrorCode {
    /// Duplicate same-target join intent was coalesced.
    DuplicateSameTargetCoalesced,
    /// A different target was requested while one is already pending.
    JoinAlreadyPendingDifferentTarget,
    /// Join denied by server policy/permission.
    JoinDenied,
    /// Join failed due to protocol-level error.
    JoinProtocolFailure,
    /// Join failed due to transport/network error.
    JoinNetworkFailure,
    /// Join timed out awaiting confirmation.
    JoinTimeout,
    /// Pending join was superseded by user leave.
    JoinSupersededByLeave,
    /// Stale join outcome was ignored.
    JoinStaleOutcomeIgnored,
    /// Authoritative membership reconciled to different channel.
    JoinReconciledDifferentChannel,
    /// Join command was rejected before send acceptance.
    JoinCommandRejectedBeforeSend,
    /// Join intent rejected while reducer synchronizing.
    JoinCannotStartWhileSynchronizing,
 }
 /// Coarse OS-reported network state. Populated by the Flutter side
 /// via `connectivity_plus`; on platforms where no signal is wired
 /// we stay at `Unknown` forever and the supervisor falls back to
 /// pure watchdog/backoff behaviour.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum NetworkState {
    /// No signal seen yet — treat as ambiguous; don't change behaviour.
    Unknown,
    /// OS reports at least one network with internet capability.
    Online,
    /// OS reports no networks available.
    Offline,
 }
 /// Channel capacity for the broadcast events. Generous because
 /// reconnect cycles emit several events per attempt; if subscribers
 /// fall behind we'd rather skip than block the supervisor.
 const EVENT_CHANNEL_CAPACITY: usize = 64;
 /// Network diagnostics snapshot collected across connection lifetimes.
 #[derive(Debug, Clone, Default)]
 struct NetworkDiagnostics {
    /// Total count of connects (including the initial one).
    connect_count: u64,
    /// Count of disconnects (graceful + loss).
    disconnect_count: u64,
    /// Recent loss reasons (last 8, ring buffer).
    loss_reasons: Vec<String>,
 }
 impl NetworkDiagnostics {
    fn record_connect(&mut self) {
        self.connect_count = self.connect_count.saturating_add(1);
    }
    fn record_loss(&mut self, reason: &str) {
        self.disconnect_count = self.disconnect_count.saturating_add(1);
        if self.loss_reasons.len() >= 8 {
            self.loss_reasons.remove(0);
        }
        self.loss_reasons.push(reason.to_string());
    }
    fn summary(&self) -> String {
        let mut s = format!(
            "connects: {}\ndisconnects: {}\n",
            self.connect_count, self.disconnect_count
        );
        if !self.loss_reasons.is_empty() {
            s.push_str(&format!(
                "loss_reasons: [{}]\n",
                self.loss_reasons.join(", ")
            ));
        }
        s
    }
 }
 struct SupervisorInner {
    /// Optional cached AudioEngineConfig — set when start_audio is
    /// first called, used to re-create the engine after a reconnect.
@@ -138,6 +405,7 @@ struct SupervisorInner {
 }
 struct ConnectedState {
    protocol: chanora_protocol::ProtocolClient,
    audio: Option<chanora_audio::AudioEngine>,
    /// Active PTT controller (SDD-088). Owns the platform input
    /// backend, the active binding, and the capability watch
@@ -171,20 +439,12 @@ struct ConnectedState {
    local_output_muted: bool,
 }
 async fn take_disconnect_state<T>(inner: &Arc<Mutex<Option<T>>>) -> Option<T> {
    inner.lock().await.take()
 }
 fn normalize_channel_password(password: Option<String>) -> Option<String> {
    password
        .map(|p| p.trim().to_string())
        .filter(|p| !p.is_empty())
 }
 fn should_dispatch_text_message(message: &str, target: &MessageTarget) -> bool {
    !message.trim().is_empty() || matches!(target, MessageTarget::Poke(_))
 }
 /// The top-level Chanora session. Owns at most one active server
 /// connection (DEC-006).
 #[derive(Clone)]
@@ -204,8 +464,6 @@ pub struct ChanoraSession {
    /// extension). Lives alongside the identity file. Wired by
    /// [`Self::init_storage`].
    bookmark_store: Arc<Mutex<Option<BookmarkRepository>>>,
    protocol: Arc<Mutex<Option<chanora_protocol::ProtocolClient>>>,
    file_transfer: Arc<Mutex<Option<Arc<file_transfer::FileTransferService>>>>,
    /// Invisible server-address prefetch cache. Warmed by Flutter typing
    /// but validated by Rust before Connect can reuse it.
    server_prefetch: ServerPrefetcher,
@@ -261,8 +519,6 @@ impl ChanoraSession {
            network_tx,
            identity_store: Arc::new(Mutex::new(None)),
            bookmark_store: Arc::new(Mutex::new(None)),
            protocol: Arc::new(Mutex::new(None)),
            file_transfer: Arc::new(Mutex::new(None)),
            server_prefetch: ServerPrefetcher::new(),
            voice_selector: selector,
            release_tail,
@@ -284,17 +540,6 @@ impl ChanoraSession {
        ConnectionEpoch(epoch)
    }
    async fn store_protocol(&self, client: Option<chanora_protocol::ProtocolClient>) {
        // Always update the shared Arc. The FileTransferService holds
        // the same Arc, so it sees the new client automatically — no
        // separate set_protocol call needed.
        *self.protocol.lock().await = client;
    }
    async fn take_protocol(&self) -> Option<chanora_protocol::ProtocolClient> {
        self.protocol.lock().await.take()
    }
    /// Wire a directory-backed identity store. Called by the bridge
    /// during `bridge_init` once Flutter has resolved the platform
    /// app-private storage directory. Subsequent [`Self::connect`]
@@ -359,65 +604,6 @@ impl ChanoraSession {
        Ok(())
    }
    /// Configure the blob cache root.
    pub async fn init_cache(&self, dir: &str) -> Result<(), CoreError> {
        let cache = chanora_cache::BlobCache::new(dir, 100 * 1024 * 1024)?;
        cache.evict().await?;
        let service = Arc::new(file_transfer::FileTransferService::new(
            cache,
            self.protocol.clone(),
        ));
        let mut guard = self.file_transfer.lock().await;
        *guard = Some(service);
        Ok(())
    }
    /// Resolve avatar bytes.
    pub async fn get_avatar(
        &self,
        avatar_hash: &str,
        client_uid: &str,
    ) -> Result<Option<Vec<u8>>, CoreError> {
        let service = { self.file_transfer.lock().await.clone() };
        if let Some(service) = service {
            return Ok(service.get_avatar(avatar_hash, client_uid).await?);
        }
        let protocol = self.protocol.lock().await;
        let client = protocol.as_ref().ok_or(CoreError::NotConnected)?;
        Ok(Some(client.download_avatar(client_uid).await?))
    }
    /// Resolve icon bytes.
    pub async fn get_icon(&self, icon_id: u64) -> Result<Option<Vec<u8>>, CoreError> {
        let service = { self.file_transfer.lock().await.clone() };
        if let Some(service) = service {
            return Ok(service.get_icon(icon_id).await?);
        }
        let protocol = self.protocol.lock().await;
        let client = protocol.as_ref().ok_or(CoreError::NotConnected)?;
        Ok(Some(client.download_icon(icon_id).await?))
    }
    /// Purge cached protocol-owned assets.
    pub async fn clear_cache(&self) -> Result<(), CoreError> {
        let service = { self.file_transfer.lock().await.clone() };
        if let Some(service) = service {
            service.clear_cache().await?;
        }
        Ok(())
    }
    /// Report the configured blob-cache size.
    pub async fn cache_size(&self) -> Result<u64, CoreError> {
        let service = { self.file_transfer.lock().await.clone() };
        match service {
            Some(service) => Ok(service.cache_size().await?),
            None => Ok(0),
        }
    }
    /// List persisted bookmarks. Returns an empty list if the store
    /// has not been wired or has no entries.
    pub async fn list_bookmarks(&self) -> Result<Vec<Bookmark>, CoreError> {
@@ -595,7 +781,6 @@ impl ChanoraSession {
        let supervisor = tokio::spawn(supervisor_loop(SupervisorContext {
            state_arc: self.inner.clone(),
            protocol: self.protocol.clone(),
            events_tx: self.events_tx.clone(),
            initial_cfg: cfg.clone(),
            initial_lost_rx: lost_rx,
@@ -650,9 +835,9 @@ impl ChanoraSession {
        }
        spawn_event_forwarders(&client, &self.events_tx);
        self.store_protocol(Some(client)).await;
        *guard = Some(ConnectedState {
            protocol: client,
            audio: None,
            ptt_controller: None,
            cancel_tx: Some(cancel_tx),
@@ -713,13 +898,9 @@ impl ChanoraSession {
    /// Return a fresh snapshot of the current server state.
    pub async fn snapshot(&self) -> Result<ServerSnapshot, CoreError> {
        let snap = {
            let protocol = self.protocol.lock().await;
            let client = protocol.as_ref().ok_or(CoreError::NotConnected)?;
            client.snapshot().await?
        };
        let mut guard = self.inner.lock().await;
        let state = guard.as_mut().ok_or(CoreError::NotConnected)?;
        let snap = state.protocol.snapshot().await?;
        let current_channel = self
            .find_own_in(&snap)
            .await
@@ -747,9 +928,9 @@ impl ChanoraSession {
    /// Fetch richer profile and live connection details for one online client.
    pub async fn client_profile(&self, client_id: u64) -> Result<ClientProfile, CoreError> {
-        let protocol = self.protocol.lock().await;
+        let guard = self.inner.lock().await;
-        let client = protocol.as_ref().ok_or(CoreError::NotConnected)?;
+        let state = guard.as_ref().ok_or(CoreError::NotConnected)?;
-        Ok(client.client_profile(client_id).await?)
+        Ok(state.protocol.client_profile(client_id).await?)
    }
    /// True if a connection is currently active.
@@ -763,12 +944,12 @@ impl ChanoraSession {
        message: String,
        target: MessageTarget,
    ) -> Result<(), CoreError> {
-        if !should_dispatch_text_message(&message, &target) {
+        if message.trim().is_empty() {
            return Ok(());
        }
-        let protocol = self.protocol.lock().await;
+        let guard = self.inner.lock().await;
-        let client = protocol.as_ref().ok_or(CoreError::NotConnected)?;
+        let state = guard.as_ref().ok_or(CoreError::NotConnected)?;
-        client.send_text_message(message, target).await?;
+        state.protocol.send_text_message(message, target).await?;
        Ok(())
    }
@@ -827,16 +1008,11 @@ impl ChanoraSession {
        // session permanently unable to restart audio without a
        // reconnect (the user saw "voice_in already taken" on the
        // second channel switch).
-        let (voice_out, voice_in) = {
+        let voice_out = state.protocol.voice_out();
-            let protocol = self.protocol.lock().await;
+        let voice_in = state
-            let client = protocol.as_ref().ok_or(CoreError::NotConnected)?;
+            .protocol
            (
                client.voice_out(),
                client
            .take_voice_in()
-                    .ok_or(CoreError::Invariant("voice_in already taken"))?,
+            .ok_or(CoreError::Invariant("voice_in already taken"))?;
            )
        };
        let gate = AudioTransmitGate::new(cfg.ptt_initial);
        cfg.voice_activity_selector = Some(self.voice_selector.clone());
        let new_engine = match chanora_audio::AudioEngine::start_with_gate(
@@ -1067,11 +1243,10 @@ impl ChanoraSession {
        let password_to_send = requested_password
            .clone()
            .or_else(|| state.channel_passwords.get(&channel_id).cloned());
-        {
+        state
-            let protocol = self.protocol.lock().await;
+            .protocol
-            let client = protocol.as_ref().ok_or(CoreError::NotConnected)?;
+            .move_to_channel(channel_id, password_to_send)
-            client.move_to_channel(channel_id, password_to_send).await?;
+            .await?;
        }
        if let Some(pw) = requested_password {
            state.channel_passwords.insert(channel_id, pw);
        }
@@ -1096,11 +1271,7 @@ impl ChanoraSession {
        if let Some(muted) = output {
            state.local_output_muted = muted;
        }
-        {
+        state.protocol.set_muted(input, output).await?;
            let protocol = self.protocol.lock().await;
            let client = protocol.as_ref().ok_or(CoreError::NotConnected)?;
            client.set_muted(input, output).await?;
        }
        if let Some(muted) = output {
            if let Some(audio) = state.audio.as_ref() {
                audio.set_output_muted(muted);
@@ -1136,8 +1307,8 @@ impl ChanoraSession {
        Ok(())
    }
-    /// Read audio engine statistics: (frames_sent, frames_received, transmit_active, input_level_dbfs).
+    /// Read audio engine statistics: (frames_sent, frames_received, transmit_active).
-    pub async fn audio_stats(&self) -> Result<(u32, u32, bool, f32), CoreError> {
+    pub async fn audio_stats(&self) -> Result<(u32, u32, bool), CoreError> {
        let guard = self.inner.lock().await;
        let state = guard.as_ref().ok_or(CoreError::NotConnected)?;
        let audio = state.audio.as_ref().ok_or(CoreError::AudioNotStarted)?;
@@ -1145,7 +1316,6 @@ impl ChanoraSession {
            audio.frames_sent(),
            audio.frames_received(),
            audio.transmit_active(),
            audio.input_level(),
        ))
    }
@@ -1212,19 +1382,11 @@ impl ChanoraSession {
    /// Configure the preferred Silero ONNX VAD model path on platforms
    /// that ship the ONNX detector.
    ///
-    /// Set the Silero VAD model path on supported platforms.
+    /// This does not require an active connection. Running non-iOS
-    ///
+    /// audio backends can observe the model-path epoch and reload on
-    /// This does not require an active connection. On desktop, the audio
+    /// the next capture frame when Silero is selected.
    /// engine immediately reloads the Silero ONNX worker if one is active
    /// or if the model file is now available at the new path.
    pub async fn set_vad_model_path(&self, path: String) -> Result<(), CoreError> {
        chanora_audio::vad::set_silero_model_path(&path)?;
        let guard = self.inner.lock().await;
        if let Some(state) = guard.as_ref() {
            if let Some(audio) = state.audio.as_ref() {
                audio.reload_audio_processing_config()?;
            }
        }
        Ok(())
    }
@@ -1423,12 +1585,11 @@ impl ChanoraSession {
        let password_to_send = requested_password
            .clone()
            .or_else(|| state.channel_passwords.get(&channel_id).cloned());
-        let move_result = {
+        if let Err(e) = state
-            let protocol = self.protocol.lock().await;
+            .protocol
-            let client = protocol.as_ref().ok_or(CoreError::NotConnected)?;
+            .queue_move_to_channel(channel_id, password_to_send)
-            client.queue_move_to_channel(channel_id, password_to_send).await
+            .await
-        };
+        {
        if let Err(e) = move_result {
            // TS3 error 0x0302 = `channel_already_in`: we're already
            // in the target channel, so this is a no-op success.
            // Rolling `in_channel` back to false would break PTT
@@ -1678,7 +1839,8 @@ impl ChanoraSession {
    /// Disconnect from the server. No-op if not connected.
    pub async fn disconnect(&self) -> Result<(), CoreError> {
-        if let Some(mut state) = take_disconnect_state(&self.inner).await {
+        let mut guard = self.inner.lock().await;
        if let Some(mut state) = guard.take() {
            // Signal the supervisor to exit (cancels any backoff sleep).
            if let Some(tx) = state.cancel_tx.take() {
                let _ = tx.send(());
@@ -1690,13 +1852,11 @@ impl ChanoraSession {
                audio.stop();
                let _ = self.events_tx.send(SessionEvent::AudioStopped);
            }
-            if let Some(protocol) = self.take_protocol().await {
+            state.protocol.disconnect().await;
                protocol.disconnect().await;
            }
            // Wait for the supervisor to wind down so we don't race
            // a redial against the explicit disconnect.
            if let Some(handle) = state.supervisor.take() {
-                await_supervisor_shutdown(handle, SUPERVISOR_SHUTDOWN_TIMEOUT).await;
+                let _ = handle.await;
            }
            let _ = self.events_tx.send(SessionEvent::Disconnected {
                reason: "user requested".to_string(),
@@ -1735,26 +1895,9 @@ const WATCHDOG_PROBE_TIMEOUT: Duration = Duration::from_secs(4);
 /// Number of consecutive watchdog failures before the supervisor
 /// declares the connection lost.
 const WATCHDOG_MAX_MISSES: u32 = 3;
 const SUPERVISOR_SHUTDOWN_TIMEOUT: Duration = Duration::from_secs(1);
 async fn await_supervisor_shutdown(mut handle: JoinHandle<()>, timeout_duration: Duration) {
    if tokio::time::timeout(timeout_duration, &mut handle)
        .await
        .is_err()
    {
        warn!(
            target: "chanora_core",
            timeout_ms = timeout_duration.as_millis() as u64,
            "supervisor did not stop before shutdown timeout"
        );
        handle.abort();
        let _ = handle.await;
    }
 }
 struct SupervisorContext {
    state_arc: Arc<Mutex<Option<ConnectedState>>>,
    protocol: Arc<Mutex<Option<chanora_protocol::ProtocolClient>>>,
    events_tx: broadcast::Sender<SessionEvent>,
    initial_cfg: ConnectConfig,
    initial_lost_rx: oneshot::Receiver<chanora_protocol::DisconnectReason>,
@@ -1786,7 +1929,6 @@ fn spawn_event_forwarders(
                    sender_name: msg.sender_name,
                    message: msg.message,
                    target: msg.target,
                    poke_strength: msg.poke_strength,
                });
            }
        });
@@ -1808,77 +1950,27 @@ fn spawn_event_forwarders(
            let mut rx = delta_rx;
            while let Some(delta) = rx.recv().await {
                let event = match delta {
-                    ProtocolDelta::ClientMoved {
+                    ProtocolDelta::ClientMoved { client_id, new_channel_id } => {
-                        client_id,
+                        SessionEvent::ClientMoved { client_id, new_channel_id }
-                        new_channel_id,
+                    }
-                    } => SessionEvent::ClientMoved {
+                    ProtocolDelta::ClientJoined { client_id, channel_id, name, input_muted, output_muted, is_server_query, talk_power, talk_power_granted } => {
-                        client_id,
+                        SessionEvent::ClientJoined { client_id, channel_id, name, input_muted, output_muted, is_server_query, talk_power, talk_power_granted }
-                        new_channel_id,
+                    }
                    },
                    ProtocolDelta::ClientJoined {
                        client_id,
                        channel_id,
                        name,
                        input_muted,
                        output_muted,
                        is_server_query,
                        talk_power,
                        talk_power_granted,
                    } => SessionEvent::ClientJoined {
                        client_id,
                        channel_id,
                        name,
                        input_muted,
                        output_muted,
                        is_server_query,
                        talk_power,
                        talk_power_granted,
                    },
                    ProtocolDelta::ClientLeft { client_id, name } => {
                        SessionEvent::ClientLeft { client_id, name }
                    }
-                    ProtocolDelta::ClientUpdated {
+                    ProtocolDelta::ClientUpdated { client_id, input_muted, output_muted, is_server_query, talk_power, talk_power_granted } => {
-                        client_id,
+                        SessionEvent::ClientUpdated { client_id, input_muted, output_muted, is_server_query, talk_power, talk_power_granted }
-                        input_muted,
+                    }
-                        output_muted,
+                    ProtocolDelta::ChannelAdded { id, parent, name, order, has_password, needed_talk_power } => {
-                        is_server_query,
+                        SessionEvent::ChannelAdded { id, parent, name, order, has_password, needed_talk_power }
-                        talk_power,
+                    }
-                        talk_power_granted,
+                    ProtocolDelta::ChannelRemoved { id } => {
-                    } => SessionEvent::ClientUpdated {
+                        SessionEvent::ChannelRemoved { id }
-                        client_id,
+                    }
-                        input_muted,
+                    ProtocolDelta::ChannelUpdated { id, name, has_password, needed_talk_power } => {
-                        output_muted,
+                        SessionEvent::ChannelUpdated { id, name, has_password, needed_talk_power }
-                        is_server_query,
+                    }
                        talk_power,
                        talk_power_granted,
                    },
                    ProtocolDelta::ChannelAdded {
                        id,
                        parent,
                        name,
                        order,
                        has_password,
                        needed_talk_power,
                    } => SessionEvent::ChannelAdded {
                        id,
                        parent,
                        name,
                        order,
                        has_password,
                        needed_talk_power,
                    },
                    ProtocolDelta::ChannelRemoved { id } => SessionEvent::ChannelRemoved { id },
                    ProtocolDelta::ChannelUpdated {
                        id,
                        name,
                        has_password,
                        needed_talk_power,
                    } => SessionEvent::ChannelUpdated {
                        id,
                        name,
                        has_password,
                        needed_talk_power,
                    },
                };
                let _ = ev_tx.send(event);
            }
@@ -1889,7 +1981,6 @@ fn spawn_event_forwarders(
 async fn supervisor_loop(ctx: SupervisorContext) {
    let SupervisorContext {
        state_arc,
        protocol,
        events_tx,
        initial_cfg,
        initial_lost_rx,
@@ -2159,21 +2250,20 @@ async fn supervisor_loop(ctx: SupervisorContext) {
                            // Reattach into the session state.
                            let restart_audio = {
                                let guard = state_arc.lock().await;
                                if guard.is_none() {
                                    // Session was disposed mid-reconnect.
                                    return;
                                }
                                drop(guard);
                                let old = protocol.lock().await.replace(new_client);
                                drop(old);
                                let mut guard = state_arc.lock().await;
                                let state = match guard.as_mut() {
                                    Some(s) => s,
                                    None => {
                                        // Session was disposed mid-reconnect.
                                        return;
                                    }
                                };
                                // Replace the dead protocol client with the new one.
                                // The old client's background task either already
                                // exited (loss notifier fired) or will exit when
                                // its request channel drops (watchdog path).
                                let old = std::mem::replace(&mut state.protocol, new_client);
                                drop(old);
                                let _ = channel_join::reduce(
                                    &mut state.join_state,
@@ -2203,9 +2293,9 @@ async fn supervisor_loop(ctx: SupervisorContext) {
                            });
                            {
-                                let protocol = protocol.lock().await;
+                                let guard = state_arc.lock().await;
-                                if let Some(client) = protocol.as_ref() {
+                                if let Some(state) = guard.as_ref() {
-                                    spawn_event_forwarders(client, &events_tx);
+                                    spawn_event_forwarders(&state.protocol, &events_tx);
                                }
                            }
@@ -2217,15 +2307,8 @@ async fn supervisor_loop(ctx: SupervisorContext) {
                                };
                                let mut guard = state_arc.lock().await;
                                if let Some(state) = guard.as_mut() {
-                                    let (voice_out, voice_in) = {
+                                    let voice_out = state.protocol.voice_out();
-                                        let protocol = protocol.lock().await;
+                                    if let Some(voice_in) = state.protocol.take_voice_in() {
                                        let client = match protocol.as_ref() {
                                            Some(client) => client,
                                            None => return,
                                        };
                                        (client.voice_out(), client.take_voice_in())
                                    };
                                    if let Some(voice_in) = voice_in {
                                        let gate = chanora_audio::AudioTransmitGate::new(
                                            audio_cfg.ptt_initial,
                                        );
@@ -2316,7 +2399,6 @@ async fn supervisor_loop(ctx: SupervisorContext) {
 /// the UI would render. Two snapshots with identical channel
 /// memberships, names, and orderings produce the same signature;
 /// any in-channel move, rename, or reorder produces a different one.
 #[cfg(test)]
 fn snapshot_signature(snap: &ServerSnapshot) -> u64 {
    use std::collections::hash_map::DefaultHasher;
    use std::hash::{Hash, Hasher};
@@ -2511,54 +2593,6 @@ mod tests {
        s.disconnect().await.unwrap();
    }
    #[tokio::test]
    async fn disconnect_state_take_releases_inner_lock_before_teardown() {
        let inner = Arc::new(Mutex::new(Some(())));
        let state = super::take_disconnect_state(&inner).await;
        assert_eq!(state, Some(()));
        assert!(inner.try_lock().is_ok());
    }
    #[tokio::test]
    async fn supervisor_join_returns_after_shutdown_timeout() {
        let handle = tokio::spawn(async {
            std::future::pending::<()>().await;
        });
        let start = std::time::Instant::now();
        super::await_supervisor_shutdown(handle, Duration::from_millis(10)).await;
        assert!(start.elapsed() < Duration::from_millis(100));
    }
    #[tokio::test]
    async fn supervisor_shutdown_timeout_aborts_pending_task() {
        struct DropNotice(Option<tokio::sync::oneshot::Sender<()>>);
        impl Drop for DropNotice {
            fn drop(&mut self) {
                if let Some(tx) = self.0.take() {
                    let _ = tx.send(());
                }
            }
        }
        let (dropped_tx, dropped_rx) = tokio::sync::oneshot::channel();
        let handle = tokio::spawn(async move {
            let _notice = DropNotice(Some(dropped_tx));
            std::future::pending::<()>().await;
        });
        super::await_supervisor_shutdown(handle, Duration::from_millis(10)).await;
        tokio::time::timeout(Duration::from_millis(100), dropped_rx)
            .await
            .expect("pending supervisor task should be aborted")
            .expect("drop notice should be delivered");
    }
    #[test]
    fn signature_detects_in_channel_move() {
        use chanora_protocol::{ChannelInfo, ClientInfo};
@@ -2656,38 +2690,6 @@ mod tests {
        );
    }
    #[test]
    fn empty_poke_messages_are_dispatchable() {
        assert!(super::should_dispatch_text_message(
            "",
            &MessageTarget::Poke(42)
        ));
        assert!(super::should_dispatch_text_message(
            "  \t  ",
            &MessageTarget::Poke(42)
        ));
    }
    #[test]
    fn empty_non_poke_messages_remain_suppressed() {
        assert!(!super::should_dispatch_text_message(
            "",
            &MessageTarget::Server
        ));
        assert!(!super::should_dispatch_text_message(
            "  ",
            &MessageTarget::Channel
        ));
        assert!(!super::should_dispatch_text_message(
            "",
            &MessageTarget::Client(42)
        ));
        assert!(super::should_dispatch_text_message(
            "hello",
            &MessageTarget::Channel
        ));
    }
    #[tokio::test]
    async fn empty_address_is_rejected() {
        let s = ChanoraSession::new();
@@ -1,72 +0,0 @@
 use std::collections::VecDeque;
 /// Network diagnostics snapshot collected across connection lifetimes.
 #[derive(Debug, Clone, Default)]
 pub(crate) struct NetworkDiagnostics {
    /// Total count of connects (including the initial one).
    connect_count: u64,
    /// Count of disconnects (graceful + loss).
    disconnect_count: u64,
    /// Recent loss reasons (last 8, ring buffer).
    loss_reasons: VecDeque<String>,
 }
 impl NetworkDiagnostics {
    pub(crate) fn record_connect(&mut self) {
        self.connect_count = self.connect_count.saturating_add(1);
    }
    pub(crate) fn record_loss(&mut self, reason: &str) {
        self.disconnect_count = self.disconnect_count.saturating_add(1);
        if self.loss_reasons.len() >= 8 {
            self.loss_reasons.pop_front();
        }
        self.loss_reasons.push_back(reason.to_string());
    }
    pub(crate) fn summary(&self) -> String {
        let mut s = format!(
            "connects: {}\ndisconnects: {}\n",
            self.connect_count, self.disconnect_count
        );
        if !self.loss_reasons.is_empty() {
            s.push_str(&format!(
                "loss_reasons: [{}]\n",
                self.loss_reasons
                    .iter()
                    .map(String::as_str)
                    .collect::<Vec<_>>()
                    .join(", ")
            ));
        }
        s
    }
 }
 #[cfg(test)]
 mod tests {
    use super::*;
    #[test]
    fn network_diagnostics_keeps_last_eight_loss_reasons() {
        let mut diagnostics = NetworkDiagnostics::default();
        for i in 0..10 {
            diagnostics.record_loss(&format!("loss-{i}"));
        }
        assert_eq!(diagnostics.disconnect_count, 10);
        assert_eq!(diagnostics.loss_reasons.len(), 8);
        assert_eq!(
            diagnostics.loss_reasons.front().map(String::as_str),
            Some("loss-2")
        );
        assert_eq!(
            diagnostics.loss_reasons.back().map(String::as_str),
            Some("loss-9")
        );
        assert!(diagnostics.summary().contains(
            "loss_reasons: [loss-2, loss-3, loss-4, loss-5, loss-6, loss-7, loss-8, loss-9]"
        ));
    }
 }
@@ -1,50 +0,0 @@
 use std::env;
 use std::path::PathBuf;
 use std::process;
 use std::time::{SystemTime, UNIX_EPOCH};
 #[tokio::test]
 async fn get_avatar_returns_cached_bytes_without_connection() {
    let tmp = mktemp("chanora_core_avatar_cache_test");
    let session = chanora_core::ChanoraSession::new();
    session.init_cache(tmp.to_str().unwrap()).await.unwrap();
    let cache = chanora_cache::BlobCache::new(&tmp, 100 * 1024 * 1024).unwrap();
    let hash = "a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6";
    cache
        .put(chanora_cache::PREFIX_AVATAR, hash, b"avatar-bytes")
        .await
        .unwrap();
    let bytes = session
        .get_avatar(hash, "client-uid")
        .await
        .unwrap()
        .unwrap();
    assert_eq!(bytes, b"avatar-bytes");
    let _ = std::fs::remove_dir_all(&tmp);
 }
 #[tokio::test]
 async fn get_avatar_without_cache_or_connection_returns_not_connected() {
    let session = chanora_core::ChanoraSession::new();
    let err = session
        .get_avatar("a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6", "client-uid")
        .await
        .unwrap_err();
    assert!(matches!(err, chanora_core::CoreError::NotConnected));
 }
 fn mktemp(label: &str) -> PathBuf {
    let nanos = SystemTime::now()
        .duration_since(UNIX_EPOCH)
        .unwrap()
        .as_nanos();
    let p = env::temp_dir()
        .join(label)
        .join(format!("{}-{nanos}", process::id()));
    std::fs::create_dir_all(&p).unwrap();
    p
 }
@@ -30,12 +30,13 @@ tsclientlib = { git = "https://github.com/ReSpeak/tsclientlib.git", rev = "04aa2
 tokio = { version = "1", features = ["sync", "rt", "macros", "time"] }
 rustfft = "6.2.0"
 crossbeam = { version = "0.8", default-features = false, features = ["alloc", "crossbeam-queue"] }
 crossbeam-utils = { version = "0.8", default-features = false }
 [target.'cfg(all(not(target_os = "android"), not(target_os = "ios"), not(target_os = "macos")))'.dependencies]
 # Desktop audio I/O for Windows capture/playback and Linux capture.
 # Linux playback uses SDL2; Apple platforms use direct VoiceProcessingIO
 # AudioUnits via `coreaudio-rs` for the voice path.
-cpal = "0.18.0"
+cpal = "0.17.3"
 [target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies]
 # Direct CoreAudio AudioUnit access on Apple platforms (DEC-011 follow-up).
@@ -51,14 +52,14 @@ coreaudio-rs = "0.14"
 # on the main queue to avoid the VPIO RPC timeout on iOS simulator.
 dispatch2 = "0.3"
-[target.'cfg(not(any(target_os = "ios", target_os = "macos", target_os = "android")))'.dependencies]
+[target.'cfg(not(target_os = "ios"))'.dependencies]
 ort = { version = "2.0.0-rc.12", default-features = false, features = ["load-dynamic", "ndarray", "api-24"] }
 [target.'cfg(target_os = "android")'.dependencies]
 # JNI bindings to flip Android's AudioManager into MODE_IN_COMMUNICATION
 # when the voice-comm preset is requested. ndk_context is initialised
 # by the bridge crate's android_init shim.
-jni = { version = "0.22.4", default-features = false }
+jni = { version = "0.21", default-features = false }
 ndk-context = "0.1"
 # Oboe-rs (Google Oboe wrapper) for low-latency voice capture + playback.
 # Primary backend for SDD-111..SDD-115. The pre-compiled static library
@@ -73,18 +74,13 @@ ndk-context = "0.1"
 #   - deduplicated macro impls
 #   - PowerSavingOffloaded PerformanceMode variant
 oboe = { git = "https://github.com/EdisonJwa/oboe-rs", rev = "a14f9b83ecea8c93f5a692f2ee7808445b938c35" }
 # Safe slice reinterpret for the oboe stereo output callback.
 # bytemuck::cast_slice_mut replaces the raw-pointer cast from
 # `&mut [(f32, f32)]` to `&mut [f32]` with a provenance-correct
 # and UB-free transmute backed by `NoUninit`.
 bytemuck = { version = "1", features = ["derive"] }
 [target.'cfg(target_os = "windows")'.dependencies]
 # Real Windows global PTT (SDD-083 / SDD-084): RegisterRawInputDevices
 # + WM_INPUT translation backed by a hidden message-only window, and
 # SetWindowsHookExW(WH_KEYBOARD_LL / WH_MOUSE_LL) fallback. Both
 # require a per-backend OS thread that owns a message pump.
-windows = { version = "0.62", features = [
+windows = { version = "0.54", features = [
    "Win32_Foundation",
    "Win32_Graphics_Gdi",
    "Win32_System_LibraryLoader",
@@ -104,7 +100,7 @@ tracing-subscriber = { version = "0.3", features = ["registry"] }
 # SDD-120 §3 — criterion bench harness (realtime_capture / opus_codec /
 # resampler). `harness = false` per bench entry below disables the
 # default libtest harness so criterion can install its own.
-criterion = "0.8"
+criterion = "0.5"
 # SDD-120 §3 item 1 — dhat is used as the global allocator inside
 # `benches/realtime_capture.rs` to count post-warmup heap allocations
 # on the realtime capture path. Dev-dep only — does NOT affect
@@ -147,7 +143,7 @@ futures-util = { version = "0.3", default-features = false, features = ["std"] }
 # Random token bytes for the portal handle_token / session_handle_token
 # options. The portal recommends fresh tokens to scope its own
 # object paths per call.
-rand = "0.10"
+rand = "0.8"
 # SDL2 audio for Linux. Replaces the cpal playback path on Linux only;
 # cpal stays in use for Linux capture and Windows capture/playback.
 # Apple platforms use direct VoiceProcessingIO AudioUnits. Rationale: the
@@ -166,4 +162,4 @@ rand = "0.10"
 # libSDL2.so. Arch ships `sdl2-compat`; Debian/Ubuntu ship
 # `libsdl2-2.0-0`; Fedora ships `SDL2`. The chanora-flutter Linux
 # build documentation lists this as a runtime dependency.
-sdl2 = { version = "0.38", default-features = false }
+sdl2 = { version = "0.37", default-features = false }
@@ -1,124 +0,0 @@
 use std::sync::Arc;
 use crossbeam::queue::ArrayQueue;
 /// Fixed-capacity PCM handoff from the Android render producer task to
 /// the Oboe output callback.
 pub(crate) struct AndroidRenderRing {
    frames: Arc<ArrayQueue<[f32; 2]>>,
 }
 impl AndroidRenderRing {
    pub(crate) fn new(capacity: usize) -> Self {
        Self {
            frames: Arc::new(ArrayQueue::new((capacity / 2).max(1))),
        }
    }
    pub(crate) fn producer(&self) -> AndroidRenderRingProducer {
        AndroidRenderRingProducer {
            frames: Arc::clone(&self.frames),
        }
    }
    pub(crate) fn consumer(&self) -> AndroidRenderRingConsumer {
        AndroidRenderRingConsumer {
            frames: Arc::clone(&self.frames),
        }
    }
 }
 pub(crate) struct AndroidRenderRingProducer {
    frames: Arc<ArrayQueue<[f32; 2]>>,
 }
 impl AndroidRenderRingProducer {
    pub(crate) fn push_frame_lossy(&self, samples: &[f32]) {
        for frame in samples.chunks_exact(2) {
            let stereo_frame = [frame[0], frame[1]];
            if self.frames.push(stereo_frame).is_err() {
                let _ = self.frames.pop();
                let _ = self.frames.push(stereo_frame);
            }
        }
    }
 }
 pub(crate) struct AndroidRenderRingConsumer {
    frames: Arc<ArrayQueue<[f32; 2]>>,
 }
 impl AndroidRenderRingConsumer {
    #[cfg(test)]
    pub(crate) fn drain_into_zero_filling(&self, out: &mut [f32]) {
        let mut chunks = out.chunks_exact_mut(2);
        for frame_out in &mut chunks {
            let frame = self.frames.pop().unwrap_or([0.0, 0.0]);
            frame_out.copy_from_slice(&frame);
        }
        for sample in chunks.into_remainder() {
            *sample = 0.0;
        }
    }
    pub(crate) fn drain_stereo_into_zero_filling(&self, out: &mut [(f32, f32)]) {
        for frame_out in out {
            let frame = self.frames.pop().unwrap_or([0.0, 0.0]);
            *frame_out = (frame[0], frame[1]);
        }
    }
 }
 #[cfg(test)]
 mod tests {
    use super::*;
    #[test]
    fn producer_drops_oldest_samples_when_ring_is_full() {
        let ring = AndroidRenderRing::new(4);
        let producer = ring.producer();
        let consumer = ring.consumer();
        producer.push_frame_lossy(&[1.0, 2.0, 3.0, 4.0]);
        producer.push_frame_lossy(&[5.0, 6.0]);
        let mut out = [0.0; 4];
        consumer.drain_into_zero_filling(&mut out);
        assert_eq!(out, [3.0, 4.0, 5.0, 6.0]);
    }
    #[test]
    fn overflow_after_partial_consumer_drain_preserves_stereo_pairing() {
        let ring = AndroidRenderRing::new(4);
        let producer = ring.producer();
        let consumer = ring.consumer();
        producer.push_frame_lossy(&[1.0, 10.0, 2.0, 20.0]);
        let mut odd_out = [9.0];
        consumer.drain_into_zero_filling(&mut odd_out);
        assert_eq!(odd_out, [0.0]);
        producer.push_frame_lossy(&[3.0, 30.0]);
        let mut out = [0.0; 4];
        consumer.drain_into_zero_filling(&mut out);
        assert_eq!(out, [2.0, 20.0, 3.0, 30.0]);
    }
    #[test]
    fn consumer_zero_fills_tail_on_underrun() {
        let ring = AndroidRenderRing::new(4);
        let producer = ring.producer();
        let consumer = ring.consumer();
        producer.push_frame_lossy(&[0.25, -0.25]);
        let mut out = [9.0; 4];
        consumer.drain_into_zero_filling(&mut out);
        assert_eq!(out, [0.25, -0.25, 0.0, 0.0]);
    }
 }
@@ -53,6 +53,7 @@ use crate::mobile_voice_backend::{
    BackendEventTx, EffectEngagement, EffectEngine, InputPresetChoice, MobileVoiceAudioBackend,
    SharingModeChoice, VoiceAudioParams,
 };
 use chanora_protocol::OutPacket;
 use tsclientlib::audio::AudioHandler;
 use crate::{engine::SessionAudioId, AudioError};
@@ -85,11 +86,40 @@ use crate::processor::AudioProcessor;
 const RENDER_REF_SLOTS: usize = 4;
 const RENDER_REF_SAMPLES: usize = crate::frame::FRAME_10MS_SAMPLES;
 const ANDROID_RENDER_PULL_SAMPLES: usize = crate::frame::FRAME_20MS_SAMPLES * 2;
 const ANDROID_RENDER_RING_CAPACITY: usize = ANDROID_RENDER_PULL_SAMPLES * 5;
-type RenderReferenceBuffer =
+struct RenderReferenceBuffer {
-    crate::render_reference::RenderReferenceBuffer<RENDER_REF_SAMPLES, RENDER_REF_SLOTS>;
+    buf: Box<[[f32; RENDER_REF_SAMPLES]; RENDER_REF_SLOTS]>,
    write_idx: std::sync::atomic::AtomicUsize,
 }
 impl RenderReferenceBuffer {
    fn new() -> Arc<Self> {
        Arc::new(Self {
            buf: Box::new([[0.0_f32; RENDER_REF_SAMPLES]; RENDER_REF_SLOTS]),
            write_idx: std::sync::atomic::AtomicUsize::new(0),
        })
    }
    fn write(&self, frame: &[f32; RENDER_REF_SAMPLES]) {
        let idx = self.write_idx.load(Ordering::Relaxed);
        unsafe {
            let slot = &self.buf[idx] as *const [f32; RENDER_REF_SAMPLES]
                as *mut [f32; RENDER_REF_SAMPLES];
            (*slot).copy_from_slice(frame);
        }
        self.write_idx
            .store((idx + 1) % RENDER_REF_SLOTS, Ordering::Relaxed);
    }
    fn read_latest(&self) -> [f32; RENDER_REF_SAMPLES] {
        let wi = self.write_idx.load(Ordering::Relaxed);
        let ri = (wi + RENDER_REF_SLOTS - 1) % RENDER_REF_SLOTS;
        self.buf[ri]
    }
 }
 unsafe impl Send for RenderReferenceBuffer {}
 unsafe impl Sync for RenderReferenceBuffer {}
 // --- Capture state for Oboe input callback (SDD-111 / SDD-120) ----
 //
@@ -108,8 +138,9 @@ struct AndroidCaptureState {
    encoder: OpusEncoder,
    pcm_accum: Vec<i16>,
    opus_out: [u8; crate::opus_voice::MAX_OPUS_FRAME],
-    voice_out_tx: crate::opus_voice::EncodedVoiceFrameSender,
+    voice_out_tx: mpsc::Sender<OutPacket>,
    transmit_active: Arc<AtomicBool>,
    frames_sent: Arc<AtomicU32>,
    mic_gain: f32,
    voice_activity_selector: Option<Arc<crate::TransmitModeSelector>>,
    vad_detector: crate::vad::WebRtcFallbackVad,
@@ -133,7 +164,7 @@ struct AndroidCaptureState {
 impl AndroidCaptureState {
    fn new(
-        voice_out_tx: mpsc::Sender<chanora_protocol::OutPacket>,
+        voice_out_tx: mpsc::Sender<OutPacket>,
        transmit_active: Arc<AtomicBool>,
        frames_sent: Arc<AtomicU32>,
        mic_gain: f32,
@@ -157,12 +188,9 @@ impl AndroidCaptureState {
            encoder,
            pcm_accum: Vec::with_capacity(crate::frame::FRAME_20MS_SAMPLES * 2),
            opus_out: [0u8; crate::opus_voice::MAX_OPUS_FRAME],
            voice_out_tx: crate::opus_voice::start_out_packet_worker(
            voice_out_tx,
                frames_sent.clone(),
                "android",
            )?,
            transmit_active,
            frames_sent,
            mic_gain,
            voice_activity_selector,
            vad_detector: crate::vad::WebRtcFallbackVad::default(),
@@ -193,10 +221,8 @@ impl AndroidCaptureState {
        self.audio_processing_stats
            .record_callback_frames(samples.len() as u64);
        if self.input_sample_rate_hz != crate::frame::SAMPLE_RATE_HZ {
-            self.resample_capture_to_48k(samples);
+            let resampled = self.resample_capture_to_48k(samples);
            let resampled = std::mem::take(&mut self.resample_scratch);
            self.ingest_48k_i16(&resampled);
            self.resample_scratch = resampled;
            return;
        }
        self.ingest_48k_i16(samples);
@@ -215,7 +241,6 @@ impl AndroidCaptureState {
            if self.pending_10ms_len == crate::frame::FRAME_10MS_SAMPLES {
                let frame = self.pending_10ms;
                self.process_10ms_capture_frame(&frame);
                self.encode_complete_20ms_frames();
                self.pending_10ms_len = 0;
            }
        }
@@ -225,10 +250,6 @@ impl AndroidCaptureState {
            return;
        }
        self.encode_complete_20ms_frames();
    }
    fn encode_complete_20ms_frames(&mut self) {
        while self.pcm_accum.len() >= crate::frame::FRAME_20MS_SAMPLES {
            let mut frame = [0i16; crate::frame::FRAME_20MS_SAMPLES];
            frame.copy_from_slice(&self.pcm_accum[..crate::frame::FRAME_20MS_SAMPLES]);
@@ -237,6 +258,7 @@ impl AndroidCaptureState {
                Ok(len) => {
                    crate::opus_voice::send_voip_frame(
                        &self.voice_out_tx,
                        &self.frames_sent,
                        &self.opus_out,
                        len,
                        || {
@@ -264,18 +286,35 @@ impl AndroidCaptureState {
        }
    }
-    fn resample_capture_to_48k(&mut self, samples: &[i16]) -> usize {
+    fn resample_capture_to_48k(&mut self, samples: &[i16]) -> Vec<i16> {
-        let result = crate::capture_resampler::resample_capture_to_48k(
+        if samples.is_empty() {
-            samples,
+            return Vec::new();
            self.input_sample_rate_hz,
            &mut self.resample_pos,
            &mut self.resample_last,
            &mut self.resample_scratch,
        );
        if result.dropped {
            self.audio_processing_stats.increment_callback_xrun();
        }
-        result.output_len
+        self.resample_scratch.clear();
        let ratio = self.input_sample_rate_hz as f64 / crate::frame::SAMPLE_RATE_HZ as f64;
        let mut pos = self.resample_pos;
        while pos < samples.len() as f64 {
            let i = pos.floor() as isize;
            let frac = pos - i as f64;
            let a = if i <= 0 {
                self.resample_last as f64
            } else {
                samples[(i - 1) as usize] as f64
            };
            let b = if i < samples.len() as isize {
                samples[i as usize] as f64
            } else {
                a
            };
            let value = (a + frac * (b - a))
                .round()
                .clamp(i16::MIN as f64, i16::MAX as f64) as i16;
            self.resample_scratch.push(value);
            pos += ratio;
        }
        self.resample_pos = pos - samples.len() as f64;
        self.resample_last = *samples.last().unwrap_or(&self.resample_last);
        self.resample_scratch.clone()
    }
    fn set_input_sample_rate_hz(&mut self, sample_rate_hz: u32) {
@@ -354,9 +393,15 @@ impl AndroidCaptureState {
            self.fallback_warned_backend = None;
            match vad_backend {
                crate::VadBackend::SileroOnnx => {
-                    self.silero_vad_worker = None;
+                    let path = crate::vad::silero_model_bundle_path();
-                    self.mark_vad_fallback_active(crate::VadBackend::SileroOnnx);
+                    self.silero_vad_worker =
-                    self.audio_processing_stats.set_vad_fallback_active(true);
+                        crate::vad::silero_onnx::SileroOnnxVadWorker::try_new(&path);
                    if self.silero_vad_worker.is_none() {
                        warn!(
                            target: "chanora_audio",
                            "android: Silero VAD model not found at {path}; falling back to WebRTC VAD"
                        );
                    }
                }
                _ => {
                    self.silero_vad_worker = None;
@@ -399,10 +444,7 @@ impl AndroidCaptureState {
                } else {
                    used_fallback_vad = true;
                    self.mark_vad_fallback_active(vad_backend);
-                    crate::vad::VoiceActivityDetector::process_10ms(
+                    crate::vad::VoiceActivityDetector::process_10ms(&mut self.vad_detector, &frame)
                        &mut self.vad_detector,
                        &frame,
                    )
                }
            } else {
                crate::vad::VoiceActivityDetector::process_10ms(&mut self.vad_detector, &frame)
@@ -430,19 +472,21 @@ impl AndroidCaptureState {
            return;
        }
-        if crate::capture_accumulator::append_processed_i16_bounded(
+        let gain = self.mic_gain;
-            &mut self.pcm_accum,
+        if (gain - 1.0).abs() < f32::EPSILON {
-            &frame,
+            self.pcm_accum
-            self.mic_gain,
+                .extend(frame.iter().copied().map(crate::frame::f32_to_i16));
-        ) {
+        } else {
-            self.audio_processing_stats.increment_callback_xrun();
+            self.pcm_accum.extend(frame.iter().copied().map(|s| {
                let scaled = (crate::frame::f32_to_i16(s) as f32) * gain;
                scaled.clamp(i16::MIN as f32, i16::MAX as f32) as i16
            }));
        }
    }
 }
 struct InputCallback {
    state: Arc<Mutex<AndroidCaptureState>>,
    audio_processing_stats: Arc<crate::SharedAudioProcessingStats>,
    event_tx: BackendEventTx,
 }
@@ -454,13 +498,9 @@ impl AudioInputCallback for InputCallback {
        _stream: &mut dyn AudioInputStreamSafe,
        frames: &[i16],
    ) -> DataCallbackResult {
-        let _ = catch_unwind(AssertUnwindSafe(|| match self.state.try_lock() {
+        let _ = catch_unwind(AssertUnwindSafe(|| {
-            Ok(mut s) => s.ingest_i16(frames),
+            if let Ok(mut s) = self.state.lock() {
-            Err(std::sync::TryLockError::WouldBlock) => {
+                s.ingest_i16(frames);
                self.audio_processing_stats.increment_callback_xrun();
            }
            Err(std::sync::TryLockError::Poisoned(e)) => {
                warn!(target: "chanora_audio", "android: capture state poisoned: {e}");
            }
        }));
        DataCallbackResult::Continue
@@ -482,7 +522,8 @@ impl AudioInputCallback for InputCallback {
 // writes stereo f32 directly to the Oboe output buffer.
 struct OutputCallback {
-    pcm_consumer: crate::android_render_ring::AndroidRenderRingConsumer,
+    handler: AudioHandler<SessionAudioId>,
    event_queue: Arc<AudioEventQueue>,
    output_gain: Arc<AtomicU32>,
    output_muted: Arc<AtomicBool>,
    event_tx: BackendEventTx,
@@ -501,39 +542,49 @@ impl AudioOutputCallback for OutputCallback {
        frames: &mut [(f32, f32)],
    ) -> DataCallbackResult {
        let _ = catch_unwind(AssertUnwindSafe(|| {
-            self.pcm_consumer.drain_stereo_into_zero_filling(frames);
+            let buf: &mut [f32] = unsafe {
                std::slice::from_raw_parts_mut(frames.as_mut_ptr() as *mut f32, frames.len() * 2)
            };
            for s in buf.iter_mut() {
                *s = 0.0;
            }
            let consumer = AudioEventQueue::consumer(&self.event_queue);
            for cmd in consumer.drain_controls() {
                match cmd {
                    AudioCommand::SetVolume(id, vol) => {
                        if let Some(q) = self.handler.get_mut_queues().get_mut(&id) {
                            q.volume = vol;
                        }
                    }
                    AudioCommand::RemoveClient(id) => {
                        self.handler.get_mut_queues().remove(&id);
                    }
                }
            }
            for pkt in consumer.drain_packets(50) {
                if let Err(e) = self.handler.handle_packet(pkt.client_id, pkt.data) {
                    debug!(target: "chanora_audio", error = %e, "decode failed");
                }
            }
            let _ = self.handler.fill_buffer(buf);
            let gain = f32::from_bits(self.output_gain.load(Ordering::Relaxed));
            let muted = self.output_muted.load(Ordering::Relaxed);
            if muted {
-                for frame in frames.iter_mut() {
+                for s in buf.iter_mut() {
-                    *frame = (0.0, 0.0);
+                    *s = 0.0;
                }
            } else if gain != 1.0 {
-                for (left, right) in frames.iter_mut() {
+                for s in buf.iter_mut() {
-                    *left *= gain;
+                    *s *= gain;
                    *right *= gain;
                }
            }
            let mut sum_squares = 0.0_f32;
            for (left, right) in frames.iter() {
                sum_squares += left * left + right * right;
            }
            let sample_count = frames.len() * 2;
            let dbfs = if sample_count == 0 {
                -120.0
            } else {
                let rms = (sum_squares / sample_count as f32).sqrt();
                if rms <= 0.000_001 {
                    -120.0
                } else {
                    20.0 * rms.log10()
                }
            };
            self.audio_processing_stats
-                .update_render(dbfs, frames.len() as u32);
+                .update_render(crate::frame::dbfs(buf), frames.len() as u32);
-            for (left, right) in frames.iter() {
+            for chunk in buf.chunks_exact(2) {
-                self.pending_render_ref[self.pending_render_ref_len] = (left + right) * 0.5;
+                self.pending_render_ref[self.pending_render_ref_len] = (chunk[0] + chunk[1]) * 0.5;
                self.pending_render_ref_len += 1;
                if self.pending_render_ref_len == crate::frame::FRAME_10MS_SAMPLES {
                    self.render_reference.write(&self.pending_render_ref);
@@ -565,7 +616,6 @@ impl AudioOutputCallback for OutputCallback {
 pub struct AndroidVoiceUnit {
    input: Option<AudioStreamAsync<OboeInput, InputCallback>>,
    output: Option<AudioStreamAsync<OboeOutput, OutputCallback>>,
    render_producer_shutdown: Arc<AtomicBool>,
    // Recorded achieved values (SDD-112).
    input_perf: AchievedPerformanceMode,
@@ -587,13 +637,11 @@ pub struct AndroidVoiceUnit {
 #[derive(Default)]
 struct HardwareEffectHandles {
-    aec: Option<AndroidGlobalObject>,
+    aec: Option<jni::objects::GlobalRef>,
-    ns: Option<AndroidGlobalObject>,
+    ns: Option<jni::objects::GlobalRef>,
-    agc: Option<AndroidGlobalObject>,
+    agc: Option<jni::objects::GlobalRef>,
 }
 type AndroidGlobalObject = jni::refs::Global<jni::objects::JObject<'static>>;
 impl AndroidVoiceUnit {
    /// Open the input + output streams (SDD-111 + SDD-112) and,
    /// once a session id is available, attach SDD-113 hardware
@@ -660,7 +708,6 @@ impl AndroidVoiceUnit {
        let input_cb = InputCallback {
            state: capture_state.clone(),
            audio_processing_stats: audio_processing_stats.clone(),
            event_tx: event_tx.clone(),
        };
        let input_builder = input_builder.set_callback(input_cb);
@@ -677,12 +724,7 @@ impl AndroidVoiceUnit {
                    error = ?e,
                    "android: primary input stream open failed; entering fallback ladder"
                );
-                match Self::open_input_fallback(
+                match Self::open_input_fallback(cfg, &event_tx, capture_state.clone()) {
                    cfg,
                    &event_tx,
                    capture_state.clone(),
                    audio_processing_stats.clone(),
                ) {
                    Ok(s) => Some(s),
                    Err(fallback_err) => {
                        warn!(
@@ -749,10 +791,9 @@ impl AndroidVoiceUnit {
        let render_ref_for_output = render_ref_buf.clone();
        let event_queue = params.event_producer.queue();
        let render_ring =
            crate::android_render_ring::AndroidRenderRing::new(ANDROID_RENDER_RING_CAPACITY);
        let output_cb = OutputCallback {
-            pcm_consumer: render_ring.consumer(),
+            handler: params.handler,
            event_queue: event_queue.clone(),
            output_gain: params.output_gain.clone(),
            output_muted: params.output_muted.clone(),
            event_tx: event_tx.clone(),
@@ -774,7 +815,8 @@ impl AndroidVoiceUnit {
                Self::open_output_fallback(
                    cfg,
                    &event_tx,
-                    render_ring.consumer(),
+                    AudioHandler::new(),
                    event_queue.clone(),
                    params.output_gain.clone(),
                    params.output_muted.clone(),
                    audio_processing_stats.clone(),
@@ -782,11 +824,6 @@ impl AndroidVoiceUnit {
                )?
            }
        };
        let render_producer_shutdown = Self::spawn_render_producer(
            params.handler,
            AudioEventQueue::consumer(&event_queue),
            render_ring.producer(),
        );
        let output_frames_per_burst = output_stream.get_frames_per_burst();
        if output_frames_per_burst > 0 {
@@ -943,7 +980,6 @@ impl AndroidVoiceUnit {
        Ok(Self {
            input: input_stream,
            output: Some(output_stream),
            render_producer_shutdown,
            input_perf,
            input_share,
            output_perf,
@@ -961,7 +997,6 @@ impl AndroidVoiceUnit {
        cfg: &AndroidVoiceStreamConfig,
        event_tx: &BackendEventTx,
        capture_state: Arc<Mutex<AndroidCaptureState>>,
        audio_processing_stats: Arc<crate::SharedAudioProcessingStats>,
    ) -> Result<AudioStreamAsync<OboeInput, InputCallback>, BackendError> {
        // SDD-112 items 6 & 7: explore (preset × sharing) independently
        // via the pure helpers in `mobile_voice_backend`. Primary
@@ -998,7 +1033,6 @@ impl AndroidVoiceUnit {
                };
                let cb = InputCallback {
                    state: capture_state.clone(),
                    audio_processing_stats: audio_processing_stats.clone(),
                    event_tx: event_tx.clone(),
                };
                let builder = AudioStreamBuilder::default()
@@ -1034,14 +1068,16 @@ impl AndroidVoiceUnit {
    fn open_output_fallback(
        cfg: &AndroidVoiceStreamConfig,
        event_tx: &BackendEventTx,
-        pcm_consumer: crate::android_render_ring::AndroidRenderRingConsumer,
+        handler: AudioHandler<SessionAudioId>,
        event_queue: Arc<AudioEventQueue>,
        output_gain: Arc<AtomicU32>,
        output_muted: Arc<AtomicBool>,
        audio_processing_stats: Arc<crate::SharedAudioProcessingStats>,
        render_reference: Arc<RenderReferenceBuffer>,
    ) -> Result<AudioStreamAsync<OboeOutput, OutputCallback>, BackendError> {
        let cb = OutputCallback {
-            pcm_consumer,
+            handler,
            event_queue,
            output_gain,
            output_muted,
            event_tx: event_tx.clone(),
@@ -1066,50 +1102,6 @@ impl AndroidVoiceUnit {
            .map_err(|e| BackendError::OpenFailed(format!("output fallback: {e:?}")))
    }
    fn spawn_render_producer(
        mut handler: AudioHandler<SessionAudioId>,
        event_consumer: crate::audio_event_queue::AudioEventConsumer,
        pcm_producer: crate::android_render_ring::AndroidRenderRingProducer,
    ) -> Arc<AtomicBool> {
        let shutdown = Arc::new(AtomicBool::new(false));
        let shutdown_for_task = shutdown.clone();
        tokio::spawn(async move {
            let mut pull_scratch = vec![0.0_f32; ANDROID_RENDER_PULL_SAMPLES];
            let mut interval = tokio::time::interval(std::time::Duration::from_millis(20));
            interval.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Delay);
            loop {
                interval.tick().await;
                if shutdown_for_task.load(Ordering::Relaxed) {
                    break;
                }
                for cmd in event_consumer.drain_controls() {
                    match cmd {
                        AudioCommand::SetVolume(id, vol) => {
                            if let Some(q) = handler.get_mut_queues().get_mut(&id) {
                                q.volume = vol;
                            }
                        }
                        AudioCommand::RemoveClient(id) => {
                            handler.get_mut_queues().remove(&id);
                        }
                    }
                }
                for pkt in event_consumer.drain_packets(50) {
                    if let Err(e) = handler.handle_packet(pkt.client_id, pkt.data) {
                        debug!(target: "chanora_audio", error = %e, "decode failed");
                    }
                }
                pull_scratch.fill(0.0);
                let _ = handler.fill_buffer(&mut pull_scratch);
                pcm_producer.push_frame_lossy(&pull_scratch);
            }
        });
        shutdown
    }
    /// Clone of the event sender, for JNI focus / SCO listeners
    /// registered on the engine's behalf.
    pub fn event_sender(&self) -> BackendEventTx {
@@ -1161,7 +1153,6 @@ impl MobileVoiceAudioBackend for AndroidVoiceUnit {
    fn close(&mut self) -> Result<(), BackendError> {
        // SDD-115 reverse order: release hardware effects FIRST,
        // then close streams.
        self.render_producer_shutdown.store(true, Ordering::Relaxed);
        release_hardware_effects(&mut self.hw_effects);
        self.stop().ok();
        // Dropping the Option drops the underlying AudioStreamAsync
@@ -1219,7 +1210,6 @@ impl Drop for AndroidVoiceUnit {
        // Wrap in catch_unwind so a panic during Drop cannot unwind
        // into the JVM (SDD-115 callback safety).
        let _ = catch_unwind(AssertUnwindSafe(|| {
            self.render_producer_shutdown.store(true, Ordering::Relaxed);
            release_hardware_effects(&mut self.hw_effects);
            // SDD-116: clear the diagnostics slot on Drop too.
            clear_android_audio_diagnostics();
@@ -1299,11 +1289,33 @@ fn attach_hardware_effects_inner(
    session_id: AudioSessionId,
    effects: &crate::AudioEffects,
 ) -> HardwareEffectHandles {
-    with_android_env("hardware effects", |env| {
+    let ctx = ndk_context::android_context();
    if ctx.vm().is_null() {
        warn!(
            target: "chanora_audio",
            "android: ndk_context vm null; cannot bind hardware effects (software fallback engages)"
        );
        return HardwareEffectHandles::default();
    }
    let jvm = match unsafe { jni::JavaVM::from_raw(ctx.vm() as *mut _) } {
        Ok(v) => v,
        Err(e) => {
            warn!(target: "chanora_audio", error = %e, "android: JavaVM::from_raw failed; effects not bound");
            return HardwareEffectHandles::default();
        }
    };
    let mut env = match jvm.attach_current_thread() {
        Ok(e) => e,
        Err(e) => {
            warn!(target: "chanora_audio", error = %e, "android: attach_current_thread failed; effects not bound");
            return HardwareEffectHandles::default();
        }
    };
    let mut handles = HardwareEffectHandles::default();
    if effects.aec {
        handles.aec = create_effect(
-                env,
+            &mut env,
            "android/media/audiofx/AcousticEchoCanceler",
            session_id,
            "AEC",
@@ -1311,7 +1323,7 @@ fn attach_hardware_effects_inner(
    }
    if effects.noise_suppression {
        handles.ns = create_effect(
-                env,
+            &mut env,
            "android/media/audiofx/NoiseSuppressor",
            session_id,
            "NS",
@@ -1319,51 +1331,20 @@ fn attach_hardware_effects_inner(
    }
    if effects.agc {
        handles.agc = create_effect(
-                env,
+            &mut env,
            "android/media/audiofx/AutomaticGainControl",
            session_id,
            "AGC",
        );
    }
    handles
    })
    .unwrap_or_default()
 }
 fn with_android_env<R>(
    operation: &str,
    op: impl for<'local> FnOnce(&mut jni::Env<'local>) -> R,
 ) -> Option<R> {
    let ctx = ndk_context::android_context();
    if ctx.vm().is_null() {
        warn!(
            target: "chanora_audio",
            operation,
            "android: ndk_context vm null; JNI call skipped"
        );
        return None;
    }
    let jvm = unsafe { jni::JavaVM::from_raw(ctx.vm() as *mut _) };
    match jvm.attach_current_thread(|env| Ok::<R, jni::errors::Error>(op(env))) {
        Ok(value) => Some(value),
        Err(e) => {
            warn!(target: "chanora_audio", error = %e, operation, "android: attach_current_thread failed");
            None
        }
    }
 }
 /// SDD-113 item 3: probe the static `isAvailable()` on each effect
 /// class before calling `create(int)`. Returns `false` on any JNI
 /// failure so the caller engages the software fallback.
-fn effect_is_available(env: &mut jni::Env<'_>, class: &jni::objects::JClass, label: &str) -> bool {
+fn effect_is_available(env: &mut jni::JNIEnv, class: &jni::objects::JClass, label: &str) -> bool {
-    match env.call_static_method(
+    match env.call_static_method(class, "isAvailable", "()Z", &[]) {
        class,
        jni::jni_str!("isAvailable"),
        jni::jni_sig!("()Z"),
        &[],
    ) {
        Ok(v) => match v.z() {
            Ok(b) => b,
            Err(e) => {
@@ -1381,14 +1362,14 @@ fn effect_is_available(env: &mut jni::Env<'_>, class: &jni::objects::JClass, lab
 }
 fn create_effect(
-    env: &mut jni::Env<'_>,
+    env: &mut jni::JNIEnv,
    fqcn: &str,
    session_id: AudioSessionId,
    label: &str,
-) -> Option<AndroidGlobalObject> {
+) -> Option<jni::objects::GlobalRef> {
    use jni::objects::JValue;
    // Class.create(int) -> ClassInstance|null
-    let class = match env.find_class(jni::strings::JNIString::new(fqcn)) {
+    let class = match env.find_class(fqcn) {
        Ok(c) => c,
        Err(e) => {
            warn!(target: "chanora_audio", error = %e, effect = label, "android: find_class failed; effect not bound — software fallback engages");
@@ -1404,18 +1385,10 @@ fn create_effect(
        );
        return None;
    }
    let create_sig = match jni::signature::RuntimeMethodSignature::from_str(format!("(I)L{fqcn};"))
    {
        Ok(sig) => sig,
        Err(e) => {
            warn!(target: "chanora_audio", error = %e, effect = label, "android: create() signature parse failed");
            return None;
        }
    };
    let inst = match env.call_static_method(
        &class,
-        jni::jni_str!("create"),
+        "create",
-        create_sig.method_signature(),
+        &format!("(I)L{fqcn};"),
        &[JValue::Int(session_id)],
    ) {
        Ok(v) => match v.l() {
@@ -1440,8 +1413,8 @@ fn create_effect(
    // setEnabled(true) -> int (success code)
    if let Err(e) = env.call_method(
        &inst,
-        jni::jni_str!("setEnabled"),
+        "setEnabled",
-        jni::jni_sig!("(Z)I"),
+        "(Z)I",
        &[JValue::Bool(jni::sys::JNI_TRUE)],
    ) {
        let _ = env.exception_clear();
@@ -1477,28 +1450,34 @@ fn release_hardware_effects_inner(handles: &mut HardwareEffectHandles) {
    if aec.is_none() && ns.is_none() && agc.is_none() {
        return;
    }
-    let _ = with_android_env("release hardware effects", |env| {
+    let ctx = ndk_context::android_context();
    if ctx.vm().is_null() {
        return;
    }
    // SAFETY: vm is non-null and owned for process lifetime via JNI_OnLoad.
    let jvm = match unsafe { jni::JavaVM::from_raw(ctx.vm() as *mut _) } {
        Ok(v) => v,
        Err(_) => return,
    };
    let mut env = match jvm.attach_current_thread() {
        Ok(e) => e,
        Err(_) => return,
    };
    for (effect, label) in [(aec, "AEC"), (ns, "NS"), (agc, "AGC")] {
        if let Some(g) = effect {
            let _ = env.call_method(
                g.as_obj(),
-                    jni::jni_str!("setEnabled"),
+                "setEnabled",
-                    jni::jni_sig!("(Z)I"),
+                "(Z)I",
                &[jni::objects::JValue::Bool(jni::sys::JNI_FALSE)],
            );
-                env.exception_clear();
+            let _ = env.exception_clear();
-                let _ = env.call_method(
+            let _ = env.call_method(g.as_obj(), "release", "()V", &[]);
-                    g.as_obj(),
+            let _ = env.exception_clear();
                    jni::jni_str!("release"),
                    jni::jni_sig!("()V"),
                    &[],
                );
                env.exception_clear();
            drop(g);
            info!(target: "chanora_audio", effect = label, "android: hardware effect released");
        }
    }
    });
 }
 // --- Process-global BackendEvent sender for JNI callbacks --------
@@ -1573,7 +1552,7 @@ pub fn chanora_android_stop_voice_service() -> bool {
 fn call_voice_service_static(method: &str) -> bool {
    use jni::objects::{JObject, JValue};
    let ctx = ndk_context::android_context();
-    if ctx.context().is_null() {
+    if ctx.vm().is_null() || ctx.context().is_null() {
        warn!(
            target: "chanora_audio",
            method,
@@ -1581,19 +1560,34 @@ fn call_voice_service_static(method: &str) -> bool {
        );
        return false;
    }
-
+    // SAFETY: vm/context populated by chanora_bridge::android_init at
-    with_android_env("voice foreground service", |env| {
+    // JNI_OnLoad + initChanoraContext; both pointers are valid for
    // the process lifetime.
    let jvm = match unsafe { jni::JavaVM::from_raw(ctx.vm() as *mut _) } {
        Ok(v) => v,
        Err(e) => {
            warn!(target: "chanora_audio", error = %e, method, "android: JavaVM::from_raw failed");
            return false;
        }
    };
    let mut env = match jvm.attach_current_thread() {
        Ok(e) => e,
        Err(e) => {
            warn!(target: "chanora_audio", error = %e, method, "android: attach_current_thread failed");
            return false;
        }
    };
    // SAFETY: ndk_context::context() is the application Context
    // jobject; valid global ref for process lifetime.
-        let context_obj = unsafe { JObject::from_raw(env, ctx.context() as jni::sys::jobject) };
+    let context_obj = unsafe { JObject::from_raw(ctx.context() as jni::sys::jobject) };
-        let class = match load_app_class(env, &context_obj, ANDROID_VOICE_FG_SERVICE_FQCN) {
+    let class = match load_app_class(&mut env, &context_obj, ANDROID_VOICE_FG_SERVICE_FQCN) {
        Some(c) => c,
        None => return false,
    };
    match env.call_static_method(
        &class,
-            jni::strings::JNIString::new(method),
+        method,
-            jni::jni_sig!("(Landroid/content/Context;)V"),
+        "(Landroid/content/Context;)V",
        &[JValue::Object(&context_obj)],
    ) {
        Ok(_) => {
@@ -1601,21 +1595,19 @@ fn call_voice_service_static(method: &str) -> bool {
            true
        }
        Err(e) => {
-                env.exception_clear();
+            let _ = env.exception_clear();
            warn!(target: "chanora_audio", error = %e, method, "android: foreground service static call failed");
            false
        }
    }
    })
    .unwrap_or(false)
 }
 fn load_app_class<'local>(
-    env: &mut jni::Env<'local>,
+    env: &mut jni::JNIEnv<'local>,
    context_obj: &jni::objects::JObject<'local>,
    slash_name: &str,
 ) -> Option<jni::objects::JClass<'local>> {
-    match env.find_class(jni::strings::JNIString::new(slash_name)) {
+    match env.find_class(slash_name) {
        Ok(c) => return Some(c),
        Err(e) => {
            let _ = env.exception_clear();
@@ -1626,8 +1618,8 @@ fn load_app_class<'local>(
    let loader = match env
        .call_method(
            context_obj,
-            jni::jni_str!("getClassLoader"),
+            "getClassLoader",
-            jni::jni_sig!("()Ljava/lang/ClassLoader;"),
+            "()Ljava/lang/ClassLoader;",
            &[],
        )
        .and_then(|v| v.l())
@@ -1652,20 +1644,13 @@ fn load_app_class<'local>(
    match env
        .call_method(
            &loader,
-            jni::jni_str!("loadClass"),
+            "loadClass",
-            jni::jni_sig!("(Ljava/lang/String;)Ljava/lang/Class;"),
+            "(Ljava/lang/String;)Ljava/lang/Class;",
            &[jni::objects::JValue::Object(&class_name_obj)],
        )
        .and_then(|v| v.l())
    {
-        Ok(class_obj) => match env.cast_local::<jni::objects::JClass>(class_obj) {
+        Ok(class_obj) => Some(jni::objects::JClass::from(class_obj)),
            Ok(class) => Some(class),
            Err(e) => {
                env.exception_clear();
                warn!(target: "chanora_audio", error = %e, class = %dotted_name, "android: ClassLoader.loadClass returned non-Class object");
                None
            }
        },
        Err(e) => {
            let _ = env.exception_clear();
            warn!(target: "chanora_audio", error = %e, class = %dotted_name, "android: ClassLoader.loadClass failed");
@@ -1696,7 +1681,7 @@ fn load_app_class<'local>(
 pub extern "system" fn Java_app_chanora_chanora_1flutter_AndroidAudioFocusController_publishFocusChange<
    'local,
 >(
-    _env: jni::EnvUnowned<'local>,
+    _env: jni::JNIEnv<'local>,
    _class: jni::objects::JClass<'local>,
    state: jni::sys::jint,
 ) {
@@ -1734,7 +1719,7 @@ pub extern "system" fn Java_app_chanora_chanora_1flutter_AndroidAudioFocusContro
 pub extern "system" fn Java_app_chanora_chanora_1flutter_AndroidBluetoothScoController_publishScoStateChange<
    'local,
 >(
-    _env: jni::EnvUnowned<'local>,
+    _env: jni::JNIEnv<'local>,
    _class: jni::objects::JClass<'local>,
    state: jni::sys::jint,
 ) {
@@ -1783,7 +1768,7 @@ pub fn chanora_android_stop_bluetooth_sco() -> bool {
 fn call_static_void_context(fqcn: &str, method: &str) -> bool {
    use jni::objects::{JObject, JValue};
    let ctx = ndk_context::android_context();
-    if ctx.context().is_null() {
+    if ctx.vm().is_null() || ctx.context().is_null() {
        warn!(
            target: "chanora_audio",
            class = fqcn,
@@ -1792,17 +1777,29 @@ fn call_static_void_context(fqcn: &str, method: &str) -> bool {
        );
        return false;
    }
-
+    let jvm = match unsafe { jni::JavaVM::from_raw(ctx.vm() as *mut _) } {
-    with_android_env("static context call", |env| {
+        Ok(v) => v,
-        let context_obj = unsafe { JObject::from_raw(env, ctx.context() as jni::sys::jobject) };
+        Err(e) => {
-        let class = match load_app_class(env, &context_obj, fqcn) {
+            warn!(target: "chanora_audio", error = %e, class = fqcn, method, "android: JavaVM::from_raw failed");
            return false;
        }
    };
    let mut env = match jvm.attach_current_thread() {
        Ok(e) => e,
        Err(e) => {
            warn!(target: "chanora_audio", error = %e, class = fqcn, method, "android: attach_current_thread failed");
            return false;
        }
    };
    let context_obj = unsafe { JObject::from_raw(ctx.context() as jni::sys::jobject) };
    let class = match load_app_class(&mut env, &context_obj, fqcn) {
        Some(c) => c,
        None => return false,
    };
    match env.call_static_method(
        &class,
-            jni::strings::JNIString::new(method),
+        method,
-            jni::jni_sig!("(Landroid/content/Context;)V"),
+        "(Landroid/content/Context;)V",
        &[JValue::Object(&context_obj)],
    ) {
        Ok(_) => {
@@ -1810,11 +1807,9 @@ fn call_static_void_context(fqcn: &str, method: &str) -> bool {
            true
        }
        Err(e) => {
-                env.exception_clear();
+            let _ = env.exception_clear();
            warn!(target: "chanora_audio", error = %e, class = fqcn, method, "android: static call failed");
            false
        }
    }
    })
    .unwrap_or(false)
 }
@@ -10,7 +10,6 @@ const PACKET_QUEUE_CAPACITY: usize = 100;
 const CONTROL_QUEUE_CAPACITY: usize = 32;
 /// A raw inbound voice packet waiting to be inserted into AudioHandler.
 #[derive(Debug)]
 pub struct AudioPacket {
    /// Client whose TeamSpeak audio packet this belongs to.
    pub client_id: SessionAudioId,
@@ -19,14 +18,10 @@ pub struct AudioPacket {
 }
 /// Control commands from the main thread to the audio callback.
 #[derive(Debug)]
 pub enum AudioCommand {
    /// Set a client's output volume.
    SetVolume(SessionAudioId, f32),
    /// Remove a client's decode queue.
    // TODO: Wire to client disconnect path; handled in callback but no
    // producer currently pushes this command.
    #[allow(dead_code)]
    RemoveClient(SessionAudioId),
 }
@@ -121,64 +116,3 @@ impl AudioEventConsumer {
        std::iter::from_fn(move || self.queue.control_queue.pop())
    }
 }
 #[cfg(test)]
 mod tests {
    use super::*;
    fn empty_packet(id: u64) -> AudioPacket {
        let audio = chanora_protocol::AudioData::S2C {
            codec: chanora_protocol::CodecType::OpusVoice,
            id: 0x1234,
            from: 0x5678,
            data: &[1, 2, 3],
        };
        let out = chanora_protocol::OutAudio::new(&audio);
        AudioPacket {
            client_id: SessionAudioId(id),
            data: InAudioBuf::try_new(chanora_protocol::Direction::S2C, out.data().to_vec())
                .unwrap(),
        }
    }
    #[test]
    fn packet_overflow_increments_drop_counter() {
        let queue = AudioEventQueue::new();
        let producer = AudioEventQueue::producer(&queue);
        for i in 0..PACKET_QUEUE_CAPACITY {
            let packet = empty_packet(i as u64);
            assert!(producer.push_packet(packet).is_ok());
        }
        let overflow = empty_packet(999);
        assert!(producer.push_packet(overflow).is_err());
        assert_eq!(queue.packets_dropped.load(Ordering::Relaxed), 1);
    }
    #[test]
    fn consumer_drains_packets_and_controls() {
        let queue = AudioEventQueue::new();
        let producer = AudioEventQueue::producer(&queue);
        let consumer = AudioEventQueue::consumer(&queue);
        producer
            .push_control(AudioCommand::SetVolume(SessionAudioId(7), 0.5))
            .unwrap();
        producer.push_packet(empty_packet(42)).unwrap();
        let packets: Vec<_> = consumer.drain_packets(8).collect();
        assert_eq!(packets.len(), 1);
        assert_eq!(packets[0].client_id, SessionAudioId(42));
        let controls: Vec<_> = consumer.drain_controls().collect();
        assert_eq!(controls.len(), 1);
        match controls[0] {
            AudioCommand::SetVolume(id, vol) => {
                assert_eq!(id, SessionAudioId(7));
                assert_eq!(vol, 0.5);
            }
            AudioCommand::RemoveClient(_) => panic!("unexpected remove-client command"),
        }
    }
 }
--- a/Show More
+++ b/Show More