fix(android): make injected context previews transport-aware

fix(dashboard): resolve relocated upstream WebSocket guards

.github/scripts/classify-ci-paths.cjs

@@ -17,6 +17,7 @@ function classifyCiPaths(paths) {
     android: forceAll || under(['app/', 'gradle/']) || exact([
       'build.gradle.kts', 'settings.gradle.kts', 'gradle.properties', 'gradlew', 'gradlew.bat',
       'scripts/check-android-locales.py', 'scripts/android-locale-harness.py',
+      'scripts/check-android-capabilities.py', 'scripts/tests/check_android_capabilities_test.py',
       'scripts/check-android-collection-apis.py', 'scripts/check-android-native-compat.py',
       'scripts/check-android-release-notes.py',
       'scripts/android_release_artifacts.py',

.github/scripts/classify-ci-paths.test.cjs

@@ -128,3 +128,6 @@ assert.match(releaseTrainWorkflow, /name: Hermes-Relay Coordinated Release Appro
 assert.match(releaseTrainWorkflow, /Coordinated Android approval is stable-only/);
 
 console.log('CI path classification tests passed.');
+
+assert.deepEqual(classifyCiPaths(['scripts/check-android-capabilities.py']), { ...none, android: true });
+assert.deepEqual(classifyCiPaths(['scripts/tests/check_android_capabilities_test.py']), { ...none, android: true });

.github/workflows/android-on-demand.yml

@@ -166,6 +166,9 @@ jobs:
       - name: Build debug APKs
         run: ./gradlew assembleDebug --console=plain
 
+      - name: Verify Play capability manifest
+        run: python3 scripts/check-android-capabilities.py --variant googlePlayDebug
+
       - name: Verify packaged native compatibility
         run: |
           python3 scripts/check-android-native-compat.py \
@@ -203,6 +206,9 @@ jobs:
       - name: Build release bundles and APKs
         run: ./gradlew bundleRelease assembleRelease --console=plain
 
+      - name: Verify Play release capability manifest
+        run: python3 scripts/check-android-capabilities.py --variant googlePlayRelease
+
       - name: Scan release DEX for unsupported collection APIs
         run: |
           python3 scripts/check-android-collection-apis.py \

.github/workflows/ci-android.yml

@@ -34,6 +34,8 @@ on:
       - "scripts/check-android-locales.py"
       - "scripts/android-locale-harness.py"
       - "scripts/check-android-collection-apis.py"
+      - "scripts/check-android-capabilities.py"
+      - "scripts/tests/check_android_capabilities_test.py"
       - "scripts/check-android-native-compat.py"
       - "scripts/check-android-release-notes.py"
       - "scripts/tests/check_android_native_compat_test.py"
@@ -73,6 +75,11 @@ jobs:
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/dev' }}
 
+      - name: Validate Play capability boundary
+        run: |
+          python3 scripts/check-android-capabilities.py
+          python3 -m unittest scripts.tests.check_android_capabilities_test
+
       - name: Validate translation catalogs
         run: python3 scripts/check-android-locales.py
 
@@ -117,6 +124,9 @@ jobs:
       - name: Build debug APK
         run: ./gradlew assembleDebug --console=plain
 
+      - name: Verify Play capability manifest
+        run: python3 scripts/check-android-capabilities.py --variant googlePlayDebug
+
       - name: Verify packaged ONNX Runtime compatibility
         run: |
           python3 scripts/check-android-native-compat.py \

.github/workflows/ci-website.yml

@@ -8,6 +8,15 @@ on:
       - "assets/screenshots/03_voice.png"
       - "assets/screenshots/06_manage.png"
       - "docs/media/screenshots.json"
+      - "docs/media/desktop-ui-screenshots.json"
+      - "assets/screenshots/desktop-ui/**"
+      - "desktop/tray/ui/**"
+      - "desktop/tray/scripts/*.mjs"
+      - "desktop/tray/package-lock.json"
+      - "desktop/tray/index.html"
+      - "desktop/tray/icons/icon-256.png"
+      - "desktop/src/endpoint.ts"
+      - "desktop/src/transportSecurity.ts"
       - ".github/workflows/ci-website.yml"
   push:
     branches: [main, dev]
@@ -17,6 +26,15 @@ on:
       - "assets/screenshots/03_voice.png"
       - "assets/screenshots/06_manage.png"
       - "docs/media/screenshots.json"
+      - "docs/media/desktop-ui-screenshots.json"
+      - "assets/screenshots/desktop-ui/**"
+      - "desktop/tray/ui/**"
+      - "desktop/tray/scripts/*.mjs"
+      - "desktop/tray/package-lock.json"
+      - "desktop/tray/index.html"
+      - "desktop/tray/icons/icon-256.png"
+      - "desktop/src/endpoint.ts"
+      - "desktop/src/transportSecurity.ts"
       - ".github/workflows/ci-website.yml"
 
 permissions:

.github/workflows/play-preflight-android.yml

@@ -106,6 +106,9 @@ jobs:
             :app:assembleSideloadRelease \
             --console=plain
 
+      - name: Verify Play capability manifest
+        run: python3 scripts/check-android-capabilities.py --variant googlePlayRelease
+
       - name: Scan final release DEX
         run: |
           python3 scripts/check-android-collection-apis.py \

CHANGELOG.md

@@ -6,9 +6,21 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/), and this
 
 ## [Unreleased]
 
+### Added
+
+- Optional voice controls over other apps in Google Play, with contextual permission setup, a persistent Stop voice notification, and session shutdown on screen lock or permission loss. Phone control remains sideload-only.
+
 ### Fixed
 
-- Android Dashboard-only connections start the profile-scoped session directory before Gateway readiness, so a cold LAN launch cannot leave both the directory and the passive Gateway socket waiting on each other. (#495, #528)
+- Android context previews mark phone status and turn context as unavailable in Gateway chats instead of claiming they are sent. Settings clarify that automatic phone-status sharing applies to API-only chats. (#556)
+- Relay Dashboard WebSockets work with current Hermes authentication helpers while preserving older-host compatibility, single-use tickets, Host/Origin/IP checks, and Relay session authentication.
+- Android shows Hermes profile display names and groups the resolved server default under its agent identity, while preserving explicit profile selection and saved conversations.
+
+## [Android 1.16.1] - 2026-09-12
+
+### Fixed
+
+- Android Dashboard-only connections start the profile-scoped session directory before Gateway readiness, so a cold launch no longer leaves both the directory and passive Gateway socket waiting on each other. (#495, #528)
 
 ## [Android 1.16.0] - 2026-09-10
 

RELEASE_NOTES.md

@@ -1,10 +1,10 @@
-# Hermes-Relay Android v1.16.0
+# Hermes-Relay Android v1.16.1
 
-**Release Date:** September 10, 2026
+**Release Date:** September 12, 2026
 
 ## Download
 
-> Installing on your phone? Download `hermes-relay-1.16.0-sideload-release.apk` and tap it for the full feature set, or install the conservative build from [Google Play](https://play.google.com/store/apps/details?id=com.axiomlabs.hermesrelay).
+> Installing on your phone? Download `hermes-relay-1.16.1-sideload-release.apk` and tap it for the full feature set, or install the conservative build from [Google Play](https://play.google.com/store/apps/details?id=com.axiomlabs.hermesrelay).
 
 The `.aab` file is a Play Console upload bundle and cannot be installed by tapping it on a phone.
 
@@ -12,28 +12,16 @@ Verify the download against `SHA256SUMS.txt`. See the [sideload guide](https://h
 
 ## Summary
 
-This release makes startup and connection switching safer, prevents a network-change crash, and keeps Bot Mode and delegated work stable across multiple Hermes gateways. Chat feedback, attachment failures, and session preparation are also easier to understand and review.
-
-## Changed
-
-- Delegated-agent activity remains available after parent replies as compact, bounded, read-only history. The live strip appears only while work is active, and historical views cannot control a running process.
-- Android feedback uses themed banners and action cards. A long-press on the agent header opens session diagnostics, and Developer settings can preview message surfaces locally.
+This patch fixes a remaining cold-start path that could leave a Dashboard-only connection waiting for Gateway readiness until the app resumed or its network route changed.
 
 ## Fixed
 
-- An authenticated Gateway chat opens on the first foreground launch instead of waiting for a background-and-resume cycle.
-- Network changes can invalidate route probes without racing the endpoint cache or crashing Android.
-- Saved Dashboard sign-ins stay bound to their owning connection when switching gateways; an outgoing route cannot invalidate another connection's session.
-- Dashboard sign-in removes pasted line breaks from username and password fields while preserving every other credential character.
-- Bot Mode and Active Now keep connection identity when different gateways expose the same profile name, and progress opens only on the selected bot.
-- Missing attachments keep their error and Retry action in the attachment card without repeated global messages.
-- Chat distinguishes session preparation from response streaming and retains initialization errors received before session acknowledgement.
+- Dashboard-only connections now start the exact profile-scoped session directory before Gateway readiness, so the directory and passive Gateway socket no longer wait on each other during a cold launch.
 
 ## Install / Verify
 
-- App version: **1.16.0** (versionCode **55**).
+- App version: **1.16.1** (versionCode **56**).
 - Standard Chat, sessions, profiles, Manage, voice, and ordinary media use current upstream Hermes. Speech-to-text still requires a configured provider on the host.
-- Hermes-Relay Plugin **1.11.2** is the matching optional release for Relay tools; the Android connection, Bot Mode, and delegated-activity fixes do not require the plugin.
-- Already-erased or revoked Dashboard credentials still require a legitimate sign-in; this release prevents cross-connection invalidation going forward.
+- Hermes-Relay Plugin **1.11.2** remains the matching optional release for Relay tools; this Gateway startup fix does not require it.
 - Explicit Direct API/API-only connections remain supported and are not used as silent failover for Dashboard-owned chats.
 - Granular Device Control and the system Voice Focus overlay remain sideload-only.

app/build.gradle.kts

@@ -100,9 +100,9 @@ android {
     }
 
     // ─── Bridge release tracks ─────────────────────────────────────────────────
-    // Google Play ships Bridge Core only: pairing, chat, voice, terminal/TUI,
+    // Google Play ships Bridge Core and user-started voice-only overlay: pairing, chat, voice, terminal/TUI,
     // media, notification companion, relay sessions, and status. It does not
-    // declare AccessibilityService, overlay, MediaProjection, wake-lock device
+    // declare AccessibilityService, MediaProjection, wake-lock device
     // control, SMS/call/contact/location, or unattended-control permissions.
     //
     //   googlePlay  — canonical Play Store install. Bridge Core only.

app/src/googlePlay/AndroidManifest.xml

@@ -8,7 +8,7 @@
     Google Play ships Hermes Bridge Core only. It intentionally does not merge
     any Device Control services or permissions.
 
-    This file is intentionally kept as an empty overlay so future flavor-specific
+    This overlay owns the voice-only special access so future flavor-specific
     permissions / activities have an obvious home. Mirror structural additions
     in `app/src/sideload/AndroidManifest.xml` unless the change is intentionally
     track-specific.
@@ -22,6 +22,9 @@
         android:name="android.permission.WAKE_LOCK"
         tools:node="remove" />
 
+    <!-- User-started voice controls only; does not enable Device Control. -->
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+
     <application />
 
 </manifest>

app/src/googlePlay/play/listings/en-US/full-description.txt

@@ -23,7 +23,7 @@ GOOGLE PLAY AND SIDELOAD
 
 The Google Play build includes Chat, voice, sessions, Manage, profiles, notifications, media, and Terminal/TUI when the Hermes-Relay plugin is paired.
 
-Google Play does not include Android Device Control. It cannot read the phone screen, tap, type, swipe, take device screenshots, send SMS, place calls, or access contacts or location.
+Google Play does not include Android Device Control. It cannot tap, type, swipe, send SMS, place calls, or access contacts or location. Optional Voice Overlay provides user-started voice controls over other apps, with microphone notification and Stop voice. Selecting Hermes as Android Digital Assistant can provide bounded screen text and a screenshot for an explicit unlocked assistant invocation; this context goes to your configured server and AI provider.
 
 Device Control is available only in the signed Sideload build on this project's GitHub Releases. It requires the Sideload app, a paired Hermes-Relay plugin, explicit Android accessibility permission, and the app's safety controls.
 
@@ -32,9 +32,6 @@ FEATURES
 - Streaming Chat with reasoning, markdown, tool progress, attachments, mid-turn steering, edit-and-resend, and searchable commands.
 - Manage models and provider keys, edit profiles, and browse, install, or update skills through the Hermes Dashboard.
 - Hands-free voice through your server's speech providers. Hermes-Relay pairing adds per-profile voices and an experimental realtime engine.
-- Create, switch, search, rename, pin, archive, and continue sessions.
-- Connect multiple Hermes servers and switch in one tap; add LAN, Tailscale, or public routes.
-- Pair the Hermes-Relay plugin for Terminal/TUI, notifications, media, enhanced voice, Relay sessions, and per-feature grants.
 - Inspect connection readiness, routes, response timing, token usage, and stream health without exposing credentials.
 
 SECURITY AND PRIVACY

app/src/googlePlay/play/release-notes/en-US/default.txt

@@ -1,3 +1,3 @@
-v1.16.0 - Safer startup, connections, and activity
+v1.16.1 - Dashboard-only cold starts recover
 
-Gateway chat now opens reliably on a cold launch. Saved Dashboard sign-ins stay bound to the correct connection, pasted credentials ignore accidental line breaks, and network changes no longer race the route cache. Bot Mode supports duplicate profile names across gateways, while delegated work, session setup, attachment errors, and feedback remain visible and easier to review.
+Dashboard-only connections now prepare the selected profile before Gateway readiness, fixing a remaining cold-start path that could stay on waking or waiting for Gateway until the app resumed or its network route changed.

app/src/main/assets/changelog.json

@@ -1,6 +1,27 @@
 {
  "schema": 3,
  "versions": [
+  {
+   "version": "1.16.1",
+   "title": "Dashboard-only cold starts recover",
+   "date": "2026-09-12",
+   "summary": "Dashboard-only connections can now prepare the selected profile and open Gateway chat without waiting for a background, resume, or network-route change.",
+   "changes": [
+    {
+     "id": "gateway-directory-bootstrap",
+     "kind": "fixed",
+     "title": "Open Gateway chat from a Dashboard-only cold start",
+     "summary": "The selected profile's session directory starts before Gateway readiness, so it cannot wait on the same passive socket that depends on its result.",
+     "highlight": true
+    }
+   ],
+   "compatibility": [
+    "Standard Dashboard and Gateway chat continue to use current upstream Hermes without requiring the optional Hermes-Relay Plugin.",
+    "Hermes-Relay Plugin 1.11.2 remains the matching optional release for Relay tools."
+   ],
+   "playNotes": "Dashboard-only connections now prepare the selected profile before Gateway readiness, fixing a remaining cold-start path that could stay on waking or waiting for Gateway until the app resumed or its network route changed.",
+   "sections": []
+  },
   {
    "version": "1.16.0",
    "title": "Safer startup, connections, and activity",

app/src/main/assets/whats_new.txt

@@ -1,24 +1,11 @@
-v1.16.0 - Safer startup, connections, and activity
+v1.16.1 - Dashboard-only cold starts recover
 
 Summary
-* Gateway chat opens reliably from a cold launch, saved sign-ins stay with the correct connection, and network changes no longer race the route cache. Bot Mode and delegated-work feedback also remain stable across multiple gateways and later review.
+* Dashboard-only connections can now prepare the selected profile and open Gateway chat without waiting for a background, resume, or network-route change.
 
 Highlights
-* Open Gateway chat on the first launch — An authenticated Gateway wakes and opens from a cold foreground start instead of waiting for the app to background and resume.
-* Keep saved sign-ins with their connection — Switching gateways cannot reuse an outgoing resolver route to invalidate another connection's saved Dashboard session.
-* Recover safely when the network changes — Route-probe completion and endpoint-cache invalidation are serialized so Wi-Fi, mobile-data, VPN, or Tailscale changes do not trigger the reported crash.
-* Review delegated work after it finishes — Compact, bounded activity receipts survive parent replies and remain available read-only, while the live strip appears only during active work.
-
-Improved
-* Keep feedback with the surface that owns it — Themed banners and action cards replace platform popups, global actions stay clear of the composer, and local Developer previews make feedback states inspectable.
-* See session preparation and initialization failures — Chat distinguishes session preparation from response streaming, retains early initialization errors, and opens session diagnostics from the agent header.
-
-Fixed
-* Open same-named bots from multiple gateways — Bot Mode and Active Now keep connection and profile identity together, avoiding duplicate list keys and opening progress on the selected bot.
-* Retry missing attachments in place — A missing attachment keeps its error and Retry action in the attachment card without producing repeated global messages.
-* Paste Dashboard credentials without hidden line breaks — Username and password fields remove pasted carriage returns and line feeds while preserving every other credential character.
+* Open Gateway chat from a Dashboard-only cold start — The selected profile's session directory starts before Gateway readiness, so it cannot wait on the same passive socket that depends on its result.
 
 Compatibility
-* Standard Chat, sessions, profiles, Manage, voice, Bot Mode, and delegated activity continue to use current upstream Hermes without requiring the optional Hermes-Relay Plugin.
-* Hermes-Relay Plugin 1.11.2 is the matching optional release for Relay tools. Existing erased or revoked Dashboard credentials still require a legitimate sign-in.
-* Granular Device Control and the system Voice Focus overlay remain sideload-only.
+* Standard Dashboard and Gateway chat continue to use current upstream Hermes without requiring the optional Hermes-Relay Plugin.
+* Hermes-Relay Plugin 1.11.2 remains the matching optional release for Relay tools.

app/src/main/kotlin/com/hermesandroid/relay/data/AgentDisplay.kt

@@ -34,9 +34,7 @@ object AgentDisplay {
         profiles: List<Profile>,
     ): Profile? = selectedProfile
 
-    // Display can use the root default profile's metadata without making it a
-    // request/session override. Verbose SOUL summaries are filtered by
-    // profileDisplayName below, so this is safe for headers/cards.
+    // Display resolution never changes selection or persistence identity.
     fun effectiveDisplayProfile(
         selectedProfile: Profile?,
         profiles: List<Profile>,
@@ -44,36 +42,22 @@ object AgentDisplay {
     ): Profile? {
         selectedProfile?.let { return it }
         val resolvedServerDefault = profileRequestName(serverDefaultProfileName)
-        return resolvedServerDefault
-            ?.let { activeName ->
-                profiles.firstOrNull { it.name.equals(activeName, ignoreCase = true) }
-            }
-            ?: profiles.firstOrNull { it.name.equals("default", ignoreCase = true) }
+        // An absent roster row is not authority to substitute the root profile.
+        // Retain the confirmed name while its display metadata is loading.
+        return resolvedServerDefault?.let { activeName ->
+            profiles.firstOrNull { it.name == activeName }
+                ?: Profile(name = activeName, model = "")
+        }
     }
 
-    // The NAME goes in the name slot. Non-default profiles use their profile
-    // name first. The synthetic default profile uses its description only when
-    // that description looks like a concise human agent name ("Victor"), not a
-    // verbose SOUL summary.
+    // Match upstream Desktop: presentation-only display_name, then exact request name.
     fun profileDisplayName(profile: Profile?): String? {
         if (profile == null) return null
-        if (profile.name.equals("default", ignoreCase = true)) {
-            return defaultProfileDisplayName(profile)
-        }
-        return when {
-            profile.name.isNotBlank() -> titleCase(profile.name.trim())
-            profile.description.isNotBlank() -> profile.description.trim()
-            else -> null
-        }
+        return profile.displayName.trim().takeIf(String::isNotEmpty)
+            ?: profile.name.trim().takeIf(String::isNotEmpty)
     }
 
-    fun defaultProfileDisplayName(profile: Profile?): String? =
-        profile
-            ?.description
-            ?.trim()
-            ?.takeIf { it.looksLikeConciseAgentName() }
-            ?.let(::titleCase)
-
+    @Suppress("UNUSED_PARAMETER") // connectionLabel retained for source compatibility.
     fun agentName(
         profile: Profile?,
         selectedPersonality: String,
@@ -86,7 +70,7 @@ object AgentDisplay {
 
         // "none"/"neutral" are the upstream "cleared overlay" aliases — treat
         // them like "default" for identity: fall through to the server default
-        // (or the base connection identity) rather than rendering the literal
+        // identity rather than rendering the literal
         // word as an agent name.
         val personalityName = if (
             isClearedPersonality(selectedPersonality) &&
@@ -102,7 +86,6 @@ object AgentDisplay {
         return when {
             personalityName.isNotBlank() && personalityName != "default" ->
                 titleCase(personalityName.trim())
-            !connectionLabel.isNullOrBlank() -> connectionLabel.trim()
             else -> "Hermes"
         }
     }
@@ -199,16 +182,6 @@ object AgentDisplay {
             ?.replace(Regex("\\s+"), " ")
             ?.takeIf { it.isNotEmpty() }
 
-    private fun String.looksLikeConciseAgentName(): Boolean {
-        if (isBlank() || length > 40 || contains('\n') || contains('\r')) {
-            return false
-        }
-        if (any { it == '.' || it == ':' || it == ';' }) {
-            return false
-        }
-        return trim().split(Regex("\\s+")).size <= 4
-    }
-
     private fun titleCase(value: String): String =
         value.replaceFirstChar { it.uppercase() }
 }

app/src/main/kotlin/com/hermesandroid/relay/data/FeatureFlags.kt

@@ -96,7 +96,8 @@ object FeatureFlags {
  * flavor ships AccessibilityService-backed Device Control. The `googlePlay`
  * flavor is Bridge Core: relay pairing, chat, voice, terminal, notification
  * companion, media, and session-grant surfaces without screen reading, taps,
- * typing, screenshots, overlays, or unattended control.
+ * typing, MediaProjection screenshots, or unattended control. Voice-only overlay
+ * presentation is a separate capability shared by both flavors.
  *
  * Device Control tier definitions (see `Phase 3 — Bridge Channel.md`):
  *   1. baseline          — sideload only (app open, tap, navigate within app)
@@ -126,6 +127,9 @@ object BuildFlavor {
      */
     val isSideload: Boolean get() = current == SIDELOAD
 
+    /** Voice presentation does not grant Device Control. Unknown distributions fail closed. */
+    val voiceSystemOverlay: Boolean get() = current == GOOGLE_PLAY || current == SIDELOAD
+
     val bridgeTier1: Boolean get() = current == SIDELOAD         // baseline device control
     val bridgeTier2: Boolean get() = current == SIDELOAD         // screen context
     val bridgeTier3: Boolean get() = current == SIDELOAD         // voice-first

app/src/main/kotlin/com/hermesandroid/relay/data/ProfileData.kt

@@ -111,6 +111,8 @@ data class Profile(
     val hasAvatar: Boolean = false,
     @SerialName("ui_meta")
     val uiMeta: JsonObject = JsonObject(emptyMap()),
+    @SerialName("display_name")
+    val displayName: String = "",
 ) {
     val hasIsolatedApi: Boolean
         get() = !apiServerUrl.isNullOrBlank()

app/src/main/kotlin/com/hermesandroid/relay/network/upstream/DashboardApiClient.kt

@@ -29,6 +29,7 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonNull
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.booleanOrNull
 import kotlinx.serialization.json.buildJsonObject
@@ -1506,7 +1507,7 @@ class DashboardApiClient(
             val patched = buildJsonObject {
                 obj.forEach { (k, v) -> put(k, v) }
                 if (obj["name"] == null && !nameOverride.isNullOrBlank()) put("name", nameOverride)
-                if (obj["model"] == null) put("model", "")
+                if (obj["model"] == null || obj["model"] == JsonNull) put("model", "")
             }
             json.decodeFromJsonElement(Profile.serializer(), patched)
         }.getOrNull()

app/src/main/kotlin/com/hermesandroid/relay/network/upstream/GatewayChatClient.kt

@@ -1913,6 +1913,7 @@ class GatewayChatClient(
                     model = row.stringField("model").orEmpty(),
                     provider = row.stringField("provider").orEmpty(),
                     description = row.stringField("description").orEmpty(),
+                    displayName = row.stringField("display_name").orEmpty(),
                     skillCount = (row["skill_count"] as? JsonPrimitive)?.intOrNull ?: 0,
                     isDefault = (row["is_default"] as? JsonPrimitive)?.booleanOrNull ?: false,
                     hasAvatar = (row["has_avatar"] as? JsonPrimitive)?.booleanOrNull ?: false,
@@ -5268,6 +5269,7 @@ private fun parseBotRosterEntry(row: JsonObject): BotRosterEntry? {
             model = row.stringField("model").orEmpty(),
             provider = row.stringField("provider").orEmpty(),
             description = row.stringField("description")?.take(512).orEmpty(),
+            displayName = row.stringField("display_name").orEmpty(),
             skillCount = (row["skill_count"] as? JsonPrimitive)?.intOrNull ?: 0,
             isDefault = (row["is_default"] as? JsonPrimitive)?.booleanOrNull ?: false,
             hasAvatar = (row["has_avatar"] as? JsonPrimitive)?.booleanOrNull ?: false,

app/src/main/kotlin/com/hermesandroid/relay/ui/components/ConnectionInfoSheet.kt

@@ -3625,7 +3625,7 @@ internal fun ProfileDisplayManagerDialog(
                     val isServerDefault = key == AgentDisplay.SERVER_DEFAULT_PROFILE_KEY
                     val profile = profiles.firstOrNull { it.name == key }
                     val label = if (isServerDefault) {
-                        stringResource(R.string.conn_info_server_default)
+                        stringResource(R.string.profile_follow_server_default)
                     } else {
                         profile?.let(AgentDisplay::profileDisplayName)
                             ?: key.replaceFirstChar { it.uppercase() }

app/src/main/kotlin/com/hermesandroid/relay/ui/components/InjectedContextSheet.kt

@@ -23,14 +23,9 @@ import com.hermesandroid.relay.R
 import com.hermesandroid.relay.viewmodel.ChatViewModel
 
 /**
- * Bottom-sheet audit of the exact extra context the agent is injected with on
- * the next turn — opened by tapping the chat [ContextMeterBar].
- *
- * Renders the SAME [ChatViewModel.InjectedContext] the send path builds (via
- * [ChatViewModel.previewInjectedContext] → `composeInjectedContext`), so it is
- * a faithful audit, not a re-derivation that could drift. Empty blocks show a
- * labeled note instead of vanishing, and the gateway's server-side persona is
- * explicitly called out as not-sent-from-this-device.
+ * Transport-aware context preview, opened from the chat [ContextMeterBar].
+ * Unsupported blocks are labeled rather than represented as delivered.
+ * Server-reported configuration is separate from device-supplied context.
  */
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -53,7 +48,7 @@ fun InjectedContextSheet(
             )
             Spacer(Modifier.height(4.dp))
             Text(
-                text = stringResource(R.string.injected_context_subtitle, context.transport),
+                text = stringResource(R.string.injected_context_subtitle),
                 style = MaterialTheme.typography.bodySmall,
                 color = MaterialTheme.colorScheme.onSurfaceVariant,
             )
@@ -71,6 +66,7 @@ fun InjectedContextSheet(
             val mediaNoRelay = stringResource(R.string.injected_context_media_no_relay)
             val relayNotSet = stringResource(R.string.injected_context_relay_not_set)
             val turnNotSet = stringResource(R.string.injected_context_turn_not_set)
+            val unsupported = stringResource(R.string.injected_context_gateway_unsupported)
 
             ContextSection(
                 title = personaTitle,
@@ -84,7 +80,7 @@ fun InjectedContextSheet(
             ContextSection(
                 title = phoneStatusTitle,
                 body = context.appContext,
-                emptyNote = phoneStatusNotSet,
+                emptyNote = if (context.perTurnContextSupported) phoneStatusNotSet else unsupported,
             )
             ContextSection(
                 title = mediaTitle,
@@ -107,7 +103,7 @@ fun InjectedContextSheet(
             ContextSection(
                 title = turnTitle,
                 body = context.interfaceContext,
-                emptyNote = turnNotSet,
+                emptyNote = if (context.perTurnContextSupported) turnNotSet else unsupported,
             )
         }
     }

app/src/main/kotlin/com/hermesandroid/relay/ui/components/ProfileShelf.kt

@@ -18,6 +18,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.selection.selectable
+import androidx.compose.foundation.selection.toggleable
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
@@ -41,6 +42,8 @@ import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -80,9 +83,10 @@ object ProfileShelfPolicy {
         profiles: List<Profile>,
         presentation: ProfilePresentation,
         selectedProfileName: String?,
+        serverDefaultProfileName: String? = null,
     ): List<ProfileChoice> {
         val selectedKey = AgentDisplay.profileSessionKey(selectedProfileName)
-        return ProfilePresentationPolicy
+        val choices = ProfilePresentationPolicy
             .visibleKeys(profiles, presentation, selectedKey)
             .mapNotNull { key ->
                 if (key == AgentDisplay.SERVER_DEFAULT_PROFILE_KEY) {
@@ -91,6 +95,17 @@ object ProfileShelfPolicy {
                     profiles.firstOrNull { it.name == key }?.let { ProfileChoice(key, it) }
                 }
             }
+        // Group only exact upstream identities, never matching display labels.
+        // Keep the selected choice's request/presentation key unchanged.
+        val hasDefault = choices.any { it.isServerDefault }
+        val hasResolved = choices.any { it.key == serverDefaultProfileName }
+        if (!hasDefault || !hasResolved) return choices
+        val omittedKey = if (selectedProfileName == serverDefaultProfileName) {
+            AgentDisplay.SERVER_DEFAULT_PROFILE_KEY
+        } else {
+            serverDefaultProfileName
+        }
+        return choices.filterNot { it.key == omittedKey }
     }
 
     fun canSwitch(isStreaming: Boolean, streamingEndpoint: String): Boolean =
@@ -124,8 +139,9 @@ fun ProfileShelf(
     onHide: (String?) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    val choices = remember(profiles, presentation, selectedProfile?.name) {
-        ProfileShelfPolicy.choices(profiles, presentation, selectedProfile?.name)
+    val serverDefaultProfile by connectionViewModel.serverDefaultDisplayProfile.collectAsState()
+    val choices = remember(profiles, presentation, selectedProfile?.name, serverDefaultProfile) {
+        ProfileShelfPolicy.choices(profiles, presentation, selectedProfile?.name, serverDefaultProfile?.name)
     }
     if (choices.size <= 1) return
 
@@ -157,7 +173,7 @@ fun ProfileShelf(
                         val label = if (selected) {
                             activeDisplayName
                         } else {
-                            profileChoiceLabel(choice, resolvedProfile)
+                            profileChoiceLabel(choice, serverDefaultProfile)
                         }
                         if (selected) {
                             val openPassportDescription = stringResource(R.string.profile_shelf_open_passport)
@@ -191,7 +207,7 @@ fun ProfileShelf(
                                         ProfileChoiceAvatar(
                                             connectionViewModel,
                                             choice,
-                                            resolvedProfile,
+                                            serverDefaultProfile,
                                             label,
                                             36,
                                         )
@@ -238,7 +254,7 @@ fun ProfileShelf(
                                 ProfileChoiceAvatar(
                                     connectionViewModel,
                                     choice,
-                                    resolvedProfile,
+                                    serverDefaultProfile,
                                     label,
                                     36,
                                 )
@@ -275,8 +291,8 @@ fun ProfileShelf(
 
     actionChoice?.let { choice ->
         val selected = ProfileShelfPolicy.isSelected(choice, selectedProfile?.name)
-        val target = choice.profile ?: resolvedProfile
-        val label = profileChoiceLabel(choice, resolvedProfile)
+        val target = choice.profile ?: serverDefaultProfile
+        val label = profileChoiceLabel(choice, serverDefaultProfile)
         ProfileShelfActionsDialog(
             label = label,
             canSwitch = switchEnabled && !isProfileLocked,
@@ -319,10 +335,14 @@ fun ProfileSwitcherSheet(
     onManageDisplay: () -> Unit,
     onDismiss: () -> Unit,
 ) {
-    val choices = remember(profiles, presentation, selectedProfile?.name) {
-        ProfileShelfPolicy.choices(profiles, presentation, selectedProfile?.name)
+    val serverDefaultProfile by connectionViewModel.serverDefaultDisplayProfile.collectAsState()
+    val choices = remember(profiles, presentation, selectedProfile?.name, serverDefaultProfile) {
+        ProfileShelfPolicy.choices(profiles, presentation, selectedProfile?.name, serverDefaultProfile?.name)
     }
-    ModalBottomSheet(onDismissRequest = onDismiss) {
+    ModalBottomSheet(
+        onDismissRequest = onDismiss,
+        sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
+    ) {
         Column(
             modifier = Modifier
                 .fillMaxWidth()
@@ -346,8 +366,15 @@ fun ProfileSwitcherSheet(
             }
             choices.forEach { choice ->
                 val selected = ProfileShelfPolicy.isSelected(choice, selectedProfile?.name)
-                val label = profileChoiceLabel(choice, resolvedProfile)
-                val model = choice.profile?.model?.takeIf { it.isNotBlank() }
+                val label = profileChoiceLabel(choice, serverDefaultProfile)
+                val target = if (choice.isServerDefault) serverDefaultProfile else choice.profile
+                val defaultGroup = serverDefaultProfile != null &&
+                    (choice.isServerDefault || choice.key == serverDefaultProfile?.name)
+                val detail = listOfNotNull(
+                    stringResource(R.string.conn_info_server_default).takeIf { defaultGroup },
+                    target?.name?.takeIf { it != label },
+                    target?.model?.takeIf { it.isNotBlank() },
+                ).joinToString(" · ")
                 ListItem(
                     modifier = Modifier.selectable(
                         selected = selected,
@@ -361,13 +388,13 @@ fun ProfileSwitcherSheet(
                     headlineContent = {
                         Text(label, maxLines = 1, overflow = TextOverflow.Ellipsis)
                     },
-                    supportingContent = if (model != null) {
-                        { Text(model, maxLines = 1, overflow = TextOverflow.Ellipsis) }
+                    supportingContent = if (detail.isNotBlank()) {
+                        { Text(detail, maxLines = 2, overflow = TextOverflow.Ellipsis) }
                     } else {
                         null
                     },
                     leadingContent = {
-                        ProfileChoiceAvatar(connectionViewModel, choice, resolvedProfile, label, 42)
+                        ProfileChoiceAvatar(connectionViewModel, choice, serverDefaultProfile, label, 42)
                     },
                     trailingContent = if (selected) {
                         { Icon(Icons.Filled.Check, contentDescription = null) }
@@ -375,6 +402,27 @@ fun ProfileSwitcherSheet(
                         null
                     },
                 )
+                if (defaultGroup && selected) {
+                    Row(
+                        modifier = Modifier.fillMaxWidth().heightIn(min = 48.dp)
+                            .toggleable(
+                                value = choice.isServerDefault,
+                                enabled = switchEnabled && !isProfileLocked,
+                                role = Role.Checkbox,
+                                onValueChange = {
+                                    onSelect(if (choice.isServerDefault) serverDefaultProfile else null)
+                                    onDismiss()
+                                },
+                            ).padding(start = 64.dp, end = 24.dp),
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        Checkbox(checked = choice.isServerDefault, onCheckedChange = null,
+                            enabled = switchEnabled && !isProfileLocked)
+                        Spacer(Modifier.size(8.dp))
+                        Text(stringResource(R.string.profile_follow_server_default),
+                            style = MaterialTheme.typography.bodyMedium)
+                    }
+                }
             }
             HorizontalDivider(modifier = Modifier.padding(top = 8.dp))
             TextButton(
@@ -518,7 +566,8 @@ private fun ProfileActionRow(
 @Composable
 private fun profileChoiceLabel(choice: ProfileChoice, resolvedProfile: Profile?): String =
     if (choice.isServerDefault) {
-        stringResource(R.string.conn_info_server_default)
+        AgentDisplay.profileDisplayName(resolvedProfile)
+            ?: stringResource(R.string.conn_info_server_default)
     } else {
         choice.profile?.let(AgentDisplay::profileDisplayName)
             ?: choice.profile?.name?.replaceFirstChar { it.uppercase() }

app/src/main/kotlin/com/hermesandroid/relay/ui/screens/ChatScreen.kt

@@ -1012,6 +1012,7 @@ fun ChatScreen(
     // of available profiles itself now lives entirely inside the sheet.
     val selectedProfile by connectionViewModel.selectedProfile.collectAsState()
     val effectiveProfile by connectionViewModel.effectiveDisplayProfile.collectAsState()
+    val serverDefaultDisplayProfile by connectionViewModel.serverDefaultDisplayProfile.collectAsState()
     val profilePresentation by connectionViewModel.profilePresentation.collectAsState()
     val isProfileLocked by connectionViewModel.isProfileLocked.collectAsState()
     val lockedProfileName by connectionViewModel.lockedProfileName.collectAsState()
@@ -1672,65 +1673,53 @@ fun ChatScreen(
         voiceOutputConfig?.enabled
     }
 
-    val voiceSystemOverlayAvailable = BuildFlavor.isSideload
+    val voiceSystemOverlayAvailable = BuildFlavor.voiceSystemOverlay
     val showVoiceSystemOverlay: () -> Unit = {
-        if (!voiceSystemOverlayAvailable) {
-            pendingVoiceOverlayPermission = false
-        } else if (assistantSessionActive) {
-            voiceOverlayHost.hide()
-        } else if (!voiceOverlayHost.hasOverlayPermission()) {
+        if (voiceSystemOverlayAvailable && !assistantSessionActive) {
             pendingVoiceOverlayPermission = true
-            runCatching {
-                val intent = Intent(
-                    Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
-                    Uri.parse("package:${context.packageName}"),
-                ).apply { addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) }
-                context.startActivity(intent)
-            }
-            scope.launch {
-                snackbarHostState.showSnackbar(
-                    message = context.getString(R.string.chat_overlay_perm_enable),
-                    duration = SnackbarDuration.Short,
-                )
-            }
-        } else {
-            pendingVoiceOverlayPermission = false
-            val shown = voiceOverlayHost.show(
-                VoiceOverlaySession(
-                    uiState = voiceViewModel.uiState,
-                    engineMode = voiceStats.voiceEngineMode,
-                    provider = activeVoiceProvider,
-                    model = activeVoiceModel,
-                    voice = activeVoiceName,
-                    profileName = AgentDisplay.profileDisplayName(effectiveProfile),
-                    configScope = activeVoiceScope,
-                    outputEnabled = activeVoiceEnabled,
-                    fallbackEnabled = voiceOutputConfig?.fallback_enabled,
-                    onStartListening = { voiceViewModel.startListening() },
-                    onStopListening = { voiceViewModel.stopListening() },
-                    onInterrupt = { voiceViewModel.interruptSpeaking() },
-                    onPauseAutoMode = { voiceViewModel.pauseContinuousMode() },
-                    onReturnToHermes = {
-                        openHermesFromOverlay(context)
-                        voiceOverlayHost.hide()
-                    },
-                    onDismissOverlay = { voiceOverlayHost.hide() },
-                    onExit = {
-                        voiceOverlayHost.hide()
-                        voiceViewModel.exitVoiceMode()
-                    },
-                ),
-            )
-            if (!shown) {
-                scope.launch {
-                    snackbarHostState.showSnackbar(
-                        message = context.getString(R.string.chat_overlay_start_failed),
-                        duration = SnackbarDuration.Short,
-                    )
-                }
-            }
         }
     }
+    if (pendingVoiceOverlayPermission && voiceUiState.voiceMode && !assistantSessionActive) {
+        com.hermesandroid.relay.voice.VoiceOverlaySetupDialog(
+            onDismiss = { pendingVoiceOverlayPermission = false },
+            onBeforePermission = { voiceViewModel.pauseContinuousMode() },
+            onStart = {
+                pendingVoiceOverlayPermission = false
+                val shown = voiceOverlayHost.show(
+                    VoiceOverlaySession(
+                        uiState = voiceViewModel.uiState,
+                        engineMode = voiceStats.voiceEngineMode,
+                        connectionLabel = activeConnection?.label,
+                        provider = activeVoiceProvider,
+                        model = activeVoiceModel,
+                        voice = activeVoiceName,
+                        profileName = AgentDisplay.profileDisplayName(effectiveProfile),
+                        configScope = activeVoiceScope,
+                        outputEnabled = activeVoiceEnabled,
+                        fallbackEnabled = voiceOutputConfig?.fallback_enabled,
+                        onStartListening = { voiceViewModel.startListening() },
+                        onStopListening = { voiceViewModel.stopListening() },
+                        onInterrupt = { voiceViewModel.interruptSpeaking() },
+                        onPauseAutoMode = { voiceViewModel.pauseContinuousMode() },
+                        onReturnToHermes = {
+                            if (!openHermesFromOverlay(context)) voiceOverlayHost.exitVoiceSession()
+                        },
+                        onDismissOverlay = { voiceOverlayHost.exitVoiceSession() },
+                        onExit = { voiceViewModel.exitVoiceMode() },
+                    ),
+                    lifecycleOwner.lifecycle,
+                )
+                if (!shown) {
+                    scope.launch {
+                        snackbarHostState.showSnackbar(
+                            message = context.getString(R.string.chat_overlay_start_failed),
+                            duration = SnackbarDuration.Short,
+                        )
+                    }
+                }
+            },
+        )
+    }
 
     LaunchedEffect(voiceUiState.voiceMode) {
         if (!voiceUiState.voiceMode) {
@@ -1746,37 +1735,6 @@ fun ChatScreen(
         }
     }
 
-    DisposableEffect(
-        lifecycleOwner,
-        pendingVoiceOverlayPermission,
-        voiceUiState.voiceMode,
-        voiceOutputConfig,
-        realtimeAgentConfig,
-        voiceStats.voiceEngineMode,
-    ) {
-        val observer = LifecycleEventObserver { _, event ->
-            if (event == Lifecycle.Event.ON_RESUME && pendingVoiceOverlayPermission) {
-                when {
-                    voiceOverlayHost.hasOverlayPermission() && voiceUiState.voiceMode -> {
-                        showVoiceSystemOverlay()
-                    }
-                    !voiceOverlayHost.hasOverlayPermission() -> {
-                        pendingVoiceOverlayPermission = false
-                        scope.launch {
-                            snackbarHostState.showSnackbar(
-                                message = context.getString(R.string.chat_overlay_perm_denied),
-                                duration = SnackbarDuration.Short,
-                            )
-                        }
-                    }
-                    else -> pendingVoiceOverlayPermission = false
-                }
-            }
-        }
-        lifecycleOwner.lifecycle.addObserver(observer)
-        onDispose { lifecycleOwner.lifecycle.removeObserver(observer) }
-    }
-
     LaunchedEffect(voiceClient, voiceUiState.voiceMode, selectedProfile?.name) {
         if (!voiceUiState.voiceMode) return@LaunchedEffect
         val client = voiceClient ?: return@LaunchedEffect
@@ -2479,11 +2437,12 @@ fun ChatScreen(
         }
     }
     val selectedProfileKey = AgentDisplay.profileSessionKey(selectedProfile?.name)
-    val profileShelfAvailable = !supervised && ProfilePresentationPolicy.shouldShowShelf(
+    val profileShelfAvailable = !supervised && com.hermesandroid.relay.ui.components.ProfileShelfPolicy.choices(
         profiles = agentProfiles,
         presentation = profilePresentation,
-        selectedKey = selectedProfileKey,
-    )
+        selectedProfileName = selectedProfile?.name,
+        serverDefaultProfileName = serverDefaultDisplayProfile?.name,
+    ).size > 1
     val profileSwitchEnabled = com.hermesandroid.relay.ui.components.ProfileShelfPolicy.canSwitch(
         isStreaming = isStreaming,
         streamingEndpoint = chatViewModel.streamingEndpoint,
@@ -3256,8 +3215,8 @@ fun ChatScreen(
                 )
             }
             if (!supervised && showContextSheet) {
-                // Live audit of the exact extra context the agent will be
-                // injected with on the next turn (transparency / auditability).
+                // Snapshot of supported client context and separately reported
+                // server configuration, not a delivery receipt.
                 InjectedContextSheet(
                     context = remember(showContextSheet) {
                         chatViewModel.previewInjectedContext()

app/src/main/kotlin/com/hermesandroid/relay/ui/screens/DashboardManagementScreen.kt

@@ -4475,7 +4475,8 @@ internal fun summarizeObjectItem(
         )
     }
 
-    val title = obj.stringField("name")
+    val title = obj.stringField("display_name")?.takeIf(String::isNotBlank)
+        ?: obj.stringField("name")
         ?: obj.stringField("id")
         ?: obj.stringField("title")
         ?: fallbackTitle

app/src/main/kotlin/com/hermesandroid/relay/ui/screens/PermissionsStatusScreen.kt

@@ -86,6 +86,10 @@ fun PermissionsStatusScreen(
     onBack: () -> Unit,
     onOpenBridge: () -> Unit = {},
 ) {
+    var showVoiceOverlaySetup by remember { mutableStateOf(false) }
+    if (showVoiceOverlaySetup) com.hermesandroid.relay.voice.VoiceOverlaySetupDialog(
+        onDismiss = { showVoiceOverlaySetup = false },
+    )
     val context = LocalContext.current
     val lifecycleOwner = LocalLifecycleOwner.current
     var status by remember { mutableStateOf(AppPermissionStatusProbe.snapshot(context)) }
@@ -209,6 +213,21 @@ fun PermissionsStatusScreen(
                 )
             }
 
+            PermissionSection(
+                title = stringResource(R.string.voice_overlay_setup_title),
+                subtitle = stringResource(R.string.voice_overlay_settings_hint),
+            ) {
+                PermissionStatusRow(
+                    icon = Icons.Filled.PictureInPicture,
+                    title = stringResource(R.string.perms_display_over_apps),
+                    subtitle = stringResource(R.string.voice_overlay_setup_body),
+                    badge = stringResource(R.string.perms_badge_optional),
+                    statusLabel = optionalStatus(context, status.overlayPermitted),
+                    granted = status.overlayPermitted,
+                    onClick = { showVoiceOverlaySetup = true },
+                )
+            }
+
             if (BuildFlavor.isSideload) {
                 SideloadPermissionsSection(
                     status = status,

app/src/main/kotlin/com/hermesandroid/relay/ui/screens/SettingsScreen.kt

@@ -1287,7 +1287,7 @@ private fun ProfileLockDialog(
                     HorizontalDivider()
                     // Server default option.
                     ProfileLockOptionRow(
-                        label = stringResource(R.string.settings_server_default),
+                        label = stringResource(R.string.profile_follow_server_default),
                         secondary = stringResource(R.string.settings_use_default_profile),
                         selected = lockedIsServerDefault,
                         onSelect = { onLock(null) },

app/src/main/kotlin/com/hermesandroid/relay/ui/screens/VoiceSettingsScreen.kt

@@ -582,6 +582,7 @@ fun VoiceSettingsScreen(
                 }
 
                 VoiceSettingsSection.Listening -> {
+                    com.hermesandroid.relay.voice.VoiceOverlaySettingsCard()
                     GlobalVoiceControlsCard(
                         voiceSettings = voiceSettings,
                         prefsRepo = prefsRepo,

app/src/main/kotlin/com/hermesandroid/relay/viewmodel/ChatViewModel.kt

@@ -9667,8 +9667,8 @@ class ChatViewModel : ViewModel() {
      *  0. **Gateway transport** — the server owns the persona end-to-end: the
      *     session is bound to the selected profile (SOUL applied server-side) and
      *     the personality overlay rides `config.set`/`ephemeral_system_prompt`.
-     *     The phone sends NO persona/profile prompt (only the phone-status block)
-     *     so it can't double-apply. Cases 1–3 are the SSE-fallback rules.
+     *     The phone sends no per-turn system context on Gateway.
+     *     Cases 1–3 are the explicit API-only transport rules.
      *  1. **Selected profile with a non-blank [Profile.systemMessage]** —
      *     profile wins outright. Profile is a richer, newer concept than
      *     personality: it bundles model + persona (from the profile's
@@ -9683,15 +9683,12 @@ class ChatViewModel : ViewModel() {
      *     configured default.
      *
      * The phone-status [appContextSettings] block is appended to whichever
-     * of the above wins (or sent alone in case 3), so the LLM always sees
-     * phone state regardless of persona source.
+     * of the API-only cases above wins (or sent alone in case 3).
      */
     /**
-     * The exact `system_message` (`ephemeral_system_prompt`) injected for a
-     * turn, split into labeled blocks. Single source of truth shared by
-     * [startStream] (which sends [combinedSystemMessage]) and
-     * [previewInjectedContext] (which renders it in the chat audit sheet) so
-     * the preview can never drift from what is actually sent.
+     * Context prepared for the selected transport, split into labeled blocks.
+     * This is a preview, not a delivery receipt or the complete agent prompt.
+     * Gateway has no general per-turn system-context slot.
      */
     data class InjectedContext(
         val personaPrompt: String?,
@@ -9722,6 +9719,8 @@ class ChatViewModel : ViewModel() {
          * audit UI labels that block "added server-side".
          */
         val personaOwnedServerSide: Boolean,
+        /** False on Gateway; unsupported blocks are excluded from the payload and preview. */
+        val perTurnContextSupported: Boolean,
     )
 
     /**
@@ -9757,11 +9756,14 @@ class ChatViewModel : ViewModel() {
         } else {
             _sseToolNames.value
         }
-        val appContextRaw = buildPromptBlock(
-            settings = appContextSettings,
-            snapshot = capturePhoneSnapshot(),
-            availableTools = availableTools,
-        )
+        val appContextRaw = if (!gateway && appContextSettings.master) {
+            buildPromptBlock(
+                settings = appContextSettings,
+                snapshot = capturePhoneSnapshot(),
+                availableTools = availableTools,
+            )
+        } else null
+        val interfaceContext = interfaceContextPrompt?.takeIf { !gateway && it.isNotBlank() }
         // Gateway has no per-turn system slot. SSE carries the standard
         // Dashboard route first, then the optional Relay enhancement.
         val upstreamMediaAvailable = dashboardMediaClientProvider?.invoke() != null
@@ -9773,25 +9775,26 @@ class ChatViewModel : ViewModel() {
         // block (a stable environment fact, like phone status) and before the
         // per-turn interface context. The per-block fields below null out blanks
         // only for display.
-        val combined = listOfNotNull(personaPrompt, appContextRaw, mediaCapability, interfaceContextPrompt)
+        val combined = listOfNotNull(personaPrompt, appContextRaw, mediaCapability, interfaceContext)
             .joinToString("\n\n")
             .ifBlank { null }
         return InjectedContext(
             personaPrompt = personaPrompt,
             appContext = appContextRaw?.takeIf { it.isNotBlank() },
-            interfaceContext = interfaceContextPrompt?.takeIf { it.isNotBlank() },
+            interfaceContext = interfaceContext,
             mediaCapability = mediaCapability,
             relayServerBlocks = relayServerBlocks,
             relayMediaAvailable = relayMediaAvailable,
             combinedSystemMessage = combined,
             transport = streamingEndpoint,
             personaOwnedServerSide = gateway,
+            perTurnContextSupported = !gateway,
         )
     }
 
     /**
-     * Live audit snapshot of what the agent will be injected with on the next
-     * turn — rendered by the chat context sheet. Per-turn voice context is null
+     * Preview of context supported by the selected transport, plus separately
+     * reported Relay configuration. Per-turn voice context is null
      * here (it's set only on a spoken turn); the UI notes that.
      */
     fun previewInjectedContext(): InjectedContext {

app/src/main/kotlin/com/hermesandroid/relay/viewmodel/ConnectionViewModel.kt

@@ -2357,6 +2357,8 @@ class ConnectionViewModel(application: Application) : AndroidViewModel(applicati
         get() = profileController.effectiveSessionProfileName
     val effectiveDisplayProfile: StateFlow<Profile?>
         get() = profileController.effectiveDisplayProfile
+    val serverDefaultDisplayProfile: StateFlow<Profile?>
+        get() = profileController.serverDefaultDisplayProfile
 
     fun refreshDashboardProfiles() = profileController.refreshDashboardProfiles()
     fun refreshDeferredProfileMetadata() = profileController.refreshDeferredProfileMetadata()

app/src/main/kotlin/com/hermesandroid/relay/viewmodel/connection/ProfileController.kt

@@ -193,6 +193,13 @@ class ProfileController(
     private val _serverDefaultProfileScope = MutableStateFlow<DashboardProfileScope?>(null)
     val serverDefaultProfileScope: StateFlow<DashboardProfileScope?> =
         _serverDefaultProfileScope.asStateFlow()
+    /** Default identity independent of the explicit selection; never a routing override. */
+    val serverDefaultDisplayProfile: StateFlow<Profile?> = combine(
+        agentProfiles,
+        serverDefaultProfileScope,
+    ) { profiles, serverDefault ->
+        AgentDisplay.effectiveDisplayProfile(null, profiles, serverDefault?.active)
+    }.stateIn(scope, SharingStarted.Eagerly, null)
     private val _serverDefaultProfileSettled = MutableStateFlow(false)
 
     private fun pendingProfileNameForActiveConnection(): String? {
@@ -361,12 +368,8 @@ class ProfileController(
         activeConnectionId,
         selectedProfile,
         serverDefaultProfileScope,
-        _gatewayProfiles,
-    ) { connectionId, selected, serverDefault, gatewayProfiles ->
-        connectionId to (
-            selected?.name ?: serverDefault?.active
-                ?: gatewayProfiles.firstOrNull(Profile::isDefault)?.name
-        )
+    ) { connectionId, selected, serverDefault ->
+        connectionId to (selected?.name ?: serverDefault?.active)
     }
 
     /** Cached bytes fetched from Hermes; always preferred over the local fallback. */
@@ -398,12 +401,8 @@ class ProfileController(
     fun profileIconFlow(profileName: String?): Flow<String?> = combine(
         activeConnectionId,
         serverDefaultProfileScope,
-        _gatewayProfiles,
-    ) { connectionId, serverDefault, gatewayProfiles ->
-        connectionId to (
-            profileName ?: serverDefault?.active
-                ?: gatewayProfiles.firstOrNull(Profile::isDefault)?.name
-        )
+    ) { connectionId, serverDefault ->
+        connectionId to (profileName ?: serverDefault?.active)
     }
         .flatMapLatest { (connectionId, serverProfileName) ->
             if (connectionId == null) return@flatMapLatest flowOf(null)
@@ -1282,7 +1281,6 @@ class ProfileController(
 
     private fun resolveSharedAssetProfileName(): String? =
         resolveSessionProfileName()
-            ?: _gatewayProfiles.value.firstOrNull(Profile::isDefault)?.name
 
     private companion object {
         const val LOCAL_PROFILE_ICON_MAX_BYTES = 8_000_000

app/src/main/kotlin/com/hermesandroid/relay/voice/VoiceOverlayAccess.kt

@@ -0,0 +1,39 @@
+package com.hermesandroid.relay.voice
+
+import android.Manifest
+import android.app.KeyguardManager
+import android.app.NotificationManager
+import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
+import android.os.PowerManager
+import android.provider.Settings
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
+
+/** Permissions do not grant permission to start a session: a resumed UI action is also required. */
+data class VoiceOverlayAccess(
+    val microphone: Boolean,
+    val notifications: Boolean,
+    val overlay: Boolean,
+    val unlocked: Boolean,
+) {
+    val ready: Boolean get() = microphone && notifications && overlay && unlocked
+
+    companion object {
+        fun read(context: Context): VoiceOverlayAccess {
+            val manager = context.getSystemService(NotificationManager::class.java)
+            val channelEnabled = Build.VERSION.SDK_INT < Build.VERSION_CODES.O ||
+                manager?.getNotificationChannel(VoiceOverlayForegroundService.CHANNEL_ID)?.importance !=
+                NotificationManager.IMPORTANCE_NONE
+            return VoiceOverlayAccess(
+                microphone = ContextCompat.checkSelfPermission(context, Manifest.permission.RECORD_AUDIO) ==
+                    PackageManager.PERMISSION_GRANTED,
+                notifications = NotificationManagerCompat.from(context).areNotificationsEnabled() && channelEnabled,
+                overlay = Settings.canDrawOverlays(context),
+                unlocked = context.getSystemService(KeyguardManager::class.java)?.isKeyguardLocked == false &&
+                    context.getSystemService(PowerManager::class.java)?.isInteractive == true,
+            )
+        }
+    }
+}

app/src/main/kotlin/com/hermesandroid/relay/voice/VoiceOverlayForegroundService.kt

@@ -8,9 +8,13 @@ import android.app.PendingIntent
 import android.app.Service
 import android.content.Context
 import android.content.Intent
+import android.content.BroadcastReceiver
+import android.content.IntentFilter
 import android.content.pm.ServiceInfo
 import android.os.Build
 import android.os.IBinder
+import android.os.Handler
+import android.os.Looper
 import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
@@ -27,31 +31,84 @@ import com.hermesandroid.relay.R
  * execution state Android requires once [MainActivity] is backgrounded.
  */
 class VoiceOverlayForegroundService : Service() {
+    private var activeSessionId: Long? = null
+    private val handler = Handler(Looper.getMainLooper())
+    private val accessMonitor = object : Runnable {
+        override fun run() {
+            val id = activeSessionId ?: return
+            if (VoiceOverlayHost.peek()?.canContinue(id) != true) {
+                endSession()
+            } else {
+                // Notification channels can be disabled without a runtime-permission event.
+                handler.postDelayed(this, 1_000)
+            }
+        }
+    }
+    private val screenOffReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context?, intent: Intent?) {
+            if (intent?.action == Intent.ACTION_SCREEN_OFF) endSession()
+        }
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        ContextCompat.registerReceiver(this, screenOffReceiver, IntentFilter(Intent.ACTION_SCREEN_OFF),
+            ContextCompat.RECEIVER_NOT_EXPORTED)
+    }
+
     override fun onBind(intent: Intent?): IBinder? = null
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        startForegroundNotification()
+        val id = intent?.getLongExtra(EXTRA_SESSION_ID, -1L) ?: -1L
+        val host = VoiceOverlayHost.peek()
         if (intent?.action == ACTION_STOP) {
-            Log.i(TAG, "Notification stop requested")
-            VoiceOverlayHost.peek()?.exitVoiceSession()
-            stopForeground(STOP_FOREGROUND_REMOVE)
-            stopSelf()
+            if (id == activeSessionId) endSession()
+            else if (activeSessionId == null && host?.sessionId == null) stopSelfResult(startId)
+            return START_NOT_STICKY
+        }
+        // No sticky restart, unowned Intent, or stale callback can start a microphone session.
+        if (intent?.action != ACTION_START || host?.canStart(id) != true) {
+            if (host?.sessionId == id) host.exitVoiceSession(id)
+            if (activeSessionId == null) stopSelfResult(startId)
+            return START_NOT_STICKY
+        }
+        activeSessionId = id
+        if (!startForegroundNotification() || !host.onServiceReady(id)) {
+            endSession()
+        } else {
+            handler.removeCallbacks(accessMonitor)
+            handler.post(accessMonitor)
         }
         return START_NOT_STICKY
     }
 
     override fun onTaskRemoved(rootIntent: Intent?) {
         super.onTaskRemoved(rootIntent)
-        Log.i(TAG, "App task removed; closing voice overlay")
-        VoiceOverlayHost.peek()?.exitVoiceSession()
+        endSession()
+    }
+
+    private fun endSession() {
+        val id = activeSessionId
+        activeSessionId = null
+        handler.removeCallbacks(accessMonitor)
+        if (id != null) VoiceOverlayHost.peek()?.exitVoiceSession(id)
         stopForeground(STOP_FOREGROUND_REMOVE)
         stopSelf()
     }
 
+    override fun onDestroy() {
+        val id = activeSessionId
+        activeSessionId = null
+        handler.removeCallbacks(accessMonitor)
+        unregisterReceiver(screenOffReceiver)
+        if (id != null) VoiceOverlayHost.peek()?.exitVoiceSession(id)
+        super.onDestroy()
+    }
+
     @SuppressLint("ForegroundServiceType")
-    private fun startForegroundNotification() {
-        ensureChannel()
+    private fun startForegroundNotification(): Boolean {
         try {
+            ensureChannel()
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                 startForeground(
                     NOTIFICATION_ID,
@@ -63,9 +120,9 @@ class VoiceOverlayForegroundService : Service() {
             }
         } catch (t: Throwable) {
             Log.w(TAG, "Could not foreground voice overlay microphone service", t)
-            VoiceOverlayHost.peek()?.hide()
-            stopSelf()
+            return false
         }
+        return true
     }
 
     private fun buildNotification(): Notification {
@@ -76,8 +133,10 @@ class VoiceOverlayForegroundService : Service() {
         val openPending = PendingIntent.getActivity(this, 0, openIntent, pendingFlags)
         val stopPending = PendingIntent.getService(
             this,
-            1,
-            Intent(this, VoiceOverlayForegroundService::class.java).setAction(ACTION_STOP),
+            activeSessionId?.toInt() ?: 0,
+            Intent(this, VoiceOverlayForegroundService::class.java).setAction(ACTION_STOP)
+                .setData(android.net.Uri.parse("hermes-voice-overlay:stop/$activeSessionId"))
+                .putExtra(EXTRA_SESSION_ID, activeSessionId ?: -1L),
             pendingFlags,
         )
         return NotificationCompat.Builder(this, CHANNEL_ID)
@@ -93,6 +152,7 @@ class VoiceOverlayForegroundService : Service() {
             .setOnlyAlertOnce(true)
             .setPriority(NotificationCompat.PRIORITY_LOW)
             .setCategory(NotificationCompat.CATEGORY_SERVICE)
+            .setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
             .addAction(
                 0,
                 getString(R.string.voice_overlay_notification_stop),
@@ -123,14 +183,15 @@ class VoiceOverlayForegroundService : Service() {
         const val NOTIFICATION_ID = 4715
         const val ACTION_START = "com.hermesandroid.relay.voice.OVERLAY_MIC_START"
         const val ACTION_STOP = "com.hermesandroid.relay.voice.OVERLAY_MIC_STOP"
+        const val EXTRA_SESSION_ID = "voice_overlay_session_id"
 
-        fun start(context: Context): Boolean {
+        fun start(context: Context, sessionId: Long): Boolean {
             val appContext = context.applicationContext
             return runCatching {
                 ContextCompat.startForegroundService(
                     appContext,
                     Intent(appContext, VoiceOverlayForegroundService::class.java)
-                        .setAction(ACTION_START),
+                        .setAction(ACTION_START).putExtra(EXTRA_SESSION_ID, sessionId),
                 )
                 true
             }.getOrElse { error ->

app/src/main/kotlin/com/hermesandroid/relay/voice/VoiceOverlayHost.kt

@@ -22,6 +22,8 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.foundation.gestures.detectDragGestures
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -31,6 +33,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -81,6 +84,7 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleRegistry
 import androidx.lifecycle.ViewModelStore
 import androidx.lifecycle.ViewModelStoreOwner
@@ -153,21 +157,78 @@ class VoiceOverlayHost(context: Context) {
     private var overlayView: View? = null
     private var overlayOwner: VoiceOverlayLifecycleOwner? = null
     private var overlayParams: WindowManager.LayoutParams? = null
+    private var generation = android.os.SystemClock.elapsedRealtimeNanos()
+    internal var sessionId: Long? = null
+        private set
+    private var callerLifecycle: Lifecycle? = null
+    private val callerObserver = LifecycleEventObserver { _, event ->
+        when (event) {
+            // Keep microphone protection until the real Activity is foreground again.
+            Lifecycle.Event.ON_RESUME -> if (overlayView != null) handoffToApp()
+            Lifecycle.Event.ON_DESTROY -> exitVoiceSession()
+            else -> Unit
+        }
+    }
 
     fun hasOverlayPermission(): Boolean = Settings.canDrawOverlays(appContext)
 
+    fun show(session: VoiceOverlaySession, lifecycle: Lifecycle): Boolean {
+        if (!com.hermesandroid.relay.data.BuildFlavor.voiceSystemOverlay ||
+            !lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED) ||
+            !VoiceOverlayAccess.read(appContext).ready || !session.uiState.value.voiceMode
+        ) {
+            return false
+        }
+        if (sessionId != null) return true
+        val id = ++generation
+        sessionId = id
+        fun guarded(action: () -> Unit): () -> Unit = {
+            if (canContinue(id)) action() else exitVoiceSession(id)
+        }
+        sessionState.value = session.copy(
+            onStartListening = guarded(session.onStartListening),
+            onStopListening = guarded(session.onStopListening),
+            onInterrupt = guarded(session.onInterrupt),
+            onPauseAutoMode = guarded(session.onPauseAutoMode),
+            onReturnToHermes = guarded {
+                session.onReturnToHermes()
+                // Already foreground: no lifecycle transition is needed for a safe handoff.
+                if (sessionId == id &&
+                    callerLifecycle?.currentState?.isAtLeast(Lifecycle.State.RESUMED) == true
+                ) handoffToApp()
+            },
+            onExit = { exitVoiceSession(id) },
+            onDismissOverlay = { exitVoiceSession(id) },
+            onResetPosition = guarded { moveTo(24, 96) },
+        )
+        exitCallback = session.onExit
+        callerLifecycle = lifecycle
+        lifecycle.addObserver(callerObserver)
+        if (!VoiceOverlayForegroundService.start(appContext, id)) {
+            exitVoiceSession(id)
+            return false
+        }
+        return true
+    }
+
+    private var exitCallback: (() -> Unit)? = null
+
+    private fun handoffToApp() {
+        val id = sessionId ?: return
+        // A fast return from Android Settings must not bypass revocation teardown.
+        if (canContinue(id)) hide() else exitVoiceSession(id)
+    }
+
+    internal fun canStart(id: Long): Boolean = sessionId == id &&
+        callerLifecycle?.currentState?.isAtLeast(Lifecycle.State.RESUMED) == true && canContinue(id)
+
+    internal fun canContinue(id: Long): Boolean = sessionId == id &&
+        sessionState.value?.uiState?.value?.voiceMode == true && VoiceOverlayAccess.read(appContext).ready
+
+    /** Called only after startForeground succeeds; a queued service start is not readiness. */
     @SuppressLint("InflateParams")
-    fun show(session: VoiceOverlaySession): Boolean {
-        sessionState.value = session
-        if (!hasOverlayPermission()) {
-            Log.w(TAG, "show: SYSTEM_ALERT_WINDOW not granted")
-            return false
-        }
-        if (!VoiceOverlayForegroundService.start(appContext)) {
-            Log.w(TAG, "show: microphone foreground service could not start")
-            sessionState.value = null
-            return false
-        }
+    internal fun onServiceReady(id: Long): Boolean {
+        if (!canStart(id)) return false
         if (overlayView != null) return true
 
         val compose = ComposeView(appContext).apply {
@@ -191,9 +252,7 @@ class VoiceOverlayHost(context: Context) {
             WindowManager.LayoutParams.WRAP_CONTENT,
             overlayType(),
             WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or
-                WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or
-                WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN or
-                WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
+                WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL,
             PixelFormat.TRANSLUCENT,
         ).apply {
             gravity = Gravity.TOP or Gravity.START
@@ -205,8 +264,6 @@ class VoiceOverlayHost(context: Context) {
             .onFailure { Log.w(TAG, "addView(voice overlay) failed", it) }
             .isSuccess
         if (!added) {
-            sessionState.value = null
-            VoiceOverlayForegroundService.stop(appContext)
             overlayOwner?.stop()
             overlayOwner = null
             return false
@@ -214,10 +271,17 @@ class VoiceOverlayHost(context: Context) {
 
         overlayView = compose
         overlayParams = params
+        compose.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+            moveTo(params.x, params.y)
+        }
         return true
     }
 
     fun hide() {
+        sessionId = null
+        exitCallback = null
+        callerLifecycle?.removeObserver(callerObserver)
+        callerLifecycle = null
         val view = overlayView
         overlayView = null
         overlayParams = null
@@ -231,17 +295,29 @@ class VoiceOverlayHost(context: Context) {
         VoiceOverlayForegroundService.stop(appContext)
     }
 
-    fun exitVoiceSession() {
-        val onExit = sessionState.value?.onExit
+    fun exitVoiceSession(expectedId: Long? = sessionId) {
+        if (expectedId == null || sessionId != expectedId) return
+        val onExit = exitCallback
         hide()
         onExit?.invoke()
     }
 
     private fun moveBy(dx: Float, dy: Float) {
+        val params = overlayParams ?: return
+        moveTo(params.x + dx.roundToInt(), params.y + dy.roundToInt())
+    }
+
+    private fun moveTo(x: Int, y: Int) {
         val view = overlayView ?: return
         val params = overlayParams ?: return
-        params.x = (params.x + dx.roundToInt()).coerceAtLeast(0)
-        params.y = (params.y + dy.roundToInt()).coerceAtLeast(0)
+        val size = android.graphics.Point()
+        @Suppress("DEPRECATION")
+        wm.defaultDisplay.getSize(size)
+        val nextX = x.coerceIn(0, (size.x - view.width).coerceAtLeast(0))
+        val nextY = y.coerceIn(0, (size.y - view.height).coerceAtLeast(0))
+        if (params.x == nextX && params.y == nextY) return
+        params.x = nextX
+        params.y = nextY
         runCatching { wm.updateViewLayout(view, params) }
             .onFailure { Log.w(TAG, "updateViewLayout(voice overlay) failed", it) }
     }
@@ -280,10 +356,12 @@ data class VoiceOverlaySession(
     val onReturnToHermes: () -> Unit,
     val onDismissOverlay: () -> Unit,
     val onExit: () -> Unit,
+    val onResetPosition: () -> Unit = {},
+    val connectionLabel: String? = null,
 )
 
 @Composable
-private fun VoiceFloatingOverlayPill(
+internal fun VoiceFloatingOverlayPill(
     session: VoiceOverlaySession,
     onDragBy: (Float, Float) -> Unit,
 ) {
@@ -301,20 +379,31 @@ private fun VoiceFloatingOverlayPill(
         ?: stringResource(R.string.voice_overlay_label_default_profile)
     val stateText = voiceOverlayStateLabel(uiState.state)
     val overlayWidth = (LocalConfiguration.current.screenWidthDp - 24)
-        .coerceIn(280, 368)
+        .coerceIn(200, 368)
         .dp
 
     if (minimized) {
-        VoiceFloatingOverlayBubble(
-            uiState = uiState,
-            stateText = stateText,
-            onExpand = { minimized = false },
-            onStartListening = session.onStartListening,
-            onStopListening = session.onStopListening,
-            onInterrupt = session.onInterrupt,
-            onPauseAutoMode = session.onPauseAutoMode,
-            onDragBy = onDragBy,
-        )
+        Surface(
+            shape = RoundedCornerShape(24.dp),
+            color = MaterialTheme.colorScheme.surfaceContainerHigh,
+            contentColor = MaterialTheme.colorScheme.onSurface,
+        ) {
+            Column(horizontalAlignment = Alignment.CenterHorizontally) {
+                VoiceFloatingOverlayBubble(
+                    uiState = uiState,
+                    stateText = stateText,
+                    onExpand = { minimized = false },
+                    onStartListening = session.onStartListening,
+                    onStopListening = session.onStopListening,
+                    onInterrupt = session.onInterrupt,
+                    onPauseAutoMode = session.onPauseAutoMode,
+                    onDragBy = onDragBy,
+                )
+                TextButton(onClick = session.onExit) {
+                    Text(stringResource(R.string.voice_overlay_notification_stop))
+                }
+            }
+        }
         return
     }
 
@@ -329,6 +418,7 @@ private fun VoiceFloatingOverlayPill(
             },
         shape = RoundedCornerShape(28.dp),
         color = MaterialTheme.colorScheme.surfaceContainerHigh.copy(alpha = 0.98f),
+        contentColor = MaterialTheme.colorScheme.onSurface,
         tonalElevation = 8.dp,
         shadowElevation = 10.dp,
     ) {
@@ -382,7 +472,9 @@ private fun VoiceOverlayHeader(
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.spacedBy(10.dp),
     ) {
-        Box(modifier = Modifier.size(50.dp), contentAlignment = Alignment.Center) {
+        if (LocalConfiguration.current.screenWidthDp >= 360) Box(
+            modifier = Modifier.size(50.dp), contentAlignment = Alignment.Center,
+        ) {
             OverlayCircularWaveformRing(
                 amplitude = uiState.amplitude,
                 state = uiState.state,
@@ -396,21 +488,28 @@ private fun VoiceOverlayHeader(
             )
         }
         Column(modifier = Modifier.weight(1f)) {
+            Text(
+                text = listOfNotNull(session.connectionLabel, session.profileName).joinToString(" · "),
+                style = MaterialTheme.typography.labelSmall,
+                maxLines = 3,
+                overflow = TextOverflow.Ellipsis,
+            )
             Text(
                 text = stateText,
                 style = MaterialTheme.typography.labelLarge,
                 color = MaterialTheme.colorScheme.primary,
                 fontWeight = FontWeight.SemiBold,
             )
-            Text(
-                text = overlayPrimaryText(uiState, stateText),
+            val primaryText = overlayPrimaryText(uiState, stateText)
+            if (primaryText != stateText) Text(
+                text = primaryText,
                 style = MaterialTheme.typography.bodyMedium,
                 color = MaterialTheme.colorScheme.onSurface,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,
             )
         }
-        IconButton(onClick = onToggleExpanded, modifier = Modifier.size(38.dp)) {
+        IconButton(onClick = onToggleExpanded, modifier = Modifier.size(48.dp)) {
             Icon(
                 imageVector = if (expanded) Icons.Filled.ExpandLess else Icons.Filled.ExpandMore,
                 contentDescription = stringResource(
@@ -426,6 +525,9 @@ private fun VoiceOverlayHeader(
             onPauseAutoMode = session.onPauseAutoMode,
             size = 50.dp,
         )
+        IconButton(onClick = session.onExit, modifier = Modifier.size(48.dp)) {
+            Icon(Icons.Filled.Close, stringResource(R.string.voice_overlay_notification_stop))
+        }
     }
 }
 
@@ -439,7 +541,10 @@ private fun ExpandedVoiceOverlayBody(
     session: VoiceOverlaySession,
 ) {
     Column(
-        modifier = Modifier.padding(bottom = 8.dp),
+        modifier = Modifier
+            .heightIn(max = (LocalConfiguration.current.screenHeightDp - 120).coerceAtLeast(100).dp)
+            .verticalScroll(rememberScrollState())
+            .padding(bottom = 8.dp),
     ) {
         OverlayLinearWaveform(
             amplitude = uiState.amplitude,
@@ -502,31 +607,36 @@ private fun ExpandedVoiceOverlayBody(
         }
 
         HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.62f))
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 8.dp, vertical = 2.dp),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
+        val actions: @Composable (Modifier) -> Unit = { actionModifier ->
             VoiceOverlayAction(
                 icon = Icons.Filled.ExpandMore,
                 label = stringResource(R.string.voice_overlay_minimize),
                 onClick = onMinimize,
-                modifier = Modifier.weight(1f),
+                modifier = actionModifier,
             )
             VoiceOverlayAction(
-                icon = Icons.Filled.VisibilityOff,
-                label = stringResource(R.string.voice_overlay_hide),
-                onClick = session.onDismissOverlay,
-                modifier = Modifier.weight(1f),
+                icon = Icons.Filled.GraphicEq,
+                label = stringResource(R.string.voice_overlay_reset_position),
+                onClick = session.onResetPosition,
+                modifier = actionModifier,
             )
             VoiceOverlayAction(
                 icon = Icons.AutoMirrored.Filled.OpenInNew,
                 label = stringResource(R.string.voice_overlay_open_hermes),
                 onClick = session.onReturnToHermes,
-                modifier = Modifier.weight(1f),
+                modifier = actionModifier,
             )
         }
+        val actionContainer = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 2.dp)
+        val stackActions = androidx.compose.ui.platform.LocalDensity.current.fontScale > 1.2f &&
+            LocalConfiguration.current.screenWidthDp < 360
+        if (stackActions) {
+            Column(modifier = actionContainer) { actions(Modifier.fillMaxWidth()) }
+        } else {
+            Row(modifier = actionContainer, verticalAlignment = Alignment.CenterVertically) {
+                actions(Modifier.weight(1f))
+            }
+        }
     }
 }
 
@@ -570,7 +680,7 @@ private fun VoiceOverlayAction(
 ) {
     TextButton(
         onClick = onClick,
-        modifier = modifier.height(54.dp),
+        modifier = modifier.heightIn(min = 72.dp),
     ) {
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
@@ -584,7 +694,7 @@ private fun VoiceOverlayAction(
             Text(
                 text = label,
                 style = MaterialTheme.typography.labelSmall,
-                maxLines = 1,
+                maxLines = 2,
                 overflow = TextOverflow.Ellipsis,
             )
         }
@@ -1049,7 +1159,7 @@ private fun voiceEngineLabel(engineMode: String?): String = when (engineMode) {
         .replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }
 }
 
-fun openHermesFromOverlay(context: Context) {
+fun openHermesFromOverlay(context: Context): Boolean {
     val appContext = context.applicationContext
     val launchIntent = appContext.packageManager.getLaunchIntentForPackage(appContext.packageName)
         ?: Intent().setPackage(appContext.packageName)
@@ -1057,8 +1167,9 @@ fun openHermesFromOverlay(context: Context) {
         .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
         .addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
         .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
-    runCatching { appContext.startActivity(launchIntent) }
+    return runCatching { appContext.startActivity(launchIntent) }
         .onFailure { Log.w("VoiceOverlayHost", "return to Hermes failed", it) }
+        .isSuccess
 }
 
 private class VoiceOverlayLifecycleOwner :

app/src/main/kotlin/com/hermesandroid/relay/voice/VoiceOverlaySetupDialog.kt

@@ -0,0 +1,152 @@
+package com.hermesandroid.relay.voice
+
+import android.Manifest
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.provider.Settings
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Card
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.compose.LocalLifecycleOwner
+import com.hermesandroid.relay.R
+
+/** Settings and Voice Focus share the explanation; only Voice Focus supplies a start action. */
+@Composable
+fun VoiceOverlaySetupDialog(
+    onDismiss: () -> Unit,
+    onStart: (() -> Unit)? = null,
+    onBeforePermission: () -> Unit = {},
+) {
+    val context = LocalContext.current
+    val lifecycle = LocalLifecycleOwner.current.lifecycle
+    var access by remember { mutableStateOf(VoiceOverlayAccess.read(context)) }
+    var requestedMicrophone by remember { mutableStateOf(false) }
+    var requestedNotifications by remember { mutableStateOf(false) }
+    var failed by remember { mutableStateOf(false) }
+    val permission = rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) {
+        access = VoiceOverlayAccess.read(context)
+    }
+    DisposableEffect(lifecycle) {
+        val observer = LifecycleEventObserver { _, event ->
+            if (event == Lifecycle.Event.ON_RESUME) access = VoiceOverlayAccess.read(context)
+        }
+        lifecycle.addObserver(observer)
+        onDispose { lifecycle.removeObserver(observer) }
+    }
+    fun open(intent: Intent) {
+        onBeforePermission()
+        failed = runCatching { context.startActivity(intent) }.isFailure
+    }
+    VoiceOverlaySetupContent(
+        access = access,
+        failed = failed,
+        onDismiss = onDismiss,
+        onStart = onStart?.let { start -> {
+            access = VoiceOverlayAccess.read(context)
+            if (access.ready && lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) start()
+        } },
+        onMicrophone = {
+            if (access.microphone || requestedMicrophone) {
+                open(Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, Uri.parse("package:${context.packageName}")))
+            } else {
+                onBeforePermission()
+                requestedMicrophone = true
+                permission.launch(Manifest.permission.RECORD_AUDIO)
+            }
+        },
+        onNotifications = {
+            if (Build.VERSION.SDK_INT >= 33 && !requestedNotifications &&
+                androidx.core.content.ContextCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) !=
+                android.content.pm.PackageManager.PERMISSION_GRANTED
+            ) {
+                onBeforePermission()
+                requestedNotifications = true
+                permission.launch(Manifest.permission.POST_NOTIFICATIONS)
+            } else {
+                open(Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS).putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName))
+            }
+        },
+        onOverlay = {
+            open(Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:${context.packageName}")))
+        },
+    )
+}
+
+@Composable
+internal fun VoiceOverlaySetupContent(
+    access: VoiceOverlayAccess,
+    failed: Boolean,
+    onDismiss: () -> Unit,
+    onStart: (() -> Unit)?,
+    onMicrophone: () -> Unit,
+    onNotifications: () -> Unit,
+    onOverlay: () -> Unit,
+) {
+    AlertDialog(
+        onDismissRequest = onDismiss,
+        title = { Text(stringResource(R.string.voice_overlay_setup_title)) },
+        text = {
+            Column(Modifier.verticalScroll(rememberScrollState()), verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                Text(stringResource(R.string.voice_overlay_setup_body))
+                AccessButton(R.string.perms_microphone, access.microphone, onMicrophone)
+                AccessButton(R.string.perms_app_notifications, access.notifications, onNotifications)
+                AccessButton(R.string.perms_display_over_apps, access.overlay, onOverlay)
+                if (onStart == null) Text(stringResource(R.string.voice_overlay_settings_hint))
+                if (failed) Text(stringResource(R.string.chat_overlay_start_failed), color = MaterialTheme.colorScheme.error)
+            }
+        },
+        confirmButton = {
+            if (onStart != null) TextButton(onClick = onStart, enabled = access.ready) {
+                Text(stringResource(R.string.voice_overlay_setup_start))
+            }
+        },
+        dismissButton = {
+            TextButton(onClick = onDismiss) { Text(stringResource(R.string.cw_cancel)) }
+        },
+    )
+}
+
+@Composable
+private fun AccessButton(@androidx.annotation.StringRes label: Int, granted: Boolean, onClick: () -> Unit) {
+    TextButton(onClick = onClick, modifier = Modifier.fillMaxWidth()) {
+        Text(stringResource(label) + " · " + stringResource(
+            if (granted) R.string.ncs_access_granted else R.string.chat_open_settings,
+        ))
+    }
+}
+
+@Composable
+fun VoiceOverlaySettingsCard() {
+    var show by remember { mutableStateOf(false) }
+    Card {
+        Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
+            Text(stringResource(R.string.voice_overlay_setup_title), style = MaterialTheme.typography.titleMedium)
+            Text(stringResource(R.string.voice_overlay_settings_hint))
+            TextButton(onClick = { show = true }) { Text(stringResource(R.string.onboarding_review_optional_permissions)) }
+        }
+    }
+    if (show) VoiceOverlaySetupDialog(onDismiss = { show = false })
+}

app/src/main/res/values-b+pt+BR/strings.xml

@@ -757,7 +757,7 @@
     <string name="chat_settings_notify_when_finishes">Alertas de chat em segundo plano</string>
     <string name="chat_settings_notify_when_finishes_desc">Notifique quando o Hermes precisar de uma resposta ou terminar em segundo plano</string>
     <string name="chat_settings_share_phone_status">Compartilhar o status do celular com o agente</string>
-    <string name="chat_settings_share_phone_status_desc">Inclua uma breve mensagem do sistema sobre o app e o celular em cada turno do chat</string>
+    <string name="chat_settings_share_phone_status_desc">Incluir contexto do app e do telefone em chats apenas por API. Não é enviado nos chats padrão do Gateway.</string>
     <string name="chat_settings_bridge_permissions">Bridge + permissões</string>
     <string name="chat_settings_bridge_permissions_desc">Se acessibilidade, captura de tela, sobreposição e notificações foram concedidas</string>
     <string name="chat_settings_foreground_app">App em primeiro plano</string>
@@ -766,7 +766,7 @@
     <string name="chat_settings_battery_level_desc">Porcentagem atual da bateria. Desativado por padrão.</string>
     <string name="chat_settings_safety_rails">Proteções de segurança</string>
     <string name="chat_settings_safety_rails_desc">Quantidade de itens bloqueados, quantidade de verbos destrutivos e temporizador de desativação automática</string>
-    <string name="chat_settings_preview">Prévia</string>
+    <string name="chat_settings_preview">Exemplo de chat apenas por API</string>
     <string name="chat_settings_no_system_message">(nenhuma mensagem do sistema será enviada)</string>
     <string name="chat_settings_parse_tool_annotations">Analisar anotações de ferramentas</string>
     <string name="chat_settings_experimental">Experimental</string>
@@ -3196,10 +3196,10 @@
     <string name="injected_context_phone_status_title">Status do celular</string>
     <string name="injected_context_relay_not_set">Nenhum relay configurado</string>
     <string name="injected_context_relay_title">Relay</string>
-    <string name="injected_context_subtitle">Contexto enviado com a próxima mensagem</string>
+    <string name="injected_context_subtitle">Prévia deste chat. O contexto do servidor é configurado separadamente.</string>
     <string name="injected_context_title">Contexto injetado</string>
     <string name="injected_context_turn_not_set">Não definido</string>
-    <string name="injected_context_turn_title">Modo de detecção de turno</string>
+    <string name="injected_context_turn_title">Contexto do turno</string>
     <string name="model_picker_cd_clear">Limpar</string>
     <string name="model_picker_count">%d modelos</string>
     <string name="power_feature_back_desc">Voltar</string>
@@ -4439,4 +4439,13 @@
     <string name="tool_progress_status_dispatched">Enviado</string>
     <string name="chat_activity_history_notice">Atividade registrada. As atualizações de progresso não são mantidas; o histórico disponível dos subagentes pode ser aberto somente para leitura.</string>
     <string name="chat_activity_output_unavailable">A saída não está mais disponível. Este registro preserva o estado registrado do processo.</string>
+    <string name="profile_follow_server_default">Seguir o perfil padrão do servidor</string>
+
+    <!-- User-started voice overlay, independent of Device Control. -->
+    <string name="voice_overlay_setup_title">Voz sobre outros apps</string>
+    <string name="voice_overlay_setup_body">Mantenha os controles de voz visíveis sobre outro app. O áudio vai para o servidor Hermes configurado. Isso não permite ler a tela nem controlar o telefone. Permita a exibição sobre outros apps nas configurações do Android e volte aqui. É necessária uma notificação do microfone com Parar voz. Fechar a sobreposição ou bloquear a tela encerra a sessão de voz.</string>
+    <string name="voice_overlay_setup_start">Iniciar sobreposição de voz</string>
+    <string name="voice_overlay_settings_hint">Opcional nas duas versões. Abra o foco de voz no Chat e escolha Sobreposição. As permissões sozinhas nunca iniciam a escuta.</string>
+    <string name="voice_overlay_reset_position">Redefinir posição</string>
+    <string name="injected_context_gateway_unsupported">Não é enviado no chat do Gateway. Esta conexão não oferece suporte a contexto adicional por turno.</string>
 </resources>

app/src/main/res/values-b+zh+Hans/strings.xml

@@ -796,7 +796,7 @@
     <string name="chat_settings_notify_when_finishes">后台聊天提醒</string>
     <string name="chat_settings_notify_when_finishes_desc">Hermes 在后台需要输入或完成回复时通知</string>
     <string name="chat_settings_share_phone_status">与代理分享手机状态</string>
-    <string name="chat_settings_share_phone_status_desc">每轮聊天附带一条关于应用和手机的简短系统消息</string>
+    <string name="chat_settings_share_phone_status_desc">在仅使用 API 的聊天中包含应用和手机上下文。标准 Gateway 聊天不会发送此内容。</string>
     <string name="chat_settings_bridge_permissions">Bridge + 权限</string>
     <string name="chat_settings_bridge_permissions_desc">无障碍、屏幕捕获、悬浮窗、通知是否已授权</string>
     <string name="chat_settings_foreground_app">前台应用</string>
@@ -805,7 +805,7 @@
     <string name="chat_settings_battery_level_desc">当前电池百分比。默认关闭。</string>
     <string name="chat_settings_safety_rails">安全护栏</string>
     <string name="chat_settings_safety_rails_desc">黑名单数量、破坏性动词数量和自动禁用计时器</string>
-    <string name="chat_settings_preview">预览</string>
+    <string name="chat_settings_preview">仅使用 API 的聊天示例</string>
     <string name="chat_settings_no_system_message">（不会发送系统消息）</string>
     <string name="chat_settings_parse_tool_annotations">解析工具标注</string>
     <string name="chat_settings_experimental">实验性</string>
@@ -3295,10 +3295,10 @@
     <string name="injected_context_phone_status_title">手机状态</string>
     <string name="injected_context_relay_not_set">未配置 Relay</string>
     <string name="injected_context_relay_title">Relay</string>
-    <string name="injected_context_subtitle">随下一条消息发送的上下文</string>
+    <string name="injected_context_subtitle">此聊天的预览。服务器端上下文单独配置。</string>
     <string name="injected_context_title">注入上下文</string>
     <string name="injected_context_turn_not_set">未设置</string>
-    <string name="injected_context_turn_title">轮换检测模式</string>
+    <string name="injected_context_turn_title">本轮上下文</string>
     <string name="model_picker_cd_clear">清空</string>
     <string name="model_picker_count">%d 个模型</string>
     <string name="power_feature_back_desc">返回</string>
@@ -4520,4 +4520,13 @@
     <string name="tool_progress_status_dispatched">已分派</string>
     <string name="chat_activity_history_notice">已记录的活动。进度更新不会保留；可用的子代理历史记录可以以只读方式打开。</string>
     <string name="chat_activity_output_unavailable">输出已不可用。此条目保留了记录的进程状态。</string>
+    <string name="profile_follow_server_default">跟随服务器默认配置</string>
+
+    <!-- User-started voice overlay, independent of Device Control. -->
+    <string name="voice_overlay_setup_title">在其他应用上使用语音</string>
+    <string name="voice_overlay_setup_body">在其他应用上保持语音控件可见。音频会发送到你配置的 Hermes 服务器。这不会授权读取屏幕或控制手机。请在 Android 设置中允许显示在其他应用上层，然后返回此处。必须启用带有停止操作的麦克风通知。关闭悬浮窗或锁定屏幕会结束语音会话。</string>
+    <string name="voice_overlay_setup_start">启动语音悬浮窗</string>
+    <string name="voice_overlay_settings_hint">两个版本均可选择使用。在聊天的语音专注模式中选择悬浮窗。仅授予权限不会开始监听。</string>
+    <string name="voice_overlay_reset_position">重置位置</string>
+    <string name="injected_context_gateway_unsupported">Gateway 聊天不会发送此内容。此连接不支持每轮附加上下文。</string>
 </resources>

app/src/main/res/values-de/strings.xml

@@ -799,7 +799,7 @@
     <string name="chat_settings_notify_when_finishes">Chat-Benachrichtigungen im Hintergrund</string>
     <string name="chat_settings_notify_when_finishes_desc">Benachrichtigen, wenn Hermes Eingaben benötigt oder im Hintergrund fertig wird</string>
     <string name="chat_settings_share_phone_status">Smartphone-Status mit Agent teilen</string>
-    <string name="chat_settings_share_phone_status_desc">Bei jedem Chatdurchlauf eine kurze Systemnachricht über App und Smartphone einfügen</string>
+    <string name="chat_settings_share_phone_status_desc">App- und Smartphone-Kontext in reinen API-Chats mitsenden. Wird in Standard-Gateway-Chats nicht gesendet.</string>
     <string name="chat_settings_bridge_permissions">Bridge + Berechtigungen</string>
     <string name="chat_settings_bridge_permissions_desc">Ob Bedienungshilfe, Bildschirmaufnahme, Overlay und Benachrichtigungen erlaubt sind</string>
     <string name="chat_settings_foreground_app">App im Vordergrund</string>
@@ -808,7 +808,7 @@
     <string name="chat_settings_battery_level_desc">Aktueller Akkustand in Prozent. Standardmäßig aus.</string>
     <string name="chat_settings_safety_rails">Schutzmechanismen</string>
     <string name="chat_settings_safety_rails_desc">Anzahl gesperrter Einträge und destruktiver Verben sowie Timer zur automatischen Deaktivierung</string>
-    <string name="chat_settings_preview">Vorschau</string>
+    <string name="chat_settings_preview">Beispiel für einen reinen API-Chat</string>
     <string name="chat_settings_no_system_message">(es wird keine Systemnachricht gesendet)</string>
     <string name="chat_settings_parse_tool_annotations">Werkzeughinweise auswerten</string>
     <string name="chat_settings_experimental">Experimentell</string>
@@ -3364,10 +3364,10 @@
     <string name="injected_context_phone_status_title">Smartphone-Status</string>
     <string name="injected_context_relay_not_set">Kein Relay konfiguriert</string>
     <string name="injected_context_relay_title">Relay</string>
-    <string name="injected_context_subtitle">Kontext, der mit der nächsten Nachricht gesendet wird</string>
+    <string name="injected_context_subtitle">Vorschau für diesen Chat. Serverseitiger Kontext wird separat konfiguriert.</string>
     <string name="injected_context_title">Eingefügter Kontext</string>
     <string name="injected_context_turn_not_set">Nicht festgelegt</string>
-    <string name="injected_context_turn_title">Modus zur Durchlauferkennung</string>
+    <string name="injected_context_turn_title">Nachrichtenkontext</string>
     <string name="model_picker_cd_clear">Leeren</string>
     <string name="model_picker_count">%d Modelle</string>
     <string name="power_feature_back_desc">Zurück</string>
@@ -4596,4 +4596,13 @@
     <string name="tool_progress_status_dispatched">Übergeben</string>
     <string name="chat_activity_history_notice">Gespeicherte Aktivität. Fortschrittsmeldungen werden nicht gespeichert; der verfügbare Verlauf der Unteragenten kann schreibgeschützt geöffnet werden.</string>
     <string name="chat_activity_output_unavailable">Die Ausgabe ist nicht mehr verfügbar. Dieser Eintrag enthält den gespeicherten Prozessstatus.</string>
+    <string name="profile_follow_server_default">Serverstandard folgen</string>
+
+    <!-- User-started voice overlay, independent of Device Control. -->
+    <string name="voice_overlay_setup_title">Sprache über anderen Apps</string>
+    <string name="voice_overlay_setup_body">Sprachsteuerung bleibt über anderen Apps sichtbar. Audio geht an deinen konfigurierten Hermes-Server. Dies erlaubt weder Bildschirmlesen noch Telefonsteuerung. Erlaube die Anzeige über anderen Apps in den Android-Einstellungen und kehre zurück. Eine Mikrofonbenachrichtigung mit Stopp-Aktion ist erforderlich. Schließen des Overlays oder Sperren des Bildschirms beendet die Sprachsitzung.</string>
+    <string name="voice_overlay_setup_start">Sprach-Overlay starten</string>
+    <string name="voice_overlay_settings_hint">In beiden Versionen optional. Öffne den Sprachfokus im Chat und wähle Overlay. Berechtigungen allein starten kein Zuhören.</string>
+    <string name="voice_overlay_reset_position">Position zurücksetzen</string>
+    <string name="injected_context_gateway_unsupported">Wird im Gateway-Chat nicht gesendet. Diese Verbindung unterstützt keinen zusätzlichen Kontext pro Nachricht.</string>
 </resources>

app/src/main/res/values-es/strings.xml

@@ -724,7 +724,7 @@
     <string name="chat_settings_notify_when_finishes">Alertas de chat en segundo plano</string>
     <string name="chat_settings_notify_when_finishes_desc">Notificar cuando Hermes necesite información o termine en segundo plano</string>
     <string name="chat_settings_share_phone_status">Compartir el estado del teléfono con el agente</string>
-    <string name="chat_settings_share_phone_status_desc">Incluya un breve mensaje del sistema sobre la aplicación y el teléfono en cada turno de chat.</string>
+    <string name="chat_settings_share_phone_status_desc">Incluir contexto de la app y el teléfono en chats solo por API. No se envía en los chats estándar de Gateway.</string>
     <string name="chat_settings_bridge_permissions">Bridge + permisos</string>
     <string name="chat_settings_bridge_permissions_desc">Si se concede accesibilidad, captura de pantalla, superposición o notificaciones</string>
     <string name="chat_settings_foreground_app">Aplicación en primer plano</string>
@@ -733,7 +733,7 @@
     <string name="chat_settings_battery_level_desc">Porcentaje de batería actual. Desactivado de forma predeterminada.</string>
     <string name="chat_settings_safety_rails">Barandillas de seguridad</string>
     <string name="chat_settings_safety_rails_desc">Recuento de listas de bloqueo, recuento de verbos destructivos y temporizador de desactivación automática</string>
-    <string name="chat_settings_preview">Avance</string>
+    <string name="chat_settings_preview">Ejemplo de chat solo por API</string>
     <string name="chat_settings_no_system_message">(no se enviará ningún mensaje del sistema)</string>
     <string name="chat_settings_parse_tool_annotations">Anotaciones de la herramienta de análisis</string>
     <string name="chat_settings_experimental">Experimental</string>
@@ -3028,10 +3028,10 @@
     <string name="injected_context_phone_status_title">Estado del teléfono</string>
     <string name="injected_context_relay_not_set">Ningún relay configurado</string>
     <string name="injected_context_relay_title">Relay</string>
-    <string name="injected_context_subtitle">Contexto enviado con el siguiente mensaje.</string>
+    <string name="injected_context_subtitle">Vista previa de este chat. El contexto del servidor se configura por separado.</string>
     <string name="injected_context_title">Contexto inyectado</string>
     <string name="injected_context_turn_not_set">No establecido</string>
-    <string name="injected_context_turn_title">Modo de detección de giro</string>
+    <string name="injected_context_turn_title">Contexto del turno</string>
     <string name="model_picker_cd_clear">Borrar</string>
     <string name="model_picker_count">Modelos %d</string>
     <string name="power_feature_back_desc">Atrás</string>
@@ -4287,4 +4287,13 @@
     <string name="tool_progress_status_dispatched">Enviado</string>
     <string name="chat_activity_history_notice">Actividad registrada. No se conservan las actualizaciones de progreso; el historial disponible de los subagentes se puede abrir en modo de solo lectura.</string>
     <string name="chat_activity_output_unavailable">La salida ya no está disponible. Esta entrada conserva el estado registrado del proceso.</string>
+    <string name="profile_follow_server_default">Seguir el perfil predeterminado del servidor</string>
+
+    <!-- User-started voice overlay, independent of Device Control. -->
+    <string name="voice_overlay_setup_title">Voz sobre otras apps</string>
+    <string name="voice_overlay_setup_body">Mantén los controles de voz visibles sobre otra app. El audio se envía a tu servidor Hermes configurado. Esto no permite leer la pantalla ni controlar el teléfono. Permite mostrar sobre otras apps en los ajustes de Android y vuelve aquí. Se requiere una notificación del micrófono con Detener voz. Cerrar la ventana o bloquear la pantalla termina la sesión de voz.</string>
+    <string name="voice_overlay_setup_start">Iniciar ventana de voz</string>
+    <string name="voice_overlay_settings_hint">Opcional en ambas versiones. Abre el enfoque de voz en Chat y elige Superposición. Los permisos por sí solos nunca inician la escucha.</string>
+    <string name="voice_overlay_reset_position">Restablecer posición</string>
+    <string name="injected_context_gateway_unsupported">No se envía en el chat de Gateway. Esta conexión no admite contexto adicional por turno.</string>
 </resources>

app/src/main/res/values-ja/strings.xml

@@ -796,7 +796,7 @@
     <string name="chat_settings_notify_when_finishes">バックグラウンドのチャット通知</string>
     <string name="chat_settings_notify_when_finishes_desc">バックグラウンドで Hermes が入力を必要としたとき、または完了したときに通知します</string>
     <string name="chat_settings_share_phone_status">電話のステータスをエージェントと共有する</string>
-    <string name="chat_settings_share_phone_status_desc">すべてのチャット ターンにアプリと電話に関する短いシステム メッセージを含めます</string>
+    <string name="chat_settings_share_phone_status_desc">API のみのチャットにアプリと端末のコンテキストを含めます。標準の Gateway チャットでは送信されません。</string>
     <string name="chat_settings_bridge_permissions">Bridge + 権限</string>
     <string name="chat_settings_bridge_permissions_desc">アクセシビリティ、画面キャプチャ、オーバーレイ、通知が許可されているかどうか</string>
     <string name="chat_settings_foreground_app">フォアグラウンドアプリ</string>
@@ -805,7 +805,7 @@
     <string name="chat_settings_battery_level_desc">現在のバッテリーのパーセント。デフォルトではオフです。</string>
     <string name="chat_settings_safety_rails">安全レール</string>
     <string name="chat_settings_safety_rails_desc">ブロックリストの数、破壊的な動詞の数、および自動無効化タイマー</string>
-    <string name="chat_settings_preview">プレビュー</string>
+    <string name="chat_settings_preview">API のみのチャットの例</string>
     <string name="chat_settings_no_system_message">(システムメッセージは送信されません)</string>
     <string name="chat_settings_parse_tool_annotations">解析ツールの注釈</string>
     <string name="chat_settings_experimental">実験的</string>
@@ -3371,10 +3371,10 @@
     <string name="injected_context_phone_status_title">電話のステータス</string>
     <string name="injected_context_relay_not_set">Relayが設定されていません</string>
     <string name="injected_context_relay_title">Relay</string>
-    <string name="injected_context_subtitle">次のメッセージで送信されるコンテキスト</string>
+    <string name="injected_context_subtitle">このチャットのプレビューです。サーバー側のコンテキストは別途設定されます。</string>
     <string name="injected_context_title">挿入されたコンテキスト</string>
     <string name="injected_context_turn_not_set">未設定</string>
-    <string name="injected_context_turn_title">回転検出モード</string>
+    <string name="injected_context_turn_title">ターンのコンテキスト</string>
     <string name="model_picker_cd_clear">クリア</string>
     <string name="model_picker_count">%d モデル</string>
     <string name="power_feature_back_desc">戻る</string>
@@ -4591,4 +4591,13 @@
     <string name="tool_progress_status_dispatched">ディスパッチ済み</string>
     <string name="chat_activity_history_notice">記録されたアクティビティです。進捗の更新は保存されません。利用可能なサブエージェントの履歴は読み取り専用で開けます。</string>
     <string name="chat_activity_output_unavailable">出力は利用できなくなりました。この項目には記録されたプロセスの状態が残っています。</string>
+    <string name="profile_follow_server_default">サーバーのデフォルトに従う</string>
+
+    <!-- User-started voice overlay, independent of Device Control. -->
+    <string name="voice_overlay_setup_title">他のアプリ上で音声を使用</string>
+    <string name="voice_overlay_setup_body">他のアプリ上に音声操作を表示します。音声は設定したHermesサーバーに送信されます。画面の読み取りや端末操作は許可されません。Androidの設定で他のアプリ上への表示を許可し、ここに戻ってください。停止操作付きのマイク通知が必要です。表示を閉じるか画面をロックすると音声セッションは終了します。</string>
+    <string name="voice_overlay_setup_start">音声オーバーレイを開始</string>
+    <string name="voice_overlay_settings_hint">両方のビルドで任意に利用できます。チャットの音声フォーカスでオーバーレイを選択します。権限の付与だけで録音は始まりません。</string>
+    <string name="voice_overlay_reset_position">位置をリセット</string>
+    <string name="injected_context_gateway_unsupported">Gateway チャットでは送信されません。この接続はターンごとの追加コンテキストに対応していません。</string>
 </resources>

app/src/main/res/values-ru/strings.xml

@@ -773,7 +773,7 @@
     <string name="chat_settings_notify_when_finishes">Уведомления о фоновом чате</string>
     <string name="chat_settings_notify_when_finishes_desc">Уведомлять, когда Гермес требует ввода или заканчивает работу, когда приложение находится в фоновом режиме</string>
     <string name="chat_settings_share_phone_status">Поделиться статусом телефона с агентом</string>
-    <string name="chat_settings_share_phone_status_desc">Включите короткое системное сообщение о приложении и телефоне в каждом обороте чата</string>
+    <string name="chat_settings_share_phone_status_desc">Добавлять контекст приложения и телефона в чаты только через API. В стандартных чатах Gateway он не отправляется.</string>
     <string name="chat_settings_bridge_permissions">Мост + разрешения</string>
     <string name="chat_settings_bridge_permissions_desc">Разрешения на доступность, захват экрана, наложение, уведомления</string>
     <string name="chat_settings_foreground_app">Приложение на переднем плане</string>
@@ -782,7 +782,7 @@
     <string name="chat_settings_battery_level_desc">Текущий процент заряда батареи. По умолчанию выключено.</string>
     <string name="chat_settings_safety_rails">Ограждения безопасности</string>
     <string name="chat_settings_safety_rails_desc">Количество в черном списке, количество деструктивных глаголов и таймер автоматического отключения</string>
-    <string name="chat_settings_preview">Предпросмотр</string>
+    <string name="chat_settings_preview">Пример чата только через API</string>
     <string name="chat_settings_no_system_message">(системное сообщение не будет отправлено)</string>
     <string name="chat_settings_parse_tool_annotations">Анализ аннотаций инструментов</string>
     <string name="chat_settings_experimental">Экспериментальные</string>
@@ -3234,10 +3234,10 @@
     <string name="injected_context_phone_status_title">Статус телефона</string>
     <string name="injected_context_relay_not_set">плагин Relay не настроен</string>
     <string name="injected_context_relay_title">плагин Relay</string>
-    <string name="injected_context_subtitle">Контекст отправляется с следующим сообщением</string>
+    <string name="injected_context_subtitle">Предпросмотр для этого чата. Контекст на стороне сервера настраивается отдельно.</string>
     <string name="injected_context_title">Внедренный контекст</string>
     <string name="injected_context_turn_not_set">Не установлено</string>
-    <string name="injected_context_turn_title">Режим обнаружения Turn</string>
+    <string name="injected_context_turn_title">Контекст хода</string>
     <string name="model_picker_cd_clear">Очистить</string>
     <string name="model_picker_count">%d моделей</string>
     <string name="power_feature_back_desc">Назад</string>
@@ -4335,4 +4335,13 @@
     <string name="tool_progress_status_dispatched">Отправлено</string>
     <string name="chat_activity_history_notice">Сохранённая активность. Обновления хода работы не сохраняются; доступную историю субагентов можно открыть только для чтения.</string>
     <string name="chat_activity_output_unavailable">Вывод больше недоступен. Эта запись сохраняет зафиксированное состояние процесса.</string>
+    <string name="profile_follow_server_default">Следовать профилю сервера по умолчанию</string>
+
+    <!-- User-started voice overlay, independent of Device Control. -->
+    <string name="voice_overlay_setup_title">Голос поверх других приложений</string>
+    <string name="voice_overlay_setup_body">Голосовые элементы управления видны поверх другого приложения. Аудио отправляется на настроенный сервер Hermes. Это не разрешает чтение экрана или управление телефоном. Разрешите показ поверх приложений в настройках Android и вернитесь сюда. Требуется уведомление микрофона с кнопкой остановки. Закрытие окна или блокировка экрана завершает голосовой сеанс.</string>
+    <string name="voice_overlay_setup_start">Начать голосовой оверлей</string>
+    <string name="voice_overlay_settings_hint">Необязательно в обеих сборках. Откройте голосовой фокус в чате и выберите оверлей. Одни разрешения никогда не включают прослушивание.</string>
+    <string name="voice_overlay_reset_position">Сбросить положение</string>
+    <string name="injected_context_gateway_unsupported">Не отправляется в чате Gateway. Это подключение не поддерживает дополнительный контекст для каждого хода.</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -882,7 +882,7 @@
     <string name="chat_settings_notify_when_finishes">Background chat alerts</string>
     <string name="chat_settings_notify_when_finishes_desc">Notify when Hermes needs input or finishes while the app is in the background</string>
     <string name="chat_settings_share_phone_status">Share phone status with agent</string>
-    <string name="chat_settings_share_phone_status_desc">Include a short system message about the app and phone on every chat turn</string>
+    <string name="chat_settings_share_phone_status_desc">Include app and phone context in API-only chats. Not sent in standard Gateway chats.</string>
     <string name="chat_settings_bridge_permissions">Bridge + permissions</string>
     <string name="chat_settings_bridge_permissions_desc">Whether accessibility, screen capture, overlay, notifications are granted</string>
     <string name="chat_settings_foreground_app">Foreground app</string>
@@ -891,7 +891,7 @@
     <string name="chat_settings_battery_level_desc">Current battery percent. Off by default.</string>
     <string name="chat_settings_safety_rails">Safety rails</string>
     <string name="chat_settings_safety_rails_desc">Blocklist count, destructive-verb count, and auto-disable timer</string>
-    <string name="chat_settings_preview">Preview</string>
+    <string name="chat_settings_preview">Example for API-only chat</string>
     <string name="chat_settings_no_system_message">(no system message will be sent)</string>
     <string name="chat_settings_parse_tool_annotations">Parse tool annotations</string>
     <string name="chat_settings_experimental">Experimental</string>
@@ -3764,10 +3764,10 @@
     <string name="injected_context_phone_status_title">Phone status</string>
     <string name="injected_context_relay_not_set">No relay configured</string>
     <string name="injected_context_relay_title">Relay</string>
-    <string name="injected_context_subtitle">Context sent with next message</string>
+    <string name="injected_context_subtitle">Preview for this chat. Server-side context is configured separately.</string>
     <string name="injected_context_title">Injected context</string>
     <string name="injected_context_turn_not_set">Not set</string>
-    <string name="injected_context_turn_title">Turn detection mode</string>
+    <string name="injected_context_turn_title">Turn context</string>
     <string name="model_picker_cd_clear">Clear</string>
     <string name="model_picker_count">%d models</string>
     <string name="power_feature_back_desc">Back</string>
@@ -4654,4 +4654,13 @@
     <string name="dev_message_retry_result" translatable="false">Preview retry selected — no request sent.</string>
     <string name="dev_message_clear" translatable="false">Clear previews</string>
     <string name="dev_message_clear_desc" translatable="false">Dismiss only these samples; real app messages are preserved.</string>
+    <string name="profile_follow_server_default">Follow server default</string>
+
+    <!-- User-started voice overlay, independent of Device Control. -->
+    <string name="voice_overlay_setup_title">Voice over other apps</string>
+    <string name="voice_overlay_setup_body">Keep voice controls visible while using another app. Audio goes to your configured Hermes server. This does not grant screen reading or phone control. Allow display over other apps in Android Settings, then return here. A microphone notification with Stop voice is required. Closing the overlay or locking the screen ends this voice session.</string>
+    <string name="voice_overlay_setup_start">Start voice overlay</string>
+    <string name="voice_overlay_settings_hint">Optional in both builds. Open Voice Focus in Chat and choose Overlay to start. Permissions alone never start listening.</string>
+    <string name="voice_overlay_reset_position">Reset position</string>
+    <string name="injected_context_gateway_unsupported">Not sent in Gateway chat. This connection does not support extra per-turn context.</string>
 </resources>

app/src/sideload/AndroidManifest.xml

@@ -17,11 +17,10 @@
     <!--
         Tier C (C1-C4) sideload-only permissions.
 
-        These are deliberately NOT declared in the main manifest: Google Play
-        policy forbids CALL_PHONE / SEND_SMS / READ_CONTACTS without a default-
-        dialer / default-SMS-app justification, and ACCESS_FINE_LOCATION is
-        flagged alongside auto-dial on the `googlePlay` track. The `sideload`
-        flavor is the only track that ships them.
+        These are deliberately kept outside Play's voice-only capability surface.
+        SMS permissions require an eligible default-handler/approved use on Play;
+        contacts, foreground location and CALL_PHONE have distinct requirements.
+        Their omission here is a product boundary, not a blanket permission ban.
 
         Each of the four `android_*` tools (location, search_contacts, call,
         send_sms) runtime-checks the corresponding permission in

app/src/test/kotlin/com/hermesandroid/relay/data/AgentDisplayTest.kt

@@ -43,13 +43,13 @@ class AgentDisplayTest {
     }
 
     @Test
-    fun effectiveDisplayProfile_usesDefaultProfileForDisplayOnly() {
+    fun effectiveDisplayProfile_doesNotAssumeRootWhenScopeIsUnknown() {
         val effective = AgentDisplay.effectiveDisplayProfile(
             selectedProfile = null,
             profiles = listOf(mizu, defaultProfile),
         )
 
-        assertEquals(defaultProfile, effective)
+        assertNull(effective)
     }
 
     @Test
@@ -86,7 +86,7 @@ class AgentDisplayTest {
     fun agentName_usesProfileNameNotVerboseDescription() {
         // The name slot shows the NAME, even when a (verbose) description exists.
         assertEquals(
-            "Mizu",
+            "mizu",
             AgentDisplay.agentName(
                 profile = mizu.copy(description = "Builds and maintains the codebase"),
                 selectedPersonality = "friendly",
@@ -96,7 +96,7 @@ class AgentDisplayTest {
         )
 
         assertEquals(
-            "Coder",
+            "coder",
             AgentDisplay.agentName(
                 profile = mizu.copy(name = "coder", description = ""),
                 selectedPersonality = "friendly",
@@ -107,11 +107,11 @@ class AgentDisplayTest {
     }
 
     @Test
-    fun agentName_usesConciseDefaultDescriptionNotVerboseSummary() {
+    fun agentName_usesDisplayNameAndNeverInfersIdentityFromDescription() {
         assertEquals(
             "Victor",
             AgentDisplay.agentName(
-                profile = defaultProfile.copy(description = "victor"),
+                profile = defaultProfile.copy(displayName = "Victor", description = "Summary"),
                 selectedPersonality = "default",
                 defaultPersonality = "",
                 connectionLabel = "Lab",
@@ -119,7 +119,7 @@ class AgentDisplayTest {
         )
 
         assertEquals(
-            "Lab",
+            "default",
             AgentDisplay.agentName(
                 profile = defaultProfile.copy(description = "Builds and maintains the codebase."),
                 selectedPersonality = "default",
@@ -175,7 +175,7 @@ class AgentDisplayTest {
             ),
         )
         assertEquals(
-            "Lab",
+            "Hermes",
             AgentDisplay.agentName(
                 profile = null,
                 selectedPersonality = "default",
@@ -218,7 +218,7 @@ class AgentDisplayTest {
             ),
         )
         assertEquals(
-            "Lab",
+            "Hermes",
             AgentDisplay.agentName(
                 profile = null,
                 selectedPersonality = "none",
@@ -255,6 +255,18 @@ class AgentDisplayTest {
         assertNull(AgentDisplay.effectiveSessionProfileName(null, null))
     }
 
+    @Test
+    fun confirmedDefaultKeepsItsNameWhileRosterLoadsAndDoesNotBorrowRootMetadata() {
+        val effective = AgentDisplay.effectiveDisplayProfile(null, listOf(defaultProfile), "victor")
+        assertEquals("victor", effective?.name)
+        assertEquals("victor", AgentDisplay.profileDisplayName(effective))
+        assertEquals("default", AgentDisplay.profileDisplayName(defaultProfile))
+        val victor = Profile("victor", "", displayName = "Victor")
+        assertEquals("Victor", AgentDisplay.profileDisplayName(
+            AgentDisplay.effectiveDisplayProfile(null, listOf(defaultProfile, victor), "victor")))
+        assertEquals(defaultProfile, AgentDisplay.effectiveDisplayProfile(defaultProfile, listOf(victor), "victor"))
+    }
+
     @Test
     fun displayModelName_hidesGenericApiAlias() {
         assertNull(AgentDisplay.displayModelName("hermes-agent"))

app/src/test/kotlin/com/hermesandroid/relay/data/ProfileSelectionStoreTest.kt

@@ -21,6 +21,22 @@ import kotlinx.coroutines.sync.withLock
  * raw DataStore shape that its Context constructor resolves in production.
  */
 class ProfileSelectionStoreTest {
+    @Test
+    fun restartedStoreRetainsIndependentDefaultAndNamedChoicesAcrossConnections() = runBlocking {
+        val data = InMemoryPreferencesDataStore()
+        val first = ProfileSelectionStore(data)
+        first.setSelectedProfile("a", AgentDisplay.SERVER_DEFAULT_PROFILE_KEY)
+        first.setSelectedProfile("b", "default")
+        first.setSelectedProfile("c", "victor")
+        val restarted = ProfileSelectionStore(data)
+        assertEquals(AgentDisplay.SERVER_DEFAULT_PROFILE_KEY, restarted.selectedProfileFlow("a").first())
+        assertEquals("default", restarted.selectedProfileFlow("b").first())
+        assertEquals("victor", restarted.selectedProfileFlow("c").first())
+        restarted.setSelectedProfile("a", "victor")
+        assertEquals("default", restarted.selectedProfileFlow("b").first())
+        assertEquals("victor", restarted.selectedProfileFlow("c").first())
+    }
+
 
     private val store = ProfileSelectionStore(InMemoryPreferencesDataStore())
 

app/src/test/kotlin/com/hermesandroid/relay/network/upstream/DashboardApiClientTest.kt

@@ -1070,6 +1070,18 @@ class DashboardApiClientTest {
         assertEquals("claude-opus-4-8", profiles[1].model)
     }
 
+    @Test
+    fun listProfiles_keepsDisplayIdentitySeparateAndAcceptsUnconfiguredRoot() = runTest {
+        server.enqueue(MockResponse().setHeader("Content-Type", "application/json").setBody(
+            """{"profiles":[{"name":"default","model":null,"is_default":true},
+                {"name":"guide","model":"model","display_name":"Guide","description":"Summary"}]}"""))
+        val profiles = DashboardApiClient(baseUrl = server.url("/").toString()).listProfiles().getOrThrow()
+        assertEquals(listOf("default", "guide"), profiles.map { it.name })
+        assertEquals("", profiles[0].model)
+        assertEquals("Guide", profiles[1].displayName)
+        assertEquals("Summary", profiles[1].description)
+    }
+
     @Test
     fun listProfiles_parsesObjectMapShapeWithInjectedName() = runTest {
         server.enqueue(

app/src/test/kotlin/com/hermesandroid/relay/network/upstream/GatewayChatClientTest.kt

@@ -197,6 +197,7 @@ class GatewayClientHarness(
             put("model", "gpt-5.6")
             put("provider", "openai")
             put("description", "Android operator")
+            put("display_name", "Guide")
             put("skill_count", 3)
             put("has_avatar", true)
             put("ui_meta", buildJsonObject { put("accent", "#ff5500") })
@@ -1009,6 +1010,7 @@ class GatewayChatClientTest {
 
         assertEquals(1, profiles.size)
         assertEquals("operator", profiles.single().name)
+        assertEquals("Guide", profiles.single().displayName)
         assertEquals("openai", profiles.single().provider)
         assertTrue(profiles.single().hasAvatar)
         assertEquals("#ff5500", (profiles.single().uiMeta["accent"] as JsonPrimitive).content)

app/src/test/kotlin/com/hermesandroid/relay/screenshots/InjectedContextSheetTest.kt

@@ -0,0 +1,52 @@
+package com.hermesandroid.relay.screenshots
+
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onAllNodesWithText
+import androidx.compose.ui.test.assertCountEquals
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.onRoot
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.github.takahirom.roborazzi.captureRoboImage
+import com.hermesandroid.relay.ui.components.InjectedContextSheet
+import com.hermesandroid.relay.ui.theme.HermesRelayTheme
+import com.hermesandroid.relay.viewmodel.ChatViewModel
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.GraphicsMode
+
+@RunWith(AndroidJUnit4::class)
+@GraphicsMode(GraphicsMode.Mode.NATIVE)
+@Config(sdk = [34], qualifiers = "w360dp-h720dp-xhdpi")
+class InjectedContextSheetTest {
+    @get:Rule val compose = createComposeRule()
+
+    @Test
+    fun gatewayPreviewLabelsUnsupportedContextWithoutShowingPhonePreamble() {
+        showPreview("gateway")
+        compose.onAllNodesWithText(
+            "Not sent in Gateway chat. This connection does not support extra per-turn context.",
+        ).assertCountEquals(2)
+        compose.onNodeWithText("Hermes-Relay Android app", substring = true).assertDoesNotExist()
+        compose.onNodeWithText("Server-side persona").assertExists()
+        compose.onRoot().captureRoboImage("build/ui-regression/injected-context-gateway.png")
+    }
+
+    @Test
+    fun apiOnlyPreviewShowsThePreparedMobileContext() {
+        showPreview("sessions")
+        compose.onNodeWithText("Hermes-Relay Android app", substring = true).assertExists()
+        compose.onNodeWithText("Not sent in Gateway chat", substring = true).assertDoesNotExist()
+        compose.onRoot().captureRoboImage("build/ui-regression/injected-context-api.png")
+    }
+
+    private fun showPreview(endpoint: String) {
+        val preview = ChatViewModel().apply { streamingEndpoint = endpoint }.previewInjectedContext()
+        compose.setContent {
+            HermesRelayTheme(appThemeId = "hermes-relay", themePreference = "dark") {
+                InjectedContextSheet(context = preview, onDismiss = {})
+            }
+        }
+    }
+}

app/src/test/kotlin/com/hermesandroid/relay/screenshots/ProfileIdentityScreenshotTest.kt

@@ -0,0 +1,91 @@
+package com.hermesandroid.relay.screenshots
+
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onRoot
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.onAllNodesWithText
+import androidx.compose.ui.test.assertCountEquals
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsOn
+import androidx.compose.ui.test.assertIsOff
+import androidx.compose.ui.test.assertIsSelected
+import androidx.compose.ui.test.assertHeightIsAtLeast
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performScrollTo
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.dp
+import org.junit.Assert.assertEquals
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.github.takahirom.roborazzi.captureRoboImage
+import com.hermesandroid.relay.data.Profile
+import com.hermesandroid.relay.data.ProfilePresentation
+import com.hermesandroid.relay.ui.components.ProfileSwitcherSheet
+import com.hermesandroid.relay.ui.theme.HermesRelayTheme
+import com.hermesandroid.relay.viewmodel.ConnectionViewModel
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.flow.MutableStateFlow
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.GraphicsMode
+import org.robolectric.RuntimeEnvironment
+import java.io.File
+
+@RunWith(AndroidJUnit4::class)
+@GraphicsMode(GraphicsMode.Mode.NATIVE)
+@Config(qualifiers = "w360dp-h720dp-xhdpi")
+class ProfileIdentityScreenshotTest {
+    @get:Rule val compose = createComposeRule()
+
+    @Test fun profileSwitcher() = render("profile-switcher")
+
+    @Test fun enlargedText() = render("profile-switcher-large-text", fontScale = 1.5f)
+
+    @Test fun longName() = render("profile-switcher-long-name", fontScale = 1.5f,
+        displayName = "Research and planning assistant for the whole team")
+
+    @Test
+    @Config(qualifiers = "w720dp-h360dp-xhdpi")
+    fun landscape() = render("profile-switcher-landscape")
+
+    @Test
+    @Config(qualifiers = "w840dp-h720dp-xhdpi")
+    fun expanded() = render("profile-switcher-expanded")
+
+    private fun render(file: String, fontScale: Float = 1f, displayName: String = "Guide") {
+        RuntimeEnvironment.setFontScale(fontScale)
+        val agent = Profile(name = "guide", model = "example-model", displayName = displayName)
+        val vm = mockk<ConnectionViewModel>(relaxed = true)
+        every { vm.profileIconFlow(any()) } returns MutableStateFlow(null)
+        every { vm.serverDefaultDisplayProfile } returns MutableStateFlow(agent)
+        val selected = mutableStateOf<Profile?>(null)
+        compose.setContent {
+            HermesRelayTheme(appThemeId = "hermes-relay", themePreference = "dark") {
+                CompositionLocalProvider(LocalDensity provides Density(LocalDensity.current.density, fontScale)) {
+                    ProfileSwitcherSheet(vm, listOf(Profile("default", "root-model"), agent), selected.value,
+                        selected.value ?: agent, ProfilePresentation(), false, true, { selected.value = it }, {}, {})
+                }
+            }
+        }
+        compose.onAllNodesWithText(displayName, substring = false).assertCountEquals(1)
+        compose.onNodeWithText("Follow server default").assertIsDisplayed().assertIsOn()
+            .assertHeightIsAtLeast(48.dp)
+        val output = File("build/ui-evidence/$file.png")
+        output.parentFile?.mkdirs()
+        compose.onRoot().captureRoboImage(output.absolutePath)
+        compose.onNodeWithText("Follow server default").performClick()
+        compose.runOnIdle { assertEquals("guide", selected.value?.name) }
+        compose.onNodeWithText("Follow server default").assertIsOff()
+        compose.onNodeWithText("Follow server default").performClick()
+        compose.runOnIdle { assertEquals(null, selected.value) }
+        // Scrollable even in landscape or at enlarged text sizes.
+        compose.onNodeWithText("default", substring = false).performScrollTo().performClick()
+        compose.runOnIdle { assertEquals("default", selected.value?.name) }
+        compose.onNodeWithText("default", substring = false).assertIsSelected()
+    }
+}

app/src/test/kotlin/com/hermesandroid/relay/ui/components/ProfileShelfPolicyTest.kt

@@ -9,6 +9,30 @@ import org.junit.Assert.assertTrue
 import org.junit.Test
 
 class ProfileShelfPolicyTest {
+    @Test
+    fun resolvedDefaultGroupsOnlyExactIdentityAndRetainsSelectedRequestKey() {
+        val victor = Profile("victor", "", displayName = "Victor")
+        val duplicate = Profile("other", "", displayName = "Victor")
+        val roster = listOf(Profile("default", ""), victor, duplicate)
+        for (selected in listOf(null, "victor", "default", "other")) {
+            val choices = ProfileShelfPolicy.choices(roster, ProfilePresentation(), selected, "victor")
+            assertEquals(3, choices.size)
+            assertTrue(choices.any { ProfileShelfPolicy.isSelected(it, selected) })
+            assertTrue(choices.any { it.key == "default" })
+            assertTrue(choices.any { it.key == "other" })
+            val grouped = choices.first { it.isServerDefault || it.key == "victor" }
+            assertEquals(if (selected == "victor") "victor" else null, grouped.profile?.name)
+        }
+    }
+
+    @Test
+    fun unknownDefaultNeverCollapsesRootOrNamesWithMatchingLabels() {
+        val roster = listOf(Profile("default", ""), Profile("one", "", displayName = "Same"),
+            Profile("two", "", displayName = "Same"))
+        assertEquals(4, ProfileShelfPolicy.choices(roster, ProfilePresentation(), null).size)
+        assertEquals(4, ProfileShelfPolicy.choices(roster, ProfilePresentation(), null, "missing").size)
+    }
+
     private val profiles = listOf(
         Profile(name = "default", model = "root"),
         Profile(name = "alpha", model = "a"),

app/src/test/kotlin/com/hermesandroid/relay/viewmodel/ChatViewModelGatewayInboundTurnTest.kt

@@ -1736,6 +1736,24 @@ class ChatViewModelGatewayInboundTurnTest {
         assertEquals(false, gatewayClient.sessionModelProvider()?.fast)
     }
 
+    @Test
+    fun injectedContextPreviewMatchesBareGatewayPayload() {
+        viewModel.appContextSettings = com.hermesandroid.relay.util.AppContextSettings(
+            master = true, battery = true, currentApp = true,
+        )
+        val preview = viewModel.previewInjectedContext()
+        assertFalse(preview.perTurnContextSupported)
+        assertNull(preview.combinedSystemMessage)
+
+        viewModel.sendMessage("Keep this message unchanged")
+        gatewayHarness.awaitRpc("prompt.submit")
+        val submitted = gatewayHarness.rpcLog.last { it.first == "prompt.submit" }.second
+        assertEquals(JsonPrimitive("Keep this message unchanged"), submitted["text"])
+        assertFalse(submitted.containsKey("system_message"))
+        assertFalse(submitted.containsKey("surface"))
+        assertEquals(0, apiCompletionsRequestCount.get())
+    }
+
     @Test
     fun dashboardOnlyConnectionCanSendWithoutApiClient() {
         viewModel.updateGatewayClient(null)

app/src/test/kotlin/com/hermesandroid/relay/viewmodel/InjectedContextTest.kt

@@ -0,0 +1,63 @@
+package com.hermesandroid.relay.viewmodel
+
+import com.hermesandroid.relay.data.Profile
+import com.hermesandroid.relay.util.AppContextSettings
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [34])
+class InjectedContextTest {
+    @Test
+    fun gatewayPreviewExcludesPhoneContextEvenWhenSharingIsEnabled() {
+        val viewModel = ChatViewModel().apply {
+            streamingEndpoint = "gateway"
+            appContextSettings = AppContextSettings(master = true, battery = true, currentApp = true)
+            setSelectedProfileProvider { Profile(name = "writer", model = "test-model", systemMessage = "Profile persona") }
+        }
+
+        val preview = viewModel.previewInjectedContext()
+
+        assertFalse(preview.perTurnContextSupported)
+        assertTrue(preview.personaOwnedServerSide)
+        assertNull(preview.personaPrompt)
+        assertNull(preview.appContext)
+        assertNull(preview.interfaceContext)
+        assertNull(preview.mediaCapability)
+        assertNull(preview.combinedSystemMessage)
+    }
+
+    @Test
+    fun apiOnlyTransportsRetainOptedInPhoneContextAndMasterOffRemovesIt() {
+        for (endpoint in listOf("sessions", "runs", "completions")) {
+            val viewModel = ChatViewModel().apply { streamingEndpoint = endpoint }
+            val enabled = viewModel.previewInjectedContext()
+            assertTrue(enabled.perTurnContextSupported)
+            assertFalse(enabled.personaOwnedServerSide)
+            assertTrue(enabled.appContext!!.contains("Hermes-Relay Android app"))
+            assertEquals(enabled.appContext, enabled.combinedSystemMessage)
+
+            viewModel.appContextSettings = AppContextSettings(master = false, battery = true, currentApp = true)
+            val disabled = viewModel.previewInjectedContext()
+            assertNull(disabled.appContext)
+            assertNull(disabled.combinedSystemMessage)
+        }
+    }
+
+    @Test
+    fun changingTransportRebuildsPreviewWithoutChangingSharingPreference() {
+        val viewModel = ChatViewModel().apply { streamingEndpoint = "sessions" }
+        val apiPreview = viewModel.previewInjectedContext()
+        viewModel.streamingEndpoint = "gateway"
+        assertNull(viewModel.previewInjectedContext().appContext)
+        assertTrue(viewModel.appContextSettings.master)
+        viewModel.streamingEndpoint = "sessions"
+        assertEquals(apiPreview.appContext, viewModel.previewInjectedContext().appContext)
+    }
+}

app/src/test/kotlin/com/hermesandroid/relay/viewmodel/connection/ProfileControllerLockTest.kt

@@ -250,6 +250,48 @@ class ProfileControllerLockTest {
         Thread.sleep(100)
 
         assertEquals("newer", controller.effectiveSessionProfileName.value)
+        assertEquals("newer", awaitFlow(controller.serverDefaultDisplayProfile) { it?.name == "newer" }?.name)
+    }
+
+    @Test
+    fun connectionSwitchRejectsOldDefaultIdentity() {
+        dashboardUrl = "https://dashboard.example"
+        val started = CompletableDeferred<Unit>()
+        val old = CompletableDeferred<DashboardProfileScope>()
+        coEvery { dashboardClient.getActiveProfileScope() } coAnswers {
+            started.complete(Unit)
+            Result.success(old.await())
+        }
+        controller.refreshDashboardProfileScope()
+        runBlocking { withTimeout(5_000) { started.await() } }
+        controller.resetForConnectionSwitch()
+        activeConnectionId.value = "other-connection"
+        coEvery { dashboardClient.getActiveProfileScope() } returns Result.success(
+            DashboardProfileScope(active = "other", current = "default"))
+        controller.refreshDashboardProfileScope()
+        assertEquals("other", awaitFlow(controller.serverDefaultDisplayProfile) { it?.name == "other" }?.name)
+        old.complete(DashboardProfileScope(active = "victor", current = "default"))
+        assertEquals("other", awaitFlow(controller.effectiveSessionProfileName) { it == "other" })
+        assertNull(controller.selectedProfile.value)
+    }
+
+    @Test
+    fun unresolvedDefaultDoesNotBorrowRootAvatarFromGatewayRoster() = runBlocking {
+        gatewayClient = mockk(relaxed = true)
+        coEvery { gatewayClient!!.petInfo(any(), any()) } returns Result.failure(
+            IllegalStateException("Pet metadata temporarily unavailable"))
+        coEvery { gatewayClient!!.listProfiles() } returns Result.success(
+            listOf(literalDefault.copy(isDefault = true, hasAvatar = true)))
+        coEvery { gatewayClient!!.getProfileAvatar("default") } returns Result.failure(
+            IllegalStateException("Avatar temporarily unavailable"))
+        controller.refreshGatewayProfiles()
+        awaitFlow(controller.agentProfiles) { it.any { profile -> profile.name == "default" } }
+        controller.profileIconStore.setServerAvatar(connectionId, "default", "root-avatar.png")
+        assertNull(controller.profileIconFlow(null).first())
+        assertEquals("root-avatar.png", controller.profileIconFlow("default").first())
+        assertNull(controller.serverDefaultDisplayProfile.value)
+        controller.clearSharedProfileAvatar()
+        coVerify(exactly = 0) { gatewayClient!!.clearProfileAvatar(any()) }
     }
 
     @After
@@ -352,6 +394,7 @@ class ProfileControllerLockTest {
 
         assertEquals("pinned", awaitFlow(controller.effectiveSessionProfileName) { it == "pinned" })
         assertEquals(pinned, awaitFlow(controller.effectiveDisplayProfile) { it?.name == "pinned" })
+        assertEquals(pinned, awaitFlow(controller.serverDefaultDisplayProfile) { it?.name == "pinned" })
         assertEquals("default", controller.serverDefaultProfileScope.value?.current)
         assertTrue(awaitFlow(controller.selectionSettled) { it })
         runBlocking { controller.listProfileScopedSessions()?.getOrThrow() }

app/src/test/kotlin/com/hermesandroid/relay/voice/VoiceOverlayForegroundServiceTest.kt

@@ -0,0 +1,92 @@
+package com.hermesandroid.relay.voice
+
+import android.app.Application
+import android.content.Intent
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkObject
+import io.mockk.spyk
+import io.mockk.unmockkAll
+import io.mockk.verify
+import org.junit.After
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Robolectric
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.annotation.Config
+
+@RunWith(RobolectricTestRunner::class)
+@Config(application = Application::class, sdk = [35])
+class VoiceOverlayForegroundServiceTest {
+    private val host = mockk<VoiceOverlayHost>(relaxed = true)
+    private lateinit var service: VoiceOverlayForegroundService
+    @Before fun setup() {
+        mockkObject(VoiceOverlayHost.Companion)
+        every { VoiceOverlayHost.peek() } returns host
+        every { host.sessionId } returns 7L
+        every { host.canStart(7L) } returns true
+        every { host.canContinue(7L) } returns true
+        every { host.onServiceReady(7L) } returns true
+        service = Robolectric.buildService(VoiceOverlayForegroundService::class.java).create().get()
+    }
+    @After fun cleanup() { service.onDestroy(); unmockkAll() }
+    private fun command(action: String, id: Long = 7L) = Intent().setAction(action)
+        .putExtra(VoiceOverlayForegroundService.EXTRA_SESSION_ID, id)
+
+    @Test fun notificationIsPostedBeforeWindowReadiness() {
+        every { host.onServiceReady(7L) } answers {
+            assertNotNull(shadowOf(service).lastForegroundNotification)
+            true
+        }
+        service.onStartCommand(command(VoiceOverlayForegroundService.ACTION_START), 0, 1)
+        verify(exactly = 1) { host.onServiceReady(7L) }
+    }
+    @Test fun unownedOrRestartIntentNeverPromotesService() {
+        service.onStartCommand(null, 0, 1)
+        service.onStartCommand(command(VoiceOverlayForegroundService.ACTION_START, 8), 0, 2)
+        assertNull(shadowOf(service).lastForegroundNotification)
+        verify(exactly = 0) { host.onServiceReady(any()) }
+    }
+    @Test fun oldNotificationCannotStopCurrentSession() {
+        service.onStartCommand(command(VoiceOverlayForegroundService.ACTION_START), 0, 1)
+        service.onStartCommand(command(VoiceOverlayForegroundService.ACTION_STOP, 6), 0, 2)
+        verify(exactly = 0) { host.exitVoiceSession(any()) }
+        service.onStartCommand(command(VoiceOverlayForegroundService.ACTION_STOP), 0, 3)
+        verify(exactly = 1) { host.exitVoiceSession(7L) }
+    }
+    @Test fun windowFailureEndsVoiceInsteadOfLeavingUnprotectedCapture() {
+        every { host.onServiceReady(7L) } returns false
+        service.onStartCommand(command(VoiceOverlayForegroundService.ACTION_START), 0, 1)
+        verify(exactly = 1) { host.exitVoiceSession(7L) }
+    }
+    @Test fun taskRemovalEndsVoice() {
+        service.onStartCommand(command(VoiceOverlayForegroundService.ACTION_START), 0, 1)
+        service.onTaskRemoved(null)
+        verify(exactly = 1) { host.exitVoiceSession(7L) }
+    }
+
+    @Test fun permissionLossEndsVoiceAtTheNextAccessCheck() {
+        service.onStartCommand(command(VoiceOverlayForegroundService.ACTION_START), 0, 1)
+        every { host.canContinue(7L) } returns false
+        shadowOf(android.os.Looper.getMainLooper()).idle()
+        verify(exactly = 1) { host.exitVoiceSession(7L) }
+    }
+
+    @Test fun screenOffEndsVoiceWithoutWaitingForPolling() {
+        service.onStartCommand(command(VoiceOverlayForegroundService.ACTION_START), 0, 1)
+        service.sendBroadcast(Intent(Intent.ACTION_SCREEN_OFF))
+        shadowOf(android.os.Looper.getMainLooper()).idle()
+        verify(exactly = 1) { host.exitVoiceSession(7L) }
+    }
+
+    @Test fun failedForegroundPromotionNeverAttachesWindow() {
+        service = spyk(service)
+        every { service.startForeground(any(), any(), any()) } throws SecurityException("denied")
+        service.onStartCommand(command(VoiceOverlayForegroundService.ACTION_START), 0, 1)
+        verify(exactly = 0) { host.onServiceReady(any()) }
+        verify(exactly = 1) { host.exitVoiceSession(7L) }
+    }
+}

app/src/test/kotlin/com/hermesandroid/relay/voice/VoiceOverlayLifecycleTest.kt

@@ -0,0 +1,126 @@
+package com.hermesandroid.relay.voice
+
+import android.app.Application
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import com.hermesandroid.relay.viewmodel.VoiceUiState
+import io.mockk.every
+import io.mockk.mockkObject
+import io.mockk.unmockkAll
+import kotlinx.coroutines.flow.MutableStateFlow
+import org.junit.After
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+
+@RunWith(RobolectricTestRunner::class)
+@Config(application = Application::class, sdk = [35])
+class VoiceOverlayLifecycleTest {
+    private lateinit var host: VoiceOverlayHost
+    private val owner = object : LifecycleOwner {
+        override val lifecycle = LifecycleRegistry(this)
+    }
+    private var exits = 0
+    private var access = VoiceOverlayAccess(true, true, true, true)
+    private val state = MutableStateFlow(VoiceUiState(voiceMode = true))
+
+    @Before fun setup() {
+        mockkObject(VoiceOverlayAccess.Companion)
+        every { VoiceOverlayAccess.read(any()) } answers { access }
+        host = VoiceOverlayHost(RuntimeEnvironment.getApplication())
+        owner.lifecycle.currentState = Lifecycle.State.RESUMED
+    }
+    @After fun cleanup() { host.hide(); unmockkAll() }
+
+    private fun session() = VoiceOverlaySession(state, provider = null, model = null, voice = null,
+        profileName = "Test", configScope = null, outputEnabled = true, fallbackEnabled = false,
+        onStartListening = {}, onStopListening = {}, onInterrupt = {}, onPauseAutoMode = {},
+        onReturnToHermes = {}, onDismissOverlay = {}, onExit = { exits++ })
+
+    @Test fun backgroundCallerCannotCreateSession() {
+        owner.lifecycle.currentState = Lifecycle.State.STARTED
+        assertFalse(host.show(session(), owner.lifecycle))
+        assertNull(host.sessionId)
+    }
+
+    @Test fun missingAccessCannotCreateSession() {
+        listOf(access.copy(microphone = false), access.copy(notifications = false),
+            access.copy(overlay = false), access.copy(unlocked = false)).forEach {
+            access = it
+            assertFalse(host.show(session(), owner.lifecycle))
+            assertNull(host.sessionId)
+        }
+    }
+
+    @Test fun stopBeforeServiceReadyRejectsLateStartAndExitsOnce() {
+        assertTrue(host.show(session(), owner.lifecycle))
+        val id = host.sessionId!!
+        host.exitVoiceSession(id)
+        host.exitVoiceSession(id)
+        assertFalse(host.onServiceReady(id))
+        assertEquals(1, exits)
+    }
+
+    @Test fun oldStopAndReadyCannotAffectNewSession() {
+        host.show(session(), owner.lifecycle)
+        val old = host.sessionId!!
+        host.exitVoiceSession(old)
+        host.show(session(), owner.lifecycle)
+        val current = host.sessionId!!
+        host.exitVoiceSession(old)
+        assertFalse(host.onServiceReady(old))
+        assertEquals(current, host.sessionId)
+        assertTrue(host.canStart(current))
+        assertEquals(1, exits)
+    }
+
+    @Test fun lossOfForegroundBeforeServicePromotionFailsClosed() {
+        host.show(session(), owner.lifecycle)
+        owner.lifecycle.currentState = Lifecycle.State.STARTED
+        assertFalse(host.canStart(host.sessionId!!))
+    }
+
+    @Test fun revocationAndVoiceExitInvalidateActiveEligibility() {
+        host.show(session(), owner.lifecycle)
+        val id = host.sessionId!!
+        access = access.copy(overlay = false)
+        assertFalse(host.canContinue(id))
+        access = access.copy(overlay = true)
+        state.value = VoiceUiState(voiceMode = false)
+        assertFalse(host.canContinue(id))
+    }
+
+    @Test fun destroyedCallerEndsPendingSession() {
+        host.show(session(), owner.lifecycle)
+        owner.lifecycle.currentState = Lifecycle.State.DESTROYED
+        assertNull(host.sessionId)
+        assertEquals(1, exits)
+    }
+
+    @Test fun returningToResumedAppReleasesOverlayWithoutEndingVoice() {
+        host.show(session(), owner.lifecycle)
+        val id = host.sessionId!!
+        assertTrue(host.onServiceReady(id))
+        owner.lifecycle.currentState = Lifecycle.State.STARTED
+        assertTrue(host.canContinue(id))
+        owner.lifecycle.currentState = Lifecycle.State.RESUMED
+        assertNull(host.sessionId)
+        assertEquals(0, exits)
+        assertTrue(state.value.voiceMode)
+    }
+
+    @Test fun revocationBeforeResumeEndsVoiceInsteadOfHandingItBack() {
+        host.show(session(), owner.lifecycle)
+        assertTrue(host.onServiceReady(host.sessionId!!))
+        owner.lifecycle.currentState = Lifecycle.State.STARTED
+        access = access.copy(overlay = false)
+        owner.lifecycle.currentState = Lifecycle.State.RESUMED
+        assertNull(host.sessionId)
+        assertEquals(1, exits)
+    }
+}

app/src/test/kotlin/com/hermesandroid/relay/voice/VoiceOverlayPresentationTest.kt

@@ -0,0 +1,107 @@
+package com.hermesandroid.relay.voice
+
+import android.app.Application
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.ui.Modifier
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.test.*
+import androidx.compose.ui.test.junit4.v2.createComposeRule
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.dp
+import com.github.takahirom.roborazzi.captureRoboImage
+import com.hermesandroid.relay.ui.theme.HermesRelayTheme
+import com.hermesandroid.relay.viewmodel.VoiceUiState
+import kotlinx.coroutines.flow.MutableStateFlow
+import org.junit.Assert.assertEquals
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.GraphicsMode
+import java.io.File
+
+@RunWith(RobolectricTestRunner::class)
+@Config(application = Application::class, qualifiers = "w360dp-h720dp-xhdpi", sdk = [35])
+@GraphicsMode(GraphicsMode.Mode.NATIVE)
+class VoiceOverlayPresentationTest {
+    @get:Rule val compose = createComposeRule()
+
+    @Test fun missingPermissionKeepsStartDisabled() = setupDialog(false, 1f)
+    @Test fun grantedPermissionsStillRequireStart() = setupDialog(true, 1f)
+    @Test fun largeTextPermissionSetup() = setupDialog(true, 1.5f)
+
+    private fun setupDialog(granted: Boolean, scale: Float) {
+        org.robolectric.RuntimeEnvironment.setFontScale(scale)
+        compose.waitForIdle()
+        var starts = 0
+        compose.setContent {
+            HermesRelayTheme(appThemeId = "hermes-relay", themePreference = "dark") {
+                CompositionLocalProvider(LocalDensity provides Density(LocalDensity.current.density, scale)) {
+                    VoiceOverlaySetupContent(VoiceOverlayAccess(true, granted, granted, true), false,
+                        {}, { starts++ }, {}, {}, {})
+                }
+            }
+        }
+        val start = compose.onNodeWithText("Start voice overlay")
+        start.assertIsDisplayed()
+        assertEquals(0, starts)
+        if (granted) start.assertIsEnabled() else start.assertIsNotEnabled()
+        capture("setup-$granted-$scale")
+        compose.onNodeWithText("Display over other apps", substring = true).performScrollTo().assertIsDisplayed()
+        if (scale > 1f) capture("setup-large-text-scrolled")
+        if (granted) {
+            start.performClick()
+            compose.runOnIdle { assertEquals(1, starts) }
+        }
+    }
+
+    @Test fun stopRemainsReachableWhenMinimized() = overlay(1f)
+
+    @Test
+    @Config(qualifiers = "w320dp-h480dp-xhdpi")
+    fun narrowOverlayWithLargeText() = overlay(1.5f)
+
+    private fun overlay(scale: Float) {
+        org.robolectric.RuntimeEnvironment.setFontScale(scale)
+        compose.waitForIdle()
+        var exits = 0
+        val session = VoiceOverlaySession(MutableStateFlow(VoiceUiState(voiceMode = true)),
+            provider = null, model = null, voice = null, profileName = "Research", configScope = null,
+            outputEnabled = true, fallbackEnabled = false, onStartListening = {}, onStopListening = {},
+            onInterrupt = {}, onPauseAutoMode = {}, onReturnToHermes = {}, onDismissOverlay = {},
+            onExit = { exits++ }, connectionLabel = "Home server")
+        compose.mainClock.autoAdvance = false
+        compose.setContent {
+            HermesRelayTheme(appThemeId = "hermes-relay", themePreference = "dark") {
+                Box(Modifier.fillMaxSize()) {
+                    VoiceFloatingOverlayPill(session, { _, _ -> })
+                }
+            }
+        }
+        compose.onNodeWithContentDescription("Stop voice").assertIsDisplayed().assertHeightIsAtLeast(48.dp)
+        capture("overlay-compact-$scale")
+        compose.onNodeWithContentDescription("Expand voice controls")
+            .performSemanticsAction(androidx.compose.ui.semantics.SemanticsActions.OnClick) { it() }
+        compose.runOnIdle { androidx.compose.runtime.snapshots.Snapshot.sendApplyNotifications() }
+        compose.mainClock.advanceTimeByFrame()
+        compose.mainClock.advanceTimeBy(500)
+        capture("overlay-expanded-$scale")
+        compose.onNodeWithText("Minimize").performScrollTo()
+            .performSemanticsAction(androidx.compose.ui.semantics.SemanticsActions.OnClick) { it() }
+        compose.mainClock.advanceTimeBy(500)
+        compose.onNodeWithText("Stop voice").assertIsDisplayed()
+        capture("overlay-minimized-$scale")
+        compose.onNodeWithText("Stop voice")
+            .performSemanticsAction(androidx.compose.ui.semantics.SemanticsActions.OnClick) { it() }
+        compose.runOnIdle { assertEquals(1, exits) }
+    }
+
+    private fun capture(name: String) {
+        val file = File("build/ui-evidence/play-voice-$name.png")
+        file.parentFile?.mkdirs()
+        compose.onRoot().captureRoboImage(file.absolutePath)
+    }
+}

desktop/tray/scripts/desktop-ui-source-fingerprint.mjs

@@ -22,13 +22,24 @@ export const desktopUiScreenshotSourceFiles = Object.freeze([
 
 const binaryExtensions = new Set(['.png'])
 
+function normalizedSource(relativePath, bytes) {
+  if (binaryExtensions.has(extname(relativePath))) return bytes
+  const text = bytes.toString('utf8').replace(/\r\n?/g, '\n')
+  if (relativePath !== 'desktop/tray/package-lock.json') return Buffer.from(text, 'utf8')
+
+  // The screenshot fixture has fixed display versions. A release-only bump of
+  // the root package does not change it; dependency versions still affect rendering.
+  const lockfile = JSON.parse(text)
+  delete lockfile.version
+  if (lockfile.packages?.['']) delete lockfile.packages[''].version
+  return Buffer.from(JSON.stringify(lockfile), 'utf8')
+}
+
 export async function computeDesktopUiSourceFingerprint(repositoryRoot = defaultRepositoryRoot) {
   const hash = createHash('sha256')
   for (const relativePath of desktopUiScreenshotSourceFiles) {
     const bytes = await readFile(resolve(repositoryRoot, relativePath))
-    const normalized = binaryExtensions.has(extname(relativePath))
-      ? bytes
-      : Buffer.from(bytes.toString('utf8').replace(/\r\n?/g, '\n'), 'utf8')
+    const normalized = normalizedSource(relativePath, bytes)
     hash.update(relativePath)
     hash.update('\0')
     hash.update(normalized)
@@ -36,7 +47,7 @@ export async function computeDesktopUiSourceFingerprint(repositoryRoot = default
   }
   return {
     algorithm: 'sha256',
-    normalization: 'text-lf-v1',
+    normalization: 'text-lf-lockfile-root-version-v2',
     digest: hash.digest('hex'),
     files: [...desktopUiScreenshotSourceFiles]
   }

desktop/tray/scripts/desktop-ui-source-fingerprint.test.mjs

@@ -0,0 +1,68 @@
+import assert from 'node:assert/strict'
+import { mkdtemp, mkdir, readFile, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { basename, dirname, join, resolve } from 'node:path'
+import test from 'node:test'
+import { computeDesktopUiSourceFingerprint, desktopUiScreenshotSourceFiles } from './desktop-ui-source-fingerprint.mjs'
+
+async function fixture(t) {
+  const root = await mkdtemp(join(tmpdir(), 'hermes-desktop-fingerprint-'))
+  t.after(async () => {
+    assert.equal(dirname(resolve(root)), resolve(tmpdir()))
+    assert.ok(basename(root).startsWith('hermes-desktop-fingerprint-'))
+    await rm(root, { recursive: true, force: true })
+  })
+  for (const file of desktopUiScreenshotSourceFiles) {
+    const destination = join(root, file)
+    await mkdir(dirname(destination), { recursive: true })
+    await writeFile(destination, 'fixture\n')
+  }
+  const lockfile = {
+    name: '@hermes-relay/tray-ui', version: '0.4.0-beta.6', lockfileVersion: 3,
+    packages: {
+      '': { name: '@hermes-relay/tray-ui', version: '0.4.0-beta.6', dependencies: { react: '^19.0.0' } },
+      'node_modules/react': { version: '19.0.0', integrity: 'example-integrity' },
+    },
+  }
+  const saveLock = () => writeFile(join(root, 'desktop/tray/package-lock.json'), JSON.stringify(lockfile, null, 2))
+  await saveLock()
+  return { root, lockfile, saveLock, fingerprint: () => computeDesktopUiSourceFingerprint(root) }
+}
+
+test('root release versions do not invalidate fixed-version screenshots', async t => {
+  const f = await fixture(t)
+  const before = await f.fingerprint()
+  f.lockfile.version = '0.4.0-beta.7'
+  f.lockfile.packages[''].version = '0.4.0-beta.7'
+  await f.saveLock()
+  assert.deepEqual(await f.fingerprint(), before)
+})
+
+test('dependency versions and integrity remain fingerprinted', async t => {
+  const f = await fixture(t)
+  const before = (await f.fingerprint()).digest
+  f.lockfile.packages['node_modules/react'].version = '19.1.0'
+  await f.saveLock()
+  const changedVersion = (await f.fingerprint()).digest
+  assert.notEqual(changedVersion, before)
+  f.lockfile.packages['node_modules/react'].integrity = 'changed-integrity'
+  await f.saveLock()
+  assert.notEqual((await f.fingerprint()).digest, changedVersion)
+})
+
+test('production UI changes still invalidate screenshots', async t => {
+  const f = await fixture(t)
+  const before = (await f.fingerprint()).digest
+  await writeFile(join(f.root, 'desktop/tray/ui/App.tsx'), 'changed UI\n')
+  assert.notEqual((await f.fingerprint()).digest, before)
+})
+
+test('text line endings do not cause platform-only drift', async t => {
+  const f = await fixture(t)
+  const before = await f.fingerprint()
+  for (const file of desktopUiScreenshotSourceFiles.filter(file => !file.endsWith('.png'))) {
+    const path = join(f.root, file)
+    await writeFile(path, (await readFile(path, 'utf8')).replace(/\n/g, '\r\n'))
+  }
+  assert.deepEqual(await f.fingerprint(), before)
+})

docs/audits/2026-09-12-play-voice-overlay.md

@@ -0,0 +1,73 @@
+# Play voice overlay verification
+
+The Google Play build adds user-started voice controls over other apps. This
+does not enable Device Control, AccessibilityService, MediaProjection or phone
+utility permissions. Standard voice keeps the upstream Dashboard/Gateway path.
+
+## Session contract
+
+- Permission setup explains the purpose before launching Android Settings.
+  Permission grants do not start the overlay; Start requires a resumed, unlocked
+  app with microphone, overlay and notification access.
+- The microphone foreground service must successfully promote before the window
+  attaches. Session identifiers reject stale starts, readiness and Stop actions.
+- The existing voice runtime owns capture and microphone-release barriers. The
+  service creates no recorder. Stop/close, screen lock, task removal, permission
+  loss and failed startup terminate the voice session. Notification-channel
+  revocation is checked at most one second later while the service is running.
+- Returning to Hermes preserves foreground protection until the app resumes.
+  No overlay session is restored after process death or started by boot, Relay
+  commands or wake detection. Independent opt-in wake settings remain unchanged.
+
+## Host verification
+
+Run focused tests through the Windows Android lane:
+
+```powershell
+.\scripts\android-lane.ps1 gradle :app:testGooglePlayDebugUnitTest `
+  --tests '*VoiceOverlay*Test' --tests '*VoiceModeOverlayInteractionTest' `
+  --tests '*VoiceViewModelBargeInTest' --tests '*BargeInListenerShutdownRaceTest' `
+  --console=plain
+```
+
+The new session/service tests exercise foreground eligibility, missing/revoked
+access, stopped-before-ready sessions, old notification actions, failed foreground
+promotion/window attachment, screen-off and task removal. Existing voice tests
+cover the microphone handoff and shutdown race. The same new tests are included
+in the both-flavor on-demand focused preset.
+
+`scripts/check-android-capabilities.py` checks source overlays and the merged
+Play debug/release manifests. Its mutation tests reject transitive sensitive
+permissions, renamed accessibility services and exported overlay services.
+CI debug/release builds and Play preflight run this check.
+
+## Rendered controls
+
+These are production Compose components rendered by Robolectric/Roborazzi on
+API 35, with synthetic voice state. They are not physical microphone evidence.
+Normal layout is 360 × 720 dp; narrow layout is 320 × 480 dp with 150% font size.
+The permission dialog is also checked at 150%, including scrolling to the last
+permission row while Start/Cancel remain reachable.
+
+![Permission setup](assets/play-voice-overlay/setup.png)
+![Large text after scrolling](assets/play-voice-overlay/setup-large-text.png)
+![Compact overlay](assets/play-voice-overlay/compact.png)
+![Narrow overlay with large text](assets/play-voice-overlay/narrow.png)
+![Minimized overlay with Stop](assets/play-voice-overlay/minimized.png)
+
+## Release validation
+
+Physical-device tests and Play Console changes are separate release work. Before
+production, validate real repeated microphone turns after backgrounding on Android
+14–16, denial/revocation, task/process termination, screen lock, audio interruption,
+network loss and OEM window behavior. Use the Standard Phone API 36 emulator lane
+for the smallest relevant instrumentation run; device claims still require a real
+device. Do not install an APK or submit a test-track build without authorization.
+
+Update the microphone FGS declaration and demo for the actual Google Play package.
+`scripts/android-fgs-demo.py` defaults to that package and requires permissions to
+be granted manually before recording. Review Data Safety against real recipients,
+retention and any applicable exceptions. Publish the corresponding canonical and
+legacy privacy pages before stable preflight; the strengthened live checker
+deliberately rejects the old blanket no-screen-access policy. See the
+[submission requirements](../play-store-listing.md#voice-overlay-review-before-production).

docs/audits/2026-09-12-profile-identity.md

@@ -0,0 +1,96 @@
+# Android profile identity audit
+
+## Upstream contract
+
+Source inspection used clean upstream commit
+`b0c383cdf7d8e9e540087610324ec3bb89f3b250` from `NousResearch/hermes-agent`.
+
+- [`hermes_cli/profiles.py`](https://github.com/NousResearch/hermes-agent/blob/b0c383cdf7d8e9e540087610324ec3bb89f3b250/hermes_cli/profiles.py):
+  `default` is the reserved request name for the root Hermes home. Named profiles
+  resolve beneath the profiles directory. `is_default` marks that root row; it
+  does not identify the sticky selection. The active-profile marker is written
+  atomically, and selecting root removes the marker. Profile `display_name` is
+  presentation metadata in `profile.yaml`; renaming root changes that display
+  metadata rather than moving its home.
+- [`hermes_cli/web_routers/profiles.py`](https://github.com/NousResearch/hermes-agent/blob/b0c383cdf7d8e9e540087610324ec3bb89f3b250/hermes_cli/web_routers/profiles.py):
+  `/api/profiles` returns `name`, `display_name`, `description`, and `is_default`.
+  `/api/profiles/active` returns two different authorities: `active` is the sticky
+  choice for new invocations, while `current` describes the running Dashboard.
+- [`tui_gateway/methods_profiles.py`](https://github.com/NousResearch/hermes-agent/blob/b0c383cdf7d8e9e540087610324ec3bb89f3b250/tui_gateway/methods_profiles.py):
+  `profiles.list` returns the same profile identity plus avatar/UI metadata.
+  Standard Android requests `include_sessions:false`; Bot Mode retains the
+  richer roster contract and its own optional Bot title.
+- [`tui_gateway/methods_session.py`](https://github.com/NousResearch/hermes-agent/blob/b0c383cdf7d8e9e540087610324ec3bb89f3b250/tui_gateway/methods_session.py):
+  explicit `profile` selects the profile home for session creation and resume.
+  Omission uses launch context; it is not inherently a request for the sticky
+  active profile. Android already resolves the sticky setting explicitly for
+  standard profile-scoped sessions and retains that behavior.
+- [`apps/desktop/src/store/profile.ts`](https://github.com/NousResearch/hermes-agent/blob/b0c383cdf7d8e9e540087610324ec3bb89f3b250/apps/desktop/src/store/profile.ts):
+  `profileLabel` uses trimmed `display_name`, then the request name. TUI's
+  [`appLayout.tsx`](https://github.com/NousResearch/hermes-agent/blob/b0c383cdf7d8e9e540087610324ec3bb89f3b250/ui-tui/src/components/appLayout.tsx)
+  supplies session `profile_name` to its composer prompt rather than a server
+  connection label.
+
+The `active_status_profile_scope` scenario's current-upstream conformance check
+passed against this SHA. This is source-only evidence, with no provider calls.
+
+## Product decision
+
+The agent name is Hermes `display_name`, otherwise the exact profile request
+name. Descriptions are not identity. A connection name remains infrastructure
+identity. Existing local aliases and personality fallback remain supported; an
+otherwise unknown agent is **Hermes**.
+
+When the server default resolves to a catalog profile, the shelf and canonical
+switcher show one identity with a home badge. The switcher shows **Server default**
+as secondary status and **Follow server default** as a separate selection control.
+Unchecking it explicitly selects the resolved profile; checking it restores the
+null selection. Both use the existing profile-switch lifecycle. No server setting
+is written and no session, draft, history, lock, or asset key is migrated.
+
+The explicit root `default` choice remains available. Equal display names never
+cause grouping. Grouping requires exact upstream request identity within the
+current connection. Missing scope stays unresolved; a known scope without roster
+metadata retains its request name rather than borrowing root metadata.
+
+## Surface review
+
+| Surface | Result |
+| --- | --- |
+| Chat header and Passport | Shared identity helper consumes display metadata; connection label and description no longer masquerade as an agent. |
+| Profile shelf and canonical switcher | Exact-identity grouping, selected-key preservation, role text, follow control, unchanged switch callbacks and local/shared avatar lookup. |
+| Connection selection | Connection identity and credentials remain separately scoped; no endpoint or persistence changes. |
+| Settings locks and display management | Follow-default preference is labeled as an action; independent lock/order/hidden keys remain visible for management. |
+| Manage profile catalog | Uses upstream display name while preserving the raw name for actions. |
+| Bot Mode | Already prioritizes Bot title, then display name, then request name; parsing now also retains display name in its Profile metadata. Route keys and connection-qualified handles stay unchanged. |
+| Restoration and diagnostics | Raw profile/session/connection keys remain authoritative. No display-label parsing, normalization, session deletion, or routing changes. |
+| Supervised mode, avatars, pets | Lock gates and exact asset keys remain unchanged. An unresolved default cannot borrow or modify the root avatar from `is_default`; shared-avatar actions require a resolved or explicit profile. The follow control is disabled under a lock. |
+| Legacy private agent sheet | Not the canonical switcher; retained without a separate routing/model rewrite. |
+
+## Rendered evidence
+
+Sanitized fixtures render the production Compose profile switcher with mocked
+metadata and avatar flows. They make no network requests and contain no profile
+contents or private infrastructure. These are JVM/Robolectric renders, not phone
+screenshots or live-server certification.
+
+| Before | After |
+| --- | --- |
+| ![Three apparent identities](assets/profile-identity/before.png) | ![Resolved identity and follow-default control](assets/profile-identity/after.png) |
+
+The rendered checks cover 360 x 720 dp, 720 x 360 dp landscape, and
+840 x 720 dp expanded layouts, plus 1.5x system font scale and a long display
+name. Text truncates with ellipsis, the request name remains available as
+supporting text, and the follow control preserves checkbox state and a 48 dp
+minimum target. Landscape opens fully expanded with scrollable content.
+
+- [Large text](assets/profile-identity/large-text.png)
+- [Landscape](assets/profile-identity/landscape.png)
+- [Expanded layout](assets/profile-identity/expanded.png)
+- [Long name](assets/profile-identity/long-name.png)
+
+Focused sideload and Google Play suites each passed 497 tests with no failures
+or skips. Lint and build results are recorded with the PR. Live-server,
+physical-device, screen-reader, and fold-posture transition behavior remain
+separate verification gaps. No APK was installed and no server profile was
+modified.

docs/decisions.md

@@ -2896,7 +2896,10 @@ the selected-hidden exception. Local icons remain connection/profile scoped.
 Compose renders state and invokes ViewModel actions; it never writes a store.
 
 Server default is represented only by `SERVER_DEFAULT_PROFILE_KEY`/a null
-selection and uses a home glyph. A profile literally named `default` retains its
+selection. Its resolved agent is grouped once with a home badge and a follow-default
+control; the selected request key remains unchanged. Upstream `display_name` is
+presentation-only. Descriptions and connection names are not profile names, and
+an unresolved default never assumes root identity. A profile named `default` retains its
 own request, lock, icon, presentation, and session keys. Selecting either does
 not call the upstream sticky-default mutation.
 
@@ -4408,3 +4411,36 @@ approval bypass.
 - `.github/workflows/approve-release-train.yml`
 - `scripts/android_release_artifacts.py`
 - `scripts/android-prepush.py`
+
+
+## ADR 74 — Play voice overlay is independent of phone control
+
+**Status:** Accepted (2026-09-12).
+
+Voice Focus and a user-started voice-only system overlay are shared presentation
+surfaces. `SYSTEM_ALERT_WINDOW` is special access, not permission to read or drive
+other apps. Play retains the no-op voice bridge handler, unsupported Device Control
+status, absent accessibility/projection services and closed bridge-command gate.
+
+The overlay requires a resumed, unlocked Activity action and microphone,
+notification and overlay access. Permission grants never start listening. Its
+session identifier fences queued starts and old notification actions. The window
+is attached only after microphone foreground promotion succeeds. The existing
+voice runtime remains the sole microphone owner; no second recorder is created.
+
+Stop/close, screen lock, task removal, permission loss and service/window failure
+end the voice session. Returning to the Activity releases overlay protection only
+after it resumes. The session is not persisted or restarted by background callers.
+Existing independent opt-in wake/Assistant settings are not changed by overlay use.
+
+Play's autonomous Accessibility Device Control boundary remains sideload-only.
+User-mediated MediaProjection and phone compose/picker actions are separate future
+features, not implicitly enabled by this decision. Standard voice remains upstream
+Dashboard/Gateway-owned and never requires Relay. Google Play declaration, live
+privacy/listing publication and physical-device certification are release gates,
+not consequences of merging this change.
+
+Source and merged-manifest validation enforce this boundary. Foreground-service
+lifecycle tests and rendered permission/Stop controls supplement, but do not
+replace, device tests or a reviewed Play test-track submission. See
+[Play declarations](play-store-listing.md#voice-overlay-review-before-production).

docs/localization-status.json

@@ -13,7 +13,7 @@
       "verification": "ai-translated",
       "review_refs": [],
       "source_sha256": {
-        "main": "f177eedfe624875dd36d36501b2b43e68869360ea80c83410870f503ca6ac9dc",
+        "main": "03856583805b7bfa6f8134b9ff3bdc1c8f3bbd7b2a342dcd890ded66a04ee842",
         "sideload": "4abff4f1069091ec2de735c3037a7ec7d77699cb4321e8511a622437bceaf7c2"
       },
       "surfaces": {
@@ -48,7 +48,7 @@
       "verification": "ai-translated",
       "review_refs": [],
       "source_sha256": {
-        "main": "f177eedfe624875dd36d36501b2b43e68869360ea80c83410870f503ca6ac9dc",
+        "main": "03856583805b7bfa6f8134b9ff3bdc1c8f3bbd7b2a342dcd890ded66a04ee842",
         "sideload": "4abff4f1069091ec2de735c3037a7ec7d77699cb4321e8511a622437bceaf7c2"
       },
       "surfaces": {
@@ -72,7 +72,7 @@
       "verification": "ai-translated",
       "review_refs": [],
       "source_sha256": {
-        "main": "f177eedfe624875dd36d36501b2b43e68869360ea80c83410870f503ca6ac9dc",
+        "main": "03856583805b7bfa6f8134b9ff3bdc1c8f3bbd7b2a342dcd890ded66a04ee842",
         "sideload": "4abff4f1069091ec2de735c3037a7ec7d77699cb4321e8511a622437bceaf7c2"
       },
       "surfaces": {
@@ -96,7 +96,7 @@
       "verification": "ai-translated",
       "review_refs": [],
       "source_sha256": {
-        "main": "f177eedfe624875dd36d36501b2b43e68869360ea80c83410870f503ca6ac9dc",
+        "main": "03856583805b7bfa6f8134b9ff3bdc1c8f3bbd7b2a342dcd890ded66a04ee842",
         "sideload": "4abff4f1069091ec2de735c3037a7ec7d77699cb4321e8511a622437bceaf7c2"
       },
       "surfaces": {
@@ -120,7 +120,7 @@
       "verification": "ai-translated",
       "review_refs": [],
       "source_sha256": {
-        "main": "f177eedfe624875dd36d36501b2b43e68869360ea80c83410870f503ca6ac9dc",
+        "main": "03856583805b7bfa6f8134b9ff3bdc1c8f3bbd7b2a342dcd890ded66a04ee842",
         "sideload": "4abff4f1069091ec2de735c3037a7ec7d77699cb4321e8511a622437bceaf7c2"
       },
       "surfaces": {
@@ -135,7 +135,7 @@
       "verification": "ai-translated",
       "review_refs": [],
       "source_sha256": {
-        "main": "f177eedfe624875dd36d36501b2b43e68869360ea80c83410870f503ca6ac9dc",
+        "main": "03856583805b7bfa6f8134b9ff3bdc1c8f3bbd7b2a342dcd890ded66a04ee842",
         "sideload": "4abff4f1069091ec2de735c3037a7ec7d77699cb4321e8511a622437bceaf7c2"
       },
       "surfaces": {

docs/media/desktop-ui-screenshots.json

@@ -50,8 +50,8 @@
   ],
   "sourceFingerprint": {
     "algorithm": "sha256",
-    "normalization": "text-lf-v1",
-    "digest": "38253cb9fb1124a629625ea0bc5be09a4f61af91e3fca0103cbb12a5279aae54",
+    "normalization": "text-lf-lockfile-root-version-v2",
+    "digest": "ed01f2a0d65cd152c271bc37f9c6b0e555ca0e1306ec09c7638cdcbe283ed5eb",
     "files": [
       "desktop/tray/ui/App.tsx",
       "desktop/tray/ui/main.tsx",

docs/play-store-listing.md

@@ -91,9 +91,9 @@ This app is a community project and is not affiliated with or endorsed by NousRe
 Paste into Play Console → **What's new** (≤500 characters):
 
 ```
-v1.16.0 - Safer startup, connections, and activity
+v1.16.1 - Dashboard-only cold starts recover
 
-Gateway chat now opens reliably on a cold launch. Saved Dashboard sign-ins stay bound to the correct connection, pasted credentials ignore accidental line breaks, and network changes no longer race the route cache. Bot Mode supports duplicate profile names across gateways, while delegated work, session setup, attachment errors, and feedback remain visible and easier to review.
+Dashboard-only connections now prepare the selected profile before Gateway readiness, fixing a remaining cold-start path that could stay on waking or waiting for Gateway until the app resumed or its network route changed.
 ```
 ## Category
 
@@ -197,6 +197,8 @@ entry points in its description and demonstration:
   and Stop action, then opens the voice overlay, backgrounds Hermes, and ends
   the session from the overlay or notification.
 
+The Play build declares `SYSTEM_ALERT_WINDOW` only for explicitly user-started Voice Overlay. It never enables Device Control. Overlay permission and notification refusal retain in-app voice.
+
 The Play build does **not** declare `FOREGROUND_SERVICE_MEDIA_PROJECTION` or the Device Control accessibility/bridge services — those are sideload-only.
 
 ### Data safety
@@ -213,3 +215,23 @@ questions against this flow before the next Play submission.
 - `POST_NOTIFICATIONS` — chat input, turn-complete, and keep-alive notifications, requested on API 33+.
 - `CAMERA` — QR pairing / attachments, requested at use.
 - Notification listener (companion) — user-enabled in system settings.
+
+### Voice Overlay review before production
+
+Update the microphone FGS declaration and demonstrate the actual Google Play
+package on an explicitly approved test track. Sideload recordings do not certify
+Play. Show permission refusal, notification Stop, screen-lock termination and
+repeated turns after switching apps. Do not use the Production-draft stable
+preflight as an experiment. Upload success is not policy approval.
+
+Reconcile Data Safety for audio, messages, attachments, notification content and
+Assistant text/screenshots, including recipients and retention. No hosted backend
+or analytics does not itself establish "no data collected." Record any applicable
+collection/sharing exceptions against Google's definitions. Confirm the listing,
+canonical privacy page and legacy page describe the reviewed behavior. Console
+updates and test-track submission require release authorization.
+
+Official sources checked September 12, 2026: [special access](https://developer.android.com/training/permissions/requesting-special),
+[FGS declarations](https://support.google.com/googleplay/android-developer/answer/13392821),
+[Data Safety](https://support.google.com/googleplay/android-developer/answer/10787469),
+and [Accessibility automation](https://support.google.com/googleplay/android-developer/answer/10964491).

docs/privacy.md

@@ -17,7 +17,7 @@ Hermes-Relay has two Android tracks:
 
 | Track | Bridge scope | Sensitive Android APIs |
 |-------|--------------|------------------------|
-| Google Play | **Bridge Core**: chat, voice, terminal/TUI relay, notification companion, media handoff, relay sessions, status | No AccessibilityService, overlay permission, MediaProjection, wake-lock device-control service, or contacts/location/SMS/call permissions. Optional Android Assistant screen context is described below. |
+| Google Play | **Bridge Core**: chat, voice, terminal/TUI relay, notification companion, media handoff, relay sessions, status | Optional voice-only overlay. No AccessibilityService, MediaProjection, wake-lock device-control service, or contacts/location/SMS/call permissions. Optional Android Assistant screen context is described below. |
 | Sideload | **Device Control**: the full agent-driven phone-control bridge | AccessibilityService, foreground service, overlay chip, optional screenshots, and phone-utility permissions when enabled |
 
 The Google Play build cannot use Accessibility or MediaProjection to inspect or
@@ -118,3 +118,7 @@ Stats for Nerds tracks performance metrics such as time to first token, completi
 ## Open Source
 
 Hermes-Relay is MIT licensed. All source code is publicly available and auditable at [GitHub](https://github.com/Codename-11/hermes-relay).
+
+## Voice Overlay
+
+Voice Overlay is optional in both builds. Start it explicitly from Voice Focus while Hermes-Relay is visible and unlocked. It requires microphone access, display-over-other-apps access and an enabled microphone notification with Stop voice. Audio goes to the configured Hermes server; the overlay does not read or control other apps. Stop voice, closing the overlay, screen lock, task removal or loss of required access ends the overlay voice session. Returning to the app keeps foreground protection until the app is resumed. Granting permissions never starts a session.

docs/project/TODO.md

@@ -58,6 +58,33 @@ standard upstream media/file delivery, and concise-response expectations. Once
 that contract is available in the supported Hermes baseline, adopt it and add
 Gateway conformance coverage proving the exact prompt bytes and session source.
 
+Issues [#556](https://github.com/Codename-11/hermes-relay/issues/556) and
+[#557](https://github.com/Codename-11/hermes-relay/issues/557) share this contract
+gap. The Android audit fix labels unsupported context; automatic Android
+identification and Gateway phone-status delivery still require upstream work.
+Rechecked against upstream `5dea46d13deec9549bdc2ea703ae9201d733c28d`:
+
+- [`methods_prompt.py`](https://github.com/NousResearch/hermes-agent/blob/5dea46d13deec9549bdc2ea703ae9201d733c28d/tui_gateway/methods_prompt.py)
+  accepts `surface` only for `hud` and `voice-live`; it has no general
+  per-turn system-context parameter. Neither surface means Android.
+- [`session_notifications.py`](https://github.com/NousResearch/hermes-agent/blob/5dea46d13deec9549bdc2ea703ae9201d733c28d/tui_gateway/session_notifications.py)
+  adds those built-in surface notes to model input without changing the
+  persisted user row. This is the existing upstream seam to extend, with
+  explicit client capability negotiation, bounded opted-in context, and
+  turn-owned snapshots through queueing, retries, and client switches.
+- [`server.py`](https://github.com/NousResearch/hermes-agent/blob/5dea46d13deec9549bdc2ea703ae9201d733c28d/tui_gateway/server.py)
+  accepts a caller-supplied session `source`, but
+  [`prompt_builder.py`](https://github.com/NousResearch/hermes-agent/blob/5dea46d13deec9549bdc2ea703ae9201d733c28d/agent/prompt_builder.py)
+  has no Android platform hint. A session-origin label is not verified
+  current-turn sender identity. Do not invent a platform or use a client hint
+  as authorization for phone tools.
+- The API server's `POST /api/sessions` source field belongs to the explicit
+  API-only surface. Android standard chat creates/resumes sessions through
+  Gateway RPC; that REST field does not add per-turn context to `prompt.submit`.
+
+Keep unknown/older hosts supported without sending private parameters,
+rewriting the user transcript, overriding persona, or requiring Relay.
+
 ---
 
 ## Scope sensitive-media prompt guidance to capable clients

docs/spec.md

@@ -597,11 +597,13 @@ Bottom navigation bar with 4 tabs:
 ```
 
 ### Chat Tab
+
+- **Context preview** — the Injected context sheet describes the bound chat transport, not a delivery receipt. Standard Gateway chat has no general per-turn system-context slot: phone status, the Android client preamble, media hints, and interface-context blocks are omitted. Phone status and turn context show an explicit unsupported note. API-only chats retain the opted-in context and sharing controls; the Settings example is labeled API-only. Gateway persona and optional Relay-reported configuration remain separately server-owned. No context is prepended to user text or written into the personality slot to bypass this boundary.
 - **Top bar and Profile Shelf (three-layer agent model).** Layout from left to right:
   1. **Connection chip** — tap to open `ConnectionSwitcherSheet` (all paired servers + health indicator). Auto-hidden when you only have one Connection. See `docs/decisions.md` §19.
   2. **Agent avatar/name region** — tap to expand or collapse the Profile Shelf immediately below the app bar. With only one visible effective identity, the shelf stays hidden and the same tap opens Agent Passport.
   3. Remaining top-bar actions (session drawer hamburger, ambient toggle, etc.).
-- **Profile Shelf** — the active avatar/name/chevron capsule opens Agent Passport; inactive profiles are avatar-only 48 dp switch targets; a fixed overflow opens the canonical full switcher also used by Passport. The shelf scrolls horizontally, honors `ProfilePresentationStore` ordering/hidden preferences, keeps a hidden selected profile disclosed, and disappears when only one visible identity remains. Hermes-owned avatars win by default, followed by device-local icons and display initials; an explicit per-connection/profile **This phone only** override lets the local icon win without mutating Hermes. Server default uses a home glyph and remains distinct from a profile literally named `default`.
+- **Profile Shelf** — the active avatar/name/chevron capsule opens Agent Passport; inactive profiles are avatar-only 48 dp switch targets; a fixed overflow opens the canonical full switcher also used by Passport. The shelf scrolls horizontally, honors `ProfilePresentationStore` ordering/hidden preferences, keeps a hidden selected profile disclosed, and disappears when only one visible identity remains. Hermes-owned avatars win by default, followed by device-local icons and display initials; an explicit per-connection/profile **This phone only** override lets the local icon win without mutating Hermes. The resolved server default is grouped with its exact named profile and carries a home badge; a follow-default control preserves implicit and explicit selection keys. Display identity uses upstream `display_name`, then the exact profile name, never a connection label or description. Unknown default identity stays unresolved rather than borrowing root metadata.
 - **Hermes-owned profile identity** — on a current Gateway, Android calls `profiles.list {include_sessions:false}` and consumes bounded `ui_meta` plus `has_avatar`. A true avatar flag triggers `profiles.get_asset`; validated server bytes are cached per connection/profile and win over the older device-local `ProfileIconStore`. A false flag or successful clear removes only the server cache. Refresh generations and exact connection identity prevent a late fetch from repainting another connection or resurrecting a cleared avatar.
 - **Separated shared and phone avatar controls** — **Shared across Hermes** directly selects or removes the upstream `profiles.set_asset` avatar without changing local presentation. **This phone only** is a persisted per-connection/profile override populated from a phone image. The Relay-host `GET /api/profiles/{name}/avatar` conventional-file importer is a legacy enhancement only; it does not own or replace upstream profile assets. Selecting a phone image enables the override, while disabling it immediately returns to the shared avatar. Phone-local PNG/JPEG/WebP/GIF bytes are magic-checked and capped at 8 MB; Coil renders animated GIF/WebP consistently anywhere the profile icon appears. The shared picker accepts any image Android can decode, applies its display orientation, and downscales/re-encodes when necessary while retaining the exact upstream PNG/JPEG/WebP and 2,000,000-byte storage contract. Pet sheets and Sphere skins never enter `ui_meta` or profile assets.
 - **Upstream animated pets** — the agent sheet consumes the profile-scoped Gateway `pet.info`, `pet.gallery`, `pet.select`, and `pet.disable` contracts. Android caches the bounded PNG/WebP sprite sheet by connection, effective profile, and `spritesheetRevision`; it sends `knownRevision` on refresh and reuses the existing bounded pet renderer for the returned geometry, row taxonomy, and activity states. The active upstream pet becomes the phone companion unless the user explicitly selected a phone-local floating pet. Selection and disable write Hermes `display.pet.*` state and therefore follow the profile across current Hermes surfaces; a method-not-found response leaves older hosts on the established local pet flow.
@@ -1016,7 +1018,7 @@ The v0.4 wave includes three reliability patterns applied to existing code and o
 
 **WakeLockManager — wake-scope wrapping for gesture dispatch.** New `object WakeLockManager` at `app/src/main/kotlin/com/hermesandroid/relay/power/WakeLockManager.kt` exposes `suspend fun <T> wakeForAction(block: suspend () -> T): T`. Uses `PowerManager.PARTIAL_WAKE_LOCK`, ref-counted so nested calls don't release each other prematurely, with a hard 10-second timeout as a battery safety rail. `ActionExecutor` wraps every gesture-dispatching function (`tap`, `tapText`, `typeText`, `swipe`, `scroll`, `longPress`, `drag`) in `wakeForAction { ... }`. Read-only accessibility calls (`readScreen`, `findNodes`, `describeNode`, `screenHash`, `diffScreen`, `currentApp`, `clipboardRead/Write`, `mediaControl`) are not wrapped — they don't need the screen on. Closes the "gesture fires into the void when the screen is off" failure mode that silently broke `android_tap` / `android_swipe` whenever Bailey's phone hit idle between commands. Requires `android.permission.WAKE_LOCK` in the main manifest.
 
-**Multi-window ScreenReader (P1).** `ScreenReader.readCurrentScreen` now iterates `service.windows.mapNotNull { it.root }` instead of the single `rootInActiveWindow`. Returns a merged tree where each `AccessibilityNodeInfo` is walked per-window and recycled in the per-iteration `try/finally`. Catches system overlays, popup menus, notification shade, and split-screen secondary windows — the previous single-root path silently ignored them. **Node-ID scheme update:** stable IDs are now prefixed `w<windowIndex>:<sequentialIndex>` (e.g. `w0:42`, `w1:7`) so IDs are disambiguated across windows. A single-window fallback kicks in when `service.windows` is empty, which happens on the googlePlay flavor without `flagRetrieveInteractiveWindows` (the conservative a11y config that survives Play Store policy review). Node IDs are end-to-end resolvable after A4 wired parsing into `/tap` and `/scroll` — `android_find_nodes` and `android_describe_node` emit them, and `android_tap` / `android_scroll` accept them as input, so an agent can search → describe → act without re-reading the tree.
+**Multi-window ScreenReader (P1).** `ScreenReader.readCurrentScreen` now iterates `service.windows.mapNotNull { it.root }` instead of the single `rootInActiveWindow`. Returns a merged tree where each `AccessibilityNodeInfo` is walked per-window and recycled in the per-iteration `try/finally`. Catches system overlays, popup menus, notification shade, and split-screen secondary windows — the previous single-root path silently ignored them. **Node-ID scheme update:** stable IDs are now prefixed `w<windowIndex>:<sequentialIndex>` (e.g. `w0:42`, `w1:7`) so IDs are disambiguated across windows. A single-window fallback kicks in when `service.windows` is empty, when Android cannot provide interactive windows; the Google Play flavor does not bind this AccessibilityService. Node IDs are end-to-end resolvable after A4 wired parsing into `/tap` and `/scroll` — `android_find_nodes` and `android_describe_node` emit them, and `android_tap` / `android_scroll` accept them as input, so an agent can search → describe → act without re-reading the tree.
 
 **A9 three-tier `tapText` cascade.** `ActionExecutor.tapText` replaces the single-shot `findNodeBoundsByText → performAction(ACTION_CLICK)` path with a 3-tier fallback:
 1. Find node by text across all windows. If `node.isClickable` → `performAction(ACTION_CLICK)`.
@@ -1369,3 +1371,13 @@ Preserved verbatim from the original scoping session. This is a historical snaps
 
 All six deliverables shipped in v0.1.0. Four of the five "non-goals for tonight" have since shipped in v0.2.0 / v0.3.0; biometrics is the one remaining open item.
 - **ClawPort** — Web dashboard (parallel effort, different interface surface)
+
+
+### Voice Overlay capability boundary
+
+Both Android flavors offer an optional voice-only overlay from Voice Focus.
+Microphone, notification and display-over-other-apps permission checks are followed
+by a fresh Start action in the resumed app. The microphone FGS acknowledges
+readiness before the overlay attaches. Stop, screen lock, task removal and lost
+access terminate the session; an Activity handoff retains protection until resume.
+Device Control, Accessibility and MediaProjection remain sideload-only. See ADR 74.

docs/upstream-surface-matrix.md

@@ -63,6 +63,46 @@ Verified upstream source snapshot:
 | `hermes relay doctor` | Hermes-Relay plugin CLI | No for diagnostics | Operator/agent diagnostics | Reports vanilla upstream Hermes route reachability (including `/v1/toolsets`), dashboard Nous/topology state, sanitized gateway event-loop heartbeat state, plugin layout, Relay loopback state, and legacy bootstrap presence. |
 | `hermes_relay_bootstrap` routes | Legacy compatibility monkeypatch | No, but non-upstream | Fallback only | Installed via `.pth` by legacy installer. Injects only compatibility-only gaps: session search, memory, legacy skill detail/toggle, config, available-models, slash middleware. Sessions CRUD and skill/toolset lists are native upstream and retired from the bootstrap. Retained session-database work is offloaded (`AsyncSessionDB` when available, `asyncio.to_thread` fallback), and memory mutations reset newer upstream's request-local consolidation-failure budget. |
 
+## Dashboard Relay WebSocket guard compatibility
+
+The optional Relay ingress reuses the host's already-loaded
+`_ws_request_is_allowed` and `_ws_auth_ok` pair. Current Hermes owns both in
+`hermes_cli.web_server_chat`; older hosts expose them on `hermes_cli.web_server`
+(or its legacy module alias). The current owner takes precedence. If it is
+loaded but either guard is missing or non-callable, admission fails closed;
+guards are never combined across modules or retried through a weaker fallback.
+No Dashboard modules are imported just to discover guards.
+
+Plugin enablement still uses the facade's `_get_dashboard_plugins` and the
+host's enabled/disabled sets. A disabled plugin or rejected Host/Origin/IP is
+checked before ticket consumption. Guard exceptions deny the upgrade, tickets
+remain single-use, and Dashboard admission never replaces Relay's own
+pairing/session authentication.
+
+Run the hermetic transport regressions with:
+
+```bash
+python -m pytest plugin/dashboard/test_plugin_api.py plugin/tests/test_dashboard_ingress.py -q
+```
+
+An opt-in conformance lane exercises real current-upstream imports and ticket
+consumption through FastAPI and an ephemeral loopback Relay, using a temporary
+Hermes home rather than an installed service. Use a Python environment with the
+Dashboard dependencies, provide the upstream checkout on `PYTHONPATH`, and run
+this lane in its own process:
+
+```bash
+test_home=$(mktemp -d)
+env -i PATH="$PATH" HOME="$test_home" HERMES_HOME="$test_home" \
+  HERMES_RELAY_TEST_UPSTREAM=1 PYTHONPATH="$PWD:/path/to/hermes-agent" \
+  python -m pytest plugin/dashboard/test_upstream_ws_guards.py -q
+```
+
+The explicit opt-in fails on missing upstream dependencies instead of silently
+skipping. It covers query/subprotocol tickets, replay/expiry, policy and plugin
+rejection before forwarding, loopback-only token auth, and inner Relay auth.
+It does not certify a live reverse proxy or restart any installed service.
+
 ## Client capability gate (build flavor)
 
 Route ownership above is a *server-side* contract. The Android client adds a

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
-appVersionName = "1.16.0"
-appVersionCode = "55"
+appVersionName = "1.16.1"
+appVersionCode = "56"
 agp = "9.4.0"
 kotlin = "2.4.10"
 compose-bom = "2026.08.00"

plugin/dashboard/plugin_api.py

@@ -364,8 +364,17 @@ def _dashboard_ws_guards() -> tuple[Any, Any] | None:
     The current upstream plugin contract mounts routers but does not inject an
     auth dependency for WebSockets.  Using the host's already-loaded helpers
     keeps ticket consumption and Host/Origin/IP policy identical to `/api/ws`.
-    If upstream moves either helper, this ingress fails closed.
+    Current hosts own both guards in web_server_chat; older hosts expose them
+    on web_server. Prefer the current owner and never combine guards from
+    different modules. A loaded current owner with an incomplete contract must
+    fail closed rather than fall back to potentially stale facade helpers.
     """
+    chat = sys.modules.get("hermes_cli.web_server_chat")
+    if chat is not None:
+        allowed = getattr(chat, "_ws_request_is_allowed", None)
+        authed = getattr(chat, "_ws_auth_ok", None)
+        return (allowed, authed) if callable(allowed) and callable(authed) else None
+
     candidates = [sys.modules.get("hermes_cli.web_server")]
     candidates.extend(
         module for name, module in tuple(sys.modules.items())

plugin/dashboard/test_plugin_api.py

@@ -293,6 +293,68 @@ class TransportIngressTests(PluginApiTestCase):
         self.assertIn("size limit", response.json()["detail"])
 
 
+class DashboardWebSocketGuardDiscoveryTests(unittest.TestCase):
+    def test_loaded_chat_guards_admit_without_legacy_facade_exports(self) -> None:
+        allowed = Mock(return_value=True)
+        authed = Mock(return_value=True)
+        modules = {
+            "hermes_cli.web_server": SimpleNamespace(),
+            "hermes_cli.web_server_chat": SimpleNamespace(
+                _ws_request_is_allowed=allowed, _ws_auth_ok=authed,
+            ),
+        }
+        with patch.object(plugin_api.sys, "modules", modules):
+            self.assertEqual(plugin_api._dashboard_ws_guards(), (allowed, authed))
+
+    def test_legacy_hosts_retain_complete_guard_pair(self) -> None:
+        for name in ("hermes_cli.web_server", "legacy.web_server"):
+            with self.subTest(name=name):
+                guards = (Mock(), Mock())
+                module = SimpleNamespace(
+                    _ws_request_is_allowed=guards[0], _ws_auth_ok=guards[1],
+                )
+                with patch.object(plugin_api.sys, "modules", {name: module}):
+                    self.assertEqual(plugin_api._dashboard_ws_guards(), guards)
+
+    def test_current_owner_takes_precedence_over_stale_facade(self) -> None:
+        guards = (Mock(return_value=False), Mock(return_value=False))
+        modules = {
+            "hermes_cli.web_server_chat": SimpleNamespace(
+                _ws_request_is_allowed=guards[0], _ws_auth_ok=guards[1],
+            ),
+            "hermes_cli.web_server": SimpleNamespace(
+                _ws_request_is_allowed=Mock(return_value=True),
+                _ws_auth_ok=Mock(return_value=True),
+            ),
+        }
+        with patch.object(plugin_api.sys, "modules", modules):
+            self.assertEqual(plugin_api._dashboard_ws_guards(), guards)
+
+    def test_missing_or_partial_contracts_fail_closed_without_mixing(self) -> None:
+        complete = SimpleNamespace(_ws_request_is_allowed=Mock(), _ws_auth_ok=Mock())
+        for modules in (
+            {},
+            {"hermes_cli.web_server_chat": SimpleNamespace()},
+            {
+                "hermes_cli.web_server_chat": SimpleNamespace(_ws_auth_ok=Mock()),
+                "hermes_cli.web_server": complete,
+            },
+            {
+                "hermes_cli.web_server_chat": SimpleNamespace(
+                    _ws_auth_ok=True, _ws_request_is_allowed=Mock(),
+                ),
+                "hermes_cli.web_server": complete,
+            },
+            {
+                "hermes_cli.web_server": SimpleNamespace(_ws_auth_ok=Mock()),
+                "legacy.web_server": SimpleNamespace(_ws_request_is_allowed=Mock()),
+            },
+        ):
+            with self.subTest(modules=tuple(modules)):
+                with patch.object(plugin_api.sys, "modules", modules):
+                    self.assertIsNone(plugin_api._dashboard_ws_guards())
+
+
 class TransportWebSocketAdmissionTests(unittest.IsolatedAsyncioTestCase):
     class _Socket:
         def __init__(self) -> None:
@@ -330,6 +392,30 @@ class TransportWebSocketAdmissionTests(unittest.IsolatedAsyncioTestCase):
         request_allowed.assert_called_once_with(socket)
         auth_ok.assert_called_once_with(socket)
 
+    async def test_request_denial_does_not_consume_ticket(self) -> None:
+        socket = self._Socket()
+        auth = Mock(return_value=True)
+        with patch.object(plugin_api, "_dashboard_plugin_is_enabled", return_value=True), patch.object(
+            plugin_api, "_dashboard_ws_guards", return_value=(lambda _ws: False, auth)
+        ):
+            self.assertIsNone(await plugin_api._admit_transport_websocket(socket))  # type: ignore[arg-type]
+        self.assertEqual(socket.closed[0], 1008)  # type: ignore[index]
+        auth.assert_not_called()
+
+    async def test_guard_exception_fails_closed_without_auth_fallback(self) -> None:
+        for failing_guard in (0, 1):
+            with self.subTest(failing_guard=failing_guard):
+                socket = self._Socket()
+                guards = [Mock(return_value=True), Mock(return_value=True)]
+                guards[failing_guard].side_effect = RuntimeError("guard unavailable")
+                with patch.object(plugin_api, "_dashboard_plugin_is_enabled", return_value=True), patch.object(
+                    plugin_api, "_dashboard_ws_guards", return_value=tuple(guards)
+                ):
+                    self.assertIsNone(await plugin_api._admit_transport_websocket(socket))  # type: ignore[arg-type]
+                self.assertEqual(socket.closed[0], 1011)  # type: ignore[index]
+                if failing_guard == 0:
+                    guards[1].assert_not_called()
+
     async def test_failed_dashboard_ticket_is_policy_close(self) -> None:
         socket = self._Socket()
         with patch.object(

plugin/dashboard/test_upstream_ws_guards.py

@@ -0,0 +1,134 @@
+"""Opt-in conformance against real Hermes Dashboard imports, never a live service.
+
+Set HERMES_RELAY_TEST_UPSTREAM=1 and put a current hermes-agent checkout on
+PYTHONPATH. Missing upstream dependencies then fail rather than silently skip.
+"""
+from __future__ import annotations
+
+import os
+import tempfile
+import unittest
+from pathlib import Path
+from unittest.mock import patch
+from typing import Any
+
+from fastapi import FastAPI
+from fastapi.testclient import TestClient
+from starlette.websockets import WebSocketDisconnect
+
+from plugin.dashboard import plugin_api
+from plugin.dashboard import test_plugin_api as transport_tests
+
+
+@unittest.skipUnless(os.environ.get("HERMES_RELAY_TEST_UPSTREAM") == "1", "opt-in upstream conformance")
+class UpstreamWebSocketGuardTests(unittest.TestCase):
+    path = "/api/plugins/hermes-relay/transport/ws"
+
+    def setUp(self) -> None:
+        home = Path(self.enterContext(tempfile.TemporaryDirectory()))
+        self.enterContext(patch.dict(os.environ, {
+            "HERMES_HOME": str(home),
+            "HERMES_RELAY_DASHBOARD_PROXY_SECRET": "integration-test-secret",
+        }))
+        self.enterContext(patch.object(Path, "home", return_value=home))
+        self.config_path = home / "config.yaml"
+        self.config_path.write_text("plugins:\n  enabled: [hermes-relay]\n", encoding="utf-8")
+
+        from hermes_cli import web_server
+        from hermes_cli.dashboard_auth import ws_tickets
+
+        self.host = web_server
+        self.tickets = ws_tickets
+        self.tickets._reset_for_tests()
+        self.addCleanup(self.tickets._reset_for_tests)
+        app = FastAPI()
+        app.state.auth_required = True
+        app.state.bound_host = "127.0.0.1"
+        app.state.trusted_public_hosts = frozenset()
+        self.enterContext(patch.object(self.host, "app", app))
+        # Exercise the facade discovery function and real enabled/disabled config
+        # readers, but do not discover or execute the operator's installed plugins.
+        self.enterContext(patch.object(self.host, "_dashboard_plugins_cache", [{
+            "name": "hermes-relay", "source": "user", "_dir": str(home),
+        }]))
+        self.assertTrue(plugin_api._dashboard_plugin_is_enabled())
+        app.include_router(plugin_api.router, prefix="/api/plugins/hermes-relay")
+        self.client = self.enterContext(TestClient(
+            app, base_url="http://127.0.0.1", headers={"host": "127.0.0.1"},
+        ))
+        self.relay = transport_tests._EphemeralRelay()
+        self.relay.start()
+        self.addCleanup(self.relay.stop)
+        self.enterContext(patch.object(plugin_api, "RELAY_PORT", self.relay.port))
+
+    def _ticket(self) -> str:
+        return self.tickets.mint_ticket(user_id="test-user", provider="test-provider")
+
+    def _assert_denied(self, path: str, **kwargs: Any) -> None:
+        # No connection to the loopback Relay is permitted on a failed guard.
+        with patch.object(plugin_api.aiohttp, "ClientSession", side_effect=AssertionError("Relay reached")):
+            with self.assertRaises(WebSocketDisconnect) as denied:
+                with self.client.websocket_connect(path, **kwargs):
+                    pass
+        self.assertEqual(denied.exception.code, 1008)
+
+    def test_real_ticket_pairing_reconnect_subprotocol_and_replay(self) -> None:
+        self.assertTrue(self.relay.server.pairing.register_code("ABC123"))
+        ticket = self._ticket()
+        with self.client.websocket_connect(f"{self.path}?ticket={ticket}") as socket:
+            socket.send_json(transport_tests.TransportWebSocketIntegrationTests._auth_payload(pairing_code="ABC123"))
+            paired = socket.receive_json()
+            self.assertEqual(paired["type"], "auth.ok")
+            session_token = paired["payload"]["session_token"]
+        self._assert_denied(f"{self.path}?ticket={ticket}")
+
+        protocols = ["hermes-gateway-v1", f"hermes-gateway-ticket.{self._ticket()}"]
+        with self.client.websocket_connect(self.path, subprotocols=protocols) as socket:
+            self.assertEqual(socket.accepted_subprotocol, "hermes-gateway-v1")
+            socket.send_json(transport_tests.TransportWebSocketIntegrationTests._auth_payload(session_token=session_token))
+            self.assertEqual(socket.receive_json()["type"], "auth.ok")
+        self._assert_denied(self.path, subprotocols=protocols)
+
+        # Dashboard admission must not replace the inner Relay session boundary.
+        with self.client.websocket_connect(f"{self.path}?ticket={self._ticket()}") as socket:
+            socket.send_json(transport_tests.TransportWebSocketIntegrationTests._auth_payload(session_token="invalid"))
+            self.assertEqual(socket.receive_json()["type"], "auth.fail")
+
+    def test_real_ungated_token_keeps_loopback_peer_policy(self) -> None:
+        self.host.app.state.auth_required = False
+        path = f"{self.path}?token={self.host._SESSION_TOKEN}"
+        with self.client.websocket_connect(path) as socket:
+            socket.send_json(transport_tests.TransportWebSocketIntegrationTests._auth_payload(session_token="invalid"))
+            self.assertEqual(socket.receive_json()["type"], "auth.fail")
+        with TestClient(
+            self.host.app, headers={"host": "127.0.0.1"}, client=("203.0.113.8", 12345),
+        ) as remote_client, patch.object(
+            plugin_api.aiohttp, "ClientSession", side_effect=AssertionError("Relay reached"),
+        ):
+            with self.assertRaises(WebSocketDisconnect) as denied:
+                with remote_client.websocket_connect(path):
+                    pass
+            self.assertEqual(denied.exception.code, 1008)
+
+    def test_real_policy_and_plugin_gate_reject_before_ticket_consumption(self) -> None:
+        for headers in ({"host": "untrusted.example"}, {"origin": "https://untrusted.example"}):
+            with self.subTest(headers=headers):
+                ticket = self._ticket()
+                self._assert_denied(f"{self.path}?ticket={ticket}", headers=headers)
+                self.assertEqual(self.tickets.consume_ticket(ticket)["user_id"], "test-user")
+
+        self._assert_denied(self.path)
+        self._assert_denied(f"{self.path}?ticket=invalid")
+        with patch.object(self.tickets.time, "time", return_value=0):
+            expired = self._ticket()
+        self._assert_denied(f"{self.path}?ticket={expired}")
+
+        for config in (
+            "plugins:\n  enabled: []\n",
+            "plugins:\n  enabled: [hermes-relay]\n  disabled: [hermes-relay]\n",
+        ):
+            self.config_path.write_text(config, encoding="utf-8")
+            self.assertFalse(plugin_api._dashboard_plugin_is_enabled())
+            ticket = self._ticket()
+            self._assert_denied(f"{self.path}?ticket={ticket}")
+            self.assertEqual(self.tickets.consume_ticket(ticket)["user_id"], "test-user")

scripts/android-fgs-demo.py

@@ -19,7 +19,7 @@ from dataclasses import dataclass
 from pathlib import Path
 
 
-DEFAULT_PACKAGE = "com.axiomlabs.hermesrelay.sideload"
+DEFAULT_PACKAGE = "com.axiomlabs.hermesrelay"
 REMOTE_UI = "/sdcard/hermes-fgs-demo.xml"
 REMOTE_VIDEO = "/sdcard/hermes-fgs-demo.mp4"
 
@@ -420,6 +420,8 @@ def main() -> int:
         demo.tap_selector(description="Start voice conversation", settle=1)
         demo.tap_selector(description="Expand voice controls", settle=0.7)
         demo.tap_selector(text="Overlay", settle=1.5)
+        # Grant required access manually before recording; never automate consent.
+        demo.tap_selector(text="Start voice overlay", settle=1.5)
         demo.home()
         demo.pause(3)
         nodes, _ = demo.wait_for_notification("Hermes voice overlay active")

scripts/android-prepush.py

@@ -21,6 +21,12 @@ import sys
 
 REPO_ROOT = pathlib.Path(__file__).resolve().parents[1]
 FOCUSED_TESTS = (
+    "com.hermesandroid.relay.viewmodel.InjectedContextTest",
+    "com.hermesandroid.relay.screenshots.InjectedContextSheetTest",
+    "com.hermesandroid.relay.viewmodel.ChatViewModelGatewayInboundTurnTest.injectedContextPreviewMatchesBareGatewayPayload",
+    "com.hermesandroid.relay.voice.VoiceOverlayLifecycleTest",
+    "com.hermesandroid.relay.voice.VoiceOverlayForegroundServiceTest",
+    "com.hermesandroid.relay.voice.VoiceOverlayPresentationTest",
     "com.hermesandroid.relay.network.ArchitectureBoundaryTest",
     "com.hermesandroid.relay.network.relay.RelayUrlDeriverTest",
     "com.hermesandroid.relay.viewmodel.ConnectionSwitchTest",
@@ -45,6 +51,7 @@ RELEASE_PREP_TESTS = (
     "com.hermesandroid.relay.screenshots.WhatsNewToastScreenshotTest",
 )
 REPOSITORY_CHECKS = (
+    "check-android-capabilities.py",
     "check-android-locales.py",
     "check-user-docs-locales.py",
     "check-android-collection-apis.py",

scripts/check-android-capabilities.py

@@ -0,0 +1,70 @@
+#!/usr/bin/env python3
+"""Verify Play voice capabilities without allowing Device Control through a manifest merge."""
+from __future__ import annotations
+
+import argparse
+from pathlib import Path
+import xml.etree.ElementTree as ET
+
+ROOT = Path(__file__).resolve().parents[1]
+ANDROID = "{http://schemas.android.com/apk/res/android}"
+TOOLS = "{http://schemas.android.com/tools}"
+FORBIDDEN = {
+    "BIND_ACCESSIBILITY_SERVICE", "WAKE_LOCK", "FOREGROUND_SERVICE_MEDIA_PROJECTION",
+    "READ_CONTACTS", "WRITE_CONTACTS", "SEND_SMS", "READ_SMS", "RECEIVE_SMS",
+    "READ_CALL_LOG", "WRITE_CALL_LOG", "CALL_PHONE", "ACCESS_FINE_LOCATION",
+    "ACCESS_COARSE_LOCATION", "ACCESS_BACKGROUND_LOCATION", "DISABLE_KEYGUARD",
+    "REQUEST_IGNORE_BATTERY_OPTIMIZATIONS", "QUERY_ALL_PACKAGES", "MANAGE_EXTERNAL_STORAGE",
+}
+REQUIRED = {"RECORD_AUDIO", "POST_NOTIFICATIONS", "FOREGROUND_SERVICE",
+            "FOREGROUND_SERVICE_MICROPHONE", "SYSTEM_ALERT_WINDOW"}
+
+
+def validate(roots: list[ET.Element]) -> None:
+    permissions: set[str] = set()
+    services: dict[str, ET.Element] = {}
+    for root in roots:
+        for node in root:
+            if node.tag.startswith("uses-permission"):
+                name = node.get(ANDROID + "name", "").removeprefix("android.permission.")
+                if node.get(TOOLS + "node") == "remove":
+                    permissions.discard(name)
+                else:
+                    permissions.add(name)
+        for node in root.findall("application/service"):
+            name = node.get(ANDROID + "name", "")
+            services[name.rsplit(".", 1)[-1]] = node
+            if node.get(ANDROID + "permission") == "android.permission.BIND_ACCESSIBILITY_SERVICE":
+                raise ValueError("Play must not bind an AccessibilityService")
+            if "mediaProjection" in node.get(ANDROID + "foregroundServiceType", "").split("|"):
+                raise ValueError("Play must not declare a MediaProjection service")
+    if permissions & FORBIDDEN:
+        raise ValueError(f"Play contains Device Control permissions: {sorted(permissions & FORBIDDEN)}")
+    if REQUIRED - permissions:
+        raise ValueError(f"Play voice permissions missing: {sorted(REQUIRED - permissions)}")
+    if {"BridgeForegroundService", "HermesAccessibilityService"} & services.keys():
+        raise ValueError("Play contains a Device Control service")
+    voice = services.get("VoiceOverlayForegroundService")
+    if voice is None or voice.get(ANDROID + "exported") != "false" or \
+            voice.get(ANDROID + "foregroundServiceType") != "microphone":
+        raise ValueError("Play voice overlay must use a non-exported microphone FGS")
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--variant", choices=("googlePlayDebug", "googlePlayRelease"))
+    parser.add_argument("--build-dir", type=Path, default=ROOT / "app/build")
+    args = parser.parse_args()
+    validate([ET.parse(ROOT / f"app/src/{flavor}/AndroidManifest.xml").getroot()
+              for flavor in ("main", "googlePlay")])
+    if args.variant:
+        files = list((args.build_dir / "intermediates/merged_manifests" / args.variant)
+                     .rglob("AndroidManifest.xml"))
+        if len(files) != 1:
+            raise SystemExit(f"Expected one merged {args.variant} manifest, found {len(files)}")
+        validate([ET.parse(files[0]).getroot()])
+    print(f"Play capability manifest validated ({args.variant or 'source overlays'})")
+
+
+if __name__ == "__main__":
+    main()

scripts/check-privacy-policy.py

@@ -21,6 +21,9 @@ REQUIRED_MARKERS = (
     "Data export and deletion",
     "Children's privacy",
     "Hermes-Relay issue tracker",
+    "Voice Overlay",
+    "Android Digital Assistant",
+    "Stop voice",
 )
 
 
@@ -28,6 +31,9 @@ def validate_content(label: str, content: str) -> None:
     missing = [marker for marker in REQUIRED_MARKERS if marker not in content]
     if missing:
         raise ValueError(f"{label} is missing required markers: {', '.join(missing)}")
+    for obsolete in ("cannot read your screen", "does not collect, transmit, or share personal data"):
+        if obsolete in content:
+            raise ValueError(f"{label} has an obsolete blanket privacy claim: {obsolete}")
 
 
 def validate_repository() -> None:

scripts/tests/check_android_capabilities_test.py

@@ -0,0 +1,43 @@
+import importlib.util
+from pathlib import Path
+import unittest
+import xml.etree.ElementTree as ET
+
+ROOT = Path(__file__).resolve().parents[2]
+spec = importlib.util.spec_from_file_location("capabilities", ROOT / "scripts/check-android-capabilities.py")
+checker = importlib.util.module_from_spec(spec)
+spec.loader.exec_module(checker)
+
+
+class PlayManifestTest(unittest.TestCase):
+    def roots(self):
+        return [ET.parse(ROOT / f"app/src/{flavor}/AndroidManifest.xml").getroot()
+                for flavor in ("main", "googlePlay")]
+
+    def test_current_voice_only_split(self):
+        checker.validate(self.roots())
+
+    def test_transitive_sensitive_permission_rejected(self):
+        for permission in checker.FORBIDDEN:
+            with self.subTest(permission=permission):
+                roots = self.roots()
+                ET.SubElement(roots[-1], "uses-permission", {checker.ANDROID + "name": f"android.permission.{permission}"})
+                with self.assertRaises(ValueError):
+                    checker.validate(roots)
+
+    def test_renamed_accessibility_service_rejected(self):
+        roots = self.roots()
+        ET.SubElement(roots[-1].find("application"), "service", {
+            checker.ANDROID + "name": "third.party.UnexpectedService",
+            checker.ANDROID + "permission": "android.permission.BIND_ACCESSIBILITY_SERVICE",
+        })
+        with self.assertRaises(ValueError):
+            checker.validate(roots)
+
+    def test_exported_microphone_service_rejected(self):
+        roots = self.roots()
+        for node in roots[0].findall("application/service"):
+            if node.get(checker.ANDROID + "name").endswith("VoiceOverlayForegroundService"):
+                node.set(checker.ANDROID + "exported", "true")
+        with self.assertRaises(ValueError):
+            checker.validate(roots)

user-docs/architecture/flavor-differences.md

@@ -6,7 +6,7 @@ Hermes-Relay ships as two product flavors from the same codebase: **googlePlay**
 
 | Flavor | Install ID | Bridge scope |
 |--------|------------|--------------|
-| `googlePlay` | `com.axiomlabs.hermesrelay` | **Bridge Core** only. No AccessibilityService, screen reading, gestures, screenshots, SMS/call/contact/location access, overlays, wake-lock Device Control, or unattended control. |
+| `googlePlay` | `com.axiomlabs.hermesrelay` | **Bridge Core** only. No AccessibilityService or MediaProjection Device Control, gestures, SMS/call/contact/location access, wake-lock Device Control, or unattended control. |
 | `sideload` | `com.axiomlabs.hermesrelay.sideload` | **Device Control**. Adds AccessibilityService-backed screen reads, taps, typing, screenshots, app launch, clipboard/media control, phone utilities, safety rails, and unattended controls. |
 
 ## Build System
@@ -65,14 +65,14 @@ The shared manifest declares the app permissions and services needed by both tra
 
 ```
 INTERNET, ACCESS_NETWORK_STATE, CAMERA, RECORD_AUDIO, MODIFY_AUDIO_SETTINGS,
-POST_NOTIFICATIONS, FOREGROUND_SERVICE, FOREGROUND_SERVICE_SPECIAL_USE
+POST_NOTIFICATIONS, FOREGROUND_SERVICE, FOREGROUND_SERVICE_SPECIAL_USE, FOREGROUND_SERVICE_MICROPHONE
 ```
 
-It also declares the optional notification companion service and `GatewayKeepAliveService`, a `specialUse` foreground service that protects user-started active turns automatically and optionally extends to idle time through "Persistent connection." It ships on **both** flavors. It does not declare the accessibility service, the Device Control bridge foreground service, overlay permission, wake lock, MediaProjection foreground-service type, contacts, location, SMS, or call permissions.
+It also declares the optional notification companion service and `GatewayKeepAliveService`, a `specialUse` foreground service that protects user-started active turns automatically and optionally extends to idle time through "Persistent connection." It ships on **both** flavors. It does not declare the accessibility service, the Device Control bridge foreground service, wake lock, MediaProjection foreground-service type, contacts, location, SMS, or call permissions. Both tracks declare the voice-only `SYSTEM_ALERT_WINDOW` special access and microphone foreground-service permission.
 
 ### Google Play manifest
 
-The Play manifest does not add Device Control permissions or services. The merged Play manifest should contain no `AccessibilityService`, `BIND_ACCESSIBILITY_SERVICE`, `SYSTEM_ALERT_WINDOW`, `WAKE_LOCK`, `FOREGROUND_SERVICE_MEDIA_PROJECTION`, or `BridgeForegroundService` declaration.
+The Play manifest adds `SYSTEM_ALERT_WINDOW` for user-started Voice Overlay, removes the transitive `WAKE_LOCK`, and adds no Device Control services. The merged Play manifest should contain no `AccessibilityService`, `BIND_ACCESSIBILITY_SERVICE`, `WAKE_LOCK`, `FOREGROUND_SERVICE_MEDIA_PROJECTION`, or `BridgeForegroundService` declaration.
 
 > **Exception — `FOREGROUND_SERVICE_SPECIAL_USE` + `GatewayKeepAliveService` _are_ in the merged Play manifest.** They protect user-started active turns and back the opt-in idle "Persistent connection" feature, which ships on both flavors via the main manifest. This means the Play build carries one `specialUse` foreground service and therefore needs a Play Console foreground-service declaration at submission (see `docs/play-store-listing.md`). The Device Control bridge's `specialUse|mediaProjection` service stays sideload-only.
 
@@ -149,3 +149,27 @@ val bridgeTier6: Boolean get() = current == SIDELOAD
 The server-side `android_*` Device Control tools are registered with a runtime requirement check. Tools other than `android_setup` are visible only when `/bridge/status` reports both `phone_connected=true` and `bridge.device_control_supported=true`.
 
 That means a connected Google Play Bridge Core phone can still show up in relay status and use non-device-control features, but the agent will not see phone-control tools for it.
+
+## Voice presentation is independent of Device Control
+
+Both flavors support in-app Voice Focus and optional voice-only system Overlay.
+`BuildFlavor.voiceSystemOverlay` gates presentation independently of the sideload
+bridge tiers. The overlay cannot dispatch phone-control commands on Play.
+
+Voice Focus explains microphone, notification and display-over-other-apps access
+before opening Android Settings. Returning from Settings never starts a session;
+the user taps Start voice overlay while the app is visible and unlocked. A
+non-exported microphone FGS must be ready before the window appears. Stop voice,
+screen lock, task removal, failed startup and permission loss end the session.
+Returning to Hermes retains protection until the Activity resumes. No overlay
+session survives process death or starts from boot, a Relay request or wake word.
+
+The selected Android Digital Assistant can separately receive bounded text and an
+available screenshot for an explicit compatible unlocked invocation. This uses
+platform Assistant APIs, not AccessibilityService or MediaProjection. User-shared
+files and images likewise remain available in both builds.
+
+`scripts/check-android-capabilities.py` validates the source split and, with
+`--variant googlePlayDebug` or `googlePlayRelease`, the merged manifest. CI builds
+and Play preflight check the merged Play artifact's manifest for forbidden Device
+Control permissions and services while requiring the voice overlay capabilities.

user-docs/architecture/privacy.md

@@ -4,7 +4,7 @@ Hermes-Relay connects only to your own machines — no cloud accounts, no hosted
 
 ## Track split
 
-- **Google Play:** Bridge Core only — chat, voice, standard inbound files, terminal/TUI relay, notification companion, Relay media enhancements, relay sessions, and status. No AccessibilityService, screen reading, taps, typing, screenshots, SMS, calls, contacts, location, overlay, or unattended phone control.
+- **Google Play:** Bridge Core only — chat, voice, standard inbound files, terminal/TUI relay, notification companion, Relay media enhancements, relay sessions, and status. No AccessibilityService or MediaProjection Device Control, taps, typing, SMS, calls, contacts, location, or unattended phone control. Voice-only overlays and bounded user-invoked Android Assistant context are separate optional capabilities.
 - **Sideload:** Device Control — the separate sideload track can include AccessibilityService-backed phone control and the extra Android permissions needed for that surface.
 
 ## What stays on your phone
@@ -48,3 +48,9 @@ From **Settings**, you can export a full connection backup, import a backup, or
 ## Open source
 
 All code is [MIT licensed](https://github.com/Codename-11/hermes-relay) and publicly auditable. See the full [privacy policy](https://hermes-relay.dev/privacy.html).
+
+## Voice Overlay
+
+Voice Overlay is optional in both builds. Start it explicitly from Voice Focus while Hermes-Relay is visible and unlocked. It requires microphone access, display-over-other-apps access and an enabled microphone notification with Stop voice. Audio goes to the configured Hermes server; the overlay does not read or control other apps. Stop voice, closing the overlay, screen lock, task removal or loss of required access ends the overlay voice session. Returning to the app keeps foreground protection until the app is resumed. Granting permissions never starts a session.
+
+If Hermes-Relay is selected as Android’s Digital Assistant, a compatible explicit unlocked assistant-button invocation may include bounded visible text and an available screenshot in one Standard voice turn sent to the configured Hermes server and AI provider. Ordinary wake and keyguard invocations do not request screen context.

user-docs/architecture/security.md

@@ -95,7 +95,7 @@ On sideload, `/ping`, `/current_app`, and `/return_to_hermes` — liveness, intr
 
 ### Sideload-only permissions
 
-The `sideload` build ships a fourth tier of phone-utility tools (`/location`, `/search_contacts`, `/call`, `/send_sms`) that require runtime permissions Google Play's policy forbids without a default-dialer / default-SMS-app justification. These are compiled out of the `googlePlay` build entirely; picking which flavor to install is itself a trust decision.
+The `sideload` build ships a fourth tier of phone-utility tools (`/location`, `/search_contacts`, `/call`, `/send_sms`) that remain outside the Play product boundary. SMS has default-handler/approved-use restrictions; contacts, location and direct calling have separate permission requirements. These are compiled out of the `googlePlay` build entirely; picking which flavor to install is itself a trust decision.
 
 ### Activity log
 

user-docs/features/index.md

@@ -121,7 +121,7 @@ Google Play builds do not include AccessibilityService-backed screen reading or
 | Chat empty state | Logo + suggestion chips |
 | Animated streaming dots | Pulsing 3-dot indicator during streaming |
 | Haptic feedback | On send, copy, stream complete, error |
-| App context prompt | Toggleable system message for mobile context |
+| App context prompt | Opt-in phone details and mobile context for API-only chats; Gateway limitations shown in the context preview |
 
 ## Security
 

user-docs/features/profiles.md

@@ -36,30 +36,44 @@ Or clone from an existing profile:
 hermes profile create coder --clone
 ```
 
-The phone doesn't create profiles — you do that on the server. The phone just picks them up on the next pairing (or the next `auth.ok` round-trip after a relay restart).
+Current Hermes gateways support profile creation in Manage. The upstream Dashboard
+and Gateway expose the profile catalog without requiring Relay.
 
-## What "switching profile" does on the phone
+## What switching profile does on the phone
 
-When a profile is selected, the phone first checks whether the relay advertised that profile's own Hermes API server.
+Standard connections use the selected profile's upstream Dashboard/Gateway
+session namespace. Switching restores its last compatible conversation or opens
+a fresh draft. It preserves the old conversation and does not change its agent.
+The optional API-only compatibility path can use an advertised profile API route.
 
-- **With a profile API server:** chat, session browsing, memory, tools, model, and SOUL come from that profile's routed API. The chat session drawer clears and refetches through that profile route, so you see that profile's sessions instead of the default agent's sessions.
-- **Without a profile API server:** the app falls back to the compatibility overlay. It sends the profile `model.default` and `SOUL.md` on each chat turn, but memory, sessions, tools, and provider auth still come from the active Connection.
-- **Voice:** relay-owned voice routes receive the selected profile too. Voice Settings shows whether TTS/STT, streaming voice output, or realtime voice came from profile config or fell back to relay/global defaults. Saving voice output or experimental realtime settings while a named profile is active writes that profile's `voice_output:` / `realtime_voice:` section, so profiles like `mizuki` and `victor` can keep different voices.
+## Identity and server default
 
-**If you want true profile isolation,** run that profile's gateway as its own service on its own port:
+Android uses Hermes `display_name`, then the exact profile request name.
+Descriptions summarize a profile; they are not names. A connection name identifies
+the server and does not become the agent name. Without a known profile or
+personality identity, Android shows **Hermes**. Local display aliases remain
+phone-only overrides.
 
-```bash
-hermes -p mizu platform start api --port 8643
-```
+**Server default** is a role. The switcher shows the resolved agent once with that
+role as secondary text. **Follow server default** switches between following the
+server setting and explicitly selecting that agent. It never changes the server
+setting. Both choices retain independent conversation, draft, lock, and local
+presentation keys.
 
-Then make sure the relay advertises that API server in the profile metadata, or add that gateway as a separate **Connection** on the phone. Each routed profile API has its own sessions, memory, and state because it is a distinct gateway.
+The exact name `default` addresses the root profile and remains selectable when
+another profile is the server default. Hermes' sticky `active` setting may differ
+from the running server's `current` launch profile. Android resolves the sticky
+setting when available. Older hosts without that metadata retain launch-profile
+behavior and an unresolved **Server default** choice. A missing catalog does not
+justify borrowing root profile metadata or its avatar. Shared-avatar changes
+require a resolved default or an explicit profile selection.
 
 ## Profile Shelf behaviour
 
 - **Collapsible and compact.** Tap the avatar/name in the Chat header to expand or collapse the shelf. The hamburger still opens only the active profile's Session Drawer.
 - **Active capsule.** The active avatar/name/chevron opens Agent Passport. Inactive agents are 48 dp avatar targets; the fixed overflow opens the same full switcher used by Passport's **Switch agent** control.
 - **Hidden for one effective identity.** The shelf takes no space when only one visible identity remains. Saved ordering and hidden preferences are honored, but a hidden active profile stays visible until you switch away.
-- **Server default is distinct.** The home-glyph **Server default** choice follows the server's sticky default without changing it. A profile literally named `default` is a separate explicit profile with its own session and presentation state.
+- **Server default is a role.** The resolved agent carries a home badge. Its follow-default control preserves implicit and explicit selections.
 - **Transport-safe switching.** Gateway turns can continue in the background and reconcile to their original conversation, so profile switching remains available. SSE switching is disabled only while an SSE turn is live.
 - **No live-session hot swap.** Switching restores the destination profile's last compatible Gateway or SSE session, or opens a fresh draft. It never changes the agent inside the conversation currently on screen.
 - **Session controls reset.** Model, personality, reasoning, approval, Fast, and YOLO choices from the old session do not leak into the new profile.
@@ -106,8 +120,8 @@ Very large files (SOUL or a memory entry) are still truncated server-side; when
 
 The Profile Shelf and its canonical full switcher use these conventions:
 
-- **Server default** — the no-override row with a home glyph. It follows the server's current sticky default without changing that setting.
-- Actual profiles use their configured display description when available, then their profile name. A local agent icon wins over the display initial, and the full switcher can show the profile's model without inventing presence or activity state.
+- **Server default** is secondary status on the resolved agent. Grouping uses exact request names, never matching display labels.
+- Profiles use upstream display names, then exact request names. Supporting text disambiguates a display name from its request name. Shared avatars and phone-local overrides retain their existing precedence and scope.
 - When the server emits a `profiles.updated` push (profile added, renamed, or removed on the server side), the app applies the new list immediately and shows a brief "Profiles updated" snackbar. A profile you had selected that the server then removes falls back to Server default automatically.
 
 The Settings card is visible whether or not a profile is currently active; when there's no active profile, the card renders at half opacity with "No active agent" and does nothing when tapped.
@@ -130,7 +144,7 @@ If you select a profile AND a personality, the **profile wins** — its `SOUL.md
 ## At a glance
 
 - **Connection** = a whole Hermes server.
-- **Profile** = a named agent *on* that server, discovered from `~/.hermes/profiles/`. Picking one overlays its model + SOUL for chat turns.
+- **Profile** = a named agent *on* that server, discovered from `~/.hermes/profiles/`. Picking one selects its upstream session namespace on standard connections.
 - **Personality** = a system-prompt preset *within* the agent's config.
 
 See [Connections](./connections.md) for the server-level concept and [Personalities](./personalities.md) for the preset-prompt layer.

user-docs/features/voice.md

@@ -547,3 +547,9 @@ provider (ElevenLabs, OpenAI, Groq, Mistral), your audio goes to them. If you're
 using local providers (faster-whisper, NeuTTS, Edge TTS), nothing leaves your network.
 
 The mp3 files returned from `/voice/synthesize` are cached briefly in the app's cache directory and cleared automatically as new ones arrive (capped at 6 at a time). On the server side, the relay writes each `/voice/synthesize` render to a private temp file and deletes it after streaming, so relay synthesis no longer accumulates files in `~/voice-memos/` (other Hermes agent voice features may still use that directory).
+
+## Voice over other apps
+
+Voice Overlay is optional in both builds. Start it explicitly from Voice Focus while Hermes-Relay is visible and unlocked. It requires microphone access, display-over-other-apps access and an enabled microphone notification with Stop voice. Audio goes to the configured Hermes server; the overlay does not read or control other apps. Stop voice, closing the overlay, screen lock, task removal or loss of required access ends the overlay voice session. Returning to the app keeps foreground protection until the app is resumed. Granting permissions never starts a session.
+
+Open **Chat → Voice Focus → Overlay**. Review the explanation, grant only the missing permissions in Android, return, and tap **Start voice overlay**. Permission refusal leaves in-app voice available. Review access later in **Settings → Voice → Listening** or **Settings → Permissions**. The expanded panel can reset its position. Every panel size exposes Stop voice.

user-docs/guide/chat.md

@@ -248,15 +248,22 @@ Each assistant message shows token usage below the timestamp:
 
 ## App context prompt
 
-When enabled (**Settings → Chat → App context prompt**, on by default),
-Hermes-Relay tells the agent it's talking to a phone so replies stay
-mobile-friendly and concise, and can attach optional bridge/permission and
-safety-rail summaries. On the standard (API-server) connection this rides an
-invisible system message. The Gateway connection carries no app-context preamble
-— its protocol has no hidden per-turn slot, and adding one would leave the text
-in your saved chat history — so there the agent reads phone state on demand via
-the `android_phone_status` tool. Privacy-sensitive fields (foreground app,
-battery) default off and are only added when you opt in.
+**Settings → Chat → Share phone status with agent** controls an extra system
+message in API-only chats. It identifies Hermes-Relay Android to the agent and
+can include optional phone status. Foreground app and battery sharing default
+off and are included only when you opt in. Turning the master switch off also
+removes the Android preamble.
+
+Standard Gateway chats do not send this block: upstream has no general
+per-turn context slot. The **Injected context** sheet marks phone status and
+turn context as unsupported on Gateway, and Settings labels its sample as an
+API-only example. The sheet is a preview, not proof of delivery or a complete
+view of the agent prompt; persona and Relay configuration are server-owned.
+
+The optional Relay `android_phone_status` tool can provide phone state when
+enabled for the selected profile. Its presence does not identify who sent the
+current message. Automatic Android identification on Gateway still needs an
+upstream client-surface contract; pairing alone does not provide it.
 
 ## Persistent connection
 

user-docs/privacy.md

@@ -6,7 +6,7 @@ description: Privacy policy for the Hermes-Relay Android app
 
 # Privacy Policy
 
-**Hermes-Relay** · Effective date: July 18, 2026
+**Hermes-Relay** · Effective date: September 12, 2026
 
 Hermes-Relay is a native Android app that connects to your own [Hermes Agent](https://github.com/NousResearch/hermes-agent) host. This policy describes how the app handles your data.
 
@@ -64,6 +64,7 @@ Google Play build:
 | Network State | Detect connectivity for reconnect behavior | Yes |
 | Camera | QR code scanning for server pairing | No |
 | Microphone | Voice mode speech-to-text and opt-in local “Hey Hermes” detection | No |
+| Display over other apps | Optional user-started Voice Overlay, with microphone notification and Stop voice | No |
 | Notification Access | Optional notification companion metadata forwarding to your paired relay | No |
 | Android Digital Assistant role | Optional assistant session; compatible unlocked assistant-button invocations may include one-turn screen context | No |
 
@@ -75,7 +76,9 @@ microphone while the mode is enabled. Pre-activation wake audio is not sent to
 Hermes, Relay, or a hosted service. The Digital Assistant listener and the
 notification-based experimental listener cannot be active together.
 
-Sideload Device Control builds may request additional permissions for overlay, foreground service, wake lock, screenshots, contacts, location, SMS, and calls. Those permissions are not present in the Google Play build.
+Both builds declare foreground-service permissions for user-started voice and connection tasks. Both offer an optional voice-only overlay. Sideload Device Control adds accessibility, wake lock, MediaProjection screenshots, contacts, location, SMS and calls; these Device Control permissions are absent from Play.
+
+Voice Overlay is optional in both builds. Start it explicitly from Voice Focus while Hermes-Relay is visible and unlocked. It requires microphone access, display-over-other-apps access and an enabled microphone notification with Stop voice. Audio goes to the configured Hermes server; the overlay does not read or control other apps. Stop voice, closing the overlay, screen lock, task removal or loss of required access ends the overlay voice session. Returning to the app keeps foreground protection until the app is resumed. Granting permissions never starts a session.
 
 ## Third-Party Services