docs: changelog + devlog for cold-start keystore fast path

(DEVLOG also carries the concurrent docs session''s updated marketing
paragraph; its user-docs files land separately.)

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

.github/workflows/ci-android.yml

@@ -1,23 +1,40 @@
-# Hermes-Relay — CI Pipeline
+# Hermes-Relay — Android CI Pipeline
+#
+# 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.
 #
-# Runs on every push to main and on pull requests targeting main.
 # Pipeline: lint -> build + test (parallel) -> upload artifacts
-#
-# Android: Kotlin + Jetpack Compose (root Gradle project)
-# Python:  aiohttp relay server (relay_server/)
 
-name: CI
+name: CI — Android
 
 on:
   push:
-    branches: [main]
+    branches: [main, dev]
+    paths:
+      - "app/**"
+      - "gradle/**"
+      - "build.gradle.kts"
+      - "settings.gradle.kts"
+      - "gradle.properties"
+      - "gradlew"
+      - "gradlew.bat"
+      - ".github/workflows/ci-android.yml"
   pull_request:
-    branches: [main]
+    branches: [main, dev]
+    paths:
+      - "app/**"
+      - "gradle/**"
+      - "build.gradle.kts"
+      - "settings.gradle.kts"
+      - "gradle.properties"
+      - "gradlew"
+      - "gradlew.bat"
+      - ".github/workflows/ci-android.yml"
 
-# Cancel in-progress runs for the same branch/PR, but let main finish
+# Cancel in-progress runs for the same branch/PR, but let main and dev finish
 concurrency:
-  group: ci-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+  group: ci-android-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/dev' }}
 
 jobs:
   # ──────────────────────────────────────────────
@@ -85,11 +102,20 @@ jobs:
 
   # ──────────────────────────────────────────────
   # Android Tests — unit tests + report upload
+  #
+  # Tests run on every branch but are ADVISORY on dev (push or PR) so WIP
+  # commits don't block the merge queue. Strict on main — any PR retargeted
+  # from dev → main will surface the real failures before release-merge.
   # ──────────────────────────────────────────────
   test:
     name: Test (Android)
     needs: lint
     runs-on: ubuntu-latest
+    timeout-minutes: 20
+    # Advisory on dev, strict on main. Evaluates to false (= strict) for
+    # pushes to main and PRs whose base branch is main; true (= advisory)
+    # for everything else (dev pushes, dev-targeted PRs, feature branches).
+    continue-on-error: ${{ github.ref != 'refs/heads/main' && github.base_ref != 'main' }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
@@ -103,8 +129,16 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v6
 
-      - name: Run unit tests
-        run: ./gradlew test
+      # The broad Gradle `test` aggregate currently hangs in deferred JVM test
+      # suites tracked by issue #32. Keep CI release-relevant until that suite is
+      # split: pairing URL derivation plus connection switching are the stable
+      # Android regression slice for the active release work.
+      - name: Run focused Android unit tests
+        run: |
+          ./gradlew :app:testSideloadDebugUnitTest \
+            --tests com.hermesandroid.relay.network.RelayUrlDeriverTest \
+            --tests com.hermesandroid.relay.viewmodel.ConnectionSwitchTest \
+            --console=plain
 
       # Upload test reports even if tests fail, for debugging
       - name: Upload test reports
@@ -114,35 +148,3 @@ jobs:
           name: test-reports
           path: app/build/reports/tests/
           retention-days: 7
-
-  # ──────────────────────────────────────────────
-  # Python Relay — syntax check + future tests
-  # ──────────────────────────────────────────────
-  relay-check:
-    name: Relay Check (Python)
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v6
-        with:
-          python-version: "3.11"
-
-      - name: Install dependencies
-        run: pip install -r relay_server/requirements.txt
-
-      - 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
-          python -m py_compile plugin/relay/channels/chat.py
-          python -m py_compile plugin/relay/channels/bridge.py
-
-      - name: Syntax check (relay_server shim)
-        run: python -m py_compile relay_server/__init__.py relay_server/__main__.py
-
-      # TODO: Add pytest step when relay tests exist
-      # - name: Run tests
-      #   run: pytest plugin/relay/tests/

.github/workflows/ci-dashboard.yml

@@ -0,0 +1,65 @@
+name: CI dashboard plugin
+
+on:
+  push:
+    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:
+  contents: read
+
+concurrency:
+  group: ci-dashboard-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/dev' }}
+
+jobs:
+  build-and-test:
+    name: Build and test dashboard plugin
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: "22"
+          cache: npm
+          cache-dependency-path: plugin/dashboard/package-lock.json
+
+      - name: Install dashboard deps
+        working-directory: plugin/dashboard
+        run: npm ci
+
+      - name: Build dashboard bundle
+        working-directory: plugin/dashboard
+        run: npm run build
+
+      - name: Setup Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.11"
+
+      - name: Verify server-owned version metadata
+        run: python scripts/check-server-version-sync.py
+
+      - name: Install dashboard API test deps
+        run: pip install -r relay_server/requirements.txt fastapi httpx pytest requests
+
+      - name: Run dashboard API tests
+        run: python -m unittest plugin.dashboard.test_plugin_api
+
+      - name: Verify dashboard bundle outputs
+        run: |
+          test -s plugin/dashboard/dist/index.js
+          test -s plugin/dashboard/dist/style.css
+          grep -q "hr-modal-card" plugin/dashboard/dist/style.css

.github/workflows/ci-desktop.yml

@@ -0,0 +1,116 @@
+name: CI desktop
+
+on:
+  push:
+    branches: [main, dev]
+    paths:
+      - 'desktop/**'
+      - '.github/workflows/ci-desktop.yml'
+  pull_request:
+    paths:
+      - 'desktop/**'
+      - '.github/workflows/ci-desktop.yml'
+
+permissions:
+  contents: read
+
+jobs:
+  typecheck-and-build:
+    name: Type-check + build
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: desktop
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+          cache: npm
+          cache-dependency-path: desktop/package-lock.json
+
+      - name: Install deps
+        run: npm ci
+
+      - name: Type-check
+        run: npm run type-check
+
+      - name: Build (tsc → dist/)
+        run: npm run build
+
+      - name: Verify bin shim is executable
+        # The published tarball depends on bin/hermes-relay.js having a valid
+        # shebang + importing the freshly built dist/cli.js. Smoke the actual
+        # invocation so we catch broken imports, missing main export, or a
+        # 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:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        working-directory: desktop
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+          cache: npm
+          cache-dependency-path: desktop/package-lock.json
+
+      - name: Install deps
+        run: npm ci
+
+      - name: Build
+        run: npm run build
+
+      - name: --version
+        run: node bin/hermes-relay.js --version
+
+      - name: --help
+        run: node bin/hermes-relay.js --help
+
+  tray-shell:
+    name: Tray shell checks
+    runs-on: windows-latest
+    defaults:
+      run:
+        working-directory: desktop
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+          cache: npm
+          cache-dependency-path: desktop/package-lock.json
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Install deps
+        run: npm ci
+
+      - name: Cargo check tray shell
+        run: npm run tray:check
+
+      - name: Test tray shell
+        run: npm run tray:test

.github/workflows/ci-required.yml

@@ -0,0 +1,49 @@
+# Required-checks sentinel — always runs on every PR + push to main/dev so
+# 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`,
+# `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
+# any PR that didn't touch the protected paths was blocked from merging,
+# even with all the relevant gates green. We were admin-overriding every
+# desktop-only PR. Same for relay-touching PRs (the protection rule named
+# `Relay Check (Python)` didn't even match any actual job — broken since
+# day one).
+#
+# This sentinel + claude-review become the only required checks. The
+# path-filtered workflows still run when relevant and surface their
+# results on the PR — visible, clickable, but advisory rather than
+# blocking. Reviewers (human + claude-review) eyeball them. This is the
+# standard pattern for monorepos with path-filtered CI.
+#
+# Trade-off acknowledged: a broken Android build on an Android-touching
+# PR could merge if the reviewer ignores the failing CI badge. Mitigation:
+# claude-review reads CI conclusions in its review prompt + the project's
+# release-merge cadence catches issues before they reach a tag. If a
+# stricter gate is later wanted, fold it into this workflow as a job that
+# fans out to the path-filtered work — but the simplest version (just an
+# `echo`) is what's needed to make branch protection useful again today.
+
+name: Required checks
+
+on:
+  push:
+    branches: [main, dev]
+  pull_request:
+    branches: [main, dev]
+
+# Cancel in-progress runs for the same branch/PR. Doesn't matter much for
+# a 5-second job, but matches every other workflow's concurrency shape.
+concurrency:
+  group: ci-required-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/dev' }}
+
+jobs:
+  guard:
+    name: Required checks
+    runs-on: ubuntu-latest
+    steps:
+      - name: OK
+        run: echo "Required-checks sentinel — see ci-required.yml header for context."

.github/workflows/ci-server.yml

@@ -0,0 +1,128 @@
+# Hermes-Relay — Python Server 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
+# Python toolchain.
+#
+# Pipeline: syntax-check -> focused server tests
+
+name: CI — Server
+
+on:
+  push:
+    branches: [main, dev]
+    paths:
+      - "plugin/__init__.py"
+      - "plugin/android_tool.py"
+      - "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-server-version-sync.py"
+      - "scripts/bump-server-version.sh"
+      - ".github/workflows/ci-server.yml"
+  pull_request:
+    branches: [main, dev]
+    paths:
+      - "plugin/__init__.py"
+      - "plugin/android_tool.py"
+      - "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-server-version-sync.py"
+      - "scripts/bump-server-version.sh"
+      - ".github/workflows/ci-server.yml"
+
+# Cancel in-progress runs for the same branch/PR, but let main and dev finish
+concurrency:
+  group: ci-server-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/dev' }}
+
+jobs:
+  # ──────────────────────────────────────────────
+  # Python Server — py_compile syntax sanity
+  # ──────────────────────────────────────────────
+  syntax-check:
+    name: Syntax check (Python)
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.11"
+
+      - name: Install dependencies
+        run: pip install -r relay_server/requirements.txt
+
+      - name: Syntax check (server/plugin.relay — canonical location)
+        run: |
+          python -m py_compile plugin/relay/server.py
+          python -m py_compile plugin/relay/channels/terminal.py
+          python -m py_compile plugin/relay/channels/chat.py
+          python -m py_compile plugin/relay/channels/bridge.py
+          python -m py_compile plugin/relay/voice.py
+          python -m py_compile plugin/relay/upstream_voice.py
+
+      - 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
+
+  # ──────────────────────────────────────────────
+  # Python Server — 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
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    # Advisory on dev, strict on main. Evaluates to false (= strict) for
+    # pushes to main and PRs whose base branch is main; true (= advisory)
+    # for everything else (dev pushes, dev-targeted PRs, feature branches).
+    continue-on-error: ${{ github.ref != 'refs/heads/main' && github.base_ref != 'main' }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.11"
+
+      - name: Install dependencies
+        run: |
+          pip install -r relay_server/requirements.txt
+          pip install pytest responses
+
+      - name: Run focused Server tests
+        run: |
+          python -m pytest \
+            plugin/tests/test_relay_security.py \
+            plugin/tests/test_voice_routes.py \
+            plugin/tests/test_session_grants.py

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

@@ -3,22 +3,53 @@ name: Claude Code Review
 on:
   pull_request:
     types: [opened, synchronize, ready_for_review, reopened]
+    # Optional: Only run on specific file changes
+    # paths:
+    #   - "src/**/*.ts"
+    #   - "src/**/*.tsx"
+    #   - "src/**/*.js"
+    #   - "src/**/*.jsx"
 
 jobs:
   claude-review:
+    # Optional: Filter by PR author
+    # if: |
+    #   github.event.pull_request.user.login == 'external-contributor' ||
+    #   github.event.pull_request.user.login == 'new-developer' ||
+    #   github.event.pull_request.author_association == 'FIRST_TIME_CONTRIBUTOR'
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     permissions:
       contents: read
       pull-requests: read
       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:') }}
+
     steps:
-      - uses: actions/checkout@v6
+      - name: Skip aggregate release PR review
+        if: env.IS_RELEASE_PR == 'true'
+        run: |
+          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: Checkout repository
+        if: env.IS_RELEASE_PR != 'true'
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
-      - uses: anthropics/claude-code-action@v1
+
+      - name: Run Claude Code Review
+        if: env.IS_RELEASE_PR != 'true'
+        timeout-minutes: 15
+        id: claude-review
+        uses: anthropics/claude-code-action@v1
         with:
           claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
           plugin_marketplaces: 'https://github.com/anthropics/claude-code.git'
           plugins: 'code-review@claude-code-plugins'
           prompt: '/code-review:code-review ${{ github.repository }}/pull/${{ github.event.pull_request.number }}'
+          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
+          # or https://code.claude.com/docs/en/cli-reference for available options
+

.github/workflows/claude.yml

@@ -6,134 +6,45 @@ on:
   pull_request_review_comment:
     types: [created]
   issues:
-    types: [opened, assigned, labeled]
+    types: [opened, assigned]
   pull_request_review:
     types: [submitted]
 
 jobs:
-  auth:
-    runs-on: ubuntu-latest
-    outputs:
-      authorized: ${{ steps.check.outputs.authorized }}
-    steps:
-      - name: Check collaborator status
-        id: check
-        uses: actions/github-script@v8
-        with:
-          script: |
-            if (context.eventName === 'issues' && ['opened', 'labeled'].includes(context.payload.action)) {
-              core.setOutput('authorized', 'true');
-              return;
-            }
-            const sender = context.payload.sender?.login;
-            if (!sender) { core.setOutput('authorized', 'false'); return; }
-            try {
-              const { data } = await github.rest.repos.getCollaboratorPermissionLevel({
-                owner: context.repo.owner, repo: context.repo.repo, username: sender,
-              });
-              const allowed = ['admin', 'write', 'maintain'].includes(data.permission);
-              core.setOutput('authorized', allowed ? 'true' : 'false');
-            } catch {
-              core.setOutput('authorized', 'false');
-            }
-
-  triage:
-    needs: auth
+  claude:
     if: |
-      needs.auth.outputs.authorized == 'true' && (
-        (github.event_name == 'issues' && github.event.action == 'labeled' && github.event.label.name == 'claude') ||
-        (github.event_name == 'issues' && github.event.action == 'opened')
-      )
+      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
+      (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
+      (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
+      (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
     runs-on: ubuntu-latest
     permissions:
       contents: read
       pull-requests: read
-      issues: write
+      issues: read
       id-token: write
-      actions: read
+      actions: read # Required for Claude to read CI results on PRs
     steps:
-      - uses: actions/checkout@v6
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
-      - uses: anthropics/claude-code-action@v1
+
+      - name: Run Claude Code
+        id: claude
+        uses: anthropics/claude-code-action@v1
         with:
           claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-          prompt: |
-            Triage this GitHub issue. Analysis-only — do NOT write code or create PRs.
 
-            1. **Classify** — bug, feature request, question, or docs issue?
-            2. **Priority** — critical, high, medium, low based on impact.
-            3. **Affected area** — which module(s)? Check CLAUDE.md for architecture.
-               (ui/, network/, viewmodel/, auth/, data/, relay_server/, plugin/)
-            4. **Reproduction** — for bugs, is there enough info? Ask for device, Android version, steps.
-            5. **Suggested approach** — brief outline (files, strategy).
-            6. **Labels** — suggest appropriate labels.
+          # This is an optional setting that allows Claude to read CI results on PRs
+          additional_permissions: |
+            actions: read
 
-            Keep it concise and actionable.
-          claude_args: "--max-turns 5"
+          # Optional: Give a custom prompt to Claude. If this is not specified, Claude will perform the instructions specified in the comment that tagged it.
+          # prompt: 'Update the pull request description to include a summary of changes.'
 
-  fix:
-    needs: auth
-    if: |
-      needs.auth.outputs.authorized == 'true' &&
-      github.event_name == 'issues' &&
-      github.event.action == 'labeled' &&
-      github.event.label.name == 'claude-fix'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-      issues: write
-      id-token: write
-      actions: read
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-      - uses: anthropics/claude-code-action@v1
-        with:
-          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-          prompt: |
-            Implement a fix for this GitHub issue. Read CLAUDE.md for project conventions.
+          # Optional: Add claude_args to customize behavior and configuration
+          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
+          # or https://code.claude.com/docs/en/cli-reference for available options
+          # claude_args: '--allowed-tools Bash(gh pr *)'
 
-            1. Understand the issue — read relevant source files.
-            2. Implement the minimal fix.
-            3. Follow conventions: Kotlin + Jetpack Compose, kotlinx.serialization, Conventional Commits.
-            4. Run `./gradlew assembleDebug` and fix any errors.
-            5. Create a PR with Conventional Commits format title.
-
-            Do NOT over-engineer. Only change what is needed.
-          claude_args: "--max-turns 25"
-
-  chat:
-    needs: auth
-    if: |
-      needs.auth.outputs.authorized == 'true' && (
-        (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
-        (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
-        (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
-        (github.event_name == 'issues' && github.event.action == 'assigned' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
-      )
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: write
-      issues: write
-      id-token: write
-      actions: read
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 1
-      - uses: anthropics/claude-code-action@v1
-        with:
-          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-          prompt: |
-            Responding to a collaborator comment. Read CLAUDE.md for project context.
-
-            Default mode is analysis — investigate, explain, suggest. Do NOT write code
-            unless explicitly asked ("fix this", "implement", "create a PR").
-
-            If asked to fix: follow conventions (Kotlin, Compose, Conventional Commits),
-            run `./gradlew assembleDebug`, and create a PR.
-          claude_args: "--max-turns 15"

.github/workflows/release-android.yml

@@ -1,15 +1,16 @@
-# Hermes-Relay — Release Pipeline
+# Hermes-Relay-Android — Release Pipeline
 #
-# Triggered when a version tag (v*) is pushed.
+# Triggered when an Android release tag (android-v*) is pushed.
 # Validates the tag matches the app version in libs.versions.toml,
-# runs CI checks, builds a release APK, and creates a GitHub Release.
+# runs focused Android checks, builds release APK/AAB artifacts, and creates a
+# GitHub Release. Server/Python package releases use server-v* tags.
 
-name: Release
+name: Release Android
 
 on:
   push:
     tags:
-      - "v*"
+      - "android-v*"
 
 permissions:
   contents: write
@@ -26,7 +27,7 @@ jobs:
 
       - name: Extract version from tag
         id: version
-        run: echo "version=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
+        run: echo "version=${GITHUB_REF#refs/tags/android-v}" >> $GITHUB_OUTPUT
 
       - name: Verify version sync
         run: |
@@ -47,6 +48,7 @@ jobs:
     name: CI Checks
     needs: validate
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v6
 
@@ -62,13 +64,21 @@ jobs:
       - name: Build debug APK
         run: ./gradlew assembleDebug
 
-      - name: Run unit tests
-        run: ./gradlew test
+      # Keep the tag release gate aligned with CI — Android's broad Gradle
+      # `test` aggregate currently hangs in deferred JVM suites tracked by
+      # issue #32, so the release gate runs the stable connection/pairing slice.
+      - name: Run focused Android unit tests
+        run: |
+          ./gradlew :app:testSideloadDebugUnitTest \
+            --tests com.hermesandroid.relay.network.RelayUrlDeriverTest \
+            --tests com.hermesandroid.relay.viewmodel.ConnectionSwitchTest \
+            --console=plain
 
   release:
     name: Build & Publish Release
     needs: [validate, ci]
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v6
 
@@ -123,9 +133,10 @@ jobs:
           cat SHA256SUMS.txt
 
       - name: Create GitHub Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         with:
-          name: v${{ needs.validate.outputs.version }}
+          name: Hermes-Relay-Android v${{ needs.validate.outputs.version }}
+          tag_name: android-v${{ needs.validate.outputs.version }}
           body_path: RELEASE_NOTES.md
           prerelease: ${{ contains(needs.validate.outputs.version, '-') }}
           # Attach all four flavored artifacts — users sideload the
@@ -144,7 +155,7 @@ jobs:
         env:
           HERMES_KEYSTORE_BASE64: ${{ secrets.HERMES_KEYSTORE_BASE64 }}
         run: |
-          echo "## Release v${{ needs.validate.outputs.version }}" >> "$GITHUB_STEP_SUMMARY"
+          echo "## Hermes-Relay-Android v${{ needs.validate.outputs.version }}" >> "$GITHUB_STEP_SUMMARY"
           echo "" >> "$GITHUB_STEP_SUMMARY"
           if [ -n "$HERMES_KEYSTORE_BASE64" ]; then
             echo "✅ **Signed with release keystore** — suitable for Play Store upload" >> "$GITHUB_STEP_SUMMARY"

.github/workflows/release-desktop.yml

@@ -0,0 +1,241 @@
+name: Release Desktop
+
+on:
+  push:
+    tags: ['desktop-v*']
+
+permissions:
+  contents: write
+
+jobs:
+  build-cli-binaries:
+    name: Build cross-platform CLI binaries via Bun compile
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: desktop
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Node.js (for npm ci + tsc)
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+          cache: npm
+          cache-dependency-path: desktop/package-lock.json
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: '1.3.x'
+
+      - name: Install deps
+        run: npm ci
+
+      - name: Type-check
+        run: npm run type-check
+
+      - name: Build dist/ (tsc)
+        run: npm run build
+
+      - name: Print Bun version (diagnostics)
+        run: bun --version
+
+      - name: Prepare binary output dir
+        run: mkdir -p dist/bin
+
+      # Keep the package.json scripts as the single source of truth for Bun
+      # compile flags so release and local smoke builds cannot diverge.
+      - name: Build Windows x64
+        run: npm run build:bin:win
+
+      - name: Build Linux x64
+        run: npm run build:bin:linux
+
+      - name: Build macOS x64
+        run: npm run build:bin:mac-x64
+
+      - name: Build macOS arm64
+        run: npm run build:bin:mac-arm
+
+      - name: Size guard (<150 MB each)
+        run: |
+          set -e
+          for f in dist/bin/hermes-relay-*; do
+            sz=$(stat -c%s "$f")
+            mb=$(( sz / 1024 / 1024 ))
+            echo "  $f - ${mb} MB"
+            if [ "$sz" -gt 157286400 ]; then
+              echo "FAIL: $f exceeds 150 MB - Bun likely shipped a debug build or we added a large dep."
+              exit 1
+            fi
+          done
+
+      - name: Smoke-test Linux binary
+        run: |
+          set -e
+          chmod +x dist/bin/hermes-relay-linux-x64
+          for cmd in --version --help doctor; do
+            out=$(./dist/bin/hermes-relay-linux-x64 "$cmd" 2>&1 || true)
+            exit_code=$?
+            if [ -z "$out" ] || [ ${#out} -lt 10 ]; then
+              echo "SMOKE FAIL: './hermes-relay-linux-x64 $cmd' produced no output (exit=$exit_code)"
+              echo "Raw output was: [$out]"
+              exit 1
+            fi
+            echo "  smoke OK: $cmd -> $(echo "$out" | head -1)"
+          done
+
+      - name: Upload CLI release assets
+        uses: actions/upload-artifact@v4
+        with:
+          name: desktop-cli-release
+          path: |
+            desktop/dist/bin/hermes-relay-win-x64.exe
+            desktop/dist/bin/hermes-relay-linux-x64
+            desktop/dist/bin/hermes-relay-darwin-x64
+            desktop/dist/bin/hermes-relay-darwin-arm64
+          retention-days: 7
+
+  build-windows-tray-installer:
+    name: Build Windows tray installer
+    runs-on: windows-latest
+    defaults:
+      run:
+        working-directory: desktop
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+          cache: npm
+          cache-dependency-path: desktop/package-lock.json
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: '1.3.x'
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Install deps
+        run: npm ci
+
+      - name: Type-check
+        run: npm run type-check
+
+      - name: Build dist/ (tsc)
+        run: npm run build
+
+      - name: Test tray shell
+        run: npm run tray:test
+
+      - name: Build tray installer
+        run: npm run tray:build
+
+      - name: Normalize installer asset name
+        shell: pwsh
+        run: |
+          New-Item -ItemType Directory -Force -Path dist/tray | Out-Null
+          $installer = Get-ChildItem -Path tray/src-tauri/target/release/bundle/nsis -Filter '*_x64-setup.exe' | Select-Object -First 1
+          if (-not $installer) { throw 'NSIS installer was not produced' }
+          Copy-Item -Force $installer.FullName dist/tray/hermes-relay-desktop-windows-x64-setup.exe
+
+      - name: Smoke-test tray exe launch
+        shell: pwsh
+        run: |
+          $home = Join-Path $env:RUNNER_TEMP 'hermes-tray-smoke-home'
+          New-Item -ItemType Directory -Force -Path $home | Out-Null
+          $env:USERPROFILE = $home
+          $env:HOME = $home
+          $proc = Start-Process -FilePath tray/src-tauri/target/release/hermes-relay-desktop.exe -WindowStyle Hidden -PassThru
+          Start-Sleep -Seconds 5
+          if ($proc.HasExited) { throw "tray app exited early with code $($proc.ExitCode)" }
+          Stop-Process -Id $proc.Id -Force
+          Write-Host "tray launch smoke OK pid=$($proc.Id)"
+
+      - name: Upload Windows tray release asset
+        uses: actions/upload-artifact@v4
+        with:
+          name: desktop-windows-tray-release
+          path: desktop/dist/tray/hermes-relay-desktop-windows-x64-setup.exe
+          retention-days: 7
+
+  publish-release:
+    name: Publish GitHub Release
+    runs-on: ubuntu-latest
+    needs:
+      - build-cli-binaries
+      - build-windows-tray-installer
+    steps:
+      - name: Extract desktop version
+        id: version
+        run: echo "version=${GITHUB_REF_NAME#desktop-v}" >> "$GITHUB_OUTPUT"
+
+      - uses: actions/download-artifact@v4
+        with:
+          path: release-assets
+
+      - name: Generate SHA256SUMS
+        run: |
+          set -e
+          find release-assets -type f ! -name SHA256SUMS.txt -print0 \
+            | sort -z \
+            | xargs -0 sha256sum \
+            | sed -E 's#release-assets/[^/]+/##' > release-assets/SHA256SUMS.txt
+          cat release-assets/SHA256SUMS.txt
+
+      - name: Publish GitHub Release
+        uses: softprops/action-gh-release@v3
+        with:
+          name: Hermes-Relay-Desktop 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.
+
+          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/SHA256SUMS.txt

.github/workflows/release-server.yml

@@ -0,0 +1,118 @@
+name: Release Server
+
+on:
+  push:
+    tags:
+      - "server-v*"
+
+permissions:
+  contents: write
+
+jobs:
+  validate:
+    name: Validate Server release
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    outputs:
+      version: ${{ steps.version.outputs.version }}
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Extract version from tag
+        id: version
+        run: echo "version=${GITHUB_REF#refs/tags/server-v}" >> "$GITHUB_OUTPUT"
+
+      - name: Verify Server version sync
+        run: python scripts/check-server-version-sync.py --expect "$TAG_VERSION"
+        env:
+          TAG_VERSION: ${{ steps.version.outputs.version }}
+
+  test:
+    name: Test Server package
+    needs: validate
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.11"
+
+      - name: Install test dependencies
+        run: |
+          pip install -r relay_server/requirements.txt
+          pip install pytest responses
+
+      - name: Syntax check
+        run: |
+          python -m py_compile plugin/relay/server.py
+          python -m py_compile plugin/relay/voice.py
+          python -m py_compile plugin/relay/upstream_voice.py
+          python -m py_compile plugin/relay/voice_auth.py
+          python -m py_compile plugin/tools/android_tool.py
+          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
+        run: |
+          python -m pytest \
+            plugin/tests/test_relay_security.py \
+            plugin/tests/test_voice_routes.py \
+            plugin/tests/test_session_grants.py
+
+  package:
+    name: Build and publish Server package
+    needs: [validate, test]
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.11"
+
+      - name: Build wheel and sdist
+        run: |
+          pip install build
+          python -m build
+
+      - name: Generate checksums
+        run: |
+          cd dist
+          sha256sum * > SHA256SUMS.txt
+          cat SHA256SUMS.txt
+
+      - 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 }}
+          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
+            ```
+          files: |
+            dist/*.whl
+            dist/*.tar.gz
+            dist/SHA256SUMS.txt

.gitignore

@@ -24,6 +24,9 @@ Thumbs.db
 local.properties
 /build/
 /app/build/
+/relay-core/build/
+/relay-ui/build/
+/quest/build/
 /app/release/
 *.apk
 *.aab
@@ -43,19 +46,31 @@ certs/
 
 # Local tools
 .subframe/
+voice-lab-runs/
+realtime-voice-runs/
+realtime-agent-runs/
+voice_rec_*.wav
+
+# Ad-hoc debugging artifacts (logcat dumps, screenshots, UI XMLs)
+.scratch/
 
 # VitePress
 user-docs/.vitepress/cache/
 user-docs/.vitepress/dist/
 node_modules/
-package.json
-package-lock.json
+# Anchor VitePress-only npm manifests to root/user-docs so desktop/package.json is tracked.
+/package.json
+/package-lock.json
+/user-docs/package.json
+/user-docs/package-lock.json
 
-# Local upstream reference
+# Local upstream references (not shipped in this repo)
 hermes-agent-upstream/
+hermes-agent-fork/
 
 # Claude Code internal state (worktrees, image cache, conversation logs)
 .claude/
+.claude-launcher/
 
 # Kotlin compiler cache
 .kotlin/
@@ -63,3 +78,10 @@ hermes-agent-upstream/
 # Release signing & Play Store credentials — never commit these
 play-service-account.json
 keystore.properties
+
+# Desktop TUI smoke harness runtime artifacts
+.smoke-relay.pid
+.smoke-relay.log
+
+# Generated tray frontend vendor assets copied from desktop/node_modules
+desktop/tray/ui/vendor/

.mcp.json

@@ -0,0 +1,8 @@
+{
+  "mcpServers": {
+    "mobile-mcp": {
+      "command": "npx",
+      "args": ["-y", "@mobilenext/mobile-mcp@latest"]
+    }
+  }
+}

AGENTS.md

@@ -1,386 +0,0 @@
-<!-- @subframe-version 0.15.1-beta -->
-<!-- @subframe-managed -->
-# hermes-android - SubFrame Project
-
-This project is managed with **SubFrame**. AI assistants should follow the rules below to keep documentation up to date.
-
-> **Note:** This file is named `AGENTS.md` to be AI-tool agnostic. CLAUDE.md and GEMINI.md contain a reference to this file.
-
----
-
-## Core Working Principle
-
-**Only do what the user asks.** Do not go beyond the scope of the request.
-
-- Implement exactly what the user requested — nothing more, nothing less.
-- Do not change business logic, flow, or architecture unless the user explicitly asks for it.
-- If a user asks for a design change, only change the design. Do not refactor, restructure, or modify functionality alongside it.
-- If you have additional suggestions or improvements, **present them as suggestions** to the user. Never implement them without approval.
-- The user's request must be completed first. Additional ideas come after, as proposals.
-
----
-
-## Relationship to Native AI Tools
-
-SubFrame **enhances** native AI coding tools — it does not replace them.
-
-**Claude Code** works exactly as normal. Built-in features (`/init`, `/commit`, `/review-pr`, `/compact`, `/memory`, CLAUDE.md) are fully supported. CLAUDE.md is Claude Code's native instruction file — users can add their own tool-specific instructions freely. SubFrame adds a small backlink reference pointing to this AGENTS.md file using HTML comment markers (`<!-- SUBFRAME:BEGIN -->` / `<!-- SUBFRAME:END -->`). SubFrame will never overwrite user content in CLAUDE.md.
-
-**Gemini CLI** works exactly as normal. Built-in features (`/init`, `/model`, `/memory`, `/compress`, `/settings`, GEMINI.md) are fully supported. GEMINI.md is Gemini CLI's native instruction file — same backlink approach as CLAUDE.md. Users can add their own instructions freely and SubFrame won't overwrite them.
-
-**Codex CLI** gets SubFrame context via a wrapper script at `.subframe/bin/codex` that injects AGENTS.md as an initial prompt.
-
-**This file (AGENTS.md)** contains SubFrame-specific rules that apply across all tools:
-- Sub-Task management (`.subframe/tasks/*.md`, index at `.subframe/tasks.json`)
-- Codebase mapping (`.subframe/STRUCTURE.json`)
-- Context preservation (`.subframe/PROJECT_NOTES.md`)
-- Internal docs and changelog (`.subframe/docs-internal/`)
-- Session notes and decision tracking
-
----
-
-## Session Start
-
-**Read these files at the start of each session:**
-
-1. **`.subframe/STRUCTURE.json`** — Module map, file locations, architecture notes
-2. **`.subframe/PROJECT_NOTES.md`** — Project vision, past decisions, session notes
-3. **`.subframe/tasks.json`** — Sub-task index (pending, in-progress, completed)
-
-This gives you full project context before making any changes. The session-start hook (if configured) automatically injects pending/in-progress sub-tasks into your context, but you should still read these files for deeper understanding.
-
-### Concurrent Work & Worktrees
-
-Before making changes, check whether other AI sessions or agent teams are already working on this repository. Signs of concurrent work include:
-- In-progress sub-tasks you didn't start (check `.subframe/tasks.json`)
-- Recent uncommitted changes in `git status` that aren't yours
-- Lock files or active worktrees (`git worktree list`)
-
-**If concurrent work is detected**, ask the user: "Another session appears to be working on this project. Should I use a git worktree to avoid conflicts?"
-
-**Git worktrees** create an isolated copy of the repo on a separate branch, allowing parallel work without merge conflicts:
-- Each worktree has its own working directory and branch
-- Changes in one worktree don't affect others until merged
-- Use worktrees when multiple agents or sessions work on different features simultaneously
-
-**When to suggest a worktree:**
-- Agent teams spawning multiple workers on the same repo
-- User asks to work on a feature while another is in progress
-- The session-start hook flags concurrent sessions
-
-**When worktrees are NOT needed:**
-- Single-session work with no concurrent agents
-- Read-only exploration or research tasks
-- Quick fixes that won't conflict with in-progress work
-
----
-
-## Hooks (Automatic Awareness)
-
-SubFrame can configure project-level hooks that automate sub-task awareness. These hooks fire automatically — no manual intervention needed.
-
-| Hook | When it fires | What it does |
-|------|---------------|--------------|
-| **SessionStart** | Startup, resume, after compaction | Injects pending/in-progress sub-tasks into context |
-| **UserPromptSubmit** | Each user prompt | Fuzzy-matches prompt against pending sub-tasks, suggests starting a match |
-| **Stop** | When AI finishes responding | Reminds about in-progress sub-tasks; flags untracked work if source files changed |
-| **PreToolUse** | Before tool execution | Project-specific guardrails (if configured) |
-| **PostToolUse** | After tool execution | Project-specific follow-ups (if configured) |
-
-These hooks ensure sub-task awareness even after context compaction. Hook configuration lives in `.claude/settings.json`.
-
----
-
-## Skills (Slash Commands)
-
-SubFrame provides optional slash commands for AI coding tools that support them (e.g., Claude Code):
-
-| Skill | Purpose |
-|-------|---------|
-| `/sub-tasks` | Interactive sub-task management — list, start, complete, add, archive |
-| `/sub-docs` | Sync all SubFrame documentation after feature work (changelog, CLAUDE.md, PROJECT_NOTES, STRUCTURE) |
-| `/sub-audit` | Code review + documentation audit on recent changes |
-| `/onboard` | Bootstrap SubFrame files from existing codebase context |
-
-Skills are deployed to `.claude/skills/` and enhance the workflow — but direct file editing always works as a fallback. If your AI tool doesn't support skills, follow the manual instructions in each section below.
-
----
-
-## Sub-Task Management
-
-> **Terminology:** "Sub-Tasks" are SubFrame's project task tracking system. The name plays on "Sub" from SubFrame and disambiguates from Claude Code's internal todo tools. When the user says "sub-task", they mean this system.
-
-### Sub-Task File Format
-
-Each sub-task lives in its own markdown file at `.subframe/tasks/<id>.md` with YAML frontmatter:
-
-```yaml
----
-id: task-abc12345
-title: Short and clear title (max 60 characters)
-status: pending | in_progress | completed
-priority: high | medium | low
-category: feature | fix | refactor | docs | test | chore
-description: AI's detailed explanation — what, how, which files affected
-userRequest: User's original prompt/request — copy exactly
-acceptanceCriteria: When is this task done? Concrete testable criteria
-blockedBy: []          # task IDs this depends on
-blocks: []             # task IDs that depend on this
-createdAt: ISO timestamp
-updatedAt: ISO timestamp
-completedAt: ISO timestamp | null
----
-
-## Notes
-
-[YYYY-MM-DD] Session notes, alternatives considered, dependencies.
-
-## Steps
-
-- [x] Completed step
-- [ ] Pending step
-```
-
-A generated index is kept at `.subframe/tasks.json` for hooks and quick lookups. After creating or modifying task `.md` files, regenerate the index by reading all `.subframe/tasks/*.md` files (excluding `archive/`) and building the JSON with tasks grouped by status.
-
-### Sub-Task Recognition Rules
-
-**These ARE SUB-TASKS:**
-- When the user requests a feature or change
-- Decisions like "Let's do this", "Let's add this", "Improve this"
-- Deferred work: "We'll do this later", "Let's leave it for now"
-- Gaps or improvement opportunities discovered while coding
-- Situations requiring bug fixes
-
-**These are NOT SUB-TASKS:**
-- Error messages and debugging sessions
-- Questions, explanations, information exchange
-- Temporary experiments and tests
-- Work already completed and closed
-- Instant fixes (like typo fixes)
-
-### Sub-Task Creation Flow
-
-1. Detect sub-task patterns during conversation
-2. **Check existing sub-tasks first** — read `.subframe/tasks.json` to avoid duplicates
-3. Ask the user: "I identified these sub-tasks from our conversation, should I add them?"
-4. If approved, create `.subframe/tasks/<id>.md` with all required frontmatter fields
-5. Regenerate the `.subframe/tasks.json` index
-
-### Sub-Task Content Rules
-
-**title:** Short, action-oriented
-- OK: "Add tasks button to terminal toolbar"
-- Bad: "Tasks"
-
-**description:** AI's detailed technical explanation
-- What will be done, how, which files affected
-- Minimum 2-3 sentences
-
-**userRequest:** User's original words — copy verbatim for context preservation
-
-**acceptanceCriteria:** Concrete, testable completion criteria
-
-### Sub-Task Status Updates
-
-**Before starting any work**, check `.subframe/tasks.json` for an existing sub-task that matches. If found, set it to `in_progress` — do not create a duplicate.
-
-- `pending` → `in_progress` — immediately when you begin working (update `updatedAt`)
-- `in_progress` → `completed` — when done and verified (set `completedAt`, update `updatedAt`)
-- `completed` → `pending` — when reopening, add a note explaining why
-- After commit: check and update the status of all related sub-tasks
-- **Incomplete work:** If partially done at session end, leave as `in_progress` and add a notes entry
-
-### Sub-Task Lifecycle
-
-- If a sub-task grows beyond its original scope, split it — create new sub-tasks and reference the parent ID in notes
-- Cross-reference relevant commit hashes or PR numbers in notes
-- Update the description if the approach changes significantly
-
-### Priority Guidelines
-
-- **high** — Blocking other work or explicitly flagged as urgent by the user
-- **medium** — Normal feature work and standard bug fixes
-- **low** — Nice-to-have improvements, deferred items, minor polish
-
----
-
-## .subframe/PROJECT_NOTES.md Rules
-
-### When to Update?
-- When an important architectural decision is made
-- When a technology choice is made
-- When an important problem is solved and the solution method is noteworthy
-- When an approach is determined together with the user
-
-### Format
-Free format. Date + title is sufficient:
-```markdown
-### [YYYY-MM-DD] Topic title
-Conversation/decision as is, with its context...
-```
-
-### Update Flow
-- Update immediately after a decision is made
-- You can add without asking the user (for important decisions)
-- You can accumulate small decisions and add them in bulk
-
-### Organization Rules
-- Keep **"Project Vision"** at the top, then **"Session Notes"** in chronological order
-- Notes should capture the **why** (decisions, trade-offs, alternatives rejected), not the **what** (code structure belongs in STRUCTURE.json)
-- When the same topic spans multiple sessions, consolidate related notes under the original heading rather than creating duplicates
-- When notes grow beyond ~500 lines, consider archiving older session notes or grouping by month
-
----
-
-## Context Preservation (Automatic Note Taking)
-
-SubFrame's core purpose is to prevent context loss. Capture important moments and ask the user.
-
-### When to Ask?
-
-Ask the user: **"Should I add this to .subframe/PROJECT_NOTES.md?"** when:
-
-- A sub-task is successfully completed
-- An important architectural/technical decision is made
-- A bug is fixed and the solution method is noteworthy
-- "Let's do this later" is said (also add as a sub-task)
-- A new pattern or best practice is discovered
-
-### Importance Threshold
-
-**Would it take more than 5 minutes to re-derive or re-explain in a future session?** If yes, capture it.
-
-**Always capture:** Architecture decisions, technology choices, approach changes, user preferences discovered during work.
-
-**Never capture:** Routine debugging steps, simple config changes, typo fixes.
-
-**Note failed approaches too** — a brief "We tried X, it didn't work because Y" prevents future re-exploration of dead ends.
-
-### Completion Detection
-
-Pay attention to these signals:
-- User approval: "okay", "done", "it worked", "nice", "fixed", "yes"
-- Moving from one topic to another
-- User continuing after build/run succeeds
-
-### How to Add?
-
-1. **DON'T write a summary** — Add the conversation as is, with its context
-2. **Add date** — In `### [YYYY-MM-DD] Title` format
-3. **Add to Session Notes section** — At the end of PROJECT_NOTES.md
-
-### When NOT to Ask
-
-- For every small change (it becomes spam)
-- Typo fixes, simple corrections
-- If the user already said "no" or "not needed", don't ask again for that topic
-
-### If User Says "No"
-
-No problem, continue. The user can also say what they consider important themselves: "add this to notes"
-
----
-
-## .subframe/STRUCTURE.json Rules
-
-**This file is the map of the codebase.**
-
-### When to Update?
-- When a new file/folder is created
-- When a file/folder is deleted or moved
-- When module dependencies change
-- When an IPC channel is added or changed
-- When an important architectural pattern is discovered (architectureNotes)
-
-### Full Schema
-
-```json
-{
-  "modules": {
-    "main/moduleName": {
-      "file": "src/main/moduleName.ts",
-      "description": "What this module does",
-      "exports": ["init", "loadData"],
-      "depends": ["fs", "path", "shared/ipcChannels"],
-      "functions": {
-        "init": { "line": 15 },
-        "loadData": { "line": 42 }
-      }
-    }
-  },
-  "ipcChannels": {
-    "CHANNEL_NAME": {
-      "direction": "renderer → main",
-      "handler": "main/moduleName"
-    }
-  },
-  "architectureNotes": {
-    "topicName": {
-      "issue": "Description of the pattern or concern",
-      "solution": "How it was resolved"
-    }
-  }
-}
-```
-
-### Update Rules
-- The pre-commit hook (if configured) auto-updates STRUCTURE.json when source files in `src/` are committed
-- When deleting files, remove their entries from `modules` and update any `depends` arrays that referenced them
-- When adding IPC channels, also add them to the `ipcChannels` section with `direction` and `handler`
-- `architectureNotes` is for **structural patterns** (e.g., circular dependency workarounds, init ordering). Use PROJECT_NOTES.md for **decisions and session context**
-- If function line numbers drift significantly after edits, re-run the pre-commit hook or update manually
-
----
-
-## .subframe/docs-internal/ Directory
-
-This directory holds project documentation that doesn't belong in the root:
-
-| File | Purpose |
-|------|---------|
-| `changelog.md` | Track changes under `## [Unreleased]`, grouped by Added/Changed/Fixed/Removed |
-| `*.md` (ADRs) | Architecture Decision Records for significant design choices |
-
-**What goes here:** Changelog entries, architecture decision records, internal reference docs.
-
-**What does NOT go here:** User-facing docs (those go in `docs/` or project root), task files (those go in `.subframe/tasks/`).
-
----
-
-## .subframe/QUICKSTART.md Rules
-
-### When to Update?
-- When installation steps change
-- When new requirements are added
-- When important commands change
-
----
-
-## Before Ending Work
-
-After significant work (code changes, architecture decisions), verify SubFrame files are in sync:
-
-1. **Sub-Tasks** — Was this work tracked? Check `.subframe/tasks.json` → create/complete as needed
-2. **PROJECT_NOTES.md** — Any decisions worth preserving? Ask the user
-3. **Changelog** — Does `.subframe/docs-internal/changelog.md` reflect the changes?
-4. **STRUCTURE.json** — Source files changed? The pre-commit hook handles this automatically if configured; otherwise update manually
-
-The stop hook (if configured) will flag untracked work automatically.
-
----
-
-## General Rules
-
-1. **Language:** Write documentation in English (except code examples)
-2. **Date Format:** ISO 8601 (YYYY-MM-DDTHH:mm:ssZ)
-3. **After Commit:** Check sub-tasks (`.subframe/tasks/*.md`) and `.subframe/STRUCTURE.json`
-4. **Session Start:** Read STRUCTURE.json, PROJECT_NOTES.md, and tasks.json before making changes
-5. **Don't Duplicate:** Always check existing sub-tasks before creating new ones
-
----
-
-*This file was automatically created by SubFrame.*
-*Creation date: 2026-04-14*
-
-<!-- subframe-template-version: 1 -->

CHANGELOG.md

@@ -6,6 +6,513 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/), and this
 
 ## [Unreleased]
 
+### 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.)
+
+### Changed
+
+- **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.
+
+- **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.
+
+### 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.
+
+- **"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.
+
+- **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.
+
+- **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`.
+
+- **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).
+
+- **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.
+
+- **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.
+
+- **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.
+
+## [0.8.1] - 2026-05-26
+
+### Fixed
+
+- **Voice mode crash with barge-in on legacy TTS playback.** When barge-in was enabled and the relay served audio over the legacy `/voice/synthesize` (Media3) path, the first agent sentence played for ~2 syllables and then the app crashed with `IllegalStateException: Player is accessed on the wrong thread`. The barge-in listener's `Dispatchers.IO` reader was reading `ExoPlayer.getAudioSessionId()` (a thread-confined accessor) to attach the echo canceller. `VoicePlayer.audioSessionId` now serves a `@Volatile` cache populated from main-thread Media3 callbacks, so it is safe to read from any thread.
+
+## [0.8.0] - 2026-05-23
+
+### Added
+
+- **Provider-native Realtime Agent voice.** Android can opt into a Realtime Agent voice engine where Android streams mic PCM to the relay, xAI or OpenAI owns realtime speech recognition and speech generation, and Hermes remains the governed authority for tools, memory, profiles, confirmations, current-data checks, side effects, and durable transcript context.
+
+- **Hermes-brokered realtime tool timeline.** Realtime Agent turns now mirror transcript, assistant speech, Hermes task state, concise tool-status rows, confirmation state, path badges, and compact result provenance into chat/voice UI without dumping raw tool output aloud.
+
+- **Connection diagnostics and activity logs.** Settings now includes a Diagnostics surface with sanitized recent API, relay, session, endpoint, and voice activity. API / Relay / Session detail drawers also tail the relevant recent activity so hung or unreachable relays are visible without ADB first.
+
+- **Realtime and Voice Settings active-engine layout.** Voice Settings now separates **Voice Engine** from global voice controls, shows only the selected engine's provider card, keeps fallback TTS visible as a global safety-net card, and provides **Test Current Engine**: stable voice plays the saved Voice Output sample, while Realtime Agent opens a provider-native `/voice/realtime-agent/*` test session and plays streamed realtime audio.
+
+- **Voice Lab text and mic demos.** The realtime voice test screen now offers two clearly separated demos: a **Text demo** that plays raw provider TTS, and a **Mic demo** that exercises the full agent path — real speech recognition, Hermes brokering, and a spoken reply — with tap-to-record / tap-to-stop capture. A `scripts/realtime-voice-lab-smoke.ps1` smoke script accompanies the lab.
+
+- **Realtime playback diagnostics.** Playback now records a time-to-first-audio metric, logs requested-vs-actual AudioTrack buffer sizes, runs a first-frame watchdog, and cross-checks playback drain drift so cold-start and underrun regressions surface in the Diagnostics log instead of as silent dead air.
+
+### Changed
+
+- **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.
+
+- **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.
+
+- **Play/user docs now match the actual artifact.** Release-track docs, feature matrix, getting-started copy, privacy/security references, and Play listing copy now say Google Play has no AccessibilityService, screen reading, gestures, screenshots, or phone-control utility permissions.
+
+### Fixed
+
+- **Silent / choppy first-turn realtime voice playback.** The AudioTrack deep-buffer cold-start was parking the playback head at zero so the first turn dropped or stuttered. The streaming buffer was shrunk from 4000ms to 700ms, the low-latency prebuffer threshold retuned, and a preroll force-start removed, giving reliable low-latency playback from the first frame. Confirmed on-device.
+
+- **Voice Lab waveform now tracks the playback cursor.** The waveform is driven by `RealtimePcmPlayer.playbackAmplitude()` at the playback position instead of socket-arrival time, so the visual matches what is actually being heard.
+
+- **Realtime Hermes calls no longer depend on the phone's saved Hermes API key.** Provider-native Hermes tool calls are brokered by the relay with its server-side Hermes credential, so a phone can be paired for realtime voice without exposing or misusing its saved API bearer.
+
+- **Hung relay voice turns fail visibly.** Voice turns run relay health preflight and shorter realtime/session timeouts so Settings and Voice mode surface unreachable relay state instead of sitting indefinitely on Thinking.
+
+- **OpenAI realtime is no longer treated as render-after-Hermes fallback.** `openai_realtime` is registered as a native Realtime Agent provider path alongside xAI, with provider-native audio events normalized through the same broker contract.
+
+- **Local release signing no longer falls back to debug when `local.properties` uses a repo-root relative keystore path.** The Android Gradle signing config now resolves relative keystore paths from the repo root, matching the documented `release.keystore` setup.
+
+## [0.7.0] - 2026-05-19
+
+### Added
+
+- **Profile-aware Hermes sessions and voice settings.** Android now treats Hermes profiles as first-class connection state: profile selection resolves against the active server, profile-specific chat sessions are persisted separately, default/Victor display is normalized, and per-profile voice provider/model/voice settings can be read and saved through server-owned endpoints without depending on Hermes config mutations.
+
+- **Realtime voice playground and provider lab.** The relay now includes standalone OpenAI/xAI/ElevenLabs-oriented voice lab tooling, provider adapters, provider option discovery routes, realtime playground routes, and generated WAV/JSONL artifact ignores for iterative voice quality testing outside production Hermes routes.
+
+- **Streaming voice output routes.** server-owned `/voice/output/*`, realtime playground, profile voice config, and provider option endpoints support provider-neutral TTS rendering, dynamic voice/model option surfaces, and profile-scoped voice configuration for Android.
+
+- **Experimental Android realtime voice overlay.** Android adds a richer voice overlay with tap-to-talk, continuous mode controls, optional system overlay mode, compact mode, realtime waveform visualization, playback controls, and an experimental badge around barge-in instead of treating all voice as experimental.
+
+- **Experimental realtime Hermes voice-agent plan.** `docs/plans/2026-05-19-realtime-hermes-voice-agent.md` records the next architecture step: provider-native realtime speech with Hermes-brokered profiles, sessions, tools, confirmations, and transcript mirroring. The stable Hermes chat + voice-output path remains the default.
+
+- **Desktop tray pairing and consent flow.** The desktop surface gained Tauri tray pairing, QR/consent affordances, sidecar preparation, and computer-action approval polish so desktop and Android pairing flows are closer to parity.
+
+- **Shared relay/Quest scaffolding.** Experimental `relay-core`, `relay-ui`, and Quest prototype modules were added for shared pairing, terminal, transport, voice, and morphing-sphere work without changing the Android phone app's default route.
+
+- **Desktop Chat tab with first-run route setup.** The Tauri tray dashboard now has a Chat tab inspired by the Hermes Desktop chat-first flow. It streams through the saved paired relay when `~/.hermes/remote-sessions.json` has an active session, or through a direct Hermes gateway/API URL when relay pairing is not available. The tab supports stop, retry, new chat, clear, current-session transcript history, and a setup panel that offers relay pairing or direct WebAPI configuration without saving the optional API key.
+
+- **First-class desktop TUI tab.** The Tauri tray dashboard now gives the embedded xterm/PTY Hermes session its own sidebar tab instead of nesting it under Terminal / CLI. Terminal remains the external launcher, shim-state, and copyable-command surface, while plugin embeds route into the same TUI tab.
+
+- **Desktop surface plugins.** The desktop CLI and Tauri tray now register built-in terminal surface plugins, starting with Herm (`herm-tui`) from `liftaris/herm`. Users can inspect plugin status, install or update Herm, launch a fresh dashboard, resume with `herm -c`, or embed the plugin in the tray's xterm/PTY surface with `bunx`/`npx` fallback when the `herm` binary is not installed.
+
+- **Relay server release track.** Relay server and Python package releases now use `relay-v*` tags, validate relay-owned version metadata, build wheel/sdist artifacts, generate checksums, and publish through `.github/workflows/release-relay.yml`. This lets Relay server fixes ship independently from Android app `versionCode` bumps and desktop CLI alphas.
+
+- **Dashboard plugin CI.** `.github/workflows/ci-dashboard.yml` builds the dashboard plugin, runs the dashboard API tests, and verifies the plugin-owned QR modal CSS markers are present in the built bundle.
+
+- **Upstream integration sync reference.** `docs/upstream-integration-sync.md` now tracks which Hermes-Relay surfaces use upstream-supported extension points, which pieces are server-owned compatibility layers, and what has to be checked before changing relay, Android, desktop, dashboard, bootstrap, or user-doc surfaces.
+
+- **Relay version sync verifier.** `scripts/check-relay-version-sync.py` validates the relay package version against plugin metadata and dashboard metadata so release and dashboard surfaces cannot silently drift.
+
+### Changed
+
+- **Stable voice is now the main Android voice path.** Voice mode defaults to Hermes chat streaming plus relay-managed voice output, with realtime-provider work kept as a standalone lab/testbench and future experimental mode instead of replacing Hermes session/tool authority.
+
+- **Realtime voice output uses balanced coalescing.** Normal assistant speech is batched into more natural chunks while tool/status speech stays immediate, reducing provider render resets and tone/volume variation during voice replies.
+
+- **Voice settings are profile-scoped and option-aware.** Android can fetch provider/model/voice options from relay endpoints, show profile context in voice settings, save voice choices per Hermes profile, and expose advanced manual entry when provider metadata is incomplete.
+
+- **Voice UI state is synchronized with chat state.** Voice mode now reuses more of the chat session/profile state, preserves live transcript and tool timeline visibility, and improves overlay exit/minimize behavior for hands-free use.
+
+- **Release versioning is split by surface.** Android app releases remain on `v*` and use `gradle/libs.versions.toml`; Relay releases use `relay-v*` and keep `pyproject.toml`, `plugin/relay/__init__.py`, `plugin/plugin.yaml`, and dashboard plugin metadata in lockstep; desktop remains on `desktop-v*` and `desktop/package.json`. `scripts/bump-version.sh` is now a backward-compatible Android alias, with new explicit `scripts/bump-android-version.sh` and `scripts/bump-relay-version.sh` helpers.
+
+- **Upstream voice imports are isolated.** Relay voice routes now call upstream Hermes STT/TTS helpers through `plugin.relay.upstream_voice`, keeping private upstream voice helper imports in one adapter module until Hermes exposes a stable HTTP voice API.
+
+- **CI paths and release actions tightened.** Relay CI now watches Relay-owned paths instead of all `plugin/**`, validates Relay version metadata during syntax checks, uses explicit timeouts, and runs the focused route/auth/session test slice instead of broad test discovery. Release workflows now use `softprops/action-gh-release@v3`.
+
+### Fixed
+
+- **Profile switching no longer silently falls back to the wrong local API host.** Profile API URL resolution now handles per-profile Hermes API servers, default/Victor compatibility, and relay-managed profile metadata so selecting a profile does not try to create sessions against `localhost` from the phone.
+
+- **Non-default profile names remain visible in chat.** Agent display metadata is normalized so selected profile names persist above finalized assistant messages instead of disappearing back to the default label after stream completion.
+
+- **Voice waveform and playback state are better aligned to real audio.** The output waveform waits for audio playback, handles processing separately, and avoids returning to the microphone too early at the end of an assistant response.
+
+- **Continuous voice mode no longer starts a session just because auto mode is enabled.** Auto/continuous remains a preference, while explicit voice start/stop controls decide when a voice session is active.
+
+- **Android voice mode no longer 403s when paired over plain-LAN `ws://` with a Hermes API key saved.** Symptom: tap the mic in Voice mode → red banner *"Voice access expired — extend or re-pair with voice grants"* even though the Connections card shows API Server / Relay / Session all green. Root cause: `RelayVoiceClient` preferred the saved Hermes API key over the paired Relay session token; the relay's `_request_is_secure_enough_for_api_bearer` correctly rejects API-bearer auth on `/voice/*` over plaintext outside loopback/Tailscale, returning a generic 403 that the client flattened to "expired." Fix: invert bearer precedence so paired devices use the session token first (no transport guard — it's the credential the QR/pair handshake already established), with the API key as fallback for chat+voice-only installs that never paired. `describeHttpError` now also reads the server's text/plain response body when present so future 403s show the relay's actual reason instead of a one-size-fits-all string.
+
+## [0.6.1] - 2026-05-06
+
+### Added
+
+- **Android bridge media sharing and MMS handoff.** New `android_share_media` and `android_send_mms` tools expose full file/attachment support through the relay media registry and Android `FileProvider` `content://` grants. Host-local paths are registered with `/media/register`, phones fetch bytes with their paired relay session, and the sideload app opens Android's native share or MMS compose UI after on-device confirmation. Relay HTTP now includes `/share_media` and `/send_mms`, and docs spell out that direct `android_send_sms` remains text-only `{to, body}`.
+
+- **Relay voice endpoints accept Hermes API bearer tokens.** `/voice/config`, `/voice/transcribe`, and `/voice/synthesize` now accept either a Relay session token with explicit `voice:*` grants or the existing Hermes API bearer token. API bearer validation is voice-only, uses the configured Hermes API server's protected `/v1/models` endpoint with a short positive cache, and rejects non-loopback plaintext by default unless a trusted HTTPS proxy header or the explicit dev escape hatch is configured. Existing Relay sessions are backfilled with voice grants so paired phones do not need to re-pair.
+
+- **Relay CLI can toggle plain-LAN API-key voice auth without restart.** `hermes relay insecure-api-key status|on|off` calls the running relay's loopback-only `/relay/security` endpoint and flips the runtime `allow_insecure_api_bearer` flag immediately. This keeps HTTPS as the default for API-key voice auth while making Android phone LAN smoke tests possible without exporting env vars or restarting the service.
+
+- **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.
+
+### Fixed
+
+- **Android bridge tool/route contract drift.** The active plugin import now uses `plugin.tools.android_tool` as the single source of truth, while top-level `plugin/android_tool.py` remains as a compatibility shim. The relay now registers `/return_to_hermes`, matching the documented and phone-side command, and bridge status gating checks `/bridge/status` so tools are hidden unless a phone is actually connected.
+
+- **Android CI/release gate no longer hangs on the broad Gradle test aggregate.** The Android CI and `v*` release workflows now run the stable sideload pairing/connection regression slice with explicit timeouts while the deferred full JVM test-suite cleanup remains tracked separately.
+
+- **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.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.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`.
+
+### Changed
+
+- **Android voice no longer requires Relay pairing when a Hermes API key is saved.** The phone now resolves voice auth from the saved Hermes API key first, then falls back to the paired Relay session for `/voice/config`, `/voice/transcribe`, and `/voice/synthesize`. Chat+voice-only setups can use manual/API-key configuration without the full pairing-code flow; bridge, terminal, media, clipboard, profile writes, and Android-control routes remain paired-session-only.
+
+- **Relay grant labels are now human-readable in Android and dashboard management UI.** Relay session grant chips still preserve the server keys internally, but user-facing lists now sort the known grant set and render labels such as `Voice STT` / `Voice TTS` instead of raw `voice:stt` / `voice:tts`. Privacy and configuration docs now reflect that Voice mode uses runtime microphone permission and split voice grants.
+
+- **Desktop CLI alpha.8 — `/screenshot` is multi-monitor aware by default.** The alpha.6/alpha.7 `screenshotHandler` / `captureScreenshot` captured only the primary display on Windows and treated `display` as a number-only param. alpha.8 changes the default to `-1` (all monitors stitched) and accepts string aliases so both the agent tool call and the `/screenshot` slash command can say `'all'` / `'primary'` / `'1'` / `'2'` etc. Windows path uses `System.Windows.Forms.SystemInformation.VirtualScreen` for the union rect (handles negative coordinates when monitors are arranged left-of-primary). macOS path uses `screencapture -D N` for 1-indexed per-display capture. Linux path relies on grim/scrot/import's inherent whole-X-screen behavior. REPL `/screenshot` defaults to all monitors; `/screenshot primary` or `/screenshot 0 | 1 | 2` narrow. Live smoke on a multi-monitor Windows box: all = 1.6 MB stitched, primary = 405 KB — 4× size ratio confirms virtual-screen path. Zero server changes; `image.attach.bytes` RPC consumes whatever bytes the client sends.
+
+### Added
+
+- **Desktop CLI alpha.7 — native image paste in `hermes-relay chat`.** `desktop-v0.3.0-alpha.7`. Plan: [`docs/plans/2026-04-23-desktop-alpha-7-native-paste.md`](docs/plans/2026-04-23-desktop-alpha-7-native-paste.md). Users now type `/paste` (system clipboard), `/screenshot` (primary display), or `/image <path>` (file on disk) inside the `chat` REPL, get a one-line feedback echo (`[📎 clipboard 1920×1080, 234 KB — attached to next message]`), and the NEXT `prompt.submit` ships with the image attached so the vision-capable model sees it in the same turn. Parity with Claude Desktop's paste behavior — minus OS-level Ctrl+V, which terminals fundamentally don't deliver image bytes through. Spans two repos: the client half is new `desktop/src/chatAttach.ts` (captureClipboardImage / captureScreenshot / readImageFile — platform-shelled like the alpha.6 clipboard handler: Windows PowerShell `Get-Clipboard -Format Image` + `System.Drawing.Bitmap.CopyFromScreen`, macOS `pngpaste`/`screencapture -x -t png`, Linux Wayland-first `wl-paste --type image/png`/`grim` with X11 `xclip`/`scrot` fallbacks) plus new slash-command branches in `desktop/src/commands/chat.ts`; the server half is ONE new `@method("image.attach.bytes")` RPC handler on the fork's `tui_gateway/server.py` (`Codename-11/hermes-agent` branch `feat/image-attach-bytes` → merged to `axiom`) that accepts `{session_id, format, bytes_base64, filename_hint?}`, validates magic bytes (PNG `89 50 4E 47` / JPEG `FF D8 FF` / WEBP `RIFF....WEBP`) to prevent content-type laundering, decodes to `~/.hermes/images/remote_<ts>_<rand6>.<ext>`, and appends to `session["attached_images"]`. The fork's **existing** `_enrich_with_attached_images` pipeline already handles the hard part — multimodal payload plumbing, session-scoped image state, vision-model routing — so this release is almost entirely about bridging client-captured bytes to the server-side state that's been there for months. The `tui` relay channel is a transparent RPC forwarder; zero relay changes. Fallback when hermes-host hasn't been updated yet: client's `image.attach.bytes` RPC call gets `method not found`, client catches it specifically and prints `[attach failed: method not found — server may need axiom rollout]` to stderr, REPL stays alive, user can still send text — no crash, and the exact error points the operator at the fix. Non-goals locked for this release: no Ctrl+V terminal keybinding (terminals don't pipe image bytes to stdin — that's OS-level), no Kitty/iTerm2 inline image protocols (defer to alpha.10+), no PTY shell-mode support (the remote `hermes` CLI has its own paste handling), no multimodal `prompt.submit` payload extension (the attach-then-submit pattern is cleaner and matches the existing server state model).
+
+- **Desktop CLI alpha.6 — seamless-local dev pass.** Nine features across six parallel agent workstreams delivered in one integration. Plan: [`docs/plans/2026-04-23-desktop-alpha-6-seamless-local.md`](docs/plans/2026-04-23-desktop-alpha-6-seamless-local.md). (1) **Workspace-awareness envelope** (`#1+#8`) — new `src/workspaceContext.ts` detects `cwd`/`git_root`/`git_branch`/`git_status_summary`/`repo_name`/`hostname`/`platform`/`arch`/`active_shell` via parallel `git rev-parse`/`git status --porcelain=v1 --branch` calls under a 2 s total budget; `RelayTransport` auto-sends a `desktop.workspace` envelope after first `auth.ok` (guarded against reconnect re-send); server-side `plugin/relay/channels/desktop.py::DesktopChannel` stashes per-ws as ephemeral session metadata. Active-editor hints (`src/activeEditor.ts`) poll tmux (`display-message -p "#{pane_current_path}:#{pane_current_command}"`) or detect VSCode/Cursor via `$VSCODE_IPC_HOOK_CLI`+`TERM_PROGRAM`; dedupes envelopes so only actual changes fire. New `hermes-relay workspace` subcommand prints the context; `doctor` output gains a `workspace:` block. Gated client-side by `--watch-editor` for the poller; envelope itself is always-on. (2) **`hermes-relay update` self-update** (`#2`) — new `src/updater.ts` + `src/commands/update.ts`. Polls GitHub Releases API (the same prerelease-aware resolver the installer uses), semver-compares to `VERSION`, downloads asset with SHA256 verification, and atomic-swaps on POSIX (`fs.rename` — running process's inode stays live so the daemon keeps running; next invocation picks up new binary). Windows can't replace a running `.exe`, so the updater writes to `<bin>.new.exe` and `finalizePendingUpdate()` runs at the top of `main()` on every subsequent invocation to rename it into place. `--check` dry-runs; `--yes` skips confirm; `--json` emits machine-readable status. (3+4) **Editor tool + interactive patch approval** (`#3+#4`) — new `src/tools/handlers/editor.ts` for `desktop_open_in_editor(path, line?, col?, wait?)` with launcher detection (`$VISUAL`→`$EDITOR`→PATH probe for `code`/`cursor`/`subl`/`nvim`/`vim`→platform fallback); `-g` injection for GUI editors supports `:line:col`. `desktop_patch` now routes through `src/tools/patchApproval.ts` in interactive mode — renders unified diff with ANSI (green/red/cyan, NO_COLOR/isTTY aware), prompts `y/n/e/r` via readline on stderr; `e` opens the patch in `$EDITOR` and re-reads on close. Non-interactive modes (daemon, piped stdin) auto-reject with structured reason; never auto-accepts. Router (`src/tools/router.ts`) carries an `interactive` flag set at construct time (`stdin.isTTY && HERMES_RELAY_DAEMON !== '1'`). (5) **Conversation picker on connect** (`#5`) — new `src/sessionPicker.ts` calls tui_gateway's `session.list` JSON-RPC (same RPC upstream Ink TUI uses), renders a numbered list with human-readable age + first-prompt preview. `shell.ts` injects after banner / before PTY attach, appending `--resume '<id>'` to the hermes exec when a session is picked. `chat.ts` injects before the chat loop. `--session <id>` (chat: legacy alias for `--conversation`; shell: tmux session name — distinct), `--conversation <id>` and `--new` bypass the picker. Graceful degradation: 404 / "method not found" returns empty list silently, picker falls through to `'new'`. (9+12) **Clipboard + screenshot handlers** (`#9+#12`) — `src/tools/handlers/clipboard.ts` and `.../screenshot.ts`. Clipboard: Windows `powershell Get-Clipboard -Raw` / `$input | Set-Clipboard` (strips trailing CRLF); macOS `pbpaste`/`pbcopy`; Linux Wayland-first (`wl-paste`/`wl-copy` via `$WAYLAND_DISPLAY`), xclip fallback. 5 s timeout, 10 MB cap both directions. Screenshot: Windows writes a temp `.ps1` using `System.Drawing.Bitmap.CopyFromScreen` (honors multi-monitor via `Screen.AllScreens[display]`); macOS `screencapture -x -t png`; Linux `grim`→`scrot`→`import` fallback chain. `save_to` keeps the file; otherwise base64 + tempfile delete. 10 s timeout, 50 MB cap. All three wired into `shell.ts`/`chat.ts`/`daemon.ts` router handler map (9 handlers advertised now, up from 5). (13) **`hermes` alias** (`#13`) — `install.sh` creates a POSIX symlink `~/.hermes/bin/hermes → hermes-relay`; `install.ps1` drops a universal `.cmd` shim (no admin required — avoids Windows symlink Developer-Mode requirement). Collision-safe: only creates if nothing else lives at that name. Uninstall scripts remove the alias only when it points at our binary (preserves an unrelated upstream hermes-agent install).
+
+- **Dev-iteration additions.** `npm run smoke` expanded from 4 to 5 assertions (added `workspace`); still runs locally in ~1 s post-build. CI workflow already runs the equivalent 5-command smoke on the Linux binary before publishing.
+
+### 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`.
+- **`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`.
+- **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
+
+- **Pre-release hardening: uninstall, doctor, first-run prompts, version-aware install.** Four parallel workstreams that close the "feels like a dev preview" gap before tagging `desktop-v0.3.0-alpha.1`. (1) **Uninstall scripts** — new `desktop/scripts/uninstall.{sh,ps1}` matching install one-liners, 3-tier: default `--binary-only` (removes binary + PATH entry, preserves `~/.hermes/remote-sessions.json`), `--purge` (also wipes the shared session store with a loud cross-surface warning about Ink TUI + Android tooling dependencies), `--service` (stub for when daemon service installers ship — prints canonical systemd/launchd/sc.exe paths without acting). iex-pipe safety: Windows falls back to `HERMES_RELAY_UNINSTALL_{PURGE,SERVICE}` env vars since `$args` drops through `irm | iex`. Shell rc files deliberately untouched (mirrors install.sh philosophy). (2) **`hermes-relay doctor` subcommand** — local-only diagnostic report (225 lines, `src/commands/doctor.ts`); human format uses `!!` prefix for warnings + hint line at bottom, `--json` for support-paste / scripts. Fields: version / binary_path / install_dir / on_path / sessions file + size + count + summaries (no tokens — total omission, not even prefix) / daemon detection (stat of canonical service unit file paths) / platform + node version. Case-insensitive PATH comparison on Windows. (3) **Interactive first-run fallback** — new `src/relayUrlPrompt.ts` (~180 lines) with `promptForRelayUrl()` (readline on stderr, `^wss?:\/\/\S+$` validation, 3 retries) and `resolveFirstRunUrl()` (auto-picks single stored session, numbered picker for multiple, first-run banner for zero). Wired into `connectAndAuth` in `shell.ts` / `chat.ts` / `tools.ts` and `resolvePairTarget` in `pair.ts`, replacing the hard `No relay URL` error. Fresh-install UX: bare `hermes-relay` now prints `Welcome to hermes-relay. No stored sessions yet — let's pair with a Server.` → URL prompt → pairing code prompt → drops into shell. `--non-interactive` still fails fast. Daemon command deliberately untouched — headless binaries must never prompt; fails closed on missing credentials/consent as before. (4) **Version-aware install** — `install.{sh,ps1}` now read `$target --version` before download and print one of `upgrading X → Y`, `reinstalling X`, `will replace (could not read version)`, or `installing fresh` (no prior install); post-install readback re-invokes the new binary to confirm. Pinned-version mismatches (`HERMES_RELAY_VERSION=desktop-v0.3.0-alpha.1`) print a non-fatal WARN rather than failing (pre-release version-name drift is expected). 5s timeout on the version call (where `timeout(1)` available); all diagnostic failures fall through to the "could not read version" path. Cross-version normalizer strips `desktop-v` / `v` prefix + `-alpha.N` / `-beta.N` / `-rc.N` suffix for matching. All structural flow (SHA256 verify, tmp cleanup, PATH injection, quarantine note) preserved additively. Type-check + build green; live smoke: `doctor` both modes, `daemon` fails-closed without credentials, help text includes all new surfaces.
+
+- **`hermes-relay daemon` — headless WSS + tool router, lifts the "tools only work while a shell is open" ceiling.** New `desktop/src/commands/daemon.ts` subcommand that opens a persistent relay connection and attaches `DesktopToolRouter` without a TTY. The agent can now reach the user's machine any time of day — first step toward "feels-local" parity. Fails closed on missing credentials (no stored session + no `--token` → exits 1) and on missing consent (no `toolsConsented: true` on the stored record → exits 1 unless `--allow-tools` is passed alongside an explicit `--token`); a headless binary must never be the thing that first grants tool access. Inherits `RelayTransport`'s reconnect state machine as-is — exp backoff 1s → 30s (5min on 429), reconnect listeners persistent across close/reconnect cycles because `channelListeners` is a Map on the transport (not wiped on socket close), so the router's `attach()` fires exactly once. Structured logging defaults to JSON-line on stderr (parseable by journald / log shippers / jq), auto-switches to human-readable when stderr is a TTY, or force either with `--log-json` / `--log-human`. Lifecycle events: `starting` → `authed` (includes `server_version`, `transport`) → `ready` (with `advertised_tools` list) → `reconnecting` (attempt + delay_ms) / `reconnected` → `shutdown` on SIGTERM/SIGINT/SIGHUP → `transport_exited` when the transport exhausts reconnects (exits 1 so the service manager restarts fresh). Live smoke against `ws://172.16.24.250:8767`: `starting` → `authed` (server 0.6.0) → `ready` (5 tools advertised) in ~120ms. New BOOLEAN_FLAGS entries: `log-human`, `log-json`, `allow-tools`. Service installers for Windows `sc.exe` / systemd user unit / macOS launchd plist are the obvious follow-up; the daemon binary is runnable standalone today via `hermes-relay daemon --remote <url>`.
+
+- **Desktop CLI v0.2 — PTY shell, local tool routing, multi-endpoint pairing, reconnect + TOFU, devices, contextual banner.** The `@hermes-relay/cli` package at `desktop/` grew from a chat-only scripting surface into a full Hermes-experience thin client. Bare `hermes-relay` now drops into `shell` mode (interactive PTY pipe through the existing relay `terminal` channel → `tmux new-session -A` + post-attach `exec hermes` → the full local `hermes` banner/skin/session id verbatim, zero server changes). `Ctrl+A .` detaches preserving tmux; `Ctrl+A k` destroys it. New `devices` subcommand drives the relay's `GET/DELETE/PATCH /sessions` HTTP endpoints for listing, revoking, and extending server-side paired-device tokens. Status now surfaces `grants:` (per-channel expiry) and `expires:` (session TTL) pulled from the `auth.ok` handshake the transport already received — `RemoteSessionRecord` gained `grants`, `ttlExpiresAt`, `endpointRole`, `toolsConsented` (additive, back-compat preserved via a `SaveSessionOptions | string | null` overload on `saveSession`). Contextual connect banner (`Connected via LAN (plain) — server 0.6.0`) replaces the flat `Connected (server X)` line across `chat` + `shell`. Multi-endpoint pairing (ADR 24): `--pair-qr <payload>` / `HERMES_RELAY_PAIR_QR` accepts a full v3 QR payload (compact JSON or base64), decodes the `endpoints[]` array, probes each candidate with strict-priority-within-tier racing (`Promise.any` + `AbortSignal.any`, 4 s per-candidate timeout, 60 s reachability cache), and auto-selects the first reachable — role propagates into the banner + stored record. Reconnect-on-drop: `RelayTransport` gained a `ReconnectState` machine (`idle|connecting|connected|reconnecting`), exponential backoff (1 s → 30 s, 5 min on 429), `reconnectGate` re-checked both at schedule time and post-backoff (matches Android's mid-sleep purge-race lesson), `'reconnecting'` + `'reconnected'` events, and bufferedEvents-cleared-on-reconnect. TOFU cert pinning: TLS probe runs before the WebSocket opens on `wss://`, extracts peer-cert SPKI sha256 (`sha256/<base64>`, OkHttp-compatible), compares against the stored pin or captures it first-time; mismatches error out with a human-readable "re-pair to reset" pointer. Client-side tool routing (Phase B): new `desktop` relay channel on the server (`plugin/relay/channels/desktop.py` + `plugin/tools/desktop_tool.py` registering `desktop_read_file` / `desktop_write_file` / `desktop_terminal` / `desktop_search_files` / `desktop_patch`) forwards tool calls from Hermes to the connected Node CLI; client-side `DesktopToolRouter` dispatches to in-process handlers (`fs`, `terminal`, `search`) under a 30 s AbortController, 30 s heartbeat advertising the tool names. Gated behind a one-time per-URL consent prompt (`toolsConsented` on the session record) + `--no-tools` kill-switch; non-TTY stdin fails closed. New files on the client: `src/banner.ts`, `src/endpoint.ts`, `src/pairingQr.ts`, `src/certPin.ts`, `src/commands/devices.ts`, `src/tools/router.ts`, `src/tools/consent.ts`, `src/tools/handlers/{fs,terminal,search}.ts`. New files on the server: `plugin/relay/channels/desktop.py`, `plugin/tools/desktop_tool.py`, `docs/relay-protocol.md §3.5`. Still zero runtime deps on the client (Node ≥21 global `WebSocket` + `fetch` + `tls.connect` + `node:crypto` X509Certificate + `AbortSignal.any`). Build clean; live smoke passed for `status` / `tools` / `devices`; interactive `shell` + tool-call smoke pending user walk-through. Delivered as four parallel implementation agents (multi-endpoint, reconnect+TOFU, server-side desktop, client-side tool handlers) + one synthesis-and-integration pass; the `connectAndAuth → {relay, url, endpointRole}` return-shape refactor in `chat.ts` / `shell.ts` / `tools.ts` unifies how `--pair-qr`'s winning-endpoint URL overrides `--remote` across every subcommand.
+
+- **Desktop thin-client CLI (`@hermes-relay/cli`) v0.1 under `desktop/`.** Node ≥21 package — installable via `npm install -g @hermes-relay/cli`, `npx @hermes-relay/cli`, or the new `scripts/install.sh` / `install.ps1` curl+iwr one-liners. One `hermes-relay` binary with four subcommands: `chat` (REPL + one-shot + piped-stdin, default), `pair` (one-time handshake → persists session token), `status` (local read of `~/.hermes/remote-sessions.json`), `tools` (`tools.list` RPC → enabled/available toolsets on the server). Credential precedence matches the Ink TUI exactly: `--token` → `HERMES_RELAY_TOKEN` → `--code` → `HERMES_RELAY_CODE` → stored session → interactive readline prompt. Reuses the **same** `~/.hermes/remote-sessions.json` store as the TUI, so a user paired via either surface sees the other work with no re-pair. Zero server changes: the CLI consumes the existing relay `tui` WSS channel + `tui_gateway` subprocess events (`message.delta`, `tool.start/complete`, `thinking.delta`, `status.update`, `error`, `approval.request`, …) and renders them as plain lines to stdout, with decorated tool arrows on stderr. Flags: `--remote <url>`, `--code <CODE>`, `--token <TOKEN>`, `--session <id>`, `--json` (event-per-line for `jq`), `--verbose`, `--quiet`, `--no-color`, `--non-interactive`, `--reveal-tokens` (opt-in full-token output on `status --json` — default redacts). Transport, gateway types, session storage, graceful-exit, and rpc helpers are **vendored verbatim** from `hermes-agent-tui-smoke/ui-tui/src/` (feat/tui-transport-pluggable) with a header note; the CLI and TUI stay in lockstep on the envelope protocol (docs/relay-protocol.md §3.7) until the shared surface can be lifted into a `@hermes-relay/core` package post-stabilization. SIGINT during a turn calls `session.interrupt` via a per-turn `{ promise, cancel }` handle — the REPL's cancellation state lives and dies with the turn so a late-arriving `error` event for a cancelled turn can't be misread by the next turn's handler. Smoke-tested end-to-end against `ws://172.16.24.250:8767` (hermes-relay 0.6.0, hermes-agent 0.10.0): connect/auth/session.create/prompt.submit/tools.list/--json/piped-stdin all clean. Not yet wired: interactive approval/clarify/sudo/secret request response (renderer logs a warning; out of scope for v0.1). Upstream PR candidate once the sibling Ink TUI stabilizes — see `desktop/README.md` and vault `Desktop Client.md` for the broader thin-client roadmap.
+
+### Changed
+
+- **Transport Security badge is now role-aware — "Plain (on LAN)" instead of "Insecure (network unknown)".** The previous badge derived its label from `PairingPreferences.insecureReason`, which only got populated when the user toggled "Allow insecure connections" ON via the Ack dialog and picked a reason. If a user paired directly from a plain-`ws://` LAN QR, they never had to toggle that flag — the connection was already `ws://` — so the reason stayed blank and the badge degraded to the alarming `"Insecure (network unknown)"` even though the multi-endpoint resolver was tracking `activeEndpointRole = "lan"` in real time. Fix: `insecureReasonLabel` now accepts an optional `activeRole: String?` and prefers the live role over the stored ack reason (`Plain (on LAN)` / `Plain (on Tailscale)` / `Plain (on public URL)`). Neutral fallback when both role and reason are unknown is `"Plain (no TLS)"` — matches the new "Plain / Secure" vocabulary, drops the scary "Insecure" adjective. Binary-boolean `TransportSecurityBadge(isSecure, reason, ...)` overload gains an optional `activeRole` param with default `null` so existing call sites compile unchanged. `ConnectionViewModel.applyPairingPayload` auto-stamps `PairingPreferences.insecureReason` at pair time based on the selected endpoint's role (`lan` → `lan_only`, `tailscale` → `tailscale_vpn`, `public`/unknown → leave blank so the user thinks); clears any stale reason when upgrading to a secure endpoint. Only overwrites blank values — never clobbers a user-selected reason. Two user-visible "Insecure" strings inside the Advanced section's insecure-toggle subsection also rewritten to "Plain" for consistency (`"Plain connection — traffic is not encrypted"`, `"Allow plain (unencrypted) connections"`).
+
+### Added
+
+- **Bridge destructive-verb "Don't ask again" per verb.** `BridgeSafetyManager` now consults a new `trustedDestructiveVerbs: Flow<Set<String>>` in `BridgeSafetyPreferences` and short-circuits the confirmation overlay when the incoming verb is in the set (logging the auto-approval to the activity log so the trail is preserved). The `DestructiveVerbConfirmDialog` gets a `Don't ask again for "{verb}"` checkbox — off on every dialog open, so the user has to actively opt in per-action. Deny path never persists trust (denying a command is not consent). Kill-switch precedence is preserved and strictly ordered: master-disable wins over blocklist wins over per-verb trust. A trusted verb in a blocklisted app still 403s. `BridgeScreen` surfaces a `Trusted actions · N actions bypass confirmation` row with a `Reset` button under the existing safety section so a user who changes their mind can find the escape hatch without deep-linking to developer options. Addresses the confirmation-fatigue trap where approving `send_sms` 50 times trains the user to click through without reading the 51st.
+
+- **AllInsecure pairing — one-time acknowledgment gate.** When every endpoint in a scanned QR is plain `ws://` / `http://` (no secure sibling to fall back to), `ConnectionWizard.ConfirmStep` now renders an `"I understand this pairing sends traffic in plain text — visible to anyone on the network."` checkbox that gates the Pair button. Per-install via new `PairingPreferences.allInsecurePairAckSeen` — once the user has acknowledged it, subsequent AllInsecure pairs pair one-tap. Mixed and AllSecure pairings are ungated (the amber "Mixed — secure fallback available" warning on Mixed is sufficient because the secure route exists). Matches the `InsecureConnectionAckDialog` precedent of per-install Tier-1 consent and complements the UX pass's explicit "subtle warning for Tier-2, forced confirm for Tier-1 absolute boundaries" philosophy documented in DEVLOG 2026-04-22.
+
+### Changed
+
+- **Connection UX self-narration pass — Route / Relay sessions vocabulary + section headers + per-route security chips.** Three linked problems shipped as one commit: (1) pairing step 2 read as "you're stuck with insecure" for any multi-endpoint QR with LAN first, because the security badge + warning card were both computed from `endpoints[0]` alone — never acknowledging a secure Tailscale fallback in the same list; (2) the post-refactor active card had the right structure but no narration — sections stacked without headers, no captions explaining what Routes / Advanced / Security are for, Advanced surfaced manual URLs with no "most people don't need this" framing; (3) "Paired Devices" sounded like Bluetooth to anyone outside the project — the actual concept is server-side relay sessions with per-channel grants. Fix: introduce a shared vocabulary (Route for network path, Active/Fallback for state, Secure/Plain for transport, Relay sessions for server records) used consistently across `ConnectionWizard.kt` ConfirmStep, `ActiveConnectionSections.kt` (all three body sections), `EndpointsCard.kt`, and `PairedDevicesScreen.kt`. New `TransportSecurityState` tri-state (`AllSecure` / `Mixed` / `AllInsecure`) drives a context-aware pairing badge — the Mixed case now reads "LAN is plain ws:// — fine at home or the office, not on public Wi-Fi. Tailscale is encrypted (wss://) and the app uses it automatically when LAN is unreachable. You're safe on any network." — so users see they have a secure fallback without needing to understand the candidate-list mental model. Active card gains four labelMedium section headers (Connection health / Routes (N) / Advanced / Security) each with a one-line bodySmall caption above the section body. Endpoint rows in both surfaces carry per-row Secure/Plain chips (green 🔒 / amber 🔓, not scary red) so each route's security is visible at a glance; ordinal labels are humanized (`1st choice` / `Fallback` / `Fallback 2` on pairing step 2; `Active` / `Fallback` on the active card — different framings because pre-connection the commitment is ordinal and post-connection what matters is state). `PairedDevices` Kotlin identifier and deep-link route string stay — only the user-visible labels change — so nav deep links are unaffected. New intro paragraph on the Relay sessions screen explains that rows are sessions (not Bluetooth pairings), and a tap-for-info icon on "Channel grants" opens a dialog explaining that chat/bridge/voice are per-feature permissions with independent expiries. Delivered as three parallel `general-purpose` implementation agents (one per surface, isolated file ownership) plus a post-implementation `code-reviewer` sweep that caught seven leftover `endpoint`/`Paired Devices` strings across `ConnectionInfoSheet.kt`, `SessionTtlPickerDialog.kt`, `EndpointsCard.kt`, `SettingsScreen.kt`, and the `Screen.PairedDevices` nav title — all corrected before commit.
+
+### Fixed
+
+- **Add-Connection navigation now fires on the tap instead of waiting for placeholder persistence.** Pre-fix, `RelayApp.kt`'s `onAddConnection` lambda awaited `beginAddConnection().join()` *before* calling `navController.navigate(Screen.Pair)` — so three serialized DataStore writes (addConnection / persistUrls / setActiveConnection) blocked the QR scanner appearing. On a warm device this was ~15-50 ms; on a cold / flash-pressured device it spiked to 100-150 ms, a visible freeze on every FAB tap. Fix pre-allocates the placeholder UUID synchronously on the UI thread, fires `navController.navigate(Screen.Pair.route(connectionId = id, autoStart = "scan"))` immediately, and runs `connectionViewModel.beginAddConnection(preAllocatedId = id)` in a fire-and-forget background coroutine. `ConnectionViewModel.beginAddConnection` gains an optional `preAllocatedId: String? = null` param — when provided, skips UUID generation, does an existence check (idempotent re-entry on double-tap / recomposition), and falls through to the existing mutex-guarded placeholder-build path. PairScreen's existing reactive `collectAsState` on `connectionStore.connections` / `activeConnectionId` picks up the placeholder milliseconds later — the user is still framing the QR. Critical path drops from three DataStore writes to zero; the writes still happen, just off the critical path. Zero behavior change for `preAllocatedId == null` callers (the legacy placeholder-reuse scan path is preserved byte-for-byte).
+
+### Added
+
+- **`relayReady` signal gates voice + bridge surfaces.** New `ConnectionViewModel.relayReady: StateFlow<Boolean>` composes three inputs — WSS `ConnectionState.Connected`, `AuthState.Paired`, AND non-blank `relayUrl` — into a single "WSS is actually functional" truth. ChatScreen's mic button dims + Toasts "Voice mode unavailable — relay not connected" instead of launching an overlay that would immediately fail on `/voice/transcribe`. BridgeScreen surfaces an error-container banner at the top of the scroll region so the user doesn't enable the master toggle expecting commands to flow. Soft-gate semantics — neither surface hard-disables, matching the existing Chat-send / Terminal-Refresh patterns; BridgeScreen intentionally still lets the user pre-configure permissions and safety rails before a relay pairs. Three-input (rather than the simpler two-input `chatReady` form) because the Case-C teardown edge — last connection removed, `_apiServerUrl`/`_relayUrl` blanked — can leave a stale `Paired` token alive alongside a dead URL; without the URL check the banner would never surface in that state.
+
+### Changed
+
+- **Connection settings unified — one screen, one mental model.** The pre-refactor app had two near-identically-named screens (`ConnectionSettings` singular, `ConnectionsSettings` plural) reached from two different Settings-top surfaces (Active Connection quick-look card vs. "Connections" category row), each covering overlapping functionality. Everything the singular screen did — pair QR entry, manual URL config, insecure toggle, manual pairing code fallback, 3 tappable status rows — now folds inline onto the **active card** of the plural screen as expandable body sections. The singular `ConnectionSettings` screen (1429 lines), its route, its `Screen` enum entry, its `onNavigateToConnectionSettings` param chain, and the Active Connection quick-look card on Settings have all been removed. New active-card structure: Status rows (always visible) → Endpoints expander → Advanced expander (manual URL / insecure toggle / manual pairing code) → Security posture strip (transport badge + Tailscale chip + hardware keystore badge + Paired Devices row). Non-active cards stay flat. Navigation path throughout the user docs updates from `Settings → Connection → X` to `Settings → Connections → [active card] → X` (or `→ Advanced → X`). New file `ui/components/ActiveConnectionSections.kt` (~650 lines) owns the active-card bodies; `ui/screens/ConnectionsSettingsScreen.kt` is rewritten (~580 lines) with screen-scope hoisting for info sheets + the insecure-Ack dialog so `LazyColumn` item disposal can't silently dismiss them mid-scroll. Team-delivered: three parallel `feature-dev:code-explorer` agents produced the full feature inventory + integration map + caller trace in under 2 minutes, which made the synthesis + implementation mechanical.
+
+### Fixed
+
+- **Voice-exit chime firing on every Add-connection tap.** `ConnectionSwitchCoordinator.switchConnection` fires the `voiceStopCallback` unconditionally at step 3 (correct for connection-to-connection switches while voice is active), but `beginAddConnection` also routes through `switchConnection` to bind the placeholder Connection's auth store before the pair wizard runs — and `VoiceViewModel.exitVoiceMode()` was playing `sfxPlayer.playExit()` regardless of whether voice mode was actually on. Logcat confirmed the chime on every Add-connection FAB tap. Fix adds an idempotence guard at the top of `exitVoiceMode()`: early-return when `_uiState.value.voiceMode` is already false. Teardown is still safe to skip because every inner statement is null-guarded + try/catch-wrapped and would be a no-op on an already-stopped voice session; the only meaningful line is the `playExit()` SFX, which is what we're silencing.
+- **500 ms freeze on every Add-connection tap.** `ConnectionSwitchCoordinator.switchConnection` runs a `withTimeoutOrNull(AUTH_HYDRATE_TIMEOUT_MS = 500L)` block at step 10 to wait for the freshly-bound `AuthManager` to flip `AuthState` from `Loading` to `Paired`. The comment acknowledged Add-connection is the common path and the 500 ms was meant to be "imperceptible," but on-device it wasn't — the user perceived the delay (and the voice chime masking it) on every tap. The placeholder Connection created by `beginAddConnection` has `pairedAt == null` and an empty EncryptedSharedPreferences store, so `AuthState` will NEVER reach `Paired` — the 500 ms is pure stall. Fix short-circuits the hydrate wait when `target.pairedAt == null`: skip `withTimeoutOrNull` entirely for placeholders and log at DEBUG instead of the misleading "auth hydrate timeout" INFO. Real paired-to-paired switches still run the full hydrate wait because both sides have `pairedAt != null`.
+- **KDoc nested-comment trap in `ConnectionViewModel.relayReady` doc block.** A literal `/voice/*` path pattern inside the `relayReady` KDoc opened a nested block comment (Kotlin supports nested `/* */`, Java does not) whose `*/` then closed only the nested level — leaving the outer `/**` open for the remaining ~2200 lines of the file. Symptom: `MainActivity.kt:67` "Unresolved reference 'isReady'" plus ~50 cascading "Cannot infer type" errors across `PairedDevicesScreen`, `SettingsScreen`, `TerminalScreen`. Real errors (`Missing '}`, `Unclosed comment`) were the last two lines of `./gradlew compileGooglePlayDebugKotlin` output, easy to miss. Fix was a two-character rewrite: path patterns now wrapped in backticks AND `/*` → `/...` so the glob-looking character isn't in a block-comment position. Lesson logged in `DEVLOG.md` 2026-04-21; worth a sweep of other KDoc blocks for shell/regex-looking patterns before the next large diff.
+
+- **Orphan placeholder connections from abandoned Add-connection flows.** The `beginAddConnection` path pre-creates a placeholder Connection and switches to it before the pair wizard runs — so `applyPairingPayload` lands the token in the right auth store. Previously, cleanup of the placeholder was wired only to the explicit Cancel button and TopAppBar back arrow. System back (gesture back / predictive back) bypassed that branch, leaving the placeholder in the connection list forever. Two-part fix: (a) `PairScreen` now installs a `BackHandler` that routes system back through the same `onCancel` → `discardPlaceholderConnection` branch the explicit back arrow uses; (b) `ConnectionViewModel.init` sweeps for any existing orphans (tuple: `pairedAt == null && apiServerUrl.isBlank() && label == PLACEHOLDER_LABEL`) on cold start and removes them — the tuple cannot be produced by any real pairing, so the sweep is safe without a dry-run. If the active connection at startup points at an orphan, the sweep switches to the first surviving real connection before deleting. Fixes the "why does my chip say 'New connection…'" symptom on devices that were affected pre-fix.
+- **Pair flow now auto-starts the camera on Add connection.** `ConnectionWizard` gains an `autoStart: String?` param (currently only `"scan"` is honored). The Add-connection FAB on `ConnectionsSettingsScreen` passes it so the wizard fires the camera permission launcher on first composition instead of forcing users through the Method chooser — one obvious next step, one-tap flow. Re-pair surfaces intentionally leave `autoStart` null so the full Scan / Enter code / Show code chooser stays available there. The deep-link arg is plumbed through `Screen.Pair`'s route (`pair?connectionId=...&autoStart=...`) and `PairScreen`'s new `autoStart` param; unrecognized values fall through to the default Method step so future builds can add more targets without breaking old ones.
+
+### 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.
+
+### 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.
+- **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.
+- **`MorphingSphereCore.kt` — pure, platform-agnostic sphere algorithm.** Extracted from `MorphingSphere.kt` as the single source of truth for the sphere going forward. Uses only `kotlin.math` — no Android, no Compose, no `Paint` — so the same math can back a terminal TUI (Hermes CLI), the codename-11.dev user site, or a Compose Desktop port without visual drift between surfaces.
+- **`preview/web/` — zero-dep browser harness for the sphere.** `sphere.js` is a line-for-line JS mirror of `MorphingSphereCore.kt` (`Math.imul` + `|0` for Kotlin `Int` overflow, floored modulo for `.mod()`, `Math.trunc` for `.toInt()`). `index.html` exposes live panel controls for state / voice / layout (cols, rows, fill%, aspect, char size) + a `phone 9:16` preset matching Compose `@Preview(widthDp=360, heightDp=640)`. Serve via `python3 -m http.server --directory preview/web`.
+- **Runtime parity harness for the sphere.** `preview/web/parity-check.mjs` + JVM `MorphingSphereCoreParityTest` render the 8 Compose `@Preview` fixtures on both sides and emit FNV-1a 32-bit checksums. **8/8 structural checksums** (over discrete `(row, col, char)` tuples) and **8/8 zone histograms** match between JS and Kotlin; 6/8 full (color/alpha-inclusive) checksums match — the 2 voice-modulated fixtures drift at the 3rd decimal due to Float (Kotlin) vs Double (JS) precision in compound expressions, sub-perceptible.
+- **Multi-endpoint pairing QR** (ADR 24). A single pairing now carries an ordered list of endpoint candidates (`lan` / `tailscale` / `public` / operator-defined) so the same phone works seamlessly across LAN, Tailscale, and a public reverse-proxy URL. The phone picks the highest-priority reachable candidate at connect time and re-probes reachability on every `ConnectivityManager` network change with a 30s per-candidate cache. Strict-priority semantics — reachability only breaks ties among equal priorities, never promotes a lower priority over a higher one. New `plugin/pair.py` CLI flags `--mode {auto,lan,tailscale,public}` (default auto) and `--public-url <url>` drive candidate emission. See [`docs/remote-access.md`](docs/remote-access.md).
+- **First-class Tailscale helper** (ADR 25). New `plugin/relay/tailscale.py` + `hermes-relay-tailscale` CLI shim fronts the loopback-bound relay with `tailscale serve --bg --https=<port>` so the port is reachable over the tailnet with managed TLS + ACL-based identity. Safe to call unconditionally — no-ops with structured-dict failure when the `tailscale` binary is absent. `install.sh` gains an optional step [7/7] offering Tailscale enablement; skipped silently when the binary is missing, when `TS_DECLINE=1`, or under non-interactive shells without `TS_AUTO=1`. Auto-retires when upstream PR [#9295](https://github.com/NousResearch/hermes-agent/pull/9295) merges.
+- **Remote Access dashboard tab** (in the dashboard plugin). Operators can enable/disable the Tailscale helper, mint multi-endpoint pairing QRs, and inspect which endpoint modes are currently active — all from the hermes-agent web UI.
+- **Reachability probe + network-change re-probe** in the Android client. `ConnectionManager.resolveBestEndpoint()` does `HEAD /health` against each API candidate with a 2s timeout + 30s cache; `NetworkCallback.onAvailable` / `onLost` triggers a re-probe. `RelayUiState` gains `activeEndpointRole` so the UI can render which endpoint (LAN / Tailscale / Public) is currently serving.
+- **Opt-in terminal sessions.** Fresh terminal tabs no longer auto-attach — each tab shows a centered **Start session** overlay and spawns the tmux-backed shell only after the user taps it. Tabs that have already been started still auto-reattach on reconnect. Removes the previous behavior of creating persistent server-side shells just by opening the Terminal tab.
+- **`terminal.kill` envelope** — hard-destroy a session. The relay runs `tmux kill-session -t <name>` out-of-band before tearing down the PTY so the background shell (and any running commands) die with it. Closing a tab now opens a confirmation dialog with explicit **Detach** (preserve tmux session) vs **Kill** (destroy it) choices; the session info sheet also gains an error-tinted **Kill session** button.
+- **Touch-scroll + scrollback buttons for the terminal.** A vertical swipe on the terminal surface now moves xterm.js's scrollback (with a 12 px deadzone so long-press-to-select still works); the extras toolbar gains ⇑ / ⇓ / ⇲ buttons for ten-line scroll up, ten-line scroll down, and jump-to-bottom. Scrollback depth is unchanged at 10 000 lines.
+- **Friendly names for terminal tabs.** The session info sheet now has an inline rename field that persists a cosmetic name (up to 40 chars) keyed on the wire-side `session_name`. Names survive app restart and re-pair; cleared on Kill but preserved on Detach. The tab chip renders `1 · build` when named.
+- **`--prefer <role>` priority override** on every pair surface (`hermes-pair --prefer tailscale`, the `/hermes-relay-pair` skill, and the dashboard Remote Access tab's "Prefer role" dropdown). Open-vocab role string — promotes the named role to priority 0 with the rest renumbered in natural order. Unknown role emits a stderr warning and keeps the natural order. Case-insensitive matching; role string preserved verbatim for HMAC round-trip.
+- **Active-endpoint chip in the Chat top bar.** Compact tappable chip (e.g. "LAN" / "Tailscale" / "Public" / "Custom VPN (…)") rendered next to the ambient-mode button when the resolver has picked an endpoint. Tap jumps to the Connections screen so the user can probe / override / re-pair without leaving chat. Hidden for single-endpoint legacy pairings — the existing Settings row already spells the host out.
+- **Re-pair hint on single-endpoint connections.** When the active connection has exactly one endpoint (legacy single-URL pair), the Connections list card shows a tertiary-container info strip suggesting "Re-pair with Mode = Auto to get LAN + Tailscale + Public in one QR" with an inline Re-pair button. Silent when zero or ≥2 endpoints are stored.
+- **Tailscale Funnel auto-detect for the public candidate.** `plugin.relay.tailscale.funnel_url(port)` probes `tailscale serve status --json` for `AllowFunnel` flags and returns the `https://<hostname>/` URL when the relay port is funneled. `plugin/pair.py` `build_endpoint_candidates` calls it as a fallback whenever `mode=auto` or `mode=public` is picked without an explicit `--public-url` — removes the "pin the public URL on Remote Access tab" step when Funnel is already publishing. Soft-fail on every error path; missing CLI / non-funneled port / unparseable JSON all return None.
+
+### Changed
+
+- **Install-command copy buttons stay pinned.** The copy buttons on the docs home's "Install in 30 seconds" commands used to scroll out of view with long one-liners because `.install-code` had both `position: relative` and `overflow-x: auto` — the button's absolute coordinates anchored to the scrolling content box, not the visible viewport. Split into `.install-code` (positioning context, no overflow) wrapping a new `.install-code-scroll` (padding + horizontal overflow). Button now overlays the code as a proper static copy affordance.
+- **Docs hero (mobile).** VitePress's default `.image-container` is a fixed 320×320 square on mobile (designed for round illustrations) with negative margins on `.image` that overlap `.main`. On a 9:16 phone-frame video this caused the frame to overflow the square and the text/CTAs to sit on top of the video. `custom.css` now overrides the container to `height: auto` and zeroes the negative margins below 960 px, and `HeroDemo.vue` swaps three breakpoint widths (280/240/200 px) for one `clamp(180px, 62vw, 280px)` rule with a `max-height: 70vh` safety rail so the frame can't dominate the fold on tall narrow viewports.
+- **`MorphingSphere.kt` is now a thin Compose renderer** that delegates all math to `MorphingSphereCore`. Public `@Composable` API is unchanged (same params, same defaults); call sites in `VoiceModeOverlay` and the chat empty state need no updates. Renderer also swapped legacy `android.graphics.Paint` + `Typeface` + `nativeCanvas.drawText` for Compose's `rememberTextMeasurer()` + `drawText`, dropping all `android.graphics.*` imports.
+- **Pairing QR now carries the `hermes: 3` schema when endpoints are emitted.** `plugin/pair.py` → `build_payload(endpoints=...)` bumps the version only when the `endpoints` array is present; pairs without endpoint candidates continue to emit `hermes: 2`. `canonicalize()` in `plugin/relay/qr_sign.py` preserves array order and role strings verbatim (no case/whitespace normalization) so HMAC signatures round-trip across Python / Kotlin.
+- **Paired Devices screen renders per-endpoint rows.** Each paired device now shows one row per `(device, endpoint)` pair, with a styled chip per role (LAN / Tailscale / Public / Custom VPN). Settings and Paired Devices both read from the new `PairingPreferences` per-device endpoint store.
+- **Terminal session info sheet is vertically scrollable** — tall phones in landscape with the new Start / Reattach / Kill action rows no longer clip the Done button.
+- **Connections list subtitle shows role names, not count.** Active card's subtitle was "hostname • Connected • LAN • 2 endpoints" — accurate but opaque (users couldn't tell which endpoints the QR carried without expanding). Now shows "hostname • Connected • Active: LAN • LAN + Public" — role set on display, not count. Non-active cards unchanged.
+- **Looser resolver probe timing.** Per-candidate HEAD `/health` timeout raised from 2s → 4s and cache TTL from 30s → 60s. ADR 24's 2s was tight enough that LTE hand-off and slow hotel Wi-Fi routinely got marked unreachable spuriously; 4s preserves fast-fail-on-real-outage while surviving the flaky-network case. NetworkCallback still invalidates the cache on real network changes, so the longer cache is functionally equivalent but saves battery.
+
+### Backward compatible
+
+- **Old v1 / v2 QRs keep parsing unchanged.** The Android parser's `ignoreUnknownKeys = true` plus the nullable `endpoints` field means pre-v3 QRs work on new phones (the phone synthesizes a single priority-0 `role: lan` candidate from the top-level fields, promoted to `role: tailscale` when the host matches `100.64.0.0/10` / `.ts.net`), and v3 QRs work on v0.6.x and earlier clients (they ignore `endpoints` and use the top-level fields). No forced re-pair for existing installs.
+
+### Fixed
+
+- **Profile `PUT` endpoints restored.** The ADR 24 commit collaterally deleted ~479 lines of `handle_profile_soul_put` / `handle_profile_memory_put` while adding multi-endpoint passthrough to the pairing handlers. `PUT /api/profiles/{name}/soul` and `PUT /api/profiles/{name}/memory/{filename}` are back at their canonical positions; atomic-write semantics and loopback-or-bearer auth unchanged.
+- **Stray terminal errors no longer poison the wrong tab.** Server-level error envelopes without a `session_name` (e.g. "Unknown terminal message type" from an older relay) previously fell through to the active tab and flashed an error overlay on whichever tab the user happened to be looking at. Errors without session scope now log only.
+- **Dashboard-minted QRs now show the correct 10-minute expiry.** `handle_pairing_mint` was returning `expires_at = now + 60` whenever the caller didn't pin a session TTL (every dashboard mint), which conflated the pairing-code window with the future session's lifetime and made the dashboard dialog count down from ~1 minute even though the underlying code was valid for 10. Now stamps `expires_at = now + _PAIRING_CODE_TTL` explicitly — the pairing-code TTL is what the UI cares about. Session TTL continues to ride the QR payload's `ttl_seconds` field for the phone's TTL picker.
+- **PairDialog: multi-endpoint aware, Authelia-trap guardrail.** The dashboard Management tab's "Pair new device" button was still minting legacy single-endpoint QRs (no `endpoints[]`, no `mode`, no `prefer`) while the Remote Access tab had been on the modern path for months. Swapped to `mintPairingWithMode` with `Mode` + `Prefer role` dropdowns as primary inputs; the legacy host/port/tls fields moved under a collapsed "Advanced · API-server override" section with a warning that triggers when the typed host looks like a forward-auth-gated FQDN (the root cause of "relay pairs but phone drops config" reports: e.g. `wss://hermes.example.com` fronted by Authelia gets pinned into the QR's API block, relay WSS succeeds over LAN, then API probes return 401 and the wizard cleans up). Modal widened from `max-w-md` to `max-w-xl` to fit the endpoints receipt without horizontal scroll.
+- **PairDialog: proxy-fronted override now requires explicit consent.** Previously the Advanced warning was purely informational — the dialog still auto-minted a QR the phone would fail to use. Now the auto-mint is gated: when the pinned host matches the proxy-fronted heuristic, the dialog pauses and shows "Mint anyway / Clear override" instead of proceeding. Consent is per-host — changing the host resets `proxyConfirmed` so a new host triggers a fresh confirm step.
+
+## [0.6.0] — 2026-04-18
+
+### Added
+
+- **Pair with multiple Hermes servers** and switch in one tap. A new Connection chip on the left of the Chat top bar opens a switcher sheet with a health indicator for each paired server — tap one to cancel in-flight chat, disconnect the old relay, rebind to the new server, and reload sessions + personalities + profiles. The chip is hidden automatically when you only have one Connection. Existing single-server installs migrate transparently on first launch of this version — zero re-pair, zero token migration. See `docs/decisions.md` §19.
+- **Connections management screen** at Settings → Connections. Each paired server is a card with inline rename, re-pair (reuses the QR onboarding flow), revoke, and remove. Add a new Connection from the same screen. Per-connection state kept separate: sessions, memory, personalities, skills, profiles, relay URL + cert pin, voice endpoints, last-active session. Theme, bridge safety preferences, and TOFU cert-pin map stay global.
+- **Agent Profiles** — the relay now auto-discovers upstream Hermes profiles by scanning `~/.hermes/profiles/*/` (plus a synthetic "default" for the root config) and advertises them in the `auth.ok` payload. On chat send with a profile selected, the phone overlays the request's `model` and `system_message` with the profile's `model.default` + `SOUL.md`. Selection is ephemeral and clears on Connection switch. Gated by `RELAY_PROFILE_DISCOVERY_ENABLED=1` (default on) — operators can set it to `false` to keep the picker empty. See `docs/decisions.md` §21.
+- **Consolidated agent sheet** on the Chat top bar. Tap the agent name in the middle of the top bar to open a scrollable bottom sheet holding Profile selection, Personality selection, and session info + analytics (message count, tokens in/out, avg TTFT). Replaces the separate top-bar chips from intermediate v0.5.x builds. Toast confirmations fire on Profile and Personality switches.
+- **"Active agent" card** at the top of Settings — summarizes the current Connection / Profile / Personality. Tap navigates to Chat with the agent sheet auto-opened via the `openAgentSheet` nav arg, giving Settings-originating users a one-tap path to change agent context.
+- **Three-layer agent model** formalized: Connection (server) → Profile (agent directory) → Personality (system-prompt preset). Documented in `docs/spec.md`, `docs/decisions.md` §8 / §19 / §21, and `user-docs/features/{connections,profiles,personalities}.md`.
+- **Pair wizard URL scheme cross-validation** — an inline hint fires when the API field is given a `wss://` URL (or any obviously-wrong scheme), so misplaced values surface before the pair attempt instead of after.
+- **Pair-stamp on the active Connection** — successful auth now stamps the active Connection's pairing metadata (paired-at, transport hint, expiry) in place, so a re-pair from Settings doesn't leave stale state on the card.
+- **Live WSS state on the active Connection row** in the Connections list — the active card now reflects Connected / Reconnecting… / Stale in real time instead of a static "Paired N minutes ago" timestamp. A Stale state also surfaces an inline **Reconnect** action button (promoted above Rename) tinted to signal "attention."
+- **Reconnect taps get explicit feedback.** Every Stale-recovery affordance (the Relay row, the Reconnect button in Connection Settings, and the new Reconnect action in the Connections list) now shows a snackbar / toast "Reconnecting to relay…" so users know the tap registered even during the sub-second before the row flips to Connecting.
+
+### Changed
+
+- **Unified relay status across screens.** `SettingsScreen`, `ConnectionSettingsScreen`, and the Connections list used to resolve relay status independently (each with its own ad-hoc stale / auto-reconnect / probing combinator), which let them disagree on what state the relay was in — e.g. the Settings card said **Disconnected** red while the Connection sub-screen said **Reconnecting…** amber for the same moment. State resolution now lives on `ConnectionViewModel.relayUiState: StateFlow<RelayUiState>` with five well-defined cases (`NotConfigured` / `Connected` / `Connecting` / `Stale` / `Disconnected`) and a 5 s grace window before a Paired-but-Disconnected pose is promoted to `Stale` — every screen maps the single source of truth onto the existing `ConnectionStatusRow` API.
+- **Settings "Connection" card → "Active Connection".** Title renamed, and the current Connection's label now renders as the card subtitle so installs with multiple servers can see at a glance which one the status rows describe. Fresh `reconnectIfStale()` tick on first compose so the Relay row doesn't flash red before the lifecycle observer's resume path lands.
+- **Status-badge UX polish.** `ConnectionStatusBadge` top-aligns cleanly on multi-line rows (was vertically centered and drifted off-center when the label wrapped). The Settings screen now treats a paired Connection with a briefly-down relay as **Connecting** (amber) instead of **Disconnected** (red) — avoids scare-red during the few seconds around a relay restart.
+- **Top-bar chip layout.** `ProfilePicker.kt` and `PersonalityPicker.kt` as standalone top-bar chips are gone; their selection now lives inside the consolidated agent sheet.
+
+### Fixed
+
+- **`POST /pairing/mint` emits the correct wire format.** Dashboard-minted QRs were unscannable — the relay endpoint put the freshly-minted pairing code in top-level `key` and defaulted the top-level port to the relay's own `8767` (its `server.config.port`) instead of the Hermes API server's `8642`. The Android scanner reads top-level `host:port` as the **API** server URL and expects the minted code inside `relay.code`, so phones saw `serverUrl=http://host:8767` (wrong port, no API reachable) and an empty `relay` block — `applyServerIssuedCodeAndReset` bailed on the empty code and the WSS never handshook. Silent fail. The `hermes-pair` CLI and `/hermes-relay-pair` skill were unaffected because they go through `pair.py`'s CLI path which builds the payload correctly; only the dashboard's "Pair new device" flow hit the bug. `handle_pairing_mint` now mirrors `pair.py:762` — top-level `host/port/key/tls` default from `RelayConfig.webapi_url` (resolved to a LAN-routable IP via `_resolve_lan_ip`) with `host`/`port`/`tls`/`api_key` body overrides, and the `relay` block carries `url` from `_relay_lan_base_url(server.config.host, server.config.port, ...)` plus the minted `code`. Shape now matches `docs/spec.md` §3.3.1 and `QrPairingScanner.kt`. Regression test at `plugin/tests/test_pairing_mint_schema.py` (8 cases) pins the payload shape against what the Android parser expects so the two sides can't drift silently again.
+- **Dashboard Relay Management tab no longer crashes on paired-session list.** `RelayManagement.jsx:172` wrapped a dict-shaped `s.grants` (`{chat, terminal, bridge}`) in a 1-element array and rendered each entry as a React child, tripping minified React error #31 ("objects are not valid as a React child"). Now uses `Object.keys(s.grants)` when the value is dict-shaped so Badge children are always strings; existing array path preserved for future callers. Rebuilt bundle at `plugin/dashboard/dist/index.js` — the hermes-agent dashboard loads that file verbatim so source changes require a rebuild.
+
+### Deferred
+
+- True per-profile isolation on a single Connection (memory + sessions + `.env` shared today; use separate Connections for full isolation).
+- Persisted Profile selection per Connection across app restarts.
+- Gateway-running probe (hermes-desktop-inspired) on the Connection health indicator.
+
+## [0.5.x] — Unreleased feature work
+
+### Added — Voice silence auto-stop (2026-04-18)
+
+- **Silence-based auto-stop for Listening turns.** `VoiceViewModel.startListening()`
+  now arms a `silenceWatchdogJob` that polls `VoiceRecorder.amplitude` every
+  150 ms and calls `stopListening()` after the user's configured
+  `silenceThresholdMs` of continuous silence following at least one
+  above-floor frame. Uses the existing `RESUME_SILENCE_THRESHOLD = 0.08f`
+  floor (already tuned to reject mic hiss / room tone while catching
+  whispered speech). Cancelled on manual stop, `interruptSpeaking`, and
+  `onCleared`. Skipped in `InteractionMode.HoldToTalk` — the physical
+  release is the authoritative stop there. Closes the previously-dead
+  `VoiceSettings.silenceThresholdMs` preference, which was persisted
+  + exposed via a Settings slider but never consumed by any code path.
+
+### Fixed — Bootstrap crash when wrapping command middleware (2026-04-18)
+
+- **`hermes_relay_bootstrap/_command_middleware.py`** — `maybe_install_middleware()`
+  was replacing `app._middlewares` (an aiohttp `FrozenList`) with a plain
+  tuple via `(*existing, middleware)`. When `AppRunner.setup()` later
+  called `app._middlewares.freeze()`, tuples have no `.freeze()` method
+  and the gateway crashed on startup with `'tuple' object has no
+  attribute 'freeze'`. Switched to in-place `app._middlewares.append(middleware)`
+  — the FrozenList is still mutable at middleware-install time. 31/31
+  tests in `test_command_middleware.py` pass.
+
+### Added — Dashboard plugin
+
+- **Hermes-agent dashboard plugin** at `plugin/dashboard/` — surfaces
+  relay state in the gateway's web UI via four tabs. **Relay
+  Management** lists paired devices + health + Server version;
+  **Bridge Activity** renders the in-memory ring buffer of recent
+  bridge commands (method / path / decision, with safety-rail
+  `executed` / `blocked` / `confirmed` / `timeout` / `error`
+  filters); **Push Console** ships as a stub with an
+  "FCM not configured" banner until FCM lands; **Media Inspector**
+  lists active `MediaRegistry` tokens with live TTL countdowns and
+  basename-only file names (absolute paths never leave the server).
+  Frontend is a pre-built React IIFE at `plugin/dashboard/dist/index.js`
+  (~16 KB) loaded verbatim by the dashboard shell; backend is a thin
+  FastAPI proxy at `plugin/dashboard/plugin_api.py` mounted at
+  `/api/plugins/hermes-relay/*`.
+- **Three new loopback-only relay routes** feeding the plugin —
+  `GET /bridge/activity` (ring buffer; `?limit=N`, max 500),
+  `GET /media/inspect` (token list; `?include_expired=true` to
+  include evicted entries), and `GET /relay/info` (aggregate
+  `{version, uptime_seconds, session_count, paired_device_count,
+  pending_commands, media_entry_count, health}`). Plus a
+  loopback-exempt branch on the existing `GET /sessions` so the
+  plugin proxy doesn't need to mint a bearer.
+- **`BridgeCommandRecord` ring buffer** on `BridgeHandler`
+  (`deque(maxlen=100)`) — records `request_id`, `method`, `path`,
+  redacted `params`, `sent_at`, `response_status`, `result_summary`,
+  `error`, and `decision`. Commit `777a06a` wires append/update into
+  `handle_command()` / `handle_response()` without changing external
+  behaviour; timeouts flip `decision=timeout`, phone-side safety
+  denials flip `blocked`. Params are redacted for keys in
+  `{password, token, secret, otp, bearer}`.
+- **`MediaRegistry.list_all(include_expired=False)`** — lock-guarded
+  snapshot method returning `{token, file_name, content_type, size,
+  created_at, expires_at, last_accessed, is_expired}` dicts sorted
+  newest-first. Absolute paths are never included. Commit `2212fbc`.
+- **Pairing workflow from the dashboard** — new `POST /pairing/mint`
+  relay route (loopback-only) generates a random 6-char A-Z/0-9 code,
+  registers it with the existing `PairingManager`, and returns the
+  signed QR payload built via `plugin.pair.build_payload`. The
+  dashboard backend exposes it at
+  `POST /api/plugins/hermes-relay/pairing`. A new **PairDialog** in
+  the Management tab renders the QR (via the `qrcode` npm lib bundled
+  into the IIFE), shows the code + expiry countdown, and lets the
+  operator **override Host / Port / TLS** in the QR payload — useful
+  for Traefik-fronted deploys where the phone needs
+  `wss://relay.example.com:443` even when the dashboard itself is
+  served at a different hostname. Settings persist per-browser in
+  localStorage.
+- **Functional session revocation** — loopback-exempt branch on
+  `DELETE /sessions/{token_prefix}` plus a proxy route at
+  `DELETE /api/plugins/hermes-relay/sessions/{prefix}`. The Revoke
+  button on the Management tab now confirms via native dialog, calls
+  the proxy, and auto-reloads the session list on success.
+
+### Added — Installer
+
+- **`--dashboard-plugin=yes|no`** flag on `install.sh` (default `yes`;
+  also via `HERMES_RELAY_DASHBOARD_PLUGIN` env var). Passing `no`
+  renames `plugin/dashboard/manifest.json` → `manifest.json.disabled`
+  so the hermes-agent dashboard loader skips the plugin entirely.
+  Re-running with the opposite flag flips it back — no config lives
+  anywhere else.
+- **Live dashboard rescan** in both `install.sh` and `uninstall.sh` —
+  parses `hermes-dashboard.service` ExecStart for `--host` / `--port`
+  and GETs `/api/dashboard/plugins/rescan`, falling back to loopback
+  and common ports. The relay tab appears/disappears without a
+  dashboard restart. Silent no-op when the dashboard isn't running.
+
+### Fixed
+
+- **Dashboard plugin UI** uses plain tab buttons instead of Radix
+  `<Tabs>`: Radix's `Tabs` container expects `TabsContent` children
+  (not exposed in the SDK whitelist) and its internal context blew
+  up at first render as `o is not a function` after minification.
+- **Install banner** no longer claims "Phase 3 — Bridge channel +
+  status tool" (stale since v0.2.x). Phase-agnostic copy now.
+
+### Added — Sideload in-app update check
+
+- **In-app update banner** on the `sideload` flavor. On cold start (at
+  most once every 6h) the app queries the GitHub `releases/latest`
+  endpoint and, if it's behind, shows a slim `UpdateBanner` at the
+  top of the scaffold with the current and latest versions. Tap
+  **Update** → opens the `-sideload-release.apk` asset URL directly in
+  the browser; Android's DownloadManager fetches it and hands it to
+  the OS installer. Tap the **X** to dismiss for this version — the
+  banner reappears automatically on the next release.
+- **"Updates" row in About → About** card — manual "Check" button
+  with the same plumbing. After a successful check shows either
+  "You're on the latest release" or "Update available — v0.x.y" with
+  a **Download** CTA. The row is hidden on the `googlePlay` flavor
+  (Play Store owns update delivery there).
+- **No new permissions** — the app never installs APKs itself; it
+  only opens the asset URL via `ACTION_VIEW`. The Android download +
+  install path is unchanged from what sideload users already use.
+- Files: `update/UpdateChecker.kt`, `UpdatePreferences.kt`,
+  `UpdateModels.kt`, `SemverCompare.kt`;
+  `viewmodel/UpdateViewModel.kt`;
+  `ui/components/UpdateBanner.kt`;
+  wire-up in `ui/RelayApp.kt` + `ui/screens/AboutScreen.kt`.
+
 ### Added — v0.4.1 Bridge page polish pass
 
 - **`UnattendedGlobalBanner`** — thin 28dp amber strip at the top of
@@ -183,6 +690,147 @@ sees the toggle, never installs the wake lock, and never invokes
 - **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`).
 
+### Added — Barge-in (interrupt the agent)
+
+Voice mode can now be interrupted by speaking while the agent is
+replying — the same turn-taking pattern ChatGPT, Siri, and Google
+Assistant use. Stops the current TTS response the moment your voice
+is detected, flips to Listening, and hands the mic back to you
+without you needing to tap anything. If you then stay quiet for
+~600 ms, the agent resumes from the next sentence of the response
+you interrupted — so a quick breath or pause won't throw away its
+answer.
+
+- **Duplex audio + Silero VAD.** A new `BargeInListener` runs a
+  continuous `AudioRecord` (16 kHz mono PCM, `VOICE_COMMUNICATION`
+  source) alongside TTS playback, feeding 32 ms frames to a bundled
+  Silero voice-activity-detection model via `com.github.gkonovalov:
+  android-vad:silero`. `AcousticEchoCanceler` + `NoiseSuppressor` are
+  attached to the ExoPlayer audio session so the VAD doesn't trip on
+  our own TTS output. A second hysteresis layer on top of the library
+  (`2`–`3` consecutive speech frames depending on sensitivity) rejects
+  isolated false-positive frames.
+- **Two-stage ducking → cutoff.** A single raw speech frame fires a
+  `maybeSpeech` event → TTS volume ducks to 30 % as a soft
+  acknowledgement (user hears the shift, knows we heard something).
+  If hysteresis passes → hard `bargeInDetected` → `interruptSpeaking()`
+  fires (same path V4 wired for user-initiated interrupts in the
+  voice-quality-pass — cancels synth/play workers, deletes pending
+  cache files). If no follow-up detection within 500 ms, a watchdog
+  un-ducks so a single stray frame doesn't leave playback quieted.
+- **Resume-from-next-sentence.** `VoiceViewModel` tracks the list of
+  sentence chunks the play worker has spoken plus the index the user
+  interrupted at. After an interrupt, a 600 ms watchdog listens to
+  `VoiceRecorder.amplitude` — if the user keeps speaking past the
+  threshold, the new turn proceeds normally and the interrupted
+  response is dropped. If silence wins, remaining chunks re-enqueue
+  onto the TTS queue and playback resumes from the sentence after the
+  cut. Controlled by the "Resume after interruption" sub-toggle
+  (default on).
+- **Settings UI.** New "Barge-in" section in Voice Settings: master
+  toggle (default off), sensitivity segmented button (`Off / Low /
+  Default / High` — inverted from the library's `Mode` enum so higher
+  user-facing value = more sensitive), resume sub-toggle, and a
+  compatibility warning badge that shows on devices where
+  `AcousticEchoCanceler.isAvailable() == false` ("Your device may have
+  limited echo cancellation. Barge-in quality will vary.").
+  Preferences live in `BargeInPreferences` DataStore following the
+  existing `BridgeSafetyPreferences` shape.
+- **Shipped default-off.** AEC quality varies widely across Android
+  OEMs — Pixel is solid, many mid-tier and older devices aren't. The
+  feature ships disabled by default; users opt in from Voice Settings
+  and see the compatibility badge if their device has no AEC. A
+  `useExoPlayerVoice` flavor-safe architecture from the voice-quality-
+  pass already exposed `VoicePlayer.audioSessionId`, which is what
+  AEC binds against.
+- **Live settings reactivity.** Toggling the feature on or off
+  mid-conversation works without restarting voice mode; the
+  coordinator observes `BargeInPreferences.flow` and starts/stops the
+  listener on each emission.
+
+Tests: 7 new `VoiceViewModelBargeInTest` cases covering the
+interrupt path, resume-vs-keep-talking branches, the ducking
+watchdog, and live prefs-change reactivity. Plus unit tests for each
+new subsystem (VAD engine, duplex listener with `AudioFrameSource`
+seam for non-instrumented tests, ducking helpers, DataStore).
+
+### Changed — Voice output quality pass
+
+Addresses four symptom classes that surfaced in on-device voice testing
+after v0.4.0: voice output switching between crisp and muffled, volume
+drifting between sentences, audible pauses between chunks, and occasional
+jumbled-letter spell-outs when the agent emitted markdown, URLs, or
+tool-annotation tokens. Root-caused across five compounding layers and
+fixed end-to-end in a single agent-team session on
+`feature/voice-quality-pass`.
+
+- **Text sanitization, both ends.** A new `plugin/relay/tts_sanitizer`
+  module strips markdown (code fences, links, URLs, bold/italic, inline
+  code, headers, list markers, horizontal rules), Hermes tool-annotation
+  tokens (`` `💻 terminal` ``, `` `🔧 android_foo` ``, etc.), and a
+  conservative standalone-emoji set before `/voice/synthesize` hands
+  text to the upstream `text_to_speech_tool`. The same regex set is
+  mirrored client-side in `VoiceViewModel.sanitizeForTts` and applied
+  per delta before the sentenceBuffer sees the text, with multi-delta
+  code-fence deferral so unclosed fences don't leak orphaned backticks
+  to the chunker. Kills the "jumbled letters" symptom — ElevenLabs no
+  longer reads URLs character-by-character or speaks backtick+emoji
+  wrappers aloud.
+- **Coalescing chunker.** The old `MIN_SENTENCE_LEN=6` chunker emitted
+  every tiny acknowledgement (`"Sure."`, `"Okay."`) as its own TTS
+  call, guaranteeing audible inter-chunk variance. New
+  `MIN_COALESCE_LEN=40` + `MAX_BUFFER_LEN=400` secondary-break escape
+  merges short runs into one synthesize call, splits run-on sentences
+  at the last comma/semicolon/em-dash inside the 400-char window, and
+  preserves the `e.g.`/`U.S.` abbreviation lookahead. An 800 ms
+  silent-delta timer force-flushes buffered text so trailing fragments
+  on an abrupt stream-end don't strand in the buffer.
+- **Prefetch pipelining.** `VoiceViewModel.startTtsConsumer` was
+  previously a strictly serial `synthesize → play → awaitCompletion`
+  loop — every sentence boundary cost one full network round-trip. Now
+  split into two `supervisorScope`-rooted coroutines joined by a
+  bounded `Channel<File>(capacity=2)`: the synth worker runs up to one
+  sentence ahead of the play worker, so N+1's audio is already on disk
+  when N's playback finishes. Synth failures on N+1 no longer stall
+  N's playback. Cancellation paths (`stopVoice`,
+  `interruptSpeaking`, `exitVoiceMode`) cancel the scope and delete any
+  unplayed `voice_tts_<ts>.mp3` cache files; a `finally`-scoped
+  cleanup catches any late-arriving synth results that beat the cancel
+  signal.
+- **Gapless ExoPlayer playback.** `VoicePlayer` swapped from
+  recreating a `MediaPlayer` per file to a single persistent Media3
+  ExoPlayer + `addMediaItem` queue. Appending is non-blocking;
+  `awaitCompletion()` now returns when the queue is drained AND the
+  player is idle (documented semantic change). Kills the codec-reset
+  pop between sentences and composes naturally with the prefetcher —
+  the play worker appends without blocking the synth worker. Visualizer
+  attaches once against the ExoPlayer audio session (deferred to the
+  first `onIsPlayingChanged(true)` since some OEMs initialize the
+  session id lazily) and degrades gracefully if attach fails. Ships
+  behind a `FeatureFlags.useExoPlayerVoice` hook as a safety net; no
+  `MediaPlayer` fallback is currently wired.
+- **ElevenLabs model flipped to `eleven_flash_v2_5`.** Operator change
+  applied to `~/.hermes/config.yaml` on hermes-host ahead of the code
+  work. `eleven_multilingual_v2` is expressive but re-interprets
+  prosody per call — wrong model for a chunked pipeline.
+  `eleven_flash_v2_5` is the streaming-optimized model (~75 ms
+  per-request latency, lower per-call variance, designed exactly for
+  sentence-scale pipelines) and is net-cheaper per character. Voice id
+  unchanged. This single flip accounts for the bulk of the perceived
+  "clear↔muffled switching" reduction; the code units below reduce
+  what remained.
+
+Deferred: upstream PR exposing `VoiceSettings` (stability /
+similarity_boost / use_speaker_boost) in
+`hermes-agent/tools/tts_tool.py::_generate_elevenlabs`. Useful once
+merged — default `stability` is a hair too low for consistent chunked
+output — but not blocking; the flash model already solves most of what
+the settings would.
+
+Tests: 33 new relay sanitizer tests, 4 new client test files covering
+sanitization parity, chunking semantics, prefetch pipelining timing +
+cancellation cleanup, and ExoPlayer queue behavior.
+
 ## [0.4.0] - 2026-04-14
 
 ### Added — Bridge feature expansion (the big one)
@@ -541,7 +1189,7 @@ picker.
 - **Stats for Nerds enhancements** — reset button, tokens per message average, peak TTFT, slowest completion, seconds subtext on all ms values
 - **Feature gating** — `FeatureFlags` singleton with compile-time defaults (`BuildConfig.DEV_MODE`) and runtime DataStore overrides
 - **Developer Options** — hidden settings section, tap version 7 times to unlock (same pattern as Android system Developer Options)
-- **Relay feature toggle** — relay server settings and pairing sections gated behind developer options in release builds
+- **Relay feature toggle** — Server settings and pairing sections gated behind developer options in release builds
 - **Dynamic onboarding** — terminal, bridge, and relay pages excluded from onboarding when relay feature disabled
 - **Parse tool annotations** — experimental annotation parsing for Sessions mode (marked with badge, disabled for Runs mode)
 - **Privacy policy link** — accessible from Settings → About
@@ -575,7 +1223,7 @@ MVP release — native Android companion app for Hermes agent with direct API ch
 #### Core Chat
 - **Direct API chat** — connects to Hermes API Server via `/api/sessions/{id}/chat/stream` with SSE streaming
 - **HermesApiClient** — full session CRUD + SSE streaming, health checks, cancel support
-- **Dual connection model** — API Server (HTTP) for chat, Relay Server (WSS) for bridge/terminal
+- **Dual connection model** — API Server (HTTP) for chat, Server (WSS) for bridge/terminal
 - **API key auth** — optional Bearer token stored in EncryptedSharedPreferences
 - **Cancel streaming** — stop button to cancel in-flight chat responses
 - **Error retry** — retry button in error banner re-sends last failed message
@@ -605,20 +1253,22 @@ MVP release — native Android companion app for Hermes agent with direct API ch
 - **Auth flow** — 6-character pairing code with session token persistence
 - **Material 3 + Material You** — dynamic theming with light/dark/auto
 - **Onboarding** — multi-page pager with feature overview and connection setup
-- **Settings** — API Server + Relay Server config, theme, reasoning toggle, data export/import/reset
+- **Settings** — API Server + Server config, theme, reasoning toggle, data export/import/reset
 - **Offline detection** — banner shown when network connectivity is lost
 - **What's New dialog** — shown automatically when app version changes
 - **Splash screen** — branded splash via core-splashscreen API
 - **Network security** — cleartext restricted to localhost only
 
 #### Infrastructure
-- **Relay server** — Python aiohttp WSS server for bridge/terminal channels
+- **Server** — Python aiohttp WSS server for bridge/terminal channels
 - **CI/CD** — GitHub Actions for lint, build, test, and tag-driven releases
 - **Claude Code automation** — issue triage, PR fix, chat, and code review workflows
 - **Dependabot** — weekly Gradle + GitHub Actions dependency updates with auto-merge
 - **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/v0.1.0...HEAD
+[Unreleased]: https://github.com/Codename-11/hermes-relay/compare/android-v0.8.0...HEAD
+[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
 [0.1.0-beta]: https://github.com/Codename-11/hermes-relay/releases/tag/v0.1.0-beta

CLAUDE.md

@@ -6,7 +6,7 @@
 
 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.
 
-**Current state:** v0.4.x — Phase 0–3 complete. Direct API chat, session management, pairing + security, inbound media, voice mode, bridge/accessibility control, notification companion, and safety rails. Two product flavors: `googlePlay` (conservative) and `sideload` (full-capability).
+**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).
 
 ## Architecture
 
@@ -29,40 +29,53 @@ Chat goes directly to the API server via HTTP/SSE. The API key (Bearer token) is
 | `POST /v1/runs` | Start an agent run | Returns `run_id` |
 | `GET /v1/runs/{run_id}/events` | SSE stream of run lifecycle events | **Structured events**: `tool.started`, `tool.completed`, `message.delta`, `reasoning.available`, `run.completed`, `run.failed` |
 | `POST /v1/responses` | OpenAI Responses API format | Structured `function_call` objects (non-streaming only) |
+| `GET /v1/capabilities` | Machine-readable feature + endpoint discovery | Use before assuming optional surfaces exist |
 | `GET /v1/models` | List available models | — |
+| `GET /v1/skills` | Read-only skill list for the API-server agent | `{"object":"list","data":[...]}` |
+| `GET /v1/toolsets` | Read-only API-server toolset inventory | `{"object":"list","platform":"api_server","data":[...]}` |
+| `GET/POST/PATCH/DELETE /api/sessions/*` | Native session CRUD, messages, fork, sync chat, SSE chat | Upstream merged via NousResearch/hermes-agent PR #33134 |
 | `GET /health` | Health check | — |
-| `GET/POST/PATCH/DELETE /api/jobs/*` | Cron job management | — |
+| `GET/POST/PATCH/DELETE /api/jobs/*` | Cron job management (api_server surface) | — |
 
-**Non-standard endpoints (provided by fork OR by plugin bootstrap):**
+**Compatibility endpoints (not all native upstream API-server routes):**
 
-These endpoints are not in stock upstream `gateway/platforms/api_server.py`. There are three ways a hermes-agent install can serve them:
+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. **Codename-11 fork** (`feat/session-api` branch, deployed on the `axiom` branch) — adds them natively. Submitted upstream as PR [#8556](https://github.com/NousResearch/hermes-agent/pull/8556) *"feat(api-server): add session management API for frontend clients"* — scope is broader than the title: sessions CRUD + session chat/stream + memory + skills + config + available-models.
-2. **Bootstrap injection** (`hermes_relay_bootstrap/`) — monkey-patches aiohttp on startup via `.pth` file. Does NOT inject `/api/sessions/{id}/chat/stream` — use `/v1/runs` for chat.
-3. **Upstream-merged** (post PR #8556) — bootstrap auto-detects and no-ops.
+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.
+3. **Legacy fork branches** — useful as lineage only. Do not cite `feat/session-api` / `#8556` as the current upstream contract.
 
 | Endpoint | Purpose | Provided by |
 |----------|---------|-------------|
-| `GET /api/sessions` (CRUD) | Session list/create/rename/delete/fork | Fork OR bootstrap OR upstream-merged |
-| `GET /api/sessions/{id}/messages` | Conversation history | Fork OR bootstrap OR upstream-merged |
-| `GET /api/sessions/search` | Full-text message search | Fork OR bootstrap OR upstream-merged |
-| `POST /api/sessions/{id}/chat/stream` | Session-based SSE chat | Fork OR upstream-merged ONLY (NOT bootstrap) |
-| `GET /api/config`, `PATCH /api/config` | Personalities + model config | Fork OR bootstrap OR upstream-merged |
-| `GET /api/skills`, `/categories`, `/{name}` | Skill discovery | Fork OR bootstrap OR upstream-merged |
-| `GET/POST/PATCH/DELETE /api/memory` | Memory CRUD | Fork OR bootstrap OR upstream-merged |
-| `GET /api/available-models` | Provider model list | Fork OR bootstrap OR upstream-merged |
+| `GET /api/sessions` (CRUD) | Session list/create/rename/delete/fork | Native upstream (#33134); bootstrap only for old builds |
+| `GET /api/sessions/{id}/messages` | Conversation history | Native upstream (#33134); bootstrap only for old builds |
+| `POST /api/sessions/{id}/chat` | Synchronous session chat | Native upstream (#33134) |
+| `POST /api/sessions/{id}/chat/stream` | Session-based SSE chat | Native upstream (#33134); bootstrap does NOT inject |
+| `GET /v1/skills`, `GET /v1/toolsets` | Read-only skill/toolset discovery | Native upstream (#33016) |
+| `GET /api/sessions/search` | Full-text message search | Bootstrap/fork legacy; not in current upstream main |
+| `GET /api/config`, `PATCH /api/config` | Personalities + model config | Bootstrap/fork legacy or dashboard web-server surface; not current API-server upstream |
+| `GET /api/skills`, `/{name}` | Legacy skill discovery/detail | Bootstrap/fork legacy; prefer native `/v1/skills` for lists |
+| `PUT /api/skills/toggle` | Enable/disable installed skill | `hermes_cli/web_server.py` dashboard surface; bootstrap stub returns 501 |
+| `GET/POST/PATCH/DELETE /api/memory` | Memory CRUD | Bootstrap/fork legacy; not current API-server upstream |
+| `GET /api/available-models` | Provider model list | Bootstrap/fork legacy; not current API-server upstream |
 
-The Android client probes per-endpoint capability via `HermesApiClient.probeCapabilities()` (returns `ServerCapabilities`). When `streamingEndpoint = "auto"`, `ConnectionViewModel.resolveStreamingEndpoint()` picks `sessions` or `runs` based on the capability snapshot.
+The Android client probes per-endpoint capability via `HermesApiClient.probeCapabilities()` (returns `ServerCapabilities`). When `streamingEndpoint = "auto"`, `ConnectionViewModel.resolveStreamingEndpoint()` picks `sessions`, `completions`, or `runs` based on the capability snapshot.
+
+**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.
+
+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.**
 
 **Tool call rendering paths:**
 1. **Runs API** — Emits `tool.started`/`tool.completed` as real SSE events → `ToolProgressCard` in real-time.
-2. **Sessions API** — No structured tool events during streaming; reloads message history on stream complete ("session_end reload" pattern).
+2. **Sessions API** — Native upstream emits structured SSE (`run.started`, `message.started`, `assistant.delta`, `tool.progress`, `tool.started/completed/failed`, `assistant.completed`, `run.completed`, `done`). `run.completed.messages` can reconcile authoritative per-turn transcript.
 3. **Annotation parser** — Fallback for servers emitting inline markdown annotations (`` `💻 terminal` ``).
 
 ## Key Instructions
 - **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:** Remove `hermes_relay_bootstrap/` in one PR once PR #8556 merges. It's no-op-compatible, so leaving it in place during rollout is harmless.
+- **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.
 
 ## Repository Layout
 
@@ -79,13 +92,30 @@ hermes-android/
 │   ├── accessibility/       # HermesAccessibilityService, ScreenReader, ActionExecutor
 │   ├── bridge/              # BridgeSafetyManager, BridgeForegroundService, BridgeStatusOverlay
 │   └── notifications/       # HermesNotificationCompanion
+├── desktop/                 ← Node thin-client CLI (`@hermes-relay/cli`)
+│   ├── bin/hermes-relay.js  # #!/usr/bin/env node shim → dist/cli.js
+│   ├── src/
+│   │   ├── cli.ts           # argv parser + subcommand dispatcher (bare → shell)
+│   │   ├── commands/        # chat, shell, pair, status, tools, devices
+│   │   ├── banner.ts        # contextual connect line (LAN / Tailscale / Plain / Secure)
+│   │   ├── renderer.ts      # GatewayEvent → plain-line stdout formatter (chat only)
+│   │   ├── endpoint.ts      # ADR 24 EndpointCandidate + role helpers
+│   │   ├── pairingQr.ts     # v3 QR decode + priority-raced reachability probe
+│   │   ├── pairing.ts       # readline 6-char prompt + payload validator
+│   │   ├── credentials.ts   # token → pair-qr → code → stored → prompt precedence
+│   │   ├── certPin.ts       # TOFU SPKI sha256 extract / pinKey / compare
+│   │   ├── tools/           # desktop.command router + fs/terminal/search handlers + consent
+│   │   ├── transport/       # RelayTransport (reconnect state machine + TLS probe TOFU)
+│   │   └── lib/             # gracefulExit, rpc, circularBuffer (vendored)
+│   └── scripts/             # install.sh + install.ps1 curl/iwr one-liners
 ├── plugin/                  ← Hermes agent plugin
 │   ├── android_tool.py      # 18 android_* tool handlers
 │   ├── pair.py              # QR pairing implementation
 │   ├── relay/               # Canonical WSS relay (server.py, auth.py, channels/, media.py, voice.py)
-│   └── tools/               # android_navigate.py, android_notifications.py
+│   ├── 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 patch for vanilla upstream; removable after PR #8556
+├── hermes_relay_bootstrap/  ← Runtime compatibility patch; retire per surface as upstream replaces it
 ├── 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
@@ -108,6 +138,13 @@ hermes-android/
 - **applicationId:** `com.axiomlabs.hermesrelay` (googlePlay), `com.axiomlabs.hermesrelay.sideload` (sideload)
 - **Min SDK 26, Target SDK 35, Compile SDK 36** / **Kotlin 2.0+**, JVM toolchain 17
 
+### Code Style — Desktop CLI (Node/TypeScript)
+- **Node ≥21** — uses built-in global `WebSocket` (no `ws`/`undici` dep). Strict TS, ES modules, `NodeNext` resolution.
+- **Zero runtime deps** — `@types/node` + `tsx`/`rimraf`/`typescript` are devDeps only. Ship compiled `dist/`, not tsx.
+- **One binary, subcommands** — idiomatic for Node CLIs (codex, continue, vite pattern). Bare invocation is `chat`.
+- **Vendor-for-now** — transport/gateway/types are copied verbatim from `hermes-agent-tui-smoke/ui-tui/src/` with a header note. Extract to a shared package when the TUI and CLI stabilize.
+- **Dev loop:** `npx tsx src/cli.ts <args>` (no rebuild). `npm run build` + `npm link` before pushing to verify the bin shim. Never ship tsx in the published tarball — pre-build with `tsc` so Windows `npm install -g` can cmd-shim the JS directly.
+
 ### Code Style — Server (Python)
 - **aiohttp** — async, matches existing Hermes relay patterns
 - **Type hints everywhere** — Python 3.11+ syntax
@@ -115,15 +152,17 @@ hermes-android/
 
 ### Git
 - **Conventional Commits:** `feat`, `fix`, `docs`, `refactor`, `test`, `chore`
-- **Feature branches** as of 2026-04-13. Straight-to-main for single-file typos only.
-- **Merge style:** `git merge --no-ff` — no squash. Preserves per-commit trail for agent-team branches.
-- **Version bumps on `main` only.** Use `bash scripts/bump-version.sh <new-version>` to bump all three sources atomically (`gradle/libs.versions.toml`, `pyproject.toml`, `plugin/relay/__init__.py`).
-- **Branch protection** on `main` since 0.3.0 — PRs must pass CI; direct push blocked except `release: vX.Y.Z`.
+- **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`.
+- **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 runs on every push** — build must pass before merge
+- **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.
 
 ## Key Files
 
@@ -136,7 +175,8 @@ hermes-android/
 | **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()` |
+| `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/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 |
@@ -148,6 +188,7 @@ hermes-android/
 | `auth/SessionTokenStore.kt` | Keystore (StrongBox) + EncryptedSharedPrefs fallback; lossless migration on upgrade |
 | `auth/CertPinStore.kt` | TOFU cert pinning — SHA-256 SPKI per host:port in DataStore |
 | `auth/PairedSession.kt` | PairedSession state + PairedDeviceInfo wire model |
+| `data/Endpoint.kt` | `EndpointCandidate` / `ApiEndpoint` / `RelayEndpoint` — multi-endpoint pairing (ADR 24); `displayLabel()` for LAN/Tailscale/Public/Custom chips |
 | `network/RelayHttpClient.kt` | OkHttp for /media, /sessions (list/revoke/extend), /health |
 | **App — Bridge** | |
 | `network/handlers/BridgeCommandHandler.kt` | Routes `bridge.command` → ActionExecutor; full path inventory + safety-rail integration |
@@ -164,24 +205,32 @@ hermes-android/
 | **App — Voice** | |
 | `voice/VoiceViewModel.kt` | Voice turn state machine; TTS queue; `ignoreAssistantId`; `errorEvents: SharedFlow` |
 | `audio/VoiceRecorder.kt` | MediaRecorder wrapper; perceptual amplitude curve; `.m4a` at 16kHz/64kbps |
-| `audio/VoicePlayer.kt` | MediaPlayer + Visualizer; amplitude StateFlow; `awaitCompletion()` via coroutine |
+| `audio/VoicePlayer.kt` | Media3 ExoPlayer (gapless TTS queue) + Visualizer; amplitude StateFlow; `awaitCompletion()` via coroutine; `audioSessionId` is a thread-safe `@Volatile` cache |
 | `network/RelayVoiceClient.kt` | OkHttp for `/voice/transcribe`, `/synthesize`, `/config` |
 | `voice/VoiceBridgeIntentHandler.kt` | Interface routing voice utterances to bridge; impls per flavor via factory |
 | `voice/VoiceIntentClassifier.kt` | Regex phone-control classifier (sideload only); false-negatives preferred over false-positives |
 | `ui/components/VoiceModeOverlay.kt` | Full-screen voice UI — MorphingSphere + VoiceWaveform + mic button |
+| `ui/components/MorphingSphere.kt` | Compose renderer for the agent sphere — delegates math to `MorphingSphereCore` |
+| `ui/components/MorphingSphereCore.kt` | Platform-agnostic sphere algorithm (`kotlin.math` only) — single source of truth; mirrored byte-for-byte in `preview/web/sphere.js` |
+| `preview/web/` | Zero-dep browser harness — live `index.html` preview + `parity-check.mjs`; paired with `MorphingSphereCoreParityTest` (JVM) for struct/full checksum diffing |
+| `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 |
+| `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 |
 | **Relay — Server** | |
-| `plugin/relay/server.py` | Canonical relay — WSS + HTTP routes; bridge, media, voice, session, pairing handlers |
+| `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 |
 | `plugin/relay/channels/bridge.py` | Bridge handler — `handle_command()` mints request_id, awaits response, 30s timeout |
 | `plugin/relay/channels/notifications.py` | Bounded deque (100) of notification metadata; in-memory only |
 | `plugin/relay/media.py` | MediaRegistry — LRU token store; `strict_sandbox` off by default for `/media/by-path` |
 | `plugin/relay/voice.py` | Voice endpoints — transcribe, synthesize, voice_config; lazy tool imports |
-| `plugin/relay/qr_sign.py` | HMAC-SHA256 QR signing; secret at `~/.hermes/hermes-relay-qr-secret` |
+| `plugin/relay/qr_sign.py` | HMAC-SHA256 QR signing; secret at `~/.hermes/hermes-relay-qr-secret`; canonical form preserves `endpoints` array order + role strings verbatim (ADR 24) |
+| `plugin/relay/tailscale.py` | First-class Tailscale helper (ADR 25) — `status()` / `enable(port)` / `disable(port)` / `canonical_upstream_present()`; safe-absent via shell-out to `tailscale` CLI |
 | `plugin/relay/_env_bootstrap.py` | Loads `~/.hermes/.env` before relay imports; called from both entry points |
 | **Plugin — Tools + Installer** | |
 | `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()` |
@@ -189,7 +238,56 @@ hermes-android/
 | `plugin/pair.py` | QR payload builder + CLI; `build_payload(sign=True)`; `--register-code` fallback |
 | `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 patch for vanilla upstream; no-op on fork/upstream-merged; remove after PR #8556 |
+| `hermes_relay_bootstrap/` | Runtime compatibility patch; skips native routes per method/path; retire only after remaining config/memory/legacy skill/slash gaps are handled |
+| **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 |
+| `plugin/dashboard/src/index.jsx` | React root registering `hermes-relay` plugin with 4-tab shell |
+| `plugin/dashboard/dist/index.js` | Committed IIFE bundle loaded verbatim by dashboard |
+| **Desktop CLI** | |
+| `desktop/package.json` | `@hermes-relay/cli` package manifest — Node ≥21, one `hermes-relay` bin, pre-built dist |
+| `desktop/bin/hermes-relay.js` | Tiny shim: `import('../dist/cli.js').then(m => m.main())` + error surfacing |
+| `desktop/src/chatAttach.ts` | captureClipboardImage / captureScreenshot / readImageFile; ships base64 to server via `image.attach.bytes` RPC before next prompt.submit |
+| `desktop/src/cli.ts` | argv parser + subcommand dispatcher — bare → `shell` (PTY), positional-only → `chat` |
+| `desktop/src/commands/chat.ts` | REPL + one-shot + piped-stdin; `runOneTurn` returns `{promise, cancel}` for safe SIGINT; auto-wires `DesktopToolRouter` when consented |
+| `desktop/src/commands/shell.ts` | Pipes the `terminal` relay channel to raw-mode stdin/stdout; post-attach `exec hermes` 350ms after tmux settles; `Ctrl+A .` detach / `Ctrl+A k` kill / `Ctrl+A Ctrl+A` literal |
+| `desktop/src/commands/pair.ts` | Either 6-char code + `--remote`, or full v3 QR via `--pair-qr` — probes + picks endpoint, records role; `--grant-tools` (TTY prompt) / `--auto-grant-tools` (silent) stamp `toolsConsented` so `daemon` works without a `shell` round-trip |
+| `desktop/src/commands/tools.ts` | `tools.list` RPC → enabled/available toolsets; `--verbose` lists individual tools |
+| `desktop/src/commands/status.ts` | Local read of `~/.hermes/remote-sessions.json`; renders `grants:` + `expires:` + `route:`; `--json` redacts tokens, `--reveal-tokens` opts in |
+| `desktop/src/commands/devices.ts` | Server-side session management — `GET/DELETE/PATCH /sessions` via `fetch` over http(s)://host:port; `list` / `revoke <prefix>` / `extend <prefix> --ttl <s>` |
+| `desktop/src/banner.ts` | `buildConnectBanner({url, meta, endpointRole})` → "Connected via LAN (plain) — server 0.6.0"; `humanExpiry()` for TTL formatting |
+| `desktop/src/endpoint.ts` | `EndpointCandidate` / `EndpointRole` types + `displayLabel()` — mirrors Android `data/Endpoint.kt` |
+| `desktop/src/pairingQr.ts` | `decodePairingPayload` (JSON or base64), `payloadToCandidates` (v3 verbatim / v1–v2 synthesized), `probeCandidatesByPriority` (`Promise.any` within tier, `AbortSignal.any`, 4s timeout, 60s cache) |
+| `desktop/src/certPin.ts` | `extractSpkiSha256(der)` via `crypto.X509Certificate` + `publicKey.export({type:'spki'})`; `pinKey(url)`, `comparePins()`, `isSecureUrl()` |
+| `desktop/src/tools/router.ts` | `DesktopToolRouter.attach(relay)` — `onChannel('desktop')` dispatch under 30s `AbortController`; heartbeat enriched with host/platform/version/uptime_ms + sticky `last_error` for `desktop_health` |
+| `desktop/src/tools/handlerSet.ts` | Single source of truth for the desktop tool map — `DESKTOP_HANDLERS` + `DESKTOP_ADVERTISED_TOOLS`; consumed by `chat.ts` / `shell.ts` / `daemon.ts` so adding a tool is a one-file change |
+| `desktop/src/tools/consent.ts` | `ensureToolsConsent(url)` — stored per-URL in `toolsConsented`; TTY prompt; non-TTY fails closed |
+| `desktop/src/tools/handlers/fs.ts` | `readFileHandler` / `writeFileHandler` / `patchHandler` — strict unified-diff applier, no fuzz |
+| `desktop/src/tools/handlers/terminal.ts` | `bash -lc` / `cmd /c`, SIGKILL on timeout or abort, returns `{stdout, stderr, exit_code, duration_ms}` |
+| `desktop/src/tools/handlers/powershell.ts` | Spawns `pwsh`/`powershell` directly with `-Command -`, script piped via stdin — no cmd.exe quote-mangling; auto-picks pwsh > powershell |
+| `desktop/src/tools/handlers/process.ts` | `spawn_detached` (unref'd, returns pid+log_path), `list_processes` (tasklist /FO CSV — no /V to dodge window-title latency), `kill_process`, `find_pid_by_port` (netstat/lsof/ss) |
+| `desktop/src/tools/handlers/jobs.ts` | Job API — `~/.hermes/desktop-jobs/<id>/{stdout.log, stderr.log, meta.json}` is source of truth across daemon restarts; `taskkill /T` on Windows so build trees die fully |
+| `desktop/src/tools/handlers/transfer.ts` | `copy_directory` via `fs.cp`, `zip`/`unzip` via tar > zip > PowerShell probe, `checksum` streamed (sha256/sha1/md5) |
+| `desktop/src/tools/handlers/search.ts` | ripgrep with pure-Node fallback, skips `.git`/`node_modules`/`dist`/`.next`/`.cache` |
+| `desktop/src/renderer.ts` | Streams `message.delta` → stdout, tool events → decorated lines; NO_COLOR / --json / --quiet aware |
+| `desktop/src/pairing.ts` | readline-based 6-char prompt (`A-Z0-9`); headless mirror of TUI's Ink prompt; `validatePairingPayloadString` discriminated-union wrapper |
+| `desktop/src/credentials.ts` | Precedence: `--token` → `--pair-qr` (probe+pair) → `--code` → stored → prompt; returns `Credentials{sessionToken?, pairingCode?, resolvedEndpoint?}` |
+| `desktop/src/transport/RelayTransport.ts` | Fork of ui-tui's transport + reconnect state machine (`idle/connecting/connected/reconnecting`, exp backoff 1→30s, 5min on 429, gate re-check post-sleep) + pre-WS TLS probe for TOFU |
+| `desktop/src/remoteSessions.ts` | Same file path as TUI (`~/.hermes/remote-sessions.json`, 0600); schema widened with `grants`, `ttlExpiresAt`, `endpointRole`, `toolsConsented`; `saveSession` back-compat overload |
+| `desktop/src/commands/daemon.ts` | Headless WSS + tool router for always-on access; JSON-line logs; fails closed on missing consent unless `--allow-tools` with explicit `--token` |
+| `desktop/src/commands/doctor.ts` | Local-only diagnostic report — version / binary path / PATH / sessions / daemon detection; `--json` for support-paste; omits tokens entirely |
+| `desktop/src/relayUrlPrompt.ts` | First-run URL fallback — `resolveFirstRunUrl()` auto-picks single stored session, numbered picker for multiple, welcome banner for zero; throws on non-interactive + ambiguous |
+| `desktop/src/version.ts` | Build-time-generated constant (`npm run gen:version` before every build) — Bun compiled binaries can't read package.json via `__dirname` so version is embedded at build |
+| `desktop/scripts/install.sh` / `install.ps1` | curl/iwr one-liner installers — download prebuilt Bun binary (no Node required), SHA256-verified, API-resolver for `latest` that includes prereleases, version-aware pre/post-install readback |
+| `desktop/scripts/uninstall.sh` / `uninstall.ps1` | 3-tier removal — default (binary + PATH), `--purge` (also wipes `~/.hermes/remote-sessions.json`), `--service` (stub for future service installers); Windows iex-safe env-var fallback |
+| `desktop/README.md` | User-facing install + usage reference |
+| **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. |
+| **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 |
 
 ## What NOT to Do
 
@@ -237,9 +335,10 @@ 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. **Commit + push** — feature branch for anything >1-2 commits.
-5. **Pull + restart on server** — see Server Deployment below.
-6. **Test on phone** — Bailey builds from Studio, installs to Samsung device, pairs via `/hermes-relay-pair`.
+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.
+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`.
 
 ### Server Deployment
 
@@ -283,12 +382,14 @@ See [RELEASE.md](RELEASE.md) for the full recipe.
 
 | Surface | Endpoint | Notes |
 |---------|----------|-------|
-| Chat streaming | `POST /v1/runs` → `GET /v1/runs/{id}/events` | Structured tool events; preferred |
-| Chat (sessions) | `POST /api/sessions/{id}/chat/stream` | No live tool events; reloads history on stream complete |
+| 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` | Non-standard; bootstrap or fork |
-| Pairing (QR) | `POST /pairing/register` (loopback only) | Via `/hermes-relay-pair` or `hermes-pair` shim |
+| Session CRUD | `GET/POST/PATCH/DELETE /api/sessions` | Native upstream (#33134); bootstrap fallback only for old builds |
+| 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` |
+| Tailscale Serve (ADR 25) | `hermes-relay-tailscale enable\|disable\|status` CLI | Fronts loopback `:8767` with `tailscale serve --bg --https=<port>`; auto-retires on upstream PR #9295 |
 | Inbound media (token) | `GET /media/{token}` | Bearer auth; 24h TTL |
 | Inbound media (path) | `GET /media/by-path?path=<abs>` | Permissive by default; `RELAY_MEDIA_STRICT_SANDBOX=1` to restrict |
 | Session management | `GET /sessions`, `DELETE /sessions/{prefix}`, `PATCH /sessions/{prefix}` | List/revoke/extend; RelayHttpClient |
@@ -297,7 +398,14 @@ See [RELEASE.md](RELEASE.md) for the full recipe.
 | Voice config | `GET /voice/config` | Returns current tts/stt provider info |
 | Notifications | `GET /notifications/recent?limit=N` | Loopback callers skip bearer |
 | Relay health | `GET /health` on `:8767` | Used by `RelayHttpClient.probeHealth()` |
-| Capabilities | `HEAD /api/sessions`, `HEAD /v1/runs`, etc. | HEAD avoids CORS 403 on OPTIONS preflight |
+| Capabilities | `GET /v1/capabilities` plus targeted `HEAD` probes | Prefer capabilities when present; HEAD probes keep mixed-version fallback working |
+| Desktop CLI (tui channel) | WSS `tui.attach` / `tui.rpc.request` / `tui.rpc.event` | Same channel + envelopes as the Ink TUI — the CLI just renders events as plain lines. Zero server changes. |
+| Desktop CLI (terminal channel) | WSS `terminal.attach` / `terminal.input` / `terminal.output` / `terminal.resize` / `terminal.detached` | Existing channel (shared with Android). CLI `shell` subcommand attaches, injects `clear; exec hermes\n` 350ms after ack, pipes raw bytes. `Ctrl+A .` detaches (tmux preserved), `Ctrl+A k` kills. |
+| Desktop CLI tool visibility | `tools.list` RPC on the shared tui channel | Returns `{toolsets: [{name, description, tool_count, enabled, tools:[]}]}`; surfaced by `hermes-relay tools` |
+| Desktop CLI devices | HTTP `GET/DELETE/PATCH /sessions` on the relay's same port | Wrapped by `hermes-relay devices list | revoke <prefix> | extend <prefix> --ttl <s>`; bearer token from stored session; token prefix only (never full token) |
+| Desktop tool routing (Phase B) | WSS `desktop.command` (s→c) + `desktop.response` (c→s) + `desktop.status` (c→s heartbeat) | New channel. Hermes calls `desktop_read_file(path)` → Python handler POSTs to `/desktop/desktop_read_file` → relay forwards over `desktop.command` → Node client's `DesktopToolRouter` runs the handler locally → response bubbles back. Mirror of Android's `bridge.command` pattern. |
+| Desktop tool check_fn | HTTP `GET /desktop/_ping?tool=<name>` | Returns 200 if a client is connected AND advertises this tool; 503 otherwise. Hermes uses this to fail the tool quickly when no desktop client is live, instead of waiting 30s for the dispatch timeout. |
+| Desktop health | HTTP `GET /desktop/health` | Returns full status snapshot — connected/host/platform/version/pid/uptime/advertised_tools/last_error/recent_commands. Loopback-only. Backs the `desktop_health` agent tool, which intentionally does NOT round-trip through the client so it remains callable when other tools are wedged. |
 
 ## Upstream References
 

CONTRIBUTING.md

@@ -92,16 +92,16 @@ After the plugin is in place, restart hermes and verify pairing with `hermes-pai
 
 We follow [Conventional Commits](https://www.conventionalcommits.org/): `feat:`, `fix:`, `docs:`, `refactor:`, `test:`, `chore:`.
 
-Feature branches are the house style — `feature/<name>`, `fix/<name>`, `docs/<name>`, `chore/<name>` — merged into `main` via `--no-ff` merge commits so the per-branch history stays visible in `git log --graph`. Straight-to-`main` is reserved for single-file typo fixes.
+**Branching model (as of 2026-04-19): `main` + `dev`.** Feature branches — `feature/<name>`, `fix/<name>`, `docs/<name>`, `chore/<name>` — branch off `dev` and merge back into `dev` via `--no-ff` PRs. `main` is released state only; it receives release merges from `dev` and nothing else. There is no straight-to-main exemption — even single-file typos go through `dev`.
 
-Release-prep commits (version bump + tag) are allowed to push directly to `main` via a branch-protection carve-out — see [RELEASE.md](RELEASE.md) for the full release process.
+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.
 
 ## Testing
 
 - **Android unit tests:** `scripts/dev.bat test` (runs JUnit + MockK + Compose testing)
 - **Python tests:** `python -m unittest plugin.tests.test_<name>` from the repo root with the hermes-agent venv active. `pytest` works too but the pre-existing `conftest.py` imports a module that isn't always installed — `unittest` avoids that entirely.
 
-CI (`.github/workflows/ci.yml`) runs lint, Android build, Android unit tests, and a Python relay syntax check on every push.
+CI is split into path-filtered workflows: `.github/workflows/ci-android.yml` (lint + build + test on app/Gradle changes), `.github/workflows/ci-server.yml` (syntax check + focused server tests on plugin/Python changes), and `.github/workflows/ci-desktop.yml` (desktop type/build/smoke checks). They run on pushes to `main` and `dev` and on PRs targeting either when their paths are touched.
 
 ## Questions?
 

README.md

@@ -5,14 +5,16 @@
 <h1 align="center">Hermes-Relay</h1>
 
 <p align="center">
-  Native Android client for the Hermes agent platform.<br>
-  Chat, control, and connect — one app for your AI agent.
+  <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.
 </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/Platform-Android-green.svg" alt="Android"></a>
-  <a href="https://github.com/Codename-11/hermes-relay/actions/workflows/ci.yml"><img src="https://github.com/Codename-11/hermes-relay/actions/workflows/ci.yml/badge.svg" alt="CI"></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://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>
 </p>
 
@@ -29,125 +31,182 @@
 
 ---
 
-## Quick Start
+## Two surfaces, one pair
 
-Two steps: install the Android app on your phone, then install the plugin on your Hermes server.
+| 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 |
 
-### 1. Install the Android app
+Both share the same WSS relay and credentials store. **Pair once from either, both work.**
 
-<!-- TODO: Uncomment when Play Store listing is live
-<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="80"></a>
--->
+---
+
+## 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**.
+
+### 1. Install the app
 
 - **Google Play** — coming soon (currently on Internal testing)
-- **APK** — download from [GitHub Releases](https://github.com/Codename-11/hermes-relay/releases/latest)
+- **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).
 
-#### Sideload APK (GitHub Releases)
+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.
 
-Prefer not to wait for Google Play? Grab the signed APK directly:
+### 2. Have Hermes running
 
-1. Download the file ending in **`-sideload-release.apk`** from [the latest release](https://github.com/Codename-11/hermes-relay/releases/latest) — that's the full-featured "Hermes Dev" build. (Skip any `.aab` file — those are the Google Play bundle format and won't install directly.)
-2. On your phone: **Settings → Apps → Special app access → Install unknown apps** and allow your browser (first time only).
-3. Open the APK from your downloads and tap **Install**.
-4. Optionally verify integrity against `SHA256SUMS.txt` from the same release (`sha256sum` on macOS/Linux, `Get-FileHash -Algorithm SHA256` on Windows).
+Run upstream Hermes with its API server and dashboard enabled:
 
-Full walkthrough, including signing-certificate fingerprint: [Sideload guide](https://codename-11.github.io/hermes-relay/guide/getting-started.html#sideload-apk).
+```bash
+hermes setup --portal
 
-### 2. Install the server plugin (one-liner)
+mkdir -p ~/.hermes
+API_SERVER_KEY="$(openssl rand -hex 32)"
+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
 
-On the machine running your Hermes agent:
+echo "Android API URL: http://<this-computer-ip>:8642"
+echo "Android API 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).
+
+### 3. Connect and talk
+
+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:
+
+| 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.
+
+**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
+
+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 relay start --no-ssl
+hermes pair
 ```
 
-The installer clones Hermes-Relay to `~/.hermes/hermes-relay/` (override with `$HERMES_RELAY_HOME`), `pip install -e`s the package into the hermes-agent venv, registers the `skills/` directory in your `~/.hermes/config.yaml` under `skills.external_dirs` (so updates flow through `git pull`), symlinks the plugin into `~/.hermes/plugins/hermes-relay`, drops a thin `hermes-pair` shim into `~/.local/bin/`, and (optionally) installs a systemd user service for the WSS relay. After restart, pair your phone via either of these equivalent entry points:
+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.)
 
-- **From any Hermes chat surface** (CLI, Discord, Telegram, etc.): type `/hermes-relay-pair` and the `hermes-relay-pair` skill renders the QR inline. Shortest path if you're already chatting with the agent.
-- **From a shell**: `hermes-pair` (dashed) — a thin wrapper around `python -m plugin.pair` in the hermes-agent venv. Use this in scripts or when you want the raw output.
-- **No camera?** `hermes-pair --register-code ABCD12` — manual fallback for SSH-only / camera-less setups. Read the 6-char code from the app's **Settings → Connection → Manual pairing code (fallback)** card, pre-register it on the host with this command, then tap **Connect** in the app. Composes with `--ttl` / `--grants`.
+- **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.
 
-Scan the QR from the Android app's onboarding screen and you're connected. One scan configures **both** the direct-chat API server **and** the WSS relay (for terminal/bridge) — if a local relay is running at `localhost:8767`, the pair command pre-registers a fresh 6-char pairing code with it and embeds the relay URL + code in the same QR. If you only want direct chat, pass `--no-relay` (or just don't start the relay). Plain-text connection details are always printed alongside the QR so you can copy values by hand if your terminal can't render QR blocks.
+Full server setup, TLS, and systemd details: [docs/relay-server.md](docs/relay-server.md).
 
-**Updating:** `hermes-relay-update` (shortest path — installed as part of the one-liner) or re-run the same `curl … | bash` from above. Both are equivalent and fully idempotent: pulls latest main, refreshes the editable install, recreates all three shims, restarts `hermes-relay`, and prompts before restarting `hermes-gateway`. Set `HERMES_RELAY_RESTART_GATEWAY=1` to opt into the gateway restart non-interactively. For routine plugin/skill updates without restarting anything, a plain `cd ~/.hermes/hermes-relay && git pull` is enough — the editable install picks up the new code on next process start.
+**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.
 
-**Uninstalling:** `bash ~/.hermes/hermes-relay/uninstall.sh` reverses every install step in the opposite order. Idempotent, never touches state shared with other Hermes tools (`.env`, sessions DB, hermes-agent venv core). Flags: `--dry-run`, `--keep-clone`, `--remove-secret`. Or pull the script via curl if you've already removed the clone.
+## Desktop CLI (alpha)
 
-**Requirements:** Android 8.0+ (SDK 26), [hermes-agent](https://github.com/NousResearch/hermes-agent) v0.8.0+, Python 3.11+.
+> **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.
 
-### For AI Agents
+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.
 
-If you have an AI assistant (Claude, GPT, etc.) and want it to install or maintain Hermes-Relay for you, paste the block below into the chat. The agent will fetch the canonical setup recipe from this repo and walk you through it — verification, pairing, troubleshooting included.
+**Install** (Windows PowerShell / macOS / Linux):
+
+```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)
+- **AI-agent setup recipe:** `/hermes-relay-desktop-setup`
+
+## Features
+
+### Android
+
+- **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
+
+> 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).
+
+### Desktop CLI
+
+- **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
+
+## Install with an AI agent
+
+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:
 
 ```text
-You are helping me install and maintain Hermes-Relay (https://github.com/Codename-11/hermes-relay), a native Android client + 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 desktop 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
 
 Then guide me through:
 - Verifying hermes-agent is already installed (it's a prerequisite — Hermes-Relay is a plugin, not standalone)
-- Running the install one-liner: `curl -fsSL https://raw.githubusercontent.com/Codename-11/hermes-relay/main/install.sh | bash`
-- Pairing my phone via `hermes-pair` or `/hermes-relay-pair`
-- Verifying with `hermes-status`
+- 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)
 
 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 have Hermes-Relay installed? The same recipe is auto-loaded as a Hermes skill — invoke it from any chat with `/hermes-relay-self-setup` for re-setup, troubleshooting, or "is everything wired correctly?" checks. Single source, two delivery modes (raw URL pre-install + Hermes skill post-install), no drift.
-
-## What It Does
-
-Talk to your Hermes agent from anywhere. Direct API streaming, session history, tool visualization — all native on Android.
-
-| Channel | What | Status |
-|---------|------|--------|
-| **Chat** | Stream conversations to Hermes via HTTP/SSE | Available |
-| **Voice** | Real-time voice conversation via relay TTS/STT | Available |
-| **Bridge** | Agent reads the screen and performs UI actions (tap, long-press, drag, type, clipboard, media, macros, events) | Available |
-| **Terminal** | Secure remote shell via tmux | Phase 2 |
-
-## Features
-
-- **Streaming chat** — Direct SSE to the Hermes API Server with real-time markdown rendering, session history, tool-call visualization, personality picker, searchable command palette (29+ gateway commands), file attachments, and send-while-streaming message queuing
-- **Voice mode** — Real-time voice conversation via the relay; the sphere listens with you and performs the agent's reply as it speaks. Uses your server's configured TTS/STT providers (Edge TTS, ElevenLabs, OpenAI, MiniMax, Mistral, NeuTTS / faster-whisper, Groq, OpenAI Whisper)
-- **Phone control (bridge)** — The agent can read what's on screen and act on it — tap, long-press, drag, swipe, scroll, type, and press system keys — plus take screenshots, read/write the clipboard, and control system-wide media playback. Gesture reliability is hardened for dim/idle screens, and a smarter tap-fallback cascade handles apps where labels sit inside non-clickable wrappers
-- **Screen understanding** — Filtered accessibility-tree search, per-node property lookups with stable IDs, cheap screen-hash change detection, and multi-window reads (system overlays, popups, notification shade) so the agent can reason about UI without guessing
-- **Workflow automation** — Batched macro execution for multi-step flows, real-time accessibility event streaming for "wait until something happens" waits, and a raw-Intent escape hatch for apps that expose deep-link actions
-- **Notification companion** — Opt-in notification access so the agent can triage, summarize, and route incoming notifications
-- **Bridge safety rails** — Per-app blocklist (banking, payments, 2FA default-blocked), destructive-verb confirmation modal (send, pay, delete, transfer…), idle auto-disable timer, optional persistent-status overlay, full activity log
-- **Security & pairing** — QR-code pairing, Android Keystore session storage (StrongBox-preferred), TOFU cert pinning, per-channel time-bound grants, user-chosen session TTL
-- **Analytics** — Stats for Nerds with TTFT, token usage, stream health, and peak-time charts
-
-> 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) for the full sideload capability matrix.
-
-## Getting Started
-
-1. **Install the app** from the link above
-2. **Enter your Hermes server URL** (e.g. `http://192.168.1.100:8642`) during onboarding
-3. **Start chatting** — the app connects directly to the Hermes API Server
-
-For detailed setup, server configuration, and feature guides, see the **[full documentation](https://codename-11.github.io/hermes-relay/)**.
+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 (WSS)      --> Relay Server (:8767)         [terminal, bridge — future]
+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 — same pattern used by Open WebUI and other Hermes frontends. The relay server is a separate lightweight Python service for terminal and bridge channels (coming in Phase 2/3).
+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/)** | **Getting started, features, configuration — start here** |
-| [Architecture](https://codename-11.github.io/hermes-relay/architecture/) | How the app works under the hood |
-| [API Reference](https://codename-11.github.io/hermes-relay/reference/api.html) | Hermes API endpoints used by the app |
+| **[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 |
-| [Changelog](CHANGELOG.md) | Release history |
+| [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*`) |
 
 ---
 
@@ -168,7 +227,7 @@ 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 relay server (dev, no TLS)
+scripts/dev.bat relay      # Start Server (dev, no TLS)
 ```
 
 ### Repository Structure
@@ -176,15 +235,21 @@ scripts/dev.bat relay      # Start relay server (dev, no TLS)
 ```
 hermes-relay/
 ├── app/                       # Android app (Kotlin + Jetpack Compose)
-├── relay_server/              # WSS relay server (Python + aiohttp)
-├── plugin/                    # Hermes agent plugin (18 android_* tools + pair module)
+├── 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
-├── user-docs/                 # VitePress documentation site
+│       ├── 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
+├── .github/workflows/         # CI + release pipelines (ci-android / ci-server / ci-desktop)
 └── gradle/                    # Wrapper (8.13) + version catalog
 ```
 
@@ -193,13 +258,14 @@ hermes-relay/
 | Component | Stack |
 |-----------|-------|
 | **Android App** | Kotlin 2.0, Jetpack Compose, Material 3, OkHttp |
-| **Relay Server** | Python 3.11+, aiohttp |
-| **Serialization** | kotlinx.serialization |
-| **Build** | AGP 9, Gradle 8.13, JVM toolchain 17 |
-| **CI/CD** | GitHub Actions (lint, build, test, APK artifact) |
+| **Desktop CLI** | TypeScript, Bun-compiled native binary, Node ≥21 (source/dev), zero runtime deps |
+| **Server** | 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 |
 
-### Relay Server (optional — terminal/bridge only)
+### Server (optional — bridge, terminal, TUI, media, and relay voice routes)
 
 ```bash
 hermes relay start --no-ssl          # if you installed the plugin
@@ -217,7 +283,7 @@ See [docs/relay-server.md](docs/relay-server.md) for TLS, systemd, and full setu
 
 ### Hermes Plugin (for contributors)
 
-End users should install via the [one-liner](#2-install-the-server-plugin-one-liner) at the top. For local development from a clone:
+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
@@ -225,7 +291,7 @@ cp -r plugin ~/.hermes/plugins/hermes-relay
 ln -s "$PWD/plugin" ~/.hermes/plugins/hermes-relay
 ```
 
-Then restart hermes and run `hermes-pair` (dashed shell shim) or type `/hermes-relay-pair` in any Hermes chat surface to verify pairing. The 14 `android_*` tools register regardless of hermes-agent version. **Note:** a top-level `hermes pair` CLI sub-command is *not* currently exposed — hermes-agent v0.8.0's top-level argparser doesn't yet forward to third-party plugins' `register_cli_command()` dict. Use the slash command or the dashed shim instead.
+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.
 
 ## Hermes Agent
 
@@ -233,7 +299,7 @@ Hermes-Relay is built for [Hermes Agent](https://github.com/NousResearch/hermes-
 
 ## 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" 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" / "the alpha.14 Windows binary segfaults on my Surface" is genuinely useful.
 
 ## Star History
 

RELEASE.md

@@ -3,7 +3,7 @@
 > The full recipe for cutting a new release. Read this end-to-end before
 > tagging your first release.
 
-## Versioning
+## Release Tracks And Versioning
 
 Hermes-Relay follows [SemVer](https://semver.org/): `MAJOR.MINOR.PATCH`,
 with optional prerelease identifiers.
@@ -13,6 +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:
+
+| 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` |
+
+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.
+
+### Android app versioning
+
 **Source of truth:** `gradle/libs.versions.toml`
 
 ```toml
@@ -44,36 +61,68 @@ Never decrement `appVersionCode` — Play Console rejects any upload whose
 code is lower than or equal to a previous upload on the same track. Confirm
 current values with `scripts\dev.bat version`.
 
-### The three version sources (MUST stay in lockstep)
-
-There are **three** places the version lives, and they MUST all match on
-every release commit. Drift is silent and painful — we chased a "why does
-/health say 0.2.0" bug for hours on 2026-04-12 because `pyproject.toml`
-had drifted to `0.5.0` speculatively and `plugin/relay/__init__.py` was
-still at a stale `0.2.0`.
-
-| File | Line | Written by |
-|---|---|---|
-| `gradle/libs.versions.toml` | `appVersionName = "…"` | You (canonical) |
-| `pyproject.toml` | `version = "…"` | You (Python package) |
-| `plugin/relay/__init__.py` | `__version__ = "…"` | You (runtime, reported by `/health`) |
-
-**Always bump them atomically via `scripts/bump-version.sh`**:
+Always bump Android releases via:
 
 ```bash
-bash scripts/bump-version.sh 0.3.0
+bash scripts/bump-android-version.sh 0.6.2
 ```
 
-The script validates SemVer, bumps `appVersionCode` monotonically, rewrites
-all three files, runs a post-bump sanity grep, prints the diff, and tells
-you the next steps. It deliberately does NOT commit, tag, or touch
-`CHANGELOG.md` / `RELEASE_NOTES.md` — those need human prose.
+`scripts/bump-version.sh` remains as a backward-compatible alias for the
+Android script.
+
+### Server / Python package versioning
+
+Server version metadata lives in these server-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/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:
+
+```bash
+bash scripts/bump-server-version.sh 0.6.2
+```
+
+Check the current metadata with:
+
+```bash
+python scripts/check-server-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.
 
 ## Branching policy
 
-Hermes-Relay uses **feature branches + no-ff merges**, with version bumps
-gated to release-prep commits on `main`. `main` is always "last release +
-unreleased features," never mid-refactor.
+> **Updated 2026-04-19:** moved from `main`-only to `main + dev`. See
+> `docs/decisions.md` §23 for the rationale.
+
+Hermes-Relay uses **`main` + `dev` with feature branches and no-ff
+merges**. `main` is **released state only** — every commit on `main`
+corresponds to a shipped version or a release-merge of `dev`. Day-to-day
+integration happens on `dev`.
+
+**Merging is decoupled from releasing.** Feature branches land on `dev`
+continuously as they go green in CI — there is no "one feature per
+release" rule. The `[Unreleased]` section of `CHANGELOG.md` on `dev` is
+the accumulator: every merged PR appends bullets there. A release is a
+separate act, taken when the accumulated state on `dev` is worth shipping
+(see "When to cut a release" below). Cutting a release means opening a
+surface-specific release PR from `dev` into `main`, merging it `--no-ff`,
+then tagging `main`.
+
+**Server tracks `dev` for staging.** The hermes-host deployment pulls
+`dev` so merged features get exercised against real data before they
+reach a tag. Users (Play Store, sideload, `hermes-relay-update`) only
+see state that lives on `main` and on release tags.
 
 ### Branch names
 
@@ -84,14 +133,17 @@ unreleased features," never mid-refactor.
 | `docs/<name>` | Docs-only changes larger than a typo | `docs/sideload-guide` |
 | `chore/<name>` | Cleanup / refactor / tooling | `chore/sync-version-sources` |
 
-Straight-to-main is still OK for **single-file typo fixes** and **tiny
-one-liner tweaks**. Judgment call — if in doubt, branch.
+All of the above branch off `dev` and merge back to `dev`. There is no
+straight-to-main exemption — even single-file typos go through a feature
+branch and PR into `dev`.
 
 ### Merge style: `--no-ff`
 
 Always merge with `git merge --no-ff <branch>` (or the "Create a merge
-commit" option in the GitHub PR UI). This preserves the branch context
-as a visible merge commit in `git log --graph`, which is valuable when:
+commit" option in the GitHub PR UI). This applies at every level —
+feature → `dev`, and `dev` → `main` for release merges. `--no-ff`
+preserves the branch context as a visible merge commit in
+`git log --graph`, which is valuable when:
 
 - An agent team pushed several commits to a branch — the per-commit trail
   is useful for "which agent did what"
@@ -101,31 +153,32 @@ as a visible merge commit in `git log --graph`, which is valuable when:
 
 Squash merges lose that detail and are **not** the house style.
 
-### Version bumps happen at release-prep, NOT on feature branches
+### Version bumps happen at release-prep on `dev`, NOT on feature branches
 
 Feature branches **never** touch `gradle/libs.versions.toml`,
-`pyproject.toml`, or `plugin/relay/__init__.py`. If two feature branches
-both bumped the version, they'd collide on `appVersionCode` (which must
-be monotonic) and you'd hit a merge conflict for no good reason.
+server-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).
 
-The version-bump commit lives on `main`, created via
-`scripts/bump-version.sh`, immediately before `git tag`. It's a dedicated
-commit with the message `release: vX.Y.Z` that also lands the CHANGELOG
-and RELEASE_NOTES updates.
+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` →
+`main` with `--no-ff`, and the matching tag is cut from the resulting
+`main` tip.
 
-### Branch protection on `main`
+### Branch protection
 
-Light branch protection is enabled on `main` to enforce the above:
+Light branch protection is enabled:
 
-- Direct pushes blocked (must go through PR)
-- PR must pass CI (build + unit tests) before merge
-- Force push and branch deletion blocked
-- Signed commits + review approval NOT required (solo-dev overhead)
-
-Release-prep commits (`release: vX.Y.Z`) are an exception — they're the
-one time direct push is allowed via a short-lived bypass, because they
-include the version bump + tag push in one transaction. Everything else
-goes through a PR.
+- **`main`** — direct pushes blocked; only release PRs from `dev` merge
+  here. PR must pass CI (Android + Server) 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
+  blocked.
+- Signed commits + review approval NOT required (solo-dev overhead).
 
 ## One-time Setup
 
@@ -156,10 +209,12 @@ hermes.key.password=YOUR_KEY_PASSWORD
 ```
 
 `local.properties`, `*.keystore`, and `*.jks` are already gitignored.
+Relative `hermes.keystore.path` values resolve from the repo root, so
+`release.keystore` works when the keystore lives beside this file.
 
 > If the keystore at `hermes.keystore.path` is missing, `app/build.gradle.kts`
 > silently falls back to debug signing. The build succeeds but Play Console
-> rejects the AAB — always verify with `keytool -list -printcert` (step 3
+> rejects the AAB — always verify with `keytool -printcert` (step 3
 > below).
 
 #### CI builds
@@ -240,23 +295,48 @@ to Play Console. Manual UI uploads work without this.
 ### 4. GitHub Actions secrets
 
 In the repo: **Settings > Secrets and variables > Actions > New repository
-secret.** Add all four (see the table in "Required GitHub Secrets" below).
+secret.** Add all four (see the table in "Required Android Release Secrets"
+below).
 
 If `HERMES_KEYSTORE_BASE64` is missing, CI release builds fall back to
 debug signing and print a warning in the workflow summary — those
 artifacts will not be accepted by Play Console.
 
+## When to cut a release
+
+Cut a release when **any of the following** is true:
+
+- The `[Unreleased]` section of `CHANGELOG.md` has enough user-facing
+  change that a version number is worth attaching.
+- A user-facing bug is fixed and you want affected users to pick it up
+  via `hermes-relay-update` or a Play Store auto-update.
+- A regulatory / policy deadline applies (new Play Console target SDK,
+  etc).
+- You've been sitting on unreleased work for more than a couple of
+  weeks and the delta-from-last-release is growing faster than it
+  should.
+
+**Don't** cut a release just because a feature landed. If one feature
+isn't enough to justify a version bump, wait — merge the next one, let
+it sit alongside in `[Unreleased]`, and ship them together. A release
+is a statement to users that "this is a thing worth updating to," so
+the threshold is intent-driven, not event-driven.
+
+If you want to dogfood accumulated `main` state without declaring GA,
+tag a **pre-release** (`android-vX.Y.Z-rc.N`). Users can opt in via
+`hermes-relay-update --branch rc/vX.Y.Z-rc.N` without being auto-pushed
+the unstable build.
+
 ## Release Process
 
-### 1. Bump the version (atomic across all three sources)
+### 1. Bump the Android app version
 
-Use `scripts/bump-version.sh` — it rewrites `libs.versions.toml`,
-`pyproject.toml`, AND `plugin/relay/__init__.py::__version__` in lockstep,
-increments `appVersionCode` monotonically, and runs a sanity check. Don't
-edit the files by hand; drift is silent and painful.
+Use `scripts/bump-android-version.sh`. It rewrites
+`gradle/libs.versions.toml`, increments `appVersionCode` monotonically,
+and runs a sanity check. Don't edit the Android version files by hand.
 
 ```bash
-bash scripts/bump-version.sh 0.3.0
+bash scripts/bump-android-version.sh 0.6.2
 ```
 
 Confirm the bump:
@@ -265,20 +345,29 @@ Confirm the bump:
 scripts\dev.bat version
 ```
 
-The script's diff output should show exactly three files changed and all
-three carrying the new version string.
+The script's diff output should show `gradle/libs.versions.toml` carrying
+the new app version and a higher `appVersionCode`.
 
 ### 2. Update release notes and changelog
 
+- `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:
+  1. Change the `## [Unreleased]` header to `## [X.Y.Z] - YYYY-MM-DD`.
+  2. Insert a fresh empty `## [Unreleased]` header above it so the
+     next PR has a landing spot.
+  3. Skim the new versioned block and tighten / reorder if needed —
+     Keep-a-Changelog grouping (`Added` / `Changed` / `Fixed`) should
+     already be in place from the accumulator phase.
 - `RELEASE_NOTES.md` — body of the GitHub Release for this version
-  (rewritten each release; the workflow uses this as-is). Keep the
+  (rewritten each release; the workflow uses this as-is). This is the
+  operator-facing summary, not the CHANGELOG mirror. Keep the
   **Download** section near the top — it should spell out which file
   to grab by its `-sideload-release.apk` / `-googlePlay-release.aab`
   suffix (every artifact is version-tagged as
   `hermes-relay-<version>-<flavor>-<buildType>` via `archivesName`
   in `app/build.gradle.kts`) and link to the sideload guide.
   The v0.3.0 body is a good template.
-- `CHANGELOG.md` — cumulative history; append a new section.
 - `app/src/main/assets/whats_new.txt` — in-app "What's New" content
   shown in the settings/about screen. Update with the version number
   and a brief feature summary. Gets stale silently if forgotten
@@ -291,7 +380,7 @@ three carrying the new version string.
 
 ```bat
 scripts\dev.bat bundle
-keytool -list -printcert -jarfile app\build\outputs\bundle\googlePlayRelease\hermes-relay-*-googlePlay-release.aab
+keytool -printcert -jarfile app\build\outputs\bundle\googlePlayRelease\hermes-relay-*-googlePlay-release.aab
 ```
 
 The `keytool` output must show your release certificate (the CN/OU/O
@@ -308,31 +397,65 @@ prefixed `hermes-relay-<version>-` via `archivesName` in
 Optional device smoke test: `scripts\dev.bat release` then
 `adb install -r app\build\outputs\apk\sideload\release\hermes-relay-*-sideload-release.apk`.
 
-### 4. Commit and tag
+### 4. Commit on `dev`, merge to `main`, tag from `main`
 
-The release-prep commit is one of the few allowed direct-to-main pushes
-(see Branching Policy above — branch protection exempts the
-`release: vX.Y.Z` pattern because tagging + bumping must be atomic):
+The release-prep commit lands on `dev` first. Then a release PR merges
+`dev` → `main` with `--no-ff`, and the `android-v<version>` tag is cut from the
+resulting merge commit on `main`:
 
 ```bash
-git add gradle/libs.versions.toml pyproject.toml plugin/relay/__init__.py \
-        RELEASE_NOTES.md CHANGELOG.md \
-        app/src/main/assets/whats_new.txt docs/play-store-listing.md
-git commit -m "release: v0.3.0"
-git push origin main
+# From a clean dev checkout:
+git checkout dev
+git pull --ff-only origin dev
 
-git tag v0.3.0
-git push origin v0.3.0
+git add gradle/libs.versions.toml RELEASE_NOTES.md CHANGELOG.md \
+        app/src/main/assets/whats_new.txt docs/play-store-listing.md
+git commit -m "release(android): android-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 android-v0.6.2
+git push origin android-v0.6.2
 ```
 
-Pushing a tag matching `v*` triggers `.github/workflows/release.yml`,
+Pushing a tag matching `android-v*` triggers `.github/workflows/release-android.yml`,
 which builds, signs, checksums, and creates a GitHub Release. Watch the
 run under the **Actions** tab.
 
-> **Why all three files in the commit?** See "The three version sources"
-> above — `bump-version.sh` rewrites them atomically, so they must be
-> staged + committed atomically too. Missing one creates the same drift
-> the script was built to prevent.
+Server/Python version files are intentionally not part of an Android app
+release unless the server package itself is also being released.
+
+### Server / 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.
+
+```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"
+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
+```
+
+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.
 
 ### 5. Upload to Play Console
 
@@ -388,9 +511,9 @@ Promote via the Play Console UI or `gradlew promoteReleaseArtifact`.
   `RELEASE_NOTES.md` this will already be baked in. If for some reason
   it's missing, edit the body with:
   ```bash
-  gh release view vX.Y.Z --repo Codename-11/hermes-relay --json body --jq .body > /tmp/body.md
+  gh release view android-vX.Y.Z --repo Codename-11/hermes-relay --json body --jq .body > /tmp/body.md
   # edit /tmp/body.md to add/fix the Download section
-  gh release edit vX.Y.Z --repo Codename-11/hermes-relay --notes-file /tmp/body.md
+  gh release edit android-vX.Y.Z --repo Codename-11/hermes-relay --notes-file /tmp/body.md
   ```
   (This step was only needed as a retrofit for v0.1.0 — v0.1.1+ inherit
   the Download section automatically from `RELEASE_NOTES.md`.)
@@ -399,23 +522,47 @@ Promote via the Play Console UI or `gradlew promoteReleaseArtifact`.
 
 ## CI Behavior
 
-On every push of a tag matching `v*`, `.github/workflows/release.yml`:
+Android, Server, 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.
+
+On every push of a tag matching `android-v*`, `.github/workflows/release-android.yml`:
 
 1. Validates the tag matches `appVersionName` in
    `gradle/libs.versions.toml` (mismatches fail the workflow).
-2. Runs `./gradlew assembleDebug` and `./gradlew test`.
+2. Runs the Android debug build and the stable sideload pairing/connection
+   regression slice with explicit timeouts.
 3. Decodes `HERMES_KEYSTORE_BASE64` into `$RUNNER_TEMP/release.keystore`
    and exports `HERMES_KEYSTORE_PATH` (skipped if the secret is unset).
-4. Builds both artifacts: `./gradlew bundleRelease assembleRelease`.
+4. Builds both Android release artifacts:
+   `./gradlew bundleRelease assembleRelease`.
 5. Generates `SHA256SUMS.txt` covering both.
-6. Creates a GitHub Release named `v<version>` with `RELEASE_NOTES.md` as
+6. Creates a GitHub Release named `Hermes-Relay-Android v<version>` with `RELEASE_NOTES.md` as
    the body. Attaches the APK, AAB, and `SHA256SUMS.txt`. Tags any version
-   containing a dash (e.g. `v0.2.0-beta.1`) as a prerelease automatically.
+   containing a dash (e.g. `android-v0.2.0-beta.1`) as a prerelease automatically.
 7. Prints a `$GITHUB_STEP_SUMMARY` showing whether release signing
    succeeded. If `HERMES_KEYSTORE_BASE64` is missing, the summary warns
    that the artifacts are debug-signed and unsuitable for Play Store.
 
-## Required GitHub Secrets
+On every push of a tag matching `server-v*`,
+`.github/workflows/release-server.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.
+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,
+   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
+`.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.
+
+## Required Android Release Secrets
 
 | Secret                      | Purpose                             | How to populate                                  |
 |-----------------------------|-------------------------------------|--------------------------------------------------|
@@ -427,26 +574,41 @@ On every push of a tag matching `v*`, `.github/workflows/release.yml`:
 ## Hotfix Recipe
 
 When production has a bug and you need to ship a fix without picking up
-unrelated `main` changes:
+unreleased work from `dev`, branch from the affected release tag and only
+bump the version source for the surface you are shipping.
 
-1. `git checkout -b fix/short-name v0.1.0` — branch from the released tag.
+For an Android app hotfix:
+
+1. `git checkout -b fix/short-name android-v0.6.1` — branch from the released
+   Android tag (not from `main` or `dev`).
 2. Apply the fix, add a test, commit.
-3. Bump `appVersionName` and `appVersionCode` in
+3. Run `bash scripts/bump-android-version.sh 0.6.2` to update
    `gradle/libs.versions.toml`.
-4. Update `RELEASE_NOTES.md` and `CHANGELOG.md`.
-5. `git tag v0.1.1 && git push origin v0.1.1` — CI builds and publishes.
-6. Upload to Play Console as normal.
-7. Merge the hotfix branch back into `main` so the fix isn't lost.
+4. Update `RELEASE_NOTES.md`, `CHANGELOG.md`, in-app What's New, and Play
+   listing notes as needed.
+5. Open a PR from `fix/short-name` into `main`, merge with `--no-ff`.
+6. `git tag android-v0.6.2` from the new `main` tip and `git push origin android-v0.6.2`
+   so Android release CI builds and publishes.
+7. Upload to Play Console as normal.
+8. Merge `main` back into `dev` (`git checkout dev && git merge --no-ff main`)
+   so `dev` picks up the hotfix and the versionCode bump. Without this,
+   `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
+`gradle/libs.versions.toml` unless an Android app release is also shipping.
 
 ## Troubleshooting
 
 **`Tag version (X) does not match appVersionName (Y)` in CI validate step**
 You pushed a tag before bumping `gradle/libs.versions.toml`, or vice versa.
 Fix: update the file, commit, delete the remote tag
-(`git push --delete origin vX`), re-tag, and push again.
+(`git push --delete origin android-vX`), re-tag, and push again.
 
 **Play Console rejects the AAB as debug-signed**
-Run `keytool -list -printcert -jarfile <aab>` locally — if it shows
+Run `keytool -printcert -jarfile <aab>` locally — if it shows
 `CN=Android Debug`, fix `local.properties` for local builds or
 `HERMES_KEYSTORE_BASE64` for CI. For CI, check the workflow summary; if it
 says "Debug-signed", one of the four `HERMES_*` secrets is missing or the

RELEASE_NOTES.md

@@ -1,99 +1,44 @@
-# Hermes-Relay v0.5.0
+# Unreleased
 
-**Release Date:** April 17, 2026
-**Since v0.4.0:** v0.4.1 fast-follows (bootstrap middleware, tiered permissions, unattended access mode, voice-session sync) + 2026-04-17 polish pass (UI redesign, agent-aware status, auto-return, activity log)
+## Changed
 
-> **The polish release.** v0.4.0 shipped the bridge channel surface; v0.5.0 makes it usable. The Bridge tab is restructured around a clear master/sub-feature hierarchy, the agent now knows about your phone's unattended state and screen lock so it can warn you instead of failing silently, and the phone auto-returns to Hermes-Relay after every run so you're never stranded on Starbucks/Chrome/whatever the agent left you in.
+- 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.
 
 ---
 
-## 📥 Download
+# Hermes-Relay-Android v0.8.1
 
-v0.5.0 ships in **two build flavors**. APK filenames are version-tagged:
+**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.
+
+---
+
+## Download
+
+v0.8.1 ships in two Android build flavors. APK and AAB filenames are version-tagged:
 
 | Flavor | File | Who it's for |
 |---|---|---|
-| **sideload** (recommended) | `hermes-relay-0.5.0-sideload-release.apk` | Full feature set — bridge channel, voice intents, unattended access, vision-driven `android_navigate`. Installs alongside the Play build with a `.sideload` applicationId. |
-| **Google Play** | `hermes-relay-0.5.0-googlePlay-release.aab` | Conservative feature set (chat, voice, safety rails — no agent device control) to match Play Store's Accessibility policy. |
-| googlePlay APK | `hermes-relay-0.5.0-googlePlay-release.apk` | Parity + diff tooling — not the primary download. |
-| sideload AAB | `hermes-relay-0.5.0-sideload-release.aab` | Parity + diff tooling — not the primary download. |
+| 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. |
 
-**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 install steps.
-
-> **Why two flavors?** The `googlePlay` build stays inside Play Store's Accessibility Service policy. The `sideload` build unlocks the full agent-control feature set and installs with a `.sideload` applicationId so both can coexist (sideload launcher labelled **"Hermes Dev"**). See [Release tracks comparison](https://codename-11.github.io/hermes-relay/guide/release-tracks.html).
+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.
 
 ---
 
-## ✨ Highlights
+## Fixed
 
-### Bridge tab redesign
+### Voice mode crash with barge-in on legacy TTS playback
 
-- **MASTER pill + rewritten copy.** The "Allow Agent Control" toggle now reads as the parent gate it actually is — a small "MASTER" pill next to the title plus subtitle text that explicitly names sub-features ("master switch — agent can read screen and act via the sub-features below"). No more wondering whether unattended is a peer or a child.
-- **Snackbar instead of dead taps.** Tapping the master Switch when accessibility isn't granted used to be a silent no-op (Android's disabled-Switch behavior). Now it shows a snackbar with an "Open Settings" action that deep-links straight to Android's Accessibility Settings page.
-- **Card reorder.** Master → Permission Checklist → [Advanced] → Unattended → Safety → Activity Log. Prereqs come before opt-in features; Activity Log goes last because it's a history view.
-- **Runtime-permission rows always do something.** Tapping Microphone / Camera / Contacts / SMS / Phone / Location / Notifications now opens Android's app-info Settings page on every tap — same affordance as the special-permission rows (Accessibility, Overlay, Notification Listener). Eliminates the silent no-op after permanent denial that confused users on previous releases.
-- **Optional badge no longer wraps.** "Notification Listener" + "Optional" on a portrait phone used to render as a lumpy two-line pill. Fixed via FlowRow layout + non-wrapping badge text.
+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`.
 
-### Unattended access — gating + global banner (sideload only)
+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.
 
-- **Gated on master.** The unattended Switch is now disabled when Agent Control is off, with subtitle text "Requires Agent Control — enable the master switch above first." User can't flip it without observable feedback.
-- **Inline keyguard alert.** The "Keyguard detected" warning is now an inline alert band inside the Unattended card instead of a separate sibling card.
-- **Global UnattendedGlobalBanner.** Thin amber strip (28dp) at the top of every tab when master + unattended are both on. Pulsing amber dot, "Unattended access ON — agent can wake and drive this device", tap-to-Bridge. Theme-aware colours, WCAG AA+ in both light and dark mode.
-- **System overlay chip + in-app banner now coordinate.** The cross-app WindowManager chip (visible when Hermes-Relay is backgrounded) hides when our app is foregrounded — the banner takes over. Backed by a new `AppForegroundTracker` (ProcessLifecycleOwner). Result: one indicator at a time, no visual noise.
-
-### Agent-aware phone status
-
-- **Unattended/screen/credential-lock visible to the LLM.** The system-prompt block (built by `PhoneStatusPromptBuilder`) and the `bridge.status` envelope (consumed by the host-side `android_phone_status` tool) both gained `unattended.supported / .enabled / .credential_lock_detected` and `screen_on` fields. The agent can now warn you upfront ("the screen is off and unattended access is off — wake the phone first") instead of finding out reactively via `keyguard_blocked` errors after a wasted command.
-- **`android_phone_status` tool description tightened.** The LLM is now told explicitly when to warn (screen-off + unattended-off → ask user to wake; unattended-on + credential-lock → expect `keyguard_blocked`). Push-on-toggle so host cache reflects state changes within ~1s.
-
-### Auto-return to Hermes-Relay
-
-- **Tightened tool prompts.** `android_return_to_hermes` and `android_open_app` descriptions are rewritten with explicit `REQUIRED FINAL STEP` / `MANDATORY CLEANUP` framing. Less likely to be skipped.
-- **Dual-signal safety net.** New `BridgeRunTracker` singleton coordinates two completion signals: Chat-tab SSE `run.completed` (fast, fires when phone's Chat tab is in the loop) and a 12s bridge-idle timer (works for ANY frontend — Discord, CLI, web, Slack). Whichever fires first dispatches a local `/return_to_hermes` so the phone auto-returns to Hermes-Relay after the agent finishes — even if the LLM forgot to call the return tool itself.
-
-### Activity log finally records actions
-
-- The Bridge tab's Activity Log card was scaffolded in v0.3 but never wired — the UI rendered the flow, the DataStore was ready, but no code ever called `recordActivity()`. Fixed in v0.5.0: `BridgeCommandHandler` now emits a `BridgeActivityEntry` for every dispatched command, with Success / Failed / Blocked status, route-specific summaries (`tap (540, 1200)`, `open_app com.starbucks.mobilecard`, `type "hello"`), and error text on failures. High-frequency polls (`/ping`, `/events`, `/current_app`) suppressed so the log shows user-meaningful activity, not noise.
-
-### "Current app" status finally populated
-
-- The `Current app` field in the Bridge tab's master card was hardcoded `null` with a TODO. Now wired to `HermesAccessibilityService.instance.currentApp` with a 5s periodic refresh — finally shows the actual foreground package.
-
----
-
-## 🔧 Fixes
-
-- **Banner status-bar overlap.** The new global banner sat at y=0 of the window with no inset padding, so on Android 15 edge-to-edge mode the system status bar icons (clock / wifi / battery) drew on top of the banner text. Fixed via `windowInsetsPadding(WindowInsets.statusBars)` + conditional `consumeWindowInsets` on the Scaffold so child TopAppBars don't double-pad.
-- **TalkBack semantics.** Banner is now announced as a Button with the role hint, not just plain prose with a clickable hit-target.
-- **Repository config-change churn.** `remember(LocalContext.current) { Repository(ctx) }` would re-instantiate DataStore repos on every rotation / dark-mode swap / locale change. Switched to keying off `applicationContext` (process-stable).
-
----
-
-## 🏗️ Includes from v0.4.1 fast-follows
-
-(Already merged into the integration branch before the polish pass — listed here for context since v0.4.1 wasn't tagged on its own.)
-
-- **Bootstrap command middleware** for `/v1/chat/completions` + `/v1/runs` so vanilla upstream installs still see slash-command routing without the fork.
-- **Tiered permission checklist** with JIT error surfacing for missing permissions.
-- **Unattended access mode** (sideload-only) — the wake-lock + keyguard-dismiss machinery this release polishes.
-- **Voice-session sync** so phone-local voice intents land in the server LLM session as proper assistant/tool message pairs.
-
----
-
-## 🧪 Verification checklist (post-install)
-
-- Bridge tab: master toggle, MASTER pill, Settings-deep-link snackbar on accessibility-needed.
-- Permission rows tap → Android app-info page (every row).
-- Unattended toggle disabled when master is off; enabled + scary-dialog when master is on.
-- Global banner appears when master + unattended both ON; hides on Onboarding / Voice mode.
-- WindowManager chip hides when Hermes-Relay is foregrounded.
-- "Current app" status updates every ~5s while the Bridge tab is open.
-- Activity Log populates with bridge commands (open_app, screen, tap, type, etc.) with Success/Failed/Blocked status.
-- Discord-test: ask the agent to open Starbucks and read order history. After it finishes (no more tool calls), phone auto-returns to Hermes within ~12s.
-- `/bridge/status` JSON envelope includes `unattended.{supported, enabled, credential_lock_detected}`.
-
-See `CHANGELOG.md` for the full file-level diff and `DEVLOG.md` for the session narrative.
-
----
-
-🤖 Generated with [Claude Code](https://claude.com/claude-code)
+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.

ROADMAP.md

@@ -12,6 +12,52 @@ Native Android companion for the [Hermes agent platform](https://github.com/Nous
 - **v0.2.0** — Voice mode foundation, terminal preview, TOFU cert pinning, Paired Devices screen. [CHANGELOG](CHANGELOG.md)
 - **v0.1.0** — Chat, sessions, QR pairing, encrypted storage, Play Store submission.
 
+### 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).
+
+**Shipped (2026-04-23 — first tagged release `desktop-v0.3.0-alpha.1`):**
+
+- **`@hermes-relay/cli` v0.1** — Node thin-client at [`desktop/`](desktop/). Remote chat + pair + status + tools subcommands over the relay's `tui` WSS channel. Shares `~/.hermes/remote-sessions.json` with the Android client (pair once, both work).
+- **v0.2 — resilience + pairing UX** — multi-endpoint pairing (ADR 24: `--pair-qr` probes LAN/Tailscale/Public, strict-priority within-tier race, 4s timeout, 60s cache), reconnect-on-drop state machine (1s→30s exp backoff, 5min on 429, gate re-check post-sleep), TOFU cert pinning via pre-WS TLS probe (SPKI sha256, `sha256/<base64>` OkHttp-compatible).
+- **v0.2 — UX polish** — bare `hermes-relay` → `shell` (full Hermes CLI over PTY with `clear; exec hermes` after tmux settles); contextual connect banner (`Connected via LAN (plain) — server 0.6.0`); `status` surfaces grants + TTL + endpoint role from `auth.ok`; new `devices` subcommand talking to relay `GET/DELETE/PATCH /sessions` over HTTP.
+- **Phase B — client-side tool routing** — server-side `plugin/relay/channels/desktop.py` + `plugin/tools/desktop_tool.py` register `desktop_read_file` / `_write_file` / `_terminal` / `_search_files` / `_patch` via `tools.registry` (mirror of `android_*` pattern — **zero hermes-agent core change**). Client-side `DesktopToolRouter` attaches to the `desktop` channel, dispatches under a 30s AbortController, heartbeats `desktop.status` every 30s. One-time per-URL consent gate + `--no-tools` kill-switch.
+- **`hermes-relay daemon`** — headless WSS + tool router that keeps desktop tools serving without a visible shell. Fails closed on missing stored consent (`--allow-tools` escape hatch with an explicit `--token`). JSON-line logs by default, auto-human on TTY. Inherits transport's reconnect state machine; `setImmediate(exit)` to flush final log line before process dies.
+- **Pre-release hardening** — `hermes-relay doctor` (local diagnostic report, human + `--json`, no token leakage); `uninstall.{sh,ps1}` (3-tier: default keeps session store, `--purge` wipes it with cross-surface warning, `--service` stub); interactive first-run prompts (`resolveFirstRunUrl` — auto-picks single stored session, numbered picker for multiple, welcome banner for fresh install); version-aware install (`upgrading X → Y` readback pre-install, post-install confirmation).
+- **Self-setup skill** — [`skills/devops/hermes-relay-desktop-setup/SKILL.md`](skills/devops/hermes-relay-desktop-setup/SKILL.md) lets any Hermes agent install, pair, and troubleshoot the CLI with **live local diagnostics** via `desktop_terminal` (can read the user's Node version, PATH, binary location directly — something the Android setup skill can't match).
+
+**Shipped — `desktop-v0.3.0-alpha.6` (seamless-local dev pass, done 2026-04-23):** Plan at [`docs/plans/2026-04-23-desktop-alpha-6-seamless-local.md`](docs/plans/2026-04-23-desktop-alpha-6-seamless-local.md). Nine features across six parallel agent workstreams, all opt-in: workspace-awareness envelope + active-editor signal (#1+#8), `hermes-relay update` self-update subcommand (#2), `desktop_open_in_editor` tool + interactive patch approval with unified-diff rendering (#3+#4), conversation picker on connect (#5), clipboard bridge + screenshot handlers (#9+#12), and a `hermes` alias so muscle-memory works without the `-relay` suffix (#13). Integration day: 2026-04-23.
+
+**Active — `desktop-v0.3.0-alpha.7` (native image paste):** Plan at [`docs/plans/2026-04-23-desktop-alpha-7-native-paste.md`](docs/plans/2026-04-23-desktop-alpha-7-native-paste.md). Two-repo workstream: client slash commands `/paste` (clipboard), `/screenshot` (primary display), `/image <path>` (file) land in `hermes-relay chat`, each echoes a one-line feedback and attaches the image to the next `prompt.submit` so the vision-capable model sees it in the same turn — parity with Claude Desktop's paste UX minus OS-level Ctrl+V (terminals don't pipe image bytes to stdin). Client half is new `desktop/src/chatAttach.ts` + slash-command branches in `desktop/src/commands/chat.ts`. Server half is ONE new `@method("image.attach.bytes")` on the fork's `tui_gateway/server.py` (branch `feat/image-attach-bytes` → merged to `axiom`); the fork's existing `_enrich_with_attached_images` already handles multimodal payload plumbing and session-scoped image state, so this release is almost entirely about bridging client-captured bytes to server-side state that's been there for months. Relay channel unchanged — `tui` is a transparent RPC forwarder. Graceful fallback when hermes-host hasn't been updated yet: client catches `method not found`, prints a pointer at the axiom rollout, REPL stays alive.
+
+**Active — desktop control / computer-use:** Enhanced plan at [`docs/plans/desktop-control-computer-use-enhanced.md`](docs/plans/desktop-control-computer-use-enhanced.md); earlier MVP implementation record at [`docs/plans/desktop-computer-use-mvp.md`](docs/plans/desktop-computer-use-mvp.md). Windows now has the first Tauri tray/overlay app as the primary Easy/Standard install surface: pair, start/pause daemon, Devices/Revoke, Task Log, Settings, overlay status chip, emergency stop, and bundled CLI sidecar. The existing CLI and daemon remain the primary advanced/headless surface. `desktop_computer_*` schemas are registered on the normal desktop tool channel but advertised only behind the explicit experimental computer-use flag. Host input still requires desktop-tool consent plus a visible, task-scoped assist/control grant; there is no unrestricted or silent mouse/keyboard automation.
+
+**Desktop control UX direction:** Tauri v2 (Rust + static web UI) is the native shell for the polished Easy-tier experience: tray icon, always-visible overlay chip, task log, settings, and one-click pause/emergency stop. Easy tier pairs once, shows a connected/observing chip, and exposes Devices / Revoke / Task Log / Settings / Emergency Stop from the tray. Standard tier adds full tray management; Advanced tier remains CLI + daemon + JSON policy (`~/.hermes/desktop-control.json`) for operators. The default policy baseline blocks password managers, credential prompts, banking/payment/crypto surfaces, OS security/admin settings, and private-key/token material until locally overridden.
+
+**Deferred to alpha.8 / alpha.9 / v1.0:**
+
+- **Per-project session stickiness** — blocked on hermes-agent plugin hook that consumes the workspace envelope; premature until the envelope shape stabilizes in use.
+- **Shell-history context hook** — needs rc-file-edit install path, which our install philosophy currently avoids. Design pass required.
+- **Desktop notifications for long-running daemon work** — let daemon bake in real-world use first; latency/idle-detection thresholds best tuned with telemetry.
+- **Environment-variable passthrough** — security-sensitive; needs per-var prompt UX + threat model before shipping.
+- **Global hotkey to summon a prompt** — OS-specific helper installers; out of scope for binary-only release.
+- **Watch mode** (`hermes-relay daemon --watch`) — needs a DSL and clear safety bounds; own feature branch.
+- **Native assist/control grant modal hardening** — the tray-managed daemon now has a local grant bridge and Grant Requests view. Next pass should polish native modal behavior, notification routing, and multi-client grant ownership.
+- **Kitty / iTerm2 inline image protocols for paste feedback** — would show a thumbnail of the attached image directly in the terminal after `/paste` instead of a plain text line. Most terminals don't support them; the slash-command feedback line works anywhere. Revisit if users request it.
+
+**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.
+- **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.
+- **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.
+
+**Docs + references:** user-docs `/desktop/` section (Overview → Installation → Pairing → Subcommands → Local tool routing → Troubleshooting → FAQ) with an `<ExperimentalBadge />` Vue component on every page. README.md landing has a dedicated "Experimental: Desktop CLI" section with the install one-liners.
+
 ## Current — Axiom-Labs migration
 
 Moving the Play Store listing from a personal account to the DUNS-verified Axiom-Labs LLC org account. Unblocks straight-to-production rollout (no 14-day closed-testing requirement). New applicationId `com.axiomlabs.hermesrelay`; keystore identity + SHA256 fingerprint preserved. In progress — waiting on Google DUNS verification.
@@ -69,6 +115,10 @@ Small follow-ons to v0.4 deliberately deferred to keep the v0.4.0 release surfac
 
 Shape subject to change. Each theme needs a separate design + plan pass before implementation; file design notes as research matures.
 
+### Desktop thin-client — Phase B (client-side tool routing)
+
+v0.1 ships a remote-chat CLI. Phase B is the bigger win: **per-tool dispatch routing** so file/terminal/browser tools run against the user's machine while state tools (memory, skills, sessions, cron) stay on the server. Design detailed in the vault under `Axiom-Vault/3. System/Projects/Hermes-Relay/Desktop Client.md`. Key insertion point is hermes-agent `model_tools.py::handle_function_call()` (~line 517) — before `registry.dispatch()`, consult a session-scoped routing table populated by a relay handshake extension where the client advertises which tools it can service. Isomorphic to how `android_*` tools already flow through the `bridge.command` channel. Proposed branch: `fork/tool-relay` on the hermes-agent fork; upstream issue to open before merging. Blocked on: (a) the handshake extension in `plugin/relay/auth.py` to carry the advertised-tools list, (b) a new `desktop.command` channel mirroring `bridge.command` semantics, (c) the upstream PR conversation.
+
 ### Observability & introspection
 - Real-time accessibility event streaming for reactive workflows (`android_events`, `android_event_stream`)
 - On-device text-to-speech through the phone's system speaker for hands-free responses (distinct from the in-app voice mode)

TODO.md

@@ -6,6 +6,63 @@ For shipped work, see `DEVLOG.md`. For architectural decisions, see `docs/decisi
 
 ---
 
+## 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.
+- **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.
+- **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.
+- **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.
+- **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.
+- **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.
+- **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.
+- **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.
+- **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.
+- **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.
+- **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.
+- **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.
+
+---
+
 ## Research / open questions
 
 ### Proper Hermes plugin / skill / tool distribution

app/build.gradle.kts

@@ -54,11 +54,10 @@ android {
                 Properties().apply { localProps.inputStream().use { stream -> load(stream) } }
             } else null
 
-            storeFile = file(
-                System.getenv("HERMES_KEYSTORE_PATH")
-                    ?: props?.getProperty("hermes.keystore.path")
-                    ?: "/nonexistent"
-            )
+            val keystorePath = System.getenv("HERMES_KEYSTORE_PATH")
+                ?: props?.getProperty("hermes.keystore.path")
+                ?: "/nonexistent"
+            storeFile = rootProject.file(keystorePath)
             storePassword = System.getenv("HERMES_KEYSTORE_PASSWORD")
                 ?: props?.getProperty("hermes.keystore.password") ?: ""
             keyAlias = System.getenv("HERMES_KEY_ALIAS")
@@ -68,20 +67,18 @@ android {
         }
     }
 
-    // ─── Phase 3 — Bridge channel release tracks ────────────────────────────────
-    // Google Play scrutinizes AccessibilityService heavily (policy review + manual
-    // appeals are common), so Phase 3 ships two distinct tracks via flavor-merged
-    // manifests + flavor-scoped strings + flavor-scoped accessibility configs:
+    // ─── Bridge release tracks ─────────────────────────────────────────────────
+    // Google Play ships Bridge Core only: pairing, chat, voice, terminal/TUI,
+    // media, notification companion, relay sessions, and status. It does not
+    // declare AccessibilityService, overlay, MediaProjection, wake-lock device
+    // control, SMS/call/contact/location, or unattended-control permissions.
     //
-    //   googlePlay  — conservative use-case description targeted at Play Store
-    //                 policy review. Subset of event types + flagDefault only.
-    //                 No gestures, no interactive-window reporting. Feature gates
-    //                 in BuildFlavor.kt hide tier 3/4/6 surfaces in the UI.
+    //   googlePlay  — canonical Play Store install. Bridge Core only.
     //
-    //   sideload    — full agent-control description for users who install the
-    //                 APK directly (GitHub Releases, F-Droid, ADB). typeAllMask,
-    //                 gestures, interactive windows, view-id reporting. All six
-    //                 tiers enabled.
+    //   sideload    — Device Control for users who install directly (GitHub
+    //                 Releases, F-Droid, ADB). AccessibilityService, gestures,
+    //                 screenshots, overlay/status chip, and phone utilities are
+    //                 declared in the sideload manifest.
     //
     // applicationIdSuffix decision: sideload gets `.sideload` so both tracks can
     // coexist on the same device. The Play build keeps the base
@@ -166,6 +163,9 @@ android {
     // both failing with RuntimeException from unmocked Log.w calls.
     testOptions {
         unitTests.isReturnDefaultValues = true
+        // Robolectric (VoicePlayerTest) needs merged Android resources +
+        // manifest on the unit-test classpath to bootstrap its sandbox.
+        unitTests.isIncludeAndroidResources = true
     }
 }
 
@@ -219,6 +219,13 @@ dependencies {
     implementation(libs.okhttp)
     implementation(libs.okhttp.sse)
 
+    // Media3 ExoPlayer — gapless TTS queue playback (replaces MediaPlayer in VoicePlayer)
+    implementation(libs.media3.exoplayer)
+
+    // android-vad Silero — on-device VAD for barge-in (B2)
+    // Bundled ONNX Silero model (~2.2 MB); pulled from JitPack.
+    implementation(libs.android.vad.silero)
+
     // Markdown rendering
     implementation(libs.markdown.renderer.m3)
     implementation(libs.markdown.renderer.code)
@@ -252,8 +259,13 @@ dependencies {
     // Testing
     testImplementation(libs.junit)
     testImplementation(libs.mockk)
+    testImplementation(libs.robolectric)
     testImplementation(libs.kotlinx.coroutines.test)
     testImplementation(libs.kotlinx.serialization.json)
+    // MockWebServer for ADR 24 EndpointResolver tests — probes HEAD /health
+    // across priority groups against real local sockets so the behavior we
+    // validate matches on-device.
+    testImplementation(libs.okhttp.mockwebserver)
     androidTestImplementation(libs.compose.ui.test.junit4)
     debugImplementation(libs.compose.ui.tooling)
     debugImplementation(libs.compose.ui.test.manifest)

app/src/androidTest/kotlin/com/hermesandroid/relay/ui/components/BridgeMasterToggleTest.kt

@@ -4,7 +4,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.ui.test.assertIsOff
 import androidx.compose.ui.test.isToggleable
 import androidx.compose.ui.test.junit4.createComposeRule
-import androidx.compose.ui.test.onNode
 import androidx.compose.ui.test.performClick
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse

app/src/androidTest/kotlin/com/hermesandroid/relay/ui/components/PowerFeatureGateUiTest.kt

@@ -0,0 +1,66 @@
+package com.hermesandroid.relay.ui.components
+
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import org.junit.Rule
+import org.junit.Test
+
+class PowerFeatureGateUiTest {
+
+    @get:Rule
+    val composeTestRule = createComposeRule()
+
+    @Test
+    fun requiresPairingCard_showsPairToUnlock() {
+        composeTestRule.setContent {
+            MaterialTheme {
+                PowerFeatureGateCard(
+                    title = "Terminal",
+                    summary = "Open a server shell through your paired relay session.",
+                    status = PowerFeatureGateStatus.RequiresPairing,
+                    onPrimaryAction = {},
+                )
+            }
+        }
+
+        composeTestRule.onNodeWithText("Requires pairing").assertIsDisplayed()
+        composeTestRule.onNodeWithText("Pair to unlock").assertIsDisplayed()
+        composeTestRule.onNodeWithText("This feature uses relay grants", substring = true).assertIsDisplayed()
+    }
+
+    @Test
+    fun expiredPairingCard_showsPairAgain() {
+        composeTestRule.setContent {
+            MaterialTheme {
+                PowerFeatureGateCard(
+                    title = "Bridge",
+                    summary = "Let Hermes send approved bridge commands to this phone.",
+                    status = PowerFeatureGateStatus.PairingExpired,
+                    onPrimaryAction = {},
+                )
+            }
+        }
+
+        composeTestRule.onNodeWithText("Pairing expired").assertIsDisplayed()
+        composeTestRule.onNodeWithText("Pair again").assertIsDisplayed()
+    }
+
+    @Test
+    fun dashboardSignInCard_usesDashboardLanguage() {
+        composeTestRule.setContent {
+            MaterialTheme {
+                PowerFeatureGateCard(
+                    title = "Manage",
+                    summary = "Open dashboard-backed management features.",
+                    status = PowerFeatureGateStatus.DashboardSignInRequired,
+                    onPrimaryAction = {},
+                )
+            }
+        }
+
+        composeTestRule.onNodeWithText("Dashboard sign-in required").assertIsDisplayed()
+        composeTestRule.onNodeWithText("Open sign-in").assertIsDisplayed()
+    }
+}

app/src/androidTest/kotlin/com/hermesandroid/relay/ui/components/UnattendedAccessRowTest.kt

@@ -6,7 +6,6 @@ import androidx.compose.ui.test.assertIsNotEnabled
 import androidx.compose.ui.test.assertIsEnabled
 import androidx.compose.ui.test.isToggleable
 import androidx.compose.ui.test.junit4.createComposeRule
-import androidx.compose.ui.test.onNode
 import androidx.compose.ui.test.onNodeWithText
 import org.junit.Rule
 import org.junit.Test

app/src/androidTest/kotlin/com/hermesandroid/relay/ui/components/VoiceModeOverlayTranscriptTest.kt

@@ -0,0 +1,104 @@
+package com.hermesandroid.relay.ui.components
+
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onAllNodesWithText
+import com.hermesandroid.relay.data.ChatMessage
+import com.hermesandroid.relay.data.MessageRole
+import com.hermesandroid.relay.viewmodel.InteractionMode
+import com.hermesandroid.relay.viewmodel.VoiceState
+import com.hermesandroid.relay.viewmodel.VoiceUiState
+import org.junit.Assert.assertEquals
+import org.junit.Rule
+import org.junit.Test
+
+/**
+ * Verifies the voice overlay renders exactly one transcript row per turn
+ * even when [VoiceUiState.transcribedText] and [VoiceUiState.responseText]
+ * are populated alongside the same content in [ChatMessage]s.
+ *
+ * Pre-fix bug: the overlay rendered from THREE sources — `transcribedText`
+ * (a top "YOU" row), `responseText` (a `StreamingResponseRow`), and
+ * `transcriptMessages` (the scrolling chat-history list). During a voice
+ * turn ChatViewModel committed the user's send and streamed the assistant
+ * reply into its own message flow, so the same content ended up in both
+ * `transcribedText`/`responseText` AND in `transcriptMessages` — every
+ * turn appeared twice on screen.
+ *
+ * Fix: the overlay consumes only `transcriptMessages` now. This test asserts
+ * that even when the other two fields are set, the on-screen count of each
+ * turn's text is exactly one.
+ */
+class VoiceModeOverlayTranscriptTest {
+
+    @get:Rule
+    val composeTestRule = createComposeRule()
+
+    @Test
+    fun userAndAgentTurns_renderExactlyOnce_evenWithLegacyFieldsSet() {
+        val userText = "Hello agent"
+        val agentText = "Hi there"
+
+        val messages = listOf(
+            ChatMessage(
+                id = "u-1",
+                role = MessageRole.USER,
+                content = userText,
+                timestamp = 1L,
+                isStreaming = false,
+            ),
+            ChatMessage(
+                id = "a-1",
+                role = MessageRole.ASSISTANT,
+                content = agentText,
+                timestamp = 2L,
+                isStreaming = true,
+            ),
+        )
+
+        composeTestRule.setContent {
+            MaterialTheme {
+                VoiceModeOverlay(
+                    uiState = VoiceUiState(
+                        voiceMode = true,
+                        state = VoiceState.Speaking,
+                        // Legacy fields — if the overlay still read these,
+                        // each turn's text would appear twice.
+                        transcribedText = userText,
+                        responseText = agentText,
+                        interactionMode = InteractionMode.TapToTalk,
+                    ),
+                    onMicTap = {},
+                    onMicRelease = {},
+                    onInterrupt = {},
+                    onDismiss = {},
+                    onModeChange = {},
+                    onClearError = {},
+                    transcriptMessages = messages,
+                )
+            }
+        }
+
+        composeTestRule.waitForIdle()
+
+        val userOccurrences = composeTestRule
+            .onAllNodesWithText(userText, substring = false)
+            .fetchSemanticsNodes()
+            .size
+        val agentOccurrences = composeTestRule
+            .onAllNodesWithText(agentText, substring = false)
+            .fetchSemanticsNodes()
+            .size
+
+        assertEquals(
+            "user turn must render exactly once (no double-entry from transcribedText)",
+            1,
+            userOccurrences,
+        )
+        assertEquals(
+            "agent turn must render exactly once (no double-entry from responseText)",
+            1,
+            agentOccurrences,
+        )
+    }
+}

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

@@ -1,22 +1,19 @@
 package com.hermesandroid.relay.ui.onboarding
 
+import android.app.Application
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.assertIsEnabled
-import androidx.compose.ui.test.assertIsNotDisplayed
-import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import androidx.compose.ui.test.performScrollTo
+import androidx.test.core.app.ApplicationProvider
 import com.hermesandroid.relay.ui.theme.HermesRelayTheme
+import com.hermesandroid.relay.viewmodel.ConnectionViewModel
 import org.junit.Rule
 import org.junit.Test
 
 /**
- * Instrumented tests for the onboarding pager flow.
- *
- * These tests require an Android device or emulator because they use
- * Compose UI testing APIs and interact with real Compose components.
+ * Instrumented tests for the Standard-first onboarding pager.
  */
 class OnboardingFlowTest {
 
@@ -24,270 +21,175 @@ class OnboardingFlowTest {
     val composeTestRule = createComposeRule()
 
     private fun setOnboardingContent() {
+        val app = ApplicationProvider.getApplicationContext<Application>()
+        val connectionViewModel = ConnectionViewModel(app)
         composeTestRule.setContent {
             HermesRelayTheme {
                 OnboardingScreen(
-                    onComplete = { _, _, _ -> }
+                    connectionViewModel = connectionViewModel,
+                    onComplete = {},
                 )
             }
         }
     }
 
-    // --- Page 1: Welcome ---
-
     @Test
-    fun firstPage_showsHermesRelayTitle() {
+    fun firstPage_showsHermesForAndroidTitle() {
         setOnboardingContent()
 
         composeTestRule
-            .onNodeWithText("Hermes-Relay")
+            .onNodeWithText("Hermes-Relay for Android")
             .assertIsDisplayed()
     }
 
     @Test
-    fun firstPage_showsWelcomeDescription() {
+    fun firstPage_showsStandardFirstDescription() {
         setOnboardingContent()
 
         composeTestRule
-            .onNodeWithText("Your AI agent, in your pocket. Chat, control, and connect — all from your phone.")
+            .onNodeWithText("Chat with Hermes and manage your dashboard from your phone.")
             .assertIsDisplayed()
-    }
-
-    // --- Skip button ---
-
-    @Test
-    fun skipButton_isAlwaysVisible_onFirstPage() {
-        setOnboardingContent()
-
         composeTestRule
-            .onNodeWithText("Skip")
+            .onNodeWithText("Standard")
             .assertIsDisplayed()
-    }
-
-    // --- Navigation: Next button ---
-
-    @Test
-    fun nextButton_isDisplayed_onFirstPage() {
-        setOnboardingContent()
-
         composeTestRule
-            .onNodeWithText("Next")
+            .onNodeWithText("Advanced")
+            .assertIsDisplayed()
+        composeTestRule
+            .onNodeWithText("Setup Guide")
+            .assertIsDisplayed()
+        composeTestRule
+            .onNodeWithText("Hermes Docs")
             .assertIsDisplayed()
     }
 
     @Test
-    fun nextButton_navigatesForward_toPage2() {
+    fun nextButton_navigatesForward_toChatPage() {
         setOnboardingContent()
 
-        // Page 1 -> Page 2
         composeTestRule.onNodeWithText("Next").performClick()
         composeTestRule.waitForIdle()
 
-        // Page 2 is "Talk to Your Agent"
         composeTestRule
-            .onNodeWithText("Talk to Your Agent")
+            .onNodeWithText("Chat")
             .assertIsDisplayed()
     }
 
     @Test
-    fun canNavigateForward_throughAllPages() {
+    fun canNavigateForward_throughStandardAndPowerPages() {
         setOnboardingContent()
 
-        // Page 1: Hermes-Relay (Welcome)
-        composeTestRule.onNodeWithText("Hermes-Relay").assertIsDisplayed()
+        composeTestRule.onNodeWithText("Hermes-Relay for Android").assertIsDisplayed()
         composeTestRule.onNodeWithText("Next").performClick()
         composeTestRule.waitForIdle()
 
-        // Page 2: Talk to Your Agent (Chat)
-        composeTestRule.onNodeWithText("Talk to Your Agent").assertIsDisplayed()
+        composeTestRule.onNodeWithText("Chat").assertIsDisplayed()
         composeTestRule.onNodeWithText("Next").performClick()
         composeTestRule.waitForIdle()
 
-        // Page 3: Remote Terminal
-        composeTestRule.onNodeWithText("Remote Terminal").assertIsDisplayed()
+        composeTestRule.onNodeWithText("Manage").assertIsDisplayed()
         composeTestRule.onNodeWithText("Next").performClick()
         composeTestRule.waitForIdle()
 
-        // Page 4: Device Bridge
-        composeTestRule.onNodeWithText("Device Bridge").assertIsDisplayed()
-        composeTestRule.onNodeWithText("Next").performClick()
+        composeTestRule.onNodeWithText("Power tools").assertIsDisplayed()
+        composeTestRule.onNodeWithText("Connect").performClick()
         composeTestRule.waitForIdle()
 
-        // Page 5: Connect to Hermes
         composeTestRule.onNodeWithText("Connect to Hermes").assertIsDisplayed()
-        composeTestRule.onNodeWithText("Next").performClick()
-        composeTestRule.waitForIdle()
-
-        // Page 6: Relay Server (last page)
-        composeTestRule.onNodeWithText("Relay Server").assertIsDisplayed()
     }
 
-    // --- Back button ---
-
     @Test
     fun backButton_hiddenOnFirstPage() {
         setOnboardingContent()
 
-        // On page 1, Back should not exist
         composeTestRule
             .onNodeWithText("Back")
             .assertDoesNotExist()
     }
 
-    @Test
-    fun backButton_visibleOnPage2() {
-        setOnboardingContent()
-
-        composeTestRule.onNodeWithText("Next").performClick()
-        composeTestRule.waitForIdle()
-
-        composeTestRule
-            .onNodeWithText("Back")
-            .assertIsDisplayed()
-    }
-
     @Test
     fun backButton_navigatesBackward() {
         setOnboardingContent()
 
-        // Go to page 2
         composeTestRule.onNodeWithText("Next").performClick()
         composeTestRule.waitForIdle()
-        composeTestRule.onNodeWithText("Talk to Your Agent").assertIsDisplayed()
+        composeTestRule.onNodeWithText("Chat").assertIsDisplayed()
 
-        // Go back to page 1
         composeTestRule.onNodeWithText("Back").performClick()
         composeTestRule.waitForIdle()
-        composeTestRule.onNodeWithText("Hermes-Relay").assertIsDisplayed()
-    }
-
-    // --- Page 5: Connect page ---
-
-    @Test
-    fun connectPage_hasApiServerUrlField() {
-        setOnboardingContent()
-        navigateToPage(4) // 0-indexed, page 5 is index 4
-
-        composeTestRule
-            .onNodeWithText("API Server URL")
-            .assertIsDisplayed()
+        composeTestRule.onNodeWithText("Hermes-Relay for Android").assertIsDisplayed()
     }
 
     @Test
-    fun connectPage_hasApiKeyField() {
+    fun connectPage_showsStandardChoiceFirst() {
         setOnboardingContent()
         navigateToPage(4)
 
         composeTestRule
-            .onNodeWithText("API Key (optional)", substring = true)
+            .onNodeWithText("Standard Hermes")
             .assertIsDisplayed()
     }
 
     @Test
-    fun connectPage_whereDoIFindThis_showsHelpDialog() {
+    fun standardSetup_showsApiFields() {
         setOnboardingContent()
         navigateToPage(4)
 
-        // Tap "Where do I find this?"
-        composeTestRule
-            .onNodeWithText("Where do I find this?")
-            .performClick()
+        composeTestRule.onNodeWithText("Standard Hermes").performClick()
         composeTestRule.waitForIdle()
 
-        // Dialog should show
         composeTestRule
-            .onNodeWithText("Do I need an API key?")
+            .onNodeWithText("API server URL")
+            .assertIsDisplayed()
+        composeTestRule
+            .onNodeWithText("API key")
             .assertIsDisplayed()
     }
 
     @Test
-    fun connectPage_helpDialog_canBeDismissed() {
+    fun standardSetup_connectButton_isEnabled_withDefaultUrl() {
         setOnboardingContent()
         navigateToPage(4)
 
-        composeTestRule.onNodeWithText("Where do I find this?").performClick()
+        composeTestRule.onNodeWithText("Standard Hermes").performClick()
         composeTestRule.waitForIdle()
 
-        // Dialog is showing
-        composeTestRule.onNodeWithText("Do I need an API key?").assertIsDisplayed()
-
-        // Dismiss it
-        composeTestRule.onNodeWithText("Got it").performClick()
-        composeTestRule.waitForIdle()
-
-        // Dialog should be gone
         composeTestRule
-            .onNodeWithText("Do I need an API key?")
-            .assertDoesNotExist()
-    }
-
-    // --- Page 6: Relay page ---
-
-    @Test
-    fun relayPage_showsOptionalMessaging() {
-        setOnboardingContent()
-        navigateToPage(5) // Last page
-
-        composeTestRule
-            .onNodeWithText("This is optional", substring = true)
-            .assertIsDisplayed()
-    }
-
-    @Test
-    fun relayPage_showsRelayUrlField() {
-        setOnboardingContent()
-        navigateToPage(5)
-
-        composeTestRule
-            .onNodeWithText("Relay URL (optional)")
-            .assertIsDisplayed()
-    }
-
-    // --- Get Started button ---
-
-    @Test
-    fun lastPage_showsGetStartedButton() {
-        setOnboardingContent()
-        navigateToPage(5)
-
-        composeTestRule
-            .onNodeWithText("Get Started")
-            .assertIsDisplayed()
-    }
-
-    @Test
-    fun lastPage_getStartedButton_isEnabled_withDefaultUrl() {
-        setOnboardingContent()
-        navigateToPage(5)
-
-        // Default URL is "http://localhost:8642" which is non-blank
-        composeTestRule
-            .onNodeWithText("Get Started")
+            .onNodeWithText("Connect")
             .assertIsEnabled()
     }
 
-    // --- Skip button visibility across pages ---
-
     @Test
-    fun skipButton_visibleOnAllPages() {
+    fun connectPage_keepsPairingOptional() {
         setOnboardingContent()
+        navigateToPage(4)
 
-        // Check skip on first page
-        composeTestRule.onNodeWithText("Skip").assertIsDisplayed()
-
-        // Navigate through all pages and check skip
-        for (i in 0 until 5) {
-            composeTestRule.onNodeWithText("Next").performClick()
-            composeTestRule.waitForIdle()
-            composeTestRule.onNodeWithText("Skip").assertIsDisplayed()
-        }
+        composeTestRule
+            .onNodeWithText("Pair Relay by code")
+            .assertIsDisplayed()
+        composeTestRule
+            .onNodeWithText("Power-user path for Terminal, Bridge, Relay sessions, and grants")
+            .assertIsDisplayed()
     }
 
-    // --- Helper ---
+    @Test
+    fun skipButton_visibleOnIntroPages_andWizardSkipOnConnectPage() {
+        setOnboardingContent()
+
+        repeat(4) {
+            composeTestRule.onNodeWithText("Skip").assertIsDisplayed()
+            composeTestRule.onNodeWithText(if (it == 3) "Connect" else "Next").performClick()
+            composeTestRule.waitForIdle()
+        }
+
+        composeTestRule
+            .onNodeWithText("Skip for now — set up later in Settings")
+            .assertIsDisplayed()
+    }
 
     private fun navigateToPage(pageIndex: Int) {
         repeat(pageIndex) {
-            composeTestRule.onNodeWithText("Next").performClick()
+            composeTestRule.onNodeWithText(if (it == 3) "Connect" else "Next").performClick()
             composeTestRule.waitForIdle()
         }
     }

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

@@ -1,157 +1,52 @@
 package com.hermesandroid.relay.ui.screens
 
+import android.app.Application
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
-import androidx.compose.material3.MaterialTheme
+import androidx.test.core.app.ApplicationProvider
+import com.hermesandroid.relay.viewmodel.ConnectionViewModel
+import com.hermesandroid.relay.viewmodel.TerminalViewModel
 import org.junit.Rule
 import org.junit.Test
 
 /**
- * Instrumented tests for Terminal and Bridge empty state screens.
+ * Instrumented smoke tests for the current Terminal and Bridge surfaces.
  */
 class EmptyStateTest {
 
     @get:Rule
     val composeTestRule = createComposeRule()
 
-    // --- Terminal Screen ---
-
     @Test
-    fun terminalScreen_showsTitle() {
+    fun terminalScreen_showsCurrentTopBar() {
+        val app = ApplicationProvider.getApplicationContext<Application>()
+        val terminalViewModel = TerminalViewModel(app)
+        val connectionViewModel = ConnectionViewModel(app)
+
         composeTestRule.setContent {
             MaterialTheme {
-                TerminalScreen()
+                TerminalScreen(
+                    terminalViewModel = terminalViewModel,
+                    connectionViewModel = connectionViewModel,
+                )
             }
         }
 
-        composeTestRule
-            .onNodeWithText("Remote Terminal")
-            .assertIsDisplayed()
+        composeTestRule.onNodeWithText("Terminal").assertIsDisplayed()
+        composeTestRule.onNodeWithContentDescription("Search scrollback").assertIsDisplayed()
     }
 
     @Test
-    fun terminalScreen_showsPhase2Chip() {
-        composeTestRule.setContent {
-            MaterialTheme {
-                TerminalScreen()
-            }
-        }
-
-        composeTestRule
-            .onNodeWithText("Coming in Phase 2")
-            .assertIsDisplayed()
-    }
-
-    @Test
-    fun terminalScreen_showsDescription() {
-        composeTestRule.setContent {
-            MaterialTheme {
-                TerminalScreen()
-            }
-        }
-
-        composeTestRule
-            .onNodeWithText("Secure shell access", substring = true)
-            .assertIsDisplayed()
-    }
-
-    @Test
-    fun terminalScreen_showsTopBarTitle() {
-        composeTestRule.setContent {
-            MaterialTheme {
-                TerminalScreen()
-            }
-        }
-
-        composeTestRule
-            .onNodeWithText("Terminal")
-            .assertIsDisplayed()
-    }
-
-    @Test
-    fun terminalScreen_showsPlannedFeatures() {
-        composeTestRule.setContent {
-            MaterialTheme {
-                TerminalScreen()
-            }
-        }
-
-        composeTestRule
-            .onNodeWithText("Full ANSI terminal emulator", substring = true)
-            .assertIsDisplayed()
-        composeTestRule
-            .onNodeWithText("tmux session management", substring = true)
-            .assertIsDisplayed()
-    }
-
-    // --- Bridge Screen ---
-
-    @Test
-    fun bridgeScreen_showsTitle() {
+    fun bridgeScreen_showsCurrentTopBar() {
         composeTestRule.setContent {
             MaterialTheme {
                 BridgeScreen()
             }
         }
 
-        composeTestRule
-            .onNodeWithText("Device Bridge")
-            .assertIsDisplayed()
-    }
-
-    @Test
-    fun bridgeScreen_showsPhase3Chip() {
-        composeTestRule.setContent {
-            MaterialTheme {
-                BridgeScreen()
-            }
-        }
-
-        composeTestRule
-            .onNodeWithText("Coming in Phase 3")
-            .assertIsDisplayed()
-    }
-
-    @Test
-    fun bridgeScreen_showsDescription() {
-        composeTestRule.setContent {
-            MaterialTheme {
-                BridgeScreen()
-            }
-        }
-
-        composeTestRule
-            .onNodeWithText("Let your Hermes agent interact with your phone", substring = true)
-            .assertIsDisplayed()
-    }
-
-    @Test
-    fun bridgeScreen_showsTopBarTitle() {
-        composeTestRule.setContent {
-            MaterialTheme {
-                BridgeScreen()
-            }
-        }
-
-        composeTestRule
-            .onNodeWithText("Bridge")
-            .assertIsDisplayed()
-    }
-
-    @Test
-    fun bridgeScreen_showsPlannedFeatures() {
-        composeTestRule.setContent {
-            MaterialTheme {
-                BridgeScreen()
-            }
-        }
-
-        composeTestRule
-            .onNodeWithText("Agent-controlled device interaction", substring = true)
-            .assertIsDisplayed()
-        composeTestRule
-            .onNodeWithText("Permission management", substring = true)
-            .assertIsDisplayed()
+        composeTestRule.onNodeWithText("Bridge").assertIsDisplayed()
     }
 }

app/src/googlePlay/AndroidManifest.xml

@@ -5,24 +5,23 @@
     Merged on top of `app/src/main/AndroidManifest.xml` by AGP when the
     `googlePlayDebug` / `googlePlayRelease` variants are built.
 
-    The AccessibilityService is declared exactly once in `app/src/main/AndroidManifest.xml`.
-    The flavor distinction is purely at the resource layer: this flavor's
-    `res/xml/accessibility_service_config.xml` carries the conservative use-case
-    description required for Google Play policy review, and `res/values/strings.xml`
-    carries the description string. Gradle's resource merger picks the right
-    files at build time, so we don't need to redeclare the <service> here.
+    Google Play ships Hermes Bridge Core only. It intentionally does not merge
+    any Device Control services or permissions.
 
     This file is intentionally kept as an empty overlay so future flavor-specific
     permissions / activities have an obvious home. Mirror structural additions
     in `app/src/sideload/AndroidManifest.xml` unless the change is intentionally
     track-specific.
 -->
-<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">
+
+    <!-- Media3 ExoPlayer contributes a power-management permission from its
+         library manifest. Strip it from the merged Play artifact. -->
+    <uses-permission
+        android:name="android.permission.WAKE_LOCK"
+        tools:node="remove" />
 
-    <!-- googlePlay inherits main manifest's specialUse-only FGS type
-         directly — no override needed. The sideload manifest ADDS
-         mediaProjection via tools:replace; googlePlay gets the safe
-         default. -->
     <application />
 
 </manifest>

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

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Google Play flavor strings.
-
-    `a11y_description_googleplay` is the user-facing description shown in
-    Android's Accessibility settings when enabling the Hermes Bridge service.
-    It is ALSO what Play Store reviewers read when evaluating our
-    AccessibilityService use-case declaration, so phrasing matters: stay
-    narrowly scoped, emphasize user confirmation, emphasize dormancy until
-    the user opts in inside the app.
-
-    Do not reference voice or vision features here — tier 3/4/6 are gated
-    off for this flavor via FeatureFlags.BuildFlavor.
--->
-<resources>
-    <string name="a11y_service_label">Hermes-Bridge</string>
-    <string name="a11y_description_googleplay">Hermes assists you by reading on-screen content and summarizing notifications. The service is read-only — it does not perform taps, type text, or control other apps. It is dormant until you explicitly enable Bridge mode in the app.</string>
-</resources>

app/src/googlePlay/res/xml/accessibility_service_config.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Google Play AccessibilityService configuration.
-
-    Conservative event-type subset targeted at the "read notifications,
-    summarize messages, reply with confirmation" use case Play Store policy
-    review expects. Does NOT subscribe to typeAllMask, does NOT request
-    gestures, does NOT request flagRetrieveInteractiveWindows.
-
-    Keep these attributes aligned with the description in strings.xml
-    (`a11y_description_googleplay`) — if the description widens, reviewers
-    will expect the config to widen too.
--->
-<accessibility-service xmlns:android="http://schemas.android.com/apk/res/android"
-    android:description="@string/a11y_description_googleplay"
-    android:accessibilityEventTypes="typeWindowStateChanged|typeWindowContentChanged|typeViewClicked"
-    android:accessibilityFlags="flagDefault"
-    android:accessibilityFeedbackType="feedbackGeneric"
-    android:notificationTimeout="100"
-    android:canRetrieveWindowContent="true" />

app/src/main/AndroidManifest.xml

@@ -6,74 +6,9 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <!-- === A8 wake-lock: keep CPU awake while dispatching bridge gestures === -->
-    <!-- Normal-protection permission (no runtime prompt). Held only inside
-         WakeLockManager.wakeForAction { ... }, with a 10s hard timeout and
-         ref-counted release. -->
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
-    <!-- === PHASE3-accessibility: AccessibilityService + bridge permissions === -->
-    <!-- BIND_ACCESSIBILITY_SERVICE is intentionally NOT declared as a
-         <uses-permission> here — it's a system-only permission granted to
-         services that declare android:permission on their <service> tag
-         (see the BridgeAccessibilityService entry below). Declaring it as
-         a uses-permission trips lint's [ProtectedPermissions] check.
-
-         FOREGROUND_SERVICE* are for the persistent notification that
-         Agent safety-rails will wire in Wave 2 for MediaProjection-backed
-         screenshots. POST_NOTIFICATIONS is required on API 33+ for that
-         same foreground-service notification. -->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <!-- FOREGROUND_SERVICE_MEDIA_PROJECTION moved to sideload manifest.
-         googlePlay doesn't need screen recording: /screenshot route is
-         gated sideload-only in BridgeCommandHandler. Declaring the
-         permission on the Play track would flag review since our
-         accessibility use-case ("read-only screen reading") doesn't
-         justify screen capture. -->
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <!-- === END PHASE3-accessibility === -->
-
-    <!-- === PHASE3-safety-rails: safety service + overlay === -->
-    <!-- SYSTEM_ALERT_WINDOW is user-granted via Settings.ACTION_MANAGE_OVERLAY_PERMISSION.
-         Used for (a) the destructive-verb confirmation modal that must be
-         visible even when Hermes isn't in the foreground, and (b) the optional
-         floating "Hermes active" status chip. The permission is declared here
-         so the user-visible grant flow triggers, but the overlay itself only
-         appears when the user has explicitly consented.
-
-         FOREGROUND_SERVICE_SPECIAL_USE is required on Android 14+ for the
-         persistent "Bridge active" notification (BridgeForegroundService),
-         because the specialUse type needs its own declared permission.  -->
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
-    <!-- === END PHASE3-safety-rails === -->
 
     <uses-feature android:name="android.hardware.camera" android:required="false" />
 
-    <!-- === PHASE3-baseline-handlers: package visibility for /get_apps + /open_app === -->
-    <!-- On Android 11+ (API 30+), apps can only see other packages that
-         are implicitly visible (own UID, system apps, etc.) unless they
-         declare a <queries> filter or hold QUERY_ALL_PACKAGES. The
-         BridgeCommandHandler /get_apps route uses
-         queryIntentActivities(ACTION_MAIN + CATEGORY_LAUNCHER) to enumerate
-         launchable apps, and BridgeSafetySettingsScreen uses the same call
-         to populate the blocklist UI — both need this declaration to see
-         the full launcher set. Without it queryIntentActivities silently
-         returns a near-empty list (typical symptom: blocklist UI shows
-         only Hermes-Relay itself + a handful of system apps).
-
-         Declaring an <intent> filter with ACTION_MAIN + CATEGORY_LAUNCHER
-         is the Play-policy-safe approach — it does NOT require the
-         restricted QUERY_ALL_PACKAGES permission, which Play would
-         otherwise demand a policy declaration for. -->
-    <queries>
-        <intent>
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.LAUNCHER" />
-        </intent>
-    </queries>
-    <!-- === END PHASE3-baseline-handlers === -->
-
     <application
         android:name=".HermesRelayApp"
         android:allowBackup="true"
@@ -89,6 +24,7 @@
             android:exported="true"
             android:launchMode="singleTask"
             android:configChanges="uiMode|fontScale|locale|density|orientation|screenSize|screenLayout|keyboardHidden"
+            android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.HermesRelay.Splash">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -106,30 +42,6 @@
                 android:resource="@xml/file_provider_paths" />
         </provider>
 
-        <!-- === PHASE3-accessibility: AccessibilityService declaration === -->
-        <!-- The @xml/accessibility_service_config resource is provided by
-             the flavor-specific source sets (app/src/googlePlay/ and
-             app/src/sideload/) owned by Agent flavor-split. Each flavor declares its
-             own accessibility use-case description and flag bitset — the
-             googlePlay track declares a conservative "notifications + reply
-             with confirmation" use case, the sideload track declares the
-             full agent-control use case. Gradle merges the flavor XML into
-             main at build time.
-             -->
-        <service
-            android:name=".accessibility.HermesAccessibilityService"
-            android:exported="true"
-            android:label="@string/a11y_service_label"
-            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
-            <intent-filter>
-                <action android:name="android.accessibilityservice.AccessibilityService" />
-            </intent-filter>
-            <meta-data
-                android:name="android.accessibilityservice"
-                android:resource="@xml/accessibility_service_config" />
-        </service>
-        <!-- === END PHASE3-accessibility === -->
-
         <!-- === PHASE3-notif-listener: notification companion service === -->
         <service
             android:name=".notifications.HermesNotificationCompanion"
@@ -142,46 +54,6 @@
         </service>
         <!-- === END PHASE3-notif-listener === -->
 
-        <!-- === PHASE3-safety-rails: safety service + overlay === -->
-        <!-- BridgeForegroundService is a plain (non-exported) foreground
-             service driven by BridgeViewModel based on the master toggle.
-             It owns the persistent "Hermes agent has device control"
-             notification.
-
-             foregroundServiceType is the OR of two API 34+ subtypes:
-
-               - specialUse — backs the persistent "bridge active"
-                 indicator we shipped with Tier 5 safety rails. Comes
-                 with the SPECIAL_USE foreground-service permission and
-                 the Play Console policy declaration.
-
-               - mediaProjection — REQUIRED by Android 14+ before any
-                 call to MediaProjectionManager.getMediaProjection().
-                 Without this declaration, getMediaProjection() returns
-                 a projection that the system auto-revokes within a
-                 frame, leaving us with a permanently-null
-                 MediaProjectionHolder.projection. Symptom on the
-                 device: consent dialog appears, user allows full
-                 screen, dialog closes, grant evaporates. Sample-tested
-                 on a Samsung S24 / Android 14 on 2026-04-12.
-
-             Both types share the same notification + same lifecycle —
-             one service, one notification, two type slots.
-
-             Android 14+ requires a <property> tag justifying the
-             specialUse subtype. The mediaProjection subtype does NOT
-             need a property tag because it has its own dedicated
-             permission (FOREGROUND_SERVICE_MEDIA_PROJECTION). -->
-        <service
-            android:name=".bridge.BridgeForegroundService"
-            android:exported="false"
-            android:foregroundServiceType="specialUse">
-            <property
-                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
-                android:value="Maintains a persistent WebSocket connection to the user's Hermes server for real-time chat relay and notification mirroring. The service is dormant until the user explicitly enables Bridge mode in the app." />
-        </service>
-        <!-- === END PHASE3-safety-rails === -->
-
     </application>
 
 </manifest>

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

@@ -239,6 +239,166 @@
             }
         };
 
+        // ── 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
+        // designed around mouse/wheel events, and it sets touch-action on
+        // its root to swallow gestures for selection. That leaves the
+        // scrollback unreachable on phones unless we add a translator.
+        //
+        // Strategy: one finger, mostly-vertical drag → convert delta to
+        // line-scroll via term.scrollLines(). The threshold keeps short
+        // taps (and their tiny jitter) from triggering scroll; the axis
+        // dominance check lets users still long-press for selection or
+        // horizontal-swipe for future features without false positives.
+        // Every scroll intent on this terminal — gesture, toolbar button,
+        // whatever — gets funneled through a synthetic WheelEvent dispatched
+        // on xterm's render root. This is deliberately NOT a direct call to
+        // term.scrollLines(), because that skips xterm's own buffer + mouse-
+        // mode routing. Letting xterm handle the wheel gives us all three
+        // correct behaviors for free:
+        //
+        //   1. Main buffer (at the shell prompt): xterm scrolls its own
+        //      10k-line scrollback locally — same as our first version.
+        //   2. Alternate buffer + TUI has enabled mouse tracking
+        //      (claude-code, hermes TUI, tmux with `mouse on`, less, vim
+        //      with `set mouse=a` — basically any modern TUI; it's what
+        //      makes hover-to-scroll work on desktop): xterm encodes the
+        //      wheel as an SGR mouse-wheel escape (\e[<64;col;rowM for
+        //      up / <65 for down) and forwards it to the PTY, so the TUI
+        //      scrolls its own content natively.
+        //   3. Alternate buffer + TUI has NOT enabled mouse tracking
+        //      (rare on modern TUIs; mostly old curses apps): xterm
+        //      ignores the wheel — safe no-op, no garbage injected.
+        const wheelTarget = function () {
+            return document.querySelector('.xterm-screen') ||
+                   document.querySelector('.xterm') ||
+                   document.getElementById('terminal');
+        };
+        const dispatchWheel = function (deltaY) {
+            const target = wheelTarget();
+            if (!target) {
+                console.warn('scrollTerminal: no wheel target element found');
+                return;
+            }
+            const rect = target.getBoundingClientRect();
+            // Mouse position matters for SGR wheel encoding — use the
+            // viewport center so TUIs that care (tmux split-pane) hit the
+            // right pane instead of always the top-left cell.
+            const clientX = rect.left + rect.width / 2;
+            const clientY = rect.top + rect.height / 2;
+            const evt = new WheelEvent('wheel', {
+                deltaY: deltaY,
+                deltaMode: 0, // DOM_DELTA_PIXEL
+                bubbles: true,
+                cancelable: true,
+                clientX: clientX,
+                clientY: clientY,
+            });
+            const altBuffer = (function () {
+                try { return term.buffer.active.type === 'alternate'; }
+                catch (_) { return false; }
+            })();
+            // Visible in logcat via TerminalWebView's onConsoleMessage —
+            // confirms the wheel fired and on which buffer. If scroll is
+            // not working in a TUI, this is the first thing to check:
+            // no line here = gesture path broken; line present but no
+            // TUI response = TUI hasn't enabled mouse tracking.
+            console.log('dispatchWheel: deltaY=' + deltaY +
+                ' altBuffer=' + altBuffer +
+                ' target=' + (target.className || target.id));
+            target.dispatchEvent(evt);
+        };
+
+        const lineHeightPx = function () {
+            const size = term.options.fontSize || 13;
+            const lh = term.options.lineHeight || 1.15;
+            return Math.max(10, size * lh);
+        };
+
+        window.scrollTerminalLines = function (lines) {
+            const n = Math.round(lines);
+            if (n === 0) return;
+            dispatchWheel(n * lineHeightPx());
+        };
+        window.scrollTerminalPages = function (pages) {
+            const n = Math.round(pages);
+            if (n === 0) return;
+            dispatchWheel(n * lineHeightPx() * Math.max(1, term.rows - 2));
+        };
+        // Jump-to-bottom only makes sense in the main buffer (alt buffer is
+        // always "at the bottom" — the TUI owns every visible row). In alt
+        // buffer we simply no-op rather than guess what "bottom" means for
+        // whichever app is running.
+        window.scrollTerminalToBottom = function () {
+            try {
+                if (term.buffer.active.type === 'alternate') return;
+                term.scrollToBottom();
+            } catch (_) {}
+        };
+        window.scrollTerminalToTop = function () {
+            try {
+                if (term.buffer.active.type === 'alternate') return;
+                term.scrollToTop();
+            } catch (_) {}
+        };
+
+        (function installTouchScroll() {
+            const root = document.getElementById('terminal');
+            if (!root) return;
+            let touchId = null;
+            let startY = 0;
+            let accumulated = 0;
+            // lineHeightPx() is defined at module scope above — it already
+            // tracks setFontSize() via term.options and returns a fresh
+            // value per call, so we just use it directly here.
+            const onStart = function (ev) {
+                if (ev.touches.length !== 1) { touchId = null; return; }
+                touchId = ev.touches[0].identifier;
+                startY = ev.touches[0].clientY;
+                accumulated = 0;
+            };
+            const onMove = function (ev) {
+                if (touchId === null) return;
+                let t = null;
+                for (let i = 0; i < ev.touches.length; i++) {
+                    if (ev.touches[i].identifier === touchId) { t = ev.touches[i]; break; }
+                }
+                if (!t) return;
+                const dy = t.clientY - startY;
+                // Only fire once past a small deadzone so long-press+select
+                // isn't stolen from xterm.
+                if (Math.abs(dy) < 12) return;
+                const lh = lineHeightPx();
+                const lines = Math.trunc((dy - accumulated) / lh);
+                if (lines !== 0) {
+                    // Route through the shared shim so alt-buffer detection
+                    // kicks in — TUIs (claude-code, hermes, vim, less) live
+                    // in the alt buffer and need real input events, while
+                    // the shell's main buffer uses local scrollback.
+                    // Finger down = older content, so we flip the sign.
+                    window.scrollTerminalLines(-lines);
+                    accumulated += lines * lh;
+                    ev.preventDefault();
+                }
+            };
+            const onEnd = function (ev) {
+                for (let i = 0; i < ev.changedTouches.length; i++) {
+                    if (ev.changedTouches[i].identifier === touchId) {
+                        touchId = null;
+                        return;
+                    }
+                }
+            };
+            // passive:false is required because we preventDefault above to
+            // stop the browser from also hijacking the gesture for refresh
+            // or selection.
+            root.addEventListener('touchstart', onStart, { passive: true });
+            root.addEventListener('touchmove', onMove, { passive: false });
+            root.addEventListener('touchend', onEnd, { passive: true });
+            root.addEventListener('touchcancel', onEnd, { passive: true });
+        })();
+
         // Refit on any container size change. ResizeObserver is more reliable
         // than `window.resize` on Android WebView — the window doesn't always
         // fire `resize` when Compose resizes the parent View, so the initial

app/src/main/assets/whats_new.txt

@@ -1,32 +1,7 @@
-v0.5.0 — Bridge Polish + Auto-Return
+v0.8.1 - Voice mode crash fix
 
-Bridge Tab Redesign
-• Master toggle now reads as the parent gate (MASTER pill + clearer copy)
-• Tap Switch without accessibility → Settings deep-link snackbar
-• Card order: Master → Permissions → Advanced → Unattended → Safety → Log
-• Permission rows always open Android Settings on tap (no more dead taps)
-
-Unattended Access (sideload)
-• Disabled when master is off — clear "Requires Agent Control" hint
-• New global banner across every tab when unattended is active
-• System overlay chip hides when you're inside Hermes-Relay (banner takes over)
-
-Smarter Agent Awareness
-• LLM now sees unattended state, screen state, and credential lock upfront
-• android_phone_status tool warns about screen-off + unattended-off ahead of time
-• Tool description updates push to host immediately on toggle flip
-
-Auto-Return After Tasks
-• Tightened LLM prompts to call android_return_to_hermes as the final step
-• 12s idle-timer safety net auto-fires the return for ANY frontend
-  (Discord, CLI, web, voice) — phone goes back to Hermes-Relay automatically
-
-Activity Log
-• Now actually records what the agent did — every tap, type, open_app, etc.
-• Success / Failed / Blocked status with route-specific summaries
-• Polling noise (ping, events) suppressed
-
-Other
-• "Current app" status finally populates and updates live (~5s tick)
-• Banner status-bar overlap fixed
-• TalkBack semantics added to global banner
+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.

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

@@ -18,6 +18,7 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 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.ui.RelayApp
 import com.hermesandroid.relay.util.ComposeArrWorkaround
 import com.hermesandroid.relay.util.NavRouteRequest
@@ -50,6 +51,10 @@ class MainActivity : ComponentActivity() {
         ActivityResultContracts.StartActivityForResult()
     ) { result ->
         val data = result.data
+        if (!BuildFlavor.isSideload) {
+            Log.w(TAG, "Ignoring MediaProjection result on Google Play Bridge Core build")
+            return@registerForActivityResult
+        }
         if (result.resultCode == RESULT_OK && data != null) {
             Log.i(TAG, "MediaProjection consent granted — handing off to FGS")
             BridgeForegroundService.grantMediaProjection(this, result.resultCode, data)
@@ -88,13 +93,15 @@ class MainActivity : ComponentActivity() {
         // Hand the launcher to the process-singleton rendezvous so
         // BridgeViewModel.requestScreenCapture() can fire the consent
         // dialog without holding an Activity reference.
-        ScreenCaptureRequester.install {
-            val mgr = getSystemService(Context.MEDIA_PROJECTION_SERVICE)
-                as MediaProjectionManager
-            try {
-                mediaProjectionLauncher.launch(mgr.createScreenCaptureIntent())
-            } catch (t: Throwable) {
-                Log.w(TAG, "failed to launch MediaProjection consent: ${t.message}")
+        if (BuildFlavor.isSideload) {
+            ScreenCaptureRequester.install {
+                val mgr = getSystemService(Context.MEDIA_PROJECTION_SERVICE)
+                    as MediaProjectionManager
+                try {
+                    mediaProjectionLauncher.launch(mgr.createScreenCaptureIntent())
+                } catch (t: Throwable) {
+                    Log.w(TAG, "failed to launch MediaProjection consent: ${t.message}")
+                }
             }
         }
         // === END PHASE3-bridge-ui-followup ===
@@ -140,15 +147,21 @@ class MainActivity : ComponentActivity() {
         // we don't leak the Activity past its lifecycle. The unattended-
         // access manager only attempts dismiss when an activity is
         // registered AND the user has opted in.
-        UnattendedAccessManager.setHostActivity(this)
+        if (BuildFlavor.isSideload) {
+            UnattendedAccessManager.setHostActivity(this)
+        }
         // Re-probe the credential-lock state on resume so the Bridge
         // tab badge updates immediately if the user just changed their
         // lock screen in system Settings between app sessions.
-        UnattendedAccessManager.refreshKeyguardState()
+        if (BuildFlavor.isSideload) {
+            UnattendedAccessManager.refreshKeyguardState()
+        }
     }
 
     override fun onPause() {
-        UnattendedAccessManager.setHostActivity(null)
+        if (BuildFlavor.isSideload) {
+            UnattendedAccessManager.setHostActivity(null)
+        }
         super.onPause()
     }
 
@@ -157,7 +170,9 @@ class MainActivity : ComponentActivity() {
         // Drop the launcher closure so we don't hold a stale Activity ref
         // after destroy. ScreenCaptureRequester.request() will return false
         // until the next MainActivity instance reinstalls itself.
-        ScreenCaptureRequester.uninstall()
+        if (BuildFlavor.isSideload) {
+            ScreenCaptureRequester.uninstall()
+        }
         // === END PHASE3-bridge-ui-followup ===
         super.onDestroy()
     }

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

@@ -140,8 +140,11 @@ class ActionExecutor(private val service: HermesAccessibilityService) {
             fun ok(data: Map<String, Any?> = mapOf("ok" to true)): ActionResult =
                 ActionResult(ok = true, data = data)
 
-            fun failure(message: String): ActionResult =
-                ActionResult(ok = false, error = message)
+            fun failure(
+                message: String,
+                data: Map<String, Any?> = emptyMap(),
+            ): ActionResult =
+                ActionResult(ok = false, data = data, error = message)
         }
     }
 
@@ -1622,13 +1625,22 @@ class ActionExecutor(private val service: HermesAccessibilityService) {
      */
     suspend fun sendSms(to: String, body: String): ActionResult {
         if (to.isBlank()) {
-            return ActionResult.failure("send_sms: recipient must be non-blank")
+            return ActionResult.failure(
+                "send_sms: recipient must be non-blank",
+                mapOf("status" to "failed", "reason" to "invalid_recipient"),
+            )
         }
         if (body.isEmpty()) {
-            return ActionResult.failure("send_sms: body must be non-empty")
+            return ActionResult.failure(
+                "send_sms: body must be non-empty",
+                mapOf("status" to "failed", "reason" to "invalid_schema"),
+            )
         }
         if (!to.matches(Regex("^[+0-9 ()\\-.]{2,}$"))) {
-            return ActionResult.failure("send_sms: recipient contains invalid characters")
+            return ActionResult.failure(
+                "send_sms: recipient contains invalid characters",
+                mapOf("status" to "failed", "reason" to "invalid_recipient"),
+            )
         }
 
         val ctx: Context = service
@@ -1636,7 +1648,12 @@ class ActionExecutor(private val service: HermesAccessibilityService) {
             != PackageManager.PERMISSION_GRANTED
         ) {
             return ActionResult.failure(
-                "Grant SMS permission in Settings > Apps > Hermes-Relay > Permissions"
+                "Grant SMS permission in Settings > Apps > Hermes-Relay > Permissions",
+                mapOf(
+                    "status" to "blocked",
+                    "reason" to "permission_denied",
+                    "required_permission" to Manifest.permission.SEND_SMS,
+                ),
             )
         }
 
@@ -1652,7 +1669,10 @@ class ActionExecutor(private val service: HermesAccessibilityService) {
             null
         }
         if (smsManager == null) {
-            return ActionResult.failure("SmsManager unavailable on this device")
+            return ActionResult.failure(
+                "SmsManager unavailable on this device",
+                mapOf("status" to "failed", "reason" to "sms_manager_unavailable"),
+            )
         }
 
         // Pick one intent action value — the receiver identifies us by
@@ -1708,7 +1728,10 @@ class ActionExecutor(private val service: HermesAccessibilityService) {
             ContextCompat.registerReceiver(ctx, receiver, filter, flags)
         } catch (t: Throwable) {
             Log.w(TAG, "registerReceiver for SMS_SENT threw: ${t.message}")
-            return ActionResult.failure("sms receiver registration failed: ${t.message}")
+            return ActionResult.failure(
+                "sms receiver registration failed: ${t.message}",
+                mapOf("status" to "failed", "reason" to "receiver_registration_failed"),
+            )
         }
 
         // One PendingIntent per part — SmsManager fires the broadcast with
@@ -1741,12 +1764,20 @@ class ActionExecutor(private val service: HermesAccessibilityService) {
         } catch (se: SecurityException) {
             try { ctx.unregisterReceiver(receiver) } catch (_: Throwable) { }
             return ActionResult.failure(
-                "SMS permission revoked or restricted — re-grant in system Settings"
+                "SMS permission revoked or restricted — re-grant in system Settings",
+                mapOf(
+                    "status" to "blocked",
+                    "reason" to "permission_denied",
+                    "required_permission" to Manifest.permission.SEND_SMS,
+                ),
             )
         } catch (t: Throwable) {
             try { ctx.unregisterReceiver(receiver) } catch (_: Throwable) { }
             Log.w(TAG, "sendTextMessage threw: ${t.message}")
-            return ActionResult.failure("send_sms failed: ${t.message}")
+            return ActionResult.failure(
+                "send_sms failed: ${t.message}",
+                mapOf("status" to "failed", "reason" to "android_exception"),
+            )
         }
 
         // Wait for the receiver to complete — with a 15s cap. If the radio
@@ -1757,18 +1788,28 @@ class ActionExecutor(private val service: HermesAccessibilityService) {
 
         if (result == null) {
             return ActionResult.failure(
-                "send_sms timeout after ${SEND_SMS_TIMEOUT_MS}ms — carrier never acked"
+                "send_sms timeout after ${SEND_SMS_TIMEOUT_MS}ms — carrier never acked",
+                mapOf(
+                    "status" to "timeout",
+                    "reason" to "carrier_ack_timeout",
+                    "android_result" to "timeout",
+                    "parts" to expectedParts,
+                ),
             )
         }
         return if (result == android.app.Activity.RESULT_OK) {
             ActionResult.ok(
                 mapOf(
+                    "status" to "sent",
+                    "android_result" to "RESULT_OK",
                     "to" to to,
                     "length" to body.length,
                     "parts" to expectedParts,
+                    "summary" to "SMS sent to $to ($expectedParts part(s))",
                 )
             )
         } else {
+            val androidResult = smsResultName(result)
             val reason = when (result) {
                 SmsManager.RESULT_ERROR_GENERIC_FAILURE -> "generic failure"
                 SmsManager.RESULT_ERROR_NO_SERVICE -> "no service"
@@ -1776,8 +1817,25 @@ class ActionExecutor(private val service: HermesAccessibilityService) {
                 SmsManager.RESULT_ERROR_RADIO_OFF -> "radio off (airplane mode?)"
                 else -> "result code $result"
             }
-            ActionResult.failure("send_sms failed: $reason")
+            ActionResult.failure(
+                "send_sms failed: $reason",
+                mapOf(
+                    "status" to "failed",
+                    "reason" to reason,
+                    "android_result" to androidResult,
+                    "parts" to expectedParts,
+                ),
+            )
         }
     }
 
+    private fun smsResultName(result: Int): String = when (result) {
+        android.app.Activity.RESULT_OK -> "RESULT_OK"
+        SmsManager.RESULT_ERROR_GENERIC_FAILURE -> "RESULT_ERROR_GENERIC_FAILURE"
+        SmsManager.RESULT_ERROR_NO_SERVICE -> "RESULT_ERROR_NO_SERVICE"
+        SmsManager.RESULT_ERROR_NULL_PDU -> "RESULT_ERROR_NULL_PDU"
+        SmsManager.RESULT_ERROR_RADIO_OFF -> "RESULT_ERROR_RADIO_OFF"
+        else -> "RESULT_$result"
+    }
+
 }

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

@@ -65,10 +65,10 @@ import kotlinx.serialization.json.put
  * }
  * ```
  *
- * `unattended.supported` is false on the googlePlay flavor — the Play
- * APK has no wake-lock path — which lets the agent distinguish "user
- * hasn't opted in" from "this build can't do unattended at all" without
- * a separate probe.
+ * `bridge.device_control_supported` and `unattended.supported` are false on
+ * the googlePlay flavor — the Play APK ships Bridge Core without
+ * AccessibilityService, wake locks, overlays, screenshots, or unattended
+ * control — which lets the agent avoid attempting sideload-only tools.
  *
  * The legacy top-level keys (`screen_on`, `battery`, `current_app`,
  * `accessibility_enabled`, `ts`) are ALSO emitted for backwards
@@ -188,6 +188,7 @@ class BridgeStatusReporter(
         val currentApp = HermesAccessibilityService.instance?.currentApp
         val accessibilityGranted = HermesAccessibilityService.instance != null
         val masterEnabled = HermesAccessibilityService.instance?.isMasterEnabled() ?: false
+        val deviceControlSupported = BuildFlavor.isSideload
 
         // Screen-capture grant — the process-singleton holder is non-null
         // iff the user granted MediaProjection consent this session.
@@ -257,10 +258,17 @@ class BridgeStatusReporter(
                     })
                 })
                 put("bridge", buildJsonObject {
-                    put("master_enabled", masterEnabled)
-                    put("accessibility_granted", accessibilityGranted)
-                    put("screen_capture_granted", screenCaptureGranted)
-                    put("overlay_granted", overlayGranted)
+                    put("device_control_supported", deviceControlSupported)
+                    put("master_enabled", if (deviceControlSupported) masterEnabled else false)
+                    put(
+                        "accessibility_granted",
+                        if (deviceControlSupported) accessibilityGranted else false,
+                    )
+                    put(
+                        "screen_capture_granted",
+                        if (deviceControlSupported) screenCaptureGranted else false,
+                    )
+                    put("overlay_granted", if (deviceControlSupported) overlayGranted else false)
                     put("notification_listener_granted", notificationListenerGranted)
                 })
                 put("safety", buildJsonObject {
@@ -285,11 +293,18 @@ class BridgeStatusReporter(
                 // when both `enabled=true` and this is true, commands
                 // will wake the screen but stop at the lock screen.
                 put("unattended", buildJsonObject {
-                    put("supported", BuildFlavor.isSideload)
-                    put("enabled", UnattendedAccessManager.enabled.value)
+                    put("supported", deviceControlSupported)
+                    put(
+                        "enabled",
+                        if (deviceControlSupported) UnattendedAccessManager.enabled.value else false,
+                    )
                     put(
                         "credential_lock_detected",
-                        UnattendedAccessManager.credentialLockDetected.value,
+                        if (deviceControlSupported) {
+                            UnattendedAccessManager.credentialLockDetected.value
+                        } else {
+                            false
+                        },
                     )
                 })
 
@@ -300,8 +315,8 @@ class BridgeStatusReporter(
                 // groups above.
                 put("screen_on", screenOn)
                 put("battery", batteryFinal)
-                put("current_app", currentApp ?: "unknown")
-                put("accessibility_enabled", accessibilityGranted)
+                put("current_app", if (deviceControlSupported) currentApp ?: "unknown" else "unknown")
+                put("accessibility_enabled", if (deviceControlSupported) accessibilityGranted else false)
                 put("ts", System.currentTimeMillis())
             }
         )

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

@@ -267,13 +267,12 @@ class HermesAccessibilityService : AccessibilityService() {
      * # Fallback semantics
      *
      * `service.windows` returns an empty list unless the accessibility
-     * config XML requests `flagRetrieveInteractiveWindows`. That flag is
-     * **only** set in the `sideload` flavor — the `googlePlay` flavor
-     * deliberately runs on the conservative config subset to pass Play
-     * Store policy review. When `windows` is empty (or throws, or every
-     * window's root is null) we fall back to a single-element list
-     * wrapping [rootInActiveWindow], preserving pre-P1 behaviour on
-     * `googlePlay` builds.
+     * config XML requests `flagRetrieveInteractiveWindows`. The service is
+     * declared only by the `sideload` manifest, and that sideload config sets
+     * the flag. When `windows` is empty (or throws, or every window's root is
+     * null) we fall back to a single-element list wrapping
+     * [rootInActiveWindow], preserving pre-P1 behaviour for tests and
+     * defensive runtime fallback.
      *
      * Returns an empty list only if the service cannot read any window
      * root at all (e.g. lock screen, master-off state). Callers should

app/src/main/kotlin/com/hermesandroid/relay/audio/BargeInListener.kt

@@ -0,0 +1,436 @@
+package com.hermesandroid.relay.audio
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.media.AudioFormat
+import android.media.AudioRecord
+import android.media.MediaRecorder
+import android.media.audiofx.AcousticEchoCanceler
+import android.media.audiofx.NoiseSuppressor
+import android.util.Log
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.yield
+import kotlin.math.max
+
+/**
+ * Duplex audio capture for voice barge-in (plan unit B3).
+ *
+ * While TTS is playing, this listener continuously pulls 32 ms / 512-sample
+ * PCM frames off the microphone and feeds them to [VadEngine]. It emits two
+ * SharedFlows that B4 will wire into the voice state machine:
+ *
+ *  - [maybeSpeech] fires on the **first** positive raw-VAD frame — before the
+ *    second-layer debouncer latches. B4 uses this to softly [VoicePlayer.duck]
+ *    the TTS so the user's voice has acoustic headroom while we decide whether
+ *    to cut off.
+ *
+ *  - [bargeInDetected] fires when [VadEngine] confirms speech post-hysteresis.
+ *    B4 uses this to call `interruptSpeaking()` and flip state to Listening.
+ *
+ * ### Acoustic echo cancellation
+ *
+ * We configure [AudioRecord] with [MediaRecorder.AudioSource.VOICE_COMMUNICATION]
+ * so the platform's voice-call AEC pipeline is in play, and additionally try
+ * to attach [AcousticEchoCanceler] + [NoiseSuppressor] keyed to the ExoPlayer
+ * audio session id so TTS audio is cancelled from the mic stream specifically.
+ * Without AEC, the device's own speaker output would trip the VAD the moment
+ * TTS started and we'd interrupt ourselves.
+ *
+ * The ExoPlayer audio session id is not stable at the moment we want to start
+ * listening — Media3 allocates the underlying AudioTrack lazily on first
+ * playback, and callers may hit [start] before that's happened (e.g. the very
+ * first sentence of a turn). We poll [audioSessionIdProvider] for up to 1 s
+ * before giving up on AEC and proceeding with the mic-hardware AEC alone.
+ * See the `AEC_SESSION_POLL_*` constants below.
+ *
+ * ### Graceful degradation
+ *
+ * - `AudioRecord.getState() != STATE_INITIALIZED` → log WARN, emit nothing,
+ *   [stop] remains safe to call. Typical cause: RECORD_AUDIO denied at runtime
+ *   or another app holding the mic.
+ * - `AcousticEchoCanceler.isAvailable() == false` → log INFO, proceed without.
+ *   Many mid-range and older devices lack the effect; the VAD still works with
+ *   the mic-hardware AEC from VOICE_COMMUNICATION alone (at the cost of some
+ *   false positives during loud TTS).
+ *
+ * ### Testability seam
+ *
+ * The hot path is abstracted behind [AudioFrameSource]. Production code uses
+ * [AudioRecordSource]; unit tests inject a deterministic fake. This keeps the
+ * test on the JVM unit test path with no Robolectric or `android.jar` shim,
+ * matching the [VadEngine] test pattern.
+ *
+ * ### Thread model
+ *
+ * [start] launches a single reader coroutine on [Dispatchers.IO]. The reader
+ * blocks on [AudioFrameSource.read], then synchronously invokes
+ * [VadEngine.analyze] on the same dispatcher — VadEngine is synchronous,
+ * allocation-free, and callers promise single-threaded access. Flow emissions
+ * use [MutableSharedFlow] with `extraBufferCapacity = 1` so slow subscribers
+ * drop events instead of backpressuring the audio loop.
+ */
+class BargeInListener internal constructor(
+    private val audioSource: AudioFrameSource,
+    private val vadEngine: VadEngine,
+    private val audioSessionIdProvider: () -> Int,
+    private val readerDispatcher: CoroutineDispatcher = Dispatchers.IO,
+) {
+
+    companion object {
+        private const val TAG = "BargeInListener"
+
+        /** Bytes per PCM sample at [AudioFormat.ENCODING_PCM_16BIT]. */
+        private const val BYTES_PER_SAMPLE = 2
+
+        /** Frames of buffering on the [AudioRecord] side. 4× keeps read() from
+         *  ever racing the DMA when the reader coroutine is scheduled with a
+         *  brief delay (GC pause, dispatcher contention). */
+        private const val AUDIO_BUFFER_FRAMES = 4
+
+        /** ExoPlayer may return `0` for its audio session id until its
+         *  AudioTrack is first allocated (on playback start). Poll the
+         *  provider briefly before giving up on AEC and proceeding without. */
+        private const val AEC_SESSION_POLL_INTERVAL_MS = 50L
+        private const val AEC_SESSION_POLL_TIMEOUT_MS = 1_000L
+
+        /**
+         * Factory for the production path. Builds an [AudioRecordSource] from
+         * a `Context` and wires it to the listener. The returned listener has
+         * no allocated `AudioRecord` yet — that happens inside [start].
+         */
+        fun create(
+            context: Context,
+            vadEngine: VadEngine,
+            audioSessionIdProvider: () -> Int,
+        ): BargeInListener = BargeInListener(
+            audioSource = AudioRecordSource(context.applicationContext),
+            vadEngine = vadEngine,
+            audioSessionIdProvider = audioSessionIdProvider,
+        )
+    }
+
+    private val _bargeInDetected = MutableSharedFlow<Unit>(extraBufferCapacity = 1)
+    /** Fires post-hysteresis when [VadEngine] confirms the user is speaking. */
+    val bargeInDetected: SharedFlow<Unit> = _bargeInDetected.asSharedFlow()
+
+    private val _maybeSpeech = MutableSharedFlow<Unit>(extraBufferCapacity = 1)
+    /** Fires on the first positive raw VAD frame, before hysteresis latches. */
+    val maybeSpeech: SharedFlow<Unit> = _maybeSpeech.asSharedFlow()
+
+    private val _aecAttached = MutableStateFlow(false)
+    /** True once [AcousticEchoCanceler] has been attached for the current
+     *  listen session. Exposed for observability and B5's compatibility hint. */
+    val aecAttached: StateFlow<Boolean> = _aecAttached.asStateFlow()
+
+    // Reused across every read() call so the hot loop never allocates a
+    // fresh buffer. Length matches the VAD engine's contract (512 samples).
+    private val frameBuffer: ShortArray = ShortArray(VadEngine.FRAME_SIZE_SAMPLES)
+
+    @Volatile private var readerJob: Job? = null
+    @Volatile private var aec: AcousticEchoCanceler? = null
+    @Volatile private var noiseSuppressor: NoiseSuppressor? = null
+
+    /**
+     * Allocate the audio pipeline and begin reading frames into [vadEngine].
+     *
+     * Launches on the supplied [scope] so the reader coroutine dies with its
+     * owner (the ViewModel scope in B4). [start] is not suspend in the usual
+     * "blocks until ready" sense — it returns as soon as the reader job is
+     * launched; the AEC attach happens lazily inside the coroutine so a
+     * caller waiting on the first [maybeSpeech] / [bargeInDetected] emission
+     * is not gated on an AudioTrack that hasn't been allocated yet.
+     *
+     * Idempotent: calling [start] again while a previous session is still
+     * active is a no-op with a WARN log — B4 is expected to bracket each
+     * listen session with a matching [stop].
+     */
+    fun start(scope: CoroutineScope) {
+        if (readerJob?.isActive == true) {
+            Log.w(TAG, "start() called while a reader is already active — ignoring")
+            return
+        }
+
+        if (!audioSource.initialize()) {
+            Log.w(
+                TAG,
+                "AudioFrameSource failed to initialize " +
+                    "(missing RECORD_AUDIO permission or mic busy) — listener inactive",
+            )
+            _aecAttached.value = false
+            return
+        }
+
+        _aecAttached.value = false
+        readerJob = scope.launch(readerDispatcher) {
+            try {
+                try {
+                    audioSource.start()
+                } catch (t: CancellationException) {
+                    throw t
+                } catch (t: Throwable) {
+                    Log.w(TAG, "AudioFrameSource.start failed: ${t.message}")
+                    return@launch
+                }
+                Log.i(TAG, "Barge-in AudioRecord reader started")
+                maybeAttachEffects()
+
+                while (isActive) {
+                    val read = try {
+                        audioSource.read(frameBuffer, VadEngine.FRAME_SIZE_SAMPLES)
+                    } catch (t: CancellationException) {
+                        throw t
+                    } catch (t: Throwable) {
+                        Log.w(TAG, "AudioFrameSource.read failed; stopping reader: ${t.message}")
+                        break
+                    }
+                    if (read <= 0) {
+                        // Negative values are AudioRecord error codes; 0 means
+                        // no data yet. Either way, yield briefly and retry
+                        // rather than spinning — but don't swallow the
+                        // cancellation check for too long.
+                        delay(5)
+                        continue
+                    }
+                    if (read < VadEngine.FRAME_SIZE_SAMPLES) {
+                        // Short read — skip this frame rather than feeding
+                        // the VAD a partially-populated buffer. This is rare;
+                        // AudioRecord.read(…, SIZE_IN_SHORTS) normally fills
+                        // the requested length when state is correct.
+                        continue
+                    }
+
+                    if (!isActive) break
+
+                    val result = try {
+                        vadEngine.analyze(frameBuffer)
+                    } catch (t: CancellationException) {
+                        throw t
+                    } catch (t: Throwable) {
+                        Log.w(TAG, "VadEngine.analyze failed; stopping reader: ${t.message}")
+                        break
+                    }
+                    if (result.probability > 0f) {
+                        _maybeSpeech.tryEmit(Unit)
+                    }
+                    if (result.isSpeech) {
+                        _bargeInDetected.tryEmit(Unit)
+                    }
+                    // Give the dispatcher a chance to observe cancellation
+                    // between frames. Production-side the AudioRecord.read
+                    // call already blocks until a frame is available, so
+                    // this is effectively free; test-side it prevents the
+                    // reader from monopolizing the test scheduler on fakes
+                    // that return data synchronously.
+                    yield()
+                }
+            } finally {
+                // Release effects + AudioRecord in the reverse of attach order
+                // so the AudioSessionId is still valid when AEC teardown runs.
+                releaseEffects()
+                runCatching { audioSource.stop() }
+                runCatching { audioSource.release() }
+                _aecAttached.value = false
+            }
+        }
+    }
+
+    /**
+     * Cancel the reader loop and release the mic + effects. Safe to call
+     * repeatedly and safe to call before [start]. Returns immediately; the
+     * actual release happens in the reader coroutine's `finally` block, which
+     * is typically a single frame later.
+     */
+    fun stop(): Job? {
+        val job = readerJob
+        if (job?.isActive == true) {
+            Log.i(TAG, "Stopping barge-in AudioRecord reader")
+        }
+        job?.cancel()
+        readerJob = null
+        return job
+    }
+
+    private suspend fun maybeAttachEffects() {
+        val sessionId = awaitNonZeroSessionId()
+        if (sessionId == 0) {
+            Log.i(
+                TAG,
+                "AEC not attached — ExoPlayer audio session id was still 0 " +
+                    "after ${AEC_SESSION_POLL_TIMEOUT_MS}ms poll; continuing " +
+                    "without effects (mic-hardware AEC from VOICE_COMMUNICATION " +
+                    "still in play)",
+            )
+            return
+        }
+
+        if (AcousticEchoCanceler.isAvailable()) {
+            try {
+                val created = AcousticEchoCanceler.create(sessionId)
+                if (created != null) {
+                    created.enabled = true
+                    aec = created
+                    _aecAttached.value = true
+                    Log.i(TAG, "AcousticEchoCanceler attached to session=$sessionId")
+                } else {
+                    Log.i(TAG, "AcousticEchoCanceler.create returned null; continuing without")
+                }
+            } catch (t: Throwable) {
+                Log.w(TAG, "AcousticEchoCanceler attach failed: ${t.message}")
+            }
+        } else {
+            Log.i(TAG, "AEC unavailable on this device; continuing without echo cancellation")
+        }
+
+        if (NoiseSuppressor.isAvailable()) {
+            try {
+                val ns = NoiseSuppressor.create(sessionId)
+                if (ns != null) {
+                    ns.enabled = true
+                    noiseSuppressor = ns
+                }
+            } catch (t: Throwable) {
+                Log.w(TAG, "NoiseSuppressor attach failed: ${t.message}")
+            }
+        }
+    }
+
+    private suspend fun awaitNonZeroSessionId(): Int {
+        val immediate = audioSessionIdProvider()
+        if (immediate != 0) return immediate
+
+        var waited = 0L
+        while (waited < AEC_SESSION_POLL_TIMEOUT_MS) {
+            delay(AEC_SESSION_POLL_INTERVAL_MS)
+            waited += AEC_SESSION_POLL_INTERVAL_MS
+            val id = audioSessionIdProvider()
+            if (id != 0) return id
+        }
+        return 0
+    }
+
+    private fun releaseEffects() {
+        aec?.let {
+            runCatching { it.enabled = false }
+            runCatching { it.release() }
+        }
+        aec = null
+        noiseSuppressor?.let {
+            runCatching { it.enabled = false }
+            runCatching { it.release() }
+        }
+        noiseSuppressor = null
+    }
+
+    /**
+     * Minimal seam over [AudioRecord] so the audio-source pipeline can be
+     * replaced with a deterministic fake in unit tests. Implementations are
+     * not thread-safe — callers promise single-threaded access from the
+     * reader coroutine.
+     */
+    internal interface AudioFrameSource {
+        /**
+         * Allocate underlying native resources. Returns true on success.
+         * Returning false from here short-circuits the listener without any
+         * downstream state flapping.
+         */
+        fun initialize(): Boolean
+
+        /** Begin streaming frames. Must be preceded by a successful [initialize]. */
+        fun start()
+
+        /** Read up to [sizeInShorts] samples into [buffer]; returns the number
+         *  of samples actually read (possibly 0 or negative for error states). */
+        fun read(buffer: ShortArray, sizeInShorts: Int): Int
+
+        /** Stop streaming. May be called multiple times. */
+        fun stop()
+
+        /** Release native resources. After this, the source is dead. */
+        fun release()
+    }
+
+    /**
+     * Real [AudioRecord]-backed frame source. Configures 16 kHz mono 16-bit
+     * PCM with [MediaRecorder.AudioSource.VOICE_COMMUNICATION] so the mic
+     * hardware AEC is engaged.
+     *
+     * The [Context] parameter is currently unused — [AudioRecord] doesn't
+     * need one — but we take it to keep the production factory signature
+     * symmetric with the rest of the audio stack (e.g. [VoiceRecorder])
+     * and to leave room for future permission-probe / audio-focus hooks
+     * without a constructor signature change.
+     */
+    @Suppress("unused", "UNUSED_PARAMETER")
+    private class AudioRecordSource(context: Context) : AudioFrameSource {
+        private var record: AudioRecord? = null
+
+        @SuppressLint("MissingPermission")
+        override fun initialize(): Boolean {
+            val sampleRate = 16_000
+            val channelConfig = AudioFormat.CHANNEL_IN_MONO
+            val encoding = AudioFormat.ENCODING_PCM_16BIT
+
+            val minBytes = AudioRecord.getMinBufferSize(sampleRate, channelConfig, encoding)
+            if (minBytes <= 0) {
+                Log.w(TAG, "AudioRecord.getMinBufferSize returned $minBytes — aborting")
+                return false
+            }
+            val ourBytes =
+                VadEngine.FRAME_SIZE_SAMPLES * BYTES_PER_SAMPLE * AUDIO_BUFFER_FRAMES
+            val bufferBytes = max(minBytes, ourBytes)
+
+            val r = try {
+                AudioRecord(
+                    MediaRecorder.AudioSource.VOICE_COMMUNICATION,
+                    sampleRate,
+                    channelConfig,
+                    encoding,
+                    bufferBytes,
+                )
+            } catch (t: Throwable) {
+                Log.w(TAG, "AudioRecord constructor threw: ${t.message}")
+                return false
+            }
+
+            if (r.state != AudioRecord.STATE_INITIALIZED) {
+                Log.w(TAG, "AudioRecord state=${r.state} (expected STATE_INITIALIZED)")
+                runCatching { r.release() }
+                return false
+            }
+
+            record = r
+            return true
+        }
+
+        override fun start() {
+            record?.startRecording()
+        }
+
+        override fun read(buffer: ShortArray, sizeInShorts: Int): Int {
+            val r = record ?: return -1
+            return r.read(buffer, 0, sizeInShorts)
+        }
+
+        override fun stop() {
+            runCatching { record?.stop() }
+        }
+
+        override fun release() {
+            runCatching { record?.release() }
+            record = null
+        }
+    }
+}

app/src/main/kotlin/com/hermesandroid/relay/audio/RealtimePcmPlayer.kt

@@ -0,0 +1,830 @@
+package com.hermesandroid.relay.audio
+
+import android.content.Context
+import android.media.AudioAttributes
+import android.media.AudioFocusRequest
+import android.media.AudioFormat
+import android.media.AudioManager
+import android.media.AudioTrack
+import android.os.Build
+import android.os.SystemClock
+import android.util.Log
+import com.hermesandroid.relay.diagnostics.DiagnosticCategory
+import com.hermesandroid.relay.diagnostics.DiagnosticSeverity
+import com.hermesandroid.relay.diagnostics.DiagnosticsLog
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlin.math.max
+import kotlin.math.sqrt
+
+/**
+ * Small streaming PCM sink for the realtime voice dev testbench.
+ *
+ * The relay sends mono 16-bit little-endian PCM chunks over the websocket. This
+ * writes them directly to an AudioTrack so the Android Studio dev build can
+ * hear provider output without waiting for an encoded file.
+ */
+class RealtimePcmPlayer(context: Context? = null) {
+    private val trackLock = Any()
+    private val writeLock = Any()
+    private val audioManager =
+        context?.applicationContext?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager
+    private val realtimeAudioAttributes = AudioAttributes.Builder()
+        .setUsage(AudioAttributes.USAGE_MEDIA)
+        .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
+        .build()
+    private val audioFocusChangeListener = AudioManager.OnAudioFocusChangeListener { change ->
+        Log.i(TAG, "Realtime PCM audio focus change=$change")
+    }
+    private var audioTrack: AudioTrack? = null
+    private var audioFocusRequest: AudioFocusRequest? = null
+    private var audioFocusHeld: Boolean = false
+    private var currentSampleRate: Int = 0
+    private var currentVolume: Float = 1f
+    private var estimatedPlaybackEndAtMs: Long = 0L
+    private var playbackStarted: Boolean = false
+    private var pendingStartBytes: Int = 0
+    private var firstBufferedAtMs: Long = 0L
+    private var lastUnderrunCount: Int = 0
+    private var lastHeadPositionLogAtMs: Long = 0L
+    private var lastLoggedHeadFrames: Int = 0
+    private var headAdvanceConfirmed: Boolean = false
+    private var playbackStartedAtMs: Long = 0L
+    private var totalFramesWritten: Long = 0L
+    // (endFrame, rms) per written chunk — lets [playbackAmplitude] report the
+    // amplitude of the audio actually at the hardware cursor right now, instead
+    // of the chunk that most recently *arrived* over the socket.
+    private val playbackAmpQueue = ArrayDeque<FrameAmp>()
+    private var lastPlaybackGapDiagnosticAtMs: Long = 0L
+    private var lastMutedVolumeDiagnosticAtMs: Long = 0L
+    private var adaptiveStartPrebufferMs: Long = RealtimePcmBufferPolicy.START_PREBUFFER_MS
+    private var playbackGapSeenThisTrack: Boolean = false
+    private val _amplitude = MutableStateFlow(0f)
+    val amplitude: StateFlow<Float> = _amplitude.asStateFlow()
+
+    val isActive: Boolean
+        get() = synchronized(trackLock) { audioTrack != null }
+
+    val audioSessionId: Int
+        get() = synchronized(trackLock) { audioTrack?.audioSessionId ?: 0 }
+
+    fun write(pcm: ByteArray, sampleRate: Int): Float {
+        if (pcm.isEmpty()) return 0f
+        val level = computePcm16LeRms(pcm)
+        val now = SystemClock.elapsedRealtime()
+        val written = synchronized(writeLock) {
+            val track = try {
+                synchronized(trackLock) {
+                    val currentTrack = ensureTrackLocked(sampleRate)
+                    notePlaybackGapLocked(currentTrack, now)
+                    currentTrack
+                }
+            } catch (e: Exception) {
+                Log.w(TAG, "PCM track preparation failed: ${e.message}")
+                synchronized(trackLock) { releaseTrackLocked(reason = "PCM track preparation failure") }
+                return@synchronized 0
+            }
+
+            try {
+                val prerollWritten = maybeWriteStartupPreroll(track, sampleRate)
+                if (prerollWritten < 0) {
+                    Log.w(TAG, "PCM preroll write returned $prerollWritten; restarting track")
+                    synchronized(trackLock) {
+                        if (audioTrack === track) releaseTrackLocked(reason = "PCM preroll write error")
+                    }
+                    return@synchronized 0
+                }
+                // Intentionally do NOT start playback on the bare silent preroll.
+                // Starting here would begin draining ~120ms of silence with zero
+                // real audio queued, guaranteeing an immediate underrun on the
+                // first speech chunk. The real audio written just below feeds the
+                // normal start decision, and the end-of-turn flush
+                // (voice.output_audio.done) force-starts anything still buffered.
+
+                val writtenBytes = writeBlocking(track, pcm)
+                if (writtenBytes < 0) {
+                    Log.w(TAG, "PCM write returned $writtenBytes; restarting track")
+                    synchronized(trackLock) {
+                        if (audioTrack === track) releaseTrackLocked(reason = "PCM write error")
+                    }
+                    return@synchronized 0
+                }
+
+                var accepted = 0
+                if (writtenBytes > 0) {
+                    synchronized(trackLock) {
+                        if (audioTrack === track) {
+                            noteWrittenBytesLocked(writtenBytes, sampleRate)
+                            enqueuePlaybackAmplitudeLocked(level)
+                            maybeStartPlaybackLocked(track, sampleRate, force = false)
+                            updateUnderrunCursorLocked(track)
+                            logPlaybackHealthLocked(track, now)
+                            accepted = writtenBytes
+                        }
+                    }
+                }
+                accepted
+            } catch (e: Exception) {
+                Log.w(TAG, "PCM write failed: ${e.message}")
+                synchronized(trackLock) {
+                    if (audioTrack === track) releaseTrackLocked(reason = "PCM write failure")
+                }
+                return@synchronized 0
+            }
+        }
+        if (written > 0) {
+            _amplitude.value = level
+        }
+        return level
+    }
+
+    private fun writeBlocking(track: AudioTrack, pcm: ByteArray): Int =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            track.write(pcm, 0, pcm.size, AudioTrack.WRITE_BLOCKING)
+        } else {
+            @Suppress("DEPRECATION")
+            track.write(pcm, 0, pcm.size)
+        }
+
+    fun flushBufferedPlayback(cushionMs: Long = DEFAULT_DRAIN_CUSHION_MS): Long {
+        val now = SystemClock.elapsedRealtime()
+        return synchronized(trackLock) {
+            val track = audioTrack ?: return@synchronized 0L
+            maybeStartPlaybackLocked(track, currentSampleRate, force = true)
+            val remaining = remainingPlaybackMsLocked(now, cushionMs)
+            Log.i(
+                TAG,
+                "Realtime PCM flush playState=${readPlayState(track)} " +
+                    "headFrames=${readHeadFrames(track)} remainingMs=$remaining " +
+                    "underruns=${readUnderrunCount(track)}",
+            )
+            remaining
+        }
+    }
+
+    fun stop() {
+        synchronized(writeLock) {
+            synchronized(trackLock) {
+                releaseTrackLocked(reason = "stop")
+                currentSampleRate = 0
+                estimatedPlaybackEndAtMs = 0L
+            }
+        }
+        _amplitude.value = 0f
+    }
+
+    fun estimatedRemainingPlaybackMs(cushionMs: Long = DEFAULT_DRAIN_CUSHION_MS): Long {
+        val now = SystemClock.elapsedRealtime()
+        return synchronized(trackLock) {
+            remainingPlaybackMsLocked(now, cushionMs)
+        }
+    }
+
+    fun setVolume(volume: Float) {
+        val clamped = volume.coerceIn(0f, 1f)
+        synchronized(trackLock) {
+            currentVolume = clamped
+            try { audioTrack?.setVolume(clamped) } catch (_: Exception) { }
+        }
+    }
+
+    fun duck() {
+        setVolume(0.3f)
+    }
+
+    fun unduck() {
+        setVolume(1f)
+    }
+
+    private fun releaseTrackLocked(reason: String) {
+        audioTrack?.let { track ->
+            Log.i(TAG, "Stopping streaming PCM playback ($reason)")
+            try { track.pause() } catch (_: Exception) { }
+            try { track.flush() } catch (_: Exception) { }
+            try { track.release() } catch (_: Exception) { }
+        }
+        abandonAudioFocusLocked()
+        settleAdaptivePrebufferLocked()
+        audioTrack = null
+        playbackStarted = false
+        pendingStartBytes = 0
+        firstBufferedAtMs = 0L
+        lastUnderrunCount = 0
+        lastHeadPositionLogAtMs = 0L
+        lastLoggedHeadFrames = 0
+        headAdvanceConfirmed = false
+        playbackStartedAtMs = 0L
+        totalFramesWritten = 0L
+        playbackAmpQueue.clear()
+        playbackGapSeenThisTrack = false
+    }
+
+    private fun enqueuePlaybackAmplitudeLocked(rms: Float) {
+        // [totalFramesWritten] has already been advanced past this chunk, so it
+        // is the chunk's end frame. The cursor reaches this amplitude once
+        // playbackHeadPosition passes the previous end frame.
+        playbackAmpQueue.addLast(FrameAmp(endFrame = totalFramesWritten, rms = rms))
+        while (playbackAmpQueue.size > MAX_AMP_QUEUE) playbackAmpQueue.removeFirst()
+    }
+
+    /**
+     * Amplitude of the audio currently at the hardware cursor (0 if not playing
+     * or drained). This is the playback-synced signal a UI waveform should draw:
+     * it advances with [AudioTrack.getPlaybackHeadPosition], so it matches what
+     * the user hears rather than what most recently arrived over the socket.
+     */
+    fun playbackAmplitude(): Float = synchronized(trackLock) {
+        val track = audioTrack ?: return@synchronized 0f
+        if (!playbackStarted) return@synchronized 0f
+        val head = readHeadFrames(track).toLong()
+        // Drop fully-played chunks so the head of the queue is the one playing now.
+        while (playbackAmpQueue.size > 1 && playbackAmpQueue.first().endFrame <= head) {
+            playbackAmpQueue.removeFirst()
+        }
+        amplitudeAtHead(playbackAmpQueue, head)
+    }
+
+    private fun ensureTrackLocked(sampleRate: Int): AudioTrack {
+        val existing = audioTrack
+        if (existing != null && currentSampleRate == sampleRate) {
+            return existing
+        }
+        releaseTrackLocked(reason = "sample rate changed")
+
+        val minBuffer = AudioTrack.getMinBufferSize(
+            sampleRate,
+            AudioFormat.CHANNEL_OUT_MONO,
+            AudioFormat.ENCODING_PCM_16BIT,
+        ).coerceAtLeast(sampleRate / 10 * 2)
+        val bufferSize = RealtimePcmBufferPolicy.streamBufferSize(
+            minBufferBytes = minBuffer,
+            sampleRate = sampleRate,
+        )
+        val format = AudioFormat.Builder()
+            .setEncoding(AudioFormat.ENCODING_PCM_16BIT)
+            .setSampleRate(sampleRate)
+            .setChannelMask(AudioFormat.CHANNEL_OUT_MONO)
+            .build()
+
+        val track = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            AudioTrack.Builder()
+                .setAudioAttributes(realtimeAudioAttributes)
+                .setAudioFormat(format)
+                .setTransferMode(AudioTrack.MODE_STREAM)
+                .setBufferSizeInBytes(bufferSize)
+                .build()
+        } else {
+            @Suppress("DEPRECATION")
+            AudioTrack(
+                AudioManager.STREAM_MUSIC,
+                sampleRate,
+                AudioFormat.CHANNEL_OUT_MONO,
+                AudioFormat.ENCODING_PCM_16BIT,
+                bufferSize,
+                AudioTrack.MODE_STREAM,
+            )
+        }
+
+        if (track.state != AudioTrack.STATE_INITIALIZED) {
+            try { track.release() } catch (_: Exception) { }
+            throw IllegalStateException("AudioTrack failed to initialize")
+        }
+
+        requestAudioFocusLocked()
+        audioTrack = track
+        currentSampleRate = sampleRate
+        playbackStarted = false
+        pendingStartBytes = 0
+        firstBufferedAtMs = 0L
+        totalFramesWritten = 0L
+        lastUnderrunCount = readUnderrunCount(track)
+        // Log requested vs. actual allocated frames. If a device coerces our
+        // sub-second request back up to a multi-second allocation, that's the
+        // tell-tale of deep-buffer routing (the cold-start parking class) and
+        // explains a regression of the silent-first-turn bug on new hardware.
+        val requestedFrames = bufferSize / BYTES_PER_FRAME
+        val actualFrames = try { track.bufferSizeInFrames } catch (_: Exception) { -1 }
+        Log.i(
+            TAG,
+            "Initialized streaming PCM playback at ${sampleRate}Hz " +
+                "session=${track.audioSessionId} buffer=${bufferSize}B " +
+                "requestedFrames=$requestedFrames actualFrames=$actualFrames " +
+                "(${frameMs(actualFrames, sampleRate)}ms)",
+        )
+        return track
+    }
+
+    private fun frameMs(frames: Int, sampleRate: Int): Long {
+        if (frames <= 0 || sampleRate <= 0) return 0L
+        return (frames * 1000L / sampleRate)
+    }
+
+    private fun noteWrittenBytesLocked(writtenBytes: Int, sampleRate: Int) {
+        if (writtenBytes <= 0 || sampleRate <= 0) return
+        totalFramesWritten += (writtenBytes / BYTES_PER_FRAME).toLong()
+        val durationMs = ((writtenBytes / 2.0) / sampleRate * 1000.0)
+            .toLong()
+            .coerceAtLeast(1L)
+        val now = SystemClock.elapsedRealtime()
+        if (!playbackStarted) {
+            if (firstBufferedAtMs == 0L) firstBufferedAtMs = now
+            pendingStartBytes += writtenBytes
+            return
+        }
+        val base = max(now, estimatedPlaybackEndAtMs)
+        estimatedPlaybackEndAtMs = base + durationMs
+    }
+
+    private fun maybeWriteStartupPreroll(track: AudioTrack, sampleRate: Int): Int {
+        if (
+            synchronized(trackLock) {
+                playbackStarted ||
+                    pendingStartBytes > 0 ||
+                    firstBufferedAtMs > 0L ||
+                    sampleRate <= 0 ||
+                    audioTrack !== track
+            }
+        ) {
+            return 0
+        }
+
+        val prerollMs = startupPrerollMsLocked()
+        val silenceBytes = RealtimePcmBufferPolicy.bytesForDurationMs(sampleRate, prerollMs)
+        if (silenceBytes <= 0) return 0
+
+        val written = writeBlocking(track, ByteArray(silenceBytes))
+        if (written > 0) {
+            synchronized(trackLock) {
+                if (audioTrack === track) {
+                    noteWrittenBytesLocked(written, sampleRate)
+                    enqueuePlaybackAmplitudeLocked(0f) // preroll is silence
+                    Log.i(
+                        TAG,
+                        "Primed realtime PCM playback with " +
+                            "${RealtimePcmBufferPolicy.durationMsForBytes(written, sampleRate)}ms " +
+                            "silent preroll",
+                    )
+                }
+            }
+        }
+        return written
+    }
+
+    private fun startupPrerollMsLocked(): Long {
+        return RealtimePcmBufferPolicy.STARTUP_PREROLL_MS
+    }
+
+    private fun maybeStartPlaybackLocked(
+        track: AudioTrack,
+        sampleRate: Int,
+        force: Boolean,
+    ) {
+        if (playbackStarted || pendingStartBytes <= 0 || sampleRate <= 0) return
+        val now = SystemClock.elapsedRealtime()
+        val waitedMs = if (firstBufferedAtMs > 0L) now - firstBufferedAtMs else 0L
+        val decision = RealtimePcmBufferPolicy.startDecision(
+            pendingBytes = pendingStartBytes,
+            sampleRate = sampleRate,
+            waitedMs = waitedMs,
+            force = force,
+            startPrebufferMs = adaptiveStartPrebufferMs,
+        )
+        if (!decision.shouldStart) return
+
+        try {
+            requestAudioFocusLocked()
+            track.play()
+            try { track.setVolume(currentVolume) } catch (_: Exception) { }
+        } catch (e: Exception) {
+            try { track.release() } catch (_: Exception) { }
+            audioTrack = null
+            throw e
+        }
+
+        playbackStarted = true
+        estimatedPlaybackEndAtMs = now + decision.bufferedMs
+        playbackStartedAtMs = now
+        lastHeadPositionLogAtMs = now
+        lastLoggedHeadFrames = readHeadFrames(track)
+        headAdvanceConfirmed = false
+        Log.i(
+            TAG,
+            "Started streaming PCM playback at ${sampleRate}Hz " +
+                "session=${track.audioSessionId} prebuffer=${decision.bufferedMs}ms " +
+                "waited=${waitedMs}ms target=${adaptiveStartPrebufferMs}ms " +
+                "reason=${decision.reason} playState=${readPlayState(track)} " +
+                "headFrames=$lastLoggedHeadFrames ${mediaVolumeSummaryLocked()}",
+        )
+        pendingStartBytes = 0
+        firstBufferedAtMs = 0L
+        lastUnderrunCount = readUnderrunCount(track)
+    }
+
+    /**
+     * Periodically logs whether the AudioTrack hardware cursor is actually
+     * advancing. This is the decisive signal for the "speaking animation + valid
+     * PCM logs but no sound" class of bug:
+     *
+     *  - head frames advancing + still no sound → output route / volume problem
+     *    (e.g. the Samsung HAL not opening the path until a volume key nudges it).
+     *  - head frames pinned at the start value → the track was play()'d but the
+     *    mixer never pulled from it (focus / state problem on this device).
+     */
+    private fun logPlaybackHealthLocked(track: AudioTrack, now: Long) {
+        if (!playbackStarted) return
+        val headFrames = readHeadFrames(track)
+        // First-frame detection runs on EVERY write until confirmed (not gated by
+        // the throttle) and uses a fresh timestamp, so time-to-first-audio is
+        // accurate to write cadence rather than the 1s health-log window — the
+        // throttle/stale-`now` combination otherwise inflates it by ~1.5s.
+        if (!headAdvanceConfirmed && headFrames > 0) {
+            headAdvanceConfirmed = true
+            val freshNow = SystemClock.elapsedRealtime()
+            val ttfaMs = if (playbackStartedAtMs > 0L) freshNow - playbackStartedAtMs else -1L
+            Log.i(
+                TAG,
+                "Realtime PCM time-to-first-audio=${ttfaMs}ms (headFrames=$headFrames)",
+            )
+            DiagnosticsLog.record(
+                category = DiagnosticCategory.Voice,
+                severity = DiagnosticSeverity.Info,
+                title = "Realtime audio started",
+                detail = "First sample reached the speaker after ${ttfaMs}ms.",
+            )
+        }
+        if (now - lastHeadPositionLogAtMs < HEAD_POSITION_LOG_THROTTLE_MS) return
+        val advancedFrames = headFrames - lastLoggedHeadFrames
+        Log.i(
+            TAG,
+            "Realtime PCM playback health playState=${readPlayState(track)} " +
+                "headFrames=$headFrames advanced=$advancedFrames " +
+                "underruns=${readUnderrunCount(track)} ${mediaVolumeSummaryLocked()}",
+        )
+        if (advancedFrames <= 0) {
+            Log.w(
+                TAG,
+                "Realtime PCM hardware cursor not advancing (headFrames=$headFrames " +
+                    "playState=${readPlayState(track)}); audio queued but mixer is not pulling",
+            )
+            maybeRecordStuckCursorDiagnosticLocked(track, now)
+        }
+        lastHeadPositionLogAtMs = now
+        lastLoggedHeadFrames = headFrames
+    }
+
+    /**
+     * If the hardware cursor never started after [STUCK_CURSOR_DIAGNOSTIC_MS] of
+     * "playing", surface it to the in-app Diagnostics screen once per track —
+     * this is the field-visible signal for the cold-start parking class when no
+     * logcat cable is attached. Write-sampled here; the [VoiceViewModel] watchdog
+     * provides the timer-driven guarantee when writes stall.
+     */
+    private fun maybeRecordStuckCursorDiagnosticLocked(track: AudioTrack, now: Long) {
+        if (headAdvanceConfirmed || playbackStartedAtMs <= 0L) return
+        val stuckMs = now - playbackStartedAtMs
+        if (stuckMs < STUCK_CURSOR_DIAGNOSTIC_MS) return
+        if (now - lastPlaybackGapDiagnosticAtMs < PLAYBACK_GAP_DIAGNOSTIC_THROTTLE_MS) return
+        lastPlaybackGapDiagnosticAtMs = now
+        DiagnosticsLog.record(
+            category = DiagnosticCategory.Voice,
+            severity = DiagnosticSeverity.Warning,
+            title = "Realtime audio not starting",
+            detail = "Playback running ${stuckMs}ms but no audio reached the speaker " +
+                "(${mediaVolumeSummaryLocked()}).",
+        )
+    }
+
+    /**
+     * Immutable snapshot of playback progress for the [VoiceViewModel] watchdog
+     * and drain cross-check. Reads are cheap and lock-guarded.
+     */
+    fun snapshot(): RealtimePlaybackSnapshot = synchronized(trackLock) {
+        val track = audioTrack
+        RealtimePlaybackSnapshot(
+            active = track != null,
+            playbackStarted = playbackStarted,
+            headFrames = track?.let { readHeadFrames(it) } ?: 0,
+            framesWritten = totalFramesWritten,
+            sampleRate = currentSampleRate,
+            playStatePlaying = track != null && readPlayState(track) == "playing",
+            startedAtElapsedMs = playbackStartedAtMs,
+        )
+    }
+
+    private fun readHeadFrames(track: AudioTrack): Int =
+        try { track.playbackHeadPosition } catch (_: Exception) { lastLoggedHeadFrames }
+
+    private fun readPlayState(track: AudioTrack): String =
+        try {
+            when (track.playState) {
+                AudioTrack.PLAYSTATE_PLAYING -> "playing"
+                AudioTrack.PLAYSTATE_PAUSED -> "paused"
+                AudioTrack.PLAYSTATE_STOPPED -> "stopped"
+                else -> "unknown"
+            }
+        } catch (_: Exception) {
+            "error"
+        }
+
+    private fun notePlaybackGapLocked(track: AudioTrack, now: Long) {
+        if (!playbackStarted) return
+        val underrunCount = readUnderrunCount(track)
+        val platformUnderrun = underrunCount > lastUnderrunCount
+        val estimatedDrained = estimatedPlaybackEndAtMs > 0L &&
+            now > estimatedPlaybackEndAtMs + RealtimePcmBufferPolicy.UNDERFLOW_GRACE_MS
+        if (!platformUnderrun && !estimatedDrained) return
+
+        val reason = if (platformUnderrun) {
+            "platform underrun ${lastUnderrunCount}→$underrunCount"
+        } else {
+            "stream gap ${now - estimatedPlaybackEndAtMs}ms"
+        }
+        Log.w(TAG, "Realtime PCM continuing after $reason")
+        recordPlaybackGapDiagnosticLocked(now, reason)
+        playbackGapSeenThisTrack = true
+        increaseAdaptivePrebufferLocked(reason)
+
+        // Provider-native realtime streams can legitimately arrive in uneven
+        // bursts while the model decides to call tools. Keep the AudioTrack
+        // alive so already queued speech is not flushed and the next chunk can
+        // resume naturally after Android's underrun recovery.
+        if (estimatedDrained) {
+            estimatedPlaybackEndAtMs = now
+        }
+        lastUnderrunCount = underrunCount
+    }
+
+    private fun increaseAdaptivePrebufferLocked(reason: String) {
+        val previous = adaptiveStartPrebufferMs
+        adaptiveStartPrebufferMs = (adaptiveStartPrebufferMs + ADAPTIVE_PREBUFFER_STEP_MS)
+            .coerceAtMost(RealtimePcmBufferPolicy.MAX_ADAPTIVE_START_PREBUFFER_MS)
+        if (adaptiveStartPrebufferMs != previous) {
+            Log.i(
+                TAG,
+                "Realtime PCM adaptive prebuffer increased to ${adaptiveStartPrebufferMs}ms " +
+                    "after $reason",
+            )
+        }
+    }
+
+    private fun settleAdaptivePrebufferLocked() {
+        if (playbackGapSeenThisTrack) return
+        val previous = adaptiveStartPrebufferMs
+        adaptiveStartPrebufferMs = (adaptiveStartPrebufferMs - ADAPTIVE_PREBUFFER_DECAY_MS)
+            .coerceAtLeast(RealtimePcmBufferPolicy.START_PREBUFFER_MS)
+        if (adaptiveStartPrebufferMs != previous) {
+            Log.i(
+                TAG,
+                "Realtime PCM adaptive prebuffer relaxed to ${adaptiveStartPrebufferMs}ms",
+            )
+        }
+    }
+
+    private fun recordPlaybackGapDiagnosticLocked(now: Long, reason: String) {
+        if (now - lastPlaybackGapDiagnosticAtMs < PLAYBACK_GAP_DIAGNOSTIC_THROTTLE_MS) return
+        lastPlaybackGapDiagnosticAtMs = now
+        DiagnosticsLog.record(
+            category = DiagnosticCategory.Voice,
+            severity = DiagnosticSeverity.Warning,
+            title = "Realtime audio stream gap",
+            detail = reason,
+        )
+    }
+
+    private fun requestAudioFocusLocked() {
+        val manager = audioManager ?: return
+        val now = SystemClock.elapsedRealtime()
+        val mediaVolume = runCatching { manager.getStreamVolume(AudioManager.STREAM_MUSIC) }.getOrNull()
+        val maxVolume = runCatching { manager.getStreamMaxVolume(AudioManager.STREAM_MUSIC) }.getOrNull()
+        if (mediaVolume == 0 && now - lastMutedVolumeDiagnosticAtMs > MUTED_VOLUME_DIAGNOSTIC_THROTTLE_MS) {
+            lastMutedVolumeDiagnosticAtMs = now
+            Log.w(TAG, "Realtime PCM playback is starting while media volume is muted")
+            DiagnosticsLog.record(
+                category = DiagnosticCategory.Voice,
+                severity = DiagnosticSeverity.Warning,
+                title = "Realtime voice volume muted",
+                detail = "Media volume is 0/${maxVolume ?: "?"}.",
+            )
+        }
+        if (audioFocusHeld) {
+            Log.i(TAG, "Realtime PCM audio focus already held ${mediaVolumeSummaryLocked()}")
+            return
+        }
+        val result = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val request = audioFocusRequest ?: AudioFocusRequest.Builder(
+                AudioManager.AUDIOFOCUS_GAIN_TRANSIENT,
+            )
+                .setAudioAttributes(realtimeAudioAttributes)
+                .setAcceptsDelayedFocusGain(false)
+                .setOnAudioFocusChangeListener(audioFocusChangeListener)
+                .build()
+                .also { audioFocusRequest = it }
+            manager.requestAudioFocus(request)
+        } else {
+            @Suppress("DEPRECATION")
+            manager.requestAudioFocus(
+                audioFocusChangeListener,
+                AudioManager.STREAM_MUSIC,
+                AudioManager.AUDIOFOCUS_GAIN_TRANSIENT,
+            )
+        }
+        audioFocusHeld = result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED
+        Log.i(
+            TAG,
+            "Realtime PCM audio focus result=$result held=$audioFocusHeld ${mediaVolumeSummaryLocked()}",
+        )
+    }
+
+    private fun abandonAudioFocusLocked() {
+        val manager = audioManager ?: return
+        if (!audioFocusHeld) return
+        runCatching {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                audioFocusRequest?.let { manager.abandonAudioFocusRequest(it) }
+            } else {
+                @Suppress("DEPRECATION")
+                manager.abandonAudioFocus(audioFocusChangeListener)
+            }
+        }.onFailure {
+            Log.w(TAG, "Realtime PCM audio focus abandon failed: ${it.message}")
+        }
+        audioFocusHeld = false
+    }
+
+    private fun mediaVolumeSummaryLocked(): String {
+        val manager = audioManager ?: return "mediaVolume=unknown"
+        val volume = runCatching { manager.getStreamVolume(AudioManager.STREAM_MUSIC) }.getOrNull()
+        val maxVolume = runCatching { manager.getStreamMaxVolume(AudioManager.STREAM_MUSIC) }.getOrNull()
+        val musicActive = runCatching { manager.isMusicActive }.getOrNull()
+        return "mediaVolume=${volume ?: "?"}/${maxVolume ?: "?"} musicActive=${musicActive ?: "?"}"
+    }
+
+    private fun updateUnderrunCursorLocked(track: AudioTrack) {
+        val underrunCount = readUnderrunCount(track)
+        if (underrunCount > lastUnderrunCount) {
+            lastUnderrunCount = underrunCount
+        }
+    }
+
+    private fun readUnderrunCount(track: AudioTrack): Int =
+        try { track.underrunCount } catch (_: Exception) { lastUnderrunCount }
+
+    private fun remainingPlaybackMsLocked(now: Long, cushionMs: Long): Long {
+        if (audioTrack == null) return 0L
+        if (!playbackStarted) {
+            return RealtimePcmBufferPolicy.durationMsForBytes(
+                bytes = pendingStartBytes,
+                sampleRate = currentSampleRate,
+            ) + cushionMs.coerceAtLeast(0L)
+        }
+        return (estimatedPlaybackEndAtMs - now + cushionMs).coerceAtLeast(0L)
+    }
+
+    private fun computePcm16LeRms(pcm: ByteArray): Float {
+        val usable = pcm.size - (pcm.size % 2)
+        if (usable <= 0) return 0f
+
+        var sumSquares = 0.0
+        var samples = 0
+        var index = 0
+        while (index < usable) {
+            val low = pcm[index].toInt() and 0xff
+            val high = pcm[index + 1].toInt()
+            val sample = ((high shl 8) or low).toShort().toInt()
+            val normalized = sample / Short.MAX_VALUE.toDouble()
+            sumSquares += normalized * normalized
+            samples++
+            index += 2
+        }
+        if (samples == 0) return 0f
+
+        val rms = sqrt(sumSquares / samples)
+        val lifted = sqrt((rms / 0.28).coerceIn(0.0, 1.0))
+        return if (lifted.isNaN() || lifted.isInfinite()) 0f else lifted.toFloat().coerceIn(0f, 1f)
+    }
+
+    companion object {
+        private const val TAG = "RealtimePcmPlayer"
+        private const val DEFAULT_DRAIN_CUSHION_MS = 250L
+        private const val PLAYBACK_GAP_DIAGNOSTIC_THROTTLE_MS = 5_000L
+        private const val MUTED_VOLUME_DIAGNOSTIC_THROTTLE_MS = 10_000L
+        private const val ADAPTIVE_PREBUFFER_STEP_MS = 240L
+        private const val ADAPTIVE_PREBUFFER_DECAY_MS = 120L
+        private const val HEAD_POSITION_LOG_THROTTLE_MS = 1_000L
+        private const val STUCK_CURSOR_DIAGNOSTIC_MS = 1_200L
+        private const val BYTES_PER_FRAME = 2 // mono 16-bit PCM
+        private const val MAX_AMP_QUEUE = 1_024
+    }
+}
+
+/**
+ * Lock-free value snapshot of realtime playback progress, consumed by the
+ * [com.hermesandroid.relay.viewmodel.VoiceViewModel] first-frame watchdog and
+ * drain cross-check.
+ */
+data class RealtimePlaybackSnapshot(
+    val active: Boolean,
+    val playbackStarted: Boolean,
+    val headFrames: Int,
+    val framesWritten: Long,
+    val sampleRate: Int,
+    val playStatePlaying: Boolean,
+    val startedAtElapsedMs: Long,
+)
+
+/** A written PCM chunk's RMS amplitude tagged with the frame it finishes at. */
+internal data class FrameAmp(val endFrame: Long, val rms: Float)
+
+/**
+ * Returns the amplitude of the first chunk that has not finished playing
+ * ([FrameAmp.endFrame] > [headFrames]) — i.e. the audio at the cursor right now.
+ * 0 when the queue is empty or fully drained. Pure for unit testing.
+ */
+internal fun amplitudeAtHead(queue: List<FrameAmp>, headFrames: Long): Float {
+    for (entry in queue) {
+        if (entry.endFrame > headFrames) return entry.rms
+    }
+    return 0f
+}
+
+internal data class RealtimePcmStartDecision(
+    val shouldStart: Boolean,
+    val bufferedMs: Long,
+    val reason: String,
+)
+
+internal object RealtimePcmBufferPolicy {
+    // Realtime voice is latency-sensitive: the provider streams PCM at (or faster
+    // than) realtime, so the start prebuffer only needs to cover network jitter,
+    // not the whole turn. The large [STREAM_BUFFER_MS] AudioTrack buffer absorbs
+    // bursts *after* playback starts; the start thresholds just decide when the
+    // very first sample is allowed to leave the queue.
+    //
+    // A short turn whose audio arrives faster than realtime used to satisfy
+    // neither the (2.4s) prebuffer nor the (1.2s) max-wait, so it never started
+    // mid-stream and depended entirely on the end-of-turn flush. Lowering these
+    // lets streaming start on the first few chunks while keeping enough cushion
+    // to ride out jitter.
+    const val STARTUP_PREROLL_MS = 120L
+    const val START_PREBUFFER_MS = 320L
+    const val MIN_PREBUFFER_MS = 160L
+    const val MAX_PREBUFFER_WAIT_MS = 280L
+    const val MAX_ADAPTIVE_START_PREBUFFER_MS = 1_200L
+    // Keep the AudioTrack buffer modest. A multi-second buffer gets routed to
+    // Samsung's "deep buffer" output mixer, whose thread is suspended at rest and
+    // cold-starts very slowly — the hardware cursor (playbackHeadPosition) stays
+    // pinned at 0 for ~2-5s after play() even though playState=PLAYING, focus is
+    // held and volume is up. That parked window is the inaudible first/short
+    // turn. A sub-second buffer keeps playback on the primary (fast) mixer path,
+    // which begins pulling immediately. The ~700ms still absorbs normal network
+    // jitter; longer provider gaps (tool calls) underrun-and-resume regardless of
+    // buffer size and are handled by notePlaybackGapLocked.
+    const val STREAM_BUFFER_MS = 700L
+    const val UNDERFLOW_GRACE_MS = 180L
+
+    fun streamBufferSize(minBufferBytes: Int, sampleRate: Int): Int {
+        val target = bytesForDurationMs(sampleRate, STREAM_BUFFER_MS)
+        return max(minBufferBytes, target)
+    }
+
+    fun startDecision(
+        pendingBytes: Int,
+        sampleRate: Int,
+        waitedMs: Long,
+        force: Boolean,
+        startPrebufferMs: Long = START_PREBUFFER_MS,
+    ): RealtimePcmStartDecision {
+        val bufferedMs = durationMsForBytes(pendingBytes, sampleRate)
+        val targetPrebufferMs = startPrebufferMs.coerceIn(
+            START_PREBUFFER_MS,
+            MAX_ADAPTIVE_START_PREBUFFER_MS,
+        )
+        val reason = when {
+            force && pendingBytes > 0 -> "flush"
+            bufferedMs >= targetPrebufferMs -> "prebuffer"
+            bufferedMs >= MIN_PREBUFFER_MS && waitedMs >= MAX_PREBUFFER_WAIT_MS -> "max-wait"
+            else -> "buffering"
+        }
+        return RealtimePcmStartDecision(
+            shouldStart = reason != "buffering",
+            bufferedMs = bufferedMs,
+            reason = reason,
+        )
+    }
+
+    fun durationMsForBytes(bytes: Int, sampleRate: Int): Long {
+        if (bytes <= 0 || sampleRate <= 0) return 0L
+        return ((bytes / 2.0) / sampleRate * 1000.0)
+            .toLong()
+            .coerceAtLeast(1L)
+    }
+
+    fun bytesForDurationMs(sampleRate: Int, durationMs: Long): Int {
+        if (sampleRate <= 0 || durationMs <= 0L) return 0
+        return (sampleRate * 2L * durationMs / 1000L).toInt()
+    }
+
+    fun startupPrerollBytes(sampleRate: Int): Int =
+        bytesForDurationMs(sampleRate, STARTUP_PREROLL_MS)
+}

app/src/main/kotlin/com/hermesandroid/relay/audio/RealtimePcmRecorder.kt

@@ -0,0 +1,145 @@
+package com.hermesandroid.relay.audio
+
+import android.annotation.SuppressLint
+import android.media.AudioFormat
+import android.media.AudioRecord
+import android.media.MediaRecorder
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.io.ByteArrayOutputStream
+import kotlin.math.min
+import kotlin.math.sqrt
+
+/**
+ * Captures mono 16-bit PCM for realtime voice test runs.
+ *
+ * [capture] grabs a fixed short window (legacy/back-compat). [captureUntilStopped]
+ * records open-endedly until [requestStop] is called (tap-to-stop), which is what
+ * the Mic demo needs to capture a full spoken sentence.
+ */
+class RealtimePcmRecorder(
+    private val sampleRate: Int = 16_000,
+) {
+    @Volatile
+    private var capturing = false
+
+    /** Signals an in-flight [captureUntilStopped] to finish and return. */
+    fun requestStop() {
+        capturing = false
+    }
+
+    val isCapturing: Boolean
+        get() = capturing
+
+    /**
+     * Records until [requestStop] is called or [maxDurationMs] elapses, invoking
+     * [onLevel] (0..1 RMS) per read so the UI can show a live input waveform.
+     */
+    @SuppressLint("MissingPermission")
+    suspend fun captureUntilStopped(
+        maxDurationMs: Long = 15_000,
+        onLevel: ((Float) -> Unit)? = null,
+    ): ByteArray = withContext(Dispatchers.IO) {
+        val minBuffer = AudioRecord.getMinBufferSize(
+            sampleRate,
+            AudioFormat.CHANNEL_IN_MONO,
+            AudioFormat.ENCODING_PCM_16BIT,
+        ).coerceAtLeast(sampleRate / 10 * 2)
+        val maxBytes = ((sampleRate * maxDurationMs) / 1000L * 2L).toInt()
+
+        val recorder = AudioRecord.Builder()
+            .setAudioSource(MediaRecorder.AudioSource.MIC)
+            .setAudioFormat(
+                AudioFormat.Builder()
+                    .setEncoding(AudioFormat.ENCODING_PCM_16BIT)
+                    .setSampleRate(sampleRate)
+                    .setChannelMask(AudioFormat.CHANNEL_IN_MONO)
+                    .build()
+            )
+            .setBufferSizeInBytes(minBuffer)
+            .build()
+
+        val out = ByteArrayOutputStream(minBuffer * 4)
+        val buffer = ByteArray(minBuffer)
+        capturing = true
+        try {
+            recorder.startRecording()
+            while (capturing && out.size() < maxBytes) {
+                val read = recorder.read(buffer, 0, buffer.size)
+                if (read > 0) {
+                    out.write(buffer, 0, read)
+                    onLevel?.invoke(rms16Le(buffer, read))
+                } else {
+                    break
+                }
+            }
+        } finally {
+            capturing = false
+            try { recorder.stop() } catch (_: Exception) { }
+            recorder.release()
+        }
+        out.toByteArray()
+    }
+
+    @SuppressLint("MissingPermission")
+    suspend fun capture(durationMs: Long = 800): ByteArray = withContext(Dispatchers.IO) {
+        val minBuffer = AudioRecord.getMinBufferSize(
+            sampleRate,
+            AudioFormat.CHANNEL_IN_MONO,
+            AudioFormat.ENCODING_PCM_16BIT,
+        ).coerceAtLeast(sampleRate / 10 * 2)
+        val targetBytes = ((sampleRate * durationMs) / 1000L * 2L)
+            .toInt()
+            .coerceAtLeast(minBuffer)
+
+        val recorder = AudioRecord.Builder()
+            .setAudioSource(MediaRecorder.AudioSource.MIC)
+            .setAudioFormat(
+                AudioFormat.Builder()
+                    .setEncoding(AudioFormat.ENCODING_PCM_16BIT)
+                    .setSampleRate(sampleRate)
+                    .setChannelMask(AudioFormat.CHANNEL_IN_MONO)
+                    .build()
+            )
+            .setBufferSizeInBytes(minBuffer)
+            .build()
+
+        val out = ByteArrayOutputStream(targetBytes)
+        val buffer = ByteArray(minBuffer)
+        try {
+            recorder.startRecording()
+            while (out.size() < targetBytes) {
+                val read = recorder.read(
+                    buffer,
+                    0,
+                    min(buffer.size, targetBytes - out.size()),
+                )
+                if (read > 0) {
+                    out.write(buffer, 0, read)
+                } else {
+                    break
+                }
+            }
+        } finally {
+            try { recorder.stop() } catch (_: Exception) { }
+            recorder.release()
+        }
+        out.toByteArray()
+    }
+
+    private fun rms16Le(buffer: ByteArray, length: Int): Float {
+        val usable = length - (length % 2)
+        if (usable <= 0) return 0f
+        var sum = 0.0
+        var i = 0
+        while (i < usable) {
+            val low = buffer[i].toInt() and 0xff
+            val high = buffer[i + 1].toInt()
+            val sample = ((high shl 8) or low).toShort().toInt() / 32768.0
+            sum += sample * sample
+            i += 2
+        }
+        val rms = sqrt(sum / (usable / 2))
+        return sqrt((rms / 0.28).coerceIn(0.0, 1.0)).toFloat()
+    }
+}

app/src/main/kotlin/com/hermesandroid/relay/audio/VadEngine.kt

@@ -0,0 +1,266 @@
+package com.hermesandroid.relay.audio
+
+import android.content.Context
+import androidx.annotation.VisibleForTesting
+import com.hermesandroid.relay.data.BargeInSensitivity
+import com.konovalov.vad.silero.VadSilero
+import com.konovalov.vad.silero.config.FrameSize
+import com.konovalov.vad.silero.config.Mode
+import com.konovalov.vad.silero.config.SampleRate
+
+/**
+ * Voice activity detection engine for barge-in (plan unit B2).
+ *
+ * Wraps the upstream `com.github.gkonovalov.android-vad:silero` Silero VAD
+ * behind a project-internal interface so callers never see the library type —
+ * swapping to `vad-webrtc` or another backend later is a single-file change
+ * here, not a fan-out edit across [com.hermesandroid.relay.audio.BargeInListener]
+ * (B3) and [com.hermesandroid.relay.viewmodel.VoiceViewModel] (B4).
+ *
+ * ### Frame contract
+ *
+ * - 16 kHz mono 16-bit PCM.
+ * - Exactly **512 samples** per call (32 ms at 16 kHz). This is the smallest
+ *   Silero-supported frame size at 16 kHz per the library's public
+ *   `supportedParameters` map (512, 1024, 1536); 512 keeps latency tight.
+ *   The plan document references 640 samples — that was the previous library
+ *   constraint before the Silero 2.0 series dropped 160/320/640/1024 in
+ *   favour of 512/1024/1536. Use 512.
+ * - [analyze] is synchronous. Cost is one ONNX forward pass + a couple of
+ *   counter increments. Callers (B3) feed frames in a tight loop; any heap
+ *   allocation beyond the returned [VadResult] is avoided.
+ *
+ * ### Two-layer hysteresis
+ *
+ * 1. **Library layer** — Silero's own `isSpeech()` already applies an
+ *    attack/release window driven by `speechDurationMs`/`silenceDurationMs`
+ *    ([SENSITIVITY_PROFILES]). This handles per-frame wobble from the DNN.
+ * 2. **Our layer** — on top, we require `consecutiveSpeechFrames` successive
+ *    post-library `true` returns before [VadResult.isSpeech] flips to `true`.
+ *    This is the "2–3 consecutive speech frames" debouncer from the plan.
+ *
+ * The two layers compose: library filters per-frame noise, ours defends
+ * against short false-positive bursts (~40 ms) that slip through.
+ *
+ * ### Sensitivity semantics
+ *
+ * [BargeInSensitivity.Off] short-circuits: [analyze] always returns
+ * `isSpeech=false` without touching the model. Useful as a "disable without
+ * flipping the master enabled toggle" UI affordance.
+ */
+class VadEngine @VisibleForTesting internal constructor(
+    private val client: VadClient,
+    sampleRate: Int,
+) {
+
+    /**
+     * Production constructor. Builds a real Silero-backed [VadClient].
+     *
+     * @param sampleRate currently pinned to 16000 — other rates are not
+     *   supported by this engine (and the plan standardises on 16 kHz mic
+     *   capture in B3).
+     */
+    constructor(context: Context, sampleRate: Int = 16_000) : this(
+        client = SileroVadClient(context.applicationContext, sampleRate.toSampleRate()),
+        sampleRate = sampleRate,
+    )
+
+    init {
+        require(sampleRate == 16_000) {
+            "VadEngine currently supports only 16 kHz sample rate; got $sampleRate"
+        }
+    }
+
+    @Volatile
+    private var sensitivity: BargeInSensitivity = BargeInSensitivity.Default
+
+    @Volatile
+    private var profile: SensitivityProfile = SENSITIVITY_PROFILES.getValue(BargeInSensitivity.Default)
+        .also { client.applyProfile(it) }
+
+    // Rolling counters for the second-layer "N consecutive speech frames"
+    // hysteresis. These are touched only from [analyze], which callers drive
+    // single-threaded from B3's audio-read loop, so no synchronization is
+    // required beyond reading the latest [profile] volatile.
+    private var consecutiveSpeechCount: Int = 0
+    private var debounced: Boolean = false
+
+    /**
+     * Analyze one frame of 16-bit PCM audio.
+     *
+     * @param frame exactly [FRAME_SIZE_SAMPLES] (512) samples at 16 kHz. Any
+     *   other size is rejected by the Silero backend.
+     * @return a [VadResult] whose [VadResult.isSpeech] incorporates both the
+     *   library's internal attack/release and our N-consecutive debouncer;
+     *   [VadResult.probability] is a coarse 0f/1f signal derived from the
+     *   pre-debounce library decision (Silero's public API exposes only the
+     *   boolean, not the raw confidence).
+     */
+    fun analyze(frame: ShortArray): VadResult {
+        if (sensitivity == BargeInSensitivity.Off) {
+            return VadResult.NOT_SPEECH
+        }
+
+        val rawSpeech = client.isSpeech(frame)
+
+        if (rawSpeech) {
+            if (consecutiveSpeechCount < profile.consecutiveSpeechFrames) {
+                consecutiveSpeechCount++
+            }
+            if (consecutiveSpeechCount >= profile.consecutiveSpeechFrames) {
+                debounced = true
+            }
+        } else {
+            consecutiveSpeechCount = 0
+            debounced = false
+        }
+
+        return if (debounced) {
+            VadResult(isSpeech = true, probability = 1f)
+        } else {
+            VadResult(isSpeech = false, probability = if (rawSpeech) 1f else 0f)
+        }
+    }
+
+    /**
+     * Apply a sensitivity preset. Updates the library's attack/release
+     * durations and our debouncer's `consecutive` count. Safe to call from
+     * the UI thread; takes effect on the next [analyze].
+     */
+    fun setSensitivity(sensitivity: BargeInSensitivity) {
+        this.sensitivity = sensitivity
+        val newProfile = SENSITIVITY_PROFILES.getValue(sensitivity)
+        profile = newProfile
+        client.applyProfile(newProfile)
+        // Reset the second-layer debouncer so a sensitivity change doesn't
+        // latch a stale speech count from the previous profile.
+        consecutiveSpeechCount = 0
+        debounced = false
+    }
+
+    /** Release the underlying ONNX session and native resources. */
+    fun close() {
+        client.close()
+    }
+
+    companion object {
+        /** Samples per analyze-call at 16 kHz (32 ms). */
+        const val FRAME_SIZE_SAMPLES: Int = 512
+
+        /**
+         * Sensitivity → `(libraryMode, speechDurationMs, silenceDurationMs,
+         * consecutiveSpeechFrames)` map. Tunings come from the B2 unit spec
+         * in `docs/plans/2026-04-17-voice-barge-in.md`.
+         *
+         * The Silero library does not accept an arbitrary threshold float
+         * — it hardcodes one per [Mode]. So we lean on [Mode] for threshold
+         * and use `speech/silenceDurationMs` for the library-layer
+         * attack/release, with our own `consecutiveSpeechFrames` for the
+         * second-layer debouncer.
+         *
+         * Mode mapping (more aggressive = lower threshold = more sensitive):
+         *   - [BargeInSensitivity.Low]  → [Mode.VERY_AGGRESSIVE] (high thr)
+         *   - [BargeInSensitivity.Default] → [Mode.AGGRESSIVE]
+         *   - [BargeInSensitivity.High] → [Mode.NORMAL] (lowest thr)
+         *
+         * NOTE: "aggressive" in the Silero library refers to how aggressively
+         * it rejects non-speech (higher threshold), so Low-sensitivity UX
+         * maps to the MORE aggressive library mode.
+         */
+        internal val SENSITIVITY_PROFILES: Map<BargeInSensitivity, SensitivityProfile> = mapOf(
+            BargeInSensitivity.Off to SensitivityProfile(
+                mode = Mode.VERY_AGGRESSIVE,
+                attackMs = 0,
+                releaseMs = 0,
+                consecutiveSpeechFrames = Int.MAX_VALUE,
+            ),
+            BargeInSensitivity.Low to SensitivityProfile(
+                mode = Mode.VERY_AGGRESSIVE,
+                attackMs = 80,
+                releaseMs = 300,
+                consecutiveSpeechFrames = 3,
+            ),
+            BargeInSensitivity.Default to SensitivityProfile(
+                mode = Mode.AGGRESSIVE,
+                attackMs = 50,
+                releaseMs = 250,
+                consecutiveSpeechFrames = 2,
+            ),
+            BargeInSensitivity.High to SensitivityProfile(
+                mode = Mode.NORMAL,
+                attackMs = 30,
+                releaseMs = 200,
+                consecutiveSpeechFrames = 1,
+            ),
+        )
+    }
+
+    /**
+     * Internal seam over the Silero library so unit tests can replace the
+     * native ONNX-backed client with a deterministic fake. Not exposed
+     * publicly — callers always go through [VadEngine].
+     */
+    internal interface VadClient {
+        fun isSpeech(frame: ShortArray): Boolean
+        fun applyProfile(profile: SensitivityProfile)
+        fun close()
+    }
+
+    internal data class SensitivityProfile(
+        val mode: Mode,
+        val attackMs: Int,
+        val releaseMs: Int,
+        val consecutiveSpeechFrames: Int,
+    )
+
+    private class SileroVadClient(
+        context: Context,
+        sampleRate: SampleRate,
+    ) : VadClient {
+        // Built lazily with a default profile so construction doesn't race
+        // with an initial [applyProfile] call from [VadEngine.init].
+        private val vad: VadSilero = VadSilero(
+            context = context,
+            sampleRate = sampleRate,
+            frameSize = FrameSize.FRAME_SIZE_512,
+            mode = Mode.AGGRESSIVE,
+            speechDurationMs = 50,
+            silenceDurationMs = 250,
+        )
+
+        override fun isSpeech(frame: ShortArray): Boolean = vad.isSpeech(frame)
+
+        override fun applyProfile(profile: SensitivityProfile) {
+            vad.mode = profile.mode
+            vad.speechDurationMs = profile.attackMs
+            vad.silenceDurationMs = profile.releaseMs
+        }
+
+        override fun close() {
+            vad.close()
+        }
+    }
+}
+
+/**
+ * Result of a single [VadEngine.analyze] call.
+ *
+ * [isSpeech] is the post-debounce decision callers should act on.
+ * [probability] is a best-effort confidence hint — Silero's public API
+ * exposes only a boolean, so we surface a coarse 0f/1f until we swap to a
+ * backend that gives us the raw score.
+ */
+data class VadResult(
+    val isSpeech: Boolean,
+    val probability: Float,
+) {
+    companion object {
+        internal val NOT_SPEECH = VadResult(isSpeech = false, probability = 0f)
+    }
+}
+
+private fun Int.toSampleRate(): SampleRate = when (this) {
+    8_000 -> SampleRate.SAMPLE_RATE_8K
+    16_000 -> SampleRate.SAMPLE_RATE_16K
+    else -> error("Unsupported sample rate: $this")
+}

app/src/main/kotlin/com/hermesandroid/relay/audio/VoicePlayer.kt

@@ -1,30 +1,59 @@
 package com.hermesandroid.relay.audio
 
-import android.media.MediaPlayer
+import android.content.Context
 import android.media.audiofx.Visualizer
 import android.util.Log
-import kotlinx.coroutines.suspendCancellableCoroutine
+import androidx.annotation.OptIn
+import androidx.core.net.toUri
+import androidx.media3.common.MediaItem
+import androidx.media3.common.Player
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.exoplayer.analytics.AnalyticsListener
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.first
 import java.io.File
-import kotlin.coroutines.resume
 import kotlin.math.sqrt
 
 /**
- * Plays a TTS audio file emitted by the relay's `/voice/synthesize` endpoint
+ * Plays TTS audio files emitted by the relay's `/voice/synthesize` endpoint
  * and exposes a live [amplitude] flow for the MorphingSphere / UI meter.
  *
+ * Backed by a single Media3 [ExoPlayer] that lives for the lifetime of this
+ * [VoicePlayer] instance. [play] appends a new [MediaItem] to the player's
+ * queue so adjacent TTS sentences play back-to-back without the per-file
+ * codec re-init seam that the old `MediaPlayer` implementation produced.
+ * This is the foundation of the Wave 1 gapless-playback work in the voice
+ * quality pass plan — V5 in `docs/plans/2026-04-16-voice-quality-pass.md`.
+ *
  * Amplitude is computed from [Visualizer] PCM waveform RMS — one waveform
  * snapshot is captured every ~40 ms (the visualizer's default capture rate)
  * and reduced to a 0..1 float. On devices that don't allow Visualizer
  * construction (missing MODIFY_AUDIO_SETTINGS or OEM quirks) we log and
  * continue with amplitude pinned at 0 rather than crashing the voice session.
  *
- * One player instance owns at most one active playback. Calling [play] again
- * while something is playing stops the previous file first.
+ * 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.
+ *
+ * @param context used for [ExoPlayer.Builder]. Application context is fine;
+ *   the player holds no view references.
+ * @param exoPlayerFactory seam for unit tests — production defaults to a
+ *   real Media3 `ExoPlayer.Builder` with `setHandleAudioBecomingNoisy`.
+ *   Tests inject a MockK mock directly to avoid
+ *   `mockkConstructor(ExoPlayer.Builder::class)`, which fails on the
+ *   JVM unit test classpath because Media3's `Builder` static init
+ *   chain pulls in android.os.Looper etc. that aren't shadowed there.
  */
-class VoicePlayer {
+@OptIn(UnstableApi::class)
+class VoicePlayer(
+    context: Context,
+    exoPlayerFactory: (Context) -> ExoPlayer = ::defaultExoPlayer,
+) {
 
     companion object {
         private const val TAG = "VoicePlayer"
@@ -34,99 +63,259 @@ class VoicePlayer {
     private val _amplitude = MutableStateFlow(0f)
     val amplitude: StateFlow<Float> = _amplitude.asStateFlow()
 
-    private var mediaPlayer: MediaPlayer? = null
+    // Mirrors the most recent value passed to [setVolume] / [duck] / [unduck].
+    // ExoPlayer's own `volume` getter is the source of truth for the audio
+    // pipeline, but we keep a local copy so callers can introspect current
+    // ducking state without racing the underlying ExoPlayer thread, and so
+    // future reconfig paths (reconstruct ExoPlayer, swap sink, etc.) can
+    // re-apply the same volume without losing the caller's intent.
+    @Volatile private var currentVolume: Float = 1f
+
+    // Tracked via Player.Listener.onIsPlayingChanged so awaitCompletion can
+    // suspend on the combined (isPlaying, mediaItemCount) signal without
+    // polling the player from arbitrary threads.
+    private val _isPlaying = MutableStateFlow(false)
+
+    // Logical count of media items still owned by this playback turn. ExoPlayer
+    // retains played playlist items after STATE_ENDED, so this cannot mirror
+    // mediaItemCount blindly at end-of-queue.
+    private val _queueCount = MutableStateFlow(0)
+
     private var visualizer: Visualizer? = null
-    private var completionListener: (() -> Unit)? = null
+    private var visualizerAttached = false
+
+    // Thread-safe mirror of [ExoPlayer.getAudioSessionId]. ExoPlayer is
+    // thread-confined — every accessor (the audioSessionId getter included)
+    // calls verifyApplicationThread() and throws "Player is accessed on the
+    // wrong thread" if touched off the player's construction thread. The
+    // barge-in pipeline reads [audioSessionId] from BargeInListener's
+    // Dispatchers.IO reader coroutine to attach AcousticEchoCanceler, so we
+    // can't expose the raw getter. Instead we cache the id from the
+    // main-thread Media3 callbacks below and serve the getter from this
+    // @Volatile field. (Fixes the legacy-TTS + barge-in crash where the
+    // first sentence played for ~2 syllables before the IO read threw.)
+    @Volatile private var cachedAudioSessionId: Int = 0
+
+    private val exoPlayer: ExoPlayer = exoPlayerFactory(context.applicationContext)
+
+    init {
+        // AnalyticsListener callbacks are delivered on the player's
+        // application (main) thread, so caching the id here is the
+        // authoritative, thread-correct way to track it as Media3 allocates
+        // and reallocates the underlying AudioTrack.
+        exoPlayer.addAnalyticsListener(object : AnalyticsListener {
+            override fun onAudioSessionIdChanged(
+                eventTime: AnalyticsListener.EventTime,
+                audioSessionId: Int,
+            ) {
+                cachedAudioSessionId = audioSessionId
+            }
+        })
+        exoPlayer.addListener(object : Player.Listener {
+            override fun onIsPlayingChanged(isPlaying: Boolean) {
+                _isPlaying.value = isPlaying
+                if (!isPlaying) _amplitude.value = 0f
+                // Lazily attach the Visualizer the first time playback
+                // actually begins — the audio session id is stable from
+                // player construction on Media3 1.x but some OEM pipelines
+                // don't allocate the track until playback starts.
+                if (isPlaying) {
+                    // Belt-and-braces with the analytics listener above: this
+                    // 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).
+                    cachedAudioSessionId = exoPlayer.audioSessionId
+                    if (!visualizerAttached) {
+                        attachVisualizer(cachedAudioSessionId)
+                    }
+                }
+            }
+
+            override fun onMediaItemTransition(
+                mediaItem: MediaItem?,
+                reason: Int,
+            ) {
+                // Refresh on every transition — covers auto-advance drain
+                // at end-of-queue and explicit seekToNext paths.
+                _queueCount.value = exoPlayer.mediaItemCount
+            }
+
+            override fun onPlaybackStateChanged(state: Int) {
+                when (state) {
+                    Player.STATE_ENDED -> {
+                        // Media3 keeps consumed playlist entries around. Clear
+                        // them here so awaitCompletion observes a true drain and
+                        // voice mode can leave Speaking when the last TTS chunk ends.
+                        exoPlayer.clearMediaItems()
+                        _queueCount.value = 0
+                        _isPlaying.value = false
+                        _amplitude.value = 0f
+                    }
+                    Player.STATE_IDLE -> {
+                        if (exoPlayer.mediaItemCount == 0) {
+                            _queueCount.value = 0
+                        }
+                    }
+                }
+            }
+        })
+    }
 
     /**
-     * Start playback of [audioFile]. Returns immediately; completion is
-     * delivered via [awaitCompletion]. If another file is already playing,
-     * [stop]s it first.
+     * Append [audioFile] to the ExoPlayer queue. If the player is idle, also
+     * [ExoPlayer.prepare] and [ExoPlayer.play]. Non-blocking — completion is
+     * delivered via [awaitCompletion], which now observes the entire queue
+     * rather than a single file.
      */
     fun play(audioFile: File) {
-        if (mediaPlayer != null) {
-            Log.w(TAG, "play called while another file is playing — stopping first")
-            stop()
+        val wasIdle = exoPlayer.mediaItemCount == 0 &&
+            exoPlayer.playbackState != Player.STATE_READY &&
+            exoPlayer.playbackState != Player.STATE_BUFFERING
+        exoPlayer.addMediaItem(MediaItem.fromUri(audioFile.toUri()))
+        _queueCount.value = exoPlayer.mediaItemCount
+        if (wasIdle) {
+            exoPlayer.prepare()
+            exoPlayer.play()
+        } else if (!exoPlayer.isPlaying && exoPlayer.playWhenReady.not()) {
+            // Queue had drained but player wasn't torn down — restart.
+            exoPlayer.play()
         }
-
-        val player = MediaPlayer()
-        try {
-            player.setDataSource(audioFile.absolutePath)
-            player.prepare()
-            player.setOnCompletionListener {
-                _amplitude.value = 0f
-                completionListener?.invoke()
-            }
-            player.setOnErrorListener { _, what, extra ->
-                Log.e(TAG, "MediaPlayer error: what=$what extra=$extra")
-                _amplitude.value = 0f
-                completionListener?.invoke()
-                true
-            }
-            player.start()
-        } catch (e: Exception) {
-            Log.e(TAG, "MediaPlayer setup failed: ${e.message}")
-            try { player.release() } catch (_: Exception) { /* ignore */ }
-            throw e
-        }
-
-        mediaPlayer = player
-        attachVisualizer(player)
     }
 
     /**
-     * Suspend until the current playback completes or errors. Cancellable —
-     * if the caller cancels, playback is left running (use [stop] for a
-     * hard teardown).
+     * Suspend until the ExoPlayer queue is drained AND playback has stopped.
+     *
+     * **Semantic change from the old MediaPlayer implementation.** Previously
+     * this returned when the *current file* completed. Now it returns when
+     * the entire logical queue has been consumed — i.e. `_queueCount == 0 &&
+     * !isPlaying`. This matches the gapless-playback model where adjacent
+     * sentences play back-to-back from the same ExoPlayer, and it's exactly
+     * what the V4 prefetch pipelining rewrite needs (synth worker can enqueue
+     * N+1 while play worker is still awaiting queue-drain on N).
+     *
+     * If a caller appends new items to the queue while this is suspended,
+     * the wait extends through the new items as well.
+     *
+     * Cancellable. If the caller cancels, playback is left running — use
+     * [stop] for a hard teardown.
      */
-    suspend fun awaitCompletion(): Unit = suspendCancellableCoroutine { cont ->
-        if (mediaPlayer == null) {
-            cont.resume(Unit)
-            return@suspendCancellableCoroutine
-        }
-        completionListener = {
-            completionListener = null
-            if (cont.isActive) cont.resume(Unit)
-        }
-        cont.invokeOnCancellation {
-            completionListener = null
-        }
+    suspend fun awaitCompletion() {
+        // Fast-path: already idle.
+        if (_queueCount.value == 0 && !_isPlaying.value) return
+        combine(_queueCount, _isPlaying) { count, playing -> count == 0 && !playing }
+            .first { drained -> drained }
     }
 
     /**
-     * Hard teardown: stop playback, release visualizer + player, reset
-     * amplitude. Safe to call repeatedly.
+     * Hard teardown of the current playback session. Clears the queue,
+     * stops ExoPlayer, releases the Visualizer, and resets amplitude.
+     * The ExoPlayer itself is kept alive for reuse — the next [play] call
+     * will re-prepare it. Safe to call repeatedly.
      */
     fun stop() {
-        completionListener = null
+        exoPlayer.clearMediaItems()
+        exoPlayer.stop()
+        _queueCount.value = 0
+        _isPlaying.value = false
 
         visualizer?.let { v ->
             try { v.enabled = false } catch (_: Exception) { /* ignore */ }
             try { v.release() } catch (_: Exception) { /* ignore */ }
         }
         visualizer = null
-
-        mediaPlayer?.let { p ->
-            try {
-                if (p.isPlaying) p.stop()
-            } catch (_: Exception) { /* ignore */ }
-            try { p.reset() } catch (_: Exception) { /* ignore */ }
-            try { p.release() } catch (_: Exception) { /* ignore */ }
-        }
-        mediaPlayer = null
+        visualizerAttached = false
 
         _amplitude.value = 0f
     }
 
     /**
-     * True if there's an active [MediaPlayer]. Doesn't check `isPlaying` —
-     * that would race with the completion listener.
+     * True if the ExoPlayer has any queued media items (playing or paused
+     * mid-queue). Matches the old semantic of "there's audio in flight".
      */
-    fun isPlaying(): Boolean = mediaPlayer != null
+    fun isPlaying(): Boolean = _queueCount.value > 0
 
-    private fun attachVisualizer(player: MediaPlayer) {
+    /**
+     * Current ExoPlayer audio session id. Returns `0` until the underlying
+     * [android.media.AudioTrack] has been allocated — Media3 defers that
+     * allocation to first playback on most devices. Callers that need a
+     * non-zero session id (barge-in's [android.media.audiofx.AcousticEchoCanceler]
+     * attach path in [com.hermesandroid.relay.audio.BargeInListener]) should
+     * poll this property briefly rather than assume it's hot-ready at
+     * [VoicePlayer] construction time.
+     *
+     * **Thread-safe.** Backed by [cachedAudioSessionId] rather than the raw
+     * `ExoPlayer.getAudioSessionId()` getter, because ExoPlayer is
+     * thread-confined and [BargeInListener] reads this from its
+     * `Dispatchers.IO` reader coroutine. Reading the raw getter off-main
+     * throws `IllegalStateException: Player is accessed on the wrong thread`.
+     * The cache is populated from main-thread Media3 callbacks (the
+     * [AnalyticsListener.onAudioSessionIdChanged] hook and `onIsPlayingChanged`).
+     *
+     * Exposed read-only. B4 reads it via a provider lambda so the listener
+     * can re-check across the 1 s poll window without holding a stale
+     * reference.
+     */
+    val audioSessionId: Int
+        get() = cachedAudioSessionId
+
+    /**
+     * Set the playback volume of the underlying ExoPlayer.
+     *
+     * **Barge-in use case.** The barge-in pipeline (see
+     * `docs/plans/2026-04-17-voice-barge-in.md`, unit B6) runs the mic
+     * through a Silero VAD while TTS plays. On a *single* "maybe speech"
+     * frame — one positive frame that hasn't yet passed the hysteresis
+     * debounce — we soft-duck via [duck] instead of hard-stopping. If the
+     * speech is confirmed (enough consecutive positive frames pass the
+     * debounce), [VoiceViewModel] calls the hard-stop path
+     * (`interruptSpeaking()`); if the frame was a false positive, a
+     * watchdog re-calls [unduck] to restore full volume. The result is a
+     * fast-reacting but false-positive-tolerant interruption feel.
+     *
+     * @param volume linear gain in the range `0f..1f`; values outside this
+     *   range are clamped. Forwarded verbatim to `ExoPlayer.volume`.
+     */
+    fun setVolume(volume: Float) {
+        val clamped = volume.coerceIn(0f, 1f)
+        currentVolume = clamped
+        exoPlayer.volume = clamped
+    }
+
+    /**
+     * Soft-duck TTS to 30% of full volume. See [setVolume] for context —
+     * used by barge-in on a single VAD positive frame, before the
+     * hysteresis debounce confirms an actual interruption.
+     */
+    fun duck() {
+        setVolume(0.3f)
+    }
+
+    /**
+     * Restore TTS to full volume. Pair with [duck]; safe to call even if
+     * not currently ducked.
+     */
+    fun unduck() {
+        setVolume(1.0f)
+    }
+
+    /**
+     * Fully release the underlying ExoPlayer. Call when the owning scope is
+     * being destroyed; the VoicePlayer instance is unusable after this.
+     */
+    fun release() {
+        stop()
+        exoPlayer.release()
+    }
+
+    private fun attachVisualizer(audioSessionId: Int) {
+        if (audioSessionId == 0) {
+            // ExoPlayer returns 0 before the audio track is allocated; retry
+            // on the next playback-start event.
+            return
+        }
         try {
-            val viz = Visualizer(player.audioSessionId)
+            val viz = Visualizer(audioSessionId)
             viz.captureSize = VISUALIZER_SIZE_BYTES.coerceIn(
                 Visualizer.getCaptureSizeRange()[0],
                 Visualizer.getCaptureSizeRange()[1],
@@ -154,13 +343,16 @@ class VoicePlayer {
             )
             viz.enabled = true
             visualizer = viz
+            visualizerAttached = true
         } catch (e: Exception) {
             // Some devices refuse Visualizer (MODIFY_AUDIO_SETTINGS denied,
             // OEM restrictions). Fall back to flat-zero amplitude rather
-            // than killing the voice session.
+            // than killing the voice session. Mark as "attached" so we don't
+            // keep retrying on every isPlaying transition.
             Log.w(TAG, "Visualizer unavailable — amplitude stuck at 0: ${e.message}")
             _amplitude.value = 0f
             visualizer = null
+            visualizerAttached = true
         }
     }
 
@@ -189,3 +381,14 @@ class VoicePlayer {
                else normalized.coerceIn(0f, 1f)
     }
 }
+
+/**
+ * Production ExoPlayer factory — used as the default for [VoicePlayer].
+ * Split out as a top-level function so unit tests can swap it for a
+ * MockK mock without touching Media3's `Builder` class loader.
+ */
+@OptIn(UnstableApi::class)
+private fun defaultExoPlayer(context: Context): ExoPlayer =
+    ExoPlayer.Builder(context)
+        .setHandleAudioBecomingNoisy(true)
+        .build()

app/src/main/kotlin/com/hermesandroid/relay/audio/VoiceRecorder.kt

@@ -2,60 +2,47 @@ package com.hermesandroid.relay.audio
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.media.AudioFormat
+import android.media.AudioRecord
 import android.media.MediaRecorder
-import android.os.Build
 import android.util.Log
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.launch
+import java.io.ByteArrayOutputStream
 import java.io.File
+import java.io.IOException
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.math.sqrt
 
 /**
- * Captures the user's voice into an `.m4a` (AAC-in-MP4) file for V2a voice
- * mode. The relay's `/voice/transcribe` endpoint feeds this to whisper-1 via
- * OpenAI, which accepts m4a/mp4 natively.
+ * Captures the user's voice as 16 kHz mono PCM and writes a `.wav` file for
+ * the relay STT endpoint. The raw PCM is retained for the server-mediated
+ * `/voice/realtime/{session}` path so the main voice UI can send the same utterance
+ * through the realtime websocket without opening a second microphone stream.
  *
- * A live [amplitude] flow is exposed for the UI (MorphingSphere + meter) —
- * driven by polling `MediaRecorder.maxAmplitude` every ~16 ms. The polling
- * coroutine runs on the caller-supplied [scope] so it dies with the owning
- * ViewModel.
- *
- * One recorder instance owns at most one active recording at a time. Calling
- * [startRecording] again while a recording is in flight will stop the
- * previous one first. [stopRecording] is safe to call when nothing is
- * running (it just returns the last file, or throws if there never was one).
+ * A live [amplitude] flow is exposed for the UI (MorphingSphere + meter). The
+ * value is computed from the same PCM frames that are written to disk, which
+ * keeps legacy STT fallback and realtime voice testing on a single capture
+ * path.
  */
 class VoiceRecorder(
     private val context: Context,
-    private val scope: CoroutineScope,
+    @Suppress("UNUSED_PARAMETER") private val scope: kotlinx.coroutines.CoroutineScope,
 ) {
 
     companion object {
         private const val TAG = "VoiceRecorder"
         private const val SAMPLE_RATE = 16_000
-        private const val BIT_RATE = 64_000
-        private const val AMPLITUDE_POLL_MS = 16L
+        private const val BYTES_PER_SAMPLE = 2
+        private const val CHANNEL_COUNT = 1
         private const val MAX_AMPLITUDE_SHORT = 32_767f
+        private const val MAX_PCM_BYTES = 25 * 1024 * 1024
 
-        // Perceptual amplitude mapping constants. Raw PCM peak values from
-        // MediaRecorder.maxAmplitude for a phone at arm's length:
-        //   silence / ambient : 100..500   (≤0.015 of max)
-        //   quiet speech      : 500..3000  (0.015..0.09)
-        //   normal speech     : 3000..8000 (0.09..0.24)
-        //   loud speech       : 8000..18000 (0.24..0.55)
-        //   shout / clipping  : 18000..32767 (0.55..1.0)
-        //
-        // Linear 0..1 puts normal conversation between 0.09 and 0.24 — the
-        // meter barely moves. Subtract a noise floor, rescale into the
-        // speech-ceiling window, then apply a sqrt curve so quiet speech
-        // still registers visually without drowning loud speech at the top.
+        // Keep the perceptual curve from the previous MediaRecorder-backed
+        // implementation so the on-screen meter feels the same.
         private const val NOISE_FLOOR = 0.01f
         private const val SPEECH_CEILING = 0.35f
     }
@@ -63,162 +50,231 @@ class VoiceRecorder(
     private val _amplitude = MutableStateFlow(0f)
     val amplitude: StateFlow<Float> = _amplitude.asStateFlow()
 
-    private var mediaRecorder: MediaRecorder? = null
+    val sampleRate: Int get() = SAMPLE_RATE
+
+    private val bufferLock = Any()
+    private val stopRequested = AtomicBoolean(false)
+    private var audioRecord: AudioRecord? = null
     private var currentOutputFile: File? = null
-    private var pollJob: Job? = null
+    private var readThread: Thread? = null
+    private var readDone: CountDownLatch? = null
+    private var pcmBuffer = ByteArrayOutputStream(SAMPLE_RATE * BYTES_PER_SAMPLE * 4)
+    private var lastPcmBytes: ByteArray = ByteArray(0)
 
     /**
-     * Begin a new recording. Returns the output [File] that will receive the
-     * audio once [stopRecording] is called. Throws on permission failure or
-     * encoder init failure — callers should catch and surface to the UI.
+     * Begin a new recording. Returns the output [File] that will contain WAV
+     * audio once [stopRecording] is called.
      */
     @SuppressLint("MissingPermission")
     fun startRecording(): File {
-        // Defensive: if a recording is somehow still running, tear it down
-        // before starting a new one. MediaRecorder transitions are strict.
-        if (mediaRecorder != null) {
-            Log.w(TAG, "startRecording called while another recording is in flight — stopping it first")
+        if (audioRecord != null) {
+            Log.w(TAG, "startRecording called while another recording is in flight; stopping it first")
             try {
                 stopRecording()
             } catch (_: Exception) {
-                // Swallow — we're about to overwrite state anyway.
                 releaseRecorder()
             }
         }
 
-        val outFile = File(context.cacheDir, "voice_rec_${System.currentTimeMillis()}.m4a")
-        currentOutputFile = outFile
+        val minBuffer = AudioRecord.getMinBufferSize(
+            SAMPLE_RATE,
+            AudioFormat.CHANNEL_IN_MONO,
+            AudioFormat.ENCODING_PCM_16BIT,
+        ).coerceAtLeast(SAMPLE_RATE / 10 * BYTES_PER_SAMPLE)
 
-        val recorder = buildRecorder()
-        try {
-            recorder.setAudioSource(MediaRecorder.AudioSource.MIC)
-            recorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4)
-            recorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC)
-            recorder.setAudioSamplingRate(SAMPLE_RATE)
-            recorder.setAudioEncodingBitRate(BIT_RATE)
-            recorder.setAudioChannels(1)
-            recorder.setOutputFile(outFile.absolutePath)
-            recorder.prepare()
-            recorder.start()
-        } catch (e: IllegalStateException) {
-            Log.e(TAG, "MediaRecorder failed to start: ${e.message}")
-            try {
-                recorder.reset()
-            } catch (_: Exception) { /* ignore */ }
+        val outFile = File(context.cacheDir, "voice_rec_${System.currentTimeMillis()}.wav")
+        currentOutputFile = outFile
+        synchronized(bufferLock) {
+            pcmBuffer = ByteArrayOutputStream(SAMPLE_RATE * BYTES_PER_SAMPLE * 4)
+            lastPcmBytes = ByteArray(0)
+        }
+        stopRequested.set(false)
+        _amplitude.value = 0f
+
+        val recorder = AudioRecord.Builder()
+            .setAudioSource(MediaRecorder.AudioSource.MIC)
+            .setAudioFormat(
+                AudioFormat.Builder()
+                    .setEncoding(AudioFormat.ENCODING_PCM_16BIT)
+                    .setSampleRate(SAMPLE_RATE)
+                    .setChannelMask(AudioFormat.CHANNEL_IN_MONO)
+                    .build()
+            )
+            .setBufferSizeInBytes(minBuffer * 2)
+            .build()
+
+        if (recorder.state != AudioRecord.STATE_INITIALIZED) {
             recorder.release()
-            mediaRecorder = null
             currentOutputFile = null
-            throw e
+            throw IllegalStateException("AudioRecord failed to initialize")
+        }
+
+        try {
+            recorder.startRecording()
         } catch (e: Exception) {
-            Log.e(TAG, "MediaRecorder setup failed: ${e.message}")
-            try {
-                recorder.reset()
-            } catch (_: Exception) { /* ignore */ }
             recorder.release()
-            mediaRecorder = null
             currentOutputFile = null
             throw e
         }
 
-        mediaRecorder = recorder
-        startAmplitudePolling()
+        audioRecord = recorder
+        val done = CountDownLatch(1)
+        readDone = done
+        readThread = Thread(
+            {
+                readPcmLoop(recorder, minBuffer)
+                done.countDown()
+            },
+            "HermesVoiceRecorder",
+        ).also { it.start() }
         return outFile
     }
 
     /**
-     * Stop the active recording, flush the encoder, and return the completed
-     * output [File]. Safe to call when nothing is recording — in that case
-     * it returns the last file produced, or throws if there never was one.
+     * Stop the active recording, write the WAV container, and return it.
      */
     fun stopRecording(): File {
         val file = currentOutputFile
             ?: throw IllegalStateException("stopRecording called with no active recording")
 
-        stopAmplitudePolling()
-
-        val recorder = mediaRecorder
-        if (recorder != null) {
+        val record = audioRecord
+        stopRequested.set(true)
+        if (record != null) {
             try {
-                recorder.stop()
+                record.stop()
             } catch (e: IllegalStateException) {
-                // MediaRecorder.stop throws if called before any audio was
-                // captured (sub-300ms recordings). Treat as recoverable —
-                // the output file may be 0 bytes but the caller can check.
-                Log.w(TAG, "MediaRecorder.stop threw — recording may be empty: ${e.message}")
-            } catch (e: RuntimeException) {
-                Log.w(TAG, "MediaRecorder.stop runtime error: ${e.message}")
-            } finally {
-                releaseRecorder()
+                Log.w(TAG, "AudioRecord.stop threw; recording may be empty: ${e.message}")
             }
         }
+        readDone?.await(1, TimeUnit.SECONDS)
+        releaseRecorder()
 
+        val pcm = synchronized(bufferLock) {
+            pcmBuffer.toByteArray().also { lastPcmBytes = it }
+        }
+        writeWav(file, pcm)
         _amplitude.value = 0f
         return file
     }
 
-    /**
-     * True if a recording is currently active. Cheap — just checks whether
-     * we have a live [MediaRecorder] reference.
-     */
-    fun isRecording(): Boolean = mediaRecorder != null
+    fun isRecording(): Boolean = audioRecord != null && !stopRequested.get()
+
+    fun lastPcmBytes(): ByteArray = synchronized(bufferLock) {
+        lastPcmBytes.copyOf()
+    }
 
     /**
-     * Release any recorder resources without returning a file. Safe fallback
-     * for error paths where the output file is known-invalid.
+     * Release any recorder resources without returning a file.
      */
     fun cancel() {
-        stopAmplitudePolling()
-        mediaRecorder?.let { r ->
-            try {
-                r.stop()
-            } catch (_: Exception) { /* ignore */ }
+        stopRequested.set(true)
+        audioRecord?.let { record ->
+            try { record.stop() } catch (_: Exception) { }
         }
+        readDone?.await(500, TimeUnit.MILLISECONDS)
         releaseRecorder()
-        currentOutputFile?.let { f ->
-            try { f.delete() } catch (_: Exception) { /* ignore */ }
+        currentOutputFile?.let { file ->
+            try { file.delete() } catch (_: Exception) { }
         }
         currentOutputFile = null
+        synchronized(bufferLock) {
+            pcmBuffer.reset()
+            lastPcmBytes = ByteArray(0)
+        }
         _amplitude.value = 0f
     }
 
-    private fun releaseRecorder() {
-        mediaRecorder?.let { r ->
-            try { r.reset() } catch (_: Exception) { /* ignore */ }
-            try { r.release() } catch (_: Exception) { /* ignore */ }
-        }
-        mediaRecorder = null
-    }
-
-    @Suppress("DEPRECATION")
-    private fun buildRecorder(): MediaRecorder =
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            MediaRecorder(context)
-        } else {
-            MediaRecorder()
-        }
-
-    private fun startAmplitudePolling() {
-        pollJob?.cancel()
-        pollJob = scope.launch(Dispatchers.Default) {
-            while (isActive) {
-                val recorder = mediaRecorder ?: break
-                val raw = try {
-                    recorder.maxAmplitude
-                } catch (e: IllegalStateException) {
-                    // Recorder torn down under us — exit quietly.
-                    break
+    private fun readPcmLoop(record: AudioRecord, minBuffer: Int) {
+        val buffer = ByteArray(minBuffer)
+        while (!stopRequested.get()) {
+            val read = try {
+                record.read(buffer, 0, buffer.size)
+            } catch (e: Exception) {
+                Log.w(TAG, "AudioRecord.read failed: ${e.message}")
+                break
+            }
+            if (read > 0) {
+                synchronized(bufferLock) {
+                    if (pcmBuffer.size() + read <= MAX_PCM_BYTES) {
+                        pcmBuffer.write(buffer, 0, read)
+                    } else {
+                        stopRequested.set(true)
+                    }
                 }
-                val raw01 = (raw.toFloat() / MAX_AMPLITUDE_SHORT).coerceIn(0f, 1f)
-                val floored = ((raw01 - NOISE_FLOOR) / (SPEECH_CEILING - NOISE_FLOOR))
-                    .coerceIn(0f, 1f)
-                _amplitude.value = sqrt(floored)
-                delay(AMPLITUDE_POLL_MS)
+                updateAmplitude(buffer, read)
             }
         }
     }
 
-    private fun stopAmplitudePolling() {
-        pollJob?.cancel()
-        pollJob = null
+    private fun updateAmplitude(buffer: ByteArray, read: Int) {
+        var peak = 0
+        var index = 0
+        val usable = read - (read % BYTES_PER_SAMPLE)
+        while (index < usable) {
+            val low = buffer[index].toInt() and 0xff
+            val high = buffer[index + 1].toInt()
+            val sample = (high shl 8) or low
+            val abs = kotlin.math.abs(sample.coerceIn(Short.MIN_VALUE.toInt(), Short.MAX_VALUE.toInt()))
+            if (abs > peak) peak = abs
+            index += BYTES_PER_SAMPLE
+        }
+        val raw01 = (peak.toFloat() / MAX_AMPLITUDE_SHORT).coerceIn(0f, 1f)
+        val floored = ((raw01 - NOISE_FLOOR) / (SPEECH_CEILING - NOISE_FLOOR))
+            .coerceIn(0f, 1f)
+        _amplitude.value = sqrt(floored)
+    }
+
+    private fun releaseRecorder() {
+        audioRecord?.let { record ->
+            try { record.release() } catch (_: Exception) { }
+        }
+        audioRecord = null
+        readThread = null
+        readDone = null
+    }
+
+    private fun writeWav(file: File, pcm: ByteArray) {
+        try {
+            file.outputStream().use { out ->
+                out.write(wavHeader(pcm.size))
+                out.write(pcm)
+            }
+        } catch (e: IOException) {
+            throw IOException("Failed to write WAV recording: ${e.message}", e)
+        }
+    }
+
+    private fun wavHeader(pcmBytes: Int): ByteArray {
+        val totalDataLen = pcmBytes + 36
+        val byteRate = SAMPLE_RATE * CHANNEL_COUNT * BYTES_PER_SAMPLE
+        return ByteArray(44).also { header ->
+            fun ascii(offset: Int, value: String) {
+                value.encodeToByteArray().copyInto(header, offset)
+            }
+            fun leInt(offset: Int, value: Int) {
+                header[offset] = (value and 0xff).toByte()
+                header[offset + 1] = ((value shr 8) and 0xff).toByte()
+                header[offset + 2] = ((value shr 16) and 0xff).toByte()
+                header[offset + 3] = ((value shr 24) and 0xff).toByte()
+            }
+            fun leShort(offset: Int, value: Int) {
+                header[offset] = (value and 0xff).toByte()
+                header[offset + 1] = ((value shr 8) and 0xff).toByte()
+            }
+
+            ascii(0, "RIFF")
+            leInt(4, totalDataLen)
+            ascii(8, "WAVE")
+            ascii(12, "fmt ")
+            leInt(16, 16)
+            leShort(20, 1)
+            leShort(22, CHANNEL_COUNT)
+            leInt(24, SAMPLE_RATE)
+            leInt(28, byteRate)
+            leShort(32, CHANNEL_COUNT * BYTES_PER_SAMPLE)
+            leShort(34, 16)
+            ascii(36, "data")
+            leInt(40, pcmBytes)
+        }
     }
 }

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

@@ -2,24 +2,32 @@ package com.hermesandroid.relay.auth
 
 import android.content.Context
 import android.util.Log
+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 kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.booleanOrNull
 import kotlinx.serialization.json.contentOrNull
 import kotlinx.serialization.json.doubleOrNull
+import kotlinx.serialization.json.intOrNull
 import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
@@ -33,6 +41,15 @@ sealed class AuthState {
     data class Failed(val reason: String) : AuthState()
 }
 
+@Serializable
+data class ConnectionAuthSecrets(
+    val sessionToken: String? = null,
+    val refreshToken: String? = null,
+    val deviceId: String? = null,
+    val apiKey: String? = null,
+    val pairedSessionMetaJson: String? = null,
+)
+
 /**
  * Orchestrates pairing + session token lifecycle for the relay channel.
  *
@@ -57,17 +74,196 @@ sealed class AuthState {
 class AuthManager(
     private val context: Context,
     private val multiplexer: ChannelMultiplexer,
-    private val scope: CoroutineScope
+    private val scope: CoroutineScope,
+    /**
+     * Multi-connection: the id of the [com.hermesandroid.relay.data.Connection]
+     * this AuthManager is bound to. Drives which EncryptedSharedPreferences
+     * file the underlying [SessionTokenStore] reads/writes.
+     *
+     * Defaults to [CONNECTION_ID_LEGACY] so the pre-multi-connection call site
+     * in `ConnectionViewModel` still compiles. Worker B removes the default
+     * and passes a real connection id when they wire the active connection
+     * through.
+     */
+    private val connectionId: String = CONNECTION_ID_LEGACY,
+    /**
+     * Exact EncryptedSharedPreferences filename for this connection. New
+     * connections use the deterministic id-derived name, but the migrated
+     * legacy connection intentionally keeps [Connection.LEGACY_TOKEN_STORE_KEY].
+     */
+    private val tokenStoreKey: String? = null,
 ) : ChannelMultiplexer.ChannelHandler {
 
     companion object {
         private const val TAG = "AuthManager"
         private const val KEY_SESSION_TOKEN = "session_token"
+        private const val KEY_REFRESH_TOKEN = "refresh_token"
         private const val KEY_DEVICE_ID = "device_id"
         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"
         private const val PAIRING_CODE_LENGTH = 6
         private val PAIRING_CODE_CHARS = ('A'..'Z') + ('0'..'9')
+
+        /**
+         * Sentinel [connectionId] meaning "bind this AuthManager to the legacy
+         * single-connection EncryptedSharedPreferences file
+         * ([Connection.LEGACY_TOKEN_STORE_KEY])". Used as the default ctor arg
+         * so existing call sites don't need to change until Worker B threads
+         * a real connection id through.
+         */
+        const val CONNECTION_ID_LEGACY: String = "legacy"
+
+        internal fun shouldPreservePairedSessionOnAuthFail(
+            currentState: AuthState,
+            rawReason: String,
+        ): Boolean {
+            val lower = rawReason.lowercase()
+            return currentState is AuthState.Paired &&
+                "timeout" in lower &&
+                ("auth" in lower || "authentication" in lower)
+        }
+
+        /**
+         * Best-effort read of a connection's stored device id without making
+         * that connection active. Used by the connection removal path so it
+         * can delete the per-device route list before deleting the token
+         * store backing file.
+         */
+        suspend fun readStoredDeviceId(context: Context, tokenStoreKey: String): String? =
+            withContext(Dispatchers.IO) {
+                val appContext = context.applicationContext
+                val primary = KeystoreTokenStore.tryCreate(appContext, tokenStoreKey)
+                    ?: LegacyEncryptedPrefsTokenStore(appContext, tokenStoreKey)
+                primary.getString(KEY_DEVICE_ID)
+                    ?: if (tokenStoreKey == Connection.LEGACY_TOKEN_STORE_KEY) {
+                        runCatching {
+                            LegacyEncryptedPrefsTokenStore(appContext).getString(KEY_DEVICE_ID)
+                        }.getOrNull()
+                    } else {
+                        null
+                    }
+            }
+
+        suspend fun exportStoredSecrets(
+            context: Context,
+            tokenStoreKey: String,
+        ): ConnectionAuthSecrets = withContext(Dispatchers.IO) {
+            val store = tokenStoreForBackup(context, tokenStoreKey)
+            ConnectionAuthSecrets(
+                sessionToken = store.getString(KEY_SESSION_TOKEN),
+                refreshToken = store.getString(KEY_REFRESH_TOKEN),
+                deviceId = store.getString(KEY_DEVICE_ID),
+                apiKey = store.getString(KEY_API_KEY),
+                pairedSessionMetaJson = store.getString(KEY_PAIRED_META),
+            )
+        }
+
+        suspend fun importStoredSecrets(
+            context: Context,
+            tokenStoreKey: String,
+            secrets: ConnectionAuthSecrets,
+        ) {
+            withContext(Dispatchers.IO) {
+                val store = tokenStoreForBackup(context, tokenStoreKey)
+                writeOrRemove(store, KEY_SESSION_TOKEN, secrets.sessionToken)
+                writeOrRemove(store, KEY_REFRESH_TOKEN, secrets.refreshToken)
+                writeOrRemove(store, KEY_DEVICE_ID, secrets.deviceId)
+                writeOrRemove(store, KEY_API_KEY, secrets.apiKey)
+                writeOrRemove(store, KEY_PAIRED_META, secrets.pairedSessionMetaJson)
+            }
+        }
+
+        private fun tokenStoreForBackup(
+            context: Context,
+            tokenStoreKey: String,
+        ): SessionTokenStore {
+            val appContext = context.applicationContext
+            return KeystoreTokenStore.tryCreate(appContext, tokenStoreKey)
+                ?: LegacyEncryptedPrefsTokenStore(appContext, tokenStoreKey)
+        }
+
+        private fun writeOrRemove(
+            store: SessionTokenStore,
+            key: String,
+            value: String?,
+        ) {
+            if (value == null) {
+                store.remove(key)
+            } else {
+                store.putString(key, value)
+            }
+        }
+
+        /**
+         * Parse the `profiles` array from an `auth.ok` payload into a list of
+         * [Profile] entries. Extracted out of [handleAuthOk] so it's
+         * exercisable from a pure JVM unit test without constructing an
+         * Android [Context] / [kotlinx.coroutines.CoroutineScope].
+         *
+         * Defensive rules, in order:
+         *  - Non-[JsonObject] entries (stray strings, numbers) are dropped.
+         *  - An entry missing `name` is dropped — the picker has no label
+         *    to render for it.
+         *  - `model` defaults to `"unknown"` so a profile without a model
+         *    still renders as a selectable chip (server misconfiguration,
+         *    but we don't want to silently drop the only profile).
+         *  - `description` defaults to `""`.
+         *  - `system_message` is passed through as-is, including JSON `null`.
+         *    A null or missing value means "this profile has no SOUL.md on
+         *    disk — fall back to the personality/default system prompt at
+         *    send time". Kept separate from an empty string so ChatViewModel
+         *    can cleanly detect "no override" via `systemMessage?.isNotBlank()`.
+         *  - `gateway_running`, `has_soul`, `skill_count` (v0.7.0 runtime
+         *    metadata) are optional on the wire. Missing / malformed values
+         *    fall back to `false` / `false` / `0` so older relays stay
+         *    compatible and bad server data can't crash the pairing handshake.
+         *  - `api_server_*` metadata is optional. When present, it lets the
+         *    client route chat through a profile's isolated Hermes API
+         *    server without exposing that profile server's key.
+         */
+        fun parseAgentProfiles(array: JsonArray): List<Profile> {
+            return array.mapNotNull { entry ->
+                val obj = entry as? JsonObject ?: return@mapNotNull null
+                val name = obj["name"]?.jsonPrimitive?.contentOrNull
+                    ?: return@mapNotNull null
+                val model = obj["model"]?.jsonPrimitive?.contentOrNull
+                    ?: "unknown"
+                val description = obj["description"]?.jsonPrimitive?.contentOrNull
+                    ?: ""
+                val systemMessage = obj["system_message"]?.jsonPrimitive?.contentOrNull
+                val gatewayRunning = obj["gateway_running"]
+                    ?.jsonPrimitive?.booleanOrNull ?: false
+                val hasSoul = obj["has_soul"]
+                    ?.jsonPrimitive?.booleanOrNull ?: false
+                val skillCount = obj["skill_count"]
+                    ?.jsonPrimitive?.intOrNull ?: 0
+                val apiServerEnabled = obj["api_server_enabled"]
+                    ?.jsonPrimitive?.booleanOrNull ?: false
+                val apiServerUrl = obj["api_server_url"]
+                    ?.jsonPrimitive?.contentOrNull
+                val apiServerHost = obj["api_server_host"]
+                    ?.jsonPrimitive?.contentOrNull
+                val apiServerPort = obj["api_server_port"]
+                    ?.jsonPrimitive?.intOrNull
+                val apiServerKeyPresent = obj["api_server_key_present"]
+                    ?.jsonPrimitive?.booleanOrNull ?: false
+                Profile(
+                    name = name,
+                    model = model,
+                    description = description,
+                    systemMessage = systemMessage,
+                    gatewayRunning = gatewayRunning,
+                    hasSoul = hasSoul,
+                    skillCount = skillCount,
+                    apiServerEnabled = apiServerEnabled,
+                    apiServerUrl = apiServerUrl,
+                    apiServerHost = apiServerHost,
+                    apiServerPort = apiServerPort,
+                    apiServerKeyPresent = apiServerKeyPresent,
+                )
+            }
+        }
     }
 
     private val json = Json { ignoreUnknownKeys = true }
@@ -77,6 +273,48 @@ class AuthManager(
     private var _store: SessionTokenStore? = null
     private val storeMutex = Mutex()
 
+    /**
+     * The encrypted-store filename for this connection — shared by [store]
+     * and the plain hint file below so they always describe the same store.
+     */
+    private val tokenPrefsName: String =
+        tokenStoreKey ?: if (connectionId == CONNECTION_ID_LEGACY) {
+            Connection.LEGACY_TOKEN_STORE_KEY
+        } else {
+            Connection.buildTokenStoreKey(connectionId)
+        }
+
+    /**
+     * Plain (non-encrypted) mirror of one boolean fact: "does this
+     * connection have an API key stored?". Read at startup WITHOUT touching
+     * the Keystore, so [ConnectionViewModel] can build the API client
+     * immediately for key-less connections — the common local setup —
+     * instead of queueing behind the encrypted store's first decrypt.
+     *
+     * Why this exists: on StrongBox devices every keystore operation runs
+     * ~550ms and Tink serializes them process-globally; a measured S25
+     * Ultra cold start spent 15 seconds in that marathon before
+     * `getApiKey()` could return — only to answer "there is no key".
+     *
+     * The hint stores ONLY presence, never key material. It defaults to
+     * `true` (unknown ⇒ assume a key exists ⇒ wait for the real decrypt),
+     * so a missing or stale hint can never strip auth off a keyed
+     * connection — the failure mode is "slow like before", never "401s".
+     * It converges in [setApiKey]/[clearApiKey], in init's store
+     * hydration, and after legacy migration.
+     */
+    private val hintPrefs by lazy {
+        context.getSharedPreferences("${tokenPrefsName}_plain_hints", Context.MODE_PRIVATE)
+    }
+
+    /** True only when a previously-recorded hint says "no API key stored". */
+    fun apiKeyKnownAbsent(): Boolean = !hintPrefs.getBoolean(HINT_API_KEY_PRESENT, true)
+
+    private fun recordApiKeyHint(present: Boolean) {
+        _apiKeyPresent.value = present
+        hintPrefs.edit().putBoolean(HINT_API_KEY_PRESENT, present).apply()
+    }
+
     /**
      * Lazily construct the best available token store. First tries
      * [KeystoreTokenStore] — if that fails on broken OEM keystores we fall
@@ -92,8 +330,14 @@ class AuthManager(
         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) ?: LegacyEncryptedPrefsTokenStore(context)
+                    KeystoreTokenStore.tryCreate(context, tokenPrefsName)
+                        ?: LegacyEncryptedPrefsTokenStore(context, tokenPrefsName)
                 migrateFromLegacyIfNeeded(picked)
                 _store = picked
                 picked
@@ -109,13 +353,24 @@ 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
+        // we'd copy connection 0's token into every new connection.
+        if (connectionId != CONNECTION_ID_LEGACY) return
         val legacy = try {
             LegacyEncryptedPrefsTokenStore(context)
         } catch (_: Exception) {
             return
         }
 
-        val keysToMigrate = listOf(KEY_SESSION_TOKEN, KEY_DEVICE_ID, KEY_API_KEY, KEY_PAIRED_META)
+        val keysToMigrate = listOf(
+            KEY_SESSION_TOKEN,
+            KEY_REFRESH_TOKEN,
+            KEY_DEVICE_ID,
+            KEY_API_KEY,
+            KEY_PAIRED_META,
+        )
         var migrated = false
         for (k in keysToMigrate) {
             val existing = legacy.getString(k) ?: continue
@@ -207,8 +462,37 @@ class AuthManager(
      */
     private var pendingGrants: Map<String, Long>? = null
 
-    private val _profiles = MutableStateFlow<List<String>>(emptyList())
-    val profiles: StateFlow<List<String>> = _profiles.asStateFlow()
+    /**
+     * Optional endpoint-candidate list from the pairing QR (ADR 24, v3+).
+     * Persisted via [PairingPreferences.setDeviceEndpoints] once the server
+     * confirms the pair in `auth.ok` so the reachability probe + network-aware
+     * switch (Kt-Probe) can read them on subsequent connects.
+     *
+     * `null` means "no endpoint list to persist on this pair" — either a v1/v2
+     * QR hit the legacy path without going through [setPendingEndpoints], or
+     * we're in a session-token refresh where the endpoint list doesn't change.
+     * Either way, we leave the previously-persisted list untouched.
+     */
+    private var pendingEndpoints: List<EndpointCandidate>? = null
+
+    /**
+     * Server-advertised agent profiles from the `auth.ok` payload's
+     * `profiles` field. Each entry corresponds to a named agent config in
+     * the server's `~/.hermes/config.yaml` (see Hermes's `_load_profiles`).
+     *
+     * This replaces the old `_sessionLabels` field (2026-04-18, Pass 2).
+     * The previous code parsed each entry as a raw [String] via
+     * `it.jsonPrimitive.content`, which blew up silently on the real
+     * object-shaped payload the server actually sends — so the list was
+     * always empty in practice. [parseAgentProfiles] is the structured
+     * replacement.
+     *
+     * Exposed via [com.hermesandroid.relay.viewmodel.ConnectionViewModel.agentProfiles]
+     * to the profile picker UI. Empty when unpaired or when the server
+     * returned no `profiles` entry.
+     */
+    private val _agentProfiles = MutableStateFlow<List<Profile>>(emptyList())
+    val agentProfiles: StateFlow<List<Profile>> = _agentProfiles.asStateFlow()
 
     /**
      * Whether an API key is currently stored. Updated reactively by
@@ -221,6 +505,12 @@ class AuthManager(
     init {
         // Register as system channel handler for auth messages
         multiplexer.registerHandler("system", this)
+        // Also listen on the "pairing" channel for server-initiated
+        // pushes — currently just profiles.updated (v0.7.1+ relay).
+        // Routed through the same onMessage dispatcher which switches
+        // by envelope type so adding new pairing.* events later is a
+        // one-line change in [onMessage].
+        multiplexer.registerHandler("pairing", this)
 
         // Check for existing session token off main thread
         scope.launch {
@@ -237,7 +527,9 @@ class AuthManager(
             } else {
                 Log.i(TAG, "init: no stored session_token → authState stays Unpaired")
             }
-            _apiKeyPresent.value = !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())
         }
     }
 
@@ -322,6 +614,9 @@ class AuthManager(
      */
     suspend fun getOrCreateDeviceId(): String = getDeviceId()
 
+    /** Existing device ID without creating a new one. */
+    suspend fun getExistingDeviceId(): String? = store().getString(KEY_DEVICE_ID)
+
     /**
      * Set the TTL the user picked at [SessionTtlPickerDialog]. `0` → never,
      * `null` → defer to server default. Persisted across [authenticate]
@@ -341,6 +636,21 @@ class AuthManager(
         pendingGrants = grants
     }
 
+    /**
+     * Stage the endpoint-candidate list parsed from the pairing QR (ADR 24).
+     * Consumed in [handleAuthOk] — after the server confirms the pair we
+     * persist the list under the current device id via
+     * [PairingPreferences.setDeviceEndpoints].
+     *
+     * Safe to call with `null` or an empty list — either clears any staged
+     * value without persisting. Pair-code re-sends from an existing
+     * [AuthState.Paired] state never reach this setter, so session-token
+     * refreshes don't clobber the persisted list.
+     */
+    fun setPendingEndpoints(endpoints: List<EndpointCandidate>?) {
+        pendingEndpoints = endpoints?.takeIf { it.isNotEmpty() }
+    }
+
     /**
      * Send auth envelope when connection is established.
      *
@@ -363,12 +673,17 @@ class AuthManager(
             val deviceId = getDeviceId()
             val payload = when (currentState) {
                 is AuthState.Paired -> {
+                    val refreshToken = store().getString(KEY_REFRESH_TOKEN)
                     Log.i(
                         TAG,
-                        "authenticate: sending session_token (state=Paired, token=${currentState.token.take(8)}…)"
+                        "authenticate: sending session_token (state=Paired, token=${currentState.token.take(8)}…, " +
+                            "refresh=${!refreshToken.isNullOrBlank()})"
                     )
                     buildJsonObject {
                         put("session_token", currentState.token)
+                        if (!refreshToken.isNullOrBlank()) {
+                            put("refresh_token", refreshToken)
+                        }
                         put("device_id", deviceId)
                         put("device_name", android.os.Build.MODEL)
                     }
@@ -452,6 +767,7 @@ class AuthManager(
         scope.launch {
             val s = store()
             s.remove(KEY_SESSION_TOKEN)
+            s.remove(KEY_REFRESH_TOKEN)
             s.remove(KEY_PAIRED_META)
             if (relayUrl != null) {
                 certPinStore.removePinFor(relayUrl)
@@ -464,9 +780,58 @@ class AuthManager(
         when (envelope.type) {
             "auth.ok" -> handleAuthOk(envelope)
             "auth.fail" -> handleAuthFail(envelope)
+            // `profiles.updated` push — sent by the v0.7.1+ relay on
+            // the "pairing" channel whenever its in-memory profile
+            // snapshot changes (file-watcher, SIGHUP, or a manual
+            // /api/profiles/refresh). The array shape mirrors the
+            // `profiles` field of auth.ok, so we parse with the exact
+            // same [parseAgentProfiles] helper.
+            "profiles.updated" -> handleProfilesUpdated(envelope)
         }
     }
 
+    /**
+     * Consumer for the pairing-channel `profiles.updated` envelope.
+     * Re-uses [parseAgentProfiles] because the wire shape of the
+     * `profiles` array exactly matches the auth.ok embedded form —
+     * the whole point of the push is that the app keeps a single
+     * parser regardless of which entry point the list arrives on.
+     *
+     * Emits a one-shot [profilesUpdatedEvents] event so the UI layer
+     * can show a brief "Profiles updated" snackbar. The event is only
+     * fired when the list actually changed (different names or count)
+     * — an idempotent push that matches the cached state is silent.
+     */
+    private fun handleProfilesUpdated(envelope: Envelope) {
+        val array = envelope.profiles ?: run {
+            Log.w(TAG, "handleProfilesUpdated: envelope has no `profiles` array")
+            return
+        }
+        val parsed = parseAgentProfiles(array)
+        val prev = _agentProfiles.value
+        _agentProfiles.value = parsed
+
+        // Did anything meaningful change? We treat "same names" as
+        // "nothing to announce" — the dashboard can emit these pushes
+        // liberally and we don't want to spam the user with toasts.
+        val prevNames = prev.map { it.name }.toSet()
+        val nextNames = parsed.map { it.name }.toSet()
+        if (prevNames != nextNames || prev.size != parsed.size) {
+            _profilesUpdatedEvents.tryEmit(Unit)
+        }
+    }
+
+    /**
+     * One-shot signal emitted every time a `profiles.updated` envelope
+     * materially changes the profile list. UI collects it via
+     * [com.hermesandroid.relay.viewmodel.ConnectionViewModel.profilesUpdatedEvents]
+     * to show a transient snackbar.
+     */
+    private val _profilesUpdatedEvents =
+        kotlinx.coroutines.flow.MutableSharedFlow<Unit>(extraBufferCapacity = 4)
+    val profilesUpdatedEvents: kotlinx.coroutines.flow.SharedFlow<Unit> =
+        _profilesUpdatedEvents.asSharedFlow()
+
     fun regeneratePairingCode() {
         _pairingCode.value = generatePairingCode()
     }
@@ -475,6 +840,7 @@ class AuthManager(
         scope.launch {
             val s = store()
             s.remove(KEY_SESSION_TOKEN)
+            s.remove(KEY_REFRESH_TOKEN)
             s.remove(KEY_PAIRED_META)
             _authState.value = AuthState.Unpaired
             _currentPairedSession.value = null
@@ -491,16 +857,16 @@ class AuthManager(
         val s = store()
         if (trimmed.isBlank()) {
             s.remove(KEY_API_KEY)
-            _apiKeyPresent.value = false
+            recordApiKeyHint(false)
         } else {
             s.putString(KEY_API_KEY, trimmed)
-            _apiKeyPresent.value = true
+            recordApiKeyHint(true)
         }
     }
 
     suspend fun clearApiKey() {
         store().remove(KEY_API_KEY)
-        _apiKeyPresent.value = false
+        recordApiKeyHint(false)
     }
 
     val isPaired: Boolean
@@ -523,6 +889,14 @@ class AuthManager(
                 if (token != null) {
                     val s = store()
                     s.putString(KEY_SESSION_TOKEN, token)
+                    val refreshToken = payload["refresh_token"]
+                        ?.jsonPrimitive
+                        ?.contentOrNull
+                        ?.takeIf { it.isNotBlank() }
+                    if (refreshToken != null) {
+                        s.putString(KEY_REFRESH_TOKEN, refreshToken)
+                        Log.i(TAG, "handleAuthOk: stored rotated refresh token")
+                    }
                     _authState.value = AuthState.Paired(token)
                     Log.i(TAG, "handleAuthOk: Paired(token=${token.take(8)}…)")
                     // Server-issued code is one-shot — drop it once the
@@ -565,19 +939,55 @@ class AuthManager(
                     _currentPairedSession.value = paired
                     persistPairedSession(paired)
 
-                    // Pending TTL/grants are consumed — the server has
-                    // either honored or overridden them and the next
+                    // ADR 24 — persist the pairing's endpoint-candidate list
+                    // so the reachability probe + network-aware switch
+                    // (Kt-Probe) can load it on subsequent connects without
+                    // re-scanning the original QR. Keyed by the stable
+                    // device id so multiple paired devices coexist cleanly.
+                    //
+                    // Leave the previously-persisted list untouched when
+                    // nothing was staged (session-token refresh path, or
+                    // a legacy caller that didn't set endpoints).
+                    pendingEndpoints?.let { endpoints ->
+                        try {
+                            val deviceId = getDeviceId()
+                            PairingPreferences.setDeviceEndpoints(
+                                context,
+                                deviceId,
+                                endpoints,
+                            )
+                            Log.i(
+                                TAG,
+                                "handleAuthOk: persisted ${endpoints.size} endpoint(s) for device=$deviceId " +
+                                    "roles=${endpoints.map { it.role }}"
+                            )
+                        } catch (e: Exception) {
+                            Log.w(
+                                TAG,
+                                "handleAuthOk: endpoint persistence failed — continuing without; " +
+                                    "reachability probe will fall back to the single active endpoint. " +
+                                    "reason=${e.message}"
+                            )
+                        }
+                    }
+
+                    // Pending TTL/grants/endpoints are consumed — the server
+                    // has either honored or overridden them and the next
                     // auth round-trip should not resend stale values.
                     pendingTtlSeconds = null
                     pendingGrants = null
+                    pendingEndpoints = null
                 }
 
                 val profilesArray = payload["profiles"]?.jsonArray
                 if (profilesArray != null) {
-                    _profiles.value = profilesArray.map { it.jsonPrimitive.content }
+                    _agentProfiles.value = parseAgentProfiles(profilesArray)
                 }
             } catch (e: Exception) {
-                e.printStackTrace()
+                // Replaces a silent `e.printStackTrace()` — that stack-trace-only
+                // handler is exactly why the broken `_sessionLabels` parser
+                // (stringifying object entries) sat undetected for so long.
+                Log.w(TAG, "auth.ok parse failed: ${e.message}", e)
             }
         }
     }
@@ -588,13 +998,36 @@ class AuthManager(
                 ?: "Unknown error"
             val humanized = humanizeAuthFailReason(rawReason)
             Log.w(TAG, "handleAuthFail: raw=$rawReason humanized=$humanized")
+            if (shouldPreservePairedSessionOnAuthFail(_authState.value, rawReason)) {
+                Log.w(
+                    TAG,
+                    "handleAuthFail: preserving paired session after transient auth timeout"
+                )
+                return
+            }
+            clearPendingPairContextAfterAuthFailure(rawReason)
             _authState.value = AuthState.Failed(humanized)
         } catch (e: Exception) {
             Log.w(TAG, "handleAuthFail: exception parsing payload", e)
+            clearPendingPairContextAfterAuthFailure("parse failure")
             _authState.value = AuthState.Failed("Authentication failed")
         }
     }
 
+    private fun clearPendingPairContextAfterAuthFailure(reason: String) {
+        if (serverIssuedCode == null) return
+        serverIssuedCode = null
+        pendingTtlSeconds = null
+        pendingGrants = null
+        pendingEndpoints = null
+        _pairingCode.value = generatePairingCode()
+        Log.i(
+            TAG,
+            "auth.fail consumed server-issued pairing code; " +
+                "cleared pending pair context so reconnects stop (reason=$reason)"
+        )
+    }
+
     /**
      * Map common relay `auth.fail` reasons to user-friendly short strings.
      * The wizard VerifyStep surfaces the returned text directly, so this is

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

@@ -18,10 +18,11 @@ import kotlinx.serialization.Serializable
  * @property expiresAt epoch seconds at which the server says the session
  *           expires — or `null` when the user chose "never expire" at the
  *           TTL picker. `null` is a first-class value, not a missing field.
- * @property grants per-channel expiry map. Keys: `"chat"`, `"terminal"`,
- *           `"bridge"` (and any future channel the server adds). Values are
- *           epoch seconds or `null` for "never". Missing channels = server
- *           didn't grant that channel to this device.
+ * @property grants per-channel expiry map. Known keys include `"chat"`,
+ *           `"terminal"`, `"bridge"`, `"tui"`, `"voice:config"`,
+ *           `"voice:stt"`, and `"voice:tts"`; future server-defined keys are
+ *           tolerated. Values are epoch seconds or `null` for "never".
+ *           Missing channels = server didn't grant that channel to this device.
  * @property transportHint the transport the server advises the phone to
  *           use, for UX labeling only. `"wss"` / `"ws"` / `null` when the
  *           server didn't provide a hint.

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

@@ -67,7 +67,8 @@ interface SessionTokenStore {
 class KeystoreTokenStore private constructor(
     private val context: Context,
     private val wantsStrongBox: Boolean,
-    override val hasHardwareBackedStorage: Boolean
+    override val hasHardwareBackedStorage: Boolean,
+    private val prefsName: String,
 ) : SessionTokenStore {
 
     // Mutable so [resetPrefs] can swap in a fresh instance after a corrupted
@@ -89,7 +90,7 @@ class KeystoreTokenStore private constructor(
         val masterKey = builder.build()
         return EncryptedSharedPreferences.create(
             context,
-            PREFS_NAME,
+            prefsName,
             masterKey,
             EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
             EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
@@ -114,16 +115,24 @@ class KeystoreTokenStore private constructor(
             prefs.edit().clear().apply()
         } catch (_: Exception) { /* expected on a wedged file */ }
         try {
-            context.deleteSharedPreferences(PREFS_NAME)
+            context.deleteSharedPreferences(prefsName)
         } catch (e: Exception) {
-            Log.w(TAG, "deleteSharedPreferences($PREFS_NAME) failed: ${e.message}")
+            Log.w(TAG, "deleteSharedPreferences($prefsName) failed: ${e.message}")
         }
         prefs = buildPrefs()
     }
 
     companion object {
         private const val TAG = "KeystoreTokenStore"
-        private const val PREFS_NAME = "hermes_companion_auth_hw"
+
+        /**
+         * Default EncryptedSharedPreferences filename. Pre-multi-connection
+         * installs have all their auth state in this single file —
+         * connection 0 re-uses it as-is via
+         * [Connection.LEGACY_TOKEN_STORE_KEY] so no user-visible migration is
+         * needed.
+         */
+        const val DEFAULT_PREFS_NAME = "hermes_companion_auth_hw"
 
         /**
          * Try to build a [KeystoreTokenStore] on the current device. Returns
@@ -131,13 +140,22 @@ class KeystoreTokenStore private constructor(
          * AndroidKeystore implementations — we don't want the app to brick
          * itself trying to create a master key).
          *
+         * [prefsName] selects the EncryptedSharedPreferences file — defaults
+         * to [DEFAULT_PREFS_NAME] for backwards compat with the
+         * single-connection call sites. Multi-connection callers pass a
+         * per-connection filename built via
+         * [com.hermesandroid.relay.data.Connection.buildTokenStoreKey].
+         *
          * Also fires a one-shot read probe so a pre-corrupted file from a
          * previous install gets healed during construction rather than on the
          * first user-driven read. The probe routes through the instance's
          * own [getString], so if it throws, [resetPrefs] runs and we end up
          * with a fresh empty prefs file — not a permanently broken store.
          */
-        fun tryCreate(context: Context): KeystoreTokenStore? {
+        fun tryCreate(
+            context: Context,
+            prefsName: String = DEFAULT_PREFS_NAME,
+        ): KeystoreTokenStore? {
             return try {
                 val wantsStrongBox = Build.VERSION.SDK_INT >= Build.VERSION_CODES.P &&
                     context.packageManager.hasSystemFeature(
@@ -147,6 +165,7 @@ class KeystoreTokenStore private constructor(
                     context = context.applicationContext,
                     wantsStrongBox = wantsStrongBox,
                     hasHardwareBackedStorage = wantsStrongBox,
+                    prefsName = prefsName,
                 )
                 // Force a read so a wedged file from a prior install heals
                 // here rather than at the first user-visible call.
@@ -224,7 +243,10 @@ class KeystoreTokenStore private constructor(
  * (b) migration source for reading existing session tokens out of the legacy
  * prefs on first launch after the update.
  */
-class LegacyEncryptedPrefsTokenStore(context: Context) : SessionTokenStore {
+class LegacyEncryptedPrefsTokenStore(
+    context: Context,
+    private val prefsName: String = LEGACY_PREFS_NAME,
+) : SessionTokenStore {
 
     companion object {
         const val LEGACY_PREFS_NAME = "hermes_companion_auth"
@@ -243,7 +265,7 @@ class LegacyEncryptedPrefsTokenStore(context: Context) : SessionTokenStore {
             .build()
         return EncryptedSharedPreferences.create(
             appContext,
-            LEGACY_PREFS_NAME,
+            prefsName,
             masterKey,
             EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
             EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
@@ -255,9 +277,9 @@ class LegacyEncryptedPrefsTokenStore(context: Context) : SessionTokenStore {
             prefs.edit().clear().apply()
         } catch (_: Exception) { /* expected on a wedged file */ }
         try {
-            appContext.deleteSharedPreferences(LEGACY_PREFS_NAME)
+            appContext.deleteSharedPreferences(prefsName)
         } catch (e: Exception) {
-            Log.w(TAG, "deleteSharedPreferences($LEGACY_PREFS_NAME) failed: ${e.message}")
+            Log.w(TAG, "deleteSharedPreferences($prefsName) failed: ${e.message}")
         }
         prefs = buildPrefs()
     }

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

@@ -70,8 +70,10 @@ class AutoDisableWorker(private val context: Context) {
     // call is also wrapped in runCatching to swallow SecurityException as
     // a belt-and-braces. Suppress here rather than inlining the check —
     // the helper exists so the same gate can grow more conditions later
-    // without each call site re-implementing it.
-    @SuppressLint("MissingPermission")
+    // without each call site re-implementing it. Both IDs are needed:
+    // `NotificationPermission` is the notify()-specific check (POST_NOTIFICATIONS
+    // on API 33+); `MissingPermission` is the generic fallback.
+    @SuppressLint("MissingPermission", "NotificationPermission")
     private fun postNotification() {
         ensureChannel()
         if (!hasPostNotificationsPermission()) {

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

@@ -1,5 +1,6 @@
 package com.hermesandroid.relay.bridge
 
+import android.annotation.SuppressLint
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
@@ -300,6 +301,16 @@ class BridgeForegroundService : Service() {
         super.onDestroy()
     }
 
+    // ForegroundServiceType: lint requires the manifest `<service>` to declare
+    // `foregroundServiceType` for targetSdk >= 34. The SIDELOAD manifest does
+    // (specialUse|mediaProjection) + declares the matching FOREGROUND_SERVICE_*
+    // permissions. The GOOGLEPLAY flavor deliberately omits this service AND
+    // those permissions (no device-control capability for Play-Store
+    // compliance), so this code is unreachable there — the service can't be
+    // started without a manifest declaration. Lint analyzes the merged
+    // googlePlay manifest and can't see the sideload guarantee, so suppress
+    // here rather than weaken googlePlay by granting it specialUse.
+    @SuppressLint("ForegroundServiceType")
     private fun startForegroundNotification() {
         ensureChannel()
         val notification = buildNotification()

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

@@ -110,10 +110,26 @@ class BridgeSafetyManager(
     private val _settings = MutableStateFlow(BridgeSafetySettings())
     val settings: StateFlow<BridgeSafetySettings> = _settings.asStateFlow()
 
+    /**
+     * "Don't ask again" set for destructive verbs. When a confirmation is
+     * about to fire and the matched verb is in this set, we short-circuit
+     * to Allow (and let the normal activity-log path record the action so
+     * the user still has an audit trail). This does NOT bypass the master
+     * blocklist or the master-disable toggle — both of those gates run in
+     * [BridgeCommandHandler] before the code ever reaches [awaitConfirmation].
+     */
+    private val _trustedDestructiveVerbs = MutableStateFlow<Set<String>>(emptySet())
+    val trustedDestructiveVerbs: StateFlow<Set<String>> =
+        _trustedDestructiveVerbs.asStateFlow()
+
     /** True once the DataStore collector has ticked at least once. */
     @Volatile
     private var settingsHydrated: Boolean = false
 
+    /** True once the trusted-verbs collector has ticked at least once. */
+    @Volatile
+    private var trustedHydrated: Boolean = false
+
     /**
      * Pending confirmation requests keyed by a monotonic id. The overlay's
      * Allow / Deny callbacks complete the deferred by looking up the id the
@@ -145,6 +161,12 @@ class BridgeSafetyManager(
                 settingsHydrated = true
             }
         }
+        scope.launch {
+            prefsRepo.trustedDestructiveVerbs.collect { latest ->
+                _trustedDestructiveVerbs.value = latest
+                trustedHydrated = true
+            }
+        }
     }
 
     // ── Blocklist ────────────────────────────────────────────────────────
@@ -197,12 +219,32 @@ class BridgeSafetyManager(
         val timeoutMs = snapshot.confirmationTimeoutSeconds * 1000L
         val requestId = nextRequestId.incrementAndGet()
 
+        val matchedVerb = text?.let { firstMatchedVerb(it, snapshot.destructiveVerbs) }.orEmpty()
+
+        // "Don't ask again" short-circuit. If the user has previously
+        // allowed this verb with the trust checkbox ticked, skip the
+        // modal entirely and return allow. We intentionally only short-
+        // circuit when the matched verb is non-empty — routes like /call
+        // and /send_sms whose confirm text doesn't match any user verb
+        // (verb = "") always prompt so irreversible actions never bypass.
+        //
+        // This path is NOT consulted before the master blocklist or the
+        // master-disable toggle — both of those live in BridgeCommandHandler
+        // and fail earlier, so even a trusted verb can't slip through a
+        // blocklisted app or a disabled bridge.
+        if (matchedVerb.isNotBlank() &&
+            currentTrustedVerbs().contains(matchedVerb.lowercase())
+        ) {
+            Log.i(TAG, "awaitConfirmation: verb '$matchedVerb' is trusted — auto-allowing")
+            return true
+        }
+
         val deferred = CompletableDeferred<Boolean>()
         val pending = PendingConfirmation(
             id = requestId,
             method = method,
             text = text.orEmpty(),
-            verb = text?.let { firstMatchedVerb(it, snapshot.destructiveVerbs) }.orEmpty(),
+            verb = matchedVerb,
             deferred = deferred,
         )
         pendingConfirmations[requestId] = pending
@@ -302,6 +344,46 @@ class BridgeSafetyManager(
 
     // ── Internals ────────────────────────────────────────────────────────
 
+    /**
+     * Add [verb] to the trusted-verb set. Idempotent; no-op on blank input.
+     * Called from the overlay host when the user ticks "Don't ask again"
+     * and taps Allow. Verbs are persisted lowercase/trimmed by the
+     * underlying repository.
+     */
+    fun trustDestructiveVerb(verb: String) {
+        val normalized = verb.trim().lowercase()
+        if (normalized.isEmpty()) return
+        scope.launch {
+            runCatching { prefsRepo.addTrustedDestructiveVerb(normalized) }
+                .onFailure { Log.w(TAG, "trustDestructiveVerb('$verb') failed", it) }
+        }
+    }
+
+    /**
+     * Wipe the trusted-verb set. Called from [BridgeScreen]'s "Reset"
+     * affordance after the user confirms. After this, every destructive
+     * verb prompts again.
+     */
+    fun clearTrustedDestructiveVerbs() {
+        scope.launch {
+            runCatching { prefsRepo.clearTrustedDestructiveVerbs() }
+                .onFailure { Log.w(TAG, "clearTrustedDestructiveVerbs failed", it) }
+        }
+    }
+
+    private suspend fun currentTrustedVerbs(): Set<String> {
+        if (trustedHydrated) return _trustedDestructiveVerbs.value
+        return try {
+            val first = prefsRepo.trustedDestructiveVerbs.first()
+            _trustedDestructiveVerbs.value = first
+            trustedHydrated = true
+            first
+        } catch (t: Throwable) {
+            Log.w(TAG, "currentTrustedVerbs: DataStore read failed — using empty", t)
+            emptySet()
+        }
+    }
+
     private suspend fun currentSettings(): BridgeSafetySettings {
         // Prefer the cached value once the DataStore collector has ticked
         // at least once. Before that, fall back to a one-shot read of

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

@@ -184,11 +184,22 @@ class BridgeStatusOverlay(context: Context) : ConfirmationOverlayHost {
                         method = request.method,
                         verb = request.verb,
                         fullText = request.text,
-                        onAllow = {
+                        onAllow = { trustVerb ->
+                            // Persist the "don't ask again" choice BEFORE
+                            // dismissing so a slow write can't race a
+                            // follow-up command that arrives while we're
+                            // still tearing down the overlay. trustVerb is
+                            // already gated by the dialog on verb.isNotBlank,
+                            // so passing it through straight is safe.
+                            if (trustVerb && request.verb.isNotBlank()) {
+                                BridgeSafetyManager.peek()
+                                    ?.trustDestructiveVerb(request.verb)
+                            }
                             onResult(true)
                             dismissConfirmation(request.id)
                         },
                         onDeny = {
+                            // Deny never writes trust — denying isn't consent.
                             onResult(false)
                             dismissConfirmation(request.id)
                         },

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

@@ -0,0 +1,83 @@
+package com.hermesandroid.relay.data
+
+/**
+ * Shared profile/personality display and request identity helpers.
+ *
+ * A null profile name is the app's explicit "Server default" state. The
+ * relay also advertises the root Hermes config as a synthetic profile named
+ * "default"; for request/session identity that row is an alias of server
+ * default so it does not split chat, voice, or session scope.
+ */
+object AgentDisplay {
+    const val SERVER_DEFAULT_PROFILE_KEY: String = "__server_default__"
+
+    fun effectiveProfile(
+        selectedProfile: Profile?,
+        profiles: List<Profile>,
+    ): Profile? = selectedProfile
+        ?: profiles.firstOrNull { it.name.equals("default", ignoreCase = true) }
+
+    fun profileDisplayName(profile: Profile?): String? {
+        if (profile == null) return null
+        return when {
+            profile.description.isNotBlank() -> profile.description.trim()
+            profile.name.isNotBlank() -> titleCase(profile.name.trim())
+            else -> null
+        }
+    }
+
+    fun agentName(
+        profile: Profile?,
+        selectedPersonality: String,
+        defaultPersonality: String,
+        connectionLabel: String?,
+    ): String {
+        profileDisplayName(profile)?.let { return it }
+
+        val personalityName = if (
+            selectedPersonality == "default" &&
+            defaultPersonality.isNotBlank()
+        ) {
+            defaultPersonality
+        } else {
+            selectedPersonality
+        }
+
+        return when {
+            personalityName.isNotBlank() && personalityName != "default" ->
+                titleCase(personalityName.trim())
+            !connectionLabel.isNullOrBlank() -> connectionLabel.trim()
+            else -> "Hermes"
+        }
+    }
+
+    fun personalityLabel(
+        selectedPersonality: String,
+        defaultPersonality: String,
+    ): String = when {
+        selectedPersonality != "default" && selectedPersonality.isNotBlank() ->
+            titleCase(selectedPersonality.trim())
+        defaultPersonality.isNotBlank() -> titleCase(defaultPersonality.trim())
+        else -> "Default"
+    }
+
+    fun isServerDefaultAlias(profileName: String?): Boolean =
+        profileName?.trim()?.equals("default", ignoreCase = true) == true
+
+    fun normalizeSelection(profile: Profile?): Profile? =
+        if (isServerDefaultAlias(profile?.name)) null else profile
+
+    fun profileRequestName(profileName: String?): String? =
+        profileName
+            ?.trim()
+            ?.takeIf { it.isNotEmpty() && !isServerDefaultAlias(it) }
+
+    fun profileSessionKey(profileName: String?): String =
+        profileRequestName(profileName) ?: SERVER_DEFAULT_PROFILE_KEY
+
+    fun profileContextKey(connectionId: String?, profileName: String?): String =
+        "${connectionId.orEmpty()}::${profileSessionKey(profileName)}"
+
+    private fun titleCase(value: String): String =
+        value.replaceFirstChar { it.uppercase() }
+}

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

@@ -0,0 +1,117 @@
+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.booleanPreferencesKey
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringPreferencesKey
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+
+/**
+ * User-tunable voice barge-in preferences.
+ *
+ * Phase V follow-on — owned by the voice-barge-in plan (Wave 1 / unit B1).
+ *
+ * Barge-in lets the user interrupt TTS playback by speaking. The three knobs
+ * here back the Voice Settings "Interruption" section added by B5 and are
+ * consumed by [com.hermesandroid.relay.viewmodel.VoiceViewModel] (wired in
+ * B4):
+ *
+ *  - [enabled] — master toggle for the whole barge-in path. When false, the
+ *    listener never starts and TTS plays uninterrupted. Default off at launch
+ *    on both flavors so existing users aren't surprised by mic activation
+ *    during a speaking turn.
+ *
+ *  - [sensitivity] — maps to Silero VAD threshold + hysteresis tuning inside
+ *    [com.hermesandroid.relay.audio.VadEngine]. [BargeInSensitivity.Off] is
+ *    a UI convenience for "disable without flipping the top-level toggle";
+ *    it short-circuits the VAD to `isSpeech=false` regardless of input.
+ *
+ *  - [resumeAfterInterruption] — if the user interrupts, then falls silent
+ *    within the 600 ms watchdog, should we re-enqueue the un-played sentence
+ *    chunks so the agent finishes speaking? On by default — without it,
+ *    barge-in behaves like a hard cancel, which is more abrupt than most
+ *    conversational UX expects.
+ *
+ * Matches the [BridgePreferences] / [VoicePreferences] / [MediaSettings] style:
+ * single shared DataStore (`relayDataStore`), one key per scalar field, enum
+ * stored as its `name` (cheap + schema-evolvable via fall-back to default on
+ * unknown values). No migration needed — preferences are additive.
+ */
+data class BargeInPreferences(
+    val enabled: Boolean = DEFAULT_ENABLED,
+    val sensitivity: BargeInSensitivity = DEFAULT_SENSITIVITY,
+    val resumeAfterInterruption: Boolean = DEFAULT_RESUME_AFTER_INTERRUPTION,
+)
+
+/**
+ * VAD sensitivity preset for barge-in detection.
+ *
+ * Tuning lives in [com.hermesandroid.relay.audio.VadEngine.setSensitivity] —
+ * see the B2 unit spec for the exact `(threshold, attack, release,
+ * consecutive)` tuple each value maps to. [Off] is UI-only shorthand for
+ * "disable detection without clearing the toggle".
+ */
+enum class BargeInSensitivity {
+    Off,
+    Low,
+    Default,
+    High,
+}
+
+const val DEFAULT_ENABLED: Boolean = false
+val DEFAULT_SENSITIVITY: BargeInSensitivity = BargeInSensitivity.Default
+const val DEFAULT_RESUME_AFTER_INTERRUPTION: Boolean = true
+
+/**
+ * DataStore-backed repository for [BargeInPreferences].
+ *
+ * Primary constructor takes an [android.content.Context] and resolves the
+ * shared [Context.relayDataStore]; the secondary constructor takes a raw
+ * [DataStore] so unit tests can inject a filesystem-backed instance without
+ * needing an Android [android.content.Context]. Matches the shape of
+ * [BridgeSafetyPreferencesRepository] (field `flow: Flow<...>`, per-field
+ * suspend setters).
+ */
+class BargeInPreferencesRepository(
+    private val dataStore: DataStore<Preferences>,
+) {
+    constructor(context: Context) : this(context.relayDataStore)
+
+    companion object {
+        private val KEY_ENABLED = booleanPreferencesKey("barge_in_enabled")
+        private val KEY_SENSITIVITY = stringPreferencesKey("barge_in_sensitivity")
+        private val KEY_RESUME_AFTER_INTERRUPTION =
+            booleanPreferencesKey("barge_in_resume_after_interruption")
+    }
+
+    val flow: Flow<BargeInPreferences> = dataStore.data
+        .map { prefs ->
+            BargeInPreferences(
+                enabled = prefs[KEY_ENABLED] ?: DEFAULT_ENABLED,
+                sensitivity = prefs[KEY_SENSITIVITY]?.let { decodeSensitivity(it) }
+                    ?: DEFAULT_SENSITIVITY,
+                resumeAfterInterruption = prefs[KEY_RESUME_AFTER_INTERRUPTION]
+                    ?: DEFAULT_RESUME_AFTER_INTERRUPTION,
+            )
+        }
+        .distinctUntilChanged()
+
+    suspend fun setEnabled(value: Boolean) {
+        dataStore.edit { it[KEY_ENABLED] = value }
+    }
+
+    suspend fun setSensitivity(value: BargeInSensitivity) {
+        dataStore.edit { it[KEY_SENSITIVITY] = value.name }
+    }
+
+    suspend fun setResumeAfterInterruption(value: Boolean) {
+        dataStore.edit { it[KEY_RESUME_AFTER_INTERRUPTION] = value }
+    }
+
+    private fun decodeSensitivity(raw: String): BargeInSensitivity =
+        runCatching { BargeInSensitivity.valueOf(raw) }.getOrDefault(DEFAULT_SENSITIVITY)
+}

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

@@ -5,6 +5,7 @@ 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 androidx.datastore.preferences.core.stringSetPreferencesKey
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kotlinx.serialization.encodeToString
@@ -164,6 +165,17 @@ class BridgeSafetyPreferencesRepository(private val context: Context) {
             booleanPreferencesKey("bridge_unattended_warning_seen")
         // === END v0.4.1 unattended-access keys ===
 
+        // === "Don't ask again" trusted destructive verbs ===
+        // Set of normalized (lowercase, trimmed) destructive verbs the user
+        // has chosen to stop being prompted about. Stored as a native
+        // stringSet (not JSON) because there's no ordering/evolution concern
+        // here — just membership. Empty set by default — every destructive
+        // verb prompts until the user opts in via the confirmation dialog's
+        // "Don't ask again" checkbox.
+        private val KEY_TRUSTED_DESTRUCTIVE_VERBS =
+            stringSetPreferencesKey("bridge_trusted_destructive_verbs")
+        // === END trusted destructive verbs ===
+
         /** Sentinel key we set the first time settings get written. Used to
          *  tell "user cleared the blocklist" from "user has never touched it". */
         private val KEY_SAFETY_INITIALIZED = booleanPreferencesKey("bridge_safety_initialized")
@@ -307,6 +319,52 @@ class BridgeSafetyPreferencesRepository(private val context: Context) {
 
     // === END v0.4.1 unattended-access setters ===
 
+    // === "Don't ask again" trusted destructive verbs ===
+
+    /**
+     * Live Flow of the verbs the user has marked "don't ask again" for.
+     * Values are normalized (lowercase, trimmed) on write, so comparisons
+     * against [BridgeSafetySettings.destructiveVerbs] and the incoming
+     * modal `verb` field don't need any extra casing logic at the read
+     * site. Master blocklist + master-disable still take precedence over
+     * this set — this is only consulted AFTER the destructive-verb gate
+     * decides a confirmation would otherwise fire.
+     */
+    val trustedDestructiveVerbs: Flow<Set<String>> =
+        context.relayDataStore.data.map { prefs ->
+            prefs[KEY_TRUSTED_DESTRUCTIVE_VERBS]?.toSet() ?: emptySet()
+        }
+
+    suspend fun setTrustedDestructiveVerbs(verbs: Set<String>) {
+        val normalized = verbs
+            .map { it.trim().lowercase() }
+            .filter { it.isNotEmpty() }
+            .toSet()
+        context.relayDataStore.edit { prefs ->
+            prefs[KEY_TRUSTED_DESTRUCTIVE_VERBS] = normalized
+            prefs[KEY_SAFETY_INITIALIZED] = true
+        }
+    }
+
+    suspend fun addTrustedDestructiveVerb(verb: String) {
+        val normalized = verb.trim().lowercase()
+        if (normalized.isEmpty()) return
+        context.relayDataStore.edit { prefs ->
+            val current = prefs[KEY_TRUSTED_DESTRUCTIVE_VERBS] ?: emptySet()
+            prefs[KEY_TRUSTED_DESTRUCTIVE_VERBS] = current + normalized
+            prefs[KEY_SAFETY_INITIALIZED] = true
+        }
+    }
+
+    suspend fun clearTrustedDestructiveVerbs() {
+        context.relayDataStore.edit { prefs ->
+            prefs[KEY_TRUSTED_DESTRUCTIVE_VERBS] = emptySet()
+            prefs[KEY_SAFETY_INITIALIZED] = true
+        }
+    }
+
+    // === END trusted destructive verbs ===
+
     private fun decodeSet(raw: String): Set<String> =
         runCatching { json.decodeFromString<List<String>>(raw).toSet() }
             .getOrDefault(emptySet())

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

@@ -39,8 +39,27 @@ data class ChatMessage(
     val estimatedCost: Double? = null,
     // Agent/personality name for display on assistant messages
     val agentName: String? = null,
+    // Small provenance badges rendered on assistant bubbles.
+    val badges: List<String> = emptyList(),
     // File attachments (images, documents, etc.)
     val attachments: List<Attachment> = emptyList(),
+    /**
+     * 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]
+     * and rendered inline by
+     * [com.hermesandroid.relay.ui.components.HermesCardBubble]. Mirrors
+     * [attachments]' lifecycle — the marker line is stripped from
+     * [content] on match so the raw `CARD:{...}` never appears in the
+     * bubble text, same as the `MEDIA:` parser.
+     */
+    val cards: List<HermesCard> = emptyList(),
+    /**
+     * Tapped actions on any of [cards]. Checked by the renderer so a card
+     * whose action has been dispatched collapses into a confirmation state
+     * rather than re-offering the buttons.
+     */
+    val cardDispatches: List<HermesCardDispatch> = emptyList(),
     /**
      * Structured trace of a phone-local voice intent dispatch. Populated only
      * for messages whose [id] starts with `voice-intent-` and that originated
@@ -60,7 +79,17 @@ data class ChatMessage(
      * to true via [com.hermesandroid.relay.network.handlers.ChatHandler.markVoiceIntentsSynced]
      * so they're not re-sent on the next turn.
      */
-    val voiceIntent: VoiceIntentTrace? = null
+    val voiceIntent: VoiceIntentTrace? = null,
+    /**
+     * Provider-native Realtime Agent turns can answer without calling Hermes.
+     * Those local-only assistant turns need to be spliced into the next Hermes
+     * chat/run payload so switching back to normal chat preserves context.
+     *
+     * Hermes-backed realtime turns leave this null because Hermes already owns
+     * the durable session turn; the provider's spoken summary is UI/runtime
+     * provenance, not another canonical assistant message.
+     */
+    val realtimeTurn: RealtimeTurnTrace? = null
 )
 
 /**
@@ -112,6 +141,24 @@ data class VoiceIntentTrace(
     val syncedToServer: Boolean = false,
 )
 
+/**
+ * Local provider-native realtime turn that has not necessarily been absorbed
+ * into the Hermes session yet.
+ *
+ * Stored on the assistant message so the next normal chat send can emit a
+ * compact OpenAI-format user/assistant pair before the live user message. This
+ * keeps Realtime Agent and Hermes Chat + Voice Output as one conversation even
+ * when the realtime provider answered directly.
+ */
+data class RealtimeTurnTrace(
+    val userText: String,
+    val assistantText: String,
+    val provider: String? = null,
+    val model: String? = null,
+    val voice: String? = null,
+    val syncedToServer: Boolean = false,
+)
+
 /**
  * A file attachment sent with a message.
  *
@@ -187,6 +234,8 @@ data class ToolCall(
     val success: Boolean?,
     val isComplete: Boolean = false,
     val error: String? = null,
+    val runId: String? = null,
+    val provenance: String? = null,
     // Duration tracking
     val startedAt: Long = System.currentTimeMillis(),
     val completedAt: Long? = null

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

@@ -0,0 +1,330 @@
+package com.hermesandroid.relay.data
+
+import kotlinx.serialization.Serializable
+import java.net.URI
+
+@Serializable
+data class DashboardConnectionStatus(
+    val checkedAtMillis: Long? = null,
+    val reachable: Boolean = false,
+    val authRequired: Boolean? = null,
+    val authProviders: List<String> = emptyList(),
+    val authenticated: Boolean? = null,
+    val authProvider: String? = null,
+    val gatewayTicketAvailable: Boolean? = null,
+    val message: String? = null,
+)
+
+/**
+ * A "connection" = a distinct Hermes server connection the app can switch between.
+ *
+ * Each connection has its own:
+ *  - API server URL + relay URL
+ *  - EncryptedSharedPreferences file (keyed by [tokenStoreKey]) holding the
+ *    session token, device ID, API key, and paired-session metadata.
+ *  - Cert pin (already host-keyed in [com.hermesandroid.relay.auth.CertPinStore]
+ *    so that store is intrinsically per-connection as long as hosts differ).
+ *  - Last-active session ID (to restore the open chat on connection switch).
+ *  - Transport hint + session expiry mirrored from the server's `auth.ok`
+ *    payload so the connection list can show "expires in 3d" without cracking
+ *    open the token store.
+ *
+ * Switching connection is a HEAVY context swap — caller is expected to tear down
+ * the current [com.hermesandroid.relay.network.ConnectionManager],
+ * [com.hermesandroid.relay.auth.AuthManager], and API client, then construct
+ * fresh ones pointed at the new connection's `tokenStoreKey`.
+ *
+ * **Zero-disruption migration:** the legacy pre-multi-connection install kept
+ * all of its auth state in a single EncryptedSharedPreferences file named
+ * [LEGACY_TOKEN_STORE_KEY]. On first launch after the multi-connection upgrade,
+ * [ConnectionStore.migrateLegacyConnectionIfNeeded] seeds connection 0 pointing
+ * at that existing file — no token migration, no re-pair.
+ *
+ * **Terminology note (2026-04-18):** earlier drafts of this feature called the
+ * concept "Profile". Renamed to [Connection] so that the term "Profile" is
+ * free to mean upstream Hermes profiles: separate host-side Hermes homes
+ * under `~/.hermes/profiles/<name>/`, each with its own config, SOUL, memory,
+ * sessions, skills, cron, and provider state.
+ */
+@Serializable
+data class Connection(
+    val id: String,
+    val label: String,
+    val apiServerUrl: String,
+    val relayUrl: String,
+    val tokenStoreKey: String,
+    /**
+     * Hermes dashboard/admin URL. Dashboard management features use this
+     * separately from the relay pairing channel; a blank/null value means
+     * "derive from [apiServerUrl] using the conventional same-host :9119".
+     */
+    val dashboardUrl: String? = null,
+    val dashboardAuthRequired: Boolean? = null,
+    val dashboardAuthProviders: List<String> = emptyList(),
+    val dashboardLastStatus: DashboardConnectionStatus? = null,
+    /**
+     * Candidate host routes for this saved Hermes server. Standard setup
+     * stores at least one candidate here so API, dashboard, voice, and Relay
+     * helpers can follow LAN/Tailscale/public handoff before Relay pairing.
+     * Older installs and legacy serialized records default to an empty list.
+     */
+    val routeCandidates: List<EndpointCandidate> = emptyList(),
+    /** Optional user preference such as "lan" or "tailscale"; null means Auto. */
+    val preferredRouteRole: String? = null,
+    /** Epoch milliseconds. Pass `System.currentTimeMillis()`; do not pass seconds. */
+    val pairedAt: Long? = null,
+    val lastActiveSessionId: String? = null,
+    val transportHint: String? = null,
+    /** Epoch milliseconds. The auth.ok `expires_at` field is seconds — multiply by 1000 at the call site. */
+    val expiresAt: Long? = null,
+) {
+    val resolvedDashboardUrl: String
+        get() = dashboardUrl
+            ?.trim()
+            ?.takeIf { it.isNotBlank() }
+            ?: deriveDefaultDashboardUrl(apiServerUrl).orEmpty()
+
+    companion object {
+        /**
+         * The pre-multi-connection EncryptedSharedPreferences filename. Matches
+         * [com.hermesandroid.relay.auth.KeystoreTokenStore]'s original
+         * hardcoded `PREFS_NAME`. Connection 0 re-uses this file as-is so the
+         * existing paired device keeps working across the upgrade.
+         */
+        const val LEGACY_TOKEN_STORE_KEY: String = "hermes_companion_auth_hw"
+
+        const val DEFAULT_DASHBOARD_PORT: Int = 9119
+
+        /**
+         * Derive a stable per-connection EncryptedSharedPreferences filename
+         * from a connection UUID. Trimmed to the first 8 characters of the
+         * UUID so the on-disk filename stays short and human-diffable, which
+         * matters because [android.content.Context.deleteSharedPreferences]
+         * only accepts a filename string.
+         */
+        fun buildTokenStoreKey(id: String): String = "hermes_auth_${id.take(8)}"
+
+        /**
+         * Human-friendly default label for a newly-added connection. Uses the
+         * hostname of the API server URL so "http://192.168.1.10:8642" becomes
+         * "192.168.1.10". Falls back to the raw URL if parsing fails (e.g.,
+         * user typed a malformed value — better to show something recognizable
+         * than to crash).
+         */
+        fun extractDefaultLabel(apiServerUrl: String): String {
+            return try {
+                URI(apiServerUrl).host ?: apiServerUrl
+            } catch (_: Exception) {
+                apiServerUrl
+            }
+        }
+
+        fun deriveDefaultDashboardUrl(
+            apiServerUrl: String,
+            dashboardPort: Int = DEFAULT_DASHBOARD_PORT,
+        ): String? {
+            val trimmed = apiServerUrl.trim().trimEnd('/')
+            if (trimmed.isEmpty()) return null
+
+            val uri = runCatching { URI(trimmed) }.getOrNull() ?: return null
+            val scheme = when (uri.scheme?.lowercase()) {
+                "http" -> "http"
+                "https" -> "https"
+                else -> return null
+            }
+            val host = uri.host?.takeIf { it.isNotBlank() } ?: return null
+            val hostPart = if (host.contains(":") && !host.startsWith("[")) {
+                "[$host]"
+            } else {
+                host
+            }
+            return "$scheme://$hostPart:$dashboardPort"
+        }
+
+        fun isAutoManagedDashboardUrl(dashboardUrl: String?, apiServerUrl: String): Boolean {
+            val trimmed = dashboardUrl?.trim()?.trimEnd('/').orEmpty()
+            if (trimmed.isEmpty()) return true
+            val derived = deriveDefaultDashboardUrl(apiServerUrl) ?: return false
+            return trimmed.equals(derived, ignoreCase = true)
+        }
+
+        fun deriveDefaultRelayUrl(
+            apiServerUrl: String,
+            relayPort: Int = 8767,
+        ): String? {
+            val trimmed = apiServerUrl.trim().trimEnd('/')
+            if (trimmed.isEmpty()) return null
+
+            val uri = runCatching { URI(trimmed) }.getOrNull() ?: return null
+            val scheme = when (uri.scheme?.lowercase()) {
+                "http" -> "ws"
+                "https" -> "wss"
+                else -> return null
+            }
+            val host = uri.host?.takeIf { it.isNotBlank() } ?: return null
+            val hostPart = if (host.contains(":") && !host.startsWith("[")) {
+                "[$host]"
+            } else {
+                host
+            }
+            return "$scheme://$hostPart:$relayPort"
+        }
+
+        fun buildRouteCandidates(
+            apiServerUrl: String,
+            relayUrl: String,
+            extraApiUrls: List<Pair<String, String>> = emptyList(),
+        ): List<EndpointCandidate> {
+            val routes = buildList {
+                endpointCandidateFromApiUrl(
+                    role = inferRouteRole(apiServerUrl),
+                    priority = 0,
+                    apiServerUrl = apiServerUrl,
+                    relayUrl = relayUrl.takeIf { it.isNotBlank() }
+                        ?: deriveDefaultRelayUrl(apiServerUrl).orEmpty(),
+                )?.let(::add)
+
+                extraApiUrls
+                    .map { it.first.trim() to it.second.trim() }
+                    .filter { (_, url) -> url.isNotBlank() }
+                    .forEachIndexed { index, (role, url) ->
+                        endpointCandidateFromApiUrl(
+                            role = role.ifBlank { inferRouteRole(url) },
+                            priority = index + 1,
+                            apiServerUrl = url,
+                            relayUrl = deriveDefaultRelayUrl(url).orEmpty(),
+                        )?.let(::add)
+                    }
+            }
+
+            return routes
+                .distinctBy {
+                    "${it.role.lowercase()}|${it.api.host.lowercase()}:${it.api.port}"
+                }
+                .sortedWith(compareBy<EndpointCandidate> { it.priority }.thenBy { it.role })
+        }
+
+        /**
+         * Overlay a freshly-rebuilt candidate list onto an existing stored
+         * one, preserving the stored extras (priority > 0) that the rebuild
+         * doesn't already cover. URL edits rebuild only the route(s) the
+         * user actually touched — without this merge, saving an API or
+         * Relay URL collapsed the stored list to a single candidate,
+         * silently dropping the setup wizard's Tailscale route (or a
+         * pairing payload's extra endpoints) and killing LAN/VPN roaming.
+         *
+         * Stored extras are preserved **verbatim** (role, priority, relay
+         * URL) rather than re-derived, so payload-specified relay URLs
+         * survive. Host:port collisions defer to the rebuilt entry.
+         */
+        fun mergeRouteCandidates(
+            rebuilt: List<EndpointCandidate>,
+            existing: List<EndpointCandidate>,
+        ): List<EndpointCandidate> {
+            val rebuiltHostPorts = rebuilt
+                .map { "${it.api.host.lowercase()}:${it.api.port}" }
+                .toSet()
+            val preserved = existing
+                .filter { it.priority > 0 }
+                .filterNot { "${it.api.host.lowercase()}:${it.api.port}" in rebuiltHostPorts }
+            return (rebuilt + preserved)
+                .distinctBy { "${it.role.lowercase()}|${it.api.host.lowercase()}:${it.api.port}" }
+                .sortedWith(compareBy<EndpointCandidate> { it.priority }.thenBy { it.role })
+        }
+
+        /**
+         * Normalize hand-typed API-URL input: trim, strip trailing slashes,
+         * default a missing scheme to `http://`, and default a missing port
+         * to [defaultPort] — most Hermes API servers speak plain HTTP on
+         * 8642, and a bare `192.168.1.10` / Tailscale `100.x.y.z` is by far
+         * the most common thing users type.
+         *
+         * URLs that already carry a scheme are preserved **verbatim**
+         * (including a wrong one like `ws://`, so downstream validators can
+         * complain precisely): an explicit `https://hermes.example.com` may
+         * be a reverse proxy on 443, and force-appending :8642 would break
+         * it. Port-defaulting applies only to scheme-less input, where the
+         * user is visibly relying on our defaults.
+         */
+        fun normalizeApiUrlInput(raw: String, defaultPort: Int = 8642): String {
+            val trimmed = raw.trim().trimEnd('/')
+            if (trimmed.isEmpty()) return trimmed
+            if (SCHEME_REGEX.containsMatchIn(trimmed)) return trimmed
+            val withScheme = "http://$trimmed"
+            val uri = runCatching { URI(withScheme) }.getOrNull()
+            val canAppendPort = uri != null &&
+                !uri.host.isNullOrBlank() &&
+                uri.port <= 0 &&
+                uri.rawPath.isNullOrEmpty() &&
+                uri.rawQuery == null
+            return if (canAppendPort) "$withScheme:$defaultPort" else withScheme
+        }
+
+        private val SCHEME_REGEX = Regex("^[A-Za-z][A-Za-z0-9+.-]*://")
+
+        fun endpointCandidateFromApiUrl(
+            role: String,
+            priority: Int,
+            apiServerUrl: String,
+            relayUrl: String,
+        ): EndpointCandidate? {
+            val uri = runCatching { URI(apiServerUrl.trim().trimEnd('/')) }.getOrNull()
+                ?: return null
+            val scheme = uri.scheme?.lowercase()
+            val tls = when (scheme) {
+                "http" -> false
+                "https" -> true
+                else -> return null
+            }
+            val host = uri.host?.takeIf { it.isNotBlank() } ?: return null
+            val port = if (uri.port > 0) uri.port else 8642
+            val resolvedRelayUrl = relayUrl.trim().takeIf { it.isNotBlank() }
+                ?: deriveDefaultRelayUrl(apiServerUrl)
+                ?: return null
+            val transportHint = when {
+                resolvedRelayUrl.startsWith("wss://", ignoreCase = true) -> "wss"
+                resolvedRelayUrl.startsWith("ws://", ignoreCase = true) -> "ws"
+                else -> null
+            }
+            return EndpointCandidate(
+                role = role.ifBlank { inferRouteRole(apiServerUrl) },
+                priority = priority,
+                api = ApiEndpoint(host = host, port = port, tls = tls),
+                relay = RelayEndpoint(url = resolvedRelayUrl, transportHint = transportHint),
+            )
+        }
+
+        fun inferRouteRole(apiServerUrl: String): String {
+            val host = runCatching { URI(apiServerUrl.trim().trimEnd('/')).host }
+                .getOrNull()
+                ?.lowercase()
+                ?: return "custom"
+            return when {
+                host.endsWith(".ts.net") || isTailscaleIpv4(host) -> "tailscale"
+                host == "localhost" ||
+                    host == "127.0.0.1" ||
+                    host == "::1" ||
+                    isPrivateLanIpv4(host) -> "lan"
+                else -> "public"
+            }
+        }
+
+        private fun isTailscaleIpv4(host: String): Boolean {
+            val parts = host.split('.').mapNotNull { it.toIntOrNull() }
+            if (parts.size != 4) return false
+            return parts[0] == 100 && parts[1] in 64..127
+        }
+
+        private fun isPrivateLanIpv4(host: String): Boolean {
+            val parts = host.split('.').mapNotNull { it.toIntOrNull() }
+            if (parts.size != 4) return false
+            return when {
+                parts[0] == 10 -> true
+                parts[0] == 172 && parts[1] in 16..31 -> true
+                parts[0] == 192 && parts[1] == 168 -> true
+                parts[0] == 169 && parts[1] == 254 -> true
+                else -> false
+            }
+        }
+    }
+}

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

@@ -0,0 +1,503 @@
+package com.hermesandroid.relay.data
+
+import android.content.Context
+import android.util.Log
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringPreferencesKey
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.json.Json
+
+/**
+ * Single source of truth for the list of Hermes server connections and which
+ * one is currently active.
+ *
+ * Persistence lives on [Context.relayDataStore] — the same DataStore used by
+ * [FeatureFlags] / [PairingPreferences] / etc. — under two keys:
+ *
+ *  - [KEY_CONNECTIONS]          — JSON array of [Connection] serialized via
+ *                                 kotlinx.serialization.
+ *  - [KEY_ACTIVE_CONNECTION_ID] — the UUID of the currently-active connection.
+ *                                 May be absent on a fresh install or after
+ *                                 the last connection is removed.
+ *
+ * The store exposes three [StateFlow]s:
+ *
+ *  - [connections]         — the full list, hot on the store's own scope.
+ *  - [activeConnectionId]  — the active connection's UUID, or null.
+ *  - [activeConnection]    — derived from the above two. Null when the active
+ *                            ID is missing or refers to a connection that no
+ *                            longer exists (stale ID after a delete, for
+ *                            example).
+ *
+ * The store is **single-writer by convention** — all mutations go through its
+ * suspend fns, each of which uses a [DataStore.edit] block under the hood so
+ * concurrent writers serialize correctly. No external locking required.
+ *
+ * Tests instantiate it via the internal constructor that accepts a raw
+ * [DataStore] so they can point it at a temp-folder preferences file without
+ * needing an Android Context.
+ *
+ * **Terminology note (2026-04-18):** renamed from `ProfileStore` so that the
+ * term "Profile" is free to mean what Hermes's server config means by it
+ * (agent profiles). Legacy DataStore keys (`profiles_v1`, `active_profile_id`)
+ * are migrated once on first launch — see the init block below.
+ */
+class ConnectionStore private constructor(
+    private val dataStore: DataStore<Preferences>,
+    private val context: Context?,
+) {
+
+    /**
+     * Production constructor — wires the store to [Context.relayDataStore].
+     * The context reference is kept so [removeConnection] can call
+     * [Context.deleteSharedPreferences] on the connection's
+     * EncryptedSharedPreferences file when it's removed.
+     */
+    constructor(context: Context) : this(
+        dataStore = context.relayDataStore,
+        context = context.applicationContext,
+    )
+
+    /**
+     * Test constructor — accepts a raw [DataStore]. The context is null, so
+     * [removeConnection] skips the file-deletion side effect (tests don't have
+     * access to a real EncryptedSharedPreferences anyway).
+     */
+    internal constructor(dataStore: DataStore<Preferences>) : this(
+        dataStore = dataStore,
+        context = null,
+    )
+
+    private val scope = CoroutineScope(Dispatchers.Default + SupervisorJob())
+
+    private val json = Json {
+        ignoreUnknownKeys = true
+        encodeDefaults = true
+    }
+
+    private val connectionListSerializer = ListSerializer(Connection.serializer())
+
+    private val writeMutex = Mutex()
+
+    private val _connections = MutableStateFlow<List<Connection>>(emptyList())
+    val connections: StateFlow<List<Connection>> = _connections.asStateFlow()
+
+    private val _activeConnectionId = MutableStateFlow<String?>(null)
+    val activeConnectionId: StateFlow<String?> = _activeConnectionId.asStateFlow()
+
+    /**
+     * Derived: the active connection, or null when the active ID is missing
+     * or points to a deleted connection. Recomputes every time either
+     * upstream emits — cheap list scan, no memoization needed.
+     */
+    val activeConnection: StateFlow<Connection?> = combine(_connections, _activeConnectionId) { list, id ->
+        if (id == null) null else list.firstOrNull { it.id == id }
+    }.stateIn(scope, SharingStarted.Eagerly, null)
+
+    init {
+        scope.launch {
+            try {
+                val prefs = dataStore.data.first()
+                val newJson = prefs[KEY_CONNECTIONS]
+                val oldJson = prefs[KEY_LEGACY_PROFILES]
+                val activeNew = prefs[KEY_ACTIVE_CONNECTION_ID]
+                val activeOld = prefs[KEY_LEGACY_ACTIVE_PROFILE_ID]
+
+                // Prefer the new key. If absent and the old key has data,
+                // migrate it once: write to the new key and clear the old ones
+                // so we don't thrash every boot. JSON shape is identical
+                // between the two names — `{"id": ..., "label": ..., ...}` —
+                // so no per-record migration is needed.
+                if (newJson == null && oldJson != null) {
+                    dataStore.edit { p ->
+                        p[KEY_CONNECTIONS] = oldJson
+                        p.remove(KEY_LEGACY_PROFILES)
+                        if (activeNew == null && activeOld != null) {
+                            p[KEY_ACTIVE_CONNECTION_ID] = activeOld
+                            p.remove(KEY_LEGACY_ACTIVE_PROFILE_ID)
+                        }
+                    }
+                    _connections.value = decodeConnections(oldJson)
+                    _activeConnectionId.value = activeOld
+                    Log.i(
+                        TAG,
+                        "Migrated legacy DataStore keys (profiles_v1 → connections_v1)",
+                    )
+                } else {
+                    _connections.value = decodeConnections(newJson)
+                    _activeConnectionId.value = activeNew
+                }
+            } catch (e: Exception) {
+                Log.w(TAG, "Initial hydrate failed: ${e.message}")
+            }
+        }
+    }
+
+    // --- Mutations ----------------------------------------------------------
+
+    suspend fun addConnection(connection: Connection) {
+        writeMutex.withLock {
+            dataStore.edit { prefs ->
+                val current = decodeConnections(prefs[KEY_CONNECTIONS])
+                // If the same ID already exists, treat this as an upsert —
+                // callers shouldn't rely on insertion order of a duplicate
+                // add, and the alternative (throwing) makes migration code
+                // more brittle than it needs to be.
+                val normalized = connection.withDashboardDefaults()
+                val next = current.filterNot { it.id == connection.id } + normalized
+                prefs[KEY_CONNECTIONS] = encodeConnections(next)
+                _connections.value = next
+            }
+        }
+    }
+
+    /**
+     * Replace the connection with [connection]'s id. No-op if no connection
+     * with that id exists — callers should use [addConnection] for inserts.
+     */
+    suspend fun updateConnection(connection: Connection) {
+        writeMutex.withLock {
+            dataStore.edit { prefs ->
+                val current = decodeConnections(prefs[KEY_CONNECTIONS])
+                if (current.none { it.id == connection.id }) {
+                    Log.w(TAG, "updateConnection: no connection with id=${connection.id} — ignored")
+                    return@edit
+                }
+                val normalized = connection.withDashboardDefaults()
+                val next = current.map { if (it.id == connection.id) normalized else it }
+                prefs[KEY_CONNECTIONS] = encodeConnections(next)
+                _connections.value = next
+            }
+        }
+    }
+
+    /**
+     * Remove the connection with [id] from the list and delete its backing
+     * EncryptedSharedPreferences file. If [id] is currently active, the
+     * active pointer is cleared — callers are responsible for picking a new
+     * active connection.
+     *
+     * The EncryptedSharedPreferences file is deleted via
+     * [Context.deleteSharedPreferences], which is documented as API 24+ and
+     * is safe on our minSdk 26. The legacy connection's file
+     * ([Connection.LEGACY_TOKEN_STORE_KEY]) is deleted the same way — there's
+     * nothing structurally special about it once the user explicitly asks
+     * to remove connection 0.
+     */
+    suspend fun removeConnection(id: String) {
+        writeMutex.withLock {
+            var removed: Connection? = null
+            dataStore.edit { prefs ->
+                val current = decodeConnections(prefs[KEY_CONNECTIONS])
+                removed = current.firstOrNull { it.id == id }
+                val next = current.filterNot { it.id == id }
+                prefs[KEY_CONNECTIONS] = encodeConnections(next)
+                _connections.value = next
+
+                if (prefs[KEY_ACTIVE_CONNECTION_ID] == id) {
+                    prefs.remove(KEY_ACTIVE_CONNECTION_ID)
+                    _activeConnectionId.value = null
+                }
+            }
+            removed?.let { deleteTokenStoresFor(it) }
+        }
+    }
+
+    /**
+     * Factory-reset helper: clear the persisted connection list, active
+     * pointer, legacy profile aliases, and every known per-connection auth
+     * store. Unlike removing one connection, this intentionally does not pick
+     * a successor; callers are resetting the app back to "no connection".
+     */
+    suspend fun clearAllConnections() {
+        writeMutex.withLock {
+            var removed: List<Connection> = emptyList()
+            dataStore.edit { prefs ->
+                removed = decodeConnections(prefs[KEY_CONNECTIONS])
+                prefs.remove(KEY_CONNECTIONS)
+                prefs.remove(KEY_ACTIVE_CONNECTION_ID)
+                prefs.remove(KEY_LEGACY_PROFILES)
+                prefs.remove(KEY_LEGACY_ACTIVE_PROFILE_ID)
+                _connections.value = emptyList()
+                _activeConnectionId.value = null
+            }
+            removed.forEach { deleteTokenStoresFor(it) }
+        }
+    }
+
+    suspend fun replaceConnections(
+        connections: List<Connection>,
+        activeConnectionId: String? = null,
+    ) {
+        writeMutex.withLock {
+            var removed: List<Connection> = emptyList()
+            val normalizedConnections = connections.map { it.withDashboardDefaults() }
+            val normalizedActiveId = activeConnectionId
+                ?.takeIf { id -> normalizedConnections.any { it.id == id } }
+                ?: normalizedConnections.firstOrNull()?.id
+
+            dataStore.edit { prefs ->
+                removed = decodeConnections(prefs[KEY_CONNECTIONS])
+                if (normalizedConnections.isEmpty()) {
+                    prefs.remove(KEY_CONNECTIONS)
+                } else {
+                    prefs[KEY_CONNECTIONS] = encodeConnections(normalizedConnections)
+                }
+                if (normalizedActiveId == null) {
+                    prefs.remove(KEY_ACTIVE_CONNECTION_ID)
+                } else {
+                    prefs[KEY_ACTIVE_CONNECTION_ID] = normalizedActiveId
+                }
+                prefs.remove(KEY_LEGACY_PROFILES)
+                prefs.remove(KEY_LEGACY_ACTIVE_PROFILE_ID)
+                _connections.value = normalizedConnections
+                _activeConnectionId.value = normalizedActiveId
+            }
+            removed.forEach { deleteTokenStoresFor(it) }
+        }
+    }
+
+    private fun deleteTokenStoresFor(connection: Connection) {
+        context?.let { ctx ->
+            val storeKeys = buildSet {
+                add(connection.tokenStoreKey)
+                if (connection.tokenStoreKey == Connection.LEGACY_TOKEN_STORE_KEY) {
+                    // Pre-StrongBox fallback path used this file. If
+                    // connection 0 is removed, scrub it alongside the
+                    // hardware-backed legacy filename.
+                    add("hermes_companion_auth")
+                }
+            }
+            for (storeKey in storeKeys) {
+                try {
+                    ctx.deleteSharedPreferences(storeKey)
+                } catch (e: Exception) {
+                    Log.w(
+                        TAG,
+                        "deleteSharedPreferences($storeKey) failed: ${e.message}",
+                    )
+                }
+            }
+        }
+    }
+
+    suspend fun setActiveConnection(id: String) {
+        writeMutex.withLock {
+            dataStore.edit { prefs ->
+                prefs[KEY_ACTIVE_CONNECTION_ID] = id
+                _activeConnectionId.value = id
+            }
+        }
+    }
+
+    /**
+     * Update just the `lastActiveSessionId` on the identified connection.
+     * Called whenever the user picks a chat session so connection-switch can
+     * restore the same session on re-selection. No-op if the connection
+     * doesn't exist.
+     */
+    suspend fun setLastActiveSessionId(connectionId: String, sessionId: String?) {
+        writeMutex.withLock {
+            dataStore.edit { prefs ->
+                val current = decodeConnections(prefs[KEY_CONNECTIONS])
+                val target = current.firstOrNull { it.id == connectionId } ?: return@edit
+                val next = current.map {
+                    if (it.id == connectionId) target.copy(lastActiveSessionId = sessionId) else it
+                }
+                prefs[KEY_CONNECTIONS] = encodeConnections(next)
+                _connections.value = next
+            }
+        }
+    }
+
+    /**
+     * Stamp the identified connection with pairing metadata pulled out of an
+     * `auth.ok` payload. No-op if the connection doesn't exist — callers are
+     * responsible for ordering this after [addConnection].
+     *
+     * Both [pairedAtMillis] and [expiresAtMillis] are epoch milliseconds —
+     * pass `System.currentTimeMillis()` for pairedAt and `expires_at * 1000`
+     * for the seconds-based auth.ok payload field. `ConnectionsSettingsScreen`
+     * assumes millis when rendering relative time; pass seconds here and
+     * cards will always read as "Paired decades ago".
+     */
+    suspend fun markPaired(
+        connectionId: String,
+        pairedAtMillis: Long,
+        transportHint: String?,
+        expiresAtMillis: Long?,
+    ) {
+        writeMutex.withLock {
+            dataStore.edit { prefs ->
+                val current = decodeConnections(prefs[KEY_CONNECTIONS])
+                val target = current.firstOrNull { it.id == connectionId } ?: return@edit
+                val next = current.map {
+                    if (it.id == connectionId) {
+                        target.copy(
+                            pairedAt = pairedAtMillis,
+                            transportHint = transportHint,
+                            expiresAt = expiresAtMillis,
+                            dashboardUrl = target.dashboardUrl
+                                ?: Connection.deriveDefaultDashboardUrl(target.apiServerUrl),
+                        )
+                    } else {
+                        it
+                    }
+                }
+                prefs[KEY_CONNECTIONS] = encodeConnections(next)
+                _connections.value = next
+            }
+        }
+    }
+
+    /**
+     * One-shot legacy migration: if no connections are persisted yet, seed a
+     * connection 0 pointing at [Connection.LEGACY_TOKEN_STORE_KEY] so the
+     * existing paired install keeps working without a re-pair.
+     *
+     * Idempotent — subsequent calls after connection 0 is seeded (or after
+     * the user has added real connections) are a no-op. Pass the legacy URL
+     * / session values from whatever store currently holds them (e.g.,
+     * [ConnectionViewModel]'s DataStore-backed URL preferences).
+     */
+    suspend fun migrateLegacyConnectionIfNeeded(
+        legacyApiServerUrl: String?,
+        legacyRelayUrl: String?,
+        legacyLastSessionId: String?,
+    ) {
+        writeMutex.withLock {
+            dataStore.edit { prefs ->
+                val existing = decodeConnections(prefs[KEY_CONNECTIONS])
+                if (existing.isNotEmpty()) {
+                    // Already migrated or already has user-created connections.
+                    return@edit
+                }
+                if (legacyApiServerUrl.isNullOrBlank() && legacyRelayUrl.isNullOrBlank()) {
+                    Log.i(TAG, "migrateLegacyConnectionIfNeeded: no legacy URLs to seed")
+                    return@edit
+                }
+                val apiUrl = legacyApiServerUrl?.takeIf { it.isNotBlank() } ?: DEFAULT_API_URL
+                val relayUrl = legacyRelayUrl?.takeIf { it.isNotBlank() } ?: DEFAULT_RELAY_URL
+                val id = java.util.UUID.randomUUID().toString()
+                val seed = Connection(
+                    id = id,
+                    label = Connection.extractDefaultLabel(apiUrl),
+                    apiServerUrl = apiUrl,
+                    relayUrl = relayUrl,
+                    tokenStoreKey = Connection.LEGACY_TOKEN_STORE_KEY,
+                    dashboardUrl = Connection.deriveDefaultDashboardUrl(apiUrl),
+                    routeCandidates = Connection.buildRouteCandidates(apiUrl, relayUrl),
+                    pairedAt = null,
+                    lastActiveSessionId = legacyLastSessionId,
+                    transportHint = null,
+                    expiresAt = null,
+                )
+                val next = listOf(seed)
+                prefs[KEY_CONNECTIONS] = encodeConnections(next)
+                prefs[KEY_ACTIVE_CONNECTION_ID] = id
+                _connections.value = next
+                _activeConnectionId.value = id
+                Log.i(TAG, "migrateLegacyConnectionIfNeeded: seeded connection 0 id=$id apiUrl=$apiUrl")
+            }
+        }
+    }
+
+    suspend fun setDashboardStatus(
+        connectionId: String,
+        status: DashboardConnectionStatus,
+    ) {
+        writeMutex.withLock {
+            dataStore.edit { prefs ->
+                val current = decodeConnections(prefs[KEY_CONNECTIONS])
+                val target = current.firstOrNull { it.id == connectionId } ?: return@edit
+                val next = current.map {
+                    if (it.id == connectionId) {
+                        target.copy(
+                            dashboardUrl = target.dashboardUrl
+                                ?: Connection.deriveDefaultDashboardUrl(target.apiServerUrl),
+                            dashboardAuthRequired = status.authRequired,
+                            dashboardAuthProviders = status.authProviders,
+                            dashboardLastStatus = status,
+                        )
+                    } else {
+                        it
+                    }
+                }
+                prefs[KEY_CONNECTIONS] = encodeConnections(next)
+                _connections.value = next
+            }
+        }
+    }
+
+    // --- Encoding helpers ---------------------------------------------------
+
+    private fun encodeConnections(list: List<Connection>): String =
+        json.encodeToString(connectionListSerializer, list)
+
+    private fun decodeConnections(raw: String?): List<Connection> {
+        if (raw.isNullOrBlank()) return emptyList()
+        return try {
+            json.decodeFromString(connectionListSerializer, raw)
+                .map { it.withDashboardDefaults() }
+        } catch (e: Exception) {
+            Log.w(TAG, "decodeConnections failed, returning empty list: ${e.message}")
+            emptyList()
+        }
+    }
+
+    private fun Connection.withDashboardDefaults(): Connection {
+        val derivedDashboardUrl = Connection.deriveDefaultDashboardUrl(apiServerUrl)
+        val normalizedRoutes = routeCandidates.ifEmpty {
+            Connection.buildRouteCandidates(apiServerUrl, relayUrl)
+        }
+        val normalizedPreferredRouteRole = preferredRouteRole?.takeIf { preferred ->
+            normalizedRoutes.any { it.role.equals(preferred, ignoreCase = true) }
+        }
+        return if (
+            (dashboardUrl.isNullOrBlank() && derivedDashboardUrl != null) ||
+            normalizedRoutes != routeCandidates ||
+            normalizedPreferredRouteRole != preferredRouteRole
+        ) {
+            copy(
+                dashboardUrl = dashboardUrl?.takeIf { it.isNotBlank() } ?: derivedDashboardUrl,
+                routeCandidates = normalizedRoutes,
+                preferredRouteRole = normalizedPreferredRouteRole,
+            )
+        } else {
+            this
+        }
+    }
+
+    companion object {
+        private const val TAG = "ConnectionStore"
+
+        private val KEY_CONNECTIONS = stringPreferencesKey("connections_v1")
+        private val KEY_ACTIVE_CONNECTION_ID = stringPreferencesKey("active_connection_id")
+
+        // Pre-rename DataStore keys — read once in init on first launch after
+        // the rename, then wiped. See the init block above.
+        private val KEY_LEGACY_PROFILES = stringPreferencesKey("profiles_v1")
+        private val KEY_LEGACY_ACTIVE_PROFILE_ID = stringPreferencesKey("active_profile_id")
+
+        // Match the defaults used by ConnectionViewModel so a seeded connection
+        // from migrateLegacyConnectionIfNeeded() resolves to the same endpoints
+        // a fresh install would.
+        private const val DEFAULT_API_URL = "http://localhost:8642"
+        private const val DEFAULT_RELAY_URL = "ws://localhost:8767"
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.hermesandroid.relay.data
+
+import java.net.URI
+import java.net.URISyntaxException
+
+/**
+ * Validation rules for user-editable connection fields. Kept as a standalone
+ * object so the same rules fire in all save paths — inline dialog feedback,
+ * post-pairing add-connection, and any future import path — without the VM,
+ * the UI, and the data layer each re-implementing string checks.
+ *
+ * All validators return null on success or a short human-readable message
+ * suitable for surfacing in an OutlinedTextField `supportingText` slot or a
+ * Snackbar. Messages are intentionally concise — callers add context ("in
+ * connection label", "in relay URL") if the surface needs it.
+ */
+object ConnectionValidation {
+
+    const val LABEL_MAX_LEN: Int = 40
+
+    /**
+     * @return null when valid, else a message describing the problem.
+     *         Callers should `.trim()` before persisting — this does not
+     *         mutate the input.
+     */
+    fun validateLabel(raw: String): String? {
+        val trimmed = raw.trim()
+        if (trimmed.isEmpty()) return "Label can't be blank"
+        if (trimmed.length > LABEL_MAX_LEN) return "Label too long (max $LABEL_MAX_LEN)"
+        // Control characters (newlines, tabs, nul, etc.) would render badly
+        // in chips and are almost certainly a paste-accident.
+        if (trimmed.any { it.isISOControl() }) return "Label can't contain control characters"
+        return null
+    }
+
+    /**
+     * API server must be http:// or https:// with a host. The user pairs
+     * before they can save a connection, so malformed URLs shouldn't reach
+     * this path — but defense-in-depth against manual edits / restored
+     * backups is worth the few lines.
+     */
+    fun validateApiServerUrl(raw: String): String? = validateUrl(
+        raw = raw,
+        allowedSchemes = setOf("http", "https"),
+        kind = "API server URL",
+    )
+
+    /** Relay URL must be ws:// or wss:// with a host. */
+    fun validateRelayUrl(raw: String): String? = validateUrl(
+        raw = raw,
+        allowedSchemes = setOf("ws", "wss"),
+        kind = "relay URL",
+    )
+
+    /**
+     * Catches the "added the same server twice" mistake. Matches when the
+     * candidate's api + relay URLs exactly match an existing connection
+     * (case-insensitive on scheme + host, per RFC 3986). [excludeId] skips
+     * a specific connection so renames don't trip over their own entry.
+     *
+     * Deliberately lenient: two connections may share either URL alone (dev
+     * that points API at prod + relay at a test box, say). Full exact-match
+     * on both is the only blocked case.
+     */
+    fun findDuplicate(
+        connections: List<Connection>,
+        apiServerUrl: String,
+        relayUrl: String,
+        excludeId: String? = null,
+    ): Connection? = connections.firstOrNull { c ->
+        c.id != excludeId &&
+            c.apiServerUrl.equals(apiServerUrl, ignoreCase = true) &&
+            c.relayUrl.equals(relayUrl, ignoreCase = true)
+    }
+
+    private fun validateUrl(raw: String, allowedSchemes: Set<String>, kind: String): String? {
+        val trimmed = raw.trim()
+        if (trimmed.isEmpty()) return "$kind can't be blank"
+        val uri = try {
+            URI(trimmed)
+        } catch (_: URISyntaxException) {
+            return "$kind is malformed"
+        }
+        val scheme = uri.scheme?.lowercase()
+        if (scheme == null || scheme !in allowedSchemes) {
+            return "$kind must start with ${allowedSchemes.joinToString(" or ") { "$it://" }}"
+        }
+        if (uri.host.isNullOrBlank()) return "$kind has no host"
+        val port = uri.port
+        if (port != -1 && (port < 1 || port > 65535)) return "$kind has an invalid port"
+        return null
+    }
+}

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

@@ -6,6 +6,10 @@ import android.util.Log
 import androidx.datastore.preferences.core.booleanPreferencesKey
 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 kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
@@ -13,15 +17,27 @@ import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
 import java.io.File
 
 /**
  * Manages app data: backup, restore, and reset.
  *
- * Backup format is a JSON file containing settings and connection info.
- * Tokens are NOT included in backups for security.
+ * Backup format is a JSON file containing full connection metadata and
+ * credentials. Treat exported files as sensitive secrets.
  */
-class DataManager(private val context: Context) {
+class DataManager(
+    private val context: Context,
+    /**
+     * Multi-connection: the [ConnectionStore] singleton whose snapshot gets
+     * written into [AppBackup.connections] on export. Nullable for
+     * legacy/compat call sites that construct a [DataManager] without
+     * connection support; a null store just means "export an empty
+     * connections list" (equivalent to v2 behavior).
+     */
+    private val connectionStore: ConnectionStore? = null,
+) {
 
     companion object {
         private const val TAG = "DataManager"
@@ -39,53 +55,188 @@ class DataManager(private val context: Context) {
     }
 
     /**
-     * Backup data model -- only non-sensitive settings.
-     * Tokens and device IDs are never included.
+     * Backup data model.
+     *
+     * **Schema history:**
+     *  - v1: `serverUrl` only (single endpoint, pre-API-split).
+     *  - v2: adds `apiServerUrl` + `relayUrl`; `profiles: List<String>` held
+     *    server-issued session labels from `auth.ok` (never actually populated
+     *    on export — the field was vestigial).
+     *  - v3 (2026-04-18): `profiles: List<Profile>` — carried the new
+     *    multi-connection definitions under the then-current "Profile" name.
+     *  - v4 (2026-04-18): `connections: List<Connection>` — same shape as v3
+     *    under the renamed concept. v3 imports get their `profiles` field
+     *    re-mapped to `connections` (see [importSettings]). v1/v2 imports
+     *    get `connections = emptyList()` since the old string list was not
+     *    structurally compatible.
+     *  - v5 (2026-06-08): full connection backups. Adds active connection id
+     *    and `connectionSecrets`, including API keys, relay tokens, device id,
+     *    paired metadata, and dashboard cookies.
      */
     @Serializable
     data class AppBackup(
-        val version: Int = 2,
+        val version: Int = 5,
         val serverUrl: String? = null, // legacy (v1 compat)
         val apiServerUrl: String? = null,
         val relayUrl: String? = null,
         val theme: String = "auto",
         val onboardingCompleted: Boolean = false,
-        val profiles: List<String> = emptyList(),
-        val exportedAt: Long = System.currentTimeMillis()
+        val connections: List<Connection> = emptyList(),
+        val activeConnectionId: String? = null,
+        val containsSensitiveData: Boolean = true,
+        val connectionSecrets: List<ConnectionSecretBackup> = emptyList(),
+        val exportedAt: Long = System.currentTimeMillis(),
+    )
+
+    @Serializable
+    data class ConnectionSecretBackup(
+        val connectionId: String,
+        val tokenStoreKey: String,
+        val auth: ConnectionAuthSecrets = ConnectionAuthSecrets(),
+        val dashboardCookies: List<DashboardCookieBackup> = emptyList(),
+    )
+
+    @Serializable
+    data class DashboardCookieBackup(
+        val name: String,
+        val value: String,
+        val expiresAt: Long,
+        val domain: String,
+        val path: String,
+        val secure: Boolean,
+        val httpOnly: Boolean,
+        val hostOnly: Boolean,
+        val persistent: Boolean,
     )
 
     /**
      * Export app settings to a JSON string.
-     * Does NOT include session tokens or device IDs (security).
+     * Includes connection credentials. The export UI must warn the user that
+     * the resulting JSON file is sensitive.
+     *
+     * The `sessionLabels` parameter is a legacy dead parameter — it was
+     * previously sourced from `AuthManager.sessionLabels`, a field removed
+     * in Pass 2 of the multi-connection rollout (2026-04-18) when it was
+     * replaced by the structured `agentProfiles: StateFlow<List<Profile>>`.
+     * Kept only for call-site signature stability; not written to the
+     * backup. The backup's [AppBackup.connections] comes from the
+     * injected [connectionStore] snapshot. Callers should pass
+     * `emptyList()`. Will be removed in a later pass.
      */
     suspend fun exportSettings(
         serverUrl: String?,
         theme: String,
         onboardingCompleted: Boolean,
-        profiles: List<String>,
+        @Suppress("UNUSED_PARAMETER") sessionLabels: List<String>,
         apiServerUrl: String? = null,
         relayUrl: String? = null
     ): String {
+        val connectionsSnapshot = connectionStore?.connections?.value.orEmpty()
+        if (connectionStore == null) {
+            Log.w(
+                TAG,
+                "exportSettings: no ConnectionStore wired — writing empty connections list " +
+                    "(caller constructed DataManager without the multi-connection ctor arg)",
+            )
+        }
+        val connectionSecrets = connectionsSnapshot.map { connection ->
+            ConnectionSecretBackup(
+                connectionId = connection.id,
+                tokenStoreKey = connection.tokenStoreKey,
+                auth = AuthManager.exportStoredSecrets(context, connection.tokenStoreKey),
+                dashboardCookies = EncryptedDashboardCookieStore(
+                    context = context,
+                    connectionId = connection.id,
+                ).load().map { it.toBackup() },
+            )
+        }
         val backup = AppBackup(
-            version = 2,
+            version = 5,
             serverUrl = serverUrl, // legacy compat
             apiServerUrl = apiServerUrl,
             relayUrl = relayUrl,
             theme = theme,
             onboardingCompleted = onboardingCompleted,
-            profiles = profiles,
-            exportedAt = System.currentTimeMillis()
+            connections = connectionsSnapshot,
+            activeConnectionId = connectionStore?.activeConnectionId?.value,
+            containsSensitiveData = true,
+            connectionSecrets = connectionSecrets,
+            exportedAt = System.currentTimeMillis(),
         )
         return json.encodeToString(backup)
     }
 
+    suspend fun restoreConnectionBackup(backup: AppBackup) {
+        val store = connectionStore ?: return
+        deleteSensitivePreferenceFiles()
+        store.replaceConnections(
+            connections = backup.connections,
+            activeConnectionId = backup.activeConnectionId,
+        )
+
+        val connectionsById = backup.connections.associateBy { it.id }
+        backup.connectionSecrets.forEach { secret ->
+            val connection = connectionsById[secret.connectionId] ?: return@forEach
+            AuthManager.importStoredSecrets(
+                context = context,
+                tokenStoreKey = connection.tokenStoreKey,
+                secrets = secret.auth,
+            )
+            EncryptedDashboardCookieStore(
+                context = context,
+                connectionId = connection.id,
+            ).save(secret.dashboardCookies.map { it.toStoredCookie() })
+        }
+    }
+
     /**
      * Import settings from a JSON string.
      * Returns the parsed backup, or null if invalid.
+     *
+     * For v1/v2 backups we deliberately drop the old `profiles: List<String>`
+     * field on its own, since kotlinx.serialization's `ignoreUnknownKeys`
+     * would throw if it found the old scalar-string entries where it now
+     * expects [Connection] objects. We pre-parse as a [JsonElement] and
+     * rebuild the object with `connections = []` on older schema versions.
+     *
+     * For v3 backups, the old `profiles: List<Profile>` field is re-mapped
+     * to `connections: List<Connection>` — same wire shape, just renamed.
      */
     fun importSettings(jsonString: String): AppBackup? {
         return try {
-            json.decodeFromString<AppBackup>(jsonString)
+            val element = json.parseToJsonElement(jsonString)
+            val obj = element as? JsonObject ?: return null
+            val version = obj["version"]?.let {
+                (it as? JsonPrimitive)?.content?.toIntOrNull()
+            } ?: 4
+            val normalized = when {
+                version < 3 -> {
+                    // Strip the incompatible v1/v2 `profiles` field so the
+                    // serializer doesn't try to decode List<String> into
+                    // List<Connection>. The feature never populated the list
+                    // in export anyway, so no user data is lost.
+                    Log.d(
+                        TAG,
+                        "importSettings: dropping legacy v$version profiles field " +
+                            "(schema was vestigial)",
+                    )
+                    JsonObject(obj - "profiles")
+                }
+                version == 3 -> {
+                    // v3 used `profiles: List<Profile>` with the same wire
+                    // shape as v4's `connections: List<Connection>`. Swap
+                    // the key name and decode as v4.
+                    val profilesField = obj["profiles"]
+                    val withoutProfiles = obj - "profiles"
+                    if (profilesField != null) {
+                        JsonObject(withoutProfiles + ("connections" to profilesField))
+                    } else {
+                        JsonObject(withoutProfiles)
+                    }
+                }
+                else -> obj
+            }
+            json.decodeFromJsonElement(AppBackup.serializer(), normalized)
         } catch (e: Exception) {
             Log.e(TAG, "Failed to parse backup JSON", e)
             null
@@ -138,6 +289,11 @@ class DataManager(private val context: Context) {
             // Preserve onboarding state before clearing
             val onboarding = isOnboardingCompleted()
 
+            // Multi-connection reset: clear the hot ConnectionStore state and
+            // delete every per-connection token store before the global
+            // DataStore is wiped.
+            connectionStore?.clearAllConnections()
+
             // Clear all DataStore preferences
             context.relayDataStore.edit { it.clear() }
 
@@ -148,15 +304,7 @@ class DataManager(private val context: Context) {
                 }
             }
 
-            // Delete the EncryptedSharedPreferences file for auth tokens
-            withContext(Dispatchers.IO) {
-                val prefsDir = File(context.filesDir.parent, "shared_prefs")
-                val authFile = File(prefsDir, "$AUTH_PREFS_NAME.xml")
-                if (authFile.exists()) {
-                    authFile.delete()
-                    Log.d(TAG, "Deleted auth preferences file")
-                }
-            }
+            deleteSensitivePreferenceFiles()
 
             // Clear cache directory
             withContext(Dispatchers.IO) {
@@ -171,6 +319,61 @@ class DataManager(private val context: Context) {
         }
     }
 
+    private suspend fun deleteSensitivePreferenceFiles() {
+        withContext(Dispatchers.IO) {
+            val prefsDir = File(context.filesDir.parent, "shared_prefs")
+            val stores = buildSet {
+                add(AUTH_PREFS_NAME)
+                add(Connection.LEGACY_TOKEN_STORE_KEY)
+                prefsDir.listFiles()?.forEach { file ->
+                    if (file.extension == "xml") {
+                        val name = file.nameWithoutExtension
+                        if (
+                            name.startsWith("hermes_auth_") ||
+                            name.startsWith("hermes_dashboard_")
+                        ) {
+                            add(name)
+                        }
+                    }
+                }
+            }
+            stores.forEach { storeName ->
+                try {
+                    context.deleteSharedPreferences(storeName)
+                    Log.d(TAG, "Deleted auth preferences file: $storeName")
+                } catch (e: Exception) {
+                    Log.w(TAG, "deleteSharedPreferences($storeName) failed: ${e.message}")
+                }
+            }
+        }
+    }
+
+    private fun StoredDashboardCookie.toBackup(): DashboardCookieBackup =
+        DashboardCookieBackup(
+            name = name,
+            value = value,
+            expiresAt = expiresAt,
+            domain = domain,
+            path = path,
+            secure = secure,
+            httpOnly = httpOnly,
+            hostOnly = hostOnly,
+            persistent = persistent,
+        )
+
+    private fun DashboardCookieBackup.toStoredCookie(): StoredDashboardCookie =
+        StoredDashboardCookie(
+            name = name,
+            value = value,
+            expiresAt = expiresAt,
+            domain = domain,
+            path = path,
+            secure = secure,
+            httpOnly = httpOnly,
+            hostOnly = hostOnly,
+            persistent = persistent,
+        )
+
     /**
      * Reset only the onboarding completion flag.
      * Next app launch will show onboarding again.

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

@@ -0,0 +1,112 @@
+package com.hermesandroid.relay.data
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+/**
+ * One entry in a pairing payload's `endpoints` array (ADR 24 — multi-endpoint
+ * pairing, 2026-04-19).
+ *
+ * Pairing QRs can now carry an ordered list of candidate endpoints so a single
+ * pairing works across LAN / Tailscale / public-reverse-proxy networks. The
+ * phone picks the highest-priority reachable candidate at connect time and
+ * re-evaluates on network change.
+ *
+ * Wire contract (v3 pairing payload):
+ * ```json
+ * {
+ *   "role": "lan",
+ *   "priority": 0,
+ *   "api":   { "host": "192.168.1.100", "port": 8642, "tls": false },
+ *   "relay": { "url": "ws://192.168.1.100:8767", "transport_hint": "ws" }
+ * }
+ * ```
+ *
+ * **Semantics (locked by ADR 24):**
+ *  - [role] is an open string. Known values `lan` / `tailscale` / `public`
+ *    get styled labels; anything else renders generically (`Custom VPN (<role>)`).
+ *    No enum, no normalization — the raw role string must round-trip exactly
+ *    so HMAC canonicalization holds.
+ *  - [priority] is strict, `0 = highest`. Reachability never promotes a lower
+ *    priority over a higher one; it only breaks ties among equal priorities.
+ *  - The per-endpoint [RelayEndpoint] intentionally carries **only** the URL
+ *    and transport hint. The pairing `code`, `ttl_seconds`, and `grants` stay
+ *    at the top level of the pairing payload because they're per-pair
+ *    artifacts — not per-endpoint.
+ */
+@Serializable
+data class EndpointCandidate(
+    val role: String,
+    val priority: Int = 0,
+    val api: ApiEndpoint,
+    val relay: RelayEndpoint,
+)
+
+/**
+ * The API-server half of an [EndpointCandidate] — the HTTP/SSE target the
+ * phone uses for `/v1/runs`, `/v1/chat/completions`, `/api/sessions/...`, etc.
+ *
+ * Note: [tls] defaults to false so a v2-synthesized candidate (built from a
+ * legacy QR with no `endpoints` field and no top-level `tls`) still
+ * deserializes cleanly.
+ */
+@Serializable
+data class ApiEndpoint(
+    val host: String,
+    val port: Int,
+    val tls: Boolean = false,
+) {
+    /** Build the full API server URL from host, port, and tls flag. */
+    val url: String
+        get() = "${if (tls) "https" else "http"}://$host:$port"
+}
+
+/**
+ * The relay-server half of an [EndpointCandidate] — the WSS URL the phone
+ * opens for the bridge + terminal channels.
+ *
+ * @property url full WebSocket URL, e.g. `ws://192.168.1.100:8767` (dev) or
+ *           `wss://hermes.example.com/relay` (fronted by a reverse proxy).
+ * @property transportHint `"wss"` / `"ws"` / `null`. Drives the plaintext-ws
+ *           consent gate and the transport-security UI badge. Never gates
+ *           behavior on its own — the scheme of [url] is authoritative.
+ */
+@Serializable
+data class RelayEndpoint(
+    val url: String,
+    @SerialName("transport_hint")
+    val transportHint: String? = null,
+)
+
+/**
+ * Returns true when [EndpointCandidate.role] is one of the built-in, styled
+ * roles: `lan`, `tailscale`, or `public`. Case-insensitive match — but the
+ * role string itself is still preserved verbatim for HMAC canonicalization.
+ *
+ * Unknown roles (`"wireguard"`, `"zerotier"`, `"netbird-eu"`, operator-defined
+ * labels) return false so the UI can fall back to [displayLabel]'s generic
+ * "Custom VPN" treatment.
+ */
+fun EndpointCandidate.isKnownRole(): Boolean {
+    return when (role.lowercase()) {
+        "lan", "tailscale", "public" -> true
+        else -> false
+    }
+}
+
+/**
+ * Human-readable label for the UI. Known roles get fixed-case styled labels;
+ * unknown roles render as `"Custom VPN (<role>)"` with the raw role preserved
+ * so an operator can see exactly what they labeled it.
+ *
+ * The raw [role] on the [EndpointCandidate] is NOT modified — it stays in its
+ * emitted form for HMAC canonicalization. This is a display-only transform.
+ */
+fun EndpointCandidate.displayLabel(): String {
+    return when (role.lowercase()) {
+        "lan" -> "LAN"
+        "tailscale" -> "Tailscale"
+        "public" -> "Public"
+        else -> "Custom VPN ($role)"
+    }
+}

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

@@ -59,26 +59,34 @@ object FeatureFlags {
             prefs[KEY_RELAY_ENABLED] = enabled
         }
     }
+
+    /**
+     * Safety hook for the V5 ExoPlayer rollout.
+     *
+     * Default `true` — VoicePlayer uses Media3 ExoPlayer for gapless TTS
+     * queue playback. No MediaPlayer fallback is wired this session; if a
+     * regression surfaces in the field we'll rewire one and honor this flag
+     * at the construction site. Flipping this to `false` today has no
+     * effect — it's a placeholder hook, not yet load-bearing.
+     */
+    const val useExoPlayerVoice: Boolean = true
 }
 
 /**
  * Compile-time gating based on the active Gradle product flavor.
  *
- * Phase 3 ships Bridge on two tracks with very different AccessibilityService
- * scope: the `googlePlay` flavor carries a conservative event-type subset and
- * a "notifications + confirmations" description for Play Store policy review,
- * and the `sideload` flavor carries the full agent-control surface. The tier
- * flags below let UI code hide tier 3/4/6 surfaces on the Play build without
- * a runtime check — Kotlin's `val … get() = current == SIDELOAD` resolves at
- * each call site, but because `current` is a compile-time string, R8 is able
- * to fold the check away in release builds.
+ * Phase 3 keeps "Hermes Bridge" as the umbrella, but only the `sideload`
+ * flavor ships AccessibilityService-backed Device Control. The `googlePlay`
+ * flavor is Bridge Core: relay pairing, chat, voice, terminal, notification
+ * companion, media, and session-grant surfaces without screen reading, taps,
+ * typing, screenshots, overlays, or unattended control.
  *
- * Tier definitions (see `Phase 3 — Bridge Channel.md` in the vault):
- *   1. baseline          — both tracks (app open, tap, navigate within app)
- *   2. notifications     — both tracks (read notifications, summarize, reply)
+ * Device Control tier definitions (see `Phase 3 — Bridge Channel.md`):
+ *   1. baseline          — sideload only (app open, tap, navigate within app)
+ *   2. screen context    — sideload only (Accessibility tree / screen reads)
  *   3. voice-first       — sideload only (always-on voice capture)
  *   4. vision-first      — sideload only (always-on screen reading)
- *   5. safety rails      — both tracks (confirmation dialogs, action log)
+ *   5. safety rails      — sideload only (confirmation dialogs, action log)
  *   6. ambitious future  — sideload only (cross-app macros, scheduling)
  */
 object BuildFlavor {
@@ -101,11 +109,11 @@ object BuildFlavor {
      */
     val isSideload: Boolean get() = current == SIDELOAD
 
-    val bridgeTier1: Boolean = true                              // baseline — both tracks
-    val bridgeTier2: Boolean = true                              // notifications, calendar — both tracks
+    val bridgeTier1: Boolean get() = current == SIDELOAD         // baseline device control
+    val bridgeTier2: Boolean get() = current == SIDELOAD         // screen context
     val bridgeTier3: Boolean get() = current == SIDELOAD         // voice-first
     val bridgeTier4: Boolean get() = current == SIDELOAD         // vision-first
-    val bridgeTier5: Boolean = true                              // safety rails — always on
+    val bridgeTier5: Boolean get() = current == SIDELOAD         // safety rails
     val bridgeTier6: Boolean get() = current == SIDELOAD         // future ambitious
 
     /** Human-readable badge label for the Settings → About version row. */

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

@@ -0,0 +1,156 @@
+package com.hermesandroid.relay.data
+
+import kotlinx.serialization.SerialName
+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.ui.components.HermesCardBubble].
+ *
+ * The marker lives in the text stream alongside `MEDIA:...` for the same
+ * reason: it works unchanged across every streaming endpoint we support
+ * (`/v1/runs`, `/api/sessions/{id}/chat/stream`, `/v1/chat/completions`)
+ * without a server-side schema change. When upstream gains structured card
+ * events, the parser can fan out — the [HermesCard] model stays.
+ *
+ * Unknown [type] values fall back to a generic title+fields render so the
+ * surface doesn't break when the agent emits a card the phone build hasn't
+ * seen. Unknown [accent] / action [style] values degrade to their defaults
+ * the same way.
+ *
+ * Example (single-line in practice):
+ * ```
+ * CARD:{"type":"approval_request","title":"Run shell command?",
+ *       "body":"`rm -rf /tmp/cache`","accent":"warning",
+ *       "actions":[{"label":"Allow","value":"/approve","style":"primary"},
+ *                  {"label":"Deny","value":"/deny","style":"danger"}]}
+ * ```
+ */
+@Serializable
+data class HermesCard(
+    /**
+     * Card dispatcher key. Known built-ins are defined in [BuiltInTypes];
+     * unknown values render via the generic fallback.
+     */
+    val type: String,
+    val title: String? = null,
+    val subtitle: String? = null,
+    /** Markdown-rendered body text. Appears between the header and fields. */
+    val body: String? = null,
+    /**
+     * Semantic accent — maps to a colorScheme token in the renderer.
+     * Valid: `info` (default), `success`, `warning`, `danger`.
+     */
+    val accent: String? = null,
+    val fields: List<HermesCardField> = emptyList(),
+    val actions: List<HermesCardAction> = emptyList(),
+    /** Small muted text at the bottom of the card. */
+    val footer: String? = null,
+    /**
+     * Optional stable id from the agent. Used by the renderer to track
+     * 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.
+     */
+    val id: String? = null,
+) {
+    object BuiltInTypes {
+        const val SKILL_RESULT = "skill_result"
+        const val APPROVAL_REQUEST = "approval_request"
+        const val LINK_PREVIEW = "link_preview"
+        const val CALENDAR_EVENT = "calendar_event"
+        const val WEATHER = "weather"
+    }
+
+    object Accents {
+        const val INFO = "info"
+        const val SUCCESS = "success"
+        const val WARNING = "warning"
+        const val DANGER = "danger"
+    }
+}
+
+/**
+ * A label/value row inside a card. [value] is rendered as markdown so the
+ * agent can embed emphasis, inline code, or links.
+ */
+@Serializable
+data class HermesCardField(
+    val label: String,
+    val value: String,
+)
+
+/**
+ * A tappable action on a card.
+ *
+ * When the user taps the button, the ViewModel reads [mode] to decide how
+ * to dispatch [value]:
+ *  - [Modes.SEND_TEXT] (default): sends [value] as a new user message, so
+ *    the agent sees it in its next turn. This is how approval_request's
+ *    "Allow" / "Deny" replies flow back to the LLM.
+ *  - [Modes.SLASH_COMMAND]: runs [value] as a slash command (e.g.
+ *    `/approve` or `/clear`). The leading `/` is stripped if present.
+ *  - [Modes.OPEN_URL]: opens [value] in an external browser — used by
+ *    [HermesCard.BuiltInTypes.LINK_PREVIEW]'s "Open" button.
+ *
+ * [style] picks a button color from the colorScheme:
+ *  - `primary` — filled, colorScheme.primary
+ *  - `secondary` (default) — outlined, onSurfaceVariant
+ *  - `danger` — outlined, colorScheme.error
+ */
+@Serializable
+data class HermesCardAction(
+    val label: String,
+    val value: String,
+    val style: String? = null,
+    val mode: String? = null,
+) {
+    object Styles {
+        const val PRIMARY = "primary"
+        const val SECONDARY = "secondary"
+        const val DANGER = "danger"
+    }
+
+    object Modes {
+        const val SEND_TEXT = "send_text"
+        const val SLASH_COMMAND = "slash_command"
+        const val OPEN_URL = "open_url"
+    }
+}
+
+/**
+ * Local-only tracking of card action dispatch, stored alongside
+ * [ChatMessage.cards] so a session reload from server history doesn't lose
+ * "I already approved this" state. Keyed by the card's id (or its index
+ * position as a fallback) + action value.
+ *
+ * Persisted to server-side session memory via
+ * [com.hermesandroid.relay.viewmodel.CardDispatchSyncBuilder], modeled on
+ * [com.hermesandroid.relay.voice.VoiceIntentSyncBuilder]: on the next
+ * chat send, unsynced dispatches materialize as OpenAI-format `assistant`
+ * (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]
+ * flips [syncedToServer] so subsequent turns don't re-send the same
+ * trace.
+ */
+@Serializable
+data class HermesCardDispatch(
+    val cardKey: String,
+    val actionValue: String,
+    val timestamp: Long,
+    /**
+     * Idempotency guard for the server-side session sync path.
+     * Flipped to true by
+     * [com.hermesandroid.relay.network.handlers.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
+     * [com.hermesandroid.relay.viewmodel.CardDispatchSyncBuilder.buildSyntheticMessages]
+     * passes.
+     */
+    val syncedToServer: Boolean = false,
+)

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

@@ -8,6 +8,8 @@ import androidx.datastore.preferences.core.stringPreferencesKey
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.json.Json
 
 /**
  * DataStore-backed preferences for the pairing + security overhaul introduced
@@ -42,6 +44,27 @@ object PairingPreferences {
     private val KEY_INSECURE_ACK_SEEN = booleanPreferencesKey("insecure_ack_seen")
     private val KEY_INSECURE_REASON = stringPreferencesKey("insecure_reason")
     private val KEY_TOFU_PINS = stringPreferencesKey("tofu_pins")
+    private val KEY_ALL_INSECURE_PAIR_ACK_SEEN =
+        booleanPreferencesKey("all_insecure_pair_ack_seen")
+
+    /**
+     * Prefix for per-device endpoint-candidate keys. Full key is
+     * `device_endpoints:<deviceId>`; the value is a JSON-encoded
+     * `List<EndpointCandidate>` (ADR 24, 2026-04-19). One key per paired
+     * device so the phone can store + retrieve multi-endpoint pairing
+     * candidates for each host without multiplexing into a single blob.
+     */
+    private const val KEY_DEVICE_ENDPOINTS_PREFIX = "device_endpoints:"
+
+    private val endpointJson = Json {
+        ignoreUnknownKeys = true
+        encodeDefaults = true
+    }
+
+    private val endpointListSerializer = ListSerializer(EndpointCandidate.serializer())
+
+    private fun deviceEndpointsKey(deviceId: String) =
+        stringPreferencesKey("$KEY_DEVICE_ENDPOINTS_PREFIX$deviceId")
 
     // --- Pair TTL -----------------------------------------------------------
 
@@ -75,6 +98,27 @@ object PairingPreferences {
         context.relayDataStore.edit { it[KEY_INSECURE_ACK_SEEN] = seen }
     }
 
+    /**
+     * Per-install acknowledgment that the user understands the implications of
+     * pairing to a QR where *every* endpoint candidate is plain text
+     * (`ws://` / `http://` with no secure Tailscale/wss fallback — the
+     * [TransportSecurityState.AllInsecure] case).
+     *
+     * Gates the Pair button on the wizard's Confirm step only for the absolute-
+     * boundary AllInsecure scenario. Mixed pairings (any secure route present)
+     * are NOT gated — the app auto-falls back to the secure one, so the
+     * existing amber advisory is sufficient. Once the user has acknowledged
+     * once on this install the gate is removed for all future AllInsecure
+     * pairs — matches the precedent set by [insecureAckSeen] for the
+     * per-install insecure-mode dialog.
+     */
+    fun allInsecurePairAckSeen(context: Context): Flow<Boolean> =
+        context.relayDataStore.data.map { it[KEY_ALL_INSECURE_PAIR_ACK_SEEN] ?: false }
+
+    suspend fun setAllInsecurePairAckSeen(context: Context, seen: Boolean) {
+        context.relayDataStore.edit { it[KEY_ALL_INSECURE_PAIR_ACK_SEEN] = seen }
+    }
+
     /**
      * Reason the user selected when they flipped insecure mode on.
      *
@@ -139,4 +183,61 @@ object PairingPreferences {
 
     private fun encodePins(pins: Map<String, String>): String =
         pins.entries.joinToString("|") { (host, pin) -> "$host=$pin" }
+
+    // --- Per-device endpoint candidates (ADR 24) ---------------------------
+    //
+    // Multi-endpoint pairing carries an ordered list of API+relay candidates
+    // (LAN, Tailscale, public, custom-VPN, ...). The phone persists the list
+    // per-device so the reachability-probe + network-aware switch (Kt-Probe)
+    // can pick the best candidate on every connect without re-reading the
+    // original QR.
+    //
+    // Storage shape: one DataStore string key per deviceId, value is the
+    // JSON-encoded `List<EndpointCandidate>`. JSON keeps us flexible on
+    // schema growth without touching the DataStore key layout (e.g. future
+    // `weight`, `region`, `last_successful_at` per-candidate fields land as
+    // new JSON properties, not new preference keys).
+
+    /**
+     * Persist the ordered endpoint-candidate list for [deviceId]. Overwrites
+     * any previously-stored list for that device. Encodes as JSON so future
+     * schema fields land cleanly without a migration.
+     */
+    suspend fun setDeviceEndpoints(
+        context: Context,
+        deviceId: String,
+        endpoints: List<EndpointCandidate>,
+    ) {
+        val encoded = endpointJson.encodeToString(endpointListSerializer, endpoints)
+        context.relayDataStore.edit { prefs ->
+            prefs[deviceEndpointsKey(deviceId)] = encoded
+        }
+    }
+
+    /**
+     * Observe the stored endpoint-candidate list for [deviceId]. Emits an
+     * empty list when none has been persisted yet (first-pair / pre-ADR-24
+     * legacy devices) or when decoding fails (forward-compat safety net —
+     * a bad blob shouldn't crash the reachability probe).
+     */
+    fun getDeviceEndpoints(context: Context, deviceId: String): Flow<List<EndpointCandidate>> =
+        context.relayDataStore.data.map { prefs ->
+            val raw = prefs[deviceEndpointsKey(deviceId)] ?: return@map emptyList()
+            try {
+                endpointJson.decodeFromString(endpointListSerializer, raw)
+            } catch (_: Exception) {
+                emptyList()
+            }
+        }
+
+    /**
+     * Remove the stored endpoint list for [deviceId]. Used when a device is
+     * revoked / re-paired and its old candidate list is no longer trusted.
+     * No-op if no record exists.
+     */
+    suspend fun removeDeviceEndpoints(context: Context, deviceId: String) {
+        context.relayDataStore.edit { prefs ->
+            prefs.remove(deviceEndpointsKey(deviceId))
+        }
+    }
 }

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

@@ -0,0 +1,80 @@
+package com.hermesandroid.relay.data
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+/**
+ * An agent profile advertised by a Hermes server in its `auth.ok` payload.
+ *
+ * Historically (pre-R1) the server scanned a non-existent top-level
+ * `profiles:` key in `~/.hermes/config.yaml` and effectively shipped an
+ * empty list. Worker R1 rewrote the relay-side loader to scan the REAL
+ * upstream layout (one directory per profile under `~/.hermes/profiles/`)
+ * and added [systemMessage], sourced from each profile's `SOUL.md`.
+ *
+ * A Profile is an upstream Hermes profile context within a Connection.
+ * Upstream stores named profiles as separate Hermes homes under
+ * `~/.hermes/profiles/<name>/`. Switching profile changes the active agent
+ * identity for the Android chat surface:
+ *  - which profile API server the phone routes chat/session calls to when
+ *    the relay advertises [apiServerUrl];
+ *  - which profile name the phone sends to the server for new sessions and
+ *    chat turns when isolated routing is not available;
+ *  - which model and system message the phone can send as compatibility
+ *    fallback (via [model] and [systemMessage]);
+ *  - which profile-scoped session id Android resumes for local chat context.
+ *
+ * It does not mutate the server's configured default profile.
+ *
+ * Wire shape uses snake_case (`system_message`), this class uses camelCase
+ * (`systemMessage`) — translated via [SerialName].
+ *
+ * **v0.7.0 runtime metadata.** Three optional fields — [gatewayRunning],
+ * [hasSoul], [skillCount] — describe what the relay observes about each
+ * profile directory at discovery time:
+ *  - [gatewayRunning] is a read-only probe (best-effort; can be stale or
+ *    wrong if the relay's last probe missed a restart). Drives the green/
+ *    grey status dot in the agent sheet.
+ *  - [hasSoul] is true when the profile directory has a non-empty
+ *    `SOUL.md` on disk. Decoupled from `systemMessage != null` so a SOUL
+ *    that fails to load (permissions, I/O) still reports its presence.
+ *  - [skillCount] is the count of skills visible under the profile
+ *    directory — drives the "N skills" chip.
+ *
+ * All three default to safe zero-values and are optional on the wire, so
+ * older relays without the fields deserialize cleanly as
+ * `gatewayRunning = false, hasSoul = false, skillCount = 0`.
+ *
+ * **Hermes profile API metadata.** A relay can advertise an isolated
+ * profile API server without exposing its secret. When [apiServerUrl] is
+ * present, Android routes chat/session traffic to that URL and reuses the
+ * active connection's stored API key. Operators that use distinct API keys
+ * per profile should pair those profile API servers as separate connections.
+ */
+@Serializable
+data class Profile(
+    val name: String,
+    val model: String,
+    val description: String = "",
+    @SerialName("system_message")
+    val systemMessage: String? = null,
+    @SerialName("gateway_running")
+    val gatewayRunning: Boolean = false,
+    @SerialName("has_soul")
+    val hasSoul: Boolean = false,
+    @SerialName("skill_count")
+    val skillCount: Int = 0,
+    @SerialName("api_server_enabled")
+    val apiServerEnabled: Boolean = false,
+    @SerialName("api_server_url")
+    val apiServerUrl: String? = null,
+    @SerialName("api_server_host")
+    val apiServerHost: String? = null,
+    @SerialName("api_server_port")
+    val apiServerPort: Int? = null,
+    @SerialName("api_server_key_present")
+    val apiServerKeyPresent: Boolean = false,
+) {
+    val hasIsolatedApi: Boolean
+        get() = !apiServerUrl.isNullOrBlank()
+}

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

@@ -0,0 +1,138 @@
+package com.hermesandroid.relay.data
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonObject
+
+/**
+ * Wire contracts for the v0.7.0 Profile Inspector endpoints:
+ *
+ *  - `GET /api/profiles/{name}/config`
+ *  - `GET /api/profiles/{name}/skills`
+ *  - `GET /api/profiles/{name}/soul`
+ *  - `GET /api/profiles/{name}/memory`
+ *
+ * All four endpoints are read-only introspection views served by the relay
+ * directly off disk (no gateway round-trip). Field names mirror the Python
+ * worker's contracts exactly — any rename here is a protocol break.
+ *
+ * Optional fields on the wire (`truncated`, `readonly`) default to safe
+ * values so older relays that omit them deserialize without failing the
+ * whole payload.
+ */
+
+/**
+ * Response for `GET /api/profiles/{name}/config`.
+ *
+ * `config` is a raw [JsonObject] so the UI can render arbitrary nested YAML
+ * loaded from the profile's `config.yaml`. We don't model every possible
+ * config shape — that's upstream Hermes territory and churns frequently.
+ *
+ * @property readonly The relay always serves this view read-only; the flag
+ *                    is advisory. Optional on the wire, defaults to false.
+ */
+@Serializable
+data class ProfileConfigResponse(
+    val profile: String,
+    val path: String,
+    val config: JsonObject,
+    val readonly: Boolean = false,
+)
+
+/**
+ * One entry in the [ProfileSkillsResponse.skills] list.
+ *
+ * `enabled` is optional on the wire; defaults to true so a pre-v0.7 relay
+ * that doesn't emit the field treats every skill as enabled.
+ */
+@Serializable
+data class ProfileSkillEntry(
+    val name: String,
+    val category: String,
+    val description: String,
+    val path: String,
+    val enabled: Boolean = true,
+)
+
+/** Response for `GET /api/profiles/{name}/skills`. */
+@Serializable
+data class ProfileSkillsResponse(
+    val profile: String,
+    val skills: List<ProfileSkillEntry>,
+    val total: Int,
+)
+
+/**
+ * Response for `GET /api/profiles/{name}/soul`.
+ *
+ * When `exists=false`, [content] is typically an empty string and the UI
+ * should render an empty-state pointing at the expected [path].
+ *
+ * [truncated] is optional on the wire — Python may omit when false.
+ */
+@Serializable
+data class ProfileSoulResponse(
+    val profile: String,
+    val path: String,
+    val content: String,
+    val exists: Boolean,
+    @SerialName("size_bytes")
+    val sizeBytes: Long,
+    val truncated: Boolean = false,
+)
+
+/**
+ * One entry in the [ProfileMemoryResponse.entries] list — a single memory
+ * file found under the profile's memories directory.
+ */
+@Serializable
+data class ProfileMemoryEntry(
+    val name: String,
+    val filename: String,
+    val path: String,
+    val content: String,
+    @SerialName("size_bytes")
+    val sizeBytes: Long,
+    val truncated: Boolean = false,
+)
+
+/** Response for `GET /api/profiles/{name}/memory`. */
+@Serializable
+data class ProfileMemoryResponse(
+    val profile: String,
+    @SerialName("memories_dir")
+    val memoriesDir: String,
+    val entries: List<ProfileMemoryEntry>,
+    val total: Int,
+)
+
+/**
+ * Response for `PUT /api/profiles/{name}/soul`. Server echoes back the
+ * profile name, on-disk path, and bytes written so the UI can
+ * optimistically confirm the write without an immediate re-fetch.
+ */
+@Serializable
+data class ProfileSoulUpdateResponse(
+    val ok: Boolean,
+    val profile: String,
+    val path: String,
+    @SerialName("bytes_written")
+    val bytesWritten: Long,
+)
+
+/**
+ * Response for `PUT /api/profiles/{name}/memory/{filename}`. Same shape
+ * as [ProfileSoulUpdateResponse] plus the filename so a client can
+ * confirm which entry it just wrote (relevant when creating a new file
+ * — the request echo proves the server stored it under the requested
+ * name rather than silently rewriting a collision).
+ */
+@Serializable
+data class ProfileMemoryUpdateResponse(
+    val ok: Boolean,
+    val profile: String,
+    val filename: String,
+    val path: String,
+    @SerialName("bytes_written")
+    val bytesWritten: Long,
+)

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

@@ -0,0 +1,104 @@
+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
+
+/**
+ * Per-connection persisted selection of the active profile name.
+ *
+ * Why separate from [relayDataStore]: the main `relay_settings` store holds
+ * a large pile of global settings that are expensive to iterate on every
+ * profile-selection change, and we want these mappings to survive clean-up
+ * passes over the main store without special-casing per-connection keys.
+ * The dedicated `profile_selections` DataStore is small, scoped, and can be
+ * cleared wholesale without collateral damage.
+ *
+ * Stored shape: one string-preference key per connection id, value is the
+ * profile `name` string (NOT the serialized Profile object — the Profile
+ * itself is advertised fresh by the server on every `auth.ok` and the
+ * on-server set can drift between app launches, so we resolve name → Profile
+ * at read time against the current [ConnectionViewModel.agentProfiles] list).
+ *
+ * A `null` value means "clear" — the key is removed from the store rather
+ * than written as an empty string. That way the flow emits null cleanly
+ * on fresh installs and on explicit clears.
+ *
+ * See Commit 3 of feature/profile-config-readonly for wiring. The caller
+ * ([com.hermesandroid.relay.viewmodel.ConnectionViewModel]) handles the
+ * name → Profile resolution and is the sole consumer.
+ */
+class ProfileSelectionStore(
+    private val dataStore: DataStore<Preferences>,
+) {
+    constructor(context: Context) : this(context.profileSelectionsDataStore)
+
+    companion object {
+        /**
+         * Preference-key factory. Per-connection so every connection gets
+         * its own slot — wholesale clearing of the store still works by
+         * calling [clear] per connection id (or, in disaster-recovery,
+         * dropping the file).
+         */
+        private fun keyFor(connectionId: String) =
+            stringPreferencesKey("selected_profile_$connectionId")
+    }
+
+    /**
+     * Persist the selected profile name for [connectionId]. Passing `null`
+     * removes the key — fresh installs and explicit clears both converge
+     * on the same "no key" state.
+     */
+    suspend fun setSelectedProfile(connectionId: String, profileName: String?) {
+        dataStore.edit { prefs ->
+            val key = keyFor(connectionId)
+            if (profileName == null) {
+                prefs.remove(key)
+            } else {
+                prefs[key] = profileName
+            }
+        }
+    }
+
+    /**
+     * Emits the persisted profile name for [connectionId], or `null` when
+     * no selection has been stored. Callers must resolve the name against
+     * the current server-advertised profile list — if the profile was
+     * removed on the server, the caller should treat the resolution as
+     * null (see ConnectionViewModel for the reference resolver).
+     */
+    fun selectedProfileFlow(connectionId: String): Flow<String?> {
+        val key = keyFor(connectionId)
+        return dataStore.data.map { prefs -> prefs[key] }
+    }
+
+    /**
+     * Remove the persisted selection for [connectionId]. Called from the
+     * Connection removal path AFTER the switch-away job completes so we
+     * don't delete the selection the just-unmounted store is still writing.
+     */
+    suspend fun clear(connectionId: String) {
+        dataStore.edit { prefs ->
+            prefs.remove(keyFor(connectionId))
+        }
+    }
+
+    suspend fun clearAll() {
+        dataStore.edit { prefs ->
+            prefs.clear()
+        }
+    }
+}
+
+/**
+ * Dedicated DataStore for [ProfileSelectionStore]. Kept separate from
+ * [relayDataStore] so the two stores can evolve independently and a nuke
+ * of one doesn't take out the other.
+ */
+internal val Context.profileSelectionsDataStore: DataStore<Preferences>
+        by preferencesDataStore(name = "profile_selections")

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

@@ -0,0 +1,75 @@
+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
+
+/**
+ * Per-connection, per-Hermes-profile 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.
+ */
+class ProfileSessionStore(
+    private val dataStore: DataStore<Preferences>,
+) {
+    constructor(context: Context) : this(context.profileSessionsDataStore)
+
+    companion object {
+        private const val PREFIX = "profile_session__"
+
+        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 setSessionId(
+        connectionId: String,
+        profileName: String?,
+        sessionId: String?,
+    ) {
+        dataStore.edit { prefs ->
+            val key = keyFor(connectionId, profileName)
+            if (sessionId.isNullOrBlank()) {
+                prefs.remove(key)
+            } else {
+                prefs[key] = sessionId
+            }
+        }
+    }
+
+    fun sessionIdFlow(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.profileSessionsDataStore: DataStore<Preferences>
+        by preferencesDataStore(name = "profile_sessions")

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

@@ -0,0 +1,11 @@
+package com.hermesandroid.relay.data
+
+/**
+ * Compact text context sent to the relay when opening a provider-native
+ * Realtime Agent session.
+ */
+data class RealtimeConversationContextMessage(
+    val role: MessageRole,
+    val content: String,
+    val source: String? = null,
+)

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

@@ -0,0 +1,61 @@
+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 kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+
+/**
+ * Friendly-name store for terminal tabs, keyed by the stable wire-side
+ * `session_name` (e.g. `hermes-<deviceId>-tabN`). Cosmetic-only — the name
+ * never crosses the wire; tmux reattach + server-side bookkeeping still use
+ * the opaque session name.
+ *
+ * Keyed on `session_name` because that's also what tmux keys on — if the
+ * user detaches, restarts the app, and reattaches, the same name re-binds
+ * to the same tmux session. Kill explicitly clears the name (via
+ * [clearName]) because the underlying session is destroyed; detach leaves
+ * the name intact as a "come back to this later" hint.
+ */
+class TerminalTabNameStore(
+    private val dataStore: DataStore<Preferences>,
+) {
+    constructor(context: Context) : this(context.relayDataStore)
+
+    companion object {
+        private val KEY_NAMES_JSON = stringPreferencesKey("terminal_tab_names_json")
+        private val JSON = Json { ignoreUnknownKeys = true }
+    }
+
+    val namesFlow: Flow<Map<String, String>> = dataStore.data.map { prefs ->
+        val raw = prefs[KEY_NAMES_JSON] ?: return@map emptyMap()
+        runCatching { JSON.decodeFromString<Map<String, String>>(raw) }
+            .getOrDefault(emptyMap())
+    }
+
+    /** Set or clear (null / blank) the friendly name for [sessionName]. */
+    suspend fun setName(sessionName: String, displayName: String?) {
+        dataStore.edit { prefs ->
+            val current = prefs[KEY_NAMES_JSON]
+                ?.let { runCatching { JSON.decodeFromString<Map<String, String>>(it) }.getOrNull() }
+                ?: emptyMap()
+            val next = if (displayName.isNullOrBlank()) {
+                current - sessionName
+            } else {
+                current + (sessionName to displayName.trim().take(MAX_NAME_LEN))
+            }
+            prefs[KEY_NAMES_JSON] = JSON.encodeToString(next)
+        }
+    }
+
+    /** Remove the entry for a session that's being forcibly retired (e.g. kill). */
+    suspend fun clearName(sessionName: String) = setName(sessionName, null)
+}
+
+private const val MAX_NAME_LEN = 40

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

@@ -0,0 +1,31 @@
+package com.hermesandroid.relay.data
+
+/**
+ * Snapshot of a single tool-call invocation for the Stats-for-Nerds +
+ * Timeline panels.
+ *
+ * Derived from [ToolCall] on the assistant messages but denormalized so
+ * consumers don't need to walk the message list themselves. The ring
+ * buffer that owns these is bounded — usually the last 10 tool calls
+ * across all assistant messages in the active chat session.
+ *
+ * Status is split into two booleans so the UI can render three visual
+ * states without introducing an enum dependency:
+ *   - `isComplete = false` → in-progress (spinner)
+ *   - `isComplete = true  && success == true`  → completed
+ *   - `isComplete = true  && success == false` → failed
+ */
+data class ToolCallEvent(
+    val id: String,
+    val name: String,
+    val startedAtMs: Long,
+    val completedAtMs: Long?,
+    val isComplete: Boolean,
+    val success: Boolean?,
+    val resultSummary: String?,
+    val errorSummary: String?,
+) {
+    /** Elapsed wall-clock ms; null if the call hasn't completed. */
+    val durationMs: Long?
+        get() = completedAtMs?.let { it - startedAtMs }
+}

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

@@ -1,11 +1,14 @@
 package com.hermesandroid.relay.data
 
 import android.content.Context
+import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
 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.distinctUntilChanged
 import kotlinx.coroutines.flow.map
 
 /**
@@ -20,48 +23,118 @@ import kotlinx.coroutines.flow.map
  *   (V1 doesn't accept a language param).
  */
 data class VoiceSettings(
+    val engineMode: String = VoiceEngineMode.HermesVoiceOutput.storageValue,
+    val audioRoute: String = VoiceAudioRoute.Auto.storageValue,
     val interactionMode: String = "tap",
     val silenceThresholdMs: Long = 3000L,
     val autoTts: Boolean = false,
     val language: String = "",
+    val realtimeTraceDetails: Boolean = false,
+    /**
+     * When true (default), Realtime Agent keeps one provider session/socket open
+     * across turns (persistent conversation). When false, falls back to the
+     * legacy one-session-per-utterance path. See
+     * docs/plans/2026-05-24-realtime-persistent-session.md.
+     */
+    val realtimePersistentSession: Boolean = true,
 )
 
-class VoicePreferencesRepository(private val context: Context) {
+enum class VoiceEngineMode(val storageValue: String) {
+    HermesVoiceOutput("hermes_voice_output"),
+    RealtimeAgent("realtime_agent");
 
     companion object {
+        fun fromStorage(value: String?): VoiceEngineMode =
+            values().firstOrNull { it.storageValue == value } ?: HermesVoiceOutput
+    }
+}
+
+enum class VoiceAudioRoute(val storageValue: String) {
+    Auto("auto"),
+    Standard("standard"),
+    Relay("relay");
+
+    companion object {
+        fun fromStorage(value: String?): VoiceAudioRoute =
+            values().firstOrNull { it.storageValue == value } ?: Auto
+    }
+}
+
+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")
         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")
         private val KEY_LANGUAGE = stringPreferencesKey("voice_language")
+        private val KEY_REALTIME_TRACE_DETAILS = booleanPreferencesKey("voice_realtime_trace_details")
+        private val KEY_REALTIME_PERSISTENT_SESSION =
+            booleanPreferencesKey("voice_realtime_persistent_session")
 
+        const val DEFAULT_ENGINE_MODE = "hermes_voice_output"
+        const val DEFAULT_AUDIO_ROUTE = "auto"
         const val DEFAULT_INTERACTION_MODE = "tap"
         const val DEFAULT_SILENCE_THRESHOLD_MS = 3000L
         const val DEFAULT_AUTO_TTS = false
         const val DEFAULT_LANGUAGE = ""
+        const val DEFAULT_REALTIME_TRACE_DETAILS = false
+        const val DEFAULT_REALTIME_PERSISTENT_SESSION = true
     }
 
-    val settings: Flow<VoiceSettings> = context.relayDataStore.data.map { prefs ->
-        VoiceSettings(
-            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,
-        )
+    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,
+            )
+        }
+        .distinctUntilChanged()
+
+    suspend fun setEngineMode(mode: VoiceEngineMode) {
+        dataStore.edit { it[KEY_ENGINE_MODE] = mode.storageValue }
+    }
+
+    suspend fun setAudioRoute(route: VoiceAudioRoute) {
+        dataStore.edit { it[KEY_AUDIO_ROUTE] = route.storageValue }
     }
 
     suspend fun setInteractionMode(mode: String) {
-        context.relayDataStore.edit { it[KEY_INTERACTION_MODE] = mode }
+        dataStore.edit { it[KEY_INTERACTION_MODE] = mode }
     }
 
     suspend fun setSilenceThresholdMs(ms: Long) {
-        context.relayDataStore.edit { it[KEY_SILENCE_THRESHOLD_MS] = ms.coerceAtLeast(500L) }
+        dataStore.edit { it[KEY_SILENCE_THRESHOLD_MS] = ms.coerceAtLeast(500L) }
     }
 
     suspend fun setAutoTts(enabled: Boolean) {
-        context.relayDataStore.edit { it[KEY_AUTO_TTS] = enabled }
+        dataStore.edit { it[KEY_AUTO_TTS] = enabled }
     }
 
     suspend fun setLanguage(language: String) {
-        context.relayDataStore.edit { it[KEY_LANGUAGE] = language }
+        dataStore.edit { it[KEY_LANGUAGE] = language }
+    }
+
+    suspend fun setRealtimeTraceDetails(enabled: Boolean) {
+        dataStore.edit { it[KEY_REALTIME_TRACE_DETAILS] = enabled }
+    }
+
+    suspend fun setRealtimePersistentSession(enabled: Boolean) {
+        dataStore.edit { it[KEY_REALTIME_PERSISTENT_SESSION] = enabled }
     }
 }

app/src/main/kotlin/com/hermesandroid/relay/diagnostics/DiagnosticsLog.kt

@@ -0,0 +1,110 @@
+package com.hermesandroid.relay.diagnostics
+
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+enum class DiagnosticCategory(val label: String) {
+    Api("API"),
+    Relay("Relay"),
+    Session("Session"),
+    Voice("Voice"),
+    Endpoint("Route"),
+    Auth("Auth"),
+}
+
+enum class DiagnosticSeverity {
+    Info,
+    Warning,
+    Error,
+}
+
+data class DiagnosticLogEntry(
+    val timestampMs: Long,
+    val category: DiagnosticCategory,
+    val severity: DiagnosticSeverity,
+    val title: String,
+    val detail: String? = null,
+    val endpointRole: String? = null,
+    val url: String? = null,
+    val elapsedMs: Long? = null,
+)
+
+object DiagnosticsLog {
+    private const val MAX_ENTRIES = 200
+    private const val MAX_TEXT_LENGTH = 180
+
+    private val lock = Any()
+    private val _entries = MutableStateFlow<List<DiagnosticLogEntry>>(emptyList())
+    val entries: StateFlow<List<DiagnosticLogEntry>> = _entries.asStateFlow()
+
+    fun record(
+        category: DiagnosticCategory,
+        severity: DiagnosticSeverity = DiagnosticSeverity.Info,
+        title: String,
+        detail: String? = null,
+        endpointRole: String? = null,
+        url: String? = null,
+        elapsedMs: Long? = null,
+    ) {
+        val entry = DiagnosticLogEntry(
+            timestampMs = System.currentTimeMillis(),
+            category = category,
+            severity = severity,
+            title = clean(title) ?: title.take(MAX_TEXT_LENGTH),
+            detail = clean(detail),
+            endpointRole = clean(endpointRole),
+            url = sanitizeUrl(url),
+            elapsedMs = elapsedMs,
+        )
+        synchronized(lock) {
+            _entries.value = (_entries.value + entry).takeLast(MAX_ENTRIES)
+        }
+    }
+
+    fun recent(
+        categories: Set<DiagnosticCategory>? = null,
+        limit: Int = 30,
+    ): List<DiagnosticLogEntry> {
+        val source = entries.value.asReversed()
+        val filtered = if (categories == null) {
+            source
+        } else {
+            source.filter { it.category in categories }
+        }
+        return filtered.take(limit.coerceAtLeast(0))
+    }
+
+    fun clear() {
+        synchronized(lock) {
+            _entries.value = emptyList()
+        }
+    }
+
+    fun sanitizeUrl(value: String?): String? {
+        val trimmed = value?.trim()?.takeIf { it.isNotBlank() } ?: return null
+        val noQuery = trimmed.substringBefore('?').substringBefore('#')
+        val schemeEnd = noQuery.indexOf("://")
+        val noUserInfo = if (schemeEnd >= 0) {
+            val prefix = noQuery.substring(0, schemeEnd + 3)
+            val rest = noQuery.substring(schemeEnd + 3)
+            val slash = rest.indexOf('/').let { if (it < 0) rest.length else it }
+            val authority = rest.substring(0, slash)
+            val path = rest.substring(slash)
+            val safeAuthority = authority.substringAfterLast('@')
+            prefix + safeAuthority + path
+        } else {
+            noQuery
+        }
+        return noUserInfo.take(MAX_TEXT_LENGTH)
+    }
+
+    private fun clean(value: String?): String? {
+        val trimmed = value?.trim()?.takeIf { it.isNotBlank() } ?: return null
+        return trimmed
+            .replace(Regex("""(?i)(bearer|token|api[_-]?key|session[_-]?token)\s*[:=]\s*\S+""")) {
+                "${it.groupValues[1]}=[hidden]"
+            }
+            .take(MAX_TEXT_LENGTH)
+    }
+}

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

@@ -82,6 +82,13 @@ class ChannelMultiplexer {
             // flavor or by the master enable toggle in the UI).
             "bridge" -> handlers["bridge"]?.onMessage(envelope)
             // === END PHASE3-accessibility ===
+            // Pairing channel — host-originated pushes that concern the
+            // paired session itself (e.g. `profiles.updated` when the
+            // server rescans its ~/.hermes/profiles tree). Routed to
+            // whatever handler registered for "pairing"; AuthManager
+            // picks it up so the existing agentProfiles flow updates
+            // without requiring a re-pair round-trip.
+            "pairing" -> handlers["pairing"]?.onMessage(envelope)
             else -> {
                 // Unknown channel — ignore
             }

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

@@ -1,7 +1,17 @@
 package com.hermesandroid.relay.network
 
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
 import android.util.Log
 import com.hermesandroid.relay.auth.CertPinStore
+import com.hermesandroid.relay.data.EndpointCandidate
+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 kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -10,7 +20,9 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withTimeoutOrNull
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import okhttp3.CertificatePinner
@@ -59,7 +71,38 @@ class ConnectionManager(
      * Defaults to always-allow for tests and legacy call sites. Production
      * wiring passes the AuthManager gate from [ConnectionViewModel].
      */
-    private val reconnectGate: () -> Boolean = { true }
+    private val reconnectGate: () -> Boolean = { true },
+    /**
+     * Application context used to register the [ConnectivityManager
+     * .NetworkCallback] that drives ADR 24's network-aware re-resolution.
+     * Nullable for legacy call sites / tests — when null, the callback is
+     * never registered and the manager degrades to single-URL behavior.
+     */
+    private val context: Context? = null,
+    /**
+     * ADR 24 multi-endpoint resolver. When provided alongside [context] and
+     * either [endpointCandidatesProvider] or a non-null [deviceIdProvider],
+     * every call to [connect] first consults the resolver before opening the
+     * WSS; on network changes the resolver is re-run and we hot-swap to the
+     * new winner. When null the manager uses the caller-supplied URL verbatim
+     * (pre-ADR-24 behavior).
+     */
+    private val endpointResolver: EndpointResolver? = null,
+    /**
+     * Candidate supplier for the active saved connection. This is the
+     * standard-Hermes route source: it works before Relay pairing, so API,
+     * dashboard, voice, and future Relay calls can hand off between LAN and
+     * Tailscale using the same resolver. If it returns an empty list, we fall
+     * back to the legacy per-device PairingPreferences source below.
+     */
+    private val endpointCandidatesProvider: (suspend () -> List<EndpointCandidate>)? = null,
+    /**
+     * Suspending supplier for the active device id. Used to key into
+     * [PairingPreferences.getDeviceEndpoints] during resolution. `null`
+     * disables multi-endpoint resolution even when [endpointResolver] is
+     * non-null — the manager falls back to the single-URL path.
+     */
+    private val deviceIdProvider: (suspend () -> String?)? = null,
 ) {
     private val supervisorJob = SupervisorJob()
     private val scope = CoroutineScope(supervisorJob + Dispatchers.IO)
@@ -90,10 +133,19 @@ class ConnectionManager(
     @Volatile
     private var client: OkHttpClient = buildClient()
 
+    @Volatile
     private var webSocket: WebSocket? = null
+
+    @Volatile
     private var serverUrl: String? = null
     private var reconnectAttempt = 0
     private var shouldReconnect = true
+    // Last HTTP status seen during WSS upgrade, captured in onFailure.
+    // Used by scheduleReconnect() to pick an appropriate backoff — notably
+    // a much longer one when the server is rate-limiting us (HTTP 429) so
+    // we don't re-fill the ban bucket and brick our own auth window.
+    @Volatile
+    private var lastUpgradeResponseCode: Int? = null
 
     private val _connectionState = MutableStateFlow(ConnectionState.Disconnected)
     val connectionState: StateFlow<ConnectionState> = _connectionState.asStateFlow()
@@ -106,27 +158,157 @@ class ConnectionManager(
     private val _isInsecureConnection = MutableStateFlow(false)
     val isInsecureConnection: StateFlow<Boolean> = _isInsecureConnection.asStateFlow()
 
+    // ADR 24 — currently-active endpoint candidate. Null when the manager is
+    // running in legacy single-URL mode (no resolver wired, no candidates in
+    // DataStore, or resolve() returned null and we fell back to the caller's
+    // URL). Surfaced through [activeEndpoint] for the UI status chip + the
+    // Endpoints card in Settings.
+    private val _activeEndpoint = MutableStateFlow<EndpointCandidate?>(null)
+    val activeEndpoint: StateFlow<EndpointCandidate?> = _activeEndpoint.asStateFlow()
+
+    /**
+     * Manual role override. When non-null, the resolver's output is replaced
+     * with whichever candidate in the stored list matches this role (case-
+     * insensitive) — provided it's reachable. Reachability still gates: a
+     * user-preferred endpoint that doesn't respond to HEAD /health falls
+     * back through the normal priority chain.
+     *
+     * Two writers feed this: a sticky [Connection.preferredRouteRole] is
+     * restored into it on connection load, and the Routes card's transient
+     * "Use now" writes it directly without persisting. Cleared on
+     * [disconnect] per ADR 24's "clears on disconnect" semantics.
+     *
+     * Exposed as [manualRoleOverrideFlow] so the Routes card can label the
+     * current route as automatic / preferred / manually switched.
+     */
+    private val _manualRoleOverride = MutableStateFlow<String?>(null)
+    val manualRoleOverrideFlow: StateFlow<String?> = _manualRoleOverride.asStateFlow()
+
+    private var networkCallback: ConnectivityManager.NetworkCallback? = null
+
+    /**
+     * Debounce job for network-change re-resolution. Android fires one
+     * onAvailable per satisfying network (Wi-Fi + cell + VPN can land within
+     * milliseconds of each other, and registration itself replays every
+     * current network), so each event cancels the previous pending resolve
+     * and the last one wins after a short settle window.
+     */
+    @Volatile
+    private var networkResolveJob: kotlinx.coroutines.Job? = null
+
+    init {
+        // Register at construction, not on first connect(). Standard
+        // (no-Relay) connections never open the WSS socket, but their HTTP
+        // surfaces (chat, dashboard, voice) still need [activeEndpoint] to
+        // follow LAN/Tailscale handoffs — leaving registration inside
+        // connect() left the whole ADR 24 network-aware path dormant for
+        // exactly those users. No-op when [context] is null (tests).
+        ensureNetworkCallbackRegistered()
+    }
+
     companion object {
         private const val TAG = "ConnectionManager"
         private const val MAX_BACKOFF_MS = 30_000L
         private const val BASE_BACKOFF_MS = 1_000L
+        // Settle window before re-resolving after a network event. Long
+        // 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
+        // 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
+        // banned forever. Waiting at least as long as the server's block
+        // duration lets the ban expire naturally.
+        private const val RATE_LIMIT_BACKOFF_MS = 300_000L
     }
 
     fun setInsecureMode(enabled: Boolean) {
+        if (_insecureMode.value == enabled) {
+            return
+        }
         _insecureMode.value = enabled
         if (enabled) {
             Log.w(TAG, "⚠ INSECURE MODE ENABLED — ws:// connections allowed. Do NOT use in production.")
+            DiagnosticsLog.record(
+                category = DiagnosticCategory.Relay,
+                severity = DiagnosticSeverity.Warning,
+                title = "Insecure relay mode enabled",
+                detail = "ws:// connections are allowed",
+            )
         }
     }
 
     fun connect(url: String) {
+        // Register the network callback on the first connect attempt. We
+        // only do this once per manager lifetime; [shutdown] tears it down.
+        ensureNetworkCallbackRegistered()
+
+        // ADR 24: if we have a resolver + device id, try the multi-endpoint
+        // path first. Fall back to the caller-supplied URL whenever the
+        // resolver returns nothing — preserving pre-ADR-24 single-URL
+        // behavior for freshly-upgraded installs and for v1/v2 QRs where
+        // the synthesized list just collapses to the same URL anyway.
+        scope.launch {
+            val resolved = resolveBestEndpointSafe()
+            val targetUrl = resolved?.relay?.url ?: url
+            if (resolved != null) {
+                _activeEndpoint.value = resolved
+                Log.i(TAG, "connect: resolver picked role=${resolved.role} " +
+                    "relay=${resolved.relay.url} (fallback would have been $url)")
+                DiagnosticsLog.record(
+                    category = DiagnosticCategory.Relay,
+                    severity = DiagnosticSeverity.Info,
+                    title = "Relay route selected",
+                    endpointRole = resolved.role,
+                    url = resolved.relay.url,
+                )
+            } else {
+                _activeEndpoint.value = null
+                Log.d(TAG, "connect: no resolver winner — using supplied url $url")
+                DiagnosticsLog.record(
+                    category = DiagnosticCategory.Relay,
+                    severity = DiagnosticSeverity.Warning,
+                    title = "Using configured relay URL",
+                    detail = "No resolver winner",
+                    url = url,
+                )
+            }
+            connectToUrlOnMainPath(targetUrl)
+        }
+    }
+
+    /**
+     * Same as [connect] but bypasses the resolver — used by the network-
+     * change callback when we've already picked a winner and just want to
+     * reopen the socket against that URL. Keeping this separate prevents
+     * the callback from re-running the resolve loop inside another
+     * resolve loop.
+     */
+    private fun connectToUrlOnMainPath(
+        url: String,
+        replaceReason: String = "Relay socket replaced",
+    ) {
         val isInsecure = url.startsWith("ws://") && !url.startsWith("wss://")
         if (isInsecure && !_insecureMode.value) {
             Log.e(TAG, "Blocked ws:// connection — insecure mode is disabled. Use wss:// or enable insecure mode in Settings.")
+            DiagnosticsLog.record(
+                category = DiagnosticCategory.Relay,
+                severity = DiagnosticSeverity.Error,
+                title = "Relay socket blocked",
+                detail = "ws:// is disabled",
+                url = url,
+            )
             return
         }
         if (!url.startsWith("ws://") && !url.startsWith("wss://")) {
             Log.e(TAG, "Invalid URL scheme — must start with ws:// or wss://")
+            DiagnosticsLog.record(
+                category = DiagnosticCategory.Relay,
+                severity = DiagnosticSeverity.Error,
+                title = "Relay socket URL invalid",
+                detail = "URL must start with ws:// or wss://",
+                url = url,
+            )
             return
         }
 
@@ -135,16 +317,293 @@ class ConnectionManager(
         // hits the HTTP root and comes back as 404 Not Found during the
         // upgrade handshake. We still accept an explicit path if present.
         val normalized = normalizeRelayUrl(url)
+        val existingState = _connectionState.value
+        if (serverUrl == normalized &&
+            (existingState == ConnectionState.Connecting ||
+                existingState == ConnectionState.Connected ||
+                existingState == ConnectionState.Reconnecting)
+        ) {
+            Log.i(TAG, "connect: already ${existingState.name.lowercase()} to $normalized — skipping duplicate open")
+            return
+        }
+        val previousSocket = webSocket
 
         _isInsecureConnection.value = isInsecure
         if (isInsecure) {
             Log.w(TAG, "⚠ Connecting over INSECURE ws:// to: $normalized")
+            DiagnosticsLog.record(
+                category = DiagnosticCategory.Relay,
+                severity = DiagnosticSeverity.Warning,
+                title = "Opening insecure relay socket",
+                url = normalized,
+            )
+        } else {
+            DiagnosticsLog.record(
+                category = DiagnosticCategory.Relay,
+                severity = DiagnosticSeverity.Info,
+                title = "Opening relay socket",
+                url = normalized,
+            )
         }
 
         serverUrl = normalized
         shouldReconnect = true
         reconnectAttempt = 0
-        doConnect(normalized)
+        doConnect(normalized, previousSocket, replaceReason)
+    }
+
+    // ----- ADR 24 — multi-endpoint resolution --------------------------------
+
+    /**
+     * Load the device's stored [EndpointCandidate] list and hand it to
+     * [EndpointResolver.resolve]. Returns `null` when any precondition is
+     * missing (no resolver wired, no context, no device id, empty list) OR
+     * when no candidate was reachable — caller then falls back to the
+     * legacy single-URL path.
+     *
+     * Wraps the DataStore read in a 1-second timeout; if DataStore stalls
+     * for any reason we don't block the connect loop forever.
+     */
+    suspend fun resolveBestEndpoint(): EndpointCandidate? = resolveBestEndpointSafe()
+
+    private suspend fun resolveBestEndpointSafe(): EndpointCandidate? {
+        val resolver = endpointResolver ?: return null
+        val ctx = context ?: return null
+
+        val endpoints = try {
+            withTimeoutOrNull(1_000L) {
+                endpointCandidatesProvider?.invoke()
+                    ?.takeIf { it.isNotEmpty() }
+            }
+        } catch (_: Exception) {
+            null
+        } ?: run {
+            val devicePull = deviceIdProvider ?: return null
+            val deviceId = try {
+                withTimeoutOrNull(1_000L) { devicePull() }
+            } catch (_: Exception) {
+                null
+            } ?: return null
+
+            try {
+                withTimeoutOrNull(1_000L) {
+                    PairingPreferences.getDeviceEndpoints(ctx, deviceId).first()
+                }
+            } catch (_: Exception) {
+                null
+            } ?: emptyList()
+        }
+
+        if (endpoints.isEmpty()) return null
+
+        // Manual override: if the user pinned a role in the Endpoints card,
+        // try that one first; fall through to the strict-priority algorithm
+        // if it isn't reachable.
+        _manualRoleOverride.value?.let { preferredRole ->
+            val preferred = endpoints.firstOrNull {
+                it.role.equals(preferredRole, ignoreCase = true)
+            }
+            if (preferred != null) {
+                // Single-element list still respects the 2s probe gate.
+                val winner = resolver.resolve(listOf(preferred))
+                if (winner != null) return winner
+                Log.i(TAG, "manualRoleOverride=$preferredRole not reachable — " +
+                    "falling through to strict-priority resolve")
+            }
+        }
+
+        return resolver.resolve(endpoints)
+    }
+
+    /**
+     * User-triggered re-probe. Forces a fresh resolve + reconnect regardless
+     * of cache state. Backs the "Probe now" row action in the Endpoints card.
+     * Fire-and-forget wrapper around [probeAndReconnectNow] for callers that
+     * don't need the outcome.
+     */
+    fun probeAndReconnect() {
+        scope.launch { probeAndReconnectNow() }
+    }
+
+    /**
+     * Awaitable body of [probeAndReconnect]. Returns the resolved winner —
+     * or null when no candidate answered — so callers (probe-status UI) can
+     * report the outcome instead of guessing with a fixed delay.
+     *
+     * Unlike the pre-2026-06 version this ALWAYS publishes the resolve
+     * outcome to [activeEndpoint]: a standard (no relay socket) connection
+     * whose probes all failed used to early-return before publishing,
+     * leaving the Routes card stuck on "Resolving" with no feedback. The
+     * only exception is the live-socket transient-miss guard shared with
+     * [refreshActiveEndpoint].
+     */
+    suspend fun probeAndReconnectNow(): EndpointCandidate? {
+        endpointResolver?.clearCache()
+        val current = serverUrl
+        val resolved = resolveBestEndpointSafe()
+        if (resolved == null && _connectionState.value == ConnectionState.Connected) {
+            // Transient probe miss while the relay socket is demonstrably up
+            // — keep the live route published rather than downgrading every
+            // HTTP surface to the saved URL. Mirrors refreshActiveEndpoint.
+            return _activeEndpoint.value
+        }
+        _activeEndpoint.value = resolved
+        val targetUrl = resolved?.relay?.url ?: current ?: return resolved
+        val normalizedTarget = normalizeRelayUrl(targetUrl)
+        // Reconnect when the winner changed, and also when the socket is
+        // stale/disconnected on the same winner. The latter makes the
+        // "Use now" route action an actual recovery path after Wi-Fi drop
+        // instead of a no-op that only updates preference state.
+        if (current == null) {
+            if (shouldReconnect && reconnectGate()) {
+                Log.i(TAG, "probeAndReconnect: no current socket — connecting to $normalizedTarget")
+                connectToUrlOnMainPath(targetUrl)
+            }
+        } else if (normalizedTarget != current) {
+            Log.i(TAG, "probeAndReconnect: swapping $current → $normalizedTarget")
+            connectToUrlOnMainPath(targetUrl, "Endpoint re-probe")
+        } else if (_connectionState.value == ConnectionState.Disconnected &&
+            shouldReconnect &&
+            reconnectGate()
+        ) {
+            Log.i(TAG, "probeAndReconnect: current route is stale — reconnecting $current")
+            doConnect(current)
+        }
+        return resolved
+    }
+
+    /**
+     * Re-run endpoint resolution and publish the winner without forcing a
+     * WSS reconnect. Used by HTTP-only surfaces (chat/voice/relay HTTP)
+     * so they can follow LAN/Tailscale/VPN route changes even when the relay
+     * socket is currently disconnected or intentionally not paired.
+     *
+     * @param clearProbeCache wipe the resolver's probe cache first. Pass
+     *   `true` from "the world may have changed" triggers (app resume,
+     *   network change) — otherwise a route that died within the positive
+     *   cache TTL (60s) can still be returned as the winner.
+     */
+    suspend fun refreshActiveEndpoint(clearProbeCache: Boolean = false): EndpointCandidate? {
+        if (clearProbeCache) endpointResolver?.clearCache()
+        val resolved = resolveBestEndpointSafe()
+        if (resolved == null && _connectionState.value == ConnectionState.Connected) {
+            // Transient probe miss while the relay socket is demonstrably up
+            // (slow resume, mid-handoff blip) — keep publishing the live
+            // route instead of downgrading every HTTP surface to the saved
+            // URL. Mirrors scheduleNetworkReResolve's guard.
+            return _activeEndpoint.value
+        }
+        _activeEndpoint.value = resolved
+        return resolved
+    }
+
+    /**
+     * Pin a specific role as the preferred endpoint. Cleared on [disconnect]
+     * per the Endpoints-card contract. No-op until the next connect / probe
+     * cycle — call [probeAndReconnect] to apply immediately.
+     */
+    fun setManualRoleOverride(role: String?) {
+        _manualRoleOverride.value = role?.takeIf { it.isNotBlank() }
+        Log.i(TAG, "manualRoleOverride now=${_manualRoleOverride.value ?: "(cleared)"}")
+    }
+
+    fun getManualRoleOverride(): String? = _manualRoleOverride.value
+
+    private fun markActiveEndpointUnreachable(reason: String) {
+        val active = _activeEndpoint.value ?: return
+        endpointResolver?.markUnreachable(active)
+        Log.i(TAG, "marked endpoint role=${active.role} unreachable ($reason)")
+    }
+
+    /**
+     * Debounced network-change re-resolution, shared by both NetworkCallback
+     * events. Re-runs the resolver and publishes the winner to
+     * [activeEndpoint] so HTTP-only surfaces (chat, dashboard, standard
+     * voice) follow the route change even when no relay socket exists. When
+     * a socket IS up, additionally swaps it to a differing winner, or
+     * reconnects a disconnected socket on the same winner — preserving the
+     * pre-refactor relay-path behavior.
+     */
+    private fun scheduleNetworkReResolve(closeReason: String) {
+        if (endpointResolver == null) return
+        networkResolveJob?.cancel()
+        networkResolveJob = scope.launch {
+            delay(NETWORK_RESOLVE_DEBOUNCE_MS)
+            val current = serverUrl
+            val resolved = resolveBestEndpointSafe()
+            if (resolved == null) {
+                // Don't clear a live socket's endpoint on a transient probe
+                // miss — only drop the published route when nothing is
+                // actually connected.
+                if (_connectionState.value != ConnectionState.Connected) {
+                    _activeEndpoint.value = null
+                }
+                return@launch
+            }
+            _activeEndpoint.value = resolved
+            if (current == null) return@launch
+            // After an explicit disconnect() the route still publishes above
+            // (HTTP surfaces keep roaming), but no socket action: without
+            // this gate a network event whose winner differs from the last
+            // URL would resurrect a socket the user deliberately closed.
+            // (connectToUrlOnMainPath force-sets shouldReconnect = true, so
+            // the swap path never re-checked it.)
+            if (!shouldReconnect) return@launch
+            val normalizedNew = normalizeRelayUrl(resolved.relay.url)
+            if (normalizedNew != current) {
+                Log.i(TAG, "network change: swapping $current → $normalizedNew")
+                connectToUrlOnMainPath(resolved.relay.url, closeReason)
+            } else if (_connectionState.value == ConnectionState.Disconnected &&
+                reconnectGate()
+            ) {
+                Log.i(TAG, "network change: same winner is disconnected — reconnecting $current")
+                doConnect(current)
+            }
+        }
+    }
+
+    private fun ensureNetworkCallbackRegistered() {
+        val ctx = context ?: return
+        if (networkCallback != null) return
+        val cm = ctx.getSystemService(ConnectivityManager::class.java) ?: return
+        val callback = object : ConnectivityManager.NetworkCallback() {
+            override fun onAvailable(network: Network) {
+                Log.i(TAG, "network onAvailable — re-evaluating endpoint")
+                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")
+            }
+        }
+        try {
+            val request = NetworkRequest.Builder()
+                .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+                .removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
+                .build()
+            cm.registerNetworkCallback(request, callback)
+            networkCallback = callback
+            Log.i(TAG, "registered NetworkCallback for ADR 24 re-resolution")
+        } catch (e: Exception) {
+            Log.w(TAG, "registerNetworkCallback failed: ${e.message}")
+        }
+    }
+
+    private fun unregisterNetworkCallback() {
+        val ctx = context ?: return
+        val cb = networkCallback ?: return
+        try {
+            val cm = ctx.getSystemService(ConnectivityManager::class.java)
+            cm?.unregisterNetworkCallback(cb)
+        } catch (e: Exception) {
+            Log.w(TAG, "unregisterNetworkCallback failed: ${e.message}")
+        } finally {
+            networkCallback = null
+        }
     }
 
     private fun normalizeRelayUrl(url: String): String {
@@ -165,14 +624,27 @@ class ConnectionManager(
 
     fun disconnect() {
         shouldReconnect = false
+        DiagnosticsLog.record(
+            category = DiagnosticCategory.Relay,
+            severity = DiagnosticSeverity.Info,
+            title = "Relay socket disconnect requested",
+            url = serverUrl,
+        )
         webSocket?.close(1000, "Client disconnect")
         webSocket = null
         _connectionState.value = ConnectionState.Disconnected
         _isInsecureConnection.value = false
+        // ADR 24: clear manual override on explicit disconnect — a "Use
+        // now" switch lasts until the user disconnects, then resets to
+        // resolver-picked. A sticky preferredRouteRole is re-installed by
+        // the ViewModel on the next connection load.
+        _manualRoleOverride.value = null
+        _activeEndpoint.value = null
     }
 
     fun shutdown() {
         disconnect()
+        unregisterNetworkCallback()
         supervisorJob.cancel()
         client.dispatcher.executorService.shutdown()
         client.connectionPool.evictAll()
@@ -183,17 +655,38 @@ class ConnectionManager(
         webSocket?.send(text)
     }
 
-    private fun doConnect(url: String) {
+    private fun isActiveSocket(socket: WebSocket): Boolean = webSocket === socket
+
+    private fun doConnect(
+        url: String,
+        previousSocketToClose: WebSocket? = null,
+        replaceReason: String = "Relay socket replaced",
+    ) {
+        val existingState = _connectionState.value
+        if (previousSocketToClose == null &&
+            serverUrl == url &&
+            (existingState == ConnectionState.Connecting ||
+                existingState == ConnectionState.Connected ||
+                existingState == ConnectionState.Reconnecting)
+        ) {
+            Log.i(TAG, "doConnect: already ${existingState.name.lowercase()} to $url — skipping duplicate open")
+            return
+        }
+
         _connectionState.value = if (reconnectAttempt > 0) {
             ConnectionState.Reconnecting
         } else {
             ConnectionState.Connecting
         }
 
-        scope.launch { doConnectInternal(url) }
+        scope.launch { doConnectInternal(url, previousSocketToClose, replaceReason) }
     }
 
-    private fun doConnectInternal(url: String) {
+    private fun doConnectInternal(
+        url: String,
+        previousSocketToClose: WebSocket? = null,
+        replaceReason: String = "Relay socket replaced",
+    ) {
         // Rebuild the client so the CertificatePinner picks up the current
         // pin store snapshot — crucial right after applyServerIssuedCodeAndReset
         // wipes a pin for re-pair. buildClient() does a tiny DataStore read
@@ -205,11 +698,24 @@ class ConnectionManager(
             .build()
 
         Log.i(TAG, "doConnect: opening WSS to $url")
-        webSocket = client.newWebSocket(request, object : WebSocketListener() {
+        val newSocket = client.newWebSocket(request, object : WebSocketListener() {
             override fun onOpen(webSocket: WebSocket, response: Response) {
+                if (!isActiveSocket(webSocket)) {
+                    Log.i(TAG, "onOpen: stale WSS handshake ignored ($url)")
+                    runCatching { webSocket.close(1000, "Stale relay socket") }
+                    webSocket.cancel()
+                    return
+                }
                 reconnectAttempt = 0
+                lastUpgradeResponseCode = null
                 _connectionState.value = ConnectionState.Connected
                 Log.i(TAG, "onOpen: WSS handshake complete ($url)")
+                DiagnosticsLog.record(
+                    category = DiagnosticCategory.Relay,
+                    severity = DiagnosticSeverity.Info,
+                    title = "Relay socket connected",
+                    url = url,
+                )
 
                 // TOFU: record the peer cert fingerprint if we don't have one
                 // yet. OkHttp populates response.handshake when the connection
@@ -232,6 +738,10 @@ class ConnectionManager(
             }
 
             override fun onMessage(webSocket: WebSocket, text: String) {
+                if (!isActiveSocket(webSocket)) {
+                    Log.i(TAG, "onMessage: stale WSS envelope ignored ($url)")
+                    return
+                }
                 try {
                     val envelope = json.decodeFromString<Envelope>(text)
                     multiplexer.route(envelope)
@@ -246,17 +756,55 @@ class ConnectionManager(
             }
 
             override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
+                if (!isActiveSocket(webSocket)) {
+                    Log.i(TAG, "onClosed: stale WSS close ignored ($url code=$code reason=$reason)")
+                    return
+                }
                 Log.i(TAG, "onClosed: code=$code reason=$reason")
+                DiagnosticsLog.record(
+                    category = DiagnosticCategory.Relay,
+                    severity = DiagnosticSeverity.Warning,
+                    title = "Relay socket closed",
+                    detail = "code=$code reason=$reason",
+                    url = url,
+                )
                 _connectionState.value = ConnectionState.Disconnected
                 scheduleReconnect()
             }
 
             override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
-                Log.w(TAG, "onFailure: ${t.javaClass.simpleName}: ${t.message} (responseCode=${response?.code})")
+                if (!isActiveSocket(webSocket)) {
+                    Log.i(TAG, "onFailure: stale WSS failure ignored ($url ${t.javaClass.simpleName}: ${t.message})")
+                    return
+                }
+                val code = response?.code
+                Log.w(TAG, "onFailure: ${t.javaClass.simpleName}: ${t.message} (responseCode=$code)")
+                DiagnosticsLog.record(
+                    category = DiagnosticCategory.Relay,
+                    severity = DiagnosticSeverity.Error,
+                    title = "Relay socket failed",
+                    detail = listOfNotNull(
+                        t.javaClass.simpleName,
+                        t.message,
+                        code?.let { "HTTP $it" },
+                    ).joinToString(": "),
+                    url = url,
+                )
+                lastUpgradeResponseCode = code
+                if (response == null) {
+                    markActiveEndpointUnreachable("socket failure")
+                }
                 _connectionState.value = ConnectionState.Disconnected
                 scheduleReconnect()
             }
         })
+        webSocket = newSocket
+        previousSocketToClose
+            ?.takeIf { it !== newSocket }
+            ?.let { staleSocket ->
+                runCatching { staleSocket.close(1000, replaceReason) }
+                staleSocket.cancel()
+            }
     }
 
     private fun scheduleReconnect() {
@@ -269,6 +817,13 @@ class ConnectionManager(
         // the rate limiter and block ourselves.
         if (!reconnectGate()) {
             Log.i(TAG, "scheduleReconnect: gate says no pair context — aborting retry")
+            DiagnosticsLog.record(
+                category = DiagnosticCategory.Session,
+                severity = DiagnosticSeverity.Warning,
+                title = "Relay reconnect skipped",
+                detail = "No paired session or pending pair code",
+                url = serverUrl,
+            )
             _connectionState.value = ConnectionState.Disconnected
             return
         }
@@ -276,8 +831,33 @@ class ConnectionManager(
         val url = serverUrl ?: return
         reconnectAttempt++
 
-        val backoffMs = (BASE_BACKOFF_MS * (1L shl minOf(reconnectAttempt - 1, 4)))
-            .coerceAtMost(MAX_BACKOFF_MS)
+        // Server-issued 429 means we're IP-banned — keep retrying at our
+        // normal exponential cadence and we'll re-fill the ban bucket on
+        // every attempt, extending the ban indefinitely. Wait out the
+        // server's full block window instead.
+        val backoffMs = if (lastUpgradeResponseCode == 429) {
+            Log.i(TAG, "scheduleReconnect: rate-limited (429) — backing off ${RATE_LIMIT_BACKOFF_MS}ms")
+            DiagnosticsLog.record(
+                category = DiagnosticCategory.Relay,
+                severity = DiagnosticSeverity.Warning,
+                title = "Relay reconnect delayed",
+                detail = "Rate limited; retrying in ${RATE_LIMIT_BACKOFF_MS / 1000}s",
+                url = url,
+            )
+            RATE_LIMIT_BACKOFF_MS
+        } else {
+            (BASE_BACKOFF_MS * (1L shl minOf(reconnectAttempt - 1, 4)))
+                .coerceAtMost(MAX_BACKOFF_MS)
+        }
+        if (lastUpgradeResponseCode != 429) {
+            DiagnosticsLog.record(
+                category = DiagnosticCategory.Relay,
+                severity = DiagnosticSeverity.Info,
+                title = "Relay reconnect scheduled",
+                detail = "Retrying in ${backoffMs / 1000}s",
+                url = url,
+            )
+        }
 
         scope.launch {
             delay(backoffMs)
@@ -285,7 +865,19 @@ class ConnectionManager(
             // expires, auth state may have changed (e.g., user hit Revoke
             // during the retry window).
             if (shouldReconnect && reconnectGate()) {
-                doConnect(url)
+                val resolved = resolveBestEndpointSafe()
+                val targetUrl = resolved?.relay?.url
+                if (resolved != null) {
+                    _activeEndpoint.value = resolved
+                } else {
+                    _activeEndpoint.value = null
+                }
+                if (targetUrl != null && normalizeRelayUrl(targetUrl) != url) {
+                    Log.i(TAG, "scheduleReconnect: switching $url → ${normalizeRelayUrl(targetUrl)}")
+                    connectToUrlOnMainPath(targetUrl)
+                } else {
+                    doConnect(url)
+                }
             } else if (!reconnectGate()) {
                 Log.i(TAG, "scheduleReconnect: gate turned false during backoff — aborting retry")
                 _connectionState.value = ConnectionState.Disconnected

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

@@ -19,32 +19,69 @@ class ConnectivityObserver(private val context: Context) {
 
     fun observe(): Flow<Status> = callbackFlow {
         val connectivityManager = context.getSystemService(ConnectivityManager::class.java)
+        if (connectivityManager == null) {
+            trySend(Status.Unavailable)
+            awaitClose { }
+            return@callbackFlow
+        }
+
+        @Suppress("DEPRECATION")
+        fun hasAnyInternetNetwork(): Boolean =
+            connectivityManager.allNetworks.any { network ->
+                hasInternetCapability(connectivityManager.getNetworkCapabilities(network))
+            }
+
+        fun sendCurrentStatus(fallbackWhenNone: Status) {
+            trySend(statusForInternetAvailability(hasAnyInternetNetwork(), fallbackWhenNone))
+        }
 
         val callback = object : ConnectivityManager.NetworkCallback() {
             override fun onAvailable(network: Network) {
-                trySend(Status.Available)
+                sendCurrentStatus(Status.Available)
             }
+
+            override fun onCapabilitiesChanged(
+                network: Network,
+                networkCapabilities: NetworkCapabilities,
+            ) {
+                sendCurrentStatus(
+                    if (hasInternetCapability(networkCapabilities)) {
+                        Status.Available
+                    } else {
+                        Status.Lost
+                    }
+                )
+            }
+
             override fun onLost(network: Network) {
-                trySend(Status.Lost)
+                sendCurrentStatus(Status.Lost)
             }
+
             override fun onUnavailable() {
-                trySend(Status.Unavailable)
+                sendCurrentStatus(Status.Unavailable)
             }
         }
 
         val request = NetworkRequest.Builder()
             .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+            .removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
             .build()
         connectivityManager.registerNetworkCallback(request, callback)
 
         // Emit current state
-        val activeNetwork = connectivityManager.activeNetwork
-        val caps = connectivityManager.getNetworkCapabilities(activeNetwork)
-        val isConnected = caps?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) == true
-        trySend(if (isConnected) Status.Available else Status.Unavailable)
+        sendCurrentStatus(Status.Unavailable)
 
         awaitClose {
             connectivityManager.unregisterNetworkCallback(callback)
         }
     }
 }
+
+internal fun hasInternetCapability(caps: NetworkCapabilities?): Boolean =
+    caps?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) == true
+
+internal fun statusForInternetAvailability(
+    hasAnyInternetNetwork: Boolean,
+    fallbackWhenNone: ConnectivityObserver.Status,
+): ConnectivityObserver.Status =
+    if (hasAnyInternetNetwork) ConnectivityObserver.Status.Available else fallbackWhenNone

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

@@ -0,0 +1,906 @@
+package com.hermesandroid.relay.network
+
+import android.content.Context
+import com.hermesandroid.relay.auth.KeystoreTokenStore
+import com.hermesandroid.relay.auth.LegacyEncryptedPrefsTokenStore
+import com.hermesandroid.relay.auth.SessionTokenStore
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.booleanOrNull
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.contentOrNull
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.put
+import okhttp3.Cookie
+import okhttp3.CookieJar
+import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.Response
+import java.io.IOException
+import java.net.URLEncoder
+import java.util.concurrent.TimeUnit
+
+// Status/session/provider snapshots are @Serializable so the Manage tab's
+// disk cache (DashboardManageDiskCache) can persist Loaded entries verbatim.
+@Serializable
+data class DashboardStatus(
+    val authRequired: Boolean,
+    val authProviders: List<String> = emptyList(),
+    val authProviderDetails: List<DashboardAuthProvider> = emptyList(),
+    val version: String? = null,
+    val message: String? = null,
+)
+
+@Serializable
+data class DashboardAuthProvider(
+    val name: String,
+    val displayName: String? = null,
+    val supportsPassword: Boolean = false,
+) {
+    val isRedirectProvider: Boolean
+        get() = !supportsPassword
+}
+
+data class DashboardLoginResponse(
+    val ok: Boolean,
+    val next: String? = null,
+    val message: String? = null,
+)
+
+@Serializable
+data class DashboardAuthSession(
+    val authenticated: Boolean,
+    val username: String? = null,
+    val provider: String? = null,
+)
+
+data class DashboardWsTicket(
+    val ticket: String,
+    val ttlSeconds: Int? = null,
+)
+
+/**
+ * Native client for the Hermes dashboard/admin server (:9119).
+ *
+ * This is deliberately separate from [HermesApiClient] and all relay pairing
+ * clients. Dashboard cookies authenticate standard admin surfaces such as
+ * skills/cron/MCP/profile config; relay pairing remains the auth path for
+ * terminal, bridge, media relay, and profile memory file editing.
+ */
+class DashboardApiClient(
+    baseUrl: String,
+    private val okHttpClient: OkHttpClient = defaultClient(),
+    private val json: Json = Json {
+        ignoreUnknownKeys = true
+        isLenient = true
+        coerceInputValues = true
+    },
+) {
+    private val baseUrl: String = baseUrl.trim().trimEnd('/')
+
+    suspend fun getStatus(): Result<DashboardStatus> = withContext(Dispatchers.IO) {
+        getJson("/api/status").mapCatching { parseStatus(it) }
+    }
+
+    suspend fun getAuthProviders(): Result<List<DashboardAuthProvider>> = withContext(Dispatchers.IO) {
+        getJson("/api/auth/providers").mapCatching { root ->
+            parseProviders(root["providers"])
+        }
+    }
+
+    suspend fun getJsonObject(path: String): Result<JsonObject> = withContext(Dispatchers.IO) {
+        val normalized = if (path.startsWith("/")) path else "/$path"
+        getJson(normalized)
+    }
+
+    suspend fun getJsonElement(path: String): Result<JsonElement> = withContext(Dispatchers.IO) {
+        val normalized = if (path.startsWith("/")) path else "/$path"
+        val request = Request.Builder()
+            .url("$baseUrl$normalized")
+            .get()
+            .build()
+        executeJsonElement(request, normalized)
+    }
+
+    suspend fun postJsonObject(
+        path: String,
+        payload: JsonObject = JsonObject(emptyMap()),
+    ): Result<JsonObject> = withContext(Dispatchers.IO) {
+        val normalized = if (path.startsWith("/")) path else "/$path"
+        val request = Request.Builder()
+            .url("$baseUrl$normalized")
+            .post(json.encodeToString(JsonObject.serializer(), payload).toRequestBody(JSON_MEDIA))
+            .build()
+        executeJson(request, normalized)
+    }
+
+    suspend fun putJsonObject(
+        path: String,
+        payload: JsonObject,
+    ): Result<JsonObject> = withContext(Dispatchers.IO) {
+        val normalized = if (path.startsWith("/")) path else "/$path"
+        val request = Request.Builder()
+            .url("$baseUrl$normalized")
+            .put(json.encodeToString(JsonObject.serializer(), payload).toRequestBody(JSON_MEDIA))
+            .build()
+        executeJson(request, normalized)
+    }
+
+    suspend fun deleteJsonObject(path: String): Result<JsonObject> = withContext(Dispatchers.IO) {
+        val normalized = if (path.startsWith("/")) path else "/$path"
+        val request = Request.Builder()
+            .url("$baseUrl$normalized")
+            .delete()
+            .build()
+        executeJson(request, normalized)
+    }
+
+    /** DELETE with a JSON body — upstream's `DELETE /api/env` reads the key from the body. */
+    suspend fun deleteJsonObjectWithBody(
+        path: String,
+        payload: JsonObject,
+    ): Result<JsonObject> = withContext(Dispatchers.IO) {
+        val normalized = if (path.startsWith("/")) path else "/$path"
+        val request = Request.Builder()
+            .url("$baseUrl$normalized")
+            .delete(json.encodeToString(JsonObject.serializer(), payload).toRequestBody(JSON_MEDIA))
+            .build()
+        executeJson(request, normalized)
+    }
+
+    // --- Models (dashboard parity with hermes-desktop Settings → Model) ---
+
+    /** Full provider/model universe — REST twin of the TUI's `model.options` RPC. */
+    suspend fun getModelOptions(): Result<JsonObject> = getJsonObject("/api/model/options")
+
+    /**
+     * Assign the main model in `~/.hermes/config.yaml` (new sessions only).
+     * Upstream may answer `{ok: false, confirm_required: true, warning: ...}`
+     * for expensive models — re-call with [confirmExpensive] after the user
+     * accepts the warning.
+     */
+    suspend fun setMainModel(
+        provider: String,
+        model: String,
+        confirmExpensive: Boolean = false,
+    ): Result<JsonObject> =
+        postJsonObject(
+            path = "/api/model/set",
+            payload = buildJsonObject {
+                put("scope", "main")
+                put("provider", provider)
+                put("model", model)
+                if (confirmExpensive) put("confirm_expensive_model", true)
+            },
+        )
+
+    // --- Env / keys (dashboard parity with hermes-desktop Settings → Keys) ---
+
+    /** Curated env-var inventory: name → {is_set, redacted_value, description, category, ...}. */
+    suspend fun getEnvVars(): Result<JsonObject> = getJsonObject("/api/env")
+
+    suspend fun setEnvVar(key: String, value: String): Result<JsonObject> =
+        putJsonObject(
+            path = "/api/env",
+            payload = buildJsonObject {
+                put("key", key)
+                put("value", value)
+            },
+        )
+
+    suspend fun deleteEnvVar(key: String): Result<JsonObject> =
+        deleteJsonObjectWithBody(
+            path = "/api/env",
+            payload = buildJsonObject { put("key", key) },
+        )
+
+    /** Server rate-limits reveals (5 per 30s) and audit-logs each one. */
+    suspend fun revealEnvVar(key: String): Result<JsonObject> =
+        postJsonObject(
+            path = "/api/env/reveal",
+            payload = buildJsonObject { put("key", key) },
+        )
+
+    // --- Skills hub (dashboard parity with hermes-desktop Browse-hub tab) ---
+
+    /**
+     * Parallel multi-source hub search. Response carries `results` (name /
+     * description / source / identifier / trust_level / repo / tags),
+     * `source_counts`, `timed_out`, and `installed` (identifier → lock entry)
+     * so already-installed results can be marked. Server caps limit at 50 and
+     * fans out with a 30s overall timeout — keep client read timeouts above that.
+     */
+    suspend fun searchSkillsHub(query: String, limit: Int = 20): Result<JsonObject> =
+        getJsonObject("/api/skills/hub/search?q=${queryValue(query)}&limit=${limit.coerceIn(1, 50)}")
+
+    /** SKILL.md + manifest for an identifier WITHOUT installing — read before you trust. */
+    suspend fun previewSkillsHub(identifier: String): Result<JsonObject> =
+        getJsonObject("/api/skills/hub/preview?identifier=${queryValue(identifier)}")
+
+    /**
+     * Configured hub sources + featured skills (`{sources, index_available,
+     * featured, installed}`) — content for the browse dialog before the first
+     * search. Featured entries share the search-result payload shape.
+     */
+    suspend fun getSkillsHubSources(): Result<JsonObject> =
+        getJsonObject("/api/skills/hub/sources")
+
+    /**
+     * Spawns `hermes skills install <identifier>` server-side and returns
+     * `{ok, pid}` immediately — the install completes in the background, so
+     * callers should message "started" and refresh the skills list later.
+     */
+    suspend fun installSkillsHub(identifier: String): Result<JsonObject> =
+        postJsonObject(
+            path = "/api/skills/hub/install",
+            payload = buildJsonObject { put("identifier", identifier) },
+        )
+
+    /** Async spawn like install; takes the installed skill *name*, not the hub identifier. */
+    suspend fun uninstallSkillsHub(name: String): Result<JsonObject> =
+        postJsonObject(
+            path = "/api/skills/hub/uninstall",
+            payload = buildJsonObject { put("name", name) },
+        )
+
+    /** Async spawn of `hermes skills update` for all hub-installed skills. */
+    suspend fun updateSkillsHub(): Result<JsonObject> =
+        postJsonObject("/api/skills/hub/update")
+
+    // --- Profiles (write surface) ---
+
+    /** Full SOUL.md text — upstream returns the complete file, safe for round-trip editing. */
+    suspend fun putProfileSoul(name: String, content: String): Result<JsonObject> =
+        putJsonObject(
+            path = "/api/profiles/${pathSegment(name)}/soul",
+            payload = buildJsonObject { put("content", content) },
+        )
+
+    suspend fun createProfile(
+        name: String,
+        cloneFromDefault: Boolean = true,
+        description: String? = null,
+    ): Result<JsonObject> =
+        postJsonObject(
+            path = "/api/profiles",
+            payload = buildJsonObject {
+                put("name", name)
+                put("clone_from_default", cloneFromDefault)
+                if (!description.isNullOrBlank()) put("description", description)
+            },
+        )
+
+    suspend fun setProfileDescription(name: String, description: String): Result<JsonObject> =
+        putJsonObject(
+            path = "/api/profiles/${pathSegment(name)}/description",
+            payload = buildJsonObject { put("description", description) },
+        )
+
+    suspend fun setProfileModel(
+        name: String,
+        provider: String,
+        model: String,
+    ): Result<JsonObject> =
+        putJsonObject(
+            path = "/api/profiles/${pathSegment(name)}/model",
+            payload = buildJsonObject {
+                put("provider", provider)
+                put("model", model)
+            },
+        )
+
+    suspend fun toggleSkill(name: String, enabled: Boolean): Result<JsonObject> =
+        putJsonObject(
+            path = "/api/skills/toggle",
+            payload = buildJsonObject {
+                put("name", name)
+                put("enabled", enabled)
+            },
+        )
+
+    suspend fun pauseCronJob(jobId: String, profile: String? = null): Result<JsonObject> =
+        postJsonObject("/api/cron/jobs/${pathSegment(jobId)}/pause${profileQuery(profile)}")
+
+    suspend fun resumeCronJob(jobId: String, profile: String? = null): Result<JsonObject> =
+        postJsonObject("/api/cron/jobs/${pathSegment(jobId)}/resume${profileQuery(profile)}")
+
+    suspend fun triggerCronJob(jobId: String, profile: String? = null): Result<JsonObject> =
+        postJsonObject("/api/cron/jobs/${pathSegment(jobId)}/trigger${profileQuery(profile)}")
+
+    suspend fun getCronJobRuns(
+        jobId: String,
+        profile: String? = null,
+        limit: Int = 20,
+    ): Result<JsonObject> =
+        getJsonObject("/api/cron/jobs/${pathSegment(jobId)}/runs${profileLimitQuery(profile, limit)}")
+
+    suspend fun deleteCronJob(jobId: String, profile: String? = null): Result<JsonObject> =
+        deleteJsonObject("/api/cron/jobs/${pathSegment(jobId)}${profileQuery(profile)}")
+
+    suspend fun setMcpServerEnabled(name: String, enabled: Boolean): Result<JsonObject> =
+        putJsonObject(
+            path = "/api/mcp/servers/${pathSegment(name)}/enabled",
+            payload = buildJsonObject { put("enabled", enabled) },
+        )
+
+    suspend fun testMcpServer(name: String): Result<JsonObject> =
+        postJsonObject("/api/mcp/servers/${pathSegment(name)}/test")
+
+    suspend fun removeMcpServer(name: String): Result<JsonObject> =
+        deleteJsonObject("/api/mcp/servers/${pathSegment(name)}")
+
+    suspend fun installMcpCatalogEntry(
+        name: String,
+        env: Map<String, String> = emptyMap(),
+        enable: Boolean = true,
+    ): Result<JsonObject> =
+        postJsonObject(
+            path = "/api/mcp/catalog/install",
+            payload = buildJsonObject {
+                put("name", name)
+                put(
+                    "env",
+                    buildJsonObject {
+                        env.forEach { (key, value) -> put(key, value) }
+                    },
+                )
+                put("enable", enable)
+            },
+        )
+
+    suspend fun setActiveProfile(name: String): Result<JsonObject> =
+        postJsonObject(
+            path = "/api/profiles/active",
+            payload = buildJsonObject { put("name", name) },
+        )
+
+    suspend fun getProfileSoul(name: String): Result<JsonObject> =
+        getJsonObject("/api/profiles/${pathSegment(name)}/soul")
+
+    suspend fun deleteProfile(name: String): Result<JsonObject> =
+        deleteJsonObject("/api/profiles/${pathSegment(name)}")
+
+    suspend fun loginPassword(
+        provider: String = "basic",
+        username: String,
+        password: String,
+        next: String = "/",
+    ): Result<DashboardLoginResponse> = withContext(Dispatchers.IO) {
+        val payload = buildJsonObject {
+            put("provider", provider)
+            put("username", username)
+            put("password", password)
+            put("next", next)
+        }
+        val request = Request.Builder()
+            .url("$baseUrl/auth/password-login")
+            .post(json.encodeToString(JsonObject.serializer(), payload).toRequestBody(JSON_MEDIA))
+            .build()
+
+        executeJson(request, "Dashboard sign-in").mapCatching { root ->
+            DashboardLoginResponse(
+                ok = root.booleanField("ok") ?: true,
+                next = root.stringField("next"),
+                message = root.stringField("message") ?: root.stringField("detail"),
+            )
+        }
+    }
+
+    suspend fun currentSession(): Result<DashboardAuthSession> = withContext(Dispatchers.IO) {
+        val request = Request.Builder()
+            .url("$baseUrl/api/auth/me")
+            .get()
+            .build()
+
+        okHttpClient.newCall(request).execute().use { response ->
+            if (response.code == 401 || response.code == 403) {
+                return@withContext Result.success(DashboardAuthSession(authenticated = false))
+            }
+            if (!response.isSuccessful) {
+                return@withContext Result.failure(apiFailure(response, "Dashboard session"))
+            }
+            val root = response.readJsonObject(json)
+            Result.success(parseAuthSession(root))
+        }
+    }
+
+    /**
+     * True when this dashboard build exposes the hermes-desktop voice routes
+     * (`/api/audio/transcribe` + `/api/audio/speak`). HEAD on a POST-only
+     * FastAPI route returns 405 when the path exists and 404 when it doesn't;
+     * 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
+        }
+    }
+
+    suspend fun requestWsTicket(): Result<DashboardWsTicket> = withContext(Dispatchers.IO) {
+        val request = Request.Builder()
+            .url("$baseUrl/api/auth/ws-ticket")
+            .post(ByteArray(0).toRequestBody(null))
+            .build()
+
+        executeJson(request, "Dashboard websocket ticket").mapCatching { root ->
+            val ticket = root.stringField("ticket")
+                ?: root.stringField("ws_ticket")
+                ?: throw IOException("Dashboard websocket ticket response missing ticket")
+            DashboardWsTicket(
+                ticket = ticket,
+                ttlSeconds = root.intField("ttl_seconds") ?: root.intField("ttl"),
+            )
+        }
+    }
+
+    fun authLoginUrl(provider: String, next: String = "/"): String =
+        authLoginUrl(baseUrl = baseUrl, provider = provider, next = next)
+
+    fun gatewayWebSocketUrl(ticket: String, path: String = "/api/ws"): String? =
+        gatewayWebSocketUrl(baseUrl = baseUrl, ticket = ticket, path = path)
+
+    fun shutdown() {
+        okHttpClient.dispatcher.executorService.shutdown()
+        okHttpClient.connectionPool.evictAll()
+    }
+
+    private suspend fun getJson(path: String): Result<JsonObject> = withContext(Dispatchers.IO) {
+        val request = Request.Builder()
+            .url("$baseUrl$path")
+            .get()
+            .build()
+        executeJson(request, path)
+    }
+
+    private fun executeJson(request: Request, operation: String): Result<JsonObject> {
+        return try {
+            okHttpClient.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) {
+                    return Result.failure(apiFailure(response, operation))
+                }
+                Result.success(response.readJsonObject(json))
+            }
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
+
+    private fun executeJsonElement(request: Request, operation: String): Result<JsonElement> {
+        return try {
+            okHttpClient.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) {
+                    return Result.failure(apiFailure(response, operation))
+                }
+                Result.success(response.readJsonElement(json))
+            }
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
+
+    companion object {
+        private val JSON_MEDIA = "application/json; charset=utf-8".toMediaType()
+
+        fun pathSegment(value: String): String =
+            URLEncoder.encode(value, "UTF-8").replace("+", "%20")
+
+        private fun queryValue(value: String): String =
+            URLEncoder.encode(value, "UTF-8").replace("+", "%20")
+
+        fun authLoginUrl(baseUrl: String, provider: String, next: String = "/"): String {
+            val root = baseUrl.trim().trimEnd('/')
+            return "$root/auth/login?provider=${queryValue(provider)}&next=${queryValue(next)}"
+        }
+
+        fun authLandingPath(baseUrl: String): String {
+            val httpUrl = baseUrl.trim().trimEnd('/').toHttpUrlOrNull() ?: return "/"
+            val basePath = httpUrl.encodedPath.trimEnd('/')
+            return when {
+                basePath.isBlank() || basePath == "/" -> "/"
+                else -> "$basePath/"
+            }
+        }
+
+        fun gatewayWebSocketUrl(baseUrl: String, ticket: String, path: String = "/api/ws"): String? {
+            val httpUrl = baseUrl.trim().trimEnd('/').toHttpUrlOrNull() ?: return null
+            val websocketPrefix = when (httpUrl.scheme) {
+                "https" -> "wss://"
+                "http" -> "ws://"
+                else -> return null
+            }
+            val normalizedPath = if (path.startsWith("/")) path else "/$path"
+            val basePath = httpUrl.encodedPath.trimEnd('/')
+            val encodedPath = when {
+                basePath.isBlank() || basePath == "/" -> normalizedPath
+                else -> "$basePath$normalizedPath"
+            }
+            val url = httpUrl.newBuilder()
+                .encodedPath(encodedPath)
+                .addQueryParameter("ticket", ticket)
+                .build()
+                .toString()
+            return websocketPrefix + url.substringAfter("://")
+        }
+
+        private fun profileQuery(profile: String?): String {
+            val trimmed = profile?.trim().orEmpty()
+            return if (trimmed.isBlank()) "" else "?profile=${pathSegment(trimmed)}"
+        }
+
+        private fun profileLimitQuery(profile: String?, limit: Int): String {
+            val params = buildList {
+                val trimmed = profile?.trim().orEmpty()
+                if (trimmed.isNotBlank()) add("profile=${pathSegment(trimmed)}")
+                add("limit=${limit.coerceIn(1, 100)}")
+            }
+            return params.joinToString(prefix = "?", separator = "&")
+        }
+
+        fun defaultClient(
+            cookieStore: DashboardCookieStore = InMemoryDashboardCookieStore(),
+        ): OkHttpClient = OkHttpClient.Builder()
+            .cookieJar(DashboardCookieJar(cookieStore))
+            .connectTimeout(10, TimeUnit.SECONDS)
+            // Skills-hub search fans out server-side with a 30s overall
+            // timeout; keep the read window above it so a slow-but-successful
+            // search doesn't die client-side at the edge.
+            .readTimeout(45, TimeUnit.SECONDS)
+            .writeTimeout(30, TimeUnit.SECONDS)
+            .build()
+
+        fun parseStatus(root: JsonObject): DashboardStatus {
+            val authObject = root["auth"] as? JsonObject
+            val providersElement = root["auth_providers"]
+                ?: root["providers"]
+                ?: authObject?.get("providers")
+            val providers = parseProviders(providersElement)
+            return DashboardStatus(
+                authRequired = root.booleanField("auth_required")
+                    ?: authObject.booleanField("required")
+                    ?: false,
+                authProviders = providers.map { it.name },
+                authProviderDetails = providers,
+                version = root.stringField("version"),
+                message = root.stringField("message") ?: root.stringField("detail"),
+            )
+        }
+
+        fun parseAuthSession(root: JsonObject): DashboardAuthSession {
+            val user = root["user"] as? JsonObject
+            val session = root["session"] as? JsonObject
+            val explicitAuthenticated = root.booleanField("authenticated")
+                ?: root.booleanField("ok")
+            val flatIdentityPresent =
+                root.stringField("user_id") != null ||
+                    root.stringField("email") != null ||
+                    root.stringField("display_name") != null ||
+                    root.stringField("provider") != null ||
+                    root["expires_at"] != null
+            val authenticated = explicitAuthenticated
+                ?: (user != null || session != null || flatIdentityPresent)
+            return DashboardAuthSession(
+                authenticated = authenticated,
+                username = root.stringField("username")
+                    ?: root.stringField("display_name")
+                    ?: root.stringField("email")
+                    ?: root.stringField("user_id")
+                    ?: user.stringField("username")
+                    ?: user.stringField("name")
+                    ?: session.stringField("username"),
+                provider = root.stringField("provider")
+                    ?: session.stringField("provider")
+                    ?: user.stringField("provider"),
+            )
+        }
+
+        fun parseProviders(element: JsonElement?): List<DashboardAuthProvider> {
+            return when (element) {
+                is JsonArray -> element.mapNotNull { provider(it) }
+                is JsonObject -> element.entries.mapNotNull { (key, value) ->
+                    val name = key.trim().takeIf { it.isNotBlank() }
+                    if (name != null && value is JsonObject) {
+                        provider(name, value)
+                    } else {
+                        provider(value) ?: name?.let {
+                            DashboardAuthProvider(name = it, supportsPassword = isPasswordProvider(it))
+                        }
+                    }
+                }
+                else -> emptyList()
+            }.distinctBy { it.name }
+        }
+
+        private fun provider(element: JsonElement?): DashboardAuthProvider? {
+            return when (element) {
+                is JsonPrimitive -> element.contentOrNull
+                    ?.trim()
+                    ?.takeIf { it.isNotBlank() }
+                    ?.let { DashboardAuthProvider(name = it, supportsPassword = isPasswordProvider(it)) }
+                is JsonObject -> {
+                    val name = element.stringField("id")
+                        ?: element.stringField("name")
+                        ?: element.stringField("provider")
+                        ?: element.stringField("type")
+                    name?.let { provider(it, element) }
+                }
+                else -> null
+            }
+        }
+
+        private fun provider(name: String, element: JsonObject): DashboardAuthProvider =
+            DashboardAuthProvider(
+                name = name,
+                displayName = element.stringField("display_name")
+                    ?: element.stringField("label")
+                    ?: element.stringField("title"),
+                supportsPassword = element.booleanField("supports_password")
+                    ?: isPasswordProvider(name),
+            )
+
+        private fun isPasswordProvider(name: String): Boolean =
+            name.equals("basic", ignoreCase = true) ||
+                name.equals("password", ignoreCase = true)
+    }
+}
+
+interface DashboardCookieStore {
+    fun load(): List<StoredDashboardCookie>
+    fun save(cookies: List<StoredDashboardCookie>)
+    fun clear()
+}
+
+class InMemoryDashboardCookieStore : DashboardCookieStore {
+    private val lock = Any()
+    private var cookies: List<StoredDashboardCookie> = emptyList()
+
+    override fun load(): List<StoredDashboardCookie> = synchronized(lock) { cookies }
+
+    override fun save(cookies: List<StoredDashboardCookie>) {
+        synchronized(lock) {
+            this.cookies = cookies
+        }
+    }
+
+    override fun clear() {
+        synchronized(lock) {
+            cookies = emptyList()
+        }
+    }
+}
+
+class EncryptedDashboardCookieStore(
+    context: Context,
+    connectionId: String,
+    private val json: Json = Json { ignoreUnknownKeys = true },
+) : DashboardCookieStore {
+    private val serializer = ListSerializer(StoredDashboardCookie.serializer())
+    private val appContext = context.applicationContext
+    private val prefsName = prefsName(connectionId)
+
+    // 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.
+    private val store: SessionTokenStore by lazy {
+        KeystoreTokenStore.tryCreate(appContext, prefsName)
+            ?: LegacyEncryptedPrefsTokenStore(appContext, prefsName)
+    }
+
+    override fun load(): List<StoredDashboardCookie> {
+        val raw = store.getString(KEY_COOKIES) ?: return emptyList()
+        return runCatching { json.decodeFromString(serializer, raw) }
+            .getOrElse { emptyList() }
+    }
+
+    override fun save(cookies: List<StoredDashboardCookie>) {
+        store.putString(KEY_COOKIES, json.encodeToString(serializer, cookies))
+    }
+
+    override fun clear() {
+        store.remove(KEY_COOKIES)
+    }
+
+    companion object {
+        private const val KEY_COOKIES = "dashboard_cookies_json"
+
+        fun prefsName(connectionId: String): String =
+            "hermes_dashboard_${connectionId.take(8)}"
+    }
+}
+
+class DashboardCookieJar(
+    private val store: DashboardCookieStore,
+    private val clockMillis: () -> Long = { System.currentTimeMillis() },
+) : CookieJar {
+    override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
+        val now = clockMillis()
+        val incoming = cookies.map { StoredDashboardCookie.fromCookie(it) }
+            .filterNot { it.isExpired(now) }
+        val retained = store.load()
+            .filterNot { it.isExpired(now) }
+            .filterNot { old -> incoming.any { it.key == old.key } }
+        store.save(retained + incoming)
+    }
+
+    override fun loadForRequest(url: HttpUrl): List<Cookie> {
+        val now = clockMillis()
+        val stored = store.load().filterNot { it.isExpired(now) }
+        if (stored.size != store.load().size) {
+            store.save(stored)
+        }
+        return stored.mapNotNull { it.toCookie() }
+            .filter { it.matches(url) }
+    }
+}
+
+/**
+ * Cookie jar that resolves the backing per-connection store at request time.
+ *
+ * Long-lived OkHttpClients (e.g. the standard voice client, remembered once
+ * per process in RelayApp) can't bind a fixed [DashboardCookieStore] because
+ * the active Connection — and therefore the encrypted cookie file — changes
+ * when the user switches connections. A null store (no active connection)
+ * degrades to an empty jar rather than failing the request.
+ */
+class DynamicDashboardCookieJar(
+    private val storeProvider: () -> DashboardCookieStore?,
+) : CookieJar {
+    override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
+        val store = storeProvider() ?: return
+        DashboardCookieJar(store).saveFromResponse(url, cookies)
+    }
+
+    override fun loadForRequest(url: HttpUrl): List<Cookie> {
+        val store = storeProvider() ?: return emptyList()
+        return DashboardCookieJar(store).loadForRequest(url)
+    }
+}
+
+fun importDashboardCookieHeader(
+    store: DashboardCookieStore,
+    url: String,
+    cookieHeader: String?,
+    clockMillis: () -> Long = { System.currentTimeMillis() },
+): Int {
+    val httpUrl = url.toHttpUrlOrNull() ?: return 0
+    val raw = cookieHeader?.trim().orEmpty()
+    if (raw.isBlank()) return 0
+
+    val now = clockMillis()
+    // CookieManager.getCookie(url) returns only "name=value" pairs; it does
+    // not expose the original Set-Cookie Path attribute. Store imported
+    // WebView auth cookies at root so a cookie observed on /auth/callback is
+    // still sent to /api/auth/me during native session verification.
+    val cookiePath = "/"
+    val imported = raw.split(";")
+        .mapNotNull { part ->
+            val index = part.indexOf('=')
+            if (index <= 0) return@mapNotNull null
+            val name = part.substring(0, index).trim()
+            val value = part.substring(index + 1).trim()
+            if (name.isBlank()) return@mapNotNull null
+            StoredDashboardCookie(
+                name = name,
+                value = value,
+                expiresAt = Long.MAX_VALUE,
+                domain = httpUrl.host,
+                path = cookiePath,
+                secure = httpUrl.isHttps,
+                httpOnly = true,
+                hostOnly = true,
+                persistent = false,
+            )
+        }
+        .filterNot { it.isExpired(now) }
+    if (imported.isEmpty()) return 0
+
+    val retained = store.load()
+        .filterNot { it.isExpired(now) }
+        .filterNot { old -> imported.any { it.key == old.key } }
+    store.save(retained + imported)
+    return imported.size
+}
+
+@Serializable
+data class StoredDashboardCookie(
+    val name: String,
+    val value: String,
+    val expiresAt: Long,
+    val domain: String,
+    val path: String,
+    val secure: Boolean,
+    val httpOnly: Boolean,
+    val hostOnly: Boolean,
+    val persistent: Boolean,
+) {
+    val key: String
+        get() = "${name.lowercase()}|${domain.lowercase()}|$path"
+
+    fun isExpired(nowMillis: Long): Boolean =
+        persistent && expiresAt <= nowMillis
+
+    fun toCookie(): Cookie? {
+        return runCatching {
+            val builder = Cookie.Builder()
+                .name(name)
+                .value(value)
+                .path(path)
+            if (hostOnly) {
+                builder.hostOnlyDomain(domain)
+            } else {
+                builder.domain(domain)
+            }
+            if (persistent) {
+                builder.expiresAt(expiresAt)
+            }
+            if (secure) builder.secure()
+            if (httpOnly) builder.httpOnly()
+            builder.build()
+        }.getOrNull()
+    }
+
+    companion object {
+        fun fromCookie(cookie: Cookie): StoredDashboardCookie =
+            StoredDashboardCookie(
+                name = cookie.name,
+                value = cookie.value,
+                expiresAt = cookie.expiresAt,
+                domain = cookie.domain,
+                path = cookie.path,
+                secure = cookie.secure,
+                httpOnly = cookie.httpOnly,
+                hostOnly = cookie.hostOnly,
+                persistent = cookie.persistent,
+            )
+    }
+}
+
+private fun Response.readJsonObject(json: Json): JsonObject {
+    val raw = body.string()
+    if (raw.isBlank()) return JsonObject(emptyMap())
+    return json.parseToJsonElement(raw).jsonObject
+}
+
+private fun Response.readJsonElement(json: Json): JsonElement {
+    val raw = body.string()
+    if (raw.isBlank()) return JsonObject(emptyMap())
+    return json.parseToJsonElement(raw)
+}
+
+private fun apiFailure(response: Response, operation: String): IOException {
+    val bodyDetail = runCatching { response.body.string() }.getOrDefault("")
+    val detail = bodyDetail.take(240).ifBlank { response.message }
+    return IOException("$operation failed - HTTP ${response.code}: $detail")
+}
+
+private fun JsonObject?.stringField(name: String): String? =
+    ((this?.get(name) as? JsonPrimitive)?.contentOrNull)
+        ?.trim()
+        ?.takeIf { it.isNotBlank() }
+
+private fun JsonObject?.booleanField(name: String): Boolean? =
+    (this?.get(name) as? JsonPrimitive)?.booleanOrNull
+
+private fun JsonObject?.intField(name: String): Int? =
+    (this?.get(name) as? JsonPrimitive)?.contentOrNull?.toIntOrNull()

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

@@ -0,0 +1,421 @@
+package com.hermesandroid.relay.network
+
+import android.util.Log
+import com.hermesandroid.relay.data.EndpointCandidate
+import com.hermesandroid.relay.diagnostics.DiagnosticCategory
+import com.hermesandroid.relay.diagnostics.DiagnosticSeverity
+import com.hermesandroid.relay.diagnostics.DiagnosticsLog
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.TimeoutCancellationException
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeoutOrNull
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import java.net.ConnectException
+import java.net.NoRouteToHostException
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.TimeUnit
+import javax.net.ssl.SSLException
+
+/**
+ * Last observed probe result for a single [EndpointCandidate], keyed by
+ * [EndpointResolver.cacheKey] in [EndpointResolver.probeOutcomes]. Unlike the
+ * probe *cache* (a short-TTL "don't re-ask the network" optimization), this is
+ * a UI-facing record of what actually happened — it survives [EndpointResolver
+ * .clearCache] so the Routes card can keep showing the most recent
+ * reachability verdict between probes.
+ */
+data class RouteProbeOutcome(
+    val reachable: Boolean,
+    /** Short human-readable failure reason; null when [reachable]. */
+    val detail: String? = null,
+    /** Resolver-clock timestamp of when the probe finished. */
+    val atMillis: Long,
+)
+
+/**
+ * Picks the highest-priority **reachable** [EndpointCandidate] from a
+ * per-device list, driven by ADR 24 "Multi-endpoint pairing + network-aware
+ * switching" (2026-04-19).
+ *
+ * ### Semantics (locked by ADR 24)
+ *
+ *  * **Strict priority.** `priority = 0` is highest. If a priority-0
+ *    candidate is reachable we use it; reachability never promotes a lower
+ *    priority over a higher one. Reachability is **only** the tiebreaker
+ *    among candidates that share the same priority.
+ *  * **Reachability probe.** `HEAD ${api.url}/health` with a 2-second
+ *    per-candidate timeout. Positive results are cached longer than negative
+ *    results so repeated `connect()` calls don't hammer healthy routes, while
+ *    transient handoff misses do not pin a good fallback offline.
+ *  * **Network-change re-evaluate.** `ConnectionManager`'s network callback
+ *    bumps the caller into `resolve()` again on `onAvailable`, and marks the
+ *    active endpoint unreachable on `onLost` via [markUnreachable].
+ *
+ * The resolver is pure: no Context, no DataStore, no coroutine scope of its
+ * own. Callers pass the pre-loaded [EndpointCandidate] list (from
+ * `PairingPreferences.getDeviceEndpoints`), we run the probes, we return the
+ * winner. That keeps the resolver testable from plain JUnit with a
+ * MockWebServer stand-in.
+ *
+ * The resolver is **thread-safe** — the probe cache is a
+ * [ConcurrentHashMap] so parallel probes from a race group don't tear it.
+ */
+class EndpointResolver(
+    /**
+     * OkHttp client used for probes. Callers pass the shared relay-side
+     * client so TLS trust + DNS cache + cert-pinner state is consistent with
+     * the eventual WSS connect. Internally the resolver applies its own
+     * 2-second timeouts per call via [OkHttpClient.newBuilder], so the input
+     * client's timeouts don't leak into probe behavior.
+     */
+    private val httpClient: OkHttpClient,
+    /**
+     * Swappable "now" for tests. Production uses [System.currentTimeMillis];
+     * tests feed a mutable clock to exercise the 30-second TTL.
+     */
+    private val clock: () -> Long = { System.currentTimeMillis() },
+) {
+
+    /**
+     * Cached probe result. [expiresAt] is `clock()` + [CACHE_TTL_MS] when the
+     * entry was written; after expiry the entry is re-probed.
+     */
+    private data class CacheEntry(val expiresAt: Long, val reachable: Boolean)
+
+    private val probeCache = ConcurrentHashMap<String, CacheEntry>()
+
+    private val _probeOutcomes = MutableStateFlow<Map<String, RouteProbeOutcome>>(emptyMap())
+
+    /**
+     * Last probe verdict per candidate, keyed by [cacheKey]. Drives the
+     * per-row reachability line in the Routes card. Deliberately NOT wiped by
+     * [clearCache] — the cache controls when we re-ask the network; this
+     * records what the network last said.
+     */
+    val probeOutcomes: StateFlow<Map<String, RouteProbeOutcome>> = _probeOutcomes.asStateFlow()
+
+    private fun recordOutcome(candidate: EndpointCandidate, reachable: Boolean, detail: String?) {
+        _probeOutcomes.update { outcomes ->
+            outcomes + (cacheKey(candidate) to RouteProbeOutcome(
+                reachable = reachable,
+                detail = detail,
+                atMillis = clock(),
+            ))
+        }
+    }
+
+    companion object {
+        private const val TAG = "EndpointResolver"
+        /**
+         * Per-candidate HEAD probe timeout. ADR 24 speced 2s which was
+         * tight — LTE hand-off and slow hotel Wi-Fi routinely blew past
+         * 2s on the first packet and got candidates marked unreachable
+         * spuriously. 4s preserves "fast-fail on real outage" while
+         * surviving the flaky-network case.
+         */
+        const val PROBE_TIMEOUT_MS = 4_000L
+        /**
+         * Successful probe-result cache TTL. Widened from ADR 24's 30s to 60s for
+         * two reasons: (1) HEAD /health on every tab open was burning
+         * battery unnecessarily on mobile, (2) NetworkCallback's
+         * onAvailable / onLost invalidates the cache on real network
+         * changes anyway, so a 60s idle cache is functionally
+         * equivalent. Manual probes (EndpointsCard → "Probe now")
+         * bypass the cache.
+         */
+        const val CACHE_TTL_MS = 60_000L
+
+        /**
+         * Failed probe-result cache TTL. Keep this intentionally short:
+         * Android may report a new cellular/VPN network before Tailscale has
+         * finished routing, so a single early ConnectException must not keep a
+         * viable fallback route suppressed through the voice resume window.
+         */
+        const val NEGATIVE_CACHE_TTL_MS = 2_000L
+
+        /** Shared timeout wording so HEAD-timeout and socket-timeout read the same. */
+        private const val PROBE_TIMEOUT_DETAIL = "No answer (timed out)"
+
+        /**
+         * Stable cache key for a candidate: `"<role>|<api.host>:<api.port>"`.
+         * Roles are preserved case-verbatim (HMAC canonicalization contract)
+         * but hostnames are lowercased — two roles pointing at the same
+         * host:port share reachability state.
+         */
+        internal fun cacheKey(candidate: EndpointCandidate): String =
+            "${candidate.role}|${candidate.api.host.lowercase()}:${candidate.api.port}"
+    }
+
+    /**
+     * Run the resolver against [candidates].
+     *
+     *  1. Group by `priority` ascending.
+     *  2. For each priority group, race a HEAD /health probe against every
+     *     candidate in the group (2 s per candidate). First 2xx wins; ties
+     *     broken by whichever response lands first.
+     *  3. If the entire group is unreachable, fall through to the next
+     *     priority group.
+     *  4. If no candidate is reachable, return `null` — the caller falls back
+     *     to its legacy single-URL path.
+     *
+     * Candidates with an invalid api URL are skipped without affecting the
+     * priority-group decision (a bad record shouldn't starve out the rest of
+     * its tier). An empty [candidates] list returns null immediately without
+     * touching the network.
+     */
+    suspend fun resolve(candidates: List<EndpointCandidate>): EndpointCandidate? {
+        if (candidates.isEmpty()) return null
+
+        // Strict priority: sort ascending so priority-0 lands first. Grouping
+        // preserves emitted order within a priority class (DNS SRV parity).
+        val groups = candidates.groupBy { it.priority }.toSortedMap()
+
+        for ((priority, group) in groups) {
+            Log.d(TAG, "probing priority=$priority group (size=${group.size})")
+            val winner = raceGroup(group)
+            if (winner != null) {
+                Log.i(TAG, "resolve winner: role=${winner.role} " +
+                    "api=${winner.api.host}:${winner.api.port} priority=$priority")
+                DiagnosticsLog.record(
+                    category = DiagnosticCategory.Endpoint,
+                    severity = DiagnosticSeverity.Info,
+                    title = "Endpoint selected",
+                    detail = "priority=$priority",
+                    endpointRole = winner.role,
+                    url = winner.relay.url,
+                )
+                return winner
+            }
+        }
+
+        Log.w(TAG, "resolve: no reachable candidate across ${candidates.size} record(s)")
+        DiagnosticsLog.record(
+            category = DiagnosticCategory.Endpoint,
+            severity = DiagnosticSeverity.Warning,
+            title = "No reachable endpoint",
+            detail = "${candidates.size} configured route(s) failed health probes",
+        )
+        return null
+    }
+
+    /**
+     * Race all candidates in [group] (same priority tier) in parallel. First
+     * candidate that reports reachable — whether from cache or a fresh probe
+     * — wins. Null when the entire group is unreachable.
+     *
+     * We **don't** await all probes before picking a winner: the spec calls
+     * for "first 2xx wins" so latency matters. The losing probes' results
+     * still land in the cache, though, so the next call benefits.
+     */
+    private suspend fun raceGroup(group: List<EndpointCandidate>): EndpointCandidate? {
+        if (group.isEmpty()) return null
+        if (group.size == 1) {
+            val only = group.first()
+            return if (isReachable(only)) only else null
+        }
+
+        // Fast-path: any cached-reachable candidate wins immediately without
+        // touching the network.
+        for (candidate in group) {
+            val cached = probeCache[cacheKey(candidate)]
+            if (cached != null && cached.expiresAt > clock() && cached.reachable) {
+                return candidate
+            }
+        }
+
+        return coroutineScope {
+            val deferred = group.map { candidate ->
+                async(Dispatchers.IO) {
+                    if (isReachable(candidate)) candidate else null
+                }
+            }
+            // Collect results in arrival order: iterate through awaitAll +
+            // pick the first non-null. awaitAll preserves input order, which
+            // means a slow-but-reachable priority-0 candidate would block a
+            // fast-and-reachable sibling. But HEAD /health against a healthy
+            // API route replies in <100ms and the timeout caps stragglers at 2s,
+            // so this is acceptable in practice. A true "first to arrive"
+            // would need kotlinx.coroutines Channel plumbing that's not
+            // worth the weight here.
+            deferred.awaitAll().firstOrNull { it != null }
+        }
+    }
+
+    /**
+     * Cache-aware reachability check for a single candidate. Consults
+     * [probeCache] first; on miss or expiry, runs a HEAD /health probe and
+     * records the result.
+     */
+    private suspend fun isReachable(candidate: EndpointCandidate): Boolean {
+        val key = cacheKey(candidate)
+        val now = clock()
+        val cached = probeCache[key]
+        if (cached != null && cached.expiresAt > now) {
+            Log.d(TAG, "cache hit for $key reachable=${cached.reachable}")
+            return cached.reachable
+        }
+
+        val reachable = probe(candidate)
+        val ttl = if (reachable) CACHE_TTL_MS else NEGATIVE_CACHE_TTL_MS
+        probeCache[key] = CacheEntry(expiresAt = now + ttl, reachable = reachable)
+        return reachable
+    }
+
+    /**
+     * One-shot HEAD /health probe against a candidate. 2-second timeout,
+     * no retries — callers that need retry semantics can re-invoke after
+     * the cache expires.
+     *
+     * Returns false on any failure (timeout, I/O, non-2xx, invalid URL).
+     * We never raise: a bad record shouldn't crash the connect loop.
+     */
+    private suspend fun probe(candidate: EndpointCandidate): Boolean {
+        val startedAtMs = clock()
+        val url = "${candidate.api.url}/health".toHttpUrlOrNull()
+            ?: run {
+                Log.w(TAG, "probe: invalid url for role=${candidate.role}")
+                DiagnosticsLog.record(
+                    category = DiagnosticCategory.Endpoint,
+                    severity = DiagnosticSeverity.Error,
+                    title = "Endpoint probe invalid",
+                    detail = "Invalid API URL",
+                    endpointRole = candidate.role,
+                    url = candidate.api.url,
+                )
+                recordOutcome(candidate, reachable = false, detail = "Invalid API URL")
+                return false
+            }
+        val fastClient = httpClient.newBuilder()
+            .connectTimeout(PROBE_TIMEOUT_MS, TimeUnit.MILLISECONDS)
+            .readTimeout(PROBE_TIMEOUT_MS, TimeUnit.MILLISECONDS)
+            .writeTimeout(PROBE_TIMEOUT_MS, TimeUnit.MILLISECONDS)
+            .callTimeout(PROBE_TIMEOUT_MS, TimeUnit.MILLISECONDS)
+            .build()
+        val request = Request.Builder()
+            .url(url)
+            .head()
+            .header("Accept", "*/*")
+            .build()
+        return withContext(Dispatchers.IO) {
+            try {
+                withTimeoutOrNull(PROBE_TIMEOUT_MS + 200L) {
+                    fastClient.newCall(request).execute().use { resp ->
+                        val ok = resp.isSuccessful
+                        DiagnosticsLog.record(
+                            category = DiagnosticCategory.Endpoint,
+                            severity = if (ok) DiagnosticSeverity.Info else DiagnosticSeverity.Warning,
+                            title = if (ok) "Endpoint probe ok" else "Endpoint probe failed",
+                            detail = if (ok) null else "HTTP ${resp.code}",
+                            endpointRole = candidate.role,
+                            url = candidate.api.url,
+                            elapsedMs = clock() - startedAtMs,
+                        )
+                        recordOutcome(
+                            candidate,
+                            reachable = ok,
+                            detail = if (ok) null else "HTTP ${resp.code} from /health",
+                        )
+                        ok
+                    }
+                } ?: run {
+                    DiagnosticsLog.record(
+                        category = DiagnosticCategory.Endpoint,
+                        severity = DiagnosticSeverity.Warning,
+                        title = "Endpoint probe timeout",
+                        detail = "No /health response in ${PROBE_TIMEOUT_MS}ms",
+                        endpointRole = candidate.role,
+                        url = candidate.api.url,
+                        elapsedMs = clock() - startedAtMs,
+                    )
+                    recordOutcome(candidate, reachable = false, detail = PROBE_TIMEOUT_DETAIL)
+                    false
+                }
+            } catch (_: TimeoutCancellationException) {
+                DiagnosticsLog.record(
+                    category = DiagnosticCategory.Endpoint,
+                    severity = DiagnosticSeverity.Warning,
+                    title = "Endpoint probe timeout",
+                    detail = "No /health response in ${PROBE_TIMEOUT_MS}ms",
+                    endpointRole = candidate.role,
+                    url = candidate.api.url,
+                    elapsedMs = clock() - startedAtMs,
+                )
+                recordOutcome(candidate, reachable = false, detail = PROBE_TIMEOUT_DETAIL)
+                false
+            } catch (e: Exception) {
+                Log.d(TAG, "probe failed role=${candidate.role} " +
+                    "host=${candidate.api.host}: ${e.javaClass.simpleName}")
+                DiagnosticsLog.record(
+                    category = DiagnosticCategory.Endpoint,
+                    severity = DiagnosticSeverity.Warning,
+                    title = "Endpoint probe failed",
+                    detail = e.javaClass.simpleName,
+                    endpointRole = candidate.role,
+                    url = candidate.api.url,
+                    elapsedMs = clock() - startedAtMs,
+                )
+                recordOutcome(candidate, reachable = false, detail = humanProbeFailure(e))
+                false
+            }
+        }
+    }
+
+    /**
+     * Map a probe exception to a short, actionable string for the Routes
+     * card. The TLS case is the headline: a route saved with `https://`
+     * against a plain-HTTP Hermes API server fails its handshake on every
+     * probe and previously surfaced as a silent "never switches" mystery.
+     */
+    private fun humanProbeFailure(e: Exception): String = when (e) {
+        is SSLException -> "TLS failed — server may be http://, not https://"
+        is ConnectException -> "Connection refused"
+        is UnknownHostException -> "Host not found"
+        is SocketTimeoutException -> PROBE_TIMEOUT_DETAIL
+        is NoRouteToHostException -> "No route to host"
+        else -> e.javaClass.simpleName
+    }
+
+    /**
+     * Mark [candidate] unreachable without re-probing. Called from
+     * `ConnectionManager`'s `NetworkCallback.onLost` so the next resolve()
+     * skips the dead endpoint without waiting for its probe to time out.
+     *
+     * The entry is still TTL'd with the short negative TTL so a network-change
+     * transition can skip the known-dead active route without suppressing a
+     * valid fallback for the whole positive cache window.
+     */
+    fun markUnreachable(candidate: EndpointCandidate) {
+        val key = cacheKey(candidate)
+        probeCache[key] = CacheEntry(
+            expiresAt = clock() + NEGATIVE_CACHE_TTL_MS,
+            reachable = false,
+        )
+        recordOutcome(candidate, reachable = false, detail = "Network changed — assumed offline")
+    }
+
+    /**
+     * Wipe the probe cache so the next resolve runs fresh probes. Called on
+     * "the world changed" triggers — NetworkCallback events, manual "Probe
+     * now", and [refreshActiveEndpoint][ConnectionManager.refreshActiveEndpoint]
+     * with `clearProbeCache = true` — where a positive entry for a
+     * just-died route must not outlive the handoff.
+     */
+    internal fun clearCache() {
+        probeCache.clear()
+    }
+
+    /** Test-only: snapshot the current cache for assertion purposes. */
+    internal fun cacheSnapshot(): Map<String, Pair<Long, Boolean>> =
+        probeCache.mapValues { (_, v) -> v.expiresAt to v.reachable }
+}

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

@@ -3,6 +3,7 @@ package com.hermesandroid.relay.network
 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
@@ -21,10 +22,10 @@ import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.addJsonObject
-import kotlinx.serialization.json.buildJsonObject
-import kotlinx.serialization.json.put
-import kotlinx.serialization.json.putJsonArray
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.booleanOrNull
+import kotlinx.serialization.json.contentOrNull
+import kotlinx.serialization.json.decodeFromJsonElement
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -57,16 +58,16 @@ enum class ChatMode {
  * The Android client uses this to pick the best chat path automatically when
  * `streamingEndpoint = "auto"`. The bootstrap-injected vanilla-upstream case
  * is the interesting one: `sessionsApi=true` (we injected it) but
- * `sessionsChatStream=false` (we deliberately didn't inject the chat
- * handler — runs is better). The auto-resolver picks `runs` for chat in that
- * case while still using sessions endpoints for browse/rename/delete.
+ * `sessionsChatStream=false` (the chat handler is absent). The auto-resolver
+ * now picks OpenAI-compatible chat completions for that case because the route
+ * returns an SSE stream, while `/v1/runs` may be an async JSON run-start API.
  */
 data class ServerCapabilities(
-    /** `/api/sessions` (CRUD) — true on fork, upstream-merged, OR bootstrap-injected. */
+    /** `/api/sessions` (CRUD) — true on native upstream, fork, OR bootstrap-injected older builds. */
     val sessionsApi: Boolean,
-    /** `/api/sessions/{id}/chat/stream` (SSE) — true ONLY on fork or upstream-merged. */
+    /** `/api/sessions/{id}/chat/stream` (SSE) — true on native upstream or legacy fork builds. */
     val sessionsChatStream: Boolean,
-    /** `/v1/runs` (structured-event SSE) — standard upstream chat path. */
+    /** `/v1/runs` (structured-event SSE) — true only when explicitly advertised as SSE-compatible. */
     val runs: Boolean,
     /** `/v1/chat/completions` — OpenAI-compatible fallback. */
     val portable: Boolean,
@@ -76,6 +77,7 @@ data class ServerCapabilities(
     /** Resolve `streamingEndpoint = "auto"` to the best concrete choice. */
     fun preferredChatEndpoint(): String = when {
         sessionsChatStream -> "sessions"
+        portable -> "completions"
         runs -> "runs"
         else -> "sessions"  // last-resort: try sessions, will surface a clear error
     }
@@ -98,6 +100,62 @@ data class ServerCapabilities(
     }
 }
 
+private fun JsonObject.childObject(key: String): JsonObject? = this[key] as? JsonObject
+
+private fun JsonObject.booleanFlag(key: String): Boolean =
+    (this[key] as? JsonPrimitive)?.booleanOrNull == true
+
+private fun JsonObject.hasEndpoint(key: String): Boolean {
+    val path = ((this[key] as? JsonObject)?.get("path") as? JsonPrimitive)?.contentOrNull
+    return !path.isNullOrBlank()
+}
+
+internal fun parseCapabilitiesBody(json: Json, body: String): ServerCapabilities? {
+    val root = try {
+        json.decodeFromString<JsonObject>(body)
+    } catch (_: Exception) {
+        return null
+    }
+
+    val features = root.childObject("features")
+    val endpoints = root.childObject("endpoints")
+    if (features == null && endpoints == null) return null
+
+    fun feature(name: String): Boolean = features?.booleanFlag(name) == true
+    fun endpoint(name: String): Boolean = endpoints?.hasEndpoint(name) == true
+
+    return ServerCapabilities(
+        sessionsApi = feature("session_resources") ||
+            endpoint("sessions") ||
+            endpoint("session_create"),
+        sessionsChatStream = feature("session_chat_streaming") ||
+            endpoint("session_chat_stream"),
+        runs = feature("run_events_sse") || endpoint("run_events"),
+        portable = feature("chat_completions_streaming") ||
+            feature("chat_completions") ||
+            endpoint("chat_completions"),
+        healthy = true,
+    )
+}
+
+internal val HERMES_SKILL_ENDPOINTS = listOf("/v1/skills", "/api/skills")
+
+internal fun parseSkillListBody(json: Json, body: String): List<SkillInfo>? {
+    try {
+        val parsed = json.decodeFromString<SkillListResponse>(body)
+        val skills = parsed.skills ?: parsed.items ?: parsed.data
+        if (skills != null) return skills
+    } catch (_: Exception) {
+        // Fall through to direct-array compatibility below.
+    }
+
+    try {
+        return json.decodeFromString<List<SkillInfo>>(body)
+    } catch (_: Exception) {
+        return null
+    }
+}
+
 /**
  * Direct HTTP/SSE client for the Hermes API Server.
  *
@@ -193,43 +251,109 @@ class HermesApiClient(
         }
     }
 
-    // --- Session CRUD ---
-
-    suspend fun listSessions(limit: Int = 50): List<SessionItem> = withContext(Dispatchers.IO) {
+    suspend fun checkSessionsAuthDetailed(): HealthCheckResult = withContext(Dispatchers.IO) {
         try {
-            val request = authRequest("$baseUrl/api/sessions?limit=$limit").get().build()
+            val request = authRequest("$baseUrl/api/sessions?limit=1").get().build()
+
             client.newCall(request).execute().use { response ->
-                if (!response.isSuccessful) return@withContext emptyList()
-                val body = response.body?.string() ?: return@withContext emptyList()
-                val parsed = json.decodeFromString<SessionListResponse>(body)
-                parsed.items ?: parsed.sessions ?: emptyList()
+                when {
+                    response.isSuccessful -> HealthCheckResult.Healthy
+                    response.code == 401 || response.code == 403 ->
+                        HealthCheckResult.Unhealthy("API reachable, but sessions auth failed - check your API key")
+                    response.code == 404 ->
+                        HealthCheckResult.Unhealthy("API reachable, but /api/sessions is unavailable")
+                    else ->
+                        HealthCheckResult.Unhealthy("Sessions check returned HTTP ${response.code}")
+                }
             }
+        } catch (e: javax.net.ssl.SSLException) {
+            if (baseUrl.startsWith("https://", ignoreCase = true)) {
+                HealthCheckResult.Unhealthy("TLS handshake failed - try http:// if your server doesn't use HTTPS")
+            } else {
+                HealthCheckResult.Unhealthy("SSL error: ${e.message}")
+            }
+        } catch (e: java.net.ConnectException) {
+            HealthCheckResult.Unhealthy("Connection refused - check the URL and port")
+        } catch (e: java.net.UnknownHostException) {
+            HealthCheckResult.Unhealthy("Server not found - check the hostname")
+        } catch (e: java.net.SocketTimeoutException) {
+            HealthCheckResult.Unhealthy("Connection timed out - is the server running?")
+        } catch (e: IOException) {
+            HealthCheckResult.Unhealthy("Connection failed: ${e.message ?: "I/O error"}")
         } catch (e: Exception) {
-            Log.w(TAG, "Failed to list sessions: ${e.message}")
-            emptyList()
+            HealthCheckResult.Unhealthy("Unexpected error: ${e.message}")
         }
     }
 
-    suspend fun createSession(title: String? = null): SessionItem? = withContext(Dispatchers.IO) {
+    // --- Session CRUD ---
+
+    suspend fun listSessionsResult(limit: Int = 50): Result<List<SessionItem>> = withContext(Dispatchers.IO) {
         try {
-            val reqBody = json.encodeToString(CreateSessionRequest(title = title))
+            val request = authRequest("$baseUrl/api/sessions?limit=$limit").get().build()
+            client.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) {
+                    return@withContext Result.failure(apiFailure(response, "List sessions"))
+                }
+                val body = response.body.string()
+                if (body.isBlank()) {
+                    return@withContext Result.failure(IOException("List sessions returned an empty response"))
+                }
+                val parsed = json.decodeFromString<SessionListResponse>(body)
+                Result.success(parsed.data ?: parsed.items ?: parsed.sessions ?: emptyList())
+            }
+        } catch (e: Exception) {
+            Log.w(TAG, "Failed to list sessions: ${e.message}")
+            Result.failure(e)
+        }
+    }
+
+    suspend fun listSessions(limit: Int = 50): List<SessionItem> =
+        listSessionsResult(limit).getOrElse { emptyList() }
+
+    suspend fun createSessionResult(
+        title: String? = null,
+        profileName: String? = null,
+        model: String? = null,
+    ): Result<SessionItem> = withContext(Dispatchers.IO) {
+        try {
+            val reqBody = json.encodeToString(
+                CreateSessionRequest(
+                    title = title,
+                    model = model,
+                    profile = AgentDisplay.profileRequestName(profileName),
+                ),
+            )
             val request = authRequest("$baseUrl/api/sessions")
                 .post(reqBody.toRequestBody(JSON_MEDIA))
                 .build()
             client.newCall(request).execute().use { response ->
-                if (!response.isSuccessful) return@withContext null
-                val body = response.body?.string() ?: return@withContext null
+                if (!response.isSuccessful) {
+                    return@withContext Result.failure(apiFailure(response, "Create session"))
+                }
+                val body = response.body.string()
+                if (body.isBlank()) {
+                    return@withContext Result.failure(IOException("Create session returned an empty response"))
+                }
                 val parsed = json.decodeFromString<SessionResponse>(body)
-                parsed.session ?: parsed.id?.let {
+                val session = parsed.session ?: parsed.id?.let {
                     SessionItem(id = it, title = parsed.title, model = parsed.model)
                 }
+                session?.let { Result.success(it) }
+                    ?: Result.failure(IOException("Create session response missing session id"))
             }
         } catch (e: Exception) {
             Log.w(TAG, "Failed to create session: ${e.message}")
-            null
+            Result.failure(e)
         }
     }
 
+    suspend fun createSession(
+        title: String? = null,
+        profileName: String? = null,
+        model: String? = null,
+    ): SessionItem? =
+        createSessionResult(title, profileName, model).getOrNull()
+
     suspend fun deleteSession(sessionId: String): Boolean = withContext(Dispatchers.IO) {
         try {
             val request = authRequest("$baseUrl/api/sessions/$sessionId")
@@ -264,7 +388,7 @@ class HermesApiClient(
                 if (!response.isSuccessful) return@withContext emptyList()
                 val body = response.body?.string() ?: return@withContext emptyList()
                 val parsed = json.decodeFromString<MessageListResponse>(body)
-                parsed.items ?: parsed.messages ?: emptyList()
+                parsed.data ?: parsed.items ?: parsed.messages ?: emptyList()
             }
         } catch (e: Exception) {
             Log.w(TAG, "Failed to get messages: ${e.message}")
@@ -275,27 +399,21 @@ class HermesApiClient(
     // --- Skills ---
 
     suspend fun getSkills(): List<SkillInfo> = withContext(Dispatchers.IO) {
-        try {
-            val request = authRequest("$baseUrl/api/skills").get().build()
-            client.newCall(request).execute().use { response ->
-                if (!response.isSuccessful) return@withContext emptyList()
-                val body = response.body?.string() ?: return@withContext emptyList()
-                // Try structured response: { "skills": [...] } or { "items": [...] }
-                try {
-                    val parsed = json.decodeFromString<SkillListResponse>(body)
-                    val skills = parsed.skills ?: parsed.items
+        for (endpoint in HERMES_SKILL_ENDPOINTS) {
+            try {
+                val request = authRequest("$baseUrl$endpoint").get().build()
+                client.newCall(request).execute().use { response ->
+                    if (!response.isSuccessful) return@use
+                    val body = response.body?.string() ?: return@use
+                    val skills = parseSkillListBody(json, body)
                     if (skills != null) return@withContext skills
-                } catch (_: Exception) { /* fall through */ }
-                // Try direct array: [...]
-                try {
-                    return@withContext json.decodeFromString<List<SkillInfo>>(body)
-                } catch (_: Exception) { /* fall through */ }
-                emptyList()
+                }
+            } catch (e: Exception) {
+                Log.w(TAG, "Failed to fetch skills from $endpoint: ${e.message}")
             }
-        } catch (e: Exception) {
-            Log.w(TAG, "Failed to fetch skills: ${e.message}")
-            emptyList()
         }
+
+        emptyList()
     }
 
     // --- Server personalities ---
@@ -335,10 +453,22 @@ class HermesApiClient(
                     key to ((value as? kotlinx.serialization.json.JsonPrimitive)?.content ?: "")
                 } ?: emptyMap()
 
-                // Default personality: config.display.personality
+                // Default display identity. Upstream Hermes currently uses
+                // config.display.personality for the active persona and often
+                // mirrors the same identity through skin. Accept name-style
+                // aliases too so older or profile-specific configs don't make
+                // Android fall back to the literal "Hermes" label.
                 val display = config["display"] as? JsonObject
-                val defaultName = (display?.get("personality") as? kotlinx.serialization.json.JsonPrimitive)
-                    ?.content ?: ""
+                val defaultPersonality = display.stringField("personality")
+                val defaultName = firstNonBlank(
+                    defaultPersonality.takeUnless { it.equals("default", ignoreCase = true) },
+                    display.stringField("agent_name"),
+                    display.stringField("assistant_name"),
+                    display.stringField("display_name"),
+                    display.stringField("name"),
+                    display.stringField("skin"),
+                    defaultPersonality,
+                )
 
                 PersonalityConfig(
                     names = prompts.keys.toList(),
@@ -355,6 +485,16 @@ class HermesApiClient(
 
     // --- Chat streaming via /api/sessions/{id}/chat/stream ---
 
+    /**
+     * Stream chat via the sessions endpoint.
+     *
+     * @param modelOverride When non-null and non-blank, injects `"model":
+     *   "<value>"` at the top level of the session-chat request body,
+     *   asking the server to use that model for this turn. When null or
+     *   blank the `model` field is omitted entirely and the server falls
+     *   back to its session default. Used by the agent-profile picker so
+     *   an explicit user choice wins over implicit session/server defaults.
+     */
     fun sendChatStream(
         sessionId: String,
         message: String,
@@ -390,31 +530,24 @@ class HermesApiClient(
         onTurnComplete: () -> Unit,
         onComplete: () -> Unit,
         onUsage: (UsageInfo?) -> Unit,
-        onError: (String) -> Unit
+        onError: (String) -> Unit,
+        modelOverride: String? = null,
+        profileName: String? = null,
     ): EventSource {
-        val requestPayload = buildJsonObject {
-            put("message", message)
-            if (!systemMessage.isNullOrBlank()) {
-                put("system_message", systemMessage)
-            }
-            if (!attachments.isNullOrEmpty()) {
-                putJsonArray("attachments") {
-                    attachments.forEach { att ->
-                        addJsonObject {
-                            put("contentType", att.contentType)
-                            put("content", att.content)
-                        }
-                    }
-                }
-            }
-            if (voiceIntentMessages != null && voiceIntentMessages.isNotEmpty()) {
-                // Nest the synthesized OpenAI-format pairs under `messages`.
-                // Stays additive — the upstream sessions handler reads
-                // `message` for the live turn and treats `messages` as
-                // history context to seed the LLM with.
-                put("messages", voiceIntentMessages)
-            }
+        if (!modelOverride.isNullOrBlank()) {
+            Log.d(TAG, "sendChatStream: modelOverride=$modelOverride (profile pick)")
         }
+        AgentDisplay.profileRequestName(profileName)?.let {
+            Log.d(TAG, "sendChatStream: profile=$it")
+        }
+        val requestPayload = buildSessionChatStreamPayload(
+            message = message,
+            systemMessage = systemMessage,
+            attachments = attachments,
+            voiceIntentMessages = voiceIntentMessages,
+            modelOverride = modelOverride,
+            profileName = profileName,
+        )
         val requestBody = json.encodeToString(JsonObject.serializer(), requestPayload)
 
         val request = authRequest("$baseUrl/api/sessions/$sessionId/chat/stream")
@@ -610,8 +743,196 @@ class HermesApiClient(
         return sseFactory.newEventSource(request, listener)
     }
 
+    // --- OpenAI-compatible chat streaming via /v1/chat/completions ---
+
+    /**
+     * Stream chat through the OpenAI-compatible chat completions endpoint.
+     *
+     * This is the portable SSE fallback for servers that expose
+     * `/v1/chat/completions` but where `/v1/runs` is an async JSON run-start
+     * API rather than an EventSource-compatible stream.
+     */
+    fun sendChatCompletionsStream(
+        message: String,
+        model: String? = null,
+        systemMessage: String? = null,
+        attachments: List<com.hermesandroid.relay.data.Attachment>? = null,
+        voiceIntentMessages: JsonArray? = null,
+        onSessionId: (String) -> Unit,
+        onMessageStarted: (String) -> Unit,
+        onTextDelta: (String) -> Unit,
+        onThinkingDelta: (String) -> Unit,
+        onToolCallStart: (String, String) -> Unit,
+        onToolCallDone: (String, String?) -> Unit,
+        onToolCallFailed: (String, String?) -> Unit,
+        onTurnComplete: () -> Unit,
+        onComplete: () -> Unit,
+        onUsage: (UsageInfo?) -> Unit,
+        onError: (String) -> Unit,
+        modelOverride: String? = null,
+        profileName: String? = null,
+    ): EventSource {
+        if (!modelOverride.isNullOrBlank()) {
+            Log.d(TAG, "sendChatCompletionsStream: modelOverride=$modelOverride (profile pick, was model=$model)")
+        }
+        AgentDisplay.profileRequestName(profileName)?.let {
+            Log.d(TAG, "sendChatCompletionsStream: profile=$it")
+        }
+        val requestPayload = buildChatCompletionsStreamPayload(
+            message = message,
+            model = model,
+            systemMessage = systemMessage,
+            attachments = attachments,
+            voiceIntentMessages = voiceIntentMessages,
+            modelOverride = modelOverride,
+            profileName = profileName,
+        )
+        val requestBody = json.encodeToString(JsonObject.serializer(), requestPayload)
+
+        val request = authRequest("$baseUrl/v1/chat/completions")
+            .header("Accept", "text/event-stream")
+            .post(requestBody.toRequestBody(JSON_MEDIA))
+            .build()
+
+        val completeCalled = AtomicBoolean(false)
+        val messageStarted = AtomicBoolean(false)
+
+        val listener = object : EventSourceListener() {
+            override fun onEvent(
+                eventSource: EventSource,
+                id: String?,
+                type: String?,
+                data: String
+            ) {
+                if (data == "[DONE]") {
+                    if (completeCalled.compareAndSet(false, true)) {
+                        mainHandler.post { onComplete() }
+                    }
+                    return
+                }
+
+                try {
+                    val event = json.decodeFromString<JsonObject>(data)
+                    openAiErrorMessage(event)?.let { msg ->
+                        if (completeCalled.compareAndSet(false, true)) {
+                            mainHandler.post { onError(msg) }
+                        }
+                        return
+                    }
+
+                    openAiUsage(event)?.let { usage ->
+                        mainHandler.post { onUsage(usage) }
+                    }
+
+                    if (messageStarted.compareAndSet(false, true)) {
+                        openAiMessageId(event)?.let { messageId ->
+                            mainHandler.post { onMessageStarted(messageId) }
+                        }
+                    }
+
+                    openAiReasoningDelta(event)?.let { reasoning ->
+                        if (reasoning.isNotEmpty()) {
+                            mainHandler.post { onThinkingDelta(reasoning) }
+                        }
+                    }
+
+                    openAiTextDelta(event)?.let { delta ->
+                        if (delta.isNotEmpty()) {
+                            mainHandler.post { onTextDelta(delta) }
+                        }
+                    }
+
+                    val finishReason = openAiFinishReason(event)
+                    if (!finishReason.isNullOrBlank() && completeCalled.compareAndSet(false, true)) {
+                        mainHandler.post { onComplete() }
+                    }
+                } catch (e: Exception) {
+                    Log.w(TAG, "Unparseable chat completion SSE event ($type): ${e.message}\nRaw: $data")
+                }
+            }
+
+            override fun onFailure(
+                eventSource: EventSource,
+                t: Throwable?,
+                response: Response?
+            ) {
+                if (completeCalled.compareAndSet(false, true)) {
+                    val msg = when {
+                        response != null && !response.isSuccessful ->
+                            "API error ${response.code}: ${response.message}"
+                        t is IOException -> "Connection failed: ${t.message}"
+                        t != null -> "Stream error: ${t.message}"
+                        else -> "Unknown stream error"
+                    }
+                    mainHandler.post { onError(msg) }
+                }
+            }
+
+            override fun onClosed(eventSource: EventSource) {
+                if (completeCalled.compareAndSet(false, true)) {
+                    mainHandler.post { onComplete() }
+                }
+            }
+        }
+
+        return sseFactory.newEventSource(request, listener)
+    }
+
+    private fun openAiChoice(event: JsonObject): JsonObject? =
+        (event["choices"] as? JsonArray)
+            ?.firstOrNull()
+            ?.let { it as? JsonObject }
+
+    private fun openAiDelta(event: JsonObject): JsonObject? =
+        openAiChoice(event)?.get("delta") as? JsonObject
+
+    private fun openAiTextDelta(event: JsonObject): String? =
+        (openAiDelta(event)?.get("content") as? JsonPrimitive)?.contentOrNull
+
+    private fun openAiReasoningDelta(event: JsonObject): String? {
+        val delta = openAiDelta(event) ?: return null
+        return (delta["reasoning_content"] as? JsonPrimitive)?.contentOrNull
+            ?: (delta["reasoning"] as? JsonPrimitive)?.contentOrNull
+            ?: (delta["thinking"] as? JsonPrimitive)?.contentOrNull
+    }
+
+    private fun openAiFinishReason(event: JsonObject): String? =
+        (openAiChoice(event)?.get("finish_reason") as? JsonPrimitive)?.contentOrNull
+
+    private fun openAiMessageId(event: JsonObject): String? =
+        (event["id"] as? JsonPrimitive)?.contentOrNull
+
+    private fun openAiErrorMessage(event: JsonObject): String? {
+        val error = event["error"] ?: return null
+        return when (error) {
+            is JsonPrimitive -> error.contentOrNull
+            is JsonObject -> (error["message"] as? JsonPrimitive)?.contentOrNull
+                ?: (error["error"] as? JsonPrimitive)?.contentOrNull
+            else -> null
+        }
+    }
+
+    private fun openAiUsage(event: JsonObject): UsageInfo? =
+        (event["usage"] as? JsonObject)?.let { usage ->
+            runCatching { json.decodeFromJsonElement<UsageInfo>(usage) }.getOrNull()
+        }
+
     // --- Run streaming via /v1/runs ---
 
+    /**
+     * Stream a run via `/v1/runs`.
+     *
+     * @param model Caller's default model selection (nullable). When
+     *   [modelOverride] is null/blank this is used as the `model` field,
+     *   or `"default"` if both are null — preserving the pre-profile
+     *   behaviour exactly.
+     * @param modelOverride When non-null and non-blank, wins over [model]
+     *   and is injected as the top-level `"model"` field in the run
+     *   request body. Used by the agent-profile picker so an explicit
+     *   user-selected profile model takes precedence over any implicit
+     *   caller default. When null/blank this parameter is ignored and
+     *   [model] drives selection as before.
+     */
     fun sendRunStream(
         message: String,
         model: String? = null,
@@ -629,33 +950,25 @@ class HermesApiClient(
         onTurnComplete: () -> Unit,
         onComplete: () -> Unit,
         onUsage: (UsageInfo?) -> Unit,
-        onError: (String) -> Unit
+        onError: (String) -> Unit,
+        modelOverride: String? = null,
+        profileName: String? = null,
     ): EventSource {
-        val requestPayload = buildJsonObject {
-            put("model", model ?: "default")
-            put("input", message)
-            put("stream", true)
-            if (!systemMessage.isNullOrBlank()) {
-                put("system_message", systemMessage)
-            }
-            if (!attachments.isNullOrEmpty()) {
-                putJsonArray("attachments") {
-                    attachments.forEach { att ->
-                        addJsonObject {
-                            put("contentType", att.contentType)
-                            put("content", att.content)
-                        }
-                    }
-                }
-            }
-            if (voiceIntentMessages != null && voiceIntentMessages.isNotEmpty()) {
-                // /v1/runs is OpenAI Responses-shaped — accepts an
-                // additional `messages` field for context-priming the
-                // run. Mirror the chat-stream branch so both endpoints
-                // ingest the synthetic voice-intent history identically.
-                put("messages", voiceIntentMessages)
-            }
+        if (!modelOverride.isNullOrBlank()) {
+            Log.d(TAG, "sendRunStream: modelOverride=$modelOverride (profile pick, was model=$model)")
         }
+        AgentDisplay.profileRequestName(profileName)?.let {
+            Log.d(TAG, "sendRunStream: profile=$it")
+        }
+        val requestPayload = buildRunStreamPayload(
+            message = message,
+            model = model,
+            systemMessage = systemMessage,
+            attachments = attachments,
+            voiceIntentMessages = voiceIntentMessages,
+            modelOverride = modelOverride,
+            profileName = profileName,
+        )
         val requestBody = json.encodeToString(JsonObject.serializer(), requestPayload)
 
         val request = authRequest("$baseUrl/v1/runs")
@@ -867,14 +1180,16 @@ class HermesApiClient(
      *
      * Probe order:
      *   1. `/health` — if this fails, everything else is moot.
-     *   2. `HEAD /api/sessions?limit=1` — sessions CRUD (true on fork OR
-     *      bootstrap-injected upstream).
-     *   3. `HEAD /api/sessions/probe/chat/stream` — chat-stream handler
+     *   2. `GET /v1/capabilities` — native upstream feature + endpoint map.
+     *   3. `HEAD /api/sessions?limit=1` — sessions CRUD (true on fork,
+     *      native upstream, OR bootstrap-injected older upstream).
+     *   4. `HEAD /api/sessions/probe/chat/stream` — chat-stream handler
      *      presence. The handler only accepts POST, so HEAD returns 405
      *      (Method Not Allowed) when the route is registered. 404 means
      *      the route doesn't exist at all.
-     *   4. `HEAD /v1/runs` — runs endpoint presence (same 405-vs-404 logic).
-     *   5. `HEAD /v1/models` — OpenAI-compat reachability.
+     *   5. `HEAD /v1/chat/completions` — OpenAI-compatible SSE fallback.
+     *   6. `HEAD /v1/runs` with `Accept: text/event-stream` — accepted only
+     *      when the response explicitly advertises event-stream compatibility.
      *
      * **Why HEAD instead of OPTIONS:** The hermes-agent gateway runs CORS
      * middleware (`security_headers_middleware`) that intercepts OPTIONS
@@ -884,10 +1199,13 @@ class HermesApiClient(
      * for present, 404 for missing). Verified empirically against the
      * production hermes-agent gateway on 2026-04-12.
      *
-     * **Success criterion:** any HTTP response code that isn't 404 means
-     * the route is registered. We accept 200, 204, 401, 403, 405, 415,
-     * etc. as positive — even quirky middleware responses count, because
-     * the alternative (404) is the only signal that means "no such path."
+     * **Route presence criterion:** for sessions and completions, any HTTP
+     * response code that isn't 404 means the route is registered. We accept
+     * 200, 204, 401, 403, 405, 415, etc. as positive because the alternative
+     * (404) is the only signal that means "no such path." `/v1/runs` is
+     * stricter: route presence alone is not enough because async runs can
+     * return `202 application/json`; auto only uses it if event-stream support
+     * is explicitly advertised.
      *
      * Network errors (connection refused, DNS failure, etc.) count as
      * "missing" since we can't differentiate from a server-down case.
@@ -902,6 +1220,20 @@ class HermesApiClient(
         }
         if (!healthy) return@withContext ServerCapabilities.DISCONNECTED
 
+        val advertisedCapabilities = try {
+            val req = authRequest("$baseUrl/v1/capabilities").get().build()
+            client.newCall(req).execute().use { response ->
+                if (!response.isSuccessful) {
+                    null
+                } else {
+                    parseCapabilitiesBody(json, response.body.string())
+                }
+            }
+        } catch (_: Exception) {
+            null
+        }
+        if (advertisedCapabilities != null) return@withContext advertisedCapabilities
+
         // Reusable HEAD probe — returns true if the route is registered
         // (any status except 404 + network errors). Already inside the
         // Dispatchers.IO context from the outer withContext, so the
@@ -913,10 +1245,31 @@ class HermesApiClient(
             false
         }
 
+        fun Response.advertisesEventStream(): Boolean {
+            val contentType = header("Content-Type").orEmpty()
+            val streamMode = header("X-Hermes-Stream-Mode").orEmpty()
+            val runStreaming = header("X-Hermes-Run-Streaming").orEmpty()
+            return contentType.contains("text/event-stream", ignoreCase = true) ||
+                streamMode.equals("sse", ignoreCase = true) ||
+                runStreaming.equals("sse", ignoreCase = true)
+        }
+
+        fun routeExplicitlySupportsEventStream(path: String): Boolean = try {
+            val req = authRequest("$baseUrl$path")
+                .head()
+                .header("Accept", "text/event-stream")
+                .build()
+            client.newCall(req).execute().use { response ->
+                response.code != 404 && response.advertisesEventStream()
+            }
+        } catch (_: Exception) {
+            false
+        }
+
         val sessionsApi = routeExists("/api/sessions?limit=1")
         val sessionsChatStream = routeExists("/api/sessions/probe/chat/stream")
-        val runs = routeExists("/v1/runs")
-        val portable = routeExists("/v1/models")
+        val portable = routeExists("/v1/chat/completions")
+        val runs = routeExplicitlySupportsEventStream("/v1/runs")
 
         ServerCapabilities(
             sessionsApi = sessionsApi,
@@ -948,4 +1301,20 @@ class HermesApiClient(
         }
         return builder
     }
+
+    private fun apiFailure(response: Response, operation: String): IOException {
+        val detail = response.message.takeIf { it.isNotBlank() }?.let { ": $it" }.orEmpty()
+        val message = when (response.code) {
+            401, 403 -> "$operation unauthorized - check your API key"
+            in 500..599 -> "$operation failed - server error HTTP ${response.code}"
+            else -> "$operation failed - HTTP ${response.code}$detail"
+        }
+        return IOException(message)
+    }
+
+    private fun JsonObject?.stringField(name: String): String =
+        ((this?.get(name) as? JsonPrimitive)?.contentOrNull ?: "").trim()
+
+    private fun firstNonBlank(vararg values: String?): String =
+        values.firstOrNull { !it.isNullOrBlank() }.orEmpty()
 }

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

@@ -0,0 +1,145 @@
+package com.hermesandroid.relay.network
+
+import com.hermesandroid.relay.data.AgentDisplay
+import com.hermesandroid.relay.data.Attachment
+import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.add
+import kotlinx.serialization.json.addJsonObject
+import kotlinx.serialization.json.buildJsonArray
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.put
+import kotlinx.serialization.json.putJsonArray
+import kotlinx.serialization.json.putJsonObject
+
+internal fun buildSessionChatStreamPayload(
+    message: String,
+    systemMessage: String? = null,
+    attachments: List<Attachment>? = null,
+    voiceIntentMessages: JsonArray? = null,
+    modelOverride: String? = null,
+    profileName: String? = null,
+): JsonObject = buildJsonObject {
+    put("message", message)
+    if (!systemMessage.isNullOrBlank()) {
+        put("system_message", systemMessage)
+    }
+    if (!modelOverride.isNullOrBlank()) {
+        put("model", modelOverride)
+    }
+    AgentDisplay.profileRequestName(profileName)?.let { put("profile", it) }
+    if (!attachments.isNullOrEmpty()) {
+        putJsonArray("attachments") {
+            attachments.forEach { att ->
+                addJsonObject {
+                    put("contentType", att.contentType)
+                    put("content", att.content)
+                }
+            }
+        }
+    }
+    if (voiceIntentMessages != null && voiceIntentMessages.isNotEmpty()) {
+        put("messages", voiceIntentMessages)
+    }
+}
+
+internal fun buildRunStreamPayload(
+    message: String,
+    model: String? = null,
+    systemMessage: String? = null,
+    attachments: List<Attachment>? = null,
+    voiceIntentMessages: JsonArray? = null,
+    modelOverride: String? = null,
+    profileName: String? = null,
+): JsonObject {
+    val resolvedModel = when {
+        !modelOverride.isNullOrBlank() -> modelOverride
+        !model.isNullOrBlank() -> model
+        else -> "default"
+    }
+    return buildJsonObject {
+        put("model", resolvedModel)
+        put("input", message)
+        put("stream", true)
+        if (!systemMessage.isNullOrBlank()) {
+            put("system_message", systemMessage)
+        }
+        AgentDisplay.profileRequestName(profileName)?.let { put("profile", it) }
+        if (!attachments.isNullOrEmpty()) {
+            putJsonArray("attachments") {
+                attachments.forEach { att ->
+                    addJsonObject {
+                        put("contentType", att.contentType)
+                        put("content", att.content)
+                    }
+                }
+            }
+        }
+        if (voiceIntentMessages != null && voiceIntentMessages.isNotEmpty()) {
+            put("messages", voiceIntentMessages)
+        }
+    }
+}
+
+internal fun buildChatCompletionsStreamPayload(
+    message: String,
+    model: String? = null,
+    systemMessage: String? = null,
+    attachments: List<Attachment>? = null,
+    voiceIntentMessages: JsonArray? = null,
+    modelOverride: String? = null,
+    profileName: String? = null,
+): JsonObject {
+    val resolvedModel = when {
+        !modelOverride.isNullOrBlank() -> modelOverride
+        !model.isNullOrBlank() -> model
+        else -> "default"
+    }
+    return buildJsonObject {
+        put("model", resolvedModel)
+        put("stream", true)
+        AgentDisplay.profileRequestName(profileName)?.let { put("profile", it) }
+        putJsonArray("messages") {
+            if (!systemMessage.isNullOrBlank()) {
+                addJsonObject {
+                    put("role", "system")
+                    put("content", systemMessage)
+                }
+            }
+            if (voiceIntentMessages != null && voiceIntentMessages.isNotEmpty()) {
+                voiceIntentMessages.forEach { add(it) }
+            }
+            addJsonObject {
+                put("role", "user")
+                if (!attachments.isNullOrEmpty() && attachments.any { it.isImage }) {
+                    put("content", buildJsonArray {
+                        addJsonObject {
+                            put("type", "text")
+                            put("text", message)
+                        }
+                        attachments.filter { it.isImage }.forEach { att ->
+                            addJsonObject {
+                                put("type", "image_url")
+                                putJsonObject("image_url") {
+                                    put("url", "data:${att.contentType};base64,${att.content}")
+                                }
+                            }
+                        }
+                    })
+                } else {
+                    put("content", message)
+                }
+            }
+        }
+        if (!attachments.isNullOrEmpty() && attachments.any { !it.isImage }) {
+            putJsonArray("attachments") {
+                attachments.filter { !it.isImage }.forEach { att ->
+                    addJsonObject {
+                        put("contentType", att.contentType)
+                        put("content", att.content)
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,226 @@
+package com.hermesandroid.relay.network
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.LinkAddress
+import android.util.Log
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.sync.Semaphore
+import kotlinx.coroutines.sync.withPermit
+import kotlinx.coroutines.withContext
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import java.net.Inet4Address
+import java.util.concurrent.TimeUnit
+
+data class HermesLanDiscoveryResult(
+    val host: String,
+    val apiUrl: String,
+    val dashboardUrl: String?,
+    val apiReachable: Boolean,
+    val dashboardReachable: Boolean,
+)
+
+/**
+ * User-triggered local-network discovery for standard Hermes setup.
+ *
+ * This deliberately scans only the active RFC1918/link-local LAN around the
+ * phone, never broad public or Tailscale ranges. Tailscale/public routes still
+ * belong in the explicit advanced fields where the user controls the URL.
+ */
+object HermesLanDiscovery {
+    private const val TAG = "HermesLanDiscovery"
+    private const val MAX_HOSTS = 254
+    private const val MAX_CONCURRENT_PROBES = 32
+    private const val PROBE_TIMEOUT_MS = 650L
+    private const val IPV4_MASK = 0xFFFF_FFFFL
+
+    suspend fun scan(
+        context: Context,
+        apiPort: Int = 8642,
+        dashboardPort: Int = 9119,
+    ): List<HermesLanDiscoveryResult> = withContext(Dispatchers.IO) {
+        val hosts = localLanHosts(context.applicationContext)
+        if (hosts.isEmpty()) return@withContext emptyList()
+
+        val client = OkHttpClient.Builder()
+            .connectTimeout(PROBE_TIMEOUT_MS, TimeUnit.MILLISECONDS)
+            .readTimeout(PROBE_TIMEOUT_MS, TimeUnit.MILLISECONDS)
+            .writeTimeout(PROBE_TIMEOUT_MS, TimeUnit.MILLISECONDS)
+            .callTimeout(PROBE_TIMEOUT_MS * 2, TimeUnit.MILLISECONDS)
+            .build()
+
+        coroutineScope {
+            val semaphore = Semaphore(MAX_CONCURRENT_PROBES)
+            hosts.map { host ->
+                async {
+                    semaphore.withPermit {
+                        probeHost(client, host, apiPort, dashboardPort)
+                    }
+                }
+            }.awaitAll()
+                .filterNotNull()
+                .sortedWith(
+                    compareByDescending<HermesLanDiscoveryResult> { it.dashboardReachable }
+                        .thenByDescending { it.apiReachable }
+                        .thenBy { it.host },
+                )
+        }
+    }
+
+    private fun probeHost(
+        client: OkHttpClient,
+        host: String,
+        apiPort: Int,
+        dashboardPort: Int,
+    ): HermesLanDiscoveryResult? {
+        val apiUrl = "http://$host:$apiPort"
+        val dashboardUrl = "http://$host:$dashboardPort"
+        val dashboardReachable = probe(
+            client = client,
+            url = "$dashboardUrl/api/status",
+            expectedBody = ::looksLikeDashboardStatus,
+        )
+        val apiReachable = probe(
+            client = client,
+            url = "$apiUrl/health",
+            expectedBody = ::looksLikeApiHealth,
+        )
+        if (!dashboardReachable && !apiReachable) return null
+        return HermesLanDiscoveryResult(
+            host = host,
+            apiUrl = apiUrl,
+            dashboardUrl = dashboardUrl.takeIf { dashboardReachable },
+            apiReachable = apiReachable,
+            dashboardReachable = dashboardReachable,
+        )
+    }
+
+    private fun probe(
+        client: OkHttpClient,
+        url: String,
+        expectedBody: (String, String) -> Boolean,
+    ): Boolean {
+        val httpUrl = url.toHttpUrlOrNull() ?: return false
+        val request = Request.Builder()
+            .url(httpUrl)
+            .get()
+            .header("Accept", "application/json, text/plain, */*")
+            .build()
+
+        return try {
+            client.newCall(request).execute().use { response ->
+                if (response.code == 401 || response.code == 403) {
+                    return true
+                }
+                if (!response.isSuccessful) {
+                    return false
+                }
+                val contentType = response.header("Content-Type").orEmpty()
+                val body = response.body.string().take(2_048)
+                expectedBody(body, contentType)
+            }
+        } catch (e: Exception) {
+            Log.d(TAG, "probe failed url=$url type=${e.javaClass.simpleName}")
+            false
+        }
+    }
+
+    private fun looksLikeDashboardStatus(body: String, contentType: String): Boolean {
+        val lower = body.lowercase()
+        return contentType.contains("json", ignoreCase = true) && (
+            lower.contains("auth_required") ||
+                lower.contains("auth_providers") ||
+                lower.contains("authenticated") ||
+                lower.contains("hermes")
+            )
+    }
+
+    private fun looksLikeApiHealth(body: String, contentType: String): Boolean {
+        if (contentType.contains("json", ignoreCase = true)) return true
+        if (contentType.contains("text/plain", ignoreCase = true)) return true
+        return body.isBlank() || body.trimStart().startsWith("{")
+    }
+
+    private fun localLanHosts(context: Context): List<String> {
+        val connectivityManager = context.getSystemService(ConnectivityManager::class.java)
+            ?: return emptyList()
+        val networks = buildList {
+            connectivityManager.activeNetwork?.let(::add)
+            connectivityManager.allNetworks.forEach { network ->
+                if (!contains(network)) add(network)
+            }
+        }
+
+        val hosts = linkedSetOf<String>()
+        for (network in networks) {
+            val linkProperties = connectivityManager.getLinkProperties(network) ?: continue
+            for (linkAddress in linkProperties.linkAddresses) {
+                addHostsForLink(linkAddress, hosts)
+                if (hosts.size >= MAX_HOSTS) break
+            }
+            if (hosts.size >= MAX_HOSTS) break
+        }
+        return hosts.take(MAX_HOSTS)
+    }
+
+    private fun addHostsForLink(linkAddress: LinkAddress, hosts: MutableSet<String>) {
+        val address = linkAddress.address as? Inet4Address ?: return
+        if (address.isLoopbackAddress || address.isMulticastAddress) return
+
+        val local = ipv4ToLong(address)
+        if (!isScannableLanAddress(local)) return
+
+        val scanPrefix = when (linkAddress.prefixLength) {
+            in 24..30 -> linkAddress.prefixLength
+            else -> 24
+        }
+        val mask = subnetMask(scanPrefix)
+        val network = local and mask
+        val broadcast = network or (mask.inv() and IPV4_MASK)
+        val first = network + 1
+        val last = broadcast - 1
+        if (first > last) return
+
+        for (candidate in first..last) {
+            if (candidate == local) continue
+            hosts.add(longToIpv4(candidate))
+            if (hosts.size >= MAX_HOSTS) return
+        }
+    }
+
+    private fun subnetMask(prefixLength: Int): Long {
+        return (IPV4_MASK shl (32 - prefixLength)) and IPV4_MASK
+    }
+
+    private fun ipv4ToLong(address: Inet4Address): Long {
+        return address.address.fold(0L) { acc, byte ->
+            (acc shl 8) or (byte.toInt() and 0xFF).toLong()
+        } and IPV4_MASK
+    }
+
+    private fun longToIpv4(value: Long): String {
+        return listOf(
+            (value shr 24) and 0xFF,
+            (value shr 16) and 0xFF,
+            (value shr 8) and 0xFF,
+            value and 0xFF,
+        ).joinToString(".") { it.toString() }
+    }
+
+    private fun isScannableLanAddress(value: Long): Boolean {
+        val first = ((value shr 24) and 0xFF).toInt()
+        val second = ((value shr 16) and 0xFF).toInt()
+        return when {
+            first == 10 -> true
+            first == 172 && second in 16..31 -> true
+            first == 192 && second == 168 -> true
+            first == 169 && second == 254 -> true
+            else -> false
+        }
+    }
+}

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

@@ -0,0 +1,52 @@
+package com.hermesandroid.relay.network
+
+import java.net.URI
+
+/**
+ * Resolves profile-scoped Hermes API URLs for phone use.
+ *
+ * Relays and Hermes gateways often bind profile API servers to loopback or
+ * 0.0.0.0 on the host machine. Those addresses are correct for the relay
+ * process but wrong on Android, where 127.0.0.1 means the phone. When the
+ * active connection uses a reachable LAN/Tailscale host, replace loopback
+ * profile hosts with that same host while preserving the profile port.
+ */
+object ProfileApiUrlResolver {
+    fun normalize(url: String?): String? =
+        url?.trim()?.takeIf { it.isNotBlank() }?.trimEnd('/')
+
+    fun resolveForConnection(profileApiUrl: String?, baseApiUrl: String?): String? {
+        val profile = normalize(profileApiUrl) ?: return null
+        val base = normalize(baseApiUrl) ?: return profile
+
+        val profileUri = runCatching { URI(profile) }.getOrNull() ?: return profile
+        val profileHost = profileUri.host?.takeIf { it.isNotBlank() } ?: return profile
+        if (!isLocalBindHost(profileHost)) return profile
+
+        val baseUri = runCatching { URI(base) }.getOrNull() ?: return profile
+        val baseHost = baseUri.host?.takeIf { it.isNotBlank() } ?: return profile
+        if (isLocalBindHost(baseHost)) return profile
+
+        val scheme = baseUri.scheme?.takeIf { it.isNotBlank() }
+            ?: profileUri.scheme?.takeIf { it.isNotBlank() }
+            ?: return profile
+        val hostPart = if (baseHost.contains(":") && !baseHost.startsWith("[")) {
+            "[$baseHost]"
+        } else {
+            baseHost
+        }
+        val portPart = profileUri.port.takeIf { it != -1 }?.let { ":$it" }.orEmpty()
+        val pathPart = profileUri.rawPath?.takeIf { it.isNotBlank() && it != "/" }.orEmpty()
+        val queryPart = profileUri.rawQuery?.let { "?$it" }.orEmpty()
+        val fragmentPart = profileUri.rawFragment?.let { "#$it" }.orEmpty()
+
+        return "$scheme://$hostPart$portPart$pathPart$queryPart$fragmentPart".trimEnd('/')
+    }
+
+    private fun isLocalBindHost(host: String): Boolean {
+        return when (host.lowercase().trim('[', ']')) {
+            "localhost", "127.0.0.1", "0.0.0.0", "::1", "::" -> true
+            else -> false
+        }
+    }
+}

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

@@ -2,6 +2,9 @@ package com.hermesandroid.relay.network
 
 import android.util.Log
 import com.hermesandroid.relay.auth.PairedDeviceInfo
+import com.hermesandroid.relay.diagnostics.DiagnosticCategory
+import com.hermesandroid.relay.diagnostics.DiagnosticSeverity
+import com.hermesandroid.relay.diagnostics.DiagnosticsLog
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.builtins.ListSerializer
@@ -579,7 +582,10 @@ class RelayHttpClient(
      * human-readable message on any failure (network, non-200, bad body,
      * doesn't-look-like-hermes-relay).
      */
-    suspend fun probeHealth(relayUrl: String): Result<RelayHealth> = withContext(Dispatchers.IO) {
+    suspend fun probeHealth(
+        relayUrl: String,
+        logSuccess: Boolean = true,
+    ): Result<RelayHealth> = withContext(Dispatchers.IO) {
         val trimmed = relayUrl.trim()
         if (trimmed.isEmpty()) {
             return@withContext Result.failure(
@@ -591,10 +597,18 @@ class RelayHttpClient(
             .replace(Regex("^wss://", RegexOption.IGNORE_CASE), "https://")
             .replace(Regex("^ws://", RegexOption.IGNORE_CASE), "http://")
             .trimEnd('/')
+        val startedAtMs = System.currentTimeMillis()
 
         val url = try {
             "$httpBase/health".toHttpUrl()
         } catch (e: IllegalArgumentException) {
+            DiagnosticsLog.record(
+                category = DiagnosticCategory.Relay,
+                severity = DiagnosticSeverity.Error,
+                title = "Relay URL invalid",
+                detail = e.message,
+                url = relayUrl,
+            )
             return@withContext Result.failure(
                 IOException("Invalid relay URL: ${e.message}")
             )
@@ -606,6 +620,7 @@ class RelayHttpClient(
             .connectTimeout(3, java.util.concurrent.TimeUnit.SECONDS)
             .readTimeout(3, java.util.concurrent.TimeUnit.SECONDS)
             .writeTimeout(3, java.util.concurrent.TimeUnit.SECONDS)
+            .callTimeout(3, java.util.concurrent.TimeUnit.SECONDS)
             .build()
 
         val request = Request.Builder()
@@ -617,12 +632,28 @@ class RelayHttpClient(
         try {
             fastClient.newCall(request).execute().use { response ->
                 if (!response.isSuccessful) {
+                    DiagnosticsLog.record(
+                        category = DiagnosticCategory.Relay,
+                        severity = DiagnosticSeverity.Warning,
+                        title = "Relay health failed",
+                        detail = "HTTP ${response.code}",
+                        url = httpBase,
+                        elapsedMs = System.currentTimeMillis() - startedAtMs,
+                    )
                     return@withContext Result.failure(
                         IOException("Relay responded HTTP ${response.code}")
                     )
                 }
                 val body = response.body?.string().orEmpty()
                 if (body.isBlank()) {
+                    DiagnosticsLog.record(
+                        category = DiagnosticCategory.Relay,
+                        severity = DiagnosticSeverity.Warning,
+                        title = "Relay health failed",
+                        detail = "Empty response",
+                        url = httpBase,
+                        elapsedMs = System.currentTimeMillis() - startedAtMs,
+                    )
                     return@withContext Result.failure(
                         IOException("Relay returned an empty response")
                     )
@@ -632,18 +663,42 @@ class RelayHttpClient(
                 val parsed: Map<String, kotlinx.serialization.json.JsonElement> = try {
                     sessionsJson.parseToJsonElement(body).jsonObject
                 } catch (e: Exception) {
+                    DiagnosticsLog.record(
+                        category = DiagnosticCategory.Relay,
+                        severity = DiagnosticSeverity.Warning,
+                        title = "Relay health failed",
+                        detail = "Non-JSON response",
+                        url = httpBase,
+                        elapsedMs = System.currentTimeMillis() - startedAtMs,
+                    )
                     return@withContext Result.failure(
                         IOException("Relay returned non-JSON: ${e.message ?: "parse error"}")
                     )
                 }
                 val status = (parsed["status"] as? kotlinx.serialization.json.JsonPrimitive)?.content
                 if (status != "ok") {
+                    DiagnosticsLog.record(
+                        category = DiagnosticCategory.Relay,
+                        severity = DiagnosticSeverity.Warning,
+                        title = "Relay health failed",
+                        detail = "status=${status ?: "missing"}",
+                        url = httpBase,
+                        elapsedMs = System.currentTimeMillis() - startedAtMs,
+                    )
                     return@withContext Result.failure(
                         IOException("Relay reports status=${status ?: "missing"} (expected 'ok')")
                     )
                 }
                 val version = (parsed["version"] as? kotlinx.serialization.json.JsonPrimitive)?.content
                 if (version.isNullOrBlank()) {
+                    DiagnosticsLog.record(
+                        category = DiagnosticCategory.Relay,
+                        severity = DiagnosticSeverity.Warning,
+                        title = "Relay health failed",
+                        detail = "Missing version field",
+                        url = httpBase,
+                        elapsedMs = System.currentTimeMillis() - startedAtMs,
+                    )
                     return@withContext Result.failure(
                         IOException("Response doesn't look like a hermes-relay — missing 'version' field")
                     )
@@ -652,19 +707,61 @@ class RelayHttpClient(
                     ?.content?.toIntOrNull() ?: 0
                 val sessions = (parsed["sessions"] as? kotlinx.serialization.json.JsonPrimitive)
                     ?.content?.toIntOrNull() ?: 0
+                if (logSuccess) {
+                    DiagnosticsLog.record(
+                        category = DiagnosticCategory.Relay,
+                        severity = DiagnosticSeverity.Info,
+                        title = "Relay health ok",
+                        detail = "version=$version clients=$clients sessions=$sessions",
+                        url = httpBase,
+                        elapsedMs = System.currentTimeMillis() - startedAtMs,
+                    )
+                }
                 Result.success(RelayHealth(version = version, clients = clients, sessions = sessions))
             }
         } catch (e: java.net.SocketTimeoutException) {
             Log.w(TAG, "probeHealth timeout: ${e.message}")
+            DiagnosticsLog.record(
+                category = DiagnosticCategory.Relay,
+                severity = DiagnosticSeverity.Warning,
+                title = "Relay health timeout",
+                detail = "No HTTP response in 3s",
+                url = httpBase,
+                elapsedMs = System.currentTimeMillis() - startedAtMs,
+            )
             Result.failure(IOException("Relay is not responding (3s timeout)"))
         } catch (e: java.net.ConnectException) {
             Log.w(TAG, "probeHealth connect refused: ${e.message}")
+            DiagnosticsLog.record(
+                category = DiagnosticCategory.Relay,
+                severity = DiagnosticSeverity.Error,
+                title = "Relay connection refused",
+                detail = e.message,
+                url = httpBase,
+                elapsedMs = System.currentTimeMillis() - startedAtMs,
+            )
             Result.failure(IOException("Connection refused — is the relay running on this URL?"))
         } catch (e: IOException) {
             Log.w(TAG, "probeHealth IO error: ${e.message}")
+            DiagnosticsLog.record(
+                category = DiagnosticCategory.Relay,
+                severity = DiagnosticSeverity.Warning,
+                title = "Relay health failed",
+                detail = e.message ?: "Network error",
+                url = httpBase,
+                elapsedMs = System.currentTimeMillis() - startedAtMs,
+            )
             Result.failure(IOException("Network error: ${e.message ?: "unreachable"}"))
         } catch (e: Exception) {
             Log.w(TAG, "probeHealth unexpected error: ${e.message}")
+            DiagnosticsLog.record(
+                category = DiagnosticCategory.Relay,
+                severity = DiagnosticSeverity.Error,
+                title = "Relay health failed",
+                detail = e.message ?: e.javaClass.simpleName,
+                url = httpBase,
+                elapsedMs = System.currentTimeMillis() - startedAtMs,
+            )
             Result.failure(e)
         }
     }

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

@@ -0,0 +1,514 @@
+package com.hermesandroid.relay.network
+
+import android.util.Log
+import com.hermesandroid.relay.data.ProfileConfigResponse
+import com.hermesandroid.relay.data.ProfileMemoryResponse
+import com.hermesandroid.relay.data.ProfileSkillsResponse
+import com.hermesandroid.relay.data.ProfileSoulResponse
+import com.hermesandroid.relay.data.ProfileSoulUpdateResponse
+import com.hermesandroid.relay.data.ProfileMemoryUpdateResponse
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.put
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import java.io.IOException
+import java.net.URLEncoder
+
+/**
+ * HTTP client for the read-only **Profile Inspector** endpoints added in
+ * the v0.7.0 relay:
+ *
+ *  - `GET /api/profiles/{name}/config`   (already live)
+ *  - `GET /api/profiles/{name}/skills`   (already live)
+ *  - `GET /api/profiles/{name}/soul`     (Python worker)
+ *  - `GET /api/profiles/{name}/memory`   (Python worker)
+ *
+ * Mirrors the constructor shape of [RelayHttpClient] — same OkHttpClient,
+ * the same `wss://` → `https://` URL-flipping trick, and the same lazy
+ * session-token provider so a paired bearer token from EncryptedSharedPrefs
+ * is only read when actually needed.
+ *
+ * All IO hops over [Dispatchers.IO] — we had a `NetworkOnMainThreadException`
+ * during v0.6.0 development when an earlier client went straight from a
+ * Composable effect to OkHttp without a dispatcher hop, so every path here
+ * starts with `withContext(Dispatchers.IO) { ... }`.
+ *
+ * Profile names are URL-encoded before being spliced into the path so
+ * names containing spaces or non-ASCII characters don't produce malformed
+ * URLs.
+ */
+class RelayProfileInspectorClient(
+    private val okHttpClient: OkHttpClient,
+    private val relayUrlProvider: () -> String?,
+    private val sessionTokenProvider: suspend () -> String?,
+) {
+
+    companion object {
+        private const val TAG = "RelayProfileInspector"
+
+        /**
+         * Server-side upload ceiling for SOUL.md and memory entries
+         * (1 MiB). Kept as a named constant so the matching wire limit
+         * in the Python worker can be moved in lockstep. We use it to
+         * translate a generic 413 into a friendlier error message.
+         */
+        private const val SOUL_MAX_BYTES: Long = 1024L * 1024L
+
+        /**
+         * JSON media type used for all PUT requests. Hoisted to a
+         * constant so we don't re-parse it on every write.
+         */
+        private val JSON_MEDIA_TYPE = "application/json; charset=utf-8".toMediaType()
+
+        // Lenient + ignore unknown keys so if the Python worker adds a
+        // field later we don't fail to deserialize the whole payload.
+        private val json = Json {
+            ignoreUnknownKeys = true
+            isLenient = true
+            coerceInputValues = true
+            explicitNulls = false
+        }
+    }
+
+
+    /** Fetch `GET /api/profiles/{name}/config`. */
+    suspend fun fetchConfig(profileName: String): Result<ProfileConfigResponse> =
+        get(profileName, "config", ProfileConfigResponse.serializer())
+
+    /** Fetch `GET /api/profiles/{name}/skills`. */
+    suspend fun fetchSkills(profileName: String): Result<ProfileSkillsResponse> =
+        get(profileName, "skills", ProfileSkillsResponse.serializer())
+
+    /** Fetch `GET /api/profiles/{name}/soul`. */
+    suspend fun fetchSoul(profileName: String): Result<ProfileSoulResponse> =
+        get(profileName, "soul", ProfileSoulResponse.serializer())
+
+    /** Fetch `GET /api/profiles/{name}/memory`. */
+    suspend fun fetchMemory(profileName: String): Result<ProfileMemoryResponse> =
+        get(profileName, "memory", ProfileMemoryResponse.serializer())
+
+    /**
+     * `PUT /api/profiles/{name}/soul` with body `{"content": "..."}`.
+     *
+     * Server-side contract:
+     *   - 200: content written; returns [ProfileSoulUpdateResponse]
+     *   - 404: profile not found
+     *   - 413: body exceeds 1 MiB size limit
+     *   - 401/403: unauthorized — re-pair
+     *
+     * The [content] may be any UTF-8 string including empty (to blank the
+     * file) — the server does not enforce non-emptiness. A `null` content
+     * would be a protocol violation; we send empty-string for an empty
+     * SOUL.
+     */
+    suspend fun updateSoul(
+        profileName: String,
+        content: String,
+    ): Result<ProfileSoulUpdateResponse> = withContext(Dispatchers.IO) {
+        val bodyPayload = buildJsonObject { put("content", content) }
+        val bodyJson = json.encodeToString(
+            kotlinx.serialization.json.JsonObject.serializer(),
+            bodyPayload,
+        )
+        put(
+            profileName = profileName,
+            segment = "soul",
+            body = bodyJson,
+            deserializer = ProfileSoulUpdateResponse.serializer(),
+            maxBytesHint = SOUL_MAX_BYTES,
+        )
+    }
+
+    /**
+     * `PUT /api/profiles/{name}/memory/{filename}` with body
+     * `{"content": "..."}`.
+     *
+     * Filenames are validated both locally (by the caller — we expect
+     * `.md` suffix, no traversal) and server-side. A bad filename yields
+     * a 400 from the relay.
+     *
+     * Used for both creating a new memory entry (the relay writes the
+     * file if missing) and updating an existing entry.
+     */
+    suspend fun updateMemoryEntry(
+        profileName: String,
+        filename: String,
+        content: String,
+    ): Result<ProfileMemoryUpdateResponse> = withContext(Dispatchers.IO) {
+        val bodyPayload = buildJsonObject { put("content", content) }
+        val bodyJson = json.encodeToString(
+            kotlinx.serialization.json.JsonObject.serializer(),
+            bodyPayload,
+        )
+        val encodedFilename = URLEncoder.encode(filename, "UTF-8").replace("+", "%20")
+        put(
+            profileName = profileName,
+            segment = "memory/$encodedFilename",
+            body = bodyJson,
+            deserializer = ProfileMemoryUpdateResponse.serializer(),
+            // Memory entries share the same 1MiB ceiling server-side —
+            // no documented difference, so we report the same soft hint
+            // in the error message.
+            maxBytesHint = SOUL_MAX_BYTES,
+        )
+    }
+
+    /**
+     * Shared PUT-body-and-parse path for the two update endpoints
+     * (SOUL + memory). Centralized so we reuse the same URL builder,
+     * session-token plumbing, and error mapping. Kept separate from
+     * [get] rather than generalized over the HTTP method because the
+     * body/response semantics (413, 400 invalid filename) are specific
+     * to the update side.
+     */
+    private suspend fun <T> put(
+        profileName: String,
+        segment: String,
+        body: String,
+        deserializer: kotlinx.serialization.DeserializationStrategy<T>,
+        maxBytesHint: Long = SOUL_MAX_BYTES,
+    ): Result<T> = 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 encodedName = URLEncoder.encode(profileName, "UTF-8").replace("+", "%20")
+
+        val url = try {
+            "$httpBase/api/profiles/$encodedName/$segment".toHttpUrl()
+        } catch (e: IllegalArgumentException) {
+            return@withContext Result.failure(
+                IOException("Invalid relay URL: ${e.message}")
+            )
+        }
+
+        val request = Request.Builder()
+            .url(url)
+            .put(body.toRequestBody(JSON_MEDIA_TYPE))
+            .header("Authorization", "Bearer $sessionToken")
+            .header("Accept", "application/json")
+            .build()
+
+        try {
+            okHttpClient.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) {
+                    val reason = when (response.code) {
+                        400 -> {
+                            // Relay emits 400 for invalid filename or
+                            // malformed JSON. Surface the response body
+                            // when present so the user sees the specific
+                            // validation error.
+                            val bodyText = response.body?.string().orEmpty()
+                            if (bodyText.isNotBlank()) {
+                                "Invalid request: ${extractErrorDetail(bodyText)}"
+                            } else {
+                                "Invalid request"
+                            }
+                        }
+                        401, 403 -> "Unauthorized — re-pair with the relay"
+                        404 -> "Profile '$profileName' not found on relay"
+                        413 -> "Content too large — max ${maxBytesHint / 1024} KiB"
+                        in 500..599 -> "Relay error (HTTP ${response.code})"
+                        else -> "HTTP ${response.code}: ${response.message.ifBlank { "request failed" }}"
+                    }
+                    return@withContext Result.failure(IOException(reason))
+                }
+
+                val bodyText = response.body?.string().orEmpty()
+                if (bodyText.isBlank()) {
+                    return@withContext Result.failure(
+                        IOException("Relay returned an empty response")
+                    )
+                }
+
+                val parsed = try {
+                    json.decodeFromString(deserializer, bodyText)
+                } catch (e: SerializationException) {
+                    return@withContext Result.failure(
+                        IOException("Malformed response from relay: ${e.message ?: "parse error"}")
+                    )
+                }
+                Result.success(parsed)
+            }
+        } catch (e: IOException) {
+            Log.w(TAG, "$segment write failed for $profileName: ${e.message}")
+            Result.failure(e)
+        } catch (e: Exception) {
+            Log.w(TAG, "$segment write unexpected error for $profileName: ${e.message}")
+            Result.failure(e)
+        }
+    }
+
+    /**
+     * `PUT /api/skills/toggle` with body `{"name": "...", "enabled": true/false}`.
+     *
+     * Current relay stubs this out — returns 501 with
+     * `{"error": "skill_toggle_not_implemented", "detail": "..."}`. The
+     * UI uses the distinctive 501 to show a "not supported on this
+     * server" snackbar and ghost out the toggle. When the real
+     * implementation lands server-side, this method needs no change.
+     */
+    suspend fun updateSkillToggle(
+        skillName: String,
+        enabled: Boolean,
+    ): Result<SkillToggleResult> = 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/api/skills/toggle".toHttpUrl()
+        } catch (e: IllegalArgumentException) {
+            return@withContext Result.failure(
+                IOException("Invalid relay URL: ${e.message}")
+            )
+        }
+
+        val payload = buildJsonObject {
+            put("name", skillName)
+            put("enabled", enabled)
+        }
+        val bodyJson = json.encodeToString(
+            kotlinx.serialization.json.JsonObject.serializer(),
+            payload,
+        )
+
+        val request = Request.Builder()
+            .url(url)
+            .put(bodyJson.toRequestBody(JSON_MEDIA_TYPE))
+            .header("Authorization", "Bearer $sessionToken")
+            .header("Accept", "application/json")
+            .build()
+
+        try {
+            okHttpClient.newCall(request).execute().use { response ->
+                when (response.code) {
+                    in 200..299 -> Result.success(SkillToggleResult.Ok)
+                    501 -> Result.success(SkillToggleResult.NotImplemented)
+                    401, 403 -> Result.failure(
+                        IOException("Unauthorized — re-pair with the relay")
+                    )
+                    else -> Result.failure(
+                        IOException("Relay returned HTTP ${response.code}")
+                    )
+                }
+            }
+        } catch (e: IOException) {
+            Log.w(TAG, "skill toggle failed for $skillName: ${e.message}")
+            Result.failure(e)
+        }
+    }
+
+    /**
+     * Capability probe for the skill-toggle endpoint — HEAD / OPTIONS
+     * would be the ideal choice but we need to know specifically if the
+     * server responds 501 vs 200, which is only visible on PUT. We
+     * send a no-op PUT with `enabled = true` against a placeholder
+     * skill name that the server treats as a probe ping — relays that
+     * implement the endpoint accept it; stubbed relays return 501.
+     *
+     * In practice we don't want this probe to have side effects, so we
+     * use the HTTP OPTIONS verb instead and treat a 501 response as
+     * "not implemented" and any 2xx as "supported". The relay serves
+     * OPTIONS via aiohttp's CORS handling by default.
+     */
+    suspend fun probeSkillToggleSupported(): Boolean = withContext(Dispatchers.IO) {
+        val relayUrl = relayUrlProvider()?.trim().orEmpty()
+        if (relayUrl.isEmpty()) return@withContext false
+        val sessionToken = sessionTokenProvider() ?: return@withContext false
+
+        val httpBase = relayUrl
+            .replace(Regex("^wss://", RegexOption.IGNORE_CASE), "https://")
+            .replace(Regex("^ws://", RegexOption.IGNORE_CASE), "http://")
+            .trimEnd('/')
+
+        val url = try {
+            "$httpBase/api/skills/toggle".toHttpUrl()
+        } catch (_: IllegalArgumentException) {
+            return@withContext false
+        }
+
+        // OPTIONS probe. Relays that don't mount the handler return 404
+        // or the default 405 method-not-allowed; stubbed-implementation
+        // relays return 501 from the PUT handler but allow OPTIONS.
+        // A 2xx/3xx OPTIONS does NOT confirm PUT works (the server
+        // might still 501 on the real call), so a successful OPTIONS
+        // here means "worth trying". A 501 response on OPTIONS (rare)
+        // is definitive "not supported".
+        val request = Request.Builder()
+            .url(url)
+            .method("OPTIONS", null)
+            .header("Authorization", "Bearer $sessionToken")
+            .build()
+
+        try {
+            okHttpClient.newCall(request).execute().use { response ->
+                when (response.code) {
+                    501 -> false
+                    404, 405 -> false
+                    // 401/403 — we don't know; default to true (don't
+                    // ghost the toggle over an auth problem, let the
+                    // PUT fail and snackbar through the normal path).
+                    401, 403 -> true
+                    else -> response.isSuccessful
+                }
+            }
+        } catch (_: IOException) {
+            // Network / offline — assume supported; PUT will surface
+            // the real failure.
+            true
+        }
+    }
+
+    /**
+     * Result of a skill-toggle PUT. Kept as a small sealed class so
+     * the caller can distinguish "server accepted it" from "server
+     * answered 501 — not implemented yet" without inventing magic
+     * error strings.
+     */
+    sealed class SkillToggleResult {
+        data object Ok : SkillToggleResult()
+        data object NotImplemented : SkillToggleResult()
+    }
+
+    /**
+     * Best-effort pull of a `detail` or `error` string out of a relay
+     * 400 body. Falls back to the first 120 chars of the payload when
+     * the response isn't JSON-shaped.
+     */
+    private fun extractErrorDetail(body: String): String {
+        return try {
+            val obj = json.parseToJsonElement(body) as? kotlinx.serialization.json.JsonObject
+                ?: return body.take(120)
+            val detail = (obj["detail"] as? kotlinx.serialization.json.JsonPrimitive)?.content
+            val error = (obj["error"] as? kotlinx.serialization.json.JsonPrimitive)?.content
+            detail ?: error ?: body.take(120)
+        } catch (_: Exception) {
+            body.take(120)
+        }
+    }
+
+    /**
+     * Shared GET-and-parse path for all four endpoints. Centralizing here
+     * keeps the error-mapping consistent (404 profile-not-found, 401
+     * re-pair, 5xx server error, etc.) without four near-identical copies.
+     */
+    private suspend fun <T> get(
+        profileName: String,
+        segment: String,
+        deserializer: kotlinx.serialization.DeserializationStrategy<T>,
+    ): Result<T> = 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('/')
+
+        // Percent-encode the profile name for splicing into the path —
+        // profile names are typically ASCII identifiers but nothing
+        // structurally forbids spaces or non-ASCII.
+        // URLEncoder encodes spaces as `+` which is wrong for paths; swap
+        // back to `%20` after encoding.
+        val encodedName = URLEncoder.encode(profileName, "UTF-8").replace("+", "%20")
+
+        val url = try {
+            "$httpBase/api/profiles/$encodedName/$segment".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()
+
+        try {
+            okHttpClient.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) {
+                    val reason = when (response.code) {
+                        401, 403 -> "Unauthorized — re-pair with the relay"
+                        404 -> "Profile '$profileName' not found on 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("Relay returned an empty response")
+                    )
+                }
+
+                val parsed = try {
+                    json.decodeFromString(deserializer, body)
+                } catch (e: SerializationException) {
+                    return@withContext Result.failure(
+                        IOException("Malformed response from relay: ${e.message ?: "parse error"}")
+                    )
+                }
+                Result.success(parsed)
+            }
+        } catch (e: IOException) {
+            Log.w(TAG, "$segment fetch failed for $profileName: ${e.message}")
+            Result.failure(e)
+        } catch (e: Exception) {
+            Log.w(TAG, "$segment fetch unexpected error for $profileName: ${e.message}")
+            Result.failure(e)
+        }
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.hermesandroid.relay.network
+
+import java.net.URI
+
+/**
+ * Derives the conventional Hermes-Relay WSS/WS URL from a Hermes API URL.
+ *
+ * Hermes API and Relay are separate processes, but normal installs expose
+ * them on the same host with API on 8642 and Relay on 8767. Keeping this
+ * logic centralized lets setup flows treat the Relay URL as "Auto" by
+ * default while still allowing a manual override for custom reverse proxies.
+ */
+object RelayUrlDeriver {
+    const val DEFAULT_RELAY_PORT: Int = 8767
+
+    fun deriveFromApiUrl(apiUrl: String, relayPort: Int = DEFAULT_RELAY_PORT): String? {
+        val trimmed = apiUrl.trim().trimEnd('/')
+        if (trimmed.isEmpty()) return null
+
+        val uri = runCatching { URI(trimmed) }.getOrNull() ?: return null
+        val relayScheme = when (uri.scheme?.lowercase()) {
+            "http" -> "ws"
+            "https" -> "wss"
+            else -> return null
+        }
+        val host = uri.host?.takeIf { it.isNotBlank() } ?: return null
+        val hostPart = if (host.contains(":") && !host.startsWith("[")) {
+            "[$host]"
+        } else {
+            host
+        }
+        return "$relayScheme://$hostPart:$relayPort"
+    }
+
+    fun isAutoManagedRelayUrl(relayUrl: String, apiUrl: String): Boolean {
+        val trimmed = relayUrl.trim().trimEnd('/')
+        if (trimmed.isEmpty()) return true
+        if (isDefaultLocalRelayUrl(trimmed)) return true
+
+        val derived = deriveFromApiUrl(apiUrl) ?: return false
+        return trimmed.equals(derived, ignoreCase = true)
+    }
+
+    private fun isDefaultLocalRelayUrl(relayUrl: String): Boolean {
+        val uri = runCatching { URI(relayUrl.trim()) }.getOrNull() ?: return false
+        val scheme = uri.scheme?.lowercase()
+        if (scheme != "ws" && scheme != "wss") return false
+        val host = uri.host?.lowercase() ?: return false
+        val port = if (uri.port == -1) {
+            when (scheme) {
+                "ws" -> 80
+                "wss" -> 443
+                else -> -1
+            }
+        } else {
+            uri.port
+        }
+        return port == DEFAULT_RELAY_PORT &&
+            (host == "localhost" || host == "127.0.0.1" || host == "::1")
+    }
+}

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

@@ -0,0 +1,296 @@
+package com.hermesandroid.relay.network
+
+import android.content.Context
+import com.hermesandroid.relay.data.VoiceAudioRoute
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.contentOrNull
+import kotlinx.serialization.json.put
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.Response
+import java.io.File
+import java.io.IOException
+import java.util.Base64
+import java.util.concurrent.TimeUnit
+
+interface VoiceAudioClient {
+    val route: VoiceAudioRoute
+    suspend fun transcribe(audioFile: File): Result<String>
+    suspend fun synthesize(text: String): Result<File>
+}
+
+class RelayVoiceAudioClientAdapter(
+    private val relayVoiceClient: RelayVoiceClient,
+) : VoiceAudioClient {
+    override val route: VoiceAudioRoute = VoiceAudioRoute.Relay
+
+    override suspend fun transcribe(audioFile: File): Result<String> =
+        relayVoiceClient.transcribe(audioFile)
+
+    override suspend fun synthesize(text: String): Result<File> =
+        relayVoiceClient.synthesize(text)
+}
+
+/**
+ * Routes each STT/TTS call to the Standard (dashboard) or Relay voice client.
+ *
+ * Auto preference order is **Relay first, then Standard**: a paired Relay is
+ * the purpose-built mobile facade — profile-aware voice config, no dashboard
+ * sign-in dependency — so users who installed the plugin keep the richer
+ * path. Standard is the zero-plugin route for vanilla Hermes installs and is
+ * used whenever Relay isn't configured/paired (or fails mid-call). Power
+ * users can force either route in Voice Settings.
+ */
+class AutoVoiceAudioClient(
+    private val standardClient: VoiceAudioClient,
+    private val relayClient: VoiceAudioClient,
+    private val routeProvider: () -> VoiceAudioRoute,
+    private val standardReadyProvider: () -> Boolean,
+    private val relayReadyProvider: () -> Boolean,
+) : VoiceAudioClient {
+    override val route: VoiceAudioRoute
+        get() = routeProvider()
+
+    override suspend fun transcribe(audioFile: File): Result<String> =
+        runWithSelectedRoute { it.transcribe(audioFile) }
+
+    override suspend fun synthesize(text: String): Result<File> =
+        runWithSelectedRoute { it.synthesize(text) }
+
+    private suspend fun <T> runWithSelectedRoute(
+        block: suspend (VoiceAudioClient) -> Result<T>,
+    ): Result<T> {
+        return when (routeProvider()) {
+            VoiceAudioRoute.Standard -> {
+                if (!standardReadyProvider()) {
+                    Result.failure(
+                        IllegalStateException(
+                            "Standard Hermes voice is not available — check dashboard sign-in in Manage",
+                        ),
+                    )
+                } else {
+                    block(standardClient)
+                }
+            }
+            VoiceAudioRoute.Relay -> {
+                if (!relayReadyProvider()) {
+                    Result.failure(IllegalStateException("Relay voice is not available"))
+                } else {
+                    block(relayClient)
+                }
+            }
+            VoiceAudioRoute.Auto -> runAuto(block)
+        }
+    }
+
+    private suspend fun <T> runAuto(
+        block: suspend (VoiceAudioClient) -> Result<T>,
+    ): Result<T> {
+        var relayFailure: Result<T>? = null
+        if (relayReadyProvider()) {
+            val result = block(relayClient)
+            if (result.isSuccess || !standardReadyProvider()) return result
+            relayFailure = result
+        }
+        if (standardReadyProvider()) {
+            val result = block(standardClient)
+            if (result.isSuccess) return result
+            return relayFailure ?: result
+        }
+        return relayFailure ?: Result.failure(
+            IllegalStateException("Voice needs a reachable Hermes dashboard or Relay voice route"),
+        )
+    }
+}
+
+/**
+ * Standard (no-plugin) voice client — speaks the upstream **dashboard web
+ * server** contract that hermes-desktop's voice mode uses:
+ *
+ *   POST {dashboard}/api/audio/transcribe  {data_url, mime_type} → {ok, transcript}
+ *   POST {dashboard}/api/audio/speak       {text}                → {ok, data_url, mime_type}
+ *
+ * These routes live on `hermes_cli/web_server.py` (:9119 by convention), NOT
+ * on the API server (:8642) — current upstream api_server advertises
+ * `audio_api: false` and registers no audio routes. Auth is the dashboard
+ * cookie session (gated_auth_middleware), so [okHttpClient] must carry the
+ * same per-connection cookie jar the Manage tab signs in with; an API bearer
+ * header is meaningless on this surface. Revisit when upstream PR #8199
+ * lands the `/v1/audio` routes on the API server (docs/upstream-contributions.md §6).
+ * (No glob spellings in block comments — Kotlin block comments nest.)
+ */
+class StandardHermesVoiceClient(
+    private val context: Context,
+    private val okHttpClient: OkHttpClient,
+    private val dashboardUrlProvider: () -> String?,
+    private val json: Json = Json {
+        ignoreUnknownKeys = true
+        isLenient = true
+        coerceInputValues = true
+    },
+) : VoiceAudioClient {
+    override val route: VoiceAudioRoute = VoiceAudioRoute.Standard
+
+    private val callClient: OkHttpClient =
+        okHttpClient.newBuilder()
+            .callTimeout(90, TimeUnit.SECONDS)
+            .build()
+
+    override suspend fun transcribe(audioFile: File): Result<String> = withContext(Dispatchers.IO) {
+        val baseUrl = dashboardBaseUrl()
+            ?: return@withContext Result.failure(IllegalStateException("Hermes dashboard URL not configured"))
+        if (!audioFile.exists() || audioFile.length() == 0L) {
+            return@withContext Result.failure(IOException("Audio file missing or empty: ${audioFile.name}"))
+        }
+
+        val dataUrl = buildAudioDataUrl(audioFile)
+        val payload = buildJsonObject {
+            put("data_url", dataUrl)
+            put("mime_type", mediaTypeForAudioFile(audioFile))
+        }
+        val request = Request.Builder()
+            .url("$baseUrl/api/audio/transcribe")
+            .post(json.encodeToString(JsonObject.serializer(), payload).toRequestBody(JSON_MEDIA))
+            .header("Accept", "application/json")
+            .build()
+
+        executeJson(request, "Hermes audio transcribe").mapCatching { root ->
+            val transcript = root.stringField("transcript")
+                ?: root.stringField("text")
+                ?: root.stringField("message")
+            if (transcript.isNullOrBlank()) {
+                throw IOException("Hermes audio transcribe returned an empty transcript")
+            }
+            transcript
+        }
+    }
+
+    override suspend fun synthesize(text: String): Result<File> = withContext(Dispatchers.IO) {
+        val baseUrl = dashboardBaseUrl()
+            ?: return@withContext Result.failure(IllegalStateException("Hermes dashboard URL not configured"))
+        val cleanText = text.trim()
+        if (cleanText.isBlank()) {
+            return@withContext Result.failure(IllegalArgumentException("Cannot synthesize blank text"))
+        }
+
+        val payload = buildJsonObject { put("text", cleanText) }
+        val request = Request.Builder()
+            .url("$baseUrl/api/audio/speak")
+            .post(json.encodeToString(JsonObject.serializer(), payload).toRequestBody(JSON_MEDIA))
+            .header("Accept", "application/json")
+            .build()
+
+        executeJson(request, "Hermes audio speak").mapCatching { root ->
+            val dataUrl = root.stringField("data_url") ?: root.stringField("dataUrl")
+            if (dataUrl.isNullOrBlank()) {
+                throw IOException("Hermes audio speak returned no audio")
+            }
+            val mimeType = root.stringField("mime_type")
+                ?: root.stringField("mimeType")
+                ?: mimeTypeFromDataUrl(dataUrl)
+                ?: "audio/mpeg"
+            val bytes = decodeDataUrl(dataUrl)
+            if (bytes.isEmpty()) throw IOException("Hermes audio speak returned empty audio")
+
+            val extension = extensionForMimeType(mimeType)
+            File(context.cacheDir, "hermes_voice_${System.currentTimeMillis()}.$extension")
+                .also { it.writeBytes(bytes) }
+        }
+    }
+
+    private fun dashboardBaseUrl(): String? =
+        dashboardUrlProvider()?.trim()?.trimEnd('/')?.takeIf { it.isNotBlank() }
+
+    private fun executeJson(request: Request, operation: String): Result<JsonObject> {
+        return try {
+            callClient.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) {
+                    return Result.failure(apiFailure(response, operation))
+                }
+                val body = response.body.string()
+                if (body.isBlank()) {
+                    return Result.failure(IOException("$operation returned an empty response"))
+                }
+                val root = json.decodeFromString<JsonObject>(body)
+                val ok = (root["ok"] as? JsonPrimitive)?.contentOrNull
+                    ?.toBooleanStrictOrNull()
+                if (ok == false) {
+                    val message = root.stringField("message")
+                        ?: root.stringField("error")
+                        ?: "$operation failed"
+                    return Result.failure(IOException(message))
+                }
+                Result.success(root)
+            }
+        } catch (e: IOException) {
+            Result.failure(IOException("$operation failed: ${e.message ?: "network error"}", e))
+        } catch (e: Exception) {
+            Result.failure(IOException("$operation failed: ${e.message ?: "parse error"}", e))
+        }
+    }
+
+    private fun apiFailure(response: Response, operation: String): IOException {
+        val body = runCatching { response.body.string() }.getOrDefault("")
+        val detail = body.takeIf { it.isNotBlank() } ?: response.message
+        val message = when (response.code) {
+            401, 403 -> "$operation needs dashboard sign-in - open Manage to sign in"
+            404 -> "$operation unavailable on this Hermes build - update hermes-agent or use Relay"
+            in 500..599 -> "$operation failed - server error HTTP ${response.code}"
+            else -> "$operation failed - HTTP ${response.code}: $detail"
+        }
+        return IOException(message)
+    }
+
+    private fun buildAudioDataUrl(audioFile: File): String {
+        val mimeType = mediaTypeForAudioFile(audioFile)
+        val encoded = Base64.getEncoder().encodeToString(audioFile.readBytes())
+        return "data:$mimeType;base64,$encoded"
+    }
+
+    private fun mediaTypeForAudioFile(file: File): String =
+        when (file.extension.lowercase()) {
+            "wav" -> "audio/wav"
+            "m4a", "mp4" -> "audio/mp4"
+            "mp3" -> "audio/mpeg"
+            "ogg" -> "audio/ogg"
+            "webm" -> "audio/webm"
+            else -> "application/octet-stream"
+        }
+
+    private fun decodeDataUrl(dataUrl: String): ByteArray {
+        val comma = dataUrl.indexOf(',')
+        val payload = if (comma >= 0) dataUrl.substring(comma + 1) else dataUrl
+        return Base64.getDecoder().decode(payload)
+    }
+
+    private fun mimeTypeFromDataUrl(dataUrl: String): String? {
+        if (!dataUrl.startsWith("data:", ignoreCase = true)) return null
+        val semi = dataUrl.indexOf(';')
+        if (semi <= "data:".length) return null
+        return dataUrl.substring("data:".length, semi).takeIf { it.isNotBlank() }
+    }
+
+    private fun extensionForMimeType(mimeType: String): String =
+        when (mimeType.lowercase().substringBefore(';')) {
+            "audio/wav", "audio/wave", "audio/x-wav" -> "wav"
+            "audio/mp4", "audio/aac", "audio/m4a" -> "m4a"
+            "audio/ogg" -> "ogg"
+            "audio/webm" -> "webm"
+            else -> "mp3"
+        }
+
+    private fun JsonObject.stringField(name: String): String? =
+        ((this[name] as? JsonPrimitive)?.contentOrNull)?.trim()?.takeIf { it.isNotBlank() }
+
+    private companion object {
+        val JSON_MEDIA = "application/json".toMediaType()
+    }
+}

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

@@ -1,6 +1,9 @@
 package com.hermesandroid.relay.network.handlers
 
+import android.content.ActivityNotFoundException
+import android.content.ClipData
 import android.content.Intent
+import android.net.Uri
 import android.util.Log
 import com.hermesandroid.relay.accessibility.ActionExecutor
 import com.hermesandroid.relay.accessibility.HermesAccessibilityService
@@ -21,15 +24,20 @@ import kotlinx.serialization.json.booleanOrNull
 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.util.MediaCacheWriter
 import kotlin.coroutines.AbstractCoroutineContextElement
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.coroutineContext
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.add
 import kotlinx.serialization.json.buildJsonArray
 import kotlinx.serialization.json.buildJsonObject
@@ -103,6 +111,10 @@ import kotlinx.serialization.json.contentOrNull
  *  - `/setup` → 200 no-op (host-side helper, phone has no setup work)
  *  - `/clipboard` (GET) → returns `{text: "..."}` (empty string = nothing copied)
  *  - `/clipboard` (POST) body `{text}` → returns `{success: true}`
+ *  - `/share_media` body `{attachments?, media?, path?, text?, package?}` →
+ *    launches Android's native share UI with FileProvider `content://` URIs
+ *  - `/send_mms` body `{to, body?, attachments?, media?, path?, package?}` →
+ *    opens a user-mediated MMS compose/share handoff
  *  - `/describe_node` body `{nodeId}` — A4: full property bag for a node
  *
  * # nodeId semantics (A4)
@@ -115,18 +127,23 @@ import kotlinx.serialization.json.contentOrNull
  * contract documented on the Python `android_tap` / `android_scroll` tools.
  * A non-resolvable nodeId returns a 404-style error envelope.
  *
- * # Master enable gate
+ * # Device Control gate
  *
- * Before dispatching any action we check
+ * The Google Play flavor ships Bridge Core without AccessibilityService or
+ * Device Control. It answers harmless bridge liveness/status probes above
+ * the dispatch layer, but any command that reaches Device Control fails closed
+ * before touching [HermesAccessibilityService]. The sideload flavor then checks
  * [HermesAccessibilityService.instance] — if the user hasn't enabled the
- * service in Android Settings, we fail fast with status 503. If the
- * service is running but the soft master toggle is off we fail with 403
- * and a body explaining that Bridge is disabled in the app.
+ * service in Android Settings, we fail fast with status 503. If the service is
+ * running but the soft master toggle is off we fail with 403 and a body
+ * explaining that Bridge is disabled in the app.
  */
 class BridgeCommandHandler(
     private val multiplexer: ChannelMultiplexer,
     private val scope: CoroutineScope,
     private val screenCapture: ScreenCapture? = null,
+    private val relayHttpClient: RelayHttpClient? = null,
+    private val mediaCacheWriter: MediaCacheWriter? = null,
     // === PHASE3-safety-rails: safety enforcement ===
     // Safety manager is optional so older tests that construct this handler
     // without the full DI graph still compile; in production ConnectionViewModel
@@ -207,14 +224,15 @@ class BridgeCommandHandler(
     //
     // Intentionally narrow — only commands that are PRIMARILY about
     // launching / switching to another app. /send_sms on sideload uses
-    // SmsManager and doesn't shift foreground; it does on googlePlay
-    // where the tool falls back to opening Messages, but that's already
-    // covered by android_send_sms's own `android_return_to_hermes`
-    // prompting in plugin/android_tool.py. Keep the allowlist minimal
-    // and extend only when a concrete need surfaces.
+    // SmsManager and doesn't shift foreground. /share_media and /send_mms
+    // intentionally open native Android share/compose surfaces, so they
+    // participate in the same auto-return bookkeeping as /open_app and
+    // /send_intent.
     private val foregroundShiftingPaths: Set<String> = setOf(
         "/open_app",
         "/send_intent",
+        "/share_media",
+        "/send_mms",
     )
 
     private data class PendingActivity(
@@ -224,6 +242,19 @@ class BridgeCommandHandler(
         val timestampMs: Long,
     )
 
+    private data class ShareAttachmentRef(
+        val media: String? = null,
+        val path: String? = null,
+        val contentType: String? = null,
+        val fileName: String? = null,
+    )
+
+    private data class CachedShareAttachment(
+        val uri: Uri,
+        val contentType: String,
+        val fileName: String?,
+    )
+
     private val pendingActivities =
         java.util.concurrent.ConcurrentHashMap<String, PendingActivity>()
     // === END v0.4.1 polish ===
@@ -500,6 +531,28 @@ class BridgeCommandHandler(
             return
         }
 
+        if (!BuildFlavor.isSideload) {
+            respond(
+                requestId, 403,
+                buildJsonObject {
+                    put(
+                        "error",
+                        "Device Control is not included in the Google Play build " +
+                            "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, " +
+                            "typing, screenshots, SMS, calls, or unattended " +
+                            "phone control. Install the sideload build for " +
+                            "Device Control.",
+                    )
+                    put("error_code", "device_control_sideload_only")
+                    put("flavor", "googlePlay")
+                }
+            )
+            return
+        }
+
         val service = HermesAccessibilityService.instance
             ?: return respond(
                 requestId, 503,
@@ -648,57 +701,6 @@ class BridgeCommandHandler(
         }
         // === END v0.4.1 unattended-access ===
 
-        // === Google Play flavor route gate ===
-        // The googlePlay build's AccessibilityService config declares a
-        // narrow use case ("read notifications, summarize messages") with
-        // NO gesture dispatch (canPerformGestures is absent) and NO
-        // flagRetrieveInteractiveWindows. Only READ-ONLY routes that
-        // match this declared scope are whitelisted; everything else
-        // returns a 403 so reviewers tracing the code see a capability
-        // surface that matches the manifest declaration.
-        //
-        // The whitelist is FAIL-CLOSED: any new route we add to the when
-        // block below defaults to sideload-only on the Play flavor unless
-        // explicitly added here. This prevents future routes from
-        // accidentally widening the Play APK's capability surface.
-        //
-        // Early-return routes (/ping, /events, /setup) are above this
-        // point so they work on both flavors — they're harmless liveness
-        // probes and don't need the a11y service. /return_to_hermes is
-        // whitelisted because it only foregrounds our OWN app (not a
-        // phone-control action). /clipboard is whitelisted for GET
-        // (read-only); POST (write) is gated inside the /clipboard case.
-        if (!BuildFlavor.isSideload) {
-            val playAllowed = setOf(
-                "/current_app",
-                "/screen",
-                "/get_apps",
-                "/apps",
-                "/clipboard",
-                "/return_to_hermes",
-            )
-            if (path !in playAllowed) {
-                respond(
-                    requestId, 403,
-                    buildJsonObject {
-                        put(
-                            "error",
-                            "This bridge route ($path) is only available on the " +
-                                "sideload flavor of Hermes Relay. The Google Play " +
-                                "build supports read-only bridge operations (screen " +
-                                "reading, app status, clipboard read) but not " +
-                                "phone-control actions (tap, type, swipe, SMS, call). " +
-                                "Install the sideload APK for full phone control.",
-                        )
-                        put("error_code", "sideload_only")
-                        put("flavor", "googlePlay")
-                    }
-                )
-                return
-            }
-        }
-        // === END Google Play flavor route gate ===
-
         val executor = service.actionExecutor
 
         when (path) {
@@ -815,9 +817,8 @@ class BridgeCommandHandler(
             // 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
-            // apps. The phone knows its own package name via service — no
-            // parameter needed, works transparently on both sideload and
-            // googlePlay flavors.
+            // apps. The sideload phone knows its own package name via the
+            // accessibility service, so no parameter is needed.
             //
             // Allowed even when the master toggle is off: returning focus
             // to our own app isn't a destructive action, and this tool
@@ -1325,6 +1326,9 @@ class BridgeCommandHandler(
                         requestId, 400,
                         buildJsonObject {
                             put("error", "missing 'to' or 'body' in body")
+                            put("status", "failed")
+                            put("reason", "invalid_schema")
+                            put("expected_schema", "{ \"to\": \"<phone>\", \"body\": \"<text>\" }")
                         }
                     )
                     return
@@ -1340,6 +1344,8 @@ class BridgeCommandHandler(
                         requestId, 503,
                         buildJsonObject {
                             put("error", "safety manager not initialized — refusing destructive action")
+                            put("status", "failed")
+                            put("reason", "safety_manager_missing")
                         }
                     )
                     return
@@ -1358,6 +1364,70 @@ class BridgeCommandHandler(
                 }
                 respondFromResult(requestId, executor.sendSms(to, smsBody))
             }
+
+            "/share_media", "/send_mms" -> {
+                if (!BuildFlavor.isSideload) {
+                    respond(
+                        requestId, 403,
+                        buildJsonObject {
+                            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")
+                        }
+                    )
+                    return
+                }
+                if (safetyManager == null) {
+                    respond(
+                        requestId, 503,
+                        buildJsonObject {
+                            put("error", "safety manager not initialized — refusing media share action")
+                            put("status", "failed")
+                            put("reason", "safety_manager_missing")
+                        }
+                    )
+                    return
+                }
+                val targetPkg = body["package"]?.jsonPrimitive?.contentOrNull
+                val targetAllowed = safetyManager.checkPackageAllowed(targetPkg)
+                if (!targetAllowed) {
+                    respond(
+                        requestId, 403,
+                        buildJsonObject {
+                            put("error", "blocked package ${targetPkg ?: "unknown"}")
+                            put("status", "blocked")
+                            put("reason", "blocked_package")
+                        }
+                    )
+                    return
+                }
+
+                val attachmentCount = extractShareAttachmentRefs(body).size
+                val to = body["to"]?.jsonPrimitive?.contentOrNull.orEmpty()
+                val text = body["text"]?.jsonPrimitive?.contentOrNull
+                    ?: body["body"]?.jsonPrimitive?.contentOrNull
+                    ?: ""
+                val confirmText = if (path == "/send_mms") {
+                    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?"
+                } else {
+                    "Share text from Hermes Relay?"
+                }
+                val allowed = safetyManager.awaitConfirmation(path, confirmText)
+                if (!allowed) {
+                    respond(
+                        requestId, 403,
+                        userDeniedResponse(
+                            "The user denied the media share action via the " +
+                                "on-device confirmation modal.",
+                        )
+                    )
+                    return
+                }
+                respondFromResult(requestId, shareMediaFromBody(path, body, service))
+            }
             // === END PHASE3-tier-C ===
 
             "/screen" -> {
@@ -1623,6 +1693,303 @@ class BridgeCommandHandler(
         return if (out.isEmpty()) null else out
     }
 
+    private fun extractShareAttachmentRefs(body: JsonObject): List<ShareAttachmentRef> {
+        val refs = mutableListOf<ShareAttachmentRef>()
+
+        fun stringField(obj: JsonObject, key: String): String? =
+            (obj[key] as? JsonPrimitive)?.contentOrNull
+
+        fun stringValue(element: JsonElement): String? =
+            (element as? JsonPrimitive)?.contentOrNull
+
+        fun addRef(
+            media: String? = null,
+            path: String? = null,
+            contentType: String? = null,
+            fileName: String? = null,
+        ) {
+            val normalizedMedia = media?.trim()?.takeIf { it.isNotBlank() }
+            val normalizedPath = path?.trim()?.takeIf { it.isNotBlank() }
+            if (normalizedMedia == null && normalizedPath == null) return
+            refs.add(
+                ShareAttachmentRef(
+                    media = normalizedMedia,
+                    path = normalizedPath,
+                    contentType = contentType?.trim()?.takeIf { it.isNotBlank() },
+                    fileName = fileName?.trim()?.takeIf { it.isNotBlank() },
+                )
+            )
+        }
+
+        val contentType = stringField(body, "content_type")
+        val fileName = stringField(body, "file_name")
+        addRef(path = stringField(body, "path"), contentType = contentType, fileName = fileName)
+        addRef(media = stringField(body, "media"), contentType = contentType, fileName = fileName)
+        addRef(media = stringField(body, "media_token"), contentType = contentType, fileName = fileName)
+
+        (body["paths"] as? JsonArray)?.forEach { element ->
+            addRef(path = stringValue(element))
+        }
+        (body["media_tokens"] as? JsonArray)?.forEach { element ->
+            addRef(media = stringValue(element))
+        }
+        (body["attachments"] as? JsonArray)?.forEach { element: JsonElement ->
+            val obj = element as? JsonObject ?: return@forEach
+            val refContentType = stringField(obj, "content_type")
+            val refFileName = stringField(obj, "file_name")
+            val media = stringField(obj, "media")
+                ?: stringField(obj, "media_token")
+                ?: stringField(obj, "token")
+            addRef(
+                media = media,
+                path = stringField(obj, "path"),
+                contentType = refContentType,
+                fileName = refFileName,
+            )
+        }
+
+        return refs
+    }
+
+    private suspend fun shareMediaFromBody(
+        path: String,
+        body: JsonObject,
+        service: HermesAccessibilityService,
+    ): ActionExecutor.ActionResult {
+        val isMms = path == "/send_mms"
+        fun stringField(key: String): String? =
+            (body[key] as? JsonPrimitive)?.contentOrNull
+
+        val to = stringField("to").orEmpty()
+        val text = stringField("text")
+            ?: stringField("body")
+            ?: ""
+        val title = stringField("title")
+            ?: if (isMms) "Send MMS" else "Share with"
+        val explicitTargetPkg = stringField("package")
+            ?.trim()
+            ?.takeIf { it.isNotBlank() }
+
+        if (isMms && to.isBlank()) {
+            return ActionExecutor.ActionResult.failure(
+                "send_mms requires non-blank 'to'",
+                mapOf("status" to "failed", "reason" to "invalid_schema"),
+            )
+        }
+
+        val attachmentRefs = extractShareAttachmentRefs(body)
+        if (attachmentRefs.isEmpty() && text.isBlank()) {
+            return ActionExecutor.ActionResult.failure(
+                "$path requires at least one attachment or non-blank text",
+                mapOf("status" to "failed", "reason" to "invalid_schema"),
+            )
+        }
+
+        val cached = mutableListOf<CachedShareAttachment>()
+        if (attachmentRefs.isNotEmpty()) {
+            val client = relayHttpClient
+                ?: return ActionExecutor.ActionResult.failure(
+                    "relay HTTP client not initialized — cannot fetch media",
+                    mapOf("status" to "failed", "reason" to "relay_http_client_missing"),
+                )
+            val writer = mediaCacheWriter
+                ?: return ActionExecutor.ActionResult.failure(
+                    "media cache writer not initialized — cannot prepare attachment",
+                    mapOf("status" to "failed", "reason" to "media_cache_writer_missing"),
+                )
+
+            for (ref in attachmentRefs) {
+                val fetchResult = fetchShareAttachment(client, ref)
+                if (fetchResult.isFailure) {
+                    return ActionExecutor.ActionResult.failure(
+                        fetchResult.exceptionOrNull()?.message ?: "media fetch failed",
+                        mapOf("status" to "failed", "reason" to "media_fetch_failed"),
+                    )
+                }
+                val fetched = fetchResult.getOrThrow()
+                val contentType = ref.contentType
+                    ?: fetched.contentType.takeIf { it.isNotBlank() }
+                    ?: "application/octet-stream"
+                val fileName = ref.fileName ?: fetched.fileName
+                val uri = runCatching {
+                    writer.cache(fetched.bytes, contentType, fileName)
+                }.getOrElse { t ->
+                    return ActionExecutor.ActionResult.failure(
+                        "media cache failed: ${t.message}",
+                        mapOf("status" to "failed", "reason" to "media_cache_failed"),
+                    )
+                }
+                cached.add(
+                    CachedShareAttachment(
+                        uri = uri,
+                        contentType = contentType,
+                        fileName = fileName,
+                    )
+                )
+            }
+        }
+
+        val targetPkg = explicitTargetPkg
+            ?: if (isMms) {
+                runCatching {
+                    android.provider.Telephony.Sms.getDefaultSmsPackage(service)
+                }.getOrNull()
+            } else {
+                null
+            }
+
+        val intent = buildShareIntent(
+            isMms = isMms,
+            to = to,
+            text = text,
+            attachments = cached,
+            targetPkg = targetPkg,
+        )
+
+        val launchIntent = if (targetPkg.isNullOrBlank()) {
+            Intent.createChooser(intent, title).apply {
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                intent.clipData?.let { clipData = it }
+            }
+        } else {
+            intent
+        }
+
+        return try {
+            withContext(Dispatchers.Main) {
+                service.applicationContext.startActivity(launchIntent)
+            }
+            ActionExecutor.ActionResult.ok(
+                mapOf(
+                    "ok" to true,
+                    "status" to if (isMms) "compose_opened" else "share_opened",
+                    "mode" to if (isMms) "user_confirmed_mms_handoff" else "user_confirmed_share",
+                    "to" to if (isMms) to else null,
+                    "attachments" to cached.size,
+                    "content_types" to cached.map { it.contentType },
+                    "package" to targetPkg,
+                    "summary" to if (isMms) {
+                        "Opened MMS compose for $to with ${cached.size} attachment(s)"
+                    } else {
+                        "Opened share UI with ${cached.size} attachment(s)"
+                    },
+                )
+            )
+        } catch (e: ActivityNotFoundException) {
+            ActionExecutor.ActionResult.failure(
+                "No Android app can handle this ${if (isMms) "MMS" else "share"} request",
+                mapOf("status" to "failed", "reason" to "activity_not_found"),
+            )
+        } catch (e: SecurityException) {
+            ActionExecutor.ActionResult.failure(
+                "Android denied attachment URI grant: ${e.message}",
+                mapOf("status" to "failed", "reason" to "uri_permission_denied"),
+            )
+        } catch (t: Throwable) {
+            ActionExecutor.ActionResult.failure(
+                "share launch failed: ${t.message}",
+                mapOf("status" to "failed", "reason" to "android_exception"),
+            )
+        }
+    }
+
+    private suspend fun fetchShareAttachment(
+        client: RelayHttpClient,
+        ref: ShareAttachmentRef,
+    ): Result<RelayHttpClient.FetchedMedia> {
+        val media = ref.media?.trim().orEmpty()
+        val path = ref.path?.trim().orEmpty()
+        return when {
+            media.startsWith("MEDIA:hermes-relay://") -> {
+                client.fetchMedia(media.removePrefix("MEDIA:hermes-relay://"))
+            }
+            media.startsWith("hermes-relay://") -> {
+                client.fetchMedia(media.removePrefix("hermes-relay://"))
+            }
+            media.startsWith("MEDIA:/") || media.startsWith("MEDIA:\\") -> {
+                client.fetchMediaByPath(media.removePrefix("MEDIA:"), ref.contentType)
+            }
+            media.startsWith("MEDIA:") -> {
+                client.fetchMedia(media.removePrefix("MEDIA:"))
+            }
+            media.isNotBlank() -> client.fetchMedia(media)
+            path.isNotBlank() -> client.fetchMediaByPath(path, ref.contentType)
+            else -> Result.failure(IllegalArgumentException("attachment missing media token or path"))
+        }
+    }
+
+    private fun buildShareIntent(
+        isMms: Boolean,
+        to: String,
+        text: String,
+        attachments: List<CachedShareAttachment>,
+        targetPkg: String?,
+    ): Intent {
+        val intent = when {
+            isMms && attachments.isEmpty() -> Intent(Intent.ACTION_SENDTO, Uri.parse("smsto:$to"))
+            attachments.size > 1 -> Intent(Intent.ACTION_SEND_MULTIPLE)
+            else -> Intent(Intent.ACTION_SEND)
+        }
+
+        if (!(isMms && attachments.isEmpty())) {
+            intent.type = commonContentType(attachments).ifBlank { "text/plain" }
+        }
+        if (!targetPkg.isNullOrBlank()) {
+            intent.setPackage(targetPkg)
+        }
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_GRANT_READ_URI_PERMISSION)
+
+        if (text.isNotBlank()) {
+            intent.putExtra(Intent.EXTRA_TEXT, text)
+            if (isMms) {
+                intent.putExtra("sms_body", text)
+            }
+        }
+        if (isMms) {
+            intent.putExtra("address", to)
+        }
+
+        if (attachments.size == 1) {
+            intent.putExtra(Intent.EXTRA_STREAM, attachments.first().uri)
+        } else if (attachments.size > 1) {
+            intent.putParcelableArrayListExtra(
+                Intent.EXTRA_STREAM,
+                ArrayList<Uri>(attachments.map { it.uri }),
+            )
+        }
+        attachClipData(intent, attachments, serviceLabel = if (isMms) "mms attachment" else "attachment")
+        return intent
+    }
+
+    private fun commonContentType(attachments: List<CachedShareAttachment>): String {
+        if (attachments.isEmpty()) return "text/plain"
+        val normalized = attachments
+            .map { it.contentType.substringBefore(';').trim().lowercase() }
+            .filter { it.isNotBlank() }
+        if (normalized.isEmpty()) return "application/octet-stream"
+        val distinct = normalized.toSet()
+        if (distinct.size == 1) return distinct.first()
+        val majors = normalized.map { it.substringBefore('/') }.toSet()
+        return if (majors.size == 1) "${majors.first()}/*" else "*/*"
+    }
+
+    private fun attachClipData(
+        intent: Intent,
+        attachments: List<CachedShareAttachment>,
+        serviceLabel: String,
+    ) {
+        if (attachments.isEmpty()) return
+        val first = attachments.first()
+        val clip = ClipData.newRawUri(
+            first.fileName ?: serviceLabel,
+            first.uri,
+        )
+        attachments.drop(1).forEach { attachment ->
+            clip.addItem(ClipData.Item(attachment.uri))
+        }
+        intent.clipData = clip
+    }
+
     private suspend fun respondFromResult(requestId: String, result: ActionExecutor.ActionResult) {
         val status = if (result.ok) 200 else 400
         val payload = buildJsonObject {
@@ -1646,6 +2013,10 @@ class BridgeCommandHandler(
             } else {
                 val err = result.error ?: "unknown error"
                 put("error", err)
+                for ((k, v) in result.data) {
+                    if (v == null) continue
+                    put(k, anyToJsonElement(v))
+                }
                 // M2: structured error code for the LLM tool-calling path.
                 // ActionExecutor returns free-text errors like "Grant contacts
                 // permission in Settings..." which LLMs CAN interpret, but
@@ -1772,6 +2143,8 @@ class BridgeCommandHandler(
                 "re-attempt.",
         )
         put("error_code", "user_denied")
+        put("status", "blocked")
+        put("android_result", "user_denied")
         put("reason", "confirmation_denied_or_timeout")
         put("final", true)
         put(
@@ -1911,9 +2284,17 @@ class BridgeCommandHandler(
                 ?: ""
             "/press_key" -> body["key"]?.jsonPrimitive?.content ?: ""
             "/send_sms" -> {
-                val to = body["number"]?.jsonPrimitive?.content ?: "?"
+                val to = body["to"]?.jsonPrimitive?.content ?: "?"
+                "-> $to"
+            }
+            "/send_mms" -> {
+                val to = body["to"]?.jsonPrimitive?.content ?: "?"
                 "→ $to"
             }
+            "/share_media" -> {
+                val count = extractShareAttachmentRefs(body).size
+                if (count > 0) "$count attachment(s)" else "text"
+            }
             "/call" -> body["number"]?.jsonPrimitive?.content?.let { "→ $it" } ?: ""
             "/search_contacts" -> body["query"]?.jsonPrimitive?.content?.let { "\"$it\"" } ?: ""
             "/screen", "/screenshot", "/return_to_hermes", "/get_apps",

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

@@ -3,7 +3,9 @@ package com.hermesandroid.relay.network.handlers
 import android.util.Log
 import com.hermesandroid.relay.data.ChatMessage
 import com.hermesandroid.relay.data.ChatSession
+import com.hermesandroid.relay.data.HermesCard
 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
@@ -70,6 +72,22 @@ class ChatHandler {
         //   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*$""")
+        // Rich card marker — single line, full JSON object payload.
+        //
+        // Agents emit:
+        //   CARD:{"type":"approval_request","title":"...","actions":[...]}
+        //
+        // Constraints (mirrors the `MEDIA:` marker contract in
+        // hermes-agent's prompt_builder.py): the marker MUST live on its
+        // own line, and the JSON must be single-line (escape newlines in
+        // string fields as `\n`). This keeps the line-buffer parser
+        // trivial — same strategy as MEDIA.
+        //
+        // The regex is intentionally greedy on the JSON body so nested
+        // braces in fields/actions are captured correctly. Invalid JSON is
+        // logged and the line is left in content untouched so the user
+        // still sees _something_ rather than a silent drop.
+        private val cardMarkerRegex = Regex("""^\s*CARD:(\{.*\})\s*$""")
         // Known completion/failure emojis — if these appear in backtick format, it's a completion
         private val completionEmojis = setOf("✅", "✓", "☑")
         private val failureEmojis = setOf("❌", "✗", "⚠")
@@ -131,6 +149,27 @@ class ChatHandler {
     private var mediaLineBuffer = StringBuilder()
     private val dispatchedMediaMarkers = mutableSetOf<String>()
 
+    /**
+     * Separate line buffer + dedupe set for rich-card markers, mirroring
+     * the media-marker pipeline above. Cards are a first-class feature
+     * (not gated behind any flag), so they need their own buffer for the
+     * same reason `MEDIA:` does — tool-annotation parsing can be toggled
+     * off without silently dropping partial card lines.
+     */
+    private var cardLineBuffer = StringBuilder()
+    private val dispatchedCardMarkers = mutableSetOf<String>()
+
+    /**
+     * Lenient JSON for card payloads. `ignoreUnknownKeys` means future
+     * schema additions (new card types, new field shapes) won't crash
+     * older phone builds — the renderer's unknown-type fallback handles
+     * display.
+     */
+    private val cardJson = kotlinx.serialization.json.Json {
+        ignoreUnknownKeys = true
+        isLenient = true
+    }
+
     /**
      * Tracks which tool names currently have an active (in-progress) annotation-based
      * ToolCall, keyed by "messageId:toolName" → toolCallId. This lets us match a
@@ -161,6 +200,18 @@ class ChatHandler {
         }
     }
 
+    fun replaceMessageContent(messageId: String, content: String) {
+        _messages.update { messages ->
+            messages.map { message ->
+                if (message.id == messageId) {
+                    message.copy(content = content)
+                } else {
+                    message
+                }
+            }
+        }
+    }
+
     /**
      * Append a local-only voice-intent trace to the chat scroll. Used by
      * the sideload voice intent flow (`RealVoiceBridgeIntentHandler`) so
@@ -303,6 +354,65 @@ class ChatHandler {
         }
     }
 
+    /**
+     * Twin of [markVoiceIntentsSynced] for rich-card action dispatches.
+     * Flips [com.hermesandroid.relay.data.HermesCardDispatch.syncedToServer]
+     * to true on every dispatch whose flag is currently false, so the
+     * [com.hermesandroid.relay.viewmodel.CardDispatchSyncBuilder] doesn't
+     * re-emit them on the next chat send. Called from
+     * [com.hermesandroid.relay.viewmodel.ChatViewModel.startStream] at the
+     * same point — right after the API client accepts the request — so
+     * the voice-intent and card-dispatch sync paths have identical
+     * commit-timing semantics and a thrown request-building exception
+     * falsely marks neither stream as synced.
+     */
+    fun markCardDispatchesSynced() {
+        _messages.update { messages ->
+            var changed = false
+            val mapped = messages.map { msg ->
+                if (msg.cardDispatches.isEmpty()) return@map msg
+                val anyUnsynced = msg.cardDispatches.any { !it.syncedToServer }
+                if (!anyUnsynced) return@map msg
+                changed = true
+                msg.copy(
+                    cardDispatches = msg.cardDispatches.map {
+                        if (it.syncedToServer) it else it.copy(syncedToServer = true)
+                    }
+                )
+            }
+            if (changed) mapped else messages
+        }
+    }
+
+    fun attachRealtimeTurnTrace(messageId: String, trace: RealtimeTurnTrace) {
+        _messages.update { messages ->
+            var changed = false
+            val mapped = messages.map { msg ->
+                if (msg.id == messageId && msg.role == MessageRole.ASSISTANT) {
+                    changed = true
+                    msg.copy(realtimeTurn = trace)
+                } else {
+                    msg
+                }
+            }
+            if (changed) mapped else messages
+        }
+    }
+
+    fun markRealtimeTurnsSynced() {
+        _messages.update { messages ->
+            var changed = false
+            val mapped = messages.map { msg ->
+                val trace = msg.realtimeTurn
+                if (trace != null && !trace.syncedToServer) {
+                    changed = true
+                    msg.copy(realtimeTurn = trace.copy(syncedToServer = true))
+                } else msg
+            }
+            if (changed) mapped else messages
+        }
+    }
+
     /**
      * Reusable lenient JSON parser for tool-result previews. [Json { ... }]
      * is cheap to construct but we share one instance so per-tool-completion
@@ -482,6 +592,33 @@ class ChatHandler {
         dispatchedMediaMarkers.clear()
         annotationLineBuffer.clear()
         activeAnnotationTools.clear()
+        cardLineBuffer.clear()
+        dispatchedCardMarkers.clear()
+    }
+
+    /**
+     * Repair assistant labels after late-arriving agent config. History can
+     * load before GET /api/config returns, leaving default-profile messages
+     * with the generic "Hermes" label. Keep local phone/voice action trace
+     * labels intact because those bubbles do not represent the server agent.
+     */
+    fun relabelGenericAssistantMessages(agentName: String?) {
+        val trimmed = agentName?.trim()?.takeIf { it.isNotBlank() } ?: return
+        _messages.update { list ->
+            list.map { message ->
+                if (
+                    message.role == MessageRole.ASSISTANT &&
+                    !message.id.startsWith("voice-intent-") &&
+                    message.agentName != "Voice action" &&
+                    message.agentName != "Phone action" &&
+                    (message.agentName.isNullOrBlank() || message.agentName == "Hermes")
+                ) {
+                    message.copy(agentName = trimmed)
+                } else {
+                    message
+                }
+            }
+        }
     }
 
     /**
@@ -571,19 +708,33 @@ class ChatHandler {
 
             // Run the media marker parser on assistant content; strip matched
             // lines and queue hits for post-assignment dispatch.
-            val cleanedContent = if (role == MessageRole.ASSISTANT && rawContent.isNotEmpty()) {
+            val afterMedia = if (role == MessageRole.ASSISTANT && rawContent.isNotEmpty()) {
                 extractMediaMarkersFromContent(messageId, rawContent, pendingMediaHits)
             } else {
                 rawContent
             }
 
+            // Cards are synchronous (no async fetch) so we attach them
+            // straight onto the reconstructed ChatMessage and strip their
+            // lines from the displayed content in the same pass. No
+            // post-assignment dispatch needed.
+            val (cleanedContent, extractedCards) = if (
+                role == MessageRole.ASSISTANT && afterMedia.isNotEmpty()
+            ) {
+                extractCardsFromContent(afterMedia)
+            } else {
+                afterMedia to emptyList()
+            }
+
             ChatMessage(
                 id = messageId,
                 role = role,
                 content = cleanedContent,
                 timestamp = timestampMs,
                 isStreaming = false,
-                toolCalls = toolCalls
+                toolCalls = toolCalls,
+                cards = extractedCards,
+                agentName = if (role == MessageRole.ASSISTANT) activeAgentName else null,
             )
         }
 
@@ -691,6 +842,38 @@ class ChatHandler {
         return cleaned.trim()
     }
 
+    /**
+     * Scan loaded content for `CARD:{json}` lines, parse each to a
+     * [HermesCard], return the cleaned content + the extracted cards. Pure
+     * function — does not mutate [_messages] or mark anything dispatched.
+     * Called from [loadMessageHistory]. Unparseable card lines are left in
+     * the content (same policy as [tryDispatchCardMarker]) so the user
+     * sees a visible artifact instead of a silent drop.
+     */
+    private fun extractCardsFromContent(content: String): Pair<String, List<HermesCard>> {
+        var cleaned = content
+        val cards = mutableListOf<HermesCard>()
+        for (rawLine in content.lines()) {
+            val trimmed = rawLine.trim()
+            if (trimmed.isEmpty()) continue
+            val match = cardMarkerRegex.find(trimmed) ?: continue
+            val payload = match.groupValues[1]
+            val card = try {
+                cardJson.decodeFromString(HermesCard.serializer(), payload)
+            } catch (e: Exception) {
+                Log.w(TAG, "Card reload parse failed: ${e.message}")
+                continue
+            }
+            cards += card
+            cleaned = cleaned
+                .replace("\n$rawLine\n", "\n")
+                .replace("\n$rawLine", "")
+                .replace("$rawLine\n", "")
+                .replace(rawLine, "")
+        }
+        return cleaned.trim() to cards
+    }
+
     /**
      * Parse the tool_calls JSON from an assistant message into ToolCall objects.
      * Format: array of objects with {id, type:"function", function: {name, arguments}}
@@ -764,6 +947,10 @@ class ChatHandler {
         }
     }
 
+    fun clearSessions() {
+        _sessions.value = emptyList()
+    }
+
     /**
      * Remove a session from the local list (optimistic delete).
      */
@@ -846,6 +1033,12 @@ class ChatHandler {
         // Always scan for media markers — inbound attachments are a first-class
         // feature and shouldn't be gated behind the tool-annotation flag.
         scanForMediaMarkers(messageId, processedDelta)
+
+        // Rich cards ride the same "always on" treatment as media — the
+        // agent can emit `CARD:{json}` at any point in any endpoint and
+        // the renderer should pick it up without the user having to
+        // opt in to any parsing mode.
+        scanForCardMarkers(messageId, processedDelta)
     }
 
     /**
@@ -984,6 +1177,116 @@ class ChatHandler {
         }
     }
 
+    /**
+     * Card-marker line scanner — twin of [scanForMediaMarkers] for
+     * `CARD:{json}` rows. Matched cards are appended to the message's
+     * [ChatMessage.cards] list and the raw line is stripped from
+     * [ChatMessage.content] so the user only sees the rendered
+     * [com.hermesandroid.relay.ui.components.HermesCardBubble], never the
+     * literal JSON.
+     */
+    private fun scanForCardMarkers(messageId: String, delta: String) {
+        cardLineBuffer.append(delta)
+
+        while (true) {
+            val newlineIndex = cardLineBuffer.indexOf('\n')
+            if (newlineIndex == -1) break
+
+            val line = cardLineBuffer.substring(0, newlineIndex)
+            cardLineBuffer.delete(0, newlineIndex + 1)
+
+            val trimmed = line.trim()
+            if (trimmed.isEmpty()) continue
+
+            if (tryDispatchCardMarker(messageId, trimmed)) {
+                stripLineFromContent(messageId, trimmed)
+            }
+        }
+    }
+
+    /**
+     * Parse a single `CARD:{json}` line. On success, appends the card to
+     * [ChatMessage.cards] for [messageId]. Dedupes by "messageId:cardKey"
+     * where cardKey is the parsed [HermesCard.id] or a SHA-style hash
+     * (content-based) fallback, so the same card re-appearing during
+     * streaming + finalize reconciliation doesn't render twice.
+     *
+     * Invalid JSON is logged and returns false — the caller leaves the
+     * line in the content, which at least gives the user a visible hint
+     * that the agent tried to emit a card the phone couldn't parse.
+     */
+    private fun tryDispatchCardMarker(messageId: String, line: String): Boolean {
+        val match = cardMarkerRegex.find(line) ?: return false
+        val payload = match.groupValues[1]
+
+        val card = try {
+            cardJson.decodeFromString(HermesCard.serializer(), payload)
+        } catch (e: Exception) {
+            Log.w(TAG, "Card marker parse failed: ${e.message} | payload=${payload.take(200)}")
+            return false
+        }
+
+        // Content-based fallback key when the agent didn't supply an id —
+        // good enough for dedupe of the exact same card within a single
+        // message turn.
+        val cardKey = card.id ?: "anon:${payload.hashCode()}"
+        val dedupeKey = "$messageId:$cardKey"
+        if (!dispatchedCardMarkers.add(dedupeKey)) {
+            Log.d(TAG, "Card marker duplicate, skipping: $cardKey")
+            return true // Still strip the line — it's a valid card, just a repeat.
+        }
+
+        Log.d(TAG, "Card marker: type=${card.type} key=$cardKey")
+
+        _messages.update { messages ->
+            messages.map { msg ->
+                if (msg.id == messageId && msg.role == MessageRole.ASSISTANT) {
+                    msg.copy(cards = msg.cards + card)
+                } else msg
+            }
+        }
+        return true
+    }
+
+    /**
+     * Flush the card line buffer + post-stream reconcile, twin of
+     * [finalizeMediaMarkers]. Guards against the race where a CARD: line
+     * arrived as the last delta with no trailing newline, and also
+     * re-sweeps the finalized content for any card lines that survived
+     * real-time stripping (update-ordering race against [stripLineFromContent]).
+     */
+    private fun finalizeCardMarkers(messageId: String) {
+        if (cardLineBuffer.isNotEmpty()) {
+            val remaining = cardLineBuffer.toString().trim()
+            cardLineBuffer.clear()
+            if (remaining.isNotEmpty() && tryDispatchCardMarker(messageId, remaining)) {
+                stripLineFromContent(messageId, remaining)
+            }
+        }
+
+        _messages.update { messages ->
+            messages.map { msg ->
+                if (msg.id != messageId || msg.role != MessageRole.ASSISTANT) return@map msg
+                var cleaned = msg.content
+                var changed = false
+                for (rawLine in msg.content.lines()) {
+                    val trimmed = rawLine.trim()
+                    if (trimmed.isEmpty()) continue
+                    if (cardMarkerRegex.containsMatchIn(trimmed)) {
+                        tryDispatchCardMarker(messageId, trimmed)
+                        cleaned = cleaned
+                            .replace("\n$rawLine\n", "\n")
+                            .replace("\n$rawLine", "")
+                            .replace("$rawLine\n", "")
+                            .replace(rawLine, "")
+                        changed = true
+                    }
+                }
+                if (changed) msg.copy(content = cleaned.trim()) else msg
+            }
+        }
+    }
+
     /**
      * Inspect [line] for a media marker and dispatch the appropriate callback.
      *
@@ -1296,7 +1599,30 @@ class ChatHandler {
         return null
     }
 
-    fun onToolCallStart(messageId: String, toolCallId: String, toolName: String) {
+    fun setMessageBadges(messageId: String, badges: List<String>) {
+        val cleaned = badges
+            .map { it.trim() }
+            .filter { it.isNotEmpty() }
+            .distinct()
+            .take(4)
+        _messages.update { messages ->
+            messages.map { msg ->
+                if (msg.id == messageId && msg.role == MessageRole.ASSISTANT) {
+                    msg.copy(badges = cleaned)
+                } else {
+                    msg
+                }
+            }
+        }
+    }
+
+    fun onToolCallStart(
+        messageId: String,
+        toolCallId: String,
+        toolName: String,
+        runId: String? = null,
+        provenance: String? = null,
+    ) {
         _isStreaming.value = true
 
         val toolCall = ToolCall(
@@ -1305,7 +1631,9 @@ class ChatHandler {
             args = null,
             result = null,
             success = null,
-            isComplete = false
+            isComplete = false,
+            runId = runId,
+            provenance = provenance,
         )
 
         _messages.update { messages ->
@@ -1334,7 +1662,12 @@ class ChatHandler {
         }
     }
 
-    fun onToolCallComplete(messageId: String, toolCallId: String, resultPreview: String? = null) {
+    fun onToolCallComplete(
+        messageId: String,
+        toolCallId: String,
+        resultPreview: String? = null,
+        provenance: String? = null,
+    ) {
         // Snapshot the matching tool call's name BEFORE mutating — we need it
         // to decide whether to emit a phone-action result bubble below.
         val toolName = _messages.value
@@ -1352,6 +1685,7 @@ class ChatHandler {
                                 success = true,
                                 isComplete = true,
                                 result = resultPreview ?: call.result,
+                                provenance = provenance ?: call.provenance,
                                 completedAt = System.currentTimeMillis()
                             )
                         } else {
@@ -1446,6 +1780,9 @@ class ChatHandler {
 
         // Finalize media markers unconditionally (not gated by parseToolAnnotations)
         finalizeMediaMarkers(messageId)
+        // Rich cards get the same unconditional treatment — a partial
+        // card line without a trailing newline should still render.
+        finalizeCardMarkers(messageId)
         // Note: do NOT set _isStreaming to false — the run is still active
     }
 
@@ -1480,6 +1817,7 @@ class ChatHandler {
 
         // Finalize media markers unconditionally
         finalizeMediaMarkers(messageId)
+        finalizeCardMarkers(messageId)
     }
 
     fun onStreamError(message: String) {
@@ -1538,6 +1876,37 @@ class ChatHandler {
         }
     }
 
+    // --- Card action dispatch ---
+
+    /**
+     * Record that the user tapped an action on a rich card. Appends a
+     * [com.hermesandroid.relay.data.HermesCardDispatch] to the owning
+     * message's dispatch list, which
+     * [com.hermesandroid.relay.ui.components.HermesCardBubble] reads to
+     * collapse the action row into a "you chose X" confirmation.
+     *
+     * Idempotent — taps on the same (cardKey, actionValue) pair are
+     * silently coalesced, so tapping twice during a slow send doesn't
+     * double-stamp the history.
+     */
+    fun recordCardDispatch(messageId: String, cardKey: String, actionValue: String) {
+        val stamp = com.hermesandroid.relay.data.HermesCardDispatch(
+            cardKey = cardKey,
+            actionValue = actionValue,
+            timestamp = System.currentTimeMillis(),
+        )
+        _messages.update { messages ->
+            messages.map { msg ->
+                if (msg.id != messageId) return@map msg
+                val alreadyDispatched = msg.cardDispatches.any {
+                    it.cardKey == cardKey && it.actionValue == actionValue
+                }
+                if (alreadyDispatched) msg
+                else msg.copy(cardDispatches = msg.cardDispatches + stamp)
+            }
+        }
+    }
+
     // --- Retry support ---
 
     private val _lastSentMessage = MutableStateFlow<String?>(null)

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

@@ -1,14 +1,29 @@
 package com.hermesandroid.relay.network.models
 
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.buildJsonObject
 import java.util.UUID
 
+/**
+ * Standard relay envelope. Most channel traffic nests data in [payload]
+ * so a single decoder handles every message shape.
+ *
+ * **`profiles` escape hatch.** The `pairing`-channel `profiles.updated`
+ * push envelope (see `AuthManager.handleProfilesUpdated`) hoists its
+ * profiles array to the top level of the JSON rather than nesting it
+ * inside payload. Rather than duplicating the kotlinx.serialization
+ * pipeline for one message type, we widen [Envelope] with an optional
+ * top-level [profiles] array. Every other envelope type leaves it null
+ * — kotlinx.serialization tolerates an absent field because of the
+ * default.
+ */
 @Serializable
 data class Envelope(
     val channel: String,
     val type: String,
     val id: String = UUID.randomUUID().toString(),
-    val payload: JsonObject = buildJsonObject {}
+    val payload: JsonObject = buildJsonObject {},
+    val profiles: JsonArray? = null,
 )

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

@@ -81,6 +81,7 @@ object FlexibleIdNonNullSerializer : KSerializer<String> {
 data class SessionListResponse(
     val items: List<SessionItem>? = null,
     val sessions: List<SessionItem>? = null, // alternate key
+    val data: List<SessionItem>? = null, // upstream /api/sessions list envelope
     val total: Int? = null
 )
 
@@ -112,7 +113,8 @@ data class SessionItem(
 @Serializable
 data class CreateSessionRequest(
     val title: String? = null,
-    val model: String? = null
+    val model: String? = null,
+    val profile: String? = null,
 )
 
 @Serializable
@@ -126,6 +128,7 @@ data class RenameSessionRequest(
 data class MessageListResponse(
     val items: List<MessageItem>? = null,
     val messages: List<MessageItem>? = null, // alternate key
+    val data: List<MessageItem>? = null, // upstream /api/sessions/{id}/messages list envelope
     val total: Int? = null
 )
 
@@ -299,5 +302,6 @@ data class SkillInfo(
 @Serializable
 data class SkillListResponse(
     val skills: List<SkillInfo>? = null,
-    val items: List<SkillInfo>? = null
+    val items: List<SkillInfo>? = null,
+    val data: List<SkillInfo>? = null
 )

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

@@ -0,0 +1,979 @@
+package com.hermesandroid.relay.ui.components
+
+import android.content.ClipData
+import android.widget.Toast
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ChevronRight
+import androidx.compose.material.icons.filled.ContentCopy
+import androidx.compose.material.icons.filled.ExpandLess
+import androidx.compose.material.icons.filled.ExpandMore
+import androidx.compose.material.icons.filled.Refresh
+import androidx.compose.material.icons.filled.Shield
+import androidx.compose.material.icons.filled.Visibility
+import androidx.compose.material.icons.filled.VisibilityOff
+import androidx.compose.material.icons.filled.Warning
+import androidx.compose.material3.Button
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.ClipEntry
+import androidx.compose.ui.platform.LocalClipboard
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.unit.dp
+import com.hermesandroid.relay.auth.AuthState
+import com.hermesandroid.relay.network.ConnectionState
+import com.hermesandroid.relay.network.RelayUrlDeriver
+import com.hermesandroid.relay.ui.LocalSnackbarHost
+import com.hermesandroid.relay.ui.showHumanError
+import com.hermesandroid.relay.util.classifyError
+import com.hermesandroid.relay.viewmodel.ConnectionViewModel
+import com.hermesandroid.relay.viewmodel.RelayUiState
+import com.hermesandroid.relay.viewmodel.asBadgeState
+import com.hermesandroid.relay.viewmodel.statusText
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+
+/**
+ * ──────────────────────────────────────────────────────────────────────
+ * Active-connection card body sections — the "what was Settings →
+ * Connection" feature set, now living inline on the active `ConnectionCard`
+ * inside [com.hermesandroid.relay.ui.screens.ConnectionsSettingsScreen].
+ *
+ * The per-card action row (Reconnect/Rename/Re-pair/Revoke/Remove) stays
+ * on `ConnectionCard` itself. Everything below the first divider — status
+ * rows, endpoints expander, advanced expander (manual URL, insecure
+ * toggle, manual pairing code), and the security-posture strip — is
+ * extracted here so `ConnectionsSettingsScreen` stays focused on the list
+ * layout and this file owns the active-card deep content.
+ *
+ * All composables in this file assume they render INSIDE an active
+ * `ConnectionCard`'s Column (16dp padding, 8dp vertical spacing). None of
+ * them introduce a new Card wrapper or scroll container.
+ *
+ * Call sites pass a non-null `connectionViewModel` — these sections are
+ * never rendered for non-active cards, so the VM guard happens at the
+ * call site.
+ * ──────────────────────────────────────────────────────────────────────
+ */
+
+/**
+ * Standard Hermes status rows (API / Dashboard). Dashboard auth is surfaced
+ * here so users do not have to open Manage just to discover sign-in is needed.
+ */
+@Composable
+fun ActiveCardStandardStatusSection(
+    connectionViewModel: ConnectionViewModel,
+    onOpenApiInfo: () -> Unit,
+    onOpenDashboard: () -> Unit,
+) {
+    val apiReachable by connectionViewModel.apiServerReachable.collectAsState()
+    val apiHealth by connectionViewModel.apiServerHealth.collectAsState()
+    val activeConnection by connectionViewModel.activeConnection.collectAsState()
+    val dashboardStatus = activeConnection?.dashboardLastStatus
+    val dashboardSignInRequired =
+        dashboardStatus?.authRequired == true && dashboardStatus.authenticated != true
+
+    ConnectionStatusRow(
+        label = "API Server",
+        isConnected = apiReachable,
+        isProbing = apiHealth == ConnectionViewModel.HealthStatus.Probing,
+        statusText = when {
+            apiHealth == ConnectionViewModel.HealthStatus.Probing -> "Checking…"
+            apiReachable -> "Reachable"
+            else -> "Unreachable"
+        },
+        onClick = onOpenApiInfo,
+        modifier = Modifier.fillMaxWidth(),
+    )
+
+    ConnectionStatusRow(
+        label = "Dashboard",
+        isConnected = dashboardStatus?.reachable == true && !dashboardSignInRequired,
+        statusText = when {
+            activeConnection?.resolvedDashboardUrl.isNullOrBlank() -> "Not configured"
+            dashboardStatus == null -> "Not checked"
+            !dashboardStatus.reachable -> "Unreachable"
+            dashboardSignInRequired -> "Sign-in required"
+            dashboardStatus.authenticated == true -> "Signed in"
+            dashboardStatus.authRequired == false -> "Available"
+            else -> "Available"
+        },
+        onClick = onOpenDashboard,
+        modifier = Modifier.fillMaxWidth(),
+    )
+}
+
+/**
+ * Optional Relay status rows (transport / paired session). Kept separate from
+ * [ActiveCardStandardStatusSection] so API/dashboard setup does not visually
+ * read as incomplete when Relay is not paired.
+ */
+@Composable
+fun ActiveCardRelayStatusSection(
+    connectionViewModel: ConnectionViewModel,
+    onOpenRelayInfo: () -> Unit,
+    onOpenSessionInfo: () -> Unit,
+) {
+    val context = LocalContext.current
+
+    val authState by connectionViewModel.authState.collectAsState()
+    val relayUiState by connectionViewModel.relayUiState.collectAsState()
+    val relayRowState by connectionViewModel.relayRowState.collectAsState()
+
+    // ADR 24: relayRowState carries both the phase and the active endpoint
+    // role. statusText appends " · <Role>" when the resolver has picked one.
+    ConnectionStatusRow(
+        label = "Relay",
+        state = relayRowState.asBadgeState(),
+        statusText = relayRowState.statusText(connectedLabel = "Connected"),
+        onClick = {
+            if (relayUiState == RelayUiState.Stale) {
+                connectionViewModel.connectRelay()
+                Toast.makeText(
+                    context,
+                    "Reconnecting to relay…",
+                    Toast.LENGTH_SHORT,
+                ).show()
+            } else {
+                onOpenRelayInfo()
+            }
+        },
+        modifier = Modifier.fillMaxWidth(),
+    )
+
+    ConnectionStatusRow(
+        label = "Session",
+        isConnected = authState is AuthState.Paired,
+        isConnecting = authState is AuthState.Pairing,
+        statusText = when (authState) {
+            is AuthState.Paired -> "Paired"
+            is AuthState.Pairing -> "Pairing..."
+            is AuthState.Unpaired -> "Unpaired"
+            is AuthState.Failed -> "Failed: ${(authState as AuthState.Failed).reason}"
+        },
+        onClick = onOpenSessionInfo,
+        modifier = Modifier.fillMaxWidth(),
+    )
+}
+
+/**
+ * Advanced expandable section — three subsections:
+ *  - Manual URL configuration (API URL + key + Save & Test,
+ *    Relay URL + Save & Test + Disconnect)
+ *  - Allow-insecure-connections toggle (with first-enable Ack dialog)
+ *  - Manual pairing code fallback (3-step flow with in-flight Connect
+ *    watcher + snackbar feedback)
+ *
+ * Wrapped in a single `SettingsExpandableCard` so the user can collapse
+ * the entire block — none of it is needed for the common paired-via-QR
+ * flow. Expanded-state is `rememberSaveable` so rotation / process death
+ * preserves user intent.
+ *
+ * [onInsecureAckRequested] opens the `InsecureConnectionAckDialog` at
+ * screen scope; this composable never owns it directly so the dialog
+ * can persist through card recomposition in a LazyColumn.
+ */
+@Composable
+fun ActiveCardAdvancedSection(
+    connectionViewModel: ConnectionViewModel,
+    relayEnabled: Boolean,
+    isDarkTheme: Boolean,
+    onInsecureAckRequested: () -> Unit,
+) {
+    var expanded by rememberSaveable { mutableStateOf(false) }
+
+    SettingsExpandableCard(
+        title = "Advanced",
+        expanded = expanded,
+        onToggle = { expanded = !expanded },
+        isDarkTheme = isDarkTheme,
+    ) {
+        ManualUrlSubsection(
+            connectionViewModel = connectionViewModel,
+            relayEnabled = relayEnabled,
+        )
+
+        if (relayEnabled) {
+            HorizontalDivider()
+            InsecureToggleSubsection(
+                connectionViewModel = connectionViewModel,
+                onInsecureAckRequested = onInsecureAckRequested,
+            )
+            HorizontalDivider()
+            ManualPairingCodeSubsection(
+                connectionViewModel = connectionViewModel,
+            )
+        }
+    }
+}
+
+/**
+ * Manual URL configuration subsection. Power-user only — the canonical
+ * path is QR pair via the Re-pair button on the card row above.
+ *
+ * Kept internal rather than split further because the API + relay
+ * fields share the `isTesting` + `Save & Test` idiom and the two test
+ * paths talk to the same VM.
+ */
+@Composable
+private fun ManualUrlSubsection(
+    connectionViewModel: ConnectionViewModel,
+    relayEnabled: Boolean,
+) {
+    val context = LocalContext.current
+
+    val apiServerUrl by connectionViewModel.apiServerUrl.collectAsState()
+    val relayUrl by connectionViewModel.relayUrl.collectAsState()
+    val apiKeyPresent by connectionViewModel.authManager.apiKeyPresent.collectAsState()
+    val relayConnectionState by connectionViewModel.relayConnectionState.collectAsState()
+
+    // Keyed on the backing URL so a connection switch refreshes the input.
+    var apiUrlInput by remember(apiServerUrl) { mutableStateOf(apiServerUrl) }
+    var apiKeyInput by remember { mutableStateOf("") }
+    var apiKeyVisible by remember { mutableStateOf(false) }
+    var relayUrlInput by remember(relayUrl) { mutableStateOf(relayUrl) }
+    var isTestingApi by remember { mutableStateOf(false) }
+    var apiVoiceSetupResult by remember {
+        mutableStateOf<ConnectionViewModel.ApiVoiceSetupResult?>(null)
+    }
+    var relayOverrideVisible by rememberSaveable(apiServerUrl) {
+        mutableStateOf(!RelayUrlDeriver.isAutoManagedRelayUrl(relayUrl, apiServerUrl))
+    }
+    val autoRelayUrl = RelayUrlDeriver.deriveFromApiUrl(apiUrlInput)
+
+    LaunchedEffect(apiUrlInput, relayOverrideVisible, autoRelayUrl) {
+        if (!relayOverrideVisible && autoRelayUrl != null && relayUrlInput != autoRelayUrl) {
+            relayUrlInput = autoRelayUrl
+            connectionViewModel.clearRelayReachableResult()
+        }
+    }
+
+    OutlinedTextField(
+        value = apiUrlInput,
+        onValueChange = { apiUrlInput = it },
+        label = { Text("API Server URL") },
+        placeholder = { Text("http://your-server:8642") },
+        singleLine = true,
+        modifier = Modifier.fillMaxWidth(),
+    )
+
+    OutlinedTextField(
+        value = apiKeyInput,
+        onValueChange = { apiKeyInput = it },
+        label = { Text("API Key (optional)") },
+        placeholder = {
+            Text(
+                if (apiKeyPresent) "•••• already set (leave blank to keep)"
+                else "Leave empty if not configured",
+            )
+        },
+        supportingText = {
+            Text(
+                if (apiKeyPresent && apiKeyInput.isBlank()) {
+                    "A key is already stored — leave blank to keep it, or type to replace"
+                } else {
+                    "Only needed if Hermes is configured with API_SERVER_KEY"
+                },
+            )
+        },
+        singleLine = true,
+        visualTransformation = if (apiKeyVisible) {
+            VisualTransformation.None
+        } else {
+            PasswordVisualTransformation()
+        },
+        trailingIcon = {
+            IconButton(onClick = { apiKeyVisible = !apiKeyVisible }) {
+                Icon(
+                    imageVector = if (apiKeyVisible) Icons.Filled.VisibilityOff
+                    else Icons.Filled.Visibility,
+                    contentDescription = if (apiKeyVisible) "Hide" else "Show",
+                )
+            }
+        },
+        modifier = Modifier.fillMaxWidth(),
+    )
+
+    Row(
+        horizontalArrangement = Arrangement.spacedBy(8.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Button(
+            onClick = {
+                isTestingApi = true
+                apiVoiceSetupResult = null
+                val relayOverride = if (relayOverrideVisible) relayUrlInput else null
+                connectionViewModel.saveApiAndProbeVoice(
+                    apiUrl = apiUrlInput,
+                    apiKey = apiKeyInput,
+                    manualRelayUrlOverride = relayOverride,
+                ) { result ->
+                    isTestingApi = false
+                    apiVoiceSetupResult = result
+                    if (!result.voiceConfigReachable && result.voiceRoute == "relay" && result.relayAutoDerived) {
+                        relayOverrideVisible = true
+                        result.relayUrl?.let { relayUrlInput = it }
+                    }
+                    Toast.makeText(
+                        context,
+                        when {
+                            result.apiReachable && result.voiceConfigReachable ->
+                                if (result.voiceRoute == "standard") {
+                                    "API and standard voice reachable"
+                                } else {
+                                    "API and relay voice reachable"
+                                }
+                            result.apiReachable ->
+                                "API reachable; voice route needs review"
+                            else -> "Cannot reach API server"
+                        },
+                        Toast.LENGTH_SHORT,
+                    ).show()
+                }
+            },
+            enabled = apiUrlInput.isNotBlank() && !isTestingApi,
+        ) {
+            Text("Save & Test")
+        }
+        if (isTestingApi) {
+            CircularProgressIndicator(
+                modifier = Modifier.size(20.dp),
+                strokeWidth = 2.dp,
+            )
+        }
+    }
+
+    if (relayEnabled) {
+        HorizontalDivider()
+
+        Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
+            Text(
+                text = "Relay URL",
+                style = MaterialTheme.typography.bodyMedium,
+            )
+            Text(
+                text = if (autoRelayUrl != null && !relayOverrideVisible) {
+                    "Auto: $autoRelayUrl"
+                } else {
+                    "Manual override"
+                },
+                style = MaterialTheme.typography.bodySmall.copy(fontFamily = FontFamily.Monospace),
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+            )
+            Text(
+                text = "Relay is optional for voice. Standard voice uses the Hermes API; Relay voice uses this route when selected or needed.",
+                style = MaterialTheme.typography.bodySmall,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+            )
+            TextButton(
+                onClick = {
+                    relayOverrideVisible = !relayOverrideVisible
+                    if (!relayOverrideVisible) {
+                        relayUrlInput = autoRelayUrl.orEmpty()
+                    }
+                    connectionViewModel.clearRelayReachableResult()
+                },
+                contentPadding = PaddingValues(horizontal = 0.dp),
+            ) {
+                Text(if (relayOverrideVisible) "Use auto relay URL" else "Use custom relay URL")
+            }
+        }
+
+        if (relayOverrideVisible) {
+            OutlinedTextField(
+                value = relayUrlInput,
+                onValueChange = {
+                    relayUrlInput = it
+                    // Stale reachability results belong to the prior URL.
+                    connectionViewModel.clearRelayReachableResult()
+                },
+                label = { Text("Relay URL override") },
+                placeholder = { Text("wss://your-server:8767") },
+                singleLine = true,
+                supportingText = {
+                    Text("Only needed when the optional Relay route cannot be auto-derived")
+                },
+                modifier = Modifier.fillMaxWidth(),
+            )
+        }
+
+        apiVoiceSetupResult?.let { result ->
+            val color = if (result.voiceConfigReachable) {
+                Color(0xFF4CAF50)
+            } else {
+                MaterialTheme.colorScheme.error
+            }
+            Text(
+                text = if (result.voiceConfigReachable) {
+                    if (result.voiceRoute == "standard") {
+                        "Voice ready via standard Hermes API"
+                    } else {
+                        "Voice ready via ${result.relayUrl ?: "relay"}"
+                    }
+                } else {
+                    "Voice route needs review: ${result.voiceConfigError ?: "voice config probe failed"}"
+                },
+                style = MaterialTheme.typography.bodySmall,
+                color = color,
+            )
+        }
+
+        // Save & Test + Disconnect. Connect button intentionally absent
+        // — it used to cause an unpaired-auth-then-rate-limited trap.
+        // /health probe with no WSS handshake is the safe surface.
+        val relayReachable by connectionViewModel.relayReachableResult.collectAsState()
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Button(
+                onClick = {
+                    connectionViewModel.testRelayReachable(
+                        if (relayOverrideVisible) relayUrlInput else autoRelayUrl.orEmpty(),
+                    )
+                },
+                enabled = (if (relayOverrideVisible) relayUrlInput else autoRelayUrl.orEmpty()).isNotBlank() &&
+                    relayReachable !is ConnectionViewModel.RelayReachable.Probing,
+            ) {
+                Text("Test Relay")
+            }
+            OutlinedButton(
+                onClick = { connectionViewModel.disconnectRelay() },
+                enabled = relayConnectionState != ConnectionState.Disconnected,
+            ) {
+                Text("Disconnect")
+            }
+        }
+
+        when (val r = relayReachable) {
+            is ConnectionViewModel.RelayReachable.Probing -> {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(8.dp),
+                ) {
+                    CircularProgressIndicator(
+                        modifier = Modifier.size(14.dp),
+                        strokeWidth = 2.dp,
+                    )
+                    Text(
+                        text = "Probing /health…",
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+                }
+            }
+            is ConnectionViewModel.RelayReachable.Ok -> {
+                Text(
+                    text = "✓ Reachable — hermes-relay v${r.version} (${r.clients} client, ${r.sessions} session${if (r.sessions == 1) "" else "s"})",
+                    style = MaterialTheme.typography.bodySmall,
+                    color = Color(0xFF4CAF50),
+                )
+            }
+            is ConnectionViewModel.RelayReachable.Fail -> {
+                val humanErr = classifyError(
+                    Exception(r.message),
+                    context = "save_and_test",
+                )
+                Column {
+                    Text(
+                        text = "✗ ${humanErr.title}",
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.error,
+                    )
+                    Text(
+                        text = humanErr.body,
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.error,
+                    )
+                }
+            }
+            null -> { /* idle */ }
+        }
+    }
+}
+
+/**
+ * Insecure-mode toggle subsection. First enable triggers the
+ * [InsecureConnectionAckDialog] at screen scope via
+ * [onInsecureAckRequested]; subsequent toggles fire through the VM
+ * directly.
+ */
+@Composable
+private fun InsecureToggleSubsection(
+    connectionViewModel: ConnectionViewModel,
+    onInsecureAckRequested: () -> Unit,
+) {
+    val insecureMode by connectionViewModel.insecureMode.collectAsState()
+    val insecureAckSeen by connectionViewModel.insecureAckSeen.collectAsState()
+    val isInsecureConnection by connectionViewModel.isInsecureConnection.collectAsState()
+    val relayConnectionState by connectionViewModel.relayConnectionState.collectAsState()
+
+    if (isInsecureConnection && relayConnectionState == ConnectionState.Connected) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(vertical = 4.dp),
+        ) {
+            Icon(
+                imageVector = Icons.Filled.Warning,
+                contentDescription = null,
+                tint = MaterialTheme.colorScheme.error,
+                modifier = Modifier.size(16.dp),
+            )
+            Text(
+                text = "Plain connection — traffic is not encrypted",
+                style = MaterialTheme.typography.bodySmall,
+                color = MaterialTheme.colorScheme.error,
+            )
+        }
+    }
+
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Column(modifier = Modifier.weight(1f)) {
+            Text(
+                text = "Allow plain (unencrypted) connections",
+                style = MaterialTheme.typography.bodyMedium,
+            )
+            Text(
+                text = "Enable ws:// and http:// for local dev/testing only",
+                style = MaterialTheme.typography.bodySmall,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+            )
+        }
+        Switch(
+            checked = insecureMode,
+            onCheckedChange = { enabled ->
+                if (enabled && !insecureAckSeen) {
+                    // First enable → open threat-model Ack dialog at
+                    // screen scope. VM is written only on confirm.
+                    onInsecureAckRequested()
+                } else {
+                    connectionViewModel.setInsecureMode(enabled)
+                }
+            },
+        )
+    }
+}
+
+/**
+ * Manual pairing code subsection — the 3-step fallback flow for when
+ * the QR scanner isn't usable (no camera, headless host, bad lighting).
+ *
+ *  1. Copy the phone-generated code (with Refresh to regenerate)
+ *  2. Run `hermes pair --register-code <code>` on the host
+ *  3. Tap Connect — with a 15s auth watcher that surfaces success /
+ *     failure through the global snackbar host
+ *
+ * Mirrors the legacy `ConnectionSettingsScreen` Card 3 flow verbatim
+ * since it's already battle-tested. The top-level "Connect" button on
+ * this card requires a relay URL — if the user hasn't set one in the
+ * Manual URL subsection above, the button is disabled and an inline
+ * hint points them there.
+ */
+@Composable
+private fun ManualPairingCodeSubsection(
+    connectionViewModel: ConnectionViewModel,
+) {
+    val pairingCode by connectionViewModel.pairingCode.collectAsState()
+    val relayUrl by connectionViewModel.relayUrl.collectAsState()
+
+    val clipboard = LocalClipboard.current
+    val scope = rememberCoroutineScope()
+    val snackbarHost = LocalSnackbarHost.current
+
+    // Connect state + auth-watcher attempt counter. Keyed counter so
+    // retrying cancels any in-flight watcher and restarts with a fresh
+    // 15s budget — matches the legacy Card 3 behavior byte-for-byte.
+    var connectInProgress by remember { mutableStateOf(false) }
+    var connectAttempt by remember { mutableStateOf(0) }
+    var explainerExpanded by rememberSaveable { mutableStateOf(false) }
+
+    LaunchedEffect(connectAttempt) {
+        if (connectAttempt == 0) return@LaunchedEffect
+        try {
+            val terminal = kotlinx.coroutines.withTimeout(15_000) {
+                connectionViewModel.authState
+                    .first { it is AuthState.Paired || it is AuthState.Failed }
+            }
+            connectInProgress = false
+            when (terminal) {
+                is AuthState.Paired -> snackbarHost.showSnackbar("Paired successfully")
+                is AuthState.Failed -> {
+                    val human = classifyError(
+                        IllegalStateException(terminal.reason),
+                        context = "pair",
+                    )
+                    snackbarHost.showHumanError(human)
+                }
+                else -> Unit
+            }
+        } catch (_: kotlinx.coroutines.TimeoutCancellationException) {
+            connectInProgress = false
+            val human = classifyError(
+                java.io.IOException("No response from relay"),
+                context = "pair",
+            )
+            snackbarHost.showHumanError(human)
+        } catch (e: Exception) {
+            connectInProgress = false
+            snackbarHost.showHumanError(classifyError(e, context = "pair"))
+        }
+    }
+
+    Text(
+        text = "Manual pairing code (fallback)",
+        style = MaterialTheme.typography.titleSmall,
+    )
+    Text(
+        text = "Use this when you can't scan the pairing QR. " +
+            "Follow the three steps — they're meant to be done in order on " +
+            "whatever machine you have shell access to.",
+        style = MaterialTheme.typography.bodySmall,
+        color = MaterialTheme.colorScheme.onSurfaceVariant,
+    )
+
+    // Step 1 — display + copy + regenerate
+    ManualPairStep(number = 1, title = "Copy the code below") {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            modifier = Modifier.fillMaxWidth(),
+        ) {
+            Text(
+                text = pairingCode,
+                style = MaterialTheme.typography.headlineMedium.copy(
+                    fontFamily = FontFamily.Monospace,
+                    letterSpacing = MaterialTheme.typography.headlineMedium.fontSize * 0.15,
+                ),
+                color = MaterialTheme.colorScheme.onSurface,
+                modifier = Modifier.weight(1f),
+            )
+            IconButton(onClick = {
+                scope.launch {
+                    clipboard.setClipEntry(
+                        ClipEntry(ClipData.newPlainText("Pairing code", pairingCode)),
+                    )
+                    snackbarHost.showSnackbar("Pairing code copied")
+                }
+            }) {
+                Icon(
+                    imageVector = Icons.Filled.ContentCopy,
+                    contentDescription = "Copy pairing code",
+                )
+            }
+            IconButton(onClick = { connectionViewModel.regeneratePairingCode() }) {
+                Icon(
+                    imageVector = Icons.Filled.Refresh,
+                    contentDescription = "Generate new code",
+                )
+            }
+        }
+    }
+
+    // Step 2 — host command
+    ManualPairStep(number = 2, title = "On the host running Hermes-Relay, run:") {
+        Surface(
+            color = MaterialTheme.colorScheme.surface,
+            shape = RoundedCornerShape(6.dp),
+            modifier = Modifier.fillMaxWidth(),
+        ) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier.padding(horizontal = 10.dp, vertical = 8.dp),
+            ) {
+                Text(
+                    text = "hermes pair --register-code $pairingCode",
+                    style = MaterialTheme.typography.bodySmall.copy(
+                        fontFamily = FontFamily.Monospace,
+                    ),
+                    color = MaterialTheme.colorScheme.onSurface,
+                    modifier = Modifier.weight(1f),
+                )
+                IconButton(
+                    onClick = {
+                        val cmd = "hermes pair --register-code $pairingCode"
+                        scope.launch {
+                            clipboard.setClipEntry(
+                                ClipEntry(ClipData.newPlainText("hermes pair command", cmd)),
+                            )
+                            snackbarHost.showSnackbar("Command copied")
+                        }
+                    },
+                    modifier = Modifier.size(32.dp),
+                ) {
+                    Icon(
+                        imageVector = Icons.Filled.ContentCopy,
+                        contentDescription = "Copy hermes pair command",
+                        modifier = Modifier.size(16.dp),
+                    )
+                }
+            }
+        }
+    }
+
+    // Step 3 — Connect button + relay-URL prerequisite check
+    ManualPairStep(number = 3, title = "Come back here and tap Connect") {
+        val canConnect = !connectInProgress &&
+            relayUrl.isNotBlank() &&
+            pairingCode.isNotBlank()
+        Button(
+            onClick = {
+                connectInProgress = true
+                connectAttempt += 1
+                // Atomic apply-code-and-reset avoids races between the
+                // stale session's code-regeneration and this fresh
+                // authenticate()'s mirror-write. Then kick a disconnect
+                // + connect so the WSS handshake uses the new code.
+                connectionViewModel.authManager
+                    .applyServerIssuedCodeAndReset(pairingCode)
+                connectionViewModel.disconnectRelay()
+                connectionViewModel.connectRelay(relayUrl)
+            },
+            enabled = canConnect,
+            modifier = Modifier.fillMaxWidth(),
+        ) {
+            if (connectInProgress) {
+                CircularProgressIndicator(
+                    modifier = Modifier.size(16.dp),
+                    strokeWidth = 2.dp,
+                    color = MaterialTheme.colorScheme.onPrimary,
+                )
+                Spacer(modifier = Modifier.size(8.dp))
+                Text("Connecting…")
+            } else {
+                Text("Connect")
+            }
+        }
+        if (relayUrl.isBlank()) {
+            Text(
+                text = "Relay URL not set — open the Manual URL section above to set it first.",
+                style = MaterialTheme.typography.bodySmall,
+                color = MaterialTheme.colorScheme.error,
+            )
+        }
+    }
+
+    HorizontalDivider()
+
+    TextButton(
+        onClick = { explainerExpanded = !explainerExpanded },
+        contentPadding = PaddingValues(horizontal = 0.dp),
+    ) {
+        Text(
+            text = if (explainerExpanded) "Hide explanation" else "How does this work?",
+            style = MaterialTheme.typography.bodySmall,
+        )
+    }
+    if (explainerExpanded) {
+        Text(
+            text = "This is a fallback for when you can't scan the pairing QR " +
+                "— for example, no camera, the host can't render a QR, or you " +
+                "only have SSH access from a single device. The canonical flow " +
+                "is the QR scan from `/hermes-relay-pair` or `hermes pair`.\n\n" +
+                "How it works: the phone generates a 6-character code locally. " +
+                "You paste that code into the host's `hermes pair --register-code` " +
+                "command, which pre-registers it with the relay. When you tap " +
+                "Connect here, the phone presents the same code to the relay " +
+                "and gets a long-lived session token in return.\n\n" +
+                "Bridge / device-control is gated by the master toggle on the " +
+                "Bridge tab, NOT by this pairing code. Pairing only authorizes " +
+                "the relay session.",
+            style = MaterialTheme.typography.bodySmall,
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+        )
+    }
+}
+
+/**
+ * Security posture strip — always visible on the active card, directly
+ * below the Advanced expander. Renders, in order:
+ *  - Transport security badge (wss:// vs ws://)
+ *  - Tailscale detected chip (conditional)
+ *  - Hardware keystore badge (conditional)
+ *  - Relay sessions row (always — tap to navigate)
+ *
+ * These are the "what's my pairing posture?" facts. Short + info-dense,
+ * so they don't live behind an expander.
+ */
+@Composable
+fun ActiveCardSecurityPosture(
+    connectionViewModel: ConnectionViewModel,
+    onNavigateToPairedDevices: () -> Unit,
+) {
+    val relayUrl by connectionViewModel.relayUrl.collectAsState()
+    val insecureReason by connectionViewModel.insecureReason.collectAsState()
+    val isTailscaleDetected by connectionViewModel.isTailscaleDetected.collectAsState()
+    val currentPairedSession by connectionViewModel.currentPairedSession.collectAsState()
+    val pairedDevices by connectionViewModel.pairedDevices.collectAsState()
+    // ADR 24 — surface the live endpoint role so the insecure badge can
+    // say "Plain (on LAN)" instead of "Insecure (network unknown)" when
+    // the resolver already knows which candidate we're on.
+    val activeEndpoint by connectionViewModel.activeEndpoint.collectAsState()
+
+    TransportSecurityBadge(
+        isSecure = isUrlSecure(relayUrl),
+        reason = insecureReason.ifBlank { null },
+        size = TransportSecuritySize.Row,
+        modifier = Modifier.fillMaxWidth(),
+        activeRole = activeEndpoint?.role,
+    )
+
+    if (isTailscaleDetected) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+        ) {
+            Icon(
+                imageVector = Icons.Filled.Shield,
+                contentDescription = null,
+                tint = Color(0xFF2E7D32),
+                modifier = Modifier.size(16.dp),
+            )
+            Text(
+                text = "Tailscale detected",
+                style = MaterialTheme.typography.bodySmall,
+                color = Color(0xFF2E7D32),
+            )
+        }
+    }
+
+    if (currentPairedSession?.hasHardwareStorage == true) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+        ) {
+            Icon(
+                imageVector = Icons.Filled.Shield,
+                contentDescription = null,
+                tint = MaterialTheme.colorScheme.primary,
+                modifier = Modifier.size(16.dp),
+            )
+            Text(
+                text = "Session token stored in hardware keystore",
+                style = MaterialTheme.typography.bodySmall,
+                color = MaterialTheme.colorScheme.primary,
+            )
+        }
+    }
+
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable { onNavigateToPairedDevices() }
+            .padding(vertical = 4.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.SpaceBetween,
+    ) {
+        Column(modifier = Modifier.weight(1f)) {
+            Text(
+                text = "Relay sessions",
+                style = MaterialTheme.typography.bodyMedium,
+            )
+            Text(
+                text = if (pairedDevices.isNotEmpty()) {
+                    "${pairedDevices.size} active sessions on this server"
+                } else {
+                    "Manage which phones can connect"
+                },
+                style = MaterialTheme.typography.bodySmall,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+            )
+        }
+        Icon(
+            imageVector = Icons.Filled.ChevronRight,
+            contentDescription = null,
+            tint = MaterialTheme.colorScheme.onSurfaceVariant,
+        )
+    }
+}
+
+/**
+ * Numbered step row for the Manual pairing code fallback. Tightly
+ * coupled to its Card 3 layout — step badge sizing + content shape —
+ * so it stays private-ish here rather than promoted to a shared
+ * component. Lift to `ui.components` if a second caller appears.
+ */
+@Composable
+private fun ManualPairStep(
+    number: Int,
+    title: String,
+    content: @Composable () -> Unit,
+) {
+    Row(
+        verticalAlignment = Alignment.Top,
+        horizontalArrangement = Arrangement.spacedBy(12.dp),
+        modifier = Modifier.fillMaxWidth(),
+    ) {
+        Surface(
+            color = MaterialTheme.colorScheme.primary,
+            shape = RoundedCornerShape(percent = 50),
+            modifier = Modifier.size(24.dp),
+        ) {
+            Row(
+                horizontalArrangement = Arrangement.Center,
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier.fillMaxSize(),
+            ) {
+                Text(
+                    text = number.toString(),
+                    style = MaterialTheme.typography.labelMedium,
+                    color = MaterialTheme.colorScheme.onPrimary,
+                )
+            }
+        }
+        Column(
+            modifier = Modifier.weight(1f),
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+        ) {
+            Text(
+                text = title,
+                style = MaterialTheme.typography.bodyMedium,
+                color = MaterialTheme.colorScheme.onSurface,
+            )
+            content()
+        }
+    }
+}

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

@@ -44,7 +44,7 @@ import com.hermesandroid.relay.viewmodel.BridgeStatus
  * Phase 3 Wave 1 — bridge-ui (`bridge-screen-ui`). Visual style mirrors the status
  * cards in `PairedDevicesScreen`: surfaceVariant background, 16dp padding,
  * 10dp row spacing. Uses [ConnectionStatusBadge] for the pulsing status dot
- * so the Bridge tab looks visually consistent with the Settings → Connection
+ * so the Bridge tab looks visually consistent with the Settings → Connections
  * section.
  *
  * The headline switch is `enabled = allowEnable` so users can't flip it on

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

@@ -28,7 +28,7 @@ import com.hermesandroid.relay.viewmodel.BridgeStatus
  * Phase 3 Wave 1 — bridge-ui (`bridge-screen-ui`). Kept distinct from
  * [BridgeMasterToggle] so that Agent safety-rails in Wave 2 can relocate the master
  * toggle without losing the status surface (and so we can reuse this card
- * in the Settings → Connection section later if desired).
+ * in the Settings → Connections section later if desired).
  */
 @Composable
 fun BridgeStatusCard(

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

@@ -0,0 +1,53 @@
+package com.hermesandroid.relay.ui.components
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowDropDown
+import androidx.compose.material3.AssistChip
+import androidx.compose.material3.AssistChipDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+
+/**
+ * Compact top-bar chip showing the currently-active Hermes connection.
+ * Tapping opens [ConnectionSwitcherSheet]. Kept deliberately minimal — a
+ * single row of label + dropdown caret — so it fits into the Chat top bar
+ * without hogging horizontal space.
+ */
+@Composable
+fun ConnectionChip(
+    label: String,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    AssistChip(
+        onClick = onClick,
+        label = {
+            Row {
+                Text(
+                    text = label,
+                    style = MaterialTheme.typography.labelLarge,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+                Spacer(modifier = Modifier.width(2.dp))
+                Icon(
+                    imageVector = Icons.Filled.ArrowDropDown,
+                    contentDescription = "Switch connection",
+                    modifier = Modifier,
+                )
+            }
+        },
+        colors = AssistChipDefaults.assistChipColors(
+            containerColor = MaterialTheme.colorScheme.surfaceVariant,
+        ),
+        modifier = modifier,
+    )
+}

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

@@ -0,0 +1,230 @@
+package com.hermesandroid.relay.ui.components
+
+import androidx.compose.animation.animateContentSize
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBars
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.CheckCircle
+import androidx.compose.material.icons.filled.Sync
+import androidx.compose.material.icons.filled.Warning
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import com.hermesandroid.relay.viewmodel.ConnectionHandoffStatus
+import com.hermesandroid.relay.viewmodel.ConnectionStatusSnapshot
+import com.hermesandroid.relay.viewmodel.ConnectionStatusTone
+import com.hermesandroid.relay.viewmodel.asConnectionStatusSnapshot
+
+@Composable
+fun ConnectionHandoffBanner(
+    status: ConnectionHandoffStatus?,
+    modifier: Modifier = Modifier,
+    includeStatusBarPadding: Boolean = false,
+) {
+    ConnectionStatusBanner(
+        status = status?.asConnectionStatusSnapshot(),
+        modifier = modifier,
+        includeStatusBarPadding = includeStatusBarPadding,
+    )
+}
+
+@Composable
+fun ConnectionStatusBanner(
+    status: ConnectionStatusSnapshot?,
+    modifier: Modifier = Modifier,
+    includeStatusBarPadding: Boolean = false,
+    onClick: (() -> Unit)? = null,
+) {
+    val current = status ?: return
+    val containerColor = when {
+        current.tone == ConnectionStatusTone.Error -> MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.86f)
+        current.tone == ConnectionStatusTone.Warning -> MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.62f)
+        current.success -> MaterialTheme.colorScheme.tertiaryContainer.copy(alpha = 0.58f)
+        current.active -> MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.74f)
+        else -> MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.86f)
+    }
+    val contentColor = when {
+        current.tone == ConnectionStatusTone.Error ||
+            current.tone == ConnectionStatusTone.Warning -> MaterialTheme.colorScheme.onErrorContainer
+        current.success -> MaterialTheme.colorScheme.onTertiaryContainer
+        current.active -> MaterialTheme.colorScheme.onSecondaryContainer
+        else -> MaterialTheme.colorScheme.onSurfaceVariant
+    }
+    val insetModifier = if (includeStatusBarPadding) {
+        Modifier.windowInsetsPadding(WindowInsets.statusBars)
+    } else {
+        Modifier
+    }
+
+    Column(
+        modifier = modifier
+            .fillMaxWidth()
+            .background(MaterialTheme.colorScheme.surface.copy(alpha = 0.88f))
+            .then(insetModifier)
+            .padding(horizontal = 12.dp, vertical = 6.dp),
+    ) {
+        Surface(
+            color = containerColor,
+            contentColor = contentColor,
+            shape = RoundedCornerShape(10.dp),
+            tonalElevation = 0.dp,
+            modifier = Modifier
+                .fillMaxWidth()
+                .then(if (onClick != null) Modifier.clickable(onClick = onClick) else Modifier)
+                .animateContentSize(animationSpec = tween(durationMillis = 180)),
+        ) {
+            Column(modifier = Modifier.fillMaxWidth()) {
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .heightIn(min = 34.dp)
+                        .padding(horizontal = 10.dp, vertical = 7.dp),
+                    horizontalArrangement = Arrangement.spacedBy(9.dp),
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    when {
+                        current.active -> PulsingSyncIcon(contentColor)
+                        current.success -> Icon(
+                            imageVector = Icons.Filled.CheckCircle,
+                            contentDescription = null,
+                            tint = contentColor,
+                            modifier = Modifier.size(16.dp),
+                        )
+                        current.tone == ConnectionStatusTone.Warning ||
+                            current.tone == ConnectionStatusTone.Error -> Icon(
+                                imageVector = Icons.Filled.Warning,
+                                contentDescription = null,
+                                tint = contentColor,
+                                modifier = Modifier.size(16.dp),
+                            )
+                        else -> Icon(
+                            imageVector = Icons.Filled.Sync,
+                            contentDescription = null,
+                            tint = contentColor,
+                            modifier = Modifier.size(16.dp),
+                        )
+                    }
+                    Column(
+                        modifier = Modifier.weight(1f),
+                        verticalArrangement = Arrangement.spacedBy(2.dp),
+                    ) {
+                        Row(
+                            modifier = Modifier.fillMaxWidth(),
+                            horizontalArrangement = Arrangement.spacedBy(8.dp),
+                            verticalAlignment = Alignment.CenterVertically,
+                        ) {
+                            Text(
+                                text = current.title,
+                                style = MaterialTheme.typography.labelMedium,
+                                color = contentColor,
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis,
+                                modifier = Modifier.weight(1f),
+                            )
+                            current.route?.takeIf { it.isNotBlank() }?.let { route ->
+                                Text(
+                                    text = route,
+                                    style = MaterialTheme.typography.labelSmall,
+                                    color = contentColor.copy(alpha = 0.76f),
+                                    maxLines = 1,
+                                    overflow = TextOverflow.Ellipsis,
+                                )
+                            }
+                            current.actionLabel?.takeIf { it.isNotBlank() }?.let { label ->
+                                Text(
+                                    text = label,
+                                    style = MaterialTheme.typography.labelSmall,
+                                    color = contentColor.copy(alpha = 0.86f),
+                                    maxLines = 1,
+                                    overflow = TextOverflow.Ellipsis,
+                                )
+                            }
+                        }
+                        val outputLines = current.entries
+                            .takeLast(2)
+                            .mapNotNull { entry ->
+                                val label = entry.label.trim().takeIf { it.isNotBlank() }
+                                val detail = entry.detail?.trim()?.takeIf { it.isNotBlank() }
+                                when {
+                                    label != null && detail != null -> "$label: $detail"
+                                    label != null -> label
+                                    detail != null -> detail
+                                    else -> null
+                                }
+                            }
+                            .distinct()
+                        outputLines.forEach { line ->
+                            Text(
+                                text = line,
+                                style = MaterialTheme.typography.labelSmall,
+                                color = contentColor.copy(alpha = 0.72f),
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis,
+                                modifier = Modifier.fillMaxWidth(),
+                            )
+                        }
+                    }
+                }
+                if (current.active) {
+                    LinearProgressIndicator(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .heightIn(min = 2.dp, max = 2.dp),
+                        color = contentColor.copy(alpha = 0.76f),
+                        trackColor = contentColor.copy(alpha = 0.16f),
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun PulsingSyncIcon(color: androidx.compose.ui.graphics.Color) {
+    val infinite = rememberInfiniteTransition(label = "connection-handoff-pulse")
+    val alpha by infinite.animateFloat(
+        initialValue = 0.45f,
+        targetValue = 1f,
+        animationSpec = infiniteRepeatable(
+            animation = tween(durationMillis = 900),
+            repeatMode = RepeatMode.Reverse,
+        ),
+        label = "connection-handoff-alpha",
+    )
+    Icon(
+        imageVector = Icons.Filled.Sync,
+        contentDescription = null,
+        tint = color,
+        modifier = Modifier
+            .size(16.dp)
+            .clip(CircleShape)
+            .alpha(alpha),
+    )
+}

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

@@ -238,17 +238,29 @@ fun ConnectionStatusRow(
     }
     Row(
         modifier = modifier.then(interactiveModifier),
-        verticalAlignment = Alignment.CenterVertically,
+        verticalAlignment = Alignment.Top,
         horizontalArrangement = Arrangement.spacedBy(8.dp)
     ) {
-        ConnectionStatusBadge(state = state)
+        // Small top padding on the badge so it sits visually centered with
+        // a single-line label+status, but stays aligned to the top for
+        // multi-line errors (where CenterVertically would drop it into the
+        // middle of a three-line block).
+        Box(modifier = Modifier.padding(top = 4.dp)) {
+            ConnectionStatusBadge(state = state)
+        }
 
+        // Label keeps its intrinsic width (no weight). Previously carried
+        // `weight(1f, fill = false)`, which collapsed it to 1 char wide
+        // when an unweighted statusText greedily claimed the whole row.
         Text(
             text = label,
             style = MaterialTheme.typography.bodyMedium,
-            modifier = Modifier.weight(1f, fill = false)
         )
 
+        // Status text gets the weight so long errors wrap inside their own
+        // allocation instead of squeezing the label. `fill = false` lets
+        // short statuses (e.g. "Reachable") sit naturally without forcing
+        // the row to span full width.
         Text(
             text = statusText,
             style = MaterialTheme.typography.bodyMedium,
@@ -257,7 +269,8 @@ fun ConnectionStatusRow(
                 BadgeState.Connecting -> Color(0xFFFFA726)
                 BadgeState.Probing -> MaterialTheme.colorScheme.onSurfaceVariant
                 BadgeState.Disconnected -> MaterialTheme.colorScheme.error
-            }
+            },
+            modifier = Modifier.weight(1f, fill = false),
         )
 
         if (onTest != null) {

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

@@ -0,0 +1,155 @@
+package com.hermesandroid.relay.ui.components
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.RadioButton
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import com.hermesandroid.relay.data.Connection
+
+/**
+ * Bottom sheet chooser for switching between Hermes connections. Driven by
+ * the top-bar [ConnectionChip] tap and the Settings → Connections row.
+ * Each row is a radio selection — tapping commits immediately and dismisses
+ * the sheet so the swap kicks off before the user's finger is off the screen.
+ *
+ * The "Manage connections…" footer button navigates to
+ * [ConnectionsSettingsScreen] for rename / re-pair / revoke / remove —
+ * anything beyond plain switching.
+ */
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ConnectionSwitcherSheet(
+    connections: List<Connection>,
+    activeConnectionId: String?,
+    onSelectConnection: (String) -> Unit,
+    onManageConnections: () -> Unit,
+    onDismiss: () -> Unit,
+) {
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = false)
+
+    ModalBottomSheet(
+        onDismissRequest = onDismiss,
+        sheetState = sheetState,
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 24.dp, vertical = 8.dp)
+                .navigationBarsPadding(),
+            verticalArrangement = Arrangement.spacedBy(4.dp),
+        ) {
+            Text(
+                text = "Switch connection",
+                style = MaterialTheme.typography.titleMedium,
+                modifier = Modifier.padding(bottom = 8.dp),
+            )
+
+            if (connections.isEmpty()) {
+                // Defensive: the legacy migration should always seed connection 0,
+                // but fall back to a Manage-only state if the list is empty.
+                Text(
+                    text = "No connections yet",
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    modifier = Modifier.padding(vertical = 12.dp),
+                )
+                TextButton(
+                    onClick = onManageConnections,
+                    modifier = Modifier.fillMaxWidth(),
+                ) {
+                    Text("Manage connections…")
+                }
+            } else {
+                LazyColumn(
+                    modifier = Modifier.fillMaxWidth(),
+                ) {
+                    items(connections, key = { it.id }) { connection ->
+                        ConnectionRow(
+                            connection = connection,
+                            isActive = connection.id == activeConnectionId,
+                            onClick = {
+                                onSelectConnection(connection.id)
+                                onDismiss()
+                            },
+                        )
+                    }
+                }
+
+                Spacer(modifier = Modifier.height(4.dp))
+                HorizontalDivider(
+                    color = MaterialTheme.colorScheme.outline.copy(alpha = 0.15f),
+                )
+                TextButton(
+                    onClick = onManageConnections,
+                    modifier = Modifier.fillMaxWidth(),
+                ) {
+                    Text("Manage connections…")
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun ConnectionRow(
+    connection: Connection,
+    isActive: Boolean,
+    onClick: () -> Unit,
+) {
+    val hostname = Connection.extractDefaultLabel(connection.apiServerUrl)
+    val statusLine = if (connection.pairedAt == null) {
+        "$hostname • Standard"
+    } else {
+        "$hostname • Paired"
+    }
+
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable(onClick = onClick)
+            .padding(vertical = 10.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        RadioButton(
+            selected = isActive,
+            onClick = onClick,
+        )
+        Spacer(modifier = Modifier.width(8.dp))
+        Column(modifier = Modifier.weight(1f)) {
+            Text(
+                text = connection.label,
+                style = MaterialTheme.typography.bodyLarge,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+            Text(
+                text = statusLine,
+                style = MaterialTheme.typography.bodySmall,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+    }
+}