fix(chat): apply model pick on new chats, render relay images, smooth profile switch

UI/UX fixes from a profile-switching + chat-composer audit, verified against
upstream tui_gateway/server.py.

* Model picker now applies on a fresh chat. The gateway model is a per-session
  override; we set it via config.set on live sessions only, so a brand-new
  chat's config.set carried no session_id (upstream no-ops it) and
  session.create omitted the model -> the agent ran on the account's global
  default. Added a live GatewayChatClient.sessionModelProvider (mirrors
  sessionProfileProvider) that binds model/provider onto session.create, which
  upstream honors as the session's model_override -- matching the desktop
  client. Mid-session switches still use config.set; a profile switch retires
  an explicit pick (the profile owns its model) and seeds the picker label
  up-front so it doesn't lag the round-trip. SSE paths already carried the
  model. GatewayChatClientTest gains 3 model-binding cases.

* Server-local images render through the relay. Markdown ![](/path) images only
  understood http(s) -> a server path fell to an "image is on the server"
  notice that never consulted the relay (only the MEDIA: marker path did).
  Added a RelayServerImageResolver CompositionLocal (provided by ChatScreen from
  ChatViewModel.resolveServerImage) that fetches an absolute path via the relay
  /media/by-path route, decodes, caches (bounded LRU), and renders inline with
  tap-to-zoom. On SSE the agent is also told it can surface images/files by path
  when a relay route is configured (shown in the "What the agent sees" sheet).
  Standard no-plugin connections are unchanged.

* Smoother profile switch. switchProfileContext no longer clears the message
  list before the async history fetch; the previous transcript is held and
  swapped atomically, so the LazyColumn's animateItem() cross-fades old->new
  instead of blanking to an empty/Loading state.

Verified: :app:compileSideloadDebugKotlin + unit-test compile + the
GatewayChatClientTest suite are green.

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

.gitattributes

@@ -0,0 +1 @@
+*.sh text eol=lf

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,90 @@
+name: Bug report
+description: Report a reproducible problem in Hermes-Relay.
+title: "[Bug]: "
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before submitting, remove secrets, access tokens, real hostnames/IPs, private deployment names, and personal names. Public example IPs such as `192.168.1.100` are fine.
+
+  - type: dropdown
+    id: area
+    attributes:
+      label: Affected area
+      description: Pick the closest surface.
+      options:
+        - Android app
+        - Standard Hermes chat or voice
+        - Relay plugin or server
+        - Desktop CLI or tray
+        - Dashboard plugin
+        - Docs or installer
+        - CI, release, or packaging
+        - Unsure
+    validations:
+      required: true
+
+  - type: textarea
+    id: summary
+    attributes:
+      label: What happened?
+      description: State the behavior you saw and what you expected instead.
+      placeholder: |
+        Observed:
+
+        Expected:
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps
+    attributes:
+      label: Reproduction steps
+      description: Include the smallest sequence that reproduces the issue.
+      placeholder: |
+        1. Pair or configure...
+        2. Open...
+        3. Tap or run...
+        4. See...
+    validations:
+      required: true
+
+  - type: textarea
+    id: environment
+    attributes:
+      label: Environment
+      description: Include only the fields that apply.
+      value: |
+        - Hermes-Relay version/tag:
+        - Install surface: Google Play / sideload APK / local build / plugin / desktop CLI
+        - Android device and OS:
+        - hermes-agent version or commit:
+        - Connection mode: LAN / Tailscale / public TLS / other
+    validations:
+      required: true
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Sanitized logs, screenshots, or traces
+      description: Paste the smallest useful log excerpt. Remove tokens, private URLs, hostnames, IPs, and user-identifying data.
+      render: shell
+
+  - type: textarea
+    id: upstream
+    attributes:
+      label: Upstream or standard-path notes
+      description: If relevant, note whether this reproduces against unmodified upstream hermes-agent or only with the relay plugin enabled.
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Checklist
+      options:
+        - label: I searched existing issues first.
+          required: true
+        - label: I removed secrets, tokens, private infrastructure, and personal names.
+          required: true
+        - label: I included the affected version or install surface where known.
+          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Security guidance
+    url: https://github.com/Codename-11/hermes-relay/blob/main/docs/security.md
+    about: Review the security model before posting sensitive vulnerability details publicly.
+  - name: User documentation
+    url: https://codename-11.github.io/hermes-relay/
+    about: Read setup, pairing, remote access, and troubleshooting docs.
+  - name: Contributing guide
+    url: https://github.com/Codename-11/hermes-relay/blob/main/CONTRIBUTING.md
+    about: Review local setup, branch, commit, changelog, and test conventions.

.github/ISSUE_TEMPLATE/docs.yml

@@ -0,0 +1,64 @@
+name: Documentation or setup issue
+description: Report unclear, stale, or missing docs and setup guidance.
+title: "[Docs]: "
+labels: ["documentation"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Use this for docs, installer, setup, release-note, or contribution-guide problems. Remove private hostnames/IPs, tokens, and personal names before posting.
+
+  - type: dropdown
+    id: area
+    attributes:
+      label: Documentation area
+      options:
+        - README
+        - User docs site
+        - Android setup
+        - Relay plugin setup
+        - Desktop CLI or tray setup
+        - Release notes or changelog
+        - Contributor docs
+        - Other
+    validations:
+      required: true
+
+  - type: input
+    id: location
+    attributes:
+      label: Page, file, or section
+      description: Link the page or name the file and heading.
+      placeholder: user-docs/guide/getting-started.md, README install section, etc.
+    validations:
+      required: true
+
+  - type: textarea
+    id: issue
+    attributes:
+      label: What is wrong or missing?
+      description: Explain what was unclear, outdated, misleading, or absent.
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: Suggested correction
+      description: Optional. Include the wording, command, screenshot need, or structure that would help.
+
+  - type: textarea
+    id: context
+    attributes:
+      label: Context
+      description: Optional. Include the version, install path, device, or command you were following.
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Checklist
+      options:
+        - label: I checked that this is not already covered in current docs.
+          required: true
+        - label: I removed secrets, private hostnames/IPs, internal deployment names, and personal names.
+          required: true

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,78 @@
+name: Feature request
+description: Propose a product, workflow, or platform improvement.
+title: "[Feature]: "
+labels: ["enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Keep requests focused on user-visible outcomes. Do not include private infrastructure, secrets, personal names, or branch/workspace plumbing.
+
+  - type: dropdown
+    id: area
+    attributes:
+      label: Affected area
+      options:
+        - Android app
+        - Standard Hermes chat or voice
+        - Relay plugin or server
+        - Desktop CLI or tray
+        - Dashboard plugin
+        - Docs or installer
+        - CI, release, or packaging
+        - Unsure
+    validations:
+      required: true
+
+  - type: textarea
+    id: problem
+    attributes:
+      label: Problem or workflow
+      description: What is hard, missing, slow, confusing, or unsafe today?
+      placeholder: Describe the concrete user workflow this would improve.
+    validations:
+      required: true
+
+  - type: textarea
+    id: proposal
+    attributes:
+      label: Proposed behavior
+      description: Describe the outcome, not just an implementation detail.
+      placeholder: After this change, a user should be able to...
+    validations:
+      required: true
+
+  - type: textarea
+    id: standard_path
+    attributes:
+      label: Standard upstream compatibility
+      description: If this touches chat, voice, dashboard, API routes, or server behavior, note whether it can work against unmodified upstream hermes-agent.
+      placeholder: This should work on vanilla upstream because... / This requires the relay plugin because...
+
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Alternatives considered
+      description: Optional. Mention current workarounds or related approaches.
+
+  - type: textarea
+    id: acceptance
+    attributes:
+      label: Acceptance criteria
+      description: What would make the request complete?
+      placeholder: |
+        - Users can...
+        - The app/server handles...
+        - Documentation covers...
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Checklist
+      options:
+        - label: I searched existing issues first.
+          required: true
+        - label: I described the user outcome and affected surface.
+          required: true
+        - label: I removed private infrastructure details and personal names.
+          required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,11 +6,20 @@
 
 -
 
+## Verification
+
+<!-- List the checks you ran, or explain why a check is not applicable. -->
+
+-
+
 ## Checklist
 
-- [ ] `./gradlew assembleDebug` succeeds
-- [ ] `./gradlew test` passes
-- [ ] Tested on emulator or device (if UI change)
+- [ ] Target branch is `dev` unless this is a release PR
+- [ ] Android changes: lint and focused unit tests ran, or rationale is listed above
+- [ ] Server changes: focused `python -m unittest ...` checks ran, or rationale is listed above
+- [ ] Desktop changes: `npm run build` or a narrower documented check ran, or rationale is listed above
+- [ ] Docs/site changes: docs build or link check ran, or rationale is listed above
+- [ ] UI changes were tested on emulator/device or desktop surface when applicable
 - [ ] Commit messages follow [Conventional Commits](https://www.conventionalcommits.org/)
 - [ ] CHANGELOG.md updated (if user-facing)
-- [ ] No credentials or secrets in committed files
+- [ ] Public writing hygiene checked: no secrets, private infrastructure, personal names, or AI/process narration

.github/copilot-instructions.md

@@ -0,0 +1,22 @@
+# GitHub Copilot instructions — Hermes-Relay
+
+This file exists so GitHub Copilot (which reads `.github/copilot-instructions.md`,
+not `AGENTS.md`) picks up the project's agent guidance.
+
+**Read [AGENTS.md](../AGENTS.md) first — it is the single source of truth**
+for agent guidance: the entry point, the non-negotiables, and the public-repo
+writing hygiene. It links on to `CLAUDE.md` for the deep reference
+(architecture, upstream Hermes API, repository layout, per-language code style,
+the dev loop, and the Key Files map). Follow those; don't restate them here.
+
+Quick non-negotiables (the full list and rationale are in `AGENTS.md`):
+
+- **Standard path = vanilla upstream only.** The default no-plugin connection
+  must work against unmodified upstream hermes-agent; server-side needs go
+  through upstream PRs or the optional relay plugin, never fork patches.
+- **Conventional Commits**, `main`/`dev` branching — feature branches off
+  `dev`, `--no-ff` merges, tags cut from `main`.
+- **Android:** Jetpack Compose (no XML), kotlinx.serialization (no Gson),
+  OkHttp (no Ktor), `wss://` only; run `./gradlew lint` before pushing Kotlin.
+- **Public repo:** no personal names, no private infrastructure, no
+  AI/assistant self-narration in committed prose.

.github/workflows/ci-android.yml

@@ -3,7 +3,9 @@
 # Runs on pushes to main/dev and on PRs targeting main/dev, scoped to
 # Android-affecting paths so Python-only changes don't spin up the JVM.
 #
-# Pipeline: lint -> build + test (parallel) -> upload artifacts
+# Pipeline: lint, build, and focused tests run concurrently. PRs build debug
+# APKs before merge; dev pushes keep lint/tests only to avoid duplicate
+# post-merge packaging. Main pushes keep APK artifacts.
 
 name: CI — Android
 
@@ -38,11 +40,12 @@ concurrency:
 
 jobs:
   # ──────────────────────────────────────────────
-  # Android Lint — gate for build and test jobs
+  # Android Lint
   # ──────────────────────────────────────────────
   lint:
     name: Lint (Android)
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
@@ -55,25 +58,20 @@ jobs:
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v6
+        with:
+          cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/dev' }}
 
-      # Prefer ktlintCheck if configured; fall back to Android lint
-      - name: Run lint checks
-        run: |
-          if ./gradlew tasks --all 2>/dev/null | grep -q "ktlintCheck"; then
-            echo "Running ktlintCheck..."
-            ./gradlew ktlintCheck
-          else
-            echo "ktlintCheck not found, falling back to Android lint..."
-            ./gradlew lint
-          fi
+      - name: Run Android lint
+        run: ./gradlew lint --console=plain
 
   # ──────────────────────────────────────────────
-  # Android Build — assembleDebug + upload APK
+  # Android Build — assembleDebug for PRs and main pushes
   # ──────────────────────────────────────────────
   build:
     name: Build (Android)
-    needs: lint
+    if: ${{ github.event_name == 'pull_request' || github.ref == 'refs/heads/main' }}
     runs-on: ubuntu-latest
+    timeout-minutes: 25
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
@@ -86,12 +84,15 @@ jobs:
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v6
+        with:
+          cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/dev' }}
 
       - name: Build debug APK
-        run: ./gradlew assembleDebug
+        run: ./gradlew assembleDebug --console=plain
 
       - name: Upload debug APK
         uses: actions/upload-artifact@v7
+        if: ${{ github.ref == 'refs/heads/main' }}
         with:
           name: debug-apk
           # Product flavors (googlePlay, sideload) nest APKs under
@@ -109,7 +110,6 @@ jobs:
   # ──────────────────────────────────────────────
   test:
     name: Test (Android)
-    needs: lint
     runs-on: ubuntu-latest
     timeout-minutes: 20
     # Advisory on dev, strict on main. Evaluates to false (= strict) for
@@ -128,6 +128,8 @@ jobs:
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v6
+        with:
+          cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/dev' }}
 
       # The broad Gradle `test` aggregate currently hangs in deferred JVM test
       # suites tracked by issue #32. Keep CI release-relevant until that suite is
@@ -136,14 +138,16 @@ jobs:
       - name: Run focused Android unit tests
         run: |
           ./gradlew :app:testSideloadDebugUnitTest \
-            --tests com.hermesandroid.relay.network.RelayUrlDeriverTest \
+            --tests com.hermesandroid.relay.network.ArchitectureBoundaryTest \
+            --tests com.hermesandroid.relay.network.relay.RelayUrlDeriverTest \
             --tests com.hermesandroid.relay.viewmodel.ConnectionSwitchTest \
             --console=plain
 
-      # Upload test reports even if tests fail, for debugging
+      # Upload reports only for failures. Successful PR report uploads add
+      # noticeable latency and are rarely inspected.
       - name: Upload test reports
         uses: actions/upload-artifact@v7
-        if: always()
+        if: failure()
         with:
           name: test-reports
           path: app/build/reports/tests/

.github/workflows/ci-contract.yml

@@ -0,0 +1,89 @@
+# Hermes-Relay — Vanilla-Upstream Route Contract (ADR 34)
+#
+# Proves the Android *standard path* (no-plugin) route surface exists on
+# UNMODIFIED NousResearch/hermes-agent — the invariant CLAUDE.md asserts but
+# that was never tested. Source-parses upstream's declared routes (no server
+# boot, no pip install, no model keys); see scripts/check-upstream-route-contract.py
+# for the design + tradeoff (catches renamed/removed routes; not runtime auth).
+#
+# PR/push runs check a pinned ref (non-flaky); the weekly schedule tracks
+# upstream `main` as a drift siren so a route rename surfaces on our clock.
+
+name: CI — Upstream Contract
+
+on:
+  push:
+    branches: [main, dev]
+    paths:
+      - "scripts/check-upstream-route-contract.py"
+      - ".github/workflows/ci-contract.yml"
+      - "app/src/main/kotlin/com/hermesandroid/relay/network/upstream/**"
+  pull_request:
+    branches: [main, dev]
+    paths:
+      - "scripts/check-upstream-route-contract.py"
+      - ".github/workflows/ci-contract.yml"
+      - "app/src/main/kotlin/com/hermesandroid/relay/network/upstream/**"
+  schedule:
+    - cron: "0 6 * * 1" # Mondays 06:00 UTC — upstream-drift siren (tracks main)
+  workflow_dispatch:
+    inputs:
+      upstream_ref:
+        description: "NousResearch/hermes-agent ref to check (branch, tag, or SHA)"
+        required: false
+        default: ""
+
+concurrency:
+  group: ci-contract-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/dev' }}
+
+jobs:
+  route-contract:
+    name: Vanilla-upstream route contract
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - name: Checkout hermes-relay
+        uses: actions/checkout@v6
+
+      - name: Resolve upstream ref
+        id: ref
+        run: |
+          # PR/push runs use a known-good NousResearch/hermes-agent commit so
+          # normal CI is stable. The weekly schedule below intentionally tracks
+          # main as the upstream-drift siren.
+          DEFAULT_REF="ef4b897a1843cd32c4f141f55db60f0f0602cc98"
+          if [ "${{ github.event_name }}" = "schedule" ]; then
+            REF="main"                                   # weekly drift siren
+          elif [ -n "${{ github.event.inputs.upstream_ref }}" ]; then
+            REF="${{ github.event.inputs.upstream_ref }}" # manual override
+          else
+            REF="$DEFAULT_REF"
+          fi
+          echo "ref=$REF" >> "$GITHUB_OUTPUT"
+          echo "Checking standard-path route contract against upstream ref: $REF"
+
+      - name: Checkout vanilla upstream (no plugin, no bootstrap)
+        uses: actions/checkout@v6
+        with:
+          repository: NousResearch/hermes-agent
+          ref: ${{ steps.ref.outputs.ref }}
+          path: _upstream
+          fetch-depth: 1
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.11"
+
+      - name: Assert upstream checkout is vanilla (no relay bootstrap/plugin)
+        run: |
+          if [ -e "_upstream/hermes_relay_bootstrap" ] || \
+             [ -e "_upstream/plugin/hermes_relay_bootstrap" ] || \
+             find _upstream -name "hermes_relay_bootstrap.pth" 2>/dev/null | grep -q .; then
+            echo "FAIL: upstream checkout contains a relay bootstrap — not vanilla."; exit 1
+          fi
+          echo "OK: upstream checkout carries no relay plugin/bootstrap."
+
+      - name: Run route-surface contract
+        run: python scripts/check-upstream-route-contract.py "_upstream"

.github/workflows/ci-dashboard.yml

@@ -5,13 +5,11 @@ on:
     branches: [main, dev]
     paths:
       - "plugin/dashboard/**"
-      - "scripts/check-server-version-sync.py"
       - ".github/workflows/ci-dashboard.yml"
   pull_request:
     branches: [main, dev]
     paths:
       - "plugin/dashboard/**"
-      - "scripts/check-server-version-sync.py"
       - ".github/workflows/ci-dashboard.yml"
 
 permissions:
@@ -49,11 +47,15 @@ jobs:
         with:
           python-version: "3.11"
 
-      - name: Verify server-owned version metadata
-        run: python scripts/check-server-version-sync.py
+      - name: Verify plugin-owned version metadata
+        run: python scripts/check-plugin-version-sync.py
 
       - name: Install dashboard API test deps
-        run: pip install -r relay_server/requirements.txt fastapi httpx pytest requests
+        # The suite imports the `plugin` package transitively: __init__ loads
+        # android_tool/desktop_tool (`import requests`), and one test imports
+        # `plugin.relay`, whose server.py needs `aiohttp` (+ pyyaml) from
+        # relay_server/requirements.txt. fastapi+httpx cover plugin_api itself.
+        run: pip install -r relay_server/requirements.txt fastapi httpx requests
 
       - name: Run dashboard API tests
         run: python -m unittest plugin.dashboard.test_plugin_api

.github/workflows/ci-desktop.yml

@@ -14,6 +14,10 @@ on:
 permissions:
   contents: read
 
+concurrency:
+  group: ci-desktop-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/dev' }}
+
 jobs:
   typecheck-and-build:
     name: Type-check + build
@@ -25,7 +29,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '22'
           cache: npm
@@ -47,16 +51,8 @@ jobs:
         # prebuilt dist/ that references a source file that moved.
         run: node bin/hermes-relay.js --version
 
-      - name: Upload dist/
-        uses: actions/upload-artifact@v4
-        with:
-          name: desktop-dist
-          path: desktop/dist
-          retention-days: 7
-
   smoke-help:
     name: Smoke — --help + --version work on every target OS
-    needs: typecheck-and-build
     strategy:
       fail-fast: false
       matrix:
@@ -69,7 +65,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '22'
           cache: npm

.github/workflows/ci-plugin.yml

@@ -1,12 +1,12 @@
-# Hermes-Relay — Python Server CI Pipeline
+# Hermes-Relay — Plugin CI Pipeline
 #
 # Runs on pushes to main/dev and on PRs targeting main/dev, scoped to
-# server-affecting paths so Android-only changes don't spin up the
+# plugin-affecting paths so Android-only changes don't spin up the
 # Python toolchain.
 #
-# Pipeline: syntax-check -> focused server tests
+# Pipeline: syntax-check and focused plugin tests run concurrently.
 
-name: CI — Server
+name: CI — Plugin
 
 on:
   push:
@@ -17,18 +17,17 @@ on:
       - "plugin/cli.py"
       - "plugin/pair.py"
       - "plugin/plugin.yaml"
-      - "plugin/dashboard/manifest.json"
-      - "plugin/dashboard/package.json"
-      - "plugin/dashboard/package-lock.json"
       - "plugin/relay/**"
       - "plugin/tools/**"
       - "plugin/tests/**"
       - "relay_server/**"
       - "hermes_relay_bootstrap/**"
       - "pyproject.toml"
+      - "scripts/check-plugin-version-sync.py"
       - "scripts/check-server-version-sync.py"
+      - "scripts/bump-plugin-version.sh"
       - "scripts/bump-server-version.sh"
-      - ".github/workflows/ci-server.yml"
+      - ".github/workflows/ci-plugin.yml"
   pull_request:
     branches: [main, dev]
     paths:
@@ -37,27 +36,26 @@ on:
       - "plugin/cli.py"
       - "plugin/pair.py"
       - "plugin/plugin.yaml"
-      - "plugin/dashboard/manifest.json"
-      - "plugin/dashboard/package.json"
-      - "plugin/dashboard/package-lock.json"
       - "plugin/relay/**"
       - "plugin/tools/**"
       - "plugin/tests/**"
       - "relay_server/**"
       - "hermes_relay_bootstrap/**"
       - "pyproject.toml"
+      - "scripts/check-plugin-version-sync.py"
       - "scripts/check-server-version-sync.py"
+      - "scripts/bump-plugin-version.sh"
       - "scripts/bump-server-version.sh"
-      - ".github/workflows/ci-server.yml"
+      - ".github/workflows/ci-plugin.yml"
 
 # Cancel in-progress runs for the same branch/PR, but let main and dev finish
 concurrency:
-  group: ci-server-${{ github.ref }}
+  group: ci-plugin-${{ github.ref }}
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/dev' }}
 
 jobs:
   # ──────────────────────────────────────────────
-  # Python Server — py_compile syntax sanity
+  # Python Plugin — py_compile syntax sanity
   # ──────────────────────────────────────────────
   syntax-check:
     name: Syntax check (Python)
@@ -72,10 +70,7 @@ jobs:
         with:
           python-version: "3.11"
 
-      - name: Install dependencies
-        run: pip install -r relay_server/requirements.txt
-
-      - name: Syntax check (server/plugin.relay — canonical location)
+      - name: Syntax check (plugin relay — canonical location)
         run: |
           python -m py_compile plugin/relay/server.py
           python -m py_compile plugin/relay/channels/terminal.py
@@ -87,19 +82,18 @@ jobs:
       - name: Syntax check (relay_server shim)
         run: python -m py_compile relay_server/__init__.py relay_server/__main__.py
 
-      - name: Validate Server version metadata
-        run: python scripts/check-server-version-sync.py
+      - name: Validate Plugin version metadata
+        run: python scripts/check-plugin-version-sync.py
 
   # ──────────────────────────────────────────────
-  # Python Server — focused route/auth/session tests
+  # Python Plugin — focused route/auth/session tests
   #
   # Tests are ADVISORY on dev (push or PR) so WIP commits don't block the
   # merge queue. Strict on main — the dev → main release-merge PR surfaces
   # any real failures before release.
   # ──────────────────────────────────────────────
   unit-tests:
-    name: Focused Server tests (Python)
-    needs: syntax-check
+    name: Focused Plugin tests (Python)
     runs-on: ubuntu-latest
     timeout-minutes: 10
     # Advisory on dev, strict on main. Evaluates to false (= strict) for
@@ -120,7 +114,7 @@ jobs:
           pip install -r relay_server/requirements.txt
           pip install pytest responses
 
-      - name: Run focused Server tests
+      - name: Run focused Plugin tests
         run: |
           python -m pytest \
             plugin/tests/test_relay_security.py \

.github/workflows/ci-required.yml

@@ -2,7 +2,7 @@
 # branch protection on `main` has a check name it can rely on, regardless
 # of which paths the PR touches.
 #
-# Why this exists. The other CI workflows (`ci-android.yml`, `ci-server.yml`,
+# Why this exists. The other CI workflows (`ci-android.yml`, `ci-plugin.yml`,
 # `ci-desktop.yml`) are scoped via `paths:` filters so a docs-only or
 # desktop-only PR doesn't spin up the Android toolchain. Branch protection's
 # "required status checks" treat a check that doesn't run as failing — so

.github/workflows/claude-code-review.yml

@@ -30,6 +30,11 @@ jobs:
       # alone — a title-format match (e.g. "release:") is fragile and silently
       # let a "Release v1.0.0 …"-titled PR run the full review and time out.
       IS_RELEASE_PR: ${{ github.event.pull_request.base.ref == 'main' && github.event.pull_request.head.ref == 'dev' }}
+      # Bot-authored PRs such as Dependabot do not receive the same secret
+      # surface as human-authored PRs, and Claude Code rejects bot actors unless
+      # explicitly allow-listed. Keep the required check green with a no-op and
+      # rely on the dependency CI/status checks for those PRs.
+      IS_BOT_PR: ${{ github.event.pull_request.user.type == 'Bot' }}
 
     steps:
       - name: Skip aggregate release PR review
@@ -38,14 +43,40 @@ jobs:
           echo "Skipping Claude Code Review for aggregate dev -> main release PR."
           echo "Feature work is reviewed before it lands on dev; release PRs are gated by CI and release metadata checks."
 
+      - name: Skip bot-authored PR review
+        if: env.IS_BOT_PR == 'true'
+        run: |
+          echo "Skipping Claude Code Review for bot-authored PR."
+          echo "Bot PRs are gated by Required checks plus their path-specific CI jobs."
+
       - name: Checkout repository
-        if: env.IS_RELEASE_PR != 'true'
+        if: env.IS_RELEASE_PR != 'true' && env.IS_BOT_PR != 'true'
         uses: actions/checkout@v4
         with:
-          fetch-depth: 1
+          # Depth 2 includes the pull_request merge commit's first parent, which
+          # lets the next step detect whether this PR changes the workflow file.
+          fetch-depth: 2
+
+      - name: Detect Claude review workflow changes
+        if: env.IS_RELEASE_PR != 'true' && env.IS_BOT_PR != 'true'
+        id: changed-workflow
+        shell: bash
+        run: |
+          if git rev-parse --verify HEAD^1 >/dev/null 2>&1 &&
+             git diff --name-only HEAD^1 HEAD | grep -Fxq ".github/workflows/claude-code-review.yml"; then
+            echo "claude_review_workflow=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "claude_review_workflow=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Skip Claude review workflow self-change
+        if: env.IS_RELEASE_PR != 'true' && env.IS_BOT_PR != 'true' && steps.changed-workflow.outputs.claude_review_workflow == 'true'
+        run: |
+          echo "Skipping Claude Code Review because this PR changes the review workflow itself."
+          echo "The Claude action requires this workflow file to match the default branch before it can exchange the app token."
 
       - name: Run Claude Code Review
-        if: env.IS_RELEASE_PR != 'true'
+        if: env.IS_RELEASE_PR != 'true' && env.IS_BOT_PR != 'true' && steps.changed-workflow.outputs.claude_review_workflow != 'true'
         timeout-minutes: 15
         id: claude-review
         uses: anthropics/claude-code-action@v1

.github/workflows/docs.yml

@@ -36,14 +36,14 @@ jobs:
           fetch-depth: 0  # Full history for lastUpdated timestamps
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: 20
           cache: npm
           cache-dependency-path: user-docs/package-lock.json
 
       - name: Install dependencies
-        run: npm install
+        run: npm ci
         working-directory: user-docs
 
       - name: Build VitePress site
@@ -51,10 +51,10 @@ jobs:
         working-directory: user-docs
 
       - name: Setup Pages
-        uses: actions/configure-pages@v5
+        uses: actions/configure-pages@v6
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@v5
         with:
           path: user-docs/.vitepress/dist
 
@@ -68,4 +68,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v5

.github/workflows/play-listing.yml

@@ -0,0 +1,92 @@
+name: Play Store Listing
+
+on:
+  pull_request:
+    paths:
+      - "assets/screenshots/**"
+      - "assets/play-store-icon-512.png"
+      - "assets/play-store-feature-1024x500.png"
+      - "docs/media/screenshots.json"
+      - "app/src/googlePlay/play/default-language.txt"
+      - "app/src/googlePlay/play/listings/**"
+      - "scripts/screenshots.py"
+      - ".github/workflows/play-listing.yml"
+  push:
+    branches:
+      - main
+      - dev
+    paths:
+      - "assets/screenshots/**"
+      - "assets/play-store-icon-512.png"
+      - "assets/play-store-feature-1024x500.png"
+      - "docs/media/screenshots.json"
+      - "app/src/googlePlay/play/default-language.txt"
+      - "app/src/googlePlay/play/listings/**"
+      - "scripts/screenshots.py"
+      - ".github/workflows/play-listing.yml"
+  workflow_dispatch:
+    inputs:
+      publish_listing:
+        description: "Publish Play Store listing metadata after validation"
+        required: true
+        default: false
+        type: boolean
+
+permissions:
+  contents: read
+
+jobs:
+  validate:
+    name: Validate Listing Assets
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.12"
+
+      - name: Install image tooling
+        run: python -m pip install --upgrade rich Pillow
+
+      - name: Validate screenshots and listing metadata
+        run: python scripts/screenshots.py validate
+
+  publish-listing:
+    name: Publish Listing Metadata
+    needs: validate
+    if: ${{ github.event_name == 'workflow_dispatch' && inputs.publish_listing }}
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v6
+        with:
+          cache-read-only: false
+
+      - name: Write Play service account
+        env:
+          PLAY_SERVICE_ACCOUNT_JSON: ${{ secrets.PLAY_SERVICE_ACCOUNT_JSON }}
+        run: |
+          if [ -z "$PLAY_SERVICE_ACCOUNT_JSON" ]; then
+            echo "::error::PLAY_SERVICE_ACCOUNT_JSON is not configured."
+            exit 1
+          fi
+          printf '%s' "$PLAY_SERVICE_ACCOUNT_JSON" > play-service-account.json
+
+      - name: Publish Play Store listing
+        run: ./gradlew publishGooglePlayReleaseListing
+
+      - name: Remove Play service account
+        if: always()
+        run: rm -f play-service-account.json

.github/workflows/release-android.yml

@@ -3,7 +3,7 @@
 # Triggered when an Android release tag (android-v*) is pushed.
 # Validates the tag matches the app version in libs.versions.toml,
 # runs focused Android checks, builds release APK/AAB artifacts, and creates a
-# GitHub Release. Server/Python package releases use server-v* tags.
+# GitHub Release. Plugin/Python package releases use plugin-v* tags.
 
 name: Release Android
 
@@ -60,9 +60,8 @@ jobs:
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v6
-
-      - name: Build debug APK
-        run: ./gradlew assembleDebug
+        with:
+          cache-read-only: false
 
       # Keep the tag release gate aligned with CI — Android's broad Gradle
       # `test` aggregate currently hangs in deferred JVM suites tracked by
@@ -90,6 +89,8 @@ jobs:
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v6
+        with:
+          cache-read-only: false
 
       - name: Decode release keystore
         env:
@@ -151,6 +152,38 @@ jobs:
             app/build/outputs/bundle/*Release/*.aab
             app/build/outputs/SHA256SUMS.txt
 
+      - name: Upload to Play Console (production draft)
+        env:
+          PLAY_SERVICE_ACCOUNT_JSON: ${{ secrets.PLAY_SERVICE_ACCOUNT_JSON }}
+          HERMES_KEYSTORE_PASSWORD: ${{ secrets.HERMES_KEYSTORE_PASSWORD }}
+          HERMES_KEY_ALIAS: ${{ secrets.HERMES_KEY_ALIAS }}
+          HERMES_KEY_PASSWORD: ${{ secrets.HERMES_KEY_PASSWORD }}
+        # Runs only when the Play service-account secret is configured AND this is
+        # a stable tag (prereleases — versions containing a dash — are skipped so
+        # an `-rc.N` build never lands on the production listing). HERMES_KEYSTORE_PATH
+        # was exported into $GITHUB_ENV by the "Decode release keystore" step above
+        # and persists across steps in this job, so the AAB is release-signed.
+        #
+        # `publishGooglePlayReleaseBundle` is the flavor-scoped task — only the
+        # googlePlay AAB is uploaded (sideload is disabled via playConfigs in
+        # app/build.gradle.kts). The play{} block pins releaseStatus = DRAFT, so the
+        # build lands on the Production track as a DRAFT: CI does the upload, a human
+        # clicks "Start rollout" in Play Console. A bad tag can never auto-go-live.
+        if: ${{ env.PLAY_SERVICE_ACCOUNT_JSON != '' && !contains(needs.validate.outputs.version, '-') }}
+        run: |
+          printf '%s' "$PLAY_SERVICE_ACCOUNT_JSON" > play-service-account.json
+          ./gradlew publishGooglePlayReleaseBundle --track=production
+          rm -f play-service-account.json
+
+      - name: Play upload skipped (no secret)
+        env:
+          PLAY_SERVICE_ACCOUNT_JSON: ${{ secrets.PLAY_SERVICE_ACCOUNT_JSON }}
+        if: ${{ env.PLAY_SERVICE_ACCOUNT_JSON == '' }}
+        run: |
+          echo "ℹ️  PLAY_SERVICE_ACCOUNT_JSON not set — skipped Play Console upload." \
+            "GitHub Release artifacts are still published; upload to Play manually" \
+            "(see RELEASE.md §5)." >> "$GITHUB_STEP_SUMMARY"
+
       - name: Release summary
         env:
           HERMES_KEYSTORE_BASE64: ${{ secrets.HERMES_KEYSTORE_BASE64 }}

.github/workflows/release-cli.yml

@@ -1,8 +1,8 @@
-name: Release Desktop
+name: Release CLI
 
 on:
   push:
-    tags: ['desktop-v*']
+    tags: ['cli-v*']
 
 permissions:
   contents: write
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup Node.js (for npm ci + tsc)
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '22'
           cache: npm
@@ -89,7 +89,7 @@ jobs:
       - name: Upload CLI release assets
         uses: actions/upload-artifact@v4
         with:
-          name: desktop-cli-release
+          name: cli-binaries
           path: |
             desktop/dist/bin/hermes-relay-win-x64.exe
             desktop/dist/bin/hermes-relay-linux-x64
@@ -160,7 +160,7 @@ jobs:
       - name: Upload Windows tray release asset
         uses: actions/upload-artifact@v4
         with:
-          name: desktop-windows-tray-release
+          name: cli-windows-tray-installer
           path: desktop/dist/tray/hermes-relay-desktop-windows-x64-setup.exe
           retention-days: 7
 
@@ -171,9 +171,13 @@ jobs:
       - build-cli-binaries
       - build-windows-tray-installer
     steps:
-      - name: Extract desktop version
+      # Needed so CLI_RELEASE_NOTES.md is available to render into the release body
+      # (the other publish-release steps only consume downloaded build artifacts).
+      - uses: actions/checkout@v4
+
+      - name: Extract CLI version
         id: version
-        run: echo "version=${GITHUB_REF_NAME#desktop-v}" >> "$GITHUB_OUTPUT"
+        run: echo "version=${GITHUB_REF_NAME#cli-v}" >> "$GITHUB_OUTPUT"
 
       - uses: actions/download-artifact@v4
         with:
@@ -188,54 +192,31 @@ jobs:
             | sed -E 's#release-assets/[^/]+/##' > release-assets/SHA256SUMS.txt
           cat release-assets/SHA256SUMS.txt
 
+      # Render CLI_RELEASE_NOTES.md (hand-written per release) into the GitHub
+      # Release body. __VERSION__ = bare version (0.3.0), __TAG__ = full tag
+      # (cli-v0.3.0) so the install/pin commands stay accurate without manual edits.
+      - name: Render release notes
+        env:
+          VERSION: ${{ steps.version.outputs.version }}
+          TAG: ${{ github.ref_name }}
+        run: |
+          sed -e "s/__VERSION__/${VERSION}/g" -e "s/__TAG__/${TAG}/g" \
+            CLI_RELEASE_NOTES.md > cli_release_notes_rendered.md
+          echo "=== rendered release body ===" && cat cli_release_notes_rendered.md
+
       - name: Publish GitHub Release
         uses: softprops/action-gh-release@v3
         with:
-          name: Hermes-Relay-Desktop v${{ steps.version.outputs.version }}
+          name: Hermes-Relay-CLI v${{ steps.version.outputs.version }}
           tag_name: ${{ github.ref_name }}
           draft: false
           prerelease: ${{ contains(steps.version.outputs.version, 'alpha') || contains(steps.version.outputs.version, 'beta') || contains(steps.version.outputs.version, 'rc') }}
           fail_on_unmatched_files: true
-          body: |
-            # Hermes-Relay-Desktop v${{ steps.version.outputs.version }}
-
-            **Experimental phase.** Assets are unsigned - Windows SmartScreen and macOS Gatekeeper will warn on first launch. Windows now ships a tray installer as the primary desktop surface; CLI binaries remain available for terminal/headless use and for macOS/Linux.
-
-            ## Install
-
-            **Windows tray app (PowerShell):**
-            ```powershell
-            irm https://raw.githubusercontent.com/Codename-11/hermes-relay/main/desktop/scripts/install.ps1 | iex
-            ```
-
-            **Windows CLI only:**
-            ```powershell
-            $env:HERMES_RELAY_INSTALL_SURFACE='cli'; irm https://raw.githubusercontent.com/Codename-11/hermes-relay/main/desktop/scripts/install.ps1 | iex
-            ```
-
-            **macOS / Linux CLI:**
-            ```bash
-            curl -fsSL https://raw.githubusercontent.com/Codename-11/hermes-relay/main/desktop/scripts/install.sh | sh
-            ```
-
-            Pin this specific release with `HERMES_RELAY_VERSION=${{ github.ref_name }}`.
-
-            ## Verify
-
-            ```text
-            hermes-relay --version
-            hermes-relay pair --remote ws://<host>:8767
-            hermes-relay shell
-            ```
-
-            Open **Hermes Relay Desktop** from the Windows Start menu for tray pairing, devices, task log, settings, pause, and emergency stop.
-
-            See [Desktop docs](https://codename-11.github.io/hermes-relay/desktop/) for full usage.
-
+          body_path: cli_release_notes_rendered.md
           files: |
-            release-assets/desktop-cli-release/hermes-relay-win-x64.exe
-            release-assets/desktop-cli-release/hermes-relay-linux-x64
-            release-assets/desktop-cli-release/hermes-relay-darwin-x64
-            release-assets/desktop-cli-release/hermes-relay-darwin-arm64
-            release-assets/desktop-windows-tray-release/hermes-relay-desktop-windows-x64-setup.exe
+            release-assets/cli-binaries/hermes-relay-win-x64.exe
+            release-assets/cli-binaries/hermes-relay-linux-x64
+            release-assets/cli-binaries/hermes-relay-darwin-x64
+            release-assets/cli-binaries/hermes-relay-darwin-arm64
+            release-assets/cli-windows-tray-installer/hermes-relay-desktop-windows-x64-setup.exe
             release-assets/SHA256SUMS.txt

.github/workflows/release-plugin.yml

@@ -1,16 +1,16 @@
-name: Release Server
+name: Release Plugin
 
 on:
   push:
     tags:
-      - "server-v*"
+      - "plugin-v*"
 
 permissions:
   contents: write
 
 jobs:
   validate:
-    name: Validate Server release
+    name: Validate Plugin release
     runs-on: ubuntu-latest
     timeout-minutes: 5
     outputs:
@@ -20,15 +20,15 @@ jobs:
 
       - name: Extract version from tag
         id: version
-        run: echo "version=${GITHUB_REF#refs/tags/server-v}" >> "$GITHUB_OUTPUT"
+        run: echo "version=${GITHUB_REF#refs/tags/plugin-v}" >> "$GITHUB_OUTPUT"
 
-      - name: Verify Server version sync
-        run: python scripts/check-server-version-sync.py --expect "$TAG_VERSION"
+      - name: Verify Plugin version sync
+        run: python scripts/check-plugin-version-sync.py --expect "$TAG_VERSION"
         env:
           TAG_VERSION: ${{ steps.version.outputs.version }}
 
   test:
-    name: Test Server package
+    name: Test Plugin package
     needs: validate
     runs-on: ubuntu-latest
     timeout-minutes: 15
@@ -55,7 +55,7 @@ jobs:
           python -m py_compile plugin/tools/desktop_tool.py
           python -m py_compile relay_server/__init__.py relay_server/__main__.py
 
-      - name: Run focused Server tests
+      - name: Run focused Plugin tests
         run: |
           python -m pytest \
             plugin/tests/test_relay_security.py \
@@ -63,7 +63,7 @@ jobs:
             plugin/tests/test_session_grants.py
 
   package:
-    name: Build and publish Server package
+    name: Build and publish Plugin package
     needs: [validate, test]
     runs-on: ubuntu-latest
     timeout-minutes: 15
@@ -86,32 +86,25 @@ jobs:
           sha256sum * > SHA256SUMS.txt
           cat SHA256SUMS.txt
 
+      # Render PLUGIN_RELEASE_NOTES.md (hand-written per release) into the GitHub
+      # Release body, substituting the version token so the Install command stays
+      # accurate without a manual edit. The file is the single source of the notes;
+      # see RELEASE.md "Plugin / Python package release".
+      - name: Render release notes
+        env:
+          VERSION: ${{ needs.validate.outputs.version }}
+        run: |
+          sed "s/__VERSION__/${VERSION}/g" PLUGIN_RELEASE_NOTES.md > release_notes_rendered.md
+          echo "=== rendered release body ===" && cat release_notes_rendered.md
+
       - name: Publish GitHub Release
         uses: softprops/action-gh-release@v3
         with:
-          name: Hermes-Relay-Server v${{ needs.validate.outputs.version }}
-          tag_name: server-v${{ needs.validate.outputs.version }}
+          name: Hermes-Relay-Plugin v${{ needs.validate.outputs.version }}
+          tag_name: plugin-v${{ needs.validate.outputs.version }}
           prerelease: ${{ contains(needs.validate.outputs.version, '-') }}
           fail_on_unmatched_files: true
-          body: |
-            # Hermes-Relay-Server v${{ needs.validate.outputs.version }}
-
-            This release contains the server/Python plugin package.
-            Android releases use `android-v*` tags. Desktop releases use
-            `desktop-v*` tags. Historical server releases before this lane
-            rename used `relay-v*` tags.
-
-            ## Install
-
-            ```bash
-            pip install hermes-relay==${{ needs.validate.outputs.version }}
-            ```
-
-            ## Verify
-
-            ```bash
-            python -m relay_server --help
-            ```
+          body_path: release_notes_rendered.md
           files: |
             dist/*.whl
             dist/*.tar.gz

.gitignore

@@ -26,6 +26,7 @@ local.properties
 /app/build/
 /relay-core/build/
 /relay-ui/build/
+/ui-preview/build/
 /quest/build/
 /app/release/
 *.apk

AGENTS.md

@@ -26,6 +26,10 @@ then `docs/spec.md` and `docs/decisions.md`.
   `--no-ff` merges, version bumps at release-prep on `dev`, tags cut from `main`.
 - **Android:** Jetpack Compose only (no XML), kotlinx.serialization (no Gson),
   OkHttp (no Ktor), `wss://` only. Run `./gradlew lint` before pushing Kotlin.
+- **Plugin (Python 3.11+):** aiohttp + asyncio (no threading), type hints
+  everywhere, structured `logging` (no `print`). **Desktop CLI (Node ≥21):**
+  zero runtime deps, strict TS + ES modules, ship compiled `dist/`. Full
+  per-language style and the dev loop live in CLAUDE.md → "Code Style".
 
 ## Public-repo writing hygiene
 

CHANGELOG.md

@@ -6,10 +6,74 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/), and this
 
 ## [Unreleased]
 
+### Added
+
+- **Injected-context audit (chat).** Tap the context-usage meter in chat to open a "What the agent sees" sheet showing the exact extra context prepended to your next turn — persona/profile, phone status, and any per-turn (voice) hint. On the gateway path it notes the persona is applied server-side, so the audit is honest about what the phone does and doesn't send.
+- **Spoken-turn badges (chat).** Voice-mode replies now carry a "Voice" chip and realtime replies a "Realtime Agent" chip — both with a speaker glyph — so spoken turns are distinguishable from typed ones in the scrollback.
+- **App themes.** A new theme picker in Settings → Appearance ships eight looks: the signature Hermes Relay brand (with full light/dark) plus ports of the Nous Hermes baselines — Hermes Teal, Nous Blue (light), Midnight, Ember, Mono, Cyberpunk, and Rosé. The whole app — brand chrome, accents, and chat background — follows the chosen theme. Light/Dark/Auto applies to themes that ship both modes; fixed-mode themes show their own complete look.
+- **Hot-swappable agent sphere.** The orb is now a pluggable "skin": an Adaptive skin that recolors to match your theme, built-in Classic / Aurora / Solar / Mono looks, and support for **user-authored skins** loaded from a small JSON spec. Each skin declares which live signals it reacts to (voice, tool bursts, activity), shown as capability badges in the picker. See `docs/sphere-spec.md`.
+- **Connections separate features from routes (Android).** Connection settings now distinguish what a connection can *do* (a **Features** section) from how this phone *reaches* Hermes (a **Route** section), so you can enable Relay features over whichever transport you prefer. A plugin-provided **Secure proxy** route is surfaced alongside LAN, Tailscale, public, and custom routes. The standard direct-to-upstream path is unchanged and still needs no plugin. See `docs/plans/2026-06-18-native-secure-routes.md`.
+- **Enhanced voice control (Gemini & xAI).** When the relay uses a Gemini or xAI voice provider, Voice Settings can now steer it: pick a Gemini voice and model and turn on expressive tone tags (with optional natural-language voice direction), or set an xAI voice with expressive speech tags. Expressive tags also apply to xAI on the streaming voice-output renderer. Standard (no-plugin) voice stays configured server-side.
+- **Voice render-path visibility.** Voice Settings shows which path is rendering speech (streaming vs. basic), and Diagnostics records it each session, making voice issues easier to troubleshoot.
+
+### Changed
+
+- **Voice replies are formatted for listening.** In voice mode the assistant is now guided to answer in short, conversational sentences without markdown, emoji, or raw URLs — without changing what is stored in chat history.
+- **Leaner terminal screen (Android).** The extra-keys bar scrolls horizontally with compact, fully-legible keys (no more clipped "CTRL"), the header is a single compact row showing one inline connection-status dot plus state, and the tab strip is hidden for single-tab sessions — the new-tab "+" moves into the header — reclaiming vertical space for the terminal.
+- **Relay terminals run on an isolated, TUI-tuned tmux.** Sessions now use a dedicated tmux server/socket with its own config — instant ESC (`escape-time 0`), truecolor `$TERM`, mouse and focus events on, and no status bar — so editors and full-screen tools behave correctly, without touching the user's personal tmux.
+
+### Fixed
+
+- **Clearer error when a feature needs a newer relay.** Toggling a setting an older relay plugin doesn't recognize (e.g. xAI expressive speech tags) now shows "Relay update needed" instead of a generic HTTP 400 with a dead Retry button. Genuine input errors are unaffected.
+- **Connection status toast is no longer see-through.** The floating connection-lost/switching toast renders fully opaque so content behind it no longer bleeds through and hurts legibility.
+- **Provenance badges survive the post-turn history reload.** "Voice", "Realtime Agent", "Stopped", and "Error" chips are now preserved when the conversation reloads after a turn, instead of silently vanishing.
+- **Chat and Manage no longer stay dark in Light mode.** Brand-styled surfaces bypassed the theme and were effectively hardcoded dark; they now follow the selected theme and light/dark mode, and the glow/border flourishes key off the active theme rather than the system setting.
+- **Realtime voice no longer drops the conversation mid-session with some providers.** A normal end-of-turn signal was being rejected on certain voice providers, ending the session every turn.
+- **Relay voice synthesis no longer leaves temporary audio files behind** on the server.
+- **Clearer voice errors and an oversize-recording guard.** Standard voice now rejects an over-long recording before uploading it and shows a helpful message for audio the server can't read, instead of a generic HTTP error.
+- **Terminal paste no longer auto-runs multi-line text.** The key-bar PASTE now uses bracketed paste, so multi-line content lands intact in shells and editors instead of executing line by line.
+- **Terminal on-screen arrows behave inside TUIs.** Arrow/Home/End keys follow the running app's cursor-key mode (application vs. normal), so they work correctly in vim, less, and fzf.
+- **Terminal footer spacing.** A small gap now keeps the last terminal row clear of the key bar (it could previously look like the footer overlapped it), and a redundant navigation-bar inset that left empty space below the keys was removed.
+- **In-chat model picker now actually applies on a new chat.** Picking a model and provider in the chat composer (e.g. Grok 4.3 via your xAI subscription) is bound to the new conversation, so the agent runs on the picked model instead of silently falling back to the account's global default. Switching profiles retires an explicit pick so the profile's own model takes over, and the picker label updates immediately instead of lagging a round-trip.
+- **Server-generated images render in chat when paired to the relay.** An assistant image that points at a server-side file path is now fetched through the relay's media route and shown inline (tap to zoom), instead of degrading to an "image is on the server" notice. On the SSE chat path the agent is also told it can surface images and files by path when a relay route is configured (visible in the chat "What the agent sees" sheet). Standard (no-plugin) connections are unchanged.
+- **Smoother profile switching.** Switching profiles no longer blanks the conversation to an empty/"Loading…" state before the new history loads; the previous transcript is held and cross-fades to the new one.
+
+## [1.1.0] - 2026-06-16
+
+### Added
+
+- **Automated Play Console upload on release.** When a `PLAY_SERVICE_ACCOUNT_JSON` secret is configured, pushing a stable `android-v*` tag uploads the `googlePlay` App Bundle to the Production track as a draft (a human still starts the rollout). Prereleases are skipped, and the `sideload` flavor is structurally blocked from ever publishing to Play. Without the secret, the release builds publish to GitHub Releases exactly as before.
+- **Desktop UI preview harness (`:ui-preview`).** A non-shipped Compose for Desktop module renders presentational composables in a window on the PC with Compose Hot Reload, for fast UI iteration without a device build/install loop. It reuses the shared sphere algorithm as its single source of truth.
+- **Plugin: guided env-key setup.** The relay plugin declares its optional voice-provider keys (`XAI_API_KEY`, `OPENAI_API_KEY`, `ELEVENLABS_API_KEY`) in its manifest, so `hermes plugins install` prompts for them (masked, with a "get yours" link) instead of hand-editing `.env`. The standard no-plugin path needs none.
+- **Plugin: native install path.** Tools-only setups can install via `hermes plugins install Codename-11/hermes-relay/plugin`; the full relay still uses the curl `install.sh`.
+- **`/relay` slash commands.** `relay status · devices · pair` usable mid-conversation from any platform (CLI / Discord / TUI).
+- **Dashboard relay-status widget.** A `Relay · connected / offline / unpaired` badge in the dashboard header, visible on every page.
+- **Session-start relay health check.** A minimal, fully-guarded `on_session_start` hook records relay reachability without slowing the gateway.
+
+### Changed
+
+- **Release names normalized by surface.** Future GitHub Releases are named `Hermes-Relay-Android`, `Hermes-Relay-Plugin`, and `Hermes-Relay-CLI`, with future tags on `android-v*`, `plugin-v*`, and `cli-v*`. The CLI installer and updater still understand historical `desktop-v*` prereleases during the migration.
+- **Per-surface release notes.** Plugin and CLI GitHub Releases now use hand-written `PLUGIN_RELEASE_NOTES.md` / `CLI_RELEASE_NOTES.md` files (Summary + Added/Changed/Fixed + Install/Verify) — the same format as Android's `RELEASE_NOTES.md` — instead of static boilerplate baked into the workflow. The release workflows substitute the version into the install commands automatically.
+- **Settings screen overhaul (Android).** Status pills are now exception-only — they appear only when a surface needs attention and stay quiet when healthy. The Power tools section shows a single state-aware **Plugin active / required / offline** badge instead of an identical "Relay paired" chip on every card. Connections moved to the top (above the Hermes section), Diagnostics + Developer options moved into the App section, the status chips were restyled to match the app's translucent-bordered language, and the brand blue was deepened.
+
+### Fixed
+
+- **Force-close on connect when the stored credential keyset was corrupt.** A corrupt encrypted token store (which can happen after an app upgrade or device restore) threw during construction and crashed the app right after a successful pair, on both standard and relay connections. The token store now heals a corrupt keyset on the spot, and credential storage degrades to a re-pair instead of crashing if the device keystore is unusable.
+- **Dashboard plugin: unreadable button labels.** Solid buttons in the relay dashboard panel inherited the container text colour, which matched their background. Solid button variants now keep their proper contrast colour.
+- **Installer failed on uv-managed Hermes hosts.** `install.sh` assumed `pip` lived in the hermes-agent virtualenv, but environments created by `uv` (the upstream default) ship no `pip` module, so the editable install aborted at step 2. The installer now bootstraps `pip` via `ensurepip`, or falls back to `uv pip`, so the plugin installs cleanly on uv-managed cores.
+- **Chat settings (Android).** The streaming-endpoint picker no longer wraps "Gateway"/"Sessions" onto a second line, and the system-prompt preview now reflects the enabled context toggles (foreground app, battery, safety rails) with representative placeholder values instead of looking inert.
+- **Dashboard plugin: buttons rendered as blank boxes.** The host dashboard's Nous design-system `Button`/`Badge` use boolean variant flags (`outlined`/`ghost`/`invert`) and a `tone` prop — not the shadcn-style `variant` prop the plugin passed — so every button collapsed to a solid near-white fill with an invisible label. The plugin now translates its props to the design-system contract via an adapter, and drops a label-hiding CSS reset.
+
 ## [1.0.0] - 2026-06-14
 
 ### Added
 
+- **Relay plugin diagnostics and install guidance.** `hermes relay doctor` now reports standard upstream API/dashboard reachability, Relay loopback state, dashboard plugin presence, plugin-manager layout, and whether the legacy bootstrap monkeypatch is installed. The plugin manifest now advertises its Android and desktop tools, and `after-install.md` gives the upstream plugin manager a first-run handoff.
+
+- **Plugin-owned compatibility hook lifecycle.** `hermes relay compat status/install/remove` now owns the optional `hermes_relay_bootstrap.pth` startup hook, so the monkeypatch can be inspected, added, or removed without rerunning the legacy installer. The standard v1.0.0 path does not require this hook.
+
+- **Legacy cleanup alignment.** The legacy installer now installs the optional `.pth` hook through the plugin compat lifecycle, and the uninstaller removes every shell shim it creates (`hermes-pair`, `hermes-status`, `hermes-relay`, `hermes-relay-update`, `hermes-relay-tailscale`) while delegating hook cleanup to `hermes relay compat remove` when available.
+
 - **Gateway chat transport with live thinking.** Chat can ride the upstream dashboard `/api/ws` (the `tui_gateway` surface the official hermes-desktop client speaks) — the only vanilla-upstream path that streams reasoning *live*, so the Thinking block and sphere light up during generation. "Auto" prefers it when the dashboard is reachable and Manage is signed in, and falls back to the SSE endpoints per turn.
 
 - **Gateway desktop parity.** Native image/PDF/file attachments (with an in-chat notice when a turn falls back to a transport that can't carry files), mid-turn **steering**, **edit & resend**, interactive **approval / clarify / sudo / secret** cards, live **subagent lanes**, a **context-window meter**, server **slash commands** in autocomplete, and **turn-complete notifications** when the app is backgrounded.
@@ -30,6 +94,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/), and this
 
 ### Changed
 
+- **Relay plugin/server version aligned to v1.0.0.** The Python package, plugin manifest, dashboard manifest, and relay runtime now use the same `1.0.0` line as the stable Android release so a retagged source checkout describes one product version.
+
 - **The standard (no-plugin) path is first-class.** Chat, Manage, and voice all work against an unmodified upstream Hermes agent; standard voice rides the dashboard audio surface (`/api/audio/*`) with the Manage sign-in, and relay-paired voice is the profile-aware fallback. The relay plugin is now purely additive.
 
 - **Seamless connection UX.** LAN↔Tailscale handoffs and reconnects no longer reload the chat; connection and update status are now in-theme slide-down toasts over the content instead of banners that pushed the UI around.
@@ -82,7 +148,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/), and this
 
 - **Google Play Bridge Core split.** The Google Play Android track keeps relay pairing, chat, profiles, voice, terminal/TUI, media, notification companion, relay sessions, diagnostics, and status while removing AccessibilityService-backed Device Control declarations and permissions. Sideload remains the track for screen reading, gestures, screenshots, SMS/calls, contacts/location, overlays, wake locks, and unattended control.
 
-- **Release lanes now use explicit product tags and names.** Future Android releases use `android-v*`, server/Python releases use `server-v*`, and desktop continues on `desktop-v*`. GitHub Release names now publish as `Hermes-Relay-Android vX.Y.Z`, `Hermes-Relay-Server vX.Y.Z`, and `Hermes-Relay-Desktop vX.Y.Z`; the old relay-named server scripts remain compatibility shims.
+- **Release lanes now use explicit product tags and names.** Future Android releases use `android-v*`, plugin/Python releases use `server-v*`, and CLI releases continue on `desktop-v*`. GitHub Release names now publish as `Hermes-Relay-Android vX.Y.Z`, `Hermes-Relay-Plugin vX.Y.Z`, and `Hermes-Relay-CLI vX.Y.Z`; the old relay-named server scripts remain compatibility shims.
 
 - **Realtime voice instructions are provider-neutral.** Realtime providers receive active interface context, local date/time, provider/model/voice/profile metadata, and guidance to ask Hermes for current facts, research, device/desktop state, project context, precise/versioned data, and any requested checks instead of guessing from model knowledge.
 
@@ -208,9 +274,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/), and this
 
 ### Fixed
 
-- **desktop CLI binary was a no-op on alpha.3** — installed cleanly, exited 0, produced zero stdout/stderr, wasn't "recognized" as a CLI. Root cause: cli.ts guarded its entry-point invocation with `fileURLToPath(import.meta.url) === process.argv[1]`, which is a valid Node idiom but fails in Bun-compiled binaries because the entry module has a synthetic URL that doesn't match the `.exe` path — the check evaluated false, `main()` was never called, binary exited 0 silently. Replaced with `import.meta.main` (cross-runtime: Bun, Node 20.11+, tsx) which is true in the entry module regardless of compile mode. All four invocation paths stay correct (Bun --compile binary, `bin/hermes-relay.js` shim, `tsx src/cli.ts`, test imports). Caught by adding a local `npm run smoke` target that runs the compiled Windows binary against `--version` / `--help` / `doctor` and verifies each produces output. Same smoke added to `release-desktop.yml` on the Linux target so future regressions of this class are caught pre-publish. Affects `desktop-v0.3.0-alpha.3`; fix ships as `desktop-v0.3.0-alpha.4`.
+- **desktop CLI binary was a no-op on alpha.3** — installed cleanly, exited 0, produced zero stdout/stderr, wasn't "recognized" as a CLI. Root cause: cli.ts guarded its entry-point invocation with `fileURLToPath(import.meta.url) === process.argv[1]`, which is a valid Node idiom but fails in Bun-compiled binaries because the entry module has a synthetic URL that doesn't match the `.exe` path — the check evaluated false, `main()` was never called, binary exited 0 silently. Replaced with `import.meta.main` (cross-runtime: Bun, Node 20.11+, tsx) which is true in the entry module regardless of compile mode. All four invocation paths stay correct (Bun --compile binary, `bin/hermes-relay.js` shim, `tsx src/cli.ts`, test imports). Caught by adding a local `npm run smoke` target that runs the compiled Windows binary against `--version` / `--help` / `doctor` and verifies each produces output. Same smoke runs in `release-cli.yml` on the Linux target so future regressions of this class are caught pre-publish. Affects `desktop-v0.3.0-alpha.3`; fix ships as `desktop-v0.3.0-alpha.4`.
 - **`hermes-relay --version` printed `0.0.0` in compiled binaries.** `readVersion()` tried to read `package.json` via `__dirname + '../package.json'`, which doesn't resolve in a Bun `--compile` binary (no real filesystem layout). Replaced with a build-time-generated `src/version.ts` module (`npm run gen:version` writes the version from package.json before every build and every `build:bin:*`). `readVersion()` now just returns the embedded constant. Works identically in tsx / Node / Bun.
-- **desktop CLI binary segfaulted at startup on Bun 1.3.13 Windows x64** (`panic(main thread): Segmentation fault at address 0x100000D9C`). Root cause identified as Bun's experimental `--bytecode` flag; attempted fix in alpha.2 only edited `desktop/package.json`'s build scripts while the release workflow's inline `bun build` commands silently kept `--bytecode`, so alpha.2 shipped with the same crash. alpha.3 fixes the workflow two ways: (1) dropped `--bytecode` from release-desktop.yml, and (2) refactored the four build steps to delegate to `npm run build:bin:*` so the package.json scripts are the single source of truth for compile flags. Added a `bun --version` diagnostic step to the workflow for future triage. Versions affected: `desktop-v0.3.0-alpha.1` and `desktop-v0.3.0-alpha.2`. Fix ships as `desktop-v0.3.0-alpha.3`.
+- **desktop CLI binary segfaulted at startup on Bun 1.3.13 Windows x64** (`panic(main thread): Segmentation fault at address 0x100000D9C`). Root cause identified as Bun's experimental `--bytecode` flag; attempted fix in alpha.2 only edited `desktop/package.json`'s build scripts while the release workflow's inline `bun build` commands silently kept `--bytecode`, so alpha.2 shipped with the same crash. alpha.3 fixes the workflow two ways: (1) dropped `--bytecode` from the CLI release workflow, and (2) refactored the four build steps to delegate to `npm run build:bin:*` so the package.json scripts are the single source of truth for compile flags. Added a `bun --version` diagnostic step to the workflow for future triage. Versions affected: `desktop-v0.3.0-alpha.1` and `desktop-v0.3.0-alpha.2`. Fix ships as `desktop-v0.3.0-alpha.3`.
 - **Installer couldn't find alpha-only releases.** GitHub's `/releases/latest/download/` URL deliberately skips prereleases, so the default `curl | sh` / `irm | iex` one-liner failed against alpha.1 with "maybe no Windows release for this version yet?" Both `install.sh` and `install.ps1` now query the Releases API directly (`GET /repos/.../releases`, filter to `desktop-v*` tags, take first) when `HERMES_RELAY_VERSION=latest`. Pinned versions unchanged.
 
 ### Added
@@ -1225,7 +1291,9 @@ MVP release — native Android companion app for Hermes agent with direct API ch
 - **Dev scripts** — build, install, run, test, relay via scripts/dev.bat
 - **ProGuard rules** — okhttp-sse, markdown renderer, intellij-markdown parser
 
-[Unreleased]: https://github.com/Codename-11/hermes-relay/compare/android-v0.8.0...HEAD
+[Unreleased]: https://github.com/Codename-11/hermes-relay/compare/android-v1.0.0...HEAD
+[1.0.0]: https://github.com/Codename-11/hermes-relay/compare/android-v0.8.0...android-v1.0.0
+[0.8.1]: https://github.com/Codename-11/hermes-relay/compare/android-v0.8.0...android-v0.8.1
 [0.8.0]: https://github.com/Codename-11/hermes-relay/compare/v0.7.0...android-v0.8.0
 [0.7.0]: https://github.com/Codename-11/hermes-relay/compare/v0.6.1...v0.7.0
 [0.1.0]: https://github.com/Codename-11/hermes-relay/compare/v0.1.0-beta...v0.1.0

CLAUDE.md

@@ -4,18 +4,20 @@
 
 ## What This Is
 
-A native Android app (Kotlin + Jetpack Compose) paired with a Python relay server (aiohttp) for the Hermes agent platform. Chat connects directly to the Hermes API Server via HTTP/SSE; bridge and terminal use a relay over WSS.
+A native Android app (Kotlin + Jetpack Compose) paired with an optional Python relay plugin/server (aiohttp) for the Hermes agent platform. Standard chat, Manage, and dashboard voice work against unmodified upstream Hermes. Relay adds phone control, terminal, remote desktop tooling, extra voice engines, and dashboard Relay management.
 
-**Current state:** v0.8.0 (release-prep on `dev`) — Phase 0–3 complete. Direct API chat, session management, pairing + security (now multi-endpoint, ADR 24), inbound media, voice mode (stable Hermes Chat + Voice Output plus opt-in provider-native Realtime Agent with reliable low-latency playback and a text/mic Voice Lab), bridge/accessibility control, notification companion, safety rails, multi-Connection, agent profiles + inspector, connection diagnostics, and first-class Tailscale (ADR 25). Two product flavors: `googlePlay` (conservative, Bridge Core without Device Control) and `sideload` (full-capability).
+**Current state:** v1.0.0 stable. The default no-plugin path supports chat, Manage, and voice on vanilla upstream Hermes. Chat auto-prefers the dashboard `/api/ws` gateway transport when Manage auth is ready, then falls back to API-server SSE routes. Standard voice uses dashboard `/api/audio/*` with the Manage session. Relay remains an additive power path for terminal, bridge/device control, notification companion, extra/provider-native voice, remote access, and desktop tooling. Two Android product flavors ship: `googlePlay` (conservative, no unattended Device Control surface) and `sideload` (full-capability).
 
 ## Architecture
 
 ```
-Phone (HTTP/SSE) → Hermes API Server (:8642)   [chat — direct]
-Phone (WSS)      → Relay Server (:8767)          [bridge, terminal]
+Phone (WS)       -> Hermes dashboard (:9119)     [standard gateway chat, live thinking]
+Phone (HTTP/SSE) -> Hermes API Server (:8642)    [standard chat fallback, sessions, runs]
+Phone (HTTP)     -> Hermes dashboard (:9119)     [standard Manage + voice]
+Phone (WSS/HTTP) -> Relay plugin/server (:8767)  [optional bridge, terminal, relay voice, remote tools]
 ```
 
-Chat goes directly to the API server via HTTP/SSE. The API key (Bearer token) is optional — most local setups run without one. Terminal will go through tmux via the relay. Bridge wraps existing relay protocol. See docs/decisions.md for why.
+The standard path must stay vanilla upstream only. API-server bearer auth and dashboard cookie auth are separate. Terminal and bridge require Relay pairing; standard chat, Manage, and dashboard voice must not.
 
 ### Upstream Hermes API Reference
 
@@ -42,7 +44,7 @@ Chat goes directly to the API server via HTTP/SSE. The API key (Bearer token) is
 Upstream main now contains the focused session-control API (`#33134`) and read-only skills/toolsets (`#33016`). The original broad PR [#8556](https://github.com/NousResearch/hermes-agent/pull/8556) was closed as superseded. Keep these distinctions straight:
 
 1. **Native upstream** — `/api/sessions`, `/api/sessions/{id}/messages`, `/api/sessions/{id}/chat`, `/api/sessions/{id}/chat/stream`, `/v1/capabilities`, `/v1/skills`, and `/v1/toolsets` exist in current `gateway/platforms/api_server.py`.
-2. **Bootstrap compatibility** (`hermes_relay_bootstrap/`) — monkey-patches aiohttp on startup via `.pth` file for older or partial core builds. It skips native routes per method/path and should be retired per surface, not treated as the preferred path.
+2. **Bootstrap compatibility** (`plugin/hermes_relay_bootstrap/`) — monkey-patches aiohttp on startup via `.pth` file for older or partial core builds. It skips native routes per method/path and should be retired per surface, not treated as the preferred path. The repo-root `hermes_relay_bootstrap/` package is a legacy import shim.
 3. **Legacy fork branches** — useful as lineage only. Do not cite `feat/session-api` / `#8556` as the current upstream contract.
 
 | Endpoint | Purpose | Provided by |
@@ -65,7 +67,7 @@ The Android client probes per-endpoint capability via `HermesApiClient.probeCapa
 
 hermes-agent ships a second web server at `hermes_cli/web_server.py` that hosts the React admin dashboard at `hermes_cli/web_dist/`. It has its **own** `/api/*` routes that **do not live on `api_server.py`** — notably: `GET/PUT /api/config` (full tree), `GET /api/config/schema`, `GET /api/config/defaults`, `GET/PUT /api/config/raw` (YAML text), `GET/PUT/DELETE /api/env` + `POST /api/env/reveal`, `PUT /api/skills/toggle`, `/api/cron/jobs/*` (different shape from `/api/jobs/*`), `/api/providers/oauth/*`, `/api/dashboard/themes`, `/api/dashboard/plugins`, `/api/model/info` + `/api/model/options` + `POST /api/model/set`, `/api/profiles/*` (CRUD, `POST /api/profiles/active`, per-profile soul/description/model), `/api/mcp/*`, `/api/logs`, `/api/analytics/usage`, and **`POST /api/audio/transcribe` + `POST /api/audio/speak`** (base64 data-url contract, built for hermes-desktop voice). The API server has **no audio routes** — its `/v1/capabilities` advertises `audio_api: false`; PR #8199 (`/v1/audio/*`) is the canonical future surface but is unmerged. Android's **standard (no-plugin) voice** therefore rides this dashboard surface via `StandardHermesVoiceClient` with the per-connection dashboard cookie session (Manage sign-in unlocks voice); `AutoVoiceAudioClient` prefers Relay when paired and falls back to standard.
 
-Current upstream supports two auth modes on this surface. Loopback dashboards still use the injected `window.__HERMES_SESSION_TOKEN__` path. Remote/non-loopback dashboards use the Desktop-style dashboard auth gate: `/api/status` advertises `auth_required` and providers, `/auth/password-login` handles password providers, `/auth/login?provider=...` handles Nous/OIDC redirects, `/api/auth/me` returns the verified session, and `/api/auth/ws-ticket` mints a short-lived ticket for `/api/ws` / `/api/pty`. This dashboard session is **not** an `API_SERVER_KEY`; Android Chat still uses the API-server bearer path until a dashboard `/api/ws` chat adapter is wired. Note the event-richness gap: `/api/ws` is backed by `tui_gateway/server.py` (what hermes-desktop + the Ink TUI speak) and is the only upstream surface with **live** `reasoning.delta`/`thinking.delta` streaming; the api_server SSE paths emit reasoning only post-hoc (`reasoning.available` → `tool.progress` with `tool_name:"_thinking"`, ≤500 chars; full text in `run.completed.messages[].reasoning`). Android Manage may consume this dashboard surface directly, but relay-only capabilities remain behind Relay pairing. **Do not proxy dashboard auth or dashboard admin APIs over the relay.**
+Current upstream supports two auth modes on this surface. Loopback dashboards still use the injected `window.__HERMES_SESSION_TOKEN__` path. Remote/non-loopback dashboards use the Desktop-style dashboard auth gate: `/api/status` advertises `auth_required` and providers, `/auth/password-login` handles password providers, `/auth/login?provider=...` handles Nous/OIDC redirects, `/api/auth/me` returns the verified session, and `/api/auth/ws-ticket` mints a short-lived ticket for `/api/ws` / `/api/pty`. This dashboard session is **not** an `API_SERVER_KEY`. Android uses it for Manage, standard voice, and the gateway chat transport. `/api/ws` is backed by `tui_gateway/server.py` (what hermes-desktop + the Ink TUI speak) and is the only upstream surface with **live** `reasoning.delta`/`thinking.delta` streaming; the api_server SSE paths remain the standard fallback. Relay-only capabilities remain behind Relay pairing. **Do not proxy dashboard auth or dashboard admin APIs over the relay.**
 
 **Tool call rendering paths:**
 1. **Runs API** — Emits `tool.started`/`tool.completed` as real SSE events → `ToolProgressCard` in real-time.
@@ -73,10 +75,10 @@ Current upstream supports two auth modes on this surface. Loopback dashboards st
 3. **Annotation parser** — Fallback for servers emitting inline markdown annotations (`` `💻 terminal` ``).
 
 ## Key Instructions
-- **Standard path = vanilla upstream only.** The default (no-plugin) connection path — chat via the API server, standard voice via the dashboard surface — must work against **unmodified upstream hermes-agent**: no fork patches, no bespoke server config as a dependency. The app ships on Google Play to users whose servers we don't control. Features that need server-side changes go through upstream PRs (with graceful degradation until merged) or live behind the opt-in relay plugin.
+- **Standard path = vanilla upstream only.** The default (no-plugin) connection path — gateway/API chat, Manage, and standard voice via the dashboard surface — must work against **unmodified upstream hermes-agent**: no fork patches, no bespoke server config as a dependency. The app ships on Google Play to users whose servers we don't control. Features that need server-side changes go through upstream PRs (with graceful degradation until merged) or live behind the opt-in relay plugin.
 - **Always verify upstream before assuming an endpoint exists.** Check `gateway/platforms/api_server.py` in hermes-agent. If an endpoint isn't there, document whether bootstrap injects it or it requires the fork.
 - If we use a non-standard endpoint, ensure `probeCapabilities()` covers it and the auto-resolver degrades gracefully.
-- **Bootstrap maintenance:** Retire `hermes_relay_bootstrap/` per surface. Sessions and read-only skills/toolsets now have native upstream replacements; config, memory, legacy skill detail/toggle, available-models, and slash middleware still need explicit replacement decisions before full removal.
+- **Bootstrap maintenance:** Retire `plugin/hermes_relay_bootstrap/` per surface. Sessions and read-only skills/toolsets now have native upstream replacements; config, memory, legacy skill detail/toggle, available-models, and slash middleware still need explicit replacement decisions before full removal.
 
 ## Repository Layout
 
@@ -93,6 +95,10 @@ hermes-android/
 │   ├── accessibility/       # HermesAccessibilityService, ScreenReader, ActionExecutor
 │   ├── bridge/              # BridgeSafetyManager, BridgeForegroundService, BridgeStatusOverlay
 │   └── notifications/       # HermesNotificationCompanion
+├── relay-core/              ← [EXPERIMENTAL] Quest/XR shared core lib (com.axiomlabs.hermesrelay.core) — pairing, transport, terminal, voice, wire
+├── relay-ui/                ← [EXPERIMENTAL] Quest/XR shared Compose UI lib — sphere, terminal WebView, QR scanner
+├── quest/                   ← [EXPERIMENTAL] Meta Spatial SDK Quest/XR app (gradle includeBuild; in development, not shipped)
+├── ui-preview/              ← Desktop Compose Hot Reload harness for PC UI iteration (NOT shipped; shares MorphingSphereCore)
 ├── desktop/                 ← Node thin-client CLI (`@hermes-relay/cli`)
 │   ├── bin/hermes-relay.js  # #!/usr/bin/env node shim → dist/cli.js
 │   ├── src/
@@ -116,7 +122,7 @@ hermes-android/
 │   ├── tools/               # android_navigate.py, android_notifications.py
 │   └── dashboard/           # hermes-agent dashboard plugin — manifest, React UI, FastAPI proxy
 ├── relay_server/            ← Thin compat shim → plugin.relay (legacy entrypoint)
-├── hermes_relay_bootstrap/  ← Runtime compatibility patch; retire per surface as upstream replaces it
+├── hermes_relay_bootstrap/  ← Legacy import shim for older startup hooks
 ├── skills/devops/hermes-relay-pair/  ← /hermes-relay-pair slash command
 ├── scripts/                 ← dev.bat, bridge-smoke.sh, bump-version.sh
 └── docs/                    ← spec, decisions, security, relay-server, mcp-tooling
@@ -167,14 +173,14 @@ This is a **public, distributed repo** — every committed file (CHANGELOG, DEVL
 - **Branching model (as of 2026-04-19):** `main` + `dev`. Feature branches target `dev`, not `main`. `main` receives only release merges (and tags). No straight-to-main exemption — even single-file typos go through `dev`.
 - **Merge style:** `git merge --no-ff` — no squash. Preserves per-commit trail for agent-team branches on every merge in the chain (feature → dev → main).
 - **Merging ≠ releasing.** Feature branches land on `dev` continuously as CI goes green; each PR appends to `[Unreleased]` in `CHANGELOG.md` on `dev`. Releases are a separate act — cut when accumulated state is worth shipping, not per-feature. See `RELEASE.md` "When to cut a release."
-- **Version bumps happen on `dev`, then release-merge to `main`.** Bump only the surface being released: `scripts/bump-android-version.sh` for `android-vX.Y.Z`, `scripts/bump-server-version.sh` for `server-vX.Y.Z`, and `desktop/package.json` for `desktop-vX.Y.Z`. The release commit lives on `dev`, then a release PR merges `dev` → `main` with `--no-ff`, then the surface tag is cut from `main`.
+- **Version bumps happen on `dev`, then release-merge to `main`.** Bump only the surface being released: `scripts/bump-android-version.sh` for `android-vX.Y.Z`, `scripts/bump-plugin-version.sh` for `plugin-vX.Y.Z`, and `desktop/package.json` for `cli-vX.Y.Z`. The release commit lives on `dev`, then a release PR merges `dev` → `main` with `--no-ff`, then the surface tag is cut from `main`.
 - **Server tracks `dev` for staging.** The hermes-host deployment pulls `dev` so merged features are exercised before they reach a tag. Released state lives on tags cut from `main`.
 - **Branch protection** on `main` — direct push blocked; only release-merge PRs from `dev` land here. `dev` also requires CI to pass on PRs but accepts feature-branch merges freely.
 
 ### Testing
 - **Android:** JUnit + Compose testing for UI, MockK for mocks
 - **Python:** `python -m unittest plugin.tests.test_<name>` — avoid bare `pytest` (conftest imports `responses` which may not be installed in the venv)
-- **CI is split by path:** `.github/workflows/ci-android.yml` runs on app/Gradle changes; `.github/workflows/ci-server.yml` runs on plugin/Python changes. Both trigger on pushes to `main` and `dev` and on PRs targeting either. Build + tests must pass before merge to `dev`; release-merge to `main` requires the same.
+- **CI is split by path:** `.github/workflows/ci-android.yml` runs on app/Gradle changes; `.github/workflows/ci-plugin.yml` runs on plugin/Python changes. Both trigger on pushes to `main` and `dev` and on PRs targeting either. Build + tests must pass before merge to `dev`; release-merge to `main` requires the same.
 
 ## Key Files
 
@@ -260,9 +266,12 @@ This is a **public, distributed repo** — every committed file (CHANGELOG, DEVL
 | `plugin/tools/android_tool.py` | 18 `android_*` tool handlers (14 baseline + send_sms, call, search_contacts, return_to_hermes); `android_screenshot` first consumer of `register_media()` |
 | `plugin/tools/android_navigate.py` | Vision-driven navigation loop; up to 20 iterations; `llm_gap` error until vision client wired |
 | `plugin/pair.py` | QR payload builder + CLI; `build_payload(sign=True)`; `--register-code` fallback |
+| `plugin/doctor.py` | `hermes relay doctor`; checks standard upstream API/dashboard reachability, Relay loopback state, plugin layout, and compat hook state |
+| `plugin/compat.py` | `hermes relay compat status/install/remove`; owns the optional `hermes_relay_bootstrap.pth` lifecycle |
+| `plugin/hermes_relay_bootstrap/` | Plugin-owned runtime compatibility patch; skips native routes per method/path; retire only after remaining config/memory/legacy skill/slash gaps are handled |
 | `install.sh` | Canonical installer — 6 steps; idempotent; drops `hermes-relay-update` shim |
 | `uninstall.sh` | Canonical uninstaller; reverses install.sh; never touches `.env` or `state.db` |
-| `hermes_relay_bootstrap/` | Runtime compatibility patch; skips native routes per method/path; retire only after remaining config/memory/legacy skill/slash gaps are handled |
+| `hermes_relay_bootstrap/` | Legacy import shim for old `.pth` files and editable installs |
 | **Plugin — Dashboard** | |
 | `plugin/dashboard/manifest.json` | Declares tab, entry bundle, and FastAPI module for hermes-agent discovery |
 | `plugin/dashboard/plugin_api.py` | FastAPI router proxying 5 routes to relay over loopback; `/pairing` body = API-server overrides (host/port/tls/api_key), relay URL auto-derived |
@@ -308,10 +317,16 @@ This is a **public, distributed repo** — every committed file (CHANGELOG, DEVL
 | **Desktop CLI — dev iteration** | |
 | `npm run smoke` (in `desktop/`) | Builds Windows binary + runs `--version` / `--help` / `doctor`, fails loud on zero-output. Local pre-flight before cutting any tag. |
 | `npm run gen:version` | Regenerates `src/version.ts` from `package.json`. Runs automatically before every `build` / `build:bin:*`. |
-| `release-desktop.yml → Smoke-test Linux binary` step | CI-side equivalent: runs compiled Linux binary through the same 3-command check before uploading assets. Catches silent-exit-0 + segfault classes. |
+| `release-cli.yml → Smoke-test Linux binary` step | CI-side equivalent: runs compiled Linux binary through the same 3-command check before uploading assets. Catches silent-exit-0 + segfault classes. |
 | **Server — Desktop tool routing (Phase B)** | |
 | `plugin/relay/channels/desktop.py` | Mirrors `bridge.py` — `desktop.command`/`desktop.response`/`desktop.status`, UUID-correlated futures, 30s timeout, single-client MVP, per-session advertised-tools set |
 | `plugin/tools/desktop_tool.py` | 24 `desktop_*` tools (fs/shell/powershell/process/jobs/transfer/health) — registers with `tools.registry` under `desktop` toolset; per-tool `check_fn` pings `/desktop/_ping?tool=<name>`; `desktop_health` is `_RELAY_ONLY` and pings `/desktop/health` so it works even when the client is wedged |
+| **Gradle modules — experimental Quest/XR (in development)** | |
+| `relay-core/` | [EXPERIMENTAL] Android library (`com.axiomlabs.hermesrelay.core`) — shared pairing/transport/terminal/voice/wire for the Quest port; not yet wired into the shipped `:app` |
+| `relay-ui/` | [EXPERIMENTAL] Android library (`com.axiomlabs.hermesrelay.ui`) — shared Compose UI (sphere, terminal WebView, QR scanner) for the Quest port; carries its own sphere copy |
+| `quest/` | [EXPERIMENTAL] Meta Spatial SDK Quest/XR app — gradle `includeBuild("quest")`; needs further development, not shipped |
+| **Tooling — dev iteration (not shipped)** | |
+| `ui-preview/` | Desktop Compose Hot Reload harness — JVM Compose for Desktop; source-shares `MorphingSphereCore` from `:relay-ui`; `Main.kt` gallery; see `ui-preview/README.md` |
 
 ## What NOT to Do
 
@@ -359,7 +374,7 @@ Curls every bridge HTTP route via `localhost:8767`. Catches the silent-drop regr
 1. **Edit locally** — Windows checkout. Both plugin (`plugin/`) and app (`app/`) live here.
 2. **Python syntax check** — `python -m py_compile plugin/<file>.py`. Full tests run on the server.
 3. **Kotlin changes** — do NOT run `gradle build`. Bailey builds via Android Studio's ▶ button. Never `adb install` from Claude.
-4. **Before pushing Kotlin changes** — run `./gradlew lint` locally. It's the exact task CI runs (see `.github/workflows/ci.yml` → `gradlew lint` fallback) and catches errors Android Studio's live inspections miss — e.g. `UnsafeOptInUsageError` with `kotlin.OptIn` vs `androidx.annotation.OptIn`, `FlowOperatorInvokedInComposition` (mapped flows inside Composables), Media3 `@UnstableApi` propagation. Lint is a hard blocker in CI: Build + Test show "skipping" until lint passes, and lint prints only the **first failure** before aborting — so CI iterations reveal errors one at a time while a single local lint run surfaces all of them.
+4. **Before pushing Kotlin changes** — run `./gradlew lint` locally. It's the exact task CI runs and catches errors Android Studio's live inspections miss — e.g. `UnsafeOptInUsageError` with `kotlin.OptIn` vs `androidx.annotation.OptIn`, `FlowOperatorInvokedInComposition` (mapped flows inside Composables), Media3 `@UnstableApi` propagation. Android CI runs lint alongside build/test for faster feedback, but a local lint run still surfaces issues before the workflow spends runner time compiling and packaging.
 5. **Commit + push** — feature branch off `dev`, merged back to `dev` via PR. `main` is reserved for release merges.
 6. **Pull + restart on server** — see Server Deployment below.
 7. **Test on phone** — Bailey builds from Studio, installs to Samsung device, pairs via `/hermes-relay-pair`.
@@ -378,6 +393,12 @@ Server is a Linux box running hermes-agent with hermes-relay editable-installed
 
 **Update:** `hermes-relay-update` (idempotent, re-fetches install.sh). Or manually: `git pull --ff-only && systemctl --user restart hermes-relay`.
 
+**Compat hook:** `hermes relay compat status/install/remove` manages only the
+optional `hermes_relay_bootstrap.pth` startup hook. New installs load the
+plugin-owned bootstrap from `plugin/hermes_relay_bootstrap/`; the repo-root
+package is only a legacy import shim. Standard chat, Manage, and dashboard voice
+must not depend on this hook.
+
 **Key conventions:**
 - Phone re-pairs after each relay restart (SessionManager is in-memory; wiped on restart)
 - Use `python -m unittest` not `pytest` — conftest imports `responses` which may not be installed
@@ -396,20 +417,25 @@ Server is a Linux box running hermes-agent with hermes-relay editable-installed
 
 See [RELEASE.md](RELEASE.md) for the full recipe.
 
-- **Version source:** `gradle/libs.versions.toml` (`appVersionName`, `appVersionCode`)
-- **Bump atomically:** `bash scripts/bump-version.sh <new-version>` — updates all three sources
-- **`appVersionCode` is monotonic** — always increment across prereleases
-- **Cut a release:** bump → commit → `git tag vMAJOR.MINOR.PATCH` → push tag → CI builds + GitHub Release
+- **Android version source:** `gradle/libs.versions.toml` (`appVersionName`, `appVersionCode`); bump with `scripts/bump-android-version.sh`
+- **Relay plugin version source:** `pyproject.toml`; keep plugin/dashboard metadata synced with `scripts/check-plugin-version-sync.py`; bump with `scripts/bump-plugin-version.sh`
+- **Desktop CLI version source:** `desktop/package.json`; regenerate `desktop/src/version.ts` with `npm run gen:version`
+- **Track audit:** `python scripts/check-version-tracks.py` reports Android, plugin, and CLI versions without forcing them to match
+- **`appVersionCode` is monotonic** — always increment across Android prereleases
+- **Cut a release:** bump the target surface → commit → merge `dev` to `main` → tag with `android-v*`, `plugin-v*`, or `cli-v*` → push tag → CI builds + GitHub Release
 - **Required secrets:** `HERMES_KEYSTORE_BASE64`, `HERMES_KEYSTORE_PASSWORD`, `HERMES_KEY_ALIAS`, `HERMES_KEY_PASSWORD`
 
 ## Integration Points
 
 | Surface | Endpoint | Notes |
 |---------|----------|-------|
+| Chat (gateway) | Dashboard `POST /api/auth/ws-ticket` -> WS `/api/ws` | Standard upstream dashboard/tui_gateway path; live thinking/reasoning; requires dashboard auth |
 | Chat streaming | `POST /v1/runs` → `GET /v1/runs/{id}/events` | Structured tool events; async run-control path |
 | Chat (sessions) | `POST /api/sessions/{id}/chat/stream` | Native upstream session-persisted SSE; preferred when capability probe finds it |
 | Chat (compat) | `POST /v1/chat/completions` (stream=true) | Inline tool annotations only |
 | Session CRUD | `GET/POST/PATCH/DELETE /api/sessions` | Native upstream (#33134); bootstrap fallback only for old builds |
+| Manage | Dashboard `/api/status`, `/api/auth/me`, `/api/config`, `/api/profiles/*`, `/api/env`, `/api/model/*`, `/api/mcp/*` | Standard upstream dashboard surface; do not proxy through Relay |
+| Standard voice | Dashboard `POST /api/audio/transcribe`, `POST /api/audio/speak` | Standard no-plugin voice; uses dashboard session from Manage |
 | Pairing (QR) | `POST /pairing/register` (loopback only) | Via `/hermes-relay-pair` or `hermes-pair` shim; accepts optional `endpoints` for multi-endpoint QRs |
 | Pairing (multi-endpoint) | QR `endpoints` array (ADR 24) | `hermes: 3` schema; ordered `lan`/`tailscale`/`public`/... candidates; phone re-probes on network change |
 | Pairing auth | WSS `auth.ok` payload | Includes `expires_at`, `grants`, `transport_hint` |
@@ -420,6 +446,8 @@ See [RELEASE.md](RELEASE.md) for the full recipe.
 | Voice transcribe | `POST /voice/transcribe` | multipart/form-data; bearer auth |
 | Voice synthesize | `POST /voice/synthesize` | JSON → audio/mpeg; max 5000 chars |
 | Voice config | `GET /voice/config` | Returns current tts/stt provider info |
+| Plugin diagnostics | `hermes relay doctor --json` | Reports upstream route reachability, Relay loopback state, plugin layout, and legacy bootstrap state |
+| Compat hook lifecycle | `hermes relay compat status/install/remove` | Optional legacy API compatibility hook; not required for the standard path |
 | Notifications | `GET /notifications/recent?limit=N` | Loopback callers skip bearer |
 | Relay health | `GET /health` on `:8767` | Used by `RelayHttpClient.probeHealth()` |
 | Capabilities | `GET /v1/capabilities` plus targeted `HEAD` probes | Prefer capabilities when present; HEAD probes keep mixed-version fallback working |

CLI_RELEASE_NOTES.md

@@ -0,0 +1,64 @@
+# Hermes-Relay-CLI v__VERSION__
+
+**Release Date:** <!-- YYYY-MM-DD -->
+**Since the previous CLI release:** <!-- one line: the theme of this release -->
+
+<!-- One short paragraph: what this desktop/CLI release is about and who should care. -->
+
+<!--
+═══ RELEASE-PREP CHECKLIST (delete this comment block when done) ═══
+• This file is the GitHub Release body for `cli-v*` tags. The release workflow
+  substitutes __VERSION__ (bare, e.g. 0.3.0) and __TAG__ (full, e.g. cli-v0.3.0) —
+  leave those tokens in the Install section; do NOT hardcode versions there.
+• Rewrite the Summary + the Added/Changed/Fixed groups from the CLI/desktop-relevant
+  bullets in CHANGELOG.md's promoted version block.
+• Keep-a-Changelog rules: include only the groups that have entries; delete empty ones.
+• Keep the "Experimental phase" notice until the CLI reaches GA.
+• Scrub for public distribution (RELEASE.md §2): no personal names, no private infra,
+  no fork-branch plumbing, no AI self-narration.
+═══════════════════════════════════════════════════════════════════
+-->
+
+**Experimental phase.** Assets are unsigned — Windows SmartScreen and macOS Gatekeeper will warn on first launch. Windows ships a tray installer as the primary desktop surface; CLI binaries remain available for terminal/headless use and for macOS/Linux.
+
+## What's changed
+
+### Added
+-
+
+### Changed
+-
+
+### Fixed
+-
+
+## Install
+
+**Windows tray app (PowerShell):**
+```powershell
+irm https://raw.githubusercontent.com/Codename-11/hermes-relay/main/desktop/scripts/install.ps1 | iex
+```
+
+**Windows CLI only:**
+```powershell
+$env:HERMES_RELAY_INSTALL_SURFACE='cli'; irm https://raw.githubusercontent.com/Codename-11/hermes-relay/main/desktop/scripts/install.ps1 | iex
+```
+
+**macOS / Linux CLI:**
+```bash
+curl -fsSL https://raw.githubusercontent.com/Codename-11/hermes-relay/main/desktop/scripts/install.sh | sh
+```
+
+Pin this specific release with `HERMES_RELAY_VERSION=__TAG__`.
+
+## Verify
+
+```text
+hermes-relay --version
+hermes-relay pair --remote ws://<host>:8767
+hermes-relay shell
+```
+
+Open **Hermes Relay Desktop** from the Windows Start menu for tray pairing, devices, task log, settings, pause, and emergency stop.
+
+See [Desktop docs](https://codename-11.github.io/hermes-relay/desktop/) for full usage.

DEVLOG.md

@@ -1,5 +1,166 @@
 # Hermes-Relay — Dev Log
 
+## 2026-06-18 — Chat UX: model-picker apply, relay inbound images, smooth profile switch (Android)
+
+**Why.** An audit of profile switching and the chat composer surfaced three issues: (1) the in-chat model picker showed the picked model but the agent ran on the account's global default; (2) an agent-returned server-local image showed a path/"on server" notice instead of rendering, even when paired to the relay; (3) switching profiles visibly tore down and rehydrated the conversation.
+
+- **Model picker binds to `session.create` (`GatewayChatClient`, `ChatViewModel`, `GatewayModels`).** Verified against upstream `tui_gateway/server.py`: a model is a per-session override, applied via `config.set {session_id,…}` on a live session or `model`/`provider` params on `session.create` for a fresh one. The app only did the first; on a brand-new chat the `config.set` carried no `session_id` (upstream treats it as a no-op) and `session.create` omitted the model, so the agent built from the global default. Added a live `sessionModelProvider` (mirrors `sessionProfileProvider`) so the picker's model+provider bind onto each `session.create`; mid-session switches still go through `config.set`. A profile switch now retires an explicit pick (the profile defines its own model) and seeds the picker pill from the profile model so the header doesn't lag the round-trip. SSE paths already carried the model in the request body. Tests added for the new binding.
+- **Relay-backed inbound images (`ChatImageContent`, `ChatScreen`, `ChatViewModel`).** Markdown images (`![](src)`) flowed through a renderer that only understood `http(s)` → Coil; a server-local path fell to a static "image is on the server" notice and never consulted the relay (the relay media route was only wired to the `MEDIA:` marker path). Added a `RelayServerImageResolver` CompositionLocal, provided by ChatScreen from `ChatViewModel.resolveServerImage`, which fetches an absolute server path through the relay's bearer-auth `/media/by-path` route (same route + sandbox the `MEDIA:` path uses), decodes, caches (bounded LRU keyed by path), and renders inline with tap-to-zoom. Null when unpaired → unchanged standard (no-plugin) behavior. Complementary nudge: `composeInjectedContext` appends a one-line media-capability hint to the SSE `system_message` when a relay route is configured (`RelayHttpClient.mediaUrlConfigured()`), surfaced in the "What the agent sees" audit sheet. SSE-only — the gateway has no per-turn system slot, so there the client render fallback (and upstream's own `MEDIA:` instruction) carry it.
+- **Profile-switch transition (`ChatViewModel.switchProfileContext`, `ChatScreen`).** Stopped clearing the message list synchronously before the async history fetch; the previous transcript is held and swapped atomically when the new history resolves, so the `LazyColumn`'s per-item `animateItem()` cross-fades old→new instead of blanking to an empty/"Loading…" state. The top loading row is suppressed while held content is on screen.
+- **Verification.** Rebased `Codename-11/fix-ui-ux-issues` onto `dev` first (its only unique change was already on `dev`). `:app:compileSideloadDebugKotlin` + `:app:compileSideloadDebugUnitTestKotlin` BUILD SUCCESSFUL (no new warnings in the changed files); `GatewayChatClientTest` extended with model-binding cases. On-device verification via Studio.
+
+## 2026-06-18 — Terminal: TUI input correctness + chrome cleanup (Android + relay)
+
+**Why.** On-device terminal use surfaced input bugs and wasted chrome, benchmarked against Orca's mobile terminal. The extra-keys bar clipped labels ("CTRL" → "CTR") because it was weight-distributed across a fixed width; the on-screen arrows and PASTE bypassed the emulator and sent fixed/raw bytes (wrong inside TUIs and unsafe for multi-line paste); and the header + tab strip + a stray inset ate vertical space, especially in the common single-tab case. Separately, the relay wrapped each PTY in the user's default tmux, inheriting tmux's 500ms `escape-time` and `screen` `$TERM` — the classic source of laggy ESC, mangled Alt, and degraded color in vim/htop.
+
+- **Extra-keys bar (`ExtraKeysToolbar.kt`).** Rewrote from a weight-divided `Row` to `horizontalScroll` with fixed-min-width keys, so labels never clip and the cluster scrolls when wider than the screen (Orca's strategy). Then compacted to Orca's proportions — 32dp height, 36dp min width, 12sp, tighter padding/spacing — and centralized the key haptic.
+- **Mode-aware special keys (`index.html` + `TerminalScreen.kt`).** Added `window.termSendKey(name)` that reads xterm's `applicationCursorKeysMode` and encodes arrows/Home/End as SS3 (`\eOA`) vs CSI (`\e[A`); the toolbar arrows now route through it. PASTE routes through `term.paste()` (bracketed paste) instead of a raw `sendInput`, so multi-line paste no longer auto-executes.
+- **Compact header (`TerminalScreen.kt`).** Replaced Material's fixed 64dp `TopAppBar` with a ~52dp custom `Row` + `statusBarsPadding`: status is shown once, inline with the title (a `ConnectionStatusBadge` dot + one concise word, ellipsized via `weight(1f, fill = false)` so it can't push the actions off-screen), the whole block opens the info sheet. The subtitle no longer renders the full `hermes-<deviceId>-tabN` wire id (it was wrapping to two lines).
+- **Less wasted vertical space.** The tab strip + its divider now render only for 2+ tabs; with one tab the new-tab "+" lives in the header instead. Dropped a redundant `navigationBarsPadding()` on the keys bar (the app Scaffold's bottomBar already owns the nav-bar inset, leaving a dead gap), and added an 8px bottom gap in `#terminal` so the last row clears the keys bar.
+- **Isolated, TUI-tuned tmux (`plugin/relay/channels/terminal.py`).** Sessions now spawn on a dedicated `-L hermes-relay` socket with a generated `~/.hermes/hermes-relay-tmux.conf` (written lazily, best-effort): `escape-time 0`, `default-terminal "tmux-256color"`, truecolor `terminal-features/overrides`, `mouse on`, `focus-events on`, `set-clipboard on`, `aggressive-resize on`, `status off`. A dedicated socket is the only safe way to set server-global `escape-time` without altering the user's own tmux; persistence is unchanged (the socket's server outlives the relay process).
+- **Verification.** `:app:assembleSideloadDebug` BUILD SUCCESSFUL and deployed to device; `python -m unittest plugin.tests.test_terminal_channel` (4 tests) + `py_compile` pass. Relay change hand-deployed to the staging box and verified live on the `hermes-relay` socket (`escape-time 0`, `default-terminal tmux-256color`, `status off`, `mouse on`, `focus-events on`). tmux 3.4 with `tmux-256color` terminfo present.
+
+## 2026-06-18 — Native secure routes: split connection Features from Routes (Android)
+
+**Why.** Connection setup conflated two separate questions — what a Hermes connection can *do* (features) and how this phone *reaches* it (route) — which coupled Relay features to a single transport. Modeling them separately lets a user enable Relay tools over any route (LAN, Tailscale, public HTTPS, VPN, or a plugin-provided secure proxy) and sets up a plugin-assisted native encrypted route that does not require Tailscale. The standard path stays direct-to-upstream and plugin-free. (Backfilled log entry — the work landed in PR #88; full design in `docs/plans/2026-06-18-native-secure-routes.md`.)
+
+- **Split connection model.** `ConnectionsSettingsScreen` / `ActiveConnectionSections` now render distinct **Features** and **Route** sections; `Endpoint.kt` + `ConnectionData.kt` carry the route/role model and `QrPairingScanner` threads it through pairing.
+- **Plugin secure proxy route.** A `plugin_proxy` route role surfaces as a "Secure proxy" option with encrypted / pinned-TLS treatment (recommended, not forced) alongside the existing LAN / Tailscale / public / custom roles.
+- **Docs.** Added the `2026-06-18-native-secure-routes` plan and a connections split-model mockup; fixed the docs-site hero sphere to keep its canvas backing store synced to the CSS box (`HeroDemo.vue`).
+- **Verification.** CI green on PR #88 (Android Build + Lint + Test).
+
+## 2026-06-18 — Android onboarding permissions review surface
+
+**Why.** Android onboarding already kept the standard path clean, but permissions were scattered between feature-specific prompts, Bridge, and Android Settings. A central review page makes the model explicit: standard Chat and Manage do not need phone-control permissions, while voice, camera, notifications, and sideload Device Control remain opt-in.
+
+- **Shared permission snapshot.** Added `AppPermissionStatusProbe` so Bridge and Settings read the same runtime grants and special-access switches: notifications, microphone, camera, notification listener, accessibility, screen capture, overlay, contacts, SMS, phone, and location.
+- **Permissions screen.** Added `PermissionsStatusScreen` with Standard Hermes, On demand, and flavor-aware Device Control sections. Rows show required/optional/session status and link to the relevant Android Settings surface or Bridge session grant.
+- **Onboarding and Settings entry points.** The Power Tools onboarding page now has a "Review permissions" action, and Settings -> App includes a Permissions row. Google Play builds show the sideload Device Control section as unavailable rather than implying hidden phone-control permissions.
+- **Verification.** `:app:compileGooglePlayDebugKotlin`, `:app:compileGooglePlayDebugAndroidTestKotlin`, and `:app:compileSideloadDebugKotlin` pass with `ANDROID_HOME` pointed at the local SDK.
+
+## 2026-06-17 — Chat transparency + provenance polish: injected-context audit sheet, spoken-turn badges, version-skew error
+
+**Why.** On-device voice testing surfaced two transparency gaps and two papercuts. The per-turn system context the phone injects (persona + phone status + voice hint) was invisible — no way to audit what the agent actually receives. Spoken voice-mode turns were indistinguishable from typed ones in the scrollback, while realtime turns were already badged. A field an older relay plugin doesn't accept produced a misleading "Network error · HTTP 400" with a dead Retry. And the floating connection toast's Warning tone was semi-transparent, letting content bleed through.
+
+- **Injected-context audit sheet.** `ChatViewModel.composeInjectedContext()` extracts the per-turn system-message composition (persona/profile precedence + phone-status block + per-turn interface context) into one builder used by both `startStream` (which sends `combinedSystemMessage`) and the new `previewInjectedContext()` — so the audit can't drift from what is sent. `combinedSystemMessage` is built byte-for-byte as before (`listOfNotNull` over the raw blocks); per-block fields null out blanks only for display, and the resolved profile is passed in to preserve the no-skew invariant with `modelOverride`. Tapping the `ContextMeterBar` (now with an ⓘ affordance) opens `InjectedContextSheet` ("What the agent sees"); on the gateway path the persona block is labeled "added server-side — not sent from this device", since the server owns the soul + personality overlay there.
+- **Spoken-turn badges.** Voice-mode replies are tagged "Voice", realtime replies keep "Realtime Agent"; both share a speaker glyph as the modality marker (`MessagePathBadge` gained an optional leading icon). The Voice tag is set on the assistant placeholder from the per-turn interface-context signal and rides the id-swap + content updates.
+- **Badges survive history reload.** `ChatHandler.loadMessageHistory` now carries provenance badges forward by message id when it rebuilds the list from server data — the post-turn reload previously wiped them (this also fixes the pre-existing loss of "Stopped"/"Error").
+- **Version-skew error.** `RelayErrorClassifier` maps a 400 whose body names an unsupported *field* to "Relay update needed" (non-retryable), distinct from a bad *value* like "unsupported codec" (which keeps its normal classification).
+- **Connection toast opacity.** `ConnectionStatusToast` composites its container color over the theme `surface` so the floating overlay is always opaque while keeping each tone's tint; the in-flow `ConnectionStatusBanner` is intentionally left translucent (it blends with a known backdrop).
+- **Verification.** `:app:compileSideloadDebugKotlin` BUILD SUCCESSFUL; `./gradlew lint` clean. On-device confirm via Studio/sideload.
+
+## 2026-06-17 — App theming: theme-aware brand tokens, app themes, hot-swappable sphere
+
+**Why.** Chat (and other brand-styled surfaces) were effectively hardcoded dark: the `RelayRefresh` brand palette was a single dark-only `object` of `val Color(...)` constants that ~150 call sites referenced directly, bypassing the Material light scheme. The goal was three-fold: fix that alignment, add real app themes (light/dark plus the Nous Hermes baselines), and make the agent sphere a hot-swappable component with user-authored skins.
+
+- **Theme-aware brand tokens (the fix).** New `ui/theme/BrandPalette.kt` defines a 21-token `BrandPalette`, the `LocalBrand` CompositionLocal, a `toColorScheme()` derivation (Material scheme is now derived from the palette, never authored separately), and the `AppTheme`/`AppThemes` registry. `RelayRefresh` was converted from constants into a **snapshot-backed façade** over an `activePalette`: every `RelayRefresh.X` is now a getter reading a `mutableStateOf`, so reads in composition and draw phases subscribe and repaint on theme change — the ~150 existing call sites became theme-reactive with no edits. `HermesRelayTheme(appThemeId, themePreference, fontScale)` resolves the theme + light/dark/auto mode into one palette, drives the Material scheme + `LocalBrand`, and mirrors it into the façade via `SideEffect`.
+- **App themes (8).** Hermes Relay (the brand, with full light + dark) plus ports of the canonical Nous dashboard baselines from upstream `web/src/themes/presets.ts` — Hermes Teal, Nous Blue (light), Midnight, Ember, Mono, Cyberpunk, Rosé. Per the hybrid model, the brand honors Light/Dark/Auto while the character themes are fixed-mode looks (matching how Nous ships themes; light mode lives as the Nous Blue theme). `ConnectionViewModel` gained an `appTheme` id pref (DataStore `app_theme`); the picker is a swatch gallery in `AppearanceSettingsScreen`, and the Light/Dark/Auto control disables + explains itself for fixed-mode themes.
+- **Flourish alignment.** The glow/gradient/markdown-highlight flourishes across 13 files keyed off `isSystemInDarkTheme()`; they now read `LocalBrand.current.isDark`, so a fixed dark theme keeps its flourishes on a light-mode phone (and vice-versa). `isSystemInDarkTheme()` now lives only in `Theme.kt` (resolving Auto).
+- **Hot-swappable sphere.** The core algorithm (`MorphingSphereCore.kt`, mirrored in `preview/web/sphere.js`) was left untouched — parity contract preserved. A new `SphereSkin` layer supplies per-state colors/params and declares its reactivity (voice/tools/intensity/gaze), gated inside `MorphingSphere` so reactive inputs are optional + detectable. `SphereRegistry` ships Adaptive (recolors to the active theme via `LocalBrand`), Classic (the original look), Aurora, Solar, and Mono. `MorphingSphere` gained a `skin` param defaulting to `LocalSphereSkin.current`, so all ~11 call sites are untouched; `RelayApp` provides the resolved skin + available set. User skins load from app-private `spheres/*.json` via `SphereSpec` (kotlinx.serialization, data-only, validated, invalid files skipped) → `SphereSkinLoader`; surfaced in the picker with capability badges and a "Custom" tag. Format documented in `docs/sphere-spec.md`.
+- **Verification.** Reviewed-but-not-compiled — no Android SDK in this worktree and Studio owns builds. Brace/paren balance checked on all new/edited files; import resolution and call-site compatibility reviewed by hand. `./gradlew lint` + on-device confirm pending (via Android Studio). Palettes are single `BrandPalette` literals, easy to tweak after an on-device pass.
+
+## 2026-06-17 — ConnectionViewModel decomposition: extract transport/pairing/profile collaborators (ADR 34 follow-up)
+
+**Why.** `ConnectionViewModel` was the one god-object the ADR 34 fence deferred — ~5,531 lines reaching across both sides of the upstream/relay package boundary (the `HermesApiClient`/`GatewayChatClient`/`DashboardApiClient` zoo *and* the relay `ConnectionManager` *and* pairing *and* profiles). Goal: move cohesive concerns into named, testable collaborators in a new `viewmodel/connection/` package, behind the ViewModel's existing public surface, so the standard-vs-relay wiring lives in explicit seams. Pure mechanical, behavior-preserving extraction — the whole-module compile (production + every test source unchanged) is the public-API-preservation guard. Continues the `ConnectionSwitchCoordinator` precedent.
+
+- **`PairingController`** (229 lines). Owns the paired-devices list (`GET /sessions`) + management (`loadPairedDevices`/`revokeDevice`/`extendDevice`/`revokeChannelGrant`, incl. the optimistic local removal and the full-grants-rebuild encoding) and the insecure-ack DataStore flags (`insecureAckSeen`/`insecureReason`/`setInsecureAckComplete`). Self-contained — nothing else reads its state except `applyPairingPayload`'s `insecureReason.value`. The ViewModel delegates unchanged.
+- **`UpstreamTransportController`** (269 lines). Owns the per-connection encrypted `DashboardCookieStore` cache, a single consolidated `DashboardApiClient` factory (was 4+ scattered build sites — the plan's headline), the cached `GatewayChatClient` (lazy build + mid-turn LAN/Tailscale retarget) with its availability tier + sticky-Unsupported verdict, and the per-endpoint capability snapshot + `chatMode` + the `streamingEndpoint`-preference resolution. The `@Synchronized` gateway-cache lock moved *with* the state (now the controller instance) — same mutual exclusion, different monitor. `rebuildApiClient` pushes the probed snapshot via `setCapabilitiesAndMode`.
+- **`ProfileController`** (313 lines). Owns the merged `agentProfiles` list (relay `auth.ok` ∪ dashboard `/api/profiles`), the per-connection selected-profile state machine + its three persistence stores, `profileDisplayAlias`, `activeSessionTransport`, and the per-profile last-session restore. Because the state machine is co-driven by ViewModel-level lifecycle observers (connection switch / active-connection change / agent-profile arrival / gateway-availability settle), those observers stay in the ViewModel and call `profileController.*` lifecycle hooks **in their original order** — orchestration stays put; only state + logic moved, so the state machine is now unit-testable in isolation. The three stores are exposed as public vals so the connection-lifecycle orchestrators (`removeConnection`, duplicate-merge, `resetAppData`, `saveLastSessionId`) keep their clear/persist call sites byte-identical.
+- **Deferred: `RelayTransportController`** (the plan's Step 2). Left in place per the plan's explicit "too entangled — don't force it" rule. `ConnectionManager` is referenced at ~38 ViewModel sites, including eager `StateFlow` initializers (`relayConnectionState`, `activeEndpoint`, `effectiveApiServerUrl`/`RelayUrl`/`DashboardUrl`, `relayReady`, `insecureMode`), the `ConnectionSwitchCoordinator`, and the `relayHttpClient`/`ScreenCapture`/`tailscaleDetector` URL-provider lambdas. The relay/route methods are inseparable from the central `_relayUrl`/`_apiServerUrl` state (also written by non-relay orchestrators + the switch coordinator) and from shared connection-store helpers (`persistActiveConnectionUrls`, `mergedRouteCandidates`); the route-probe public nested types (`RouteProbeStatus`, `RelayReachable`) are part of the frozen public API. A faithful extraction needs ~18 injected callbacks/refs — relocating coupling into lambdas rather than removing it, against the plan's "named seams, not emergent shared state" goal and at a regression risk the compile-plus-focused-slice verification can't catch. The other three controllers stand on their own; the `ChatTransportProvider` capstone (optional) is likewise not attempted.
+- **Result.** `ConnectionViewModel` 5,531 → 5,089 lines (−442); cohesive transport/pairing/profile concerns now live in 811 lines of `viewmodel/connection/` collaborators with narrow, provider-injected interfaces. Public API unchanged.
+- **Verification.** `:app:compileSideloadDebugKotlin` + `:app:compileSideloadDebugUnitTestKotlin` BUILD SUCCESSFUL after each extraction (every caller + test source compiles unchanged → public surface byte-identical). Focused slice `*ArchitectureBoundaryTest` (Konsist fence — `viewmodel/connection/` is outside `network.*` so it imports both worlds freely, fence stays green) + `*RelayUrlDeriverTest` + `*ConnectionSwitchTest` passes. `./gradlew lint` clean. On-device confirm pending (Bailey, via Studio).
+
+## 2026-06-17 — Voice mode audit: relay bug fixes, spoken-output hint, Google enhanced voice
+
+**Why.** A post-refactor audit of the standard and relay voice paths surfaced one reachable correctness bug plus several enhancement opportunities: leverage the desktop-style non-persisted per-turn context to instruct spoken-output formatting, and expose Google/Gemini enhanced voice (tone tags, voice/model/persona) that upstream added in recent PRs.
+
+- **Relay realtime-agent loop drift (correctness).** The non-native ("render-after-Hermes") websocket loop in `plugin/relay/realtime_agent/broker.py` lacked a `playback.drained` branch, so the end-of-turn ack every client sends fell through to the unsupported-message error; the client treats `voice.error` as fatal and tore the session down on every turn whenever a non-native provider was configured. Extracted the client→server messages identical across the native and non-native loops (`session.start`, `session.resume`, `client.ack`, `playback.drained`, `hermes.confirm`) into a shared `_handle_common_client_message` dispatcher used by both loops so they can no longer drift, and added the missing `input_audio.clear` handling to the non-native path. The native loop's per-message `provider_task.done()` break check is preserved exactly. (`hermes.confirm` echo is by-design in both loops — the realtime model answers confirmations via its `hermes_confirm` tool, which returns `forwarded_to_hermes_ui` — so it was left unchanged.)
+- **TTS file leak.** `plugin/relay/voice.py` synthesize streamed upstream-written `~/voice-memos/*.mp3` files and never deleted them. It now passes its own temp `output_path` into the TTS tool and deletes the artifact after streaming (reads bytes into memory and returns a `web.Response` so cleanup can run; audio is bounded by `MAX_TEXT_CHARS`).
+- **Realtime "lab" session binding.** `plugin/relay/realtime_voice.py` `handle_ws` authenticated but never checked the websocket caller created the session. Added `_auth_matches_session` (mirrors `voice_output.py`) binding sessions to the creating principal's kind + device-id / token-hash, reusing `voice_auth`'s shared `AuthPrincipal` / `_bearer_from_request`.
+- **Spoken-output formatting hint (standard + relay).** Enriched the per-turn voice interface context (`VoiceViewModel.STABLE_VOICE_INTERFACE_CONTEXT`) to tell the model its reply will be spoken — short conversational sentences, no markdown/emoji/URLs. This rides the existing non-persisted `system_message` slot (upstream `ephemeral_system_prompt`), so it never lands in history. Because the gateway `prompt.submit` RPC has no system-message slot, `ChatViewModel.startStream` now forces any turn carrying a per-turn interface context (voice) onto an SSE endpoint so the hint always reaches the model.
+- **Provider-aware enhanced voice (Gemini + xAI) — relay path.** `/voice/synthesize` accepts optional per-request overrides (`voice`, `model`, `audio_tags`, `persona_prompt`, `language`) mapped onto the active provider. Upstream's `text_to_speech_tool` has no per-call override surface, so the relay merges overrides into a config copy and invokes the provider generator directly — `_generate_gemini_tts` (voice/model/`audio_tags` tone-tag rewrite/inline persona via a temp file) or `_generate_xai_tts` (`voice`→`voice_id`, `audio_tags`→`auto_speech_tags`, `language`). Gemini's audio-tag rewrite fails soft when the auxiliary LLM is unavailable. `/voice/config` advertises a provider-aware `tts.enhanced` capability block. Android plumbs `EnhancedVoiceOverrides` from new persisted prefs through `RelayVoiceClient.synthesize` + the relay adapter, with an "Enhanced Voice (<provider>)" Voice Settings card rendered from the capability flags. OpenAI is excluded — upstream exposes only voice/speed for it (no `instructions` tone steering).
+- **Enhanced voice on the streaming renderer (`/voice/output`).** Because `voice_output_enabled` defaults true, the streaming renderer — not `/voice/synthesize` — is the normal relay playback path, so the per-request override was effectively fallback-only. Added xAI `auto_speech_tags` as a per-profile `voice_output:` setting threaded through every layer (config dataclass + env + YAML loader, `voice_output_settings`, profile override, `VoiceOutputSession`, `_provider_options`, `config_payload`, the `PATCH /voice/output/config` allow-list), mirroring `text_normalization`. The render applies `upstream_voice.apply_xai_speech_tags()` (fail-soft) to each chunk before the `voice_lab` `xai_tts` renderer — keeping `voice_lab` standalone and the upstream import in the patch-point. Android: `VoiceOutputConfig.auto_speech_tags` + `updateVoiceOutputConfig(autoSpeechTags=)` + an "Expressive speech tags" switch in the **Hermes Chat + Voice Output** card (xai_tts, persisted with the existing Save buttons). No Gemini streaming provider in `voice_lab`, so Gemini enhanced voice stays `/voice/synthesize`-only.
+- **Render-path visibility (troubleshooting).** The streaming-vs-synthesize decision was logcat-only. Added a per-session `DiagnosticsLog` entry naming the active path and a persistent "Render path" row in the Voice Settings card (derived from `voiceOutputConfig`).
+- **Docs.** `docs/upstream-surface-matrix.md` gained a "Voice Surfaces (standard vs. relay)" section with an explicit **route-ownership table** (every `/voice/*` route is relay-owned; only dashboard `/api/audio/*` is upstream — no upstream streaming/WS audio route) and an enhanced-voice matrix across both relay paths; `docs/spec.md` Phase V documents the override, the `tts.enhanced` block, and `voice_output` `auto_speech_tags`; `user-docs/features/voice.md` gained an "Enhanced Voice (Gemini & xAI)" section + the streaming speech-tags toggle and corrected the stale `~/voice-memos` note.
+- **Standard voice polish.** Pre-flight 25 MB transcribe guard (matches upstream `_MAX_TRANSCRIPTION_UPLOAD_BYTES`) + friendly 413/400 copy in `StandardHermesVoiceClient`; hardened the dashboard audio HEAD probe to also try `/api/audio/speak`.
+- **Verification.** Python: `py_compile` on all touched relay modules; relay voice suite green at 103 tests except one pre-existing xAI-OAuth env-dependent failure (identical on the unmodified tree). New tests: non-native `playback.drained` regression (red-on-bug/green-on-fix), Gemini + xAI synthesize-override integration, override-parser + capability-block units, `auto_speech_tags` PATCH round-trip, `apply_xai_speech_tags` call-through/fail-soft. Kotlin not built locally (Studio + `./gradlew lint` are the pre-push gate).
+
+## 2026-06-17 — Upstream/Relay isolation: package fence + Konsist rule + vanilla contract test
+
+**Why.** The load-bearing "standard path = vanilla upstream" invariant was enforced only by `CLAUDE.md` convention (network clients were cleanly named but co-located in one package, so nothing *stopped* a standard-path file importing a relay client), and the standard path had never been validated against *true* vanilla upstream (staging runs the fork with relay routes compiled in). ADR 34 records the decision; this lands all three parts. Net-additive, behavior-preserving.
+
+- **Package fence.** Split `app/.../network/` into `network/{upstream,relay,shared}` — main + mirrored test sources (38 files moved, ~83 touched for import repointing). `VoiceAudioClient.kt` split three ways: the `VoiceAudioClient` interface + `AutoVoiceAudioClient` router → `shared`; `StandardHermesVoiceClient` → `upstream`; `RelayVoiceAudioClientAdapter` → `relay` (co-locating them would force one file to import both worlds). `ChatHandler` → `upstream` (per ADR 3 chat never flows through the relay multiplexer; the handler is fed only by upstream transports). `AndroidManifest` `GatewayKeepAliveService` FQCN and the `ci-android.yml` `RelayUrlDeriverTest` path updated for the move.
+- **Hidden coupling surfaced.** The move exposed the one real upstream→relay dependency the import grep couldn't see (it was a same-package bare reference): `ChatHandler` renders phone-action bubbles from the bridge's `LocalDispatchResult` DTO. Resolved by moving that passive DTO to `network.shared` — both sides now depend only on shared to speak it.
+- **Konsist boundary test.** `ArchitectureBoundaryTest` (`scopeFromProduction`) asserts `upstream` ⊥ `relay` and `shared` imports neither. Added to the `ci-android.yml` explicit `--tests` list (the broad aggregate hangs, issue #32, so a named test is the only way it runs in CI). Konsist 0.17.3 resolves clean on Kotlin 2.3.21.
+- **Vanilla-upstream contract.** `scripts/check-upstream-route-contract.py` source-parses upstream's declared routes (aiohttp `add_*` + FastAPI decorators) — no server boot, no pip, no model keys. Two tiers: REQUIRED standard-path routes fail the build if missing; mode-dependent routes (auth-gate, `/api/pty`, `/v1/models`) only warn. A fork-marker guard refuses to pass against our own fork. `ci-contract.yml` checks out vanilla upstream with no relay bootstrap, asserts the checkout is vanilla, runs the contract; weekly schedule tracks upstream `main` as a drift siren, PR/push use a pinned ref. Notable: in the checked upstream commit the dashboard exposes no `/api/auth/ws-ticket` REST route (it uses the injected session token + a ws `ticket` query param), so the Desktop-style auth-gate routes are advisory, not required.
+- **Deferred (tracked in ADR 34).** The `ConnectionViewModel` transport-strategy split — the one true god-object leak — is intentionally deferred as the riskiest change; the fence now contains the blast radius. Same-package redundant imports left behind by the move (e.g. a relay file importing its own `network.relay` sibling) are harmless and not cleaned. The contract job's PR-run `UPSTREAM_REF` defaults to `main` until pinned to a confirmed-public known-good SHA.
+- **Verification.** `:app:compileSideloadDebugKotlin` + `:app:compileSideloadDebugUnitTestKotlin` BUILD SUCCESSFUL; `ArchitectureBoundaryTest` passes; contract script PASS against the local upstream clone (12/12 REQUIRED routes). `./gradlew lint`: BUILD SUCCESSFUL (clean, all four variants).
+
+## 2026-06-17 — Gateway parity: live session.info sync + YOLO/Fast + stale-state refreshes
+
+**Why.** An audit (full tui_gateway surface vs. what the official desktop uses vs. what we used) found we were dropping most `session.info` fields and fetching several server lists once. Goal: augment upstream, never show stale state. Verified every contract against the up-to-date upstream clone; a parallel review confirmed the new RPCs match `config.set` exactly and caught three race-window bugs (fixed).
+
+- **More of `session.info` consumed live.** The interceptor now also surfaces `reasoning_effort`, `credential_warning`, `yolo`, and `fast` (added to `serverReasoningEffort`/`serverCredentialWarning`/`serverYolo`/`serverFast` flows); `startGatewayStateSync` gained one guarded collector each. A `/reasoning` change made on the desktop/TUI now reflects instantly instead of only on turn-complete.
+- **Credential warnings no longer silent.** `session.info.credential_warning` (present only when the active provider key is missing/invalid) is surfaced once per distinct warning as a ⚠ system notice — dedup'd against the constant `session.info` echoes, cleared when the key is fixed. Previously such turns just failed silently.
+- **YOLO + Fast mode.** New session-scoped toggles in the agent sheet (`config.set yolo` value `1`/`0` scope `session`; `config.set fast` value `fast`/`normal`) with optimistic set + rollback, live state from `session.info.yolo`/`fast`, and reset across every session/profile/connection switch. YOLO (approval bypass) renders loud — `error` caption + an `errorContainer` "Approvals are OFF" banner — and stays ephemeral so a backgrounded app can't leave global auto-approve armed.
+- **No fetch-once staleness.** `refreshSkills()` + `refreshModels()` (SSE `/v1/models`) now fire on agent-sheet open alongside the personality/model refreshes, so server-side skill/model changes appear without an app reload.
+- **Review fixes.** `activateGatewayProfile` now nulls YOLO/Fast (the missing 5th clear site); the `setYolo`/`setFast` optimistic rollback guards against a session switch landing during a slow `prewarm` (re-check client identity + only roll back if we still own the value).
+- **Verification.** `:app:testSideloadDebugUnitTest` compiles clean; contract-fidelity review = all PASS. Touches only `GatewayChatClient`/`ChatViewModel`/`ConnectionInfoSheet`. The command-palette skills-refresh-on-open is the one optional follow-up (palette lives in the co-owned `ChatScreen.kt`). `./gradlew lint` + on-device confirm still pending.
+
+## 2026-06-17 — Personality: server-owned on the gateway + picker-command handling
+
+**Why.** Two reports against the personality flow. (1) Sending `/personality` (no arg) showed an agent reply bubble that appeared then vanished; (2) `/personality none` returned a confirmation but the app never reflected that the overlay was cleared. Verified the actual contract against the up-to-date upstream clone: `/personality` is a *picker command* (`hermes_cli/commands.py` `_PICKER_COMMANDS`) that the desktop/TUI never raw-forward — a bare command expands to an arg step, and a named/`none` value is applied via `config.set {key:"personality"}`, which persists `display.personality` + applies `ephemeral_system_prompt` live to the session and emits `session.info`. The app instead blindly forwarded every slash to `slash.exec`/`command.dispatch`, had no `none` concept, and never consumed `session.info` — so it kept injecting a stale per-turn personality prompt that fought the server.
+
+- **Slash results stopped vanishing.** `ChatHandler.loadMessageHistory` did a wholesale reload preserving only `voice-intent-`/`steer-`/`ask-` ids; `system-notice-` (every `addSystemNotice` slash result) was wiped by the next turn's reconcile. Added `system-notice-` to the preserve allow-list — fixes the disappearing bubble for `/personality` and all other inline command output.
+- **Gateway client owns personality.** `GatewayChatClient` gained `serverPersonality: StateFlow<String?>`, `getPersonality()` (`config.get`), and `setPersonality()` (`config.set {key:"personality", value, session_id}`), plus a connection-level `session.info` interceptor that captures the `personality` field even with no turn in flight. `"none"`/`"default"`/`"neutral"` all clear the overlay (upstream `_validate_personality` conflates them).
+- **ViewModel mirrors server truth.** `selectPersonality` pushes via `config.set` on the gateway (optimistic, rolled back on a server reject with a now-durable notice) and only drives per-turn injection on the SSE fallbacks; `startStream` skips the persona-prompt injection entirely on the gateway so it can't double-apply. A `startPersonalitySync` collector + a ready-socket `config.get` seed keep `_selectedPersonality` reconciled to whatever the server/desktop/TUI set.
+- **Picker-command UX.** `/personality` is intercepted client-side like the desktop: bare `/personality` opens the agent sheet's Personality section (new `openPersonalityPicker` one-shot), `/personality <name|none>` routes to `selectPersonality`. The synthetic client **"Default" row was removed** — the picker is now **None** + the server-provided personalities (the configured default, if any, shows tagged `(default)` and highlights when active); upstream's active value is just `none` or a name, so the client shouldn't invent a third state. Added a `/personality none` palette entry. `AgentDisplay` treats `none`/`neutral` as cleared-overlay aliases (base identity, not the literal word) via `isClearedPersonality`.
+- **`/model` sibling fixed.** `/model` is the other picker command (`_PICKER_COMMANDS = {model, skin, personality}`; `skin` is `cli_only` and already excluded on mobile). A bare `/model` had the same raw-forward dead-end — now it opens the model picker (`openModelPicker` one-shot → `ModelPickerSheet`), while `/model <args>` stays a real gateway switch.
+- **Live model/provider sync.** The `session.info` interceptor now also surfaces `model` + `provider` (`serverModel`/`serverProvider` flows); the VM's `startGatewayStateSync` (renamed from `startPersonalitySync`) drives the model pill from them, so a `/model` switch on the desktop/TUI reflects live. Format-safe — the pill normalizes through `AgentDisplay.displayModelName`, and `session.info` keeps model/provider separate like `model.options`.
+- **No app reload for server-supplied data.** `refreshPersonalities()` (list + default + active `config.get`) now fires on agent-sheet open alongside `refreshModelOptions`, so a personality added/changed server-side appears without restarting the app; the active value also tracks live via `session.info`.
+- **Profile SOUL double-inject fixed.** On the gateway the session is bound to the selected profile (SOUL applied server-side) AND the personality rides `config.set` — so `startStream` now sends NO persona/profile prompt on the gateway (only the phone-status block), where it previously re-injected the profile's `systemMessage` on top of the server's own SOUL. SSE fallbacks keep the client-side precedence rules.
+- **Verification.** `:app:testSideloadDebugUnitTest` compiles the full module clean; new `AgentDisplayTest` cases for `isClearedPersonality` / `none`-as-cleared pass. `./gradlew lint` still the pre-push gate. On-device confirm of the live gateway round-trip pending.
+
+## 2026-06-16 — Per-surface release notes (plugin + CLI parity with Android)
+
+**Why.** Plugin and CLI GitHub Release bodies were static boilerplate baked into the workflow YAML (version-interpolated, but change-agnostic — a reader couldn't tell what a `plugin-v*`/`cli-v*` release actually changed). Only Android had real per-release notes (`RELEASE_NOTES.md` via `body_path`). Brought plugin and CLI up to the same Summary/Added/Changed/Fixed format.
+
+- **New notes files.** `PLUGIN_RELEASE_NOTES.md` and `CLI_RELEASE_NOTES.md` at repo root — hand-written per release, same structure/scrub as `RELEASE_NOTES.md`. They keep the valuable Install/Verify sections but add a per-release "What's changed" block.
+- **Version stays auto-accurate.** Rather than hardcoding the version in install commands (three spots for CLI), the files use `__VERSION__` (and `__TAG__` for CLI) placeholders; each release workflow `sed`-renders them into a temp body before `softprops/action-gh-release` consumes it via `body_path`. Human writes prose, pipeline fills the version.
+- **Workflow wiring.** `release-plugin.yml` (package job, already checks out) and `release-cli.yml` got a "Render release notes" step + `body_path:` in place of inline `body:`. The CLI `publish-release` job had **no `actions/checkout`** (it only downloaded build artifacts) — added one so the notes file is present in that job.
+- **Docs.** RELEASE.md: §2 cross-references all three per-surface files; the plugin release recipe now updates + commits `PLUGIN_RELEASE_NOTES.md`; the CLI CI-behavior section documents `CLI_RELEASE_NOTES.md` + the placeholder substitution.
+- **Verification.** All three release workflow YAMLs parse (`yaml.safe_load`); plugin/CLI confirmed on `body_path` with no leftover inline body. Placeholder `sed` substitution validated by inspection. No release cut.
+
+## 2026-06-16 — Dev-velocity tooling: Play auto-publish, worktree workflow, desktop UI preview
+
+**Why.** Three workflow improvements to expedite shipping: automate the manual Play Console upload step, write down the worktree mental model, and cut the Compose UI edit→build→install loop.
+
+- **Play Console auto-upload (CI).** `gradle-play-publisher` 4.0.0 was already configured in `app/build.gradle.kts` (`play { }`, DRAFT status) but `release-android.yml` never invoked it — Play upload was fully manual. Added a publish step to the `release` job, gated on a new optional `PLAY_SERVICE_ACCOUNT_JSON` secret and skipped for prerelease tags (dash in version). It runs `publishGooglePlayReleaseBundle --track=production`, landing the build as a Production **draft** so a human still clicks Start rollout. Closed the multi-flavor footgun structurally: a `playConfigs { register("sideload") { enabled.set(false) } }` block means only the `googlePlay` flavor can ever reach Play, even via the aggregate task. RELEASE.md updated (secrets table + §5 note). When the secret is unset CI prints a "skipped" summary line and behaves exactly as before.
+
+- **Worktree workflow doc.** Added `docs/worktree-workflow.md` — a one-paragraph mental model (worktree = second folder on the same `.git`, warm caches per branch), four rules, the Orca-manages-worktrees note (use `orca-cli` worktree commands, not raw `git worktree`, here), raw-`git worktree` fallback + gotchas, and how it maps onto the existing `main`/`dev` no-ff release contract. Complements RELEASE.md "Branching policy" / decisions.md §23 without duplicating them.
+
+- **Desktop UI preview module (`:ui-preview`).** New JVM-only Compose for Desktop module for hot-reload UI iteration on the PC. Compose Multiplatform 1.10.3 (bundles stable Compose Hot Reload, enabled by default for desktop targets) against the repo's Kotlin 2.3.21 / JVM 17. Follows the existing sphere pattern: shares the platform-agnostic `MorphingSphereCore.kt` algorithm from `:relay-ui` via a Gradle `srcDir` include (excluding the Android `MorphingSphere.kt` renderer, whose `@Preview`/`androidx.*.tooling` imports don't exist on desktop), and provides a thin `DesktopSphere.kt` renderer + a `Main.kt` gallery with a state selector and live sliders. Additive — `include(":ui-preview")` in `settings.gradle.kts` and a `.gitignore` build entry; no shipped artifact depends on it. **First-sync verification pending:** the module pins the one CMP version in the repo, to be confirmed on the next Studio sync (realign per the Compose compatibility matrix if Kotlin/CMP drift). Run via the IDE "Run with Compose Hot Reload" gutter or `./gradlew :ui-preview:run`.
+
+- **Verification.** Kotlin/Gradle changes not built locally (per workflow: builds happen in Studio; `./gradlew lint` is the pre-push gate). YAML and Gradle edits are additive and reviewed by inspection; the `:ui-preview` module is isolated behind one settings include and verified-on-first-sync.
+
+## 2026-06-16 — fix v1.0.0 connect force-close (corrupt keyset) + dashboard button contrast
+
+**Why.** Two reports against v1.0.0 from the same reporter. (1) A force-close after a successful pair/connect on both Standard and Relay modes, surviving a cache clear. (2) Dashboard relay-plugin buttons rendered with text the same colour as their background. The crash was opaque from code review alone — every obvious connect-path was already guarded — until a Play Console stacktrace pinned it.
+
+- **Crash — `AEADBadTagException` escaping the legacy token-store constructor.** The Play Console stack showed `EncryptedSharedPreferences.create` → `LegacyEncryptedPrefsTokenStore.buildPrefs` (`SessionTokenStore.kt`) → `AuthManager.store`. `EncryptedSharedPreferences` decrypts its Tink keyset eagerly on construction, so a corrupt legacy keyset (the classic post-upgrade / post-restore case: the encrypted blob persists but the hardware master key it was sealed against is gone) throws AES-GCM tag-mismatch straight out of the constructor. Every *accessor* on the store already healed via `resetPrefs()`, and `KeystoreTokenStore` hides construction behind `tryCreate`'s `try/return null` — but the legacy store is `new`-ed directly (the fallback when `tryCreate` returns null, and the migration source), so nothing caught a throwing constructor. It crashed in both modes because both call `AuthManager.store` to read the session token. A cache clear didn't help because the keyset lives in `data`, not `cache`.
+  - **Fix — heal at construction + a non-persistent last resort.** `LegacyEncryptedPrefsTokenStore` now builds via `buildPrefsResilient()`: on any build failure it deletes the corrupt prefs file and rebuilds a fresh keyset against the current master key (the token in the unreadable file was lost regardless, so the user re-pairs). As defence-in-depth, `AuthManager.store()` wraps the legacy fallback in `runCatching` and degrades to a new in-memory `InMemoryTokenStore` if even the rebuild fails (a fundamentally broken keystore) — the app stays up and the user re-pairs each cold start instead of force-closing. Corrected the inaccurate `KeystoreTokenStore` comment that claimed its constructor "can't throw".
+- **Dashboard button contrast (#71).** `plugin/dashboard/src/styles.css` scopes a form-control reset `.hermes-relay-plugin button { color: inherit }`. Scoping bumps its specificity to `(0,1,1)`, which outranks the host shadcn Button's `text-*-foreground` utilities `(0,1,0)`, so solid-variant buttons painted their label in the inherited container foreground — which on the dashboard theme nearly matches the button background. Removing the rule (the reporter's local workaround) would break inputs/textareas (they need light text on the dark `--hr-bg`) and ghost/outline buttons (they rely on inheritance). Fix follows the file's existing `.bg-white { …; color }` idiom: solid variants `.bg-primary` / `.bg-secondary` / `.bg-destructive` re-assert their paired foreground colour at `(0,2,0)`, winning back over the reset without `!important`. `dist/style.css` re-synced via the package's `copyFileSync` build step.
+- **Verification.** Dashboard CSS verified by analysis against the variants actually used (`destructive`×6, `secondary`×1, bare-default `bg-primary`; `outline`×23 / `ghost`×4 correctly keep inheriting). Kotlin changes are localized to `SessionTokenStore.kt` + `AuthManager.kt`; on-device confirmation and `gradlew lint` pending a Studio build.
+
+## 2026-06-15 — Claude review required check and Dependabot PR cleanup
+
+**Why.** Open Dependabot PRs targeting `main` were blocked by the required `claude-review` check. Re-running a current Dependabot PR showed the Claude GitHub App token exchange succeeds, but `anthropics/claude-code-action` stops before review because the actor is `dependabot[bot]` and bot actors are not allow-listed. Dependabot-triggered runs also do not expose the same secret surface as human-authored PRs, so forcing Claude review on those PRs is the wrong gate.
+
+- **Workflow fix.** `.github/workflows/claude-code-review.yml` now detects bot-authored PRs with `github.event.pull_request.user.type == 'Bot'` and emits a passing no-op `claude-review` job. Human-authored PRs still run the full Claude Code Review action; aggregate `dev` -> `main` release PRs still use the existing no-op skip.
+- **Workflow self-change guard.** PRs that edit `claude-code-review.yml` now also no-op after checkout when the changed-file list includes that workflow. The Claude action requires the workflow file to match the default branch before app-token exchange, so workflow maintenance PRs must not invoke the action they are changing.
+- **Dependency PR cleanup.** Batched overlapping Gradle version-catalog updates after the required-check fix: Kotlin `2.3.21`, Compose BOM `2026.05.01`, Navigation Compose `2.9.8`, Activity Compose `1.13.0`, DataStore `1.2.1`, Markdown Renderer `0.41.0`, Media3 `1.10.1`, and Foojay resolver `1.0.0`. The Android Gradle Plugin and `softprops/action-gh-release` bumps were already present on `main`, so their stale Dependabot PRs were superseded by current main state.
+- **Verification.** Confirmed `CLAUDE_CODE_OAUTH_TOKEN` was refreshed in repository secrets after Claude Code GitHub setup. Re-ran Claude Code Review on PR #46 and confirmed the current blocker was bot-actor policy, not GitHub App installation. `git diff --check`, `.\gradlew.bat lint`, `.\gradlew.bat assembleDebug`, and the focused `:app:testSideloadDebugUnitTest` CI slice pass with `ANDROID_HOME` pointed at the local SDK.
+
 ## 2026-06-14 — profile chat: turn-complete wipe + cross-transport session continuity
 
 **Why.** v1.0.0 polish (on `dev`, into release PR #61). After the per-profile session work landed, on-device testing of a non-default agent showed: a turn streamed fine (thinking + reply), then on turn-complete the chat **switched to a new/empty session** untouched; the just-finished conversation only reappeared in the drawer a moment later. Watched `adb logcat` during a repro to confirm root cause.
@@ -433,7 +594,7 @@ One smoke-artifact: `~/.hermes/remote-sessions.json` got emptied during agent te
 
 ### Cut `desktop-v0.3.0-alpha.1`
 
-`desktop/package.json` bumped 0.1.0 → 0.3.0-alpha.1 to align the published package version with the release-track tag. Build clean; `node bin/hermes-relay.js --version` prints `0.3.0-alpha.1`. Once this lands on `main` and the tag pushes, `release-desktop.yml` cross-compiles four Bun binaries (win-x64, linux-x64, darwin-x64, darwin-arm64), uploads with `SHA256SUMS.txt`, and the `install.{sh,ps1}` one-liners start working for any user.
+`desktop/package.json` bumped 0.1.0 → 0.3.0-alpha.1 to align the published package version with the release-track tag. Build clean; `node bin/hermes-relay.js --version` prints `0.3.0-alpha.1`. Once this lands on `main` and the tag pushes, the CLI release workflow cross-compiles four Bun binaries (win-x64, linux-x64, darwin-x64, darwin-arm64), uploads with `SHA256SUMS.txt`, and the `install.{sh,ps1}` one-liners start working for any user.
 
 ---
 

GEMINI.md

@@ -0,0 +1,13 @@
+# GEMINI.md
+
+Agent instructions for **Hermes-Relay**. This file exists so Gemini CLI (which
+does not read `AGENTS.md` natively) picks up the project's guidance.
+
+**Read [AGENTS.md](AGENTS.md) — it is the single source of truth** for every
+coding agent: the entry point, the non-negotiables (standard-path-is-vanilla-
+upstream, verify-endpoints, Conventional Commits + `main`/`dev` branching, the
+per-language stack rules), and the public-repo writing hygiene. It links on to
+`CLAUDE.md` for the deep reference (architecture, upstream Hermes API, repo
+layout, code style, the dev loop, and the Key Files map).
+
+Do not restate rules here — keep them in `AGENTS.md` so they can't drift.

PLUGIN_RELEASE_NOTES.md

@@ -0,0 +1,37 @@
+# Hermes-Relay-Plugin v__VERSION__
+
+**Release Date:** June 16, 2026
+**Since the previous plugin release:** Easier setup and a fixed dashboard panel — plus mid-conversation `/relay` controls and a relay-status widget.
+
+This release makes the relay plugin easier to install and live with. Setup now prompts for the optional voice-provider keys instead of asking you to hand-edit `.env`, tools-only hosts can install through the native `hermes plugins install` path, and the installer no longer breaks on `uv`-managed Hermes cores. The dashboard panel — which previously rendered as blank boxes on the host's design system — now displays correctly, and a header widget plus `/relay` slash commands surface relay state from anywhere. The standard no-plugin path needs none of this.
+
+## What's changed
+
+### Added
+- **Guided env-key setup.** The plugin declares its optional voice-provider keys (`XAI_API_KEY`, `OPENAI_API_KEY`, `ELEVENLABS_API_KEY`) in its manifest, so `hermes plugins install` prompts for them (masked, with a "get yours" link) instead of requiring a hand-edited `.env`. The standard no-plugin path needs none.
+- **Native install path.** Tools-only setups can install via `hermes plugins install Codename-11/hermes-relay/plugin`; the full relay still uses the curl `install.sh`.
+- **`/relay` slash commands.** `relay status · devices · pair` are usable mid-conversation from any platform (CLI / Discord / TUI).
+- **Dashboard relay-status widget.** A `Relay · connected / offline / unpaired` badge in the dashboard header, visible on every page.
+- **Session-start relay health check.** A minimal, fully-guarded `on_session_start` hook records relay reachability without slowing the gateway.
+
+### Fixed
+- **Installer failed on uv-managed Hermes hosts.** `install.sh` assumed `pip` lived in the hermes-agent virtualenv, but environments created by `uv` (the upstream default) ship no `pip` module, so the editable install aborted at step 2. The installer now bootstraps `pip` via `ensurepip`, or falls back to `uv pip`, so the plugin installs cleanly on uv-managed cores.
+- **Dashboard buttons rendered as blank boxes.** The host dashboard's Nous design-system `Button` / `Badge` use boolean variant flags (`outlined` / `ghost` / `invert`) and a `tone` prop — not the shadcn-style `variant` prop the plugin passed — so every button collapsed to a solid near-white fill with an invisible label. The plugin now translates its props to the design-system contract via an adapter and drops a label-hiding CSS reset.
+- **Unreadable button labels.** Solid buttons in the relay dashboard panel inherited the container text colour, which matched their background; solid button variants now keep their proper contrast colour.
+
+## Install
+
+```bash
+pip install hermes-relay==__VERSION__
+```
+
+## Verify
+
+```bash
+python -m relay_server --help
+```
+
+---
+
+Tag prefixes: Android releases use `android-v*`, CLI releases use `cli-v*`. Historical
+relay/plugin releases used `relay-v*` tags.

README.md

@@ -80,7 +80,7 @@ Open the app and pick how to connect — any of:
 
 - **Standard Hermes** → tap **Scan for Hermes on LAN** to auto-find the server, then enter your key.
 - **Standard Hermes** → type the address (`http://<host>:8642`) and key by hand.
-- **Scan setup QR** → ask your Hermes agent to generate a QR with your URL + key (e.g. `{"api_url":"http://<host>:8642","api_key":"<key>"}`) and scan it.
+- **Scan setup QR** → ask your Hermes agent to generate a QR with your URL + key (e.g. `{"api_url":"http://<host>:8642","api_key":"<key>","dashboard_url":"http://<host>:9119"}`) and scan it. `dashboard_url` is optional when the dashboard uses the conventional same-host `:9119` URL.
 
 The wizard probes everything and finishes with a capability card:
 
@@ -101,20 +101,34 @@ If your dashboard requires sign-in, do it once under the **Manage** tab — the
 Install the Relay plugin on the server only when you want Terminal, Bridge phone control, relay sessions, media routes, or the realtime voice engine:
 
 ```bash
-curl -fsSL https://raw.githubusercontent.com/Codename-11/hermes-relay/main/install.sh | bash
+hermes plugins install Codename-11/hermes-relay/plugin --enable
+hermes relay doctor
 hermes relay start --no-ssl
 hermes pair
 ```
 
-The installer clones to `~/.hermes/hermes-relay/`, registers the plugin/skill paths, and can install a systemd user service. Scan the QR from the phone's Connections screen — or use `hermes pair --register-code ABCD12` with the manual code from Android **Settings → Connections → Advanced**.
+Use the legacy installer instead if you also want the systemd user service,
+shell shims, and the full clone/update workflow:
 
-- **Update:** `hermes-relay-update` (idempotent) — or re-run the install one-liner.
-- **Uninstall:** `bash ~/.hermes/hermes-relay/uninstall.sh` — reverses every step, never touches shared Hermes state. Flags: `--dry-run`, `--keep-clone`, `--remove-secret`.
+```bash
+curl -fsSL https://raw.githubusercontent.com/Codename-11/hermes-relay/main/install.sh | bash
+```
+
+The plugin-manager install owns the plugin code, dashboard tab, CLI commands,
+and agent tools. `hermes relay compat status/install/remove` manages only the
+optional legacy API compatibility hook when an older Hermes build needs it. Scan
+the QR from the phone's Connections screen — or use
+`hermes pair --register-code ABCD12` with the manual code from Android
+**Settings → Connections → Advanced**.
+
+- **Plugin-manager uninstall:** `hermes relay compat remove --all` if you installed the optional hook, then `hermes plugins remove hermes-relay`.
+- **Legacy installer update:** `hermes-relay-update` (idempotent) — or re-run the install one-liner.
+- **Legacy installer uninstall:** `bash ~/.hermes/hermes-relay/uninstall.sh` — removes the service, shims, clone, external skill path, editable package, and compat hook. It never touches shared Hermes state. Flags: `--dry-run`, `--keep-clone`, `--remove-secret`.
 - **Dashboard plugin:** installs with the same symlink — restart the gateway and a **Relay** tab (paired devices, bridge activity, media tokens) appears in the web UI.
 
 Full server setup, TLS, and systemd details: [docs/relay-server.md](docs/relay-server.md).
 
-**Requirements:** Android 8.0+ (SDK 26) · [hermes-agent](https://github.com/NousResearch/hermes-agent) v0.8.0+ with Python 3.11+ on the server.
+**Requirements:** Android 8.0+ (SDK 26) · current upstream [hermes-agent](https://github.com/NousResearch/hermes-agent) with the API server and dashboard enabled · Python 3.11+ on the server.
 
 ## Screenshots
 
@@ -139,7 +153,7 @@ Full server setup, TLS, and systemd details: [docs/relay-server.md](docs/relay-s
 
 ### Android
 
-- **Streaming chat** — direct SSE to the Hermes API server with live markdown, tool-call cards, session history, a searchable command palette, file attachments, quote-in-reply, conversation share, and send-while-streaming queuing.
+- **Streaming chat** — rides standard Hermes, preferring the dashboard gateway (`/api/ws`, live thinking) when signed in to Manage and falling back to API-server SSE otherwise, with live markdown, tool-call cards, session history, a searchable command palette, file attachments, quote-in-reply, conversation share, and send-while-streaming queuing.
 - **Manage your agent** — the full Hermes dashboard, native: switch models from your provider catalog, manage keys (write-only, masked, rate-limited reveal), create and edit profiles including `SOUL.md`, and browse/install/update skills. One dashboard sign-in covers it all.
 - **Hands-free voice** — talk on a vanilla install: speech rides your server's configured providers, unlocked by the same Manage sign-in. Relay-paired setups add per-profile voice and an opt-in provider-native Realtime Agent with background task handoff.
 - **Works away from home** — add a Tailscale or public URL and the app roams automatically (LAN at home, fallback elsewhere). An unreachable server gets a diagnosis, not just a red dot.
@@ -167,7 +181,7 @@ hermes-relay daemon                            # headless tool router — agent
 hermes-relay update                            # self-update via GitHub Releases
 ```
 
-It pairs against the **same relay and credential store** as the Android app — pair once from either, both work. Tagged on a separate `desktop-v*` [release track](https://github.com/Codename-11/hermes-relay/releases?q=desktop).
+It pairs against the **same relay and credential store** as the Android app — pair once from either, both work. Tagged on a separate `cli-v*` [release track](https://github.com/Codename-11/hermes-relay/releases?q=cli), with old alpha prereleases still visible under `desktop-v*`.
 
 - **Docs:** [CLI guide](https://codename-11.github.io/hermes-relay/desktop/) · [`desktop/README.md`](desktop/README.md)
 - **AI-agent setup recipe:** `/hermes-relay-desktop-setup`
@@ -175,13 +189,19 @@ It pairs against the **same relay and credential store** as the Android app —
 ## How It Works
 
 ```
-Phone        (HTTP/SSE) --> Hermes API Server (:8642)   [chat — direct]
-Phone        (HTTP)     --> Hermes Dashboard  (:9119)   [manage + standard voice — cookie sign-in]
+Phone        (HTTP/WSS) --> Hermes Dashboard  (:9119)   [chat gateway, manage, standard voice]
+Phone        (HTTP/SSE) --> Hermes API Server (:8642)   [chat fallback, sessions, runs]
 Phone        (WSS/HTTP) --> Relay             (:8767)   [terminal, bridge, media, relay voice, sessions]
 CLI          (WSS)      --> Relay             (:8767)   [machine tools, tui, terminal]
 ```
 
-Chat connects **directly** to the Hermes API server with the API key — the same pattern Open WebUI and other Hermes frontends use. Manage and standard voice ride the Hermes dashboard with its own one-time sign-in, so a vanilla install needs no plugin for either. The optional relay on `:8767` adds the power surfaces — terminal, bridge phone control, media handoff, machine tools, and relay-side voice (preferred automatically when paired). One QR can configure API, dashboard, and relay routes without merging their auth models.
+Chat prefers the Hermes dashboard gateway when Manage auth is ready, then falls
+back to the upstream API server SSE path with the API key. Manage and standard
+voice ride the Hermes dashboard with its own one-time sign-in, so a vanilla
+install needs no plugin for either. The optional relay on `:8767` adds the power
+surfaces: terminal, bridge phone control, media handoff, machine tools, and
+relay-side voice, which is preferred automatically when paired. One QR can
+configure API, dashboard, and relay routes without merging their auth models.
 
 ## Documentation
 
@@ -194,7 +214,7 @@ Chat connects **directly** to the Hermes API server with the API key — the sam
 | [API Reference](https://codename-11.github.io/hermes-relay/reference/api.html) | Hermes API endpoints used by both surfaces |
 | [Specification](docs/spec.md) | Full spec — protocol, UI, phases, dependencies |
 | [Architecture Decisions](docs/decisions.md) | ADRs — framework, channels, auth, terminal |
-| [Changelog](CHANGELOG.md) | Release history (`android-v*`, `server-v*`, `desktop-v*`) |
+| [Changelog](CHANGELOG.md) | Release history (`android-v*`, `plugin-v*`, `cli-v*`) |
 
 <details>
 <summary><b>Install with an AI agent</b> — paste-ready prompt for Claude / GPT</summary>
@@ -263,7 +283,7 @@ hermes-relay/
 ├── user-docs/                 # VitePress documentation site
 ├── docs/                      # Spec, decisions, security
 ├── scripts/                   # Dev helper scripts
-├── .github/workflows/         # CI + release pipelines (ci-android / ci-server / ci-desktop)
+├── .github/workflows/         # CI + release pipelines (ci-android / ci-plugin / ci-desktop)
 └── gradle/                    # Wrapper (8.13) + version catalog
 ```
 

RELEASE.md

@@ -13,20 +13,23 @@ with optional prerelease identifiers.
 - `PATCH` — bug fixes, backwards compatible
 - Prerelease suffixes: `-alpha`, `-beta`, `-rc.N` (e.g. `0.2.0-beta.1`)
 
-Hermes-Relay now ships three independently versioned surfaces:
+Hermes-Relay now ships three independently versioned surfaces. Public GitHub
+Release titles use product names (`Hermes-Relay-Android`,
+`Hermes-Relay-Plugin`, `Hermes-Relay-CLI`); tag prefixes stay short and stable
+for automation.
 
 | Surface | Tag prefix | Version source | Bump script | Release workflow |
 |---|---|---|---|---|
-| Android app | `android-v*` | `gradle/libs.versions.toml` | `scripts/bump-android-version.sh` | `.github/workflows/release-android.yml` |
-| Server / Python package | `server-v*` | `pyproject.toml` plus checked plugin/dashboard metadata | `scripts/bump-server-version.sh` | `.github/workflows/release-server.yml` |
-| Desktop CLI | `desktop-v*` | `desktop/package.json` | `npm version` or manual package bump | `.github/workflows/release-desktop.yml` |
+| Hermes-Relay-Android | `android-v*` | `gradle/libs.versions.toml` | `scripts/bump-android-version.sh` | `.github/workflows/release-android.yml` |
+| Hermes-Relay-Plugin | `plugin-v*` | `pyproject.toml` plus checked plugin/dashboard metadata | `scripts/bump-plugin-version.sh` | `.github/workflows/release-plugin.yml` |
+| Hermes-Relay-CLI | `cli-v*` | `desktop/package.json` | `npm version` or manual package bump | `.github/workflows/release-cli.yml` |
 
-This split is intentional. The server now carries features for both Android
-and desktop, so server fixes can ship without forcing an Android app
-`versionCode` bump, and desktop CLI alphas can continue on their own cadence.
-Historical Android releases before this naming split used bare `v*` tags, and
-historical server releases used `relay-v*` tags. New releases use the explicit
-surface prefixes above.
+This split is intentional. The plugin carries relay features for both Android
+and CLI clients, so plugin fixes can ship without forcing an Android app
+`versionCode` bump, and CLI alphas can continue on their own cadence. Historical
+Android releases before this naming split used bare `v*` tags. Historical
+plugin/server releases used `relay-v*` tags, and historical CLI prereleases used
+`desktop-v*` tags. New releases use the explicit tag prefixes above.
 
 ### Android app versioning
 
@@ -70,35 +73,47 @@ bash scripts/bump-android-version.sh 0.6.2
 `scripts/bump-version.sh` remains as a backward-compatible alias for the
 Android script.
 
-### Server / Python package versioning
+### Plugin / Python package versioning
 
-Server version metadata lives in these server-owned files and must stay in
+Plugin version metadata lives in these plugin-owned files and must stay in
 lockstep:
 
 | File | Line | Purpose |
 |---|---|---|
 | `pyproject.toml` | `version = "..."` | Python package metadata |
-| `plugin/relay/__init__.py` | `__version__ = "..."` | runtime version reported by `/health` |
+| `plugin/relay/__init__.py` | `__version__ = "..."` | runtime version reported by `/health` and `/relay/info` |
 | `plugin/plugin.yaml` | `version: ...` | Hermes plugin metadata |
 | `plugin/dashboard/manifest.json` | `"version": "..."` | Hermes dashboard plugin metadata |
 | `plugin/dashboard/package.json` | `"version": "..."` | dashboard build/package metadata |
 | `plugin/dashboard/package-lock.json` | `"version": "..."` | locked dashboard package metadata |
 
-Always bump Server releases via:
+Always bump Plugin releases via:
 
 ```bash
-bash scripts/bump-server-version.sh 0.6.2
+bash scripts/bump-plugin-version.sh 0.6.2
 ```
 
 Check the current metadata with:
 
 ```bash
-python scripts/check-server-version-sync.py
+python scripts/check-plugin-version-sync.py
 ```
 
-The `server-v*` release workflow validates the tag against the same metadata,
-runs server tests, builds a wheel and sdist, generates checksums, and publishes
-a GitHub Release with the package artifacts.
+Check all release tracks at once with:
+
+```bash
+python scripts/check-version-tracks.py
+```
+
+This aggregate check reports Android, plugin, and CLI versions
+side by side and validates that each track's own source files are internally
+consistent. It deliberately does not require all three tracks to share the same
+SemVer.
+
+The `plugin-v*` release workflow validates the tag against the same metadata,
+runs plugin tests, builds a wheel and sdist, generates checksums, and
+publishes a `Hermes-Relay-Plugin vX.Y.Z` GitHub Release with the package
+artifacts.
 
 ## Branching policy
 
@@ -156,15 +171,15 @@ Squash merges lose that detail and are **not** the house style.
 ### Version bumps happen at release-prep on `dev`, NOT on feature branches
 
 Feature branches **never** touch `gradle/libs.versions.toml`,
-server-owned version metadata, or `desktop/package.json`.
+plugin-owned version metadata, or `desktop/package.json`.
 If two feature branches both bumped a release version, they'd collide on
 version files and, for Android, on `appVersionCode` (which must be
 monotonic).
 
 Version-bump commits live on `dev` as the last commit of release-prep
-work. Android commits use `release(android): android-vX.Y.Z`; server commits
-use `release(server): server-vX.Y.Z`; desktop commits use the existing
-`release: desktop-vX.Y.Z` convention. A release PR then merges `dev` →
+work. Android commits use `release(android): android-vX.Y.Z`; plugin commits
+use `release(plugin): plugin-vX.Y.Z`; CLI commits use
+`release(cli): cli-vX.Y.Z`. A release PR then merges `dev` →
 `main` with `--no-ff`, and the matching tag is cut from the resulting
 `main` tip.
 
@@ -173,7 +188,7 @@ use `release(server): server-vX.Y.Z`; desktop commits use the existing
 Light branch protection is enabled:
 
 - **`main`** — direct pushes blocked; only release PRs from `dev` merge
-  here. PR must pass CI (Android + Server) before merge. Force push and
+  here. PR must pass CI (Android + Plugin) before merge. Force push and
   branch deletion blocked.
 - **`dev`** — direct pushes blocked for non-trivial work; feature
   branches PR in. PR must pass CI. Force push and branch deletion
@@ -275,22 +290,34 @@ for the full text.
 
 ### 3. Play Developer API service account (optional)
 
-Required only if you want `gradlew publishReleaseBundle` to upload directly
-to Play Console. Manual UI uploads work without this.
+Required for automated upload (the `android-v*` workflow's Play step, or local
+`gradlew publishGooglePlayReleaseBundle`). Manual UI uploads work without this.
 
-1. Open <https://console.cloud.google.com/> and select the project linked
-   to your Play Console account (Play Console > Setup > API access shows
-   which one).
-2. **IAM & Admin > Service Accounts > Create Service Account** (e.g.
-   `hermes-relay-publisher`). No project roles needed.
-3. On the new service account, **Keys > Add key > Create new key > JSON**
-   and download the file.
-4. In Play Console > **Setup > API access**, find the service account,
-   click **Grant access**, and assign the **Release manager** role.
-5. Save the JSON as `play-service-account.json` in the repo root (already
-   in `.gitignore`).
-6. Verify with `gradlew bootstrapReleasePlayResources` — should succeed
-   without auth errors.
+The service account is **created in Google Cloud Console** and then **authorized
+in Play Console** — two separate consoles. (Play Console's older "Setup > API
+access" page has been reorganized; there is no longer a "Setup" group. Use the
+paths below.)
+
+1. **Create the service account (Google Cloud Console).** Open
+   <https://console.cloud.google.com/iam-admin/serviceaccounts>, pick the project
+   (any project works; if Play Console's **API access** page already names a linked
+   project, use that one). **Create service account** → name it e.g.
+   `hermes-relay-publisher` → **Done**. No project roles needed.
+2. **Create a JSON key.** On the new service account → **Keys** tab → **Add key >
+   Create new key > JSON** → download. This file's *contents* are the secret.
+3. **Authorize it in Play Console.** Open the Play Console account-level left
+   sidebar → **Users and permissions** → **Invite new users** → paste the service
+   account's email (`...@...iam.gserviceaccount.com`). Under **App permissions**
+   (for `com.axiomlabs.hermesrelay`) or **Account permissions**, grant the
+   **Release** permissions — "Release apps to testing tracks" and "Release to
+   production, exclude devices, and use Play App Signing" — plus "View app
+   information". (Granting **Admin (all permissions)** also works but is broader
+   than needed.) **Invite user**.
+4. **Use it.** For CI, paste the JSON contents into the `PLAY_SERVICE_ACCOUNT_JSON`
+   repo secret (step 4 / secrets table). For local publish, save the JSON as
+   `play-service-account.json` in the repo root (already in `.gitignore`).
+5. Verify locally with `gradlew bootstrapGooglePlayReleaseResources` — succeeds
+   without auth errors once permissions propagate (allow a few minutes).
 
 ### 4. GitHub Actions secrets
 
@@ -350,6 +377,12 @@ the new app version and a higher `appVersionCode`.
 
 ### 2. Update release notes and changelog
 
+> Each surface has its own GitHub-Release-body file, all in the same format
+> (Summary + Added/Changed/Fixed + Install/Verify): `RELEASE_NOTES.md` (Android),
+> `PLUGIN_RELEASE_NOTES.md` (plugin), `CLI_RELEASE_NOTES.md` (CLI). This step covers
+> the Android artifacts; the plugin/CLI files are filled in their own release
+> sections below but follow the identical scrub and Keep-a-Changelog grouping.
+
 - `CHANGELOG.md` — promote the accumulated `[Unreleased]` block to a
   versioned header. The block already exists: every feature PR has
   been appending to it. All you do here is:
@@ -372,6 +405,13 @@ the new app version and a higher `appVersionCode`.
   shown in the settings/about screen. Update with the version number
   and a brief feature summary. Gets stale silently if forgotten
   (v0.4.0 shipped with 0.1.0 content until caught post-release).
+- `app/src/googlePlay/play/release-notes/en-US/default.txt` — the Play
+  Console **"What's new"** text, which gradle-play-publisher reads at
+  upload to fill the Production-draft release notes. This is **separate**
+  from `RELEASE_NOTES.md` (that one is only the GitHub Release body) — if
+  this file is missing or stale, the Play draft ships with empty/wrong
+  notes (shipped empty in v1.1.0 until caught post-release). Keep it
+  **≤500 chars per language**, user-facing, Android-only.
 - `docs/play-store-listing.md` — Play Store listing copy. Update
   the version reference and the "Release Notes" section that gets
   pasted into the Play Console "What's new" field. Keep the Play
@@ -452,64 +492,100 @@ Pushing a tag matching `android-v*` triggers `.github/workflows/release-android.
 which builds, signs, checksums, and creates a GitHub Release. Watch the
 run under the **Actions** tab.
 
-Server/Python version files are intentionally not part of an Android app
-release unless the server package itself is also being released.
+Plugin/Python version files are intentionally not part of an Android app
+release unless the plugin package itself is also being released.
 
-### Server / Python package release
+### Plugin / Python package release
 
-Use this when Server behavior changes independently of Android app
-delivery, for example desktop channel support, bridge routes, pairing
-server fixes, voice auth, or packaging changes.
+Use this when plugin or relay behavior changes independently of Android app
+delivery, for example CLI channel support, bridge routes, pairing server fixes,
+voice auth, dashboard plugin UI, or packaging changes.
+
+First **rewrite `PLUGIN_RELEASE_NOTES.md`** — it is the GitHub Release body for
+`plugin-v*` tags (the same role `RELEASE_NOTES.md` plays for Android). Fill the
+Summary and the Added/Changed/Fixed groups from the plugin-relevant bullets in the
+promoted `CHANGELOG.md` block, keep the `__VERSION__` token in the Install command
+(the workflow substitutes it), and apply the same public-distribution scrub as §2.
 
 ```bash
 git checkout dev
 git pull --ff-only origin dev
 
-bash scripts/bump-server-version.sh 0.6.2
-git add pyproject.toml plugin/relay/__init__.py plugin/plugin.yaml plugin/dashboard/manifest.json plugin/dashboard/package.json plugin/dashboard/package-lock.json CHANGELOG.md
-git commit -m "release(server): server-v0.6.2"
+bash scripts/bump-plugin-version.sh 0.6.2
+git add pyproject.toml plugin/relay/__init__.py plugin/plugin.yaml plugin/dashboard/manifest.json plugin/dashboard/package.json plugin/dashboard/package-lock.json CHANGELOG.md PLUGIN_RELEASE_NOTES.md
+git commit -m "release(plugin): plugin-v0.6.2"
 git push origin dev
 
 # Open the release PR (dev -> main) and merge with --no-ff.
 # After merge, tag from the new main tip:
 git checkout main
 git pull --ff-only origin main
-git tag server-v0.6.2
-git push origin server-v0.6.2
+git tag plugin-v0.6.2
+git push origin plugin-v0.6.2
 ```
 
-Pushing `server-v*` triggers `.github/workflows/release-server.yml`, which
-validates all server-owned version metadata with
-`scripts/check-server-version-sync.py`, runs server tests, builds a wheel and
-sdist, generates `SHA256SUMS.txt`, and creates a GitHub Release for the server
-package.
+Pushing `plugin-v*` triggers `.github/workflows/release-plugin.yml`, which
+validates all plugin-owned version metadata with
+`scripts/check-plugin-version-sync.py`. Run
+`python scripts/check-version-tracks.py` locally before tagging when a change
+touches more than one release surface. The workflow also runs plugin tests,
+builds a wheel and sdist, generates `SHA256SUMS.txt`, and creates a GitHub
+Release named `Hermes-Relay-Plugin v<version>` for the plugin package.
 
 ### 5. Upload to Play Console
 
-**Manual upload (default):**
+> **If `PLAY_SERVICE_ACCOUNT_JSON` is configured as a repo secret, this step is
+> automated for stable tags.** The release workflow runs
+> `publishGooglePlayReleaseBundle --track=production` and the build appears as a
+> Production **draft** — skip to the Play Console, confirm the draft, and click
+> **Start rollout**. The manual path below is the fallback when the secret is
+> unset (or for staging on a non-production track).
+>
+> This automated tag path is intentionally bundle-only. It uploads the
+> `googlePlayRelease` AAB and release-scoped "What's new" notes, but it does
+> not republish static listing assets such as screenshots, title, description,
+> icon, or feature graphic. Use the Play Store Listing workflow when those
+> assets change.
+
+**Pick the track first.** The AAB is track-agnostic — the same
+`-googlePlay-release.aab` goes to whichever track you publish on. Choose by intent,
+not habit:
+
+- **Production** — the default for a stable GA release (`android-vX.Y.Z`). The
+  listing is live, so this is where real releases land. The org account is
+  D-U-N-S-verified, so the 14-day / 12-tester closed-testing gate does **not**
+  apply — you can publish straight to Production.
+- **Open / Closed testing** — only when you actually want a public/private beta
+  channel for this build.
+- **Internal testing** — only for a throwaway pre-release smoke check (e.g. a
+  prerelease tag), not for a GA. Don't default here.
+
+**Manual upload:**
 
 1. Download the file ending in `-googlePlay-release.aab` from the GitHub
-   Release assets (for example, `hermes-relay-0.3.0-googlePlay-release.aab`),
+   Release assets (for example, `hermes-relay-1.0.0-googlePlay-release.aab`),
    or use your local build at
    `app\build\outputs\bundle\googlePlayRelease\hermes-relay-<version>-googlePlay-release.aab`.
-2. In Play Console: **Release > Testing > Internal testing** (the 14-day
-   closed-testing rule does NOT apply to this account — see "Google Play
-   Console developer account" above).
+2. In Play Console, open the track you chose above — for a GA that's
+   **Release > Production**.
 3. **Create new release** > upload the AAB.
-4. Paste `RELEASE_NOTES.md` into the release notes field.
-5. **Review release** > **Start rollout.**
+4. Paste the Play "What's new" from `docs/play-store-listing.md` (≤500 chars) into
+   the release notes field. (`RELEASE_NOTES.md` is the GitHub-Release body, not the
+   Play field — don't paste that; it's over the limit.)
+5. **Review release** > **Start rollout** (set the staged-rollout percentage if you
+   want a gradual production ramp).
 
 **Automated upload (if `play-service-account.json` is configured):**
 
 ```bat
 scripts\dev.bat bundle
-gradlew publishReleaseBundle
+gradlew publishReleaseBundle --track=production
 ```
 
-Defaults to the `internal` track with `DRAFT` status (configured in the
-`play { }` block in `app/build.gradle.kts`). Override per-invocation with
-`--track=alpha` (= Closed testing), `--track=beta` (= Open testing), or
-`--track=production`.
+The `play { }` block in `app/build.gradle.kts` defaults to the `internal` track
+with `DRAFT` status as a safety net for unattended runs, so pass `--track` explicitly
+for a real release: `--track=production` (GA), or `--track=alpha` (Closed) /
+`--track=beta` (Open) for a beta channel.
 
 To promote an existing release between tracks without rebuilding:
 
@@ -517,18 +593,24 @@ To promote an existing release between tracks without rebuilding:
 gradlew promoteReleaseArtifact --from-track=internal --promote-track=alpha
 ```
 
-### 6. Promote through tracks
+### 6. Tracks (a menu, not a mandatory ladder)
 
-Typical path:
+The org account is exempt from the 14-day / 12-tester closed-testing rule, so a
+stable GA publishes **straight to Production** — there is no required promotion
+chain. The other tracks are opt-in tools, not steps you must climb:
 
-1. **Internal testing** — personal smoke test (no tester or time minimum)
-2. **Closed testing (alpha)** — optional for staged rollout; Axiom-Labs'
-   org account is exempt from the 14-day / 12-tester rule, so you can skip
-   straight from Internal to Production if the build is ready
-3. **Open testing (beta)** — optional public beta
-4. **Production** — live on the Play Store
+- **Production** — live on the Play Store. Where GA releases go.
+- **Open testing (beta)** — opt-in public beta channel.
+- **Closed testing (alpha)** — opt-in private beta (named tester lists).
+- **Internal testing** — throwaway smoke check (e.g. a prerelease tag), no tester
+  or time minimum.
 
-Promote via the Play Console UI or `gradlew promoteReleaseArtifact`.
+If you *do* stage through tracks, promote an existing release without rebuilding via
+the Play Console UI or:
+
+```bat
+gradlew promoteReleaseArtifact --from-track=internal --promote-track=production
+```
 
 ### 7. After release
 
@@ -549,9 +631,9 @@ Promote via the Play Console UI or `gradlew promoteReleaseArtifact`.
 
 ## CI Behavior
 
-Android, Server, dashboard, and desktop now have separate CI/release lanes.
+Android, Plugin, dashboard, and desktop now have separate CI/release lanes.
 This keeps a dashboard CSS fix from running the full server suite, and keeps
-server changes from forcing an Android app `versionCode` bump.
+plugin changes from forcing an Android app `versionCode` bump.
 
 On every push of a tag matching `android-v*`, `.github/workflows/release-android.yml`:
 
@@ -571,20 +653,25 @@ On every push of a tag matching `android-v*`, `.github/workflows/release-android
    succeeded. If `HERMES_KEYSTORE_BASE64` is missing, the summary warns
    that the artifacts are debug-signed and unsuitable for Play Store.
 
-On every push of a tag matching `server-v*`,
-`.github/workflows/release-server.yml`:
+On every push of a tag matching `plugin-v*`,
+`.github/workflows/release-plugin.yml`:
 
-1. Validates the tag matches all server-owned version metadata checked by
-   `scripts/check-server-version-sync.py`.
-2. Runs server syntax checks and the focused route/auth/session test slice.
+1. Validates the tag matches all plugin-owned version metadata checked by
+   `scripts/check-plugin-version-sync.py`.
+2. Runs plugin syntax checks and the focused route/auth/session test slice.
 3. Builds the Python wheel and sdist with `python -m build`.
 4. Generates `dist/SHA256SUMS.txt`.
-5. Creates a GitHub Release named `Hermes-Relay-Server v<version>` with the wheel,
+5. Creates a GitHub Release named `Hermes-Relay-Plugin v<version>` with the wheel,
    sdist, and checksum file attached.
 
-On every push of a tag matching `desktop-v*`,
-`.github/workflows/release-desktop.yml` builds and publishes the desktop
-CLI binaries. Dashboard-only changes are covered by
+On every push of a tag matching `cli-v*`,
+`.github/workflows/release-cli.yml` builds and publishes the CLI binaries and
+Windows tray installer. Its GitHub Release body comes from `CLI_RELEASE_NOTES.md`
+(rewritten per release — the CLI counterpart of `RELEASE_NOTES.md`); the workflow
+substitutes `__VERSION__` (bare, e.g. `0.3.0`) and `__TAG__` (full, e.g.
+`cli-v0.3.0`) so the install/pin commands stay accurate. Fill its Summary and
+Added/Changed/Fixed groups at CLI release-prep and apply the §2 public scrub.
+Dashboard-only changes are covered by
 `.github/workflows/ci-dashboard.yml`, which builds the dashboard plugin,
 runs the dashboard API tests, and verifies the modal CSS markers are present
 in the built bundle.
@@ -597,6 +684,13 @@ in the built bundle.
 | `HERMES_KEYSTORE_PASSWORD`  | Store password                      | Password set during `keytool -genkey`            |
 | `HERMES_KEY_ALIAS`          | Key alias                           | Alias set during `keytool -genkey`               |
 | `HERMES_KEY_PASSWORD`       | Key password                        | Usually the same as the store password          |
+| `PLAY_SERVICE_ACCOUNT_JSON` | **Optional** — Play auto-upload     | Paste the full Play Developer API service-account JSON (step 3) |
+
+If `PLAY_SERVICE_ACCOUNT_JSON` is set, the `android-v*` release workflow uploads
+the `googlePlay` AAB to the **Production track as a DRAFT** automatically (stable
+tags only — prereleases are skipped). CI does the upload; you still click **Start
+rollout** in Play Console. If the secret is unset, the workflow skips the upload
+and you upload manually (§5) — nothing else changes.
 
 ## Hotfix Recipe
 
@@ -622,9 +716,9 @@ For an Android app hotfix:
    `dev`'s `appVersionCode` lags behind `main` and the next app release
    bump collides.
 
-For a Server hotfix, branch from the affected `server-v*` tag, apply
-the fix, run `bash scripts/bump-server-version.sh <next-version>`, merge to
-`main`, and tag `server-v<next-version>`. Do not touch
+For a Plugin hotfix, branch from the affected `plugin-v*` tag, apply
+the fix, run `bash scripts/bump-plugin-version.sh <next-version>`, merge to
+`main`, and tag `plugin-v<next-version>`. Do not touch
 `gradle/libs.versions.toml` unless an Android app release is also shipping.
 
 ## Troubleshooting

RELEASE_NOTES.md

@@ -1,22 +1,22 @@
-# Hermes-Relay-Android v1.0.0
+# Hermes-Relay-Android v1.1.0
 
-**Release Date:** June 14, 2026
-**Since v0.8.1:** The 1.0 milestone — a rechromed app, a first-class standard (no-plugin) path, live-thinking gateway chat, and a broad polish pass.
+**Release Date:** June 16, 2026
+**Since v1.0.0:** A settings + chat-UX overhaul — quieter status surfaces, a single state-aware plugin badge, and chat-settings polish — plus a force-close fix and release-pipeline upgrades.
 
-v1.0.0 is the first stable release. The headline is that a **plain, unmodified Hermes agent is now enough**: chat, Manage, and voice all work against vanilla upstream with no relay plugin. The relay plugin is now purely additive (phone control, terminal, notification companion, extra voice engines).
+v1.1.0 is a refinement release on top of the 1.0 milestone. Settings is calmer and easier to read: status pills now appear only when a surface needs attention, the Power tools section shows one **Plugin active / required / offline** badge instead of an identical chip on every card, and the most-used controls sit where you reach for them. Chat settings render correctly, the system-prompt preview reflects your toggles, and a crash that could hit right after a successful pair is gone.
 
 ---
 
 ## Download
 
-v1.0.0 ships in two Android build flavors. APK and AAB filenames are version-tagged:
+v1.1.0 ships in two Android build flavors. APK and AAB filenames are version-tagged:
 
 | Flavor | File | Who it's for |
 |---|---|---|
-| Google Play | `hermes-relay-1.0.0-googlePlay-release.aab` | Upload this Android App Bundle to Play Console. It has no AccessibilityService, screen reading, screenshots, gestures, SMS/calls, contacts/location, overlays, or unattended phone control. |
-| sideload | `hermes-relay-1.0.0-sideload-release.apk` | Direct-install APK for full Device Control. Installs as `com.axiomlabs.hermesrelay.sideload`. |
-| googlePlay APK | `hermes-relay-1.0.0-googlePlay-release.apk` | Parity/testing artifact. |
-| sideload AAB | `hermes-relay-1.0.0-sideload-release.aab` | Parity/testing artifact. |
+| Google Play | `hermes-relay-1.1.0-googlePlay-release.aab` | Upload this Android App Bundle to Play Console. It has no AccessibilityService, screen reading, screenshots, gestures, SMS/calls, contacts/location, overlays, or unattended phone control. |
+| sideload | `hermes-relay-1.1.0-sideload-release.apk` | Direct-install APK for full Device Control. Installs as `com.axiomlabs.hermesrelay.sideload`. |
+| googlePlay APK | `hermes-relay-1.1.0-googlePlay-release.apk` | Parity/testing artifact. |
+| sideload AAB | `hermes-relay-1.1.0-sideload-release.aab` | Parity/testing artifact. |
 
 Verify integrity with `SHA256SUMS.txt` from the same release. See the [Sideload guide](https://codename-11.github.io/hermes-relay/guide/getting-started.html#sideload-apk) for APK install steps.
 
@@ -24,43 +24,32 @@ Verify integrity with `SHA256SUMS.txt` from the same release. See the [Sideload
 
 ## Highlights
 
-### Standard path is first-class — no plugin required
+### Settings screen overhaul
 
-Chat, Manage, and voice now work against an unmodified upstream Hermes agent. Chat streams over the API server; Manage and voice use the Hermes dashboard with a single sign-in. The relay plugin stays optional and only adds power tools.
+Settings was reorganized around what you actually touch and quieted down everywhere else:
 
-### Gateway chat transport with live thinking
+- **Exception-only status pills.** Status pills now appear only when a surface needs attention and stay quiet when everything is healthy — no more a wall of green chips to read past.
+- **One state-aware plugin badge.** The Power tools section shows a single **Plugin active / required / offline** badge instead of an identical "Relay paired" chip repeated on every card.
+- **Layout that follows your reach.** Connections moved to the top (above the Hermes section), and Diagnostics + Developer options moved into the App section.
+- **Restyled to match the app.** The status chips now use the app's translucent-bordered language, and the brand blue was deepened.
 
-Chat can now ride the upstream dashboard `/api/ws` gateway (the same surface the official hermes-desktop client speaks). It's the only vanilla-upstream path that streams reasoning **live**, so the Thinking block and sphere light up *during* generation instead of after. "Auto" prefers the gateway when the dashboard is reachable and Manage is signed in, and falls back to the SSE endpoints per turn on any failure.
+### Chat settings polish
 
-- **Warm-start + keep-alive.** The app pre-warms the gateway on foreground so the first token lands fast (the cold session-setup cost moves off the send path). An opt-in **Keep connected in background** toggle (both flavors) holds the connection open via a foreground service so a long-backgrounded conversation resumes instantly.
-- **Attachments at desktop parity.** Images, PDFs, and any other file upload natively over the gateway (`image.attach_bytes` / `pdf.attach` / `file.attach`). Turns that fall back to an endpoint that can't carry a file now post a visible notice instead of dropping it silently.
-- **Steering, edit & resend, subagent lanes.** Send mid-turn to inject guidance into the running turn; edit your own messages to rewind and regenerate; watch per-task subagent lanes stream under the bubble; a context-window meter warns as the window fills.
-- **Turn-complete notifications** when the app is backgrounded.
+- **Streaming-endpoint picker fixed.** The picker no longer wraps "Gateway" / "Sessions" onto a second line.
+- **Live system-prompt preview.** The system-prompt preview now reflects the context toggles you've enabled (foreground app, battery, safety rails) with representative placeholder values, instead of looking inert.
 
-### Manage parity with the desktop dashboard
+### Force-close fix
 
-The Manage tab now does what the desktop dashboard does: change models from the full provider catalog, manage provider keys (write-only, masked, reveal), create/edit profiles and SOUL.md, and browse/install/update skills. Manage data is cached to disk so a cold launch renders instantly.
+A corrupt encrypted token store — which can happen after an app upgrade or a device restore — used to throw during construction and crash the app right after a successful pair, on both standard and relay connections. The token store now heals a corrupt keyset in place, and credential storage degrades to a re-pair instead of crashing if the device keystore is unusable.
 
-### Per-conversation agent profiles
+### Release pipeline
 
-Switch the whole agent — model, persona (SOUL), and skills — from the chat header. The selection is **ephemeral and per-conversation** (bound to the session, like the official desktop): it never changes your server's default agent for other clients. The session drawer scopes to the active profile, opening one of its chats loads that profile's history, and the right agent is restored on cold start.
-
-### Redesigned chat input + seamless connection UX
-
-A cleaner Telegram-style input bar (pill field, one morphing Send/Voice/Stop/Steer/Queue button, no slash button). Network route handoffs (LAN↔Tailscale) and reconnects no longer repaint or reload the chat, and connection/update status now slide down as in-theme toasts over the content instead of pushing the UI around.
-
-### Voice
-
-The provider-native Realtime Agent keeps one session open across turns (follow-ups retain context), and long Hermes runs are promoted to tracked background tasks so the conversation stays responsive and the answer is spoken when it's ready.
-
-### Docs + branding
-
-The documentation site was rechromed to the app's cockpit theme and repositioned around the two-path story (just connect → give it hands), with a reworked Android getting-started funnel and a Google Play badge.
+- **Automated Play Console upload.** When a `PLAY_SERVICE_ACCOUNT_JSON` secret is configured, pushing a stable `android-v*` tag uploads the `googlePlay` App Bundle to the Production track as a draft (a human still starts the rollout). Prereleases are skipped, and the `sideload` flavor is structurally blocked from ever publishing to Play. Without the secret, releases publish to GitHub Releases exactly as before.
+- **Desktop UI preview harness (`:ui-preview`).** A non-shipped Compose for Desktop module renders presentational composables in a window on the PC with Compose Hot Reload, for fast UI iteration without a device build/install loop. It reuses the shared sphere algorithm as its single source of truth.
 
 ---
 
 ## Upgrade notes
 
-- **Google Play submission:** the opt-in keep-alive feature adds a `FOREGROUND_SERVICE_SPECIAL_USE` service. Complete the Play Console **Foreground service permissions** declaration for `specialUse` at submission (see `docs/play-store-listing.md`).
-- **PDF attachments** over the gateway require `poppler-utils` (`pdftoppm`) on the Hermes host; without it, PDF attach reports an error and the message still sends as text.
-- `appVersionCode` is **12**.
+- The force-close fix means devices that previously crashed on connect after an upgrade or restore will heal their token store automatically on first launch of this build — no manual re-pair required in most cases.
+- `appVersionCode` is **13**.

ROADMAP.md

@@ -14,7 +14,7 @@ Native Android companion for the [Hermes agent platform](https://github.com/Nous
 
 ### Desktop track (parallel lane to Android) — **experimental**
 
-Release tags: `desktop-v*` (separate cadence from Android `android-v*` and Server `server-v*`). Curl-installed prebuilt binaries (no Node required); Windows first, macOS / Linux same release. Workflows: [`ci-desktop.yml`](.github/workflows/ci-desktop.yml) + [`release-desktop.yml`](.github/workflows/release-desktop.yml).
+Release tags: `cli-v*` (separate cadence from Android `android-v*` and Plugin `plugin-v*`). Historical alpha prereleases used `desktop-v*`, and the installer/updater keep a migration fallback. Curl-installed prebuilt binaries (no Node required); Windows first, macOS / Linux same release. Workflows: [`ci-desktop.yml`](.github/workflows/ci-desktop.yml) + [`release-cli.yml`](.github/workflows/release-cli.yml).
 
 **Shipped (2026-04-23 — first tagged release `desktop-v0.3.0-alpha.1`):**
 
@@ -47,11 +47,11 @@ Release tags: `desktop-v*` (separate cadence from Android `android-v*` and Serve
 
 **Earlier alpha.2–alpha.5 workstreams (now in-flight / done — see DEVLOG 2026-04-23 entries for specifics):**
 
-- **`hermes-relay update` subcommand + auto-update nudge.** The binary today does NOT self-update — users have to re-run the `curl | sh` / `irm | iex` one-liner to pick up a new release. Close the gap: `hermes-relay update` polls the GitHub Releases API, filters to `desktop-v*`, compares to `readVersion()`, and either shells out to the installer or downloads the binary directly + `rename` over the current one (Windows can rename while running; Linux/macOS atomic replace is fine for long-lived daemons because the running process keeps the old inode open). Add a once-per-day background check in `daemon` mode that emits `update_available` as a log event — opt-in via `--check-updates`, never auto-installs without user action. Signing prerequisite: SmartScreen/Gatekeeper would warn on every auto-downloaded binary until we sign, so this is behind code signing.
+- **`hermes-relay update` subcommand + auto-update nudge.** The binary self-update path polls the GitHub Releases API, prefers `cli-v*`, falls back to historical `desktop-v*` prereleases during migration, compares to `readVersion()`, and downloads the binary directly + `rename` over the current one (Windows can rename while running; Linux/macOS atomic replace is fine for long-lived daemons because the running process keeps the old inode open). Add a once-per-day background check in `daemon` mode that emits `update_available` as a log event — opt-in via `--check-updates`, never auto-installs without user action. Signing prerequisite: SmartScreen/Gatekeeper would warn on every auto-downloaded binary until we sign, so this is behind code signing.
 - **Workspace-awareness — desktop client sends cwd/git/hostname on connect.** Biggest lingering "is the agent working against the right tree?" problem. On WSS auth, the client advertises an ephemeral workspace descriptor — `cwd`, `git_root`, `git_branch`, `git_status_summary` (staged/modified counts), `repo_name`, `hostname`, `platform`, `active_shell`. Server-side `DesktopHandler` stashes it as live session metadata (NOT persistent state). New hermes-agent plugin hook injects a one-line ephemeral prompt prefix into the session context — *"Active desktop workspace: machine=Bailey-PC · repo=hermes-relay · branch=dev · staged=3"* — so the LLM reads it every turn without the operator having to explain. Also default `desktop_terminal` / `desktop_read_file` / `desktop_search_files` `cwd` to the repo root when unset. Expose the snapshot in `hermes-relay doctor` + `hermes-relay status` + a new `hermes-relay workspace` subcommand + a relay dashboard tab so both operator and agent have a common view. Pair with a `.hermes/workspace-context.json` file-based fallback for when the socket path can't be reached. Requires: new WSS envelope (`desktop.workspace` on connect), hermes-agent plugin hook for ephemeral context injection, schema coordination with the upstream `ContextVar` multi-client work.
 - **Service installers** — `scripts/install-service-{win,linux,mac}.{ps1,sh}` — Windows Service via `sc.exe create`, `systemd --user` unit with `loginctl enable-linger`, `launchctl load` plist for macOS. Auto-start on login so the daemon is always reachable.
 - **Multi-client routing on the `desktop` channel** — replace single-client MVP with per-token indexing + device-id reconnect handoff. Hermes session state carries `desktop_session_token` via a new `ContextVar` in `gateway/session_context.py` (hermes-agent PR candidate — won't affect Android). Natural pairing with the workspace-awareness envelope — the ContextVar scheme determines which client's workspace the active session sees.
-- **Harden `release-desktop.yml` retag semantics.** The `softprops/action-gh-release` step failed during the alpha.1 retag with `tag_name already_exists` after deleting + re-uploading all 5 assets; recovered by `gh api` cleanup (delete orphan draft + PATCH draft→false on the release with the real assets). Follow-up: pin the action version, add `make_latest: false` + explicit `release_id` lookup, or switch to `ncipollo/release-action` which handles retags without the duplicate-draft creation.
+- **Harden `release-cli.yml` retag semantics.** The `softprops/action-gh-release` step failed during the alpha.1 retag with `tag_name already_exists` after deleting + re-uploading all 5 assets; recovered by `gh api` cleanup (delete orphan draft + PATCH draft→false on the release with the real assets). Follow-up: pin the action version, add `make_latest: false` + explicit `release_id` lookup, or switch to `ncipollo/release-action` which handles retags without the duplicate-draft creation.
 - **Signed binaries** — Windows EV code-signing (~$300/yr, DigiCert or SSL.com) + Apple Developer ID + notarization ($99/yr). Removes SmartScreen/Gatekeeper warnings. Prerequisite for the auto-update path.
 - **npm registry publication** — future v1.0 distribution work. The package name is local workspace metadata today; current install paths are GitHub Release binaries or local clone + `npm link`.
 - **HMAC verification on QR payloads** — defer until a client-accessible secret story exists (same deferral as the Android app). Not blocking GA.

app/build.gradle.kts

@@ -106,6 +106,19 @@ android {
         }
     }
 
+    // Structural guard: the sideload flavor is distributed via GitHub Releases /
+    // F-Droid / ADB and must NEVER be uploaded to Play Console (it declares the
+    // unattended Device Control surface Play forbids). gradle-play-publisher
+    // generates a publish task per variant, so the aggregate `publishReleaseBundle`
+    // would otherwise try BOTH flavors. Disabling sideload here means only
+    // `publishGooglePlayReleaseBundle` can ever reach Play — see the `play { }`
+    // block below and .github/workflows/release-android.yml.
+    playConfigs {
+        register("sideload") {
+            enabled.set(false)
+        }
+    }
+
     buildTypes {
         debug {
             buildConfigField("boolean", "DEV_MODE", "true")
@@ -270,6 +283,8 @@ dependencies {
     // across priority groups against real local sockets so the behavior we
     // validate matches on-device.
     testImplementation(libs.okhttp.mockwebserver)
+    // Konsist — enforces the ADR 34 upstream/relay/shared package fence as a JUnit test
+    testImplementation(libs.konsist)
     androidTestImplementation(libs.compose.ui.test.junit4)
     debugImplementation(libs.compose.ui.tooling)
     debugImplementation(libs.compose.ui.test.manifest)

app/src/androidTest/kotlin/com/hermesandroid/relay/ui/onboarding/OnboardingFlowTest.kt

@@ -172,6 +172,17 @@ class OnboardingFlowTest {
             .assertIsDisplayed()
     }
 
+    @Test
+    fun powerPage_linksToPermissionReview() {
+        setOnboardingContent()
+        navigateToPage(3)
+
+        composeTestRule
+            .onNodeWithText("Review permissions")
+            .assertIsDisplayed()
+            .assertIsEnabled()
+    }
+
     @Test
     fun skipButton_visibleOnIntroPages_andWizardSkipOnConnectPage() {
         setOnboardingContent()

app/src/androidTest/kotlin/com/hermesandroid/relay/ui/screens/PermissionsStatusScreenTest.kt

@@ -0,0 +1,45 @@
+package com.hermesandroid.relay.ui.screens
+
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performScrollTo
+import com.hermesandroid.relay.ui.theme.HermesRelayTheme
+import org.junit.Rule
+import org.junit.Test
+
+class PermissionsStatusScreenTest {
+
+    @get:Rule
+    val composeTestRule = createComposeRule()
+
+    @Test
+    fun permissionsScreen_showsStandardAndOnDemandRows() {
+        composeTestRule.setContent {
+            HermesRelayTheme {
+                PermissionsStatusScreen(
+                    onBack = {},
+                    onOpenBridge = {},
+                )
+            }
+        }
+
+        composeTestRule
+            .onNodeWithText("Permissions and capabilities")
+            .assertIsDisplayed()
+        composeTestRule
+            .onNodeWithText("Chat and Manage")
+            .assertIsDisplayed()
+        composeTestRule
+            .onNodeWithText("No Android runtime permission needed. API/dashboard auth is configured separately.")
+            .assertIsDisplayed()
+        composeTestRule
+            .onNodeWithText("Camera")
+            .performScrollTo()
+            .assertIsDisplayed()
+        composeTestRule
+            .onNodeWithText("Microphone")
+            .performScrollTo()
+            .assertIsDisplayed()
+    }
+}

app/src/googlePlay/kotlin/com/hermesandroid/relay/voice/VoiceBridgeIntentFactory.kt

@@ -1,8 +1,8 @@
 package com.hermesandroid.relay.voice
 
-import com.hermesandroid.relay.network.ChannelMultiplexer
-import com.hermesandroid.relay.network.handlers.LocalDispatchResult
-import com.hermesandroid.relay.network.models.Envelope
+import com.hermesandroid.relay.network.relay.ChannelMultiplexer
+import com.hermesandroid.relay.network.shared.LocalDispatchResult
+import com.hermesandroid.relay.network.relay.models.Envelope
 
 /**
  * Local in-process bridge dispatcher type. The Play flavor never invokes

app/src/googlePlay/play/default-language.txt

@@ -0,0 +1 @@
+en-US

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

@@ -0,0 +1,62 @@
+Hermes-Relay is the native Android client for the Hermes agent platform. Point it at your own Hermes instance and chat with your agent, talk to it hands-free, and manage models, keys, skills, and profiles from anywhere.
+
+It is not a hosted AI service. It is a companion app for the Hermes agent you run, and it talks only to the instances you configure.
+
+QUICK START
+
+1. Run hermes-agent with its API server and dashboard enabled on your computer or home server.
+2. Install Hermes-Relay and enter your server address, for example http://192.168.1.100:8642.
+3. The setup wizard checks what your server supports and shows a readiness card, then you are ready to chat.
+
+A plain Hermes install is enough. Chat, management, and voice work with no plugin or extra service.
+
+HOW IT WORKS
+
+Chat streams directly from your Hermes API Server or dashboard gateway in real time. Manage and voice use your Hermes dashboard with one sign-in. Run the optional relay service and the app can pair by QR code to add power tools: remote terminal, notification companion, media handoff, relay-session management, and additional voice engines.
+
+GOOGLE PLAY BUILD
+
+The Google Play build ships Hermes Bridge Core only. It has no AccessibilityService Device Control: it cannot read your screen, tap, type, swipe, screenshot, send SMS, place calls, or access contacts or location. Device Control is reserved for sideload builds distributed outside Google Play.
+
+FEATURES
+
+- Streaming Chat: real-time responses with reasoning, markdown, tool-call visibility, attachments, mid-turn steering, edit-and-resend, and a searchable command palette.
+
+- Manage Your Agent: use your Hermes dashboard from your phone to switch models, manage provider keys, edit profiles, and browse, install, and update skills.
+
+- Voice Mode: talk hands-free using your server's speech providers. Relay-paired setups add per-profile voices and an experimental realtime engine.
+
+- Works Away From Home: add LAN, Tailscale, or public routes and the app chooses the best available path on connect.
+
+- Sessions: create, switch, rename, and delete chats. Message history loads on demand.
+
+- Multiple Servers and Profiles: connect to more than one server and switch in a tap; overlay an agent profile or personality per conversation.
+
+- Relay Power Tools: optional QR pairing for remote terminal, relay-session management, media handoff, and per-feature grants.
+
+- Notification Companion: optionally forward notification metadata to your paired relay so your assistant can summarize it. Toggle it anytime in system settings.
+
+- Stats for Nerds: local-only counters for response timing, token usage, cost, and stream health.
+
+- Material You: Material 3 dynamic color, light/dark/system themes, and haptics.
+
+SECURITY AND PRIVACY
+
+- API keys and relay tokens are stored in encrypted Android storage.
+- HTTPS is enforced for remote connections; cleartext is limited to localhost or LAN setups.
+- No telemetry, ads, tracking, or third-party analytics SDKs.
+- Notification access and the microphone are optional and user-controlled.
+- All app traffic goes only to servers you configure.
+
+REQUIREMENTS
+
+- Android 8.0 or later.
+- A running Hermes agent for chat, management, and voice.
+- Optional Hermes relay service for power tools such as terminal, notifications, and media.
+- Network access to your server by local network, VPN, or internet.
+
+OPEN SOURCE
+
+Hermes-Relay is MIT licensed. Source, docs, and issue tracking are on GitHub.
+
+This app is a community project and is not affiliated with or endorsed by NousResearch.

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

@@ -0,0 +1 @@
+Your Hermes AI agent, in your pocket - chat, voice, and control.

app/src/googlePlay/play/listings/en-US/title.txt

@@ -0,0 +1 @@
+Hermes-Relay

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

@@ -0,0 +1,5 @@
+Settings & chat polish:
+• Status chips now show only when something needs attention; Power tools shows one live plugin badge; Connections moved to the top of Settings.
+• Chat settings: fixed the streaming-endpoint picker layout; the system-prompt preview now reflects your enabled toggles.
+• Fixed a rare crash on connect from a corrupt saved credential (now self-heals).
+• Server-side relay-plugin improvements.

app/src/main/AndroidManifest.xml

@@ -73,7 +73,7 @@
              runs while the user has explicitly enabled the toggle. specialUse
              needs a Play Console foreground-service declaration at submission. -->
         <service
-            android:name=".network.GatewayKeepAliveService"
+            android:name=".network.upstream.GatewayKeepAliveService"
             android:exported="false"
             android:foregroundServiceType="specialUse">
             <property

app/src/main/assets/terminal/index.html

@@ -26,7 +26,9 @@
             left: 0;
             right: 0;
             bottom: 0;
-            padding: 8px 6px 0 8px;
+            /* Bottom gap so xterm's last row clears the extra-keys footer
+               instead of butting flush against it (read as an overlap). */
+            padding: 8px 6px 8px 8px;
             box-sizing: border-box;
         }
         .xterm .xterm-viewport {
@@ -149,6 +151,18 @@
             }
         });
 
+        // Report scroll position so the host can show a "jump to latest" pill
+        // while the user is scrolled up into scrollback. atBottom is true when
+        // the viewport is pinned to the live tail.
+        const reportScroll = function () {
+            if (!(window.AndroidBridge && window.AndroidBridge.onScrollPosition)) return;
+            try {
+                const buf = term.buffer.active;
+                window.AndroidBridge.onScrollPosition(buf.viewportY >= buf.baseY);
+            } catch (_) {}
+        };
+        term.onScroll(function () { reportScroll(); });
+
         // ── Inbound: Android → terminal ───────────────────────────────────
         // Base64-encoded payloads avoid JS string-escaping headaches when the
         // stream contains control characters, raw escape sequences, or bytes
@@ -223,6 +237,13 @@
             try { term.focus(); } catch (_) {}
         };
 
+        // Current xterm selection as plain text ('' when nothing selected).
+        // Read back via WebView.evaluateJavascript for the toolbar Copy key,
+        // since long-press copy is unreliable inside an Android WebView.
+        window.getSelectionText = function () {
+            try { return term.getSelection() || ''; } catch (_) { return ''; }
+        };
+
         window.clearTerminal = function () {
             try { term.clear(); } catch (_) {}
         };
@@ -239,6 +260,36 @@
             }
         };
 
+        // Mode-aware encoder for the on-screen toolbar's special keys
+        // (arrows / Home / End / Page). Arrows must follow xterm's current
+        // DECCKM (application cursor keys) mode: when an app like vim, less,
+        // or readline has requested it, an arrow is SS3-encoded (\eOA) rather
+        // than CSI (\e[A). The old path always sent CSI from Kotlin, which the
+        // running TUI could misread. We read term.modes here (where the mode
+        // actually lives) and route bytes back through onInput so sticky
+        // modifiers still apply. Page keys are mode-independent.
+        window.termSendKey = function (name) {
+            var appCursor = false;
+            try {
+                appCursor = !!(term.modes && term.modes.applicationCursorKeysMode);
+            } catch (_) {}
+            var p = appCursor ? 'O' : '[';
+            var map = {
+                ArrowUp: p + 'A',
+                ArrowDown: p + 'B',
+                ArrowRight: p + 'C',
+                ArrowLeft: p + 'D',
+                Home: p + 'H',
+                End: p + 'F',
+                PageUp: '[5~',
+                PageDown: '[6~',
+            };
+            var seq = map[name];
+            if (seq && window.AndroidBridge && window.AndroidBridge.onInput) {
+                window.AndroidBridge.onInput(seq);
+            }
+        };
+
         // ── Scroll shims + gesture ────────────────────────────────────────
         // xterm.js ships a scrollback buffer (scrollback: 10000 above) but
         // has no built-in mobile touch-to-scroll — its input handlers are

app/src/main/kotlin/com/hermesandroid/relay/HermesRelayApp.kt

@@ -1,9 +1,6 @@
 package com.hermesandroid.relay
 
 import android.app.Application
-import android.os.Build
-import androidx.compose.ui.ComposeUiFlags
-import androidx.compose.ui.ExperimentalComposeUiApi
 import coil3.ImageLoader
 import coil3.PlatformContext
 import coil3.SingletonImageLoader
@@ -28,23 +25,8 @@ class HermesRelayApp : Application(), SingletonImageLoader.Factory {
             .crossfade(true)
             .build()
 
-    @OptIn(ExperimentalComposeUiApi::class)
-    override fun attachBaseContext(base: android.content.Context?) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
-            ComposeUiFlags.isAdaptiveRefreshRateEnabled = false
-        }
-        super.attachBaseContext(base)
-    }
-
-    @OptIn(ExperimentalComposeUiApi::class)
     override fun onCreate() {
         super.onCreate()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
-            // Compose's adaptive refresh-rate hint path on API 35 can emit
-            // `setRequestedFrameRate frameRate=NaN` from inside AndroidComposeView
-            // on every draw pass. Disable ARR globally until the upstream fix lands.
-            ComposeUiFlags.isAdaptiveRefreshRateEnabled = false
-        }
         instance = this
         AppAnalytics.initialize(this)
         // A8 — wire the bridge-gesture wake-lock wrapper so

app/src/main/kotlin/com/hermesandroid/relay/MainActivity.kt

@@ -21,7 +21,6 @@ import com.hermesandroid.relay.bridge.UnattendedAccessManager
 import com.hermesandroid.relay.data.BuildFlavor
 import com.hermesandroid.relay.notifications.TurnCompleteNotifier
 import com.hermesandroid.relay.ui.RelayApp
-import com.hermesandroid.relay.util.ComposeArrWorkaround
 import com.hermesandroid.relay.util.NavRouteRequest
 import com.hermesandroid.relay.viewmodel.ConnectionViewModel
 
@@ -118,9 +117,6 @@ class MainActivity : ComponentActivity() {
         setContent {
             RelayApp()
         }
-        window.decorView.post {
-            ComposeArrWorkaround.disableForViewTree(window.decorView)
-        }
     }
 
     override fun onNewIntent(intent: Intent) {

app/src/main/kotlin/com/hermesandroid/relay/accessibility/ActionExecutor.kt

@@ -1551,7 +1551,7 @@ class ActionExecutor(private val service: HermesAccessibilityService) {
      * googlePlay as a dialer-opener" per the plan.
      *
      * The destructive-verb confirmation modal is fired in
-     * [com.hermesandroid.relay.network.handlers.BridgeCommandHandler]
+     * [com.hermesandroid.relay.network.relay.BridgeCommandHandler]
      * before we even get here — by the time this method runs, the user
      * has explicitly approved the call.
      */

app/src/main/kotlin/com/hermesandroid/relay/accessibility/BridgeStatusReporter.kt

@@ -12,8 +12,8 @@ import android.util.Log
 import com.hermesandroid.relay.bridge.BridgeSafetyManager
 import com.hermesandroid.relay.bridge.UnattendedAccessManager
 import com.hermesandroid.relay.data.BuildFlavor
-import com.hermesandroid.relay.network.ChannelMultiplexer
-import com.hermesandroid.relay.network.models.Envelope
+import com.hermesandroid.relay.network.relay.ChannelMultiplexer
+import com.hermesandroid.relay.network.relay.models.Envelope
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay

app/src/main/kotlin/com/hermesandroid/relay/accessibility/HermesAccessibilityService.kt

@@ -68,7 +68,7 @@ class HermesAccessibilityService : AccessibilityService() {
          * service is not running. Written on [onServiceConnected],
          * cleared on [onUnbind] / [onDestroy].
          *
-         * Read by [com.hermesandroid.relay.network.handlers.BridgeCommandHandler]
+         * Read by [com.hermesandroid.relay.network.relay.BridgeCommandHandler]
          * and by the Bridge UI screen (bridge-ui) to check live status.
          */
         @Volatile

app/src/main/kotlin/com/hermesandroid/relay/auth/AuthManager.kt

@@ -6,8 +6,8 @@ import com.hermesandroid.relay.data.Connection
 import com.hermesandroid.relay.data.EndpointCandidate
 import com.hermesandroid.relay.data.PairingPreferences
 import com.hermesandroid.relay.data.Profile
-import com.hermesandroid.relay.network.ChannelMultiplexer
-import com.hermesandroid.relay.network.models.Envelope
+import com.hermesandroid.relay.network.relay.ChannelMultiplexer
+import com.hermesandroid.relay.network.relay.models.Envelope
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -335,9 +335,21 @@ class AuthManager(
                 // connection. The legacy sentinel keeps the pre-multi-
                 // connection install on its original file so the existing
                 // paired device keeps working with no migration.
+                // Both encrypted backends decrypt their Tink keyset eagerly on
+                // construction, so a corrupt file can throw AEADBadTagException
+                // here. KeystoreTokenStore.tryCreate already degrades to null;
+                // the legacy store self-heals its file in its constructor. If
+                // even that rebuild fails (a fundamentally broken keystore),
+                // fall back to a non-persistent store rather than force-close —
+                // the user re-pairs, but the app stays up.
                 val picked: SessionTokenStore =
                     KeystoreTokenStore.tryCreate(context, tokenPrefsName)
-                        ?: LegacyEncryptedPrefsTokenStore(context, tokenPrefsName)
+                        ?: runCatching {
+                            LegacyEncryptedPrefsTokenStore(context, tokenPrefsName)
+                        }.getOrElse { e ->
+                            Log.w(TAG, "Legacy token store unavailable (${e.message}) — using in-memory fallback; re-pair required")
+                            InMemoryTokenStore()
+                        }
                 migrateFromLegacyIfNeeded(picked)
                 _store = picked
                 picked

app/src/main/kotlin/com/hermesandroid/relay/auth/SessionTokenStore.kt

@@ -72,9 +72,12 @@ class KeystoreTokenStore private constructor(
 ) : SessionTokenStore {
 
     // Mutable so [resetPrefs] can swap in a fresh instance after a corrupted
-    // file is deleted. Built lazily via [buildPrefs] so the constructor can't
-    // throw — [tryCreate] still controls the "is this device usable at all"
-    // decision via its init probe below.
+    // file is deleted. This field initializer runs [buildPrefs] eagerly, so it
+    // CAN throw (e.g. AEADBadTagException on a corrupt keyset) — but the
+    // constructor is private and only reachable via [tryCreate], which wraps
+    // construction in try/catch and degrades to the legacy store. The
+    // directly-constructed legacy path self-heals instead; see
+    // [LegacyEncryptedPrefsTokenStore.buildPrefsResilient].
     private var prefs: SharedPreferences = buildPrefs()
 
     private fun buildPrefs(): SharedPreferences {
@@ -257,7 +260,38 @@ class LegacyEncryptedPrefsTokenStore(
 
     // Mutable so [resetPrefs] can swap in a fresh instance after a corrupted
     // file is deleted. See [KeystoreTokenStore.resetPrefs] for the rationale.
-    private var prefs: SharedPreferences = buildPrefs()
+    //
+    // Built via [buildPrefsResilient] so a corrupt keyset can't crash the
+    // constructor. Unlike [KeystoreTokenStore], this class is `new`-ed
+    // directly (it's the fallback when KeystoreTokenStore.tryCreate returns
+    // null, and the migration source), so there's no tryCreate-style guard
+    // upstream — the healing has to live here.
+    private var prefs: SharedPreferences = buildPrefsResilient()
+
+    /**
+     * Build the encrypted prefs, healing a corrupted keyset on the way.
+     *
+     * [EncryptedSharedPreferences.create] decrypts the Tink keyset eagerly, so
+     * a stale/corrupt legacy file throws [javax.crypto.AEADBadTagException]
+     * (AES-GCM tag mismatch) right here in the constructor. This is the classic
+     * post-upgrade / post-restore failure: the encrypted blob persists but the
+     * hardware master key it was sealed against is gone or rotated. Delete the
+     * file and rebuild a fresh keyset against the current master key rather
+     * than letting the exception escape and force-close the app — the token in
+     * the unreadable file was lost anyway, so the user simply re-pairs.
+     */
+    private fun buildPrefsResilient(): SharedPreferences =
+        try {
+            buildPrefs()
+        } catch (e: Exception) {
+            Log.w(TAG, "Initial legacy prefs build failed — wiping corrupted file and rebuilding: ${e.message}")
+            try {
+                appContext.deleteSharedPreferences(prefsName)
+            } catch (e2: Exception) {
+                Log.w(TAG, "deleteSharedPreferences($prefsName) failed: ${e2.message}")
+            }
+            buildPrefs()
+        }
 
     private fun buildPrefs(): SharedPreferences {
         val masterKey = MasterKey.Builder(appContext)
@@ -342,3 +376,24 @@ class LegacyEncryptedPrefsTokenStore(
         }
     }
 }
+
+// ---------------------------------------------------------------------------
+// In-memory last-resort implementation
+// ---------------------------------------------------------------------------
+
+/**
+ * Non-persistent [SessionTokenStore]. Used only when BOTH the Keystore and the
+ * (self-healing) legacy encrypted store fail to construct — i.e. the device's
+ * AndroidKeystore is so broken it can't even build a fresh key. Tokens live for
+ * the process lifetime only, so the user re-pairs on the next cold start, but
+ * the app stays up instead of force-closing. See [AuthManager.store].
+ */
+class InMemoryTokenStore : SessionTokenStore {
+    private val map = java.util.concurrent.ConcurrentHashMap<String, String>()
+    override val hasHardwareBackedStorage: Boolean = false
+    override fun getString(key: String): String? = map[key]
+    override fun putString(key: String, value: String) { map[key] = value }
+    override fun remove(key: String) { map.remove(key) }
+    override fun contains(key: String): Boolean = map.containsKey(key)
+    override fun clearAll() { map.clear() }
+}

app/src/main/kotlin/com/hermesandroid/relay/bridge/BridgeStatusOverlay.kt

@@ -25,7 +25,6 @@ import androidx.savedstate.SavedStateRegistryOwner
 import androidx.savedstate.setViewTreeSavedStateRegistryOwner
 import com.hermesandroid.relay.ui.components.BridgeStatusOverlayChip
 import com.hermesandroid.relay.ui.components.DestructiveVerbConfirmDialog
-import com.hermesandroid.relay.util.ComposeArrWorkaround
 import java.util.concurrent.ConcurrentHashMap
 
 /**
@@ -158,7 +157,6 @@ class BridgeStatusOverlay(context: Context) : ConfirmationOverlayHost {
                 Log.w(TAG, "addView(chip) failed", it)
                 return
             }
-        compose.post { ComposeArrWorkaround.disableForViewTree(compose) }
         chipView = compose
         chipUnattended = unattended
     }
@@ -227,7 +225,6 @@ class BridgeStatusOverlay(context: Context) : ConfirmationOverlayHost {
             onResult(false)
             return
         }
-        compose.post { ComposeArrWorkaround.disableForViewTree(compose) }
         activeConfirmations[request.id] = compose
     }
 

app/src/main/kotlin/com/hermesandroid/relay/bridge/UnattendedAccessManager.kt

@@ -233,7 +233,7 @@ object UnattendedAccessManager {
      * Acquire the screen-bright wake lock + opportunistically request
      * keyguard dismiss. Synchronous — does not suspend. The caller (
      * [com.hermesandroid.relay.accessibility.ActionExecutor] wrapper, or
-     * [com.hermesandroid.relay.network.handlers.BridgeCommandHandler]
+     * [com.hermesandroid.relay.network.relay.BridgeCommandHandler]
      * pre-dispatch hook) holds onto the result and decides whether to
      * proceed with the action.
      *

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

@@ -10,24 +10,38 @@ package com.hermesandroid.relay.data
  */
 object AgentDisplay {
     const val SERVER_DEFAULT_PROFILE_KEY: String = "__server_default__"
+    private val GENERIC_MODEL_ALIASES = setOf(
+        "hermes-agent",
+        "hermes_agent",
+        "hermes agent",
+    )
 
-    // Only an EXPLICIT pick drives the effective profile. We deliberately do
-    // NOT fall back to the advertised "default" profile: a dashboard profile's
-    // description is a verbose SOUL summary ("Builds and maintains…"), and
-    // resolving it here replaced the clean agent name (the personality, e.g.
-    // "Victor") with that summary in the header. With no explicit pick, the
-    // name comes from the personality. ([profiles] kept for call-site symmetry.)
+    // Only an EXPLICIT pick drives request/session identity. The advertised
+    // "default" profile is an alias for server default, so falling back to it
+    // here would split chat, voice, or session scope.
     @Suppress("UNUSED_PARAMETER")
     fun effectiveProfile(
         selectedProfile: Profile?,
         profiles: List<Profile>,
     ): Profile? = selectedProfile
 
-    // The NAME goes in the name slot. A profile's description is a SOUL summary
-    // ("Builds and maintains…"), far too verbose for the agent-name label, so
-    // the profile name wins; description is only a last resort when name is blank.
+    // Display can use the synthetic 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.
+    fun effectiveDisplayProfile(
+        selectedProfile: Profile?,
+        profiles: List<Profile>,
+    ): Profile? = selectedProfile ?: profiles.firstOrNull { isServerDefaultAlias(it.name) }
+
+    // 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.
     fun profileDisplayName(profile: Profile?): String? {
         if (profile == null) return null
+        if (isServerDefaultAlias(profile.name)) {
+            return defaultProfileDisplayName(profile)
+        }
         return when {
             profile.name.isNotBlank() -> titleCase(profile.name.trim())
             profile.description.isNotBlank() -> profile.description.trim()
@@ -35,19 +49,34 @@ object AgentDisplay {
         }
     }
 
+    fun defaultProfileDisplayName(profile: Profile?): String? =
+        profile
+            ?.description
+            ?.trim()
+            ?.takeIf { it.looksLikeConciseAgentName() }
+            ?.let(::titleCase)
+
     fun agentName(
         profile: Profile?,
         selectedPersonality: String,
         defaultPersonality: String,
         connectionLabel: String?,
+        localDisplayAlias: String? = null,
     ): String {
+        localDisplayAlias(localDisplayAlias)?.let { return it }
         profileDisplayName(profile)?.let { return it }
 
+        // "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
+        // word as an agent name.
         val personalityName = if (
-            selectedPersonality == "default" &&
+            isClearedPersonality(selectedPersonality) &&
             defaultPersonality.isNotBlank()
         ) {
             defaultPersonality
+        } else if (isClearedPersonality(selectedPersonality)) {
+            ""
         } else {
             selectedPersonality
         }
@@ -60,16 +89,43 @@ object AgentDisplay {
         }
     }
 
+    /** True for the upstream "clear the overlay" aliases (default == none == neutral). */
+    fun isClearedPersonality(value: String): Boolean =
+        value.trim().lowercase() in setOf("default", "none", "neutral", "")
+
     fun personalityLabel(
         selectedPersonality: String,
         defaultPersonality: String,
     ): String = when {
+        // Explicit "none" — show "None" (or the configured default name, if any)
+        // so the cleared-overlay state is legible in the picker header.
+        selectedPersonality.trim().lowercase() in setOf("none", "neutral") ->
+            if (defaultPersonality.isNotBlank()) titleCase(defaultPersonality.trim()) else "None"
         selectedPersonality != "default" && selectedPersonality.isNotBlank() ->
             titleCase(selectedPersonality.trim())
         defaultPersonality.isNotBlank() -> titleCase(defaultPersonality.trim())
         else -> "Default"
     }
 
+    fun displayModelName(model: String?): String? =
+        model
+            ?.trim()
+            ?.takeIf { it.isNotEmpty() }
+            ?.takeUnless { it.lowercase() in GENERIC_MODEL_ALIASES }
+
+    /**
+     * A model string safe to SEND to the server as a model override or
+     * `config.set model=…`. Returns null for the generic agent placeholders
+     * ("hermes-agent", …) which are NOT real models — the server rejects them
+     * (HTTP 400) and falls back. Null means "send no model; use the server's
+     * configured default."
+     */
+    fun requestModelName(model: String?): String? =
+        model
+            ?.trim()
+            ?.takeIf { it.isNotEmpty() }
+            ?.takeUnless { it.lowercase() in GENERIC_MODEL_ALIASES }
+
     fun isServerDefaultAlias(profileName: String?): Boolean =
         profileName?.trim()?.equals("default", ignoreCase = true) == true
 
@@ -87,6 +143,22 @@ object AgentDisplay {
     fun profileContextKey(connectionId: String?, profileName: String?): String =
         "${connectionId.orEmpty()}::${profileSessionKey(profileName)}"
 
+    fun localDisplayAlias(value: String?): String? =
+        value
+            ?.trim()
+            ?.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/ChatMessage.kt

@@ -46,7 +46,7 @@ data class ChatMessage(
     /**
      * Rich content cards emitted by the agent via `CARD:{json}` line
      * markers in the text stream. Parsed in
-     * [com.hermesandroid.relay.network.handlers.ChatHandler.scanForCardMarkers]
+     * [com.hermesandroid.relay.network.upstream.ChatHandler.scanForCardMarkers]
      * and rendered inline by
      * [com.hermesandroid.relay.ui.components.HermesCardBubble]. Mirrors
      * [attachments]' lifecycle — the marker line is stripped from
@@ -76,7 +76,7 @@ data class ChatMessage(
      * The sync builder treats messages with [voiceIntent] != null and
      * [VoiceIntentTrace.syncedToServer] == false as the inputs to its
      * synthesis pass; on a successful send we flip [VoiceIntentTrace.syncedToServer]
-     * to true via [com.hermesandroid.relay.network.handlers.ChatHandler.markVoiceIntentsSynced]
+     * to true via [com.hermesandroid.relay.network.upstream.ChatHandler.markVoiceIntentsSynced]
      * so they're not re-sent on the next turn.
      */
     val voiceIntent: VoiceIntentTrace? = null,
@@ -94,7 +94,7 @@ data class ChatMessage(
 
 /**
  * Structured details about a phone-local voice intent that was dispatched
- * in-process via [com.hermesandroid.relay.network.handlers.BridgeCommandHandler.handleLocalCommand].
+ * in-process via [com.hermesandroid.relay.network.relay.BridgeCommandHandler.handleLocalCommand].
  *
  * Captured on a [ChatMessage] (id prefix `voice-intent-`) so the next chat
  * payload can include synthetic OpenAI-format `assistant` + `tool` message
@@ -123,12 +123,12 @@ data class ChatMessage(
  *   includes an `error` field.
  * @property resultJson Compact JSON object describing the dispatch outcome.
  *   On success, typically `{"ok":true,...}` with any tool-specific fields
- *   from [com.hermesandroid.relay.network.handlers.LocalDispatchResult.resultJson].
+ *   from [com.hermesandroid.relay.network.shared.LocalDispatchResult.resultJson].
  *   On failure, an error envelope including `ok:false`, `error`, optionally
  *   `error_code`. Stored as a string and rendered verbatim into the
  *   synthetic `tool`-role message's `content` field.
  * @property syncedToServer Idempotency guard. Flipped to true by
- *   [com.hermesandroid.relay.network.handlers.ChatHandler.markVoiceIntentsSynced]
+ *   [com.hermesandroid.relay.network.upstream.ChatHandler.markVoiceIntentsSynced]
  *   the moment we hand the request payload to the API client. Once true,
  *   the trace is excluded from future sync passes — the server-side
  *   session has already absorbed it.
@@ -272,5 +272,16 @@ data class ChatSession(
     val title: String?,
     val model: String?,
     val messageCount: Int = 0,
-    val updatedAt: Long = 0L
-)
+    val updatedAt: Long = 0L,
+    val startedAt: Long = 0L,
+    val lastActivityAt: Long = 0L
+) {
+    val activityTimestamp: Long
+        get() = firstPositive(lastActivityAt, updatedAt, startedAt)
+
+    val startTimestamp: Long
+        get() = firstPositive(startedAt, updatedAt, lastActivityAt)
+
+    private fun firstPositive(vararg values: Long): Long =
+        values.firstOrNull { it > 0L } ?: 0L
+}

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

@@ -30,7 +30,7 @@ data class DashboardConnectionStatus(
  *    open the token store.
  *
  * Switching connection is a HEAVY context swap — caller is expected to tear down
- * the current [com.hermesandroid.relay.network.ConnectionManager],
+ * the current [com.hermesandroid.relay.network.relay.ConnectionManager],
  * [com.hermesandroid.relay.auth.AuthManager], and API client, then construct
  * fresh ones pointed at the new connection's `tokenStoreKey`.
  *
@@ -290,6 +290,8 @@ data class Connection(
                 role = role.ifBlank { inferRouteRole(apiServerUrl) },
                 priority = priority,
                 api = ApiEndpoint(host = host, port = port, tls = tls),
+                dashboard = deriveDefaultDashboardUrl(apiServerUrl)
+                    ?.let { DashboardEndpoint(url = it) },
                 relay = RelayEndpoint(url = resolvedRelayUrl, transportHint = transportHint),
             )
         }

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

@@ -8,8 +8,8 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
 import com.hermesandroid.relay.auth.AuthManager
 import com.hermesandroid.relay.auth.ConnectionAuthSecrets
-import com.hermesandroid.relay.network.EncryptedDashboardCookieStore
-import com.hermesandroid.relay.network.StoredDashboardCookie
+import com.hermesandroid.relay.network.upstream.EncryptedDashboardCookieStore
+import com.hermesandroid.relay.network.upstream.StoredDashboardCookie
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map

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

@@ -40,6 +40,10 @@ data class EndpointCandidate(
     val priority: Int = 0,
     val api: ApiEndpoint,
     val relay: RelayEndpoint,
+    val dashboard: DashboardEndpoint? = null,
+    val proxy: ProxyEndpoint? = null,
+    val security: String? = null,
+    val recommended: Boolean = false,
 )
 
 /**
@@ -61,6 +65,17 @@ data class ApiEndpoint(
         get() = "${if (tls) "https" else "http"}://$host:$port"
 }
 
+/**
+ * Dashboard/admin surface for an [EndpointCandidate]. This is optional so
+ * older v3 payloads that only carried API + Relay endpoints keep
+ * deserializing; when absent, Android derives the conventional same-host
+ * `:9119` dashboard URL from [ApiEndpoint].
+ */
+@Serializable
+data class DashboardEndpoint(
+    val url: String,
+)
+
 /**
  * The relay-server half of an [EndpointCandidate] — the WSS URL the phone
  * opens for the bridge + terminal channels.
@@ -78,6 +93,22 @@ data class RelayEndpoint(
     val transportHint: String? = null,
 )
 
+/**
+ * Optional plugin-owned secure proxy route. Unlike [api], [dashboard], and
+ * [relay], this is one app-facing base that can cover all Hermes-Relay
+ * supported traffic after pairing. It is deliberately optional so plugin
+ * proxy support can be advertised by newer payloads without changing the
+ * standard upstream connection model.
+ */
+@Serializable
+data class ProxyEndpoint(
+    val url: String,
+    @SerialName("transport_hint")
+    val transportHint: String? = null,
+    @SerialName("pin_sha256")
+    val pinSha256: String? = null,
+)
+
 /**
  * Returns true when [EndpointCandidate.role] is one of the built-in, styled
  * roles: `lan`, `tailscale`, or `public`. Case-insensitive match — but the
@@ -89,7 +120,7 @@ data class RelayEndpoint(
  */
 fun EndpointCandidate.isKnownRole(): Boolean {
     return when (role.lowercase()) {
-        "lan", "tailscale", "public" -> true
+        "lan", "tailscale", "public", "plugin_proxy", "plugin-proxy", "https" -> true
         else -> false
     }
 }
@@ -106,7 +137,15 @@ fun EndpointCandidate.displayLabel(): String {
     return when (role.lowercase()) {
         "lan" -> "LAN"
         "tailscale" -> "Tailscale"
-        "public" -> "Public"
+        "public" -> if (api.tls) "HTTPS" else "Public"
+        "https" -> "HTTPS"
+        "plugin_proxy", "plugin-proxy" -> "Plugin proxy"
         else -> "Custom VPN ($role)"
     }
 }
+
+fun EndpointCandidate.hasSecureProxy(): Boolean =
+    proxy?.url?.startsWith("https://", ignoreCase = true) == true ||
+        proxy?.url?.startsWith("wss://", ignoreCase = true) == true ||
+        role.equals("plugin_proxy", ignoreCase = true) ||
+        role.equals("plugin-proxy", ignoreCase = true)

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

@@ -11,7 +11,7 @@ import androidx.datastore.preferences.core.edit
  * Shared by [com.hermesandroid.relay.viewmodel.ConnectionViewModel] (the
  * StateFlow + setter that drive the foreground service and the client's
  * no-background-close flag) and
- * [com.hermesandroid.relay.network.GatewayKeepAliveService]'s Stop notification
+ * [com.hermesandroid.relay.network.upstream.GatewayKeepAliveService]'s Stop notification
  * action, so both read/write the same key.
  */
 val KEY_GATEWAY_KEEP_ALIVE = booleanPreferencesKey("gateway_keep_alive_background")

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

@@ -6,7 +6,7 @@ import kotlinx.serialization.Serializable
 /**
  * A rich content card emitted inline in an assistant message via the
  * `CARD:{json}` line marker. Parsed by
- * [com.hermesandroid.relay.network.handlers.ChatHandler] and rendered by
+ * [com.hermesandroid.relay.network.upstream.ChatHandler] and rendered by
  * [com.hermesandroid.relay.ui.components.HermesCardBubble].
  *
  * The marker lives in the text stream alongside `MEDIA:...` for the same
@@ -226,7 +226,7 @@ data class HermesCardAction(
  * (with structured `tool_calls`) + `tool` message pairs under a synthetic
  * `hermes_card_action` tool name, splicing them into the session history
  * the LLM sees. After the API client takes ownership of the request,
- * [com.hermesandroid.relay.network.handlers.ChatHandler.markCardDispatchesSynced]
+ * [com.hermesandroid.relay.network.upstream.ChatHandler.markCardDispatchesSynced]
  * flips [syncedToServer] so subsequent turns don't re-send the same
  * trace.
  */
@@ -238,7 +238,7 @@ data class HermesCardDispatch(
     /**
      * Idempotency guard for the server-side session sync path.
      * Flipped to true by
-     * [com.hermesandroid.relay.network.handlers.ChatHandler.markCardDispatchesSynced]
+     * [com.hermesandroid.relay.network.upstream.ChatHandler.markCardDispatchesSynced]
      * once the API client has accepted the request that carried this
      * dispatch's synthetic message pair. Once true, the dispatch is
      * excluded from future

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

@@ -0,0 +1,68 @@
+package com.hermesandroid.relay.data
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringPreferencesKey
+import androidx.datastore.preferences.preferencesDataStore
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+
+/**
+ * Local-only display aliases for agent profiles.
+ *
+ * These names are phone UI labels. They are never sent to Hermes and are keyed
+ * by connection + profile context so the server-default agent can be called
+ * something different on each configured Hermes host.
+ */
+class ProfileDisplayAliasStore(
+    private val dataStore: DataStore<Preferences>,
+) {
+    constructor(context: Context) : this(context.profileDisplayAliasesDataStore)
+
+    companion object {
+        private const val PREFIX = "profile_alias__"
+
+        private fun keyName(connectionId: String, profileName: String?): String =
+            "$PREFIX${connectionId}__${AgentDisplay.profileSessionKey(profileName)}"
+
+        private fun keyFor(connectionId: String, profileName: String?) =
+            stringPreferencesKey(keyName(connectionId, profileName))
+
+        private fun connectionPrefix(connectionId: String): String =
+            "$PREFIX${connectionId}__"
+    }
+
+    suspend fun setAlias(connectionId: String, profileName: String?, alias: String?) {
+        dataStore.edit { prefs ->
+            val key = keyFor(connectionId, profileName)
+            if (alias.isNullOrBlank()) {
+                prefs.remove(key)
+            } else {
+                prefs[key] = alias
+            }
+        }
+    }
+
+    fun aliasFlow(connectionId: String, profileName: String?): Flow<String?> {
+        val key = keyFor(connectionId, profileName)
+        return dataStore.data.map { prefs -> prefs[key] }
+    }
+
+    suspend fun clearConnection(connectionId: String) {
+        val prefix = connectionPrefix(connectionId)
+        dataStore.edit { prefs ->
+            prefs.asMap().keys
+                .filter { it.name.startsWith(prefix) }
+                .forEach { prefs.remove(it) }
+        }
+    }
+
+    suspend fun clearAll() {
+        dataStore.edit { prefs -> prefs.clear() }
+    }
+}
+
+internal val Context.profileDisplayAliasesDataStore: DataStore<Preferences>
+        by preferencesDataStore(name = "profile_display_aliases")

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

@@ -37,8 +37,60 @@ data class VoiceSettings(
      * docs/plans/2026-05-24-realtime-persistent-session.md.
      */
     val realtimePersistentSession: Boolean = true,
+    /**
+     * Enhanced-voice overrides for the relay TTS path, mapped onto the active
+     * provider (Gemini / xAI). Empty string / false means "use the server's
+     * saved config" — the relay only applies a field when it is set. Surfaced
+     * in Voice Settings only when the relay advertises an enhanced provider
+     * (`/voice/config` `tts.enhanced.supported`). Field meaning is generic:
+     * `enhancedVoice` → Gemini voice / xAI voice_id; `enhancedAudioTags` →
+     * Gemini audio_tags / xAI auto_speech_tags; `enhancedPersona` is Gemini-only
+     * and `enhancedLanguage` is xAI-only.
+     */
+    val enhancedVoice: String = "",
+    val enhancedModel: String = "",
+    val enhancedAudioTags: Boolean = false,
+    val enhancedPersona: String = "",
+    val enhancedLanguage: String = "",
 )
 
+/**
+ * Per-request enhanced-voice overrides forwarded to the relay's
+ * `/voice/synthesize`. Mirrors the generic fields recognized by
+ * `plugin/relay/voice.py:_extract_voice_overrides`; the relay maps them onto
+ * the active provider's config.
+ */
+data class EnhancedVoiceOverrides(
+    val voice: String? = null,
+    val model: String? = null,
+    val audioTags: Boolean? = null,
+    val personaPrompt: String? = null,
+    val language: String? = null,
+) {
+    val isEmpty: Boolean
+        get() = voice == null && model == null && audioTags == null &&
+            personaPrompt == null && language == null
+
+    companion object {
+        /**
+         * Build overrides from persisted settings, or null when nothing is set
+         * (so the relay falls back to the server's saved config). The audio-tags
+         * toggle only sends `true` — leaving it off defers to the server default
+         * rather than forcing it off.
+         */
+        fun fromSettings(s: VoiceSettings): EnhancedVoiceOverrides? {
+            val overrides = EnhancedVoiceOverrides(
+                voice = s.enhancedVoice.takeIf { it.isNotBlank() },
+                model = s.enhancedModel.takeIf { it.isNotBlank() },
+                audioTags = true.takeIf { s.enhancedAudioTags },
+                personaPrompt = s.enhancedPersona.takeIf { it.isNotBlank() },
+                language = s.enhancedLanguage.takeIf { it.isNotBlank() },
+            )
+            return overrides.takeUnless { it.isEmpty }
+        }
+    }
+}
+
 enum class VoiceEngineMode(val storageValue: String) {
     HermesVoiceOutput("hermes_voice_output"),
     RealtimeAgent("realtime_agent");
@@ -74,6 +126,11 @@ class VoicePreferencesRepository(private val dataStore: DataStore<Preferences>)
         private val KEY_REALTIME_TRACE_DETAILS = booleanPreferencesKey("voice_realtime_trace_details")
         private val KEY_REALTIME_PERSISTENT_SESSION =
             booleanPreferencesKey("voice_realtime_persistent_session")
+        private val KEY_ENH_VOICE = stringPreferencesKey("voice_enh_voice")
+        private val KEY_ENH_MODEL = stringPreferencesKey("voice_enh_model")
+        private val KEY_ENH_AUDIO_TAGS = booleanPreferencesKey("voice_enh_audio_tags")
+        private val KEY_ENH_PERSONA = stringPreferencesKey("voice_enh_persona")
+        private val KEY_ENH_LANGUAGE = stringPreferencesKey("voice_enh_language")
 
         const val DEFAULT_ENGINE_MODE = "hermes_voice_output"
         const val DEFAULT_AUDIO_ROUTE = "auto"
@@ -102,6 +159,11 @@ class VoicePreferencesRepository(private val dataStore: DataStore<Preferences>)
                     ?: DEFAULT_REALTIME_TRACE_DETAILS,
                 realtimePersistentSession = prefs[KEY_REALTIME_PERSISTENT_SESSION]
                     ?: DEFAULT_REALTIME_PERSISTENT_SESSION,
+                enhancedVoice = prefs[KEY_ENH_VOICE] ?: "",
+                enhancedModel = prefs[KEY_ENH_MODEL] ?: "",
+                enhancedAudioTags = prefs[KEY_ENH_AUDIO_TAGS] ?: false,
+                enhancedPersona = prefs[KEY_ENH_PERSONA] ?: "",
+                enhancedLanguage = prefs[KEY_ENH_LANGUAGE] ?: "",
             )
         }
         .distinctUntilChanged()
@@ -137,4 +199,28 @@ class VoicePreferencesRepository(private val dataStore: DataStore<Preferences>)
     suspend fun setRealtimePersistentSession(enabled: Boolean) {
         dataStore.edit { it[KEY_REALTIME_PERSISTENT_SESSION] = enabled }
     }
+
+    /** "" clears the override (relay falls back to the server's saved voice). */
+    suspend fun setEnhancedVoice(voice: String) {
+        dataStore.edit { it[KEY_ENH_VOICE] = voice.trim() }
+    }
+
+    /** "" clears the override (relay falls back to the server's saved model). */
+    suspend fun setEnhancedModel(model: String) {
+        dataStore.edit { it[KEY_ENH_MODEL] = model.trim() }
+    }
+
+    suspend fun setEnhancedAudioTags(enabled: Boolean) {
+        dataStore.edit { it[KEY_ENH_AUDIO_TAGS] = enabled }
+    }
+
+    /** "" clears the inline persona/style direction (Gemini). */
+    suspend fun setEnhancedPersona(persona: String) {
+        dataStore.edit { it[KEY_ENH_PERSONA] = persona }
+    }
+
+    /** "" clears the language override (xAI). */
+    suspend fun setEnhancedLanguage(language: String) {
+        dataStore.edit { it[KEY_ENH_LANGUAGE] = language.trim() }
+    }
 }

app/src/main/kotlin/com/hermesandroid/relay/network/relay/BridgeCommandHandler.kt

@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network.handlers
+package com.hermesandroid.relay.network.relay
 
 import android.content.ActivityNotFoundException
 import android.content.ClipData
@@ -23,9 +23,10 @@ import kotlinx.serialization.json.booleanOrNull
 // === PHASE3-tier-C: flavor gate for sideload-only tools ===
 import com.hermesandroid.relay.data.BuildFlavor
 // === END PHASE3-tier-C ===
-import com.hermesandroid.relay.network.ChannelMultiplexer
-import com.hermesandroid.relay.network.RelayHttpClient
-import com.hermesandroid.relay.network.models.Envelope
+import com.hermesandroid.relay.network.relay.ChannelMultiplexer
+import com.hermesandroid.relay.network.relay.RelayHttpClient
+import com.hermesandroid.relay.network.relay.models.Envelope
+import com.hermesandroid.relay.network.shared.LocalDispatchResult
 import com.hermesandroid.relay.util.MediaCacheWriter
 import kotlin.coroutines.AbstractCoroutineContextElement
 import kotlin.coroutines.CoroutineContext
@@ -2418,33 +2419,9 @@ class BridgeCommandHandler(
     }
 }
 
-/**
- * Captured outcome of a local bridge dispatch. Voice mode reads this to
- * emit follow-up chat traces showing the real success/failure state of
- * an action after the safety modal resolves and the underlying
- * [ActionExecutor] method returns. The fields mirror what the LLM path
- * would see on a `bridge.response` envelope:
- *
- *  - [status] — HTTP-style status: 200 success, 400 client error,
- *    403 user denial / bridge disabled, 500 executor error
- *  - [errorMessage] — free-text error from the response payload, or null
- *    on success. Safe to speak / display verbatim to the user.
- *  - [errorCode] — structured classification (e.g. `permission_denied`,
- *    `bridge_disabled`, `user_denied`) when `respondFromResult` or a
- *    direct respond call includes one. Null for errors we haven't
- *    classified yet.
- *  - [resultJson] — the raw result object, for callers that need
- *    action-specific fields (e.g. the resolved phone number from
- *    /search_contacts). Optional.
- */
-data class LocalDispatchResult(
-    val status: Int,
-    val errorMessage: String?,
-    val errorCode: String?,
-    val resultJson: JsonObject?,
-) {
-    val isSuccess: Boolean get() = status in 200..299
-}
+// LocalDispatchResult moved to network.shared (ADR 34 fence): it is a passive
+// DTO shared with the upstream chat path (ChatHandler), so it cannot live in
+// this relay-package file without creating an upstream -> relay import.
 
 /**
  * Coroutine context marker installed by [BridgeCommandHandler.handleLocalCommand]

app/src/main/kotlin/com/hermesandroid/relay/network/relay/ChannelMultiplexer.kt

@@ -1,6 +1,6 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.relay
 
-import com.hermesandroid.relay.network.models.Envelope
+import com.hermesandroid.relay.network.relay.models.Envelope
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.put

app/src/main/kotlin/com/hermesandroid/relay/network/relay/ConnectionManager.kt

@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.relay
 
 import android.content.Context
 import android.net.ConnectivityManager
@@ -12,7 +12,8 @@ import com.hermesandroid.relay.data.PairingPreferences
 import com.hermesandroid.relay.diagnostics.DiagnosticCategory
 import com.hermesandroid.relay.diagnostics.DiagnosticSeverity
 import com.hermesandroid.relay.diagnostics.DiagnosticsLog
-import com.hermesandroid.relay.network.models.Envelope
+import com.hermesandroid.relay.network.relay.models.Envelope
+import com.hermesandroid.relay.network.shared.EndpointResolver
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob

app/src/main/kotlin/com/hermesandroid/relay/network/relay/RelayHttpClient.kt

@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.relay
 
 import android.util.Log
 import com.hermesandroid.relay.auth.PairedDeviceInfo
@@ -22,7 +22,7 @@ import java.io.IOException
  *
  * The chat SSE stream can emit tool output containing a marker of the form
  *   `MEDIA:hermes-relay://<opaque-token>`
- * [ChatHandler][com.hermesandroid.relay.network.handlers.ChatHandler] parses
+ * [ChatHandler][com.hermesandroid.relay.network.upstream.ChatHandler] parses
  * the marker, and [ChatViewModel][com.hermesandroid.relay.viewmodel.ChatViewModel]
  * calls [fetchMedia] to pull the actual bytes over plain HTTP(S). The relay
  * base URL is the WSS relay URL with `ws`/`wss` swapped for `http`/`https`.
@@ -53,6 +53,16 @@ class RelayHttpClient(
         }
     }
 
+    /**
+     * True when this connection has a relay route configured (a non-blank relay
+     * URL), so the relay media routes are reachable. Synchronous (URL-only) —
+     * the bearer token is resolved per request and may lag pairing; callers that
+     * only need a coarse "relay media is available" gate (e.g. the agent
+     * media-capability hint) use this. The actual fetch still fails closed if the
+     * token is missing.
+     */
+    fun mediaUrlConfigured(): Boolean = !relayUrlProvider().isNullOrBlank()
+
     /**
      * The result of a successful [fetchMedia] call.
      *

app/src/main/kotlin/com/hermesandroid/relay/network/relay/RelayProfileInspectorClient.kt

@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.relay
 
 import android.util.Log
 import com.hermesandroid.relay.data.ProfileConfigResponse

app/src/main/kotlin/com/hermesandroid/relay/network/relay/RelayUrlDeriver.kt

@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.relay
 
 import java.net.URI
 

app/src/main/kotlin/com/hermesandroid/relay/network/relay/RelayVoiceAudioClientAdapter.kt

@@ -0,0 +1,24 @@
+package com.hermesandroid.relay.network.relay
+
+import com.hermesandroid.relay.data.EnhancedVoiceOverrides
+import com.hermesandroid.relay.data.VoiceAudioRoute
+import com.hermesandroid.relay.network.shared.VoiceAudioClient
+import java.io.File
+
+/**
+ * Adapts the relay-only [RelayVoiceClient] (same package) to the neutral
+ * [VoiceAudioClient] routing seam in `network.shared`. Relay → shared is an
+ * allowed dependency direction under the ADR 34 package fence.
+ */
+class RelayVoiceAudioClientAdapter(
+    private val relayVoiceClient: RelayVoiceClient,
+    private val enhancedOverridesProvider: () -> EnhancedVoiceOverrides? = { null },
+) : VoiceAudioClient {
+    override val route: VoiceAudioRoute = VoiceAudioRoute.Relay
+
+    override suspend fun transcribe(audioFile: File): Result<String> =
+        relayVoiceClient.transcribe(audioFile)
+
+    override suspend fun synthesize(text: String): Result<File> =
+        relayVoiceClient.synthesize(text, enhancedOverridesProvider())
+}

app/src/main/kotlin/com/hermesandroid/relay/network/relay/RelayVoiceClient.kt

@@ -1,7 +1,8 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.relay
 
 import android.content.Context
 import android.util.Log
+import com.hermesandroid.relay.data.EnhancedVoiceOverrides
 import com.hermesandroid.relay.data.MessageRole
 import com.hermesandroid.relay.data.RealtimeConversationContextMessage
 import kotlinx.coroutines.CompletableDeferred
@@ -208,7 +209,10 @@ class RelayVoiceClient(
      * when done (typical pattern: keep the last N mp3s in the cache dir and
      * let the OS reclaim on cache pressure).
      */
-    suspend fun synthesize(text: String): Result<File> = withContext(Dispatchers.IO) {
+    suspend fun synthesize(
+        text: String,
+        enhanced: EnhancedVoiceOverrides? = null,
+    ): Result<File> = withContext(Dispatchers.IO) {
         val httpBase = resolveHttpBase()
             ?: return@withContext Result.failure(IllegalStateException("Relay URL not configured"))
         val token = resolveBearerToken()
@@ -223,6 +227,16 @@ class RelayVoiceClient(
 
         val bodyJson = buildJsonObject {
             put("text", JsonPrimitive(text))
+            // Per-request enhanced-voice overrides. The relay maps these generic
+            // fields onto the active provider (Gemini/xAI) and ignores them for
+            // others — see voice.py:_extract_voice_overrides.
+            enhanced?.let { ov ->
+                ov.voice?.let { put("voice", JsonPrimitive(it)) }
+                ov.model?.let { put("model", JsonPrimitive(it)) }
+                ov.audioTags?.let { put("audio_tags", JsonPrimitive(it)) }
+                ov.personaPrompt?.let { put("persona_prompt", JsonPrimitive(it)) }
+                ov.language?.let { put("language", JsonPrimitive(it)) }
+            }
             putProfile()
         }.toString()
 
@@ -724,6 +738,7 @@ class RelayVoiceClient(
         codec: String? = null,
         optimizeStreamingLatency: Int? = null,
         textNormalization: Boolean? = null,
+        autoSpeechTags: Boolean? = null,
         fallbackEnabled: Boolean? = null,
     ): Result<VoiceOutputConfig> = withContext(Dispatchers.IO) {
         val httpBase = resolveHttpBase()
@@ -755,6 +770,7 @@ class RelayVoiceClient(
                 put("optimize_streaming_latency", JsonPrimitive(it))
             }
             textNormalization?.let { put("text_normalization", JsonPrimitive(it)) }
+            autoSpeechTags?.let { put("auto_speech_tags", JsonPrimitive(it)) }
             fallbackEnabled?.let { put("fallback_enabled", JsonPrimitive(it)) }
         }
 
@@ -2304,11 +2320,44 @@ data class VoiceProviderInfo(
     val voiceId: String? = null,
     val enabled: Boolean = false,
     val available: Boolean = true,
+    /**
+     * Provider-specific enhanced-voice capability hint. Present (non-null) only
+     * for the TTS block when the relay's active provider supports per-request
+     * enhanced control (today: Gemini and xAI).
+     */
+    val enhanced: EnhancedVoiceCapabilities? = null,
 ) {
     val displayVoice: String? get() = voice ?: voiceId
     val isEnabled: Boolean get() = enabled || (!provider.isNullOrBlank() && available)
 }
 
+/**
+ * Wire shape of the `tts.enhanced` block on `GET /voice/config` — the relay's
+ * provider-aware enhanced-voice capability advertisement. Mirrors
+ * `plugin/relay/voice.py:_enhanced_voice_block`. `voices`/`models` may be empty
+ * (e.g. xAI uses a free-text voice field); the UI renders from the flags.
+ */
+@Serializable
+data class EnhancedVoiceCapabilities(
+    val provider: String? = null,
+    val supported: Boolean = false,
+    val voices: List<String> = emptyList(),
+    val models: List<String> = emptyList(),
+    @SerialName("audio_tag_models")
+    val audioTagModels: List<String> = emptyList(),
+    @SerialName("audio_tags_enabled")
+    val audioTagsEnabled: Boolean = false,
+    @SerialName("audio_tags_label")
+    val audioTagsLabel: String = "Expressive tone tags",
+    @SerialName("supports_persona")
+    val supportsPersona: Boolean = false,
+    @SerialName("supports_language")
+    val supportsLanguage: Boolean = false,
+    @SerialName("persona_prompt_file")
+    val personaPromptFile: String? = null,
+    val overrides: List<String> = emptyList(),
+)
+
 @Serializable
 data class RealtimeVoiceConfig(
     val success: Boolean = false,
@@ -2481,6 +2530,8 @@ data class VoiceOutputConfig(
     val codec: String = "pcm",
     val optimize_streaming_latency: Int = 1,
     val text_normalization: Boolean = false,
+    /** xAI expressive speech tags on the streaming renderer (xai_tts only). */
+    val auto_speech_tags: Boolean = false,
     val fallback_enabled: Boolean = true,
     val fallback_provider: String? = null,
     val providers: List<RealtimeProviderInfo> = emptyList(),

app/src/main/kotlin/com/hermesandroid/relay/network/relay/models/Envelope.kt

@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network.models
+package com.hermesandroid.relay.network.relay.models
 
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonArray

app/src/main/kotlin/com/hermesandroid/relay/network/shared/ConnectivityObserver.kt

@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.shared
 
 import android.content.Context
 import android.net.ConnectivityManager

app/src/main/kotlin/com/hermesandroid/relay/network/shared/EndpointResolver.kt

@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.shared
 
 import android.util.Log
 import com.hermesandroid.relay.data.EndpointCandidate

app/src/main/kotlin/com/hermesandroid/relay/network/shared/HermesLanDiscovery.kt

@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.shared
 
 import android.content.Context
 import android.net.ConnectivityManager

app/src/main/kotlin/com/hermesandroid/relay/network/shared/LocalDispatchResult.kt

@@ -0,0 +1,31 @@
+package com.hermesandroid.relay.network.shared
+
+import kotlinx.serialization.json.JsonObject
+
+/**
+ * Transport-neutral result of a phone-control dispatch.
+ *
+ * Shared vocabulary between the relay bridge path
+ * ([com.hermesandroid.relay.network.relay.BridgeCommandHandler], which produces
+ * it) and the upstream chat path
+ * ([com.hermesandroid.relay.network.upstream.ChatHandler], which renders a
+ * phone-action bubble from it). It is a passive DTO — not a client — so it
+ * lives in `network.shared` to keep the upstream↔relay package fence intact
+ * (ADR 34); neither side depends on the other to speak it.
+ *
+ *  - [status] — HTTP-style status of the dispatch (200 = ok).
+ *  - [errorMessage] — human-readable failure text, or null on success.
+ *  - [errorCode] — machine error code when the dispatch failed and was
+ *    classified, or null.
+ *  - [resultJson] — the raw result object, for callers that need
+ *    action-specific fields (e.g. the resolved phone number from
+ *    /search_contacts). Optional.
+ */
+data class LocalDispatchResult(
+    val status: Int,
+    val errorMessage: String?,
+    val errorCode: String?,
+    val resultJson: JsonObject?,
+) {
+    val isSuccess: Boolean get() = status in 200..299
+}

app/src/main/kotlin/com/hermesandroid/relay/network/shared/ProfileApiUrlResolver.kt

@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.shared
 
 import java.net.URI
 

app/src/main/kotlin/com/hermesandroid/relay/network/shared/VoiceAudioClient.kt

@@ -0,0 +1,92 @@
+package com.hermesandroid.relay.network.shared
+
+import com.hermesandroid.relay.data.VoiceAudioRoute
+import java.io.File
+
+/**
+ * Transport-neutral STT/TTS contract. The routing seam between the Standard
+ * (dashboard) and Relay voice clients — implementations live in `network.upstream`
+ * (`StandardHermesVoiceClient`) and `network.relay` (`RelayVoiceAudioClientAdapter`),
+ * while this interface and the [AutoVoiceAudioClient] router stay dependency-neutral
+ * so neither voice backend leaks across the upstream/relay package fence (ADR 34).
+ */
+interface VoiceAudioClient {
+    val route: VoiceAudioRoute
+    suspend fun transcribe(audioFile: File): Result<String>
+    suspend fun synthesize(text: String): Result<File>
+}
+
+/**
+ * Routes each STT/TTS call to the Standard (dashboard) or Relay voice client.
+ *
+ * Auto preference order is **Relay first, then Standard**: a paired Relay is
+ * the purpose-built mobile facade — profile-aware voice config, no dashboard
+ * sign-in dependency — so users who installed the plugin keep the richer
+ * path. Standard is the zero-plugin route for vanilla Hermes installs and is
+ * used whenever Relay isn't configured/paired (or fails mid-call). Power
+ * users can force either route in Voice Settings.
+ *
+ * Depends only on the [VoiceAudioClient] abstraction (both backends are passed
+ * in as the interface), so this router carries no upstream or relay imports.
+ */
+class AutoVoiceAudioClient(
+    private val standardClient: VoiceAudioClient,
+    private val relayClient: VoiceAudioClient,
+    private val routeProvider: () -> VoiceAudioRoute,
+    private val standardReadyProvider: () -> Boolean,
+    private val relayReadyProvider: () -> Boolean,
+) : VoiceAudioClient {
+    override val route: VoiceAudioRoute
+        get() = routeProvider()
+
+    override suspend fun transcribe(audioFile: File): Result<String> =
+        runWithSelectedRoute { it.transcribe(audioFile) }
+
+    override suspend fun synthesize(text: String): Result<File> =
+        runWithSelectedRoute { it.synthesize(text) }
+
+    private suspend fun <T> runWithSelectedRoute(
+        block: suspend (VoiceAudioClient) -> Result<T>,
+    ): Result<T> {
+        return when (routeProvider()) {
+            VoiceAudioRoute.Standard -> {
+                if (!standardReadyProvider()) {
+                    Result.failure(
+                        IllegalStateException(
+                            "Standard Hermes voice is not available — check dashboard sign-in in Manage",
+                        ),
+                    )
+                } else {
+                    block(standardClient)
+                }
+            }
+            VoiceAudioRoute.Relay -> {
+                if (!relayReadyProvider()) {
+                    Result.failure(IllegalStateException("Relay voice is not available"))
+                } else {
+                    block(relayClient)
+                }
+            }
+            VoiceAudioRoute.Auto -> runAuto(block)
+        }
+    }
+
+    private suspend fun <T> runAuto(
+        block: suspend (VoiceAudioClient) -> Result<T>,
+    ): Result<T> {
+        var relayFailure: Result<T>? = null
+        if (relayReadyProvider()) {
+            val result = block(relayClient)
+            if (result.isSuccess || !standardReadyProvider()) return result
+            relayFailure = result
+        }
+        if (standardReadyProvider()) {
+            val result = block(standardClient)
+            if (result.isSuccess) return result
+            return relayFailure ?: result
+        }
+        return relayFailure ?: Result.failure(
+            IllegalStateException("Voice needs a reachable Hermes dashboard or Relay voice route"),
+        )
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network.handlers
+package com.hermesandroid.relay.network.upstream
 
 import android.util.Log
 import com.hermesandroid.relay.data.ChatMessage
@@ -8,9 +8,10 @@ import com.hermesandroid.relay.data.MessageRole
 import com.hermesandroid.relay.data.RealtimeTurnTrace
 import com.hermesandroid.relay.data.ToolCall
 import com.hermesandroid.relay.data.VoiceIntentTrace
-import com.hermesandroid.relay.network.GatewaySubagentEvent
-import com.hermesandroid.relay.network.models.MessageItem
-import com.hermesandroid.relay.network.models.SessionItem
+import com.hermesandroid.relay.network.shared.LocalDispatchResult
+import com.hermesandroid.relay.network.upstream.GatewaySubagentEvent
+import com.hermesandroid.relay.network.upstream.models.MessageItem
+import com.hermesandroid.relay.network.upstream.models.SessionItem
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -36,6 +37,14 @@ class ChatHandler {
         /** Maximum number of messages kept in memory per session. Oldest are trimmed. */
         internal const val MAX_MESSAGES = 500
 
+        private fun timestampToMillis(timestamp: Double?): Long {
+            val value = timestamp ?: return 0L
+            return if (value > 1e12) value.toLong() else (value * 1000).toLong()
+        }
+
+        private fun firstPositive(vararg values: Long): Long =
+            values.firstOrNull { it > 0L } ?: 0L
+
         // Tool annotation patterns embedded as text markers by Hermes.
         //
         // Hermes /v1/chat/completions injects tool progress as inline markdown:
@@ -181,6 +190,18 @@ class ChatHandler {
     private val _messages = MutableStateFlow<List<ChatMessage>>(emptyList())
     val messages: StateFlow<List<ChatMessage>> = _messages.asStateFlow()
 
+    /**
+     * Latest gateway `status.update` lifecycle line for the in-flight turn
+     * (model fallback, retries, errors). Surfaced as a transient status line
+     * above the composer; cleared when the turn completes.
+     */
+    private val _turnStatus = MutableStateFlow<String?>(null)
+    val turnStatus: StateFlow<String?> = _turnStatus.asStateFlow()
+
+    fun setTurnStatus(text: String) {
+        _turnStatus.value = text
+    }
+
     private val _isStreaming = MutableStateFlow(false)
     val isStreaming: StateFlow<Boolean> = _isStreaming.asStateFlow()
 
@@ -738,6 +759,17 @@ class ChatHandler {
         // mutateMessage lookups find the newly-loaded messages.
         val pendingMediaHits = mutableListOf<Pair<String, MediaMarkerHit>>()
 
+        // Preserve provenance badges ("Voice", "Realtime Agent", "Stopped",
+        // "Error") across a wholesale reload. The messages reconstructed below
+        // come from server data and carry no badges, so without this the
+        // post-turn history reload would silently wipe them. Keyed by message
+        // id — the live assistant message has already had its id swapped to the
+        // server id via replaceMessageId, so it matches the reloaded item id.
+        val priorBadges = _messages.value
+            .asSequence()
+            .filter { it.role == MessageRole.ASSISTANT && it.badges.isNotEmpty() }
+            .associate { it.id to it.badges }
+
         val loaded = items.mapNotNull { item ->
             val role = when (item.role) {
                 "user" -> MessageRole.USER
@@ -797,6 +829,11 @@ class ChatHandler {
                 } else {
                     ""
                 },
+                badges = if (role == MessageRole.ASSISTANT) {
+                    priorBadges[messageId].orEmpty()
+                } else {
+                    emptyList()
+                },
             )
         }
 
@@ -825,7 +862,12 @@ class ChatHandler {
         val preservedVoiceTraces = _messages.value.filter {
             it.id.startsWith("voice-intent-") ||
                 it.id.startsWith("steer-") ||
-                it.id.startsWith("ask-")
+                it.id.startsWith("ask-") ||
+                // Slash-command result bubbles (addSystemNotice) are local-only —
+                // the server never persists them, so a wholesale reload would wipe
+                // a just-shown `/personality`, `/status`, … result the moment the
+                // next turn reconciles. Preserve them like the other client bubbles.
+                it.id.startsWith("system-notice-")
         }
         val merged = if (preservedVoiceTraces.isEmpty()) {
             loaded
@@ -1003,17 +1045,19 @@ class ChatHandler {
      */
     fun updateSessions(items: List<SessionItem>) {
         val mapped = items.map { item ->
-            // If > 1e12, already in milliseconds; otherwise convert from seconds
-            val ts = item.startedAt ?: 0.0
-            val timestampMs = if (ts > 1e12) ts.toLong() else (ts * 1000).toLong()
+            val startedAtMs = timestampToMillis(item.startedAt)
+            val lastActivityAtMs = timestampToMillis(item.resolvedLastActivity)
+            val activityAtMs = firstPositive(lastActivityAtMs, startedAtMs)
             ChatSession(
                 sessionId = item.id,
                 title = item.title,
                 model = item.model,
                 messageCount = item.messageCount ?: 0,
-                updatedAt = timestampMs
+                updatedAt = activityAtMs,
+                startedAt = startedAtMs,
+                lastActivityAt = lastActivityAtMs,
             )
-        }
+        }.sortedByDescending { it.activityTimestamp }
         // Preserve the active session's optimistic row when the server list
         // doesn't include it yet: a freshly created chat has 0 messages and the
         // drawer's `min_messages=1` query filters it out until its first turn
@@ -2073,12 +2117,47 @@ class ChatHandler {
         // Note: do NOT set _isStreaming to false — the run is still active
     }
 
+    /**
+     * Stamp a "Stopped" badge on a message whose turn the user cancelled, so
+     * the bubble carries a persistent status (not just a transient toast).
+     * No-op if already present. Call before [onStreamComplete] on cancel.
+     */
+    fun markStopped(messageId: String) {
+        _messages.update { messages ->
+            messages.map { msg ->
+                if (msg.id == messageId && "Stopped" !in msg.badges) {
+                    msg.copy(badges = msg.badges + "Stopped")
+                } else {
+                    msg
+                }
+            }
+        }
+    }
+
+    /**
+     * Stamp an "Error" badge on a message whose turn ended in a server error
+     * (e.g. a gateway ❌ lifecycle status), so a failed turn doesn't read as a
+     * normal answer. No-op if already present.
+     */
+    fun markError(messageId: String) {
+        _messages.update { messages ->
+            messages.map { msg ->
+                if (msg.id == messageId && "Error" !in msg.badges) {
+                    msg.copy(badges = msg.badges + "Error")
+                } else {
+                    msg
+                }
+            }
+        }
+    }
+
     /**
      * The entire agent run is complete (run.completed / done).
      * Marks the stream as finished and finalizes all messages.
      */
     fun onStreamComplete(messageId: String) {
         _isStreaming.value = false
+        _turnStatus.value = null
         insideThinkingBlock = false
 
         // Flush any remaining annotation text that didn't end with a newline
@@ -2239,7 +2318,7 @@ class ChatHandler {
  *
  * The label parameter is the short human-readable action name
  * ("Send SMS", "Open App", "Call", etc). Error-code branches mirror the
- * `error_code` strings [com.hermesandroid.relay.network.handlers.BridgeCommandHandler]
+ * `error_code` strings [com.hermesandroid.relay.network.relay.BridgeCommandHandler]
  * emits on destructive-verb rejections.
  */
 internal fun formatPhoneActionResult(

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

@@ -1,11 +1,11 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.upstream
 
 import android.content.Context
 import com.hermesandroid.relay.data.Profile
-import com.hermesandroid.relay.network.models.MessageItem
-import com.hermesandroid.relay.network.models.MessageListResponse
-import com.hermesandroid.relay.network.models.SessionItem
-import com.hermesandroid.relay.network.models.SessionListResponse
+import com.hermesandroid.relay.network.upstream.models.MessageItem
+import com.hermesandroid.relay.network.upstream.models.MessageListResponse
+import com.hermesandroid.relay.network.upstream.models.SessionItem
+import com.hermesandroid.relay.network.upstream.models.SessionListResponse
 import com.hermesandroid.relay.auth.KeystoreTokenStore
 import com.hermesandroid.relay.auth.LegacyEncryptedPrefsTokenStore
 import com.hermesandroid.relay.auth.SessionTokenStore
@@ -76,6 +76,11 @@ data class DashboardWsTicket(
     val ttlSeconds: Int? = null,
 )
 
+data class DashboardChatDisplaySettings(
+    val showReasoning: Boolean? = null,
+    val toolDisplay: String? = null,
+)
+
 /**
  * Native client for the Hermes dashboard/admin server (:9119).
  *
@@ -167,6 +172,9 @@ class DashboardApiClient(
 
     // --- Models (dashboard parity with hermes-desktop Settings → Model) ---
 
+    suspend fun getChatDisplaySettings(): Result<DashboardChatDisplaySettings> =
+        getJsonObject("/api/config").mapCatching { root -> parseChatDisplaySettings(root) }
+
     /** Full provider/model universe — REST twin of the TUI's `model.options` RPC. */
     suspend fun getModelOptions(): Result<JsonObject> = getJsonObject("/api/model/options")
 
@@ -401,9 +409,11 @@ class DashboardApiClient(
      * [profile] null/blank → the launch (default) profile's DB (param omitted). The
      * returned ids are the same stored-session ids the gateway `session.resume`
      * reads, so list-here / resume-on-gateway stays consistent. `min_messages=1`
-     * drops empty draft rows; `order=recent` keeps live conversations on top.
+     * drops empty draft rows where supported; `order=recent` requests activity
+     * ordering where the host honors it. Android still sorts by decoded
+     * `last_active` locally because older hosts return started-time order.
      */
-    suspend fun listSessions(profile: String? = null, limit: Int = 50): Result<List<SessionItem>> =
+    suspend fun listSessions(profile: String? = null, limit: Int = 200): Result<List<SessionItem>> =
         withContext(Dispatchers.IO) {
             val query = buildList {
                 add("limit=${limit.coerceIn(1, 200)}")
@@ -510,15 +520,23 @@ class DashboardApiClient(
      * an auth-gated 401/403 also proves the route is registered.
      */
     suspend fun audioRoutesPresent(): Boolean = withContext(Dispatchers.IO) {
-        val request = Request.Builder()
-            .url("$baseUrl/api/audio/transcribe")
-            .head()
-            .build()
-        try {
-            okHttpClient.newCall(request).execute().use { it.code != 404 }
-        } catch (_: Exception) {
-            false
+        // Route exists if HEAD returns anything but a clean 404:
+        //  - 405 Method Not Allowed: path registered, POST-only (FastAPI/Starlette)
+        //  - 401/403: registered but auth-gated
+        //  - 2xx: handled
+        // A reverse proxy fronting the dashboard can rewrite a 405 into a 404,
+        // which would read as absent. To cut that false-negative, probe BOTH
+        // audio routes and treat the surface as present if EITHER answers
+        // non-404 (they ship together upstream, so one reachable implies both).
+        fun probe(path: String): Boolean {
+            val request = Request.Builder().url("$baseUrl$path").head().build()
+            return try {
+                okHttpClient.newCall(request).execute().use { it.code != 404 }
+            } catch (_: Exception) {
+                false
+            }
         }
+        probe("/api/audio/transcribe") || probe("/api/audio/speak")
     }
 
     suspend fun requestWsTicket(): Result<DashboardWsTicket> = withContext(Dispatchers.IO) {
@@ -745,6 +763,28 @@ class DashboardApiClient(
         private fun isPasswordProvider(name: String): Boolean =
             name.equals("basic", ignoreCase = true) ||
                 name.equals("password", ignoreCase = true)
+
+        fun parseChatDisplaySettings(root: JsonObject): DashboardChatDisplaySettings {
+            val config = root["config"] as? JsonObject
+            val display = (config?.get("display") as? JsonObject)
+                ?: (root["display"] as? JsonObject)
+            return DashboardChatDisplaySettings(
+                showReasoning = display.booleanField("show_reasoning"),
+                toolDisplay = normalizeToolDisplay(
+                    display.stringField("tool_progress")
+                        ?: display.stringField("tool_display")
+                        ?: display.stringField("toolProgress"),
+                ),
+            )
+        }
+
+        private fun normalizeToolDisplay(value: String?): String? =
+            when (value?.trim()?.lowercase()) {
+                "off", "none", "false", "0", "hidden", "hide" -> "off"
+                "compact", "minimal", "summary", "brief" -> "compact"
+                "all", "detailed", "detail", "full", "true", "1", "on", "show" -> "detailed"
+                else -> null
+            }
     }
 }
 

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

@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.upstream
 
 import android.util.Log
 import com.hermesandroid.relay.util.AppForegroundTracker
@@ -188,6 +188,68 @@ class GatewayChatClient(
     private val _connectionState = MutableStateFlow(GatewayConnectionState.Idle)
     val connectionState: StateFlow<GatewayConnectionState> = _connectionState.asStateFlow()
 
+    /**
+     * Active personality the gateway is applying, as a config value ("none" when
+     * the overlay is cleared, otherwise the personality name). Tracks the
+     * upstream `display.personality` the way the desktop/TUI do: updated from the
+     * [setPersonality] / [getPersonality] round-trips AND from connection-level
+     * `session.info` events, so a change made via `/personality`, the desktop, or
+     * the TUI reflects in the app. Null until first observed.
+     */
+    private val _serverPersonality = MutableStateFlow<String?>(null)
+    val serverPersonality: StateFlow<String?> = _serverPersonality.asStateFlow()
+
+    /**
+     * Active model / provider the gateway reports for our session, tracked off
+     * `session.info` the same way as [serverPersonality]. Lets a `/model` switch
+     * made on the desktop/TUI (or our own dispatch) reflect in the app's model
+     * pill without an app reload. Null until first observed; only ever set to a
+     * non-blank value.
+     */
+    private val _serverModel = MutableStateFlow<String?>(null)
+    val serverModel: StateFlow<String?> = _serverModel.asStateFlow()
+
+    private val _serverProvider = MutableStateFlow<String?>(null)
+    val serverProvider: StateFlow<String?> = _serverProvider.asStateFlow()
+
+    /**
+     * Active reasoning EFFORT from `session.info` (string; "" when reasoning is
+     * disabled). The reasoning DISPLAY mode is NOT on session.info — it stays a
+     * `config.get reasoning` concern ([getReasoningSettings]). Only ever set to a
+     * non-blank value so a disabled-reasoning "" never clobbers the chip.
+     */
+    private val _serverReasoningEffort = MutableStateFlow<String?>(null)
+    val serverReasoningEffort: StateFlow<String?> = _serverReasoningEffort.asStateFlow()
+
+    /**
+     * Server-reported credential warning (upstream `session.info.credential_warning`)
+     * — present ONLY when the active provider's key is missing/invalid, absent
+     * (→ null here) when healthy. Cleared on absence so it self-resolves when the
+     * key is fixed.
+     */
+    private val _serverCredentialWarning = MutableStateFlow<String?>(null)
+    val serverCredentialWarning: StateFlow<String?> = _serverCredentialWarning.asStateFlow()
+
+    /**
+     * Effective approval-bypass (YOLO) + fast-mode state from `session.info`
+     * (`yolo`/`fast` booleans). YOLO has NO `config.get` upstream — session.info
+     * is the only read. Null until first observed.
+     */
+    private val _serverYolo = MutableStateFlow<Boolean?>(null)
+    val serverYolo: StateFlow<Boolean?> = _serverYolo.asStateFlow()
+
+    private val _serverFast = MutableStateFlow<Boolean?>(null)
+    val serverFast: StateFlow<Boolean?> = _serverFast.asStateFlow()
+
+    /**
+     * Context-window usage `(used, max)` from `session.info`'s `usage` block
+     * (upstream `_get_usage`). `session.info` is emitted on session resume, so
+     * this lets the context bar paint immediately on resume instead of waiting
+     * for the first turn's usage event. Null until observed / when omitted.
+     */
+    private val _serverContext = MutableStateFlow<Pair<Int, Int>?>(null)
+    val serverContext: StateFlow<Pair<Int, Int>?> = _serverContext.asStateFlow()
+
     /** Serializes connect / session-establish so concurrent sends share one socket. */
     private val connectMutex = Mutex()
 
@@ -223,6 +285,21 @@ class GatewayChatClient(
     private fun currentSessionProfile(): String? =
         sessionProfileProvider().takeIf { !it.isNullOrBlank() }
 
+    /**
+     * Supplies the explicit in-chat model pick to bind onto each fresh
+     * `session.create` (upstream honors `model`/`provider` → the new session's
+     * `model_override`). Pulled live so it always reflects the current picker;
+     * null = no explicit pick, so the new session inherits the profile / server
+     * default. Wired by ChatViewModel from the selected-model override. A live
+     * session keeps its agent's model, so this only affects session creation —
+     * mid-session switches go through [setModel] (`config.set`).
+     */
+    @Volatile
+    var sessionModelProvider: () -> GatewaySessionModel? = { null }
+
+    private fun currentSessionModel(): GatewaySessionModel? =
+        sessionModelProvider()?.takeIf { it.model.isNotBlank() }
+
     @Volatile
     private var activeTurn: GatewayTurn? = null
 
@@ -565,6 +642,57 @@ class GatewayChatClient(
             },
         )
 
+    /**
+     * Read the active personality (`config.get {key:"personality"}`). Returns the
+     * upstream config value — `"none"` when the overlay is cleared, otherwise the
+     * personality name. Connects on demand. Used to seed [serverPersonality] when
+     * a gateway connection comes up so the app reflects whatever the server
+     * (config / desktop / TUI) currently has active.
+     */
+    suspend fun getPersonality(): Result<String> {
+        if (webSocket == null || readySignal?.isCompleted != true) {
+            try {
+                connectMutex.withLock { ensureConnected() }
+            } catch (e: Exception) {
+                return Result.failure(e)
+            }
+        }
+        return rpc("config.get", buildJsonObject { put("key", "personality") })
+            .map { result ->
+                (result.stringField("value") ?: "none").ifBlank { "none" }
+                    .also { _serverPersonality.value = it }
+            }
+    }
+
+    /**
+     * Set the personality the way the desktop + TUI do (`config.set
+     * {key:"personality"}`). The gateway persists `display.personality` +
+     * `agent.system_prompt` to the active profile's config AND applies the
+     * overlay live to the current session (no history reset). Pass `"none"`
+     * (or `"default"`/`"neutral"`) to clear the overlay. Returns the resolved
+     * active value (`"none"` or the name); also updates [serverPersonality]
+     * directly so observers don't have to wait on the `session.info` echo (which
+     * only fires when a live session exists).
+     */
+    suspend fun setPersonality(value: String): Result<String> {
+        if (webSocket == null || readySignal?.isCompleted != true) {
+            try {
+                connectMutex.withLock { ensureConnected() }
+            } catch (e: Exception) {
+                return Result.failure(e)
+            }
+        }
+        val params = buildJsonObject {
+            put("key", "personality")
+            put("value", value)
+            liveSessionId?.let { put("session_id", it) }
+        }
+        return rpc("config.set", params).map { result ->
+            (result.stringField("value") ?: value).ifBlank { "none" }
+                .also { _serverPersonality.value = it }
+        }
+    }
+
     /**
      * Fetch the curated provider/model list (`model.options`) — the same RPC
      * the upstream desktop + TUI model picker uses (grok / kimi / gpt-5.5 …,
@@ -592,6 +720,11 @@ class GatewayChatClient(
                         .mapNotNull { (it as? JsonPrimitive)?.contentOrNull },
                     isCurrent = (obj["is_current"] as? JsonPrimitive)?.booleanOrNull ?: false,
                     warning = obj.stringField("warning"),
+                    authenticated = (obj["authenticated"] as? JsonPrimitive)?.booleanOrNull ?: true,
+                    unavailableModels = (obj["unavailable_models"] as? JsonArray).orEmpty()
+                        .mapNotNull { (it as? JsonPrimitive)?.contentOrNull },
+                    freeTier = (obj["free_tier"] as? JsonPrimitive)?.booleanOrNull ?: false,
+                    totalModels = (obj["total_models"] as? JsonPrimitive)?.contentOrNull?.toIntOrNull() ?: 0,
                 )
             }
             GatewayModelOptions(
@@ -621,6 +754,96 @@ class GatewayChatClient(
             },
         )
 
+    /** Fetch the session/global reasoning effort and display mode. */
+    suspend fun getReasoningSettings(): Result<GatewayReasoningSettings> {
+        if (webSocket == null || readySignal?.isCompleted != true) {
+            try {
+                connectMutex.withLock { ensureConnected() }
+            } catch (e: Exception) {
+                return Result.failure(e)
+            }
+        }
+        return rpc(
+            "config.get",
+            buildJsonObject {
+                put("key", "reasoning")
+                liveSessionId?.let { put("session_id", it) }
+            },
+        ).map { result ->
+            GatewayReasoningSettings(
+                effort = result.stringField("value")?.takeIf { it.isNotBlank() } ?: "medium",
+                display = result.stringField("display")?.takeIf { it.isNotBlank() },
+            )
+        }
+    }
+
+    /**
+     * Switch the active reasoning effort through the same `config.set` path
+     * the desktop/TUI `/reasoning` command uses. Values are upstream-defined:
+     * none, minimal, low, medium, high, xhigh.
+     */
+    suspend fun setReasoning(value: String): Result<JsonObject> =
+        rpc(
+            "config.set",
+            buildJsonObject {
+                put("key", "reasoning")
+                put("value", value)
+                liveSessionId?.let { put("session_id", it) }
+            },
+        )
+
+    /**
+     * Toggle per-session approval bypass (YOLO) via `config.set {key:"yolo"}` —
+     * the same session-scoped flag the desktop's setSessionYolo and the TUI's
+     * Shift+Tab use (`value` "1"/"0", `scope` "session" = ephemeral, never writes
+     * config.yaml). Requires a live session for the per-session flag. Updates
+     * [serverYolo] from the echo so observers don't wait on `session.info`.
+     * Returns the resolved enabled state. There is deliberately NO `getYolo()` —
+     * upstream has no `config.get yolo`; session.info is the only read.
+     */
+    suspend fun setYolo(enabled: Boolean, scope: String = "session"): Result<Boolean> {
+        if (webSocket == null || readySignal?.isCompleted != true) {
+            try {
+                connectMutex.withLock { ensureConnected() }
+            } catch (e: Exception) {
+                return Result.failure(e)
+            }
+        }
+        val params = buildJsonObject {
+            put("key", "yolo")
+            put("value", if (enabled) "1" else "0")
+            put("scope", scope)
+            liveSessionId?.let { put("session_id", it) }
+        }
+        return rpc("config.set", params).map { result ->
+            (result.stringField("value") == "1").also { _serverYolo.value = it }
+        }
+    }
+
+    /**
+     * Toggle fast mode (priority service tier) via `config.set {key:"fast"}` —
+     * desktop parity (`value` "fast"/"normal", session-scoped). Capability-gated
+     * upstream: enabling fails (error 4002) when the current model has no fast
+     * tier. Updates [serverFast]; returns the resolved enabled state.
+     */
+    suspend fun setFast(enabled: Boolean): Result<Boolean> {
+        if (webSocket == null || readySignal?.isCompleted != true) {
+            try {
+                connectMutex.withLock { ensureConnected() }
+            } catch (e: Exception) {
+                return Result.failure(e)
+            }
+        }
+        val params = buildJsonObject {
+            put("key", "fast")
+            put("value", if (enabled) "fast" else "normal")
+            liveSessionId?.let { put("session_id", it) }
+        }
+        return rpc("config.set", params).map { result ->
+            (result.stringField("value") == "fast").also { _serverFast.value = it }
+        }
+    }
+
     fun shutdown() {
         activeTurn?.cancel()
         activeTurn = null
@@ -764,6 +987,17 @@ class GatewayChatClient(
                 put("cols", DEFAULT_COLS)
                 if (!newSessionTitle.isNullOrBlank()) put("title", newSessionTitle)
                 currentSessionProfile()?.let { put("profile", it) }
+                // Bind the in-chat model pick to the new session as its
+                // model_override. Upstream tui_gateway session.create reads
+                // `model`/`provider`; without this a fresh chat ignores the
+                // picker and builds the agent from the global default (the
+                // "picker shows Grok but the agent answers as the default
+                // model" bug). A live session keeps its own model — this is
+                // create-only; mid-session switches use config.set (setModel).
+                currentSessionModel()?.let { sm ->
+                    put("model", sm.model)
+                    sm.provider?.takeIf { it.isNotBlank() }?.let { put("provider", it) }
+                }
             },
         ).getOrElse { e ->
             throw GatewayPreflightException("session.create failed: ${e.message}")
@@ -864,6 +1098,50 @@ class GatewayChatClient(
             return
         }
 
+        // `session.info` is connection-level (personality / model / context
+        // usage), emitted on a config change even with no turn in flight. Capture
+        // the active personality here — for our own session only — so a
+        // `/personality`, desktop, or TUI change keeps the app in sync. Falls
+        // through to the turn dispatch below so an in-flight turn still sees it.
+        if (type == "session.info" &&
+            (eventSessionId == null || liveSessionId == null || eventSessionId == liveSessionId)
+        ) {
+            payload?.let { p ->
+                if (p.containsKey("personality")) {
+                    _serverPersonality.value =
+                        (p.stringField("personality") ?: "").ifBlank { "none" }
+                }
+                p.stringField("model")?.takeIf { it.isNotBlank() }?.let { _serverModel.value = it }
+                p.stringField("provider")?.takeIf { it.isNotBlank() }?.let { _serverProvider.value = it }
+                // reasoning effort: ignore "" (reasoning disabled) so it can't
+                // clobber the chip; display mode is config.get-only, not here.
+                p.stringField("reasoning_effort")?.takeIf { it.isNotBlank() }
+                    ?.let { _serverReasoningEffort.value = it }
+                // credential_warning: present only when the provider key is
+                // missing/invalid. ABSENT means healthy — clear to null so the
+                // warning self-resolves (no ?.let, assign through takeIf).
+                _serverCredentialWarning.value =
+                    p.stringField("credential_warning")?.takeIf { it.isNotBlank() }
+                // yolo / fast: effective booleans (approval bypass + priority tier).
+                (p["yolo"] as? JsonPrimitive)?.booleanOrNull?.let { _serverYolo.value = it }
+                (p["fast"] as? JsonPrimitive)?.booleanOrNull?.let { _serverFast.value = it }
+                // Context-window usage. Require used > 0: on a COLD resume the
+                // agent's token counters + compressor are reset, so _get_usage
+                // reports context_used=0 until the first turn rebuilds the
+                // prompt. Painting that 0 would show a misleading "0%" on a
+                // session that actually has history — so we only adopt a real,
+                // non-zero figure (warm resume, or post-turn echo). Cold resumes
+                // fill on the first exchange via the usage callback.
+                (p["usage"] as? JsonObject)?.let { usage ->
+                    val used = (usage["context_used"] as? JsonPrimitive)?.intOrNull
+                    val max = (usage["context_max"] as? JsonPrimitive)?.intOrNull
+                    if (used != null && used > 0 && max != null && max > 0) {
+                        _serverContext.value = used to max
+                    }
+                }
+            }
+        }
+
         val turn = activeTurn ?: return
         // Foreign-session events (another client's chat on the same gateway) are not ours.
         if (eventSessionId != null && liveSessionId != null && eventSessionId != liveSessionId) {

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

@@ -1,6 +1,6 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.upstream
 
-import com.hermesandroid.relay.network.models.UsageInfo
+import com.hermesandroid.relay.network.upstream.models.UsageInfo
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
@@ -217,8 +217,15 @@ class GatewayEventMapper(private val callbacks: GatewayTurnCallbacks) {
                 ),
             )
 
-            // Known-but-unrendered (notification.show, status.update, …) and
-            // unknown types alike: ignore.
+            "status.update" -> {
+                val text = payload.string("text")
+                if (!text.isNullOrBlank()) {
+                    callbacks.onStatusUpdate(payload.string("kind"), text)
+                }
+            }
+
+            // Known-but-unrendered (notification.show, …) and unknown types
+            // alike: ignore.
             else -> Unit
         }
     }

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

@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.upstream
 
 import android.annotation.SuppressLint
 import android.app.NotificationChannel

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

@@ -1,6 +1,6 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.upstream
 
-import com.hermesandroid.relay.network.models.UsageInfo
+import com.hermesandroid.relay.network.upstream.models.UsageInfo
 
 /**
  * Shared types for the Gateway chat transport — upstream hermes-agent's
@@ -146,6 +146,14 @@ data class GatewayModelProvider(
     val models: List<String>,
     val isCurrent: Boolean,
     val warning: String?,
+    // Picker hints from upstream `model.options` (build_models_payload,
+    // picker_hints=True). Default to "usable" so older servers that omit them
+    // don't gray everything out.
+    val authenticated: Boolean = true,
+    /** Paid models the current account can't pick (free-tier / no credits). */
+    val unavailableModels: List<String> = emptyList(),
+    val freeTier: Boolean = false,
+    val totalModels: Int = 0,
 )
 
 /** Result of the gateway `model.options` RPC. */
@@ -155,6 +163,23 @@ data class GatewayModelOptions(
     val currentProvider: String,
 )
 
+/**
+ * The explicit in-chat model pick to bind onto a gateway `session.create` as
+ * that session's `model_override`. Matches the upstream desktop client, whose
+ * `session.create` carries `model`/`provider` params (tui_gateway honors them →
+ * `session_model_override`). Supplied live by ChatViewModel from the picker;
+ * null = no explicit pick, so the fresh session inherits the profile / server
+ * default instead of the picker being silently dropped. [provider] is the
+ * authenticated provider slug (e.g. `xai`) and may be null.
+ */
+data class GatewaySessionModel(val model: String, val provider: String?)
+
+/** Result of the gateway `config.get {key:"reasoning"}` RPC. */
+data class GatewayReasoningSettings(
+    val effort: String,
+    val display: String?,
+)
+
 /**
  * Callback set for one gateway turn. Shapes intentionally mirror the SSE
  * callback lambdas in ChatViewModel.startStream() so the gateway branch can
@@ -190,4 +215,10 @@ class GatewayTurnCallbacks(
      * cancelled.
      */
     val onInteractionRequest: (GatewayAsk) -> Unit,
+    /**
+     * Gateway `status.update` lifecycle line — model fallback, retries, and
+     * errors (often emoji-prefixed: 🔄 fallback, ⏳ retry, ❌ error). Default
+     * no-op so non-gateway/legacy constructors don't need to provide it.
+     */
+    val onStatusUpdate: (kind: String?, text: String) -> Unit = { _, _ -> },
 )

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

@@ -1,21 +1,21 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.upstream
 
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
 import com.hermesandroid.relay.data.AgentDisplay
 import com.hermesandroid.relay.data.AppAnalytics
-import com.hermesandroid.relay.network.models.CreateSessionRequest
-import com.hermesandroid.relay.network.models.HermesSseEvent
-import com.hermesandroid.relay.network.models.MessageItem
-import com.hermesandroid.relay.network.models.MessageListResponse
-import com.hermesandroid.relay.network.models.RenameSessionRequest
-import com.hermesandroid.relay.network.models.SessionItem
-import com.hermesandroid.relay.network.models.SessionListResponse
-import com.hermesandroid.relay.network.models.SessionResponse
-import com.hermesandroid.relay.network.models.SkillInfo
-import com.hermesandroid.relay.network.models.SkillListResponse
-import com.hermesandroid.relay.network.models.UsageInfo
+import com.hermesandroid.relay.network.upstream.models.CreateSessionRequest
+import com.hermesandroid.relay.network.upstream.models.HermesSseEvent
+import com.hermesandroid.relay.network.upstream.models.MessageItem
+import com.hermesandroid.relay.network.upstream.models.MessageListResponse
+import com.hermesandroid.relay.network.upstream.models.RenameSessionRequest
+import com.hermesandroid.relay.network.upstream.models.SessionItem
+import com.hermesandroid.relay.network.upstream.models.SessionListResponse
+import com.hermesandroid.relay.network.upstream.models.SessionResponse
+import com.hermesandroid.relay.network.upstream.models.SkillInfo
+import com.hermesandroid.relay.network.upstream.models.SkillListResponse
+import com.hermesandroid.relay.network.upstream.models.UsageInfo
 import com.hermesandroid.relay.util.TurnLatencyTracer
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -288,7 +288,7 @@ class HermesApiClient(
 
     // --- Session CRUD ---
 
-    suspend fun listSessionsResult(limit: Int = 50): Result<List<SessionItem>> = withContext(Dispatchers.IO) {
+    suspend fun listSessionsResult(limit: Int = 200): Result<List<SessionItem>> = withContext(Dispatchers.IO) {
         try {
             val request = authRequest("$baseUrl/api/sessions?limit=$limit").get().build()
             client.newCall(request).execute().use { response ->
@@ -308,7 +308,7 @@ class HermesApiClient(
         }
     }
 
-    suspend fun listSessions(limit: Int = 50): List<SessionItem> =
+    suspend fun listSessions(limit: Int = 200): List<SessionItem> =
         listSessionsResult(limit).getOrElse { emptyList() }
 
     suspend fun createSessionResult(

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

@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.upstream
 
 import com.hermesandroid.relay.data.AgentDisplay
 import com.hermesandroid.relay.data.Attachment

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

@@ -1,10 +1,10 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.upstream
 
 import android.content.Context
 import com.hermesandroid.relay.data.VoiceAudioRoute
+import com.hermesandroid.relay.network.shared.VoiceAudioClient
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
@@ -21,102 +21,12 @@ import java.io.IOException
 import java.util.Base64
 import java.util.concurrent.TimeUnit
 
-interface VoiceAudioClient {
-    val route: VoiceAudioRoute
-    suspend fun transcribe(audioFile: File): Result<String>
-    suspend fun synthesize(text: String): Result<File>
-}
-
-class RelayVoiceAudioClientAdapter(
-    private val relayVoiceClient: RelayVoiceClient,
-) : VoiceAudioClient {
-    override val route: VoiceAudioRoute = VoiceAudioRoute.Relay
-
-    override suspend fun transcribe(audioFile: File): Result<String> =
-        relayVoiceClient.transcribe(audioFile)
-
-    override suspend fun synthesize(text: String): Result<File> =
-        relayVoiceClient.synthesize(text)
-}
-
-/**
- * Routes each STT/TTS call to the Standard (dashboard) or Relay voice client.
- *
- * Auto preference order is **Relay first, then Standard**: a paired Relay is
- * the purpose-built mobile facade — profile-aware voice config, no dashboard
- * sign-in dependency — so users who installed the plugin keep the richer
- * path. Standard is the zero-plugin route for vanilla Hermes installs and is
- * used whenever Relay isn't configured/paired (or fails mid-call). Power
- * users can force either route in Voice Settings.
- */
-class AutoVoiceAudioClient(
-    private val standardClient: VoiceAudioClient,
-    private val relayClient: VoiceAudioClient,
-    private val routeProvider: () -> VoiceAudioRoute,
-    private val standardReadyProvider: () -> Boolean,
-    private val relayReadyProvider: () -> Boolean,
-) : VoiceAudioClient {
-    override val route: VoiceAudioRoute
-        get() = routeProvider()
-
-    override suspend fun transcribe(audioFile: File): Result<String> =
-        runWithSelectedRoute { it.transcribe(audioFile) }
-
-    override suspend fun synthesize(text: String): Result<File> =
-        runWithSelectedRoute { it.synthesize(text) }
-
-    private suspend fun <T> runWithSelectedRoute(
-        block: suspend (VoiceAudioClient) -> Result<T>,
-    ): Result<T> {
-        return when (routeProvider()) {
-            VoiceAudioRoute.Standard -> {
-                if (!standardReadyProvider()) {
-                    Result.failure(
-                        IllegalStateException(
-                            "Standard Hermes voice is not available — check dashboard sign-in in Manage",
-                        ),
-                    )
-                } else {
-                    block(standardClient)
-                }
-            }
-            VoiceAudioRoute.Relay -> {
-                if (!relayReadyProvider()) {
-                    Result.failure(IllegalStateException("Relay voice is not available"))
-                } else {
-                    block(relayClient)
-                }
-            }
-            VoiceAudioRoute.Auto -> runAuto(block)
-        }
-    }
-
-    private suspend fun <T> runAuto(
-        block: suspend (VoiceAudioClient) -> Result<T>,
-    ): Result<T> {
-        var relayFailure: Result<T>? = null
-        if (relayReadyProvider()) {
-            val result = block(relayClient)
-            if (result.isSuccess || !standardReadyProvider()) return result
-            relayFailure = result
-        }
-        if (standardReadyProvider()) {
-            val result = block(standardClient)
-            if (result.isSuccess) return result
-            return relayFailure ?: result
-        }
-        return relayFailure ?: Result.failure(
-            IllegalStateException("Voice needs a reachable Hermes dashboard or Relay voice route"),
-        )
-    }
-}
-
 /**
  * Standard (no-plugin) voice client — speaks the upstream **dashboard web
  * server** contract that hermes-desktop's voice mode uses:
  *
- *   POST {dashboard}/api/audio/transcribe  {data_url, mime_type} → {ok, transcript}
- *   POST {dashboard}/api/audio/speak       {text}                → {ok, data_url, mime_type}
+ *   POST {dashboard}/api/audio/transcribe  {data_url, mime_type} to {ok, transcript}
+ *   POST {dashboard}/api/audio/speak       {text}                to {ok, data_url, mime_type}
  *
  * These routes live on `hermes_cli/web_server.py` (:9119 by convention), NOT
  * on the API server (:8642) — current upstream api_server advertises
@@ -124,7 +34,7 @@ class AutoVoiceAudioClient(
  * cookie session (gated_auth_middleware), so [okHttpClient] must carry the
  * same per-connection cookie jar the Manage tab signs in with; an API bearer
  * header is meaningless on this surface. Revisit when upstream PR #8199
- * lands the `/v1/audio` routes on the API server (docs/upstream-contributions.md §6).
+ * lands the `/v1/audio` routes on the API server (docs/upstream-contributions.md section 6).
  * (No glob spellings in block comments — Kotlin block comments nest.)
  */
 class StandardHermesVoiceClient(
@@ -150,6 +60,14 @@ class StandardHermesVoiceClient(
         if (!audioFile.exists() || audioFile.length() == 0L) {
             return@withContext Result.failure(IOException("Audio file missing or empty: ${audioFile.name}"))
         }
+        // Upstream caps decoded transcription audio at 25 MB (web_server.py
+        // _MAX_TRANSCRIPTION_UPLOAD_BYTES → HTTP 413). The decoded size equals
+        // the file size, so guard here to avoid a wasted ~33 MB base64 upload.
+        if (audioFile.length() > MAX_TRANSCRIBE_BYTES) {
+            return@withContext Result.failure(
+                IOException("Recording too long for Hermes - try a shorter utterance"),
+            )
+        }
 
         val dataUrl = buildAudioDataUrl(audioFile)
         val payload = buildJsonObject {
@@ -241,8 +159,10 @@ class StandardHermesVoiceClient(
         val body = runCatching { response.body.string() }.getOrDefault("")
         val detail = body.takeIf { it.isNotBlank() } ?: response.message
         val message = when (response.code) {
+            400 -> "$operation rejected that input - ${detail.ifBlank { "bad request" }}"
             401, 403 -> "$operation needs dashboard sign-in - open Manage to sign in"
             404 -> "$operation unavailable on this Hermes build - update hermes-agent or use Relay"
+            413 -> "Recording too long for Hermes - try a shorter utterance"
             in 500..599 -> "$operation failed - server error HTTP ${response.code}"
             else -> "$operation failed - HTTP ${response.code}: $detail"
         }
@@ -292,5 +212,9 @@ class StandardHermesVoiceClient(
 
     private companion object {
         val JSON_MEDIA = "application/json".toMediaType()
+
+        // Matches upstream _MAX_TRANSCRIPTION_UPLOAD_BYTES (web_server.py): the
+        // dashboard rejects decoded transcription audio above 25 MB with 413.
+        const val MAX_TRANSCRIBE_BYTES = 25L * 1024 * 1024
     }
 }

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

@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network.models
+package com.hermesandroid.relay.network.upstream.models
 
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.KSerializer
@@ -16,6 +16,7 @@ import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonPrimitive
+import java.time.Instant
 
 /**
  * Models for the Hermes /api/sessions REST API.
@@ -75,6 +76,43 @@ object FlexibleIdNonNullSerializer : KSerializer<String> {
     }
 }
 
+/** Timestamp serializer for Hermes session metadata.
+ *
+ * Upstream currently returns epoch seconds for `started_at` / `last_active`;
+ * some documented surfaces use ISO strings for update-style fields. Decode
+ * both into epoch seconds so callers can convert once at the UI boundary.
+ */
+@OptIn(ExperimentalSerializationApi::class)
+object FlexibleTimestampSerializer : KSerializer<Double?> {
+    override val descriptor = PrimitiveSerialDescriptor("FlexibleTimestamp", PrimitiveKind.DOUBLE)
+
+    override fun deserialize(decoder: Decoder): Double? {
+        return try {
+            val jsonDecoder = decoder as? JsonDecoder
+                ?: return decoder.decodeDouble()
+            val element = jsonDecoder.decodeJsonElement()
+            when (element) {
+                is JsonNull -> null
+                is JsonPrimitive -> parseTimestamp(element.content)
+                else -> null
+            }
+        } catch (_: Exception) {
+            null
+        }
+    }
+
+    override fun serialize(encoder: Encoder, value: Double?) {
+        if (value != null) encoder.encodeDouble(value) else encoder.encodeNull()
+    }
+
+    private fun parseTimestamp(raw: String): Double? {
+        val trimmed = raw.trim()
+        if (trimmed.isBlank()) return null
+        trimmed.toDoubleOrNull()?.let { return it }
+        return runCatching { Instant.parse(trimmed).toEpochMilli() / 1000.0 }.getOrNull()
+    }
+}
+
 // --- Session CRUD responses ---
 
 @Serializable
@@ -102,13 +140,32 @@ data class SessionItem(
     val title: String? = null,
     val model: String? = null,
     val source: String? = null,
-    @SerialName("started_at") val startedAt: Double? = null,
-    @SerialName("ended_at") val endedAt: Double? = null,
+    @SerialName("started_at")
+    @Serializable(with = FlexibleTimestampSerializer::class)
+    val startedAt: Double? = null,
+    @SerialName("ended_at")
+    @Serializable(with = FlexibleTimestampSerializer::class)
+    val endedAt: Double? = null,
+    @SerialName("last_active")
+    @Serializable(with = FlexibleTimestampSerializer::class)
+    val lastActive: Double? = null,
+    @SerialName("last_activity")
+    @Serializable(with = FlexibleTimestampSerializer::class)
+    val lastActivity: Double? = null,
+    @SerialName("last_activity_at")
+    @Serializable(with = FlexibleTimestampSerializer::class)
+    val lastActivityAt: Double? = null,
+    @SerialName("updated_at")
+    @Serializable(with = FlexibleTimestampSerializer::class)
+    val updatedAt: Double? = null,
     @SerialName("message_count") val messageCount: Int? = null,
     @SerialName("tool_call_count") val toolCallCount: Int? = null,
     @SerialName("input_tokens") val inputTokens: Int? = null,
     @SerialName("output_tokens") val outputTokens: Int? = null
-)
+) {
+    val resolvedLastActivity: Double?
+        get() = lastActive ?: lastActivity ?: lastActivityAt ?: updatedAt
+}
 
 @Serializable
 data class CreateSessionRequest(

app/src/main/kotlin/com/hermesandroid/relay/notifications/HermesNotificationCompanion.kt

@@ -6,8 +6,8 @@ import android.provider.Settings
 import android.service.notification.NotificationListenerService
 import android.service.notification.StatusBarNotification
 import android.util.Log
-import com.hermesandroid.relay.network.ChannelMultiplexer
-import com.hermesandroid.relay.network.models.Envelope
+import com.hermesandroid.relay.network.relay.ChannelMultiplexer
+import com.hermesandroid.relay.network.relay.models.Envelope
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.encodeToJsonElement

app/src/main/kotlin/com/hermesandroid/relay/permissions/AppPermissionStatus.kt

@@ -0,0 +1,86 @@
+package com.hermesandroid.relay.permissions
+
+import android.Manifest
+import android.content.ComponentName
+import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
+import android.provider.Settings
+import androidx.core.content.ContextCompat
+import com.hermesandroid.relay.accessibility.HermesAccessibilityService
+import com.hermesandroid.relay.accessibility.MediaProjectionHolder
+
+/**
+ * One snapshot of Android grants and special-access switches that Hermes-Relay
+ * features can consume. Standard Chat and Manage do not need dangerous runtime
+ * permissions, so they are intentionally not represented as a "required"
+ * Android grant here.
+ */
+data class AppPermissionStatus(
+    val notificationsPermitted: Boolean = false,
+    val microphonePermitted: Boolean = false,
+    val cameraPermitted: Boolean = false,
+    val notificationListenerPermitted: Boolean = false,
+    val accessibilityServiceEnabled: Boolean = false,
+    val screenCapturePermitted: Boolean = false,
+    val overlayPermitted: Boolean = false,
+    val contactsPermitted: Boolean = false,
+    val smsPermitted: Boolean = false,
+    val phonePermitted: Boolean = false,
+    val locationPermitted: Boolean = false,
+)
+
+object AppPermissionStatusProbe {
+    fun snapshot(context: Context): AppPermissionStatus {
+        val appContext = context.applicationContext
+        return AppPermissionStatus(
+            notificationsPermitted = hasPostNotifications(appContext),
+            microphonePermitted = hasPermission(appContext, Manifest.permission.RECORD_AUDIO),
+            cameraPermitted = hasPermission(appContext, Manifest.permission.CAMERA),
+            notificationListenerPermitted = isNotificationListenerEnabled(appContext),
+            accessibilityServiceEnabled = isAccessibilityServiceEnabled(appContext),
+            screenCapturePermitted = MediaProjectionHolder.projection != null,
+            overlayPermitted = Settings.canDrawOverlays(appContext),
+            contactsPermitted = hasPermission(appContext, Manifest.permission.READ_CONTACTS),
+            smsPermitted = hasPermission(appContext, Manifest.permission.SEND_SMS),
+            phonePermitted = hasPermission(appContext, Manifest.permission.CALL_PHONE),
+            locationPermitted = hasPermission(appContext, Manifest.permission.ACCESS_FINE_LOCATION),
+        )
+    }
+
+    private fun hasPostNotifications(context: Context): Boolean {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            hasPermission(context, Manifest.permission.POST_NOTIFICATIONS)
+        } else {
+            true
+        }
+    }
+
+    private fun hasPermission(context: Context, permission: String): Boolean {
+        return ContextCompat.checkSelfPermission(
+            context,
+            permission,
+        ) == PackageManager.PERMISSION_GRANTED
+    }
+
+    private fun isAccessibilityServiceEnabled(context: Context): Boolean {
+        val enabled = Settings.Secure.getString(
+            context.contentResolver,
+            Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
+        ) ?: return false
+        val expected = ComponentName(
+            context.packageName,
+            HermesAccessibilityService::class.java.name,
+        ).flattenToString()
+        return enabled.split(':').any { it.equals(expected, ignoreCase = true) } ||
+            enabled.contains(context.packageName, ignoreCase = true)
+    }
+
+    private fun isNotificationListenerEnabled(context: Context): Boolean {
+        val enabled = Settings.Secure.getString(
+            context.contentResolver,
+            "enabled_notification_listeners",
+        ) ?: return false
+        return enabled.contains(context.packageName, ignoreCase = true)
+    }
+}

app/src/main/kotlin/com/hermesandroid/relay/ui/RelayApp.kt

@@ -43,6 +43,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.rememberCoroutineScope
@@ -66,7 +67,11 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
+import com.hermesandroid.relay.ui.components.LocalAvailableSphereSkins
+import com.hermesandroid.relay.ui.components.LocalSphereSkin
 import com.hermesandroid.relay.ui.components.MorphingSphere
+import com.hermesandroid.relay.ui.components.SphereRegistry
+import com.hermesandroid.relay.ui.components.SphereSkinLoader
 import com.hermesandroid.relay.ui.components.ConnectionStatusToast
 import com.hermesandroid.relay.ui.components.ConnectionSwitcherSheet
 import com.hermesandroid.relay.ui.components.PowerFeatureGateScreen
@@ -81,13 +86,16 @@ import com.hermesandroid.relay.data.AgentDisplay
 import com.hermesandroid.relay.data.BridgePreferencesRepository
 import com.hermesandroid.relay.data.BridgeSafetyPreferencesRepository
 import com.hermesandroid.relay.data.BuildFlavor
+import com.hermesandroid.relay.data.EnhancedVoiceOverrides
 import com.hermesandroid.relay.data.VoiceAudioRoute
 import com.hermesandroid.relay.data.VoicePreferencesRepository
 import com.hermesandroid.relay.data.VoiceSettings
 import com.hermesandroid.relay.data.displayLabel
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import com.hermesandroid.relay.util.HumanError
 import kotlinx.coroutines.delay
 import com.hermesandroid.relay.ui.onboarding.OnboardingScreen
@@ -106,6 +114,7 @@ import com.hermesandroid.relay.ui.screens.DeveloperSettingsScreen
 import com.hermesandroid.relay.ui.screens.MediaSettingsScreen
 import com.hermesandroid.relay.ui.screens.PairedDevicesScreen
 import com.hermesandroid.relay.ui.screens.ConnectionsSettingsScreen
+import com.hermesandroid.relay.ui.screens.PermissionsStatusScreen
 import com.hermesandroid.relay.ui.screens.ProfileInspectorScreen
 import com.hermesandroid.relay.ui.screens.RealtimeVoiceTestScreen
 import com.hermesandroid.relay.ui.screens.SettingsScreen
@@ -113,16 +122,17 @@ import com.hermesandroid.relay.ui.screens.TerminalScreen
 import com.hermesandroid.relay.ui.screens.NotificationCompanionSettingsScreen
 import com.hermesandroid.relay.ui.screens.VoiceSettingsScreen
 import com.hermesandroid.relay.ui.screens.prewarmDashboardManage
+import com.hermesandroid.relay.ui.theme.AppThemes
 import com.hermesandroid.relay.ui.theme.HermesRelayTheme
 import com.hermesandroid.relay.ui.theme.RelayRefresh
 import com.hermesandroid.relay.ui.theme.relayGridTexture
 import com.hermesandroid.relay.diagnostics.DiagnosticCategory
 import com.hermesandroid.relay.diagnostics.DiagnosticSeverity
 import com.hermesandroid.relay.diagnostics.DiagnosticsLog
-import com.hermesandroid.relay.network.RelayProfileInspectorClient
-import com.hermesandroid.relay.network.AutoVoiceAudioClient
-import com.hermesandroid.relay.network.DynamicDashboardCookieJar
-import com.hermesandroid.relay.network.RelayVoiceAudioClientAdapter
+import com.hermesandroid.relay.network.relay.RelayProfileInspectorClient
+import com.hermesandroid.relay.network.shared.AutoVoiceAudioClient
+import com.hermesandroid.relay.network.upstream.DynamicDashboardCookieJar
+import com.hermesandroid.relay.network.relay.RelayVoiceAudioClientAdapter
 import com.hermesandroid.relay.viewmodel.ChatViewModel
 import com.hermesandroid.relay.viewmodel.ConnectionViewModel
 import com.hermesandroid.relay.viewmodel.ProfileInspectorViewModel
@@ -132,8 +142,8 @@ import com.hermesandroid.relay.audio.VoicePlayer
 import com.hermesandroid.relay.audio.VoiceRecorder
 import com.hermesandroid.relay.audio.VoiceSfxPlayer
 import com.hermesandroid.relay.audio.RealtimePcmPlayer
-import com.hermesandroid.relay.network.RelayVoiceClient
-import com.hermesandroid.relay.network.StandardHermesVoiceClient
+import com.hermesandroid.relay.network.relay.RelayVoiceClient
+import com.hermesandroid.relay.network.upstream.StandardHermesVoiceClient
 import com.hermesandroid.relay.auth.AuthState
 import androidx.lifecycle.viewModelScope
 
@@ -233,6 +243,7 @@ sealed class Screen(
     data object NotificationCompanionSettings :
         Screen("settings/notifications", "Notification companion", Icons.Filled.Settings)
     // === END PHASE3-notif-listener-followup ===
+    data object PermissionsSettings : Screen("settings/permissions", "Permissions", Icons.Filled.Settings)
     // === PHASE3-safety-rails: bridge safety route ===
     data object BridgeSafetySettings :
         Screen("settings/bridge_safety", "Bridge safety", Icons.Filled.Settings)
@@ -373,6 +384,8 @@ fun RelayApp() {
     val chatApiClient by connectionViewModel.chatApiClient.collectAsState()
     val lastSessionId by connectionViewModel.lastSessionId.collectAsState()
     val selectedProfile by connectionViewModel.selectedProfile.collectAsState()
+    val agentProfiles by connectionViewModel.agentProfiles.collectAsState()
+    val profileDisplayAlias by connectionViewModel.profileDisplayAlias.collectAsState()
     val activeConnectionId by connectionViewModel.activeConnectionId.collectAsState()
 
     val mediaContext = androidx.compose.ui.platform.LocalContext.current
@@ -385,6 +398,9 @@ fun RelayApp() {
     val relayVoiceReady by connectionViewModel.relayVoiceReady.collectAsState()
     val standardVoiceReadyState = rememberUpdatedState(standardVoiceReady)
     val relayVoiceReadyState = rememberUpdatedState(relayVoiceReady)
+    // Latest enhanced-voice overrides (null when nothing is set). Read lazily by
+    // the relay TTS adapter so changes apply without rebuilding it.
+    val enhancedOverridesState = rememberUpdatedState(EnhancedVoiceOverrides.fromSettings(voiceSettings))
 
     // Voice pipeline wiring — mirrors ChatViewModel.initializeMedia (above).
     // We build a dedicated OkHttpClient so voice requests don't contend with
@@ -436,7 +452,10 @@ fun RelayApp() {
     val voiceAudioClient = remember {
         AutoVoiceAudioClient(
             standardClient = standardVoiceClient,
-            relayClient = RelayVoiceAudioClientAdapter(voiceClient),
+            relayClient = RelayVoiceAudioClientAdapter(
+                voiceClient,
+                enhancedOverridesProvider = { enhancedOverridesState.value },
+            ),
             routeProvider = { selectedAudioRouteState.value },
             standardReadyProvider = { standardVoiceReadyState.value },
             relayReadyProvider = { relayVoiceReadyState.value },
@@ -590,6 +609,15 @@ fun RelayApp() {
                 profiles = connectionViewModel.agentProfiles.value,
             )
         }
+        chatViewModel.setDisplayProfileProvider {
+            AgentDisplay.effectiveDisplayProfile(
+                selectedProfile = connectionViewModel.selectedProfile.value,
+                profiles = connectionViewModel.agentProfiles.value,
+            )
+        }
+        chatViewModel.setDisplayAliasProvider {
+            connectionViewModel.profileDisplayAlias.value
+        }
 
         // Drawer session list, scoped to the active profile on gateway
         // connections (dashboard `/api/sessions?profile=`). Returns null off the
@@ -640,6 +668,10 @@ fun RelayApp() {
         )
     }
 
+    LaunchedEffect(selectedProfile?.name, agentProfiles, profileDisplayAlias) {
+        chatViewModel.refreshAgentDisplayName(relabelGenericMessages = true)
+    }
+
     // === PHASE3-status: sync granular phone-status settings to chat ===
     val appContextEnabled by connectionViewModel.appContextEnabled.collectAsState()
     val appContextBridgeState by connectionViewModel.appContextBridgeState.collectAsState()
@@ -717,9 +749,39 @@ fun RelayApp() {
 
     // Observe theme preference
     val themePreference by connectionViewModel.theme.collectAsState()
+    val appThemeId by connectionViewModel.appTheme.collectAsState()
     val fontScale by connectionViewModel.fontScale.collectAsState()
 
-    HermesRelayTheme(themePreference = themePreference, fontScale = fontScale) {
+    // Resolve the active sphere skin (built-in / adaptive / user-loaded) and
+    // publish it + the full available set so every MorphingSphere picks it up
+    // via LocalSphereSkin without per-call-site threading. Adaptive skins read
+    // the brand lazily inside MorphingSphere, so this can sit outside the theme.
+    val sphereSkinId by connectionViewModel.sphereSkin.collectAsState()
+    val sphereContext = androidx.compose.ui.platform.LocalContext.current
+    val availableSphereSkins by produceState(
+        initialValue = SphereRegistry.builtIns,
+        key1 = sphereContext,
+    ) {
+        value = SphereRegistry.builtIns +
+            withContext(Dispatchers.IO) { SphereSkinLoader.loadUserSkins(sphereContext) }
+    }
+    val activeSphereSkin = remember(sphereSkinId, appThemeId, availableSphereSkins) {
+        SphereRegistry.resolve(
+            selectedId = sphereSkinId,
+            themeDefaultSkinId = AppThemes.byId(appThemeId).defaultSphereSkinId,
+            available = availableSphereSkins,
+        )
+    }
+
+    CompositionLocalProvider(
+        LocalSphereSkin provides activeSphereSkin,
+        LocalAvailableSphereSkins provides availableSphereSkins,
+    ) {
+    HermesRelayTheme(
+        appThemeId = appThemeId,
+        themePreference = themePreference,
+        fontScale = fontScale,
+    ) {
         val navController = rememberNavController()
         var postOnboardingRoute by remember { mutableStateOf<String?>(null) }
 
@@ -757,6 +819,7 @@ fun RelayApp() {
         val navBackStackEntry by navController.currentBackStackEntryAsState()
         val currentRoute = navBackStackEntry?.destination?.route
         val isOnboarding = currentRoute == Screen.Onboarding.route
+        val suppressGlobalChrome = !onboardingCompleted || isOnboarding
         var bridgePrimaryReturnRoute by remember { mutableStateOf<String?>(null) }
         var bridgePrimaryReturnLabel by remember { mutableStateOf<String?>(null) }
 
@@ -815,6 +878,7 @@ fun RelayApp() {
         val activeConnection by connectionViewModel.activeConnection.collectAsState()
         val activeEndpoint by connectionViewModel.activeEndpoint.collectAsState()
         val serverModelName by chatViewModel.serverModelName.collectAsState()
+        val gatewayCurrentModel by chatViewModel.gatewayCurrentModel.collectAsState()
         val appReady by connectionViewModel.isReady.collectAsState()
         val initialChatSettled by chatViewModel.initialChatSettled.collectAsState()
         // The SAME readiness signal ChatScreen renders its "Connect Standard
@@ -993,7 +1057,7 @@ fun RelayApp() {
             }
         }
         val showStartupSphere =
-            onboardingCompleted &&
+            !suppressGlobalChrome &&
                 !startupGateReleased &&
                 !voiceUiState.voiceMode
 
@@ -1094,7 +1158,7 @@ fun RelayApp() {
         val showUnattendedBanner = BuildFlavor.isSideload &&
             masterEnabled &&
             unattendedEnabled &&
-            !isOnboarding &&
+            !suppressGlobalChrome &&
             !showStartupSphere &&
             !voiceUiState.voiceMode
         // Sideload-only update availability (UpdateViewModel short-circuits on
@@ -1112,7 +1176,7 @@ fun RelayApp() {
         val showConnectionStatusToast =
             globalConnectionStatus != null &&
                 currentStatusKey != dismissedStatusKey &&
-                !isOnboarding &&
+                !suppressGlobalChrome &&
                 !showStartupSphere &&
                 !voiceUiState.voiceMode
         val onConnectionStatusBannerClick: () -> Unit = {
@@ -1214,7 +1278,7 @@ fun RelayApp() {
             contentWindowInsets = WindowInsets(0),
             snackbarHost = { SnackbarHost(snackbarHostState) },
             bottomBar = {
-                if (!isOnboarding && !isKeyboardVisible && !showStartupSphere && !voiceUiState.voiceMode) {
+                if (!suppressGlobalChrome && !isKeyboardVisible && !showStartupSphere && !voiceUiState.voiceMode) {
                     val leading = when {
                         apiReachable -> "api online"
                         relayReady -> "relay connected"
@@ -1229,7 +1293,14 @@ fun RelayApp() {
                         ?: activeConnection?.label
                         ?: "no route"
                     val profileLabel = selectedProfile?.name?.takeIf { it.isNotBlank() } ?: "default"
-                    val modelLabel = serverModelName.takeIf { it.isNotBlank() } ?: "model pending"
+                    val displayProfile = AgentDisplay.effectiveDisplayProfile(
+                        selectedProfile = selectedProfile,
+                        profiles = agentProfiles,
+                    )
+                    val modelLabel = AgentDisplay.displayModelName(gatewayCurrentModel)
+                        ?: AgentDisplay.displayModelName(displayProfile?.model)
+                        ?: AgentDisplay.displayModelName(serverModelName)
+                        ?: "model pending"
                     val safetyLabel = if (BuildFlavor.isSideload && masterEnabled) {
                         "safety: ${if (unattendedEnabled) "unattended" else "on"}"
                     } else {
@@ -1287,7 +1358,10 @@ fun RelayApp() {
                         onManageSignIn = {
                             postOnboardingRoute = Screen.Manage.route
                             connectionViewModel.completeOnboarding()
-                        }
+                        },
+                        onOpenPermissions = {
+                            navController.navigate(Screen.PermissionsSettings.route)
+                        },
                     )
                 }
                 composable(
@@ -1589,6 +1663,9 @@ fun RelayApp() {
                         onNavigateToNotificationCompanion = {
                             navController.navigate(Screen.NotificationCompanionSettings.route)
                         },
+                        onNavigateToPermissions = {
+                            navController.navigate(Screen.PermissionsSettings.route)
+                        },
                         // === PHASE3-safety-rails: bridge safety route ===
                         onNavigateToBridgeSafety = {
                             navController.navigate(Screen.BridgeSafetySettings.route)
@@ -1639,6 +1716,16 @@ fun RelayApp() {
                     )
                 }
                 // === END PHASE3-notif-listener-followup ===
+                composable(Screen.PermissionsSettings.route) {
+                    PermissionsStatusScreen(
+                        onBack = { navController.popBackStack() },
+                        onOpenBridge = {
+                            navController.navigate(Screen.Bridge.route) {
+                                launchSingleTop = true
+                            }
+                        },
+                    )
+                }
                 // === PHASE3-safety-rails: bridge safety route ===
                 composable(Screen.BridgeSafetySettings.route) {
                     if (BuildFlavor.isSideload) {
@@ -2025,7 +2112,7 @@ fun RelayApp() {
                 .windowInsetsPadding(WindowInsets.statusBars),
         ) {
             AnimatedVisibility(
-                visible = availableUpdate != null && !isOnboarding &&
+                visible = availableUpdate != null && !suppressGlobalChrome &&
                     !showStartupSphere && !voiceUiState.voiceMode,
                 enter = slideInVertically(tween(220)) { -it } + fadeIn(tween(180)),
                 exit = slideOutVertically(tween(200)) { -it } + fadeOut(tween(160)),
@@ -2136,6 +2223,7 @@ fun RelayApp() {
         }
         } // end Box
     }
+    } // end CompositionLocalProvider (sphere skin)
 }
 
 /** One line of the startup sphere's progress narration. */

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

@@ -56,15 +56,19 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.hermesandroid.relay.auth.AuthState
-import com.hermesandroid.relay.network.ConnectionState
-import com.hermesandroid.relay.network.RelayUrlDeriver
+import com.hermesandroid.relay.data.EndpointCandidate
+import com.hermesandroid.relay.data.hasSecureProxy
+import com.hermesandroid.relay.network.relay.ConnectionState
+import com.hermesandroid.relay.network.relay.RelayUrlDeriver
 import com.hermesandroid.relay.ui.LocalSnackbarHost
 import com.hermesandroid.relay.ui.showHumanError
 import com.hermesandroid.relay.util.classifyError
 import com.hermesandroid.relay.viewmodel.ConnectionViewModel
 import com.hermesandroid.relay.viewmodel.RelayUiState
+import com.hermesandroid.relay.viewmodel.StandardVoiceAvailability
 import com.hermesandroid.relay.viewmodel.asBadgeState
 import com.hermesandroid.relay.viewmodel.statusText
 import kotlinx.coroutines.flow.first
@@ -138,6 +142,24 @@ fun ActiveCardStandardStatusSection(
         onClick = onOpenDashboard,
         modifier = Modifier.fillMaxWidth(),
     )
+
+    if (dashboardSignInRequired) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(
+                text = "Dashboard controls need a sign-in for this route.",
+                style = MaterialTheme.typography.bodySmall,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                modifier = Modifier.weight(1f),
+            )
+            TextButton(onClick = onOpenDashboard) {
+                Text("Sign in")
+            }
+        }
+    }
 }
 
 /**
@@ -193,6 +215,219 @@ fun ActiveCardRelayStatusSection(
     )
 }
 
+/**
+ * Capability overview for the active connection. Features are intentionally
+ * separate from routes: users can see what Hermes can do without reading the
+ * selected network path as the feature boundary.
+ */
+@Composable
+fun ActiveCardFeaturesSection(
+    connectionViewModel: ConnectionViewModel,
+    relayEnabled: Boolean,
+    onOpenApiInfo: () -> Unit,
+    onOpenDashboard: () -> Unit,
+    onOpenRelayInfo: () -> Unit,
+    onOpenSessionInfo: () -> Unit,
+) {
+    val apiReachable by connectionViewModel.apiServerReachable.collectAsState()
+    val apiHealth by connectionViewModel.apiServerHealth.collectAsState()
+    val activeConnection by connectionViewModel.activeConnection.collectAsState()
+    val standardVoiceAvailability by
+        connectionViewModel.standardVoiceAvailability.collectAsState()
+    val relayConfigured by connectionViewModel.relayConfigured.collectAsState()
+    val relayReady by connectionViewModel.relayReady.collectAsState()
+    val relayUiState by connectionViewModel.relayUiState.collectAsState()
+    val authState by connectionViewModel.authState.collectAsState()
+
+    val dashboardStatus = activeConnection?.dashboardLastStatus
+    val dashboardSignInRequired =
+        dashboardStatus?.authRequired == true && dashboardStatus.authenticated != true
+    val secureProxyAdvertised =
+        activeConnection?.routeCandidates.orEmpty().any { it.hasSecureProxy() }
+
+    val apiValue = when {
+        apiHealth == ConnectionViewModel.HealthStatus.Probing -> "Checking"
+        apiReachable -> "Ready"
+        activeConnection?.apiServerUrl.isNullOrBlank() -> "Missing"
+        else -> "Offline"
+    }
+    val apiTone = when (apiValue) {
+        "Ready" -> CapabilityTone.Good
+        "Offline", "Missing" -> CapabilityTone.Warning
+        else -> CapabilityTone.Neutral
+    }
+
+    val dashboardValue = when {
+        activeConnection?.resolvedDashboardUrl.isNullOrBlank() -> "Missing"
+        dashboardStatus == null -> "Unchecked"
+        !dashboardStatus.reachable -> "Offline"
+        dashboardSignInRequired -> "Sign in"
+        dashboardStatus.authenticated == true -> "Signed in"
+        else -> "Available"
+    }
+    val dashboardTone = when (dashboardValue) {
+        "Signed in", "Available" -> CapabilityTone.Good
+        "Sign in" -> CapabilityTone.Info
+        "Offline", "Missing" -> CapabilityTone.Warning
+        else -> CapabilityTone.Neutral
+    }
+
+    val voiceValue = when (standardVoiceAvailability) {
+        StandardVoiceAvailability.Ready -> "Ready"
+        StandardVoiceAvailability.SignInRequired -> "Sign in"
+        StandardVoiceAvailability.Unsupported -> "Unsupported"
+        StandardVoiceAvailability.Unreachable -> "Offline"
+        StandardVoiceAvailability.Unknown -> "Checking"
+    }
+    val voiceTone = when (standardVoiceAvailability) {
+        StandardVoiceAvailability.Ready -> CapabilityTone.Good
+        StandardVoiceAvailability.SignInRequired -> CapabilityTone.Info
+        StandardVoiceAvailability.Unsupported,
+        StandardVoiceAvailability.Unreachable -> CapabilityTone.Warning
+        StandardVoiceAvailability.Unknown -> CapabilityTone.Neutral
+    }
+
+    val relayValue = when {
+        !relayEnabled -> "Disabled"
+        !relayConfigured -> "Optional"
+        relayReady -> "Ready"
+        relayUiState == RelayUiState.Stale -> "Reconnect"
+        else -> "Configured"
+    }
+    val relayTone = when {
+        !relayEnabled || !relayConfigured -> CapabilityTone.Neutral
+        relayReady -> CapabilityTone.Good
+        relayUiState == RelayUiState.Stale -> CapabilityTone.Warning
+        else -> CapabilityTone.Info
+    }
+
+    val terminalValue = when {
+        !relayEnabled -> "Disabled"
+        authState is AuthState.Paired -> "Ready"
+        relayConfigured -> "Pair Relay"
+        else -> "Optional"
+    }
+    val terminalTone = when (terminalValue) {
+        "Ready" -> CapabilityTone.Good
+        "Pair Relay" -> CapabilityTone.Info
+        else -> CapabilityTone.Neutral
+    }
+
+    val proxyValue = if (secureProxyAdvertised) "Available" else "Not advertised"
+    val proxyTone = if (secureProxyAdvertised) CapabilityTone.Good else CapabilityTone.Neutral
+
+    Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+        Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+            CapabilityChip(
+                label = "Standard API",
+                value = apiValue,
+                tone = apiTone,
+                onClick = onOpenApiInfo,
+                modifier = Modifier.weight(1f),
+            )
+            CapabilityChip(
+                label = "Dashboard",
+                value = dashboardValue,
+                tone = dashboardTone,
+                onClick = onOpenDashboard,
+                modifier = Modifier.weight(1f),
+            )
+        }
+        Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+            CapabilityChip(
+                label = "Standard voice",
+                value = voiceValue,
+                tone = voiceTone,
+                onClick = if (standardVoiceAvailability ==
+                    StandardVoiceAvailability.SignInRequired
+                ) {
+                    onOpenDashboard
+                } else {
+                    null
+                },
+                modifier = Modifier.weight(1f),
+            )
+            CapabilityChip(
+                label = "Relay tools",
+                value = relayValue,
+                tone = relayTone,
+                onClick = onOpenRelayInfo,
+                modifier = Modifier.weight(1f),
+            )
+        }
+        Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+            CapabilityChip(
+                label = "Terminal",
+                value = terminalValue,
+                tone = terminalTone,
+                onClick = onOpenSessionInfo,
+                modifier = Modifier.weight(1f),
+            )
+            CapabilityChip(
+                label = "Secure proxy",
+                value = proxyValue,
+                tone = proxyTone,
+                modifier = Modifier.weight(1f),
+            )
+        }
+    }
+}
+
+private enum class CapabilityTone { Neutral, Good, Info, Warning }
+
+@Composable
+private fun CapabilityChip(
+    label: String,
+    value: String,
+    tone: CapabilityTone,
+    modifier: Modifier = Modifier,
+    onClick: (() -> Unit)? = null,
+) {
+    val container = when (tone) {
+        CapabilityTone.Good -> MaterialTheme.colorScheme.primaryContainer
+        CapabilityTone.Info -> MaterialTheme.colorScheme.tertiaryContainer
+        CapabilityTone.Warning -> MaterialTheme.colorScheme.errorContainer
+        CapabilityTone.Neutral -> MaterialTheme.colorScheme.surface
+    }
+    val content = when (tone) {
+        CapabilityTone.Good -> MaterialTheme.colorScheme.onPrimaryContainer
+        CapabilityTone.Info -> MaterialTheme.colorScheme.onTertiaryContainer
+        CapabilityTone.Warning -> MaterialTheme.colorScheme.onErrorContainer
+        CapabilityTone.Neutral -> MaterialTheme.colorScheme.onSurfaceVariant
+    }
+    Surface(
+        modifier = modifier.then(
+            if (onClick != null) {
+                Modifier.clickable(onClick = onClick)
+            } else {
+                Modifier
+            },
+        ),
+        color = container,
+        shape = RoundedCornerShape(8.dp),
+    ) {
+        Column(
+            modifier = Modifier.padding(horizontal = 10.dp, vertical = 8.dp),
+            verticalArrangement = Arrangement.spacedBy(2.dp),
+        ) {
+            Text(
+                text = label,
+                style = MaterialTheme.typography.labelSmall,
+                color = content,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+            Text(
+                text = value,
+                style = MaterialTheme.typography.bodySmall,
+                color = content,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+    }
+}
+
 /**
  * Advanced expandable section — three subsections:
  *  - Manual URL configuration (API URL + key + Save & Test,
@@ -844,6 +1079,10 @@ fun ActiveCardSecurityPosture(
     onNavigateToPairedDevices: () -> Unit,
 ) {
     val relayUrl by connectionViewModel.relayUrl.collectAsState()
+    val effectiveApiServerUrl by connectionViewModel.effectiveApiServerUrl.collectAsState()
+    val effectiveDashboardUrl by connectionViewModel.effectiveDashboardUrl.collectAsState()
+    val effectiveRelayUrl by connectionViewModel.effectiveRelayUrl.collectAsState()
+    val relayConfigured by connectionViewModel.relayConfigured.collectAsState()
     val insecureReason by connectionViewModel.insecureReason.collectAsState()
     val isTailscaleDetected by connectionViewModel.isTailscaleDetected.collectAsState()
     val currentPairedSession by connectionViewModel.currentPairedSession.collectAsState()
@@ -852,14 +1091,43 @@ fun ActiveCardSecurityPosture(
     // say "Plain (on LAN)" instead of "Insecure (network unknown)" when
     // the resolver already knows which candidate we're on.
     val activeEndpoint by connectionViewModel.activeEndpoint.collectAsState()
+    val selectedRouteUrls = buildList {
+        effectiveApiServerUrl.trim().takeIf { it.isNotBlank() }?.let(::add)
+        effectiveDashboardUrl.trim().takeIf { it.isNotBlank() }?.let(::add)
+        val selectedRelayUrl = effectiveRelayUrl.ifBlank { relayUrl }
+        if (relayConfigured || selectedRelayUrl.isNotBlank()) {
+            selectedRelayUrl.trim().takeIf { it.isNotBlank() }?.let(::add)
+        }
+    }
+    val secureUrlCount = selectedRouteUrls.count { url ->
+        isSelectedRouteUrlSecure(
+            url = url,
+            activeEndpoint = activeEndpoint,
+            isTailscaleDetected = isTailscaleDetected,
+        )
+    }
+    val transportState = when {
+        selectedRouteUrls.isEmpty() -> null
+        secureUrlCount == selectedRouteUrls.size -> TransportSecurityState.AllSecure
+        secureUrlCount > 0 -> TransportSecurityState.Mixed
+        else -> TransportSecurityState.AllInsecure
+    }
 
-    TransportSecurityBadge(
-        isSecure = isUrlSecure(relayUrl),
-        reason = insecureReason.ifBlank { null },
-        size = TransportSecuritySize.Row,
-        modifier = Modifier.fillMaxWidth(),
-        activeRole = activeEndpoint?.role,
-    )
+    if (transportState != null) {
+        TransportSecurityBadge(
+            state = transportState,
+            size = TransportSecuritySize.Row,
+            modifier = Modifier.fillMaxWidth(),
+        )
+    } else {
+        TransportSecurityBadge(
+            isSecure = isUrlSecure(relayUrl),
+            reason = insecureReason.ifBlank { null },
+            size = TransportSecuritySize.Row,
+            modifier = Modifier.fillMaxWidth(),
+            activeRole = activeEndpoint?.role,
+        )
+    }
 
     if (isTailscaleDetected) {
         Row(
@@ -930,6 +1198,29 @@ fun ActiveCardSecurityPosture(
     }
 }
 
+private fun isSelectedRouteUrlSecure(
+    url: String,
+    activeEndpoint: EndpointCandidate?,
+    isTailscaleDetected: Boolean,
+): Boolean {
+    if (isUrlSecure(url)) return true
+    return activeEndpoint.isEncryptedOverlayRoute(isTailscaleDetected)
+}
+
+private fun EndpointCandidate?.isEncryptedOverlayRoute(isTailscaleDetected: Boolean): Boolean {
+    if (this == null) return false
+    val role = role.lowercase()
+    val securityHint = security.orEmpty().lowercase()
+    return role == "tailscale" ||
+        (isTailscaleDetected && securityHint.contains("tailscale")) ||
+        role == "plugin_proxy" ||
+        role == "plugin-proxy" ||
+        hasSecureProxy() ||
+        securityHint.contains("wireguard") ||
+        securityHint.contains("https") ||
+        securityHint.contains("tls")
+}
+
 /**
  * Numbered step row for the Manual pairing code fallback. Tightly
  * coupled to its Card 3 layout — step badge sizing + content shape —

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

@@ -0,0 +1,53 @@
+package com.hermesandroid.relay.ui.components
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.withFrameNanos
+import kotlinx.coroutines.delay
+
+/**
+ * Frame-throttled stand-in for `rememberInfiniteTransition` for slow, ambient
+ * effects — heartbeat dots, banner glows, drifting orbs. Returns a phase that
+ * loops `0f → 1f` every [periodMillis], advanced at roughly [fps] instead of
+ * the display refresh rate.
+ *
+ * Why this exists: on Android 15 the platform logs `setRequestedFrameRate` on
+ * every Compose draw pass (and on Samsung builds at INFO level). An
+ * always-visible `rememberInfiniteTransition` pins the entire window at the
+ * panel's refresh (e.g. 120Hz) for as long as it's composed — flooding logcat
+ * and burning battery to animate motion the eye can't resolve at full rate
+ * anyway. ~30fps is imperceptible for a multi-second pulse.
+ *
+ * When [running] is false the phase holds at `0f` and the loop parks (no frames
+ * requested), so a hidden/idle effect costs nothing.
+ *
+ * Linear by design (matches the `LinearEasing` + `RepeatMode.Restart` the old
+ * infinite transitions used). Map the phase to your value range at the call
+ * site, e.g. `1f + 0.8f * phase` for a 1f→1.8f scale.
+ */
+@Composable
+fun rememberAmbientPhase(
+    periodMillis: Int,
+    fps: Int = 30,
+    running: Boolean = true,
+): Float {
+    val phase = remember { mutableFloatStateOf(0f) }
+    LaunchedEffect(periodMillis, fps, running) {
+        if (!running || periodMillis <= 0) {
+            phase.floatValue = 0f
+            return@LaunchedEffect
+        }
+        val frameIntervalMs = (1000L / fps.coerceAtLeast(1)).coerceAtLeast(1L)
+        var lastNanos = withFrameNanos { it }
+        while (true) {
+            val now = withFrameNanos { it }
+            val dtMs = (now - lastNanos).coerceAtLeast(0L) / 1_000_000f
+            lastNanos = now
+            phase.floatValue = (phase.floatValue + dtMs / periodMillis) % 1f
+            delay(frameIntervalMs)
+        }
+    }
+    return phase.floatValue
+}