fix(ci): raise Gradle heap to 4g for release bundling (#96 )

Unblocks the android-v1.2.0 re-cut.
fix(ci): raise Gradle heap to 4g so release bundle packaging doesn't OOM
2026-06-21 17:51:25 -04:00 · 2026-06-21 17:50:30 -04:00 · 2026-06-21 17:34:24 -04:00 · 2026-06-21 17:31:30 -04:00 · 2026-06-21 17:18:24 -04:00 · 2026-06-21 16:41:25 -04:00
443 changed files with 52857 additions and 6841 deletions
@@ -0,0 +1 @@
+*.sh text eol=lf
@@ -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
@@ -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.
@@ -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
@@ -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
@@ -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
@@ -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.
@@ -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/
@@ -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"
@@ -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
@@ -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
@@ -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 \
@@ -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
@@ -25,7 +25,16 @@ jobs:
      issues: read
      id-token: write
    env:
-      IS_RELEASE_PR: ${{ github.event.pull_request.base.ref == 'main' && github.event.pull_request.head.ref == 'dev' && startsWith(github.event.pull_request.title, 'release:') }}
+      # Any dev -> main PR is, by the branching model, the aggregate release PR
+      # (main only ever receives release merges from dev). Detect it by base+head
+      # 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
@@ -34,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
@@ -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
@@ -0,0 +1,104 @@
+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
+    # Auto-publish the listing when its assets change on `main` (the release
+    # branch; the path filters above already scope this to screenshot/graphic/
+    # text changes). `dev` pushes and PRs validate only. A manual dispatch with
+    # `publish_listing` still works as an on-demand republish.
+    if: >-
+      ${{ (github.event_name == 'workflow_dispatch' && inputs.publish_listing)
+          || (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
+    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
+        id: sa
+        env:
+          PLAY_SERVICE_ACCOUNT_JSON: ${{ secrets.PLAY_SERVICE_ACCOUNT_JSON }}
+        run: |
+          if [ -z "$PLAY_SERVICE_ACCOUNT_JSON" ]; then
+            # Skip gracefully (no red CI) when the secret isn't configured — e.g.
+            # an auto-publish push to main before the service account is set up.
+            echo "::notice::PLAY_SERVICE_ACCOUNT_JSON not configured — skipping listing publish."
+            echo "configured=false" >> "$GITHUB_OUTPUT"
+          else
+            printf '%s' "$PLAY_SERVICE_ACCOUNT_JSON" > play-service-account.json
+            echo "configured=true" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Publish Play Store listing
+        if: ${{ steps.sa.outputs.configured == 'true' }}
+        run: ./gradlew publishGooglePlayReleaseListing
+
+      - name: Remove Play service account
+        if: always()
+        run: rm -f play-service-account.json
@@ -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 }}
@@ -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
@@ -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
@@ -26,10 +26,15 @@ local.properties
 /app/build/
 /relay-core/build/
 /relay-ui/build/
+/ui-preview/build/
 /quest/build/
 /app/release/
 *.apk
 *.aab
+
+# Scratch / working directory (local pet packs, generated test assets, etc.)
+/tmp/
+/build-*.log
 *.jks
 *.keystore
 /captures
@@ -0,0 +1,49 @@
+# AGENTS.md
+
+Universal agent instructions for **Hermes-Relay**. This is the entry point for any
+coding agent (Claude Code, Codex, Cursor, etc.).
+
+## Read this first
+
+The detailed, authoritative context lives in **[CLAUDE.md](CLAUDE.md)** —
+architecture, the upstream Hermes API reference, repository layout, per-language
+code style, the dev loop, and the Key Files map. Read it before touching code,
+then `docs/spec.md` and `docs/decisions.md`.
+
+- Release process → **[RELEASE.md](RELEASE.md)**
+- Contributor setup → **[CONTRIBUTING.md](CONTRIBUTING.md)**
+- `android_*` toolset + MCP → **[docs/mcp-tooling.md](docs/mcp-tooling.md)**
+- Follow-ups / deferred work / known gaps → **[TODO.md](TODO.md)** (the single home for "what's next" — never DEVLOG, never scattered code comments)
+
+## Non-negotiables (the short list)
+
+- **Vanilla Hermes path = upstream-only.** The default (no-plugin) connection —
+  chat via the API server, Vanilla Hermes voice via the Hermes dashboard — must work
+  against unmodified upstream hermes-agent. Server-side needs go through upstream
+  PRs or the optional relay plugin, never fork patches.
+- **Verify endpoints against upstream** (`gateway/platforms/api_server.py` /
+  `tui_gateway/server.py` in hermes-agent) before assuming a route exists.
+- **Conventional Commits + `main`/`dev` branching.** Feature branches off `dev`,
+  `--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
+
+Everything committed is public. In CHANGELOG, DEVLOG, README, docs, and release
+notes:
+
+- **No personal names** — attribute impersonally; identity lives in git + the
+  signing cert.
+- **No private infrastructure** — real hostnames/IPs, internal deployment names,
+  `~/SYSTEM.md`. (Generic example IPs in setup docs are fine.)
+- **No AI/assistant process self-narration** ("I should have…", course
+  corrections) — state the technical conclusion only.
+- **No internal jargon or fork/branch plumbing** in user-facing notes.
+- **CHANGELOG** uses Keep-a-Changelog grouping; condense the version block to
+  crisp public bullets at release-prep (see RELEASE.md §2 "Scrub for public
+  distribution"). **DEVLOG** is a depersonalized, factual engineering log.
@@ -6,101 +6,148 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/), and this

 ## [Unreleased]

+## [1.2.0] - 2026-06-20
+
 ### Added

- **Persistent Realtime Agent conversation.** Realtime Agent voice now keeps one provider session/socket open across turns instead of creating a fresh session per utterance, so the provider retains the live conversation (follow-up references work) and turns skip session-setup latency. The relay needed no change — it already supported multiple turns on one socket. A **Voice Settings → Realtime Agent → Persistent session** toggle (default on) falls back to the legacy per-utterance path. See `docs/plans/2026-05-24-realtime-persistent-session.md`.
-
- **Background Hermes runs in Realtime Agent voice (ADR 33).** Long Hermes tasks no longer freeze the realtime conversation. A run that exceeds a grace window is promoted to a tracked background task: the provider speaks a short handoff ("I'm on it"), the conversation stays responsive, and the answer is spoken once the run finishes. `hermes_run_task(mode="background")` starts a durable run immediately. New relay events `hermes.run.promoted` and `hermes.run.background_completed`, plus `tier`/`floor` fields on `hermes.run.progress`.
-
- **Relay audio floor owner.** A single-owner audio floor (provider / relay-TTS / Android-filler) makes explicit the serialization that the old blocking design provided implicitly, so a completed background result never barges in and two voices never overlap.
-
- **Voice Settings → Realtime Agent → Background tasks.** New controls to enable/disable promotion, toggle the spoken handoff, and choose result delivery (speak when idle / notify / show only). A persistent "working on it" chip appears in the voice overlay while a background task runs.
-
- **Provider idle-tolerance probe.** `scripts/realtime-provider-idle-probe.py` records a per-provider verdict (hold-floor-ok / needs-keepalive / must-reopen) for holding a realtime socket quiescent during a background run; see `docs/realtime-voice-poc.md`.
-
- **Per-route reachability verdicts in the Routes card.** Every route row now shows the result of its last health probe — "Reachable", or "Unreachable" with the actual reason ("TLS failed — server may be http://, not https://", "Connection refused", "No answer (timed out)", "HTTP 404 from /health") — and "Re-check" shows a live checking state instead of doing invisible background work. Verdicts persist between probes so you can see what the network last said.
-
- **Manage parity with the hermes-desktop dashboard.** The Manage tab can now do what the desktop dashboard can: **Models** — change the main model from the full provider/model catalog (`/api/model/options` → `/api/model/set`), including the expensive-model confirmation round-trip; new **Keys** tab — view, set (write-only, masked), reveal (server rate-limited), and clear provider keys / env secrets; **Profiles** — create profiles (clone-from-default), edit descriptions, set per-profile models, and **edit SOUL.md** in a full-file editor; **Skills** — browse the multi-source skills hub with search, SKILL.md preview-before-install, install/uninstall (async server-side), and update-all.
-
- **Manage data survives app restarts.** The Manage payload cache now mirrors to a plain-JSON file in the app's private cache directory and hydrates at startup, so a cold app launch renders the last-seen dashboard data instantly while fresh data loads quietly behind it. Signing in or out wipes the disk mirror along with the in-memory cache. (Deliberately a flat file rather than encrypted prefs — the payload carries no credentials, and every encrypted-prefs build costs seconds under the Keystore's process-global lock.)
+- **Sensitive-media classification (relay).** The relay teaches the agent — server-side, via a removable system-prompt block — to mark private/NSFW media so the phone blurs it per your setting. **On by default for relay installs** (installing the relay is itself the opt-in); reversible from the "Agent context" toggle in the Relay dashboard, or `RELAY_AGENT_CONTEXT_ENABLED=0`. The exact injected instruction is visible in the chat "What the agent sees" sheet under "Relay context (server-side)". No on-device or relay-side classifier — sensitivity stays model-emitted. Vanilla upstream (no plugin) is unaffected. See `docs/plans/2026-06-20-relay-enhancement-layer.md`.
+- **Transport path is visible (chat).** The chat status strip now shows which streaming path is actually in use — ⚡ Gateway (live thinking), 📡 Sessions, Completions, or Runs — instead of a generic "api online", and Chat Settings adds a basic→best tier ladder explaining the active path and its fallback.
+- **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.
+- **Agent pets — a living, swappable avatar.** The orb can be replaced with an animated "pet" that reacts to what the agent is doing: idle / thinking / writing / speaking / listening states, a distinct **working** pose during tool calls, one-shot **greet** / **celebrate** reactions, and a loop that quickens as output streams. Add or remove pets right in Settings → Appearance (no `adb` needed), with a live state preview, a playback-speed slider, and optional frame auto-stabilization; capability badges (Voice · Tools · Activity) show honestly what each pet actually reacts to. Pets are pure data — an AI authoring kit and a JSON schema let you generate one from sprite art. See `docs/pet-spec.md` and the custom-avatars guide.
+- **Per-profile agent icon + single-image avatars.** Each agent profile can wear its own small icon beside its name (client-side, never sent to Hermes), shown in chat, the agent sheet, the top bar, and Settings. Importing an avatar now also accepts a single image (auto-wrapped as a one-frame pet) — no animated pack required.
+- **In-app crash reporting.** If the app ever force-closes, the next launch shows a clean dialog with the stack trace — **Copy** it, or **Report** to open a pre-filled GitHub issue from the bug template. The report persists until you acknowledge it, and the handler re-raises so the OS still records the crash in Play vitals.
+- **Clean text-flow mode (chat).** A distraction-free chat layout where your sent text slides up into a continuous flow, paired with the swappable-avatar/pet system.
+- **Permissions review screen.** A central page makes the permission model explicit — standard Chat and Manage need no phone-control permissions, while voice, camera, notifications, and sideload Device Control stay opt-in — reading the same live grants Bridge does.
+- **In-app attachment previews + richer capture.** Attachments preview inline before sending, sensitive media is blurred per your setting, and the capture flow is richer.

 ### Changed

- **Docs site rechromed to the relay cockpit theme and repositioned around the two-path story.** `user-docs/` now mirrors the app's `RelayRefresh` palette (navy-black base, warm-white ink, electric-indigo accent, grid/dot texture) instead of the old neutral-gray/purple chrome. The homepage leads with "Runs on your machine. Lives on your devices.", a quick-path-first funnel ("Just connect" — no server install, just a running Hermes — above the "Give it hands" relay-plugin power path), role-framed surface cards (companion app / remote-hands CLI), and a How-it-works strip. "Desktop CLI" is now plain "CLI" with a Windows-today / macOS-Linux-coming-soon status on every availability claim; "self-hosted" dropped as a qualifier. Sidebar gained five previously unreachable pages (voice, voice intents, phone control tools, relay server, flavor differences); stale version pins refreshed. Sphere gaze tracking on the homepage no longer drifts over time or snaps between scroll/cursor modes (`lightAngleBlend` partial-mix leak — blend is now exactly 1 with ambient life moved into the wander term).
-
- **Standard (no-plugin) voice now rides the Hermes dashboard surface.** STT/TTS for the standard route uses the dashboard's `/api/audio/transcribe` + `/api/audio/speak` (the hermes-desktop voice contract) with the same cookie session Manage signs in with — a vanilla hermes-agent install needs no Relay plugin for voice. Previously the client targeted the API server, which has no audio routes, so standard-only voice always failed.
-
- **Auto STT/TTS route prefers Relay when paired.** Paired Relay voice is profile-aware and needs no dashboard sign-in; the standard dashboard route is the zero-plugin fallback. Voice Settings now shows live per-route status (ready / sign-in required / unreachable / unsupported build) with a "Sign in via Manage" shortcut, and the Realtime Agent engine is clearly marked as requiring a paired Relay.
-
- **Softened the active connection card.** The full-card Electric blue fill on the active connection was overpowering against body text; it now uses a muted indigo wash while small accents keep the vivid brand blue.
-
- **Connection wizard capability card now includes Voice.** Finishing setup shows Chat / Manage / Voice / Relay readiness in one card — voice availability (ready / unlocks with dashboard sign-in / build too old) is probed in the same pass, so the result is accurate the moment you connect.
-
- **No more relay warnings on standard-only connections.** Voice Settings no longer fetches Relay voice configs (and no longer shows "unavailable" rows or error snackbars) when no Relay is configured — relay-backed sections are replaced by a quiet note that speech uses the server's configured TTS/STT, with Relay pairing called out as the way to pick providers from the phone.
-
- **Skills hub opens with featured content.** The browse dialog lists the configured hub sources and the index's featured skills before the first search instead of starting blank.
-
- **Onboarding feature pages got real content.** Chat / Manage / Power tools pages now show three concrete feature rows each (streaming + profiles + voice; control + skills hub + one sign-in; terminal + bridge + realtime) instead of a single sentence.
-
- **Floating status pill.** The bottom status strip is now an inset rounded capsule floating above the gesture area instead of an edge-to-edge bordered bar that clashed with rounded display corners.
-
- **Ambient mode is now a gesture.** The top-bar sphere toggle is gone; long-press the conversation background to enter the fullscreen sphere, tap anywhere to return (a transient "tap to return to chat" pill teaches the exit on entry). Message long-press (copy) is unaffected.
-
- **Media settings labeled Relay-only.** The Media screen now states that its inbound-attachment controls apply to Relay-delivered files only, not to standard connections or images you attach in chat.
-
- **Quote in reply.** Long-pressing a message now offers Copy and "Quote in reply" — quoting drops the message into the input as a Markdown blockquote.
-
- **Share conversation.** A share icon in the chat top bar exports the visible conversation as Markdown through the system share sheet.
-
- **Manage cards declutter.** Cards with five or more actions (profiles) keep the three most-used buttons inline and fold the rest behind "More".
-
- **Ambient gesture is documented in Appearance.** Settings → Appearance now explains the long-press-to-enter / tap-to-return gesture, keeping it discoverable (including for screen-reader users) without a visible control.
-
- **User docs: Quick Start.** New two-minute Quick Start page leads the guide; the dashboard page documents the full phone Manage surface (skills hub, models, keys, profile + SOUL editing); voice docs lead with the standard no-Relay route.
-
- **Routes are now editable in Settings → Connections.** The Routes card gains "Add route" plus per-route Edit/Remove (the primary route mirrors the connection's API URL and stays protected) — the standard path's manual equivalent of the Relay QR's multi-endpoint provisioning. Add your server's Tailscale or public URL after the fact and the phone roams to it automatically; the wizard's optional Tailscale field remains the setup-time shortcut.
-
- **URL fields accept bare hosts and explain their ports.** Typing `100.71.8.56` (or any bare host/IP) into the API URL, wizard Tailscale, or route-editor fields now saves `http://100.71.8.56:8642` — scheme and API port defaulted, and the route editor previews exactly what will be saved ("Will save: http://100.71.8.56:8642") before you commit. Field copy now states which port is which (API `8642`, dashboard `9119`) and that `https://` should only be used when the server actually has TLS. Route rows display the full URL including the scheme, since an invisible `https` was the classic cause of a route that never won a probe.
-
- **Manage remembers its data and pre-warms it.** Dashboard payloads now live in a process-lifetime cache instead of screen state, so leaving and re-entering Manage shows the last data instantly (entries older than 30 s refresh quietly in the background — content stays put, only a thin progress bar shows). When a connection's saved dashboard status says it was reachable and signed in, the app pre-warms all Manage sections at startup (and again after a LAN↔Tailscale route handoff), so even the first open lands on real data. Signing in or out still clears the cache.
-
- **Manage's full load dropped from ~40 round trips to ~12.** Every section fetch used to re-run the dashboard auth preamble (status → providers → session → ws-ticket) before its payload — eight sections, strictly one after another, which over a Tailscale link read as 5–10 seconds of "still loading". The preamble is now fetched once per sweep and shared, and the section payloads download concurrently, so a full load costs roughly one preamble plus one payload's worth of latency.
-
- **Cold start no longer waits 15 seconds to learn there's no API key.** On devices with StrongBox secure hardware (recent Samsungs), every keystore operation takes ~half a second and they all run one at a time — a measured cold start spent 15 seconds decrypting the credential store before the app could even build its HTTP client, only to find the connection had no API key (the normal local setup). A plain non-sensitive "has API key?" hint now lets key-less connections build the client immediately — chat, health, and the conversation restore start within a couple of seconds — while keyed connections still wait for the real decrypt (a stale hint can only ever make startup slower, never strip auth). The startup checks also now count the route prober's successful health probe as "hermes online" instead of waiting for the client-based probe to repeat the same check.
-
- **Startup checks visibly check, and the OS splash blends into the sphere.** The sphere's check lines now resolve strictly top-to-bottom, each holding a brief spinner beat before its ✓ lands — with the fast cold-start path everything could already be true before the sphere faded in, and an all-✓-at-once reveal read as "nothing was actually verified". The gate waits for the ticking to finish (~1.5 s) before showing chat. The system splash (which Android always draws first and can't be replaced) now uses the app's exact background color — the old splash was a visibly different navy — and its icon is properly transparent, so launch reads as one continuous dark screen that the sphere fades into.
-
- **The startup sphere is now the actual loading screen.** Cold starts used to flash a slideshow of half-ready states — the disconnected "connect" prompt, then the connected state, then the conversation, each revealing separately — because the splash gate released on the first health verdict (often a probe against the old route, moments before the resolver switched) and force-hid itself after 5.5 s no matter what. The sphere now holds until the app is presentable — server answering AND the last conversation restored — or until an unreachable verdict survives a settle window (then the normal UI takes over with its offline status), with a 12 s backstop. While it holds, terminal-style check lines narrate progress at the bottom (state restored · route · hermes online · conversation), so a longer wait reads as work instead of a hang.
-
- **Terminal and Settings headers gained back buttons.** Both are pushed destinations (reached from the Chat/Manage header chrome), but neither offered a way back except the system gesture; they now carry the same header back arrow as every other pushed screen. The footer status pill also hugs the bottom edge slightly tighter.
-
- **"Use now" no longer silently becomes a preference.** The Routes card's "Use now" is now a true one-time switch: it moves traffic immediately and holds only until the next disconnect, without touching the saved route preference. Making a route sticky is the explicit "Prefer this route" action in the row's ⋮ menu (now a toggle, with "Stop preferring" when set). The Current line says which mode picked the route — automatic, preferred, or "manual (until disconnect)" — and dedicated "Cancel manual switch" / "Stop preferring" actions undo each layer separately. Tailscale is intentionally not auto-preferred: automatic resolution already promotes it the moment the LAN route stops answering, and keeps the faster LAN path when you're home.
-
- **Manage loading and overview polish.** The cold-load skeleton is now one progress bar plus quiet content-shaped ghost cards — previously four stacked progress bars with fake narrative labels ("Checking dashboard session"…) that read like three different failures. The cryptic KPI glyphs (`ok / … / !`) are replaced by three cards: section count, a tone-colored dashboard state word (ready / sign-in / offline / error), and the server version (handy for confirming which host answered after a route handoff). The dashboard status banner is now two lines — state + identity with Sign out, then URL · route · checked time — so nothing truncates, and its duplicate "Connection" button is gone (the Connections tile sits directly below).
-
- **Manage names its dashboard target and explains per-route sign-in.** The Manage tab now shows exactly which dashboard URL it's talking to ("Dashboard: http://… · Tailscale route") above the content, and "Dashboard unavailable" errors name the URL that failed — the dashboard (`:9119`) is a separate server from the API (`:8642`), so "chat works" never proved Manage's target was reachable. When the resolver has moved Manage onto a different host (e.g. roamed to Tailscale), the sign-in card now explains that dashboard sign-ins are per host and a one-time sign-in on this route keeps both sessions — the same hint voice already had.
-
- **Remote access is discoverable, not an easter egg.** The standard setup form now shows a "Remote access — Tailscale URL (optional)" field in the main flow (previously buried under Advanced), with a hint when Tailscale is detected on the phone; the setup result card gains a "Remote" readiness line that calls out LAN-only connections; the "Hermes API unreachable" status now diagnoses the likely cause ("Away from the server's network? Add a Tailscale or public route") instead of just reporting; and the Connections card offers an "Add Tailscale route" shortcut when the phone is on Tailscale but the connection has no Tailscale route.
-
- **README + Play listing refresh.** Both rewritten around the standard-first story. The README quick start now mirrors the app's capability card (Chat / Manage / Voice / Remote / Relay), voice is no longer described as relay-only, Manage and remote access become headline features, the desktop CLI section is trimmed and clearly marked alpha (with its planned refocus into a remote "hands" connector), and the stale CI badge, broken in-page anchors, and version-pinned "What's new in v0.6.0" section are gone. The Play listing (`docs/play-store-listing.md`) gets an end-user-first short description, a quick-start beat, Manage/remote-access feature blocks, a corrected no-plugin voice story, and v0.8.1 release notes.
+- **Much faster cold start.** The app was building several hardware-keystore-encrypted stores at launch, which serialize on a process-global lock and stalled the chat header (model, personality, approvals) for seconds. It now builds a single keyset and the dashboard cookies share it, cutting measured time-to-connected from ~2.9 s to ~1 s after first frame, with the keystore lock contention gone. Existing sign-ins are migrated automatically on first launch.
+- **Honest loading, never stale, never hidden.** Model, personality, and approvals now show a brief "checking…" state and fade in once the server confirms them, instead of popping in or showing a possibly-wrong value. Standard upstream controls (Model, YOLO, Fast, reasoning effort) are no longer hidden while loading or when unavailable — they always appear: a live control when ready, "checking…" while a value loads, or a cleanly disabled control with the reason (e.g. "available over the gateway transport") when this connection can't use them. The chat composer's reasoning-effort chip now shows alongside the model chip instead of lagging seconds behind the gateway check, and picker lists (models, personalities) show a brief, bounded "loading…" cue. The same fade-in is applied to the context meter, session drawer, and Manage panels.
+- **Tidier chat header.** The LAN/Tailscale chip was dropped from the top bar (the bottom status strip already shows the route, and is now tappable to open Connections), and a `none` personality is no longer shown — leaving more room for the model name.
+- **Connection toast reads like the cold-start screen.** The floating connection status toast now shows a live checklist — Route / API / Relay each with a spinner, ✓, or ✕ as the checks land — instead of flat text, matching the splash screen's stepper. Swiping it up now tracks your finger (slide + fade) rather than snapping, and connection problems get an explicit "Open Connections →" link at the bottom so the path to the detailed view is obvious.
+- **Tidier chat header.** The "approvals off" warning moved out of the agent subtitle into a single amber ⚡ icon in the top bar (tap for the full explanation in the agent sheet), and Share folded into a ⋮ overflow menu — so the personality · model subtitle no longer gets clipped by the trailing action icons.
+- **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.
+- **"Standard" is now "Vanilla Hermes" throughout.** The user-facing name for the no-plugin upstream path is now **Vanilla Hermes**, so it's clear the default path runs on a plain Hermes agent.
+- **QR pairing degrades gracefully on unusual cameras.** On foldables and devices where the camera can't initialize, the scanner now shows a "camera unavailable — pair manually" card instead of force-closing.
+- **Image & attachment viewers rotate to landscape.** The full-screen image / attachment viewers can rotate to landscape even though the rest of the app stays portrait-locked.

 ### Fixed

- **App-start UI freeze (frozen sphere) from Keystore lock contention.** Cold starts could freeze the UI for many seconds (logcat: `Skipped 1386 frames`, `Davey! duration=11596ms`): every `EncryptedDashboardCookieStore` eagerly built its Keystore-backed prefs in its constructor — a 1–4 s operation on StrongBox devices that serializes through a process-global Tink lock — and several code paths (Manage section loads, connection validation, the Manage pre-warm) each constructed their own instance, stacking multi-second lock holds that main-thread keystore users then queued behind. The store now builds lazily on first cookie access (always an I/O thread), all dashboard-surface consumers share one cached instance per connection, and the pre-warm uses a single client plus the shared store for its whole sweep instead of one of each per section.
+- **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.
+- **In-chat model switch now applies mid-conversation, not just on new chats.** Picking a model in an already-started chat switches the live session in place — the same path the desktop/TUI `/model` uses — instead of racing into a global-default write, so the turn runs the model you picked.
+- **Server-side turn errors always surface.** A failed turn (e.g. a provider rejecting the request) now stays on screen as an error bubble with the message, instead of appearing for a moment and then vanishing when the conversation reconciled after the turn.
+- **The model shown in chat matches the live session.** The chat header and the agent detail sheet now show the model the current session is actually running (reflecting a mid-session switch) rather than the profile/global default, and the agent sheet no longer pairs the global default model name with the session's provider — it now also names the host's "Server default" when the session runs something different.
+- **Server steering markers no longer appear as chat bubbles.** The "[System: the active model/personality changed]" notes the server injects into history for the agent's benefit are hidden from the transcript by default (matching the desktop/TUI); a new "Show system messages" debug toggle in Chat Settings can reveal them.
+- **Per-reply token counts (and other per-message details) survive the post-turn reload.** The input/output token subtext, provenance badges, tapped-card state, and voice/realtime sync traces are now preserved when the conversation reconciles against the server after a turn — previously a normal reply lost its token line once the turn finished (the error bubble kept it only because errored turns skip that reload). The reloader now preserves client-only message details by default instead of dropping any it doesn't re-derive from the server.
+- **PDF viewer no longer crashes when the document closes mid-render.** A PDF preview that was torn down during a layout pass could read a closed renderer and throw `IllegalStateException: Document already closed`; the renderer is now guarded so it returns nothing instead of crashing.
+- **No crash opening a chat with a server-local image.** Rendering a relay-fetched image could throw `ClassCastException: kotlin.Result cannot be cast to byte[]` because a `suspend` function returned `kotlin.Result` (which collides with the coroutine machinery's own wrapper); a purpose-built result type fixes it.
+- **Side-loaded avatars and sphere skins are reachable again.** Both loaders read internal storage while the docs (correctly) pointed `adb push` at external app-scoped storage, so a side-loaded pet or skin never appeared. Both now resolve through one external-preferred location, so the documented install path works.
+- **Reopened chats paint the session's real model** (not the profile/global default), the model-picker "Server default" caption shows the true default rather than the active override, and a chat's media badge shows only when paired — with the underlying server-image fetch-failure reason surfaced when a fetch fails.

- **"Re-check" / "Use now" no longer fail silently.** When every saved route failed its probe, the user-triggered re-probe early-returned without publishing anything: the Routes card sat on "Current: Resolving" forever (showing the internal relay URL underneath, which read as "stuck on the internal route") with zero feedback. The probe now always publishes its outcome, the card states "No route reachable — using saved URL …" explicitly, and per-route rows show why each candidate failed. The old 100 ms post-probe delay — always shorter than a real resolve, leaving the follow-up health checks pointed at the stale route — is replaced by actually awaiting the resolve.
+## [1.1.0] - 2026-06-16

- **Standard (no-Relay) connections now follow LAN ↔ Tailscale network changes.** The ADR 24 network-aware route switching only activated when a Relay socket was open: the connectivity callback registered inside `connect()` and bailed without a socket URL, so a standard connection that left home Wi-Fi kept probing the dead LAN route until the app was backgrounded and reopened. The callback now registers at construction and re-resolves routes (debounced) even with no socket — chat, Manage, and standard voice follow the resolved endpoint automatically.
+### Added

- **Standard voice follows the resolved route.** The standard voice client and its availability probe targeted the connection's persisted dashboard URL instead of the resolver's active route, so voice stayed pinned to the LAN host (and gated off) while away from home even after chat had switched to Tailscale. Both now ride `effectiveDashboardUrl`.
+- **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.

- **Stale probe cache can't pin a dead route.** App-resume and network-change revalidation now clear the endpoint resolver's probe cache, so a route that died moments ago can't win re-resolution for the remainder of its 60-second positive cache window. The periodic health check also escalates two consecutive unreachable probes into a full cache-cleared re-resolve — the safety net for handoffs Android never surfaces as connectivity changes (always-on VPN keeps "internet available" true throughout).
+### Changed

- **Editing URLs no longer wipes fallback routes.** Saving an API or Relay URL rebuilt the connection's route-candidate list from just the edited URL, silently dropping the setup wizard's Tailscale route (or extra endpoints from a pairing payload). Edits now merge: the touched route is rebuilt, stored extras are preserved verbatim.
+- **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.

- **Per-route sign-in is explained.** Dashboard sessions are cookie-based and per-host, so a Manage sign-in at home doesn't carry to the Tailscale host. When voice is gated on sign-in because the route moved, Voice Settings and the chat mic toast now say so ("sign in once in Manage on this route") instead of showing a bare sign-in nag that looks broken.
+### Fixed

- **A network change can no longer resurrect a deliberately disconnected relay socket.** The route-switch path force-reconnected whenever the resolved winner differed from the last URL, even after an explicit Disconnect; socket actions are now gated on reconnect intent while route publication for HTTP surfaces continues.
+- **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.
+
+- **Gateway warm-start + Keep connected in background.** Pre-warming the gateway on foreground moves the cold session-setup cost off the send path. An opt-in foreground-service toggle (both flavors; `specialUse`, off by default) holds the socket open in the background so a long-backgrounded conversation resumes instantly.
+
+- **Switch agent profiles from chat.** Pick a different agent — model, SOUL, personality, and skills — per conversation. The selection is **ephemeral** (bound to the session like the official desktop; it never changes the server's default agent for other clients). The session drawer scopes to the active profile and loads that profile's history, and the right agent is restored on cold start. The Manage tab's server-wide **Activate Profile** action now confirms first.
+
+- **Manage parity with the desktop dashboard.** 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 for an instant cold launch.
+
+- **Open & save chat images and attachments.** Tap an image for a full-screen viewer (pinch-zoom, double-tap, Share/Save); non-image attachments gain an Open/Share/Save menu. Saves land in `Pictures`/`Download/Hermes-Relay` with no permission on Android 10+, preserving the original bytes.
+
+- **Persistent Realtime Agent voice + background runs (ADR 33).** The realtime engine keeps one session across turns (follow-ups retain context); a long Hermes run is promoted to a tracked background task and spoken when ready, so the conversation stays responsive.
+
+- **Redesigned chat input bar.** A Telegram-clean pill field with one trailing button that morphs between Send / Voice / Stop / Steer / Queue; the slash button is gone (typing `/` still opens autocomplete).
+
+- **Routes card reachability verdicts** ("Reachable", or the specific failure reason) and per-turn **latency tracing** (`TurnLatency`, durations only) for diagnosing transport speed.
+
+### 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.
+
+- **Editable, roaming routes.** Add/edit/remove routes in Settings → Connections; bare-host URLs default their scheme and port (and preview what will be saved); remote-access (Tailscale) is surfaced in the main setup flow with a "Remote" readiness line.
+
+- **Faster Manage.** A shared auth preamble plus concurrent payloads cut a full load from ~40 round trips to ~12; a process-lifetime cache and startup pre-warm render the last-seen data instantly, and Manage now names which dashboard URL it's talking to.
+
+- **Faster, calmer cold start.** Key-less connections skip the multi-second keystore decrypt; the startup sphere is now the actual loading screen with narrated check lines, and the OS splash blends into it.
+
+- **Docs + branding.** The docs site was rechromed to the app theme and repositioned around the two-path story; the README and Play listing were refreshed standard-first; product-name copy normalized to **Hermes-Relay**.
+
+- **Quality-of-life.** Quote-in-reply, share-conversation-as-Markdown, ambient mode as a long-press gesture, a floating status pill, decluttered Manage cards, back buttons on pushed screens, and a softer active-connection card.
+
+### Fixed
+
+- **No "Connect to Hermes" flash on cold start.** The empty-state now distinguishes "still hydrating from disk" from "nothing configured" (`ConnectionStore.isHydrated` → `chatConnectState`), showing a quiet "Connecting to Hermes…" spinner until ready and the connect CTA only once hydration confirms no connection exists.
+
+- **In-app What's New renders cleanly** — parsed into a version subtitle, bold section headers, and real bullets instead of raw text with literal `*`.
+
+- **App-start UI freeze from Keystore lock contention.** The encrypted cookie store built its StrongBox-backed prefs eagerly in its constructor (1–4 s under a process-global lock) from several code paths at once; it now builds lazily on an I/O thread and is shared per connection.
+
+- **Standard connections now follow LAN↔Tailscale changes**, standard voice follows the resolved route (not the persisted URL), and a stale probe cache can no longer pin a dead route after a handoff or resume.
+
+- **Editing a URL no longer wipes fallback routes** (edits merge with stored extras instead of rebuilding from the edited URL alone); **"Re-check" / "Use now" no longer fail silently** (the probe always publishes its outcome and per-route failure reasons); and a network change can no longer resurrect a deliberately disconnected relay socket.

 ## [0.8.1] - 2026-05-26

@@ -128,7 +175,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.

@@ -220,7 +267,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/), and this

 - **Desktop CLI alpha.14 — `Ctrl+A ?` chord re-displays the chord-help banner.** The attach-time banner scrolls off as soon as anything writes to the terminal, so users mid-session forgot the verb list and had to detach + re-attach (or guess). New `Ctrl+A ?` (and `Ctrl+A h` synonym) reprints the banner to stderr without leaving the session. Banner text refactored into a single `CHORD_HELP` constant so the attach-time print, the `?` chord, and the unknown-chord hint can't drift out of sync. Unknown-chord hint now also lists `?` as one of the known verbs.

- **Desktop CLI alpha.13 — `Ctrl+A v` chord in `hermes-relay shell` for in-session paste.** Bailey: *"This isn't cohesive — we have to exit hermes-relay shell to run `hermes-relay paste`. Can we leverage a tmux hook?"* Tmux runs on the Linux server with no path back to the Windows clipboard, so server-side hooks can't help — but the existing client-side chord state machine (`Ctrl+A .` detach, `Ctrl+A k` kill, `Ctrl+A Ctrl+A` literal) is the right place. Added `Ctrl+A v`: client reads its own clipboard image (same `captureClipboardImage()` path as the `/paste` REPL command), POSTs to `/clipboard/inbox` via the new shared `stageClipboardImageToInbox(url, token)` helper exported from `commands/paste.ts`, then types `/paste\r` into the PTY so the upstream Hermes TUI consumes it in the same flow the user would have typed by hand. Status line goes to stderr so it doesn't pollute the PTY stream: `[shell] pasted 1920×1080 (245 KB) → /paste`. Reentrancy guard prevents double-stage on a fast double-press. Banner help and chord doc-comment updated to list the new verb.
+- **Desktop CLI alpha.13 — `Ctrl+A v` chord in `hermes-relay shell` for in-session paste.** Reported gap: *"...we have to exit hermes-relay shell to run `hermes-relay paste`. Can we leverage a tmux hook?"* Tmux runs on the Linux server with no path back to the Windows clipboard, so server-side hooks can't help — but the existing client-side chord state machine (`Ctrl+A .` detach, `Ctrl+A k` kill, `Ctrl+A Ctrl+A` literal) is the right place. Added `Ctrl+A v`: client reads its own clipboard image (same `captureClipboardImage()` path as the `/paste` REPL command), POSTs to `/clipboard/inbox` via the new shared `stageClipboardImageToInbox(url, token)` helper exported from `commands/paste.ts`, then types `/paste\r` into the PTY so the upstream Hermes TUI consumes it in the same flow the user would have typed by hand. Status line goes to stderr so it doesn't pollute the PTY stream: `[shell] pasted 1920×1080 (245 KB) → /paste`. Reentrancy guard prevents double-stage on a fast double-press. Banner help and chord doc-comment updated to list the new verb.

 ### Fixed

@@ -230,9 +277,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/), and this

 - **Android connection/profile state no longer leaks across switches.** Connection switches now clear the outgoing profile object immediately, load the destination connection's saved profile name only after that connection is active, and resolve it against the destination server's current profile list. The default local relay URL is now `ws://localhost:8767`, and auto-managed relay URLs are derived from the active API URL before reconnecting.

- **Desktop CLI alpha.12 — install scripts truncated the prerelease suffix in the "upgrading X → Y" line.** Bailey saw `existing install detected: 0.3.0-alpha.9 — upgrading to 0.3.` (literally truncated mid-token). Root cause: `normalize_pinned_version` (bash) and `Get-NormalizedPin` (PowerShell) stripped everything after the first `-`, including `-alpha.N`. Comment claimed this was "for comparison against the bare semver the binary reports" — but since alpha.4, the binary's `--version` reports the FULL semver (via the embedded `gen:version` constant), so the strip is no longer defensive, just lossy. Removed the suffix-strip from both normalizers; both now produce `0.3.0-alpha.11` from `desktop-v0.3.0-alpha.11`. The equality compare at line 138 still works because both sides include the prerelease tail.
+- **Desktop CLI alpha.12 — install scripts truncated the prerelease suffix in the "upgrading X → Y" line.** A user saw `existing install detected: 0.3.0-alpha.9 — upgrading to 0.3.` (literally truncated mid-token). Root cause: `normalize_pinned_version` (bash) and `Get-NormalizedPin` (PowerShell) stripped everything after the first `-`, including `-alpha.N`. Comment claimed this was "for comparison against the bare semver the binary reports" — but since alpha.4, the binary's `--version` reports the FULL semver (via the embedded `gen:version` constant), so the strip is no longer defensive, just lossy. Removed the suffix-strip from both normalizers; both now produce `0.3.0-alpha.11` from `desktop-v0.3.0-alpha.11`. The equality compare at line 138 still works because both sides include the prerelease tail.

- **Desktop CLI alpha.11 — `hermes-relay update` (and the install one-liners) saw the wrong "latest" release.** Bailey on alpha.9 ran `hermes-relay update --check`, expected to see alpha.10, got "Up to date." Root cause: GitHub's `/repos/.../releases` API returns rows ordered by the release object's `created_at`, NOT by SemVer of the tag — and `created_at` shifts whenever the row is touched (re-tag, manual edit, asset replacement). When alpha.9's release row got touched after alpha.10 was tagged, the API listed alpha.9 first and all three of our resolvers blindly took `[0]`. Fix: pick the SemVer-max from all desktop-v* tags explicitly. (1) `desktop/src/updater.ts` — `desktop.reduce((max, r) => compareVersions(r.tag_name, max.tag_name) > 0 ? r : max)`. (2) `desktop/scripts/install.sh` — `sort -V | tail -1` (zero new deps; bash + sort is sufficient). (3) `desktop/scripts/install.ps1` — custom `Sort-Object` comparator that packs (Major, Minor, Patch, PrereleaseRank, PrereleaseNum) into a zero-padded sortable string with alpha=1, beta=2, rc=3, stable=999. Live-verified against the real API: all three now return `desktop-v0.3.0-alpha.10` instead of `alpha.9`.
+- **Desktop CLI alpha.11 — `hermes-relay update` (and the install one-liners) saw the wrong "latest" release.** On alpha.9, `hermes-relay update --check` expected to see alpha.10 but reported "Up to date." Root cause: GitHub's `/repos/.../releases` API returns rows ordered by the release object's `created_at`, NOT by SemVer of the tag — and `created_at` shifts whenever the row is touched (re-tag, manual edit, asset replacement). When alpha.9's release row got touched after alpha.10 was tagged, the API listed alpha.9 first and all three of our resolvers blindly took `[0]`. Fix: pick the SemVer-max from all desktop-v* tags explicitly. (1) `desktop/src/updater.ts` — `desktop.reduce((max, r) => compareVersions(r.tag_name, max.tag_name) > 0 ? r : max)`. (2) `desktop/scripts/install.sh` — `sort -V | tail -1` (zero new deps; bash + sort is sufficient). (3) `desktop/scripts/install.ps1` — custom `Sort-Object` comparator that packs (Major, Minor, Patch, PrereleaseRank, PrereleaseNum) into a zero-padded sortable string with alpha=1, beta=2, rc=3, stable=999. Live-verified against the real API: all three now return `desktop-v0.3.0-alpha.10` instead of `alpha.9`.

 - **Desktop CLI alpha.10 — `hermes-relay paste` always returned "No image on clipboard" on Windows even when an image was present.** Root cause: the PowerShell invocation in `captureClipboardWindows` (`src/chatAttach.ts`) was missing the `-STA` flag. `powershell.exe -Command` defaults to MTA (Multi-Threaded Apartment), and `[System.Windows.Forms.Clipboard]::GetImage()` only returns a valid image from STA threads — from MTA it silently returns null, indistinguishable from "no image present." Also affects the `chat` REPL's `/paste` command which routes through the same Windows code path. Fix: added `-STA` to the powershell args list (now `['-NoProfile', '-NonInteractive', '-STA', '-Command', ps]`). Live verification: empty clipboard returns null; a cyan 100×80 PNG placed via `[System.Windows.Forms.Clipboard]::SetImage` returns the expected 305-byte capture with correct dimensions. Affects `desktop-v0.3.0-alpha.7` through `desktop-v0.3.0-alpha.9`.

@@ -254,9 +301,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
@@ -306,13 +353,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/), and this

 ### Changed

- **Top-bar connection chip → inline switcher in the Agent sheet.** The app-wide `ConnectionChip` row that used to sit above every primary tab has been removed. Multi-connection switching now renders as a radio list inside the existing Agent sheet's Connection section (matching the visual pattern of the Profile and Personality sections above it), visible only when ≥2 connections are paired. Tapping a non-active connection fires `switchConnection` + a confirmation toast. Reasons: the chip duplicated the Agent sheet's Connection metadata, ate vertical space above every screen, and exposed the placeholder's `New connection…` label whenever an orphan existed (the root cause of Bailey's double-pair confusion). Dead code removed: the `ConnectionChip` import, the `connectionSheetVisible` state, the `ConnectionSwitcherSheet` render block at the bottom of `RelayApp`, and the `connectionChipVisible` / `activeConnection` vals. `ConnectionSwitcherSheet.kt` itself is kept for future programmatic callers.
+- **Top-bar connection chip → inline switcher in the Agent sheet.** The app-wide `ConnectionChip` row that used to sit above every primary tab has been removed. Multi-connection switching now renders as a radio list inside the existing Agent sheet's Connection section (matching the visual pattern of the Profile and Personality sections above it), visible only when ≥2 connections are paired. Tapping a non-active connection fires `switchConnection` + a confirmation toast. Reasons: the chip duplicated the Agent sheet's Connection metadata, ate vertical space above every screen, and exposed the placeholder's `New connection…` label whenever an orphan existed (the root cause of the double-pair confusion). Dead code removed: the `ConnectionChip` import, the `connectionSheetVisible` state, the `ConnectionSwitcherSheet` render block at the bottom of `RelayApp`, and the `connectionChipVisible` / `activeConnection` vals. `ConnectionSwitcherSheet.kt` itself is kept for future programmatic callers.

 ### Added

 - **Card-dispatch → server session sync** (completes ADR 26). Every [HermesCardDispatch] now carries a `syncedToServer` idempotency flag; on the next chat send, `CardDispatchSyncBuilder` synthesizes unsynced dispatches into OpenAI-format `assistant`+`tool` pairs under a namespaced synthetic tool name `hermes_card_action` and splices them into the request body alongside the existing voice-intent synthetic messages. `ChatHandler.markCardDispatchesSynced` commits the flag after the API client accepts the request — same post-handoff timing as voice intents, so a thrown request-building exception leaves both streams retryable. Guarantees the LLM sees prior card interactions ("you approved the `Run shell command?` card") across server restarts and reconnects, including `open_url` dispatches that never go through `sendMessage`. Unit-tested under `CardDispatchSyncBuilderTest` (pure-function JVM tests, no Android deps).
 - **Rich cards in chat via `CARD:{json}` inline markers** (ADR 26). Assistant messages can now surface structured Material 3 cards — skill results, approval prompts, link previews, calendar entries, weather — emitted as a single-line `CARD:{...}` alongside prose text. Follows the same streaming-endpoint-agnostic marker recipe as `MEDIA:`, so it works unchanged on `/v1/runs`, `/api/sessions/{id}/chat/stream`, and `/v1/chat/completions`. New `HermesCard` data class (`@Serializable`, `ignoreUnknownKeys=true` so newer agent schemas don't crash older phone builds) carries `title` / `subtitle` / `body` (markdown) / `fields` / `actions` / `footer` / `accent` (`info`/`success`/`warning`/`danger`). Built-in types: `skill_result`, `approval_request`, `link_preview`, `calendar_event`, `weather`; unknown types render via a generic fallback. `approval_request` intentionally mirrors Slack's exec-approval pattern (Allow / Deny with primary/danger button styles) so upstream Phase B adapter parity is a translation exercise, not a data-model rethink. Action dispatch (`send_text` default, `slash_command`, `open_url`) routes through `ChatViewModel.dispatchCardAction`, which stamps a `HermesCardDispatch` on the owning message before forwarding so the card collapses into a "Chose: X" confirmation even if the side effect fails. Renderer is `HermesCardBubble.kt` — accent stripe + Icon + Title/Subtitle + markdown body + fields table + FlowRow of action buttons. Cards render between the assistant's prose and any attachments in `MessageBubble`.
- **CI test jobs advisory on `dev`, strict on `main`.** Both `.github/workflows/ci-android.yml` (`test`) and `.github/workflows/ci-server.yml` (`unit-tests`) now carry `continue-on-error: ${{ github.ref != 'refs/heads/main' && github.base_ref != 'main' }}` — tests still run on every dev push/PR and surface annotations and reports, but they no longer red-gate the merge. Lint stays strict on both branches (Bailey's call: lint debt should still block). The release-merge PR from `dev` → `main` flips tests back to strict, so nothing sneaks through to a tagged release.
+- **CI test jobs advisory on `dev`, strict on `main`.** Both `.github/workflows/ci-android.yml` (`test`) and `.github/workflows/ci-server.yml` (`unit-tests`) now carry `continue-on-error: ${{ github.ref != 'refs/heads/main' && github.base_ref != 'main' }}` — tests still run on every dev push/PR and surface annotations and reports, but they no longer red-gate the merge. Lint stays strict on both branches (deliberate: lint debt should still block). The release-merge PR from `dev` → `main` flips tests back to strict, so nothing sneaks through to a tagged release.
 - **MorphingSphere on the docs site.** New `SphereMark.vue` component (in `user-docs/.vitepress/theme/components/`) renders a 58×34 sphere directly above the "Install in 30 seconds" block — mounted in the `home-hero-after` slot alongside `InstallSection` for a hero → sphere → install stack. Imports `preview/web/sphere.js` directly so `MorphingSphereCore.kt` remains the single source of truth across app / preview / docs. The cursor reactivity is **eye-only** — the sphere body stays anchored while the bright-spot gaze tracks the pointer (no canvas translate / body bounce). Gaze composition: **scroll-tracking is the always-on baseline** — the eye anchors to the Install section's top edge (via `.install-section` DOM query), not to the viewport center. `installGap = installRect.top − viewportH` is the runway until install enters view; as it shrinks below 50 % viewport-height, `scrollVy` ramps linearly to 1, so by the time install's top crosses into the viewport the eye is already looking straight down at it. Before that runway, the eye sits forward (`scrollVy = 0`). **Cursor-tracking is a soft overlay** — inside a rectangular detection band (full viewport width × container height, linear falloff over 1.0 × container height past the top/bottom edges) the cursor's unit-vector direction crossfades into the scroll target via `cursorWeight`. The eye always has one coherent target — no mode switching, no fbm drift fighting the cursor at the band boundary, no eye-flip between modes. Palette retarget Idle ↔ Listening is gated on `cursorWeight` (0.2 / 0.5 hysteresis) so the sphere reads as *calmly watching* at the scroll baseline and *attentive* on direct hover. A tiny fbm wander (±0.07 on top of the target) keeps the eye breathing when both scroll and cursor are stationary. Fallback when the install element isn't on the page: viewport-center reference preserves the gaze-follows-scroll feel without the anchor. Pointer inputs pass through a per-frame EMA low-pass (180 ms direction / 280 ms proximity time constants) before any math runs — stops the per-event jitter from `pointermove`'s big discrete jumps; asin/acos inputs are capped at ±0.9 so we stay off the infinite-slope end of the inverse-trig curves. Canvas is square (`aspect-ratio: 1 / 1`, `clamp(280px, 48vw, 420px)`) so the sphere fills the frame at the algorithm's natural 0.60-envelope sizing — no dead space between the phone video and the Install block. Respects `prefers-reduced-motion` (zeroes the gaze blend so the eye stops tracking but the ambient animation continues), pauses drawing while scrolled off-screen via `IntersectionObserver`, and resizes via `ResizeObserver` on the container. SSR-safe without a `<ClientOnly>` wrapper — `sphere.js` has no side-effectful imports and all DOM access lives inside `onMounted`, which Vue 3 never runs on the server.
 - **`SphereFrame` gaze-bias fields in `MorphingSphereCore.kt` (mirrored in `sphere.js`).** New `lightAngleBiasX`, `lightAngleBiasY`, `lightAngleBlend` (all default 0f / 0) let callers aim the sphere's bright spot at a specific direction without touching the sphere body. The light-angle computation blends between the natural `t * lightSpeedX + noise` rotation (`blend = 0`) and the caller-supplied bias (`blend = 1`). Defaults preserve byte-identical behavior for every existing caller — Android `MorphingSphere.kt` composable, the parity test, and the JS parity harness all stay green because they never set the new fields. First consumer: `SphereMark.vue` on the docs site, which uses the bias to make the sphere's eye track the reader's cursor without bouncing the canvas.
 - **`SphereFrame.shadowStrength`** (mirrored in `sphere.js`, default 0f / 0). Darkens `distBrightness` on the hemisphere facing away from the light, scaling it by `(1 − shadowStrength · (1 − directionalLight))` — the lit side is untouched, the shadow side dims proportionally. At 0 the legacy uniform "pearl" shading is preserved byte-for-byte. Docs-site `SphereMark.vue` uses 0.6 so the eye reads clearly against the unlit half of the sphere; Android composable doesn't set it and stays on legacy shading.
@@ -689,7 +736,7 @@ sees the toggle, never installs the wake lock, and never invokes

 ### Added — Voice intent → server session sync (v0.4.1 fast-follow)

- **Voice actions now reach the server-side LLM's session memory.** Previously, phone-local voice intents (`open Chrome`, `text Sam saying hi`, etc.) ran in-process via `BridgeCommandHandler.handleLocalCommand` and appended local-only trace bubbles to the chat scroll. The Hermes API server's session never learned about them, so a follow-up text question like "did that work?" hit the LLM with no context and returned hallucinated answers (per Bailey's 2026-04-14 on-device repro).
+- **Voice actions now reach the server-side LLM's session memory.** Previously, phone-local voice intents (`open Chrome`, `text Sam saying hi`, etc.) ran in-process via `BridgeCommandHandler.handleLocalCommand` and appended local-only trace bubbles to the chat scroll. The Hermes API server's session never learned about them, so a follow-up text question like "did that work?" hit the LLM with no context and returned hallucinated answers (per a 2026-04-14 on-device repro).
 - **Implementation.** Each phone-local voice intent now records a structured `VoiceIntentTrace` (tool name, JSON args, success, JSON result envelope) on the post-dispatch chat-trace bubble it produces. `VoiceIntentSyncBuilder` walks the chat history before each `POST /v1/runs` / `POST /api/sessions/{id}/chat/stream` call and synthesizes OpenAI-format `assistant` (with `tool_calls`) + `tool` (with `tool_call_id`) message pairs from any unsynced traces. The synthesized array rides under the existing payload's new `messages` field — additive, ignored by older servers, picked up by anything OpenAI Chat Completions–shaped. Idempotency: traces flip to `syncedToServer=true` the moment the API client takes ownership of the request, so subsequent turns don't re-emit them.
 - **Zero server changes.** Frontend-only, no hermes-agent edits needed.
 - **Files.** `data/ChatMessage.kt` (new `voiceIntent: VoiceIntentTrace?` field), `voice/VoiceIntentSyncBuilder.kt` (pure-function builder + helpers), `network/HermesApiClient.kt` (optional `voiceIntentMessages` parameter on both stream methods), `viewmodel/ChatViewModel.kt` (build + sync + flag flip in `startStream`), `viewmodel/VoiceViewModel.kt` (extended dispatch callback wires the structured trace into the chat-trace bubble), `voice/VoiceBridgeIntentHandler.kt` (new `androidToolName` + `androidToolArgsJson` on `IntentResult.Handled`), sideload `VoiceBridgeIntentHandlerImpl.kt` populates them per intent, sideload + googlePlay `VoiceBridgeIntentFactory.kt` typealias updates. Tests in `test/voice/VoiceIntentSyncBuilderTest.kt` (12 cases — empty input, single success, failure with error_code, idempotency, chronological order, prefix gate, blank-args gate, call-id pairing, helpers) and `test/network/handlers/ChatHandlerTest.kt` (4 new cases for trace storage + `markVoiceIntentsSynced`).
@@ -1271,7 +1318,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
@@ -4,24 +4,26 @@

 ## 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. Vanilla Hermes 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. Vanilla Hermes 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)     [vanilla Hermes gateway chat, live thinking]
+Phone (HTTP/SSE) -> Hermes API Server (:8642)    [vanilla Hermes chat fallback, sessions, runs]
+Phone (HTTP)     -> Hermes dashboard (:9119)     [vanilla Hermes 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 Vanilla Hermes path must stay upstream-only. API-server bearer auth and dashboard cookie auth are separate. Terminal and bridge require Relay pairing; Vanilla Hermes chat, Manage, and dashboard voice must not.

 ### Upstream Hermes API Reference

 **IMPORTANT:** Always verify endpoints against the actual hermes-agent source (`gateway/platforms/api_server.py`). The upstream repo is the source of truth — not our docs, not our memory, not assumptions from other frontends.

-**Standard endpoints (confirmed in hermes-agent source):**
+**Vanilla Hermes endpoints (confirmed in hermes-agent source):**

 | Endpoint | Purpose | Tool Call Format |
 |----------|---------|-----------------|
@@ -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 |
@@ -63,9 +65,9 @@ The Android client probes per-endpoint capability via `HermesApiClient.probeCapa

 **Dashboard web server (separate surface — standard Manage / Desktop remote gateway):**

-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.
+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 **Vanilla Hermes (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. 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, Vanilla Hermes 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 SSE 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,9 +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
+- **Vanilla Hermes path = upstream-only.** The default (no-plugin) connection path — gateway/API chat, Manage, and Vanilla Hermes 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

@@ -92,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/
@@ -115,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
@@ -124,11 +131,23 @@ hermes-android/
 ## Project Conventions

 ### File Structure
- **Root-level:** README.md, CLAUDE.md, AGENTS.md, DEVLOG.md, .gitignore
+- **Root-level:** README.md, CLAUDE.md, AGENTS.md, DEVLOG.md, TODO.md, .gitignore
 - **docs/** — spec, decisions, security, and any other long-form documentation
- **DEVLOG.md** — update at end of each work session with what was done, what's next, blockers
+- **DEVLOG.md** — update at end of each work session with what was done + verification (the factual record of *what happened*). It churns; do NOT park forward work here.
+- **TODO.md** — the single home for follow-ups / deferred work / known gaps ("what's next"). Record them here — never buried in DEVLOG or scattered through code/doc comments where they get lost.
 - **CLAUDE.md hygiene:** Key Files entries must stay one line — implementation detail belongs in the file or `docs/`. Run `/revise-claude-md` after feature-heavy sessions to trim drift.

+### Public-repo writing hygiene
+
+This is a **public, distributed repo** — every committed file (CHANGELOG, DEVLOG, README, docs, release notes) is public-facing. Write accordingly:
+
+- **No personal names** in prose — attribute impersonally ("a user reported", "observed"). Author identity lives in git history + the signing cert, not the changelog.
+- **No private infrastructure** — real server hostnames/IPs, internal deployment names, `~/SYSTEM.md` contents. (Generic example IPs like `192.168.1.100` in setup docs are fine.)
+- **No AI/assistant process self-narration** — no "I should have…", no course-correction confessionals. State the technical conclusion, not the path to it.
+- **No internal jargon / fork-branch plumbing** in user-facing notes — keep *what changed*, drop *where we staged it*.
+- **CHANGELOG** uses Keep-a-Changelog grouping (Added / Changed / Fixed). Detail may accumulate during iteration, but at **release-prep the version block is condensed to crisp public bullets** (1–2 lines each) — deep "how we debugged it" stays in commits/DEVLOG. See [RELEASE.md](RELEASE.md) §2 "Scrub for public distribution".
+- **DEVLOG.md** is a committed, factual engineering log — what changed, why, and verification — depersonalized and third-person, not a diary.
+
 ### Code Style — Android (Kotlin)
 - **Jetpack Compose** — no XML layouts. Material 3 / Material You.
 - **kotlinx.serialization** — not Gson. Type-safe, faster.
@@ -155,14 +174,14 @@ hermes-android/
 - **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

@@ -170,14 +189,22 @@ hermes-android/
 |------|-----|
 | `docs/spec.md` | Full specification — protocol, UI layouts, phases, dependencies |
 | `docs/decisions.md` | Architecture decisions — framework choice, channel design, auth model |
-| `AGENTS.md` | Tool usage patterns for the `android_*` toolset |
-| `docs/mcp-tooling.md` | MCP server setup — android-tools-mcp + mobile-mcp |
+| `AGENTS.md` | Universal agent entry point — points here + the non-negotiables (standard-path, commits, writing hygiene) |
+| `docs/mcp-tooling.md` | MCP server setup — android-tools-mcp + mobile-mcp; `android_*` tool usage patterns |
 | **App — Core** | |
 | `ui/RelayApp.kt` | Main scaffold — bottom nav, Compose navigation |
 | `viewmodel/ChatViewModel.kt` | Chat orchestration — send, stream, cancel, slash commands |
 | `viewmodel/ConnectionViewModel.kt` | Dual connection model (API + relay); `resolveStreamingEndpoint()`; derived `relayUiState` flow + `markPaired` hook stamp the active Connection |
 | `viewmodel/RelayUiState.kt` | Shared sealed state for the relay row — 5 cases + `asBadgeState()` / `statusText()` extensions; 5s grace window before Stale |
 | `network/HermesApiClient.kt` | Direct HTTP/SSE — `sendRunStream()`, `sendChatStream()`, `probeCapabilities()` |
+| `network/GatewayChatClient.kt` | Gateway chat transport — JSON-RPC over dashboard `/api/ws` (tui_gateway); live `reasoning.delta`; fresh ws-ticket per connect; per-turn SSE fallback via `onPreflightFailure`; `prewarm()` (connect+resume off the send path); `setKeepAliveInBackground()` suppresses the 120s idle-close |
+| `network/GatewayKeepAliveService.kt` | Opt-in `specialUse` foreground service (BOTH flavors; declared in main manifest; Play needs a Console FGS declaration) holding the process up so the gateway socket survives background/Doze; driven by ConnectionViewModel from the `KEY_GATEWAY_KEEP_ALIVE` toggle; stops on task-removal |
+| `data/GatewayKeepAlivePrefs.kt` | Shared `KEY_GATEWAY_KEEP_ALIVE` pref key + `Context.setGatewayKeepAlive()` — used by ConnectionViewModel (StateFlow/setter) and the FGS Stop action |
+| `network/GatewayEventMapper.kt` | Pure-JVM gateway event→callback mapping for one turn; unknown event types silently ignored; tui_gateway usage-key translation |
+| `network/GatewayModels.kt` | `GatewayAvailability`, `ActiveTurnHandle`, `GatewayTurnCallbacks` (all members REQUIRED — forces dispatchOn main-thread wrap), `GatewayAsk`, `GatewaySubagentEvent`, `resolveStreamingEndpointPreference()` |
+| `ui/components/ChatInputBar.kt` | Redesigned input bar — pill field, one trailing slot morphing Send/Voice/Stop/Steer/Queue, no slash button (long-press + opens palette) |
+| `ui/components/SubagentLane.kt` | Per-taskIndex subagent progress lane — guide rail, compact tool rows, auto-collapse |
+| `notifications/TurnCompleteNotifier.kt` | Turn-complete local notification when backgrounded — channel `chat_turn_complete`, cancel on resume, settings-gated |
 | `network/ConnectionManager.kt` | WSS to relay with auto-reconnect; rebuilds OkHttpClient with fresh CertPinner on connect |
 | `network/ChannelMultiplexer.kt` | Envelope routing by channel; `sendNotification()` for notification outbound |
 | `network/handlers/ChatHandler.kt` | Chat message state, streaming events, tool annotation parser |
@@ -216,12 +243,16 @@ hermes-android/
 | `user-docs/.vitepress/theme/components/SphereMark.vue` | Docs-site sphere embed — imports `preview/web/sphere.js` directly; autonomous fbm drift + pointer-proximity gaze/state blend; `<ClientOnly>` + `IntersectionObserver` + `prefers-reduced-motion` aware |
 | **App — Media + Notifications** | |
 | `util/MediaCacheWriter.kt` | `cacheDir/hermes-media/` LRU writer; returns FileProvider URIs |
-| `ui/components/InboundAttachmentCard.kt` | Discord-style attachment card for images/video/audio/pdf/text/generic |
+| `util/MediaSaver.kt` | Save/share/open for chat media — MediaStore scoped-storage save (Pictures/Download `Hermes-Relay`, no perms on API 29+; pre-Q → share sheet); FileProvider share staging; remote-byte fetch; magic-byte image-MIME sniff for correct extensions |
+| `ui/components/ChatImageViewer.kt` | Full-screen image viewer — pinch-zoom/pan (`detectTransformGestures`), double-tap 1×/2.5×, Share/Save/Close; `ChatImageViewerSource` decouples Coil-model/bitmap display from a suspend `bytesProvider` so Save keeps original bytes |
+| `ui/components/InboundAttachmentCard.kt` | Discord-style attachment card for images/video/audio/pdf/text/generic; image tap → ChatImageViewer, file card long-press → Open/Share/Save menu |
+| `ui/components/ChatImageContent.kt` | Parses `![alt](src)` out of assistant content; remote http(s) → Coil (tap → ChatImageViewer), server-local/failed → inline "can't render" notice with the path |
 | `data/HermesCard.kt` | `CARD:{json}` envelope (ADR 26) — type/accent/fields/actions; kotlinx.serialization |
 | `ui/components/HermesCardBubble.kt` | Rich-card renderer — accent stripe + FlowRow actions + dispatch stamp collapse |
 | `viewmodel/CardDispatchSyncBuilder.kt` | Twin of VoiceIntentSyncBuilder — synthesizes card dispatches as `hermes_card_action` OpenAI pairs for session memory |
 | `notifications/HermesNotificationCompanion.kt` | NotificationListenerService; cold-start buffer (50); forwards via ChannelMultiplexer |
 | `util/RelayErrorClassifier.kt` | `classifyError(Throwable, context) → HumanError`; used by Voice/Chat/Connection |
+| `util/TurnLatencyTracer.kt` | One `TurnLatency` INFO line per chat turn — `warm/cold` + `connect/session/submit/ttfe/ttft/done@…ms`; gateway + 3 SSE paths use it for desktop-comparable latency diagnosis; durations only |
 | **Relay — Server** | |
 | `plugin/relay/server.py` | Canonical relay — WSS + HTTP routes; bridge, media, voice, session, pairing handlers. `handle_pairing_mint` mirrors `pair.py:762` — top-level = API server, `relay.{url,code}` nested |
 | `plugin/relay/auth.py` | PairingManager, SessionManager, RateLimiter; `math.inf` for never-expire |
@@ -236,9 +267,12 @@ hermes-android/
 | `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 |
@@ -284,10 +318,17 @@ hermes-android/
 | **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` |
+| `app/src/test/.../screenshots/StoreScreenshotTest.kt` | Roborazzi host-side store/docs screenshot renderer — deterministic, no device, exact 1080×2160; reuses real components+chrome with mock data; `capture(name, themeId){…}` renders any view; see `docs/screenshot-automation.md` §Deterministic rendering (JDK-21 + no-plugin gotchas) |

 ## What NOT to Do

@@ -296,7 +337,8 @@ hermes-android/
 - **Don't use Ktor for networking** — OkHttp for WebSocket
 - **Don't use plaintext WebSocket** — `wss://` only, even in development
 - **Don't put documentation in root** — long-form docs go in `docs/`
- **Don't forget DEVLOG.md** — update it
+- **Don't forget DEVLOG.md** — update it (record *what happened*)
+- **Don't bury follow-ups** — deferred work / known gaps go in `TODO.md`, never in DEVLOG or one-off code/doc comments

 ## MCP Tooling

@@ -335,7 +377,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`.
@@ -354,6 +396,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. Vanilla Hermes 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
@@ -372,20 +420,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` | Vanilla Hermes 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/*` | Vanilla Hermes dashboard surface; do not proxy through Relay |
+| Vanilla Hermes voice | Dashboard `POST /api/audio/transcribe`, `POST /api/audio/speak` | Vanilla Hermes 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` |
@@ -396,6 +449,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 |
@@ -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.
@@ -96,6 +96,16 @@ We follow [Conventional Commits](https://www.conventionalcommits.org/): `feat:`,

 Release-prep commits (version bump, changelog promotion) land on `dev` first, then a surface-specific release PR merges `dev` → `main` with `--no-ff`. Tags are cut from `main` after the merge: `android-vX.Y.Z`, `server-vX.Y.Z`, or `desktop-vX.Y.Z`. See [RELEASE.md](RELEASE.md) for the full release process.

+## Changelog & writing conventions
+
+This is a **public repo** — `CHANGELOG.md`, `DEVLOG.md`, the README, and everything under `docs/` ship publicly. Keep them clean:
+
+- **`CHANGELOG.md`** follows [Keep a Changelog](https://keepachangelog.com/) (Added / Changed / Fixed). Append your change to the `## [Unreleased]` block in the PR. Entries can carry detail while they accumulate, but at release-prep the version block is **condensed to crisp public bullets** (1–2 lines each) — the deep "how we debugged it" narrative belongs in commit messages and `DEVLOG.md`, not the public changelog.
+- **`DEVLOG.md`** is a factual engineering log — what changed, why, and how it was verified. Keep it depersonalized and third-person; it's a record, not a diary.
+- **No non-public wording anywhere committed:** no personal names (attribute impersonally — identity lives in git history), no real server hostnames/IPs or internal deployment names, no AI/assistant process self-narration, no fork/branch plumbing in user-facing notes. Generic example IPs in setup docs are fine.
+
+Release notes (`RELEASE_NOTES.md`, `app/src/main/assets/whats_new.txt`, `docs/play-store-listing.md`) are theme-framed and user-facing; see [RELEASE.md](RELEASE.md) §2 "Scrub for public distribution" for the full checklist.
+
 ## Testing

 - **Android unit tests:** `scripts/dev.bat test` (runs JUnit + MockK + Compose testing)
@@ -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.
@@ -0,0 +1,39 @@
+# Hermes-Relay-Plugin v__VERSION__
+
+**Release Date:** June 20, 2026
+**Since the previous plugin release:** A new, removable **enhancement layer** that lets the relay teach the agent things only the relay knows — starting with sensitive-media classification — plus provider-aware enhanced voice and an isolated, TUI-tuned tmux for relay terminals.
+
+This release adds a clean way for the relay to extend the agent without forking or touching the user's soul/memory. The first use is **sensitive-media classification**: the relay appends a small, auditable system-prompt block teaching the agent to mark private/NSFW media so the paired phone can blur it — with sensitivity staying model-emitted. It's on by default for relay installs (installing the relay is the opt-in), reversible from the dashboard or an env flag, fully visible over a new audit route, and a complete no-op on vanilla upstream. Voice gains provider-aware controls for Gemini and xAI, and relay terminals now run on a dedicated, correctly-configured tmux.
+
+## What's changed
+
+### Added
+- **Relay enhancement layer + agent-context injection.** A reusable, removable layer that injects auditable, fenced blocks into the agent's system prompt at plugin-load. Fail-open at every step (seam absent / block build throws ⇒ base prompt unchanged), config-gated, and a byte-for-byte no-op on vanilla upstream. Built to be retired per-surface as upstream adds a context hook — the same pattern as the bootstrap route shims. See `docs/plans/2026-06-20-relay-enhancement-layer.md`.
+- **Sensitive-media classification (first block).** Teaches the agent to mark private/NSFW media with the client's spoiler convention so the phone blurs it per the user's setting. **On by default for relay installs**; opt out with `RELAY_AGENT_CONTEXT_ENABLED=0` or the dashboard toggle. Sensitivity stays model-emitted — no relay-side or on-device classifier. No soul/memory is touched.
+- **`GET /context/injected` audit route.** The relay exposes exactly what it would inject (loopback-open, bearer-gated remotely), so the injection is never hidden — surfaced in the Android chat "What the agent sees" sheet as "Relay context (server-side)".
+- **Dashboard Agent-context controls.** The Relay management tab gained a master toggle and per-block toggles (labeled experimental / server-side / removable), shown on-by-default for relay installs.
+- **Provider-aware enhanced voice (Gemini + xAI).** `/voice/synthesize` accepts per-request overrides so a paired client can steer a Gemini voice/model with expressive tone tags, or an xAI voice with expressive speech tags, without changing the server's global voice config.
+
+### Changed
+- **Relay terminals run on an isolated, TUI-tuned tmux.** Sessions spawn on a dedicated tmux server/socket with a generated config — `escape-time 0`, truecolor `tmux-256color`, `mouse`/`focus-events` on, `status off` — so editors and full-screen tools behave correctly without touching the user's personal tmux.
+
+### Fixed
+- **Relay voice synthesis no longer leaves temporary audio files behind** on the server.
+- **Clearer voice errors.** Standard voice rejects an over-long recording before uploading and returns a helpful message for audio the server can't read, instead of a generic HTTP error.
+
+## 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.
@@ -1,21 +1,23 @@
 <p align="center">
-  <img src="assets/logo.svg" alt="Hermes-Relay" width="120">
+  <img src="assets/play-store-feature-1024x500.png" alt="Hermes-Relay — your Hermes agent, in your pocket" width="800">
 </p>

-<h1 align="center">Hermes-Relay</h1>
+<p align="center">
+  <strong>Runs on your machine. Lives on your devices.</strong><br>
+  A native Android companion for your <a href="https://github.com/NousResearch/hermes-agent">Hermes agent</a> — streaming chat, hands-free voice,
+  and full agent management. Plus a single-binary CLI that gives the agent hands on any machine you pair.
+</p>

 <p align="center">
-  <strong>Your self-hosted Hermes agent, native on your phone.</strong><br>
-  Chat, voice, and full agent management over your own infrastructure —<br>
-  plus an experimental desktop CLI that gives the agent hands on your computer.
+  <a href="https://play.google.com/store/apps/details?id=com.axiomlabs.hermesrelay"><img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" alt="Get it on Google Play" height="56"></a>
 </p>

 <p align="center">
  <a href="https://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/License-MIT-blue.svg" alt="MIT"></a>
-  <a href="https://developer.android.com"><img src="https://img.shields.io/badge/Surface%201-Android-green.svg" alt="Android"></a>
-  <a href="https://github.com/Codename-11/hermes-relay/tree/main/desktop"><img src="https://img.shields.io/badge/Surface%202-Desktop%20CLI%20%28alpha%29-orange.svg" alt="Desktop CLI (alpha)"></a>
+  <a href="https://developer.android.com/about/versions/oreo"><img src="https://img.shields.io/badge/Android-8.0%2B-3DDC84.svg?logo=android&logoColor=white" alt="Android 8.0+"></a>
  <a href="https://github.com/Codename-11/hermes-relay/actions/workflows/ci-android.yml"><img src="https://github.com/Codename-11/hermes-relay/actions/workflows/ci-android.yml/badge.svg" alt="Android CI"></a>
-  <a href="https://developer.android.com/about/versions/oreo"><img src="https://img.shields.io/badge/Min%20SDK-26-brightgreen.svg" alt="Min SDK 26"></a>
+  <a href="https://github.com/Codename-11/hermes-relay/releases"><img src="https://img.shields.io/github/v/release/Codename-11/hermes-relay?filter=android-v*&label=release&color=8B5CF6" alt="Latest release"></a>
+  <a href="https://github.com/Codename-11/hermes-relay/tree/main/desktop"><img src="https://img.shields.io/badge/CLI-alpha-orange.svg" alt="CLI (alpha)"></a>
 </p>

 <p align="center">
@@ -25,149 +27,208 @@
  <a href="https://hermes-agent.nousresearch.com">Hermes Agent</a>
 </p>

+---
+
+## What it is
+
+Hermes-Relay puts your [Hermes agent](https://github.com/NousResearch/hermes-agent) on the devices you actually carry. The brain stays on your own machine — Hermes-Relay is how you reach it.
+
+- **📱 Android app** — streaming chat, hands-free voice, and the full Hermes dashboard (models, keys, skills, profiles), rebuilt native. On sideload builds, the agent can read your screen and act on it.
+- **⌨️ Hermes-Relay CLI** *(alpha)* — a single binary that gives the agent **hands on any machine you pair**: files, terminal, search, screenshots — consent-gated.
+
+A vanilla [hermes-agent](https://github.com/NousResearch/hermes-agent) install is enough — chat, management, and voice need **no plugin**. Add the optional relay only when you want terminal, phone control, or the CLI's tools. **Pair once from either surface; both work.**
+
 <p align="center">
-  <video src="https://github.com/Codename-11/hermes-relay/raw/main/assets/chat_demo.mp4" poster="https://github.com/Codename-11/hermes-relay/raw/main/assets/chat_demo_poster.jpg" autoplay loop muted playsinline width="280"></video>
+  <img src="docs/diagrams/architecture-homepage.png" alt="How Hermes-Relay connects — Vanilla Hermes (Chat, Manage, Voice) runs with no plugin; the optional Relay plugin adds Terminal, Bridge, relay voice and desktop tools to the app and CLI; Device Control needs the sideload build." width="900">
 </p>

---
-
-## Two surfaces, one pair
-
-| Surface | What | Status |
-|---------|------|--------|
-| **[Android app](#quick-start-android)** | Native phone client — streaming chat, hands-free voice, full agent management (models, keys, skills, profiles), and on sideload builds the agent can read your screen and act on it. | Available — Google Play (Internal testing) + sideload APK |
-| **[Desktop CLI](#desktop-cli-alpha)** | The agent reaching back to **your machine** — local tool routing (files, terminal, screenshots, clipboard) plus a remote shell to the host. | **Alpha** — `desktop-v*` releases, expect heavy changes |
-
-Both share the same WSS relay and credentials store. **Pair once from either, both work.**
-
---
-
 ## Quick Start (Android)

-Install → connect → talk, in about two minutes. A vanilla [hermes-agent](https://github.com/NousResearch/hermes-agent) install is enough — chat, management, and voice need **no plugin**.
+Install → connect → talk, in about two minutes.

-### 1. Install the app
+### 1 · Install the app

- **Google Play** — coming soon (currently on Internal testing)
- **APK** — download the file ending in **`-sideload-release.apk`** from the newest `android-v*` release on [GitHub Releases](https://github.com/Codename-11/hermes-relay/releases) and open it (allow your browser to install unknown apps the first time). Full walkthrough — integrity verification, signing fingerprint, what's in each build — in the [Sideload guide](https://codename-11.github.io/hermes-relay/guide/getting-started.html#sideload-apk).
+- **Google Play** *(easiest — auto-updates)* — [**install from Google Play**](https://play.google.com/store/apps/details?id=com.axiomlabs.hermesrelay). Chat, voice, Manage, terminal/TUI, media, notifications, and relay sessions.
+- **APK** *(full phone-control feature set)* — download the file ending in **`-sideload-release.apk`** from the newest `android-v*` release on [GitHub Releases](https://github.com/Codename-11/hermes-relay/releases) and open it (allow your browser to install unknown apps the first time). Integrity verification, signing fingerprint, and per-build details are in the [Sideload guide](https://codename-11.github.io/hermes-relay/guide/getting-started.html#sideload-apk).

-Sideload builds check GitHub for new releases and show a one-tap update banner when you're behind; Play builds update through the Play Store. See [Release tracks](https://codename-11.github.io/hermes-relay/guide/release-tracks) for the capability matrix.
+Sideload builds check GitHub for updates and show a one-tap banner when you're behind; Play builds update through the Store. See [Release tracks](https://codename-11.github.io/hermes-relay/guide/release-tracks) for the capability matrix.

-### 2. Have Hermes running
+### 2 · Have Hermes running

-Run upstream Hermes with its API server and dashboard enabled:
+The app needs your Hermes **API server enabled and reachable from your phone**, plus an **API key** — the token the app sends to authenticate Chat (pick any value you like). Installing Hermes and choosing a provider is vanilla Hermes setup; the [full walkthrough](https://codename-11.github.io/hermes-relay/guide/getting-started) covers Windows, the dashboard for **Manage**, LAN scan, and QR setup.

 ```bash
-hermes setup --portal
+hermes setup --portal                      # install / log in / pick a provider — skip if already done

 mkdir -p ~/.hermes
-API_SERVER_KEY="$(openssl rand -hex 32)"
+API_SERVER_KEY="$(openssl rand -hex 32)"   # strong random key — or substitute your own memorable value
 cat >> ~/.hermes/.env <<EOF
 API_SERVER_ENABLED=true
 API_SERVER_HOST=0.0.0.0
 API_SERVER_PORT=8642
 API_SERVER_KEY=$API_SERVER_KEY
 EOF
+chmod 600 ~/.hermes/.env

-echo "Android API URL: http://<this-computer-ip>:8642"
-echo "Android API key: $API_SERVER_KEY"
+echo "Android API URL: http://<this-computer-ip>:8642   key: $API_SERVER_KEY"
 hermes gateway
 ```

-Windows commands, dashboard auth notes, and upstream links: [Getting Started](https://codename-11.github.io/hermes-relay/guide/getting-started).
+`API_SERVER_ENABLED` turns the API server on; `API_SERVER_HOST=0.0.0.0` makes it reachable on your LAN (the default is localhost-only); `API_SERVER_KEY` is the bearer token the app sends — **your choice of value**.

-### 3. Connect and talk
+> **Heads up on `0.0.0.0`:** that exposes the API to every device on your network — fine on a trusted home LAN, but off it keep the key set and front it with Tailscale or an HTTPS reverse proxy ([Remote access](https://codename-11.github.io/hermes-relay/guide/remote-access)) rather than exposing it directly. You don't have to type the key on your phone — **Scan for Hermes on LAN**, or have your agent make a setup QR (below). For **Manage** (skills, models, keys), also run the Hermes dashboard — see [Getting Started](https://codename-11.github.io/hermes-relay/guide/getting-started).

-Open the app, choose **Standard Hermes**, and enter your server's address and API key. The wizard probes everything and finishes with a capability card:
+### 3 · Connect and talk
+
+Open the app and pick how to connect — any of:
+
+- **Vanilla Hermes** → tap **Scan for Hermes on LAN** to auto-find the server, then enter your key.
+- **Vanilla 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>","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:

 | Line | What it means |
-|---|---|
+|------|---------------|
 | **Chat** | API server reachable — you can talk |
 | **Manage** | Dashboard found — models, keys, skills, profiles from the phone |
 | **Voice** | Speech ready via your server (or one Manage sign-in away) |
 | **Remote** | Fallback route configured — keeps working away from home |
 | **Relay** | Optional power tools — fine to leave unpaired |

-If your dashboard requires sign-in, do it once under the **Manage** tab — the same session also unlocks voice. That's the whole standard setup.
+If your dashboard requires sign-in, do it once under the **Manage** tab — the same session unlocks voice. That's the whole Vanilla Hermes setup.

-**Going places?** Put your server's Tailscale URL in the setup form's "Remote access" field (or add a route any time under **Settings → Connections → Routes**). The app uses LAN at home and switches routes automatically when you leave. See [Remote access](https://codename-11.github.io/hermes-relay/guide/remote-access).
+> **Going places?** Put your server's Tailscale URL in the setup form's *Remote access* field (or add a route any time under **Settings → Connections → Routes**). The app uses LAN at home and switches routes automatically when you leave. See [Remote access](https://codename-11.github.io/hermes-relay/guide/remote-access).

-### 4. Optional: install Relay for power tools
+### 4 · Optional: install Relay for power tools

 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; if you can't scan, use `hermes pair --register-code ABCD12` with the manual code from Android **Settings → Connections → Advanced**. (`/hermes-relay-pair` and the dashed `hermes-pair` shim remain for chat-surface and older builds.)
+Use the legacy installer instead if you also want the systemd user service,
+shell shims, and the full clone/update workflow:

- **Updating:** `hermes-relay-update` — idempotent; or re-run the install one-liner.
- **Uninstalling:** `bash ~/.hermes/hermes-relay/uninstall.sh` — reverses every step, 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.
+```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+, Python 3.11+ on the server · macOS / Linux / Windows for the desktop CLI.
+**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.

-## Desktop CLI (alpha)
+## Screenshots

-> **Alpha — expect heavy changes.** With [hermes-desktop](https://hermes-agent.nousresearch.com) now covering chat and management on the desktop, this surface is being refocused into a pure remote **"hands" connector**: the agent reaching back through the relay to run tools on your machine (files, terminal, screenshots, clipboard, editor). The chat and shell features that overlap hermes-desktop will be removed in a future release. Binaries are unsigned during the experimental phase — SmartScreen/Gatekeeper warnings are expected.
+<table>
+  <tr>
+    <td align="center" width="25%"><img src="assets/screenshots/01_startup.png" alt="Cold start" width="100%"><br><sub><b>Cold start</b></sub></td>
+    <td align="center" width="25%"><img src="assets/screenshots/02_chat.png" alt="Streaming chat" width="100%"><br><sub><b>Streaming chat</b></sub></td>
+    <td align="center" width="25%"><img src="assets/screenshots/03_voice.png" alt="Hands-free voice" width="100%"><br><sub><b>Hands-free voice</b></sub></td>
+    <td align="center" width="25%"><img src="assets/screenshots/04_sessions.png" alt="Session history" width="100%"><br><sub><b>Session history</b></sub></td>
+  </tr>
+  <tr>
+    <td align="center" width="25%"><img src="assets/screenshots/05_themes.png" alt="App themes" width="100%"><br><sub><b>App themes</b></sub></td>
+    <td align="center" width="25%"><img src="assets/screenshots/06_manage.png" alt="Manage your agent" width="100%"><br><sub><b>Manage your agent</b></sub></td>
+    <td align="center" width="25%"><img src="assets/screenshots/07_connections.png" alt="Connections and routes" width="100%"><br><sub><b>Connections &amp; routes</b></sub></td>
+    <td align="center" width="25%"><img src="assets/screenshots/08_appearance.png" alt="Agent avatar &amp; skins" width="100%"><br><sub><b>Avatars &amp; skins</b></sub></td>
+  </tr>
+</table>

-The agent's brain stays on the host; the CLI lets it call `desktop_read_file`, `desktop_terminal`, `desktop_search_files`, `desktop_screenshot`, `desktop_clipboard_*`, `desktop_open_in_editor`, and more **on your machine** over the same WSS relay — with a one-time consent gate, interactive diff approval for patches, and a `--no-tools` kill-switch. No Node required; installs are self-contained native binaries.
+<p align="center"><sub>▶ <a href="https://codename-11.github.io/hermes-relay/guide/getting-started.html#see-it-working">Watch the demo</a> on the docs site</sub></p>

-**Install** (Windows PowerShell / macOS / Linux):
+## Features
+
+### Android
+
+- **Streaming chat** — rides vanilla 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.
+- **Multi-Connection + profiles** — pair multiple Hermes servers (home + work, dev + prod) and switch in one tap; overlay a profile's model + `SOUL.md` per chat.
+- **Phone control (bridge)** — with Relay paired, the agent reads the screen and acts: tap, type, swipe, scroll, screenshots, clipboard, media keys, batched macros. Guarded by per-app blocklist (banking/2FA blocked by default), destructive-verb confirmation, idle auto-disable, and a full activity log.
+- **Notification companion** — opt-in access so the agent can triage, summarize, and route incoming notifications.
+- **Security & pairing** — QR pairing, Android Keystore session storage (StrongBox-preferred), TOFU cert pinning, per-channel time-bound grants, user-chosen session TTL.
+- **Stats for Nerds** — local-only analytics: TTFT, token usage, stream health, peak-time charts.
+
+> Sideload builds add direct SMS, contact search, one-tap dialing, and location awareness — handy for fully hands-free intents like *"text Sam I'll be 10 minutes late."* See [Release tracks](https://codename-11.github.io/hermes-relay/guide/release-tracks).
+
+## Hands on any machine — the Hermes-Relay CLI&nbsp;<sub>(alpha)</sub>
+
+> **Alpha · Windows today** (macOS / Linux coming soon). A single self-contained binary — no Node required. Binaries are unsigned during the experimental phase, so SmartScreen / Gatekeeper warnings are expected.
+
+The agent's brain stays on the host; the CLI lets it call tools **on your machine** over the same WSS relay — `read_file`, `write_file`, `terminal`, `search_files`, `screenshot`, `clipboard`, `open_in_editor`, and more — behind a one-time consent gate, interactive diff approval for patches, and a `--no-tools` kill-switch.

 ```powershell
 irm https://raw.githubusercontent.com/Codename-11/hermes-relay/main/desktop/scripts/install.ps1 | iex
 ```

-```bash
-curl -fsSL https://raw.githubusercontent.com/Codename-11/hermes-relay/main/desktop/scripts/install.sh | sh
-```
-
 ```bash
 hermes-relay pair --remote ws://<host>:8767   # once
 hermes-relay daemon                            # headless tool router — agent reaches you anytime
-hermes-relay                                   # interactive Hermes TUI in tmux (legacy, being refocused)
 hermes-relay update                            # self-update via GitHub Releases
 ```

- **Docs:** [Desktop guide](https://codename-11.github.io/hermes-relay/desktop/) · [`desktop/README.md`](desktop/README.md)
- **Release track:** tagged `desktop-v*`, [separate from Android](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`

-## Features
+## How It Works

-### Android
+```
+Phone        (HTTP/WSS) --> Hermes Dashboard  (:9119)   [chat gateway, manage, vanilla 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]
+```

- **Streaming chat** — direct SSE to the Hermes API Server with real-time markdown rendering, session history, tool-call visualization, 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 provider keys (write-only, masked, server-rate-limited reveal), create and edit agent profiles including `SOUL.md`, and browse, install, and update skills from the hub. One dashboard sign-in covers it all
- **Voice mode** — talk hands-free 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 providers and an opt-in provider-native Realtime Agent with background task handoff
- **Works away from home** — add your server's Tailscale or public URL and the app roams automatically: LAN at home, fallback elsewhere. Routes are editable per connection, and an unreachable server gets a diagnosis ("away from the server's network? add a route"), not just a red dot
- **Multi-Connection + profiles** — pair with multiple Hermes servers (home + work, dev + prod) and switch in one tap; overlay an agent profile's model + `SOUL.md` per chat
- **Phone control (bridge)** — with the Relay plugin paired, the agent reads the screen and acts on it: tap, type, swipe, scroll, screenshots, clipboard, media keys, batched macros, and event-driven waits. Guarded by safety rails: per-app blocklist (banking/payments/2FA default-blocked), destructive-verb confirmation, idle auto-disable, full activity log
- **Notification companion** — opt-in notification access so the agent can triage, summarize, and route incoming notifications
- **Security & pairing** — QR pairing, Android Keystore session storage (StrongBox-preferred), TOFU cert pinning, per-channel time-bound grants, user-chosen session TTL
- **Stats for Nerds** — local-only analytics: TTFT, token usage, stream health, peak-time charts
+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 Vanilla Hermes
+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.

-> Sideload builds add direct SMS, contact search, one-tap dialing, and location awareness — handy for fully hands-free voice intents like "text Sam I'll be 10 minutes late". See [Release tracks](https://codename-11.github.io/hermes-relay/guide/release-tracks).
+## Documentation

-### Desktop CLI
+| | |
+|---|---|
+| **[User Guide](https://codename-11.github.io/hermes-relay/)** | **Quick start, features, configuration — start here** |
+| [Android](https://codename-11.github.io/hermes-relay/guide/) | Android install + setup + features |
+| [Hermes-Relay CLI](https://codename-11.github.io/hermes-relay/desktop/) | Pairing, subcommands, local tool routing |
+| [Architecture](https://codename-11.github.io/hermes-relay/architecture/) | How the system works under the hood |
+| [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*`, `plugin-v*`, `cli-v*`) |

- **Local tool routing** — `desktop_read_file` / `_write_file` / `_terminal` / `_search_files` / `_patch` / `_clipboard_*` / `_screenshot` / `_open_in_editor` run on your machine; agent-proposed patches render as colored diffs with interactive approval
- **Daemon mode** — headless tool router; the agent can reach you with no shell open
- **Multi-endpoint pairing, reconnect-on-drop, TOFU cert pinning** — same model as the Android app
- **Self-update** — `hermes-relay update` verifies SHA256 and atomic-swaps the binary
+<details>
+<summary><b>Install with an AI agent</b> — paste-ready prompt for Claude / GPT</summary>

-## Install with an AI agent
+<br>

-If an AI assistant (Claude, GPT, etc.) manages your server, paste this block into its chat and it will fetch the canonical setup recipe and walk you through install, pairing, and troubleshooting:
+If an AI assistant manages your server, paste this block into its chat and it will fetch the canonical setup recipe and walk you through install, pairing, and troubleshooting:

 ```text
-You are helping me install and maintain Hermes-Relay (https://github.com/Codename-11/hermes-relay) — a native Android client + a desktop CLI + a Python plugin for the Hermes AI agent platform.
+You are helping me install and maintain Hermes-Relay (https://github.com/Codename-11/hermes-relay) — a native Android client + a CLI + a Python plugin for the Hermes AI agent platform.

 Read the canonical setup recipe before acting:
  https://raw.githubusercontent.com/Codename-11/hermes-relay/main/skills/devops/hermes-relay-self-setup/SKILL.md
@@ -175,131 +236,92 @@ Read the canonical setup recipe before acting:
 Then guide me through:
 - Verifying hermes-agent is already installed (it's a prerequisite — Hermes-Relay is a plugin, not standalone)
 - Running the server-plugin install one-liner: `curl -fsSL https://raw.githubusercontent.com/Codename-11/hermes-relay/main/install.sh | bash`
- Connecting my phone by Standard Hermes API URL/key first, then optionally pairing Relay via the plugin-provided `hermes pair` or `/hermes-relay-pair` for power tools; OR pairing my laptop via the `hermes-relay` desktop CLI (binary one-liner: `curl -fsSL https://raw.githubusercontent.com/Codename-11/hermes-relay/main/desktop/scripts/install.sh | sh` or `irm https://raw.githubusercontent.com/Codename-11/hermes-relay/main/desktop/scripts/install.ps1 | iex` on Windows, then `hermes-relay pair --remote ws://<host>:8767`)
- Verifying with `hermes-status` (server) or `hermes-relay doctor` (desktop CLI)
+- Connecting my phone by Vanilla Hermes API URL/key first, then optionally pairing Relay via `hermes pair` or `/hermes-relay-pair` for power tools; OR pairing my laptop via the Hermes-Relay CLI (`irm https://raw.githubusercontent.com/Codename-11/hermes-relay/main/desktop/scripts/install.ps1 | iex` on Windows, then `hermes-relay pair --remote ws://<host>:8767`)
+- Verifying with `hermes-status` (server) or `hermes-relay doctor` (CLI)

 Always confirm before running shell commands. Never restart hermes-gateway without asking. If any step fails, consult the Troubleshooting section in the SKILL.md and ask me for the exact error.
 ```

 Already installed? The same recipe is auto-loaded as a Hermes skill — invoke `/hermes-relay-self-setup` from any chat for re-setup or "is everything wired correctly?" checks.

-## How It Works
-
-```
-Phone        (HTTP/SSE) --> Hermes API Server (:8642)   [chat — direct]
-Phone        (HTTP)     --> Hermes Dashboard  (:9119)   [manage + standard voice — cookie sign-in]
-Phone        (WSS/HTTP) --> Relay             (:8767)   [terminal, bridge, media, relay voice, sessions]
-Desktop CLI  (WSS)      --> Relay             (:8767)   [desktop tools, tui, terminal]
-```
-
-Chat connects directly to the Hermes API Server with the API key — the same pattern used by Open WebUI and other Hermes frontends. The Manage tab 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, desktop tools, and relay-side voice providers (preferred automatically when paired). One QR can configure API, dashboard, and relay routes without merging their auth models.
-
-## Documentation
-
-| | |
-|---|---|
-| **[User Guide](https://codename-11.github.io/hermes-relay/)** | **Quick start, both surfaces, features, configuration — start here** |
-| [Android](https://codename-11.github.io/hermes-relay/guide/) | Android install + setup + features |
-| [Desktop CLI](https://codename-11.github.io/hermes-relay/desktop/) | Desktop CLI guide — pairing, subcommands, local tool routing |
-| [Architecture](https://codename-11.github.io/hermes-relay/architecture/) | How the system works under the hood |
-| [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 |
-| [Upstream Integration Sync](docs/upstream-integration-sync.md) | Supported Hermes extension points vs server-owned compatibility layers |
-| [Changelog](CHANGELOG.md) | Release history (Android `android-v*`, Server `server-v*`, Desktop `desktop-v*`) |
-
---
+</details>

 ## Development

-### Quick Start
-
-1. **File > Open** the repo root in Android Studio
-2. Wait for Gradle sync
-3. **Run** (Shift+F10) to deploy to emulator or device
-
-### Dev Scripts
-
 ```bash
+# Android: open the repo root in Android Studio, wait for Gradle sync, Run (Shift+F10).
 scripts/dev.bat build      # Build debug APK
 scripts/dev.bat release    # Build signed release APK
 scripts/dev.bat bundle     # Build release AAB for Google Play
 scripts/dev.bat run        # Build + install + launch + logcat
 scripts/dev.bat test       # Run unit tests
 scripts/dev.bat version    # Show current version
-scripts/dev.bat relay      # Start Server (dev, no TLS)
-```
-
-### Repository Structure
-
-```
-hermes-relay/
-├── app/                       # Android app (Kotlin + Jetpack Compose)
-├── desktop/                   # Desktop CLI thin-client (@hermes-relay/cli — TS + Bun-compiled binary)
-├── relay_server/              # WSS Server (Python + aiohttp; thin shim → plugin/relay)
-├── plugin/                    # Hermes agent plugin
-│   ├── relay/                 #   - canonical relay (server.py, channels/, media, voice, desktop tools)
-│   ├── tools/                 #   - android_* bridge + desktop_* tool handlers
-│   └── pair.py                #   - QR pairing CLI + multi-endpoint payload builder
-├── skills/                    # Hermes agent skills
-│   └── devops/
-│       ├── hermes-relay-pair/         # /hermes-relay-pair slash-command skill
-│       ├── hermes-relay-self-setup/   # AI-agent setup recipe (Android + desktop)
-│       └── hermes-relay-desktop-setup/ # AI-agent recipe specifically for the desktop CLI
-├── user-docs/                 # VitePress documentation site (Android + desktop sections)
-├── docs/                      # Spec, decisions, security
-├── scripts/                   # Dev helper scripts
-├── .github/workflows/         # CI + release pipelines (ci-android / ci-server / ci-desktop)
-└── gradle/                    # Wrapper (8.13) + version catalog
+scripts/dev.bat relay      # Start the relay server (dev, no TLS)
 ```

 ### Tech Stack

 | Component | Stack |
 |-----------|-------|
-| **Android App** | Kotlin 2.0, Jetpack Compose, Material 3, OkHttp |
-| **Desktop CLI** | TypeScript, Bun-compiled native binary, Node ≥21 (source/dev), zero runtime deps |
-| **Server** | Python 3.11+, aiohttp |
+| **Android app** | Kotlin 2.0, Jetpack Compose, Material 3, OkHttp |
+| **Hermes-Relay CLI** | TypeScript, Bun-compiled native binary, Node ≥21 (source/dev), zero runtime deps |
+| **Server / plugin** | Python 3.11+, aiohttp |
 | **Serialization** | kotlinx.serialization (Android) |
-| **Build** | AGP 9, Gradle 8.13, JVM toolchain 17 (Android); `tsc` + `bun build --compile` (desktop) |
-| **CI/CD** | GitHub Actions (lint, build, test, APK artifact, desktop binaries per platform) |
-| **Min SDK** | 26 (Android 8.0) / Target SDK 35 |
+| **Build** | AGP 9, Gradle 8.13, JVM toolchain 17 (Android); `tsc` + `bun build --compile` (CLI) |
+| **CI/CD** | GitHub Actions — lint, build, test, APK artifact, CLI binaries per platform |
+| **Min SDK** | 26 (Android 8.0) · Target SDK 35 |

-### Server (optional — bridge, terminal, TUI, media, and relay voice routes)
+<details>
+<summary><b>Repository structure</b></summary>
+
+```
+hermes-relay/
+├── app/                       # Android app (Kotlin + Jetpack Compose)
+├── desktop/                   # Hermes-Relay CLI thin-client (TS + Bun-compiled binary)
+├── relay_server/              # WSS server (Python + aiohttp; thin shim → plugin/relay)
+├── plugin/                    # Hermes agent plugin
+│   ├── relay/                 #   - canonical relay (server.py, channels/, media, voice, machine tools)
+│   ├── tools/                 #   - android_* bridge + desktop_* tool handlers
+│   └── pair.py                #   - QR pairing CLI + multi-endpoint payload builder
+├── skills/devops/             # Hermes agent skills (pairing, self-setup, CLI setup recipes)
+├── user-docs/                 # VitePress documentation site
+├── docs/                      # Spec, decisions, security
+├── scripts/                   # Dev helper scripts
+├── .github/workflows/         # CI + release pipelines (ci-android / ci-plugin / ci-desktop)
+└── gradle/                    # Wrapper (8.13) + version catalog
+```
+
+</details>
+
+<details>
+<summary><b>Running the server / plugin from a clone</b></summary>
+
+<br>
+
+End users should install via the [one-liner](#4--optional-install-relay-for-power-tools) above. For local development:

 ```bash
 hermes relay start --no-ssl          # if you installed the plugin
-# or from a repo checkout:
-python -m plugin.relay --no-ssl
-```
+python -m plugin.relay --no-ssl      # or from a repo checkout

-Or with Docker:
-
-```bash
+# Docker:
 docker build -t hermes-relay relay_server/ && docker run -d --network host --name hermes-relay hermes-relay
-```

-See [docs/relay-server.md](docs/relay-server.md) for TLS, systemd, and full setup.
-
-### Hermes Plugin (for contributors)
-
-End users should install via the [one-liner](#4-optional-install-relay-for-power-tools) above. For local development from a clone:
-
-```bash
-cp -r plugin ~/.hermes/plugins/hermes-relay
-# Or symlink for live edits:
+# Live-edit the plugin against a local Hermes:
 ln -s "$PWD/plugin" ~/.hermes/plugins/hermes-relay
 ```

-Then restart hermes and run the plugin-provided `hermes pair` to verify pairing. The 18 `android_*` and 9 `desktop_*` tools register regardless of hermes-agent version. `/hermes-relay-pair` and the dashed `hermes-pair` shim remain available for chat-surface and older-build compatibility.
+Then restart hermes and run `hermes pair` to verify. The 18 `android_*` and 9 `desktop_*` tools register regardless of hermes-agent version. See [docs/relay-server.md](docs/relay-server.md) for TLS, systemd, and full setup.

-## Hermes Agent
+</details>
+
+## Built for Hermes Agent

 Hermes-Relay is built for [Hermes Agent](https://github.com/NousResearch/hermes-agent) — an open-source AI agent platform by [Nous Research](https://nousresearch.com). See the [Hermes Agent docs](https://hermes-agent.nousresearch.com) for server setup, gateway configuration, and plugin development.

-## Found a bug? Let us know!
+## Found a bug? Let us know

-This is an indie project and every report helps shape where it goes next. If something feels off, broken, or just weird — [open an issue](https://github.com/Codename-11/hermes-relay/issues/new). We read every one, and even a one-line "this didn't work on my Pixel 7" / "the alpha.14 Windows binary segfaults on my Surface" is genuinely useful.
+This is an indie project and every report helps shape where it goes next. If something feels off, broken, or just weird — [open an issue](https://github.com/Codename-11/hermes-relay/issues/new). We read every one, and even a one-line *"this didn't work on my Pixel 7"* is genuinely useful.

 ## Star History

@@ -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,9 +405,43 @@ 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.
+  pasted into the Play Console "What's new" field. Keep the Play
+  "What's new" within **500 characters** and framed around the
+  release's themes, not a feature dump.
+
+#### Scrub for public distribution
+
+This is a **public repo** and these four files are user-facing. Before
+promoting the `[Unreleased]` block and writing the notes, scrub the
+versioned CHANGELOG block and all three release-notes artifacts for
+wording that shouldn't ship publicly. The CHANGELOG accumulates in a
+dev-log voice during the iteration phase — release-prep is where it
+becomes public copy. Check for and remove/rewrite:
+
+- **Personal names / quoted asides** — `git grep -niE "bailey|: \"" CHANGELOG.md`
+  on the new block. Attribute fixes impersonally ("a user reported"),
+  not by name. (Author identity already lives in git + the signing cert.)
+- **Private infrastructure** — server hostnames/IPs, `~/SYSTEM.md`,
+  internal deployment names, anything that should stay in the operator's
+  environment and not the repo. `grep -niE "192\.168|10\.0\.|hermes-host|SYSTEM\.md"`.
+  (Example IPs like `192.168.1.100` in install docs are fine.)
+- **Fork / branch plumbing + internal nicknames** — references to private
+  fork branches, rollout channels, or in-team incident nicknames read as
+  internal. Keep the *what changed*, drop the *where we staged it*.
+- **Personal example data** — genericize sample profile/agent names to
+  neutral placeholders so the copy doesn't expose a specific setup.
+
+The goal is that someone who has never seen the repo can read the block
+and the release notes and learn only what the software does.

 ### 3. Build and verify locally

@@ -425,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:

@@ -490,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

@@ -522,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`:

@@ -544,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.
@@ -570,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

@@ -595,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
@@ -1,44 +1,66 @@
-# Unreleased
+# Hermes-Relay-Android v1.2.0

-## Changed
+**Release Date:** June 20, 2026
+**Since v1.1.0:** A big personalization release — app themes, swappable sphere skins, and animated agent **pets** — paired with a transparency pass (see which transport you're on and exactly what the agent is told), a much faster cold start, in-app crash reporting, and a broad reliability sweep.

- Android now defaults to a standard Hermes layout with **Chat**, **Manage**, and **Settings** in bottom navigation. Terminal and Bridge remain available under **Settings → Power tools** and through existing routes.
- Added a native **Manage** surface backed by the Hermes dashboard/admin API for Skills, Cron, MCP servers/catalog, Profiles, Models, and Config. It supports dashboard sign-in, common management actions, cron run details, and read-only profile SOUL details without requiring relay pairing.
- Relay-only features now show a consistent **Requires pairing** / **Pair to unlock** gate when the active connection is not paired.
- Connections now model API auth, dashboard auth, and relay pairing separately. Dashboard URLs derive from the API host on port `9119` by default.
-
---
-
-# Hermes-Relay-Android v0.8.1
-
-**Release Date:** May 26, 2026
-**Since v0.8.0:** A focused patch fixing a voice-mode crash. No new features.
-
-v0.8.1 is a patch release. If you don't use voice mode with barge-in enabled, v0.8.0 is unaffected — but updating is still recommended.
+v1.2.0 is about making Hermes-Relay feel like *yours* and making it honest about what it's doing. Dress the app in one of eight themes, swap the agent orb for a hand-picked or AI-generated **pet** that reacts to what the agent is doing, and give each profile its own icon. At the same time, the chat status strip now names the actual streaming path (⚡ Gateway, 📡 Sessions, …), a "What the agent sees" sheet shows the exact extra context prepended to your next turn, and cold start is roughly three times faster. If something does go wrong, the app now catches the crash and offers a one-tap, pre-filled bug report.

 ---

 ## Download

-v0.8.1 ships in two Android build flavors. APK and AAB filenames are version-tagged:
+v1.2.0 ships in two Android build flavors. APK and AAB filenames are version-tagged:

 | Flavor | File | Who it's for |
 |---|---|---|
-| Google Play | `hermes-relay-0.8.1-googlePlay-release.aab` | Upload this Android App Bundle to Play Console. It has no AccessibilityService, screen reading, screenshots, gestures, SMS/calls, contacts/location, overlays, wake locks, or unattended phone control. |
-| sideload | `hermes-relay-0.8.1-sideload-release.apk` | Direct-install APK for full Device Control. Installs as `com.axiomlabs.hermesrelay.sideload`. |
-| googlePlay APK | `hermes-relay-0.8.1-googlePlay-release.apk` | Parity/testing artifact. |
-| sideload AAB | `hermes-relay-0.8.1-sideload-release.aab` | Parity/testing artifact. |
+| Google Play | `hermes-relay-1.2.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.2.0-sideload-release.apk` | Direct-install APK for full Device Control. Installs as `com.axiomlabs.hermesrelay.sideload`. |
+| googlePlay APK | `hermes-relay-1.2.0-googlePlay-release.apk` | Parity/testing artifact. |
+| sideload AAB | `hermes-relay-1.2.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.

 ---

-## Fixed
+## Highlights

-### Voice mode crash with barge-in on legacy TTS playback
+### Make it yours

-Starting voice mode with **barge-in enabled** while the relay served audio over the legacy `/voice/synthesize` path crashed the app the instant the agent began speaking — the first word or two played, then the app died with `Player is accessed on the wrong thread`.
+- **App themes.** A theme picker in Settings → Appearance ships eight looks — the signature Hermes Relay brand (full light/dark) plus ports of the Nous Hermes baselines: Hermes Teal, Nous Blue, Midnight, Ember, Mono, Cyberpunk, and Rosé. The whole app follows your choice; Light/Dark/Auto applies to themes that ship both modes.
+- **Agent pets — a living avatar.** Replace the orb with an animated pet that reacts to the agent: idle / thinking / writing / speaking / listening, a distinct **working** pose during tool calls, one-shot **greet** and **celebrate** reactions, and a loop that speeds up as output streams. Add or remove pets right in Appearance (no `adb`), preview each state, tune playback speed, and toggle frame auto-stabilization. Pets are pure data — an AI authoring kit and JSON schema let you generate one from sprite art.
+- **Hot-swappable sphere skins + per-profile icons.** Keep the orb but reskin it (Adaptive, Classic, Aurora, Solar, Mono, or your own JSON skin), and give each agent profile its own small icon beside its name — all client-side, never sent to Hermes.

-The barge-in listener reads the audio session id from a background thread to attach the echo canceller, but Media3's `ExoPlayer` is thread-confined and throws when its `audioSessionId` getter is read off the main thread. `VoicePlayer.audioSessionId` is now backed by a thread-safe cache populated from main-thread playback callbacks, so it's safe to read from any thread.
+### See what's actually happening

-This only affected the **opt-in** barge-in feature on the legacy text-to-speech path; the provider-native Realtime Agent and Voice Output paths were never affected.
+- **Transport path is visible.** The chat status strip now shows which streaming path is in use — ⚡ Gateway (live thinking), 📡 Sessions, Completions, or Runs — and Chat Settings adds a basic→best tier ladder explaining the active path and its fallback.
+- **"What the agent sees" sheet.** Tap the context meter to see the exact extra context prepended to your next turn — persona/profile, phone status, any per-turn voice hint, and (when paired) the relay's own server-side context. The audit is honest about what the phone sends versus what's applied on the server.
+- **Spoken-turn badges + voice render-path visibility.** Voice and Realtime Agent replies carry a chip in the scrollback, and Voice Settings shows whether speech is rendering over the streaming or basic path.
+
+### Privacy
+
+- **Sensitive-media blur.** When paired to the relay, the agent can mark private/NSFW media and the phone blurs it per your setting — sensitivity stays model-emitted (no on-device or relay-side classifier), and the exact instruction is visible in the "What the agent sees" sheet. Vanilla Hermes (no plugin) is unaffected.
+
+### Faster, calmer, more honest
+
+- **~3× faster cold start.** The app was building several hardware-keystore-encrypted stores at launch, serializing on a process-global lock and stalling the chat header for seconds. It now builds a single keyset shared with the dashboard cookies, cutting measured time-to-connected from ~2.9 s to ~1 s. Existing sign-ins migrate automatically.
+- **Honest loading, never stale.** Model, personality, and approvals show a brief "checking…" state and fade in once the server confirms them; standard controls (Model, YOLO, Fast, reasoning effort) always appear — live when ready, "checking…" while loading, or cleanly disabled with the reason — instead of being hidden or showing a maybe-wrong value.
+
+### More reliable
+
+- **In-app crash reporting.** A force-close now surfaces a clean dialog on next launch with the stack trace — Copy it, or **Report** to open a pre-filled GitHub issue from the bug template. The handler re-raises so Play vitals still record the crash.
+- **QR pairing hardened for foldables.** On devices where the camera can't initialize, the scanner shows a "camera unavailable — pair manually" card instead of force-closing.
+- **Crash fixes.** No more crash opening a chat with a server-local image, and the PDF viewer no longer crashes when a document closes mid-render.
+- **Chat correctness.** In-chat model picks now actually apply — both on a new chat and mid-conversation — server-side turn errors stay on screen as an error bubble, per-reply token counts and provenance badges survive the post-turn reload, and server steering markers (`[System: …]`) no longer appear as chat bubbles.
+
+### Voice & terminal polish
+
+- **Enhanced voice control (Gemini & xAI).** When the relay uses a Gemini or xAI voice provider, Voice Settings can pick a voice/model and turn on expressive tone/speech tags. Vanilla Hermes voice stays configured server-side.
+- **Leaner terminal.** A scrollable, fully-legible key bar, TUI-correct arrows and bracketed paste, a compact single-row header, and relay sessions on an isolated, TUI-tuned tmux so editors and full-screen tools behave.
+
+---
+
+## Upgrade notes
+
+- Cold-start speedup migrates the encrypted credential and dashboard-cookie stores automatically on first launch; in rare cases Manage/voice may ask for a one-time re-login (cookies are re-obtainable).
+- App themes, sphere skins, and pets are available on **both** flavors — they're client-side and need no Device Control.
+- `appVersionCode` is **14**.
@@ -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.
@@ -6,60 +6,118 @@ For shipped work, see `DEVLOG.md`. For architectural decisions, see `docs/decisi

 ---

+## User-Added:
+
+- [ ] Enhance the 'clean chat' view mode to allow more a little more vertical visible text area and scrolling within.
+- [ ] Look into the voice-settings profile specific capabilities - confirm approach is sound - verify as I noticed that in 'auto' mode it didn't work, it still used the system default despite config despite override voice chosen being displayed to user in voice config in voice setting in app UI. Only switching to 'Relay' specifically allowed the user-override to work/apply.
+
+- [ ] - analytics and diagnostics pages need cleaned up, improved, enhancements for UI/UX/layout. Diagnostics should have timeline vertical status checks with failure reason etc
+
+- [x] **Per-profile agent icon + static-image avatar (shipped 2026-06-20 — `d827e46`, see DEVLOG).** Per-profile icon: client-side `ProfileIconStore` (per `(connection, profile)`, never sent to Hermes; stores a copied-file path) → small Coil image beside the agent name in `MessageBubble` via `LocalAgentIconPath`; picker is `AgentIconRow` under the local-name row in `ConnectionInfoSheet`. Static image: "Add a pet" accepts a single image (magic-byte detect → one-frame static pet). Scope shipped: small name-adjacent icon only; big avatar stays global. Follow-ups: on-device smoke (import an image as a pet; set a profile icon, confirm it shows by the name + persists across restart); optionally also show the icon in the profile picker.
+
 ## Hands-free agentic voice backlog

 Goal: make Hermes usable for hands-free work without leaving the operator blind
+
 to tool state, safety prompts, or the current task.

 - **Waveform output-start sync** — current input waveform timing feels good, but
-  the agent-output waveform can unfold and begin movement before audible speech
-  starts. Split "preparing audio" from "speaking audio" in the visual layer, or
-  gate the unfolded Speaking waveform on the first real playback frame/audio
-  amplitude. Processing can stay as the folded circular spinner until output is
-  actually audible.
+
+the agent-output waveform can unfold and begin movement before audible speech
+
+starts. Split "preparing audio" from "speaking audio" in the visual layer, or
+
+gate the unfolded Speaking waveform on the first real playback frame/audio
+
+amplitude. Processing can stay as the folded circular spinner until output is
+
+actually audible.
+
 - **Voice command layer** — reserve local commands that bypass normal agent
-  routing: "pause", "resume", "stop talking", "cancel", "repeat that", "open
-  overlay", "return to Hermes", and "new chat". These should work while the
-  agent is thinking, speaking, or using tools.
+
+routing: "pause", "resume", "stop talking", "cancel", "repeat that", "open
+
+overlay", "return to Hermes", and "new chat". These should work while the
+
+agent is thinking, speaking, or using tools.
+
 - **Spoken tool progress** — when Hermes uses tools, voice mode should speak
-  short status updates such as "I'm checking the relay logs" or "I found an
-  error" without waiting for final assistant text. Long tool calls should emit
-  periodic, low-noise progress updates.
+
+short status updates such as "I'm checking the relay logs" or "I found an
+
+error" without waiting for final assistant text. Long tool calls should emit
+
+periodic, low-noise progress updates.
+
 - **Realtime tool timeline parity** — the voice overlay should render the same
-  live thinking blocks, streaming assistant text, and tool call progress as the
-  normal chat surface without requiring exit/reload.
+
+live thinking blocks, streaming assistant text, and tool call progress as the
+
+normal chat surface without requiring exit/reload.
+
 - **Hands-free confirmation flow** — risky actions need first-class spoken and
-  visual confirmation: "yes", "no", "cancel", "confirm", plus a visible and
-  audible countdown for destructive actions.
+
+visual confirmation: "yes", "no", "cancel", "confirm", plus a visible and
+
+audible countdown for destructive actions.
+
 - **Voice session memory/status** — add a compact "where are we?" summary for
-  the current voice task: active objective, last tool result, pending next step,
-  and whether the agent is waiting on the user.
+
+the current voice task: active objective, last tool result, pending next step,
+
+and whether the agent is waiting on the user.
+
 - **Mode presets** — add presets such as Hands-free, Low latency, Careful tool
-  mode, and Quiet/visual-only. Hands-free should favor Continuous listening,
-  spoken tool progress, confirmations, and overlay availability.
+
+mode, and Quiet/visual-only. Hands-free should favor Continuous listening,
+
+spoken tool progress, confirmations, and overlay availability.
+
 - **Barge-in hardening** — keep barge-in experimental until echo/self-recording
-  is solved. The target path is proper AEC, playback-ducking, and a rule that
-  output audio can never become a user turn.
+
+is solved. The target path is proper AEC, playback-ducking, and a rule that
+
+output audio can never become a user turn.
+
 - **Audio quality guardrails** — normalize output volume across realtime and
-  fallback TTS providers, keep pronunciation hints/profile voice tuning, and
-  measure provider-specific delay, chunk gaps, and tail clipping.
+
+fallback TTS providers, keep pronunciation hints/profile voice tuning, and
+
+measure provider-specific delay, chunk gaps, and tail clipping.
+
 - **Pluggable Realtime Agent media transports** — add an OpenAI-first WebRTC
-  transport option for Realtime Agent so mobile audio can use provider-native
-  jitter buffering, interruption, and media handling instead of only relay
-  WebSocket PCM. Design this as a provider transport interface
-  (`websocket`, `webrtc`, future `livekit`/SIP-style bridges) so other
-  realtime providers can opt in without forking the Hermes broker/tool
-  contract. Hermes must still own tools, memory, confirmations, current data,
-  and durable transcript state.
+
+transport option for Realtime Agent so mobile audio can use provider-native
+
+jitter buffering, interruption, and media handling instead of only relay
+
+WebSocket PCM. Design this as a provider transport interface
+
+(`websocket`, `webrtc`, future `livekit`/SIP-style bridges) so other
+
+realtime providers can opt in without forking the Hermes broker/tool
+
+contract. Hermes must still own tools, memory, confirmations, current data,
+
+and durable transcript state.
+
 - **Voice engine selector** — implemented as an opt-in experimental Realtime
-  Agent engine in `docs/plans/2026-05-19-realtime-hermes-voice-agent.md`.
-  Follow-up work is provider-native turn-taking, richer confirmation handling,
-  and quality/latency evaluation before promotion beyond Experimental.
+
+Agent engine in `docs/plans/2026-05-19-realtime-hermes-voice-agent.md`.
+
+Follow-up work is provider-native turn-taking, richer confirmation handling,
+
+and quality/latency evaluation before promotion beyond Experimental.
+
 - **Realtime-native Hermes bridge prototype** — first relay-brokered slice
-  implemented in `docs/plans/2026-05-19-realtime-hermes-voice-agent.md`.
-  Remaining work: let OpenAI/xAI realtime sessions own more of the live speech
-  turn while still proxying every tool, confirmation, memory, and Android bridge
-  action through Hermes/relay safety.
+
+implemented in `docs/plans/2026-05-19-realtime-hermes-voice-agent.md`.
+
+Remaining work: let OpenAI/xAI realtime sessions own more of the live speech
+
+turn while still proxying every tool, confirmation, memory, and Android bridge
+
+action through Hermes/relay safety.

 ---

@@ -77,7 +135,7 @@ Things to look into:
 - **Skill distribution as separate from plugin distribution** — right now skills ride along with the plugin install via `external_dirs`. Should skills be installable independently (e.g. `hermes skill install <git-url>`)? Would that fragment maintenance or improve reuse?
 - **Tool registration discoverability** — `android_*` tools register at gateway import time. There's no canonical "list installed plugin tools" API. Would adding one to upstream make sense, or is `gateway tool list` already enough?
 - **Versioning + compatibility ranges** — `pip install -e` doesn't enforce version pins between hermes-agent and our plugin. A breaking change in upstream's plugin loader could silently break us. Do we need a `hermes_compat: ">=0.8.0,<1.0.0"` field somewhere?
- **`hermes-relay-self-setup` SKILL.md as a precedent** — we just shipped a self-installing skill that an LLM can fetch from a raw GitHub URL and execute. Does this pattern generalize? Could it become a recommended way for any third-party Hermes project to ship setup automation?
+- `**hermes-relay-self-setup` SKILL.md as a precedent** — we just shipped a self-installing skill that an LLM can fetch from a raw GitHub URL and execute. Does this pattern generalize? Could it become a recommended way for any third-party Hermes project to ship setup automation?
 - **Bootstrap injection** — `hermes_relay_bootstrap/` monkey-patches `aiohttp.web.Application` to inject endpoints into vanilla upstream. This is intentional but feels like a hack. Upstream PR #8556 (`feat/session-api`) will eventually let us delete it — verified 2026-04-15 that its scope covers the full bootstrap surface (sessions, memory, skills, config, available-models). Track that PR's status periodically.
 - **Gateway slash-command preprocessor — upstream Stage 1 PR.** Sibling follow-up to #8556. Intercepts known gateway commands on `/v1/runs` + `/v1/chat/completions`, dispatches the stateless ones (`/help`, `/commands`) via `gateway_help_lines()`, returns a deterministic "use a channel with session state" notice for the stateful majority. Currently being prepared in `C:/Users/Bailey/Desktop/Open-Projects/hermes-agent-pr-prep/` on branch `feat/api-server-gateway-commands`; awaiting subagent's code + draft PR body before pushing. See `docs/upstream-contributions.md` §5.
 - **Gateway slash-command preprocessor — bootstrap middleware (Stage 1 equivalent).** Sibling shim in `hermes_relay_bootstrap/_command_middleware.py` that mirrors the upstream Stage 1 PR as an aiohttp middleware injected at bootstrap time. Ships the hallucination fix to vanilla-upstream installs before the upstream PR lands. Planned for v0.4.1, after the current bridge feature branch wraps. See `ROADMAP.md` v0.4.1 entry.
@@ -94,6 +152,64 @@ When the answer becomes clearer, this section becomes either an ADR in `docs/dec
 - **Wave 3 voice-bridge multi-turn confirmation** — currently a 5s TTS countdown with cancel; conversational confirmation is the follow-up
 - **LLM client wiring for `android_navigate`** — `_default_vision_model` is stubbed; production swap to a real Anthropic/OpenAI vision client
 - **Real screenshots of each flavor's a11y permission dialog** — for `user-docs/guide/release-tracks.md`
- **`llms.txt` standard** — explicitly skipped in favor of the `hermes-relay-self-setup` SKILL.md path; revisit if the standard gains traction in the agent ecosystem
- **`markdown-renderer` 0.40.x API update** — pinned at `0.30.0` in `gradle/libs.versions.toml` because 0.40.2 introduced breaking API changes that `app/src/main/kotlin/com/hermesandroid/relay/ui/components/MarkdownContent.kt` hasn't been updated for. Specifically: `markdownColor()` drops `codeText`/`linkText`, `MarkdownCodeBlock`/`MarkdownCodeFence` inner lambdas now take a 3rd `TextStyle` arg, and `MarkdownHighlightedCode`'s 3rd param is now `TextStyle` instead of `Highlights.Builder`. Dependabot auto-merged the bump on 2026-04-13 which silently broke CI; reverted for the v0.3.0 release. Update requires reading the new library API docs and testing in Studio — not a blind fix. Consider adding a dependabot ignore rule for `markdown-renderer` major bumps until this is handled.
+- `**llms.txt` standard** — explicitly skipped in favor of the `hermes-relay-self-setup` SKILL.md path; revisit if the standard gains traction in the agent ecosystem
+- `**markdown-renderer` 0.40.x API update** — pinned at `0.30.0` in `gradle/libs.versions.toml` because 0.40.2 introduced breaking API changes that `app/src/main/kotlin/com/hermesandroid/relay/ui/components/MarkdownContent.kt` hasn't been updated for. Specifically: `markdownColor()` drops `codeText`/`linkText`, `MarkdownCodeBlock`/`MarkdownCodeFence` inner lambdas now take a 3rd `TextStyle` arg, and `MarkdownHighlightedCode`'s 3rd param is now `TextStyle` instead of `Highlights.Builder`. Dependabot auto-merged the bump on 2026-04-13 which silently broke CI; reverted for the v0.3.0 release. Update requires reading the new library API docs and testing in Studio — not a blind fix. Consider adding a dependabot ignore rule for `markdown-renderer` major bumps until this is handled.
 - **Dependabot auto-merge guardrails** — Dependabot merged breaking bumps despite CI failing. Investigate why `.github/workflows/dependabot-auto-merge.yml` isn't gating on CI status, and consider adding an ignore rule for packages we know need manual attention on major bumps (`markdown-renderer`, compose BOM, activity-compose).
+
+---
+
+## Crash reporting + foldable hardening (shipped 2026-06-20)
+
+Triggered by a Play Store review: app "keeps crashing" during setup on a Samsung Galaxy Z Fold7 (Android 16 / SDK 36, version code 13). Shipped: in-app crash capture (`util/CrashReporter.kt` — uncaught handler that persists a report then re-raises so Play vitals still collects; `ui/components/CrashReportDialog.kt` — show-once dialog with Copy + pre-filled GitHub-issue "Report"); QR camera-init hardening (`QrPairingScanner.kt` — try/catch around `ProcessCameraProvider.get()` and `InputImage.fromMediaImage()`, graceful `CameraUnavailableCard` → manual pairing instead of force-close).
+
+Follow-ups:
+
+- **Confirm the actual crash from Play vitals.** Pull the top crash cluster for Galaxy Z Fold7 / version code 13 (Quality → Android vitals → Crashes & ANRs) to verify the camera path is the real cause vs. another setup-path throw. The hardening is correct regardless, but the trace closes the loop.
+- **Portrait lock is moot on large screens under SDK 36.** `android:screenOrientation="portrait"` is largely ignored by Android 16's mandatory large-screen orientation override on foldables/tablets. Decide whether to keep the lock (it still applies on phones) or make it conditional; either way it does not *cause* the crash.
+- **Foldable camera lifecycle races (from the 2026-06-20 audit, not yet fixed).** `QrPairingScanner` can still hit bind/unbind races on rapid fold/unfold recomposition (the `DisposableEffect` `unbindAll()` vs. an in-flight `addListener` bind), and `mapBoxToViewport` runs on possibly-stale `viewportSizePx` during a fold transition. Not crash-fatal after the try/catch hardening (logged + skipped), but worth a fold-aware guard if foldable adoption grows.
+- **Optional: surface crash history in Settings.** The reporter keeps only the most recent crash (`files/crash/last-crash.json`, consumed on view). If repeat-crash diagnosis becomes common, keep a small ring of recent reports + a Settings entry to view/copy them.
+
+---
+
+## Relay enhancement layer + agent-context injection (shipped 2026-06-20 — `docs/plans/2026-06-20-relay-enhancement-layer.md`)
+
+Shipped: `plugin/enhancements/` (registry + fail-open `context_injection` wrap of `AIAgent._build_system_prompt`), the `media-sensitivity` block, `GET /context/injected` audit route, dashboard toggles, client sensitivity re-thread + "Relay context (server-side)" audit section, and the transport-path UI (`ChatTransportStatusBadge` / `RelayStatusStrip` + tier ladder). OFF by default, removable, vanilla-safe.
+
+Follow-ups:
+
+- **Confirm the `AIAgent` seam on the live host before relying on it.** `context_injection._resolve_ai_agent_class()` tries `agent.system_prompt` / `run_agent`. When you flip `RELAY_AGENT_CONTEXT_ENABLED=1`, verify `GET /context/injected` shows the block AND that it actually lands in the prompt (the wrap is fail-open, so a wrong module = inert, not broken). If the class lives elsewhere, widen the module list.
+- **Retire the monkey-patch when upstream adds a plugin context hook.** Drop `context_injection` (and migrate to the native hook) the moment hermes-agent ships a first-class system-prompt contributor — same as we retire bootstrap routes for native upstream routes.
+- **Incremental bootstrap migration.** Fold the existing `hermes_relay_bootstrap` route-patches into `plugin/enhancements/` per-surface (startup phase) so patching is one surface; don't big-bang the working compat.
+- **Structured media channel** — `docs/plans/2026-06-20-structured-media-channel.md` (design only). Replace fragile `MEDIA:`/markdown text markers with a structured channel carrying `sensitive` natively; lead with a relay `relay_send_media(path, sensitive, …)` tool.
+- **Gateway voice-ephemeral via the same slot.** The enhancement layer's server-side injection can carry per-turn voice instructions on the gateway (which has no ephemeral `system_message`), letting voice stay on the gateway instead of being forced to SSE. Wire when the voice path is revisited.
+
+---
+
+## Attachments (shipped 2026-06-18 — `docs/plans/2026-06-18-attachment-experience.md`)
+
+- **B3 — download progress + cancel.** Inbound fetch is un-cancelable; the previews work scaffolded an indeterminate bar + nullable `onCancel`. Live wiring needs the fetch-path owner (`ChatViewModel`/`Attachment`) to expose determinate progress (Content-Length) + a cancel hook.
+- **A6 — multi-image gallery.** N images in one message → grid + swipe-across viewer (Telegram media-group parity).
+- **C5 — agent-side sensitivity config gate.** `RELAY_MEDIA_SENSITIVITY_HINTS` (env or per-profile) instructing the agent to annotate sensitive media via the prompt-builder. Transport (relay `X-Media-Sensitive` header + client blur) already ships; the agent isn't asked to set the bit yet.
+- **Relay thumbnails (D6).** Server-side thumbnail generation to avoid full-size download for cards/galleries. Needs an image lib (Pillow not currently a dep) — evaluate before adding.
+- **D5 — outbound upload progress.** No per-attachment progress during the 60s gateway PDF-render window.
+
+## Voice overhaul (shipped 2026-06-18 — `docs/plans/2026-06-18-voice-overhaul.md`)
+
+- **Per-profile voice on Standard (upstream PR).** Upstream `/api/profiles/*` has no voice field and `/api/audio/*` is host-global. Long-term: PR a voice section to the profile config + make `/api/audio/*` honor the active/`?profile=` profile. The relay path already carries per-profile voice; ship that first.
+- **Wire connectionId for per-profile voice namespacing.** `VoicePreferencesRepository` is scope-aware (`base_connId_profile`), but `RelayApp` passes only the profile *name* to `onProfileChanged`, so `connectionId` is null and keys namespace by profile-only. Wire `setVoicePrefsConnection` to `ConnectionViewModel.activeConnectionId` (in `RelayApp`) so two connections with same-named profiles don't share voice settings.
+- **Realtime-PCM waveform output gating.** The basic-TTS output waveform is now Visualizer-accurate (gated on real playback amplitude), but the realtime path gates `outputAudioActive` on `audioSeen` (first decoded PCM bytes) in `VoiceViewModel.handleRealtimeVoiceEvent`, which can still lead audible output by the `RealtimePcmPlayer` start prebuffer. Gate realtime on actual playback-start (head moved) to match the basic-TTS path.
+
+## Chat clean-mode + pets (shipped 2026-06-18 — `docs/plans/2026-06-18-chat-clean-mode-and-pets.md`)
+
+- **Part-A chat polish (optional bundle).** Per-code-block copy + horizontal scroll, visible copy affordance, mid-stream stall feedback, profile/skill-aware empty-state chips, the ~40-flow recomposition hotspot at the top of `ChatScreen`. (Sphere `contentDescription`/reduced-motion was handled by the clean-mode a11y work.)
+- **Pet hot-load + in-app add/remove (shipped 2026-06-20).** Pets now live-refresh: an `avatarsRefreshTick` keys the avatar `produceState` in `RelayApp`, and Appearance re-scans `pets/` on open and after in-app import/delete — no app restart. Appearance gained "Add a pet" (SAF `.zip` import via `PetImporter`, zip-slip/zip-bomb guarded + validated through `toAvatar`) and an "Installed pets" list with per-pet remove (`PetLoader.deletePet`, confirm dialog, Sphere fallback). Remaining:
+  - **Sphere-skin parity.** Skins are still process-scoped + `adb push` only — the live tick and the importer cover pets, not skins. Extend the tick to `loadUserSkins` and add a `.json` skin import if hot-loading/adding skins in-app is wanted.
+  - **`adb push` into `Android/data` hangs on Samsung scoped storage.** Confirmed: pushing a pet pack to `/sdcard/Android/data/<pkg>/files/pets/` stalls (no bytes written) although `adb shell ls` of the dir works. In-app `.zip` import is the supported path; `/sdcard/Download` pushes fine. Consider softening `docs/pet-spec.md` + user-docs to lead with in-app import over adb.
+  - **On-device import/delete smoke.** Import `/sdcard/Download/lucy.zip` via Add a pet → confirm Lucy appears, selects, and animates all states; then remove it and confirm the avatar falls back to the Sphere.
+- **Pet state-change re-decode can flash one blank frame.** When the agent state switches clips, the first frame of the new clip may briefly be blank during decode; prewarm/hold-last-frame to smooth it. Root cause is the same as the next item: `PetAvatar.Render` re-decodes from disk on every clip change.
+- **Pet frame-sequence memory: no cap or downsample (audit 2026-06-19).** `decodeClip` decodes every frame of the selected clip into `List<ImageBitmap>` at full resolution with no `inSampleSize` downscale to the display size and no frame-count/dimension ceiling — a long sequence of large PNGs can use a lot of RAM and a single very large image can OOM `BitmapFactory`. Add `inSampleSize` downsampling to the avatar's draw size and/or a documented hard cap. Spec now warns authors (prefer sprite sheets), but the renderer doesn't enforce it.
+- **Pet decoded-clip cache (audit 2026-06-19).** `PetAvatar.Render` keys `produceState` on `clip`, so idle→thinking→speaking→idle within one turn re-runs `BitmapFactory.decodeFile` from disk each transition (repeated I/O + GC churn, and the blank-frame flash above). Add a small per-avatar `Map<SphereState, PetFrames>` decode cache.
+- **Pet behavior model — richer state association (spec'd 2026-06-19, `docs/pet-spec.md` "Agent states & pet behavior").** Shipped: the honesty clamp (declared reactivity ∩ `PET_RENDERER_CAPABILITIES`), the friendly `writing` alias, the `**working`/tool-use overlay** (pet-local sub-state from `toolCallBurst`; opt-in `working` clip drives both the swap and the Tools badge), the **one-shot reaction layer** (`greet`/`wake` on appear, `done`/`celebrate` on turn-finish — opt-in, play-once-then-revert, transition-derived; `ONE_SHOT_MAX_MS` backstop), and `**intensity` modulation** (opt-in `reactive.intensity` → live playback speedup ≤1.6× via `rememberUpdatedState`; un-clamps the Activity badge). Voice · Tools · Activity reactivity is now complete. Remaining:
+  - `**attention` one-shot (only deferred behavior).** A reaction on notification arrival — needs a host event the avatar doesn't yet receive (unlike `greet`/`done`, which ride state transitions). Would plumb a notification edge into `AvatarRenderState` (or a side channel) + a `PetOneShot.Attention`. Low priority: the avatar is rarely on-screen when notifications land (backgrounded) — see the value analysis; revisit only if the avatar becomes an always-on surface (persistent overlay / Quest port).
+  - **On-device verification (working + one-shots + intensity).** Best seen in clean mode (`AgentTextFlow` feeds `toolCallBurst` + `streamingIntensity` + state transitions). Confirm: a `working` clip swaps in during a tool run and releases ~600ms after (`WORKING_BURST_THRESHOLD` 0.5); a `done` clip plays once on reply completion then returns to idle; a `greet` clip plays once when the avatar appears; with `intensity:true`, a writing/working loop visibly quickens while streaming. Watch for the known clip re-decode flash on each swap (separate TODO — decoded-clip cache).
+- **Undecodable-but-present image appears valid (audit 2026-06-19).** A file that exists but isn't a decodable image passes the loader's `isFile` check, so the pet shows in the picker but renders blank. Documented as a caveat; consider a cheap header sniff at load time if false-valid pets become a support issue.
@@ -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")
@@ -166,6 +179,10 @@ android {
        // Robolectric (VoicePlayerTest) needs merged Android resources +
        // manifest on the unit-test classpath to bootstrap its sandbox.
        unitTests.isIncludeAndroidResources = true
+        // [POC] Roborazzi runs without its Gradle plugin (the plugin needs AGP's
+        // removed TestedExtension). Force record mode via the test-JVM system
+        // property the plugin would otherwise inject, so captureRoboImage writes.
+        unitTests.all { it.systemProperty("roborazzi.test.record", "true") }
    }
 }

@@ -185,6 +202,17 @@ kotlin {
    jvmToolchain(17)
 }

+// [screenshots] Host-side screenshot tests render MessageBubble -> MarkdownContent,
+// whose code-highlighter (dev.snipme.highlights) ships Java-21 bytecode. The build
+// toolchain pins test execution to JDK 17, which can't load class-file v65, so run
+// unit tests on a 21 JVM. Compile target stays 17; on-device (dexed) is unaffected.
+// foojay (settings.gradle.kts) auto-provisions the 21 JDK if absent.
+tasks.withType<Test>().configureEach {
+    javaLauncher.set(
+        javaToolchains.launcherFor { languageVersion.set(JavaLanguageVersion.of(21)) }
+    )
+}
+
 dependencies {
    // Compose BOM
    val composeBom = platform(libs.compose.bom)
@@ -230,6 +258,10 @@ dependencies {
    implementation(libs.markdown.renderer.m3)
    implementation(libs.markdown.renderer.code)

+    // Coil 3 — async image loading for generated images in chat
+    implementation(libs.coil.compose)
+    implementation(libs.coil.network.okhttp)
+
    // QR Code scanning (ML Kit + CameraX)
    implementation(libs.mlkit.barcode)
    implementation(libs.camera.core)
@@ -266,8 +298,19 @@ 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)
+
+    // [POC] Roborazzi host-side screenshot rendering (src/test, Robolectric).
+    // Renders real composables on the JVM at an exact canvas — no device, no
+    // status bar, no clipping. See StoreScreenshotTest.
+    testImplementation("io.github.takahirom.roborazzi:roborazzi:1.43.1")
+    testImplementation("io.github.takahirom.roborazzi:roborazzi-compose:1.43.1")
+    testImplementation(libs.compose.ui.test.junit4)
+    testImplementation(libs.compose.ui.test.manifest)
+    testImplementation("androidx.test.ext:junit:1.2.1")
 }

@@ -126,7 +126,7 @@ class OnboardingFlowTest {
        navigateToPage(4)

        composeTestRule
-            .onNodeWithText("Standard Hermes")
+            .onNodeWithText("Vanilla Hermes")
            .assertIsDisplayed()
    }

@@ -135,7 +135,7 @@ class OnboardingFlowTest {
        setOnboardingContent()
        navigateToPage(4)

-        composeTestRule.onNodeWithText("Standard Hermes").performClick()
+        composeTestRule.onNodeWithText("Vanilla Hermes").performClick()
        composeTestRule.waitForIdle()

        composeTestRule
@@ -151,7 +151,7 @@ class OnboardingFlowTest {
        setOnboardingContent()
        navigateToPage(4)

-        composeTestRule.onNodeWithText("Standard Hermes").performClick()
+        composeTestRule.onNodeWithText("Vanilla Hermes").performClick()
        composeTestRule.waitForIdle()

        composeTestRule
@@ -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()
@@ -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()
+    }
+}
@@ -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
@@ -0,0 +1 @@
+en-US
@@ -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.
@@ -0,0 +1 @@
+Your Hermes AI agent, in your pocket - chat, voice, and control.
@@ -0,0 +1 @@
+Hermes-Relay
@@ -0,0 +1,7 @@
+v1.2.0 — Make it yours.
+
+• Eight app themes, swappable sphere skins, and animated agent "pets" that react to what your agent is doing.
+• See which streaming path you're on, plus a "What the agent sees" sheet showing the agent's exact context.
+• ~3× faster cold start and honest loading states.
+• In-app crash reporting with one-tap bug reports.
+• Fixes: QR pairing on foldables, server-image & PDF crashes, in-chat model picks now apply.
@@ -1,11 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">

    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.CAMERA" />
    <uses-permission android:name="android.permission.RECORD_AUDIO" />
    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <!-- Turn-complete chat notification (TurnCompleteNotifier) — runtime-requested
+         on API 33+ from the Chat Settings toggle. Lives in main (not just the
+         sideload overlay) so the googlePlay flavor can notify too. -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
+    <!-- Opt-in "Keep connected in background" (GatewayKeepAliveService). In main
+         (not the sideload overlay) so the googlePlay flavor ships it too — the
+         Home-Assistant-class persistent-connection use case Play permits. The
+         specialUse type requires a one-time Play Console foreground-service
+         declaration at submission. (Also already present in the sideload overlay
+         for the device-control bridge service; the merger dedups.) -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />

    <uses-feature android:name="android.hardware.camera" android:required="false" />

@@ -23,6 +37,8 @@
            android:name=".MainActivity"
            android:exported="true"
            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity"
            android:configChanges="uiMode|fontScale|locale|density|orientation|screenSize|screenLayout|keyboardHidden"
            android:windowSoftInputMode="adjustResize"
            android:theme="@style/Theme.HermesRelay.Splash">
@@ -54,6 +70,20 @@
        </service>
        <!-- === END PHASE3-notif-listener === -->

+        <!-- Opt-in "Keep connected in background" — holds the gateway chat
+             socket open while backgrounded. In main so BOTH flavors ship it
+             (Home-Assistant-class persistent connection). Off by default; only
+             runs while the user has explicitly enabled the toggle. specialUse
+             needs a Play Console foreground-service declaration at submission. -->
+        <service
+            android:name=".network.upstream.GatewayKeepAliveService"
+            android:exported="false"
+            android:foregroundServiceType="specialUse">
+            <property
+                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="Keeps the user's chat connection to their Hermes agent open while the app is backgrounded, only when the user has explicitly enabled 'Keep connected in background'." />
+        </service>
+
    </application>

 </manifest>
@@ -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
@@ -1,7 +1,32 @@
-v0.8.1 - Voice mode crash fix
+v1.2.0 - Make it yours

-Voice
-* Fixed a crash that could hit voice mode when barge-in was enabled on the
-  legacy text-to-speech path — the agent's first words no longer cut off
-  into a crash. Barge-in is opt-in; the Realtime Agent and Voice Output
-  paths were never affected.
+Personalize
+* Eight app themes in Settings → Appearance — the Hermes Relay brand plus
+  ports of the Nous Hermes looks (Teal, Nous Blue, Midnight, Ember, Mono,
+  Cyberpunk, Rosé), with light/dark.
+* Swap the agent orb for an animated pet that reacts to what the agent is
+  doing — add, preview, and tune pets right in the app, or generate one
+  from sprite art with the AI authoring kit.
+* Reskin the sphere, and give each agent profile its own icon.
+
+See what's happening
+* The chat status strip names the actual streaming path (Gateway, Sessions,
+  Completions, Runs), with a basic→best tier ladder in Chat Settings.
+* Tap the context meter for a "What the agent sees" sheet — the exact extra
+  context prepended to your next turn.
+* Voice and Realtime turns are badged in the scrollback.
+
+Privacy
+* When paired to the relay, the agent can mark private media and the phone
+  blurs it per your setting — sensitivity stays model-emitted.
+
+Faster & more reliable
+* Cold start is about 3× faster, and model/personality/approvals load
+  honestly instead of showing a maybe-wrong value.
+* In-app crash reporting offers a one-tap, pre-filled bug report.
+* QR pairing no longer force-closes on unusual cameras (foldables); fixed
+  crashes opening server images and PDFs; in-chat model picks now apply.
+
+Voice & terminal
+* Enhanced voice control for Gemini and xAI providers.
+* Leaner terminal with TUI-correct input and an isolated, tuned tmux.
@@ -1,34 +1,37 @@
 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
+import coil3.network.okhttp.OkHttpNetworkFetcherFactory
+import coil3.request.crossfade
 import com.hermesandroid.relay.bridge.UnattendedAccessManager
 import com.hermesandroid.relay.data.AppAnalytics
 import com.hermesandroid.relay.power.WakeLockManager
 import com.hermesandroid.relay.util.AppForegroundTracker
+import com.hermesandroid.relay.util.CrashReporter

-class HermesRelayApp : Application() {
+class HermesRelayApp : Application(), SingletonImageLoader.Factory {

-    @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)
-    }
+    /**
+     * Coil's singleton image loader for the whole app. Registering the OkHttp
+     * network fetcher EXPLICITLY guarantees `http(s)` image URLs (e.g. a
+     * generated-image link in a chat reply) load, rather than relying on
+     * artifact auto-registration. Crossfade for a clean fade-in.
+     */
+    override fun newImageLoader(context: PlatformContext): ImageLoader =
+        ImageLoader.Builder(context)
+            .components { add(OkHttpNetworkFetcherFactory()) }
+            .crossfade(true)
+            .build()

-    @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
+        // Install the crash handler FIRST so any failure in the rest of app
+        // init (or anywhere later) is captured and surfaced on next launch.
+        CrashReporter.install(this)
        AppAnalytics.initialize(this)
        // A8 — wire the bridge-gesture wake-lock wrapper so
        // ActionExecutor.tap/tapText/typeText/swipe/scroll can hold
@@ -19,8 +19,8 @@ import com.hermesandroid.relay.accessibility.ScreenCaptureRequester
 import com.hermesandroid.relay.bridge.BridgeForegroundService
 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

@@ -37,7 +37,7 @@ class MainActivity : ComponentActivity() {
    // We do NOT call MediaProjectionHolder directly from here. On Android
    // 14+, getMediaProjection() must run from inside a foreground service
    // that has already called startForeground(type=mediaProjection), and
-    // that startForeground call must happen AFTER consent. So we hand the
+    // that startForeground call must happen AFT consent. So we hand the
    // result off to BridgeForegroundService, which:
    //   1. Upgrades its FGS type to SPECIAL_USE | MEDIA_PROJECTION
    //   2. Calls MediaProjectionHolder.acceptGrantInsideForegroundService
@@ -117,9 +117,6 @@ class MainActivity : ComponentActivity() {
        setContent {
            RelayApp()
        }
-        window.decorView.post {
-            ComposeArrWorkaround.disableForViewTree(window.decorView)
-        }
    }

    override fun onNewIntent(intent: Intent) {
@@ -142,6 +139,9 @@ class MainActivity : ComponentActivity() {

    override fun onResume() {
        super.onResume()
+        // Returning to the app clears the one-slot "Hermes finished
+        // responding" notification — the chat surface is the answer.
+        TurnCompleteNotifier.cancel(this)
        // v0.4.1 — register this activity as the host for
        // KeyguardManager.requestDismissKeyguard. Cleared in onPause so
        // we don't leak the Activity past its lifecycle. The unattended-
@@ -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.
     */
@@ -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
@@ -39,7 +39,7 @@ import kotlinx.coroutines.launch
 *
 * # Master enable / disable
 *
- * The Android system toggle in `Settings → Accessibility → Hermes Relay` is
+ * The Android system toggle in `Settings → Accessibility → Hermes-Relay` is
 * the hard switch — if it's off we never receive events. On top of that the
 * user can flip a soft master in Settings (`bridge_master_enabled`); when
 * that's false we still run (Android requires it to stay connected) but we
@@ -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
@@ -38,7 +38,13 @@ import kotlin.math.sqrt
 * The Visualizer is attached exactly once against the ExoPlayer's
 * [ExoPlayer.getAudioSessionId]. There is a known gotcha where re-attaching
 * the Visualizer on every track transition invalidates the session id — the
- * single-attach lifecycle here sidesteps it entirely.
+ * single-attach lifecycle here sidesteps it entirely. The single attach is
+ * triggered by whichever of {playback became live, a real session id landed}
+ * arrives last, so a late AudioTrack allocation (deep-buffer cold-start) can't
+ * leave amplitude pinned at 0 for the turn — see [attachVisualizerIfPlaying].
+ * That promptness matters because the voice overlay gates its output waveform
+ * on the first real playback-amplitude frame, so the visual follows audible
+ * speech instead of leading it.
 *
 * @param context used for [ExoPlayer.Builder]. Application context is fine;
 *   the player holds no view references.
@@ -109,6 +115,21 @@ class VoicePlayer(
                audioSessionId: Int,
            ) {
                cachedAudioSessionId = audioSessionId
+                // Deep-buffer cold-start guard. On some OEM pipelines the
+                // AudioTrack — and therefore a real (non-zero) session id —
+                // isn't allocated until *after* onIsPlayingChanged(true) has
+                // already fired. In that race the isPlaying-driven attach
+                // below ran with id == 0, no-oped, and isPlaying will not
+                // toggle again for the rest of a continuous TTS turn, so the
+                // Visualizer would never attach and [amplitude] would stay
+                // pinned at 0 for the whole turn. The output waveform gates
+                // its unfold on the first real playback-amplitude frame, so a
+                // never-firing amplitude leaves it stuck in the folded
+                // processing/spinner shape even though audio is audible.
+                // Attaching here — the moment a real session id lands while
+                // playback is already live — makes the first-audible-frame
+                // signal reliable regardless of when the track allocates.
+                attachVisualizerIfPlaying()
            }
        })
        exoPlayer.addListener(object : Player.Listener {
@@ -124,11 +145,11 @@ class VoicePlayer(
                    // runs on the main thread too, so reading the getter here
                    // is safe and guarantees the cache is warm by the time
                    // playback is audible (and thus by the time barge-in
-                    // starts its IO reader).
+                    // starts its IO reader). If the id isn't ready yet, the
+                    // analytics callback above re-tries the attach the instant
+                    // it lands (see attachVisualizerIfPlaying).
                    cachedAudioSessionId = exoPlayer.audioSessionId
-                    if (!visualizerAttached) {
-                        attachVisualizer(cachedAudioSessionId)
-                    }
+                    attachVisualizerIfPlaying()
                }
            }

@@ -308,6 +329,24 @@ class VoicePlayer(
        exoPlayer.release()
    }

+    /**
+     * Attach the [Visualizer] iff playback is live and we haven't attached for
+     * this session yet. Idempotent and main-thread-only: both call sites
+     * ([Player.Listener.onIsPlayingChanged] and the [AnalyticsListener]'s
+     * `onAudioSessionIdChanged`) are delivered on the player's application
+     * thread, so the [visualizerAttached] check needs no extra synchronization.
+     *
+     * The delegate [attachVisualizer] still no-ops (without latching
+     * [visualizerAttached]) when the cached session id is 0, which preserves
+     * the retry: whichever of {isPlaying, valid session id} arrives last drives
+     * the single attach. This is the cold-start race fix — see the
+     * `onAudioSessionIdChanged` comment in `init`.
+     */
+    private fun attachVisualizerIfPlaying() {
+        if (visualizerAttached || !_isPlaying.value) return
+        attachVisualizer(cachedAudioSessionId)
+    }
+
    private fun attachVisualizer(audioSessionId: Int) {
        if (audioSessionId == 0) {
            // ExoPlayer returns 0 before the audio track is allocated; retry
@@ -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
@@ -92,6 +92,19 @@ class AuthManager(
     * legacy connection intentionally keeps [Connection.LEGACY_TOKEN_STORE_KEY].
     */
    private val tokenStoreKey: String? = null,
+    /**
+     * When false, [init] skips the eager session-token hydration (and the
+     * keyset decrypt it forces). Used for the throwaway LEGACY SENTINEL manager
+     * that `ConnectionViewModel` builds at field-init and replaces as soon as
+     * the active connection hydrates — decrypting its keyset only to discard it
+     * is a measured ~600 ms of wasted startup keystore work, and on a device
+     * whose active connection isn't connection 0 the sentinel's file has no
+     * token anyway. The real per-connection manager (created via the active
+     * connection, [eagerHydrate] = true) hydrates normally; the
+     * `restorePersistedActiveConnectionContext` path even awaits its
+     * Paired/Failed state. Channel handlers are still registered either way.
+     */
+    private val eagerHydrate: Boolean = true,
 ) : ChannelMultiplexer.ChannelHandler {

    companion object {
@@ -102,6 +115,10 @@ class AuthManager(
        private const val KEY_API_KEY = "api_server_key"
        private const val HINT_API_KEY_PRESENT = "api_key_present"
        private const val KEY_PAIRED_META = "paired_session_meta_json"
+        // Marker (in the connection-0 token store) recording that the one-shot
+        // pre-StrongBox `hermes_companion_auth` → `hermes_companion_auth_hw`
+        // migration has run, so we never rebuild the legacy keyset to re-check.
+        private const val KEY_LEGACY_MIGRATED = "legacy_migrated"
        private const val PAIRING_CODE_LENGTH = 6
        private val PAIRING_CODE_CHARS = ('A'..'Z') + ('0'..'9')

@@ -329,19 +346,29 @@ class AuthManager(
        _store?.let { return it }
        return storeMutex.withLock {
            _store?.let { return it }
-            withContext(Dispatchers.IO) {
-                // Multi-connection: [tokenPrefsName] picks the
-                // EncryptedSharedPreferences filename for the bound
-                // connection. The legacy sentinel keeps the pre-multi-
-                // connection install on its original file so the existing
-                // paired device keeps working with no migration.
-                val picked: SessionTokenStore =
-                    KeystoreTokenStore.tryCreate(context, tokenPrefsName)
-                        ?: LegacyEncryptedPrefsTokenStore(context, tokenPrefsName)
-                migrateFromLegacyIfNeeded(picked)
-                _store = picked
-                picked
+            val picked = withContext(Dispatchers.IO) {
+                // One keyset build per file, process-wide (see [SecureStoreCache]).
+                // The legacy sentinel is deferred (eagerHydrate=false) and the
+                // dashboard cookie store now shares this same file, so the active
+                // connection's token keyset is the ONLY one built on the cold-
+                // start critical path. [tokenPrefsName] picks the file.
+                //
+                // The build decrypts its Tink keyset eagerly, so a corrupt file
+                // can throw AEADBadTagException — KeystoreTokenStore.tryCreate
+                // degrades to null, the legacy store self-heals in its ctor, and
+                // a fundamentally broken keystore falls back to InMemory (the app
+                // stays up; the user re-pairs). See [buildRawTokenStore].
+                val s = SecureStoreCache.getOrBuild(tokenPrefsName) {
+                    buildRawTokenStore(context, tokenPrefsName)
+                }
+                // Migration runs AFTER the (shared) build so the cookie store can
+                // trigger the build without needing token-migration logic; a
+                // marker makes it read the legacy file at most once ever.
+                migrateFromLegacyIfNeeded(s)
+                s
            }
+            _store = picked
+            picked
        }
    }

@@ -353,14 +380,33 @@ class AuthManager(
     */
    private fun migrateFromLegacyIfNeeded(picked: SessionTokenStore) {
        if (picked is LegacyEncryptedPrefsTokenStore) return
-        // Multi-connection: only the legacy connection inherits from the pre-
-        // multi-connection `hermes_companion_auth` file. A freshly-minted
-        // per-connection store must NOT be seeded from the legacy file or
+        // Gate on the FILE, not the connection id. Only the legacy connection-0
+        // file (`hermes_companion_auth_hw`) inherits from the pre-multi-
+        // connection `hermes_companion_auth` file; a freshly-minted per-
+        // connection store (`hermes_auth_<id>`) must NOT be seeded from it or
        // we'd copy connection 0's token into every new connection.
-        if (connectionId != CONNECTION_ID_LEGACY) return
+        //
+        // Why file-gated rather than `connectionId == CONNECTION_ID_LEGACY`:
+        // the store build is now cached/deduped across the legacy sentinel and
+        // the real connection-0 manager, so whichever one builds the file first
+        // runs this migration. Both share `tokenPrefsName == LEGACY_TOKEN_STORE_KEY`
+        // but only the sentinel had `connectionId == CONNECTION_ID_LEGACY`, so
+        // the old id-based gate would skip migration whenever the real manager
+        // won the race — dropping a pre-StrongBox user's token. The file name is
+        // the same for both, so gating on it is race-proof.
+        if (tokenPrefsName != Connection.LEGACY_TOKEN_STORE_KEY) return
+        // Read the legacy file at most ONCE ever. The build is now cache-shared
+        // (and the cookie store can trigger it without migrating), so without
+        // this marker every freshly-rebuilt connection-0 AuthManager would
+        // re-build the legacy `hermes_companion_auth` keyset just to find it
+        // already drained — re-introducing the startup cost we just removed.
+        if (picked.contains(KEY_LEGACY_MIGRATED)) return
        val legacy = try {
            LegacyEncryptedPrefsTokenStore(context)
        } catch (_: Exception) {
+            // Legacy file unreadable/corrupt — nothing to inherit. Still mark
+            // done so its keyset isn't rebuilt on every launch.
+            picked.putString(KEY_LEGACY_MIGRATED, "1")
            return
        }

@@ -384,6 +430,7 @@ class AuthManager(
            // backup copies of the session token lying around.
            legacy.clearAll()
        }
+        picked.putString(KEY_LEGACY_MIGRATED, "1")
    }

    /** Cert pin store — shared across all relay connections. */
@@ -512,24 +559,28 @@ class AuthManager(
        // one-line change in [onMessage].
        multiplexer.registerHandler("pairing", this)

-        // Check for existing session token off main thread
-        scope.launch {
-            val s = store()
-            val existingToken = s.getString(KEY_SESSION_TOKEN)
-            if (existingToken != null) {
-                _authState.value = AuthState.Paired(existingToken)
-                _currentPairedSession.value = loadStoredMetadata(existingToken)
-                Log.i(
-                    TAG,
-                    "init: hydrated existing session_token=${existingToken.take(8)}… " +
-                        "→ authState=Paired (stale-at-startup unless this is a real continuous session)"
-                )
-            } else {
-                Log.i(TAG, "init: no stored session_token → authState stays Unpaired")
+        // Check for existing session token off main thread. Skipped for the
+        // throwaway sentinel (eagerHydrate=false) so it never pays the keyset
+        // decrypt for a store that's about to be replaced (see [eagerHydrate]).
+        if (eagerHydrate) {
+            scope.launch {
+                val s = store()
+                val existingToken = s.getString(KEY_SESSION_TOKEN)
+                if (existingToken != null) {
+                    _authState.value = AuthState.Paired(existingToken)
+                    _currentPairedSession.value = loadStoredMetadata(existingToken)
+                    Log.i(
+                        TAG,
+                        "init: hydrated existing session_token=${existingToken.take(8)}… " +
+                            "→ authState=Paired (stale-at-startup unless this is a real continuous session)"
+                    )
+                } else {
+                    Log.i(TAG, "init: no stored session_token → authState stays Unpaired")
+                }
+                // Converge the plain api-key-present hint with the decrypted
+                // truth (also repairs a hint that predates legacy migration).
+                recordApiKeyHint(!s.getString(KEY_API_KEY).isNullOrBlank())
            }
-            // Converge the plain api-key-present hint with the decrypted
-            // truth (also repairs a hint that predates legacy migration).
-            recordApiKeyHint(!s.getString(KEY_API_KEY).isNullOrBlank())
        }
    }

@@ -6,6 +6,44 @@ import android.os.Build
 import android.util.Log
 import androidx.security.crypto.EncryptedSharedPreferences
 import androidx.security.crypto.MasterKey
+import java.util.concurrent.ConcurrentHashMap
+
+/**
+ * Process-global cache for encrypted stores, keyed by prefs-file name.
+ *
+ * `EncryptedSharedPreferences.create()` unwraps a Tink keyset via a KeyStore op
+ * (~0.6–1 s on StrongBox), and Tink serializes those process-globally — so a
+ * second build of the SAME file is pure waste (the measured cold-start
+ * `Long monitor contention … AndroidKeysetManager.build()` with `waiters=1..4`).
+ *
+ * Caching by file name means each file's keyset builds ONCE process-wide. The
+ * cache is **synchronous** ([ConcurrentHashMap.computeIfAbsent], which holds a
+ * per-key lock so the build runs at most once per file) precisely so the SAME
+ * instance serves both the suspend token path (callers wrap this in
+ * [kotlinx.coroutines.Dispatchers.IO]) AND the synchronous OkHttp cookie-jar
+ * path — which is how the dashboard cookies now ride the connection's
+ * already-built token keyset instead of building a second one.
+ *
+ * The build is ~1 s on StrongBox: call only from IO / OkHttp threads, never the
+ * main thread.
+ */
+internal object SecureStoreCache {
+    private val instances = ConcurrentHashMap<String, SessionTokenStore>()
+
+    fun getOrBuild(prefsName: String, build: () -> SessionTokenStore): SessionTokenStore =
+        instances.computeIfAbsent(prefsName) { build() }
+}
+
+/**
+ * Build the raw encrypted store for [prefsName] — Keystore-backed when possible,
+ * self-healing legacy fallback, in-memory last resort. No migration. Shared by
+ * the token store and the dashboard cookie store so a given file always yields
+ * the SAME backend, via [SecureStoreCache].
+ */
+internal fun buildRawTokenStore(context: Context, prefsName: String): SessionTokenStore =
+    KeystoreTokenStore.tryCreate(context, prefsName)
+        ?: runCatching { LegacyEncryptedPrefsTokenStore(context, prefsName) }
+            .getOrElse { InMemoryTokenStore() }

 /**
 * Abstraction over the storage backend for the relay session token + API key
@@ -72,9 +110,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 +298,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 +414,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() }
+}
@@ -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
    }

@@ -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.
     *
@@ -10,35 +10,73 @@ 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 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
-        ?: profiles.firstOrNull { it.name.equals("default", ignoreCase = true) }

+    // 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.description.isNotBlank() -> profile.description.trim()
            profile.name.isNotBlank() -> titleCase(profile.name.trim())
+            profile.description.isNotBlank() -> profile.description.trim()
            else -> null
        }
    }

+    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
        }
@@ -51,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

@@ -78,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() }
 }
@@ -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,
@@ -89,12 +89,33 @@ data class ChatMessage(
     * the durable session turn; the provider's spoken summary is UI/runtime
     * provenance, not another canonical assistant message.
     */
-    val realtimeTurn: RealtimeTurnTrace? = null
+    val realtimeTurn: RealtimeTurnTrace? = null,
+    /**
+     * True for bubbles that exist ONLY on the client and have no server-side
+     * row — slash-command notices, voice-intent traces, the steer echo, gateway
+     * ask cards, an errored turn the server never persisted, and a provider-only
+     * (non-Hermes-backed) realtime turn. The post-turn history reload
+     * ([com.hermesandroid.relay.network.upstream.ChatHandler.loadMessageHistory])
+     * preserves any client-only message whose id is absent from the reloaded
+     * server transcript; without the flag those orphans would be silently
+     * wiped by the reconcile.
+     *
+     * Replaces the old id-prefix whitelist (`voice-intent-`/`steer-`/`ask-`/
+     * `system-notice-`) + "Error"-badge sniffing: each creator now declares its
+     * own provenance instead of the reconcile having to know every id
+     * convention. Defaults false so every server-backed message and existing
+     * call site stays correct.
+     *
+     * NOTE: an "Error" badge alone does NOT make a message preservable — a turn
+     * can error *after* persisting server-side, and that message must still
+     * reconcile normally. Only [clientOnly] gates orphan preservation.
+     */
+    val clientOnly: Boolean = false,
 )

 /**
 * 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 +144,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.
@@ -186,7 +207,23 @@ data class Attachment(
    /** Opaque token from `MEDIA:hermes-relay://<token>` — identifies the file on the relay. */
    val relayToken: String? = null,
    /** content:// URI from the FileProvider once bytes are cached to disk. */
-    val cachedUri: String? = null
+    val cachedUri: String? = null,
+    /**
+     * Whether this attachment was flagged sensitive (NSFW / spoiler) and should
+     * render blurred until the user taps to reveal — honored per the user's
+     * `MediaSettings.blurMode`.
+     *
+     * The flag is **model-emitted metadata, never an on-device or relay-side
+     * classifier** (see `docs/plans/2026-06-18-attachment-experience.md` §C): the
+     * agent annotates media it surfaces, the relay transports the bit
+     * authoritatively via the `X-Media-Sensitive` response header, and the
+     * client merely renders the blur. Populated for inbound attachments from
+     * [com.hermesandroid.relay.network.relay.RelayHttpClient.FetchedMedia.sensitive]
+     * when the bytes flip to [AttachmentState.LOADED]. Defaults false so every
+     * existing outbound/inbound call site stays valid and unflagged media
+     * renders exactly as before.
+     */
+    val sensitive: Boolean = false
 ) {
    val isImage: Boolean get() = contentType.startsWith("image/")

@@ -238,7 +275,27 @@ data class ToolCall(
    val provenance: String? = null,
    // Duration tracking
    val startedAt: Long = System.currentTimeMillis(),
-    val completedAt: Long? = null
+    val completedAt: Long? = null,
+    /**
+     * Gateway `tool.generating` pre-start phase — the model is still
+     * streaming this tool's arguments. Cleared (flipped false) when the
+     * matching `tool.start` arrives and the call begins executing. Renders
+     * as the quiet "preparing" state in ToolProgressCard / CompactToolCall
+     * rather than the active running spinner.
+     */
+    val isGenerating: Boolean = false,
+    /**
+     * Subagent lane index from gateway `subagent.*` events (`task_index`).
+     * Null = top-level tool call, rendered exactly as before. Non-null
+     * calls are grouped per index into a SubagentLane under the bubble.
+     */
+    val taskIndex: Int? = null,
+    /**
+     * Human label for the owning subagent lane — the `subagent.start`
+     * goal truncated to 60 chars. Carried on each child call so the lane
+     * header can render without a separate lane registry.
+     */
+    val taskLabel: String? = null
 )

 enum class MessageRole {
@@ -252,5 +309,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
+}
@@ -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),
            )
        }
@@ -100,6 +100,17 @@ class ConnectionStore private constructor(
    private val _activeConnectionId = MutableStateFlow<String?>(null)
    val activeConnectionId: StateFlow<String?> = _activeConnectionId.asStateFlow()

+    /**
+     * Flips to `true` once the initial DataStore hydrate completes (success OR
+     * failure). Until then [connections] / [activeConnection] hold their empty
+     * seed values, which are indistinguishable from a genuinely empty store.
+     * Consumers that must not mistake "still loading" for "nothing configured"
+     * — e.g. the chat empty-state, which would otherwise flash a "Connect to
+     * Hermes" CTA on every cold start — gate on this instead of on emptiness.
+     */
+    private val _isHydrated = MutableStateFlow(false)
+    val isHydrated: StateFlow<Boolean> = _isHydrated.asStateFlow()
+
    /**
     * Derived: the active connection, or null when the active ID is missing
     * or points to a deleted connection. Recomputes every time either
@@ -144,6 +155,11 @@ class ConnectionStore private constructor(
                }
            } catch (e: Exception) {
                Log.w(TAG, "Initial hydrate failed: ${e.message}")
+            } finally {
+                // Mark hydration done even on failure — a failed read still
+                // means "we now know the store's state is empty", so the UI
+                // should stop showing the neutral loading gate.
+                _isHydrated.value = true
            }
        }
    }
@@ -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
@@ -147,6 +147,7 @@ class DataManager(
                dashboardCookies = EncryptedDashboardCookieStore(
                    context = context,
                    connectionId = connection.id,
+                    tokenStoreKey = connection.tokenStoreKey,
                ).load().map { it.toBackup() },
            )
        }
@@ -185,6 +186,7 @@ class DataManager(
            EncryptedDashboardCookieStore(
                context = context,
                connectionId = connection.id,
+                tokenStoreKey = connection.tokenStoreKey,
            ).save(secret.dashboardCookies.map { it.toStoredCookie() })
        }
    }
@@ -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)
@@ -0,0 +1,22 @@
+package com.hermesandroid.relay.data
+
+import android.content.Context
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.edit
+
+/**
+ * Single source of truth for the opt-in "keep the gateway chat connection
+ * alive in the background" preference. Off by default.
+ *
+ * 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.upstream.GatewayKeepAliveService]'s Stop notification
+ * action, so both read/write the same key.
+ */
+val KEY_GATEWAY_KEEP_ALIVE = booleanPreferencesKey("gateway_keep_alive_background")
+
+/** Persist the keep-alive preference. Used by the FGS Stop action. */
+suspend fun Context.setGatewayKeepAlive(enabled: Boolean) {
+    relayDataStore.edit { it[KEY_GATEWAY_KEEP_ALIVE] = enabled }
+}
@@ -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
@@ -53,8 +53,22 @@ data class HermesCard(
     * which action (if any) has been dispatched, so the same card reloaded
     * from session history doesn't re-prompt. Falls back to the card's
     * position in the message when null.
+     *
+     * For the gateway ask types this is the ask's `request_id` (or
+     * `approval-<sid>-<ts>` for approval, which has no request id) — the
+     * dispatch tracker keys answer-once semantics off it.
     */
    val id: String? = null,
+    /**
+     * Interactive input slot rendered between [fields] and [actions] —
+     * the answer surface for the gateway ask cards (`ask.clarify` choice
+     * chips + free text, `ask.secret` masked field, `ask.sudo`
+     * hold-to-confirm). Null for every plain card. Submissions flow
+     * through the renderer's `onInputSubmit(cardKey, value)` callback and
+     * collapse the card via the same [HermesCardDispatch] list as button
+     * actions.
+     */
+    val input: HermesCardInput? = null,
 ) {
    object BuiltInTypes {
        const val SKILL_RESULT = "skill_result"
@@ -62,6 +76,14 @@ data class HermesCard(
        const val LINK_PREVIEW = "link_preview"
        const val CALENDAR_EVENT = "calendar_event"
        const val WEATHER = "weather"
+
+        // Gateway interactive asks (desktop-parity wave). Locally built
+        // from clarify/approval/sudo/secret request events — never parsed
+        // out of the text stream.
+        const val ASK_APPROVAL = "ask.approval"
+        const val ASK_CLARIFY = "ask.clarify"
+        const val ASK_SUDO = "ask.sudo"
+        const val ASK_SECRET = "ask.secret"
    }

    object Accents {
@@ -72,6 +94,67 @@ data class HermesCard(
    }
 }

+/**
+ * Interactive input slot on a [HermesCard]. The flags compose rather than
+ * branch — a sudo ask can be `masked + holdToConfirm` (password field whose
+ * submit is the 650ms press-fill button), while clarify is
+ * `choices + allowFreeText` and secret is `masked` alone.
+ *
+ * Security contract: when [masked] is true the submitted value is a secret.
+ * It must never be echoed into chat content, logged, or synced via
+ * CardDispatchSyncBuilder — record [SECRET_PROVIDED_STAMP] as the dispatch's
+ * actionValue instead of the real value. The renderer masks the collapse
+ * stamp for masked inputs regardless, but the dispatch record itself is
+ * persisted and synced, so the caller must not put the secret there.
+ */
+@Serializable
+data class HermesCardInput(
+    /**
+     * Input kind — one of [Kinds]. Drives which composite the renderer
+     * builds; unknown kinds degrade to a plain free-text field so newer
+     * asks still get an answer surface.
+     */
+    val kind: String,
+    /** Quick-answer chips (clarify). Empty = no chip row. */
+    val choices: List<String> = emptyList(),
+    /** Render the inline free-text mini field under the chips. */
+    val allowFreeText: Boolean = false,
+    /** Password-style field: masked glyphs + reveal toggle (secret/sudo). */
+    val masked: Boolean = false,
+    /** Submit is a 650ms hold-to-confirm press-fill instead of a tap (sudo). */
+    val holdToConfirm: Boolean = false,
+    /**
+     * Wall-clock expiry for timed asks (sudo 120s, clarify/secret 300s).
+     * The renderer shows a countdown footer (Amber under 30s) and
+     * self-collapses to "Expired — not granted" past it. Null = no timeout
+     * (approval is session-scoped).
+     */
+    val expiresAtMillis: Long? = null,
+) {
+    object Kinds {
+        const val CHOICE = "choice"
+        const val TEXT = "text"
+        const val SECRET = "secret"
+        const val CONFIRM = "confirm"
+    }
+
+    companion object {
+        /**
+         * Sentinel recorded as [HermesCardDispatch.actionValue] when a
+         * [masked] input is submitted. The real secret value goes only to
+         * the ask-respond RPC — never into the dispatch record, chat
+         * content, or session sync.
+         */
+        const val SECRET_PROVIDED_STAMP = "secret-provided"
+
+        /**
+         * Value submitted by a bare hold-to-confirm (no text field) — the
+         * sudo/approval "yes" that carries no payload of its own.
+         */
+        const val CONFIRM_VALUE = "confirm"
+    }
+}
+
 /**
 * A label/value row inside a card. [value] is rendered as markdown so the
 * agent can embed emphasis, inline code, or links.
@@ -117,6 +200,16 @@ data class HermesCardAction(
        const val SEND_TEXT = "send_text"
        const val SLASH_COMMAND = "slash_command"
        const val OPEN_URL = "open_url"
+
+        /**
+         * Ask-card answer: dispatch [value] straight to the gateway
+         * ask-respond RPC (clarify/sudo/secret/approval.respond), never
+         * as chat text. Dispatches in this mode are EXCLUDED from
+         * [com.hermesandroid.relay.viewmodel.CardDispatchSyncBuilder] —
+         * the server already absorbed the answer through the blocking
+         * ask, and for secrets the value must not enter session memory.
+         */
+        const val SUBMIT_ASK = "submit_ask"
    }
 }

@@ -133,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.
 */
@@ -145,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
@@ -4,9 +4,26 @@ import android.content.Context
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.intPreferencesKey
+import androidx.datastore.preferences.core.stringPreferencesKey
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map

+/**
+ * How aggressively inbound media is blurred behind a "tap to reveal" gate.
+ *
+ * - [OFF]        never blur — show everything immediately.
+ * - [FLAGGED]    blur only media the agent flagged sensitive (the model-emitted
+ *                `X-Media-Sensitive` bit; see
+ *                `docs/plans/2026-06-18-attachment-experience.md` §C). This is
+ *                the product default: zero blur when nothing is flagged.
+ * - [ALL_IMAGES] blur every inbound image regardless of source. Works on the
+ *                pure standard path with no server support at all.
+ *
+ * Persisted by [Enum.name] so adding cases later is forward-safe; an unknown
+ * stored value decodes back to the default rather than throwing.
+ */
+enum class BlurMode { OFF, FLAGGED, ALL_IMAGES }
+
 /**
 * User-tunable limits for inbound media attachments fetched from the relay.
 *
@@ -20,12 +37,17 @@ import kotlinx.coroutines.flow.map
 * - [autoFetchOnCellular] master switch: when false, the cellular-network
 *   case always inserts a manual-download placeholder.
 * - [cachedMediaCapMb] LRU cap on the `hermes-media/` cache directory.
+ * - [blurSensitive] whether (and which) inbound images render behind a
+ *   tap-to-reveal blur — see [BlurMode]. Unlike the four knobs above this one
+ *   also applies on the standard (no-Relay) path, since [BlurMode.ALL_IMAGES]
+ *   needs no server cooperation.
 */
 data class MediaSettings(
    val maxInboundSizeMb: Int = 25,
    val autoFetchThresholdMb: Int = 2,
    val autoFetchOnCellular: Boolean = false,
-    val cachedMediaCapMb: Int = 200
+    val cachedMediaCapMb: Int = 200,
+    val blurSensitive: BlurMode = BlurMode.FLAGGED
 )

 /**
@@ -39,11 +61,18 @@ class MediaSettingsRepository(private val context: Context) {
        private val KEY_AUTO_FETCH_THRESHOLD_MB = intPreferencesKey("media_auto_fetch_threshold_mb")
        private val KEY_AUTO_FETCH_ON_CELLULAR = booleanPreferencesKey("media_auto_fetch_on_cellular")
        private val KEY_CACHED_MEDIA_CAP_MB = intPreferencesKey("media_cached_cap_mb")
+        private val KEY_BLUR_SENSITIVE = stringPreferencesKey("media_blur_sensitive")

        const val DEFAULT_MAX_INBOUND_MB = 25
        const val DEFAULT_AUTO_FETCH_THRESHOLD_MB = 2
        const val DEFAULT_AUTO_FETCH_ON_CELLULAR = false
        const val DEFAULT_CACHED_MEDIA_CAP_MB = 200
+        val DEFAULT_BLUR_SENSITIVE = BlurMode.FLAGGED
+
+        /** Decode a persisted [BlurMode] name, falling back to the default. */
+        private fun parseBlurMode(raw: String?): BlurMode =
+            raw?.let { name -> BlurMode.entries.firstOrNull { it.name == name } }
+                ?: DEFAULT_BLUR_SENSITIVE
    }

    val settings: Flow<MediaSettings> = context.relayDataStore.data.map { prefs ->
@@ -51,10 +80,21 @@ class MediaSettingsRepository(private val context: Context) {
            maxInboundSizeMb = prefs[KEY_MAX_INBOUND_MB] ?: DEFAULT_MAX_INBOUND_MB,
            autoFetchThresholdMb = prefs[KEY_AUTO_FETCH_THRESHOLD_MB] ?: DEFAULT_AUTO_FETCH_THRESHOLD_MB,
            autoFetchOnCellular = prefs[KEY_AUTO_FETCH_ON_CELLULAR] ?: DEFAULT_AUTO_FETCH_ON_CELLULAR,
-            cachedMediaCapMb = prefs[KEY_CACHED_MEDIA_CAP_MB] ?: DEFAULT_CACHED_MEDIA_CAP_MB
+            cachedMediaCapMb = prefs[KEY_CACHED_MEDIA_CAP_MB] ?: DEFAULT_CACHED_MEDIA_CAP_MB,
+            blurSensitive = parseBlurMode(prefs[KEY_BLUR_SENSITIVE])
        )
    }

+    /**
+     * Just the blur knob — a standalone flow so per-bubble UI can observe it
+     * without collecting (and recomposing on) the whole [MediaSettings].
+     * Built here (outside composition) on purpose so callers can
+     * `collectAsState()` it without tripping `FlowOperatorInvokedInComposition`.
+     */
+    val blurMode: Flow<BlurMode> = context.relayDataStore.data.map { prefs ->
+        parseBlurMode(prefs[KEY_BLUR_SENSITIVE])
+    }
+
    suspend fun setMaxInboundSize(mb: Int) {
        context.relayDataStore.edit { it[KEY_MAX_INBOUND_MB] = mb.coerceAtLeast(1) }
    }
@@ -70,4 +110,8 @@ class MediaSettingsRepository(private val context: Context) {
    suspend fun setCachedMediaCap(mb: Int) {
        context.relayDataStore.edit { it[KEY_CACHED_MEDIA_CAP_MB] = mb.coerceAtLeast(10) }
    }
+
+    suspend fun setBlurSensitive(mode: BlurMode) {
+        context.relayDataStore.edit { it[KEY_BLUR_SENSITIVE] = mode.name }
+    }
 }
@@ -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")
@@ -0,0 +1,70 @@
+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 per-profile agent icons — the visual twin of [ProfileDisplayAliasStore].
+ *
+ * Stores a **file path** to an image that was copied into app storage (not a SAF
+ * content URI, so it survives without a persistable-permission grant). Like the
+ * name alias, these are phone-UI labels only: never sent to Hermes, and keyed by
+ * connection + profile context so the same server-default agent can wear a
+ * different face on each configured host.
+ */
+class ProfileIconStore(
+    private val dataStore: DataStore<Preferences>,
+) {
+    constructor(context: Context) : this(context.profileIconsDataStore)
+
+    companion object {
+        private const val PREFIX = "profile_icon__"
+
+        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 setIcon(connectionId: String, profileName: String?, path: String?) {
+        dataStore.edit { prefs ->
+            val key = keyFor(connectionId, profileName)
+            if (path.isNullOrBlank()) {
+                prefs.remove(key)
+            } else {
+                prefs[key] = path
+            }
+        }
+    }
+
+    fun iconFlow(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.profileIconsDataStore: DataStore<Preferences>
+        by preferencesDataStore(name = "profile_icons")
@@ -10,12 +10,62 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map

 /**
- * Per-connection, per-Hermes-profile last active chat session.
+ * Which chat transport created (and can resume) a stored session.
+ *
+ * The two chat transports do NOT share session storage, so their ids are not
+ * interchangeable on a non-default profile:
+ *  - [GATEWAY] — the `/api/ws` tui_gateway path. `session.create`/`session.resume`
+ *    bind the profile's own HERMES_HOME, so sessions live in that profile's
+ *    `state.db`. Ids look like `YYYYMMDD_HHMMSS_<hex>`.
+ *  - [SSE] — the api_server chat path (`/api/sessions/.../chat/stream`,
+ *    `/v1/runs`). The api_server has no per-request profile scoping; it always
+ *    persists to its launch `state.db`. Ids look like `api_<unixsecs>_<hex>`.
+ *
+ * Resuming an [SSE] id over the [GATEWAY] (which opens the profile DB) — or vice
+ * versa — fails with "session not found" and silently forks a new session. So
+ * each transport gets its own persisted slot, and a stored id is only ever
+ * restored for the transport that can actually resume it.
+ */
+enum class SessionTransport(val key: String) {
+    GATEWAY("gw"),
+    SSE("sse");
+
+    companion object {
+        /**
+         * Bucket a stored session id by the subsystem that created it — the
+         * id's namespace is the server's own ground truth about which transport
+         * can resume it, more reliable than re-deriving the resolved endpoint
+         * (a turn can fall back from gateway to SSE per-turn).
+         */
+        fun forSessionId(sessionId: String): SessionTransport =
+            if (sessionId.startsWith("api_")) SSE else GATEWAY
+
+        /**
+         * Bucket a resolved streaming endpoint. Only `"gateway"` resumes from
+         * the per-profile DB; every SSE-family member (`"sessions"` /
+         * `"completions"` / `"runs"`) rides the api_server's launch DB.
+         */
+        fun forEndpoint(resolvedEndpoint: String): SessionTransport =
+            if (resolvedEndpoint == "gateway") GATEWAY else SSE
+    }
+}
+
+/**
+ * Per-connection, per-Hermes-profile, per-transport last active chat session.
 *
 * This is intentionally separate from [ProfileSelectionStore]. Selection says
 * which agent is active; this store says which chat session belongs to that
 * agent on that connection. Null profile name is the explicit Server default
 * context.
+ *
+ * **Transport dimension (v1.0.0).** The slot is keyed by [SessionTransport] too,
+ * because a gateway session and an api_server (SSE) session are stored in
+ * different databases and cannot be cross-resumed on a non-default profile.
+ * Keying by transport keeps the two from clobbering one slot and guarantees a
+ * restored id is always resumable by the transport asking for it. The key shape
+ * changed in this release, so pre-existing (untransported) slots are not read —
+ * a one-time drop of the "last session" pointer that also clears the exact stale
+ * cross-transport ids that caused mid-conversation forks.
 */
 class ProfileSessionStore(
    private val dataStore: DataStore<Preferences>,
@@ -25,11 +75,18 @@ class ProfileSessionStore(
    companion object {
        private const val PREFIX = "profile_session__"

-        private fun keyName(connectionId: String, profileName: String?): String =
-            "$PREFIX${connectionId}__${AgentDisplay.profileSessionKey(profileName)}"
+        private fun keyName(
+            connectionId: String,
+            profileName: String?,
+            transport: SessionTransport,
+        ): String =
+            "$PREFIX${connectionId}__${AgentDisplay.profileSessionKey(profileName)}__${transport.key}"

-        private fun keyFor(connectionId: String, profileName: String?) =
-            stringPreferencesKey(keyName(connectionId, profileName))
+        private fun keyFor(
+            connectionId: String,
+            profileName: String?,
+            transport: SessionTransport,
+        ) = stringPreferencesKey(keyName(connectionId, profileName, transport))

        private fun connectionPrefix(connectionId: String): String =
            "$PREFIX${connectionId}__"
@@ -38,10 +95,11 @@ class ProfileSessionStore(
    suspend fun setSessionId(
        connectionId: String,
        profileName: String?,
+        transport: SessionTransport,
        sessionId: String?,
    ) {
        dataStore.edit { prefs ->
-            val key = keyFor(connectionId, profileName)
+            val key = keyFor(connectionId, profileName, transport)
            if (sessionId.isNullOrBlank()) {
                prefs.remove(key)
            } else {
@@ -50,8 +108,12 @@ class ProfileSessionStore(
        }
    }

-    fun sessionIdFlow(connectionId: String, profileName: String?): Flow<String?> {
-        val key = keyFor(connectionId, profileName)
+    fun sessionIdFlow(
+        connectionId: String,
+        profileName: String?,
+        transport: SessionTransport,
+    ): Flow<String?> {
+        val key = keyFor(connectionId, profileName, transport)
        return dataStore.data.map { prefs -> prefs[key] }
    }

@@ -8,8 +8,11 @@ import androidx.datastore.preferences.core.longPreferencesKey
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.stringPreferencesKey
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.map

 /**
 * User-tunable voice mode preferences.
@@ -37,8 +40,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");
@@ -60,13 +115,63 @@ enum class VoiceAudioRoute(val storageValue: String) {
    }
 }

+/**
+ * Active scope for per-profile voice prefs.
+ *
+ * Mirrors [ProfileSelectionStore]'s `_<connectionId>` keying and extends it to
+ * `_<connectionId>_<profile>` so per-profile voice picks don't leak across
+ * profiles (or across connections that expose a same-named profile).
+ *
+ * A null/blank [profileName] is the "default / launch profile" and resolves to
+ * the un-namespaced global keys — i.e. the default profile *is* the base layer
+ * that named profiles override. A null/blank [connectionId] degrades to
+ * profile-only namespacing, which still isolates profiles within one
+ * connection; it just can't disambiguate two connections with a same-named
+ * profile. See [VoicePreferencesRepository.setActiveScope].
+ */
+data class VoiceProfileScope(
+    val connectionId: String? = null,
+    val profileName: String? = null,
+) {
+    companion object {
+        val Global = VoiceProfileScope()
+    }
+}
+
 class VoicePreferencesRepository(private val dataStore: DataStore<Preferences>) {

    constructor(context: Context) : this(context.relayDataStore)

    companion object {
-        private val KEY_ENGINE_MODE = stringPreferencesKey("voice_engine_mode")
-        private val KEY_AUDIO_ROUTE = stringPreferencesKey("voice_audio_route")
+        // --- Per-profile keys (override map; namespaced by active scope) -----
+        // These are stored as base NAME strings (not typed Key<>s) so the
+        // scoped key can be built per (connectionId, profile) at read/write
+        // time. Resolution layers a per-profile value over the global value
+        // over the hard default — see [scopedName] / [resolveString].
+        //
+        // Why these are per-profile: engine mode, audio route, and the
+        // enhanced-voice overrides describe *which voice the agent speaks
+        // with*, which is a property of the profile (the relay already
+        // persists `voice_output:`/`realtime_voice:` per profile and
+        // `RelayVoiceClient` already sends `?profile=`). Keeping them global
+        // leaked one profile's voice onto every other profile.
+        private const val KEY_ENGINE_MODE = "voice_engine_mode"
+        private const val KEY_AUDIO_ROUTE = "voice_audio_route"
+        private const val KEY_ENH_VOICE = "voice_enh_voice"
+        private const val KEY_ENH_MODEL = "voice_enh_model"
+        private const val KEY_ENH_AUDIO_TAGS = "voice_enh_audio_tags"
+        private const val KEY_ENH_PERSONA = "voice_enh_persona"
+        private const val KEY_ENH_LANGUAGE = "voice_enh_language"
+
+        // --- Global keys (shared across profiles; never namespaced) ----------
+        // Why these stay global: interaction-mode and silence-threshold are
+        // ergonomic input preferences about *how the user drives the mic*, not
+        // about the agent's voice — a user wants the same tap/hold/continuous
+        // habit regardless of which profile is active. auto-tts and the STT
+        // language hint are dead/experimental controls today, and the two
+        // realtime diagnostic toggles (trace details, persistent session) are
+        // engine-behaviour switches that aren't profile-specific. Keeping them
+        // un-namespaced means switching profiles never churns these.
        private val KEY_INTERACTION_MODE = stringPreferencesKey("voice_interaction_mode")
        private val KEY_SILENCE_THRESHOLD_MS = longPreferencesKey("voice_silence_threshold_ms")
        private val KEY_AUTO_TTS = booleanPreferencesKey("voice_auto_tts")
@@ -83,37 +188,149 @@ class VoicePreferencesRepository(private val dataStore: DataStore<Preferences>)
        const val DEFAULT_LANGUAGE = ""
        const val DEFAULT_REALTIME_TRACE_DETAILS = false
        const val DEFAULT_REALTIME_PERSISTENT_SESSION = true
+
+        /**
+         * Build the storage name for a per-profile [base] key under [scope].
+         *
+         * - null/blank profile → returns [base] verbatim (the global base
+         *   layer; the default profile reads/writes the un-namespaced key).
+         * - profile set, no connection → `<base>_<profile>`.
+         * - profile + connection set → `<base>_<connectionId>_<profile>`,
+         *   matching [ProfileSelectionStore]'s connection-first ordering.
+         */
+        internal fun scopedName(base: String, scope: VoiceProfileScope): String {
+            val profile = scope.profileName?.trim()?.takeIf { it.isNotEmpty() } ?: return base
+            val conn = scope.connectionId?.trim()?.takeIf { it.isNotEmpty() }
+            return if (conn != null) "${base}_${conn}_$profile" else "${base}_$profile"
+        }
    }

-    val settings: Flow<VoiceSettings> = dataStore.data
-        .map { prefs ->
-            VoiceSettings(
-                engineMode = VoiceEngineMode.fromStorage(
-                    prefs[KEY_ENGINE_MODE] ?: DEFAULT_ENGINE_MODE,
-                ).storageValue,
-                audioRoute = VoiceAudioRoute.fromStorage(
-                    prefs[KEY_AUDIO_ROUTE] ?: DEFAULT_AUDIO_ROUTE,
-                ).storageValue,
-                interactionMode = prefs[KEY_INTERACTION_MODE] ?: DEFAULT_INTERACTION_MODE,
-                silenceThresholdMs = prefs[KEY_SILENCE_THRESHOLD_MS] ?: DEFAULT_SILENCE_THRESHOLD_MS,
-                autoTts = prefs[KEY_AUTO_TTS] ?: DEFAULT_AUTO_TTS,
-                language = prefs[KEY_LANGUAGE] ?: DEFAULT_LANGUAGE,
-                realtimeTraceDetails = prefs[KEY_REALTIME_TRACE_DETAILS]
-                    ?: DEFAULT_REALTIME_TRACE_DETAILS,
-                realtimePersistentSession = prefs[KEY_REALTIME_PERSISTENT_SESSION]
-                    ?: DEFAULT_REALTIME_PERSISTENT_SESSION,
-            )
+    // In-memory active scope. Defaults to global so un-scoped consumers (and
+    // every existing call site) behave exactly as before until a scope is set.
+    private val _scope = MutableStateFlow(VoiceProfileScope.Global)
+
+    /** The active per-profile scope. Set via [setActiveScope]. */
+    val activeScope: StateFlow<VoiceProfileScope> = _scope.asStateFlow()
+
+    /**
+     * Point the repository at a (connection, profile) scope. Per-profile reads
+     * and writes (engine/route/enhanced) re-target the namespaced keys for that
+     * profile; global prefs are unaffected. Passing a null/blank profile name
+     * reverts per-profile reads/writes to the global base layer (the default
+     * profile). Idempotent — a no-op when the normalized scope is unchanged.
+     */
+    fun setActiveScope(connectionId: String?, profileName: String?) {
+        val next = VoiceProfileScope(
+            connectionId = connectionId?.trim()?.takeIf { it.isNotEmpty() },
+            profileName = profileName?.trim()?.takeIf { it.isNotEmpty() },
+        )
+        if (_scope.value != next) {
+            _scope.value = next
        }
-        .distinctUntilChanged()
+    }
+
+    /**
+     * Emits the resolved [VoiceSettings] for the [activeScope]. Re-emits when
+     * either the underlying DataStore or the active scope changes. Per-profile
+     * fields are resolved as: per-profile key → global key → hard default.
+     */
+    val settings: Flow<VoiceSettings> = combine(_scope, dataStore.data) { scope, prefs ->
+        VoiceSettings(
+            // --- per-profile (override map) ---
+            engineMode = VoiceEngineMode.fromStorage(
+                resolveString(prefs, KEY_ENGINE_MODE, scope, DEFAULT_ENGINE_MODE),
+            ).storageValue,
+            audioRoute = VoiceAudioRoute.fromStorage(
+                resolveString(prefs, KEY_AUDIO_ROUTE, scope, DEFAULT_AUDIO_ROUTE),
+            ).storageValue,
+            enhancedVoice = resolveString(prefs, KEY_ENH_VOICE, scope, ""),
+            enhancedModel = resolveString(prefs, KEY_ENH_MODEL, scope, ""),
+            enhancedAudioTags = resolveBoolean(prefs, KEY_ENH_AUDIO_TAGS, scope, false),
+            enhancedPersona = resolveString(prefs, KEY_ENH_PERSONA, scope, ""),
+            enhancedLanguage = resolveString(prefs, KEY_ENH_LANGUAGE, scope, ""),
+            // --- global (shared across profiles) ---
+            interactionMode = prefs[KEY_INTERACTION_MODE] ?: DEFAULT_INTERACTION_MODE,
+            silenceThresholdMs = prefs[KEY_SILENCE_THRESHOLD_MS] ?: DEFAULT_SILENCE_THRESHOLD_MS,
+            autoTts = prefs[KEY_AUTO_TTS] ?: DEFAULT_AUTO_TTS,
+            language = prefs[KEY_LANGUAGE] ?: DEFAULT_LANGUAGE,
+            realtimeTraceDetails = prefs[KEY_REALTIME_TRACE_DETAILS]
+                ?: DEFAULT_REALTIME_TRACE_DETAILS,
+            realtimePersistentSession = prefs[KEY_REALTIME_PERSISTENT_SESSION]
+                ?: DEFAULT_REALTIME_PERSISTENT_SESSION,
+        )
+    }.distinctUntilChanged()
+
+    // --- per-profile resolution (per-profile key → global key → default) -----
+
+    private fun resolveString(
+        prefs: Preferences,
+        base: String,
+        scope: VoiceProfileScope,
+        default: String,
+    ): String {
+        val scopedName = scopedName(base, scope)
+        if (scopedName != base) {
+            prefs[stringPreferencesKey(scopedName)]?.let { return it }
+        }
+        return prefs[stringPreferencesKey(base)] ?: default
+    }
+
+    private fun resolveBoolean(
+        prefs: Preferences,
+        base: String,
+        scope: VoiceProfileScope,
+        default: Boolean,
+    ): Boolean {
+        val scopedName = scopedName(base, scope)
+        if (scopedName != base) {
+            prefs[booleanPreferencesKey(scopedName)]?.let { return it }
+        }
+        return prefs[booleanPreferencesKey(base)] ?: default
+    }
+
+    // --- per-profile setters (write the namespaced key for the active scope) -

    suspend fun setEngineMode(mode: VoiceEngineMode) {
-        dataStore.edit { it[KEY_ENGINE_MODE] = mode.storageValue }
+        val key = stringPreferencesKey(scopedName(KEY_ENGINE_MODE, _scope.value))
+        dataStore.edit { it[key] = mode.storageValue }
    }

    suspend fun setAudioRoute(route: VoiceAudioRoute) {
-        dataStore.edit { it[KEY_AUDIO_ROUTE] = route.storageValue }
+        val key = stringPreferencesKey(scopedName(KEY_AUDIO_ROUTE, _scope.value))
+        dataStore.edit { it[key] = route.storageValue }
    }

+    /** "" clears the override (relay falls back to the server's saved voice). */
+    suspend fun setEnhancedVoice(voice: String) {
+        val key = stringPreferencesKey(scopedName(KEY_ENH_VOICE, _scope.value))
+        dataStore.edit { it[key] = voice.trim() }
+    }
+
+    /** "" clears the override (relay falls back to the server's saved model). */
+    suspend fun setEnhancedModel(model: String) {
+        val key = stringPreferencesKey(scopedName(KEY_ENH_MODEL, _scope.value))
+        dataStore.edit { it[key] = model.trim() }
+    }
+
+    suspend fun setEnhancedAudioTags(enabled: Boolean) {
+        val key = booleanPreferencesKey(scopedName(KEY_ENH_AUDIO_TAGS, _scope.value))
+        dataStore.edit { it[key] = enabled }
+    }
+
+    /** "" clears the inline persona/style direction (Gemini). */
+    suspend fun setEnhancedPersona(persona: String) {
+        val key = stringPreferencesKey(scopedName(KEY_ENH_PERSONA, _scope.value))
+        dataStore.edit { it[key] = persona }
+    }
+
+    /** "" clears the language override (xAI). */
+    suspend fun setEnhancedLanguage(language: String) {
+        val key = stringPreferencesKey(scopedName(KEY_ENH_LANGUAGE, _scope.value))
+        dataStore.edit { it[key] = language.trim() }
+    }
+
+    // --- global setters (always the un-namespaced key) -----------------------
+
    suspend fun setInteractionMode(mode: String) {
        dataStore.edit { it[KEY_INTERACTION_MODE] = mode }
    }
@@ -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
@@ -538,7 +539,7 @@ class BridgeCommandHandler(
                    put(
                        "error",
                        "Device Control is not included in the Google Play build " +
-                            "of Hermes Relay. This build keeps Hermes Bridge Core " +
+                            "of Hermes-Relay. This build keeps Hermes Bridge Core " +
                            "features such as chat, voice, terminal, media, " +
                            "notifications, and relay status, but it does not " +
                            "ship AccessibilityService, screen reading, taps, " +
@@ -562,7 +563,7 @@ class BridgeCommandHandler(
                        "Hermes accessibility service is not enabled. " +
                            "The phone IS paired and connected — this is " +
                            "NOT a pairing problem. The user must enable " +
-                            "the Hermes Relay accessibility service in " +
+                            "the Hermes-Relay accessibility service in " +
                            "Android Settings > Accessibility > " +
                            "Installed services before the bridge can " +
                            "dispatch phone-control commands.",
@@ -570,7 +571,7 @@ class BridgeCommandHandler(
                    put("error_code", "service_unavailable")
                    put(
                        "required_action",
-                        "User enables Hermes Relay in Android Accessibility Settings",
+                        "User enables Hermes-Relay in Android Accessibility Settings",
                    )
                }
            )
@@ -813,7 +814,7 @@ class BridgeCommandHandler(
            }

            // === PHASE3-return-to-hermes ===
-            // Bring the Hermes Relay app back to foreground. Used by the
+            // Bring the Hermes-Relay app back to foreground. Used by the
            // server-side agent as the final step of any multi-app task
            // (e.g. after driving Messages to send an SMS) so the user
            // sees the agent's reply in-context without manually switching
@@ -1219,7 +1220,7 @@ class BridgeCommandHandler(
                    respond(
                        requestId, 403,
                        buildJsonObject {
-                            put("error", "android_location is only available on the sideload flavor of Hermes Relay. This build is googlePlay.")
+                            put("error", "android_location is only available on the sideload flavor of Hermes-Relay. This build is googlePlay.")
                            put("error_code", "sideload_only")
                            put("flavor", "googlePlay")
                        }
@@ -1234,7 +1235,7 @@ class BridgeCommandHandler(
                    respond(
                        requestId, 403,
                        buildJsonObject {
-                            put("error", "android_search_contacts is only available on the sideload flavor of Hermes Relay. This build is googlePlay.")
+                            put("error", "android_search_contacts is only available on the sideload flavor of Hermes-Relay. This build is googlePlay.")
                            put("error_code", "sideload_only")
                            put("flavor", "googlePlay")
                        }
@@ -1258,7 +1259,7 @@ class BridgeCommandHandler(
                    respond(
                        requestId, 403,
                        buildJsonObject {
-                            put("error", "android_call auto-dial is only available on the sideload flavor of Hermes Relay. This build is googlePlay.")
+                            put("error", "android_call auto-dial is only available on the sideload flavor of Hermes-Relay. This build is googlePlay.")
                            put("error_code", "sideload_only")
                            put("flavor", "googlePlay")
                        }
@@ -1312,7 +1313,7 @@ class BridgeCommandHandler(
                    respond(
                        requestId, 403,
                        buildJsonObject {
-                            put("error", "android_send_sms is only available on the sideload flavor of Hermes Relay. This build is googlePlay.")
+                            put("error", "android_send_sms is only available on the sideload flavor of Hermes-Relay. This build is googlePlay.")
                            put("error_code", "sideload_only")
                            put("flavor", "googlePlay")
                        }
@@ -1370,7 +1371,7 @@ class BridgeCommandHandler(
                    respond(
                        requestId, 403,
                        buildJsonObject {
-                            put("error", "$path is only available on the sideload flavor of Hermes Relay. This build is googlePlay.")
+                            put("error", "$path is only available on the sideload flavor of Hermes-Relay. This build is googlePlay.")
                            put("error_code", "sideload_only")
                            put("flavor", "googlePlay")
                        }
@@ -1411,9 +1412,9 @@ class BridgeCommandHandler(
                    val target = if (to.isBlank()) "the selected recipient" else to
                    "Send MMS compose to $target with $attachmentCount attachment(s)?"
                } else if (attachmentCount > 0) {
-                    "Share $attachmentCount attachment(s) from Hermes Relay?"
+                    "Share $attachmentCount attachment(s) from Hermes-Relay?"
                } else {
-                    "Share text from Hermes Relay?"
+                    "Share text from Hermes-Relay?"
                }
                val allowed = safetyManager.awaitConfirmation(path, confirmText)
                if (!allowed) {
@@ -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]
@@ -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
@@ -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
@@ -196,6 +197,18 @@ class ConnectionManager(
    @Volatile
    private var networkResolveJob: kotlinx.coroutines.Job? = null

+    /** Deferred reaction to a network loss — cancelled if a network returns within the grace. */
+    private var networkLossJob: kotlinx.coroutines.Job? = null
+
+    /**
+     * Set when a network loss outlives [NETWORK_LOSS_GRACE_MS] — only then may
+     * a re-resolve switch DOWN to a lower-priority endpoint. Prevents a
+     * transient probe miss (Wi-Fi settling) from switching routes and
+     * cancelling an in-flight turn. Cleared once a resolution is published.
+     */
+    @Volatile
+    private var sustainedLossDeclared = false
+
    init {
        // Register at construction, not on first connect(). Standard
        // (no-Relay) connections never open the WSS socket, but their HTTP
@@ -214,6 +227,15 @@ class ConnectionManager(
        // enough to coalesce the onAvailable burst of a handoff, short
        // enough that a route swap still feels immediate.
        private const val NETWORK_RESOLVE_DEBOUNCE_MS = 300L
+
+        /**
+         * Grace before reacting to a network loss. A transient blip (Wi-Fi
+         * power-save/roam, a brief drop, the OS swapping radios) recovers
+         * within this window and must NOT mark the active endpoint unreachable
+         * or switch routes — doing so rebuilds the chat client and cancels an
+         * in-flight turn. Only a loss sustained past the grace switches.
+         */
+        private const val NETWORK_LOSS_GRACE_MS = 6_000L
        // Matches plugin.relay.auth._BLOCK_SECONDS (5 min). If we see 429
        // on the WSS upgrade, we're IP-banned server-side — retrying at
        // our normal 1-30s cadence re-fills the ban bucket and keeps us
@@ -540,6 +562,23 @@ class ConnectionManager(
                }
                return@launch
            }
+            // Endpoint hysteresis: a transient blip can make the active
+            // (higher-priority) endpoint's health probe miss, so the resolver
+            // falls through to a LOWER-priority fallback. Switching on that
+            // transient miss rebuilds the chat client and CANCELS an in-flight
+            // turn. Don't switch DOWN in priority unless a sustained loss was
+            // actually declared (the onLost grace elapsed). Same/upgrade
+            // winners always publish.
+            val active = _activeEndpoint.value
+            if (active != null && resolved.priority > active.priority && !sustainedLossDeclared) {
+                Log.i(
+                    TAG,
+                    "re-resolve picked lower-priority ${resolved.role}(p${resolved.priority}) over " +
+                        "active ${active.role}(p${active.priority}) not confirmed dead — keeping active",
+                )
+                return@launch
+            }
+            sustainedLossDeclared = false
            _activeEndpoint.value = resolved
            if (current == null) return@launch
            // After an explicit disconnect() the route still publishes above
@@ -569,15 +608,33 @@ class ConnectionManager(
        val callback = object : ConnectivityManager.NetworkCallback() {
            override fun onAvailable(network: Network) {
                Log.i(TAG, "network onAvailable — re-evaluating endpoint")
+                // A network returned — cancel any pending loss reaction: the
+                // drop was transient, so don't switch routes / rebuild the chat
+                // client / cancel an in-flight turn. Re-resolve to pick the best
+                // route (usually the same one); the rebuild only fires if the
+                // URL actually moved.
+                networkLossJob?.cancel()
                endpointResolver?.clearCache()
                scheduleNetworkReResolve("Network change — switching endpoint")
            }

            override fun onLost(network: Network) {
-                Log.i(TAG, "network onLost — marking active endpoint unreachable and resolving fallback")
-                endpointResolver?.clearCache()
-                markActiveEndpointUnreachable("network lost")
-                scheduleNetworkReResolve("Network lost — switching endpoint")
+                // Defer the reaction: a transient blip recovers within the grace
+                // (onAvailable cancels this job). Reacting immediately — marking
+                // the active endpoint unreachable + re-resolving to a fallback —
+                // switches routes mid-blip, which rebuilds the chat client and
+                // CANCELS the in-flight turn. The gateway client already handles
+                // its own socket reconnect across the blip.
+                Log.i(TAG, "network onLost — deferring fallback re-resolve by ${NETWORK_LOSS_GRACE_MS}ms")
+                networkLossJob?.cancel()
+                networkLossJob = scope.launch {
+                    delay(NETWORK_LOSS_GRACE_MS)
+                    Log.i(TAG, "network loss sustained past grace — marking active endpoint unreachable and resolving fallback")
+                    sustainedLossDeclared = true
+                    endpointResolver?.clearCache()
+                    markActiveEndpointUnreachable("network lost (sustained)")
+                    scheduleNetworkReResolve("Network lost — switching endpoint")
+                }
            }
        }
        try {
@@ -594,6 +651,8 @@ class ConnectionManager(
    }

    private fun unregisterNetworkCallback() {
+        networkLossJob?.cancel()
+        networkLossJob = null
        val ctx = context ?: return
        val cb = networkCallback ?: return
        try {
@@ -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
@@ -7,6 +7,7 @@ import com.hermesandroid.relay.diagnostics.DiagnosticSeverity
 import com.hermesandroid.relay.diagnostics.DiagnosticsLog
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.jsonObject
@@ -22,7 +23,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`.
@@ -40,7 +41,11 @@ import java.io.IOException
 class RelayHttpClient(
    private val okHttpClient: OkHttpClient,
    private val relayUrlProvider: () -> String?,
-    private val sessionTokenProvider: suspend () -> String?
+    private val sessionTokenProvider: suspend () -> String?,
+    /** Synchronous snapshot of the paired session token (null when not currently
+     *  paired). Lets [mediaUrlConfigured] check fetch-readiness without
+     *  suspending; mirrors what [sessionTokenProvider] resolves. */
+    private val pairedTokenSnapshot: () -> String? = { null },
 ) {

    companion object {
@@ -53,6 +58,19 @@ class RelayHttpClient(
        }
    }

+    /**
+     * True when relay media is actually FETCHABLE right now: a non-blank relay
+     * URL AND a current paired session token. Synchronous. The token check
+     * matters because the relay's SessionManager is in-memory and wiped on
+     * restart, so a configured relay URL can outlive the pairing — gating on URL
+     * alone made the media-capability badge read "available" while every
+     * `/media/by-path` fetch failed for a missing token. Now the badge (and the
+     * SSE media hint) agree with what the fetch can do, and self-correct on
+     * re-pair.
+     */
+    fun mediaUrlConfigured(): Boolean =
+        !relayUrlProvider().isNullOrBlank() && !pairedTokenSnapshot().isNullOrBlank()
+
    /**
     * The result of a successful [fetchMedia] call.
     *
@@ -61,28 +79,53 @@ class RelayHttpClient(
     * @property bytes raw response body.
     * @property fileName best-effort filename parsed from
     *           `Content-Disposition: inline; filename="..."`, or null.
+     * @property sensitive model-emitted sensitivity hint, read from the
+     *           relay's `X-Media-Sensitive` response header (`"1"`/`"true"`
+     *           → true). The relay never classifies media — it transports
+     *           whatever the producing tool/agent declared. Absent header →
+     *           false. Consumed by `ChatViewModel` to blur per the user's
+     *           setting.
     */
    data class FetchedMedia(
        val contentType: String,
        val bytes: ByteArray,
-        val fileName: String?
+        val fileName: String?,
+        val sensitive: Boolean = false
    ) {
        override fun equals(other: Any?): Boolean {
            if (this === other) return true
            if (other !is FetchedMedia) return false
            return contentType == other.contentType &&
                bytes.contentEquals(other.bytes) &&
-                fileName == other.fileName
+                fileName == other.fileName &&
+                sensitive == other.sensitive
        }

        override fun hashCode(): Int {
            var result = contentType.hashCode()
            result = 31 * result + bytes.contentHashCode()
            result = 31 * result + (fileName?.hashCode() ?: 0)
+            result = 31 * result + sensitive.hashCode()
            return result
        }
    }

+    /**
+     * Server-side relay context that would be injected into the next agent turn.
+     * Mirrors `GET /context/injected`; Android treats it as audit-only state.
+     */
+    @Serializable
+    data class InjectedContextAudit(
+        val enabled: Boolean = false,
+        val blocks: List<InjectedContextBlock> = emptyList(),
+    )
+
+    @Serializable
+    data class InjectedContextBlock(
+        val name: String,
+        val text: String,
+    )
+
    /**
     * Fetch `GET /media/<token>` from the relay over HTTP(S). Returns a
     * [Result] — success carries a [FetchedMedia], failure wraps the
@@ -141,12 +184,16 @@ class RelayHttpClient(
                    response.header("Content-Disposition")
                )

+                val sensitive = parseSensitiveHeader(
+                    response.header("X-Media-Sensitive")
+                )
+
                val body = response.body
                if (body == null) {
                    return@withContext Result.failure(IOException("Empty response body"))
                }
                val bytes = body.bytes()
-                Result.success(FetchedMedia(contentType, bytes, fileName))
+                Result.success(FetchedMedia(contentType, bytes, fileName, sensitive))
            }
        } catch (e: IOException) {
            Log.w(TAG, "fetchMedia failed for $token: ${e.message}")
@@ -248,12 +295,16 @@ class RelayHttpClient(
                    response.header("Content-Disposition")
                )

+                val sensitive = parseSensitiveHeader(
+                    response.header("X-Media-Sensitive")
+                )
+
                val body = response.body
                if (body == null) {
                    return@withContext Result.failure(IOException("Empty response body"))
                }
                val bytes = body.bytes()
-                Result.success(FetchedMedia(contentType, bytes, fileName))
+                Result.success(FetchedMedia(contentType, bytes, fileName, sensitive))
            }
        } catch (e: IOException) {
            Log.w(TAG, "fetchMediaByPath failed for $path: ${e.message}")
@@ -264,6 +315,85 @@ class RelayHttpClient(
        }
    }

+    /**
+     * Fetch the relay's server-side injected-context audit. This endpoint is
+     * optional and fail-open: old/plugin-absent relays return an empty disabled
+     * audit rather than breaking the client-side context sheet.
+     */
+    suspend fun fetchInjectedContext(): Result<InjectedContextAudit> = withContext(Dispatchers.IO) {
+        val relayUrl = relayUrlProvider()?.trim().orEmpty()
+        if (relayUrl.isEmpty()) {
+            return@withContext Result.failure(
+                IllegalStateException("Relay URL not configured")
+            )
+        }
+
+        val sessionToken = sessionTokenProvider()
+        if (sessionToken.isNullOrBlank()) {
+            return@withContext Result.failure(
+                IllegalStateException("Relay not paired — session token missing")
+            )
+        }
+
+        val httpBase = relayUrl
+            .replace(Regex("^wss://", RegexOption.IGNORE_CASE), "https://")
+            .replace(Regex("^ws://", RegexOption.IGNORE_CASE), "http://")
+            .trimEnd('/')
+
+        val url = try {
+            "$httpBase/context/injected".toHttpUrl()
+        } catch (e: IllegalArgumentException) {
+            return@withContext Result.failure(
+                IOException("Invalid relay URL: ${e.message}")
+            )
+        }
+
+        val request = Request.Builder()
+            .url(url)
+            .get()
+            .header("Authorization", "Bearer $sessionToken")
+            .header("Accept", "application/json")
+            .build()
+
+        val auditClient = okHttpClient.newBuilder()
+            .callTimeout(3, java.util.concurrent.TimeUnit.SECONDS)
+            .build()
+
+        try {
+            auditClient.newCall(request).execute().use { response ->
+                if (response.code == 404) {
+                    return@withContext Result.success(InjectedContextAudit())
+                }
+                if (!response.isSuccessful) {
+                    val reason = when (response.code) {
+                        401, 403 -> "Unauthorized — re-pair with the relay"
+                        in 500..599 -> "Relay error (HTTP ${response.code})"
+                        else -> "HTTP ${response.code}: ${response.message.ifBlank { "request failed" }}"
+                    }
+                    return@withContext Result.failure(IOException(reason))
+                }
+
+                val body = response.body?.string().orEmpty()
+                if (body.isBlank()) {
+                    return@withContext Result.failure(IOException("Empty response body"))
+                }
+
+                Result.success(
+                    sessionsJson.decodeFromString(
+                        InjectedContextAudit.serializer(),
+                        body,
+                    )
+                )
+            }
+        } catch (e: IOException) {
+            Log.w(TAG, "fetchInjectedContext failed: ${e.message}")
+            Result.failure(e)
+        } catch (e: Exception) {
+            Log.w(TAG, "fetchInjectedContext parse error: ${e.message}")
+            Result.failure(e)
+        }
+    }
+
    // ------------------------------------------------------------------
    // Paired-device management (2026-04-11 security overhaul)
    // ------------------------------------------------------------------
@@ -777,4 +907,16 @@ class RelayHttpClient(
        val match = Regex("""filename\s*=\s*"?([^";]+)"?""", RegexOption.IGNORE_CASE).find(header)
        return match?.groupValues?.get(1)?.trim()?.ifBlank { null }
    }
+
+    /**
+     * Parse the relay's `X-Media-Sensitive` response header into a bool.
+     *
+     * The relay emits the header only when the media was flagged sensitive,
+     * with value `"1"` (and tolerates `"true"`). Any other value — or an
+     * absent header — means "not sensitive", so when in doubt we don't blur.
+     */
+    private fun parseSensitiveHeader(header: String?): Boolean {
+        val value = header?.trim()?.lowercase() ?: return false
+        return value == "1" || value == "true"
+    }
 }
@@ -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
@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.relay

 import java.net.URI

@@ -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())
+}
@@ -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(),
@@ -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
@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.shared

 import android.content.Context
 import android.net.ConnectivityManager
@@ -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
@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.shared

 import android.content.Context
 import android.net.ConnectivityManager
@@ -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
+}
@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.shared

 import java.net.URI

@@ -0,0 +1,117 @@
+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
+
+    /**
+     * The route a call would ACTUALLY use right now. For a concrete backend this
+     * equals [route]; for the [AutoVoiceAudioClient] router it resolves `Auto`
+     * against live readiness (relay-first). Callers that need to reason about
+     * the backend's capabilities (e.g. "is standard global-TTS in play?") must
+     * use this, not the configured preference.
+     */
+    val effectiveRoute: VoiceAudioRoute
+        get() = route
+
+    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()
+
+    /**
+     * Resolve the configured preference to the backend a call would land on:
+     * `Standard`/`Relay` are honored verbatim; `Auto` prefers Relay when it's
+     * ready (matching [runAuto]) and falls back to Standard otherwise. Used to
+     * decide whether standard-only limitations (global TTS) currently apply.
+     */
+    override val effectiveRoute: VoiceAudioRoute
+        get() = when (routeProvider()) {
+            VoiceAudioRoute.Standard -> VoiceAudioRoute.Standard
+            VoiceAudioRoute.Relay -> VoiceAudioRoute.Relay
+            VoiceAudioRoute.Auto ->
+                if (relayReadyProvider()) VoiceAudioRoute.Relay else VoiceAudioRoute.Standard
+        }
+
+    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(
+                            "Vanilla 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"),
+        )
+    }
+}
@@ -1,6 +1,7 @@
-package com.hermesandroid.relay.network.handlers
+package com.hermesandroid.relay.network.upstream

 import android.util.Log
+import com.hermesandroid.relay.data.Attachment
 import com.hermesandroid.relay.data.ChatMessage
 import com.hermesandroid.relay.data.ChatSession
 import com.hermesandroid.relay.data.HermesCard
@@ -8,8 +9,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.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
@@ -33,7 +36,15 @@ class ChatHandler {
        private const val TAG = "ChatHandler"

        /** Maximum number of messages kept in memory per session. Oldest are trimmed. */
-        private const val MAX_MESSAGES = 500
+        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.
        //
@@ -71,7 +82,11 @@ class ChatHandler {
        //   reachable when the tool fired, so we render an "unavailable"
        //   placeholder instead of attempting a fetch.
        private val mediaRelayRegex = Regex("""MEDIA:hermes-relay://([A-Za-z0-9_-]+)""")
-        private val mediaBarePathRegex = Regex("""^\s*MEDIA:(/\S+)\s*$""")
+        // `/.+?` (not `/\S+`) so absolute paths containing spaces — e.g.
+        // `MEDIA:/mnt/media/Coralee Adshade/undressher.jpg` — still match. The
+        // trailing `\s*$` trims any trailing whitespace; non-greedy keeps the
+        // capture to the path. OkHttp re-encodes the space for /media/by-path.
+        private val mediaBarePathRegex = Regex("""^\s*MEDIA:(/.+?)\s*$""")
        // Rich card marker — single line, full JSON object payload.
        //
        // Agents emit:
@@ -96,6 +111,14 @@ class ChatHandler {
    /** Whether to parse tool annotations from assistant text (for servers that don't emit tool events). */
    var parseToolAnnotations: Boolean = false

+    /**
+     * When false (default — TUI/desktop parity), server-injected role:system
+     * STEERING markers ("[System: The active model … has changed …]") are
+     * hidden from the rendered transcript. A developer toggle flips this to
+     * surface them for debugging. They always remain in server-side history.
+     */
+    var showSystemMarkers: Boolean = false
+
    /** Active personality/agent name — set by ChatViewModel before each stream. Included on new assistant messages. */
    var activeAgentName: String? = null

@@ -180,6 +203,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()

@@ -200,6 +235,61 @@ class ChatHandler {
        }
    }

+    /**
+     * Append a SYSTEM-role notice bubble (e.g. a gateway interactive ask the
+     * phone can't answer). SYSTEM role keeps it out of the voice TTS observer
+     * and renders with the muted system styling in MessageBubble.
+     */
+    fun addSystemNotice(text: String) {
+        _messages.update { list ->
+            val notice = ChatMessage(
+                id = "system-notice-${java.util.UUID.randomUUID()}",
+                role = MessageRole.SYSTEM,
+                content = text,
+                timestamp = System.currentTimeMillis(),
+                clientOnly = true,
+            )
+            (list + notice).let { if (it.size > MAX_MESSAGES) it.drop(it.size - MAX_MESSAGES) else it }
+        }
+    }
+
+    /**
+     * Append an assistant message that carries ONLY a gateway ask card
+     * (clarify / approval / sudo / secret). Local-only — the server never
+     * stores the ask as a message, so the bubble is flagged
+     * [ChatMessage.clientOnly] and [loadMessageHistory] preserves it across the
+     * reload the same way it preserves voice-intent traces.
+     * Idempotent on [messageId] so a re-emitted ask never duplicates.
+     */
+    fun appendAskCardMessage(messageId: String, card: HermesCard) {
+        _messages.update { list ->
+            if (list.any { it.id == messageId }) return@update list
+            val msg = ChatMessage(
+                id = messageId,
+                role = MessageRole.ASSISTANT,
+                content = "",
+                timestamp = System.currentTimeMillis(),
+                cards = listOf(card),
+                agentName = activeAgentName,
+                clientOnly = true,
+            )
+            (list + msg).let { if (it.size > MAX_MESSAGES) it.drop(it.size - MAX_MESSAGES) else it }
+        }
+    }
+
+    /**
+     * Edit-and-regenerate local truncation: drop [messageId] and everything
+     * after it. The gateway performs the authoritative truncation via
+     * `truncate_before_user_ordinal`; this keeps the visible list consistent
+     * until the post-turn history reload reconciles any divergence.
+     */
+    fun truncateMessagesFrom(messageId: String) {
+        _messages.update { list ->
+            val idx = list.indexOfFirst { it.id == messageId }
+            if (idx < 0) list else list.take(idx)
+        }
+    }
+
    fun replaceMessageContent(messageId: String, content: String) {
        _messages.update { messages ->
            messages.map { message ->
@@ -253,6 +343,7 @@ class ChatHandler {
            role = MessageRole.USER,
            content = userText,
            timestamp = ts,
+            clientOnly = true,
        )
        val assistantMsg = ChatMessage(
            id = "voice-intent-action-$ts",
@@ -270,6 +361,7 @@ class ChatHandler {
            // session memory. Null for the pre-dispatch user bubble (the
            // raw transcribed utterance carries no structure on its own).
            voiceIntent = voiceIntent,
+            clientOnly = true,
        )
        _messages.update { list ->
            (list + userMsg + assistantMsg).let {
@@ -318,6 +410,7 @@ class ChatHandler {
            // pre-dispatch trace was appended) leave this null and rely
            // on the pre-dispatch trace's voiceIntent field.
            voiceIntent = voiceIntent,
+            clientOnly = true,
        )
        _messages.update { list ->
            (list + resultMsg).let {
@@ -390,7 +483,13 @@ class ChatHandler {
            val mapped = messages.map { msg ->
                if (msg.id == messageId && msg.role == MessageRole.ASSISTANT) {
                    changed = true
-                    msg.copy(realtimeTurn = trace)
+                    // A realtimeTurn trace is attached ONLY for provider-only
+                    // (non-Hermes-backed) turns — Hermes-backed ones leave it
+                    // null because the server owns that turn. So a trace ⟺ a
+                    // purely local bubble: mark it clientOnly so the post-turn
+                    // reload preserves it instead of wiping the only record of
+                    // the turn (and the trace the next chat payload still needs).
+                    msg.copy(realtimeTurn = trace, clientOnly = true)
                } else {
                    msg
                }
@@ -594,6 +693,7 @@ class ChatHandler {
        activeAnnotationTools.clear()
        cardLineBuffer.clear()
        dispatchedCardMarkers.clear()
+        subagentLabels.clear()
    }

    /**
@@ -658,8 +758,19 @@ class ChatHandler {
    }

    /**
-     * Load message history from API response into the messages list.
-     * Replaces current messages with the loaded history.
+     * Reconcile the in-memory transcript against the server message history.
+     *
+     * This is a surgical DELTA-MERGE keyed by message id, not a wholesale
+     * replace:
+     *  - a server message whose id matches a local row UPDATES that row's
+     *    server-authoritative fields (content, tool calls, cards, reasoning)
+     *    in place while keeping every client-only field;
+     *  - a server message with no local row is INSERTED in timestamp order;
+     *  - a client-only orphan ([ChatMessage.clientOnly], no server row) is KEPT;
+     *  - a local row that WAS server-backed (not clientOnly) but is no longer in
+     *    the transcript is DROPPED (genuinely deleted / forked / truncated
+     *    server-side).
+     *
     * Reconstructs tool calls from assistant messages' tool_calls field.
     *
     * Server-persisted message content still contains raw `MEDIA:...` markers
@@ -684,11 +795,69 @@ class ChatHandler {
        // mutateMessage lookups find the newly-loaded messages.
        val pendingMediaHits = mutableListOf<Pair<String, MediaMarkerHit>>()

+        // Reconcile optimistic (client-UUID) live ids to their server ids BEFORE
+        // building the carry map, so the id-keyed delta-merge updates rows in
+        // place instead of dropping-and-reinserting them. SSE assistant rows are
+        // already reconciled mid-turn (replaceMessageId ← message.started); but
+        // GATEWAY assistant rows keep a local UUID (the gateway exposes no
+        // per-message server id during the turn) and USER rows of every transport
+        // keep a local UUID. Without this, the id-keyed carry-forward below
+        // silently misses those rows, so a gateway turn's tokens/badges survived
+        // only if a content match happened to cover them. See
+        // [reconcileLiveIdsToServer].
+        val serverItemIds = items.mapNotNullTo(HashSet()) { it.id }
+        val idRemap = reconcileLiveIdsToServer(items, serverItemIds)
+
+        // Carry CLIENT-ONLY enrichment forward across the reload, keyed by the
+        // RECONCILED message id. The server transcript (MessageItem) rebuilds
+        // content, tool calls, and reasoning — but it does NOT persist per-message
+        // token usage/cost, provenance badges, tapped-card confirmations, or the
+        // voice/realtime sync traces. Carrying these forward is preserve-by-default
+        // (not a per-field whitelist the next new field forgets). With the remap
+        // above, an id-matched (SSE) row keeps its server id and a positionally
+        // reconciled (gateway/user) row adopts its server id, so both match the
+        // reloaded item id and update in place.
+        val priorById = _messages.value.associateBy { idRemap[it.id] ?: it.id }
+
+        // Outbound (user-authored) attachments are the safety net for any USER row
+        // that did NOT reconcile to a server id at merge time (they live on USER
+        // messages, are not echoed in server content, and are not re-dispatched —
+        // only inbound `MEDIA:` markers are). Reconciled rows already carry their
+        // attachment by id via priorById, so we queue ONLY the still-unreconciled
+        // rows here — otherwise a later same-content row could pull a duplicate
+        // from the queue. Match by content, consume-once so repeated identical
+        // sends don't cross-assign; inbound (relayToken != null) attachments are
+        // excluded since the marker re-dispatch re-fetches them.
+        val priorOutboundByContent = HashMap<String, ArrayDeque<List<Attachment>>>()
+        for (msg in _messages.value) {
+            if (msg.role != MessageRole.USER) continue
+            if ((idRemap[msg.id] ?: msg.id) in serverItemIds) continue // carried by id already
+            val outbound = msg.attachments.filter { it.relayToken == null }
+            if (outbound.isNotEmpty()) {
+                priorOutboundByContent.getOrPut(msg.content) { ArrayDeque() }.addLast(outbound)
+            }
+        }
+
        val loaded = items.mapNotNull { item ->
            val role = when (item.role) {
                "user" -> MessageRole.USER
                "assistant" -> MessageRole.ASSISTANT
-                "system" -> MessageRole.SYSTEM
+                "system" ->
+                    // Upstream injects role:system STEERING markers into the
+                    // session history on model/personality change — e.g.
+                    // "[System: The active model for this chat has changed to …]"
+                    // (tui_gateway/server.py) — so the LLM picks up the new
+                    // runtime/persona. They are NOT user-facing; the TUI/desktop
+                    // keep them invisible. Hide them for parity UNLESS the
+                    // developer "Show system messages" toggle is on (debugging).
+                    // They remain in server-side history for the model regardless.
+                    if (!showSystemMarkers &&
+                        item.contentText?.trimStart()?.startsWith("[System:") == true
+                    ) {
+                        return@mapNotNull null
+                    } else {
+                        MessageRole.SYSTEM
+                    }
                "tool" -> return@mapNotNull null // Merged into assistant tool calls above
                else -> return@mapNotNull null
            }
@@ -726,16 +895,77 @@ class ChatHandler {
                afterMedia to emptyList()
            }

-            ChatMessage(
-                id = messageId,
-                role = role,
-                content = cleanedContent,
-                timestamp = timestampMs,
-                isStreaming = false,
-                toolCalls = toolCalls,
-                cards = extractedCards,
-                agentName = if (role == MessageRole.ASSISTANT) activeAgentName else null,
-            )
+            val prior = priorById[messageId]
+            // Outbound attachments: prefer an id-match (covers any future
+            // user-message id reconciliation), else fall back to the
+            // content-keyed queue. Inbound attachments are intentionally
+            // excluded — they come back via the marker re-dispatch.
+            val carriedAttachments = run {
+                val byId = prior?.attachments.orEmpty().filter { it.relayToken == null }
+                when {
+                    byId.isNotEmpty() -> byId
+                    role == MessageRole.USER ->
+                        priorOutboundByContent[cleanedContent]?.removeFirstOrNull().orEmpty()
+                    else -> emptyList()
+                }
+            }
+            // Server reasoning is authoritative when present; absent, keep the
+            // live-streamed thinking rather than blanking it on reload.
+            val serverThinking =
+                if (role == MessageRole.ASSISTANT) item.resolvedReasoning?.trim() else null
+
+            if (prior != null) {
+                // DELTA-MERGE UPDATE — a local row with this id already exists.
+                // Refresh ONLY the server-authoritative fields (content, tool
+                // calls, cards, reasoning, role, timestamp) and keep every
+                // client-only field (tokens, cost, badges, tapped-card
+                // confirmations, voice/realtime traces, the clientOnly flag, …)
+                // by copying the existing message. This is strictly broader than
+                // the old curated carry list — a new client-only field is
+                // preserved automatically — and produces an object equal to the
+                // prior one when nothing server-side changed, so unchanged rows
+                // don't churn.
+                //
+                // `id = messageId` adopts the server id: for an id-matched (SSE)
+                // row it's a no-op, but for a positionally reconciled (gateway /
+                // user) row whose `prior` still carries a client UUID it swaps in
+                // the server id so EVERY future reload matches by id.
+                prior.copy(
+                    id = messageId,
+                    role = role,
+                    content = cleanedContent,
+                    attachments = carriedAttachments,
+                    timestamp = timestampMs,
+                    isStreaming = false,
+                    isThinkingStreaming = false,
+                    toolCalls = toolCalls,
+                    cards = extractedCards,
+                    agentName = if (role == MessageRole.ASSISTANT) activeAgentName else null,
+                    thinkingContent = if (role == MessageRole.ASSISTANT) {
+                        serverThinking ?: prior.thinkingContent
+                    } else {
+                        ""
+                    },
+                )
+            } else {
+                // INSERT — a server message with no local row yet. Built from
+                // server data; client-only enrichment defaults empty (there is
+                // nothing local to carry).
+                ChatMessage(
+                    id = messageId,
+                    role = role,
+                    content = cleanedContent,
+                    attachments = carriedAttachments,
+                    timestamp = timestampMs,
+                    isStreaming = false,
+                    toolCalls = toolCalls,
+                    cards = extractedCards,
+                    agentName = if (role == MessageRole.ASSISTANT) activeAgentName else null,
+                    // Server persists per-message reasoning — restore it so the
+                    // Thought-process block survives returning to the chat.
+                    thinkingContent = if (role == MessageRole.ASSISTANT) serverThinking ?: "" else "",
+                )
+            }
        }

        // Reload swaps the entire message list — any stale dedupe entries keyed
@@ -743,34 +973,37 @@ class ChatHandler {
        // just collected against the reloaded IDs are guaranteed to fire.
        dispatchedMediaMarkers.clear()

-        // === PHASE3-voice-intents-chathistory ===
-        // Preserve local-only voice-intent trace messages across a reload.
-        // These messages are injected by [appendLocalVoiceIntentTrace] with
-        // IDs prefixed "voice-intent-" and never reach the server-side
-        // session, so a wholesale `_messages.value = loaded` assignment
-        // would wipe them. Bailey hit this 2026-04-15: voice fall-through
-        // ("proceed" → not a recognized intent → chat.sendMessage) triggered
-        // a history reload on stream complete and the previous voice trace
-        // vanished, making it look like "the chat cleared". Server-side
-        // sync (so these traces reach the LLM's session memory too) is
-        // still a v0.4.1 follow-up, but preserving them client-side is
-        // enough to fix the disappearing-scrollback bug today.
-        val preservedVoiceTraces = _messages.value.filter {
-            it.id.startsWith("voice-intent-")
-        }
-        val merged = if (preservedVoiceTraces.isEmpty()) {
+        // Preserve client-only orphans across the reload. A bubble flagged
+        // [ChatMessage.clientOnly] has no server-side row — slash-command
+        // notices (addSystemNotice), voice-intent traces
+        // (appendLocalVoiceIntent*), the steer echo, gateway ask cards
+        // (appendAskCardMessage), an errored turn the server never persisted
+        // (markError), and provider-only realtime turns (attachRealtimeTurnTrace).
+        // A wholesale `_messages.value = loaded` assignment would silently wipe
+        // any whose id is absent from the reloaded transcript: the
+        // disappearing-scrollback / "reply appears then vanishes" class of bug.
+        //
+        // This replaces the old id-prefix whitelist (voice-intent-/steer-/ask-/
+        // system-notice-) plus "Error"-badge sniffing — each creator now declares
+        // its own provenance, so a new client-only bubble type is preserved the
+        // moment it sets the flag, with no reconcile-side change. Note the badge
+        // subtlety: a turn that errors *after* persisting keeps an "Error" badge
+        // but IS in the transcript, so it reconciles normally; only clientOnly +
+        // absent-from-transcript marks a preservable orphan.
+        val loadedIds = loaded.mapTo(HashSet()) { it.id }
+        val preservedLocal = _messages.value.filter { it.clientOnly && it.id !in loadedIds }
+        val merged = if (preservedLocal.isEmpty()) {
            loaded
        } else {
-            // Merge by timestamp so voice traces interleave with the
-            // reloaded server messages in chronological order. The voice
-            // trace IDs carry `System.currentTimeMillis()` in their suffix
-            // (see appendLocalVoiceIntentTrace), so ChatMessage.timestamp
-            // is the source of truth here.
-            (loaded + preservedVoiceTraces).sortedBy { it.timestamp }
+            // Merge by timestamp so preserved orphans interleave with the
+            // reloaded server messages in chronological order. Voice trace IDs
+            // carry `System.currentTimeMillis()` in their suffix (see
+            // appendLocalVoiceIntentTrace); other orphans keep their live
+            // ChatMessage.timestamp — the source of truth either way.
+            (loaded + preservedLocal).sortedBy { it.timestamp }
        }

        _messages.value = if (merged.size > MAX_MESSAGES) merged.takeLast(MAX_MESSAGES) else merged
-        // === END PHASE3-voice-intents-chathistory ===

        // Now that the reloaded messages are in state, fire callbacks so the
        // ViewModel can insert LOADING/FAILED attachments via mutateMessage.
@@ -794,6 +1027,105 @@ class ChatHandler {
        }
    }

+    /** One adoptable server row during id reconciliation. `taken` enforces consume-once. */
+    private class ReconcileSlot(
+        val serverId: String,
+        val role: MessageRole,
+        val key: String,
+    ) {
+        var taken: Boolean = false
+    }
+
+    /**
+     * Map optimistic (client-UUID) live message ids → their server ids so the
+     * id-keyed delta-merge in [loadMessageHistory] updates rows in place.
+     *
+     * Strategy: match each still-unreconciled, non-[ChatMessage.clientOnly] live
+     * row to an unclaimed server row by (role, marker-stripped content),
+     * consume-once in document order, and adopt the server id. Rows whose id is
+     * already a server id (SSE assistant, reconciled mid-turn) are skipped so we
+     * never double-swap; clientOnly orphans have no server row and are never
+     * mapped; a live row that matches no slot is left alone (graceful fallback —
+     * the content-keyed attachment fallback and drop-and-reinsert still apply, so
+     * a count divergence / truncation / compaction never forces a wrong map).
+     *
+     * Returns oldLiveId → serverId for the rows that reconciled (empty when there
+     * is nothing to adopt).
+     */
+    private fun reconcileLiveIdsToServer(
+        items: List<MessageItem>,
+        serverItemIds: Set<String>,
+    ): Map<String, String> {
+        val live = _messages.value
+        if (live.isEmpty()) return emptyMap()
+        val liveIds = live.mapTo(HashSet()) { it.id }
+
+        // Adoptable slots: rendered server rows (not tool, not a hidden steering
+        // marker) whose id no live row already carries.
+        val slots = items.mapNotNull { item ->
+            val serverId = item.id ?: return@mapNotNull null
+            if (serverId in liveIds) return@mapNotNull null
+            val role = renderedRoleOf(item) ?: return@mapNotNull null
+            ReconcileSlot(serverId, role, reconcileKey(item.contentText))
+        }
+        if (slots.isEmpty()) return emptyMap()
+
+        val remap = HashMap<String, String>()
+        for (msg in live) {
+            if (msg.clientOnly) continue            // no server row to adopt
+            if (msg.id in serverItemIds) continue   // already a server id
+            val key = reconcileKey(msg.content)
+            val slot = slots.firstOrNull { !it.taken && it.role == msg.role && it.key == key }
+                ?: continue
+            slot.taken = true
+            remap[msg.id] = slot.serverId
+        }
+        return remap
+    }
+
+    /**
+     * The rendered role for a server message item, or null for rows that never
+     * become a visible bubble (tool results, unknown roles, and hidden
+     * `[System:` steering markers). Mirrors the role/skip logic in
+     * [loadMessageHistory] so reconciliation only adopts ids onto rows that
+     * actually render.
+     */
+    private fun renderedRoleOf(item: MessageItem): MessageRole? = when (item.role) {
+        "user" -> MessageRole.USER
+        "assistant" -> MessageRole.ASSISTANT
+        "system" ->
+            if (!showSystemMarkers &&
+                item.contentText?.trimStart()?.startsWith("[System:") == true
+            ) {
+                null
+            } else {
+                MessageRole.SYSTEM
+            }
+        else -> null
+    }
+
+    /**
+     * Normalize content for reconciliation matching: strip `MEDIA:`/`CARD:` marker
+     * lines (raw server content still carries them; live content already had them
+     * stripped during streaming) and collapse to trimmed, non-blank lines joined
+     * by newlines. Lets a marker-bearing assistant turn match its live row while
+     * staying byte-stable for plain user/assistant text.
+     */
+    private fun reconcileKey(content: String?): String {
+        val text = content.orEmpty()
+        if (text.isEmpty()) return ""
+        val sb = StringBuilder()
+        for (line in text.lines()) {
+            val t = line.trim()
+            if (t.isEmpty()) continue
+            if (mediaRelayRegex.containsMatchIn(t) || mediaBarePathRegex.containsMatchIn(t)) continue
+            if (cardMarkerRegex.containsMatchIn(t)) continue
+            if (sb.isNotEmpty()) sb.append('\n')
+            sb.append(t)
+        }
+        return sb.toString()
+    }
+
    /**
     * Marker hit collected during [loadMessageHistory] for post-assignment dispatch.
     */
@@ -933,18 +1265,34 @@ class ChatHandler {
     * Update sessions list from API response.
     */
    fun updateSessions(items: List<SessionItem>) {
-        _sessions.value = 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 mapped = items.map { item ->
+            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
+        // persists. Keeping the local row (its title/preview is already set)
+        // stops a new chat from vanishing from the drawer between creation and
+        // the first message. Once it has messages the server returns it and the
+        // id-match below replaces the optimistic copy.
+        val activeId = _currentSessionId.value
+        val pending = if (activeId != null && mapped.none { it.sessionId == activeId }) {
+            _sessions.value.firstOrNull { it.sessionId == activeId }
+        } else {
+            null
        }
+        _sessions.value = if (pending != null) listOf(pending) + mapped else mapped
    }

    fun clearSessions() {
@@ -1616,26 +1964,29 @@ class ChatHandler {
        }
    }

-    fun onToolCallStart(
-        messageId: String,
-        toolCallId: String,
-        toolName: String,
-        runId: String? = null,
-        provenance: String? = null,
-    ) {
-        _isStreaming.value = true
+    /** Monotonic suffix for synthetic generating / subagent ToolCall ids. */
+    private var syntheticToolSeq = 0

-        val toolCall = ToolCall(
-            id = toolCallId,
-            name = toolName,
+    /**
+     * Gateway `tool.generating` — the model is still streaming this tool's
+     * arguments. Appends a quiet "preparing" placeholder ToolCall; the
+     * matching `tool.start` (same name, FIFO — see [onToolCallStart])
+     * adopts it so the preparing card and the running card stay one entry.
+     * Nameless events get a blank-name placeholder that the next start
+     * adopts as a fallback; any never-adopted placeholders are swept in
+     * [onStreamComplete].
+     */
+    fun onToolGenerating(messageId: String, toolName: String?) {
+        _isStreaming.value = true
+        val placeholder = ToolCall(
+            id = "generating-${toolName ?: "tool"}-${syntheticToolSeq++}",
+            name = toolName ?: "",
            args = null,
            result = null,
            success = null,
            isComplete = false,
-            runId = runId,
-            provenance = provenance,
+            isGenerating = true,
        )
-
        _messages.update { messages ->
            val target = messages.findLast {
                it.id == messageId && it.role == MessageRole.ASSISTANT
@@ -1643,7 +1994,7 @@ class ChatHandler {
            if (target != null) {
                messages.map { msg ->
                    if (msg.id == messageId) {
-                        msg.copy(toolCalls = msg.toolCalls + toolCall)
+                        msg.copy(toolCalls = msg.toolCalls + placeholder)
                    } else {
                        msg
                    }
@@ -1655,13 +2006,214 @@ class ChatHandler {
                    content = "",
                    timestamp = System.currentTimeMillis(),
                    isStreaming = true,
-                    toolCalls = listOf(toolCall),
+                    toolCalls = listOf(placeholder),
                    agentName = activeAgentName
                )
            }
        }
    }

+    fun onToolCallStart(
+        messageId: String,
+        toolCallId: String,
+        toolName: String,
+        runId: String? = null,
+        provenance: String? = null,
+    ) {
+        _isStreaming.value = true
+
+        _messages.update { messages ->
+            val target = messages.findLast {
+                it.id == messageId && it.role == MessageRole.ASSISTANT
+            }
+            if (target != null) {
+                // Adopt a pending "preparing" placeholder for this name
+                // (or, failing that, the oldest nameless one) so the
+                // generating card flips to running in place instead of a
+                // second card appearing.
+                val genIdx = target.toolCalls
+                    .indexOfFirst { it.isGenerating && !it.isComplete && it.name == toolName }
+                    .takeIf { it >= 0 }
+                    ?: target.toolCalls
+                        .indexOfFirst { it.isGenerating && !it.isComplete && it.name.isEmpty() }
+                        .takeIf { it >= 0 }
+                messages.map { msg ->
+                    if (msg.id != messageId) return@map msg
+                    if (genIdx != null) {
+                        val calls = msg.toolCalls.toMutableList()
+                        calls[genIdx] = calls[genIdx].copy(
+                            id = toolCallId,
+                            name = toolName,
+                            isGenerating = false,
+                            // Execution starts now — preparing time isn't runtime.
+                            startedAt = System.currentTimeMillis(),
+                            runId = runId ?: calls[genIdx].runId,
+                            provenance = provenance ?: calls[genIdx].provenance,
+                        )
+                        msg.copy(toolCalls = calls)
+                    } else {
+                        msg.copy(
+                            toolCalls = msg.toolCalls + ToolCall(
+                                id = toolCallId,
+                                name = toolName,
+                                args = null,
+                                result = null,
+                                success = null,
+                                isComplete = false,
+                                runId = runId,
+                                provenance = provenance,
+                            ),
+                        )
+                    }
+                }
+            } else {
+                messages + ChatMessage(
+                    id = messageId,
+                    role = MessageRole.ASSISTANT,
+                    content = "",
+                    timestamp = System.currentTimeMillis(),
+                    isStreaming = true,
+                    toolCalls = listOf(
+                        ToolCall(
+                            id = toolCallId,
+                            name = toolName,
+                            args = null,
+                            result = null,
+                            success = null,
+                            isComplete = false,
+                            runId = runId,
+                            provenance = provenance,
+                        ),
+                    ),
+                    agentName = activeAgentName
+                )
+            }
+        }
+    }
+
+    // --- Gateway subagent lanes ---
+
+    /**
+     * Lane labels by task index, captured from `subagent.start` (goal
+     * truncated to 60 chars) and stamped onto every child ToolCall so
+     * [com.hermesandroid.relay.ui.components.SubagentLane] can render its
+     * header without a separate registry. Per-run state — cleared on
+     * [onStreamComplete] / [clearMessages].
+     */
+    private val subagentLabels = mutableMapOf<Int, String>()
+
+    /**
+     * Apply one gateway `subagent.*` lifecycle event to the streaming
+     * message's tool calls. Mutation model mirrors the upstream child
+     * mirror: a TOOL event closes the lane's open tool then starts the new
+     * one; COMPLETE closes whatever is still open and (for a lane that
+     * never surfaced a tool) appends a single completed summary entry so
+     * the lane is visible in history. THINKING/PROGRESS carry preview text
+     * the lanes don't render — ignored.
+     */
+    fun onSubagentEvent(messageId: String, event: GatewaySubagentEvent) {
+        val label = event.goal.trim().take(60).ifBlank { null }
+        when (event.phase) {
+            GatewaySubagentEvent.Phase.START -> {
+                if (label != null) subagentLabels[event.taskIndex] = label
+            }
+
+            GatewaySubagentEvent.Phase.TOOL -> {
+                _isStreaming.value = true
+                val laneLabel = subagentLabels[event.taskIndex] ?: label
+                val newCall = ToolCall(
+                    id = "subagent-${event.taskIndex}-${syntheticToolSeq++}",
+                    name = event.toolName?.takeIf { it.isNotBlank() } ?: "tool",
+                    args = event.preview,
+                    result = null,
+                    success = null,
+                    isComplete = false,
+                    taskIndex = event.taskIndex,
+                    taskLabel = laneLabel,
+                )
+                _messages.update { messages ->
+                    val target = messages.findLast {
+                        it.id == messageId && it.role == MessageRole.ASSISTANT
+                    }
+                    if (target != null) {
+                        messages.map { msg ->
+                            if (msg.id != messageId) return@map msg
+                            val closed = msg.toolCalls.map { call ->
+                                if (call.taskIndex == event.taskIndex && !call.isComplete) {
+                                    call.copy(
+                                        success = true,
+                                        isComplete = true,
+                                        completedAt = System.currentTimeMillis(),
+                                    )
+                                } else {
+                                    call
+                                }
+                            }
+                            msg.copy(toolCalls = closed + newCall)
+                        }
+                    } else {
+                        messages + ChatMessage(
+                            id = messageId,
+                            role = MessageRole.ASSISTANT,
+                            content = "",
+                            timestamp = System.currentTimeMillis(),
+                            isStreaming = true,
+                            toolCalls = listOf(newCall),
+                            agentName = activeAgentName
+                        )
+                    }
+                }
+            }
+
+            GatewaySubagentEvent.Phase.COMPLETE -> {
+                // "interrupted" lanes never finished — not a success either.
+                val failed = event.status == "failed" || event.status == "interrupted"
+                val laneLabel = subagentLabels.remove(event.taskIndex) ?: label
+                val summaryId = "subagent-${event.taskIndex}-${syntheticToolSeq++}"
+                _messages.update { messages ->
+                    messages.map { msg ->
+                        if (msg.id != messageId || msg.role != MessageRole.ASSISTANT) return@map msg
+                        val hasLaneCalls = msg.toolCalls.any { it.taskIndex == event.taskIndex }
+                        val closed = msg.toolCalls.map { call ->
+                            if (call.taskIndex == event.taskIndex && !call.isComplete) {
+                                call.copy(
+                                    success = !failed,
+                                    isComplete = true,
+                                    result = event.summary ?: call.result,
+                                    error = if (failed) (event.summary ?: event.status) else call.error,
+                                    completedAt = System.currentTimeMillis(),
+                                )
+                            } else {
+                                call
+                            }
+                        }
+                        val withSummary = if (hasLaneCalls) {
+                            closed
+                        } else {
+                            closed + ToolCall(
+                                id = summaryId,
+                                name = laneLabel ?: "subagent",
+                                args = null,
+                                result = event.summary,
+                                success = !failed,
+                                isComplete = true,
+                                error = if (failed) (event.summary ?: event.status) else null,
+                                completedAt = System.currentTimeMillis(),
+                                taskIndex = event.taskIndex,
+                                taskLabel = laneLabel,
+                            )
+                        }
+                        msg.copy(toolCalls = withSummary)
+                    }
+                }
+            }
+
+            GatewaySubagentEvent.Phase.THINKING,
+            GatewaySubagentEvent.Phase.PROGRESS,
+            -> Unit
+        }
+    }
+
    fun onToolCallComplete(
        messageId: String,
        toolCallId: String,
@@ -1786,12 +2338,57 @@ 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.
+     *
+     * Also marks the bubble [ChatMessage.clientOnly] = true: the only caller is
+     * the gateway ❌ terminal-error path, which fires on an in-flight turn the
+     * server never persists. That makes this assistant bubble a client-only
+     * orphan, so the reload must preserve it (the "reply appears then vanishes"
+     * regression). If the same id later turns up in the server transcript (a
+     * turn that errored *after* persisting), the reload reconciles it as a
+     * normal server-backed message and the Error badge rides along via the
+     * priorById carry — the clientOnly flag only gates the not-in-transcript
+     * orphan case.
+     */
+    fun markError(messageId: String) {
+        _messages.update { messages ->
+            messages.map { msg ->
+                if (msg.id == messageId && "Error" !in msg.badges) {
+                    msg.copy(badges = msg.badges + "Error", clientOnly = true)
+                } 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
@@ -1818,6 +2415,19 @@ class ChatHandler {
        // Finalize media markers unconditionally
        finalizeMediaMarkers(messageId)
        finalizeCardMarkers(messageId)
+
+        // Sweep "preparing" placeholders whose tool.start never arrived —
+        // they never executed and would otherwise breathe forever.
+        _messages.update { messages ->
+            messages.map { msg ->
+                if (msg.toolCalls.none { it.isGenerating && !it.isComplete }) {
+                    msg
+                } else {
+                    msg.copy(toolCalls = msg.toolCalls.filterNot { it.isGenerating && !it.isComplete })
+                }
+            }
+        }
+        subagentLabels.clear()
    }

    fun onStreamError(message: String) {
@@ -1831,6 +2441,19 @@ class ChatHandler {
                } else msg
            }
        }
+
+        // Same sweep as onStreamComplete — error/watchdog/transport-failure
+        // turns must not leave "preparing" placeholders breathing forever.
+        _messages.update { messages ->
+            messages.map { msg ->
+                if (msg.toolCalls.none { it.isGenerating && !it.isComplete }) {
+                    msg
+                } else {
+                    msg.copy(toolCalls = msg.toolCalls.filterNot { it.isGenerating && !it.isComplete })
+                }
+            }
+        }
+        subagentLabels.clear()
    }

    fun onThinkingDelta(messageId: String, delta: String) {
@@ -1926,7 +2549,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(
@@ -1,9 +1,14 @@
-package com.hermesandroid.relay.network
+package com.hermesandroid.relay.network.upstream

 import android.content.Context
-import com.hermesandroid.relay.auth.KeystoreTokenStore
-import com.hermesandroid.relay.auth.LegacyEncryptedPrefsTokenStore
+import com.hermesandroid.relay.data.Profile
+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.SecureStoreCache
 import com.hermesandroid.relay.auth.SessionTokenStore
+import com.hermesandroid.relay.auth.buildRawTokenStore
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
@@ -71,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).
 *
@@ -162,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")

@@ -372,6 +385,90 @@ class DashboardApiClient(
    suspend fun deleteProfile(name: String): Result<JsonObject> =
        deleteJsonObject("/api/profiles/${pathSegment(name)}")

+    /**
+     * List the host's Hermes agent profiles (`GET /api/profiles`) — the same
+     * profiles the Manage tab and the official desktop expose — mapped into the
+     * shared [Profile] type so the chat agent sheet can offer them even on a
+     * dashboard-only (non-relay) connection, where the relay's `auth.ok`
+     * profile list is empty. Tolerates the array (`{profiles:[…]}` / `{items:[…]}`)
+     * and the object-map (`{profiles:{name:{…}}}`) shapes; an item missing a
+     * required field is skipped, not fatal.
+     */
+    suspend fun listProfiles(): Result<List<Profile>> =
+        getJsonObject("/api/profiles").mapCatching { root -> parseProfiles(root) }
+
+    /**
+     * List a profile's chat sessions via the dashboard `GET /api/sessions?profile=`.
+     *
+     * This is the per-profile scoping the official desktop sidebar uses: upstream
+     * (`web_server.py` `_open_session_db_for_profile`) opens THAT profile's own
+     * `state.db` directly. The gateway `session.list` RPC can't do this — it reads
+     * one process-global DB bound to the launch profile, so over a single socket it
+     * always returns the launch profile's sessions regardless of the active profile.
+     *
+     * [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 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 = 200): Result<List<SessionItem>> =
+        withContext(Dispatchers.IO) {
+            val query = buildList {
+                add("limit=${limit.coerceIn(1, 200)}")
+                add("order=recent")
+                add("min_messages=1")
+                val name = profile?.trim().orEmpty()
+                if (name.isNotBlank()) add("profile=${pathSegment(name)}")
+            }.joinToString(prefix = "?", separator = "&")
+            getJson("/api/sessions$query").mapCatching { root ->
+                val parsed = json.decodeFromJsonElement(SessionListResponse.serializer(), root)
+                parsed.sessions ?: parsed.items ?: parsed.data ?: emptyList()
+            }
+        }
+
+    /**
+     * A session's message history, scoped to its owning profile via the dashboard
+     * `GET /api/sessions/{id}/messages?profile=`. Required twin of [listSessions]:
+     * a non-default profile's sessions live in that profile's own `state.db`, so
+     * loading their transcript through the api_server (one shared DB, no profile)
+     * returns nothing. [profile] null/blank → the launch profile's DB. Decodes the
+     * upstream `{session_id, messages:[…]}` envelope into the shared [MessageItem].
+     */
+    suspend fun getSessionMessages(
+        sessionId: String,
+        profile: String? = null,
+    ): Result<List<MessageItem>> = withContext(Dispatchers.IO) {
+        val name = profile?.trim().orEmpty()
+        val query = if (name.isNotBlank()) "?profile=${pathSegment(name)}" else ""
+        getJson("/api/sessions/${pathSegment(sessionId)}/messages$query").mapCatching { root ->
+            val parsed = json.decodeFromJsonElement(MessageListResponse.serializer(), root)
+            parsed.messages ?: parsed.data ?: parsed.items ?: emptyList()
+        }
+    }
+
+    private fun parseProfiles(root: JsonObject): List<Profile> {
+        fun decode(element: JsonElement, nameOverride: String?): Profile? = runCatching {
+            val obj = element as? JsonObject ?: return null
+            // Profile requires name + model; inject the map key as name and an
+            // empty model when the server omits them so a sparse row still maps.
+            val patched = buildJsonObject {
+                obj.forEach { (k, v) -> put(k, v) }
+                if (obj["name"] == null && !nameOverride.isNullOrBlank()) put("name", nameOverride)
+                if (obj["model"] == null) put("model", "")
+            }
+            json.decodeFromJsonElement(Profile.serializer(), patched)
+        }.getOrNull()
+
+        (root["profiles"] as? JsonArray)?.let { arr -> return arr.mapNotNull { decode(it, null) } }
+        (root["items"] as? JsonArray)?.let { arr -> return arr.mapNotNull { decode(it, null) } }
+        (root["profiles"] as? JsonObject)?.let { map ->
+            return map.entries.mapNotNull { (name, value) -> decode(value, name) }
+        }
+        return root.entries.mapNotNull { (name, value) -> decode(value, name) }
+    }
+
    suspend fun loginPassword(
        provider: String = "basic",
        username: String,
@@ -423,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) {
@@ -658,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
+            }
    }
 }

@@ -689,22 +816,56 @@ class InMemoryDashboardCookieStore : DashboardCookieStore {
 class EncryptedDashboardCookieStore(
    context: Context,
    connectionId: String,
+    /**
+     * The connection's TOKEN-store file key. When non-null the dashboard cookies
+     * ride that already-built keyset (so there is NO second keyset build on cold
+     * start), and any cookies in this connection's old stand-alone
+     * `hermes_dashboard_<id>` file are migrated across once. Null preserves the
+     * original stand-alone-file behavior for callers that can't resolve the key.
+     */
+    tokenStoreKey: String? = null,
    private val json: Json = Json { ignoreUnknownKeys = true },
 ) : DashboardCookieStore {
    private val serializer = ListSerializer(StoredDashboardCookie.serializer())
    private val appContext = context.applicationContext
-    private val prefsName = prefsName(connectionId)
+    private val standaloneCookiePrefsName = prefsName(connectionId)
+    // Unify onto the connection's token file when we know it; else stand alone.
+    // (Explicit type + distinct name avoids a type-inference cycle with the
+    // companion `prefsName(connectionId)` function above.)
+    private val storePrefsName: String = tokenStoreKey ?: standaloneCookiePrefsName
+    private val unified = tokenStoreKey != null && tokenStoreKey != standaloneCookiePrefsName

-    // DEFERRED on purpose. Building the Keystore-backed prefs takes 1-4s
-    // on StrongBox devices and serializes through a process-GLOBAL Tink
-    // lock (AndroidKeysetManager.Builder.build) — eager construction here
-    // froze the main thread for ~11s at app start when several stores were
-    // built concurrently (frozen-sphere incident, 2026-06-11). Construction
-    // is now free on any thread; the expensive build happens on the first
-    // actual cookie access, which is always an OkHttp/IO thread.
+    // DEFERRED on purpose. Building the Keystore-backed prefs takes 1-4s on
+    // StrongBox devices and serializes through a process-GLOBAL Tink lock
+    // (AndroidKeysetManager.Builder.build) — eager construction here froze the
+    // main thread for ~11s at app start (frozen-sphere incident, 2026-06-11).
+    // Construction is free on any thread; the expensive build happens on the
+    // first actual cookie access, always an OkHttp/IO thread. Going through
+    // SecureStoreCache means that build is SHARED with the connection's token
+    // store — so when unified there is NO second keyset build at all.
    private val store: SessionTokenStore by lazy {
-        KeystoreTokenStore.tryCreate(appContext, prefsName)
-            ?: LegacyEncryptedPrefsTokenStore(appContext, prefsName)
+        val s = SecureStoreCache.getOrBuild(storePrefsName) {
+            buildRawTokenStore(appContext, storePrefsName)
+        }
+        if (unified) migrateCookiesFromStandaloneFile(s)
+        s
+    }
+
+    /**
+     * One-shot copy of this connection's cookies from the old stand-alone
+     * `hermes_dashboard_<id>` file into the unified token file, marker-gated so
+     * the old file's keyset is built at most once ever. On failure (corrupt old
+     * file) the user simply re-signs-in to Manage — cookies are re-obtainable,
+     * unlike the relay session token.
+     */
+    private fun migrateCookiesFromStandaloneFile(target: SessionTokenStore) {
+        if (target.contains(KEY_COOKIES_MIGRATED)) return
+        runCatching {
+            val old = buildRawTokenStore(appContext, standaloneCookiePrefsName)
+            old.getString(KEY_COOKIES)?.let { target.putString(KEY_COOKIES, it) }
+            old.clearAll()
+        }
+        target.putString(KEY_COOKIES_MIGRATED, "1")
    }

    override fun load(): List<StoredDashboardCookie> {
@@ -723,6 +884,7 @@ class EncryptedDashboardCookieStore(

    companion object {
        private const val KEY_COOKIES = "dashboard_cookies_json"
+        private const val KEY_COOKIES_MIGRATED = "dashboard_cookies_migrated"

        fun prefsName(connectionId: String): String =
            "hermes_dashboard_${connectionId.take(8)}"
@@ -745,8 +907,11 @@ class DashboardCookieJar(

    override fun loadForRequest(url: HttpUrl): List<Cookie> {
        val now = clockMillis()
-        val stored = store.load().filterNot { it.isExpired(now) }
-        if (stored.size != store.load().size) {
+        // Load once (each load() is a decrypt + JSON decode); prune expired
+        // entries back to disk only when something actually expired.
+        val all = store.load()
+        val stored = all.filterNot { it.isExpired(now) }
+        if (stored.size != all.size) {
            store.save(stored)
        }
        return stored.mapNotNull { it.toCookie() }
@@ -0,0 +1,289 @@
+package com.hermesandroid.relay.network.upstream
+
+import com.hermesandroid.relay.network.upstream.models.UsageInfo
+import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.contentOrNull
+import kotlinx.serialization.json.doubleOrNull
+import kotlinx.serialization.json.intOrNull
+
+/**
+ * Maps tui_gateway events for ONE chat turn onto [GatewayTurnCallbacks].
+ *
+ * Pure JVM (no Android deps) so the whole mapping table is unit-testable.
+ * The caller (GatewayChatClient) filters events by live session id and
+ * invokes [onEvent] in arrival order; this class owns per-turn state
+ * (backfill guards, synthetic tool ids, turn-end detection).
+ *
+ * Forward-compat contract: unknown event types MUST be ignored — upstream
+ * adds event types freely and old clients are expected to skip them. That is
+ * why dispatch is a manual `when (type)` over [JsonObject] rather than a
+ * sealed polymorphic hierarchy (which throws on unknown discriminators).
+ */
+class GatewayEventMapper(private val callbacks: GatewayTurnCallbacks) {
+
+    /** True once `message.complete` or `error` has been seen — the turn is over. */
+    var turnEnded: Boolean = false
+        private set
+
+    private var sawMessageStart = false
+    private var sawTextDelta = false
+    private var sawThinkingDelta = false
+    private var syntheticToolCounter = 0
+
+    /**
+     * `tool.complete` events match their `tool.start` by `tool_id`; when a
+     * server omits the id we synthesize one per start and match completes by
+     * tool name, FIFO.
+     */
+    private val openSyntheticIdsByName = mutableMapOf<String, ArrayDeque<String>>()
+
+    /**
+     * `tool.generating` pre-registrations awaiting their `tool.start`, per
+     * name FIFO — the start adopts the pre-minted id (unless the server
+     * supplied a real `tool_id`) so the "preparing" placeholder and the
+     * running card stay one ToolCall.
+     */
+    private val generatingIdsByName = mutableMapOf<String, ArrayDeque<String>>()
+
+    fun onEvent(type: String, payload: JsonObject?) {
+        if (turnEnded) return
+        when (type) {
+            "reasoning.delta", "thinking.delta" -> {
+                val text = payload.string("text")
+                if (!text.isNullOrEmpty()) {
+                    sawThinkingDelta = true
+                    callbacks.onThinkingDelta(text)
+                }
+            }
+
+            // Post-hoc reasoning (providers that don't stream it) — only
+            // useful when nothing streamed live.
+            "reasoning.available" -> {
+                val text = payload.string("text")
+                if (!text.isNullOrEmpty() && !sawThinkingDelta) {
+                    sawThinkingDelta = true
+                    callbacks.onThinkingDelta(text)
+                }
+            }
+
+            "message.delta" -> {
+                val text = payload.string("text")
+                if (!text.isNullOrEmpty()) {
+                    sawTextDelta = true
+                    callbacks.onTextDelta(text)
+                }
+            }
+
+            "message.start" -> {
+                // Gateway has no server-side message id (placeholder UUID
+                // stays). A second start inside one turn means a new
+                // assistant message began — close out the previous one.
+                if (sawMessageStart) callbacks.onTurnComplete()
+                sawMessageStart = true
+            }
+
+            "tool.generating" -> {
+                // `{name?}` with NO tool_id — the model is still streaming
+                // this tool's arguments.
+                val name = payload.string("name")
+                if (name != null) {
+                    generatingIdsByName.getOrPut(name) { ArrayDeque() }
+                        .addLast("gateway-tool-$name-${syntheticToolCounter++}")
+                }
+                callbacks.onToolGenerating(name)
+            }
+
+            "tool.start" -> {
+                val name = payload.string("name") ?: "unknown"
+                // A pending generating placeholder for this name is adopted
+                // (consumed FIFO) whether or not the server sent a real id.
+                val adopted = generatingIdsByName[name]?.removeFirstOrNull()
+                val serverId = payload.string("tool_id")
+                val toolId = when {
+                    serverId != null -> serverId
+                    adopted != null -> adopted.also {
+                        openSyntheticIdsByName.getOrPut(name) { ArrayDeque() }.addLast(it)
+                    }
+                    else -> syntheticToolId(name)
+                }
+                callbacks.onToolCallStart(toolId, name)
+            }
+
+            "tool.complete" -> {
+                val name = payload.string("name") ?: "unknown"
+                val toolId = payload.string("tool_id")
+                    ?: openSyntheticIdsByName[name]?.removeFirstOrNull()
+                    ?: return
+                val error = payload.string("error")
+                if (!error.isNullOrEmpty()) {
+                    callbacks.onToolCallFailed(toolId, error)
+                } else {
+                    callbacks.onToolCallDone(toolId, payload.string("summary"))
+                }
+            }
+
+            "message.complete" -> {
+                // Non-streaming servers (or error turns) deliver everything
+                // here; backfill whatever never streamed.
+                val text = payload.string("text")
+                if (!sawTextDelta && !text.isNullOrEmpty()) {
+                    callbacks.onTextDelta(text)
+                }
+                val reasoning = payload.string("reasoning")
+                if (!sawThinkingDelta && !reasoning.isNullOrEmpty()) {
+                    callbacks.onThinkingDelta(reasoning)
+                }
+                callbacks.onUsage(parseGatewayUsage(payload?.get("usage") as? JsonObject))
+                turnEnded = true
+                callbacks.onComplete()
+            }
+
+            "error" -> {
+                turnEnded = true
+                callbacks.onError(payload.string("message") ?: "Gateway error")
+            }
+
+            "subagent.start", "subagent.thinking", "subagent.tool",
+            "subagent.progress", "subagent.complete",
+            -> {
+                val phase = when (type) {
+                    "subagent.start" -> GatewaySubagentEvent.Phase.START
+                    "subagent.thinking" -> GatewaySubagentEvent.Phase.THINKING
+                    "subagent.tool" -> GatewaySubagentEvent.Phase.TOOL
+                    "subagent.progress" -> GatewaySubagentEvent.Phase.PROGRESS
+                    else -> GatewaySubagentEvent.Phase.COMPLETE
+                }
+                callbacks.onSubagentEvent(
+                    GatewaySubagentEvent(
+                        phase = phase,
+                        taskIndex = payload.int("task_index") ?: 0,
+                        taskCount = payload.int("task_count") ?: 1,
+                        goal = payload.string("goal") ?: "",
+                        status = payload.string("status"),
+                        summary = payload.string("summary"),
+                        toolName = payload.string("tool_name"),
+                        // subagent.tool sets tool_preview AND mirrors it into
+                        // text; thinking/progress carry text only.
+                        preview = payload.string("tool_preview") ?: payload.string("text"),
+                        durationSeconds = payload.double("duration_seconds"),
+                    ),
+                )
+            }
+
+            "clarify.request" -> callbacks.onInteractionRequest(
+                GatewayAsk(
+                    kind = GatewayAsk.Kind.CLARIFY,
+                    requestId = payload.string("request_id"),
+                    text = payload.string("question") ?: "The agent needs clarification",
+                    choices = (payload?.get("choices") as? JsonArray)
+                        ?.mapNotNull { (it as? JsonPrimitive)?.contentOrNull }
+                        ?.takeIf { it.isNotEmpty() },
+                    timeoutSeconds = CLARIFY_TIMEOUT_SECONDS,
+                ),
+            )
+
+            "approval.request" -> callbacks.onInteractionRequest(
+                GatewayAsk(
+                    kind = GatewayAsk.Kind.APPROVAL,
+                    // Upstream approvals correlate per-SESSION, never
+                    // per-request — a stray request_id must not be adopted.
+                    requestId = null,
+                    text = listOfNotNull(payload.string("command"), payload.string("description"))
+                        .joinToString(" — ")
+                        .ifBlank { "a command approval" },
+                    timeoutSeconds = 0,
+                ),
+            )
+
+            "sudo.request" -> callbacks.onInteractionRequest(
+                GatewayAsk(
+                    kind = GatewayAsk.Kind.SUDO,
+                    requestId = payload.string("request_id"),
+                    // Payload carries request_id ONLY — no command to show.
+                    text = "Elevated permissions requested",
+                    timeoutSeconds = SUDO_TIMEOUT_SECONDS,
+                ),
+            )
+
+            "secret.request" -> callbacks.onInteractionRequest(
+                GatewayAsk(
+                    kind = GatewayAsk.Kind.SECRET,
+                    requestId = payload.string("request_id"),
+                    text = payload.string("prompt") ?: "The agent needs a secret value",
+                    envVar = payload.string("env_var"),
+                    timeoutSeconds = SECRET_TIMEOUT_SECONDS,
+                ),
+            )
+
+            "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
+        }
+    }
+
+    private fun syntheticToolId(name: String): String {
+        val id = "gateway-tool-$name-${syntheticToolCounter++}"
+        openSyntheticIdsByName.getOrPut(name) { ArrayDeque() }.addLast(id)
+        return id
+    }
+
+    companion object {
+        /**
+         * `message.complete.usage` uses tui_gateway's own key names
+         * (`input`/`output`/`total`, with `prompt`/`completion` as the raw
+         * counterparts — see upstream `_get_usage()`), NOT the
+         * `input_tokens`/`prompt_tokens` schemes [UsageInfo] decodes from the
+         * SSE paths. Translate explicitly. Values are session-cumulative.
+         *
+         * The context-window block (`context_used`/`context_max`/
+         * `context_percent`) exists only when the server's context compressor
+         * is active — absent fields stay null and the meter stays hidden.
+         */
+        fun parseGatewayUsage(usage: JsonObject?): UsageInfo? {
+            if (usage == null) return null
+            val input = usage.int("input") ?: usage.int("prompt")
+            val output = usage.int("output") ?: usage.int("completion")
+            val total = usage.int("total")
+            val contextUsed = usage.int("context_used")
+            val contextMax = usage.int("context_max")
+            val contextPercent = usage.int("context_percent")
+            if (input == null && output == null && total == null &&
+                contextUsed == null && contextMax == null && contextPercent == null
+            ) {
+                return null
+            }
+            return UsageInfo(
+                inputTokens = input,
+                outputTokens = output,
+                totalTokens = total,
+                contextUsed = contextUsed,
+                contextMax = contextMax,
+                contextPercent = contextPercent,
+            )
+        }
+    }
+}
+
+// Upstream `_block()` timeouts per ask kind (server.py) — the blocked thread
+// resolves to "" when these elapse. Approval has none (session-scoped).
+private const val CLARIFY_TIMEOUT_SECONDS = 300
+private const val SUDO_TIMEOUT_SECONDS = 120
+private const val SECRET_TIMEOUT_SECONDS = 300
+
+private fun JsonObject?.string(key: String): String? =
+    (this?.get(key) as? JsonPrimitive)?.contentOrNull
+
+private fun JsonObject?.int(key: String): Int? =
+    (this?.get(key) as? JsonPrimitive)?.intOrNull
+
+private fun JsonObject?.double(key: String): Double? =
+    (this?.get(key) as? JsonPrimitive)?.doubleOrNull
@@ -0,0 +1,172 @@
+package com.hermesandroid.relay.network.upstream
+
+import android.annotation.SuppressLint
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.content.pm.ServiceInfo
+import android.os.Build
+import android.os.IBinder
+import android.util.Log
+import androidx.core.app.NotificationCompat
+import com.hermesandroid.relay.MainActivity
+import com.hermesandroid.relay.R
+import com.hermesandroid.relay.data.setGatewayKeepAlive
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+
+/**
+ * Opt-in foreground service that keeps the app process alive so the gateway
+ * chat WebSocket (held by [com.hermesandroid.relay.viewmodel.ConnectionViewModel]'s
+ * [GatewayChatClient]) survives Android's background-freeze / Doze — i.e.
+ * "keep connected in the background".
+ *
+ * # Both flavors (Play declaration required)
+ *
+ * Declared in the MAIN manifest (unlike the device-control
+ * [com.hermesandroid.relay.bridge.BridgeForegroundService], which is sideload
+ * only), so googlePlay ships it too — the Home-Assistant-class persistent-
+ * connection use case Google Play permits. The `specialUse` type is honest for
+ * an always-on connection (`dataSync` is force-stopped after a 6h/day cap on
+ * SDK 35) but requires a one-time Play Console foreground-service declaration
+ * at submission. Off by default; only runs while the user enables the toggle.
+ *
+ * # It does NOT own the socket
+ *
+ * The service's only job is to hold the process in the foreground. The socket
+ * stays open because [GatewayChatClient.setKeepAliveInBackground] stops its
+ * idle-close timer while the toggle is on. On task removal (user swipes the app
+ * away) the ViewModel + socket die with the process, so the service stops
+ * itself rather than leave a notification that lies about being connected.
+ *
+ * # Android 15 watchdog
+ *
+ * On target SDK 35 any intent to a service that declares a foregroundServiceType
+ * must call `startForeground` within 5s — so [onStartCommand] always does that
+ * first, before branching on the action. Shutdown goes through [stop]
+ * (`stopService`) to bypass [onStartCommand] entirely.
+ */
+class GatewayKeepAliveService : Service() {
+    companion object {
+        private const val TAG = "GatewayKeepAliveSvc"
+        const val CHANNEL_ID = "gateway_keepalive"
+        private const val CHANNEL_NAME = "Background connection"
+        const val NOTIFICATION_ID = 4713
+        const val ACTION_STOP = "com.hermesandroid.relay.gateway.KEEPALIVE_STOP"
+
+        fun start(context: Context) {
+            val intent = Intent(context.applicationContext, GatewayKeepAliveService::class.java)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                context.applicationContext.startForegroundService(intent)
+            } else {
+                context.applicationContext.startService(intent)
+            }
+        }
+
+        fun stop(context: Context) {
+            // stopService() bypasses onStartCommand, so a "please shut down"
+            // never trips the Android 15 foreground-start watchdog.
+            context.applicationContext.stopService(
+                Intent(context.applicationContext, GatewayKeepAliveService::class.java),
+            )
+        }
+    }
+
+    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
+    override fun onBind(intent: Intent?): IBinder? = null
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        startForegroundNotification()
+        if (intent?.action == ACTION_STOP) {
+            Log.i(TAG, "ACTION_STOP → user dismissed background connection")
+            // Flip the pref off so ConnectionViewModel's collector won't
+            // restart us on the next foreground.
+            scope.launch { runCatching { applicationContext.setGatewayKeepAlive(false) } }
+            stopForeground(STOP_FOREGROUND_REMOVE)
+            stopSelf()
+            return START_NOT_STICKY
+        }
+        return START_STICKY
+    }
+
+    override fun onTaskRemoved(rootIntent: Intent?) {
+        super.onTaskRemoved(rootIntent)
+        // The socket lives in the ViewModel, which dies when the task is
+        // removed — keeping the notification would be a lie. Stop cleanly.
+        Log.i(TAG, "onTaskRemoved → app swiped away; stopping keep-alive")
+        stopForeground(STOP_FOREGROUND_REMOVE)
+        stopSelf()
+    }
+
+    override fun onDestroy() {
+        scope.cancel()
+        super.onDestroy()
+    }
+
+    // The service + specialUse type + FOREGROUND_SERVICE_SPECIAL_USE permission
+    // are all declared in the main manifest (both flavors), so the type is
+    // satisfied. Suppress retained defensively — lint's ForegroundServiceType
+    // check is finicky about correlating the runtime type arg with the manifest.
+    @SuppressLint("ForegroundServiceType")
+    private fun startForegroundNotification() {
+        ensureChannel()
+        val notification = buildNotification()
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                startForeground(
+                    NOTIFICATION_ID,
+                    notification,
+                    ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE,
+                )
+            } else {
+                startForeground(NOTIFICATION_ID, notification)
+            }
+        } catch (t: Throwable) {
+            Log.w(TAG, "startForeground failed — stopping keep-alive", t)
+            stopSelf()
+        }
+    }
+
+    private fun buildNotification(): android.app.Notification {
+        val tapIntent = Intent(this, MainActivity::class.java).apply {
+            flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
+        }
+        val pendingFlags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        val tapPending = PendingIntent.getActivity(this, 0, tapIntent, pendingFlags)
+
+        val stopIntent = Intent(this, GatewayKeepAliveService::class.java).setAction(ACTION_STOP)
+        val stopPending = PendingIntent.getService(this, 1, stopIntent, pendingFlags)
+
+        return NotificationCompat.Builder(this, CHANNEL_ID)
+            .setSmallIcon(R.mipmap.ic_launcher)
+            .setContentTitle("Hermes stays connected")
+            .setContentText("Keeping your chat connection warm in the background.")
+            .setContentIntent(tapPending)
+            .setOngoing(true)
+            .setOnlyAlertOnce(true)
+            .setPriority(NotificationCompat.PRIORITY_LOW)
+            .setCategory(NotificationCompat.CATEGORY_SERVICE)
+            .addAction(0, "Disconnect", stopPending)
+            .build()
+    }
+
+    private fun ensureChannel() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
+        val nm = getSystemService(NotificationManager::class.java) ?: return
+        if (nm.getNotificationChannel(CHANNEL_ID) != null) return
+        nm.createNotificationChannel(
+            NotificationChannel(CHANNEL_ID, CHANNEL_NAME, NotificationManager.IMPORTANCE_LOW).apply {
+                description =
+                    "Persistent indicator while Hermes keeps your chat connection open in the background."
+                setShowBadge(false)
+            },
+        )
+    }
+}
@@ -0,0 +1,240 @@
+package com.hermesandroid.relay.network.upstream
+
+import com.hermesandroid.relay.network.upstream.models.UsageInfo
+
+/**
+ * Shared types for the Gateway chat transport — upstream hermes-agent's
+ * `tui_gateway` JSON-RPC-over-WebSocket surface at the dashboard's `/api/ws`.
+ *
+ * This is the same wire protocol the official hermes-desktop client and the
+ * Ink TUI speak (reference shapes vendored in `desktop/src/gatewayTypes.ts`).
+ * It is the only upstream surface that streams reasoning live
+ * (`reasoning.delta` / `thinking.delta`) — the api_server SSE paths only
+ * deliver reasoning after generation completes.
+ */
+
+/**
+ * Why the Gateway chat transport is or isn't usable right now. Mirrors
+ * [com.hermesandroid.relay.viewmodel.StandardVoiceAvailability] — both ride
+ * the dashboard surface and share the same probe — minus the audio-route
+ * requirement (`/api/ws` ships with every embedded-chat dashboard build).
+ */
+enum class GatewayAvailability {
+    /** No probe has completed yet (startup, connection switch). */
+    Unknown,
+
+    /** Dashboard reachable and authenticated (or auth not required). */
+    Ready,
+
+    /** Dashboard reachable and gated, but no signed-in session — Manage sign-in unlocks it. */
+    SignInRequired,
+
+    /** Dashboard URL configured but `/api/status` did not answer. */
+    Unreachable,
+
+    /**
+     * Runtime sticky downgrade: the WS upgrade or ticket mint was rejected in
+     * a way that says this server build has no usable `/api/ws` (404 on the
+     * route, dashboard build predating the embedded chat). Cleared on
+     * connection switch / fresh probe cycle.
+     */
+    Unsupported,
+}
+
+/** Lifecycle of the gateway WebSocket, exposed for diagnostics. */
+enum class GatewayConnectionState {
+    Idle,
+    MintingTicket,
+    Connecting,
+    AwaitingReady,
+    Ready,
+}
+
+/**
+ * Streaming-endpoint resolution with the gateway tier — pure so the matrix
+ * is unit-testable without an AndroidViewModel. ConnectionViewModel
+ * delegates here with its live state.
+ *
+ * Manual picks pass through untouched (ChatViewModel handles per-turn
+ * fallback when a "gateway" pick can't serve a send); "auto" prefers the
+ * gateway only when the dashboard probe says [GatewayAvailability.Ready],
+ * otherwise it falls back to the capability-preferred SSE endpoint.
+ */
+fun resolveStreamingEndpointPreference(
+    preference: String,
+    gateway: GatewayAvailability,
+    capabilities: ServerCapabilities,
+): String = when (preference) {
+    "sessions", "completions", "runs", "gateway" -> preference
+    else -> if (gateway == GatewayAvailability.Ready) {
+        "gateway"
+    } else {
+        capabilities.preferredChatEndpoint()
+    }
+}
+
+/**
+ * Cancellable handle for one in-flight chat turn, regardless of transport.
+ * SSE turns wrap their [okhttp3.sse.EventSource]; gateway turns wrap a
+ * `session.interrupt` dispatch. Replaces the raw `EventSource?` field in
+ * ChatViewModel so both transports share the cancel/teardown sites.
+ */
+fun interface ActiveTurnHandle {
+    fun cancel()
+}
+
+/**
+ * One server-side interactive ask. The agent thread upstream is BLOCKED
+ * until the matching respond RPC arrives, the ask times out (resolves to ""
+ * server-side), or the turn is cancelled (`session.interrupt` force-releases
+ * pending asks and force-denies approvals). Built by [GatewayEventMapper]
+ * from the four `*.request` events; answered via the
+ * [GatewayChatClient] `respond*` helpers.
+ */
+data class GatewayAsk(
+    val kind: Kind,
+    /**
+     * Correlates the answer with the blocked server thread. Null ONLY for
+     * [Kind.APPROVAL] — upstream approvals correlate per-session, not
+     * per-request (`approval.respond` carries `session_id` instead).
+     */
+    val requestId: String?,
+    /** Question / command / prompt — whatever the ask wants the user to read. */
+    val text: String,
+    /** Clarify-only: server-suggested answers. */
+    val choices: List<String>? = null,
+    /** Secret-only: the env var the value will be stored under. */
+    val envVar: String? = null,
+    /**
+     * Upstream blocking timeout (clarify/secret 300s, sudo 120s). 0 means no
+     * countdown — approvals are session-scoped and never expire on their own.
+     */
+    val timeoutSeconds: Int,
+) {
+    enum class Kind { CLARIFY, APPROVAL, SUDO, SECRET }
+}
+
+/**
+ * One `subagent.*` lifecycle event, emitted on the PARENT session. Lifecycle
+ * per task: START → (THINKING | TOOL | PROGRESS)* → COMPLETE. Field
+ * availability varies by phase — [toolName]/[preview] ride TOOL,
+ * [status]/[summary]/[durationSeconds] ride COMPLETE — and older emitters
+ * omit everything beyond the three defaults-bearing fields.
+ */
+data class GatewaySubagentEvent(
+    val phase: Phase,
+    val taskIndex: Int,
+    val taskCount: Int,
+    val goal: String,
+    val status: String? = null,
+    val summary: String? = null,
+    val toolName: String? = null,
+    val preview: String? = null,
+    val durationSeconds: Double? = null,
+) {
+    enum class Phase { START, THINKING, TOOL, PROGRESS, COMPLETE }
+}
+
+/**
+ * One provider from the gateway `model.options` RPC — the curated, authenticated
+ * provider/model list the upstream desktop + TUI model picker uses (NOT the
+ * api_server `/v1/models`, which collapses to a single generic agent alias).
+ */
+data class GatewayModelProvider(
+    val name: String,
+    val slug: String,
+    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. */
+data class GatewayModelOptions(
+    val providers: List<GatewayModelProvider>,
+    val currentModel: String,
+    val currentProvider: String,
+)
+
+/**
+ * The explicit in-chat overrides to bind onto a gateway `session.create` as the
+ * new session's PER-SESSION overrides. Matches the upstream desktop client,
+ * whose `session.create` carries `model`/`provider`/`reasoning_effort`/`fast`
+ * (tui_gateway honors them → `session_model_override` / `create_reasoning_override`
+ * / `create_service_tier_override`; verified `tui_gateway/server.py:4175-4191`).
+ * Supplied live by ChatViewModel from the picker + safety/speed controls.
+ *
+ * Every field is nullable = "no explicit override for this new chat", so the
+ * fresh session inherits the profile / server default rather than the picker
+ * (or a stale local value) silently clobbering it. Crucially this keeps these
+ * picks OFF the sessionless `config.set` path, which upstream applies as GLOBAL
+ * writes (and `yolo` even leaks to other sessions via `os.environ`).
+ *
+ * [model] is the model id (e.g. `grok-4.3`); [provider] is the authenticated
+ * provider slug (e.g. `xai`). [reasoningEffort] is the upstream effort string
+ * (`low`/`medium`/`high`/…). [fast] pins the priority service tier when true.
+ * Note `yolo` is intentionally absent — upstream `session.create` does NOT
+ * accept it as a per-session override, so it is applied post-create instead.
+ */
+data class GatewaySessionModel(
+    val model: String?,
+    val provider: String?,
+    val reasoningEffort: String? = null,
+    val fast: Boolean? = null,
+)
+
+/** 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
+ * forward to the exact same ChatHandler mutations.
+ *
+ * Every member is a REQUIRED constructor param on purpose: GatewayChatClient
+ * `dispatchOn` must wrap each one onto the main thread, and a defaulted
+ * member would compile unwrapped — running on the OkHttp reader thread.
+ */
+class GatewayTurnCallbacks(
+    /** Stored (DB) session id — fired on session create/rotate so the drawer + persistence stay correct. */
+    val onSessionId: (String) -> Unit,
+    val onTextDelta: (String) -> Unit,
+    val onThinkingDelta: (String) -> Unit,
+    val onToolCallStart: (toolCallId: String, toolName: String) -> Unit,
+    val onToolCallDone: (toolCallId: String, resultPreview: String?) -> Unit,
+    val onToolCallFailed: (toolCallId: String, errorMsg: String?) -> Unit,
+    val onTurnComplete: () -> Unit,
+    val onComplete: () -> Unit,
+    val onUsage: (UsageInfo?) -> Unit,
+    val onError: (String) -> Unit,
+    /**
+     * `tool.generating` — the model is still writing this tool's arguments.
+     * Carries the tool name when upstream sent one. The next `tool.start`
+     * for the same name adopts the "preparing" placeholder (per name, FIFO).
+     */
+    val onToolGenerating: (toolName: String?) -> Unit,
+    /** `subagent.*` lifecycle on the parent session — feeds the subagent lanes. */
+    val onSubagentEvent: (GatewaySubagentEvent) -> Unit,
+    /**
+     * Server-side interactive ask (clarify/approval/sudo/secret) that blocks
+     * the turn until answered via the matching respond RPC or the turn is
+     * 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 = { _, _ -> },
+)
@@ -1,21 +1,22 @@
-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
 import kotlinx.serialization.encodeToString
@@ -287,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 ->
@@ -307,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(
@@ -416,6 +417,32 @@ class HermesApiClient(
        emptyList()
    }

+    // --- Available models ---
+
+    /**
+     * Available model ids from `GET /v1/models` (OpenAI-compatible:
+     * `{"object":"list","data":[{"id":"…"}]}`). Backs the in-chat model
+     * picker. Returns ids in server order; empty on any failure (the picker
+     * then offers only "Server default").
+     */
+    suspend fun getModels(): List<String> = withContext(Dispatchers.IO) {
+        try {
+            val request = authRequest("$baseUrl/v1/models").get().build()
+            client.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) return@withContext emptyList()
+                val body = response.body?.string() ?: return@withContext emptyList()
+                val data = (json.parseToJsonElement(body) as? JsonObject)
+                    ?.get("data") as? JsonArray ?: return@withContext emptyList()
+                data.mapNotNull {
+                    ((it as? JsonObject)?.get("id") as? JsonPrimitive)?.contentOrNull
+                }
+            }
+        } catch (e: Exception) {
+            Log.w(TAG, "Failed to fetch models: ${e.message}")
+            emptyList()
+        }
+    }
+
    // --- Server personalities ---

    /**
@@ -556,6 +583,8 @@ class HermesApiClient(
            .build()

        val completeCalled = AtomicBoolean(false)
+        // Comparable to the gateway's turn[gateway] line — see TurnLatencyTracer.
+        val tracer = TurnLatencyTracer("sessions")

        // Notify caller of the session ID being used
        mainHandler.post { onSessionId(sessionId) }
@@ -567,6 +596,7 @@ class HermesApiClient(
                type: String?,
                data: String
            ) {
+                tracer.mark("ttfe")
                if (data == "[DONE]") {
                    if (completeCalled.compareAndSet(false, true)) {
                        mainHandler.post { onComplete() }
@@ -577,6 +607,14 @@ class HermesApiClient(
                try {
                    val event = json.decodeFromString<HermesSseEvent>(data)

+                    // First visible streamed token (reasoning OR text) — the
+                    // metric that exposes SSE's reasoning dead-air vs gateway.
+                    if (!event.delta.isNullOrEmpty() || !event.thinkingDelta.isNullOrEmpty() ||
+                        !event.thinking.isNullOrEmpty()
+                    ) {
+                        tracer.mark("ttft")
+                    }
+
                    // Check for usage data on ANY event before type resolution
                    // (OpenAI-format chunks have no type/event field but may carry usage)
                    if (event.usage != null && (event.usage.resolvedInputTokens != null || event.usage.resolvedOutputTokens != null)) {
@@ -721,6 +759,7 @@ class HermesApiClient(
                t: Throwable?,
                response: Response?
            ) {
+                tracer.done("error")
                if (completeCalled.compareAndSet(false, true)) {
                    val msg = when {
                        response != null && !response.isSuccessful ->
@@ -734,6 +773,7 @@ class HermesApiClient(
            }

            override fun onClosed(eventSource: EventSource) {
+                tracer.done()
                if (completeCalled.compareAndSet(false, true)) {
                    mainHandler.post { onComplete() }
                }
@@ -796,6 +836,8 @@ class HermesApiClient(

        val completeCalled = AtomicBoolean(false)
        val messageStarted = AtomicBoolean(false)
+        // Comparable to the gateway's turn[gateway] line — see TurnLatencyTracer.
+        val tracer = TurnLatencyTracer("completions")

        val listener = object : EventSourceListener() {
            override fun onEvent(
@@ -804,6 +846,7 @@ class HermesApiClient(
                type: String?,
                data: String
            ) {
+                tracer.mark("ttfe")
                if (data == "[DONE]") {
                    if (completeCalled.compareAndSet(false, true)) {
                        mainHandler.post { onComplete() }
@@ -832,12 +875,14 @@ class HermesApiClient(

                    openAiReasoningDelta(event)?.let { reasoning ->
                        if (reasoning.isNotEmpty()) {
+                            tracer.mark("ttft")
                            mainHandler.post { onThinkingDelta(reasoning) }
                        }
                    }

                    openAiTextDelta(event)?.let { delta ->
                        if (delta.isNotEmpty()) {
+                            tracer.mark("ttft")
                            mainHandler.post { onTextDelta(delta) }
                        }
                    }
@@ -856,6 +901,7 @@ class HermesApiClient(
                t: Throwable?,
                response: Response?
            ) {
+                tracer.done("error")
                if (completeCalled.compareAndSet(false, true)) {
                    val msg = when {
                        response != null && !response.isSuccessful ->
@@ -869,6 +915,7 @@ class HermesApiClient(
            }

            override fun onClosed(eventSource: EventSource) {
+                tracer.done()
                if (completeCalled.compareAndSet(false, true)) {
                    mainHandler.post { onComplete() }
                }
@@ -977,6 +1024,8 @@ class HermesApiClient(
            .build()

        val completeCalled = AtomicBoolean(false)
+        // Comparable to the gateway's turn[gateway] line — see TurnLatencyTracer.
+        val tracer = TurnLatencyTracer("runs")

        val listener = object : EventSourceListener() {
            override fun onEvent(
@@ -985,6 +1034,7 @@ class HermesApiClient(
                type: String?,
                data: String
            ) {
+                tracer.mark("ttfe")
                if (data == "[DONE]") {
                    if (completeCalled.compareAndSet(false, true)) {
                        mainHandler.post { onComplete() }
@@ -995,6 +1045,14 @@ class HermesApiClient(
                try {
                    val event = json.decodeFromString<HermesSseEvent>(data)

+                    // First visible streamed token (reasoning OR text) — the
+                    // metric that exposes SSE's reasoning dead-air vs gateway.
+                    if (!event.delta.isNullOrEmpty() || !event.thinkingDelta.isNullOrEmpty() ||
+                        !event.thinking.isNullOrEmpty()
+                    ) {
+                        tracer.mark("ttft")
+                    }
+
                    // Check for usage data before type resolution (catches OpenAI-format chunks)
                    if (event.usage != null && (event.usage.resolvedInputTokens != null || event.usage.resolvedOutputTokens != null)) {
                        mainHandler.post { onUsage(event.usage) }
@@ -1055,6 +1113,7 @@ class HermesApiClient(
                        "reasoning.available" -> {
                            val reasoningText = event.text
                            if (!reasoningText.isNullOrEmpty()) {
+                                tracer.mark("ttft")
                                mainHandler.post { onThinkingDelta(reasoningText) }
                            }
                        }
@@ -1141,6 +1200,7 @@ class HermesApiClient(
                t: Throwable?,
                response: Response?
            ) {
+                tracer.done("error")
                if (completeCalled.compareAndSet(false, true)) {
                    val msg = when {
                        response != null && !response.isSuccessful ->
@@ -1154,6 +1214,7 @@ class HermesApiClient(
            }

            override fun onClosed(eventSource: EventSource) {
+                tracer.done()
                if (completeCalled.compareAndSet(false, true)) {
                    mainHandler.post { onComplete() }
                }
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`Your Hermes AI agent, in your pocket - chat, voice, and control.`