docs: refresh upstream API baseline references

.gitattributes

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

.github/ISSUE_TEMPLATE/bug_report.yml

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

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/docs.yml

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

.github/ISSUE_TEMPLATE/feature_request.yml

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

.github/PULL_REQUEST_TEMPLATE.md

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

.github/copilot-instructions.md

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

.github/workflows/ci-android.yml

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

.github/workflows/ci-contract.yml

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

.github/workflows/ci-dashboard.yml

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

.github/workflows/ci-desktop.yml

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

.github/workflows/ci-required.yml

@@ -2,7 +2,7 @@
 # branch protection on `main` has a check name it can rely on, regardless
 # of which paths the PR touches.
 #
-# Why this exists. The other CI workflows (`ci-android.yml`, `ci-plugin.yml`,
+# 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

.github/workflows/ci-server.yml

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

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

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

.github/workflows/docs.yml

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

.github/workflows/play-listing.yml

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

.github/workflows/release-android.yml

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

.github/workflows/release-desktop.yml

@@ -1,8 +1,8 @@
-name: Release CLI
+name: Release Desktop
 
 on:
   push:
-    tags: ['cli-v*']
+    tags: ['desktop-v*']
 
 permissions:
   contents: write
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup Node.js (for npm ci + tsc)
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
           node-version: '22'
           cache: npm
@@ -89,7 +89,7 @@ jobs:
       - name: Upload CLI release assets
         uses: actions/upload-artifact@v4
         with:
-          name: cli-binaries
+          name: desktop-cli-release
           path: |
             desktop/dist/bin/hermes-relay-win-x64.exe
             desktop/dist/bin/hermes-relay-linux-x64
@@ -160,7 +160,7 @@ jobs:
       - name: Upload Windows tray release asset
         uses: actions/upload-artifact@v4
         with:
-          name: cli-windows-tray-installer
+          name: desktop-windows-tray-release
           path: desktop/dist/tray/hermes-relay-desktop-windows-x64-setup.exe
           retention-days: 7
 
@@ -171,13 +171,9 @@ jobs:
       - build-cli-binaries
       - build-windows-tray-installer
     steps:
-      # Needed so CLI_RELEASE_NOTES.md is available to render into the release body
-      # (the other publish-release steps only consume downloaded build artifacts).
-      - uses: actions/checkout@v4
-
-      - name: Extract CLI version
+      - name: Extract desktop version
         id: version
-        run: echo "version=${GITHUB_REF_NAME#cli-v}" >> "$GITHUB_OUTPUT"
+        run: echo "version=${GITHUB_REF_NAME#desktop-v}" >> "$GITHUB_OUTPUT"
 
       - uses: actions/download-artifact@v4
         with:
@@ -192,31 +188,54 @@ jobs:
             | sed -E 's#release-assets/[^/]+/##' > release-assets/SHA256SUMS.txt
           cat release-assets/SHA256SUMS.txt
 
-      # Render CLI_RELEASE_NOTES.md (hand-written per release) into the GitHub
-      # Release body. __VERSION__ = bare version (0.3.0), __TAG__ = full tag
-      # (cli-v0.3.0) so the install/pin commands stay accurate without manual edits.
-      - name: Render release notes
-        env:
-          VERSION: ${{ steps.version.outputs.version }}
-          TAG: ${{ github.ref_name }}
-        run: |
-          sed -e "s/__VERSION__/${VERSION}/g" -e "s/__TAG__/${TAG}/g" \
-            CLI_RELEASE_NOTES.md > cli_release_notes_rendered.md
-          echo "=== rendered release body ===" && cat cli_release_notes_rendered.md
-
       - name: Publish GitHub Release
         uses: softprops/action-gh-release@v3
         with:
-          name: Hermes-Relay-CLI v${{ steps.version.outputs.version }}
+          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_path: cli_release_notes_rendered.md
+          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/cli-binaries/hermes-relay-win-x64.exe
-            release-assets/cli-binaries/hermes-relay-linux-x64
-            release-assets/cli-binaries/hermes-relay-darwin-x64
-            release-assets/cli-binaries/hermes-relay-darwin-arm64
-            release-assets/cli-windows-tray-installer/hermes-relay-desktop-windows-x64-setup.exe
+            release-assets/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

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

.gitignore

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

.mcp.json

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

AGENTS.md

@@ -1,48 +0,0 @@
-# AGENTS.md
-
-Universal agent instructions for **Hermes-Relay**. This is the entry point for any
-coding agent (Claude Code, Codex, Cursor, etc.).
-
-## Read this first
-
-The detailed, authoritative context lives in **[CLAUDE.md](CLAUDE.md)** —
-architecture, the upstream Hermes API reference, repository layout, per-language
-code style, the dev loop, and the Key Files map. Read it before touching code,
-then `docs/spec.md` and `docs/decisions.md`.
-
-- Release process → **[RELEASE.md](RELEASE.md)**
-- Contributor setup → **[CONTRIBUTING.md](CONTRIBUTING.md)**
-- `android_*` toolset + MCP → **[docs/mcp-tooling.md](docs/mcp-tooling.md)**
-
-## Non-negotiables (the short list)
-
-- **Standard path = vanilla upstream only.** The default (no-plugin) connection —
-  chat via the API server, standard voice via the Hermes dashboard — must work
-  against unmodified upstream hermes-agent. Server-side needs go through upstream
-  PRs or the optional relay plugin, never fork patches.
-- **Verify endpoints against upstream** (`gateway/platforms/api_server.py` /
-  `tui_gateway/server.py` in hermes-agent) before assuming a route exists.
-- **Conventional Commits + `main`/`dev` branching.** Feature branches off `dev`,
-  `--no-ff` merges, version bumps at release-prep on `dev`, tags cut from `main`.
-- **Android:** Jetpack Compose only (no XML), kotlinx.serialization (no Gson),
-  OkHttp (no Ktor), `wss://` only. Run `./gradlew lint` before pushing Kotlin.
-- **Plugin (Python 3.11+):** aiohttp + asyncio (no threading), type hints
-  everywhere, structured `logging` (no `print`). **Desktop CLI (Node ≥21):**
-  zero runtime deps, strict TS + ES modules, ship compiled `dist/`. Full
-  per-language style and the dev loop live in CLAUDE.md → "Code Style".
-
-## Public-repo writing hygiene
-
-Everything committed is public. In CHANGELOG, DEVLOG, README, docs, and release
-notes:
-
-- **No personal names** — attribute impersonally; identity lives in git + the
-  signing cert.
-- **No private infrastructure** — real hostnames/IPs, internal deployment names,
-  `~/SYSTEM.md`. (Generic example IPs in setup docs are fine.)
-- **No AI/assistant process self-narration** ("I should have…", course
-  corrections) — state the technical conclusion only.
-- **No internal jargon or fork/branch plumbing** in user-facing notes.
-- **CHANGELOG** uses Keep-a-Changelog grouping; condense the version block to
-  crisp public bullets at release-prep (see RELEASE.md §2 "Scrub for public
-  distribution"). **DEVLOG** is a depersonalized, factual engineering log.

CHANGELOG.md

@@ -8,119 +8,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/), and this
 
 ### Added
 
-- **Injected-context audit (chat).** Tap the context-usage meter in chat to open a "What the agent sees" sheet showing the exact extra context prepended to your next turn — persona/profile, phone status, and any per-turn (voice) hint. On the gateway path it notes the persona is applied server-side, so the audit is honest about what the phone does and doesn't send.
-- **Spoken-turn badges (chat).** Voice-mode replies now carry a "Voice" chip and realtime replies a "Realtime Agent" chip — both with a speaker glyph — so spoken turns are distinguishable from typed ones in the scrollback.
-- **App themes.** A new theme picker in Settings → Appearance ships eight looks: the signature Hermes Relay brand (with full light/dark) plus ports of the Nous Hermes baselines — Hermes Teal, Nous Blue (light), Midnight, Ember, Mono, Cyberpunk, and Rosé. The whole app — brand chrome, accents, and chat background — follows the chosen theme. Light/Dark/Auto applies to themes that ship both modes; fixed-mode themes show their own complete look.
-- **Hot-swappable agent sphere.** The orb is now a pluggable "skin": an Adaptive skin that recolors to match your theme, built-in Classic / Aurora / Solar / Mono looks, and support for **user-authored skins** loaded from a small JSON spec. Each skin declares which live signals it reacts to (voice, tool bursts, activity), shown as capability badges in the picker. See `docs/sphere-spec.md`.
-- **Connections separate features from routes (Android).** Connection settings now distinguish what a connection can *do* (a **Features** section) from how this phone *reaches* Hermes (a **Route** section), so you can enable Relay features over whichever transport you prefer. A plugin-provided **Secure proxy** route is surfaced alongside LAN, Tailscale, public, and custom routes. The standard direct-to-upstream path is unchanged and still needs no plugin. See `docs/plans/2026-06-18-native-secure-routes.md`.
-- **Enhanced voice control (Gemini & xAI).** When the relay uses a Gemini or xAI voice provider, Voice Settings can now steer it: pick a Gemini voice and model and turn on expressive tone tags (with optional natural-language voice direction), or set an xAI voice with expressive speech tags. Expressive tags also apply to xAI on the streaming voice-output renderer. Standard (no-plugin) voice stays configured server-side.
-- **Voice render-path visibility.** Voice Settings shows which path is rendering speech (streaming vs. basic), and Diagnostics records it each session, making voice issues easier to troubleshoot.
+- **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`.
 
-### Changed
+- **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`.
 
-- **Voice replies are formatted for listening.** In voice mode the assistant is now guided to answer in short, conversational sentences without markdown, emoji, or raw URLs — without changing what is stored in chat history.
-- **Leaner terminal screen (Android).** The extra-keys bar scrolls horizontally with compact, fully-legible keys (no more clipped "CTRL"), the header is a single compact row showing one inline connection-status dot plus state, and the tab strip is hidden for single-tab sessions — the new-tab "+" moves into the header — reclaiming vertical space for the terminal.
-- **Relay terminals run on an isolated, TUI-tuned tmux.** Sessions now use a dedicated tmux server/socket with its own config — instant ESC (`escape-time 0`), truecolor `$TERM`, mouse and focus events on, and no status bar — so editors and full-screen tools behave correctly, without touching the user's personal tmux.
+- **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.
 
-### Fixed
+- **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.
 
-- **Clearer error when a feature needs a newer relay.** Toggling a setting an older relay plugin doesn't recognize (e.g. xAI expressive speech tags) now shows "Relay update needed" instead of a generic HTTP 400 with a dead Retry button. Genuine input errors are unaffected.
-- **Connection status toast is no longer see-through.** The floating connection-lost/switching toast renders fully opaque so content behind it no longer bleeds through and hurts legibility.
-- **Provenance badges survive the post-turn history reload.** "Voice", "Realtime Agent", "Stopped", and "Error" chips are now preserved when the conversation reloads after a turn, instead of silently vanishing.
-- **Chat and Manage no longer stay dark in Light mode.** Brand-styled surfaces bypassed the theme and were effectively hardcoded dark; they now follow the selected theme and light/dark mode, and the glow/border flourishes key off the active theme rather than the system setting.
-- **Realtime voice no longer drops the conversation mid-session with some providers.** A normal end-of-turn signal was being rejected on certain voice providers, ending the session every turn.
-- **Relay voice synthesis no longer leaves temporary audio files behind** on the server.
-- **Clearer voice errors and an oversize-recording guard.** Standard voice now rejects an over-long recording before uploading it and shows a helpful message for audio the server can't read, instead of a generic HTTP error.
-- **Terminal paste no longer auto-runs multi-line text.** The key-bar PASTE now uses bracketed paste, so multi-line content lands intact in shells and editors instead of executing line by line.
-- **Terminal on-screen arrows behave inside TUIs.** Arrow/Home/End keys follow the running app's cursor-key mode (application vs. normal), so they work correctly in vim, less, and fzf.
-- **Terminal footer spacing.** A small gap now keeps the last terminal row clear of the key bar (it could previously look like the footer overlapped it), and a redundant navigation-bar inset that left empty space below the keys was removed.
-- **In-chat model picker now actually applies on a new chat.** Picking a model and provider in the chat composer (e.g. Grok 4.3 via your xAI subscription) is bound to the new conversation, so the agent runs on the picked model instead of silently falling back to the account's global default. Switching profiles retires an explicit pick so the profile's own model takes over, and the picker label updates immediately instead of lagging a round-trip.
-- **Server-generated images render in chat when paired to the relay.** An assistant image that points at a server-side file path is now fetched through the relay's media route and shown inline (tap to zoom), instead of degrading to an "image is on the server" notice. On the SSE chat path the agent is also told it can surface images and files by path when a relay route is configured (visible in the chat "What the agent sees" sheet). Standard (no-plugin) connections are unchanged.
-- **Smoother profile switching.** Switching profiles no longer blanks the conversation to an empty/"Loading…" state before the new history loads; the previous transcript is held and cross-fades to the new one.
-
-## [1.1.0] - 2026-06-16
-
-### Added
-
-- **Automated Play Console upload on release.** When a `PLAY_SERVICE_ACCOUNT_JSON` secret is configured, pushing a stable `android-v*` tag uploads the `googlePlay` App Bundle to the Production track as a draft (a human still starts the rollout). Prereleases are skipped, and the `sideload` flavor is structurally blocked from ever publishing to Play. Without the secret, the release builds publish to GitHub Releases exactly as before.
-- **Desktop UI preview harness (`:ui-preview`).** A non-shipped Compose for Desktop module renders presentational composables in a window on the PC with Compose Hot Reload, for fast UI iteration without a device build/install loop. It reuses the shared sphere algorithm as its single source of truth.
-- **Plugin: guided env-key setup.** The relay plugin declares its optional voice-provider keys (`XAI_API_KEY`, `OPENAI_API_KEY`, `ELEVENLABS_API_KEY`) in its manifest, so `hermes plugins install` prompts for them (masked, with a "get yours" link) instead of hand-editing `.env`. The standard no-plugin path needs none.
-- **Plugin: native install path.** Tools-only setups can install via `hermes plugins install Codename-11/hermes-relay/plugin`; the full relay still uses the curl `install.sh`.
-- **`/relay` slash commands.** `relay status · devices · pair` usable mid-conversation from any platform (CLI / Discord / TUI).
-- **Dashboard relay-status widget.** A `Relay · connected / offline / unpaired` badge in the dashboard header, visible on every page.
-- **Session-start relay health check.** A minimal, fully-guarded `on_session_start` hook records relay reachability without slowing the gateway.
-
-### Changed
-
-- **Release names normalized by surface.** Future GitHub Releases are named `Hermes-Relay-Android`, `Hermes-Relay-Plugin`, and `Hermes-Relay-CLI`, with future tags on `android-v*`, `plugin-v*`, and `cli-v*`. The CLI installer and updater still understand historical `desktop-v*` prereleases during the migration.
-- **Per-surface release notes.** Plugin and CLI GitHub Releases now use hand-written `PLUGIN_RELEASE_NOTES.md` / `CLI_RELEASE_NOTES.md` files (Summary + Added/Changed/Fixed + Install/Verify) — the same format as Android's `RELEASE_NOTES.md` — instead of static boilerplate baked into the workflow. The release workflows substitute the version into the install commands automatically.
-- **Settings screen overhaul (Android).** Status pills are now exception-only — they appear only when a surface needs attention and stay quiet when healthy. The Power tools section shows a single state-aware **Plugin active / required / offline** badge instead of an identical "Relay paired" chip on every card. Connections moved to the top (above the Hermes section), Diagnostics + Developer options moved into the App section, the status chips were restyled to match the app's translucent-bordered language, and the brand blue was deepened.
-
-### Fixed
-
-- **Force-close on connect when the stored credential keyset was corrupt.** A corrupt encrypted token store (which can happen after an app upgrade or device restore) threw during construction and crashed the app right after a successful pair, on both standard and relay connections. The token store now heals a corrupt keyset on the spot, and credential storage degrades to a re-pair instead of crashing if the device keystore is unusable.
-- **Dashboard plugin: unreadable button labels.** Solid buttons in the relay dashboard panel inherited the container text colour, which matched their background. Solid button variants now keep their proper contrast colour.
-- **Installer failed on uv-managed Hermes hosts.** `install.sh` assumed `pip` lived in the hermes-agent virtualenv, but environments created by `uv` (the upstream default) ship no `pip` module, so the editable install aborted at step 2. The installer now bootstraps `pip` via `ensurepip`, or falls back to `uv pip`, so the plugin installs cleanly on uv-managed cores.
-- **Chat settings (Android).** The streaming-endpoint picker no longer wraps "Gateway"/"Sessions" onto a second line, and the system-prompt preview now reflects the enabled context toggles (foreground app, battery, safety rails) with representative placeholder values instead of looking inert.
-- **Dashboard plugin: buttons rendered as blank boxes.** The host dashboard's Nous design-system `Button`/`Badge` use boolean variant flags (`outlined`/`ghost`/`invert`) and a `tone` prop — not the shadcn-style `variant` prop the plugin passed — so every button collapsed to a solid near-white fill with an invisible label. The plugin now translates its props to the design-system contract via an adapter, and drops a label-hiding CSS reset.
-
-## [1.0.0] - 2026-06-14
-
-### Added
-
-- **Relay plugin diagnostics and install guidance.** `hermes relay doctor` now reports standard upstream API/dashboard reachability, Relay loopback state, dashboard plugin presence, plugin-manager layout, and whether the legacy bootstrap monkeypatch is installed. The plugin manifest now advertises its Android and desktop tools, and `after-install.md` gives the upstream plugin manager a first-run handoff.
-
-- **Plugin-owned compatibility hook lifecycle.** `hermes relay compat status/install/remove` now owns the optional `hermes_relay_bootstrap.pth` startup hook, so the monkeypatch can be inspected, added, or removed without rerunning the legacy installer. The standard v1.0.0 path does not require this hook.
-
-- **Legacy cleanup alignment.** The legacy installer now installs the optional `.pth` hook through the plugin compat lifecycle, and the uninstaller removes every shell shim it creates (`hermes-pair`, `hermes-status`, `hermes-relay`, `hermes-relay-update`, `hermes-relay-tailscale`) while delegating hook cleanup to `hermes relay compat remove` when available.
-
-- **Gateway chat transport with live thinking.** Chat can ride the upstream dashboard `/api/ws` (the `tui_gateway` surface the official hermes-desktop client speaks) — the only vanilla-upstream path that streams reasoning *live*, so the Thinking block and sphere light up during generation. "Auto" prefers it when the dashboard is reachable and Manage is signed in, and falls back to the SSE endpoints per turn.
-
-- **Gateway desktop parity.** Native image/PDF/file attachments (with an in-chat notice when a turn falls back to a transport that can't carry files), mid-turn **steering**, **edit & resend**, interactive **approval / clarify / sudo / secret** cards, live **subagent lanes**, a **context-window meter**, server **slash commands** in autocomplete, and **turn-complete notifications** when the app is backgrounded.
-
-- **Gateway warm-start + Keep connected in background.** Pre-warming the gateway on foreground moves the cold session-setup cost off the send path. An opt-in foreground-service toggle (both flavors; `specialUse`, off by default) holds the socket open in the background so a long-backgrounded conversation resumes instantly.
-
-- **Switch agent profiles from chat.** Pick a different agent — model, SOUL, personality, and skills — per conversation. The selection is **ephemeral** (bound to the session like the official desktop; it never changes the server's default agent for other clients). The session drawer scopes to the active profile and loads that profile's history, and the right agent is restored on cold start. The Manage tab's server-wide **Activate Profile** action now confirms first.
-
-- **Manage parity with the desktop dashboard.** Change models from the full provider catalog, manage provider keys (write-only, masked, reveal), create/edit profiles and SOUL.md, and browse/install/update skills. Manage data is cached to disk for an instant cold launch.
-
-- **Open & save chat images and attachments.** Tap an image for a full-screen viewer (pinch-zoom, double-tap, Share/Save); non-image attachments gain an Open/Share/Save menu. Saves land in `Pictures`/`Download/Hermes-Relay` with no permission on Android 10+, preserving the original bytes.
-
-- **Persistent Realtime Agent voice + background runs (ADR 33).** The realtime engine keeps one session across turns (follow-ups retain context); a long Hermes run is promoted to a tracked background task and spoken when ready, so the conversation stays responsive.
-
-- **Redesigned chat input bar.** A Telegram-clean pill field with one trailing button that morphs between Send / Voice / Stop / Steer / Queue; the slash button is gone (typing `/` still opens autocomplete).
-
-- **Routes card reachability verdicts** ("Reachable", or the specific failure reason) and per-turn **latency tracing** (`TurnLatency`, durations only) for diagnosing transport speed.
-
-### Changed
-
-- **Relay plugin/server version aligned to v1.0.0.** The Python package, plugin manifest, dashboard manifest, and relay runtime now use the same `1.0.0` line as the stable Android release so a retagged source checkout describes one product version.
-
-- **The standard (no-plugin) path is first-class.** Chat, Manage, and voice all work against an unmodified upstream Hermes agent; standard voice rides the dashboard audio surface (`/api/audio/*`) with the Manage sign-in, and relay-paired voice is the profile-aware fallback. The relay plugin is now purely additive.
-
-- **Seamless connection UX.** LAN↔Tailscale handoffs and reconnects no longer reload the chat; connection and update status are now in-theme slide-down toasts over the content instead of banners that pushed the UI around.
-
-- **Editable, roaming routes.** Add/edit/remove routes in Settings → Connections; bare-host URLs default their scheme and port (and preview what will be saved); remote-access (Tailscale) is surfaced in the main setup flow with a "Remote" readiness line.
-
-- **Faster Manage.** A shared auth preamble plus concurrent payloads cut a full load from ~40 round trips to ~12; a process-lifetime cache and startup pre-warm render the last-seen data instantly, and Manage now names which dashboard URL it's talking to.
-
-- **Faster, calmer cold start.** Key-less connections skip the multi-second keystore decrypt; the startup sphere is now the actual loading screen with narrated check lines, and the OS splash blends into it.
-
-- **Docs + branding.** The docs site was rechromed to the app theme and repositioned around the two-path story; the README and Play listing were refreshed standard-first; product-name copy normalized to **Hermes-Relay**.
-
-- **Quality-of-life.** Quote-in-reply, share-conversation-as-Markdown, ambient mode as a long-press gesture, a floating status pill, decluttered Manage cards, back buttons on pushed screens, and a softer active-connection card.
-
-### Fixed
-
-- **No "Connect to Hermes" flash on cold start.** The empty-state now distinguishes "still hydrating from disk" from "nothing configured" (`ConnectionStore.isHydrated` → `chatConnectState`), showing a quiet "Connecting to Hermes…" spinner until ready and the connect CTA only once hydration confirms no connection exists.
-
-- **In-app What's New renders cleanly** — parsed into a version subtitle, bold section headers, and real bullets instead of raw text with literal `*`.
-
-- **App-start UI freeze from Keystore lock contention.** The encrypted cookie store built its StrongBox-backed prefs eagerly in its constructor (1–4 s under a process-global lock) from several code paths at once; it now builds lazily on an I/O thread and is shared per connection.
-
-- **Standard connections now follow LAN↔Tailscale changes**, standard voice follows the resolved route (not the persisted URL), and a stale probe cache can no longer pin a dead route after a handoff or resume.
-
-- **Editing a URL no longer wipes fallback routes** (edits merge with stored extras instead of rebuilding from the edited URL alone); **"Re-check" / "Use now" no longer fail silently** (the probe always publishes its outcome and per-route failure reasons); and a network change can no longer resurrect a deliberately disconnected relay socket.
+- **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`.
 
 ## [0.8.1] - 2026-05-26
 
@@ -148,7 +44,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/), and this
 
 - **Google Play Bridge Core split.** The Google Play Android track keeps relay pairing, chat, profiles, voice, terminal/TUI, media, notification companion, relay sessions, diagnostics, and status while removing AccessibilityService-backed Device Control declarations and permissions. Sideload remains the track for screen reading, gestures, screenshots, SMS/calls, contacts/location, overlays, wake locks, and unattended control.
 
-- **Release lanes now use explicit product tags and names.** Future Android releases use `android-v*`, plugin/Python releases use `server-v*`, and CLI releases continue on `desktop-v*`. GitHub Release names now publish as `Hermes-Relay-Android vX.Y.Z`, `Hermes-Relay-Plugin vX.Y.Z`, and `Hermes-Relay-CLI vX.Y.Z`; the old relay-named server scripts remain compatibility shims.
+- **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.
 
@@ -240,7 +136,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/), and this
 
 - **Desktop CLI alpha.14 — `Ctrl+A ?` chord re-displays the chord-help banner.** The attach-time banner scrolls off as soon as anything writes to the terminal, so users mid-session forgot the verb list and had to detach + re-attach (or guess). New `Ctrl+A ?` (and `Ctrl+A h` synonym) reprints the banner to stderr without leaving the session. Banner text refactored into a single `CHORD_HELP` constant so the attach-time print, the `?` chord, and the unknown-chord hint can't drift out of sync. Unknown-chord hint now also lists `?` as one of the known verbs.
 
-- **Desktop CLI alpha.13 — `Ctrl+A v` chord in `hermes-relay shell` for in-session paste.** Reported gap: *"...we have to exit hermes-relay shell to run `hermes-relay paste`. Can we leverage a tmux hook?"* Tmux runs on the Linux server with no path back to the Windows clipboard, so server-side hooks can't help — but the existing client-side chord state machine (`Ctrl+A .` detach, `Ctrl+A k` kill, `Ctrl+A Ctrl+A` literal) is the right place. Added `Ctrl+A v`: client reads its own clipboard image (same `captureClipboardImage()` path as the `/paste` REPL command), POSTs to `/clipboard/inbox` via the new shared `stageClipboardImageToInbox(url, token)` helper exported from `commands/paste.ts`, then types `/paste\r` into the PTY so the upstream Hermes TUI consumes it in the same flow the user would have typed by hand. Status line goes to stderr so it doesn't pollute the PTY stream: `[shell] pasted 1920×1080 (245 KB) → /paste`. Reentrancy guard prevents double-stage on a fast double-press. Banner help and chord doc-comment updated to list the new verb.
+- **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
 
@@ -250,9 +146,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/), and this
 
 - **Android connection/profile state no longer leaks across switches.** Connection switches now clear the outgoing profile object immediately, load the destination connection's saved profile name only after that connection is active, and resolve it against the destination server's current profile list. The default local relay URL is now `ws://localhost:8767`, and auto-managed relay URLs are derived from the active API URL before reconnecting.
 
-- **Desktop CLI alpha.12 — install scripts truncated the prerelease suffix in the "upgrading X → Y" line.** A user saw `existing install detected: 0.3.0-alpha.9 — upgrading to 0.3.` (literally truncated mid-token). Root cause: `normalize_pinned_version` (bash) and `Get-NormalizedPin` (PowerShell) stripped everything after the first `-`, including `-alpha.N`. Comment claimed this was "for comparison against the bare semver the binary reports" — but since alpha.4, the binary's `--version` reports the FULL semver (via the embedded `gen:version` constant), so the strip is no longer defensive, just lossy. Removed the suffix-strip from both normalizers; both now produce `0.3.0-alpha.11` from `desktop-v0.3.0-alpha.11`. The equality compare at line 138 still works because both sides include the prerelease tail.
+- **Desktop CLI alpha.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.** On alpha.9, `hermes-relay update --check` expected to see alpha.10 but reported "Up to date." Root cause: GitHub's `/repos/.../releases` API returns rows ordered by the release object's `created_at`, NOT by SemVer of the tag — and `created_at` shifts whenever the row is touched (re-tag, manual edit, asset replacement). When alpha.9's release row got touched after alpha.10 was tagged, the API listed alpha.9 first and all three of our resolvers blindly took `[0]`. Fix: pick the SemVer-max from all desktop-v* tags explicitly. (1) `desktop/src/updater.ts` — `desktop.reduce((max, r) => compareVersions(r.tag_name, max.tag_name) > 0 ? r : max)`. (2) `desktop/scripts/install.sh` — `sort -V | tail -1` (zero new deps; bash + sort is sufficient). (3) `desktop/scripts/install.ps1` — custom `Sort-Object` comparator that packs (Major, Minor, Patch, PrereleaseRank, PrereleaseNum) into a zero-padded sortable string with alpha=1, beta=2, rc=3, stable=999. Live-verified against the real API: all three now return `desktop-v0.3.0-alpha.10` instead of `alpha.9`.
+- **Desktop CLI alpha.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`.
 
@@ -274,9 +170,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/), and this
 
 ### Fixed
 
-- **desktop CLI binary was a no-op on alpha.3** — installed cleanly, exited 0, produced zero stdout/stderr, wasn't "recognized" as a CLI. Root cause: cli.ts guarded its entry-point invocation with `fileURLToPath(import.meta.url) === process.argv[1]`, which is a valid Node idiom but fails in Bun-compiled binaries because the entry module has a synthetic URL that doesn't match the `.exe` path — the check evaluated false, `main()` was never called, binary exited 0 silently. Replaced with `import.meta.main` (cross-runtime: Bun, Node 20.11+, tsx) which is true in the entry module regardless of compile mode. All four invocation paths stay correct (Bun --compile binary, `bin/hermes-relay.js` shim, `tsx src/cli.ts`, test imports). Caught by adding a local `npm run smoke` target that runs the compiled Windows binary against `--version` / `--help` / `doctor` and verifies each produces output. Same smoke runs in `release-cli.yml` on the Linux target so future regressions of this class are caught pre-publish. Affects `desktop-v0.3.0-alpha.3`; fix ships as `desktop-v0.3.0-alpha.4`.
+- **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 the CLI release workflow, and (2) refactored the four build steps to delegate to `npm run build:bin:*` so the package.json scripts are the single source of truth for compile flags. Added a `bun --version` diagnostic step to the workflow for future triage. Versions affected: `desktop-v0.3.0-alpha.1` and `desktop-v0.3.0-alpha.2`. Fix ships as `desktop-v0.3.0-alpha.3`.
+- **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
@@ -326,13 +222,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/), and this
 
 ### Changed
 
-- **Top-bar connection chip → inline switcher in the Agent sheet.** The app-wide `ConnectionChip` row that used to sit above every primary tab has been removed. Multi-connection switching now renders as a radio list inside the existing Agent sheet's Connection section (matching the visual pattern of the Profile and Personality sections above it), visible only when ≥2 connections are paired. Tapping a non-active connection fires `switchConnection` + a confirmation toast. Reasons: the chip duplicated the Agent sheet's Connection metadata, ate vertical space above every screen, and exposed the placeholder's `New connection…` label whenever an orphan existed (the root cause of the double-pair confusion). Dead code removed: the `ConnectionChip` import, the `connectionSheetVisible` state, the `ConnectionSwitcherSheet` render block at the bottom of `RelayApp`, and the `connectionChipVisible` / `activeConnection` vals. `ConnectionSwitcherSheet.kt` itself is kept for future programmatic callers.
+- **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 (deliberate: lint debt should still block). The release-merge PR from `dev` → `main` flips tests back to strict, so nothing sneaks through to a tagged release.
+- **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.
@@ -709,7 +605,7 @@ sees the toggle, never installs the wake lock, and never invokes
 
 ### Added — Voice intent → server session sync (v0.4.1 fast-follow)
 
-- **Voice actions now reach the server-side LLM's session memory.** Previously, phone-local voice intents (`open Chrome`, `text Sam saying hi`, etc.) ran in-process via `BridgeCommandHandler.handleLocalCommand` and appended local-only trace bubbles to the chat scroll. The Hermes API server's session never learned about them, so a follow-up text question like "did that work?" hit the LLM with no context and returned hallucinated answers (per a 2026-04-14 on-device repro).
+- **Voice actions now reach the server-side LLM's session memory.** Previously, phone-local voice intents (`open Chrome`, `text Sam saying hi`, etc.) ran in-process via `BridgeCommandHandler.handleLocalCommand` and appended local-only trace bubbles to the chat scroll. The Hermes API server's session never learned about them, so a follow-up text question like "did that work?" hit the LLM with no context and returned hallucinated answers (per Bailey's 2026-04-14 on-device repro).
 - **Implementation.** Each phone-local voice intent now records a structured `VoiceIntentTrace` (tool name, JSON args, success, JSON result envelope) on the post-dispatch chat-trace bubble it produces. `VoiceIntentSyncBuilder` walks the chat history before each `POST /v1/runs` / `POST /api/sessions/{id}/chat/stream` call and synthesizes OpenAI-format `assistant` (with `tool_calls`) + `tool` (with `tool_call_id`) message pairs from any unsynced traces. The synthesized array rides under the existing payload's new `messages` field — additive, ignored by older servers, picked up by anything OpenAI Chat Completions–shaped. Idempotency: traces flip to `syncedToServer=true` the moment the API client takes ownership of the request, so subsequent turns don't re-emit them.
 - **Zero server changes.** Frontend-only, no hermes-agent edits needed.
 - **Files.** `data/ChatMessage.kt` (new `voiceIntent: VoiceIntentTrace?` field), `voice/VoiceIntentSyncBuilder.kt` (pure-function builder + helpers), `network/HermesApiClient.kt` (optional `voiceIntentMessages` parameter on both stream methods), `viewmodel/ChatViewModel.kt` (build + sync + flag flip in `startStream`), `viewmodel/VoiceViewModel.kt` (extended dispatch callback wires the structured trace into the chat-trace bubble), `voice/VoiceBridgeIntentHandler.kt` (new `androidToolName` + `androidToolArgsJson` on `IntentResult.Handled`), sideload `VoiceBridgeIntentHandlerImpl.kt` populates them per intent, sideload + googlePlay `VoiceBridgeIntentFactory.kt` typealias updates. Tests in `test/voice/VoiceIntentSyncBuilderTest.kt` (12 cases — empty input, single success, failure with error_code, idempotency, chronological order, prefix gate, blank-args gate, call-id pairing, helpers) and `test/network/handlers/ChatHandlerTest.kt` (4 new cases for trace storage + `markVoiceIntentsSynced`).
@@ -1291,9 +1187,7 @@ MVP release — native Android companion app for Hermes agent with direct API ch
 - **Dev scripts** — build, install, run, test, relay via scripts/dev.bat
 - **ProGuard rules** — okhttp-sse, markdown renderer, intellij-markdown parser
 
-[Unreleased]: https://github.com/Codename-11/hermes-relay/compare/android-v1.0.0...HEAD
-[1.0.0]: https://github.com/Codename-11/hermes-relay/compare/android-v0.8.0...android-v1.0.0
-[0.8.1]: https://github.com/Codename-11/hermes-relay/compare/android-v0.8.0...android-v0.8.1
+[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

CLAUDE.md

@@ -4,20 +4,18 @@
 
 ## What This Is
 
-A native Android app (Kotlin + Jetpack Compose) paired with an optional Python relay plugin/server (aiohttp) for the Hermes agent platform. Standard chat, Manage, and dashboard voice work against unmodified upstream Hermes. Relay adds phone control, terminal, remote desktop tooling, extra voice engines, and dashboard Relay management.
+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:** v1.0.0 stable. The default no-plugin path supports chat, Manage, and voice on vanilla upstream Hermes. Chat auto-prefers the dashboard `/api/ws` gateway transport when Manage auth is ready, then falls back to API-server SSE routes. Standard voice uses dashboard `/api/audio/*` with the Manage session. Relay remains an additive power path for terminal, bridge/device control, notification companion, extra/provider-native voice, remote access, and desktop tooling. Two Android product flavors ship: `googlePlay` (conservative, no unattended Device Control surface) and `sideload` (full-capability).
+**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
 
 ```
-Phone (WS)       -> Hermes dashboard (:9119)     [standard gateway chat, live thinking]
-Phone (HTTP/SSE) -> Hermes API Server (:8642)    [standard chat fallback, sessions, runs]
-Phone (HTTP)     -> Hermes dashboard (:9119)     [standard Manage + voice]
-Phone (WSS/HTTP) -> Relay plugin/server (:8767)  [optional bridge, terminal, relay voice, remote tools]
+Phone (HTTP/SSE) → Hermes API Server (:8642)   [chat — direct]
+Phone (WSS)      → Relay Server (:8767)          [bridge, terminal]
 ```
 
-The standard path must stay vanilla upstream only. API-server bearer auth and dashboard cookie auth are separate. Terminal and bridge require Relay pairing; standard chat, Manage, and dashboard voice must not.
+Chat goes directly to the API server via HTTP/SSE. The API key (Bearer token) is optional — most local setups run without one. Terminal will go through tmux via the relay. Bridge wraps existing relay protocol. See docs/decisions.md for why.
 
 ### Upstream Hermes API Reference
 
@@ -31,54 +29,46 @@ The standard path must stay vanilla upstream only. API-server bearer auth and da
 | `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 (api_server surface) | — |
 
-**Compatibility endpoints (not all native upstream API-server routes):**
+**Baseline upstream endpoints vs compatibility endpoints:**
 
-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:
+Upstream hermes-agent now has a native baseline for API Server session control and skill/toolset discovery:
 
-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** (`plugin/hermes_relay_bootstrap/`) — monkey-patches aiohttp on startup via `.pth` file for older or partial core builds. It skips native routes per method/path and should be retired per surface, not treated as the preferred path. The repo-root `hermes_relay_bootstrap/` package is a legacy import shim.
-3. **Legacy fork branches** — useful as lineage only. Do not cite `feat/session-api` / `#8556` as the current upstream contract.
+1. **Native upstream** — commit [`f7527b0`](https://github.com/NousResearch/hermes-agent/commit/f7527b0fdb54f01691547df03fc65a6d367f9fde), merged via PR [#33134](https://github.com/NousResearch/hermes-agent/pull/33134), salvaged the focused session-control work from closed PR [#29302](https://github.com/NousResearch/hermes-agent/pull/29302). It provides `/api/sessions/*`, session chat/stream, fork/messages, plus `/v1/skills` and `/v1/toolsets`.
+2. **Codename-11 `axiom` fork** — still carries compatibility/client-metadata routes that upstream does not provide yet: `/api/sessions/search`, `/api/memory`, `/api/skills` detail routes, `/api/config`, and `/api/available-models`.
+3. **Bootstrap injection** (`hermes_relay_bootstrap/`) — monkey-patches aiohttp on startup via `.pth` file and injects only missing compatibility routes for older or partial upstream builds. It should remain per-route/per-feature, not all-or-nothing.
 
 | Endpoint | Purpose | Provided by |
 |----------|---------|-------------|
-| `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 |
+| `GET /api/sessions` (CRUD) | Session list/create/rename/delete/fork | Native upstream OR fork OR bootstrap |
+| `GET /api/sessions/{id}/messages` | Conversation history | Native upstream OR fork OR bootstrap |
+| `GET /api/sessions/search` | Full-text message search | Fork OR bootstrap only |
+| `POST /api/sessions/{id}/chat/stream` | Session-based SSE chat | Native upstream OR fork only (NOT bootstrap) |
+| `GET /v1/skills` | Skill list metadata | Native upstream OR fork |
+| `GET /api/config`, `PATCH /api/config` | Personalities + model config | Fork OR bootstrap only |
+| `GET /api/skills`, `/{name}` | Legacy skill discovery/detail routes | Fork OR bootstrap only; Android prefers `/v1/skills` first |
+| `PUT /api/skills/toggle` | Enable/disable installed skill | `hermes_cli/web_server.py` dashboard surface; mirrored into bootstrap |
+| `GET/POST/PATCH/DELETE /api/memory` | Memory CRUD | Fork OR bootstrap only |
+| `GET /api/available-models` | Provider-aware model list | Fork OR bootstrap only |
 
-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.
+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.
 
-**Dashboard web server (separate surface — standard Manage / Desktop remote gateway):**
+**Dashboard web server (separate surface — loopback-only):**
 
-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 uses it for Manage, standard voice, and the gateway chat transport. `/api/ws` is backed by `tui_gateway/server.py` (what hermes-desktop + the Ink TUI speak) and is the only upstream surface with **live** `reasoning.delta`/`thinking.delta` streaming; the api_server SSE paths remain the standard fallback. Relay-only capabilities remain behind Relay pairing. **Do not proxy dashboard auth or dashboard admin APIs over the relay.**
+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/logs`, `/api/analytics/usage`. Auth is a page-injected `window.__HERMES_SESSION_TOKEN__` — loopback-only, no external issuance. **Do not proxy this surface over the relay.** Phone consumes the narrower, fork/bootstrap `api_server.py` surface or relay-native profile-scoped endpoints.
 
 **Tool call rendering paths:**
 1. **Runs API** — Emits `tool.started`/`tool.completed` as real SSE events → `ToolProgressCard` in real-time.
-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.
+2. **Sessions API** — No structured tool events during streaming; reloads message history on stream complete ("session_end reload" pattern).
 3. **Annotation parser** — Fallback for servers emitting inline markdown annotations (`` `💻 terminal` ``).
 
 ## Key Instructions
-- **Standard path = vanilla upstream only.** The default (no-plugin) connection path — gateway/API chat, Manage, and standard voice via the dashboard surface — must work against **unmodified upstream hermes-agent**: no fork patches, no bespoke server config as a dependency. The app ships on Google Play to users whose servers we don't control. Features that need server-side changes go through upstream PRs (with graceful degradation until merged) or live behind the opt-in relay plugin.
 - **Always verify upstream before assuming an endpoint exists.** Check `gateway/platforms/api_server.py` in hermes-agent. If an endpoint isn't there, document whether bootstrap injects it or it requires the fork.
 - If we use a non-standard endpoint, ensure `probeCapabilities()` covers it and the auto-resolver degrades gracefully.
-- **Bootstrap maintenance:** Retire `plugin/hermes_relay_bootstrap/` per surface. Sessions and read-only skills/toolsets now have native upstream replacements; config, memory, legacy skill detail/toggle, available-models, and slash middleware still need explicit replacement decisions before full removal.
+- **Bootstrap maintenance:** Do not remove `hermes_relay_bootstrap/` just because upstream has native sessions. It can start shrinking only after each Relay-consuming compatibility route has a native replacement or the Android/Desktop clients have migrated away from it.
 
 ## Repository Layout
 
@@ -95,10 +85,6 @@ hermes-android/
 │   ├── accessibility/       # HermesAccessibilityService, ScreenReader, ActionExecutor
 │   ├── bridge/              # BridgeSafetyManager, BridgeForegroundService, BridgeStatusOverlay
 │   └── notifications/       # HermesNotificationCompanion
-├── relay-core/              ← [EXPERIMENTAL] Quest/XR shared core lib (com.axiomlabs.hermesrelay.core) — pairing, transport, terminal, voice, wire
-├── relay-ui/                ← [EXPERIMENTAL] Quest/XR shared Compose UI lib — sphere, terminal WebView, QR scanner
-├── quest/                   ← [EXPERIMENTAL] Meta Spatial SDK Quest/XR app (gradle includeBuild; in development, not shipped)
-├── ui-preview/              ← Desktop Compose Hot Reload harness for PC UI iteration (NOT shipped; shares MorphingSphereCore)
 ├── desktop/                 ← Node thin-client CLI (`@hermes-relay/cli`)
 │   ├── bin/hermes-relay.js  # #!/usr/bin/env node shim → dist/cli.js
 │   ├── src/
@@ -122,7 +108,7 @@ hermes-android/
 │   ├── tools/               # android_navigate.py, android_notifications.py
 │   └── dashboard/           # hermes-agent dashboard plugin — manifest, React UI, FastAPI proxy
 ├── relay_server/            ← Thin compat shim → plugin.relay (legacy entrypoint)
-├── hermes_relay_bootstrap/  ← Legacy import shim for older startup hooks
+├── hermes_relay_bootstrap/  ← Runtime patch for vanilla/partial upstream compatibility routes
 ├── 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
@@ -136,17 +122,6 @@ hermes-android/
 - **DEVLOG.md** — update at end of each work session with what was done, what's next, blockers
 - **CLAUDE.md hygiene:** Key Files entries must stay one line — implementation detail belongs in the file or `docs/`. Run `/revise-claude-md` after feature-heavy sessions to trim drift.
 
-### Public-repo writing hygiene
-
-This is a **public, distributed repo** — every committed file (CHANGELOG, DEVLOG, README, docs, release notes) is public-facing. Write accordingly:
-
-- **No personal names** in prose — attribute impersonally ("a user reported", "observed"). Author identity lives in git history + the signing cert, not the changelog.
-- **No private infrastructure** — real server hostnames/IPs, internal deployment names, `~/SYSTEM.md` contents. (Generic example IPs like `192.168.1.100` in setup docs are fine.)
-- **No AI/assistant process self-narration** — no "I should have…", no course-correction confessionals. State the technical conclusion, not the path to it.
-- **No internal jargon / fork-branch plumbing** in user-facing notes — keep *what changed*, drop *where we staged it*.
-- **CHANGELOG** uses Keep-a-Changelog grouping (Added / Changed / Fixed). Detail may accumulate during iteration, but at **release-prep the version block is condensed to crisp public bullets** (1–2 lines each) — deep "how we debugged it" stays in commits/DEVLOG. See [RELEASE.md](RELEASE.md) §2 "Scrub for public distribution".
-- **DEVLOG.md** is a committed, factual engineering log — what changed, why, and verification — depersonalized and third-person, not a diary.
-
 ### Code Style — Android (Kotlin)
 - **Jetpack Compose** — no XML layouts. Material 3 / Material You.
 - **kotlinx.serialization** — not Gson. Type-safe, faster.
@@ -173,14 +148,14 @@ This is a **public, distributed repo** — every committed file (CHANGELOG, DEVL
 - **Branching model (as of 2026-04-19):** `main` + `dev`. Feature branches target `dev`, not `main`. `main` receives only release merges (and tags). No straight-to-main exemption — even single-file typos go through `dev`.
 - **Merge style:** `git merge --no-ff` — no squash. Preserves per-commit trail for agent-team branches on every merge in the chain (feature → dev → main).
 - **Merging ≠ releasing.** Feature branches land on `dev` continuously as CI goes green; each PR appends to `[Unreleased]` in `CHANGELOG.md` on `dev`. Releases are a separate act — cut when accumulated state is worth shipping, not per-feature. See `RELEASE.md` "When to cut a release."
-- **Version bumps happen on `dev`, then release-merge to `main`.** Bump only the surface being released: `scripts/bump-android-version.sh` for `android-vX.Y.Z`, `scripts/bump-plugin-version.sh` for `plugin-vX.Y.Z`, and `desktop/package.json` for `cli-vX.Y.Z`. The release commit lives on `dev`, then a release PR merges `dev` → `main` with `--no-ff`, then the surface tag is cut from `main`.
+- **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 is split by path:** `.github/workflows/ci-android.yml` runs on app/Gradle changes; `.github/workflows/ci-plugin.yml` runs on plugin/Python changes. Both trigger on pushes to `main` and `dev` and on PRs targeting either. Build + tests must pass before merge to `dev`; release-merge to `main` requires the same.
+- **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
 
@@ -188,22 +163,14 @@ This is a **public, distributed repo** — every committed file (CHANGELOG, DEVL
 |------|-----|
 | `docs/spec.md` | Full specification — protocol, UI layouts, phases, dependencies |
 | `docs/decisions.md` | Architecture decisions — framework choice, channel design, auth model |
-| `AGENTS.md` | Universal agent entry point — points here + the non-negotiables (standard-path, commits, writing hygiene) |
-| `docs/mcp-tooling.md` | MCP server setup — android-tools-mcp + mobile-mcp; `android_*` tool usage patterns |
+| `AGENTS.md` | Tool usage patterns for the `android_*` toolset |
+| `docs/mcp-tooling.md` | MCP server setup — android-tools-mcp + mobile-mcp |
 | **App — Core** | |
 | `ui/RelayApp.kt` | Main scaffold — bottom nav, Compose navigation |
 | `viewmodel/ChatViewModel.kt` | Chat orchestration — send, stream, cancel, slash commands |
 | `viewmodel/ConnectionViewModel.kt` | Dual connection model (API + relay); `resolveStreamingEndpoint()`; derived `relayUiState` flow + `markPaired` hook stamp the active Connection |
 | `viewmodel/RelayUiState.kt` | Shared sealed state for the relay row — 5 cases + `asBadgeState()` / `statusText()` extensions; 5s grace window before Stale |
 | `network/HermesApiClient.kt` | Direct HTTP/SSE — `sendRunStream()`, `sendChatStream()`, `probeCapabilities()` |
-| `network/GatewayChatClient.kt` | Gateway chat transport — JSON-RPC over dashboard `/api/ws` (tui_gateway); live `reasoning.delta`; fresh ws-ticket per connect; per-turn SSE fallback via `onPreflightFailure`; `prewarm()` (connect+resume off the send path); `setKeepAliveInBackground()` suppresses the 120s idle-close |
-| `network/GatewayKeepAliveService.kt` | Opt-in `specialUse` foreground service (BOTH flavors; declared in main manifest; Play needs a Console FGS declaration) holding the process up so the gateway socket survives background/Doze; driven by ConnectionViewModel from the `KEY_GATEWAY_KEEP_ALIVE` toggle; stops on task-removal |
-| `data/GatewayKeepAlivePrefs.kt` | Shared `KEY_GATEWAY_KEEP_ALIVE` pref key + `Context.setGatewayKeepAlive()` — used by ConnectionViewModel (StateFlow/setter) and the FGS Stop action |
-| `network/GatewayEventMapper.kt` | Pure-JVM gateway event→callback mapping for one turn; unknown event types silently ignored; tui_gateway usage-key translation |
-| `network/GatewayModels.kt` | `GatewayAvailability`, `ActiveTurnHandle`, `GatewayTurnCallbacks` (all members REQUIRED — forces dispatchOn main-thread wrap), `GatewayAsk`, `GatewaySubagentEvent`, `resolveStreamingEndpointPreference()` |
-| `ui/components/ChatInputBar.kt` | Redesigned input bar — pill field, one trailing slot morphing Send/Voice/Stop/Steer/Queue, no slash button (long-press + opens palette) |
-| `ui/components/SubagentLane.kt` | Per-taskIndex subagent progress lane — guide rail, compact tool rows, auto-collapse |
-| `notifications/TurnCompleteNotifier.kt` | Turn-complete local notification when backgrounded — channel `chat_turn_complete`, cancel on resume, settings-gated |
 | `network/ConnectionManager.kt` | WSS to relay with auto-reconnect; rebuilds OkHttpClient with fresh CertPinner on connect |
 | `network/ChannelMultiplexer.kt` | Envelope routing by channel; `sendNotification()` for notification outbound |
 | `network/handlers/ChatHandler.kt` | Chat message state, streaming events, tool annotation parser |
@@ -242,16 +209,12 @@ This is a **public, distributed repo** — every committed file (CHANGELOG, DEVL
 | `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 |
-| `util/MediaSaver.kt` | Save/share/open for chat media — MediaStore scoped-storage save (Pictures/Download `Hermes-Relay`, no perms on API 29+; pre-Q → share sheet); FileProvider share staging; remote-byte fetch; magic-byte image-MIME sniff for correct extensions |
-| `ui/components/ChatImageViewer.kt` | Full-screen image viewer — pinch-zoom/pan (`detectTransformGestures`), double-tap 1×/2.5×, Share/Save/Close; `ChatImageViewerSource` decouples Coil-model/bitmap display from a suspend `bytesProvider` so Save keeps original bytes |
-| `ui/components/InboundAttachmentCard.kt` | Discord-style attachment card for images/video/audio/pdf/text/generic; image tap → ChatImageViewer, file card long-press → Open/Share/Save menu |
-| `ui/components/ChatImageContent.kt` | Parses `![alt](src)` out of assistant content; remote http(s) → Coil (tap → ChatImageViewer), server-local/failed → inline "can't render" notice with the path |
+| `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 |
-| `util/TurnLatencyTracer.kt` | One `TurnLatency` INFO line per chat turn — `warm/cold` + `connect/session/submit/ttfe/ttft/done@…ms`; gateway + 3 SSE paths use it for desktop-comparable latency diagnosis; durations only |
 | **Relay — Server** | |
 | `plugin/relay/server.py` | Canonical relay — WSS + HTTP routes; bridge, media, voice, session, pairing handlers. `handle_pairing_mint` mirrors `pair.py:762` — top-level = API server, `relay.{url,code}` nested |
 | `plugin/relay/auth.py` | PairingManager, SessionManager, RateLimiter; `math.inf` for never-expire |
@@ -266,12 +229,9 @@ This is a **public, distributed repo** — every committed file (CHANGELOG, DEVL
 | `plugin/tools/android_tool.py` | 18 `android_*` tool handlers (14 baseline + send_sms, call, search_contacts, return_to_hermes); `android_screenshot` first consumer of `register_media()` |
 | `plugin/tools/android_navigate.py` | Vision-driven navigation loop; up to 20 iterations; `llm_gap` error until vision client wired |
 | `plugin/pair.py` | QR payload builder + CLI; `build_payload(sign=True)`; `--register-code` fallback |
-| `plugin/doctor.py` | `hermes relay doctor`; checks standard upstream API/dashboard reachability, Relay loopback state, plugin layout, and compat hook state |
-| `plugin/compat.py` | `hermes relay compat status/install/remove`; owns the optional `hermes_relay_bootstrap.pth` lifecycle |
-| `plugin/hermes_relay_bootstrap/` | Plugin-owned runtime compatibility patch; skips native routes per method/path; retire only after remaining config/memory/legacy skill/slash gaps are handled |
 | `install.sh` | Canonical installer — 6 steps; idempotent; drops `hermes-relay-update` shim |
 | `uninstall.sh` | Canonical uninstaller; reverses install.sh; never touches `.env` or `state.db` |
-| `hermes_relay_bootstrap/` | Legacy import shim for old `.pth` files and editable installs |
+| `hermes_relay_bootstrap/` | Runtime patch for vanilla/partial upstream compatibility routes; shrink per route group after native parity or client migration |
 | **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 |
@@ -317,16 +277,10 @@ This is a **public, distributed repo** — every committed file (CHANGELOG, DEVL
 | **Desktop CLI — dev iteration** | |
 | `npm run smoke` (in `desktop/`) | Builds Windows binary + runs `--version` / `--help` / `doctor`, fails loud on zero-output. Local pre-flight before cutting any tag. |
 | `npm run gen:version` | Regenerates `src/version.ts` from `package.json`. Runs automatically before every `build` / `build:bin:*`. |
-| `release-cli.yml → Smoke-test Linux binary` step | CI-side equivalent: runs compiled Linux binary through the same 3-command check before uploading assets. Catches silent-exit-0 + segfault classes. |
+| `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 |
-| **Gradle modules — experimental Quest/XR (in development)** | |
-| `relay-core/` | [EXPERIMENTAL] Android library (`com.axiomlabs.hermesrelay.core`) — shared pairing/transport/terminal/voice/wire for the Quest port; not yet wired into the shipped `:app` |
-| `relay-ui/` | [EXPERIMENTAL] Android library (`com.axiomlabs.hermesrelay.ui`) — shared Compose UI (sphere, terminal WebView, QR scanner) for the Quest port; carries its own sphere copy |
-| `quest/` | [EXPERIMENTAL] Meta Spatial SDK Quest/XR app — gradle `includeBuild("quest")`; needs further development, not shipped |
-| **Tooling — dev iteration (not shipped)** | |
-| `ui-preview/` | Desktop Compose Hot Reload harness — JVM Compose for Desktop; source-shares `MorphingSphereCore` from `:relay-ui`; `Main.kt` gallery; see `ui-preview/README.md` |
 
 ## What NOT to Do
 
@@ -374,7 +328,7 @@ Curls every bridge HTTP route via `localhost:8767`. Catches the silent-drop regr
 1. **Edit locally** — Windows checkout. Both plugin (`plugin/`) and app (`app/`) live here.
 2. **Python syntax check** — `python -m py_compile plugin/<file>.py`. Full tests run on the server.
 3. **Kotlin changes** — do NOT run `gradle build`. Bailey builds via Android Studio's ▶ button. Never `adb install` from Claude.
-4. **Before pushing Kotlin changes** — run `./gradlew lint` locally. It's the exact task CI runs and catches errors Android Studio's live inspections miss — e.g. `UnsafeOptInUsageError` with `kotlin.OptIn` vs `androidx.annotation.OptIn`, `FlowOperatorInvokedInComposition` (mapped flows inside Composables), Media3 `@UnstableApi` propagation. Android CI runs lint alongside build/test for faster feedback, but a local lint run still surfaces issues before the workflow spends runner time compiling and packaging.
+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`.
@@ -393,12 +347,6 @@ Server is a Linux box running hermes-agent with hermes-relay editable-installed
 
 **Update:** `hermes-relay-update` (idempotent, re-fetches install.sh). Or manually: `git pull --ff-only && systemctl --user restart hermes-relay`.
 
-**Compat hook:** `hermes relay compat status/install/remove` manages only the
-optional `hermes_relay_bootstrap.pth` startup hook. New installs load the
-plugin-owned bootstrap from `plugin/hermes_relay_bootstrap/`; the repo-root
-package is only a legacy import shim. Standard chat, Manage, and dashboard voice
-must not depend on this hook.
-
 **Key conventions:**
 - Phone re-pairs after each relay restart (SessionManager is in-memory; wiped on restart)
 - Use `python -m unittest` not `pytest` — conftest imports `responses` which may not be installed
@@ -417,25 +365,20 @@ must not depend on this hook.
 
 See [RELEASE.md](RELEASE.md) for the full recipe.
 
-- **Android version source:** `gradle/libs.versions.toml` (`appVersionName`, `appVersionCode`); bump with `scripts/bump-android-version.sh`
-- **Relay plugin version source:** `pyproject.toml`; keep plugin/dashboard metadata synced with `scripts/check-plugin-version-sync.py`; bump with `scripts/bump-plugin-version.sh`
-- **Desktop CLI version source:** `desktop/package.json`; regenerate `desktop/src/version.ts` with `npm run gen:version`
-- **Track audit:** `python scripts/check-version-tracks.py` reports Android, plugin, and CLI versions without forcing them to match
-- **`appVersionCode` is monotonic** — always increment across Android prereleases
-- **Cut a release:** bump the target surface → commit → merge `dev` to `main` → tag with `android-v*`, `plugin-v*`, or `cli-v*` → push tag → CI builds + GitHub Release
+- **Version source:** `gradle/libs.versions.toml` (`appVersionName`, `appVersionCode`)
+- **Bump atomically:** `bash scripts/bump-version.sh <new-version>` — updates all three sources
+- **`appVersionCode` is monotonic** — always increment across prereleases
+- **Cut a release:** bump → commit → `git tag vMAJOR.MINOR.PATCH` → push tag → CI builds + GitHub Release
 - **Required secrets:** `HERMES_KEYSTORE_BASE64`, `HERMES_KEYSTORE_PASSWORD`, `HERMES_KEY_ALIAS`, `HERMES_KEY_PASSWORD`
 
 ## Integration Points
 
 | Surface | Endpoint | Notes |
 |---------|----------|-------|
-| Chat (gateway) | Dashboard `POST /api/auth/ws-ticket` -> WS `/api/ws` | Standard upstream dashboard/tui_gateway path; live thinking/reasoning; requires dashboard auth |
-| Chat streaming | `POST /v1/runs` → `GET /v1/runs/{id}/events` | Structured tool events; async run-control path |
-| Chat (sessions) | `POST /api/sessions/{id}/chat/stream` | Native upstream session-persisted SSE; preferred when capability probe finds it |
+| Chat 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 (compat) | `POST /v1/chat/completions` (stream=true) | Inline tool annotations only |
-| Session CRUD | `GET/POST/PATCH/DELETE /api/sessions` | Native upstream (#33134); bootstrap fallback only for old builds |
-| Manage | Dashboard `/api/status`, `/api/auth/me`, `/api/config`, `/api/profiles/*`, `/api/env`, `/api/model/*`, `/api/mcp/*` | Standard upstream dashboard surface; do not proxy through Relay |
-| Standard voice | Dashboard `POST /api/audio/transcribe`, `POST /api/audio/speak` | Standard no-plugin voice; uses dashboard session from Manage |
+| 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; 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` |
@@ -446,11 +389,9 @@ See [RELEASE.md](RELEASE.md) for the full recipe.
 | Voice transcribe | `POST /voice/transcribe` | multipart/form-data; bearer auth |
 | Voice synthesize | `POST /voice/synthesize` | JSON → audio/mpeg; max 5000 chars |
 | Voice config | `GET /voice/config` | Returns current tts/stt provider info |
-| Plugin diagnostics | `hermes relay doctor --json` | Reports upstream route reachability, Relay loopback state, plugin layout, and legacy bootstrap state |
-| Compat hook lifecycle | `hermes relay compat status/install/remove` | Optional legacy API compatibility hook; not required for the standard path |
 | Notifications | `GET /notifications/recent?limit=N` | Loopback callers skip bearer |
 | Relay health | `GET /health` on `:8767` | Used by `RelayHttpClient.probeHealth()` |
-| Capabilities | `GET /v1/capabilities` plus targeted `HEAD` probes | Prefer capabilities when present; HEAD probes keep mixed-version fallback working |
+| Capabilities | `HEAD /api/sessions`, `HEAD /v1/runs`, etc. | HEAD avoids CORS 403 on OPTIONS preflight |
 | 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` |

CLI_RELEASE_NOTES.md

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

CONTRIBUTING.md

@@ -96,16 +96,6 @@ We follow [Conventional Commits](https://www.conventionalcommits.org/): `feat:`,
 
 Release-prep commits (version bump, changelog promotion) land on `dev` first, then a surface-specific release PR merges `dev` → `main` with `--no-ff`. Tags are cut from `main` after the merge: `android-vX.Y.Z`, `server-vX.Y.Z`, or `desktop-vX.Y.Z`. See [RELEASE.md](RELEASE.md) for the full release process.
 
-## Changelog & writing conventions
-
-This is a **public repo** — `CHANGELOG.md`, `DEVLOG.md`, the README, and everything under `docs/` ship publicly. Keep them clean:
-
-- **`CHANGELOG.md`** follows [Keep a Changelog](https://keepachangelog.com/) (Added / Changed / Fixed). Append your change to the `## [Unreleased]` block in the PR. Entries can carry detail while they accumulate, but at release-prep the version block is **condensed to crisp public bullets** (1–2 lines each) — the deep "how we debugged it" narrative belongs in commit messages and `DEVLOG.md`, not the public changelog.
-- **`DEVLOG.md`** is a factual engineering log — what changed, why, and how it was verified. Keep it depersonalized and third-person; it's a record, not a diary.
-- **No non-public wording anywhere committed:** no personal names (attribute impersonally — identity lives in git history), no real server hostnames/IPs or internal deployment names, no AI/assistant process self-narration, no fork/branch plumbing in user-facing notes. Generic example IPs in setup docs are fine.
-
-Release notes (`RELEASE_NOTES.md`, `app/src/main/assets/whats_new.txt`, `docs/play-store-listing.md`) are theme-framed and user-facing; see [RELEASE.md](RELEASE.md) §2 "Scrub for public distribution" for the full checklist.
-
 ## Testing
 
 - **Android unit tests:** `scripts/dev.bat test` (runs JUnit + MockK + Compose testing)

GEMINI.md

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

PLUGIN_RELEASE_NOTES.md

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

README.md

@@ -1,23 +1,21 @@
 <p align="center">
-  <img src="assets/play-store-feature-1024x500.png" alt="Hermes-Relay — your Hermes agent, in your pocket" width="800">
+  <img src="assets/logo.svg" alt="Hermes-Relay" width="120">
 </p>
 
-<p align="center">
-  <strong>Runs on your machine. Lives on your devices.</strong><br>
-  A native Android companion for your <a href="https://github.com/NousResearch/hermes-agent">Hermes agent</a> — streaming chat, hands-free voice,
-  and full agent management. Plus a single-binary CLI that gives the agent hands on any machine you pair.
-</p>
+<h1 align="center">Hermes-Relay</h1>
 
 <p align="center">
-  <a href="https://play.google.com/store/apps/details?id=com.axiomlabs.hermesrelay"><img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" alt="Get it on Google Play" height="56"></a>
+  <strong>One Hermes agent. Two ways to use it.</strong><br>
+  A native Android remote-control app for your phone, plus a desktop CLI that lets you<br>
+  use a server-deployed Hermes from your laptop as if it were running locally.
 </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/about/versions/oreo"><img src="https://img.shields.io/badge/Android-8.0%2B-3DDC84.svg?logo=android&logoColor=white" alt="Android 8.0+"></a>
-  <a href="https://github.com/Codename-11/hermes-relay/actions/workflows/ci-android.yml"><img src="https://github.com/Codename-11/hermes-relay/actions/workflows/ci-android.yml/badge.svg" alt="Android CI"></a>
-  <a href="https://github.com/Codename-11/hermes-relay/releases"><img src="https://img.shields.io/github/v/release/Codename-11/hermes-relay?filter=android-v*&label=release&color=8B5CF6" alt="Latest release"></a>
-  <a href="https://github.com/Codename-11/hermes-relay/tree/main/desktop"><img src="https://img.shields.io/badge/CLI-alpha-orange.svg" alt="CLI (alpha)"></a>
+  <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-orange.svg" alt="Desktop CLI"></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/about/versions/oreo"><img src="https://img.shields.io/badge/Min%20SDK-26-brightgreen.svg" alt="Min SDK 26"></a>
 </p>
 
 <p align="center">
@@ -27,204 +25,120 @@
   <a href="https://hermes-agent.nousresearch.com">Hermes Agent</a>
 </p>
 
+<p align="center">
+  <video src="https://github.com/Codename-11/hermes-relay/raw/main/assets/chat_demo.mp4" poster="https://github.com/Codename-11/hermes-relay/raw/main/assets/chat_demo_poster.jpg" autoplay loop muted playsinline width="280"></video>
+</p>
+
 ---
 
-## What it is
+## Two surfaces, one pair
 
-Hermes-Relay puts your [Hermes agent](https://github.com/NousResearch/hermes-agent) on the devices you actually carry. The brain stays on your own machine — Hermes-Relay is how you reach it.
+| Surface | What | Status |
+|---------|------|--------|
+| **[Android app](#1a-android-app)** | Native phone control — chat, voice, the agent reads your screen and acts on it (tap, type, swipe), notification companion, multi-Connection. | Available — Google Play (Internal testing) + sideload APK |
+| **[Desktop app + CLI](#1b-desktop-app--cli-experimental)** | Use a server-deployed Hermes from your laptop **like it's local**. Windows gets the native tray app first: pair, start/pause the daemon, view devices, task log, settings, overlay status, and emergency stop. The CLI remains the terminal/headless surface and powers macOS/Linux installs. Experimental computer-use tools are opt-in. | **Experimental** — `desktop-v0.3.0-alpha.18` (Windows tray installer + native CLI binaries, no Node required) |
 
-- **📱 Android app** — streaming chat, hands-free voice, and the full Hermes dashboard (models, keys, skills, profiles), rebuilt native. On sideload builds, the agent can read your screen and act on it.
-- **⌨️ Hermes-Relay CLI** *(alpha)* — a single binary that gives the agent **hands on any machine you pair**: files, terminal, search, screenshots — consent-gated.
+Both share `~/.hermes/remote-sessions.json` and the same WSS relay. **Pair once from either, both work.**
 
-A vanilla [hermes-agent](https://github.com/NousResearch/hermes-agent) install is enough — chat, management, and voice need **no plugin**. Add the optional relay only when you want terminal, phone control, or the CLI's tools. **Pair once from either surface; both work.**
+---
 
-## Quick Start (Android)
+## Quick Start
 
-Install → connect → talk, in about two minutes.
+Three steps: pick your surface (or install both), then install the relay plugin on your Hermes server.
 
-### 1 · Install the app
+### 1a. Android app
 
-- **Google Play** *(easiest — auto-updates)* — [**install from Google Play**](https://play.google.com/store/apps/details?id=com.axiomlabs.hermesrelay). Chat, voice, Manage, terminal/TUI, media, notifications, and relay sessions.
-- **APK** *(full phone-control feature set)* — download the file ending in **`-sideload-release.apk`** from the newest `android-v*` release on [GitHub Releases](https://github.com/Codename-11/hermes-relay/releases) and open it (allow your browser to install unknown apps the first time). Integrity verification, signing fingerprint, and per-build details are in the [Sideload guide](https://codename-11.github.io/hermes-relay/guide/getting-started.html#sideload-apk).
+<!-- 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>
+-->
 
-Sideload builds check GitHub for updates and show a one-tap banner when you're behind; Play builds update through the Store. See [Release tracks](https://codename-11.github.io/hermes-relay/guide/release-tracks) for the capability matrix.
+- **Google Play** — coming soon (currently on Internal testing)
+- **APK** — download from [GitHub Releases](https://github.com/Codename-11/hermes-relay/releases) and choose the newest Android release (`android-v*`; historical Android releases used bare `v*`)
 
-### 2 · Have Hermes running
+#### Sideload APK (GitHub Releases)
 
-The app needs your Hermes **API server enabled and reachable from your phone**, plus an **API key** — the token the app sends to authenticate Chat (pick any value you like). Installing Hermes and choosing a provider is standard Hermes setup; the [full walkthrough](https://codename-11.github.io/hermes-relay/guide/getting-started) covers Windows, the dashboard for **Manage**, LAN scan, and QR setup.
+Prefer not to wait for Google Play? Grab the signed APK directly:
 
-```bash
-hermes setup --portal                      # install / log in / pick a provider — skip if already done
+1. Download the file ending in **`-sideload-release.apk`** from the newest Android release (`android-v*`; historical Android releases used bare `v*`) on [GitHub Releases](https://github.com/Codename-11/hermes-relay/releases) — 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).
 
-mkdir -p ~/.hermes
-API_SERVER_KEY="$(openssl rand -hex 32)"   # strong random key — or substitute your own memorable value
-cat >> ~/.hermes/.env <<EOF
-API_SERVER_ENABLED=true
-API_SERVER_HOST=0.0.0.0
-API_SERVER_PORT=8642
-API_SERVER_KEY=$API_SERVER_KEY
-EOF
-chmod 600 ~/.hermes/.env
+Full walkthrough, including signing-certificate fingerprint: [Sideload guide](https://codename-11.github.io/hermes-relay/guide/getting-started.html#sideload-apk).
 
-echo "Android API URL: http://<this-computer-ip>:8642   key: $API_SERVER_KEY"
-hermes gateway
-```
+**Staying up to date (sideload):** the app checks GitHub for a newer release on cold start (at most once every 6 hours) and shows a dismissable banner when you're behind. Tapping **Update** opens the next APK in your browser so Android's Downloads notification hands it to the system installer — no second app required. You can also trigger a check manually under **Settings → About → Updates**. Google Play installs get auto-updates through the Play Store and don't show this banner.
 
-`API_SERVER_ENABLED` turns the API server on; `API_SERVER_HOST=0.0.0.0` makes it reachable on your LAN (the default is localhost-only); `API_SERVER_KEY` is the bearer token the app sends — **your choice of value**.
+### 1b. Desktop app + CLI (experimental)
 
-> **Heads up on `0.0.0.0`:** that exposes the API to every device on your network — fine on a trusted home LAN, but off it keep the key set and front it with Tailscale or an HTTPS reverse proxy ([Remote access](https://codename-11.github.io/hermes-relay/guide/remote-access)) rather than exposing it directly. You don't have to type the key on your phone — **Scan for Hermes on LAN**, or have your agent make a setup QR (below). For **Manage** (skills, models, keys), also run the Hermes dashboard — see [Getting Started](https://codename-11.github.io/hermes-relay/guide/getting-started).
+The desktop surface talks to a server-deployed Hermes over WSS. On Windows, the default installer launches the native tray app with pairing, daemon control, devices, task log, settings, overlay status, pause, and emergency stop. The same release still ships the `hermes-relay` CLI for shell/TUI use, scripting, headless daemon mode, and macOS/Linux.
 
-### 3 · Connect and talk
+The remote agent can also reach back through the relay and run `desktop_read_file`, `desktop_terminal`, `desktop_search_files`, `desktop_screenshot`, `desktop_clipboard_*`, `desktop_open_in_editor`, etc. **on your machine** while its brain stays on the host. One pair, two surfaces (with the Android app), no `ssh`.
 
-Open the app and pick how to connect — any of:
-
-- **Standard Hermes** → tap **Scan for Hermes on LAN** to auto-find the server, then enter your key.
-- **Standard Hermes** → type the address (`http://<host>:8642`) and key by hand.
-- **Scan setup QR** → ask your Hermes agent to generate a QR with your URL + key (e.g. `{"api_url":"http://<host>:8642","api_key":"<key>","dashboard_url":"http://<host>:9119"}`) and scan it. `dashboard_url` is optional when the dashboard uses the conventional same-host `:9119` URL.
-
-The wizard probes everything and finishes with a capability card:
-
-| Line | What it means |
-|------|---------------|
-| **Chat** | API server reachable — you can talk |
-| **Manage** | Dashboard found — models, keys, skills, profiles from the phone |
-| **Voice** | Speech ready via your server (or one Manage sign-in away) |
-| **Remote** | Fallback route configured — keeps working away from home |
-| **Relay** | Optional power tools — fine to leave unpaired |
-
-If your dashboard requires sign-in, do it once under the **Manage** tab — the same session 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
-hermes plugins install Codename-11/hermes-relay/plugin --enable
-hermes relay doctor
-hermes relay start --no-ssl
-hermes pair
-```
-
-Use the legacy installer instead if you also want the systemd user service,
-shell shims, and the full clone/update workflow:
-
-```bash
-curl -fsSL https://raw.githubusercontent.com/Codename-11/hermes-relay/main/install.sh | bash
-```
-
-The plugin-manager install owns the plugin code, dashboard tab, CLI commands,
-and agent tools. `hermes relay compat status/install/remove` manages only the
-optional legacy API compatibility hook when an older Hermes build needs it. Scan
-the QR from the phone's Connections screen — or use
-`hermes pair --register-code ABCD12` with the manual code from Android
-**Settings → Connections → Advanced**.
-
-- **Plugin-manager uninstall:** `hermes relay compat remove --all` if you installed the optional hook, then `hermes plugins remove hermes-relay`.
-- **Legacy installer update:** `hermes-relay-update` (idempotent) — or re-run the install one-liner.
-- **Legacy installer uninstall:** `bash ~/.hermes/hermes-relay/uninstall.sh` — removes the service, shims, clone, external skill path, editable package, and compat hook. It never touches shared Hermes state. Flags: `--dry-run`, `--keep-clone`, `--remove-secret`.
-- **Dashboard plugin:** installs with the same symlink — restart the gateway and a **Relay** tab (paired devices, bridge activity, media tokens) appears in the web UI.
-
-Full server setup, TLS, and systemd details: [docs/relay-server.md](docs/relay-server.md).
-
-**Requirements:** Android 8.0+ (SDK 26) · current upstream [hermes-agent](https://github.com/NousResearch/hermes-agent) with the API server and dashboard enabled · Python 3.11+ on the server.
-
-## Screenshots
-
-<table>
-  <tr>
-    <td align="center" width="25%"><img src="assets/screenshots/01_startup.png" alt="Cold start" width="100%"><br><sub><b>Cold start</b></sub></td>
-    <td align="center" width="25%"><img src="assets/screenshots/02_chat.png" alt="Streaming chat" width="100%"><br><sub><b>Streaming chat</b></sub></td>
-    <td align="center" width="25%"><img src="assets/screenshots/03_voice.png" alt="Hands-free voice" width="100%"><br><sub><b>Hands-free voice</b></sub></td>
-    <td align="center" width="25%"><img src="assets/screenshots/04_sessions.png" alt="Session history" width="100%"><br><sub><b>Session history</b></sub></td>
-  </tr>
-  <tr>
-    <td align="center" width="25%"><img src="assets/screenshots/05_commands.png" alt="Command palette" width="100%"><br><sub><b>Command palette</b></sub></td>
-    <td align="center" width="25%"><img src="assets/screenshots/06_manage.png" alt="Manage your agent" width="100%"><br><sub><b>Manage your agent</b></sub></td>
-    <td align="center" width="25%"><img src="assets/screenshots/07_connections.png" alt="Connections and routes" width="100%"><br><sub><b>Connections &amp; routes</b></sub></td>
-    <td align="center" width="25%"><img src="assets/screenshots/08_settings.png" alt="Settings" width="100%"><br><sub><b>Settings</b></sub></td>
-  </tr>
-</table>
-
-<p align="center"><sub>▶ <a href="https://codename-11.github.io/hermes-relay/guide/getting-started.html#see-it-working">Watch the demo</a> on the docs site</sub></p>
-
-## Features
-
-### Android
-
-- **Streaming chat** — rides standard Hermes, preferring the dashboard gateway (`/api/ws`, live thinking) when signed in to Manage and falling back to API-server SSE otherwise, with live markdown, tool-call cards, session history, a searchable command palette, file attachments, quote-in-reply, conversation share, and send-while-streaming queuing.
-- **Manage your agent** — the full Hermes dashboard, native: switch models from your provider catalog, manage keys (write-only, masked, rate-limited reveal), create and edit profiles including `SOUL.md`, and browse/install/update skills. One dashboard sign-in covers it all.
-- **Hands-free voice** — talk on a vanilla install: speech rides your server's configured providers, unlocked by the same Manage sign-in. Relay-paired setups add per-profile voice and an opt-in provider-native Realtime Agent with background task handoff.
-- **Works away from home** — add a Tailscale or public URL and the app roams automatically (LAN at home, fallback elsewhere). An unreachable server gets a diagnosis, not just a red dot.
-- **Multi-Connection + profiles** — pair multiple Hermes servers (home + work, dev + prod) and switch in one tap; overlay a profile's model + `SOUL.md` per chat.
-- **Phone control (bridge)** — with Relay paired, the agent reads the screen and acts: tap, type, swipe, scroll, screenshots, clipboard, media keys, batched macros. Guarded by per-app blocklist (banking/2FA blocked by default), destructive-verb confirmation, idle auto-disable, and a full activity log.
-- **Notification companion** — opt-in access so the agent can triage, summarize, and route incoming notifications.
-- **Security & pairing** — QR pairing, Android Keystore session storage (StrongBox-preferred), TOFU cert pinning, per-channel time-bound grants, user-chosen session TTL.
-- **Stats for Nerds** — local-only analytics: TTFT, token usage, stream health, peak-time charts.
-
-> Sideload builds add direct SMS, contact search, one-tap dialing, and location awareness — handy for fully hands-free intents like *"text Sam I'll be 10 minutes late."* See [Release tracks](https://codename-11.github.io/hermes-relay/guide/release-tracks).
-
-## Hands on any machine — the Hermes-Relay CLI&nbsp;<sub>(alpha)</sub>
-
-> **Alpha · Windows today** (macOS / Linux coming soon). A single self-contained binary — no Node required. Binaries are unsigned during the experimental phase, so SmartScreen / Gatekeeper warnings are expected.
-
-The agent's brain stays on the host; the CLI lets it call tools **on your machine** over the same WSS relay — `read_file`, `write_file`, `terminal`, `search_files`, `screenshot`, `clipboard`, `open_in_editor`, and more — behind a one-time consent gate, interactive diff approval for patches, and a `--no-tools` kill-switch.
+**Install tray app** (Windows PowerShell):
 
 ```powershell
 irm https://raw.githubusercontent.com/Codename-11/hermes-relay/main/desktop/scripts/install.ps1 | iex
 ```
 
+**Install CLI only** (Windows PowerShell):
+
+```powershell
+$env:HERMES_RELAY_INSTALL_SURFACE='cli'; irm https://raw.githubusercontent.com/Codename-11/hermes-relay/main/desktop/scripts/install.ps1 | iex
+```
+
+**Install CLI** (macOS / Linux):
+
+```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
+hermes-relay "summarize the last commit"       # one-shot
+hermes-relay --json "..." | jq                 # structured events for scripting
+hermes-relay daemon                            # headless tool router (agent reaches you anytime)
 hermes-relay update                            # self-update via GitHub Releases
 ```
 
-It pairs against the **same relay and credential store** as the Android app — pair once from either, both work. Tagged on a separate `cli-v*` [release track](https://github.com/Codename-11/hermes-relay/releases?q=cli), with old alpha prereleases still visible under `desktop-v*`.
+**Native paste workflow** (the killer demo): inside `hermes-relay shell`, hit `Win+Shift+S` to screenshot, then `Ctrl+A v` — the client reads your clipboard, ships the image to the server's inbox, and types `/paste` into the TUI for you. Identical UX to native local-Hermes paste. The same chord set works on macOS (`Cmd+Shift+4` → `Ctrl+A v`) and Linux (Wayland/X11 detected automatically).
 
-- **Docs:** [CLI guide](https://codename-11.github.io/hermes-relay/desktop/) · [`desktop/README.md`](desktop/README.md)
-- **AI-agent setup recipe:** `/hermes-relay-desktop-setup`
+**No Node required** — the Windows tray installer bundles the compiled CLI sidecar; CLI-only installs use Bun-compiled native binaries (~60–110 MB per platform) via curl/irm. Version-aware install (`upgrading X → Y`), collision-safe `hermes` short alias for CLI installs, self-update via `hermes-relay update`. Assets are **unsigned** during the experimental phase — SmartScreen/Gatekeeper warnings are expected. Code signing, multi-client server-side routing, and service installers (sc.exe / systemd / launchd) land with v1.0.
 
-## How It Works
+- **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` (the agent can run `desktop_terminal` on your machine to diagnose install/pair issues live)
 
-```
-Phone        (HTTP/WSS) --> Hermes Dashboard  (:9119)   [chat gateway, manage, standard voice]
-Phone        (HTTP/SSE) --> Hermes API Server (:8642)   [chat fallback, sessions, runs]
-Phone        (WSS/HTTP) --> Relay             (:8767)   [terminal, bridge, media, relay voice, sessions]
-CLI          (WSS)      --> Relay             (:8767)   [machine tools, tui, terminal]
+### 2. Install the server plugin (one-liner)
+
+On the machine running your Hermes agent:
+
+```bash
+curl -fsSL https://raw.githubusercontent.com/Codename-11/hermes-relay/main/install.sh | bash
 ```
 
-Chat prefers the Hermes dashboard gateway when Manage auth is ready, then falls
-back to the upstream API server SSE path with the API key. Manage and standard
-voice ride the Hermes dashboard with its own one-time sign-in, so a vanilla
-install needs no plugin for either. The optional relay on `:8767` adds the power
-surfaces: terminal, bridge phone control, media handoff, machine tools, and
-relay-side voice, which is preferred automatically when paired. One QR can
-configure API, dashboard, and relay routes without merging their auth models.
+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 client via either of these equivalent entry points:
 
-## Documentation
+- **From any Hermes chat surface** (CLI, Discord, Telegram, etc.): type `/hermes-relay-pair` and the `hermes-relay-pair` skill renders the QR + 6-char code 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. For Android: 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. For the desktop CLI: just pass it as `hermes-relay pair ABCD12 --remote ws://<host>:8767`. Composes with `--ttl` / `--grants`.
 
-| | |
-|---|---|
-| **[User Guide](https://codename-11.github.io/hermes-relay/)** | **Quick start, features, configuration — start here** |
-| [Android](https://codename-11.github.io/hermes-relay/guide/) | Android install + setup + features |
-| [Hermes-Relay CLI](https://codename-11.github.io/hermes-relay/desktop/) | Pairing, subcommands, local tool routing |
-| [Architecture](https://codename-11.github.io/hermes-relay/architecture/) | How the system works under the hood |
-| [API Reference](https://codename-11.github.io/hermes-relay/reference/api.html) | Hermes API endpoints used by both surfaces |
-| [Specification](docs/spec.md) | Full spec — protocol, UI, phases, dependencies |
-| [Architecture Decisions](docs/decisions.md) | ADRs — framework, channels, auth, terminal |
-| [Changelog](CHANGELOG.md) | Release history (`android-v*`, `plugin-v*`, `cli-v*`) |
+Scan the QR from the Android app's onboarding screen, OR paste the 6-char code into `hermes-relay pair --remote ws://<host>:8767` on your laptop, and you're connected. One pair configures **both** the direct-chat API server **and** the relay (WSS for terminal / bridge / TUI / desktop tools, HTTP for voice routes) — 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 from the Android app, 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.
 
-<details>
-<summary><b>Install with an AI agent</b> — paste-ready prompt for Claude / GPT</summary>
+**Dashboard plugin.** If your hermes-agent install has the Dashboard Plugin System (upstream `axiom` branch), Hermes-Relay ships a plugin at `plugin/dashboard/` that surfaces paired devices, bridge command activity, and active inbound-media tokens in the gateway's web UI. It auto-registers through the same `~/.hermes/plugins/hermes-relay` symlink created by `install.sh` — restart the gateway and a "Relay" tab appears. See [docs/relay-server.md](docs/relay-server.md) and `user-docs/features/dashboard.md` for details.
 
-<br>
+**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.
 
-If an AI assistant manages your server, paste this block into its chat and it will fetch the canonical setup recipe and walk you through install, pairing, and troubleshooting:
+**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.
+
+**Requirements:** Android 8.0+ (SDK 26) for the Android app · macOS / Linux / Windows for the desktop CLI · [hermes-agent](https://github.com/NousResearch/hermes-agent) v0.8.0+, Python 3.11+ on the server.
+
+### For AI Agents
+
+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.
 
 ```text
-You are helping me install and maintain Hermes-Relay (https://github.com/Codename-11/hermes-relay) — a native Android client + a CLI + a Python plugin for the Hermes AI agent platform.
+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
@@ -232,92 +146,202 @@ Read the canonical setup recipe before acting:
 Then guide me through:
 - Verifying hermes-agent is already installed (it's a prerequisite — Hermes-Relay is a plugin, not standalone)
 - Running the server-plugin install one-liner: `curl -fsSL https://raw.githubusercontent.com/Codename-11/hermes-relay/main/install.sh | bash`
-- Connecting my phone by Standard Hermes API URL/key first, then optionally pairing Relay via `hermes pair` or `/hermes-relay-pair` for power tools; OR pairing my laptop via the Hermes-Relay CLI (`irm https://raw.githubusercontent.com/Codename-11/hermes-relay/main/desktop/scripts/install.ps1 | iex` on Windows, then `hermes-relay pair --remote ws://<host>:8767`)
-- Verifying with `hermes-status` (server) or `hermes-relay doctor` (CLI)
+- Pairing my phone via `hermes-pair` or `/hermes-relay-pair` (Android), 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 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.
+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.
 
-</details>
+## What It Does
+
+Talk to your Hermes agent from anywhere. Direct API streaming, session history, tool visualization — native on Android, native in the terminal, with the agent able to reach back through the relay and act on either surface.
+
+| Surface | Channel | What | Status |
+|---------|---------|------|--------|
+| Android | **Chat** | Stream conversations to Hermes via HTTP/SSE | Available |
+| Android | **Voice** | Real-time voice conversation via relay TTS/STT | Available |
+| Android | **Bridge** | Agent reads the screen and performs UI actions (tap, long-press, drag, type, clipboard, media, macros, events) | Available |
+| Android | **Terminal** | Secure remote shell via tmux | Phase 2 |
+| Desktop CLI | **Shell** | Full Hermes Ink TUI piped over PTY in tmux on the host. Bare `hermes-relay` drops you in. | Available (experimental) |
+| Desktop CLI | **Chat** | Structured-event REPL / one-shot / piped stdin. `--json` for scripting. REPL supports `/paste`, `/screenshot`, `/image <path>`. | Available (experimental) |
+| Desktop CLI | **In-shell paste / screenshot** | `Ctrl+A v` (clipboard image → server inbox → `/paste` auto-typed). `/screenshot` is multi-monitor by default. | Available (experimental) |
+| Desktop CLI | **Local tool routing** | Agent calls `desktop_read_file` / `_write_file` / `_terminal` / `_search_files` / `_patch` / `_clipboard_*` / `_screenshot` / `_open_in_editor` — runs on YOUR machine over the same relay | Available (experimental) |
+| Desktop CLI | **Daemon** | Headless tool router — keeps tools advertised even when no shell is open | Available (experimental) |
+| Desktop CLI | **Self-update** | `hermes-relay update` polls GitHub Releases, atomic-swaps the binary | Available (experimental) |
+
+## What's new in v0.6.0
+
+- **Connect from anywhere** — multi-endpoint pairing with first-class Tailscale support; plug in any VPN or reverse proxy mode. See [`docs/remote-access.md`](docs/remote-access.md).
+- **Multi-Connection support** — pair with multiple Hermes servers (home + work, dev + prod, etc.) and switch in one tap from the Chat top bar. Each Connection keeps its own sessions, personalities, profiles, and relay state; theme and safety preferences stay global. Existing installs migrate transparently.
+- **Agent Profiles** — the relay auto-discovers upstream Hermes profiles at `~/.hermes/profiles/*/` and the phone overlays the selected profile's model + `SOUL.md` on chat turns. Ephemeral, chat-only, clears on Connection switch. Gated by `RELAY_PROFILE_DISCOVERY_ENABLED` (default on).
+- **Consolidated agent sheet** — Profile + Personality selection and per-session analytics now live in one scrollable bottom sheet opened from the Chat top-bar agent name.
+
+See the [changelog](CHANGELOG.md) for the full list.
+
+## Features
+
+### Android
+
+- **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
+- **Multi-Connection + agent profiles** — Pair with multiple Hermes servers and switch targets from the top bar; select an upstream-discovered agent profile to overlay model + `SOUL.md` on chat turns. Three-layer model: Connection (server) → Profile (agent directory) → Personality (prompt preset)
+- **Voice mode** — Experimental server-mediated voice conversation via the relay; the sphere listens with you and performs the agent's reply as it speaks. Hermes owns chat, tool calls, and approvals, while relay voice output defaults to provider-neutral streaming TTS (`xai_tts` first) with realtime voice-agent providers kept as a separate lab mode.
+- **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.
+
+### Desktop CLI
+
+- **Shell mode (default)** — bare `hermes-relay` pipes the host's actual `hermes` Ink TUI through a PTY in tmux. Same banner, same skin, same slash commands as a local install. `Ctrl+A .` detaches (preserves tmux), `Ctrl+A k` kills, `Ctrl+A v` pastes a clipboard image, `Ctrl+A ?` re-prints chord help, `Ctrl+A Ctrl+A` literal.
+- **Chat mode** — REPL or one-shot or piped stdin. `--json` emits `GatewayEvent`s per line for `jq` / automation. REPL slash commands `/paste` (clipboard), `/screenshot` (multi-monitor by default; `primary` / `1` / `2` to narrow), `/image <path>` attach the next message.
+- **Local tool routing** — agent calls `desktop_read_file`, `desktop_write_file`, `desktop_terminal`, `desktop_search_files`, `desktop_patch`, `desktop_clipboard_read/write`, `desktop_screenshot`, `desktop_open_in_editor` — all run on YOUR machine over the same WSS relay. One-time per-URL consent gate; `--no-tools` kill-switch; non-TTY stdin fails closed; agent-proposed patches render as colored diffs with `y/n/e/r` interactive approval. Experimental `desktop_computer_*` control tools require `--experimental-computer-use` / `HERMES_RELAY_EXPERIMENTAL_COMPUTER_USE=1`, task-scoped grants, and visible local approval.
+- **Daemon mode** — `hermes-relay daemon` runs the tool router headless so the agent can reach you even when no shell is open. JSON-line lifecycle logs by default, auto-human on TTY. Fails closed on missing consent.
+- **Self-update** — `hermes-relay update` polls GitHub Releases (SemVer-max picker, prerelease-aware), verifies SHA256, atomic-swaps the binary on POSIX (running daemon keeps inode), cooperative `.new.exe` swap on Windows.
+- **Multi-endpoint pairing + reconnect-on-drop + TOFU cert pinning** — same as the Android app. One QR carries LAN + Tailscale + public; client races candidates in priority order, re-probes on every network change.
+- **Workspace awareness** — on connect, client advertises `cwd`, `git_root`, `git_branch`, `repo_name`, `hostname`, `platform`, `active_shell` to the relay (server-side prompt-context consumption coming).
+- **Conversation picker on attach** — without `--conversation` / `--new`, you get a numbered list of recent server-side hermes sessions to resume.
+- **One install, one binary, no Node required** — Bun-compiled native binaries via curl/irm one-liners; collision-safe `hermes` short alias auto-installed.
+
+## Getting Started
+
+**Android:**
+
+1. **Install the app** from the [link above](#1a-android-app)
+2. **Enter your Hermes server URL** (e.g. `http://192.168.1.100:8642`) during onboarding, or scan a QR via `/hermes-relay-pair`
+3. **Start chatting** — the app connects directly to the Hermes API Server
+
+**Desktop CLI:**
+
+1. **Install the binary** — [PowerShell `irm`](#1b-desktop-cli-experimental) (Windows) / curl (macOS / Linux) one-liner
+2. **Pair once** — `hermes-relay pair --remote ws://<host>:8767` (mint code via `hermes-pair` or `/hermes-relay-pair` on the server first)
+3. **Drop into the shell** — bare `hermes-relay` opens the full Hermes TUI in tmux on the host
+
+For detailed setup, server configuration, and feature guides, see the **[full documentation](https://codename-11.github.io/hermes-relay/)**.
+
+## How It Works
+
+```
+Phone        (HTTP/SSE) --> Hermes API Server (:8642)   [chat — direct]
+Phone        (HTTP)     --> Server (:8767)         [voice routes — API key or relay session]
+Phone        (WSS/HTTP) --> Server (:8767)         [terminal, bridge, media, sessions]
+Desktop CLI  (WSS)      --> Server (:8767)         [tui, terminal, desktop tools]
+```
+
+Chat from the Android app connects directly to the Hermes API Server with the Hermes API key — same pattern used by Open WebUI and other Hermes frontends. Voice calls the relay's `/voice/*` HTTP routes and authenticates with that Hermes API bearer when present, falling back to the relay session token for paired devices. Remote control surfaces such as terminal, bridge, TUI, media/session management, and desktop tools require relay pairing on `:8767`, so one scan can configure both the API route and the relay route without merging their auth models.
+
+## Documentation
+
+| | |
+|---|---|
+| **[User Guide](https://codename-11.github.io/hermes-relay/)** | **Getting started, both surfaces, features, configuration — start here** |
+| [Android](https://codename-11.github.io/hermes-relay/guide/) | Android-specific install + setup + features |
+| [Desktop CLI](https://codename-11.github.io/hermes-relay/desktop/) | Desktop CLI guide — shell/chat, pairing, subcommands, local tool routing |
+| [Architecture](https://codename-11.github.io/hermes-relay/architecture/) | How the system works under the hood |
+| [API Reference](https://codename-11.github.io/hermes-relay/reference/api.html) | Hermes API endpoints used by both surfaces |
+| [Specification](docs/spec.md) | Full spec — protocol, UI, phases, dependencies |
+| [Architecture Decisions](docs/decisions.md) | ADRs — framework, channels, auth, terminal |
+| [Upstream Integration Sync](docs/upstream-integration-sync.md) | Supported Hermes extension points vs server-owned compatibility layers |
+| [Changelog](CHANGELOG.md) | Release history (Android `android-v*`, Server `server-v*`, and Desktop `desktop-v*`) |
+
+---
 
 ## Development
 
+### Quick Start
+
+1. **File > Open** the repo root in Android Studio
+2. Wait for Gradle sync
+3. **Run** (Shift+F10) to deploy to emulator or device
+
+### Dev Scripts
+
 ```bash
-# Android: open the repo root in Android Studio, wait for Gradle sync, Run (Shift+F10).
 scripts/dev.bat build      # Build debug APK
 scripts/dev.bat release    # Build signed release APK
 scripts/dev.bat bundle     # Build release AAB for Google Play
 scripts/dev.bat run        # Build + install + launch + logcat
 scripts/dev.bat test       # Run unit tests
 scripts/dev.bat version    # Show current version
-scripts/dev.bat relay      # Start the relay server (dev, no TLS)
+scripts/dev.bat relay      # Start Server (dev, no TLS)
+```
+
+### Repository Structure
+
+```
+hermes-relay/
+├── app/                       # Android app (Kotlin + Jetpack Compose)
+├── desktop/                   # Desktop CLI thin-client (@hermes-relay/cli — TS + Bun-compiled binary)
+├── relay_server/              # WSS Server (Python + aiohttp; thin shim → plugin/relay)
+├── plugin/                    # Hermes agent plugin
+│   ├── relay/                 #   - canonical relay (server.py, channels/, media, voice, desktop tools)
+│   ├── tools/                 #   - android_* bridge + desktop_* tool handlers
+│   └── pair.py                #   - QR pairing CLI + multi-endpoint payload builder
+├── skills/                    # Hermes agent skills
+│   └── devops/
+│       ├── hermes-relay-pair/         # /hermes-relay-pair slash-command skill
+│       ├── hermes-relay-self-setup/   # AI-agent setup recipe (Android + desktop)
+│       └── hermes-relay-desktop-setup/ # AI-agent recipe specifically for the desktop CLI
+├── user-docs/                 # VitePress documentation site (Android + desktop sections)
+├── docs/                      # Spec, decisions, security
+├── scripts/                   # Dev helper scripts
+├── .github/workflows/         # CI + release pipelines (ci-android / ci-server / ci-desktop)
+└── gradle/                    # Wrapper (8.13) + version catalog
 ```
 
 ### Tech Stack
 
 | Component | Stack |
 |-----------|-------|
-| **Android app** | Kotlin 2.0, Jetpack Compose, Material 3, OkHttp |
-| **Hermes-Relay CLI** | TypeScript, Bun-compiled native binary, Node ≥21 (source/dev), zero runtime deps |
-| **Server / plugin** | Python 3.11+, aiohttp |
+| **Android App** | Kotlin 2.0, Jetpack Compose, Material 3, OkHttp |
+| **Desktop CLI** | TypeScript, Bun-compiled native binary, Node ≥21 (source/dev), zero runtime deps |
+| **Server** | Python 3.11+, aiohttp |
 | **Serialization** | kotlinx.serialization (Android) |
-| **Build** | AGP 9, Gradle 8.13, JVM toolchain 17 (Android); `tsc` + `bun build --compile` (CLI) |
-| **CI/CD** | GitHub Actions — lint, build, test, APK artifact, CLI binaries per platform |
-| **Min SDK** | 26 (Android 8.0) · Target SDK 35 |
+| **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 |
 
-<details>
-<summary><b>Repository structure</b></summary>
-
-```
-hermes-relay/
-├── app/                       # Android app (Kotlin + Jetpack Compose)
-├── desktop/                   # Hermes-Relay CLI thin-client (TS + Bun-compiled binary)
-├── relay_server/              # WSS server (Python + aiohttp; thin shim → plugin/relay)
-├── plugin/                    # Hermes agent plugin
-│   ├── relay/                 #   - canonical relay (server.py, channels/, media, voice, machine tools)
-│   ├── tools/                 #   - android_* bridge + desktop_* tool handlers
-│   └── pair.py                #   - QR pairing CLI + multi-endpoint payload builder
-├── skills/devops/             # Hermes agent skills (pairing, self-setup, CLI setup recipes)
-├── user-docs/                 # VitePress documentation site
-├── docs/                      # Spec, decisions, security
-├── scripts/                   # Dev helper scripts
-├── .github/workflows/         # CI + release pipelines (ci-android / ci-plugin / ci-desktop)
-└── gradle/                    # Wrapper (8.13) + version catalog
-```
-
-</details>
-
-<details>
-<summary><b>Running the server / plugin from a clone</b></summary>
-
-<br>
-
-End users should install via the [one-liner](#4--optional-install-relay-for-power-tools) above. For local development:
+### Server (optional — bridge, terminal, TUI, media, and voice routes)
 
 ```bash
 hermes relay start --no-ssl          # if you installed the plugin
-python -m plugin.relay --no-ssl      # or from a repo checkout
+# or from a repo checkout:
+python -m plugin.relay --no-ssl
+```
 
-# Docker:
+Or with Docker:
+
+```bash
 docker build -t hermes-relay relay_server/ && docker run -d --network host --name hermes-relay hermes-relay
+```
 
-# Live-edit the plugin against a local Hermes:
+See [docs/relay-server.md](docs/relay-server.md) for TLS, systemd, and full setup.
+
+### Hermes Plugin (for contributors)
+
+End users should install via the [one-liner](#2-install-the-server-plugin-one-liner) at the top. For local development from a clone:
+
+```bash
+cp -r plugin ~/.hermes/plugins/hermes-relay
+# Or symlink for live edits:
 ln -s "$PWD/plugin" ~/.hermes/plugins/hermes-relay
 ```
 
-Then restart hermes and run `hermes pair` to verify. The 18 `android_*` and 9 `desktop_*` tools register regardless of hermes-agent version. See [docs/relay-server.md](docs/relay-server.md) for TLS, systemd, and full setup.
+Then restart hermes and run `hermes-pair` (dashed shell shim) or type `/hermes-relay-pair` in any Hermes chat surface to verify pairing. The 18 `android_*` and 9 `desktop_*` 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.
 
-</details>
-
-## Built for Hermes Agent
+## Hermes Agent
 
 Hermes-Relay is built for [Hermes Agent](https://github.com/NousResearch/hermes-agent) — an open-source AI agent platform by [Nous Research](https://nousresearch.com). See the [Hermes Agent docs](https://hermes-agent.nousresearch.com) for server setup, gateway configuration, and plugin development.
 
-## Found a bug? Let us know
+## Found a bug? Let us know!
 
-This is an indie project and every report helps shape where it goes next. If something feels off, broken, or just weird — [open an issue](https://github.com/Codename-11/hermes-relay/issues/new). We read every one, and even a one-line *"this didn't work on my Pixel 7"* 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

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

RELEASE_NOTES.md

@@ -1,55 +1,33 @@
-# Hermes-Relay-Android v1.1.0
+# Hermes-Relay-Android v0.8.1
 
-**Release Date:** June 16, 2026
-**Since v1.0.0:** A settings + chat-UX overhaul — quieter status surfaces, a single state-aware plugin badge, and chat-settings polish — plus a force-close fix and release-pipeline upgrades.
+**Release Date:** May 26, 2026
+**Since v0.8.0:** A focused patch fixing a voice-mode crash. No new features.
 
-v1.1.0 is a refinement release on top of the 1.0 milestone. Settings is calmer and easier to read: status pills now appear only when a surface needs attention, the Power tools section shows one **Plugin active / required / offline** badge instead of an identical chip on every card, and the most-used controls sit where you reach for them. Chat settings render correctly, the system-prompt preview reflects your toggles, and a crash that could hit right after a successful pair is gone.
+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
 
-v1.1.0 ships in two Android build flavors. APK and AAB filenames are version-tagged:
+v0.8.1 ships in two Android build flavors. APK and AAB filenames are version-tagged:
 
 | Flavor | File | Who it's for |
 |---|---|---|
-| Google Play | `hermes-relay-1.1.0-googlePlay-release.aab` | Upload this Android App Bundle to Play Console. It has no AccessibilityService, screen reading, screenshots, gestures, SMS/calls, contacts/location, overlays, or unattended phone control. |
-| sideload | `hermes-relay-1.1.0-sideload-release.apk` | Direct-install APK for full Device Control. Installs as `com.axiomlabs.hermesrelay.sideload`. |
-| googlePlay APK | `hermes-relay-1.1.0-googlePlay-release.apk` | Parity/testing artifact. |
-| sideload AAB | `hermes-relay-1.1.0-sideload-release.aab` | Parity/testing artifact. |
+| 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 APK install steps.
 
 ---
 
-## Highlights
+## Fixed
 
-### Settings screen overhaul
+### Voice mode crash with barge-in on legacy TTS playback
 
-Settings was reorganized around what you actually touch and quieted down everywhere else:
+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`.
 
-- **Exception-only status pills.** Status pills now appear only when a surface needs attention and stay quiet when everything is healthy — no more a wall of green chips to read past.
-- **One state-aware plugin badge.** The Power tools section shows a single **Plugin active / required / offline** badge instead of an identical "Relay paired" chip repeated on every card.
-- **Layout that follows your reach.** Connections moved to the top (above the Hermes section), and Diagnostics + Developer options moved into the App section.
-- **Restyled to match the app.** The status chips now use the app's translucent-bordered language, and the brand blue was deepened.
+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.
 
-### Chat settings polish
-
-- **Streaming-endpoint picker fixed.** The picker no longer wraps "Gateway" / "Sessions" onto a second line.
-- **Live system-prompt preview.** The system-prompt preview now reflects the context toggles you've enabled (foreground app, battery, safety rails) with representative placeholder values, instead of looking inert.
-
-### Force-close fix
-
-A corrupt encrypted token store — which can happen after an app upgrade or a device restore — used to throw during construction and crash the app right after a successful pair, on both standard and relay connections. The token store now heals a corrupt keyset in place, and credential storage degrades to a re-pair instead of crashing if the device keystore is unusable.
-
-### Release pipeline
-
-- **Automated Play Console upload.** When a `PLAY_SERVICE_ACCOUNT_JSON` secret is configured, pushing a stable `android-v*` tag uploads the `googlePlay` App Bundle to the Production track as a draft (a human still starts the rollout). Prereleases are skipped, and the `sideload` flavor is structurally blocked from ever publishing to Play. Without the secret, releases publish to GitHub Releases exactly as before.
-- **Desktop UI preview harness (`:ui-preview`).** A non-shipped Compose for Desktop module renders presentational composables in a window on the PC with Compose Hot Reload, for fast UI iteration without a device build/install loop. It reuses the shared sphere algorithm as its single source of truth.
-
----
-
-## Upgrade notes
-
-- The force-close fix means devices that previously crashed on connect after an upgrade or restore will heal their token store automatically on first launch of this build — no manual re-pair required in most cases.
-- `appVersionCode` is **13**.
+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

@@ -14,7 +14,7 @@ Native Android companion for the [Hermes agent platform](https://github.com/Nous
 
 ### Desktop track (parallel lane to Android) — **experimental**
 
-Release tags: `cli-v*` (separate cadence from Android `android-v*` and Plugin `plugin-v*`). Historical alpha prereleases used `desktop-v*`, and the installer/updater keep a migration fallback. Curl-installed prebuilt binaries (no Node required); Windows first, macOS / Linux same release. Workflows: [`ci-desktop.yml`](.github/workflows/ci-desktop.yml) + [`release-cli.yml`](.github/workflows/release-cli.yml).
+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`):**
 
@@ -47,11 +47,11 @@ Release tags: `cli-v*` (separate cadence from Android `android-v*` and Plugin `p
 
 **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 self-update path polls the GitHub Releases API, prefers `cli-v*`, falls back to historical `desktop-v*` prereleases during migration, compares to `readVersion()`, and downloads the binary directly + `rename` over the current one (Windows can rename while running; Linux/macOS atomic replace is fine for long-lived daemons because the running process keeps the old inode open). Add a once-per-day background check in `daemon` mode that emits `update_available` as a log event — opt-in via `--check-updates`, never auto-installs without user action. Signing prerequisite: SmartScreen/Gatekeeper would warn on every auto-downloaded binary until we sign, so this is behind code signing.
+- **`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-cli.yml` retag semantics.** The `softprops/action-gh-release` step failed during the alpha.1 retag with `tag_name already_exists` after deleting + re-uploading all 5 assets; recovered by `gh api` cleanup (delete orphan draft + PATCH draft→false on the release with the real assets). Follow-up: pin the action version, add `make_latest: false` + explicit `release_id` lookup, or switch to `ncipollo/release-action` which handles retags without the duplicate-draft creation.
+- **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.
@@ -101,7 +101,7 @@ Small follow-ons to v0.4 deliberately deferred to keep the v0.4.0 release surfac
 
 **What the middleware can do (near-term, ships via install.sh).** New aiohttp middleware in `hermes_relay_bootstrap/_command_middleware.py`, installed at the same `_PatchedApplication.__setitem__` hook as the current route injection so it lands before `AppRunner.setup()` freezes the app. Filters by `request.path in ("/v1/runs", "/v1/chat/completions")` — zero-cost fast path for everything else. On chat paths: parses the body, lazy-imports `GATEWAY_KNOWN_COMMANDS` + `resolve_command()` + `gateway_help_lines()` from `hermes_cli.commands`, and splits on command type:
 - **Stateless commands** (`/help`, `/commands`, and any others the upstream Option B PR ends up supporting without router state) — actually dispatch, emit a synthetic SSE stream matching the runs handler's existing event shape so the Android client at `HermesApiClient.kt:655-715` renders it as a normal assistant turn.
-- **Stateful commands** (`/model`, `/new`, `/retry`, `/undo`, `/compress`, `/title`, `/resume`, `/branch`, `/rollback`, `/yolo`, `/reasoning`, `/personality`, etc. — most of the registry) — emit a synthetic SSE stream whose content is a short, helpful notice: *"The `/model` command requires a persistent session and isn't available on the stateless `/v1/runs` endpoint. Use `/api/sessions/{id}/chat/stream` (post-PR-#8556) or a channel with session state. For commands that work here, type `/help`."* This replaces the LLM hallucination with a deterministic, accurate message that points the user at the real fix.
+- **Stateful commands** (`/model`, `/new`, `/retry`, `/undo`, `/compress`, `/title`, `/resume`, `/branch`, `/rollback`, `/yolo`, `/reasoning`, `/personality`, etc. — most of the registry) — emit a synthetic SSE stream whose content is a short, helpful notice: *"The `/model` command requires a persistent session and isn't available on the stateless `/v1/runs` endpoint. Use `/api/sessions/{id}/chat/stream` or a channel with session state. For commands that work here, type `/help`."* This replaces the LLM hallucination with a deterministic, accurate message that points the user at the real fix.
 
 **On no match** (unknown command, cli-only command, or plain text): falls through to `handler(request)` unchanged. Fork-detects the same way the existing injection does — if the upstream preprocessor PR lands first, the middleware no-ops.
 
@@ -109,7 +109,7 @@ Small follow-ons to v0.4 deliberately deferred to keep the v0.4.0 release surfac
 
 **Files.** New `hermes_relay_bootstrap/_command_middleware.py` (~150 LOC), one-line append in `_patch.py` inside `_maybe_register_routes`, stdlib `unittest` coverage in `plugin/tests/test_bootstrap_command_middleware.py` mirroring the existing `test_bootstrap_patch.py` harness. Mirrors the upstream Option B PR exactly so the two can be reviewed side-by-side.
 
-**Phase 2 — stateful dispatch on the session chat stream endpoint (post PR #8556).** Once PR #8556 merges and `/api/sessions/{id}/chat/stream` ships natively in upstream, a separate middleware (or a follow-up upstream PR) can add a preprocessor **scoped to that endpoint only**, leveraging the `session_id` in the URL as the persistence handle. At that point stateful commands become a dict write against session-scoped state — `session.model_override = new_model` — without needing to refactor `GatewayRouter` or plumb api_server into the router. Much smaller than a full router refactor, and it matches upstream's partition: `/v1/*` stays stateless, statefulness lives on `/api/sessions/*`. Blocked on #8556 landing.
+**Phase 2 — stateful dispatch on the session chat stream endpoint (unblocked by PR #33134 / commit `f7527b0`).** Since `/api/sessions/{id}/chat/stream` now ships natively in upstream, a separate middleware (or a follow-up upstream PR) can add a preprocessor **scoped to that endpoint only**, leveraging the `session_id` in the URL as the persistence handle. At that point stateful commands become a dict write against session-scoped state — `session.model_override = new_model` — without needing to refactor `GatewayRouter` or plumb api_server into the router. Much smaller than a full router refactor, and it matches upstream's partition: `/v1/*` stays stateless, statefulness lives on `/api/sessions/*`.
 
 ## Future — v0.5+
 

TODO.md

@@ -78,10 +78,10 @@ Things to look into:
 - **Tool registration discoverability** — `android_*` tools register at gateway import time. There's no canonical "list installed plugin tools" API. Would adding one to upstream make sense, or is `gateway tool list` already enough?
 - **Versioning + compatibility ranges** — `pip install -e` doesn't enforce version pins between hermes-agent and our plugin. A breaking change in upstream's plugin loader could silently break us. Do we need a `hermes_compat: ">=0.8.0,<1.0.0"` field somewhere?
 - **`hermes-relay-self-setup` SKILL.md as a precedent** — we just shipped a self-installing skill that an LLM can fetch from a raw GitHub URL and execute. Does this pattern generalize? Could it become a recommended way for any third-party Hermes project to ship setup automation?
-- **Bootstrap injection** — `hermes_relay_bootstrap/` monkey-patches `aiohttp.web.Application` to inject endpoints into vanilla upstream. This is intentional but feels like a hack. Upstream PR #8556 (`feat/session-api`) will eventually let us delete it — verified 2026-04-15 that its scope covers the full bootstrap surface (sessions, memory, skills, config, available-models). Track that PR's status periodically.
-- **Gateway slash-command preprocessor — upstream Stage 1 PR.** Sibling follow-up to #8556. Intercepts known gateway commands on `/v1/runs` + `/v1/chat/completions`, dispatches the stateless ones (`/help`, `/commands`) via `gateway_help_lines()`, returns a deterministic "use a channel with session state" notice for the stateful majority. Currently being prepared in `C:/Users/Bailey/Desktop/Open-Projects/hermes-agent-pr-prep/` on branch `feat/api-server-gateway-commands`; awaiting subagent's code + draft PR body before pushing. See `docs/upstream-contributions.md` §5.
+- **Bootstrap injection shrink path** — `hermes_relay_bootstrap/` monkey-patches `aiohttp.web.Application` to inject endpoints into vanilla/partial upstream. Upstream commit `f7527b0` via PR #33134 now covers baseline sessions/chat/fork/message history, and `/v1/skills` covers list metadata. Do **not** delete the bootstrap wholesale yet: Relay still depends on compatibility routes that upstream lacks or does not match (`/api/sessions/search`, `/api/memory`, `/api/config`, legacy `/api/skills` detail routes, `/api/available-models`, and voice aliases). Shrink per route group only after native parity or client migration.
+- **Gateway slash-command preprocessor — upstream Stage 1 PR.** Follow-up to the native session-control baseline from PR #33134 / commit `f7527b0`. Intercepts known gateway commands on `/v1/runs` + `/v1/chat/completions`, dispatches the stateless ones (`/help`, `/commands`) via `gateway_help_lines()`, returns a deterministic "use a channel with session state" notice for the stateful majority. Currently being prepared in `C:/Users/Bailey/Desktop/Open-Projects/hermes-agent-pr-prep/` on branch `feat/api-server-gateway-commands`; awaiting subagent's code + draft PR body before pushing. See `docs/upstream-contributions.md` §5.
 - **Gateway slash-command preprocessor — bootstrap middleware (Stage 1 equivalent).** Sibling shim in `hermes_relay_bootstrap/_command_middleware.py` that mirrors the upstream Stage 1 PR as an aiohttp middleware injected at bootstrap time. Ships the hallucination fix to vanilla-upstream installs before the upstream PR lands. Planned for v0.4.1, after the current bridge feature branch wraps. See `ROADMAP.md` v0.4.1 entry.
-- **Stage 2 — stateful slash-command dispatch on `/api/sessions/{id}/chat/stream`.** Blocked on PR #8556 merging. Once session primitives ship upstream, add a preprocessor scoped to the session chat stream endpoint only, using `session_id` as the persistence handle. Separate upstream PR + matching bootstrap middleware. See `docs/upstream-contributions.md` §5 ("Stage 2").
+- **Stage 2 — stateful slash-command dispatch on `/api/sessions/{id}/chat/stream`.** Unblocked by upstream PR #33134 / commit `f7527b0`. Add a preprocessor scoped to the session chat stream endpoint only, using `session_id` as the persistence handle. Separate upstream PR + matching bootstrap middleware. See `docs/upstream-contributions.md` §5 ("Stage 2").
 
 When the answer becomes clearer, this section becomes either an ADR in `docs/decisions.md` or a Plan under `Plans/`.
 

app/build.gradle.kts

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

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

@@ -4,6 +4,7 @@ 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

@@ -1,66 +0,0 @@
-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,6 +6,7 @@ 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/onboarding/OnboardingFlowTest.kt

@@ -1,19 +1,22 @@
 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.test.core.app.ApplicationProvider
+import androidx.compose.ui.test.performScrollTo
 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 Standard-first onboarding pager.
+ * 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.
  */
 class OnboardingFlowTest {
 
@@ -21,186 +24,270 @@ class OnboardingFlowTest {
     val composeTestRule = createComposeRule()
 
     private fun setOnboardingContent() {
-        val app = ApplicationProvider.getApplicationContext<Application>()
-        val connectionViewModel = ConnectionViewModel(app)
         composeTestRule.setContent {
             HermesRelayTheme {
                 OnboardingScreen(
-                    connectionViewModel = connectionViewModel,
-                    onComplete = {},
+                    onComplete = { _, _, _ -> }
                 )
             }
         }
     }
 
+    // --- Page 1: Welcome ---
+
     @Test
-    fun firstPage_showsHermesForAndroidTitle() {
+    fun firstPage_showsHermesRelayTitle() {
         setOnboardingContent()
 
         composeTestRule
-            .onNodeWithText("Hermes-Relay for Android")
+            .onNodeWithText("Hermes-Relay")
             .assertIsDisplayed()
     }
 
     @Test
-    fun firstPage_showsStandardFirstDescription() {
+    fun firstPage_showsWelcomeDescription() {
         setOnboardingContent()
 
         composeTestRule
-            .onNodeWithText("Chat with Hermes and manage your dashboard from your phone.")
+            .onNodeWithText("Your AI agent, in your pocket. Chat, control, and connect — all from your phone.")
             .assertIsDisplayed()
+    }
+
+    // --- Skip button ---
+
+    @Test
+    fun skipButton_isAlwaysVisible_onFirstPage() {
+        setOnboardingContent()
+
         composeTestRule
-            .onNodeWithText("Standard")
+            .onNodeWithText("Skip")
             .assertIsDisplayed()
+    }
+
+    // --- Navigation: Next button ---
+
+    @Test
+    fun nextButton_isDisplayed_onFirstPage() {
+        setOnboardingContent()
+
         composeTestRule
-            .onNodeWithText("Advanced")
-            .assertIsDisplayed()
-        composeTestRule
-            .onNodeWithText("Setup Guide")
-            .assertIsDisplayed()
-        composeTestRule
-            .onNodeWithText("Hermes Docs")
+            .onNodeWithText("Next")
             .assertIsDisplayed()
     }
 
     @Test
-    fun nextButton_navigatesForward_toChatPage() {
+    fun nextButton_navigatesForward_toPage2() {
         setOnboardingContent()
 
+        // Page 1 -> Page 2
         composeTestRule.onNodeWithText("Next").performClick()
         composeTestRule.waitForIdle()
 
+        // Page 2 is "Talk to Your Agent"
         composeTestRule
-            .onNodeWithText("Chat")
+            .onNodeWithText("Talk to Your Agent")
             .assertIsDisplayed()
     }
 
     @Test
-    fun canNavigateForward_throughStandardAndPowerPages() {
+    fun canNavigateForward_throughAllPages() {
         setOnboardingContent()
 
-        composeTestRule.onNodeWithText("Hermes-Relay for Android").assertIsDisplayed()
+        // Page 1: Hermes-Relay (Welcome)
+        composeTestRule.onNodeWithText("Hermes-Relay").assertIsDisplayed()
         composeTestRule.onNodeWithText("Next").performClick()
         composeTestRule.waitForIdle()
 
-        composeTestRule.onNodeWithText("Chat").assertIsDisplayed()
+        // Page 2: Talk to Your Agent (Chat)
+        composeTestRule.onNodeWithText("Talk to Your Agent").assertIsDisplayed()
         composeTestRule.onNodeWithText("Next").performClick()
         composeTestRule.waitForIdle()
 
-        composeTestRule.onNodeWithText("Manage").assertIsDisplayed()
+        // Page 3: Remote Terminal
+        composeTestRule.onNodeWithText("Remote Terminal").assertIsDisplayed()
         composeTestRule.onNodeWithText("Next").performClick()
         composeTestRule.waitForIdle()
 
-        composeTestRule.onNodeWithText("Power tools").assertIsDisplayed()
-        composeTestRule.onNodeWithText("Connect").performClick()
+        // Page 4: Device Bridge
+        composeTestRule.onNodeWithText("Device Bridge").assertIsDisplayed()
+        composeTestRule.onNodeWithText("Next").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_navigatesBackward() {
+    fun backButton_visibleOnPage2() {
         setOnboardingContent()
 
         composeTestRule.onNodeWithText("Next").performClick()
         composeTestRule.waitForIdle()
-        composeTestRule.onNodeWithText("Chat").assertIsDisplayed()
 
+        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()
+
+        // Go back to page 1
         composeTestRule.onNodeWithText("Back").performClick()
         composeTestRule.waitForIdle()
-        composeTestRule.onNodeWithText("Hermes-Relay for Android").assertIsDisplayed()
+        composeTestRule.onNodeWithText("Hermes-Relay").assertIsDisplayed()
     }
 
+    // --- Page 5: Connect page ---
+
     @Test
-    fun connectPage_showsStandardChoiceFirst() {
+    fun connectPage_hasApiServerUrlField() {
         setOnboardingContent()
-        navigateToPage(4)
+        navigateToPage(4) // 0-indexed, page 5 is index 4
 
         composeTestRule
-            .onNodeWithText("Standard Hermes")
+            .onNodeWithText("API Server URL")
             .assertIsDisplayed()
     }
 
     @Test
-    fun standardSetup_showsApiFields() {
+    fun connectPage_hasApiKeyField() {
         setOnboardingContent()
         navigateToPage(4)
 
-        composeTestRule.onNodeWithText("Standard Hermes").performClick()
+        composeTestRule
+            .onNodeWithText("API Key (optional)", substring = true)
+            .assertIsDisplayed()
+    }
+
+    @Test
+    fun connectPage_whereDoIFindThis_showsHelpDialog() {
+        setOnboardingContent()
+        navigateToPage(4)
+
+        // Tap "Where do I find this?"
+        composeTestRule
+            .onNodeWithText("Where do I find this?")
+            .performClick()
         composeTestRule.waitForIdle()
 
+        // Dialog should show
         composeTestRule
-            .onNodeWithText("API server URL")
-            .assertIsDisplayed()
-        composeTestRule
-            .onNodeWithText("API key")
+            .onNodeWithText("Do I need an API key?")
             .assertIsDisplayed()
     }
 
     @Test
-    fun standardSetup_connectButton_isEnabled_withDefaultUrl() {
+    fun connectPage_helpDialog_canBeDismissed() {
         setOnboardingContent()
         navigateToPage(4)
 
-        composeTestRule.onNodeWithText("Standard Hermes").performClick()
+        composeTestRule.onNodeWithText("Where do I find this?").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("Connect")
+            .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")
             .assertIsEnabled()
     }
 
-    @Test
-    fun connectPage_keepsPairingOptional() {
-        setOnboardingContent()
-        navigateToPage(4)
-
-        composeTestRule
-            .onNodeWithText("Pair Relay by code")
-            .assertIsDisplayed()
-        composeTestRule
-            .onNodeWithText("Power-user path for Terminal, Bridge, Relay sessions, and grants")
-            .assertIsDisplayed()
-    }
+    // --- Skip button visibility across pages ---
 
     @Test
-    fun powerPage_linksToPermissionReview() {
-        setOnboardingContent()
-        navigateToPage(3)
-
-        composeTestRule
-            .onNodeWithText("Review permissions")
-            .assertIsDisplayed()
-            .assertIsEnabled()
-    }
-
-    @Test
-    fun skipButton_visibleOnIntroPages_andWizardSkipOnConnectPage() {
+    fun skipButton_visibleOnAllPages() {
         setOnboardingContent()
 
-        repeat(4) {
-            composeTestRule.onNodeWithText("Skip").assertIsDisplayed()
-            composeTestRule.onNodeWithText(if (it == 3) "Connect" else "Next").performClick()
+        // 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("Skip for now — set up later in Settings")
-            .assertIsDisplayed()
     }
 
+    // --- Helper ---
+
     private fun navigateToPage(pageIndex: Int) {
         repeat(pageIndex) {
-            composeTestRule.onNodeWithText(if (it == 3) "Connect" else "Next").performClick()
+            composeTestRule.onNodeWithText("Next").performClick()
             composeTestRule.waitForIdle()
         }
     }

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

@@ -1,52 +1,157 @@
 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.test.core.app.ApplicationProvider
-import com.hermesandroid.relay.viewmodel.ConnectionViewModel
-import com.hermesandroid.relay.viewmodel.TerminalViewModel
+import androidx.compose.material3.MaterialTheme
 import org.junit.Rule
 import org.junit.Test
 
 /**
- * Instrumented smoke tests for the current Terminal and Bridge surfaces.
+ * Instrumented tests for Terminal and Bridge empty state screens.
  */
 class EmptyStateTest {
 
     @get:Rule
     val composeTestRule = createComposeRule()
 
-    @Test
-    fun terminalScreen_showsCurrentTopBar() {
-        val app = ApplicationProvider.getApplicationContext<Application>()
-        val terminalViewModel = TerminalViewModel(app)
-        val connectionViewModel = ConnectionViewModel(app)
+    // --- Terminal Screen ---
 
+    @Test
+    fun terminalScreen_showsTitle() {
         composeTestRule.setContent {
             MaterialTheme {
-                TerminalScreen(
-                    terminalViewModel = terminalViewModel,
-                    connectionViewModel = connectionViewModel,
-                )
+                TerminalScreen()
             }
         }
 
-        composeTestRule.onNodeWithText("Terminal").assertIsDisplayed()
-        composeTestRule.onNodeWithContentDescription("Search scrollback").assertIsDisplayed()
+        composeTestRule
+            .onNodeWithText("Remote Terminal")
+            .assertIsDisplayed()
     }
 
     @Test
-    fun bridgeScreen_showsCurrentTopBar() {
+    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() {
         composeTestRule.setContent {
             MaterialTheme {
                 BridgeScreen()
             }
         }
 
-        composeTestRule.onNodeWithText("Bridge").assertIsDisplayed()
+        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()
     }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

app/src/main/AndroidManifest.xml

@@ -6,19 +6,6 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <!-- Turn-complete chat notification (TurnCompleteNotifier) — runtime-requested
-         on API 33+ from the Chat Settings toggle. Lives in main (not just the
-         sideload overlay) so the googlePlay flavor can notify too. -->
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-
-    <!-- Opt-in "Keep connected in background" (GatewayKeepAliveService). In main
-         (not the sideload overlay) so the googlePlay flavor ships it too — the
-         Home-Assistant-class persistent-connection use case Play permits. The
-         specialUse type requires a one-time Play Console foreground-service
-         declaration at submission. (Also already present in the sideload overlay
-         for the device-control bridge service; the merger dedups.) -->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
 
     <uses-feature android:name="android.hardware.camera" android:required="false" />
 
@@ -37,7 +24,6 @@
             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" />
@@ -67,20 +53,6 @@
         </service>
         <!-- === END PHASE3-notif-listener === -->
 
-        <!-- Opt-in "Keep connected in background" — holds the gateway chat
-             socket open while backgrounded. In main so BOTH flavors ship it
-             (Home-Assistant-class persistent connection). Off by default; only
-             runs while the user has explicitly enabled the toggle. specialUse
-             needs a Play Console foreground-service declaration at submission. -->
-        <service
-            android:name=".network.upstream.GatewayKeepAliveService"
-            android:exported="false"
-            android:foregroundServiceType="specialUse">
-            <property
-                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
-                android:value="Keeps the user's chat connection to their Hermes agent open while the app is backgrounded, only when the user has explicitly enabled 'Keep connected in background'." />
-        </service>
-
     </application>
 
 </manifest>

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

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

app/src/main/assets/whats_new.txt

@@ -1,36 +1,7 @@
-v1.0.0 - The 1.0 release
-
-Standard path
-* Chat, Manage, and voice now work on a plain Hermes agent — no relay
-  plugin required. The plugin is optional and only adds power tools.
-
-Chat
-* New gateway transport streams the agent's reasoning live, so the
-  Thinking block fills in during generation instead of after.
-* Warm-start + opt-in "Keep connected in background" make returning to a
-  conversation fast.
-* Attachments at desktop parity: images, PDFs, and files upload over the
-  gateway. If a connection can't carry a file, you'll see a notice
-  instead of a silent drop.
-* Steer a running turn, edit & resend your messages, watch subagent
-  lanes, and a context-window meter — plus turn-complete notifications.
-* Tap an image to open it full-screen (pinch to zoom); save or share
-  images and other attachments.
-* Redesigned input bar: pill field, one morphing Send/Voice/Stop button.
-
-Profiles
-* Switch the whole agent — model, persona, and skills — per conversation.
-  The drawer scopes to the active profile, and switching is ephemeral: it
-  never changes your server's default agent.
-
-Manage
-* Models, provider keys, profiles + SOUL.md, and a skills hub — parity
-  with the desktop dashboard. Cached for instant cold-launch.
+v0.8.1 - Voice mode crash fix
 
 Voice
-* Realtime Agent keeps one session across turns; long runs continue in
-  the background and are spoken when ready.
-
-Polish
-* Seamless LAN/Tailscale handoffs (no chat reload), slide-down status
-  toasts, and a broad round of fixes.
+* 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/HermesRelayApp.kt

@@ -1,32 +1,33 @@
 package com.hermesandroid.relay
 
 import android.app.Application
-import coil3.ImageLoader
-import coil3.PlatformContext
-import coil3.SingletonImageLoader
-import coil3.network.okhttp.OkHttpNetworkFetcherFactory
-import coil3.request.crossfade
+import android.os.Build
+import androidx.compose.ui.ComposeUiFlags
+import androidx.compose.ui.ExperimentalComposeUiApi
 import com.hermesandroid.relay.bridge.UnattendedAccessManager
 import com.hermesandroid.relay.data.AppAnalytics
 import com.hermesandroid.relay.power.WakeLockManager
 import com.hermesandroid.relay.util.AppForegroundTracker
 
-class HermesRelayApp : Application(), SingletonImageLoader.Factory {
+class HermesRelayApp : Application() {
 
-    /**
-     * Coil's singleton image loader for the whole app. Registering the OkHttp
-     * network fetcher EXPLICITLY guarantees `http(s)` image URLs (e.g. a
-     * generated-image link in a chat reply) load, rather than relying on
-     * artifact auto-registration. Crossfade for a clean fade-in.
-     */
-    override fun newImageLoader(context: PlatformContext): ImageLoader =
-        ImageLoader.Builder(context)
-            .components { add(OkHttpNetworkFetcherFactory()) }
-            .crossfade(true)
-            .build()
+    @OptIn(ExperimentalComposeUiApi::class)
+    override fun attachBaseContext(base: android.content.Context?) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+            ComposeUiFlags.isAdaptiveRefreshRateEnabled = false
+        }
+        super.attachBaseContext(base)
+    }
 
+    @OptIn(ExperimentalComposeUiApi::class)
     override fun onCreate() {
         super.onCreate()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+            // Compose's adaptive refresh-rate hint path on API 35 can emit
+            // `setRequestedFrameRate frameRate=NaN` from inside AndroidComposeView
+            // on every draw pass. Disable ARR globally until the upstream fix lands.
+            ComposeUiFlags.isAdaptiveRefreshRateEnabled = false
+        }
         instance = this
         AppAnalytics.initialize(this)
         // A8 — wire the bridge-gesture wake-lock wrapper so

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

@@ -19,8 +19,8 @@ import com.hermesandroid.relay.accessibility.ScreenCaptureRequester
 import com.hermesandroid.relay.bridge.BridgeForegroundService
 import com.hermesandroid.relay.bridge.UnattendedAccessManager
 import com.hermesandroid.relay.data.BuildFlavor
-import com.hermesandroid.relay.notifications.TurnCompleteNotifier
 import com.hermesandroid.relay.ui.RelayApp
+import com.hermesandroid.relay.util.ComposeArrWorkaround
 import com.hermesandroid.relay.util.NavRouteRequest
 import com.hermesandroid.relay.viewmodel.ConnectionViewModel
 
@@ -37,7 +37,7 @@ class MainActivity : ComponentActivity() {
     // We do NOT call MediaProjectionHolder directly from here. On Android
     // 14+, getMediaProjection() must run from inside a foreground service
     // that has already called startForeground(type=mediaProjection), and
-    // that startForeground call must happen AFT consent. So we hand the
+    // that startForeground call must happen AFTER consent. So we hand the
     // result off to BridgeForegroundService, which:
     //   1. Upgrades its FGS type to SPECIAL_USE | MEDIA_PROJECTION
     //   2. Calls MediaProjectionHolder.acceptGrantInsideForegroundService
@@ -117,6 +117,9 @@ class MainActivity : ComponentActivity() {
         setContent {
             RelayApp()
         }
+        window.decorView.post {
+            ComposeArrWorkaround.disableForViewTree(window.decorView)
+        }
     }
 
     override fun onNewIntent(intent: Intent) {
@@ -139,9 +142,6 @@ class MainActivity : ComponentActivity() {
 
     override fun onResume() {
         super.onResume()
-        // Returning to the app clears the one-slot "Hermes finished
-        // responding" notification — the chat surface is the answer.
-        TurnCompleteNotifier.cancel(this)
         // v0.4.1 — register this activity as the host for
         // KeyguardManager.requestDismissKeyguard. Cleared in onPause so
         // we don't leak the Activity past its lifecycle. The unattended-

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

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

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

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

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

@@ -39,7 +39,7 @@ import kotlinx.coroutines.launch
  *
  * # Master enable / disable
  *
- * The Android system toggle in `Settings → Accessibility → Hermes-Relay` is
+ * The Android system toggle in `Settings → Accessibility → Hermes Relay` is
  * the hard switch — if it's off we never receive events. On top of that the
  * user can flip a soft master in Settings (`bridge_master_enabled`); when
  * that's false we still run (Android requires it to stay connected) but we
@@ -68,7 +68,7 @@ class HermesAccessibilityService : AccessibilityService() {
          * service is not running. Written on [onServiceConnected],
          * cleared on [onUnbind] / [onDestroy].
          *
-         * Read by [com.hermesandroid.relay.network.relay.BridgeCommandHandler]
+         * Read by [com.hermesandroid.relay.network.handlers.BridgeCommandHandler]
          * and by the Bridge UI screen (bridge-ui) to check live status.
          */
         @Volatile

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

@@ -6,8 +6,8 @@ import com.hermesandroid.relay.data.Connection
 import com.hermesandroid.relay.data.EndpointCandidate
 import com.hermesandroid.relay.data.PairingPreferences
 import com.hermesandroid.relay.data.Profile
-import com.hermesandroid.relay.network.relay.ChannelMultiplexer
-import com.hermesandroid.relay.network.relay.models.Envelope
+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
@@ -18,7 +18,6 @@ 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
@@ -41,15 +40,6 @@ 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.
  *
@@ -100,7 +90,6 @@ class AuthManager(
         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')
@@ -145,56 +134,6 @@ class AuthManager(
                     }
             }
 
-        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
@@ -273,48 +212,6 @@ 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
@@ -330,26 +227,19 @@ 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.
-                // Both encrypted backends decrypt their Tink keyset eagerly on
-                // construction, so a corrupt file can throw AEADBadTagException
-                // here. KeystoreTokenStore.tryCreate already degrades to null;
-                // the legacy store self-heals its file in its constructor. If
-                // even that rebuild fails (a fundamentally broken keystore),
-                // fall back to a non-persistent store rather than force-close —
-                // the user re-pairs, but the app stays up.
+                // Multi-connection: pick the EncryptedSharedPreferences
+                // filename based on 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 prefsName = tokenStoreKey ?: if (connectionId == CONNECTION_ID_LEGACY) {
+                    Connection.LEGACY_TOKEN_STORE_KEY
+                } else {
+                    Connection.buildTokenStoreKey(connectionId)
+                }
                 val picked: SessionTokenStore =
-                    KeystoreTokenStore.tryCreate(context, tokenPrefsName)
-                        ?: runCatching {
-                            LegacyEncryptedPrefsTokenStore(context, tokenPrefsName)
-                        }.getOrElse { e ->
-                            Log.w(TAG, "Legacy token store unavailable (${e.message}) — using in-memory fallback; re-pair required")
-                            InMemoryTokenStore()
-                        }
+                    KeystoreTokenStore.tryCreate(context, prefsName)
+                        ?: LegacyEncryptedPrefsTokenStore(context, prefsName)
                 migrateFromLegacyIfNeeded(picked)
                 _store = picked
                 picked
@@ -539,9 +429,7 @@ class AuthManager(
             } else {
                 Log.i(TAG, "init: no stored session_token → authState stays Unpaired")
             }
-            // Converge the plain api-key-present hint with the decrypted
-            // truth (also repairs a hint that predates legacy migration).
-            recordApiKeyHint(!s.getString(KEY_API_KEY).isNullOrBlank())
+            _apiKeyPresent.value = !s.getString(KEY_API_KEY).isNullOrBlank()
         }
     }
 
@@ -869,16 +757,16 @@ class AuthManager(
         val s = store()
         if (trimmed.isBlank()) {
             s.remove(KEY_API_KEY)
-            recordApiKeyHint(false)
+            _apiKeyPresent.value = false
         } else {
             s.putString(KEY_API_KEY, trimmed)
-            recordApiKeyHint(true)
+            _apiKeyPresent.value = true
         }
     }
 
     suspend fun clearApiKey() {
         store().remove(KEY_API_KEY)
-        recordApiKeyHint(false)
+        _apiKeyPresent.value = false
     }
 
     val isPaired: Boolean

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

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

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

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

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

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

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

@@ -10,73 +10,35 @@ package com.hermesandroid.relay.data
  */
 object AgentDisplay {
     const val SERVER_DEFAULT_PROFILE_KEY: String = "__server_default__"
-    private val GENERIC_MODEL_ALIASES = setOf(
-        "hermes-agent",
-        "hermes_agent",
-        "hermes agent",
-    )
 
-    // Only an EXPLICIT pick drives request/session identity. The advertised
-    // "default" profile is an alias for server default, so falling back to it
-    // here would split chat, voice, or session scope.
-    @Suppress("UNUSED_PARAMETER")
     fun effectiveProfile(
         selectedProfile: Profile?,
         profiles: List<Profile>,
     ): Profile? = selectedProfile
+        ?: profiles.firstOrNull { it.name.equals("default", ignoreCase = true) }
 
-    // Display can use the synthetic default profile's metadata without making
-    // it a request/session override. Verbose SOUL summaries are filtered by
-    // profileDisplayName below, so this is safe for headers/cards.
-    fun effectiveDisplayProfile(
-        selectedProfile: Profile?,
-        profiles: List<Profile>,
-    ): Profile? = selectedProfile ?: profiles.firstOrNull { isServerDefaultAlias(it.name) }
-
-    // The NAME goes in the name slot. Non-default profiles use their profile
-    // name first. The synthetic default profile uses its description only when
-    // that description looks like a concise human agent name ("Victor"), not a
-    // verbose SOUL summary.
     fun profileDisplayName(profile: Profile?): String? {
         if (profile == null) return null
-        if (isServerDefaultAlias(profile.name)) {
-            return defaultProfileDisplayName(profile)
-        }
         return when {
-            profile.name.isNotBlank() -> titleCase(profile.name.trim())
             profile.description.isNotBlank() -> profile.description.trim()
+            profile.name.isNotBlank() -> titleCase(profile.name.trim())
             else -> null
         }
     }
 
-    fun defaultProfileDisplayName(profile: Profile?): String? =
-        profile
-            ?.description
-            ?.trim()
-            ?.takeIf { it.looksLikeConciseAgentName() }
-            ?.let(::titleCase)
-
     fun agentName(
         profile: Profile?,
         selectedPersonality: String,
         defaultPersonality: String,
         connectionLabel: String?,
-        localDisplayAlias: String? = null,
     ): String {
-        localDisplayAlias(localDisplayAlias)?.let { return it }
         profileDisplayName(profile)?.let { return it }
 
-        // "none"/"neutral" are the upstream "cleared overlay" aliases — treat
-        // them like "default" for identity: fall through to the server default
-        // (or the base connection identity) rather than rendering the literal
-        // word as an agent name.
         val personalityName = if (
-            isClearedPersonality(selectedPersonality) &&
+            selectedPersonality == "default" &&
             defaultPersonality.isNotBlank()
         ) {
             defaultPersonality
-        } else if (isClearedPersonality(selectedPersonality)) {
-            ""
         } else {
             selectedPersonality
         }
@@ -89,43 +51,16 @@ object AgentDisplay {
         }
     }
 
-    /** True for the upstream "clear the overlay" aliases (default == none == neutral). */
-    fun isClearedPersonality(value: String): Boolean =
-        value.trim().lowercase() in setOf("default", "none", "neutral", "")
-
     fun personalityLabel(
         selectedPersonality: String,
         defaultPersonality: String,
     ): String = when {
-        // Explicit "none" — show "None" (or the configured default name, if any)
-        // so the cleared-overlay state is legible in the picker header.
-        selectedPersonality.trim().lowercase() in setOf("none", "neutral") ->
-            if (defaultPersonality.isNotBlank()) titleCase(defaultPersonality.trim()) else "None"
         selectedPersonality != "default" && selectedPersonality.isNotBlank() ->
             titleCase(selectedPersonality.trim())
         defaultPersonality.isNotBlank() -> titleCase(defaultPersonality.trim())
         else -> "Default"
     }
 
-    fun displayModelName(model: String?): String? =
-        model
-            ?.trim()
-            ?.takeIf { it.isNotEmpty() }
-            ?.takeUnless { it.lowercase() in GENERIC_MODEL_ALIASES }
-
-    /**
-     * A model string safe to SEND to the server as a model override or
-     * `config.set model=…`. Returns null for the generic agent placeholders
-     * ("hermes-agent", …) which are NOT real models — the server rejects them
-     * (HTTP 400) and falls back. Null means "send no model; use the server's
-     * configured default."
-     */
-    fun requestModelName(model: String?): String? =
-        model
-            ?.trim()
-            ?.takeIf { it.isNotEmpty() }
-            ?.takeUnless { it.lowercase() in GENERIC_MODEL_ALIASES }
-
     fun isServerDefaultAlias(profileName: String?): Boolean =
         profileName?.trim()?.equals("default", ignoreCase = true) == true
 
@@ -143,22 +78,6 @@ object AgentDisplay {
     fun profileContextKey(connectionId: String?, profileName: String?): String =
         "${connectionId.orEmpty()}::${profileSessionKey(profileName)}"
 
-    fun localDisplayAlias(value: String?): String? =
-        value
-            ?.trim()
-            ?.replace(Regex("\\s+"), " ")
-            ?.takeIf { it.isNotEmpty() }
-
-    private fun String.looksLikeConciseAgentName(): Boolean {
-        if (isBlank() || length > 40 || contains('\n') || contains('\r')) {
-            return false
-        }
-        if (any { it == '.' || it == ':' || it == ';' }) {
-            return false
-        }
-        return trim().split(Regex("\\s+")).size <= 4
-    }
-
     private fun titleCase(value: String): String =
         value.replaceFirstChar { it.uppercase() }
 }

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

@@ -46,7 +46,7 @@ data class ChatMessage(
     /**
      * Rich content cards emitted by the agent via `CARD:{json}` line
      * markers in the text stream. Parsed in
-     * [com.hermesandroid.relay.network.upstream.ChatHandler.scanForCardMarkers]
+     * [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
@@ -76,7 +76,7 @@ data class ChatMessage(
      * The sync builder treats messages with [voiceIntent] != null and
      * [VoiceIntentTrace.syncedToServer] == false as the inputs to its
      * synthesis pass; on a successful send we flip [VoiceIntentTrace.syncedToServer]
-     * to true via [com.hermesandroid.relay.network.upstream.ChatHandler.markVoiceIntentsSynced]
+     * to true via [com.hermesandroid.relay.network.handlers.ChatHandler.markVoiceIntentsSynced]
      * so they're not re-sent on the next turn.
      */
     val voiceIntent: VoiceIntentTrace? = null,
@@ -94,7 +94,7 @@ data class ChatMessage(
 
 /**
  * Structured details about a phone-local voice intent that was dispatched
- * in-process via [com.hermesandroid.relay.network.relay.BridgeCommandHandler.handleLocalCommand].
+ * in-process via [com.hermesandroid.relay.network.handlers.BridgeCommandHandler.handleLocalCommand].
  *
  * Captured on a [ChatMessage] (id prefix `voice-intent-`) so the next chat
  * payload can include synthetic OpenAI-format `assistant` + `tool` message
@@ -123,12 +123,12 @@ data class ChatMessage(
  *   includes an `error` field.
  * @property resultJson Compact JSON object describing the dispatch outcome.
  *   On success, typically `{"ok":true,...}` with any tool-specific fields
- *   from [com.hermesandroid.relay.network.shared.LocalDispatchResult.resultJson].
+ *   from [com.hermesandroid.relay.network.handlers.LocalDispatchResult.resultJson].
  *   On failure, an error envelope including `ok:false`, `error`, optionally
  *   `error_code`. Stored as a string and rendered verbatim into the
  *   synthetic `tool`-role message's `content` field.
  * @property syncedToServer Idempotency guard. Flipped to true by
- *   [com.hermesandroid.relay.network.upstream.ChatHandler.markVoiceIntentsSynced]
+ *   [com.hermesandroid.relay.network.handlers.ChatHandler.markVoiceIntentsSynced]
  *   the moment we hand the request payload to the API client. Once true,
  *   the trace is excluded from future sync passes — the server-side
  *   session has already absorbed it.
@@ -238,27 +238,7 @@ data class ToolCall(
     val provenance: String? = null,
     // Duration tracking
     val startedAt: Long = System.currentTimeMillis(),
-    val completedAt: Long? = null,
-    /**
-     * Gateway `tool.generating` pre-start phase — the model is still
-     * streaming this tool's arguments. Cleared (flipped false) when the
-     * matching `tool.start` arrives and the call begins executing. Renders
-     * as the quiet "preparing" state in ToolProgressCard / CompactToolCall
-     * rather than the active running spinner.
-     */
-    val isGenerating: Boolean = false,
-    /**
-     * Subagent lane index from gateway `subagent.*` events (`task_index`).
-     * Null = top-level tool call, rendered exactly as before. Non-null
-     * calls are grouped per index into a SubagentLane under the bubble.
-     */
-    val taskIndex: Int? = null,
-    /**
-     * Human label for the owning subagent lane — the `subagent.start`
-     * goal truncated to 60 chars. Carried on each child call so the lane
-     * header can render without a separate lane registry.
-     */
-    val taskLabel: String? = null
+    val completedAt: Long? = null
 )
 
 enum class MessageRole {
@@ -272,16 +252,5 @@ data class ChatSession(
     val title: String?,
     val model: String?,
     val messageCount: Int = 0,
-    val updatedAt: Long = 0L,
-    val startedAt: Long = 0L,
-    val lastActivityAt: Long = 0L
-) {
-    val activityTimestamp: Long
-        get() = firstPositive(lastActivityAt, updatedAt, startedAt)
-
-    val startTimestamp: Long
-        get() = firstPositive(startedAt, updatedAt, lastActivityAt)
-
-    private fun firstPositive(vararg values: Long): Long =
-        values.firstOrNull { it > 0L } ?: 0L
-}
+    val updatedAt: Long = 0L
+)

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

@@ -3,18 +3,6 @@ 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.
  *
@@ -30,7 +18,7 @@ data class DashboardConnectionStatus(
  *    open the token store.
  *
  * Switching connection is a HEAVY context swap — caller is expected to tear down
- * the current [com.hermesandroid.relay.network.relay.ConnectionManager],
+ * 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`.
  *
@@ -42,9 +30,9 @@ data class DashboardConnectionStatus(
  *
  * **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.
+ * free to mean what Hermes's server config means by it (agent profiles —
+ * name + model + description defined under `agent.profiles` in config.yaml).
+ * A follow-up pass will introduce the new `Profile` concept on top.
  */
 @Serializable
 data class Connection(
@@ -53,24 +41,6 @@ data class Connection(
     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,
@@ -78,12 +48,6 @@ data class Connection(
     /** 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
@@ -93,8 +57,6 @@ data class Connection(
          */
         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
@@ -118,215 +80,5 @@ data class Connection(
                 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),
-                dashboard = deriveDefaultDashboardUrl(apiServerUrl)
-                    ?.let { DashboardEndpoint(url = it) },
-                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

@@ -100,17 +100,6 @@ class ConnectionStore private constructor(
     private val _activeConnectionId = MutableStateFlow<String?>(null)
     val activeConnectionId: StateFlow<String?> = _activeConnectionId.asStateFlow()
 
-    /**
-     * Flips to `true` once the initial DataStore hydrate completes (success OR
-     * failure). Until then [connections] / [activeConnection] hold their empty
-     * seed values, which are indistinguishable from a genuinely empty store.
-     * Consumers that must not mistake "still loading" for "nothing configured"
-     * — e.g. the chat empty-state, which would otherwise flash a "Connect to
-     * Hermes" CTA on every cold start — gate on this instead of on emptiness.
-     */
-    private val _isHydrated = MutableStateFlow(false)
-    val isHydrated: StateFlow<Boolean> = _isHydrated.asStateFlow()
-
     /**
      * Derived: the active connection, or null when the active ID is missing
      * or points to a deleted connection. Recomputes every time either
@@ -155,11 +144,6 @@ class ConnectionStore private constructor(
                 }
             } catch (e: Exception) {
                 Log.w(TAG, "Initial hydrate failed: ${e.message}")
-            } finally {
-                // Mark hydration done even on failure — a failed read still
-                // means "we now know the store's state is empty", so the UI
-                // should stop showing the neutral loading gate.
-                _isHydrated.value = true
             }
         }
     }
@@ -174,8 +158,7 @@ class ConnectionStore private constructor(
                 // 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
+                val next = current.filterNot { it.id == connection.id } + connection
                 prefs[KEY_CONNECTIONS] = encodeConnections(next)
                 _connections.value = next
             }
@@ -194,8 +177,7 @@ class ConnectionStore private constructor(
                     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 }
+                val next = current.map { if (it.id == connection.id) connection else it }
                 prefs[KEY_CONNECTIONS] = encodeConnections(next)
                 _connections.value = next
             }
@@ -230,83 +212,27 @@ class ConnectionStore private constructor(
                     _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}",
-                    )
+            removed?.let { 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}",
+                            )
+                        }
+                    }
                 }
             }
         }
@@ -368,8 +294,6 @@ class ConnectionStore private constructor(
                             pairedAt = pairedAtMillis,
                             transportHint = transportHint,
                             expiresAt = expiresAtMillis,
-                            dashboardUrl = target.dashboardUrl
-                                ?: Connection.deriveDefaultDashboardUrl(target.apiServerUrl),
                         )
                     } else {
                         it
@@ -416,8 +340,6 @@ class ConnectionStore private constructor(
                     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,
@@ -433,33 +355,6 @@ class ConnectionStore private constructor(
         }
     }
 
-    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 =
@@ -469,36 +364,12 @@ class ConnectionStore private constructor(
         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"
 

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

@@ -6,10 +6,6 @@ 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.upstream.EncryptedDashboardCookieStore
-import com.hermesandroid.relay.network.upstream.StoredDashboardCookie
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
@@ -24,8 +20,8 @@ import java.io.File
 /**
  * Manages app data: backup, restore, and reset.
  *
- * Backup format is a JSON file containing full connection metadata and
- * credentials. Treat exported files as sensitive secrets.
+ * Backup format is a JSON file containing settings and connection info.
+ * Tokens are NOT included in backups for security.
  */
 class DataManager(
     private val context: Context,
@@ -55,7 +51,8 @@ class DataManager(
     }
 
     /**
-     * Backup data model.
+     * Backup data model -- only non-sensitive settings.
+     * Tokens and device IDs are never included.
      *
      * **Schema history:**
      *  - v1: `serverUrl` only (single endpoint, pre-API-split).
@@ -69,50 +66,22 @@ class DataManager(
      *    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 = 5,
+        val version: Int = 4,
         val serverUrl: String? = null, // legacy (v1 compat)
         val apiServerUrl: String? = null,
         val relayUrl: String? = null,
         val theme: String = "auto",
         val onboardingCompleted: Boolean = false,
         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,
+        val exportedAt: Long = System.currentTimeMillis()
     )
 
     /**
      * Export app settings to a JSON string.
-     * Includes connection credentials. The export UI must warn the user that
-     * the resulting JSON file is sensitive.
+     * Does NOT include session tokens or device IDs (security).
      *
      * The `sessionLabels` parameter is a legacy dead parameter — it was
      * previously sourced from `AuthManager.sessionLabels`, a field removed
@@ -131,7 +100,7 @@ class DataManager(
         apiServerUrl: String? = null,
         relayUrl: String? = null
     ): String {
-        val connectionsSnapshot = connectionStore?.connections?.value.orEmpty()
+        val connectionsSnapshot = connectionStore?.connections?.value
         if (connectionStore == null) {
             Log.w(
                 TAG,
@@ -139,56 +108,19 @@ class DataManager(
                     "(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 = 5,
+            version = 4,
             serverUrl = serverUrl, // legacy compat
             apiServerUrl = apiServerUrl,
             relayUrl = relayUrl,
             theme = theme,
             onboardingCompleted = onboardingCompleted,
-            connections = connectionsSnapshot,
-            activeConnectionId = connectionStore?.activeConnectionId?.value,
-            containsSensitiveData = true,
-            connectionSecrets = connectionSecrets,
-            exportedAt = System.currentTimeMillis(),
+            connections = connectionsSnapshot ?: emptyList(),
+            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.
@@ -289,11 +221,6 @@ class DataManager(
             // 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() }
 
@@ -304,7 +231,15 @@ class DataManager(
                 }
             }
 
-            deleteSensitivePreferenceFiles()
+            // 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")
+                }
+            }
 
             // Clear cache directory
             withContext(Dispatchers.IO) {
@@ -319,61 +254,6 @@ class DataManager(
         }
     }
 
-    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

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

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

@@ -1,22 +0,0 @@
-package com.hermesandroid.relay.data
-
-import android.content.Context
-import androidx.datastore.preferences.core.booleanPreferencesKey
-import androidx.datastore.preferences.core.edit
-
-/**
- * Single source of truth for the opt-in "keep the gateway chat connection
- * alive in the background" preference. Off by default.
- *
- * Shared by [com.hermesandroid.relay.viewmodel.ConnectionViewModel] (the
- * StateFlow + setter that drive the foreground service and the client's
- * no-background-close flag) and
- * [com.hermesandroid.relay.network.upstream.GatewayKeepAliveService]'s Stop notification
- * action, so both read/write the same key.
- */
-val KEY_GATEWAY_KEEP_ALIVE = booleanPreferencesKey("gateway_keep_alive_background")
-
-/** Persist the keep-alive preference. Used by the FGS Stop action. */
-suspend fun Context.setGatewayKeepAlive(enabled: Boolean) {
-    relayDataStore.edit { it[KEY_GATEWAY_KEEP_ALIVE] = enabled }
-}

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

@@ -6,7 +6,7 @@ import kotlinx.serialization.Serializable
 /**
  * A rich content card emitted inline in an assistant message via the
  * `CARD:{json}` line marker. Parsed by
- * [com.hermesandroid.relay.network.upstream.ChatHandler] and rendered 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
@@ -53,22 +53,8 @@ data class HermesCard(
      * which action (if any) has been dispatched, so the same card reloaded
      * from session history doesn't re-prompt. Falls back to the card's
      * position in the message when null.
-     *
-     * For the gateway ask types this is the ask's `request_id` (or
-     * `approval-<sid>-<ts>` for approval, which has no request id) — the
-     * dispatch tracker keys answer-once semantics off it.
      */
     val id: String? = null,
-    /**
-     * Interactive input slot rendered between [fields] and [actions] —
-     * the answer surface for the gateway ask cards (`ask.clarify` choice
-     * chips + free text, `ask.secret` masked field, `ask.sudo`
-     * hold-to-confirm). Null for every plain card. Submissions flow
-     * through the renderer's `onInputSubmit(cardKey, value)` callback and
-     * collapse the card via the same [HermesCardDispatch] list as button
-     * actions.
-     */
-    val input: HermesCardInput? = null,
 ) {
     object BuiltInTypes {
         const val SKILL_RESULT = "skill_result"
@@ -76,14 +62,6 @@ data class HermesCard(
         const val LINK_PREVIEW = "link_preview"
         const val CALENDAR_EVENT = "calendar_event"
         const val WEATHER = "weather"
-
-        // Gateway interactive asks (desktop-parity wave). Locally built
-        // from clarify/approval/sudo/secret request events — never parsed
-        // out of the text stream.
-        const val ASK_APPROVAL = "ask.approval"
-        const val ASK_CLARIFY = "ask.clarify"
-        const val ASK_SUDO = "ask.sudo"
-        const val ASK_SECRET = "ask.secret"
     }
 
     object Accents {
@@ -94,67 +72,6 @@ data class HermesCard(
     }
 }
 
-/**
- * Interactive input slot on a [HermesCard]. The flags compose rather than
- * branch — a sudo ask can be `masked + holdToConfirm` (password field whose
- * submit is the 650ms press-fill button), while clarify is
- * `choices + allowFreeText` and secret is `masked` alone.
- *
- * Security contract: when [masked] is true the submitted value is a secret.
- * It must never be echoed into chat content, logged, or synced via
- * CardDispatchSyncBuilder — record [SECRET_PROVIDED_STAMP] as the dispatch's
- * actionValue instead of the real value. The renderer masks the collapse
- * stamp for masked inputs regardless, but the dispatch record itself is
- * persisted and synced, so the caller must not put the secret there.
- */
-@Serializable
-data class HermesCardInput(
-    /**
-     * Input kind — one of [Kinds]. Drives which composite the renderer
-     * builds; unknown kinds degrade to a plain free-text field so newer
-     * asks still get an answer surface.
-     */
-    val kind: String,
-    /** Quick-answer chips (clarify). Empty = no chip row. */
-    val choices: List<String> = emptyList(),
-    /** Render the inline free-text mini field under the chips. */
-    val allowFreeText: Boolean = false,
-    /** Password-style field: masked glyphs + reveal toggle (secret/sudo). */
-    val masked: Boolean = false,
-    /** Submit is a 650ms hold-to-confirm press-fill instead of a tap (sudo). */
-    val holdToConfirm: Boolean = false,
-    /**
-     * Wall-clock expiry for timed asks (sudo 120s, clarify/secret 300s).
-     * The renderer shows a countdown footer (Amber under 30s) and
-     * self-collapses to "Expired — not granted" past it. Null = no timeout
-     * (approval is session-scoped).
-     */
-    val expiresAtMillis: Long? = null,
-) {
-    object Kinds {
-        const val CHOICE = "choice"
-        const val TEXT = "text"
-        const val SECRET = "secret"
-        const val CONFIRM = "confirm"
-    }
-
-    companion object {
-        /**
-         * Sentinel recorded as [HermesCardDispatch.actionValue] when a
-         * [masked] input is submitted. The real secret value goes only to
-         * the ask-respond RPC — never into the dispatch record, chat
-         * content, or session sync.
-         */
-        const val SECRET_PROVIDED_STAMP = "secret-provided"
-
-        /**
-         * Value submitted by a bare hold-to-confirm (no text field) — the
-         * sudo/approval "yes" that carries no payload of its own.
-         */
-        const val CONFIRM_VALUE = "confirm"
-    }
-}
-
 /**
  * A label/value row inside a card. [value] is rendered as markdown so the
  * agent can embed emphasis, inline code, or links.
@@ -200,16 +117,6 @@ data class HermesCardAction(
         const val SEND_TEXT = "send_text"
         const val SLASH_COMMAND = "slash_command"
         const val OPEN_URL = "open_url"
-
-        /**
-         * Ask-card answer: dispatch [value] straight to the gateway
-         * ask-respond RPC (clarify/sudo/secret/approval.respond), never
-         * as chat text. Dispatches in this mode are EXCLUDED from
-         * [com.hermesandroid.relay.viewmodel.CardDispatchSyncBuilder] —
-         * the server already absorbed the answer through the blocking
-         * ask, and for secrets the value must not enter session memory.
-         */
-        const val SUBMIT_ASK = "submit_ask"
     }
 }
 
@@ -226,7 +133,7 @@ data class HermesCardAction(
  * (with structured `tool_calls`) + `tool` message pairs under a synthetic
  * `hermes_card_action` tool name, splicing them into the session history
  * the LLM sees. After the API client takes ownership of the request,
- * [com.hermesandroid.relay.network.upstream.ChatHandler.markCardDispatchesSynced]
+ * [com.hermesandroid.relay.network.handlers.ChatHandler.markCardDispatchesSynced]
  * flips [syncedToServer] so subsequent turns don't re-send the same
  * trace.
  */
@@ -238,7 +145,7 @@ data class HermesCardDispatch(
     /**
      * Idempotency guard for the server-side session sync path.
      * Flipped to true by
-     * [com.hermesandroid.relay.network.upstream.ChatHandler.markCardDispatchesSynced]
+     * [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

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

@@ -12,10 +12,8 @@ import kotlinx.serialization.Serializable
  * 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:
+ * A Profile is a NAMED AGENT CONFIG within a Connection. 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

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

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

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

@@ -87,12 +87,6 @@ class ProfileSelectionStore(
             prefs.remove(keyFor(connectionId))
         }
     }
-
-    suspend fun clearAll() {
-        dataStore.edit { prefs ->
-            prefs.clear()
-        }
-    }
 }
 
 /**

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

@@ -10,62 +10,12 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
 /**
- * Which chat transport created (and can resume) a stored session.
- *
- * The two chat transports do NOT share session storage, so their ids are not
- * interchangeable on a non-default profile:
- *  - [GATEWAY] — the `/api/ws` tui_gateway path. `session.create`/`session.resume`
- *    bind the profile's own HERMES_HOME, so sessions live in that profile's
- *    `state.db`. Ids look like `YYYYMMDD_HHMMSS_<hex>`.
- *  - [SSE] — the api_server chat path (`/api/sessions/.../chat/stream`,
- *    `/v1/runs`). The api_server has no per-request profile scoping; it always
- *    persists to its launch `state.db`. Ids look like `api_<unixsecs>_<hex>`.
- *
- * Resuming an [SSE] id over the [GATEWAY] (which opens the profile DB) — or vice
- * versa — fails with "session not found" and silently forks a new session. So
- * each transport gets its own persisted slot, and a stored id is only ever
- * restored for the transport that can actually resume it.
- */
-enum class SessionTransport(val key: String) {
-    GATEWAY("gw"),
-    SSE("sse");
-
-    companion object {
-        /**
-         * Bucket a stored session id by the subsystem that created it — the
-         * id's namespace is the server's own ground truth about which transport
-         * can resume it, more reliable than re-deriving the resolved endpoint
-         * (a turn can fall back from gateway to SSE per-turn).
-         */
-        fun forSessionId(sessionId: String): SessionTransport =
-            if (sessionId.startsWith("api_")) SSE else GATEWAY
-
-        /**
-         * Bucket a resolved streaming endpoint. Only `"gateway"` resumes from
-         * the per-profile DB; every SSE-family member (`"sessions"` /
-         * `"completions"` / `"runs"`) rides the api_server's launch DB.
-         */
-        fun forEndpoint(resolvedEndpoint: String): SessionTransport =
-            if (resolvedEndpoint == "gateway") GATEWAY else SSE
-    }
-}
-
-/**
- * Per-connection, per-Hermes-profile, per-transport last active chat session.
+ * 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.
- *
- * **Transport dimension (v1.0.0).** The slot is keyed by [SessionTransport] too,
- * because a gateway session and an api_server (SSE) session are stored in
- * different databases and cannot be cross-resumed on a non-default profile.
- * Keying by transport keeps the two from clobbering one slot and guarantees a
- * restored id is always resumable by the transport asking for it. The key shape
- * changed in this release, so pre-existing (untransported) slots are not read —
- * a one-time drop of the "last session" pointer that also clears the exact stale
- * cross-transport ids that caused mid-conversation forks.
  */
 class ProfileSessionStore(
     private val dataStore: DataStore<Preferences>,
@@ -75,18 +25,11 @@ class ProfileSessionStore(
     companion object {
         private const val PREFIX = "profile_session__"
 
-        private fun keyName(
-            connectionId: String,
-            profileName: String?,
-            transport: SessionTransport,
-        ): String =
-            "$PREFIX${connectionId}__${AgentDisplay.profileSessionKey(profileName)}__${transport.key}"
+        private fun keyName(connectionId: String, profileName: String?): String =
+            "$PREFIX${connectionId}__${AgentDisplay.profileSessionKey(profileName)}"
 
-        private fun keyFor(
-            connectionId: String,
-            profileName: String?,
-            transport: SessionTransport,
-        ) = stringPreferencesKey(keyName(connectionId, profileName, transport))
+        private fun keyFor(connectionId: String, profileName: String?) =
+            stringPreferencesKey(keyName(connectionId, profileName))
 
         private fun connectionPrefix(connectionId: String): String =
             "$PREFIX${connectionId}__"
@@ -95,11 +38,10 @@ class ProfileSessionStore(
     suspend fun setSessionId(
         connectionId: String,
         profileName: String?,
-        transport: SessionTransport,
         sessionId: String?,
     ) {
         dataStore.edit { prefs ->
-            val key = keyFor(connectionId, profileName, transport)
+            val key = keyFor(connectionId, profileName)
             if (sessionId.isNullOrBlank()) {
                 prefs.remove(key)
             } else {
@@ -108,12 +50,8 @@ class ProfileSessionStore(
         }
     }
 
-    fun sessionIdFlow(
-        connectionId: String,
-        profileName: String?,
-        transport: SessionTransport,
-    ): Flow<String?> {
-        val key = keyFor(connectionId, profileName, transport)
+    fun sessionIdFlow(connectionId: String, profileName: String?): Flow<String?> {
+        val key = keyFor(connectionId, profileName)
         return dataStore.data.map { prefs -> prefs[key] }
     }
 
@@ -125,12 +63,6 @@ class ProfileSessionStore(
                 .forEach { prefs.remove(it) }
         }
     }
-
-    suspend fun clearAll() {
-        dataStore.edit { prefs ->
-            prefs.clear()
-        }
-    }
 }
 
 internal val Context.profileSessionsDataStore: DataStore<Preferences>

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network.relay
+package com.hermesandroid.relay.network
 
 import android.content.Context
 import android.net.ConnectivityManager
@@ -12,8 +12,7 @@ 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.relay.models.Envelope
-import com.hermesandroid.relay.network.shared.EndpointResolver
+import com.hermesandroid.relay.network.models.Envelope
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -82,21 +81,12 @@ class ConnectionManager(
     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).
+     * 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`
@@ -174,68 +164,18 @@ class ConnectionManager(
      * 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.
+     * Cleared on [disconnect] per ADR 24's "clears on disconnect" semantics
+     * from the UI card.
      */
-    private val _manualRoleOverride = MutableStateFlow<String?>(null)
-    val manualRoleOverrideFlow: StateFlow<String?> = _manualRoleOverride.asStateFlow()
+    @Volatile
+    private var manualRoleOverride: String? = null
 
     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
-
-    /** Deferred reaction to a network loss — cancelled if a network returns within the grace. */
-    private var networkLossJob: kotlinx.coroutines.Job? = null
-
-    /**
-     * Set when a network loss outlives [NETWORK_LOSS_GRACE_MS] — only then may
-     * a re-resolve switch DOWN to a lower-priority endpoint. Prevents a
-     * transient probe miss (Wi-Fi settling) from switching routes and
-     * cancelling an in-flight turn. Cleared once a resolution is published.
-     */
-    @Volatile
-    private var sustainedLossDeclared = false
-
-    init {
-        // Register at construction, not on first connect(). Standard
-        // (no-Relay) connections never open the WSS socket, but their HTTP
-        // 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
-
-        /**
-         * Grace before reacting to a network loss. A transient blip (Wi-Fi
-         * power-save/roam, a brief drop, the OS swapping radios) recovers
-         * within this window and must NOT mark the active endpoint unreachable
-         * or switch routes — doing so rebuilds the chat client and cancels an
-         * in-flight turn. Only a loss sustained past the grace switches.
-         */
-        private const val NETWORK_LOSS_GRACE_MS = 6_000L
         // Matches plugin.relay.auth._BLOCK_SECONDS (5 min). If we see 429
         // on the WSS upgrade, we're IP-banned server-side — retrying at
         // our normal 1-30s cadence re-fills the ban bucket and keeps us
@@ -391,37 +331,28 @@ class ConnectionManager(
     private suspend fun resolveBestEndpointSafe(): EndpointCandidate? {
         val resolver = endpointResolver ?: return null
         val ctx = context ?: return null
+        val devicePull = deviceIdProvider ?: return null
 
-        val endpoints = try {
+        val deviceId = try {
+            withTimeoutOrNull(1_000L) { devicePull() }
+        } catch (_: Exception) {
+            null
+        } ?: return null
+
+        val endpoints: List<EndpointCandidate> = try {
             withTimeoutOrNull(1_000L) {
-                endpointCandidatesProvider?.invoke()
-                    ?.takeIf { it.isNotEmpty() }
+                PairingPreferences.getDeviceEndpoints(ctx, deviceId).first()
             }
         } 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()
-        }
+        } ?: 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 ->
+        manualRoleOverride?.let { preferredRole ->
             val preferred = endpoints.firstOrNull {
                 it.role.equals(preferredRole, ignoreCase = true)
             }
@@ -440,58 +371,35 @@ class ConnectionManager(
     /**
      * 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)
+        scope.launch {
+            val resolved = resolveBestEndpointSafe()
+            val targetUrl = resolved?.relay?.url ?: current ?: return@launch
+            val normalizedTarget = normalizeRelayUrl(targetUrl)
+            _activeEndpoint.value = resolved
+            // 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)
             }
-        } 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
     }
 
     /**
@@ -499,22 +407,9 @@ class ConnectionManager(
      * 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()
+    suspend fun refreshActiveEndpoint(): EndpointCandidate? {
         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
     }
@@ -525,11 +420,11 @@ class ConnectionManager(
      * cycle — call [probeAndReconnect] to apply immediately.
      */
     fun setManualRoleOverride(role: String?) {
-        _manualRoleOverride.value = role?.takeIf { it.isNotBlank() }
-        Log.i(TAG, "manualRoleOverride now=${_manualRoleOverride.value ?: "(cleared)"}")
+        manualRoleOverride = role?.takeIf { it.isNotBlank() }
+        Log.i(TAG, "manualRoleOverride now=${manualRoleOverride ?: "(cleared)"}")
     }
 
-    fun getManualRoleOverride(): String? = _manualRoleOverride.value
+    fun getManualRoleOverride(): String? = manualRoleOverride
 
     private fun markActiveEndpointUnreachable(reason: String) {
         val active = _activeEndpoint.value ?: return
@@ -537,65 +432,26 @@ class ConnectionManager(
         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) {
+    private fun resolveAndSwitchIfNeeded(closeReason: String) {
         if (endpointResolver == null) return
-        networkResolveJob?.cancel()
-        networkResolveJob = scope.launch {
-            delay(NETWORK_RESOLVE_DEBOUNCE_MS)
-            val current = serverUrl
+        val current = serverUrl ?: return
+        scope.launch {
             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
-                }
+                _activeEndpoint.value = null
                 return@launch
             }
-            // Endpoint hysteresis: a transient blip can make the active
-            // (higher-priority) endpoint's health probe miss, so the resolver
-            // falls through to a LOWER-priority fallback. Switching on that
-            // transient miss rebuilds the chat client and CANCELS an in-flight
-            // turn. Don't switch DOWN in priority unless a sustained loss was
-            // actually declared (the onLost grace elapsed). Same/upgrade
-            // winners always publish.
-            val active = _activeEndpoint.value
-            if (active != null && resolved.priority > active.priority && !sustainedLossDeclared) {
-                Log.i(
-                    TAG,
-                    "re-resolve picked lower-priority ${resolved.role}(p${resolved.priority}) over " +
-                        "active ${active.role}(p${active.priority}) not confirmed dead — keeping active",
-                )
-                return@launch
-            }
-            sustainedLossDeclared = false
+            val newUrl = resolved.relay.url
+            val normalizedNew = normalizeRelayUrl(newUrl)
             _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)
+                Log.i(TAG, "endpoint fallback: swapping $current → $normalizedNew")
+                connectToUrlOnMainPath(newUrl, closeReason)
             } else if (_connectionState.value == ConnectionState.Disconnected &&
+                shouldReconnect &&
                 reconnectGate()
             ) {
-                Log.i(TAG, "network change: same winner is disconnected — reconnecting $current")
+                Log.i(TAG, "endpoint fallback: same winner is disconnected — reconnecting $current")
                 doConnect(current)
             }
         }
@@ -608,33 +464,36 @@ class ConnectionManager(
         val callback = object : ConnectivityManager.NetworkCallback() {
             override fun onAvailable(network: Network) {
                 Log.i(TAG, "network onAvailable — re-evaluating endpoint")
-                // A network returned — cancel any pending loss reaction: the
-                // drop was transient, so don't switch routes / rebuild the chat
-                // client / cancel an in-flight turn. Re-resolve to pick the best
-                // route (usually the same one); the rebuild only fires if the
-                // URL actually moved.
-                networkLossJob?.cancel()
-                endpointResolver?.clearCache()
-                scheduleNetworkReResolve("Network change — switching endpoint")
+                if (endpointResolver == null) return
+                val url = serverUrl ?: return
+                endpointResolver.clearCache()
+                scope.launch {
+                    val resolved = resolveBestEndpointSafe()
+                    val newUrl = resolved?.relay?.url
+                    if (newUrl == null) {
+                        if (_connectionState.value != ConnectionState.Connected) {
+                            _activeEndpoint.value = null
+                        }
+                        return@launch
+                    }
+                    val normalizedNew = normalizeRelayUrl(newUrl)
+                    _activeEndpoint.value = resolved
+                    // Only swap if the winner actually differs from the
+                    // currently-connected URL. Avoids dropping a healthy
+                    // socket on a no-op network flap (Wi-Fi scan, cell
+                    // handover that ends up on the same route, etc.).
+                    if (normalizedNew != url) {
+                        Log.i(TAG, "network change: swapping $url → $normalizedNew")
+                        connectToUrlOnMainPath(newUrl, "Network change — switching endpoint")
+                    }
+                }
             }
 
             override fun onLost(network: Network) {
-                // Defer the reaction: a transient blip recovers within the grace
-                // (onAvailable cancels this job). Reacting immediately — marking
-                // the active endpoint unreachable + re-resolving to a fallback —
-                // switches routes mid-blip, which rebuilds the chat client and
-                // CANCELS the in-flight turn. The gateway client already handles
-                // its own socket reconnect across the blip.
-                Log.i(TAG, "network onLost — deferring fallback re-resolve by ${NETWORK_LOSS_GRACE_MS}ms")
-                networkLossJob?.cancel()
-                networkLossJob = scope.launch {
-                    delay(NETWORK_LOSS_GRACE_MS)
-                    Log.i(TAG, "network loss sustained past grace — marking active endpoint unreachable and resolving fallback")
-                    sustainedLossDeclared = true
-                    endpointResolver?.clearCache()
-                    markActiveEndpointUnreachable("network lost (sustained)")
-                    scheduleNetworkReResolve("Network lost — switching endpoint")
-                }
+                Log.i(TAG, "network onLost — marking active endpoint unreachable and resolving fallback")
+                endpointResolver?.clearCache()
+                markActiveEndpointUnreachable("network lost")
+                resolveAndSwitchIfNeeded("Network lost — switching endpoint")
             }
         }
         try {
@@ -651,8 +510,6 @@ class ConnectionManager(
     }
 
     private fun unregisterNetworkCallback() {
-        networkLossJob?.cancel()
-        networkLossJob = null
         val ctx = context ?: return
         val cb = networkCallback ?: return
         try {
@@ -693,11 +550,10 @@ class ConnectionManager(
         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
+        // ADR 24: clear manual override on explicit disconnect — the
+        // Routes card's "Prefer this route" menu contract is that it lasts
+        // until the user disconnects, then resets to resolver-picked.
+        manualRoleOverride = null
         _activeEndpoint.value = null
     }
 

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

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

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

@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network.shared
+package com.hermesandroid.relay.network
 
 import android.util.Log
 import com.hermesandroid.relay.data.EndpointCandidate
@@ -10,38 +10,13 @@ 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
@@ -95,26 +70,6 @@ class EndpointResolver(
 
     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"
         /**
@@ -144,9 +99,6 @@ class EndpointResolver(
          */
         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)
@@ -293,7 +245,6 @@ class EndpointResolver(
                     endpointRole = candidate.role,
                     url = candidate.api.url,
                 )
-                recordOutcome(candidate, reachable = false, detail = "Invalid API URL")
                 return false
             }
         val fastClient = httpClient.newBuilder()
@@ -321,11 +272,6 @@ class EndpointResolver(
                             url = candidate.api.url,
                             elapsedMs = clock() - startedAtMs,
                         )
-                        recordOutcome(
-                            candidate,
-                            reachable = ok,
-                            detail = if (ok) null else "HTTP ${resp.code} from /health",
-                        )
                         ok
                     }
                 } ?: run {
@@ -338,7 +284,6 @@ class EndpointResolver(
                         url = candidate.api.url,
                         elapsedMs = clock() - startedAtMs,
                     )
-                    recordOutcome(candidate, reachable = false, detail = PROBE_TIMEOUT_DETAIL)
                     false
                 }
             } catch (_: TimeoutCancellationException) {
@@ -351,7 +296,6 @@ class EndpointResolver(
                     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} " +
@@ -365,27 +309,11 @@ class EndpointResolver(
                     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()
@@ -401,16 +329,9 @@ class EndpointResolver(
             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.
-     */
+    /** Test-only: wipe the probe cache so a fresh run starts clean. */
     internal fun clearCache() {
         probeCache.clear()
     }

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

@@ -1,22 +1,21 @@
-package com.hermesandroid.relay.network.upstream
+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.upstream.models.CreateSessionRequest
-import com.hermesandroid.relay.network.upstream.models.HermesSseEvent
-import com.hermesandroid.relay.network.upstream.models.MessageItem
-import com.hermesandroid.relay.network.upstream.models.MessageListResponse
-import com.hermesandroid.relay.network.upstream.models.RenameSessionRequest
-import com.hermesandroid.relay.network.upstream.models.SessionItem
-import com.hermesandroid.relay.network.upstream.models.SessionListResponse
-import com.hermesandroid.relay.network.upstream.models.SessionResponse
-import com.hermesandroid.relay.network.upstream.models.SkillInfo
-import com.hermesandroid.relay.network.upstream.models.SkillListResponse
-import com.hermesandroid.relay.network.upstream.models.UsageInfo
-import com.hermesandroid.relay.util.TurnLatencyTracer
+import com.hermesandroid.relay.network.models.CreateSessionRequest
+import com.hermesandroid.relay.network.models.HermesSseEvent
+import com.hermesandroid.relay.network.models.MessageItem
+import com.hermesandroid.relay.network.models.MessageListResponse
+import com.hermesandroid.relay.network.models.RenameSessionRequest
+import com.hermesandroid.relay.network.models.SessionItem
+import com.hermesandroid.relay.network.models.SessionListResponse
+import com.hermesandroid.relay.network.models.SessionResponse
+import com.hermesandroid.relay.network.models.SkillInfo
+import com.hermesandroid.relay.network.models.SkillListResponse
+import com.hermesandroid.relay.network.models.UsageInfo
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.encodeToString
@@ -24,7 +23,6 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonObject
 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
@@ -64,9 +62,9 @@ enum class ChatMode {
  * returns an SSE stream, while `/v1/runs` may be an async JSON run-start API.
  */
 data class ServerCapabilities(
-    /** `/api/sessions` (CRUD) — true on native upstream, fork, OR bootstrap-injected older builds. */
+    /** `/api/sessions` (CRUD) — true on fork, upstream-merged, OR bootstrap-injected. */
     val sessionsApi: Boolean,
-    /** `/api/sessions/{id}/chat/stream` (SSE) — true on native upstream or legacy fork builds. */
+    /** `/api/sessions/{id}/chat/stream` (SSE) — true ONLY on fork or upstream-merged. */
     val sessionsChatStream: Boolean,
     /** `/v1/runs` (structured-event SSE) — true only when explicitly advertised as SSE-compatible. */
     val runs: Boolean,
@@ -101,44 +99,6 @@ 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>? {
@@ -288,7 +248,7 @@ class HermesApiClient(
 
     // --- Session CRUD ---
 
-    suspend fun listSessionsResult(limit: Int = 200): Result<List<SessionItem>> = withContext(Dispatchers.IO) {
+    suspend fun listSessionsResult(limit: Int = 50): Result<List<SessionItem>> = withContext(Dispatchers.IO) {
         try {
             val request = authRequest("$baseUrl/api/sessions?limit=$limit").get().build()
             client.newCall(request).execute().use { response ->
@@ -300,7 +260,7 @@ class HermesApiClient(
                     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())
+                Result.success(parsed.items ?: parsed.sessions ?: emptyList())
             }
         } catch (e: Exception) {
             Log.w(TAG, "Failed to list sessions: ${e.message}")
@@ -308,7 +268,7 @@ class HermesApiClient(
         }
     }
 
-    suspend fun listSessions(limit: Int = 200): List<SessionItem> =
+    suspend fun listSessions(limit: Int = 50): List<SessionItem> =
         listSessionsResult(limit).getOrElse { emptyList() }
 
     suspend fun createSessionResult(
@@ -389,7 +349,7 @@ class HermesApiClient(
                 if (!response.isSuccessful) return@withContext emptyList()
                 val body = response.body?.string() ?: return@withContext emptyList()
                 val parsed = json.decodeFromString<MessageListResponse>(body)
-                parsed.data ?: parsed.items ?: parsed.messages ?: emptyList()
+                parsed.items ?: parsed.messages ?: emptyList()
             }
         } catch (e: Exception) {
             Log.w(TAG, "Failed to get messages: ${e.message}")
@@ -417,32 +377,6 @@ class HermesApiClient(
         emptyList()
     }
 
-    // --- Available models ---
-
-    /**
-     * Available model ids from `GET /v1/models` (OpenAI-compatible:
-     * `{"object":"list","data":[{"id":"…"}]}`). Backs the in-chat model
-     * picker. Returns ids in server order; empty on any failure (the picker
-     * then offers only "Server default").
-     */
-    suspend fun getModels(): List<String> = withContext(Dispatchers.IO) {
-        try {
-            val request = authRequest("$baseUrl/v1/models").get().build()
-            client.newCall(request).execute().use { response ->
-                if (!response.isSuccessful) return@withContext emptyList()
-                val body = response.body?.string() ?: return@withContext emptyList()
-                val data = (json.parseToJsonElement(body) as? JsonObject)
-                    ?.get("data") as? JsonArray ?: return@withContext emptyList()
-                data.mapNotNull {
-                    ((it as? JsonObject)?.get("id") as? JsonPrimitive)?.contentOrNull
-                }
-            }
-        } catch (e: Exception) {
-            Log.w(TAG, "Failed to fetch models: ${e.message}")
-            emptyList()
-        }
-    }
-
     // --- Server personalities ---
 
     /**
@@ -583,8 +517,6 @@ class HermesApiClient(
             .build()
 
         val completeCalled = AtomicBoolean(false)
-        // Comparable to the gateway's turn[gateway] line — see TurnLatencyTracer.
-        val tracer = TurnLatencyTracer("sessions")
 
         // Notify caller of the session ID being used
         mainHandler.post { onSessionId(sessionId) }
@@ -596,7 +528,6 @@ class HermesApiClient(
                 type: String?,
                 data: String
             ) {
-                tracer.mark("ttfe")
                 if (data == "[DONE]") {
                     if (completeCalled.compareAndSet(false, true)) {
                         mainHandler.post { onComplete() }
@@ -607,14 +538,6 @@ class HermesApiClient(
                 try {
                     val event = json.decodeFromString<HermesSseEvent>(data)
 
-                    // First visible streamed token (reasoning OR text) — the
-                    // metric that exposes SSE's reasoning dead-air vs gateway.
-                    if (!event.delta.isNullOrEmpty() || !event.thinkingDelta.isNullOrEmpty() ||
-                        !event.thinking.isNullOrEmpty()
-                    ) {
-                        tracer.mark("ttft")
-                    }
-
                     // Check for usage data on ANY event before type resolution
                     // (OpenAI-format chunks have no type/event field but may carry usage)
                     if (event.usage != null && (event.usage.resolvedInputTokens != null || event.usage.resolvedOutputTokens != null)) {
@@ -759,7 +682,6 @@ class HermesApiClient(
                 t: Throwable?,
                 response: Response?
             ) {
-                tracer.done("error")
                 if (completeCalled.compareAndSet(false, true)) {
                     val msg = when {
                         response != null && !response.isSuccessful ->
@@ -773,7 +695,6 @@ class HermesApiClient(
             }
 
             override fun onClosed(eventSource: EventSource) {
-                tracer.done()
                 if (completeCalled.compareAndSet(false, true)) {
                     mainHandler.post { onComplete() }
                 }
@@ -836,8 +757,6 @@ class HermesApiClient(
 
         val completeCalled = AtomicBoolean(false)
         val messageStarted = AtomicBoolean(false)
-        // Comparable to the gateway's turn[gateway] line — see TurnLatencyTracer.
-        val tracer = TurnLatencyTracer("completions")
 
         val listener = object : EventSourceListener() {
             override fun onEvent(
@@ -846,7 +765,6 @@ class HermesApiClient(
                 type: String?,
                 data: String
             ) {
-                tracer.mark("ttfe")
                 if (data == "[DONE]") {
                     if (completeCalled.compareAndSet(false, true)) {
                         mainHandler.post { onComplete() }
@@ -875,14 +793,12 @@ class HermesApiClient(
 
                     openAiReasoningDelta(event)?.let { reasoning ->
                         if (reasoning.isNotEmpty()) {
-                            tracer.mark("ttft")
                             mainHandler.post { onThinkingDelta(reasoning) }
                         }
                     }
 
                     openAiTextDelta(event)?.let { delta ->
                         if (delta.isNotEmpty()) {
-                            tracer.mark("ttft")
                             mainHandler.post { onTextDelta(delta) }
                         }
                     }
@@ -901,7 +817,6 @@ class HermesApiClient(
                 t: Throwable?,
                 response: Response?
             ) {
-                tracer.done("error")
                 if (completeCalled.compareAndSet(false, true)) {
                     val msg = when {
                         response != null && !response.isSuccessful ->
@@ -915,7 +830,6 @@ class HermesApiClient(
             }
 
             override fun onClosed(eventSource: EventSource) {
-                tracer.done()
                 if (completeCalled.compareAndSet(false, true)) {
                     mainHandler.post { onComplete() }
                 }
@@ -1024,8 +938,6 @@ class HermesApiClient(
             .build()
 
         val completeCalled = AtomicBoolean(false)
-        // Comparable to the gateway's turn[gateway] line — see TurnLatencyTracer.
-        val tracer = TurnLatencyTracer("runs")
 
         val listener = object : EventSourceListener() {
             override fun onEvent(
@@ -1034,7 +946,6 @@ class HermesApiClient(
                 type: String?,
                 data: String
             ) {
-                tracer.mark("ttfe")
                 if (data == "[DONE]") {
                     if (completeCalled.compareAndSet(false, true)) {
                         mainHandler.post { onComplete() }
@@ -1045,14 +956,6 @@ class HermesApiClient(
                 try {
                     val event = json.decodeFromString<HermesSseEvent>(data)
 
-                    // First visible streamed token (reasoning OR text) — the
-                    // metric that exposes SSE's reasoning dead-air vs gateway.
-                    if (!event.delta.isNullOrEmpty() || !event.thinkingDelta.isNullOrEmpty() ||
-                        !event.thinking.isNullOrEmpty()
-                    ) {
-                        tracer.mark("ttft")
-                    }
-
                     // Check for usage data before type resolution (catches OpenAI-format chunks)
                     if (event.usage != null && (event.usage.resolvedInputTokens != null || event.usage.resolvedOutputTokens != null)) {
                         mainHandler.post { onUsage(event.usage) }
@@ -1113,7 +1016,6 @@ class HermesApiClient(
                         "reasoning.available" -> {
                             val reasoningText = event.text
                             if (!reasoningText.isNullOrEmpty()) {
-                                tracer.mark("ttft")
                                 mainHandler.post { onThinkingDelta(reasoningText) }
                             }
                         }
@@ -1200,7 +1102,6 @@ class HermesApiClient(
                 t: Throwable?,
                 response: Response?
             ) {
-                tracer.done("error")
                 if (completeCalled.compareAndSet(false, true)) {
                     val msg = when {
                         response != null && !response.isSuccessful ->
@@ -1214,7 +1115,6 @@ class HermesApiClient(
             }
 
             override fun onClosed(eventSource: EventSource) {
-                tracer.done()
                 if (completeCalled.compareAndSet(false, true)) {
                     mainHandler.post { onComplete() }
                 }
@@ -1241,15 +1141,14 @@ class HermesApiClient(
      *
      * Probe order:
      *   1. `/health` — if this fails, everything else is moot.
-     *   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
+     *   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
      *      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.
-     *   5. `HEAD /v1/chat/completions` — OpenAI-compatible SSE fallback.
-     *   6. `HEAD /v1/runs` with `Accept: text/event-stream` — accepted only
+     *   4. `HEAD /v1/chat/completions` — OpenAI-compatible SSE fallback.
+     *   5. `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
@@ -1281,20 +1180,6 @@ 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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network.relay
+package com.hermesandroid.relay.network.handlers
 
 import android.content.ActivityNotFoundException
 import android.content.ClipData
@@ -23,10 +23,9 @@ import kotlinx.serialization.json.booleanOrNull
 // === PHASE3-tier-C: flavor gate for sideload-only tools ===
 import com.hermesandroid.relay.data.BuildFlavor
 // === END PHASE3-tier-C ===
-import com.hermesandroid.relay.network.relay.ChannelMultiplexer
-import com.hermesandroid.relay.network.relay.RelayHttpClient
-import com.hermesandroid.relay.network.relay.models.Envelope
-import com.hermesandroid.relay.network.shared.LocalDispatchResult
+import com.hermesandroid.relay.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
@@ -539,7 +538,7 @@ class BridgeCommandHandler(
                     put(
                         "error",
                         "Device Control is not included in the Google Play build " +
-                            "of Hermes-Relay. This build keeps Hermes Bridge Core " +
+                            "of Hermes Relay. This build keeps Hermes Bridge Core " +
                             "features such as chat, voice, terminal, media, " +
                             "notifications, and relay status, but it does not " +
                             "ship AccessibilityService, screen reading, taps, " +
@@ -563,7 +562,7 @@ class BridgeCommandHandler(
                         "Hermes accessibility service is not enabled. " +
                             "The phone IS paired and connected — this is " +
                             "NOT a pairing problem. The user must enable " +
-                            "the Hermes-Relay accessibility service in " +
+                            "the Hermes Relay accessibility service in " +
                             "Android Settings > Accessibility > " +
                             "Installed services before the bridge can " +
                             "dispatch phone-control commands.",
@@ -571,7 +570,7 @@ class BridgeCommandHandler(
                     put("error_code", "service_unavailable")
                     put(
                         "required_action",
-                        "User enables Hermes-Relay in Android Accessibility Settings",
+                        "User enables Hermes Relay in Android Accessibility Settings",
                     )
                 }
             )
@@ -814,7 +813,7 @@ class BridgeCommandHandler(
             }
 
             // === PHASE3-return-to-hermes ===
-            // Bring the Hermes-Relay app back to foreground. Used by the
+            // Bring the Hermes Relay app back to foreground. Used by the
             // server-side agent as the final step of any multi-app task
             // (e.g. after driving Messages to send an SMS) so the user
             // sees the agent's reply in-context without manually switching
@@ -1220,7 +1219,7 @@ class BridgeCommandHandler(
                     respond(
                         requestId, 403,
                         buildJsonObject {
-                            put("error", "android_location is only available on the sideload flavor of Hermes-Relay. This build is googlePlay.")
+                            put("error", "android_location is only available on the sideload flavor of Hermes Relay. This build is googlePlay.")
                             put("error_code", "sideload_only")
                             put("flavor", "googlePlay")
                         }
@@ -1235,7 +1234,7 @@ class BridgeCommandHandler(
                     respond(
                         requestId, 403,
                         buildJsonObject {
-                            put("error", "android_search_contacts is only available on the sideload flavor of Hermes-Relay. This build is googlePlay.")
+                            put("error", "android_search_contacts is only available on the sideload flavor of Hermes Relay. This build is googlePlay.")
                             put("error_code", "sideload_only")
                             put("flavor", "googlePlay")
                         }
@@ -1259,7 +1258,7 @@ class BridgeCommandHandler(
                     respond(
                         requestId, 403,
                         buildJsonObject {
-                            put("error", "android_call auto-dial is only available on the sideload flavor of Hermes-Relay. This build is googlePlay.")
+                            put("error", "android_call auto-dial is only available on the sideload flavor of Hermes Relay. This build is googlePlay.")
                             put("error_code", "sideload_only")
                             put("flavor", "googlePlay")
                         }
@@ -1313,7 +1312,7 @@ class BridgeCommandHandler(
                     respond(
                         requestId, 403,
                         buildJsonObject {
-                            put("error", "android_send_sms is only available on the sideload flavor of Hermes-Relay. This build is googlePlay.")
+                            put("error", "android_send_sms is only available on the sideload flavor of Hermes Relay. This build is googlePlay.")
                             put("error_code", "sideload_only")
                             put("flavor", "googlePlay")
                         }
@@ -1371,7 +1370,7 @@ class BridgeCommandHandler(
                     respond(
                         requestId, 403,
                         buildJsonObject {
-                            put("error", "$path is only available on the sideload flavor of Hermes-Relay. This build is googlePlay.")
+                            put("error", "$path is only available on the sideload flavor of Hermes Relay. This build is googlePlay.")
                             put("error_code", "sideload_only")
                             put("flavor", "googlePlay")
                         }
@@ -1412,9 +1411,9 @@ class BridgeCommandHandler(
                     val target = if (to.isBlank()) "the selected recipient" else to
                     "Send MMS compose to $target with $attachmentCount attachment(s)?"
                 } else if (attachmentCount > 0) {
-                    "Share $attachmentCount attachment(s) from Hermes-Relay?"
+                    "Share $attachmentCount attachment(s) from Hermes Relay?"
                 } else {
-                    "Share text from Hermes-Relay?"
+                    "Share text from Hermes Relay?"
                 }
                 val allowed = safetyManager.awaitConfirmation(path, confirmText)
                 if (!allowed) {
@@ -2419,9 +2418,33 @@ class BridgeCommandHandler(
     }
 }
 
-// LocalDispatchResult moved to network.shared (ADR 34 fence): it is a passive
-// DTO shared with the upstream chat path (ChatHandler), so it cannot live in
-// this relay-package file without creating an upstream -> relay import.
+/**
+ * Captured outcome of a local bridge dispatch. Voice mode reads this to
+ * emit follow-up chat traces showing the real success/failure state of
+ * an action after the safety modal resolves and the underlying
+ * [ActionExecutor] method returns. The fields mirror what the LLM path
+ * would see on a `bridge.response` envelope:
+ *
+ *  - [status] — HTTP-style status: 200 success, 400 client error,
+ *    403 user denial / bridge disabled, 500 executor error
+ *  - [errorMessage] — free-text error from the response payload, or null
+ *    on success. Safe to speak / display verbatim to the user.
+ *  - [errorCode] — structured classification (e.g. `permission_denied`,
+ *    `bridge_disabled`, `user_denied`) when `respondFromResult` or a
+ *    direct respond call includes one. Null for errors we haven't
+ *    classified yet.
+ *  - [resultJson] — the raw result object, for callers that need
+ *    action-specific fields (e.g. the resolved phone number from
+ *    /search_contacts). Optional.
+ */
+data class LocalDispatchResult(
+    val status: Int,
+    val errorMessage: String?,
+    val errorCode: String?,
+    val resultJson: JsonObject?,
+) {
+    val isSuccess: Boolean get() = status in 200..299
+}
 
 /**
  * Coroutine context marker installed by [BridgeCommandHandler.handleLocalCommand]

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

@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network.upstream
+package com.hermesandroid.relay.network.handlers
 
 import android.util.Log
 import com.hermesandroid.relay.data.ChatMessage
@@ -8,10 +8,8 @@ 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.shared.LocalDispatchResult
-import com.hermesandroid.relay.network.upstream.GatewaySubagentEvent
-import com.hermesandroid.relay.network.upstream.models.MessageItem
-import com.hermesandroid.relay.network.upstream.models.SessionItem
+import com.hermesandroid.relay.network.models.MessageItem
+import com.hermesandroid.relay.network.models.SessionItem
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -35,15 +33,7 @@ class ChatHandler {
         private const val TAG = "ChatHandler"
 
         /** Maximum number of messages kept in memory per session. Oldest are trimmed. */
-        internal const val MAX_MESSAGES = 500
-
-        private fun timestampToMillis(timestamp: Double?): Long {
-            val value = timestamp ?: return 0L
-            return if (value > 1e12) value.toLong() else (value * 1000).toLong()
-        }
-
-        private fun firstPositive(vararg values: Long): Long =
-            values.firstOrNull { it > 0L } ?: 0L
+        private const val MAX_MESSAGES = 500
 
         // Tool annotation patterns embedded as text markers by Hermes.
         //
@@ -190,18 +180,6 @@ class ChatHandler {
     private val _messages = MutableStateFlow<List<ChatMessage>>(emptyList())
     val messages: StateFlow<List<ChatMessage>> = _messages.asStateFlow()
 
-    /**
-     * Latest gateway `status.update` lifecycle line for the in-flight turn
-     * (model fallback, retries, errors). Surfaced as a transient status line
-     * above the composer; cleared when the turn completes.
-     */
-    private val _turnStatus = MutableStateFlow<String?>(null)
-    val turnStatus: StateFlow<String?> = _turnStatus.asStateFlow()
-
-    fun setTurnStatus(text: String) {
-        _turnStatus.value = text
-    }
-
     private val _isStreaming = MutableStateFlow(false)
     val isStreaming: StateFlow<Boolean> = _isStreaming.asStateFlow()
 
@@ -222,58 +200,6 @@ class ChatHandler {
         }
     }
 
-    /**
-     * Append a SYSTEM-role notice bubble (e.g. a gateway interactive ask the
-     * phone can't answer). SYSTEM role keeps it out of the voice TTS observer
-     * and renders with the muted system styling in MessageBubble.
-     */
-    fun addSystemNotice(text: String) {
-        _messages.update { list ->
-            val notice = ChatMessage(
-                id = "system-notice-${java.util.UUID.randomUUID()}",
-                role = MessageRole.SYSTEM,
-                content = text,
-                timestamp = System.currentTimeMillis(),
-            )
-            (list + notice).let { if (it.size > MAX_MESSAGES) it.drop(it.size - MAX_MESSAGES) else it }
-        }
-    }
-
-    /**
-     * Append an assistant message that carries ONLY a gateway ask card
-     * (clarify / approval / sudo / secret). Local-only — the server never
-     * stores the ask as a message, so [loadMessageHistory] preserves the
-     * `ask-` id prefix the same way it preserves voice-intent traces.
-     * Idempotent on [messageId] so a re-emitted ask never duplicates.
-     */
-    fun appendAskCardMessage(messageId: String, card: HermesCard) {
-        _messages.update { list ->
-            if (list.any { it.id == messageId }) return@update list
-            val msg = ChatMessage(
-                id = messageId,
-                role = MessageRole.ASSISTANT,
-                content = "",
-                timestamp = System.currentTimeMillis(),
-                cards = listOf(card),
-                agentName = activeAgentName,
-            )
-            (list + msg).let { if (it.size > MAX_MESSAGES) it.drop(it.size - MAX_MESSAGES) else it }
-        }
-    }
-
-    /**
-     * Edit-and-regenerate local truncation: drop [messageId] and everything
-     * after it. The gateway performs the authoritative truncation via
-     * `truncate_before_user_ordinal`; this keeps the visible list consistent
-     * until the post-turn history reload reconciles any divergence.
-     */
-    fun truncateMessagesFrom(messageId: String) {
-        _messages.update { list ->
-            val idx = list.indexOfFirst { it.id == messageId }
-            if (idx < 0) list else list.take(idx)
-        }
-    }
-
     fun replaceMessageContent(messageId: String, content: String) {
         _messages.update { messages ->
             messages.map { message ->
@@ -668,7 +594,6 @@ class ChatHandler {
         activeAnnotationTools.clear()
         cardLineBuffer.clear()
         dispatchedCardMarkers.clear()
-        subagentLabels.clear()
     }
 
     /**
@@ -759,17 +684,6 @@ class ChatHandler {
         // mutateMessage lookups find the newly-loaded messages.
         val pendingMediaHits = mutableListOf<Pair<String, MediaMarkerHit>>()
 
-        // Preserve provenance badges ("Voice", "Realtime Agent", "Stopped",
-        // "Error") across a wholesale reload. The messages reconstructed below
-        // come from server data and carry no badges, so without this the
-        // post-turn history reload would silently wipe them. Keyed by message
-        // id — the live assistant message has already had its id swapped to the
-        // server id via replaceMessageId, so it matches the reloaded item id.
-        val priorBadges = _messages.value
-            .asSequence()
-            .filter { it.role == MessageRole.ASSISTANT && it.badges.isNotEmpty() }
-            .associate { it.id to it.badges }
-
         val loaded = items.mapNotNull { item ->
             val role = when (item.role) {
                 "user" -> MessageRole.USER
@@ -821,19 +735,6 @@ class ChatHandler {
                 toolCalls = toolCalls,
                 cards = extractedCards,
                 agentName = if (role == MessageRole.ASSISTANT) activeAgentName else null,
-                // Server persists per-message reasoning — restore it so the
-                // Thought-process block survives returning to the chat
-                // instead of existing only for the live turn.
-                thinkingContent = if (role == MessageRole.ASSISTANT) {
-                    item.resolvedReasoning?.trim() ?: ""
-                } else {
-                    ""
-                },
-                badges = if (role == MessageRole.ASSISTANT) {
-                    priorBadges[messageId].orEmpty()
-                } else {
-                    emptyList()
-                },
             )
         }
 
@@ -854,20 +755,8 @@ class ChatHandler {
         // sync (so these traces reach the LLM's session memory too) is
         // still a v0.4.1 follow-up, but preserving them client-side is
         // enough to fix the disappearing-scrollback bug today.
-        // Gateway-local bubbles ride the same preservation: steered text
-        // (id "steer-…") lives inside a server-side tool result, never as a
-        // user message, and ask cards (id "ask-…") are built from gateway
-        // events that have no server-side message at all — a wholesale
-        // reload would silently erase both.
         val preservedVoiceTraces = _messages.value.filter {
-            it.id.startsWith("voice-intent-") ||
-                it.id.startsWith("steer-") ||
-                it.id.startsWith("ask-") ||
-                // Slash-command result bubbles (addSystemNotice) are local-only —
-                // the server never persists them, so a wholesale reload would wipe
-                // a just-shown `/personality`, `/status`, … result the moment the
-                // next turn reconciles. Preserve them like the other client bubbles.
-                it.id.startsWith("system-notice-")
+            it.id.startsWith("voice-intent-")
         }
         val merged = if (preservedVoiceTraces.isEmpty()) {
             loaded
@@ -1044,34 +933,18 @@ class ChatHandler {
      * Update sessions list from API response.
      */
     fun updateSessions(items: List<SessionItem>) {
-        val mapped = items.map { item ->
-            val startedAtMs = timestampToMillis(item.startedAt)
-            val lastActivityAtMs = timestampToMillis(item.resolvedLastActivity)
-            val activityAtMs = firstPositive(lastActivityAtMs, startedAtMs)
+        _sessions.value = items.map { item ->
+            // If > 1e12, already in milliseconds; otherwise convert from seconds
+            val ts = item.startedAt ?: 0.0
+            val timestampMs = if (ts > 1e12) ts.toLong() else (ts * 1000).toLong()
             ChatSession(
                 sessionId = item.id,
                 title = item.title,
                 model = item.model,
                 messageCount = item.messageCount ?: 0,
-                updatedAt = activityAtMs,
-                startedAt = startedAtMs,
-                lastActivityAt = lastActivityAtMs,
+                updatedAt = timestampMs
             )
-        }.sortedByDescending { it.activityTimestamp }
-        // Preserve the active session's optimistic row when the server list
-        // doesn't include it yet: a freshly created chat has 0 messages and the
-        // drawer's `min_messages=1` query filters it out until its first turn
-        // persists. Keeping the local row (its title/preview is already set)
-        // stops a new chat from vanishing from the drawer between creation and
-        // the first message. Once it has messages the server returns it and the
-        // id-match below replaces the optimistic copy.
-        val activeId = _currentSessionId.value
-        val pending = if (activeId != null && mapped.none { it.sessionId == activeId }) {
-            _sessions.value.firstOrNull { it.sessionId == activeId }
-        } else {
-            null
         }
-        _sessions.value = if (pending != null) listOf(pending) + mapped else mapped
     }
 
     fun clearSessions() {
@@ -1743,29 +1616,26 @@ class ChatHandler {
         }
     }
 
-    /** Monotonic suffix for synthetic generating / subagent ToolCall ids. */
-    private var syntheticToolSeq = 0
-
-    /**
-     * Gateway `tool.generating` — the model is still streaming this tool's
-     * arguments. Appends a quiet "preparing" placeholder ToolCall; the
-     * matching `tool.start` (same name, FIFO — see [onToolCallStart])
-     * adopts it so the preparing card and the running card stay one entry.
-     * Nameless events get a blank-name placeholder that the next start
-     * adopts as a fallback; any never-adopted placeholders are swept in
-     * [onStreamComplete].
-     */
-    fun onToolGenerating(messageId: String, toolName: String?) {
+    fun onToolCallStart(
+        messageId: String,
+        toolCallId: String,
+        toolName: String,
+        runId: String? = null,
+        provenance: String? = null,
+    ) {
         _isStreaming.value = true
-        val placeholder = ToolCall(
-            id = "generating-${toolName ?: "tool"}-${syntheticToolSeq++}",
-            name = toolName ?: "",
+
+        val toolCall = ToolCall(
+            id = toolCallId,
+            name = toolName,
             args = null,
             result = null,
             success = null,
             isComplete = false,
-            isGenerating = true,
+            runId = runId,
+            provenance = provenance,
         )
+
         _messages.update { messages ->
             val target = messages.findLast {
                 it.id == messageId && it.role == MessageRole.ASSISTANT
@@ -1773,7 +1643,7 @@ class ChatHandler {
             if (target != null) {
                 messages.map { msg ->
                     if (msg.id == messageId) {
-                        msg.copy(toolCalls = msg.toolCalls + placeholder)
+                        msg.copy(toolCalls = msg.toolCalls + toolCall)
                     } else {
                         msg
                     }
@@ -1785,214 +1655,13 @@ class ChatHandler {
                     content = "",
                     timestamp = System.currentTimeMillis(),
                     isStreaming = true,
-                    toolCalls = listOf(placeholder),
+                    toolCalls = listOf(toolCall),
                     agentName = activeAgentName
                 )
             }
         }
     }
 
-    fun onToolCallStart(
-        messageId: String,
-        toolCallId: String,
-        toolName: String,
-        runId: String? = null,
-        provenance: String? = null,
-    ) {
-        _isStreaming.value = true
-
-        _messages.update { messages ->
-            val target = messages.findLast {
-                it.id == messageId && it.role == MessageRole.ASSISTANT
-            }
-            if (target != null) {
-                // Adopt a pending "preparing" placeholder for this name
-                // (or, failing that, the oldest nameless one) so the
-                // generating card flips to running in place instead of a
-                // second card appearing.
-                val genIdx = target.toolCalls
-                    .indexOfFirst { it.isGenerating && !it.isComplete && it.name == toolName }
-                    .takeIf { it >= 0 }
-                    ?: target.toolCalls
-                        .indexOfFirst { it.isGenerating && !it.isComplete && it.name.isEmpty() }
-                        .takeIf { it >= 0 }
-                messages.map { msg ->
-                    if (msg.id != messageId) return@map msg
-                    if (genIdx != null) {
-                        val calls = msg.toolCalls.toMutableList()
-                        calls[genIdx] = calls[genIdx].copy(
-                            id = toolCallId,
-                            name = toolName,
-                            isGenerating = false,
-                            // Execution starts now — preparing time isn't runtime.
-                            startedAt = System.currentTimeMillis(),
-                            runId = runId ?: calls[genIdx].runId,
-                            provenance = provenance ?: calls[genIdx].provenance,
-                        )
-                        msg.copy(toolCalls = calls)
-                    } else {
-                        msg.copy(
-                            toolCalls = msg.toolCalls + ToolCall(
-                                id = toolCallId,
-                                name = toolName,
-                                args = null,
-                                result = null,
-                                success = null,
-                                isComplete = false,
-                                runId = runId,
-                                provenance = provenance,
-                            ),
-                        )
-                    }
-                }
-            } else {
-                messages + ChatMessage(
-                    id = messageId,
-                    role = MessageRole.ASSISTANT,
-                    content = "",
-                    timestamp = System.currentTimeMillis(),
-                    isStreaming = true,
-                    toolCalls = listOf(
-                        ToolCall(
-                            id = toolCallId,
-                            name = toolName,
-                            args = null,
-                            result = null,
-                            success = null,
-                            isComplete = false,
-                            runId = runId,
-                            provenance = provenance,
-                        ),
-                    ),
-                    agentName = activeAgentName
-                )
-            }
-        }
-    }
-
-    // --- Gateway subagent lanes ---
-
-    /**
-     * Lane labels by task index, captured from `subagent.start` (goal
-     * truncated to 60 chars) and stamped onto every child ToolCall so
-     * [com.hermesandroid.relay.ui.components.SubagentLane] can render its
-     * header without a separate registry. Per-run state — cleared on
-     * [onStreamComplete] / [clearMessages].
-     */
-    private val subagentLabels = mutableMapOf<Int, String>()
-
-    /**
-     * Apply one gateway `subagent.*` lifecycle event to the streaming
-     * message's tool calls. Mutation model mirrors the upstream child
-     * mirror: a TOOL event closes the lane's open tool then starts the new
-     * one; COMPLETE closes whatever is still open and (for a lane that
-     * never surfaced a tool) appends a single completed summary entry so
-     * the lane is visible in history. THINKING/PROGRESS carry preview text
-     * the lanes don't render — ignored.
-     */
-    fun onSubagentEvent(messageId: String, event: GatewaySubagentEvent) {
-        val label = event.goal.trim().take(60).ifBlank { null }
-        when (event.phase) {
-            GatewaySubagentEvent.Phase.START -> {
-                if (label != null) subagentLabels[event.taskIndex] = label
-            }
-
-            GatewaySubagentEvent.Phase.TOOL -> {
-                _isStreaming.value = true
-                val laneLabel = subagentLabels[event.taskIndex] ?: label
-                val newCall = ToolCall(
-                    id = "subagent-${event.taskIndex}-${syntheticToolSeq++}",
-                    name = event.toolName?.takeIf { it.isNotBlank() } ?: "tool",
-                    args = event.preview,
-                    result = null,
-                    success = null,
-                    isComplete = false,
-                    taskIndex = event.taskIndex,
-                    taskLabel = laneLabel,
-                )
-                _messages.update { messages ->
-                    val target = messages.findLast {
-                        it.id == messageId && it.role == MessageRole.ASSISTANT
-                    }
-                    if (target != null) {
-                        messages.map { msg ->
-                            if (msg.id != messageId) return@map msg
-                            val closed = msg.toolCalls.map { call ->
-                                if (call.taskIndex == event.taskIndex && !call.isComplete) {
-                                    call.copy(
-                                        success = true,
-                                        isComplete = true,
-                                        completedAt = System.currentTimeMillis(),
-                                    )
-                                } else {
-                                    call
-                                }
-                            }
-                            msg.copy(toolCalls = closed + newCall)
-                        }
-                    } else {
-                        messages + ChatMessage(
-                            id = messageId,
-                            role = MessageRole.ASSISTANT,
-                            content = "",
-                            timestamp = System.currentTimeMillis(),
-                            isStreaming = true,
-                            toolCalls = listOf(newCall),
-                            agentName = activeAgentName
-                        )
-                    }
-                }
-            }
-
-            GatewaySubagentEvent.Phase.COMPLETE -> {
-                // "interrupted" lanes never finished — not a success either.
-                val failed = event.status == "failed" || event.status == "interrupted"
-                val laneLabel = subagentLabels.remove(event.taskIndex) ?: label
-                val summaryId = "subagent-${event.taskIndex}-${syntheticToolSeq++}"
-                _messages.update { messages ->
-                    messages.map { msg ->
-                        if (msg.id != messageId || msg.role != MessageRole.ASSISTANT) return@map msg
-                        val hasLaneCalls = msg.toolCalls.any { it.taskIndex == event.taskIndex }
-                        val closed = msg.toolCalls.map { call ->
-                            if (call.taskIndex == event.taskIndex && !call.isComplete) {
-                                call.copy(
-                                    success = !failed,
-                                    isComplete = true,
-                                    result = event.summary ?: call.result,
-                                    error = if (failed) (event.summary ?: event.status) else call.error,
-                                    completedAt = System.currentTimeMillis(),
-                                )
-                            } else {
-                                call
-                            }
-                        }
-                        val withSummary = if (hasLaneCalls) {
-                            closed
-                        } else {
-                            closed + ToolCall(
-                                id = summaryId,
-                                name = laneLabel ?: "subagent",
-                                args = null,
-                                result = event.summary,
-                                success = !failed,
-                                isComplete = true,
-                                error = if (failed) (event.summary ?: event.status) else null,
-                                completedAt = System.currentTimeMillis(),
-                                taskIndex = event.taskIndex,
-                                taskLabel = laneLabel,
-                            )
-                        }
-                        msg.copy(toolCalls = withSummary)
-                    }
-                }
-            }
-
-            GatewaySubagentEvent.Phase.THINKING,
-            GatewaySubagentEvent.Phase.PROGRESS,
-            -> Unit
-        }
-    }
-
     fun onToolCallComplete(
         messageId: String,
         toolCallId: String,
@@ -2117,47 +1786,12 @@ class ChatHandler {
         // Note: do NOT set _isStreaming to false — the run is still active
     }
 
-    /**
-     * Stamp a "Stopped" badge on a message whose turn the user cancelled, so
-     * the bubble carries a persistent status (not just a transient toast).
-     * No-op if already present. Call before [onStreamComplete] on cancel.
-     */
-    fun markStopped(messageId: String) {
-        _messages.update { messages ->
-            messages.map { msg ->
-                if (msg.id == messageId && "Stopped" !in msg.badges) {
-                    msg.copy(badges = msg.badges + "Stopped")
-                } else {
-                    msg
-                }
-            }
-        }
-    }
-
-    /**
-     * Stamp an "Error" badge on a message whose turn ended in a server error
-     * (e.g. a gateway ❌ lifecycle status), so a failed turn doesn't read as a
-     * normal answer. No-op if already present.
-     */
-    fun markError(messageId: String) {
-        _messages.update { messages ->
-            messages.map { msg ->
-                if (msg.id == messageId && "Error" !in msg.badges) {
-                    msg.copy(badges = msg.badges + "Error")
-                } else {
-                    msg
-                }
-            }
-        }
-    }
-
     /**
      * The entire agent run is complete (run.completed / done).
      * Marks the stream as finished and finalizes all messages.
      */
     fun onStreamComplete(messageId: String) {
         _isStreaming.value = false
-        _turnStatus.value = null
         insideThinkingBlock = false
 
         // Flush any remaining annotation text that didn't end with a newline
@@ -2184,19 +1818,6 @@ class ChatHandler {
         // Finalize media markers unconditionally
         finalizeMediaMarkers(messageId)
         finalizeCardMarkers(messageId)
-
-        // Sweep "preparing" placeholders whose tool.start never arrived —
-        // they never executed and would otherwise breathe forever.
-        _messages.update { messages ->
-            messages.map { msg ->
-                if (msg.toolCalls.none { it.isGenerating && !it.isComplete }) {
-                    msg
-                } else {
-                    msg.copy(toolCalls = msg.toolCalls.filterNot { it.isGenerating && !it.isComplete })
-                }
-            }
-        }
-        subagentLabels.clear()
     }
 
     fun onStreamError(message: String) {
@@ -2210,19 +1831,6 @@ class ChatHandler {
                 } else msg
             }
         }
-
-        // Same sweep as onStreamComplete — error/watchdog/transport-failure
-        // turns must not leave "preparing" placeholders breathing forever.
-        _messages.update { messages ->
-            messages.map { msg ->
-                if (msg.toolCalls.none { it.isGenerating && !it.isComplete }) {
-                    msg
-                } else {
-                    msg.copy(toolCalls = msg.toolCalls.filterNot { it.isGenerating && !it.isComplete })
-                }
-            }
-        }
-        subagentLabels.clear()
     }
 
     fun onThinkingDelta(messageId: String, delta: String) {
@@ -2318,7 +1926,7 @@ class ChatHandler {
  *
  * The label parameter is the short human-readable action name
  * ("Send SMS", "Open App", "Call", etc). Error-code branches mirror the
- * `error_code` strings [com.hermesandroid.relay.network.relay.BridgeCommandHandler]
+ * `error_code` strings [com.hermesandroid.relay.network.handlers.BridgeCommandHandler]
  * emits on destructive-verb rejections.
  */
 internal fun formatPhoneActionResult(

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

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

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

@@ -1,4 +1,4 @@
-package com.hermesandroid.relay.network.upstream.models
+package com.hermesandroid.relay.network.models
 
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.KSerializer
@@ -16,7 +16,6 @@ import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonPrimitive
-import java.time.Instant
 
 /**
  * Models for the Hermes /api/sessions REST API.
@@ -76,50 +75,12 @@ object FlexibleIdNonNullSerializer : KSerializer<String> {
     }
 }
 
-/** Timestamp serializer for Hermes session metadata.
- *
- * Upstream currently returns epoch seconds for `started_at` / `last_active`;
- * some documented surfaces use ISO strings for update-style fields. Decode
- * both into epoch seconds so callers can convert once at the UI boundary.
- */
-@OptIn(ExperimentalSerializationApi::class)
-object FlexibleTimestampSerializer : KSerializer<Double?> {
-    override val descriptor = PrimitiveSerialDescriptor("FlexibleTimestamp", PrimitiveKind.DOUBLE)
-
-    override fun deserialize(decoder: Decoder): Double? {
-        return try {
-            val jsonDecoder = decoder as? JsonDecoder
-                ?: return decoder.decodeDouble()
-            val element = jsonDecoder.decodeJsonElement()
-            when (element) {
-                is JsonNull -> null
-                is JsonPrimitive -> parseTimestamp(element.content)
-                else -> null
-            }
-        } catch (_: Exception) {
-            null
-        }
-    }
-
-    override fun serialize(encoder: Encoder, value: Double?) {
-        if (value != null) encoder.encodeDouble(value) else encoder.encodeNull()
-    }
-
-    private fun parseTimestamp(raw: String): Double? {
-        val trimmed = raw.trim()
-        if (trimmed.isBlank()) return null
-        trimmed.toDoubleOrNull()?.let { return it }
-        return runCatching { Instant.parse(trimmed).toEpochMilli() / 1000.0 }.getOrNull()
-    }
-}
-
 // --- Session CRUD responses ---
 
 @Serializable
 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
 )
 
@@ -140,32 +101,13 @@ data class SessionItem(
     val title: String? = null,
     val model: String? = null,
     val source: String? = null,
-    @SerialName("started_at")
-    @Serializable(with = FlexibleTimestampSerializer::class)
-    val startedAt: Double? = null,
-    @SerialName("ended_at")
-    @Serializable(with = FlexibleTimestampSerializer::class)
-    val endedAt: Double? = null,
-    @SerialName("last_active")
-    @Serializable(with = FlexibleTimestampSerializer::class)
-    val lastActive: Double? = null,
-    @SerialName("last_activity")
-    @Serializable(with = FlexibleTimestampSerializer::class)
-    val lastActivity: Double? = null,
-    @SerialName("last_activity_at")
-    @Serializable(with = FlexibleTimestampSerializer::class)
-    val lastActivityAt: Double? = null,
-    @SerialName("updated_at")
-    @Serializable(with = FlexibleTimestampSerializer::class)
-    val updatedAt: Double? = null,
+    @SerialName("started_at") val startedAt: Double? = null,
+    @SerialName("ended_at") val endedAt: Double? = null,
     @SerialName("message_count") val messageCount: Int? = null,
     @SerialName("tool_call_count") val toolCallCount: Int? = null,
     @SerialName("input_tokens") val inputTokens: Int? = null,
     @SerialName("output_tokens") val outputTokens: Int? = null
-) {
-    val resolvedLastActivity: Double?
-        get() = lastActive ?: lastActivity ?: lastActivityAt ?: updatedAt
-}
+)
 
 @Serializable
 data class CreateSessionRequest(
@@ -185,7 +127,6 @@ 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
 )
 
@@ -204,19 +145,8 @@ data class MessageItem(
     @Serializable(with = FlexibleIdSerializer::class)
     val toolCallId: String? = null,
     val timestamp: Double? = null,
-    @SerialName("finish_reason") val finishReason: String? = null,
-    // Reasoning persisted with the assistant message (upstream serializes
-    // both names; reasoning is the canonical one). Restored into
-    // ChatMessage.thinkingContent so the Thought-process block survives a
-    // return to the chat instead of existing only for the live turn.
-    val reasoning: String? = null,
-    @SerialName("reasoning_content") val reasoningContent: String? = null,
+    @SerialName("finish_reason") val finishReason: String? = null
 ) {
-    /** Reasoning text under whichever field name the server used. */
-    val resolvedReasoning: String?
-        get() = reasoning?.takeIf { it.isNotBlank() }
-            ?: reasoningContent?.takeIf { it.isNotBlank() }
-
     /** Extract content as plain text string. Handles both string and array-of-parts formats. */
     val contentText: String?
         get() = when (content) {
@@ -344,13 +274,7 @@ data class UsageInfo(
     @SerialName("completion_tokens") val completionTokens: Int? = null,
     // Cache tokens
     @SerialName("cache_creation_input_tokens") val cacheCreationInputTokens: Int? = null,
-    @SerialName("cache_read_input_tokens") val cacheReadInputTokens: Int? = null,
-    // Gateway context-window block (session-cumulative; present only when the
-    // server's context compressor is active — upstream _get_usage()). Render
-    // context UI only when contextMax is non-null.
-    @SerialName("context_used") val contextUsed: Int? = null,
-    @SerialName("context_max") val contextMax: Int? = null,
-    @SerialName("context_percent") val contextPercent: Int? = null
+    @SerialName("cache_read_input_tokens") val cacheReadInputTokens: Int? = null
 ) {
     /** Resolved input tokens — prefers Hermes naming, falls back to OpenAI. */
     val resolvedInputTokens: Int? get() = inputTokens ?: promptTokens

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

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

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

@@ -1,226 +0,0 @@
-package com.hermesandroid.relay.network.shared
-
-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/shared/LocalDispatchResult.kt

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