chore: merge dev for Android 1.4.3 preflight

feat: prepare Android 1.4.3 release
Merge pull request #188 from Codename-11/dev
2026-07-12 10:17:20 -04:00 · 2026-07-12 10:04:00 -04:00 · 2026-07-11 22:31:05 -04:00 · 2026-07-11 22:28:01 -04:00 · 2026-07-11 22:25:56 -04:00 · 2026-07-11 22:21:22 -04:00
306 changed files with 37529 additions and 5294 deletions
@@ -12,10 +12,22 @@

 -

+## Lineage / contributor credit
+
+<!--
+If this PR salvages or supersedes earlier work, link every source PR and name
+the original contributor(s). Preserve original commit authors where practical;
+otherwise use verified Co-authored-by trailers. Write "N/A" for original work.
+-->
+
+- Source PR(s): N/A
+- Attribution preserved by: N/A
+
 ## Checklist

 - [ ] Target branch is `dev` unless this is a release PR
 - [ ] Android changes: lint and focused unit tests ran, or rationale is listed above
+- [ ] Translation changes: `python scripts/check-android-locales.py` ran and the locale was reviewed on a device/emulator, or N/A
 - [ ] 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
@@ -23,3 +35,4 @@
 - [ ] 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
+- [ ] Salvaged work links the source PR and preserves contributor authorship, or N/A
@@ -0,0 +1,110 @@
+# Hermes-Relay-Android — explicit public release approval
+#
+# Run from main only after the private Play preflight is clean and the release
+# PR has merged. Creating the stable tag is the public release decision; the
+# tag-triggered release workflow submits Play first, then publishes GitHub.
+
+name: Approve Android Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Approved Android version (for example 1.4.3)"
+        required: true
+        type: string
+      confirm_play_checks:
+        description: "I reviewed and accept the Play pre-review and pre-launch results"
+        required: true
+        type: boolean
+
+permissions:
+  contents: write
+  actions: write
+
+concurrency:
+  group: approve-android-release
+  cancel-in-progress: false
+
+jobs:
+  approve:
+    name: Verify preflight and create release tag
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          fetch-depth: 0
+
+      - name: Validate approval request
+        id: metadata
+        env:
+          REQUESTED_VERSION: ${{ inputs.version }}
+          CONFIRM_PLAY_CHECKS: ${{ inputs.confirm_play_checks }}
+        run: |
+          if [ "$GITHUB_REF" != "refs/heads/main" ]; then
+            echo "::error::Approve Android Release must run from main, not $GITHUB_REF"
+            exit 1
+          fi
+          if [ "$CONFIRM_PLAY_CHECKS" != "true" ]; then
+            echo "::error::Play checks must be reviewed and explicitly accepted"
+            exit 1
+          fi
+
+          TOML_VERSION=$(grep -oP 'appVersionName\s*=\s*"\K[^"]+' gradle/libs.versions.toml)
+          if [ "$REQUESTED_VERSION" != "$TOML_VERSION" ]; then
+            echo "::error::Requested version $REQUESTED_VERSION does not match appVersionName $TOML_VERSION"
+            exit 1
+          fi
+
+          echo "version=$TOML_VERSION" >> "$GITHUB_OUTPUT"
+          echo "tree=$(git rev-parse 'HEAD^{tree}')" >> "$GITHUB_OUTPUT"
+
+      - name: Verify this exact release tree passed Play preflight
+        env:
+          GH_TOKEN: ${{ github.token }}
+          VERSION: ${{ steps.metadata.outputs.version }}
+          RELEASE_TREE: ${{ steps.metadata.outputs.tree }}
+        run: |
+          ARTIFACT_NAME="play-preflight-${VERSION}-${RELEASE_TREE}"
+          COUNT=$(gh api "/repos/${GITHUB_REPOSITORY}/actions/artifacts?name=${ARTIFACT_NAME}" \
+            --jq '[.artifacts[] | select(.expired == false)] | length')
+          if [ "$COUNT" -lt 1 ]; then
+            echo "::error::No successful Play preflight found for version $VERSION with tree $RELEASE_TREE"
+            exit 1
+          fi
+          echo "Verified Play preflight proof: $ARTIFACT_NAME"
+
+      - name: Ensure release tag does not already exist
+        env:
+          GH_TOKEN: ${{ github.token }}
+          VERSION: ${{ steps.metadata.outputs.version }}
+        run: |
+          if gh api "/repos/${GITHUB_REPOSITORY}/git/ref/tags/android-v${VERSION}" >/dev/null 2>&1; then
+            echo "::error::Tag android-v${VERSION} already exists"
+            exit 1
+          fi
+
+      - name: Create approved Android release tag
+        env:
+          GH_TOKEN: ${{ github.token }}
+          VERSION: ${{ steps.metadata.outputs.version }}
+        run: |
+          gh api --method POST "/repos/${GITHUB_REPOSITORY}/git/refs" \
+            -f ref="refs/tags/android-v${VERSION}" \
+            -f sha="$GITHUB_SHA"
+
+      - name: Start the tag release workflow
+        env:
+          GH_TOKEN: ${{ github.token }}
+          VERSION: ${{ steps.metadata.outputs.version }}
+        run: |
+          gh workflow run release-android.yml \
+            --ref="android-v${VERSION}" \
+            -f version="$VERSION"
+
+      - name: Approval summary
+        run: |
+          echo "## Android release approved" >> "$GITHUB_STEP_SUMMARY"
+          echo "" >> "$GITHUB_STEP_SUMMARY"
+          echo "Created \`android-v${{ steps.metadata.outputs.version }}\` from main at \`$GITHUB_SHA\`." >> "$GITHUB_STEP_SUMMARY"
+          echo "The release workflow was dispatched at that tag. It will submit the preflighted Play draft before creating the public GitHub Release." >> "$GITHUB_STEP_SUMMARY"
@@ -25,7 +25,12 @@ on:
      - "gradle.properties"
      - "gradlew"
      - "gradlew.bat"
+      - "scripts/check-android-locales.py"
+      - "scripts/check-android-collection-apis.py"
      - ".github/workflows/ci-android.yml"
+      - ".github/workflows/play-preflight-android.yml"
+      - ".github/workflows/approve-release-android.yml"
+      - ".github/workflows/release-android.yml"
  pull_request:
    branches: [main, dev]
    paths:
@@ -36,7 +41,12 @@ on:
      - "gradle.properties"
      - "gradlew"
      - "gradlew.bat"
+      - "scripts/check-android-locales.py"
+      - "scripts/check-android-collection-apis.py"
      - ".github/workflows/ci-android.yml"
+      - ".github/workflows/play-preflight-android.yml"
+      - ".github/workflows/approve-release-android.yml"
+      - ".github/workflows/release-android.yml"

 # Cancel in-progress runs for the same branch/PR, but let main and dev finish
 concurrency:
@@ -53,7 +63,7 @@ jobs:
    timeout-minutes: 20
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Set up JDK 17
        uses: actions/setup-java@v5
@@ -66,6 +76,12 @@ jobs:
        with:
          cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/dev' }}

+      - name: Validate translation catalogs
+        run: python3 scripts/check-android-locales.py
+
+      - name: Reject unsafe Android collection APIs
+        run: python3 scripts/check-android-collection-apis.py
+
      - name: Run Android lint
        run: ./gradlew lint --console=plain

@@ -79,7 +95,7 @@ jobs:
    timeout-minutes: 25
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Set up JDK 17
        uses: actions/setup-java@v5
@@ -123,7 +139,7 @@ jobs:
    continue-on-error: ${{ github.ref != 'refs/heads/main' && github.base_ref != 'main' }}
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Set up JDK 17
        uses: actions/setup-java@v5
@@ -138,8 +154,8 @@ jobs:

      # The broad Gradle `test` aggregate currently hangs in deferred JVM test
      # suites tracked by issue #32. Keep CI release-relevant until that suite is
-      # split: pairing URL derivation plus connection switching are the stable
-      # Android regression slice for the active release work.
+      # split: run the stable connection slice plus focused Chat/Voice state,
+      # parser, layout, and accessibility regressions for the active release.
      - name: Run focused Android unit tests
        run: |
          ./gradlew :app:testSideloadDebugUnitTest \
@@ -148,7 +164,17 @@ jobs:
            --tests com.hermesandroid.relay.viewmodel.ConnectionSwitchTest \
            --tests com.hermesandroid.relay.util.ServerAddressTest \
            --tests com.hermesandroid.relay.util.IssueReportAndDiagnosticsTest \
+            --tests com.hermesandroid.relay.data.AppLanguageTest \
            --tests com.hermesandroid.relay.viewmodel.ChatStreamRecoveryTest \
+            --tests com.hermesandroid.relay.viewmodel.ChatViewModelRealtimeTurnTest \
+            --tests com.hermesandroid.relay.network.relay.RealtimeVoiceEventParsingTest \
+            --tests com.hermesandroid.relay.voice.VoiceCommandInterpreterTest \
+            --tests com.hermesandroid.relay.data.VoiceModePresetTest \
+            --tests com.hermesandroid.relay.ui.components.BackgroundTaskCardTest \
+            --tests com.hermesandroid.relay.ui.components.DotMatrixIndicatorTest \
+            --tests com.hermesandroid.relay.ui.components.AttachmentGalleryLayoutTest \
+            --tests com.hermesandroid.relay.ui.components.MarkdownStreamingParserTest \
+            --tests com.hermesandroid.relay.ui.screens.ChatUnreadStateTest \
            --console=plain

      # Upload reports only for failures. Successful PR report uploads add
@@ -177,7 +203,7 @@ jobs:
    timeout-minutes: 35
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Set up JDK 17
        uses: actions/setup-java@v5
@@ -195,3 +221,9 @@ jobs:
      # smoke; the goal is to exercise the build, not to produce a shippable AAB.
      - name: Build release bundles + APKs (both flavors, debug-signed)
        run: ./gradlew bundleRelease assembleRelease --console=plain
+
+      - name: Scan release DEX for unsupported collection APIs
+        run: |
+          python3 scripts/check-android-collection-apis.py \
+            --apk app/build/outputs/apk/googlePlay/release/*.apk \
+            --apk app/build/outputs/apk/sideload/release/*.apk
@@ -44,7 +44,7 @@ jobs:
    timeout-minutes: 10
    steps:
      - name: Checkout hermes-relay
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Resolve upstream ref
        id: ref
@@ -64,7 +64,7 @@ jobs:
          echo "Checking standard-path route contract against upstream ref: $REF"

      - name: Checkout vanilla upstream (no plugin, no bootstrap)
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
        with:
          repository: NousResearch/hermes-agent
          ref: ${{ steps.ref.outputs.ref }}
@@ -25,7 +25,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7

      - name: Setup Node.js
        uses: actions/setup-node@v6
@@ -26,7 +26,7 @@ jobs:
      run:
        working-directory: desktop
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7

      - name: Setup Node.js
        uses: actions/setup-node@v6
@@ -41,6 +41,9 @@ jobs:
      - name: Type-check
        run: npm run type-check

+      - name: Test typed stream rendering
+        run: npm test
+
      - name: Build (tsc → dist/)
        run: npm run build

@@ -62,7 +65,7 @@ jobs:
      run:
        working-directory: desktop
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7

      - name: Setup Node.js
        uses: actions/setup-node@v6
@@ -90,10 +93,10 @@ jobs:
      run:
        working-directory: desktop
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7

      - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
        with:
          node-version: '22'
          cache: npm
@@ -12,10 +12,7 @@ on:
  push:
    branches: [main, dev]
    paths:
-      - "plugin/__init__.py"
-      - "plugin/android_tool.py"
-      - "plugin/cli.py"
-      - "plugin/pair.py"
+      - "plugin/*.py"
      - "plugin/plugin.yaml"
      - "plugin/relay/**"
      - "plugin/tools/**"
@@ -31,10 +28,7 @@ on:
  pull_request:
    branches: [main, dev]
    paths:
-      - "plugin/__init__.py"
-      - "plugin/android_tool.py"
-      - "plugin/cli.py"
-      - "plugin/pair.py"
+      - "plugin/*.py"
      - "plugin/plugin.yaml"
      - "plugin/relay/**"
      - "plugin/tools/**"
@@ -63,7 +57,7 @@ jobs:
    timeout-minutes: 10
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Set up Python 3.11
        uses: actions/setup-python@v6
@@ -102,7 +96,7 @@ jobs:
    continue-on-error: ${{ github.ref != 'refs/heads/main' && github.base_ref != 'main' }}
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Set up Python 3.11
        uses: actions/setup-python@v6
@@ -111,7 +105,12 @@ jobs:

      - name: Install dependencies
        run: |
-          pip install -r relay_server/requirements.txt
+          # Editable install pulls the full runtime dependency set from
+          # pyproject.toml (requests, aiohttp, segno, httpx, websocket-client,
+          # pyyaml). test_native_layout_imports imports the whole relay module
+          # chain in a clean subprocess, so the minimal relay_server/requirements
+          # set is not enough on its own.
+          pip install -e .
          pip install pytest responses

      - name: Run focused Plugin tests
@@ -119,4 +118,5 @@ jobs:
          python -m pytest \
            plugin/tests/test_relay_security.py \
            plugin/tests/test_voice_routes.py \
-            plugin/tests/test_session_grants.py
+            plugin/tests/test_session_grants.py \
+            plugin/tests/test_native_layout_imports.py
@@ -51,7 +51,7 @@ jobs:

      - name: Checkout repository
        if: env.IS_RELEASE_PR != 'true' && env.IS_BOT_PR != 'true'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
        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.
@@ -134,7 +134,7 @@ jobs:
      id-token: write   # OIDC token exchange for the Claude action
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
        with:
          fetch-depth: 1

@@ -231,7 +231,7 @@ jobs:
      id-token: write
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
        with:
          fetch-depth: 1

@@ -322,7 +322,7 @@ jobs:
      id-token: write
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
        with:
          fetch-depth: 1

@@ -26,7 +26,7 @@ jobs:
      actions: read # Required for Claude to read CI results on PRs
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
        with:
          fetch-depth: 1

@@ -13,7 +13,7 @@ jobs:
    steps:
      - name: Fetch Dependabot metadata
        id: metadata
-        uses: dependabot/fetch-metadata@v2
+        uses: dependabot/fetch-metadata@v3
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}

@@ -31,7 +31,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
        with:
          fetch-depth: 0  # Full history for lastUpdated timestamps

@@ -7,7 +7,7 @@ on:
      - "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/*.txt"
      - "app/src/googlePlay/play/listings/**"
      - "scripts/screenshots.py"
      - ".github/workflows/play-listing.yml"
@@ -20,7 +20,7 @@ on:
      - "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/*.txt"
      - "app/src/googlePlay/play/listings/**"
      - "scripts/screenshots.py"
      - ".github/workflows/play-listing.yml"
@@ -41,7 +41,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7

      - name: Set up Python
        uses: actions/setup-python@v6
@@ -67,7 +67,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 15
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7

      - name: Set up JDK 17
        uses: actions/setup-java@v5
@@ -0,0 +1,153 @@
+# Hermes-Relay-Android — private Google Play preflight
+#
+# Run manually from the final dev or untagged main tree before creating
+# android-v*. The job
+# builds the same signed release artifacts, scans final DEX, and uploads the
+# Google Play bundle as a production DRAFT. Play can then run pre-review and
+# pre-launch checks while no public GitHub Release or sideload APK exists.
+
+name: Play Preflight — Android
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Android version to preflight (for example 1.4.3)"
+        required: true
+        type: string
+
+permissions:
+  contents: read
+
+concurrency:
+  group: play-preflight-android
+  cancel-in-progress: false
+
+jobs:
+  preflight:
+    name: Build and upload private Play draft
+    runs-on: ubuntu-latest
+    timeout-minutes: 40
+    steps:
+      - uses: actions/checkout@v7
+
+      - name: Require final release branch and matching version
+        id: metadata
+        env:
+          REQUESTED_VERSION: ${{ inputs.version }}
+        run: |
+          if [ "$GITHUB_REF" != "refs/heads/dev" ] && [ "$GITHUB_REF" != "refs/heads/main" ]; then
+            echo "::error::Run Play preflight from dev or untagged main, not $GITHUB_REF"
+            exit 1
+          fi
+
+          TOML_VERSION=$(grep -oP 'appVersionName\s*=\s*"\K[^"]+' gradle/libs.versions.toml)
+          VERSION_CODE=$(grep -oP 'appVersionCode\s*=\s*"\K[^"]+' gradle/libs.versions.toml)
+          if [ "$REQUESTED_VERSION" != "$TOML_VERSION" ]; then
+            echo "::error::Requested version $REQUESTED_VERSION does not match appVersionName $TOML_VERSION"
+            exit 1
+          fi
+
+          echo "version=$TOML_VERSION" >> "$GITHUB_OUTPUT"
+          echo "version_code=$VERSION_CODE" >> "$GITHUB_OUTPUT"
+          echo "tree=$(git rev-parse 'HEAD^{tree}')" >> "$GITHUB_OUTPUT"
+
+      - name: Require Play and release-signing secrets
+        env:
+          PLAY_SERVICE_ACCOUNT_JSON: ${{ secrets.PLAY_SERVICE_ACCOUNT_JSON }}
+          HERMES_KEYSTORE_BASE64: ${{ secrets.HERMES_KEYSTORE_BASE64 }}
+        run: |
+          if [ -z "$PLAY_SERVICE_ACCOUNT_JSON" ]; then
+            echo "::error::PLAY_SERVICE_ACCOUNT_JSON is required for Play preflight"
+            exit 1
+          fi
+          if [ -z "$HERMES_KEYSTORE_BASE64" ]; then
+            echo "::error::HERMES_KEYSTORE_BASE64 is required for Play preflight"
+            exit 1
+          fi
+
+      - 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: Validate release metadata and source compatibility
+        run: |
+          python3 scripts/check-version-tracks.py
+          python3 scripts/check-android-locales.py
+          python3 scripts/check-android-collection-apis.py
+          python3 -m json.tool app/src/main/assets/changelog.json >/dev/null
+
+      - name: Decode release keystore
+        env:
+          HERMES_KEYSTORE_BASE64: ${{ secrets.HERMES_KEYSTORE_BASE64 }}
+        run: |
+          echo "$HERMES_KEYSTORE_BASE64" | base64 -d > "$RUNNER_TEMP/release.keystore"
+          echo "HERMES_KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> "$GITHUB_ENV"
+
+      - name: Build final release artifacts
+        env:
+          HERMES_KEYSTORE_PASSWORD: ${{ secrets.HERMES_KEYSTORE_PASSWORD }}
+          HERMES_KEY_ALIAS: ${{ secrets.HERMES_KEY_ALIAS }}
+          HERMES_KEY_PASSWORD: ${{ secrets.HERMES_KEY_PASSWORD }}
+        run: ./gradlew bundleRelease assembleRelease --console=plain
+
+      - name: Scan final release DEX
+        run: |
+          python3 scripts/check-android-collection-apis.py \
+            --apk app/build/outputs/apk/googlePlay/release/*.apk \
+            --apk app/build/outputs/apk/sideload/release/*.apk
+
+      - name: Upload private production draft to Play
+        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 }}
+        run: |
+          trap 'rm -f play-service-account.json' EXIT
+          printf '%s' "$PLAY_SERVICE_ACCOUNT_JSON" > play-service-account.json
+          ./gradlew publishGooglePlayReleaseBundle \
+            --track=production \
+            --release-status=draft \
+            --resolution-strategy=ignore \
+            --release-name="Hermes-Relay ${{ steps.metadata.outputs.version }} preflight"
+
+      - name: Record successful preflight for the exact commit
+        run: |
+          mkdir -p app/build/reports
+          cat > app/build/reports/play-preflight.json <<EOF
+          {
+            "version": "${{ steps.metadata.outputs.version }}",
+            "versionCode": "${{ steps.metadata.outputs.version_code }}",
+            "commit": "$GITHUB_SHA",
+            "tree": "${{ steps.metadata.outputs.tree }}",
+            "track": "production",
+            "status": "draft"
+          }
+          EOF
+
+      - name: Upload preflight proof
+        uses: actions/upload-artifact@v7
+        with:
+          name: play-preflight-${{ steps.metadata.outputs.version }}-${{ steps.metadata.outputs.tree }}
+          path: app/build/reports/play-preflight.json
+          if-no-files-found: error
+          retention-days: 30
+
+      - name: Preflight summary
+        run: |
+          echo "## Play preflight ready" >> "$GITHUB_STEP_SUMMARY"
+          echo "" >> "$GITHUB_STEP_SUMMARY"
+          echo "- Version: **${{ steps.metadata.outputs.version }}** (code ${{ steps.metadata.outputs.version_code }})" >> "$GITHUB_STEP_SUMMARY"
+          echo "- Commit: \`$GITHUB_SHA\`" >> "$GITHUB_STEP_SUMMARY"
+          echo "- Release tree: \`${{ steps.metadata.outputs.tree }}\`" >> "$GITHUB_STEP_SUMMARY"
+          echo "- Play track/status: **Production draft**" >> "$GITHUB_STEP_SUMMARY"
+          echo "" >> "$GITHUB_STEP_SUMMARY"
+          echo "Review Play pre-review checks and the pre-launch report. After they are acceptable, ensure this exact release tree is on main, then run **Approve Android Release** from main." >> "$GITHUB_STEP_SUMMARY"
@@ -11,9 +11,19 @@ on:
  push:
    tags:
      - "android-v*"
+  # Approve Android Release creates its tag with GITHUB_TOKEN, whose tag event
+  # does not recursively start workflows. It explicitly dispatches this file
+  # at that tag instead. Manual tag pushes continue to use the push trigger.
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Approved Android version"
+        required: true
+        type: string

 permissions:
  contents: write
+  actions: read
  id-token: write

 jobs:
@@ -22,12 +32,26 @@ jobs:
    runs-on: ubuntu-latest
    outputs:
      version: ${{ steps.version.outputs.version }}
+      version_code: ${{ steps.version.outputs.version_code }}
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7

      - name: Extract version from tag
        id: version
-        run: echo "version=${GITHUB_REF#refs/tags/android-v}" >> $GITHUB_OUTPUT
+        env:
+          DISPATCHED_VERSION: ${{ inputs.version }}
+        run: |
+          REF_VERSION="${GITHUB_REF#refs/tags/android-v}"
+          if [ "$GITHUB_REF" = "$REF_VERSION" ]; then
+            REF_VERSION="$DISPATCHED_VERSION"
+          fi
+          if [ -n "$DISPATCHED_VERSION" ] && [ "$DISPATCHED_VERSION" != "$REF_VERSION" ]; then
+            echo "::error::Dispatched version $DISPATCHED_VERSION does not match ref version $REF_VERSION"
+            exit 1
+          fi
+          VERSION_CODE=$(grep -oP 'appVersionCode\s*=\s*"\K[^"]+' gradle/libs.versions.toml)
+          echo "version=$REF_VERSION" >> "$GITHUB_OUTPUT"
+          echo "version_code=$VERSION_CODE" >> "$GITHUB_OUTPUT"

      - name: Verify version sync
        run: |
@@ -44,13 +68,30 @@ jobs:

          echo "Version validated: $TAG_VERSION"

+      - name: Require successful Play preflight for this exact release tree
+        if: ${{ !contains(steps.version.outputs.version, '-') }}
+        env:
+          GH_TOKEN: ${{ github.token }}
+          VERSION: ${{ steps.version.outputs.version }}
+        run: |
+          RELEASE_TREE=$(git rev-parse 'HEAD^{tree}')
+          ARTIFACT_NAME="play-preflight-${VERSION}-${RELEASE_TREE}"
+          COUNT=$(gh api "/repos/${GITHUB_REPOSITORY}/actions/artifacts?name=${ARTIFACT_NAME}" \
+            --jq '[.artifacts[] | select(.expired == false)] | length')
+          if [ "$COUNT" -lt 1 ]; then
+            echo "::error::No successful Play preflight found for version $VERSION with tree $RELEASE_TREE"
+            echo "Run Play Preflight from the final dev tree, review Play's checks, merge that unchanged tree to main, then approve the release."
+            exit 1
+          fi
+          echo "Play preflight proof found: $ARTIFACT_NAME"
+
  ci:
    name: CI Checks
    needs: validate
    runs-on: ubuntu-latest
    timeout-minutes: 30
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7

      - name: Set up JDK 17
        uses: actions/setup-java@v5
@@ -63,6 +104,12 @@ jobs:
        with:
          cache-read-only: false

+      - name: Validate release metadata and Android API compatibility
+        run: |
+          python3 scripts/check-version-tracks.py
+          python3 scripts/check-android-locales.py
+          python3 scripts/check-android-collection-apis.py
+
      # Keep the tag release gate aligned with CI — Android's broad Gradle
      # `test` aggregate currently hangs in deferred JVM suites tracked by
      # issue #32, so the release gate runs the stable connection/pairing slice.
@@ -79,7 +126,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 30
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7

      - name: Set up JDK 17
        uses: actions/setup-java@v5
@@ -116,6 +163,12 @@ jobs:
        #   app/build/outputs/bundle/sideloadRelease/hermes-relay-<version>-sideload-release.aab
        run: ./gradlew bundleRelease assembleRelease

+      - name: Scan release DEX for unsupported collection APIs
+        run: |
+          python3 scripts/check-android-collection-apis.py \
+            --apk app/build/outputs/apk/googlePlay/release/*.apk \
+            --apk app/build/outputs/apk/sideload/release/*.apk
+
      - name: List produced artifacts (debug aid)
        run: |
          echo "=== APK outputs ==="
@@ -135,6 +188,32 @@ jobs:
          sha256sum apk/sideload/release/*.apk bundle/googlePlayRelease/*.aab > SHA256SUMS.txt
          cat SHA256SUMS.txt

+      - name: Require Play credentials for stable release
+        env:
+          PLAY_SERVICE_ACCOUNT_JSON: ${{ secrets.PLAY_SERVICE_ACCOUNT_JSON }}
+        if: ${{ !contains(needs.validate.outputs.version, '-') }}
+        run: |
+          if [ -z "$PLAY_SERVICE_ACCOUNT_JSON" ]; then
+            echo "::error::PLAY_SERVICE_ACCOUNT_JSON is required for stable Android releases"
+            exit 1
+          fi
+
+      - name: Submit preflighted Play draft to production review
+        env:
+          PLAY_SERVICE_ACCOUNT_JSON: ${{ secrets.PLAY_SERVICE_ACCOUNT_JSON }}
+        if: ${{ !contains(needs.validate.outputs.version, '-') }}
+        run: |
+          trap 'rm -f play-service-account.json' EXIT
+          printf '%s' "$PLAY_SERVICE_ACCOUNT_JSON" > play-service-account.json
+          ./gradlew promoteGooglePlayReleaseArtifact \
+            --update=production \
+            --version-code=${{ needs.validate.outputs.version_code }} \
+            --release-status=completed \
+            --release-name="Hermes-Relay ${{ needs.validate.outputs.version }}"
+
+      # Public distribution happens only after Play accepts the production
+      # submission above. This keeps a Play-detected release blocker from
+      # appearing after the sideload APK is already public.
      - name: Create GitHub Release
        uses: softprops/action-gh-release@v3
        with:
@@ -142,56 +221,13 @@ jobs:
          tag_name: android-v${{ needs.validate.outputs.version }}
          body_path: RELEASE_NOTES.md
          prerelease: ${{ contains(needs.validate.outputs.version, '-') }}
-          # Deliberate 2-asset policy (#144): attach ONLY
-          # `hermes-relay-<version>-sideload-release.apk` (the file users
-          # install by tapping — full Device Control feature set) and
-          # `hermes-relay-<version>-googlePlay-release.aab` (the Play Console
-          # upload bundle — NOT tap-installable on a phone), plus the
-          # SHA256SUMS.txt covering exactly those two files. GitHub sorts
-          # assets alphabetically, so extra files made the non-installable
-          # .aab list first and confused new users. The parity twins
-          # (googlePlay APK, sideload AAB) are still BUILT by the step above
-          # and reproducible from the tag via CI, just not attached.
-          # NEVER rename the sideload APK: the in-app update checker
-          # (update/UpdateChecker.kt) matches assets by ".apk" + "sideload"
-          # in the name, and user-docs verify steps cite the filename.
+          # Deliberate 2-asset policy (#144): attach ONLY the installable
+          # sideload APK and Play AAB, plus checksums covering those files.
          files: |
            app/build/outputs/apk/sideload/release/*.apk
            app/build/outputs/bundle/googlePlayRelease/*.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 }}
@@ -15,7 +15,7 @@ jobs:
      run:
        working-directory: desktop
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7

      - name: Setup Node.js (for npm ci + tsc)
        uses: actions/setup-node@v6
@@ -104,10 +104,10 @@ jobs:
      run:
        working-directory: desktop
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7

      - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
        with:
          node-version: '22'
          cache: npm
@@ -176,13 +176,13 @@ jobs:
    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
+      - uses: actions/checkout@v7

      - name: Extract CLI version
        id: version
        run: echo "version=${GITHUB_REF_NAME#cli-v}" >> "$GITHUB_OUTPUT"

-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v8
        with:
          path: release-assets

@@ -16,7 +16,7 @@ jobs:
    outputs:
      version: ${{ steps.version.outputs.version }}
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7

      - name: Extract version from tag
        id: version
@@ -33,7 +33,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 15
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7

      - name: Set up Python 3.11
        uses: actions/setup-python@v6
@@ -68,7 +68,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 15
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7

      - name: Set up Python 3.11
        uses: actions/setup-python@v6
@@ -6,6 +6,101 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/), and this

 ## [Unreleased]

+### Added
+
+- **Desktop chat can use Relay typed streaming over WSS.** The opt-in `--relay-chat` mode sends `chat.send`, renders typed `stream.event` v1 assistant/tool/artifact/memory/skill/error lifecycles, de-duplicates reconnect events, and preserves the existing gateway chat path as the default.
+
+## [1.4.3] - 2026-07-11
+
+### Added
+
+- **Language switching is available inside the app.** Settings → Appearance now offers System default, English, and Simplified Chinese, stays synchronized with Android's per-app language setting, and persists the choice on Android 12 and lower.
+
+### Fixed
+
+- **Release builds reject unsupported collection APIs.** CI now scans Kotlin sources and final minified APK bytecode for Java 21 list endpoint calls that can crash on Android versions before API 35.
+
+## [1.4.2] - 2026-07-11
+
+### Added
+
+- **Android now supports Simplified Chinese.** Chat, Manage, Voice, connection setup, settings, diagnostics, notifications, accessibility labels, and both product flavors follow the device language, with Android per-app language discovery on supported versions.
+- **Localization is contributor-ready.** CI enforces resource, plural, and format-argument parity; translated README and VitePress entry points establish a repeatable path for adding languages without duplicating fast-moving technical references.
+
+### Fixed
+
+- **Connection scan and queued-message counts use proper plurals.** Count formatting no longer depends on English-only suffix arguments and cannot fail when a locale needs a different plural structure.
+
+## [1.4.1] - 2026-07-11
+
+### Added
+
+- **Background work is visible in Standard Chat.** A live process strip opens a mobile process sheet with running or recent state, output, elapsed time, Stop, and Dismiss controls. It remains compatible with older Hermes servers that do not expose process details.
+- **Background work has a clearer Chat home.** Realtime work appears as a titled task card with working, waiting, delivery, and completion states, queued work, and an expandable tool timeline.
+- **Multi-image messages open as galleries.** Adjacent images render in a compact grid and open at the selected image in a swipeable viewer while preserving sensitive-media reveal and original-file actions.
+- **Voice gains commands and presets.** Spoken commands can stop speech, cancel background work, pause or resume listening, repeat a result, or start Standard voice chat. Hands-free, Low latency, Careful tools, and Quiet presets tune existing interaction settings.
+
+### Changed
+
+- **Streaming Chat content stays steadier and more readable.** Settled prose and headings adopt final Markdown styling during generation, wide tables scroll with readable columns, the thinking indicator respects system motion and TalkBack settings, and the jump-to-bottom control counts unread messages.
+- **Offline Demo mode no longer starts Voice.** The mic action now explains locally that a Hermes connection is required.
+
+### Fixed
+
+- **An in-flight Chat turn survives reopening the app.** Session-backed replies restore partial text, live reasoning, lifecycle status, tool/subagent cards, background-task state, and unanswered approval or clarification cards. Current Hermes gateways reattach to the same running turn; older or finished sessions reconcile from history without duplicating the prompt or losing the final answer.
+- **Realtime Agent delivery is protected.** Hermes results use exact provider speech where supported, delivery validation, generation-safe confirmation, and a single relay-TTS fallback if the provider closes or rejects delivery. Voice commands no longer leave synthetic cancellation turns or mute a later background answer.
+- **Standard Chat receives background-process completions automatically.** When Hermes completes detached work and starts a follow-up turn on the originating Gateway session, Android shows the unsolicited assistant stream in the open conversation and reconciles history after a cold reconnect. The synthetic process prompt is rendered as a compact process notice rather than a user-authored message.
+
+## [1.4.0] - 2026-07-09
+
+### Added
+
+- **Android model pickers can refresh the server catalog.** Chat's model sheet and Manage's main/profile model dialogs now expose upstream's explicit **Refresh Models** action, so dynamic/custom provider model lists can be reloaded on demand without making every picker open probe providers.
+- **Server-backed session cleanup plumbing.** The dashboard client now supports single-session export, the upstream `/api/sessions/prune` route with a mandatory dry-run preview before destructive apply, plus soft archive/restore helpers and an `archived` session-list filter for the Manage surface.
+- **Notification triggers MVP.** Settings → Notifications now has explicit opt-in proactive rules for the Notification companion: match by app package plus optional title/text filters, post a safe local "Ask Hermes?" prompt, show the latest trigger activity, and pause everything instantly with a kill switch.
+- **Android bridge: multi-device targeting.** The relay can keep multiple Android bridge clients connected at once, route commands by `device` selector (`phone`, `pixel`, `fold`, `boox`, `note`, `notemax`, `tablet`, or device ID), expose `/bridge/devices` and `/bridge/select-active`, and advertise an optional `device` argument on the `android_*` tool schemas.
+- **Voice: a second long request gets queued, not refused.** Ask for another long task while one is already running in the background and it's now queued (up to three) and starts automatically when the current one finishes — with a short spoken transition. The task card shows "+N queued", and cancelling the current task clears the queue.
+- **Voice: background answers start speaking sooner and can never be silently lost.** The spoken summary now streams as it's generated (it used to be held until fully complete — a noticeable dead gap, then the whole answer at once). Delivery is verified two ways: the summary must actually reflect the answer's content (not just avoid known filler phrases), and if no spoken delivery lands within 30 seconds the answer is posted as text instead of vanishing.
+- **Voice: tap the finished-task card to hear the answer again.** After a background task's card settles to "finished," tapping it replays the delivered answer. The card also now shows in the compact voice view (it previously existed only in the full-screen layout), a "Drafting the answer…" status appears as the reply is being composed, and leaving voice mode with a task still running leaves a note in chat so the work stays visible.
+- **Voice: quick questions answered while a background task runs.** Realtime voice used to refuse *any* second request while a long task ran in the background — even a two-second lookup. A quick second ask is now answered inline on a side session (within the same few-second window that decides backgrounding); anything that turns out to be long still gets the "a task is already running" answer, and the running task is never disturbed.
+- **Voice: the background-task card no longer vanishes mid-answer.** The card used to disappear the instant the spoken answer started (exactly when the waveform returned), reading as the task being lost. It now settles to a "Background task finished." state, lingers for a few seconds while the answer plays, then dismisses itself — and its ✕ during that settled state just dismisses the card instead of sending a cancel.
+- **Voice: the "Thinking" pill no longer spins forever.** The server streams its drafting text as an internal pseudo-tool that never reports completion, and the app rendered it as a live tool pill — which then ran indefinitely in both chat and the voice overlay. Internal tool events no longer become pills (their text still feeds the thinking trace).
+- **Voice: background-task answers can't be lost to a stray cancel.** Tapping cancel/stop after a background task had already finished used to mark the finished run "cancelled" — losing the answer that was about to be spoken. Cancel now only cancels a run that's actually still running; stopping the current speech works as before.
+- **Voice: no more spoken run IDs or phantom queue state.** The realtime voice model no longer reads 32-character run IDs aloud after starting a background task (identifiers stay out of everything it's asked to speak), no longer claims a request was queued unless the relay accepted it, and a completed task's answer is spoken directly — deferral filler like "one moment while I look that up" in place of a finished result now triggers the fallback that speaks the real answer.
+- **Voice: finished-task answers keep the realtime voice.** A completed background task's answer is now spoken by the same realtime voice you've been talking to — read word for word from the authoritative Hermes answer — instead of switching to the standard TTS voice mid-conversation. The answer always lands: if the realtime model goes off-script or the provider connection drops, standard TTS speaks it, and if you start talking mid-delivery it's posted as text instead of interrupting you. The "When the answer is ready" setting keeps its four modes (Exact / Summary / Notify / Show), now explained behind an info icon in Voice Settings.
+- **Voice: realtime models refreshed.** OpenAI realtime now defaults to `gpt-realtime-2.1` (with the cheaper `gpt-realtime-2.1-mini` selectable), the versioned `grok-voice-think-fast-1.0` pin is available alongside xAI's `grok-voice-latest` alias, and session logs record which model the provider *actually* served — so provider-side alias moves no longer happen invisibly.
+- **Voice: session logs clean up after themselves.** Realtime voice session logs are swept after 14 days by default (`realtime_voice.run_retention_days`, 0 disables), and the per-response TTS audio capture is now opt-in debug tooling (`debug_audio_tap`) instead of an always-on multi-MB tap.
+- **Voice: one-command delivery health report.** `python -m plugin.relay.realtime_agent.report` summarizes recent voice deliveries — how many were spoken by the realtime voice vs fell back to TTS or text, and why — for quick health checks after live testing.
+
+### Changed
+
+- **Bootstrap compatibility layer slimmed to true gaps.** The optional compatibility hook no longer injects session CRUD/messages or the legacy skills list — current Hermes serves those natively; it now covers only surfaces with no native replacement yet (session search, memory, legacy skill detail/toggle, config, available-models, and the slash-command middleware). Older pre-session-API Hermes builds degrade to the standard completions/runs chat paths.
+- **Dependency floor: aiohttp ≥ 3.14.1.** Raised from 3.9 across plugin requirements and package metadata to the patched line covering the 2026 aiohttp security advisories.
+
+### Fixed
+
+- **Realtime voice recovers after background route loss.** A recorded turn now waits for a relay-confirmed resumed socket, retains unacknowledged follow-up PCM for replay, and reports transport rejection instead of sitting on a dead persistent connection. Resume handshakes are coalesced, and the relay requires a valid resume claim before replacing the active phone socket, so a slower stale connection cannot detach background-result delivery. Long-lived sessions start their bounded retry window when the route actually drops instead of at voice-mode entry, and a bare socket open cannot reset it. Late callbacks from a retired session are ignored. Exiting voice mode clears its detached reconnect and confirmation state before another session opens; rejected or unacknowledged cancels no longer leave an undismissable background-task pill. Provider transcription no longer impersonates active microphone capture, Stop settles the local turn even when the route is gone, and provisional `Listening...` / `Still working...` rows cannot remain stuck in chat.
+- **xAI exact background answers bypass model deferral.** Non-structured **Exact** deliveries now use xAI's provider-native forced speech event, preserving the selected realtime voice and normal assistant history while speaking the authoritative Hermes answer without asking the model to follow a read-verbatim prompt. Structured results and summary modes still use natural model summarization, and the validator plus standard-TTS fallback remain as safety nets.
+- **Background voice handoffs no longer repeat themselves.** If the realtime provider already spoke an acknowledgement before calling Hermes, promotion keeps that first line and suppresses the redundant "running in the background" follow-up; silent tool calls still receive the configured spoken handoff. Provider protocols that report both response creation and output-item creation now also produce one client `response.started` event instead of two.
+- **Realtime voice model and voice picks now apply to the next session.** Voice Settings persists the selected Realtime Agent model and voice per connection/profile and sends both when opening a session, so choosing a pinned model immediately controls the next session instead of requiring **Save realtime agent** to rewrite the relay config. The active voice UI reflects the override, changing it retires any prewarmed session, and the choice survives an app restart.
+- **Fresh realtime sessions emit one ready event.** Android's required `session.start` acknowledgement no longer causes the relay to send a second `voice.session.ready`, avoiding duplicate event IDs and duplicate session-ready telemetry on every new voice conversation.
+- **Relay media can no longer serve credential files.** `/media/by-path` now always blocks paths that resolve into credential or system locations (`~/.hermes/.env`, `auth.json`, `config.yaml`, OAuth/MCP token stores, `pairing/`, `~/.ssh`, and similar) even in the default permissive mode — mirroring upstream Hermes' media-delivery hardening — so a prompt-injected `MEDIA:` marker can't deliver live secrets to a paired phone. Symlinks are resolved before the check, and the relay's own QR-signing secret and session-token store are covered too.
+- **Long agent turns no longer die or duplicate at the transport.** Gateway chat (Android and the desktop CLI) now gives `prompt.submit` up to 30 minutes to acknowledge — matching upstream desktop and the server's own turn ceiling — instead of short generic RPC timeouts that could falsely fall back to SSE (duplicating the turn on Android) or kill a legitimately long deep-reasoning turn. Turn liveness is governed by idle-progress watchdogs (no events at all for a stretch), never a hard cap while output is still streaming.
+- **Manage → Models keeps providers that still need keys.** Newer Hermes hides unconfigured providers from the model catalog unless a management UI opts in; Android Manage now opts in and keeps rendering greyed provider rows with their key-setup guidance on both old and new servers. In-chat model picking is unchanged (configured providers only).
+- **Phone-local context actually reaches the server on fallback chat paths.** The sessions/runs streaming payloads carried voice-intent traces, card dispatches, and attachments in fields the server never reads — silently dropping them. That context now rides channels the server actually consumes (a per-turn context digest, real history fields where they exist, inline images on the completions path), and any attachment with no supported channel is reported instead of silently discarded.
+- **Relay plugin works under the native `hermes plugins install` path.** The plugin's runtime imports assumed the repo's editable layout, so upstream's native installer (which loads plugins under its own package namespace) broke `hermes relay start` and `hermes pair` with `ModuleNotFoundError: No module named 'plugin'`. All runtime imports are now package-relative, the dashboard module boots correctly when the upstream web server loads it standalone, and `hermes relay doctor` now exercises the real import chain so this class of breakage can't pass doctor again. (#165)
+- **Installer handles modern venv layouts.** `install.sh` now autodetects the classic venv, uv-managed `.venv`, and containerized layouts — and everything it generates (the systemd unit and all four command shims) points at the interpreter it actually detected instead of a hardcoded classic path. On immutable container images it steers to the native install path with a clear message instead of dying mid-run. (#165)
+- **Doctor catches dashboard URLs pointed at the wrong Hermes surface.** `hermes relay doctor` now distinguishes the dashboard/Manage surface from an API-server/headless backend URL and tells operators to use `hermes dashboard` when a configured dashboard URL is actually pointing at `hermes serve` / the API server.
+- **Doctor and installer catch stale duplicate plugin copies.** The gateway plugin loader picks a discovered plugin by manifest name, so a second directory declaring `name: hermes-relay` (a leftover backup copy or a stray extra install) could win and make the gateway load stale code — silently ignoring every later deploy. `hermes relay doctor` now warns when more than one directory under the plugins dir declares the same plugin name, and `install.sh` removes any such duplicate so only the canonical plugin symlink remains.
+- **Crash-safety on Android 14 and earlier.** Built against SDK 35, Kotlin's `removeFirst()`/`removeLast()` resolve to the new Java `List` methods that don't exist below Android 15, crashing older devices. All such calls in the app are now `removeAt(...)`, and Tink (pulled in by encrypted storage) is pinned ahead of the transitive version whose `HybridConfig` tripped the same Google Play pre-launch check.
+- **No crash when a relay address is malformed.** A corrupt or hand-edited pairing address with an invalid host could crash the app the moment it opened the relay connection (the connection is built on a background thread, so the error escaped uncaught). A bad relay address is now handled as a normal connection failure — shown as disconnected with a "re-pair to refresh" note — instead of crashing. The same guard now also covers the relay's media, session, and voice HTTP calls. (relay half of #131)
+- **Voice: cleaner error recovery.** A failed or timed-out voice turn no longer shows the same error twice (the top overlay banner and a duplicate bottom banner) and can now be **dismissed**, not just retried — so a stuck error state can't block the screen.
+- **Voice: fallback-spoken answers no longer play into a frozen overlay.** When an answer is delivered by the standard TTS fallback (or replayed from the finished-task card), the voice screen now shows the waveform and the answer text while it speaks — previously it sat on "Thinking" with no visuals even though audio was playing.
+- **Voice: a quiet realtime session no longer dies with a raw provider error.** xAI ends a realtime conversation after 900 seconds of inactivity, and no keepalive traffic resets that timer — so a voice session left open through a long background task (or simply left open) died with a raw provider error. That provider timeout is now treated as routine expiry: the session ends cleanly with no error banner, and your next voice turn transparently opens a fresh provider conversation that picks up from the same durable Hermes chat session.
+- **No crash when a malformed server address reaches a chat send.** The three streaming chat paths built their HTTP request before any error handling, so a corrupt or hand-edited API URL could throw instead of failing the turn gracefully. They now surface "Invalid server address — edit the connection's API URL or re-pair" through the normal in-chat error channel (closes the remaining #131 crash-class gap).
+- **Demo mode: typing a message now gets an honest reply.** Sending a message in the offline demo used to do nothing (the composer silently ignored it, reading as broken). The demo now echoes your message and answers with a short notice explaining it's an offline sample, pointing at the Connect action to chat for real.
+- **Voice: realtime conversations reliably reach your chat history.** Turns the realtime voice model answers directly (without calling Hermes) are folded into the chat session on your next message — but on the default gateway connection that hand-off could be deferred indefinitely, so the agent never learned what was said in voice. The turn that carries them now routes so the sync actually lands. Synced voice turns also render cleanly when a chat reloads: a quiet "Realtime Agent" chip instead of a raw provenance footnote, and no more duplicated voice exchange after the sync.
+
 ## [1.3.0] - 2026-07-06

 ### Added
@@ -1453,7 +1548,11 @@ 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
+[Unreleased]: https://github.com/Codename-11/hermes-relay/compare/android-v1.4.3...HEAD
+[1.4.3]: https://github.com/Codename-11/hermes-relay/compare/android-v1.4.2...android-v1.4.3
+[1.4.2]: https://github.com/Codename-11/hermes-relay/compare/android-v1.4.1...android-v1.4.2
+[1.4.1]: https://github.com/Codename-11/hermes-relay/compare/android-v1.4.0...android-v1.4.1
+[1.4.0]: https://github.com/Codename-11/hermes-relay/compare/android-v1.3.0...android-v1.4.0
 [1.0.0]: https://github.com/Codename-11/hermes-relay/compare/android-v0.8.0...android-v1.0.0
 [0.8.1]: https://github.com/Codename-11/hermes-relay/compare/android-v0.8.0...android-v0.8.1
 [0.8.0]: https://github.com/Codename-11/hermes-relay/compare/v0.7.0...android-v0.8.0
@@ -46,20 +46,20 @@ The Vanilla Hermes path must stay upstream-only. API-server bearer auth and dash
 Upstream main now contains the focused session-control API (`#33134`) and read-only skills/toolsets (`#33016`). The original broad PR [#8556](https://github.com/NousResearch/hermes-agent/pull/8556) was closed as superseded. Keep these distinctions straight:

 1. **Native upstream** — `/api/sessions`, `/api/sessions/{id}/messages`, `/api/sessions/{id}/chat`, `/api/sessions/{id}/chat/stream`, `/v1/capabilities`, `/v1/skills`, and `/v1/toolsets` exist in current `gateway/platforms/api_server.py`.
-2. **Bootstrap compatibility** (`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.
+2. **Bootstrap compatibility** (`plugin/hermes_relay_bootstrap/`) — monkey-patches aiohttp on startup via `.pth` file, injecting only compatibility-only surfaces (session search, memory, legacy skill detail/toggle, config, available-models, slash middleware). Sessions CRUD/messages/fork and the legacy skills list are **retired** — native upstream owns them (#33134/#33016) and the bootstrap carries no fallback for old builds. Native routes still win per method/path for the remaining set. The repo-root `hermes_relay_bootstrap/` package is a legacy import shim.
 3. **Legacy fork branches** — useful as lineage only. Do not cite `feat/session-api` / `#8556` as the current upstream contract.


 | Endpoint                               | Purpose                                | Provided by                                                                            |
 | -------------------------------------- | -------------------------------------- | -------------------------------------------------------------------------------------- |
-| `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                                |
+| `GET /api/sessions` (CRUD)             | Session list/create/rename/delete/fork | Native upstream (#33134); bootstrap injection retired                                  |
+| `GET /api/sessions/{id}/messages`      | Conversation history                   | Native upstream (#33134); bootstrap injection retired                                  |
 | `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                            |
+| `GET /api/skills/{name}`               | Legacy skill detail                    | Bootstrap compat; list (`GET /api/skills`) retired — use native `/v1/skills`           |
 | `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                                 |
@@ -84,7 +84,7 @@ Current upstream supports two auth modes on this surface. Loopback dashboards st
 - **Vanilla Hermes path = upstream-only.** The default (no-plugin) connection path — gateway/API chat, Manage, and Vanilla Hermes voice via the dashboard surface — must work against **unmodified upstream hermes-agent**: no fork patches, no bespoke server config as a dependency. The app ships on Google Play to users whose servers we don't control. Features that need server-side changes go through upstream PRs (with graceful degradation until merged) or live behind the opt-in relay plugin.
 - **Always verify upstream before assuming an endpoint exists.** Check `gateway/platforms/api_server.py` in hermes-agent. If an endpoint isn't there, document whether bootstrap injects it or it requires the fork.
 - If we use a non-standard endpoint, ensure `probeCapabilities()` covers it and the auto-resolver degrades gracefully.
- **Bootstrap maintenance:** Retire `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:** Retire `plugin/hermes_relay_bootstrap/` per surface. Done: sessions CRUD/messages/fork and the legacy skills list are retired from the bootstrap (native upstream #33134/#33016, no old-build fallback kept). Remaining: config, memory, legacy skill detail/toggle, available-models, session search, and slash middleware still need explicit replacement decisions before full removal.

 ## Repository Layout

@@ -282,7 +282,7 @@ This is a **public, distributed repo** — every committed file (CHANGELOG, DEVL
 | `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                                                                                                                                        |
+| `plugin/hermes_relay_bootstrap/`                            | Plugin-owned runtime compatibility patch — compat-only surfaces (session search, memory, skill detail/toggle, config, available-models, slash middleware); sessions + skills-list injection retired (#33134/#33016)                                                                                 |
 | `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                                                                                                                                                                                                                                       |
@@ -473,7 +473,7 @@ See [RELEASE.md](RELEASE.md) for the full recipe.
 | Chat streaming                 | `POST /v1/runs` → `GET /v1/runs/{id}/events`                                                                        | Structured tool events; async run-control path                                                                                                                                                                                                                                              |
 | Chat (sessions)                | `POST /api/sessions/{id}/chat/stream`                                                                               | Native upstream session-persisted SSE; preferred when capability probe finds it                                                                                                                                                                                                             |
 | Chat (compat)                  | `POST /v1/chat/completions` (stream=true)                                                                           | Inline tool annotations only                                                                                                                                                                                                                                                                |
-| Session CRUD                   | `GET/POST/PATCH/DELETE /api/sessions`                                                                               | Native upstream (#33134); bootstrap fallback only for old builds                                                                                                                                                                                                                            |
+| Session CRUD                   | `GET/POST/PATCH/DELETE /api/sessions`                                                                               | Native upstream (#33134); bootstrap fallback retired                                                                                                                                                                                                                                        |
 | Manage                         | Dashboard `/api/status`, `/api/auth/me`, `/api/config`, `/api/profiles/*`, `/api/env`, `/api/model/*`, `/api/mcp/*` | Vanilla Hermes dashboard surface; do not proxy through Relay                                                                                                                                                                                                                                |
 | Vanilla Hermes voice           | Dashboard `POST /api/audio/transcribe`, `POST /api/audio/speak`                                                     | Vanilla Hermes no-plugin voice; uses dashboard session from Manage                                                                                                                                                                                                                          |
 | Pairing (QR)                   | `POST /pairing/register` (loopback only)                                                                            | Via `/hermes-relay-pair` or `hermes-pair` shim; accepts optional `endpoints` for multi-endpoint QRs                                                                                                                                                                                         |
@@ -96,6 +96,52 @@ 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.

+## Stale PR salvage and contributor credit
+
+A valuable pull request can become unsafe to merge when `dev` has materially
+changed around it. Maintainers may create a replacement **salvage PR** from the
+current `dev` instead of resolving a stale branch by choosing whole conflict
+sides.
+
+A salvage PR must:
+
+- Link the original PR and contributor in its title or opening summary.
+- Recover only the intended feature; unrelated fork, release, signing, and
+  generated migration changes stay out.
+- Preserve the original commit author when a substantive commit can be safely
+  cherry-picked.
+- Use a verified `Co-authored-by: Name <email>` trailer when the implementation
+  must be reconstructed or substantially rewritten.
+- Include a `Lineage` section listing source and superseded PRs, plus a concise
+  explanation of integration changes made for current `dev`.
+- Run current verification rather than relying on checks from the stale branch.
+- Leave a comment linking the replacement before the source PR is closed.
+
+The maintainer remains the committer for integration commits. The original
+contributor remains the author or co-author of the recovered work. Do not guess
+an email address: use the source commit's verified address or ask the
+contributor.
+
+## Localization contributions
+
+English resources are canonical and Android locale catalogs must retain exact
+resource and format-argument parity. Read [docs/localization.md](docs/localization.md)
+before changing user-facing strings or adding a language.
+
+Translation PRs should cover one locale or one clear catalog refresh. They must
+not include custom APK publishing, signing configuration, version bumps, or
+fork-specific branding. Run:
+
+```bash
+python scripts/check-android-locales.py
+./gradlew lint
+```
+
+Also identify a fluent reviewer or explain the device and language review used.
+Translated READMEs use separate `README.<locale>.md` files; `README.md` remains
+the canonical project description. User docs may be added incrementally under
+`user-docs/<locale>/`, with links back to canonical English reference material.
+
 ## Changelog & writing conventions

 This is a **public repo** — `CHANGELOG.md`, `DEVLOG.md`, the README, and everything under `docs/` ship publicly. Keep them clean:
@@ -1,46 +1,39 @@
 # Hermes-Relay-Plugin v__VERSION__

-**Release Date:** July 6, 2026
-**Since the previous plugin release:** The Realtime Agent learns to multitask — long Hermes tasks hand off to the background while the conversation continues, results survive disconnects and are delivered when the phone comes back (or as a proactive notification), and spoken progress is milestone-based instead of a timer. Plus a typed chat stream for desktop clients.
+**Release Date:** July 11, 2026

-Pairs with Hermes-Relay-Android v1.3.0, which ships the matching live progress chip and detach-on-exit behavior. Provider-native voice turns and vanilla upstream (no plugin) are unaffected.
+**Since v1.4.0:** Realtime Agent result delivery is more dependable when a provider closes, stalls, or overlaps a newer response. Completed Hermes work stays authoritative through provider-native delivery where available and a single relay-TTS fallback otherwise.
+
+Pairs with Hermes-Relay-Android v1.4.1 for the matching background-task, voice-command, and result-delivery behavior. Standard chat and Vanilla Hermes voice remain upstream-owned and do not require this plugin.

 ## What's changed

-### Added
- **Background runs that finish what they started (ADR 33 hardening).** A detached voice session now stays alive while a background Hermes run is in flight (instead of expiring on the 30-second resume window); a finished result found with no phone attached is held and injected on the next resume, and if the session is gone for good it falls back to a proactive notification. Runs that exceed the cap are stopped cleanly and say so.
- **Adaptive promotion.** Clearly long-running tools (cron, desktop, browser work) hand the task to the background immediately instead of waiting out the full grace window — with a short quick-finish window so fast calls stay inline.
- **Busy answer for a second task.** Asking for another task while one is running gets an explicit "still working on the earlier task" answer (wait, check status, or cancel) instead of silently orphaning the first run.
- **Typed chat stream passthrough.** The relay `chat` channel can emit structured `stream.event` envelopes (assistant deltas, tool lifecycle, artifacts, completion) for desktop/CLI consumers that advertise the capability.
-
 ### Changed
- **Milestone speech, not timer narration.** The periodic spoken status updates during a long task are off by default — the agent speaks when a task starts in the background, finishes, or fails; the client chip covers the in-between. `realtime_voice_progress_spoken_after_ms` restores timed narration if you prefer it.
- **Live progress metadata.** `hermes.run.progress` events carry the active tool, completed-step count, and elapsed time, which drive the Android app's live chip.
+
+- **Provider-native delivery carries an explicit mode.** Realtime responses consistently identify forced-summary and fallback delivery so the Android client can present one authoritative result.
+- **Exact delivery is more direct.** Non-structured verbatim results can use provider-native exact text while natural summaries retain delivery guidance.

 ### Fixed
- **A benign provider cancel-notice no longer kills a live voice turn.** xAI's "cancellation failed: no active response found" was treated as fatal and closed the session right as the answer was about to be spoken — it's now filtered, and needless cancels are floor-gated so they aren't sent in the first place.
- **Provider sockets ride out idle stretches.** Realtime provider WebSockets use protocol-level heartbeats instead of a total-connection timeout, so long silent tool phases no longer sever the provider leg.
+
+- **A completed result survives provider failure.** If tool-result submission or a follow-up provider response fails, the relay speaks the authoritative Hermes answer through its fallback path before reporting the provider error.
+- **Delivery confirmation ignores stale work.** A generation token prevents an older confirmation alarm from emitting a duplicate answer after a newer delivery or preemption.
+- **Fallback completion is unambiguous.** The fallback path emits one complete result event even when the provider's audio render cannot finish.

 ## Install / update

-```bash
-# Classic install / update on a systemd host (recommended):
-curl -fsSL https://raw.githubusercontent.com/Codename-11/hermes-relay/main/install.sh | bash
-# or, if already installed:
-hermes-relay-update
-```
+    # Native upstream plugin path:
+    hermes plugins install Codename-11/hermes-relay/plugin --enable

-> **Known issue:** the native `hermes plugins install` path currently breaks
-> `hermes relay start` (#165, `ModuleNotFoundError: No module named 'plugin'`).
-> The fix ships in the next plugin release — use the classic installer until then.
+    # Classic install / update on a systemd host:
+    curl -fsSL https://raw.githubusercontent.com/Codename-11/hermes-relay/main/install.sh | bash
+    # or, if already installed:
+    hermes-relay-update

 ## Verify

-```bash
-hermes relay doctor
-```
+    hermes relay doctor
+    python scripts/check-plugin-version-sync.py --expect __VERSION__

 ---

-Tag prefixes: Android releases use `android-v*`, CLI releases use `cli-v*`. Historical
-relay/plugin releases used `relay-v*` tags.
+Tag prefixes: Android releases use android-v*, plugin releases use plugin-v*, and CLI releases use cli-v*.
@@ -21,6 +21,7 @@
 </p>

 <p align="center">
+  <strong>English</strong> · <a href="README.zh-CN.md">简体中文</a><br>
  <a href="https://codename-11.github.io/hermes-relay/">Documentation</a> ·
  <a href="https://github.com/Codename-11/hermes-relay/releases">Releases</a> ·
  <a href="CHANGELOG.md">Changelog</a> ·
@@ -151,6 +152,16 @@ Full server setup, TLS, and systemd details: [docs/relay-server.md](docs/relay-s
  </tr>
 </table>

+### Simplified Chinese
+
+<table>
+  <tr>
+    <td align="center" width="33%"><img src="assets/screenshots/Zh01.jpg" alt="中文设置界面" width="100%"><br><sub><b>设置 — 全面汉化</b></sub></td>
+    <td align="center" width="33%"><img src="assets/screenshots/Zh02.jpg" alt="中文管理界面" width="100%"><br><sub><b>管理 — 仪表盘汉化</b></sub></td>
+    <td align="center" width="33%"><img src="assets/screenshots/Zh03.jpg" alt="中文导航界面" width="100%"><br><sub><b>导航菜单 — 简体中文</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
@@ -0,0 +1,104 @@
+<p align="center">
+  <img src="assets/play-store-feature-1024x500.png" alt="Hermes-Relay — 随身携带您的 Hermes 代理" width="800">
+</p>
+
+<p align="center">
+  <strong>运行在您的电脑上，连接到您的设备。</strong><br>
+  Hermes-Relay 是 <a href="https://github.com/NousResearch/hermes-agent">Hermes Agent</a> 的原生 Android 客户端，提供流式聊天、免手动语音和代理管理；另有单文件 CLI，让代理在已配对的电脑上安全使用终端、文件和截图工具。
+</p>
+
+<p align="center">
+  <strong>简体中文</strong> · <a href="README.md">English</a><br>
+  <a href="https://codename-11.github.io/hermes-relay/zh-CN/">中文文档</a> ·
+  <a href="https://github.com/Codename-11/hermes-relay/releases">版本下载</a> ·
+  <a href="CHANGELOG.md">更新日志</a>
+</p>
+
+> 英文 [README.md](README.md) 是最新、完整的项目说明。本页维护中文安装入口和核心功能摘要；协议、架构和维护者文档以英文版本为准。
+
+## 功能简介
+
+- **Android 应用**：流式聊天、会话历史、文件附件、Hermes 管理、语音模式、多连接和配置文件。
+- **无需插件的标准路径**：聊天、管理和标准语音可直接连接未修改的上游 Hermes Agent。
+- **可选 Relay 插件**：增加终端、手机控制、媒体传输、通知助手、Relay 语音和电脑工具。
+- **安全连接**：二维码配对、Android Keystore、证书固定、按通道授权和可配置会话有效期。
+- **远程使用**：可配置 Tailscale 或 HTTPS 地址，在家庭局域网和远程路由之间自动切换。
+- **两种 Android 发行渠道**：Google Play 版本适合日常使用；sideload 版本包含完整手机控制能力。
+
+## 快速开始
+
+### 1. 安装 Android 应用
+
+- [Google Play](https://play.google.com/store/apps/details?id=com.axiomlabs.hermesrelay)：自动更新，包含聊天、语音、管理、终端、媒体和通知功能。
+- [GitHub Releases](https://github.com/Codename-11/hermes-relay/releases)：下载最新 `android-v*` 版本中以 `-sideload-release.apk` 结尾的文件，获得完整手机控制功能。
+
+### 2. 启动 Hermes API 服务
+
+手机需要能够访问 Hermes API 服务，并使用 API 密钥进行身份验证：
+
+```bash
+hermes setup --portal
+
+mkdir -p ~/.hermes
+API_SERVER_KEY="$(openssl rand -hex 32)"
+cat >> ~/.hermes/.env <<EOF
+API_SERVER_ENABLED=true
+API_SERVER_HOST=0.0.0.0
+API_SERVER_PORT=8642
+API_SERVER_KEY=$API_SERVER_KEY
+EOF
+chmod 600 ~/.hermes/.env
+
+echo "Android API URL: http://<电脑IP>:8642   key: $API_SERVER_KEY"
+hermes gateway
+```
+
+`0.0.0.0` 会让同一网络中的设备访问 API。请保留强密钥；离开可信局域网时，应使用 Tailscale 或 HTTPS 反向代理，不要直接把端口暴露到互联网。
+
+### 3. 在手机上连接
+
+打开应用后，可以：
+
+- 扫描局域网中的 Hermes；
+- 手动输入 `http://<主机>:8642` 和 API 密钥；
+- 扫描包含 API、Dashboard 和可选 Relay 地址的设置二维码。
+
+如需在手机上管理模型、密钥、技能和配置文件，请运行 Hermes Dashboard，并在应用的 **管理** 页面登录一次。同一登录会话也会启用标准语音。
+
+### 4. 可选：安装 Relay
+
+仅在需要终端、手机控制、媒体路由、Relay 会话、实时语音或电脑工具时安装：
+
+```bash
+hermes plugins install Codename-11/hermes-relay/plugin --enable
+hermes relay doctor
+hermes relay start --no-ssl
+hermes pair
+```
+
+完整说明请阅读[中文快速开始](https://codename-11.github.io/hermes-relay/zh-CN/guide/quick-start)；远程访问、协议和高级配置暂时链接到英文参考文档。
+
+## 中文界面
+
+<table>
+  <tr>
+    <td align="center" width="33%"><img src="assets/screenshots/Zh01.jpg" alt="中文设置界面" width="100%"><br><sub><b>设置</b></sub></td>
+    <td align="center" width="33%"><img src="assets/screenshots/Zh02.jpg" alt="中文管理界面" width="100%"><br><sub><b>管理</b></sub></td>
+    <td align="center" width="33%"><img src="assets/screenshots/Zh03.jpg" alt="中文导航界面" width="100%"><br><sub><b>导航</b></sub></td>
+  </tr>
+</table>
+
+## 参与翻译
+
+Android 英文资源是规范来源。新增语言必须保持资源名称、类型和格式参数一致，并通过：
+
+```bash
+python scripts/check-android-locales.py
+./gradlew lint
+```
+
+翻译规范、目录命名、复数和占位符规则见 [docs/localization.md](docs/localization.md)。
+
+## 许可证
+
+[MIT](LICENSE) — Copyright (c) 2026 [Axiom-Labs](https://codename-11.dev)
@@ -485,11 +485,39 @@ prefixed `hermes-relay-<version>-` via `archivesName` in
 Optional device smoke test: `scripts\dev.bat release` then
 `adb install -r app\build\outputs\apk\sideload\release\hermes-relay-*-sideload-release.apk`.

-### 4. Commit on `dev`, merge to `main`, tag from `main`
+### 4. Run the private Play preflight from `dev`

-The release-prep commit lands on `dev` first. Then a release PR merges
-`dev` → `main` with `--no-ff`, and the `android-v<version>` tag is cut from the
-resulting merge commit on `main`:
+The release-prep commit lands on `dev` first. Before any public tag or GitHub
+Release exists, open **Actions → Play Preflight — Android**, choose **Run
+workflow**, select the final `dev` branch, and enter the prepared version.
+
+The preflight workflow:
+
+1. requires the workflow to run from `dev` or untagged `main` with matching
+   version metadata;
+2. runs the release metadata, locale, and Android collection-API checks;
+3. builds and release-signs the same APK/AAB variants used by the public release;
+4. scans the final minified APK DEX for unsupported collection calls;
+5. uploads the Google Play AAB as a private **Production draft**; and
+6. records a 30-day preflight proof keyed to the version and Git tree hash.
+
+No sideload APK or GitHub Release is published by preflight. Wait for Play's
+pre-review checks and pre-launch report, then review every error and warning.
+If the release source changes after preflight, rerun it—the approval workflow
+matches the complete Git tree, not just the version number.
+
+GitHub exposes manual workflows only after their workflow file exists on the
+default branch. For the first release that introduces this process, merge the
+release PR without creating a tag, run preflight from untagged `main`, review
+Play, and then use the approval workflow. This publishes no app artifacts before
+the Play review gate.
+
+### 5. Merge to `main` and approve the public release
+
+After Play preflight is acceptable, merge the release PR from `dev` to `main`
+with `--no-ff`. The merge commit may differ from the preflight commit, but its
+tree must be identical. If the merge changes the tree, rerun private preflight
+from untagged `main`:

 ```bash
 # From a clean dev checkout:
@@ -501,17 +529,22 @@ git add gradle/libs.versions.toml RELEASE_NOTES.md CHANGELOG.md \
 git commit -m "release(android): android-v0.6.2"
 git push origin dev

+# Run Play Preflight — Android from dev and review Play's results.
 # Open the release PR (dev -> main) and merge with --no-ff.
-# After merge, tag from the new main tip:
-git checkout main
-git pull --ff-only origin main
-git tag android-v0.6.2
-git push origin android-v0.6.2
 ```

-Pushing a tag matching `android-v*` triggers `.github/workflows/release-android.yml`,
-which builds, signs, checksums, and creates a GitHub Release. Watch the
-run under the **Actions** tab.
+Then open **Actions → Approve Android Release**, choose **Run workflow**, select
+`main`, enter the version, and check the Play-results confirmation box. The
+approval workflow verifies that `main` has the exact preflighted tree and creates
+the `android-v<version>` tag. Manual stable tags are still guarded by the same
+preflight proof in the tag workflow.
+
+The tag-triggered `.github/workflows/release-android.yml` rebuilds and scans the
+artifacts, changes the existing Play Production draft to `completed` (submitting
+it for review), and only after Play accepts that operation creates the public
+GitHub Release with the sideload APK. A missing preflight, changed release tree,
+missing Play credential, or Play submission failure prevents public GitHub
+publication.

 Plugin/Python version files are intentionally not part of an Android app
 release unless the plugin package itself is also being released.
@@ -553,21 +586,24 @@ touches more than one release surface. The workflow also runs plugin tests,
 builds a wheel and sdist, generates `SHA256SUMS.txt`, and creates a GitHub
 Release named `Hermes-Relay-Plugin v<version>` for the plugin package.

-### 5. Upload to Play Console
+### 6. Play review and publishing behavior

-> **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).
+> **Stable Android releases require `PLAY_SERVICE_ACCOUNT_JSON`.** Preflight
+> uploads the Production draft; approval promotes that same version code to
+> `completed`. Stable releases no longer fall back to publishing GitHub first
+> when Play credentials or submission are unavailable.
 >
-> This automated tag path is intentionally bundle-only. It uploads the
+> This automated 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.

+If Play Console **Managed publishing** is enabled, an approved submission remains
+under **Changes ready to publish** until a Play Console user publishes it. If it
+is disabled, the production submission may become available after Google review.
+Either behavior begins only after the public-release approval described above.
+
 **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:
@@ -614,7 +650,7 @@ 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)
+### 7. Tracks (a menu, not a mandatory ladder)

 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
@@ -633,7 +669,7 @@ the Play Console UI or:
 gradlew promoteReleaseArtifact --from-track=internal --promote-track=production
 ```

-### 7. After release
+### 8. After release

 - Verify the GitHub Release has APK, AAB, and `SHA256SUMS.txt` attached.
 - Confirm the release body includes the **Download** section that tells
@@ -1,43 +1,47 @@
-# Hermes-Relay-Android v1.3.0
+# Hermes-Relay-Android v1.4.3

-**Release Date:** July 6, 2026
-**Since v1.2.6:** Realtime voice grows up — long tasks hand off to the background with a live progress chip while you keep talking, results survive disconnects (and arrive as a notification if you've left), and leaving voice mode no longer cancels a running task. Chats stop losing answers when the connection drops mid-reply, your agent can message you first (opt-in) with replies straight from the notification, and a stack of polish landed: app font picker, proportionate markdown, scrollable onboarding, smarter diagnostics reporting, and a cleaner Connections screen.
+**Release Date:** July 11, 2026

-v1.3.0 is recommended for everyone. Realtime-voice background tasks pair best with relay plugin v1.3.0 on the server; the no-plugin (vanilla Hermes) path is unaffected.
+**Since v1.4.2:** The app language can now be changed directly from Settings → Appearance. Choose System default, English, or Simplified Chinese without leaving Hermes-Relay.
+
+v1.4.3 is recommended for multilingual users. The picker stays synchronized with Android's per-app language setting and persists the choice on Android 12 and lower. This Android-only patch does not require a relay plugin update.
+
+Release packaging now also rejects Java 21 list endpoint calls that are unavailable before Android API 35, covering both first-party Kotlin and bundled dependency bytecode.

 ---

 ## Download

-**Installing on your phone?** Download **`hermes-relay-1.3.0-sideload-release.apk`** and tap it — that's the direct-install build with the full feature set (installs as `com.axiomlabs.hermesrelay.sideload`). Prefer the conservative build (no Device Control surface)? Get it from [Google Play](https://play.google.com/store/apps/details?id=com.axiomlabs.hermesrelay).
+**Installing on your phone?** Download hermes-relay-1.4.3-sideload-release.apk and tap it — that's the direct-install build with the full feature set (installs as com.axiomlabs.hermesrelay.sideload). Prefer the conservative build (no Device Control surface)? Get it from [Google Play](https://play.google.com/store/apps/details?id=com.axiomlabs.hermesrelay).

-The other file, `hermes-relay-1.3.0-googlePlay-release.aab`, is an Android App Bundle for uploading to Play Console — it **cannot** be installed by tapping it on a phone.
+The other file, hermes-relay-1.4.3-googlePlay-release.aab, is an Android App Bundle for uploading to Play Console — it **cannot** be installed by tapping it on a phone.

-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.
+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

-### Voice, hands-free
- **Background tasks with a live chip.** Ask for something big and keep talking — the task hands off to the background with a chip showing the current step, steps done, and a running timer, plus a ✕ to cancel. The answer is spoken when it's ready, even after a brief disconnect; if the voice session is gone for good, it arrives as a notification (the full answer is always in the chat).
- **Exit detaches, ✕ cancels.** Leaving voice mode or tapping stop no longer kills a running task or overwrites its delivered answer with "Cancelled." — the chip's ✕ is the one deliberate kill switch.
- **Quieter and quicker.** Milestone speech instead of step-by-step narration, immediate handoff for clearly long tools, and a faster first turn (the session warms up when you open voice mode).
+### Change language without leaving the app

-### Chats
- **Answers survive dropped connections.** On long turns (slow local models, delegating skills) the app now recovers the finished answer from the server instead of hanging on "Still working…". (#166)
- **Proactive messages, two-way.** Your agent can message your phone first (off by default, opt-in on server and phone) and you can reply from the notification or the Hermes inbox.
- **Markdown that reads like chat.** Proportionate headings, unified text sizes, styled links, per-group timestamps.
+- **Pick the app language in Appearance.** System default, English, and 简体中文 are available in a wrapping, accessible selector.
+- **Stay synchronized with Android.** A selection made in Hermes-Relay appears in Android's per-app language setting, and a system-side selection is reflected in the app.
+- **Keep older devices supported.** AppCompat stores and restores the language choice on Android 12 and lower.

-### Polish
- **Pick your font** (Inter, Nunito, or system) and an animated thinking indicator; Quick Controls at the top of Settings.
- **Onboarding fits every screen** — slides scroll on short viewports and large font sizes. (#145)
- **Smarter diagnostics reporting** — informational entries file as questions with your actual connection mode, not as empty bug reports.
- **Connections redesign** — scannable list + tabbed detail (Overview / Routes / Advanced / Security); server voice-engine settings editable from the app.
+### Built for the existing localization system
+
+- The picker reads the same English and Simplified Chinese catalogs introduced in 1.4.2.
+- Future locales use the same explicit registry: add the catalog, locale-configuration entry, picker label, and tag-resolution test.
+
+### Safer Android compatibility checks
+
+- Kotlin source checks reject `removeFirst()` and `removeLast()` list calls in favor of explicit indexed removal.
+- Release CI scans the final minified APK DEX, catching incompatible calls introduced by transitive dependencies or build-tool changes.

 ---

 ## Upgrade notes
- App-side release on **both** flavors. Realtime-voice background-task features need relay plugin **v1.3.0** on the server; everything else works on unmodified upstream Hermes.
- `appVersionCode` is **21**.
- Releases now attach **two** files (sideload APK + Play bundle) instead of four — the parity/testing artifacts are gone from the release page. (#144)
+
+- App version: **1.4.3** (versionCode **25**).
+- No relay plugin update is required for localization support.
+- Standard Chat and Vanilla Hermes voice continue to work against unmodified upstream Hermes.
@@ -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).** 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 and statefulness lives on `/api/sessions/*`.

 ## Future — v0.5+

@@ -6,21 +6,405 @@ For shipped work, see `DEVLOG.md`. For architectural decisions, see `docs/decisi

 ---

+## Active — 1.4.1 release verification (2026-07-10)
+
+Implementation plan: `docs/plans/2026-07-09-1.4.1-chat-voice-enhancements.md`.
+Android 1.4.0 / versionCode 22 and plugin 1.4.0 were published on 2026-07-09.
+The 1.4.1 Chat and Voice waves are code-complete and merged into local `dev` for
+device validation. Version bumps, public release artifacts, push, tags, production
+deployment, and store upload remain separate owner-controlled steps.
+
+Before release preparation, keep these owner/device gates explicit:
+
+- Repeat the exact record → background/route loss → foreground reproduction on the
+  newly installed debug APK; no `Listening...` / `Still working...` row may strand.
+- Recheck long-run tool ordering, the screen wake lock, output waveform timing,
+  final-syllable tail, and the reported PCM tap/static between sentences.
+- Exercise the 1.4.1 Chat surfaces: streaming reflow, wide-table overflow, gallery
+  paging/zoom/sensitive actions, unread tracking, Demo mic gate, and task-card lifecycle.
+- Re-run an ordinary Chat background process through the Gateway: the current-chat
+  process strip/sheet must show running state, live or snapshot output, exact Stop,
+  recent completion and Dismiss; the synthetic completion must render as a process
+  notice, its unsolicited assistant follow-up must appear without another prompt,
+  and both must survive a socket-close/foreground history refresh without crossing
+  into a different session or profile. Backgrounding with keep-alive disabled must
+  also let the Gateway socket close normally instead of polling it back open.
+- Start a long Standard Chat turn, wait for visible reasoning plus at least one
+  running tool card, then background/force-stop/reopen the app. The same session
+  must restore its partial answer, thinking/status line, tool state, and any live
+  approval card; new deltas must continue without a duplicate prompt, and a turn
+  that finished while offline must settle from history instead of staying busy.
+- Exercise commands and presets on Standard and Realtime Voice, including ordinary
+  prompts that resemble commands, explicit stop-vs-cancel behavior, Custom detection,
+  and preservation of route/provider/model/voice/concurrency/barge-in choices.
+- Repeat the Tink encrypted-session smoke: pair → force-stop → relaunch; the session
+  must persist without an encrypted-preferences startup crash.
+- Run release preparation separately: 1.4.1 versioning and public release artifacts,
+  then owner-controlled `dev` → `main` merge, tag, production deployment, and upload.
+- Complete the owner/Mizu GitHub triage batch, including closing #64 as superseded.
+
+---
+
+## Voice background-tasks — live findings + UX vision (2026-07-09 e2e realtime test)
+
+Live on-device e2e (relay through `8ebb21b`, app `1.4.0-sideload` build 22, provider
+`xai_realtime`). The delivery-report tooling from `5ff78da` was confirmed working
+against live data during this test.
+
+### Findings
+- **Background route loss could strand a recorded turn — FIXED IN CODE; EXTENDED LIVE STRESS TEST DEFERRED (2026-07-09).** Initial logs showed valid PCM accepted by the persistent turn channel after foregrounding, but the socket had failed during background route retries and no new relay event arrived. The first fixed APK restored submission and let the background Hermes run finish, then exposed the delivery race: a slower overlapping resume handshake connected 250 ms after the valid resume, claimed relay ownership before the Android generation check, and detached the session just before the forced answer. The second installed reproduction completed the run and delivered its notification fallback, but voice stayed on `Waiting for route`: the periodic retry deadline had been created when the session was prewarmed, so its coroutine had already expired after five minutes of healthy uptime. Exiting voice mode also retained the session-owned `RECONNECTING` run; reopening rendered that orphaned pill and its close action targeted the new session instead of the detached task. Android now coalesces pending handshakes, waits for a relay-confirmed resumed socket, retains unacknowledged chunks for atomic replay, and returns a per-turn delivery result. Its retry worker lives for the session, starts a fresh bounded budget only when a route is lost, and clears that budget only after `voice.session.resumed`; bare WebSocket opens cannot reset it. Voice sessions carry a generation fence so late handoff, run, playback, and completion callbacks cannot repopulate or act on a newer session. Voice exit atomically drops detached handoff/run/confirmation UI before another session can prewarm; offline cancel rejection dismisses immediately, and a queued cancel without acknowledgement dismisses after a bounded wait. The relay requires a valid resume claim before changing ownership and isolates invalid/stale candidate failures from the active phone socket. Provider STT stays in `Transcribing` unless `VoiceRecorder.isRecording()` is true; Stop/failure settles local placeholders, late terminal deltas are ignored, and stale capture state is reconciled on resume. Route, promotion, ownership, UI-state, and chat-terminal regressions are green. The current APK is installed; repeated long-idle, background/foreground, route-churn, and terminal-exhaustion coverage remains a post-release follow-up and may drive further hardening.
+- **Model-generated exact delivery is inconsistent and deferral is model-agnostic; xAI now has a deterministic path.**
+  A background turn ("what do you
+  think about our notes so far?") delivered `forced_summary_streaming`
+  (provider-voiced, early-commit) — grok read the answer in its own voice and
+  passed validation. BUT the same session's earlier turn ("check Hermes for what
+  we know about Minnesota") fell back to relay TTS (`acknowledgement_not_summary`).
+  A later forced-summary round on `grok-voice-think-fast-1.0` also spoke a genuine
+  deferral ("one moment ... I'll let you know") rather than the completed answer.
+  Validator fallback is therefore correct; model choice alone does not solve the
+  delivery-voice problem. xAI's provider-native `force_message` now handles
+  non-structured Exact deliveries without model inference. Its raw live event
+  stream and the full Android background path are verified; a recall follow-up
+  also answered from that provider history without re-running Hermes.
+- **think-fast selection bug fixed + live-verified.** The app's session POST omitted
+  model/voice, so the settings dropdown was only a transient server-config editor
+  until **Save realtime agent** was tapped. Model/voice now persist per
+  connection/profile and ride every new session. On-device verification selected
+  think-fast without Save, saw the relay request it and the provider's final
+  resolution report it, then force-stop/relaunch restored the selection.
+- **Duplicate "background task is running" — FIXED + LIVE-VERIFIED (2026-07-09).** The signoff trace captured both lines and disproved the suspected TTS mismatch: the provider first said it would check Hermes, then the broker requested a second provider response after promotion. Promotion now suppresses that second handoff when the original tool-calling response already emitted audio; silent calls still get one handoff. A deployed on-device round recorded `provider_acknowledged: true` and `spoken_handoff: false`, with only the original acknowledgement spoken. The same round confirmed the forced delivery emits one client response-start event after deduplicating xAI's `response.created` + `response.output_item.added` pair.
+- **Status-speech logging gap — CLOSED / premise disproved (2026-07-09).** The raw signoff log contains both provider utterances as `voice.response.delta` text, plus the progress events; relay TTS did not speak either line. The flight recorder can reconstruct what the user heard. The real defect was redundant provider response generation, fixed above.
+
+### Background-tasks-as-first-class-chat vision (owner ask 2026-07-09)
+Theme: stop treating a background run as an ephemeral voice-only side effect —
+surface it in chat like any other turn and keep its result. Overlaps the "Voice
+background-run v2" chip roadmap below (items 3/4/7) but reframed around
+chat/history rather than the voice chip; unify rather than build twice.
+- **First-class Chat task turn — CODE-COMPLETE for 1.4.1; device verification
+  remains.** Promotion attaches a short objective title and running state to
+  the existing assistant row; progress, queued count, waiting/delivery, completion,
+  failure, cancellation, answer text, and expandable tool detail settle that same
+  identity. The authoritative answer persists in normal session history. The new
+  in-flight Chat checkpoint preserves client-only task-card metadata while a turn is
+  still running across a cold app restart. Metadata for an already-completed task is
+  still absent from the server history schema after the checkpoint is cleared; keep
+  that terminal-history case as a separate durability decision.
+- **Realtime agent retains background-result context in-session — FALLBACK PATH
+  DONE + SEEDING LIVE-VERIFIED (2026-07-09); NO-RERUN VERIFY PENDING.** On a FALLBACK delivery the broker now
+  seeds the delivered answer into the provider's history as an assistant turn
+  (`append_context_item` → silent `conversation.item.create`, no `response.create`),
+  so a follow-up ("what did that say?", "expand on that") finds it durably — fixing
+  the live "can't you see we ran the task?" failure; live follow-up confirmed the
+  provider knew the delivered context. Provider-VOICED success already
+  had its own turn in history, so it's untouched (no double-record). **Remaining:**
+  (a) live on-device verify that a pure-recall post-fallback follow-up is answered
+  without a re-run after the `92f9683` instruction fix; (b) the detached/promoted delivery (`_deliver_pending_background_result`)
+  and the DONE-chip respeak weren't in scope — confirm whether they leave the same
+  gap; (c) decide if the one-shot `native_pending_delivery_note` is now redundant
+  with durable seeding or still earns its keep as an explicit correction.
+- **Proper concurrent multi-task.** True N-way parallel background runs — see v2
+  item 7 (deferred: needs session-per-run topology, run-id-targeted cancel,
+  multi-run chip/list). Owner is now explicitly asking for it; re-rank against the
+  queue rather than leaving deferred.
+
+---
+
+## Voice background-run A–E enhancement batch — SHIPPED in code (2026-07-08 PM)
+
+Owner-approved full batch from the gap review; relay 93/93 realtime tests
+green. Needs relay deploy + APK install + live verify.
+
+- **A1 — positive summary validation + early-flush streaming.** The forced
+  summary must content-overlap the Hermes answer (`_summary_overlaps_answer`;
+  vacuous for bare confirmations) — blocklists chase phrasings, overlap
+  doesn't. And the summary response now STREAMS: buffered only until the
+  prefix (≥40 chars) clears the blocklist + shows answer overlap
+  (`_maybe_commit_forced_summary_early`), then flushes and streams live —
+  kills the observed "silence, then the whole answer in one burst" delay.
+  Uncommitted responses still get full end-of-response validation.
+- **A2 — delivered-or-alarm.** `_confirm_background_delivery`: within 30s of
+  injection the summary must be done or committed-streaming, else
+  `delivery_unconfirmed` is logged and the answer is force-emitted as text.
+  A background answer can no longer be silently lost.
+- **A3 — respeak.** `hermes.result.respeak` client message → relay respeaks
+  `last_background_result` via relay TTS. Client: tapping the settled (DONE)
+  chip requests it; chip stays up while it plays.
+- **B — task queue (+N queued).** A long second ask is queued (FIFO, cap 3)
+  instead of refused (`status: "queued"`); starts automatically when the
+  current run's delivery settles (`_start_next_queued_run`, waits for the
+  summary, runs as durable, spoken transition via `_queued_start_prompt`).
+  Cancel clears the queue. `hermes.run.queued` event + `queued_count` on
+  promoted/background_completed/get_status; chip shows "+N queued". Queue
+  full → the old busy answer.
+- **C1 — chip in compact mode.** The chip previously rendered ONLY in the
+  focus layout; compact mode now shows it above the bottom controls
+  (`bottom = 120.dp` — eyeball on device).
+- **C2 — exit breadcrumb.** Exiting voice mode with a live background run
+  posts a chat system notice ("Background voice task still running (+N
+  queued) — Hermes will report back") via `VoiceViewModel.chatNoticeSink`
+  (wired in RelayApp to the shared ChatHandler).
+- **D — `_thinking` drafting signal + answer redundancy.** Relay: the
+  drafted `_thinking` text is the answer of last resort when the
+  response-delta path yields empty (`answer_from_thinking` log). Client:
+  `_thinking` deltas drive a "Drafting the answer…" chip status line.
+- **E — hygiene.** Fast lane reuses ONE side-session per voice session
+  (`fast_lane_session_id`); the idle probe now injects the relay xAI OAuth
+  token (`_probe_provider_options`) so it actually runs on the relay host;
+  new e2e test where the provider answers the summary request with filler →
+  fallback must carry the real answer
+  (`test_filler_summary_triggers_fallback_delivery`).
+- **Live verify list:** summary starts speaking promptly (streaming, no
+  burst); filler → fallback speaks the answer; queue: two long asks →
+  "queued" spoken + "+1 queued" on chip → auto-starts with spoken
+  transition; DONE-chip tap respeaks; compact-mode chip visible; exit
+  leaves the chat breadcrumb; probe run completes (repro + keepalive).
+- **VERIFIED LIVE (rounds 3–4, 2026-07-08 PM):** queue flow end-to-end
+  (queued ack → auto-start → both answers), chip +1-queued/finished states,
+  fallback delivery + audibility (user's own follow-up confirmed), and two
+  new gaps found + fixed same-day (see DEVLOG: whole-word/2-hit validation,
+  next-turn delivery note).
+- **KEEPALIVE FINAL VERDICT — no protocol message resets xAI's 900s timer
+  (empirical 2026-07-08, 4 probe runs).** Repro died at 900.0s; silent-PCM
+  pings died at 900.0s; server-ACKNOWLEDGED `session.update` pings
+  (240/480/720s) died at 900.0s. The timer counts only real conversation
+  items. **SHIPPED IN CODE (2026-07-08 PM):** picked design (b): treat
+  idle-close as routine, close the Android websocket cleanly while idle,
+  and let the next user turn open a fresh provider conversation seeded
+  from the synced Hermes session. `_provider_keepalive_loop` is retired.
+  **Remaining:** relay deploy + live >15 min idle probe to verify silent
+  next-turn recovery on device.
+- **Delivery input-quiet gate — SHIPPED (2026-07-08 PM, round-5 finding).**
+  A background task finishing while the user was mid-utterance delivered
+  over them and ended their recording. The relay now knows the user is
+  speaking (live `input_audio.append` chunks stamp
+  `native_last_input_audio_at`) and `_await_floor_idle_for_result` holds
+  delivery until they've been quiet ≥1.5s (bounded by the existing floor
+  timeout). Covers summary/fallback/queued-transition. **Client half shipped:**
+  `VoiceViewModel` suppresses realtime response/audio/done only while
+  `VoiceRecorder.isRecording()` is actually true. Provider STT uses
+  `Transcribing`, not the capture-owned `Listening` state, so a partial
+  transcript cannot wedge the mic controls or suppress its own response.
+- **Audio tail cut at end of response (round-5 repro) — MITIGATED IN CODE.**
+  Final word ("you?") cut hard instead of finishing smoothly. The client
+  output resume tail guard is raised from 350ms to 650ms so the final
+  buffered PCM has more time to drain before capture resumes. **Remaining:**
+  verify on device; if the final syllable still snaps, inspect
+  `RealtimePcmPlayer` drain/fade-out behavior.
+- **Fallback speech says file paths (round-5 polish) — FIXED IN CODE.**
+  The fallback spoke "Source: 1. Personal/Household/Househol…"; TTS-safe
+  answer extraction now strips `Source:` / `Sources:` / citation lines and
+  source-list path lines before relay TTS.
+- **grok-voice fails the delivery instruction ~always (4/4 live rounds) —
+  DEFAULT CHANGED, then REWORKED same-day.** Every observed forced summary
+  was deferral filler; the validator+fallback carried every delivery.
+  `speak_verbatim` was first made a direct relay-TTS default, then reworked
+  to provider-voiced exact delivery (below) to keep voice continuity.
+- **Provider-voiced exact delivery — xAI direct path live-verified.**
+  Model-generated word-for-word instructions were not reliable. Non-structured
+  `speak_verbatim` now supplies the authoritative answer to xAI's `force_message`,
+  which synthesizes it in the selected realtime voice without inference and
+  records a normal assistant turn. A raw live probe confirmed the full transcript,
+  audio, history, and completion lifecycle. Structured results and summary modes
+  remain model-generated; relay TTS remains the validator fallback. The on-device
+  background path produced a clean `forced_summary_streaming` event and recall
+  reused the resulting provider history without another Hermes run.
+  **1.4.1 post-audit hardening is code-complete:** foreground Hermes results now
+  enter the same validation/confirmation lifecycle, non-structured Exact delivery
+  passes authoritative text to provider-native forced speech where supported,
+  structured answers keep instruction-driven routing, an answer equal to a short
+  acknowledgement is not falsely blocked, and provider tool-result/response-request
+  failure emits exactly one authoritative fallback before its terminal error. Live
+  verify foreground delivery and provider-failure fallback. Barge-in preemption as
+  durable visible text remains open.
+- **Audit leftovers (deliberate, small).** (1) DONE-chip respeak always
+  renders via relay TTS — intentional determinism, but it voice-mismatches
+  the exact mode's promise; candidate: provider-voiced respeak with TTS
+  fallback. (2) Exact-mode answers >1400 chars are truncated with an
+  appended "…" (and machine-looking text gets "…" even under the cap) —
+  silent for a mode promising completeness; consider a visual "full answer
+  in chat" cue on truncation.
+
+## Voice observability (2026-07-08 assessment) — pre-RC hardening
+
+The realtime flight recorder (per-session JSONL under
+`realtime-agent-runs/`, decision-point events with reasons, task-failure
+wrappers, Android `DiagnosticsLog` Voice category) is in good shape — it
+carried every live-round forensics session. Three gaps before the release
+candidate:
+
+- **Buffered flight-recorder writes (minor).** `_log` open/appends per
+  event on the event loop, including one line per audio chunk. Fine so
+  far; switch to a buffered writer if voice sessions ever stutter under
+  load — measure before optimizing.
+
+## OpenAI realtime provider — next-RC roadmap (2026-07-08 research)
+
+Full findings with sources in
+`docs/plans/2026-07-08-openai-realtime-notes.md`. Headline: the OpenAI
+provider already exists and is broker-wired
+(`plugin/relay/realtime_agent/providers/openai.py`) but has never had a
+recorded live round. The default is already updated to `gpt-realtime-2.1`.
+Key provider contrasts vs
+xAI: hard 60-min wall-clock session cap (not an inactivity timer),
+out-of-band responses (`conversation:"none"` + explicit `input`), async
+function calls, per-token pricing (2.1 audio $32/$64 per 1M; mini $10/$20)
+vs grok's flat $0.05/min.
+
+- **Live-verify the OpenAI provider end-to-end.** Code-complete but no
+  recorded live round (all forensics are grok-voice). Run the xAI
+  on-device battery (pair → voice turn → `hermes_run_task` →
+  exact-delivery → queue → respeak) on 2.1. Success bar: a
+  `realtime-agent-runs/` log shows a clean OpenAI session reproducing the
+  flows with provider-voiced Hermes delivery.
+- **Handle OpenAI's 60-min hard cap.** Distinct failure mode from xAI's
+  900s inactivity close — it can cut an ACTIVE session. First confirm how
+  a cap-close currently surfaces (idle-close handling is xAI-shaped, e.g.
+  `_PROVIDER_IDLE_CLOSE_WS_REASON`), then add wall-clock-aware proactive
+  reconnect/reseed. Success bar: a >60-min OpenAI session survives the
+  cap with a proactive reseed, no user-visible break.
+- **Spike out-of-band exact delivery on OpenAI
+  (`conversation:"none"` + answer as `input`).** Supply the Hermes answer
+  as explicit input context instead of an instructions injection the
+  model may ignore. Success bar: measurably lower deferral/filler rate
+  than grok forced-summary in repeated live deliveries, demoting the
+  validator to a safety net.
+- **Async function-call delivery on OpenAI.** OpenAI GA allows the
+  session to continue while a function call is pending — a promoted
+  `hermes_run_task` could complete with a real late
+  `function_call_output` instead of interim-ack + synthetic
+  instructions, retiring `native_pending_delivery_note`. Success bar:
+  provider history reads "done" (never "still running") after a promoted
+  run, verified live.
+- **(Defer/eval-only) provider `semantic_vad` vs relay-owned floor.**
+  Better turn-taking naturalness but moves barge-in ownership off
+  `RealtimeFloor` — re-architecture, not RC scope.
+
+## xAI voice platform moved (2026-07) — re-baseline items
+
+xAI shipped `grok-voice-think-fast-1.0` (reasoning voice model, built for
+tool-calling precision) as the new flagship; `grok-voice-fast-1.0` is
+deprecated and the `grok-voice-latest` ALIAS NOW RESOLVES TO THINK-FAST.
+We default to the alias everywhere (`config.py:106`,
+`providers/xai.py:31`), so the live model may have changed under us —
+xAI's docs explicitly say to pin versioned models in production. The current
+platform documents five built-in expressive voices, 20+ spoken languages,
+speech tags, custom voice IDs, session resumption, and a
+`turn_detection.idle_timeout_ms` re-engagement knob.
+
+- **Decide pin-vs-alias, then re-baseline the live delivery rounds.** The
+  4/4 deferral-filler verdicts may predate the alias flip — a reasoning
+  voice model may comply with the exact-reading instruction where fast-1.0
+  didn't. Resolved-model logging is DONE (2026-07-08):
+  `provider_model_resolved` records the session.created echo, the delivery
+  report prefers it, and `grok-voice-think-fast-1.0` is a selectable pin.
+  Remaining: run the live rounds, read the resolved ids, and decide
+  pin-vs-alias for production. Success bar: we know which model each live
+  round actually ran on, and the default is a deliberate choice.
+- **Re-probe session lifecycle on think-fast.** The 900s
+  conversation-inactivity close and the keepalive-negative verdict were
+  measured pre-think-fast; xAI now documents session resumption and
+  `idle_timeout_ms`. Re-run `scripts/realtime-provider-idle-probe.py`;
+  if resumption is real, the idle-close-and-reseed handling can become
+  reconnect-and-resume. Success bar: fresh empirical timeout/resume
+  verdicts recorded in the POC doc.
+- **xAI voice catalog + speech-tag UX are code-current; live verify only.** Dynamic
+  discovery uses xAI's paginated `/tts/voices` surface when auth is available; the
+  unauthenticated fallback matches the documented built-ins (`eve`, `ara`, `rex`,
+  `sal`, `leo`; verified 2026-07-09). Voice Settings and Voice Output already expose
+  the enhanced contract's expressive speech-tag toggle. Exercise both surfaces with
+  a live xAI relay before release.
+
+## Voice — on-device findings (2026-07-08 e2e realtime test)
+
+Live e2e test (phone on 1.4.0 dev APK, relay at `789f32c`) surfaced a chained
+failure — full forensics from the session event log
+(`realtime-agent-20260708-122613`). **All five fixes below are in code
+(2026-07-08 PM); need relay redeploy + app rebuild + a repeat of the same
+test.**
+
+- **Stuck "Thinking" pill (root of the chain) — FIXED.** The gateway streams
+  drafting text as a `_thinking` pseudo-tool (`hermes.tool.delta` only, never
+  `tool.completed`), and `ChatViewModel.applyRealtimeAgentEvent` created a
+  ToolCall pill from the first delta of ANY tool name → a pill that spins
+  "running" forever (chat + voice overlay transcript). Fix: `_`-prefixed tool
+  names are internal (upstream's own hidden-tool convention) — never become
+  pills; their text still feeds the detailed thinking trace. Defensive same
+  guard on `hermes.tool.started`.
+- **Cancel on an already-finished run killed the delivered answer — FIXED
+  (relay).** `response.cancel` unconditionally flipped `hermes_run_status` to
+  "cancelled" and emitted `hermes.run.cancelled` even with no run in flight
+  (observed: user cancelled 10s after completion — invited by the stuck pill —
+  and the Tokyo answer was never spoken). Now the Hermes-run half of cancel
+  only fires when a run is actually active; speech-stop always happens.
+- **Model read the 32-char run ID aloud — FIXED (relay).** The interim ack
+  and the forced-summary prompt both handed the model `run_id`
+  (payload/metadata). Removed everywhere model-visible (get_status/cancel
+  default to the active run; the client gets ids via events) + explicit
+  "never say run/session IDs aloud" in all three instruction sites.
+- **Delivery spoke deferral filler instead of the answer — FIXED (relay).**
+  The forced-summary validator caught run-id speech (that saved the Minnesota
+  answer via fallback) but not "One moment while I look that up. I'll report
+  back as soon as I have the info." — Tokyo's answer was lost behind that
+  filler. Added deferral phrases (one moment / report back / looking into /
+  i'll look / as soon as i have) to `_bad_forced_summary_reason`; summary
+  prompt reworded to "speak the answer NOW". Tests:
+  `plugin/tests/test_realtime_summary_validation.py` (5) + updated cancel
+  route test; realtime batch 69/69 green.
+- **Stale pre-lead — FIXED (relay).** A new run's "I'll check Hermes"
+  progress event carried the PREVIOUS run's run_id + completed_tool_count
+  (fires before the per-run reset). Now sends null/zero identity when no run
+  is in flight; keeps the active run's identity during a fast-lane attempt.
+- **Background-run chip vanished the instant the waveform came back — FIXED
+  (client, second finding same day).** The chip was nulled at the first
+  summary-audio byte ("the DELIVERING chip has done its job"), so it
+  disappeared exactly when speech started — reading as the task being lost.
+  New `BackgroundRunPhase.DONE`: on first summary audio (or the 20s
+  no-audio watchdog) the chip settles to "Background task finished." — solid
+  dot, frozen ticker — lingers 10s (`DONE_CHIP_LINGER_MS`), then
+  auto-dismisses; ✕ on a DONE chip is a local dismiss (never a cancel); a
+  new promoted run replaces a lingering DONE chip and cancels its timer;
+  progress/tool/reconnect handlers can't reanimate a settled chip. Verify:
+  chip visibly settles + lingers while the answer is being spoken, ✕ during
+  DONE doesn't emit a relay cancel.
+
+## Voice — on-device findings (2026-07-07 realtime test)
+
+Surfaced during a live realtime-voice test with a long, many-tool-call background run. (The duplicate-error-toast + no-dismiss issue from the same test shipped this session — see DEVLOG 2026-07-07.)
+
+- **Tool-call status pills stuck / ordering wrong — FIXED, needs on-device re-verify (2026-07-07).** After the recent background-run-chip work (`8dc874c`/`9554c7c`), the owner found on-device that the "Thinking" indicator can get stuck and that the relative order of tool-call pills vs. the agent's reply doesn't cleanly track what actually happened. Root cause was narrower than first suspected — `VoiceUiState.responseText` is write-only for the realtime path (nothing renders it), so the actual stuck surface was the `BackgroundRunChip`: no `hermes.tool.completed`/`hermes.tool.failed` branch in `VoiceViewModel`'s event handler meant a finished tool's `statusLine` stayed pinned at `phase=RUNNING` until the next unrelated event overwrote it. Fixed (`VoiceViewModel.kt:2619`): clears the finished tool's status line, advances `completedToolCount`, leaves `DELIVERING` alone. The ordering half was `CompactTranscriptRow` (`VoiceModeOverlay.kt`) rendering reply text above the tool rows that produced it — reordered to tool-rows-first (chronological). The per-message `ToolCall` transcript rows were already correct (untouched). `:app:compileSideloadDebugKotlin` green. **Needs on-device re-verify** (long multi-tool background run: chip never shows a stale finished-tool name; reply reads below its tool calls, not above) before the release resumes.
+- **Tap/static click between sentences (realtime PCM playback) — NEEDS on-device audio investigation.** Suspected discontinuity at TTS chunk/sentence boundaries in `RealtimePcmPlayer` (a buffer underrun between segments, or a pop when a new segment's `AudioTrack` write starts). Capture head-position / underrun logs during a multi-sentence reply to confirm before touching the buffer sizing or adding a boundary crossfade/fade. Related to the existing "Realtime-PCM waveform output gating" note.
+- **Screen-wake-lock for chat/voice — SHIPPED (2026-07-07).** The app previously relied entirely on the OS screen-timeout during both chat and voice mode. Added `KeepScreenOnWhile(enabled)` (`ui/components/OrientationOverride.kt`, `Window.FLAG_KEEP_SCREEN_ON` via `DisposableEffect` — the same Android-recommended visible-surface mechanism `power/WakeLockManager.kt`'s doc comment already pointed at for a background/no-window case), wired at the `ChatScreen` root as a single call site: `enabled = voiceUiState.voiceMode || isStreaming`. Rationale (matches other apps): voice mode is a call-like continuous session (Assistant/phone-call convention) so it holds the flag for the whole time the overlay is open, regardless of Idle/Listening/Thinking/Speaking sub-state; chat only holds it while a reply is actively streaming (video-playback convention) — idle reading/scrolling falls back to the OS default, matching WhatsApp/Telegram/Signal norms rather than pinning the screen on for a static transcript. Deliberately a single owner of the window flag (not ref-counted) — see the function's doc comment before adding a second caller. **Needs on-device confirmation**: screen stays on for the whole voice session incl. silent gaps, screen stays on only during active streaming in chat (not while idle), and the flag is correctly released on exiting voice mode / when a stream ends.
+
 ## Voice background-run v2 (2026-07-06 roadmap — post plugin-v1.3.0)

 The v1 shape shipped in plugin-v1.3.0 (single durable run, free floor during
 background work, busy answer, deliver-on-reattach, exit-detaches / chip-✕-
 cancels). Ranked next increments, in value-per-complexity order:

-1. **Fast lane** — while one durable run is detached, allow a second
-   `hermes_run_task` *inline only*: run it on a separate ephemeral session
-   (context injected the same way turns pass `realtimeAgentContextMessages`),
-   normal grace window; if it would promote, fall through to the busy/queue
-   answer. Fixes the real gap: today ANY second Hermes-backed request is
-   refused during a background run, even a 2-second lookup.
-2. **Task queue** — upgrade the busy answer from refusal to offer ("want me
-   to queue it?"): small FIFO in the broker session, start-next-on-completion
-   with a spoken handoff, chip shows "+1 queued". Pairs with (1).
+1. **Fast lane — SHIPPED in code (2026-07-08; needs relay deploy + live voice
+   verify).** `_run_fast_lane_task` in `broker.py`: while a detached
+   (promoted/durable) run holds the background slot, a second
+   `hermes_run_task` first runs INLINE on a separate ephemeral Hermes session
+   (`session_id=None`) within the normal grace window; grace-elapse, a
+   known-long tool start (`_long_tool_hints`), explicit `mode=background`, or
+   promotion-off all abandon it and fall through to the (reworded) busy
+   answer. Touches NONE of the session's `hermes_*` run state — run_id/
+   status/progress/chip stay owned by the in-flight run — and emits no client
+   events of its own (bounded by grace; a chip would fight the detached
+   run's). Events: `voice.hermes_fast_lane.completed/abandoned/error` in the
+   session log. Tests: `plugin/tests/test_realtime_fast_lane.py` (7) +
+   updated `test_second_run_task_answers_busy_without_orphaning_first`
+   (per-stream cancellation tracking). **Residuals:** (a) context injection —
+   the ephemeral session gets only the task text + interface context, not
+   rolling conversation context (broker keeps no per-turn transcript; the
+   model is instructed to pass self-contained task text); (b) an abandoned
+   attempt may still finish server-side into the ephemeral session
+   (at-least-once, unread) — same property as promotion; (c) live verify:
+   during a long background run, ask a quick second question → answered
+   inline; ask a second long thing → busy answer unchanged.
+2. **Task queue — SHIPPED + LIVE-VERIFIED (2026-07-08).** FIFO cap 3,
+   start-next-on-completion, spoken transition, cancel-clears-queue, and the
+   `+N queued` chip all landed in the A-E batch above.
 3. **Chip tap-through to the transcript** — the run executes on a real
   gateway session, so full tool calls/outputs already live in that session's
   history; make the chip (or the finished turn) open it. Cheapest "see tool
@@ -33,9 +417,9 @@ cancels). Ranked next increments, in value-per-complexity order:
   native async function calling, leave the tool call pending and deliver the
   real `function_call_output` late instead of interim-ack + synthetic
   instruction text. Needs a live xAI parity check first.
-6. **Pending-result FIFO** — `pending_background_result` is a single slot
-   (correct for one run); generalize to an ordered list the day (1)/(2) land
-   so two results delivered during a detach don't race.
+6. **Pending-result FIFO** — `pending_background_result` is a single slot and
+   remains correct for the shipped serial queue. Generalize it only with N-way
+   concurrent background runs so multiple completions can race while detached.
 7. **Full N-way concurrent background runs — deliberately deferred.** Needs
   session-per-run topology (a gateway session serializes turns), which
   fragments conversation context, multiplies delivery/floor/failure modes,
@@ -204,13 +588,13 @@ every bubble) + grouping breaks on a >5min gap (`GROUP_GAP_MS`) so a resumed
 conversation gets its own beat; long-press haptic on the action menu; streaming dots
 gated to pre-first-token. Deferred:

- **Streaming↔final render parity (kill the reflow).** `StreamingMarkdownContent`
-  renders raw markdown source (`## `, `**bold**`, `- item`) as plain 14sp text for the
-  whole turn, then swaps to the full renderer at completion — headings still pop
-  14sp→20sp on finalize (much reduced now that settled headings are small and lists no
-  longer resize, but not zero). Run the real renderer on the settled prefix and keep
-  only the trailing unterminated block raw. Riskier (partial-fence flicker) — needs
-  on-device testing. Highest-effort audit item.
+- **Streaming↔final render parity — conservative 1.4.1 slice implemented; live
+  reflow check remains.** Blank-terminated, unambiguous top-level prose/headings use
+  the final Markdown renderer during generation while the active tail stays raw.
+  Lists, quotes, tables, HTML, and fences intentionally remain lightweight until the
+  final parse because partial CommonMark containers can re-parent earlier blocks.
+  Verify that the chosen boundary removes the common heading/prose pop without
+  introducing partial-fence or list flicker.
 - **Bubble body 14sp → 15sp/21.** 14sp is the smallest body of the five reference
  apps. Bump markdown paragraph/text/list + the two plain `Text` sites
  (`MessageBubble.kt` user/system) together; keep ~1.4 leading so the ~272dp measure
@@ -220,9 +604,6 @@ gated to pre-first-token. Deferred:
  (every bubble tails). Switching to iMessage-style "tail on the last bubble only"
  changes the look — get design intent before flipping. `isLastInGroup` is now
  meaningful (grouping breaks on gaps) so it's ready if wanted.
- **Wide tables.** GFM tables use the default renderer on ~272dp (columns crush);
-  code fences already horizontal-scroll. Add a custom `table` component in
-  `markdownComponents` with `horizontalScroll` + ~110dp min column + right-edge fade.
 - **Assistant bubble width decoupled from user.** Both cap at 300dp though only the
  assistant carries markdown/code; let the assistant run wider (~92% of available /
  340–360dp cap) so fences wrap/scroll later. Keep user ~300dp.
@@ -233,8 +614,8 @@ gated to pre-first-token. Deferred:
  text selection instead of opening Copy/Quote. Pick one owner (drop
  `SelectionContainer`, expose Copy via the menu — chat-app norm — or move actions to a
  kebab). Needs on-device confirmation of the current conflict first.
- **Jump-to-bottom FAB unread badge** + drop the no-op tap ripple on bubbles
-  (`combinedClickable onClick={}` still ripples). Telegram pattern.
+- **Drop the no-op tap ripple on bubbles.** The 1.4.1 jump-to-bottom unread badge is
+  code-complete; `combinedClickable(onClick={})` still ripples on a normal bubble tap.
 - **Sessions-transport `animateItem` flash.** Stream-complete rebuilds the list with
  new ids → every visible bubble replays its enter animation (gateway transport,
  stable id, is unaffected). Reuse the streaming bubble's id for the final message.
@@ -253,17 +634,83 @@ gated to pre-first-token. Deferred:
 The deliver-on-reattach / adaptive-promotion / milestone-speech / resume-retry /
 prewarm batch shipped (see DEVLOG 2026-07-01). Deferred:

- **Result injection framing (needs xAI parity check).** The completed background
-  summary is injected as a synthetic *user* message (`send_text` →
-  `conversation.item.create` role=user). Cleaner per current realtime-API practice:
-  inject as a function-call output / out-of-band response so the model can't mistake
-  it for the human speaking. OpenAI realtime supports this; xAI support unverified —
-  requires a live parity test before switching. Keep the user-message path as the
-  fallback.
+- **Result injection framing — FIXED in code, deployed, needs live e2e voice verify (2026-07-07).** The completed background summary, the background-handoff acknowledgement, and the forced-Hermes preamble were all injected as a synthetic *user* message (`send_text` → `conversation.item.create` role=user) — the model saw a fake turn where "the user" said things like "Hermes has already handled the user's previous voice request..." Research turned up a cleaner mechanism than the one originally guessed at: `response.create` supports a per-response `instructions` field that overrides the session system prompt for one response only, **without creating any conversation item at all** — confirmed supported by both providers (OpenAI's own docs; xAI's Voice Agent API docs explicitly show the same `response.create.response.instructions` shape). `conversation: "none"` (true out-of-band, not in history) is OpenAI-only and was deliberately NOT used — we want the spoken summary to land in real conversation history so follow-ups like "what was that again" still work; only the injection *transport* changed, not where the turn ends up. Implementation: `RealtimeAgentConnection.request_response()` (`providers/base.py`) gained an optional `instructions: str | None` kwarg; both `providers/openai.py` and `providers/xai.py` implement it identically (`{"type": "response.create", "response": {"instructions": ...}}` only when instructions are given, else the original bare `response.create`); all 4 broker-authored injection call sites (`broker.py:1244, 2113, 2352, 2560`) switched from `send_text(prompt)` to `request_response(instructions=prompt)`. The one genuine passthrough site (`broker.py:699`, real client-supplied text) is untouched. `python -m unittest discover -s plugin/tests` — 1073/1074 green (the one failure is the pre-existing, already-documented `test_reads_hermes_xai_oauth_credential_pool` fixture gap, unrelated). **Deployed to the relay (2026-07-07) — still needs a real on-device voice session** confirming the model still speaks a natural summary when driven by `instructions` alone (no preceding fake user turn); watch for a background-task delivery in particular since that's the highest-traffic call site. **Confirmed live-verified (2026-07-08)** via the raw event log on the relay: a background run (~4min, terminal tool ×9-10) delivered its spoken summary correctly through the new `request_response(instructions=...)` path (`voice.response.started` → `voice.output_audio.delta` ×N → `voice.response.done`, clean).
+- **xAI closes the realtime session after 900s of true silence — SETTLED (2026-07-08).** Live logs showed the provider closing after ~900s of zero conversation activity. Four probe runs proved no keepalive works: the repro, silent-PCM appends, and acknowledged `session.update` pings all died at exactly 900.0s. **Current code path:** idle-close is routine provider-session expiry; the broker closes Android cleanly with no `voice.error`, the old keepalive loop is gone, and the next user turn opens a fresh provider conversation seeded from the durable Hermes session. **Remaining:** relay deploy + on-device >15 min idle recovery verify.
+- **Realtime voice: provider-answered turn durability — gateway drain + provenance badge SHIPPED (2026-07-08); app-restart persistence still open.** Shipped in code (needs on-device verify with the rest of the voice batch): (a) **gateway trace drain** — a gateway-configured turn with unsynced synthetic sync messages (voice intents / card dispatches / provider-answered realtime turns) now forces itself onto the sessions SSE route so the traces actually reach the server (previously "leave them for the next SSE turn" meant *never* on a gateway-primary phone). Deliberately narrow: only with an existing session id + the sessions fallback route (a stateless completions/runs detour would drop the turn itself from the transcript) and only on the default profile (a non-default profile's gateway session lives in its own state.db — the shared api_server POST would 404 and fail the user's turn; that residual defer case is accepted). The synced-mark guard now checks the route the turn actually *dispatched* on (`effectiveEndpoint`), also fixing a latent duplicate-resend for forced-SSE voice turns. (b) **provenance badge on reload** — `RealtimeTurnSyncBuilder.stripProvenanceMarker()` recognizes the synced `[Realtime Agent provider-native voice turn: …]` marker in loaded history, strips the bracket noise, restores the quiet "Realtime Agent" badge (same chip live turns get), and drops the superseded local clientOnly bubble so the exchange doesn't render twice. **Still open — app-restart loss:** unsynced traces are in-memory only; a restart before the next Hermes turn loses them. A fix needs a client-side pending-trace store (DataStore) plus answers to: which session should late traces sync into (voice binds per-session; the next turn may be a different session/profile), and restore-as-bubbles vs builder-side-only. A true flush-on-voice-exit is NOT implementable without an upstream append-messages API (every chat POST runs the agent); the drain above narrows the exposure window to "restart before the very next turn." Deliberately NOT a separate relay transcript store (forks the conversation).
+- ~~**Realtime voice: subtle "Voice" provenance chip (2026-07-08).**~~ **Done via the durability item above** — turned out message-level "Realtime Agent"/"Voice" badges already rendered for live turns (`MessageBubble.kt` VolumeUp chips); the actual gap was reloaded history showing raw bracket provenance instead of the badge, now fixed by the marker → badge restore.
 - **Pre-existing test failure:** `test_realtime_voice_routes.py::
  test_reads_hermes_xai_oauth_credential_pool` fails at HEAD too (`token is None`) —
  looks like an environment/fixture dependency on a local xai oauth pool, not a code
  regression. Diagnose or gate on the fixture.
+- **Standard voice `delegate_task(background=true)` nudge — SHIPPED then
+  REVERTED same-day (2026-07-08); premise disproven by the VERIFY-FIRST
+  check.** The nudge (a `STABLE_VOICE_INTERFACE_CONTEXT` line telling the
+  model to background long voice asks) was implemented, then the companion
+  verify-first item below was actually checked against upstream source and
+  killed it: **`delegate_task(background=true)` never dispatches async on the
+  api_server surface at all.** Upstream downgrades it to synchronous
+  execution (issue #10760): every api_server route binds
+  `async_delivery=False` (`gateway/platforms/api_server.py` ~4000), and
+  `tools/delegate_tool.py` (~2775) checks
+  `gateway.session_context.async_delivery_supported()` and runs the batch
+  inline with a "ran SYNCHRONOUSLY" note — "the adapter's send() is a no-op,
+  so a background dispatch would silently never re-enter the conversation."
+  Since ALL standard voice turns are forced onto SSE (ephemeral prompt slot),
+  the nudge would have made the model block just as long (plus subagent
+  overhead) while claiming it backgrounded. Reverted in `45c7ef4`. If a
+  "don't hold the voice floor" behavior is ever wanted on the standard path,
+  it needs the upstream async-delivery gap fixed first (a poll/webhook
+  delivery channel for stateless sessions — upstream contribution), or the
+  Relay realtime engine, which already has real background runs (ADR 33).
+- ~~**Standard voice: speak a delegated result if the overlay is still open when
+  it lands.**~~ **CLOSED 2026-07-08 — premise gone.** There is no delayed
+  `delegate_task` completion turn on the standard voice path: the api_server
+  surface downgrades `background=true` to synchronous execution (see the
+  reverted-nudge entry above), so the "delegated result landing later" case
+  this wanted to speak cannot occur on SSE. On the gateway transport a
+  background completion does re-enter as a new turn — whether the phone's
+  gateway client renders an unsolicited idle-time turn is a separate
+  (text-chat) question, tracked nowhere yet; add it if gateway background
+  delegation becomes a used flow on phone text chat.
+- **VERIFIED 2026-07-08 — a `delegate_task` completion turn can NEVER reach an
+  api_server-sourced session, because upstream never dispatches one there.**
+  Answered by reading current upstream source (clone @ `5057f03bf`): the
+  question is moot one layer earlier than expected. Every api_server route
+  binds the session context with `async_delivery=False`
+  (`gateway/platforms/api_server.py` ~4000, "the stateless HTTP path");
+  `tools/delegate_tool.py` (~2775) consults
+  `gateway.session_context.async_delivery_supported()` and, when false, runs
+  the whole batch SYNCHRONOUSLY with an explanatory note (issue #10760) —
+  there is no detached child, no completion event, no forged turn. The
+  `_async_delegation_watcher` → `_inject_watch_notification` →
+  `adapter.handle_message()` path only ever fires for sessions whose origin
+  routes to a real push-capable platform adapter (gateway chats, Discord,
+  etc.). Consequences applied same-day: the voice delegate nudge was reverted
+  and the speak-on-overlay item closed (entries above).
+
+## Relay-enhanced standard voice for background tasks — research (2026-07-08)
+
+**Verdict: NO — don't build it.** Full owner ask + Fable 5 agent research (cross-
+checked against hermes-desktop's actual source, found in the local upstream
+monorepo clone). Three lanes already cover "a long voice request survives and
+reports back": (1) standard voice isn't a blocking call — a long turn just keeps
+streaming, and the #166 SSE-recovery poller + `TurnCompleteNotifier` already
+recover + notify on a dropped socket, zero relay involvement; (2) upstream's own
+`delegate_task(background=true)` is the standard-path equivalent of the realtime
+broker's `hermes_run_task` promotion — the model can detach a long task itself;
+(3) hermes-desktop's own voice hook (`apps/desktop/src/app/chat/composer/hooks/
+use-voice-conversation.ts` in the upstream monorepo — verified, zero mentions of
+background/promotion) is the same thin synchronous record→transcribe→submit→speak
+loop with NO background awareness; their background-task UX lives entirely in the
+chat/composer surface (a status stack + native OS notification, never spoken) —
+convergent with Android's existing background-run chip / `SubagentLane` /
+`TurnCompleteNotifier`, not a gap to fill. Building a relay-side background layer
+for standard voice would mean proxying an upstream-only surface through the relay
+or monkey-patching deeper than the accepted `plugin/enhancements/` seam — against
+the standard-path rule — to duplicate machinery ADR 33 itself calls the most
+fragile code in `broker.py`, for an audience realtime already serves better.
+Action items from this research are above (prompt nudge, speak-on-overlay-open
+polish, the api_server-routing verify-first gate).
 - **Prewarm cost watch.** Voice-mode entry now opens the provider session before the
  first utterance. If users habitually open+close voice mode without speaking, idle
  provider sessions cost connect/teardown churn — consider a short "no utterance in
@@ -297,7 +744,7 @@ Phase 1 (end-to-end spine) shipped on `Codename-11/phone-platform` — `send_mes
 - End-to-end: with the app paired + "Let Hermes message me" on, run `send_message target=phone text=...` (and a cron `deliver=phone`) and confirm a notification on the device. Verify 503 (no phone) and the off-by-default gates.
 - **Phase 2c reply round-trip — ✅ DONE (verified on-device 2026-06-29).** Confirmed: agent → phone notification → inline reply → drained through the relay's loopback `GET /phone/replies` (different process) → `handle_message` (`role_authorized=True`, no `PHONE_ALLOW_ALL_USERS`) → agent answer back in the *same* thread. Both fixes required (see DEVLOG / the Phase 2c bullet above).
 - **FIX: cron `deliver=phone` / standalone send is broken.** Live testing: `hermes send --to phone` returns `{"error": "Unknown platform: phone"}`. The standalone (non-gateway) send path doesn't run a `kind=standalone` plugin's programmatic `ctx.register_platform`, so it never learns `phone` — only the running gateway (which loads `register()` at startup) does. The agent path (`send_message target=phone` in the gateway) works and was verified end-to-end on-device; the standalone/cron path needs the platform discoverable there too (declare it so the standalone loader picks it up, or route cron through the gateway). Until then `cron deliver=phone` won't work.
- **FIX: installer leaves stale plugin backup copies in the plugins dir (root cause of the 2026-06-29 round-trip failure).** `install.sh`'s plugin-clone rebuild backs the old copy up *inside* `~/.hermes/plugins/` (e.g. `hermes-relay.copy-backup-…`). Because the loader dedups discovered plugins by manifest `name` and both copies declare `name: hermes-relay`, the backup can win the dedup and the gateway loads stale code — so every later deploy is silently ignored. Fix: back up *outside* the plugins dir (or delete the old copy), and have `hermes relay doctor` warn when more than one directory under `~/.hermes/plugins/` resolves to the same plugin `name`.
+- **FIX SHIPPED (2026-07-07) — installer + doctor guard against stale duplicate plugin copies; live-host verify pending.** Root cause of the 2026-06-29 round-trip failure: the gateway loader dedups discovered plugins by manifest `name`, so a second directory declaring `name: hermes-relay` (an old-installer backup copy, or a stray native install) could win the dedup and make the gateway load stale code — silently ignoring every later deploy. `plugin/doctor.py` now emits a `plugin-name-unique` warning when more than one directory under `~/.hermes/plugins/` declares the same plugin name (distinct real targets only — two links to the same target are deduped), and `install.sh` sweeps any such duplicate so only the canonical `hermes-relay` symlink survives. (Current `install.sh` already `rm -rf`s the old link rather than backing it up inside the plugins dir, so the original "back up outside the plugins dir" half is moot.) **Verify on the live host:** `hermes relay doctor` reports the `plugin-name-unique` check, and a reinstall leaves exactly one `hermes-relay` entry under `~/.hermes/plugins/`.

 ## Phone platform — usability roadmap (post device-verification, 2026-06-29)

@@ -317,8 +764,12 @@ Phase 1 (end-to-end spine) shipped on `Codename-11/phone-platform` — `send_mes
  - **LOOK INTO (own item, owner-requested 2026-06-29): live `/api/ws` transport for a foregrounded Thread.** Goal: when a Thread is open in the app foreground, give it the *same* live experience as Chat (live `reasoning.delta` + tool-progress) by running the turn over the `/api/ws` dashboard-gateway transport into that `source=phone` session, instead of the notification-grade `proactive.reply` path. Spec the experiment: (1) does `session.resume` + `prompt.submit` on a `source=phone` session over `/api/ws` keep `source=phone` (not silently re-tag `tui`)? (2) does it bypass `PhoneAdapter` / the role_authorized reply loop, and does that matter when the user is the one typing? (3) reconcile the two send paths (foreground→`/api/ws`, background/notification→`proactive.reply`) without double-sends. If it holds, a Thread becomes "background-delivered like a DM, but live like Chat when you open it" — the best of both. Until verified, `proactive.reply` stays the only send path.
 - **Docs/user-docs for Threads (lockstep — author with the user-facing slices 4–5).** Dev refs are done (ADR 12 carries the unified-session decision + the two-"gateway" split). Still to write when the surface ships: a plain-language `user-docs/features/threads.md` — what a Thread *is*, **Chat vs Threads** (live foreground work vs. persistent, agent-reachable conversations), the two opt-in gates, that it's relay-only — plus a **brief in-app explainer** (e.g. a one-line hint on the Threads filter empty state or a small info affordance, not a wall of text), and `docs/relay-protocol.md` + relay-server route docs for the wire. Replace the stale user-docs "Coming Soon → Push Notifications" row; keep it distinct from the clipboard inbox and the inbound Notification Companion.
 - **More Threads fold-ins (capture now, build with the relevant slice).** (a) **Read-state back to the agent** — tell the gateway you saw a proactive message (Discord-style read receipt) so the agent knows; fold into the `proactive.reply.ack` design (#7). (b) **Cross-surface reply** — because a Thread is just a gateway session, a reply could come from the desktop CLI / dashboard too, not only the phone; near-free once unified, verify the reply routing. (c) **Priority/importance on a proactive message** — let the agent mark urgent vs FYI → notification importance / quiet-hours bypass; small payload field + maps to the notifier channel.
- **Per-thread `chat_id`.** Everything is hardcoded `chat_id="phone"` (one thread) today; the adapter already plumbs `chat_id`, so varying it yields multiple threads (per topic, or the agent opening distinct conversations). Ties into the threaded surface.
- **Message status + delivery state.** Surface sent / delivered / queued / failed per message in the thread (depends on outbound buffering's queued state) so the user knows whether the agent actually reached them.
+- **Agent-created per-thread `chat_id`.** User-created named Threads and arbitrary
+  `chat_id` routing are shipped. Remaining: expose a `send_message`-adjacent
+  agent affordance that can deliberately open/name a project Thread.
+- **Queued message state.** Sending/Delivered/Failed bubbles and relay reply ACKs
+  are shipped. Add an honest Queued state plus Cancel when the offline outbox
+  exists; do not infer delivery from socket enqueue alone.
 - **Auto-title the phone thread** like other sessions (first confirm whether the gateway already auto-titles platform sessions; wire it through if so).
 ### Discord/Telegram replacement — capability gaps (to fully retire reaching for them)

@@ -326,15 +777,27 @@ The gateway-platform model is the *correct + sufficient architecture* (the phone

 - **Guaranteed background delivery (the biggest gap; no push today).** Delivery is **live-WSS-only** + a 24 h relay buffer; there is **no FCM/UnifiedPush** wake-up. If the app process is dead AND not holding a socket, a message waits for the next reconnect, and the relay buffer is ephemeral (lost on relay restart). Discord/Telegram feel instant because they wake the device via push even when the app is dead. Decide a **push transport**: **UnifiedPush/ntfy** (recommended — self-hostable, no Google dependency, upstream *already* ships an `ntfy` platform, on-brand for self-hosted) vs **FCM** (simplest UX but adds Play Services + a push relay; clashes with self-hosted ethos — at most the `googlePlay` flavor) vs **persistent foreground keep-alive service** holding the relay WSS (zero new infra, like `GatewayKeepAliveService`, but battery cost + Doze-fragile). Likely: UnifiedPush primary + foreground-keepalive fallback.
 - **Cron / background-job delivery is BROKEN** (already tracked above): `deliver=phone` standalone path → `Unknown platform: phone`. This is load-bearing for "receiver of crons/background jobs" — fix is required, not optional, for the replacement goal.
- **Multi-thread is wired-for but never varied** (already tracked: per-thread `chat_id`). For real DM/channel parity the agent must *open distinct threads* (vary `chat_id` per topic/job), the app must render a **thread list** (N conversations, not one), and replies route back by `chat_id`+`reply_to` (already plumbed).
- **Durable history / scrollback.** The relay buffer is ephemeral; a real messaging surface needs persisted scrollback. Read the gateway **session store** for the `phone` platform's history (relay-exposed read path) so reopening a thread shows the full conversation, not just buffered-while-away.
+- **Agent-initiated multi-thread creation remains.** The app already renders N
+  `source=phone` sessions, user-created Threads vary `chat_id`, and replies route
+  by `chat_id` + `reply_to`. The missing parity is letting the agent open/name a
+  distinct Thread for a topic or job.
+- **Durable history / scrollback — SHIPPED.** Threads reopen through the gateway
+  session store; the relay buffer is only the live/offline-delivery layer, not a
+  parallel history database.
 - **Profile = contact mapping (new idea, fold in).** Multiple Hermes **profiles** (distinct agent personas/configs) could each be a distinct thread *source*/"contact" — DMing different agents. Maps cleanly onto the per-thread `chat_id` + source-attribution work; lets the app feel like a contact list of agents.
 - **Per-thread notification controls + deep-link (Discord-parity affordances).** Per-thread notification channels, mute/DND/quiet-hours (Phase 3 partially), and a notification that **deep-links into the exact thread** (tap → land in that conversation) so dipping in/out while multitasking is frictionless.
 - **Agent-initiated rich content.** Agent → phone thread with **images/cards** (relay media infra + `InboundAttachmentCard`/`HermesCardBubble` already exist on the chat side — reuse). Inbound (phone → agent) reply media stays deferred (text-first), but outbound rich content is low-cost parity.
 - **In-thread "agent is working" indicator.** A typing/working state in the thread while the agent thinks/runs tools (Discord typing-dots parity) — the chat surface already has thinking indicators to reuse.

- **Source/platform attribution + filtering in the drawer (NOW READY — owner-requested 2026-06-29; the gateway/Threads surface has shipped).** `/api/sessions` DOES expose `source` (confirmed live: `tui`, `cli`, `api_server`, `web`, `discord`, `telegram`, `cron`, `webhook`, `phone`). Build: **(a)** a clean **source badge** per session in the drawer — phone → the thread-spool (done); discord / telegram / cron / webhook / web → a small per-platform chip/icon (match hermes-desktop's convention); the app's own `tui`/`api_server` chats get no badge (or a subtle one). **(b)** a **filter** (drawer dropdown) to show/hide sources. **(c)** a **setting** (Chat settings) for the default — **hide the agent's other-gateway/automation sessions (cron / webhook / discord / telegram) by default** so the drawer shows just your chats + Threads, with a toggle to reveal them (the live default `state.db` is full of cron/discord/webhook noise). Persist the visibility prefs. Can't see the official desktop (no clone) — infer its chip styling; match exactly if specifics surface. Standard-path: read-only display of the upstream `source` field. Fold cross-restart **Thread-name persistence** (currently in-memory) into this drawer pass.
- **Beta-gate the Threads featureset (owner direction 2026-06-29).** Mark Threads **Beta** with a clean badge in the UI (the Threads filter chip + the best-path "Threads" capability row) until the enhancements land. Full (non-beta) release is gated on: **live `/api/ws` transport for a foregrounded Thread** (an open Thread streams like Chat — the headline), per-session **unread**, the **`chat_id`-on-`/api/sessions` upstream fix** (so threads route after restart / cross-device), and **outbox/retry**.
+- **Source/platform attribution, filtering, and Thread-name persistence — SHIPPED.**
+  The drawer and Chat settings show source badges and persisted visibility filters;
+  `ThreadNameStore` persists user Thread names across restart and reapplies them to
+  session rows. Remaining Threads work is the explicit residual list above
+  (unread, outbox/retry, exact deep-link, agent-created named Threads, and live
+  foreground `/api/ws`).
+- **Threads Beta badges — SHIPPED.** The Threads filter and best-path capability
+  row render the shared `BetaChip`. Removing Beta remains gated on live foreground
+  `/api/ws`, per-session unread, upstream `chat_id` exposure, and outbox/retry.

 ## Voice — Standard-path parity follow-ups

@@ -351,9 +814,13 @@ The gateway-platform model is the *correct + sufficient architecture* (the phone

 ## Crash-class follow-ups

- **Audit remaining throwing URL-build sites for the "Invalid URL host" class (#131).** The #131 fix guarded the two clients that take a user-entered base URL on the Manage/voice path (`DashboardApiClient`, `StandardHermesVoiceClient`) and validates input at entry, but two lower-risk site groups still call okhttp's throwing `url(String)` / `.toHttpUrl()`:
-  - `HermesApiClient` streaming methods (`sendChatStream` / `sendCompletionsStream` / `sendRunStream`) build `authRequest("$baseUrl/…")` *outside* the surrounding `try`. Latent only — the non-streaming methods (incl. `checkHealth`) already `try/catch`, so a bad `apiServerUrl` is caught and marks the connection unreachable before streaming is reached. Consider a non-throwing `authRequestOrNull()` chokepoint → `onError`.
-  - Relay clients (`RelayHttpClient`, `RelayProfileInspectorClient`, `RelayVoiceClient`, `ConnectionManager`) use `.toHttpUrl()` on `$httpBase/…`. These ride post-pairing relay URLs (from a signed QR / pairing payload), not free-text fields, so the input-validation layer doesn't cover them — route them through `ServerAddress`/`toHttpUrlOrNull` for defense-in-depth.
+- **Verify the Tink pin didn't break EncryptedSharedPreferences (owner, on-device).** The Android-15 `removeFirst`/`removeLast` crash lint flagged `com.google.crypto.tink.hybrid.HybridConfig.<clinit>` in the Tink dependency. Our app pulls Tink transitively via `androidx.security:security-crypto` for `SessionTokenStore`'s `EncryptedSharedPreferences`, which uses the AEAD path (not Hybrid), so the flagged `<clinit>` is very likely never reached at runtime — but we pinned `com.google.crypto.tink:tink-android:1.16.0` (ahead of security-crypto's transitive Tink) to clear the Play warning. **This is untestable without a build:** a too-new Tink can break `EncryptedSharedPreferences` at *runtime* (a `NoSuchMethodError`, not a compile error, so `./gradlew build` won't catch it). On-device smoke: launch the app, pair/sign in, force-stop + relaunch, and confirm the stored session survives (no re-pair prompt) and no startup crash. If it breaks, the blast radius is one line — revert the `tink-android` pin (catalog + `app/build.gradle.kts`) and the token store falls back to security-crypto's transitive Tink; then either try a lower Tink (1.15.0) or leave the (unreached) warning.
+- **Bridge screenshots: regrant UX.** Multi-device live smoke found that a device can report `screen_capture_granted=false` because the MediaProjection grant was revoked and needs an in-app/user-consent regrant. The e-ink timeout path has been hardened with a longer configurable wait and one capture-pipeline rebuild retry; remaining polish is to surface the regrant action more prominently in Bridge status.
+
+- **Audit remaining throwing URL-build sites for the "Invalid URL host" class (#131).** The #131 fix guarded the two clients that take a user-entered base URL on the Manage/voice path (`DashboardApiClient`, `StandardHermesVoiceClient`) and validates input at entry. Remaining site groups:
+  - **`HermesApiClient` streaming methods — DONE 2026-07-08.** `sendChatStream` / `sendCompletionsStream` / `sendRunStream` now build via the non-throwing `authRequestOrNull()` chokepoint (backed by top-level `buildApiRequestOrNull`, unit-tested like `buildRelayRequestOrNull`); a malformed base URL fails the turn through the normal `onError` channel ("Invalid server address …") and returns an inert EventSource instead of throwing out of the ViewModel. The whole #131 audit list is now closed.
+  - **`ConnectionManager` WSS connect — FIXED 2026-07-07** (this was the confirmed crasher: Play 1.2.6 on a Galaxy S25 Ultra / Android 16, `IllegalArgumentException` from `HttpUrl$Builder.parse` via `doConnectInternal` → `Request.Builder.url()` on the IO coroutine). Now routed through `buildRelayRequestOrNull()` → graceful Disconnected + diagnostic instead of a throw. `ConnectionManagerUrlGuardTest` covers it.
+  - **Remaining relay HTTP clients — DONE 2026-07-07 (defense-in-depth).** `RelayVoiceClient` now validates its base in `resolveHttpBase()` (returns null on a malformed URL → the existing `Result.failure` guards fire), and `RelayHttpClient`'s two string-URL sites (`fetchMedia`, `listSessions`) use `toHttpUrlOrNull()` → `Result.failure`. `RelayProfileInspectorClient` was already fully guarded (every `.toHttpUrl()` wrapped in `catch (IllegalArgumentException)`). The whole #131 relay class is now covered; `HermesApiClient` streaming (the other lower-risk group above) remains the only open item.

 ## Session titles (#133) — follow-ups beyond the client fixes

@@ -378,33 +845,23 @@ The client-side mitigations shipped (see DEVLOG 2026-06-27): the `updateSessions

 ## User-Added:

- [x] **Clean-chat: taller scrollable text viewport** *(impl 2026-06-22, orchestration batch — unbuilt; verify in Studio.)* Replaced the fragile `screenHeightDp*0.34f` cap with a weight split (sphere `weight(1f)` / flow `weight(1.1f)` ≈ 52% of the vertical slack); kept the internal scroll + top-fade + `min=96.dp` floor. `AgentTextFlow.kt` (`1dca285`).
 - [ ] Verify profile selection retains voice config selections in all voice modes/configuration combinations - enhance UI/configurability/management for this.
- [x] **Session delete on a non-default profile now persists** *(impl 2026-06-22, orchestration batch — unbuilt; verify in Studio.)* Root cause: a non-default profile's sessions live in that profile's own `state.db`, but the delete went through the unscoped api_server `DELETE /api/sessions/{id}` (shared DB) so the row survived and the next profile-scoped list resurrected it. Fix routes gateway deletes through the dashboard profile-scoped surface (write twin of the list path) + `refreshSessions()` after success. `DashboardApiClient`/`ConnectionViewModel`/`ChatViewModel`/`RelayApp` (`6552566`).
- [x] **Voice-settings profile override in 'auto' mode** *(impl 2026-06-21, orchestration batch — unbuilt; verify in Studio. See DEVLOG + "Orchestration batch (2026-06-21)" below.)* Root cause: `VoiceViewModel.shouldPreferRealtimeVoice()` gated on `.route` (configured) not `.effectiveRoute` (resolved), so 'auto'+relay never engaged the override-capable relay path and fell back to host-global Standard `/api/audio/speak` (no override slot). Fixed + wired `connectionId` for per-profile voice-prefs namespacing. Original note: *Look into the voice-settings profile specific capabilities - in 'auto' mode the user-override voice wasn't applied (system default used) despite being displayed; only 'Relay' applied it.*

- [x] **Analytics + Diagnostics overhaul** *(impl 2026-06-22, orchestration batch — unbuilt; verify in Studio.)* Diagnostics is now a full-screen `DiagnosticsScreen` (new `Screen.Diagnostics` route, replacing the modal sheet) led by a vertical status-check timeline — Network, API server, capabilities, chat transport, pairing/auth, relay, voice — each a green/amber/red/gray dot on a connecting rail with an inline failure reason; checks backed by a logged error are tappable into `DiagnosticDetailDialog`. Derived read-only from existing `ConnectionViewModel` flows + recent `DiagnosticsLog` via a pure `buildStatusChecks()`; recent-activity log kept below. Analytics hierarchy tidied. `c3098a9`. See follow-ups below.
- [x] **Realtime voice stall + over-chatty status** *(client half impl 2026-06-21, orchestration batch — unbuilt; server half deferred, see below.)* Client now relaxes the 90s idle watchdog on promoted/long runs (5-min backstop kept) and throttles spoken status (≥22s gap, ≤3/turn); realtime waveform now gates on real playback-start. Original note: *Realtime voice mode stalls/times-out when calling a background Hermes task and repeatedly reports status vocally when not necessary.*
- [x] **Connections reframe: "Vanilla/Standard Hermes" → "Hermes"** *(impl 2026-06-22, orchestration batch — unbuilt; verify in Studio.)* 28 user-facing display strings across 10 connection/voice/permissions files; "Hermes-Relay plugin" → "Relay plugin" where it reads naturally. Display text only — no enum names, sealed types, when-branches, or stored route values touched. `c9fa8f7`.
- [x] **Lock app to a specific profile** *(impl 2026-06-21, orchestration batch — unbuilt; verify in Studio.)* Per-connection lock: new `ProfileLockStore`, `ProfileController` lock flows + enforcement, `ConnectionInfoSheet` collapses the picker to a static "Locked to <name>" row, `SettingsScreen` adds the lock card + dialog (the one surface still listing all profiles). Original note: *Allow locking app to a specific profile, hiding all other profiles except from this setting - cleanly hide profile specific UI elements based on this gate.*
- [x] **Profile icon in the floating voice overlay** *(impl 2026-06-21, orchestration batch — unbuilt.)* `VoiceModeOverlay` header pill now shows the per-profile icon (`LocalAgentIconPath`); sphere/pet stays the fallback.
- [x] **Voice dropdown state mixes + label overflow** *(impl 2026-06-21, orchestration batch — unbuilt.)* Invalid engine/route combos made unreachable (RealtimeAgent disabled without relay, unavailable routes disabled, `coerceAudioRoute` auto-corrects); long dropdown/provider labels get `maxLines=1`+ellipsis. Original note: *Fix the voice dropdown mode toggles to not allow weird state mixes - labels need overflow control to prevent 2 lines or crunching.*
+### Thinking indicator — post-v1.3.0 follow-ups

- [x] **Per-profile agent icon + static-image avatar (shipped 2026-06-20 —** `d827e46`**, see DEVLOG).** Per-profile icon: client-side `ProfileIconStore` (per `(connection, profile)`, never sent to Hermes; stores a copied-file path) → small Coil image beside the agent name in `MessageBubble` via `LocalAgentIconPath`; picker is `AgentIconRow` under the local-name row in `ConnectionInfoSheet`. Static image: "Add a pet" accepts a single image (magic-byte detect → one-frame static pet). Scope shipped: small name-adjacent icon only; big avatar stays global. Follow-ups: on-device smoke (import an image as a pet; set a profile icon, confirm it shows by the name + persists across restart); optionally also show the icon in the profile picker.
+The animated dot-matrix "thinking" indicator shipped in **android-v1.3.0**
+(Wave/Pulse/Bounce/Sparkle motions + Auto/accent colors, live preview in Chat
+settings). The 1.4.1 path also honors app animation settings, OS animator scale,
+and TalkBack touch exploration. Remaining:

- [ ] **Dot-matrix "thinking" indicator** *(prototype impl 2026-06-28 — unbuilt; verify in Studio.)* New `DotMatrixIndicator` (`ui/components/DotMatrixIndicator.kt`): a Compose-`Canvas` dot grid with a brightness wave sweeping left→right — the dot-anime-react concept reimplemented natively (not a port). Swaps the in-bubble `StreamingDots` working indicator via `LocalThinkingIndicator` (provided in `ChatScreen` around the message `LazyColumn`), behind a new **Chat settings → "Thinking indicator" (Dots / Matrix)** selector with a live preview (`thinkingIndicatorStyle` pref on `ConnectionViewModel`, default "matrix"). Brand-themed (uses the bubble `textColor`), frame-throttled via `rememberAmbientPhase` (not `rememberInfiniteTransition`), and renders a static frame when `animationEnabled` is off. Follow-ups once the base motion is approved:
-  - [x] **Preset frame patterns** *(impl 2026-06-28)* — `ThinkingMatrixPattern` (Wave/Pulse/Bounce/Sparkle): Wave stays procedural, the rest are authored `List<Set<Int>>` frame sequences (built generatively in `buildMatrixFrames`, addressed `row*cols+col`), crossfaded between frames. New `thinkingMatrixPattern` pref + a Matrix-only "Pattern" selector in Chat settings. Width widened twice on request (column pitch now 9dp).
-  - [x] **Per-indicator color** *(impl 2026-06-28)* — `ThinkingMatrixColor` (Auto + brand accents relay/cyan/green/amber/purple/pink) resolved against `LocalBrand` via `toColor()`, so accents re-theme per app theme. New `thinkingMatrixColor` pref + a Matrix-only swatch row in Chat settings; Auto follows the bubble text color. Possible later add-on: a freeform custom-color picker.
-  - **OS-level reduce-motion / TalkBack** — currently gates only on the app's `animationEnabled` pref. Also honor OS reduce-motion + touch-exploration like `CleanChatMode` does (`rememberCleanMotionState().osAnimations`).
-  - **Optional: promote to a full avatar style** — the alternative scope (a `DotMatrixAvatar` `AgentAvatar` shown everywhere via `LocalAvailableAvatars`, selected in Appearance). Deferred in favor of the narrower in-bubble indicator.
+- **Optional: promote to a full avatar style** — the alternative scope (a `DotMatrixAvatar` `AgentAvatar` shown everywhere via `LocalAvailableAvatars`, selected in Appearance). Deferred in favor of the narrower in-bubble indicator.

 ## Demo mode (2026-06-27) — deferred polish

 Shipped offline Demo / Explore mode (see DEVLOG 2026-06-27). Core is in; these are non-blocking polish items, none required for the Play "App access" fix:

- **On-device verify (Studio).** Confirm: "Try the demo" on the onboarding Connect page and the standalone Connect screen lands on Chat showing the canned transcript (Markdown, tool-progress card, weather card, code block); the persistent banner shows and its Connect exits demo into the real wizard; demo runs in airplane mode with no network; Manage/Voice show the demo empty state; Bridge/Terminal show their pair-gate; backing out of demo Chat clears the flag so a real connection still works.
- **Demo composer is a silent no-op.** `ChatViewModel.sendMessage()` early-returns with no API client, so typing + Send in demo does nothing. Polish: intercept sends while `isDemoMode` to append a canned "This is a demo — connect your Hermes server to chat for real" assistant bubble (or disable the composer with a hint), so it doesn't read as broken.
- **Live voice mode in demo.** The voice-mode overlay (mic) launched from Chat isn't demo-gated — a tap would attempt a transcribe (fails gracefully, no crash). Add a demo notice / disable the mic in demo. (Voice settings screen already shows the demo empty state.)
+- **On-device verify (Studio).** Confirm: "Try the demo" on the onboarding Connect page and the standalone Connect screen lands on Chat showing the canned transcript (Markdown, tool-progress card, weather card, code block); the persistent banner shows and its Connect exits demo into the real wizard; demo runs in airplane mode with no network; the Chat mic explains locally that Voice needs a connection and never attempts transcription; Manage/Voice show the demo empty state; Bridge/Terminal show their pair-gate; backing out of demo Chat clears the flag so a real connection still works.
+- **Demo composer is a silent no-op — DONE 2026-07-08.** `sendMessage` now intercepts while `isDemoMode`: echoes the user bubble and appends `DemoContent.composerReply` ("offline demo, can't answer for real — tap Connect in the banner"), both clientOnly so demo-exit's `clearMessages()` wipes them. Wired via `setDemoModeWiring` (unconditional in RelayApp — the client-gated chat init never runs in demo, so ChatViewModel's own handler is null there). On-device check rides the existing demo verify item above.
 - **Light typewriter/stream simulation.** The transcript is statically populated; an optional per-token reveal on first entry would better convey the "streaming" feel. Acceptable as static for v1.
 - **Optional richer demo.** Could add a second tool type or an image attachment to the transcript to showcase more surfaces; kept minimal/one-file for now.

@@ -427,7 +884,6 @@ Client-side profile-lock + voice fixes (the items marked above) landed via a pla
 - **Per-profile voice on Standard (upstream).** `/api/audio/*` is host-global/text-only; the Standard surface still can't carry a per-request voice. Needs the upstream profile-voice / `/v1/audio/*` PR. Until then the client prefers the relay path; consider surfacing an honest "override needs Relay" state when Standard is the effective surface.
 - **Profile lock: ChatScreen glyph + export.** The optional lock glyph on the chat-header avatar was skipped (`ChatScreen.kt` is owned by a concurrent session). Decide whether the per-connection lock belongs in settings export/import (it rides the `profile_selections` DataStore).
 - **Unit tests — DONE 2026-06-21 (36/36 pass via `:app:testSideloadDebugUnitTest`).** `ProfileLockStoreTest` (9 — uses an in-memory `DataStore` harness; the file-backed factory hits a Windows write-rename/instance race), `ProfileControllerLockTest` (8, Robolectric), `CoerceAudioRouteTest` (7), `VoiceStatusGatesTest` (12).
- **CHANGELOG.** Add `[Unreleased]` entries (Profile lock → Added; voice override + realtime → Fixed) at build-verify/PR time.
 - **On-device verification.** Override applies in 'auto'+relay; realtime survives a &gt;90s background task without stalling and stops over-narrating; Speaking waveform unfolds at first audible frame; profile lock hides pickers + holds on a missing profile; overlay shows the profile icon.

 ## Hands-free agentic voice backlog
@@ -436,33 +892,25 @@ Goal: make Hermes usable for hands-free work without leaving the operator blind

 to tool state, safety prompts, or the current task.

- **Waveform output-start sync** — current input waveform timing feels good, but
+- **Waveform output-start sync — SHIPPED; on-device confirmation remains.**
+  Realtime output now gates on `RealtimePcmPlayer` playback-head movement or
+  playback-synchronized amplitude through `shouldMarkRealtimeOutputActive`,
+  matching the basic-TTS path. Confirm visually on-device with the 1.4.1 batch.

-the agent-output waveform can unfold and begin movement before audible speech
+- **Voice command layer — initial 1.4.1 subset code-complete; live verify and
+  navigation residuals remain.** Exact final transcripts can stop speech,
+  explicitly cancel the active background task, pause/resume Continuous mode,
+  repeat a settled background answer, and start a new Standard chat. Bare `stop`
+  and `cancel`, partial transcripts, and command-like ordinary prompts stay on the
+  normal Hermes route. Realtime `new chat` remains gated on a clean websocket
+  session-rebind boundary; `open overlay` and `return to Hermes` remain future
+  navigation commands. Verify barge-in Stop, pause during a background run, local
+  command Chat cleanup, and Continuous rearm on device.

-starts. Split "preparing audio" from "speaking audio" in the visual layer, or
-
-gate the unfolded Speaking waveform on the first real playback frame/audio
-
-amplitude. Processing can stay as the folded circular spinner until output is
-
-actually audible.
-
- **Voice command layer** — reserve local commands that bypass normal agent
-
-routing: "pause", "resume", "stop talking", "cancel", "repeat that", "open
-
-overlay", "return to Hermes", and "new chat". These should work while the
-
-agent is thinking, speaking, or using tools.
-
- **Spoken tool progress** — when Hermes uses tools, voice mode should speak
-
-short status updates such as "I'm checking the relay logs" or "I found an
-
-error" without waiting for final assistant text. Long tool calls should emit
-
-periodic, low-noise progress updates.
+- **Spoken tool progress — baseline shipped; broader hands-free policy remains.**
+  Realtime background runs already emit milestone speech plus coarse, low-noise
+  progress with repeat suppression. The 1.4.1 residual is a unified policy across
+  Voice engines and presets, not another parallel heartbeat implementation.

 - **Realtime tool timeline parity** — the voice overlay should render the same

@@ -482,11 +930,12 @@ the current voice task: active objective, last tool result, pending next step,

 and whether the agent is waiting on the user.

- **Mode presets** — add presets such as Hands-free, Low latency, Careful tool
-
-mode, and Quiet/visual-only. Hands-free should favor Continuous listening,
-
-spoken tool progress, confirmations, and overlay availability.
+- **Mode presets — CODE-COMPLETE for 1.4.1; live apply/Custom-state verification
+  remains.** Hands-free, Low latency, Careful tools, and Quiet/visual-only compose
+  existing interaction and relay-promotion controls. They preserve engine, route,
+  provider, model, voice, credentials, concurrency, and Hands-free's existing
+  experimental barge-in choice. Relay update is server-first; local Voice/barge-in
+  values share one DataStore transaction, with relay rollback on local failure.

 - **Barge-in hardening** — keep barge-in experimental until echo/self-recording

@@ -553,10 +1002,10 @@ Things to look into:
 - **Update discovery (shipped 2026-06-30 — CLI + dashboard + app).** `hermes relay update-check`, a dashboard "Plugin version" card, and an app **About → "Relay"** row all compare the installed plugin against the latest `plugin-v*` release and surface the right update command (`hermes plugins update hermes-relay` vs `hermes-relay-update`). The app polls the relay's `GET /relay/update-check` (`:8767`, bearer) on each `auth.ok`; the relay is the single source of truth (the app never hits GitHub). Possible polish (deferred): a more prominent dismissible "relay is behind" banner outside About (today it's capability-first + the About row), and showing the app's own version alongside the relay's in the same readout (the app-Version row already exists separately just above it).
 - **Per-profile enablement (shipped 2026-06-30).** `hermes relay profiles list|enable [--all|NAME]` + `plugin/profiles.py` resolve the install-once/enable-per-profile papercut; docs now cover the pair-once/one-relay model. Possible follow-up: an `install.sh` / `hermes plugins install` prompt offering "enable for all existing profiles" so new installs don't need the manual `profiles enable --all`.
 - `**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** — `hermes_relay_bootstrap/` monkey-patches `aiohttp.web.Application` to inject endpoints into vanilla/partial upstream. This is intentional but feels like a hack. The original broad PR #8556 was **closed as superseded**; native upstream now covers sessions/chat/fork via [#33134](https://github.com/NousResearch/hermes-agent/pull/33134) and skill/toolset discovery via `/v1/skills` + `/v1/toolsets` (#33016). **Done (2026-07-08, HRUI-002):** the bootstrap's sessions CRUD/messages/fork handlers and the legacy `GET /api/skills` list were retired outright — no pre-#33134 fallback remains; old core builds degrade via the client capability probe. **Still gapped (bootstrap remains for these):** config, memory, legacy `/api/skills/{name}` detail + `PUT /api/skills/toggle` (501 stub), available-models, `/api/sessions/search`, and the slash-command middleware — each retires individually when a native replacement lands or the dependent UX is removed. Track upstream per surface.
+- **Gateway slash-command preprocessor — upstream Stage 1 PR.** Sibling follow-up to the native session-control baseline (#33134). 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 now that session primitives shipped upstream (#33134 / `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/`.

@@ -605,7 +1054,6 @@ Follow-ups:
 ## Attachments (shipped 2026-06-18 — `docs/plans/2026-06-18-attachment-experience.md`)

 - **B3 — download progress + cancel.** Inbound fetch is un-cancelable; the previews work scaffolded an indeterminate bar + nullable `onCancel`. Live wiring needs the fetch-path owner (`ChatViewModel`/`Attachment`) to expose determinate progress (Content-Length) + a cancel hook.
- **A6 — multi-image gallery.** N images in one message → grid + swipe-across viewer (Telegram media-group parity).
 - **C5 — agent-side sensitivity config gate.** `RELAY_MEDIA_SENSITIVITY_HINTS` (env or per-profile) instructing the agent to annotate sensitive media via the prompt-builder. Transport (relay `X-Media-Sensitive` header + client blur) already ships; the agent isn't asked to set the bit yet.
 - **Relay thumbnails (D6).** Server-side thumbnail generation to avoid full-size download for cards/galleries. Needs an image lib (Pillow not currently a dep) — evaluate before adding.
 - **D5 — outbound upload progress.** No per-attachment progress during the 60s gateway PDF-render window.
@@ -613,12 +1061,13 @@ Follow-ups:
 ## Voice overhaul (shipped 2026-06-18 — `docs/plans/2026-06-18-voice-overhaul.md`)

 - **Per-profile voice on Standard (upstream PR).** Upstream `/api/profiles/*` has no voice field and `/api/audio/*` is host-global. Long-term: PR a voice section to the profile config + make `/api/audio/*` honor the active/`?profile=` profile. The relay path already carries per-profile voice; ship that first.
- **Wire connectionId for per-profile voice namespacing.** `VoicePreferencesRepository` is scope-aware (`base_connId_profile`), but `RelayApp` passes only the profile *name* to `onProfileChanged`, so `connectionId` is null and keys namespace by profile-only. Wire `setVoicePrefsConnection` to `ConnectionViewModel.activeConnectionId` (in `RelayApp`) so two connections with same-named profiles don't share voice settings.
- **Realtime-PCM waveform output gating.** The basic-TTS output waveform is now Visualizer-accurate (gated on real playback amplitude), but the realtime path gates `outputAudioActive` on `audioSeen` (first decoded PCM bytes) in `VoiceViewModel.handleRealtimeVoiceEvent`, which can still lead audible output by the `RealtimePcmPlayer` start prebuffer. Gate realtime on actual playback-start (head moved) to match the basic-TTS path.

 ## Chat clean-mode + pets (shipped 2026-06-18 — `docs/plans/2026-06-18-chat-clean-mode-and-pets.md`)

- **Part-A chat polish (optional bundle).** Per-code-block copy + horizontal scroll, visible copy affordance, mid-stream stall feedback, profile/skill-aware empty-state chips, the ~40-flow recomposition hotspot at the top of `ChatScreen`. (Sphere `contentDescription`/reduced-motion was handled by the clean-mode a11y work.)
+- **Part-A chat polish residuals.** Per-code-block copy, horizontal scroll, the
+  visible copy affordance, and mid-stream stall feedback are shipped. Remaining:
+  profile/skill-aware empty-state chips and the ~40-flow recomposition hotspot at
+  the top of `ChatScreen`.
 - **Pet hot-load + in-app add/remove (shipped 2026-06-20).** Pets now live-refresh: an `avatarsRefreshTick` keys the avatar `produceState` in `RelayApp`, and Appearance re-scans `pets/` on open and after in-app import/delete — no app restart. Appearance gained "Add a pet" (SAF `.zip` import via `PetImporter`, zip-slip/zip-bomb guarded + validated through `toAvatar`) and an "Installed pets" list with per-pet remove (`PetLoader.deletePet`, confirm dialog, Sphere fallback). Remaining:
  - **Sphere-skin parity.** Skins are still process-scoped + `adb push` only — the live tick and the importer cover pets, not skins. Extend the tick to `loadUserSkins` and add a `.json` skin import if hot-loading/adding skins in-app is wanted.
  - `**adb push` into `Android/data` hangs on Samsung scoped storage.** Confirmed: pushing a pet pack to `/sdcard/Android/data/<pkg>/files/pets/` stalls (no bytes written) although `adb shell ls` of the dir works. In-app `.zip` import is the supported path; `/sdcard/Download` pushes fine. Consider softening `docs/pet-spec.md` + user-docs to lead with in-app import over adb.
@@ -245,6 +245,7 @@ dependencies {

    // Activity
    implementation(libs.activity.compose)
+    implementation(libs.appcompat)

    // Core
    implementation(libs.core.ktx)
@@ -296,6 +297,9 @@ dependencies {

    // Security
    implementation(libs.security.crypto)
+    // Force a Tink newer than security-crypto's transitive one — older Tink's
+    // HybridConfig removeFirst()/removeLast() trips the Android-15 crash lint.
+    implementation(libs.tink.android)

    // DataStore
    implementation(libs.datastore.preferences)
@@ -322,8 +326,8 @@ dependencies {
    // [POC] Roborazzi host-side screenshot rendering (src/test, Robolectric).
    // Renders real composables on the JVM at an exact canvas — no device, no
    // status bar, no clipping. See StoreScreenshotTest.
-    testImplementation("io.github.takahirom.roborazzi:roborazzi:1.64.0")
-    testImplementation("io.github.takahirom.roborazzi:roborazzi-compose:1.64.0")
+    testImplementation("io.github.takahirom.roborazzi:roborazzi:1.66.0")
+    testImplementation("io.github.takahirom.roborazzi:roborazzi-compose:1.66.0")
    testImplementation(libs.compose.ui.test.junit4)
    testImplementation(libs.compose.ui.test.manifest)
    testImplementation("androidx.test.ext:junit:1.3.0")
@@ -0,0 +1 @@
+info@axiom-labs.dev
@@ -1,6 +1,9 @@
-v1.3.0 — Voice that multitasks & sturdier chats.
+v1.4.3 - Language picker

-• Long voice tasks run in the background with a live progress chip — keep talking, cancel with a tap, and hear the result even after a dropped connection.
-• Chat answers are no longer lost when the connection drops mid-reply.
-• Your agent can message you first (opt-in), with replies straight from the notification.
-• Pick your app font; onboarding fits small screens; cleaner Connections screen.
+Language
+* Open Settings > Appearance to choose System default, English, or Simplified Chinese.
+* Your choice stays synchronized with Android's per-app language setting.
+* Android 12 and lower now persist the same in-app selection.
+
+Compatibility
+* Release builds now reject collection APIs that can crash on older Android versions.
@@ -0,0 +1,9 @@
+v1.4.3 - 应用内语言选择
+
+语言
+* 在“设置 > 外观”中选择跟随系统、English 或简体中文。
+* 选择会与 Android 的应用语言设置保持同步。
+* Android 12 及更早版本也会保存应用内选择。
+
+兼容性
+* 发布构建现在会拦截可能导致旧版 Android 崩溃的集合 API。
@@ -29,6 +29,7 @@
        android:enableOnBackInvokedCallback="true"
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
+        android:localeConfig="@xml/locales_config"
        android:networkSecurityConfig="@xml/network_security_config"
        android:supportsRtl="true"
        android:theme="@style/Theme.HermesRelay">
@@ -39,7 +40,7 @@
            android:launchMode="singleTask"
            android:screenOrientation="portrait"
            tools:ignore="LockedOrientationActivity"
-            android:configChanges="uiMode|fontScale|locale|density|orientation|screenSize|screenLayout|keyboardHidden"
+            android:configChanges="uiMode|fontScale|density|orientation|screenSize|screenLayout|keyboardHidden"
            android:windowSoftInputMode="adjustResize"
            android:theme="@style/Theme.HermesRelay.Splash">
            <intent-filter>
@@ -48,6 +49,17 @@
            </intent-filter>
        </activity>

+        <!-- AppCompat persists in-app language choices on Android 12 and lower.
+             Android 13+ stores the same selection in the platform LocaleManager. -->
+        <service
+            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
+            android:enabled="false"
+            android:exported="false">
+            <meta-data
+                android:name="autoStoreLocales"
+                android:value="true" />
+        </service>
+
        <provider
            android:name="androidx.core.content.FileProvider"
            android:authorities="${applicationId}.fileprovider"
@@ -1,5 +1,99 @@
 {
 "versions": [
+  {
+   "version": "1.4.3",
+   "title": "Language switching inside the app",
+   "date": "2026-07-11",
+   "sections": [
+    {
+     "header": "Language at your fingertips",
+     "bullets": [
+      "Choose System default, English, or Simplified Chinese from Settings → Appearance without leaving Hermes-Relay.",
+      "The picker stays synchronized with Android's per-app language setting and persists the choice on Android 12 and lower.",
+      "Release builds reject collection APIs that can crash on Android versions before API 35."
+     ]
+    }
+   ]
+  },
+  {
+   "version": "1.4.2",
+   "title": "Simplified Chinese and scalable localization",
+   "date": "2026-07-11",
+   "sections": [
+    {
+     "header": "Simplified Chinese throughout the app",
+     "bullets": [
+      "Use onboarding, connection setup, Chat, Manage, Voice, settings, diagnostics, notifications, and accessibility labels in Simplified Chinese across both product flavors.",
+      "Switch between English and Simplified Chinese through Android's per-app language settings on supported versions, or follow the device language elsewhere."
+     ]
+    },
+    {
+     "header": "Localization built to grow",
+     "bullets": [
+      "Automated catalog checks protect resource, plural, and format-argument parity, while contributor docs and translated entry points make another language easier to add safely.",
+      "Connection scan and queued-message counts now use locale-aware Android plurals."
+     ]
+    }
+   ]
+  },
+  {
+   "version": "1.4.1",
+   "title": "Chat that keeps up",
+   "date": "2026-07-11",
+   "sections": [
+    {
+     "header": "Chat that stays with you",
+     "bullets": [
+      "Follow background terminal work from a compact process strip and expandable sheet. Its completed answer appears in the same conversation automatically.",
+      "Close and reopen while a reply runs: partial text, thinking, tool progress, background-task state, and pending approvals return in the same chat without repeating your prompt."
+     ]
+    },
+    {
+     "header": "Voice you can direct",
+     "bullets": [
+      "Use spoken commands to pause or resume listening, stop speech, cancel background work, repeat a finished result, or start Standard voice chat.",
+      "Hands-free, Low latency, Careful tools, and Quiet presets tune existing voice behavior without changing your selected voice or route."
+     ]
+    },
+    {
+     "header": "Clearer conversations",
+     "bullets": [
+      "Browse adjacent images as a gallery, read smoother streaming Markdown and wide tables, and see background-process completion as a compact process notice."
+     ]
+    }
+   ]
+  },
+  {
+   "version": "1.4.0",
+   "title": "Realtime voice that finishes the job",
+   "date": "2026-07-09",
+   "sections": [
+    {
+     "header": "Voice that keeps going",
+     "bullets": [
+      "Quick follow-ups can be answered while a long Hermes task runs, another long request can wait in a bounded queue, and the finished answer can stay in the selected realtime voice.",
+      "Voice route recovery now waits for relay confirmation, replays unacknowledged input without starting a second Hermes run, and rejects stale sockets or sessions before they can overwrite a healthy connection.",
+      "Listening, thinking, reconnecting, and cancellation states now settle cleanly after Stop, exit, route loss, or terminal retry failure."
+     ]
+    },
+    {
+     "header": "Models and phone automation",
+     "bullets": [
+      "Realtime Agent model and voice choices apply to the next session, persist per connection/profile, and survive restart.",
+      "Chat and Manage can refresh dynamic provider model catalogs on demand.",
+      "Opt-in notification rules can offer a local Ask Hermes action, and Bridge tools can target a specific paired Android device."
+     ]
+    },
+    {
+     "header": "Reliability and safety",
+     "bullets": [
+      "Long chat turns avoid premature transport fallback, and supported voice, card, and attachment context now reaches upstream Hermes through channels it consumes.",
+      "Malformed server addresses fail through normal connection errors, older Android versions avoid newer collection APIs, and relay media blocks credential and token paths.",
+      "Model management keeps unconfigured providers visible with key-setup guidance, and session cleanup gains export, prune preview/apply, archive, and restore plumbing."
+     ]
+    }
+   ]
+  },
  {
   "version": "1.3.0",
   "title": "Voice that multitasks & sturdier chats",
@@ -1,18 +1,9 @@
-v1.3.0 - Voice that multitasks & chats that keep their answers
+v1.4.3 - Language picker

-Voice
-* Ask for something big and keep talking - long tasks hand off to
-  the background with a live chip (current step, timer, tap to
-  cancel), and the answer is spoken when it's ready, even after a
-  dropped connection. Leaving voice mode no longer cancels a
-  running task.
+Language
+* Open Settings > Appearance to choose System default, English, or Simplified Chinese.
+* Your choice stays synchronized with Android's per-app language setting.
+* Android 12 and lower now persist the same in-app selection.

-Chats
-* An answer is no longer lost if the connection drops mid-reply -
-  the app quietly recovers it when the server finishes.
-* Your agent can message you first (opt-in), and you can reply
-  right from the notification.
-
-Plus
-* Pick your app font, onboarding fits small screens, smarter
-  issue reporting, and a cleaner Connections screen.
+Compatibility
+* Release builds now reject collection APIs that can crash on older Android versions.
@@ -8,13 +8,13 @@ import android.os.Bundle
 import android.util.Log
 import android.view.View
 import android.view.animation.DecelerateInterpolator
-import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.core.animation.doOnEnd
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import androidx.appcompat.app.AppCompatActivity
 import com.hermesandroid.relay.accessibility.ScreenCaptureRequester
 import com.hermesandroid.relay.bridge.BridgeForegroundService
 import com.hermesandroid.relay.bridge.UnattendedAccessManager
@@ -24,7 +24,7 @@ import com.hermesandroid.relay.ui.RelayApp
 import com.hermesandroid.relay.util.NavRouteRequest
 import com.hermesandroid.relay.viewmodel.ConnectionViewModel

-class MainActivity : ComponentActivity() {
+class MainActivity : AppCompatActivity() {

    private val connectionViewModel: ConnectionViewModel by viewModels()

@@ -15,6 +15,7 @@ import android.os.HandlerThread
 import android.util.DisplayMetrics
 import android.util.Log
 import android.view.WindowManager
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
@@ -114,8 +115,27 @@ class ScreenCapture(
         */
        private const val MAX_IMAGES = 2

-        /** Capture timeout — if no frame arrives in this window, fail loudly. */
-        private const val CAPTURE_TIMEOUT_MS = 2_500L
+        /**
+         * Capture timeout — if no frame arrives in this window, fail loudly.
+         *
+         * BOOX / e-ink devices can take several seconds before a
+         * VirtualDisplay-backed ImageReader emits its first frame, especially
+         * after a fresh MediaProjection grant or when the display is idle. Keep
+         * the default generous enough for those devices while still bounded so
+         * a dead capture pipeline reports a clear error.
+         */
+        private const val DEFAULT_CAPTURE_TIMEOUT_MS = 10_000L
+
+        /** Optional JVM/system-property override for local QA and OEM tuning. */
+        private const val CAPTURE_TIMEOUT_PROPERTY =
+            "hermes.relay.screen_capture_timeout_ms"
+
+        private const val MIN_CAPTURE_TIMEOUT_MS = 2_500L
+        private const val MAX_CAPTURE_TIMEOUT_MS = 30_000L
+
+        /** One retry covers stale VirtualDisplay/ImageReader pipelines. */
+        private const val MAX_CAPTURE_ATTEMPTS = 2
+        private const val CAPTURE_RETRY_DELAY_MS = 350L
    }

    // === PHASE3-bridge-ui-followup: MediaProjection reuse fix ===
@@ -211,7 +231,27 @@ class ScreenCapture(
        // mutex keeps us honest if anything ever parallelizes.
        val pngBytes = try {
            captureMutex.withLock {
-                captureFrame(projection)
+                var lastTimeout: CaptureTimeoutException? = null
+                for (attempt in 1..MAX_CAPTURE_ATTEMPTS) {
+                    try {
+                        return@withLock captureFrame(projection)
+                    } catch (e: CaptureTimeoutException) {
+                        lastTimeout = e
+                        Log.w(
+                            TAG,
+                            "screen capture timed out on attempt " +
+                                "$attempt/$MAX_CAPTURE_ATTEMPTS: ${e.message}"
+                        )
+                        if (attempt < MAX_CAPTURE_ATTEMPTS) {
+                            // A timeout can leave an OEM VirtualDisplay path
+                            // wedged without invalidating the MediaProjection
+                            // grant. Rebuild our pipeline once before giving up.
+                            releaseCache()
+                            delay(CAPTURE_RETRY_DELAY_MS)
+                        }
+                    }
+                }
+                throw lastTimeout ?: IOException("screen capture timed out")
            }
        } catch (e: Exception) {
            Log.w(TAG, "captureFrame failed: ${e.message}")
@@ -286,16 +326,28 @@ class ScreenCapture(
        }

        return try {
-            kotlinx.coroutines.withTimeout(CAPTURE_TIMEOUT_MS) { deferred.await() }
+            val timeoutMs = captureTimeoutMs()
+            kotlinx.coroutines.withTimeout(timeoutMs) { deferred.await() }
        } catch (e: kotlinx.coroutines.TimeoutCancellationException) {
            pendingCaptureRef.compareAndSet(deferred, null)
-            throw IOException("screen capture timed out")
+            throw CaptureTimeoutException(
+                "screen capture timed out after ${captureTimeoutMs()}ms"
+            )
        } catch (t: Throwable) {
            pendingCaptureRef.compareAndSet(deferred, null)
            throw t
        }
    }

+    private fun captureTimeoutMs(): Long {
+        val configured = System.getProperty(CAPTURE_TIMEOUT_PROPERTY)
+            ?.toLongOrNull()
+            ?.coerceIn(MIN_CAPTURE_TIMEOUT_MS, MAX_CAPTURE_TIMEOUT_MS)
+        return configured ?: DEFAULT_CAPTURE_TIMEOUT_MS
+    }
+
+    private class CaptureTimeoutException(message: String) : IOException(message)
+
    /**
     * Build (or reuse) the cached VirtualDisplay + ImageReader + HandlerThread
     * for this projection. Rebuilds when:
@@ -489,7 +541,7 @@ class ScreenCapture(
            fastClient.newCall(request).execute().use { response ->
                when (response.code) {
                    200 -> {
-                        val raw = response.body?.string().orEmpty()
+                        val raw = response.body.string()
                        val token = extractToken(raw)
                        if (token.isNullOrBlank()) {
                            Result.failure(
@@ -9,6 +9,7 @@ import android.media.AudioTrack
 import android.os.Build
 import android.os.SystemClock
 import android.util.Log
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.diagnostics.DiagnosticCategory
 import com.hermesandroid.relay.diagnostics.DiagnosticSeverity
 import com.hermesandroid.relay.diagnostics.DiagnosticsLog
@@ -25,7 +26,7 @@ import kotlin.math.sqrt
 * writes them directly to an AudioTrack so the Android Studio dev build can
 * hear provider output without waiting for an encoded file.
 */
-class RealtimePcmPlayer(context: Context? = null) {
+class RealtimePcmPlayer(private val context: Context? = null) {
    private val trackLock = Any()
    private val writeLock = Any()
    private val audioManager =
@@ -225,7 +226,7 @@ class RealtimePcmPlayer(context: Context? = null) {
        // is the chunk's end frame. The cursor reaches this amplitude once
        // playbackHeadPosition passes the previous end frame.
        playbackAmpQueue.addLast(FrameAmp(endFrame = totalFramesWritten, rms = rms))
-        while (playbackAmpQueue.size > MAX_AMP_QUEUE) playbackAmpQueue.removeFirst()
+        while (playbackAmpQueue.size > MAX_AMP_QUEUE) playbackAmpQueue.removeAt(0)
    }

    /**
@@ -240,7 +241,7 @@ class RealtimePcmPlayer(context: Context? = null) {
        val head = readHeadFrames(track).toLong()
        // Drop fully-played chunks so the head of the queue is the one playing now.
        while (playbackAmpQueue.size > 1 && playbackAmpQueue.first().endFrame <= head) {
-            playbackAmpQueue.removeFirst()
+            playbackAmpQueue.removeAt(0)
        }
        amplitudeAtHead(playbackAmpQueue, head)
    }
@@ -449,7 +450,7 @@ class RealtimePcmPlayer(context: Context? = null) {
            DiagnosticsLog.record(
                category = DiagnosticCategory.Voice,
                severity = DiagnosticSeverity.Info,
-                title = "Realtime audio started",
+                title = context?.getString(R.string.audio_diag_started) ?: "Realtime audio started",
                detail = "First sample reached the speaker after ${ttfaMs}ms.",
            )
        }
@@ -489,7 +490,7 @@ class RealtimePcmPlayer(context: Context? = null) {
        DiagnosticsLog.record(
            category = DiagnosticCategory.Voice,
            severity = DiagnosticSeverity.Warning,
-            title = "Realtime audio not starting",
+            title = context?.getString(R.string.audio_diag_not_starting) ?: "Realtime audio not starting",
            detail = "Playback running ${stuckMs}ms but no audio reached the speaker " +
                "(${mediaVolumeSummaryLocked()}).",
        )
@@ -587,7 +588,7 @@ class RealtimePcmPlayer(context: Context? = null) {
        DiagnosticsLog.record(
            category = DiagnosticCategory.Voice,
            severity = DiagnosticSeverity.Warning,
-            title = "Realtime audio stream gap",
+            title = context?.getString(R.string.audio_diag_stream_gap) ?: "Realtime audio stream gap",
            detail = reason,
        )
    }
@@ -603,7 +604,7 @@ class RealtimePcmPlayer(context: Context? = null) {
            DiagnosticsLog.record(
                category = DiagnosticCategory.Voice,
                severity = DiagnosticSeverity.Warning,
-                title = "Realtime voice volume muted",
+                title = context?.getString(R.string.audio_diag_volume_muted) ?: "Realtime voice volume muted",
                detail = "Media volume is 0/${maxVolume ?: "?"}.",
            )
        }
@@ -141,6 +141,9 @@ class VoiceRecorder(
    fun stopRecording(): File {
        val file = currentOutputFile
            ?: throw IllegalStateException("stopRecording called with no active recording")
+        // Claim the capture exactly once. A stale UI stop must not repackage
+        // the previous PCM as a second voice turn.
+        currentOutputFile = null

        val record = audioRecord
        stopRequested.set(true)
@@ -207,8 +210,15 @@ class VoiceRecorder(
                    }
                }
                updateAmplitude(buffer, read)
+            } else if (read < 0) {
+                Log.w(TAG, "AudioRecord.read ended with error code $read")
+                break
            }
        }
+        // Android can terminate capture while the app is backgrounded without
+        // stopRecording() running. Reflect that loss in isRecording() so the
+        // foreground UI can recover instead of remaining stuck on Listening.
+        stopRequested.set(true)
    }

    private fun updateAmplitude(buffer: ByteArray, read: Int) {
@@ -89,8 +89,8 @@ class AutoDisableWorker(private val context: Context) {

        val builder = NotificationCompat.Builder(context, CHANNEL_ID)
            .setSmallIcon(R.mipmap.ic_launcher)
-            .setContentTitle("Bridge auto-disabled")
-            .setContentText("Paused after idle — tap to re-enable in the Bridge tab.")
+            .setContentTitle(context.getString(R.string.bridge_notification_auto_disabled_title))
+            .setContentText(context.getString(R.string.bridge_notification_auto_disabled_body))
            .setStyle(NotificationCompat.BigTextStyle().bigText(
                "Hermes bridge was idle for too long, so device control has been turned off " +
                    "automatically. Open the Bridge tab to turn it back on if you still need it."
@@ -373,8 +373,8 @@ class BridgeForegroundService : Service() {

        return NotificationCompat.Builder(this, CHANNEL_ID)
            .setSmallIcon(R.mipmap.ic_launcher)
-            .setContentTitle("Hermes agent has device control")
-            .setContentText("Bridge is active — tap Disable to stop at any time.")
+            .setContentTitle(getString(R.string.bridge_notification_control_title))
+            .setContentText(getString(R.string.bridge_notification_control_body))
            .setStyle(NotificationCompat.BigTextStyle().bigText(
                "The Hermes agent can currently read the screen and perform " +
                    "actions on your behalf through the accessibility service. " +
@@ -0,0 +1,41 @@
+package com.hermesandroid.relay.data
+
+import androidx.core.os.LocaleListCompat
+import java.util.Locale
+
+/** Languages exposed by the in-app picker and Android's per-app language UI. */
+enum class AppLanguage(val languageTag: String) {
+    SYSTEM_DEFAULT(""),
+    ENGLISH("en"),
+    SIMPLIFIED_CHINESE("zh-Hans"),
+    ;
+
+    fun toLocaleList(): LocaleListCompat = if (languageTag.isEmpty()) {
+        LocaleListCompat.getEmptyLocaleList()
+    } else {
+        LocaleListCompat.forLanguageTags(languageTag)
+    }
+
+    companion object {
+        fun fromLanguageTags(languageTags: String): AppLanguage {
+            val primaryTag = languageTags
+                .substringBefore(',')
+                .trim()
+                .takeIf { it.isNotEmpty() }
+                ?: return SYSTEM_DEFAULT
+            val locale = Locale.forLanguageTag(primaryTag)
+
+            return when (locale.language.lowercase(Locale.ROOT)) {
+                "en" -> ENGLISH
+                "zh" -> {
+                    val simplified = locale.script.equals("Hans", ignoreCase = true) ||
+                        locale.script.isEmpty() ||
+                        locale.country.equals("CN", ignoreCase = true) ||
+                        locale.country.equals("SG", ignoreCase = true)
+                    if (simplified) SIMPLIFIED_CHINESE else SYSTEM_DEFAULT
+                }
+                else -> SYSTEM_DEFAULT
+            }
+        }
+    }
+}
@@ -82,9 +82,9 @@ class BargeInPreferencesRepository(
    constructor(context: Context) : this(context.relayDataStore)

    companion object {
-        private val KEY_ENABLED = booleanPreferencesKey("barge_in_enabled")
-        private val KEY_SENSITIVITY = stringPreferencesKey("barge_in_sensitivity")
-        private val KEY_RESUME_AFTER_INTERRUPTION =
+        internal val KEY_ENABLED = booleanPreferencesKey("barge_in_enabled")
+        internal val KEY_SENSITIVITY = stringPreferencesKey("barge_in_sensitivity")
+        internal val KEY_RESUME_AFTER_INTERRUPTION =
            booleanPreferencesKey("barge_in_resume_after_interruption")
    }

@@ -120,8 +120,42 @@ data class ChatMessage(
     * no status affix.
     */
    val deliveryStatus: MessageDeliveryStatus? = null,
+    /**
+     * Client-side lifecycle for a promoted/durable Hermes run that belongs to
+     * this assistant turn. The same message owns the state from promotion
+     * through delivery so Chat never needs a separate system notice and final
+     * reply for one task. On the normal post-turn history reconcile this field
+     * is carried forward with the rest of the client-only enrichment whenever
+     * the live message can be matched to its server row.
+     */
+    val backgroundTask: BackgroundTaskState? = null,
 )

+/** One Chat-visible identity for a promoted/durable realtime Hermes run. */
+data class BackgroundTaskState(
+    /** Relay run id when supplied; otherwise a stable id derived from the message. */
+    val id: String,
+    /** Short objective derived from the associated user turn. */
+    val title: String,
+    /** ADR 33 tier: `promoted` or `durable`. */
+    val tier: String = "promoted",
+    val phase: BackgroundTaskPhase = BackgroundTaskPhase.RUNNING,
+    /** Latest meaningful progress line, deliberately not a raw event trace. */
+    val statusLine: String? = null,
+    val completedToolCount: Int = 0,
+    val queuedCount: Int = 0,
+    val startedAt: Long = System.currentTimeMillis(),
+)
+
+enum class BackgroundTaskPhase {
+    RUNNING,
+    WAITING,
+    DELIVERING,
+    COMPLETE,
+    FAILED,
+    CANCELLED,
+}
+
 /**
 * Structured details about a phone-local voice intent that was dispatched
 * in-process via [com.hermesandroid.relay.network.relay.BridgeCommandHandler.handleLocalCommand].
@@ -0,0 +1,162 @@
+package com.hermesandroid.relay.data
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringPreferencesKey
+import kotlinx.coroutines.flow.first
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+
+/**
+ * Durable, client-owned snapshot of one in-flight chat turn.
+ *
+ * Hermes history is authoritative once a turn finishes, but it cannot recreate
+ * transient UI that existed before persistence (live reasoning, a running tool,
+ * an interactive ask, or the latest lifecycle line). This checkpoint bridges
+ * that gap across Activity recreation and process death. It deliberately stores
+ * no entered secret/approval response; only the server-issued ask is retained.
+ */
+@Serializable
+data class ChatTurnCheckpoint(
+    val schemaVersion: Int = CURRENT_SCHEMA,
+    val contextKey: String,
+    val sessionId: String,
+    val liveSessionId: String? = null,
+    val transport: String,
+    val user: ChatTurnUserCheckpoint,
+    val assistant: ChatTurnAssistantCheckpoint,
+    val turnStatus: String? = null,
+    val priorUserMessageCount: Int,
+    val baselineAssistantCount: Int,
+    val pendingAsk: ChatTurnAskCheckpoint? = null,
+    val startedAt: Long,
+    val updatedAt: Long,
+) {
+    companion object {
+        const val CURRENT_SCHEMA = 1
+        const val MAX_AGE_MS = 24L * 60L * 60L * 1_000L
+    }
+}
+
+@Serializable
+data class ChatTurnUserCheckpoint(
+    val id: String,
+    val content: String,
+    val timestamp: Long,
+)
+
+@Serializable
+data class ChatTurnAssistantCheckpoint(
+    val id: String,
+    val content: String = "",
+    val timestamp: Long,
+    val isStreaming: Boolean = true,
+    val thinkingContent: String = "",
+    val isThinkingStreaming: Boolean = false,
+    val inputTokens: Int? = null,
+    val outputTokens: Int? = null,
+    val totalTokens: Int? = null,
+    val estimatedCost: Double? = null,
+    val agentName: String? = null,
+    val badges: List<String> = emptyList(),
+    val cards: List<HermesCard> = emptyList(),
+    val cardDispatches: List<HermesCardDispatch> = emptyList(),
+    val toolCalls: List<ChatTurnToolCheckpoint> = emptyList(),
+    val backgroundTask: ChatTurnBackgroundTaskCheckpoint? = null,
+)
+
+@Serializable
+data class ChatTurnToolCheckpoint(
+    val id: String? = null,
+    val name: String,
+    val result: String? = null,
+    val success: Boolean? = null,
+    val isComplete: Boolean = false,
+    val error: String? = null,
+    val runId: String? = null,
+    val provenance: String? = null,
+    val startedAt: Long,
+    val completedAt: Long? = null,
+    val isGenerating: Boolean = false,
+    val taskIndex: Int? = null,
+    val taskLabel: String? = null,
+)
+
+@Serializable
+data class ChatTurnBackgroundTaskCheckpoint(
+    val id: String,
+    val title: String,
+    val tier: String,
+    val phase: String,
+    val statusLine: String? = null,
+    val completedToolCount: Int = 0,
+    val queuedCount: Int = 0,
+    val startedAt: Long,
+)
+
+@Serializable
+data class ChatTurnAskCheckpoint(
+    val kind: String,
+    val requestId: String? = null,
+    val text: String,
+    val choices: List<String>? = null,
+    val envVar: String? = null,
+    val timeoutSeconds: Int,
+    val messageId: String,
+    val cardKey: String,
+    /** Original receive time, used to preserve an ask's expiry after reopen. */
+    val receivedAt: Long,
+)
+
+interface ChatTurnCheckpointStore {
+    suspend fun read(): ChatTurnCheckpoint?
+    suspend fun write(checkpoint: ChatTurnCheckpoint)
+    suspend fun clear()
+}
+
+class DataStoreChatTurnCheckpointStore(
+    private val dataStore: DataStore<Preferences>,
+    private val now: () -> Long = System::currentTimeMillis,
+) : ChatTurnCheckpointStore {
+    constructor(context: Context) : this(context.applicationContext.relayDataStore)
+
+    private val json = Json {
+        ignoreUnknownKeys = true
+        encodeDefaults = true
+        isLenient = true
+    }
+
+    override suspend fun read(): ChatTurnCheckpoint? {
+        val raw = runCatching { dataStore.data.first()[KEY_CHECKPOINT] }.getOrNull()
+            ?: return null
+        val checkpoint = runCatching { json.decodeFromString<ChatTurnCheckpoint>(raw) }.getOrNull()
+        if (checkpoint == null ||
+            checkpoint.schemaVersion != ChatTurnCheckpoint.CURRENT_SCHEMA ||
+            now() - checkpoint.updatedAt > ChatTurnCheckpoint.MAX_AGE_MS
+        ) {
+            // Cleanup is best-effort. In particular, Windows can briefly keep
+            // the just-read preferences file open and reject DataStore's atomic
+            // temp-file rename; an invalid checkpoint must still read as null.
+            runCatching { clear() }
+            return null
+        }
+        return checkpoint
+    }
+
+    override suspend fun write(checkpoint: ChatTurnCheckpoint) {
+        dataStore.edit { preferences ->
+            preferences[KEY_CHECKPOINT] = json.encodeToString(checkpoint)
+        }
+    }
+
+    override suspend fun clear() {
+        dataStore.edit { preferences -> preferences.remove(KEY_CHECKPOINT) }
+    }
+
+    private companion object {
+        val KEY_CHECKPOINT = stringPreferencesKey("chat_inflight_turn_checkpoint_v1")
+    }
+}
@@ -108,9 +108,36 @@ object DemoContent {
        ),
    )

+    /**
+     * Assistant reply appended when the user sends a message INSIDE demo
+     * mode. The composer must not be a silent no-op (it reads as broken —
+     * see the demo-polish TODO), but there is no server to answer, so the
+     * "reply" is an honest notice pointing at the exit path. Same content
+     * contract as the transcript: clientOnly, terminal, zero network.
+     *
+     * @param id unique message id supplied by the caller (UUID-based; two
+     *   rapid sends must not collide on LazyColumn keys).
+     * @param nowMs wall-clock timestamp for the bubble.
+     */
+    fun composerReply(id: String, nowMs: Long): ChatMessage = ChatMessage(
+        id = id,
+        role = MessageRole.ASSISTANT,
+        content = COMPOSER_REPLY,
+        timestamp = nowMs,
+        agentName = DEMO_AGENT_NAME,
+        badges = listOf("Demo"),
+        clientOnly = true,
+    )
+
    // --- Message bodies (Markdown). Kept as constants so the content is easy
    // to scan and the [transcript] builder stays readable. ---

+    private val COMPOSER_REPLY: String = """
+        This is the offline demo, so I can't answer for real — nothing here talks to a server.
+
+        Connect your own Hermes server to chat live: tap **Connect** in the demo banner above.
+    """.trimIndent()
+
    private val ASSISTANT_TOUR: String = """
        I'm **Hermes**, the agent running on *your* server. Here's a quick tour of what this app surfaces:

@@ -0,0 +1,69 @@
+package com.hermesandroid.relay.data
+
+/**
+ * A process event that upstream Hermes injected into transcript history as a
+ * synthetic user message.
+ *
+ * Hermes intentionally persists these events with role=user so the agent can
+ * react to them without breaking message-role alternation. UI code should use
+ * [ChatMessage.hermesProcessNotificationOrNull] to present them as process
+ * notices without changing their canonical role or content.
+ */
+data class HermesProcessNotification(
+    val processId: String,
+    val headline: String,
+    val detail: String?,
+)
+
+/**
+ * Recognizes the exact envelope emitted by upstream
+ * `tools.process_registry.format_process_notification` for background-process
+ * completion and watch events.
+ *
+ * The parser deliberately excludes other `[IMPORTANT: ...]` messages. Those
+ * can carry unrelated agent instructions and must continue through the normal
+ * transcript renderer.
+ */
+object HermesProcessNotificationParser {
+    private const val ENVELOPE_PREFIX = "[IMPORTANT: Background process "
+    private const val HEADLINE_PREFIX = "Background process "
+
+    fun parse(content: String): HermesProcessNotification? {
+        val normalized = content.trim()
+        if (!normalized.startsWith(ENVELOPE_PREFIX) || !normalized.endsWith(']')) {
+            return null
+        }
+
+        val body = normalized
+            .removePrefix("[IMPORTANT: ")
+            .dropLast(1)
+        val headline = body.substringBefore('\n').trim()
+        if (!headline.startsWith(HEADLINE_PREFIX)) return null
+
+        val identityAndStatus = headline.removePrefix(HEADLINE_PREFIX)
+        val processId = identityAndStatus.substringBefore(' ')
+        val status = identityAndStatus.substringAfter(' ', missingDelimiterValue = "")
+        if (processId.isBlank() || status.isBlank()) return null
+
+        val detail = body
+            .substringAfter('\n', missingDelimiterValue = "")
+            .trim()
+            .ifBlank { null }
+
+        return HermesProcessNotification(
+            processId = processId,
+            headline = headline,
+            detail = detail,
+        )
+    }
+}
+
+/**
+ * Returns the upstream process-notification presentation model only for the
+ * canonical synthetic user-row shape. The original [ChatMessage.role] remains
+ * [MessageRole.USER].
+ */
+fun ChatMessage.hermesProcessNotificationOrNull(): HermesProcessNotification? =
+    takeIf { it.role == MessageRole.USER }
+        ?.content
+        ?.let(HermesProcessNotificationParser::parse)
@@ -0,0 +1,191 @@
+package com.hermesandroid.relay.data
+
+/**
+ * One-tap bundles over voice settings that already exist in the app and relay.
+ *
+ * Presets intentionally do not own voice identity or routing: engine, audio
+ * route, provider, model, voice, enhanced-voice overrides, and background-run
+ * concurrency all remain exactly as the user configured them. A preset only
+ * coordinates interaction ergonomics, barge-in, Realtime trace/session
+ * behavior, and the existing ADR 33 background-delivery controls.
+ */
+enum class VoiceModePreset(
+    val displayName: String,
+    val shortLabel: String,
+    val description: String,
+    internal val localSettings: VoicePresetLocalSettings,
+    internal val bargeInUpdate: VoicePresetBargeInUpdate,
+    val promotionUpdate: VoicePresetPromotionUpdate,
+) {
+    HandsFree(
+        displayName = "Hands-free",
+        shortLabel = "Hands-free",
+        description =
+            "Continuous listening, exact answers, detailed trace, and low-noise " +
+                "spoken progress after 15 seconds. Your barge-in choice is preserved.",
+        localSettings = VoicePresetLocalSettings(
+            interactionMode = "continuous",
+            silenceThresholdMs = 1250L,
+            realtimeTraceDetails = true,
+            realtimePersistentSession = true,
+        ),
+        // Barge-in remains an explicit experimental opt-in until echo and
+        // self-recording hardening is complete. Never enable it via a preset.
+        bargeInUpdate = VoicePresetBargeInUpdate(),
+        promotionUpdate = VoicePresetPromotionUpdate(
+            enabled = true,
+            promoteAfterMs = 6000,
+            backgroundDefaultMode = "promote",
+            spokenHandoff = true,
+            progressSpokenAfterMs = 15000,
+            progressRepeatMs = 90000,
+            resultDelivery = "speak_verbatim",
+        ),
+    ),
+    LowLatency(
+        displayName = "Low latency",
+        shortLabel = "Fast",
+        description =
+            "Tap capture, the shortest supported silence window, a persistent " +
+                "session, and a fast visual handoff for long work.",
+        localSettings = VoicePresetLocalSettings(
+            interactionMode = "tap",
+            silenceThresholdMs = 750L,
+            realtimeTraceDetails = false,
+            realtimePersistentSession = true,
+        ),
+        bargeInUpdate = VoicePresetBargeInUpdate(enabled = false),
+        promotionUpdate = VoicePresetPromotionUpdate(
+            enabled = true,
+            promoteAfterMs = 2500,
+            backgroundDefaultMode = "promote",
+            spokenHandoff = false,
+            progressSpokenAfterMs = 0,
+            resultDelivery = "speak_when_idle",
+        ),
+    ),
+    CarefulTools(
+        displayName = "Careful tools",
+        shortLabel = "Careful",
+        description =
+            "Hold-to-talk, uninterrupted foreground tool runs, a detailed trace, and exact result delivery.",
+        localSettings = VoicePresetLocalSettings(
+            interactionMode = "hold",
+            silenceThresholdMs = 1750L,
+            realtimeTraceDetails = true,
+            realtimePersistentSession = true,
+        ),
+        bargeInUpdate = VoicePresetBargeInUpdate(enabled = false),
+        promotionUpdate = VoicePresetPromotionUpdate(
+            enabled = false,
+            backgroundDefaultMode = "foreground",
+            spokenHandoff = false,
+            progressSpokenAfterMs = 0,
+            resultDelivery = "speak_verbatim",
+        ),
+    ),
+    QuietVisualOnly(
+        displayName = "Quiet / visual-only",
+        shortLabel = "Quiet",
+        description =
+            "Manual capture with visual long-task handoffs and results. Normal short voice replies still speak.",
+        localSettings = VoicePresetLocalSettings(
+            interactionMode = "tap",
+            silenceThresholdMs = 1250L,
+            realtimeTraceDetails = true,
+            realtimePersistentSession = true,
+        ),
+        bargeInUpdate = VoicePresetBargeInUpdate(enabled = false),
+        promotionUpdate = VoicePresetPromotionUpdate(
+            enabled = true,
+            promoteAfterMs = 6000,
+            backgroundDefaultMode = "promote",
+            spokenHandoff = false,
+            progressSpokenAfterMs = 0,
+            resultDelivery = "visual_only",
+        ),
+    );
+
+    /** Apply only fields owned by this preset; every other value is preserved. */
+    fun applyTo(current: VoiceModePresetState): VoiceModePresetState =
+        current.copy(
+            voiceSettings = current.voiceSettings.copy(
+                interactionMode = localSettings.interactionMode,
+                silenceThresholdMs = localSettings.silenceThresholdMs,
+                realtimeTraceDetails = localSettings.realtimeTraceDetails,
+                realtimePersistentSession = localSettings.realtimePersistentSession,
+            ),
+            bargeInPreferences = current.bargeInPreferences.copy(
+                enabled = bargeInUpdate.enabled ?: current.bargeInPreferences.enabled,
+                sensitivity =
+                    bargeInUpdate.sensitivity ?: current.bargeInPreferences.sensitivity,
+                resumeAfterInterruption = bargeInUpdate.resumeAfterInterruption
+                    ?: current.bargeInPreferences.resumeAfterInterruption,
+            ),
+            promotion = current.promotion?.let(promotionUpdate::applyTo),
+        )
+
+    /** A preset is active only when every field it owns still matches. */
+    fun matches(current: VoiceModePresetState): Boolean =
+        current.promotion != null && applyTo(current) == current
+}
+
+/** Snapshot used by the pure preset reducer and active-preset detector. */
+data class VoiceModePresetState(
+    val voiceSettings: VoiceSettings,
+    val bargeInPreferences: BargeInPreferences,
+    val promotion: VoicePresetPromotionSettings?,
+)
+
+/** Relay promotion values mirrored without introducing a data -> network dependency. */
+data class VoicePresetPromotionSettings(
+    val enabled: Boolean = true,
+    val promoteAfterMs: Int = 6000,
+    val backgroundDefaultMode: String = "promote",
+    val spokenHandoff: Boolean = true,
+    val progressSpokenAfterMs: Int = 0,
+    val progressRepeatMs: Int = 90000,
+    val resultDelivery: String = "speak_verbatim",
+    val maxBackgroundRuns: Int = 1,
+)
+
+/** Nullable fields map directly to RelayVoiceClient's partial PATCH contract. */
+data class VoicePresetPromotionUpdate(
+    val enabled: Boolean? = null,
+    val promoteAfterMs: Int? = null,
+    val backgroundDefaultMode: String? = null,
+    val spokenHandoff: Boolean? = null,
+    val progressSpokenAfterMs: Int? = null,
+    val progressRepeatMs: Int? = null,
+    val resultDelivery: String? = null,
+    val maxBackgroundRuns: Int? = null,
+) {
+    internal fun applyTo(current: VoicePresetPromotionSettings): VoicePresetPromotionSettings =
+        current.copy(
+            enabled = enabled ?: current.enabled,
+            promoteAfterMs = promoteAfterMs ?: current.promoteAfterMs,
+            backgroundDefaultMode = backgroundDefaultMode ?: current.backgroundDefaultMode,
+            spokenHandoff = spokenHandoff ?: current.spokenHandoff,
+            progressSpokenAfterMs = progressSpokenAfterMs ?: current.progressSpokenAfterMs,
+            progressRepeatMs = progressRepeatMs ?: current.progressRepeatMs,
+            resultDelivery = resultDelivery ?: current.resultDelivery,
+            maxBackgroundRuns = maxBackgroundRuns ?: current.maxBackgroundRuns,
+        )
+}
+
+internal data class VoicePresetLocalSettings(
+    val interactionMode: String,
+    val silenceThresholdMs: Long,
+    val realtimeTraceDetails: Boolean,
+    val realtimePersistentSession: Boolean,
+)
+
+internal data class VoicePresetBargeInUpdate(
+    val enabled: Boolean? = null,
+    val sensitivity: BargeInSensitivity? = null,
+    val resumeAfterInterruption: Boolean? = null,
+)
+
+/** Null means the current manual values are Custom. */
+fun detectVoiceModePreset(current: VoiceModePresetState): VoiceModePreset? =
+    VoiceModePreset.entries.firstOrNull { it.matches(current) }
@@ -44,6 +44,9 @@ data class VoiceSettings(
     * docs/plans/2026-05-24-realtime-persistent-session.md.
     */
    val realtimePersistentSession: Boolean = true,
+    /** Per-profile Realtime Agent session overrides; blank uses relay config. */
+    val realtimeModel: String = "",
+    val realtimeVoice: String = "",
    /**
     * Enhanced-voice overrides for the relay TTS path, mapped onto the active
     * provider (Gemini / xAI). Empty string / false means "use the server's
@@ -154,9 +157,9 @@ class VoicePreferencesRepository(private val dataStore: DataStore<Preferences>)
        // over the hard default — see [scopedName] / [resolveString].
        //
        // Why these are per-profile: engine mode, audio route, and the
-        // enhanced-voice overrides describe *which voice the agent speaks
-        // with*, which is a property of the profile (the relay already
-        // persists `voice_output:`/`realtime_voice:` per profile and
+        // enhanced-voice and realtime-session overrides describe *which voice
+        // the agent speaks with*, which is a property of the profile (the relay
+        // already persists `voice_output:`/`realtime_voice:` per profile and
        // `RelayVoiceClient` already sends `?profile=`). Keeping them global
        // leaked one profile's voice onto every other profile.
        private const val KEY_ENGINE_MODE = "voice_engine_mode"
@@ -166,6 +169,8 @@ class VoicePreferencesRepository(private val dataStore: DataStore<Preferences>)
        private const val KEY_ENH_AUDIO_TAGS = "voice_enh_audio_tags"
        private const val KEY_ENH_PERSONA = "voice_enh_persona"
        private const val KEY_ENH_LANGUAGE = "voice_enh_language"
+        private const val KEY_REALTIME_MODEL = "voice_realtime_model"
+        private const val KEY_REALTIME_VOICE = "voice_realtime_voice"

        // --- Global keys (shared across profiles; never namespaced) ----------
        // Why these stay global: interaction-mode and silence-threshold are
@@ -214,8 +219,8 @@ class VoicePreferencesRepository(private val dataStore: DataStore<Preferences>)

    /**
     * Point the repository at a (connection, profile) scope. Per-profile reads
-     * and writes (engine/route/enhanced) re-target the namespaced keys for that
-     * profile; global prefs are unaffected. Passing a null/blank profile name
+     * and writes (engine/route/enhanced/realtime) re-target the namespaced keys
+     * for that profile; global prefs are unaffected. Passing a null/blank profile name
     * reverts per-profile reads/writes to the global base layer (the default
     * profile). Idempotent — a no-op when the normalized scope is unchanged.
     */
@@ -248,6 +253,8 @@ class VoicePreferencesRepository(private val dataStore: DataStore<Preferences>)
            enhancedAudioTags = resolveBoolean(prefs, KEY_ENH_AUDIO_TAGS, scope, false),
            enhancedPersona = resolveString(prefs, KEY_ENH_PERSONA, scope, ""),
            enhancedLanguage = resolveString(prefs, KEY_ENH_LANGUAGE, scope, ""),
+            realtimeModel = resolveString(prefs, KEY_REALTIME_MODEL, scope, ""),
+            realtimeVoice = resolveString(prefs, KEY_REALTIME_VOICE, scope, ""),
            // --- global (shared across profiles) ---
            interactionMode = prefs[KEY_INTERACTION_MODE] ?: DEFAULT_INTERACTION_MODE,
            silenceThresholdMs = prefs[KEY_SILENCE_THRESHOLD_MS] ?: DEFAULT_SILENCE_THRESHOLD_MS,
@@ -327,6 +334,29 @@ class VoicePreferencesRepository(private val dataStore: DataStore<Preferences>)
        dataStore.edit { it[key] = language.trim() }
    }

+    /** "" clears the override so new sessions use the relay's saved model. */
+    suspend fun setRealtimeModel(model: String) {
+        val key = stringPreferencesKey(scopedName(KEY_REALTIME_MODEL, _scope.value))
+        dataStore.edit { it[key] = model.trim() }
+    }
+
+    /** "" clears the override so new sessions use the relay's saved voice. */
+    suspend fun setRealtimeVoice(voice: String) {
+        val key = stringPreferencesKey(scopedName(KEY_REALTIME_VOICE, _scope.value))
+        dataStore.edit { it[key] = voice.trim() }
+    }
+
+    /** Persist a compatible model/voice pair without exposing a half-updated snapshot. */
+    suspend fun setRealtimeSelection(model: String, voice: String) {
+        val scope = _scope.value
+        val modelKey = stringPreferencesKey(scopedName(KEY_REALTIME_MODEL, scope))
+        val voiceKey = stringPreferencesKey(scopedName(KEY_REALTIME_VOICE, scope))
+        dataStore.edit {
+            it[modelKey] = model.trim()
+            it[voiceKey] = voice.trim()
+        }
+    }
+
    // --- global setters (always the un-namespaced key) -----------------------

    suspend fun setInteractionMode(mode: String) {
@@ -344,4 +374,31 @@ class VoicePreferencesRepository(private val dataStore: DataStore<Preferences>)
    suspend fun setRealtimePersistentSession(enabled: Boolean) {
        dataStore.edit { it[KEY_REALTIME_PERSISTENT_SESSION] = enabled }
    }
+
+    /**
+     * Atomically apply the phone-side portion of [preset]. Only fields owned by
+     * the preset are written, so route/provider/model/voice overrides and other
+     * preferences remain untouched. Barge-in shares this DataStore and is
+     * updated in the same transaction so observers never see a half-applied
+     * local preset.
+     */
+    suspend fun applyModePreset(preset: VoiceModePreset) {
+        val local = preset.localSettings
+        val bargeIn = preset.bargeInUpdate
+        dataStore.edit { prefs ->
+            prefs[KEY_INTERACTION_MODE] = local.interactionMode
+            prefs[KEY_SILENCE_THRESHOLD_MS] = local.silenceThresholdMs.coerceAtLeast(500L)
+            prefs[KEY_REALTIME_TRACE_DETAILS] = local.realtimeTraceDetails
+            prefs[KEY_REALTIME_PERSISTENT_SESSION] = local.realtimePersistentSession
+            bargeIn.enabled?.let {
+                prefs[BargeInPreferencesRepository.KEY_ENABLED] = it
+            }
+            bargeIn.sensitivity?.let {
+                prefs[BargeInPreferencesRepository.KEY_SENSITIVITY] = it.name
+            }
+            bargeIn.resumeAfterInterruption?.let {
+                prefs[BargeInPreferencesRepository.KEY_RESUME_AFTER_INTERRUPTION] = it
+            }
+        }
+    }
 }
@@ -169,7 +169,7 @@ object EventStore {
            )

            if (buffer.size >= MAX_ENTRIES) {
-                buffer.removeFirst()
+                buffer.removeAt(0)
            }
            buffer.addLast(entry)
        }
@@ -6,6 +6,7 @@ import android.net.Network
 import android.net.NetworkCapabilities
 import android.net.NetworkRequest
 import android.util.Log
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.auth.CertPinStore
 import com.hermesandroid.relay.data.EndpointCandidate
 import com.hermesandroid.relay.data.PairingPreferences
@@ -42,6 +43,20 @@ enum class ConnectionState {
    Reconnecting
 }

+/**
+ * Build an OkHttp request for a relay socket URL, or `null` if the URL is
+ * malformed. OkHttp's [Request.Builder.url] throws [IllegalArgumentException]
+ * on an invalid host; the relay connect runs on a background coroutine, so an
+ * uncaught throw crashes the app (the #131 "Invalid URL host" class). Callers
+ * treat `null` as a connection failure instead of letting it propagate.
+ */
+internal fun buildRelayRequestOrNull(url: String): Request? =
+    try {
+        Request.Builder().url(url).build()
+    } catch (e: IllegalArgumentException) {
+        null
+    }
+
 class ConnectionManager(
    private val multiplexer: ChannelMultiplexer,
    /**
@@ -292,7 +307,7 @@ class ConnectionManager(
            DiagnosticsLog.record(
                category = DiagnosticCategory.Relay,
                severity = DiagnosticSeverity.Warning,
-                title = "Insecure relay mode enabled",
+                title = context?.getString(R.string.conn_diag_insecure_mode) ?: "Insecure relay mode enabled",
                detail = "ws:// connections are allowed",
            )
        }
@@ -318,7 +333,7 @@ class ConnectionManager(
                DiagnosticsLog.record(
                    category = DiagnosticCategory.Relay,
                    severity = DiagnosticSeverity.Info,
-                    title = "Relay route selected",
+                    title = context?.getString(R.string.conn_diag_route_selected) ?: "Relay route selected",
                    endpointRole = resolved.role,
                    url = resolved.relay.url,
                )
@@ -328,7 +343,7 @@ class ConnectionManager(
                DiagnosticsLog.record(
                    category = DiagnosticCategory.Relay,
                    severity = DiagnosticSeverity.Warning,
-                    title = "Using configured relay URL",
+                    title = context?.getString(R.string.conn_diag_using_configured_url) ?: "Using configured relay URL",
                    detail = "No resolver winner",
                    url = url,
                )
@@ -354,7 +369,7 @@ class ConnectionManager(
            DiagnosticsLog.record(
                category = DiagnosticCategory.Relay,
                severity = DiagnosticSeverity.Error,
-                title = "Relay socket blocked",
+                title = context?.getString(R.string.conn_diag_socket_blocked) ?: "Relay socket blocked",
                detail = "ws:// is disabled",
                url = url,
            )
@@ -365,7 +380,7 @@ class ConnectionManager(
            DiagnosticsLog.record(
                category = DiagnosticCategory.Relay,
                severity = DiagnosticSeverity.Error,
-                title = "Relay socket URL invalid",
+                title = context?.getString(R.string.conn_diag_url_invalid) ?: "Relay socket URL invalid",
                detail = "URL must start with ws:// or wss://",
                url = url,
            )
@@ -394,14 +409,14 @@ class ConnectionManager(
            DiagnosticsLog.record(
                category = DiagnosticCategory.Relay,
                severity = DiagnosticSeverity.Warning,
-                title = "Opening insecure relay socket",
+                title = context?.getString(R.string.conn_diag_opening_insecure) ?: "Opening insecure relay socket",
                url = normalized,
            )
        } else {
            DiagnosticsLog.record(
                category = DiagnosticCategory.Relay,
                severity = DiagnosticSeverity.Info,
-                title = "Opening relay socket",
+                title = context?.getString(R.string.conn_diag_opening_socket) ?: "Opening relay socket",
                url = normalized,
            )
        }
@@ -743,7 +758,7 @@ class ConnectionManager(
        DiagnosticsLog.record(
            category = DiagnosticCategory.Relay,
            severity = DiagnosticSeverity.Info,
-            title = "Relay socket disconnect requested",
+            title = context?.getString(R.string.conn_diag_disconnect_requested) ?: "Relay socket disconnect requested",
            url = serverUrl,
        )
        webSocket?.close(1000, "Client disconnect")
@@ -828,9 +843,30 @@ class ConnectionManager(
        authenticated = false
        client = buildClient()

-        val request = Request.Builder()
-            .url(url)
-            .build()
+        val request = buildRelayRequestOrNull(url)
+        if (request == null) {
+            // A malformed relay URL (an invalid/empty host from a corrupt or
+            // hand-edited pairing payload) can't be built into a request. This
+            // runs on a background coroutine, so letting OkHttp's url() throw
+            // would crash the app — the #131 "Invalid URL host" class, relay-
+            // socket half. Route it through the same path onFailure uses.
+            Log.e(TAG, "doConnect: malformed relay URL '$url' — not connecting")
+            DiagnosticsLog.record(
+                category = DiagnosticCategory.Relay,
+                severity = DiagnosticSeverity.Error,
+                title = "Invalid relay URL",
+                detail = "The relay address could not be parsed; re-pair to refresh it.",
+                url = url,
+            )
+            authenticated = false
+            _connectionState.value = ConnectionState.Disconnected
+            previousSocketToClose?.let { stale ->
+                runCatching { stale.close(1000, replaceReason) }
+                stale.cancel()
+            }
+            scheduleReconnect()
+            return
+        }

        Log.i(TAG, "doConnect: opening WSS to $url")
        val newSocket = client.newWebSocket(request, object : WebSocketListener() {
@@ -849,7 +885,7 @@ class ConnectionManager(
                DiagnosticsLog.record(
                    category = DiagnosticCategory.Relay,
                    severity = DiagnosticSeverity.Info,
-                    title = "Relay socket connected",
+                    title = context?.getString(R.string.conn_diag_connected) ?: "Relay socket connected",
                    url = url,
                )

@@ -909,7 +945,7 @@ class ConnectionManager(
                DiagnosticsLog.record(
                    category = DiagnosticCategory.Relay,
                    severity = DiagnosticSeverity.Warning,
-                    title = "Relay socket closed",
+                    title = context?.getString(R.string.conn_diag_closed) ?: "Relay socket closed",
                    detail = "code=$code reason=$reason",
                    url = url,
                )
@@ -928,7 +964,7 @@ class ConnectionManager(
                DiagnosticsLog.record(
                    category = DiagnosticCategory.Relay,
                    severity = DiagnosticSeverity.Error,
-                    title = "Relay socket failed",
+                    title = context?.getString(R.string.conn_diag_failed) ?: "Relay socket failed",
                    detail = listOfNotNull(
                        t.javaClass.simpleName,
                        t.message,
@@ -977,7 +1013,7 @@ class ConnectionManager(
            DiagnosticsLog.record(
                category = DiagnosticCategory.Session,
                severity = DiagnosticSeverity.Warning,
-                title = "Relay reconnect skipped",
+                title = context?.getString(R.string.conn_diag_reconnect_skipped) ?: "Relay reconnect skipped",
                detail = "No paired session or pending pair code",
                url = serverUrl,
            )
@@ -1001,7 +1037,7 @@ class ConnectionManager(
                DiagnosticsLog.record(
                    category = DiagnosticCategory.Relay,
                    severity = DiagnosticSeverity.Warning,
-                    title = "Relay reconnect delayed",
+                    title = context?.getString(R.string.conn_diag_reconnect_delayed) ?: "Relay reconnect delayed",
                    detail = "Rate limited; retrying in ${RATE_LIMIT_BACKOFF_MS / 1000}s",
                    url = url,
                )
@@ -1014,7 +1050,7 @@ class ConnectionManager(
                DiagnosticsLog.record(
                    category = DiagnosticCategory.Relay,
                    severity = DiagnosticSeverity.Warning,
-                    title = "Relay reconnect slow-polling",
+                    title = context?.getString(R.string.conn_diag_reconnect_slow_poll) ?: "Relay reconnect slow-polling",
                    detail = "Server unreachable for a while; retrying every ${SLOW_POLL_BACKOFF_MS / 1000}s until it recovers (a network change reconnects immediately)",
                    url = url,
                )
@@ -1026,7 +1062,7 @@ class ConnectionManager(
                DiagnosticsLog.record(
                    category = DiagnosticCategory.Relay,
                    severity = DiagnosticSeverity.Info,
-                    title = "Relay reconnect scheduled",
+                    title = context?.getString(R.string.conn_diag_reconnect_scheduled) ?: "Relay reconnect scheduled",
                    detail = "Retrying in ${ms / 1000}s",
                    url = url,
                )
@@ -1,6 +1,8 @@
 package com.hermesandroid.relay.network.relay

+import android.content.Context
 import android.util.Log
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.auth.PairedDeviceInfo
 import com.hermesandroid.relay.diagnostics.DiagnosticCategory
 import com.hermesandroid.relay.diagnostics.DiagnosticSeverity
@@ -13,6 +15,7 @@ import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.jsonObject
 import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -47,6 +50,9 @@ class RelayHttpClient(
     *  paired). Lets [mediaUrlConfigured] check fetch-readiness without
     *  suspending; mirrors what [sessionTokenProvider] resolves. */
    private val pairedTokenSnapshot: () -> String? = { null },
+    /** Application context for localized string resources. Nullable for
+     *  backwards-compat with call sites that don't need localization. */
+    private val context: Context? = null,
 ) {

    companion object {
@@ -153,7 +159,10 @@ class RelayHttpClient(
            .replace(Regex("^ws://", RegexOption.IGNORE_CASE), "http://")
            .trimEnd('/')

-        val url = "$httpBase/media/$token"
+        val url = "$httpBase/media/$token".toHttpUrlOrNull()
+            ?: return@withContext Result.failure(
+                IllegalArgumentException("Invalid relay URL: $httpBase")
+            )

        val request = Request.Builder()
            .url(url)
@@ -597,7 +606,10 @@ class RelayHttpClient(
            .replace(Regex("^ws://", RegexOption.IGNORE_CASE), "http://")
            .trimEnd('/')

-        val url = "$httpBase/sessions"
+        val url = "$httpBase/sessions".toHttpUrlOrNull()
+            ?: return@withContext Result.failure(
+                IllegalArgumentException("Invalid relay URL: $httpBase")
+            )
        val request = Request.Builder()
            .url(url)
            .get()
@@ -897,7 +909,7 @@ class RelayHttpClient(
            DiagnosticsLog.record(
                category = DiagnosticCategory.Relay,
                severity = DiagnosticSeverity.Error,
-                title = "Relay URL invalid",
+                title = context?.getString(R.string.http_diag_url_invalid) ?: "Relay URL invalid",
                detail = e.message,
                url = relayUrl,
            )
@@ -927,7 +939,7 @@ class RelayHttpClient(
                    DiagnosticsLog.record(
                        category = DiagnosticCategory.Relay,
                        severity = DiagnosticSeverity.Warning,
-                        title = "Relay health failed",
+                        title = context?.getString(R.string.http_diag_health_failed) ?: "Relay health failed",
                        detail = "HTTP ${response.code}",
                        url = httpBase,
                        elapsedMs = System.currentTimeMillis() - startedAtMs,
@@ -941,7 +953,7 @@ class RelayHttpClient(
                    DiagnosticsLog.record(
                        category = DiagnosticCategory.Relay,
                        severity = DiagnosticSeverity.Warning,
-                        title = "Relay health failed",
+                        title = context?.getString(R.string.http_diag_health_failed) ?: "Relay health failed",
                        detail = "Empty response",
                        url = httpBase,
                        elapsedMs = System.currentTimeMillis() - startedAtMs,
@@ -958,7 +970,7 @@ class RelayHttpClient(
                    DiagnosticsLog.record(
                        category = DiagnosticCategory.Relay,
                        severity = DiagnosticSeverity.Warning,
-                        title = "Relay health failed",
+                        title = context?.getString(R.string.http_diag_health_failed) ?: "Relay health failed",
                        detail = "Non-JSON response",
                        url = httpBase,
                        elapsedMs = System.currentTimeMillis() - startedAtMs,
@@ -972,7 +984,7 @@ class RelayHttpClient(
                    DiagnosticsLog.record(
                        category = DiagnosticCategory.Relay,
                        severity = DiagnosticSeverity.Warning,
-                        title = "Relay health failed",
+                        title = context?.getString(R.string.http_diag_health_failed) ?: "Relay health failed",
                        detail = "status=${status ?: "missing"}",
                        url = httpBase,
                        elapsedMs = System.currentTimeMillis() - startedAtMs,
@@ -986,7 +998,7 @@ class RelayHttpClient(
                    DiagnosticsLog.record(
                        category = DiagnosticCategory.Relay,
                        severity = DiagnosticSeverity.Warning,
-                        title = "Relay health failed",
+                        title = context?.getString(R.string.http_diag_health_failed) ?: "Relay health failed",
                        detail = "Missing version field",
                        url = httpBase,
                        elapsedMs = System.currentTimeMillis() - startedAtMs,
@@ -1003,7 +1015,7 @@ class RelayHttpClient(
                    DiagnosticsLog.record(
                        category = DiagnosticCategory.Relay,
                        severity = DiagnosticSeverity.Info,
-                        title = "Relay health ok",
+                        title = context?.getString(R.string.http_diag_health_ok) ?: "Relay health ok",
                        detail = "version=$version clients=$clients sessions=$sessions",
                        url = httpBase,
                        elapsedMs = System.currentTimeMillis() - startedAtMs,
@@ -1016,7 +1028,7 @@ class RelayHttpClient(
            DiagnosticsLog.record(
                category = DiagnosticCategory.Relay,
                severity = DiagnosticSeverity.Warning,
-                title = "Relay health timeout",
+                title = context?.getString(R.string.http_diag_health_timeout) ?: "Relay health timeout",
                detail = "No HTTP response in 3s",
                url = httpBase,
                elapsedMs = System.currentTimeMillis() - startedAtMs,
@@ -1027,7 +1039,7 @@ class RelayHttpClient(
            DiagnosticsLog.record(
                category = DiagnosticCategory.Relay,
                severity = DiagnosticSeverity.Error,
-                title = "Relay connection refused",
+                title = context?.getString(R.string.http_diag_conn_refused) ?: "Relay connection refused",
                detail = e.message,
                url = httpBase,
                elapsedMs = System.currentTimeMillis() - startedAtMs,
@@ -1038,7 +1050,7 @@ class RelayHttpClient(
            DiagnosticsLog.record(
                category = DiagnosticCategory.Relay,
                severity = DiagnosticSeverity.Warning,
-                title = "Relay health failed",
+                title = context?.getString(R.string.http_diag_health_failed) ?: "Relay health failed",
                detail = e.message ?: "Network error",
                url = httpBase,
                elapsedMs = System.currentTimeMillis() - startedAtMs,
@@ -1049,7 +1061,7 @@ class RelayHttpClient(
            DiagnosticsLog.record(
                category = DiagnosticCategory.Relay,
                severity = DiagnosticSeverity.Error,
-                title = "Relay health failed",
+                title = context?.getString(R.string.http_diag_health_failed) ?: "Relay health failed",
                detail = e.message ?: e.javaClass.simpleName,
                url = httpBase,
                elapsedMs = System.currentTimeMillis() - startedAtMs,
@@ -1,6 +1,8 @@
 package com.hermesandroid.relay.network.shared

+import android.content.Context
 import android.util.Log
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.data.EndpointCandidate
 import com.hermesandroid.relay.diagnostics.DiagnosticCategory
 import com.hermesandroid.relay.diagnostics.DiagnosticSeverity
@@ -85,6 +87,12 @@ class EndpointResolver(
     * tests feed a mutable clock to exercise the 30-second TTL.
     */
    private val clock: () -> Long = { System.currentTimeMillis() },
+    /**
+     * Application context for localized string resources. When null the
+     * resolver falls back to hardcoded English strings — this is the
+     * expected path for plain JVM tests.
+     */
+    private val context: Context? = null,
 ) {

    /**
@@ -190,7 +198,7 @@ class EndpointResolver(
                DiagnosticsLog.record(
                    category = DiagnosticCategory.Endpoint,
                    severity = DiagnosticSeverity.Info,
-                    title = "Endpoint selected",
+                    title = context?.getString(R.string.endpoint_diag_selected) ?: "Endpoint selected",
                    detail = "priority=$priority",
                    endpointRole = winner.role,
                    url = winner.relay.url,
@@ -203,7 +211,7 @@ class EndpointResolver(
        DiagnosticsLog.record(
            category = DiagnosticCategory.Endpoint,
            severity = DiagnosticSeverity.Warning,
-            title = "No reachable endpoint",
+            title = context?.getString(R.string.endpoint_diag_no_reachable) ?: "No reachable endpoint",
            detail = "${candidates.size} configured route(s) failed health probes",
        )
        return null
@@ -288,7 +296,7 @@ class EndpointResolver(
                DiagnosticsLog.record(
                    category = DiagnosticCategory.Endpoint,
                    severity = DiagnosticSeverity.Error,
-                    title = "Endpoint probe invalid",
+                    title = context?.getString(R.string.endpoint_diag_probe_invalid) ?: "Endpoint probe invalid",
                    detail = "Invalid API URL",
                    endpointRole = candidate.role,
                    url = candidate.api.url,
@@ -312,10 +320,15 @@ class EndpointResolver(
                withTimeoutOrNull(PROBE_TIMEOUT_MS + 200L) {
                    fastClient.newCall(request).execute().use { resp ->
                        val ok = resp.isSuccessful
+                        val probeTitle = if (ok) {
+                            context?.getString(R.string.endpoint_diag_probe_ok) ?: "Endpoint probe ok"
+                        } else {
+                            context?.getString(R.string.endpoint_diag_probe_failed) ?: "Endpoint probe failed"
+                        }
                        DiagnosticsLog.record(
                            category = DiagnosticCategory.Endpoint,
                            severity = if (ok) DiagnosticSeverity.Info else DiagnosticSeverity.Warning,
-                            title = if (ok) "Endpoint probe ok" else "Endpoint probe failed",
+                            title = probeTitle,
                            detail = if (ok) null else "HTTP ${resp.code}",
                            endpointRole = candidate.role,
                            url = candidate.api.url,
@@ -332,7 +345,7 @@ class EndpointResolver(
                    DiagnosticsLog.record(
                        category = DiagnosticCategory.Endpoint,
                        severity = DiagnosticSeverity.Warning,
-                        title = "Endpoint probe timeout",
+                        title = context?.getString(R.string.endpoint_diag_probe_timeout) ?: "Endpoint probe timeout",
                        detail = "No /health response in ${PROBE_TIMEOUT_MS}ms",
                        endpointRole = candidate.role,
                        url = candidate.api.url,
@@ -345,7 +358,7 @@ class EndpointResolver(
                DiagnosticsLog.record(
                    category = DiagnosticCategory.Endpoint,
                    severity = DiagnosticSeverity.Warning,
-                    title = "Endpoint probe timeout",
+                    title = context?.getString(R.string.endpoint_diag_probe_timeout) ?: "Endpoint probe timeout",
                    detail = "No /health response in ${PROBE_TIMEOUT_MS}ms",
                    endpointRole = candidate.role,
                    url = candidate.api.url,
@@ -359,7 +372,7 @@ class EndpointResolver(
                DiagnosticsLog.record(
                    category = DiagnosticCategory.Endpoint,
                    severity = DiagnosticSeverity.Warning,
-                    title = "Endpoint probe failed",
+                    title = context?.getString(R.string.endpoint_diag_probe_failed) ?: "Endpoint probe failed",
                    detail = e.javaClass.simpleName,
                    endpointRole = candidate.role,
                    url = candidate.api.url,
@@ -2,8 +2,11 @@ package com.hermesandroid.relay.network.upstream

 import android.util.Log
 import com.hermesandroid.relay.data.Attachment
+import com.hermesandroid.relay.data.BackgroundTaskPhase
+import com.hermesandroid.relay.data.BackgroundTaskState
 import com.hermesandroid.relay.data.ChatMessage
 import com.hermesandroid.relay.data.ChatSession
+import com.hermesandroid.relay.data.ChatTurnCheckpoint
 import com.hermesandroid.relay.data.HermesCard
 import com.hermesandroid.relay.data.MessageDeliveryStatus
 import com.hermesandroid.relay.data.MessageRole
@@ -15,6 +18,7 @@ import com.hermesandroid.relay.network.upstream.GatewaySubagentEvent
 import com.hermesandroid.relay.network.upstream.models.MessageItem
 import com.hermesandroid.relay.network.upstream.models.RelayStreamEventEnvelope
 import com.hermesandroid.relay.network.upstream.models.SessionItem
+import com.hermesandroid.relay.voice.RealtimeTurnSyncBuilder
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -241,9 +245,8 @@ class ChatHandler {

    // User-chosen Thread names (sessionId → name), authoritative over the
    // server's auto-title — applied in [updateSessions] so the gateway's async
-    // auto-titler can't clobber the name. Fed by ChatViewModel. In-memory for
-    // now (survives list refreshes within a session); cross-restart persistence
-    // is a follow-up (see TODO).
+    // auto-titler can't clobber the name. ChatViewModel hydrates this map from
+    // ThreadNameStore, so names survive both list refreshes and app restarts.
    private val userThreadNames = mutableMapOf<String, String>()

    /** Record a user-chosen name for one Thread session + re-apply it now. */
@@ -365,6 +368,31 @@ class ChatHandler {
        }
    }

+    /** Attach the first Chat-visible state for a promoted/durable Hermes run. */
+    fun setBackgroundTask(messageId: String, task: BackgroundTaskState) {
+        _messages.update { list ->
+            list.map { message ->
+                if (message.id == messageId) message.copy(backgroundTask = task) else message
+            }
+        }
+    }
+
+    /** Update an existing task in place; no-op when the message/task is absent. */
+    fun updateBackgroundTask(
+        messageId: String,
+        transform: (BackgroundTaskState) -> BackgroundTaskState,
+    ) {
+        _messages.update { list ->
+            list.map { message ->
+                if (message.id == messageId && message.backgroundTask != null) {
+                    message.copy(backgroundTask = transform(message.backgroundTask))
+                } else {
+                    message
+                }
+            }
+        }
+    }
+
    /**
     * 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
@@ -476,6 +504,11 @@ class ChatHandler {
        }
    }

+    /** Remove a provisional client-side message that never became a real turn. */
+    fun removeMessage(messageId: String) {
+        _messages.update { messages -> messages.filterNot { it.id == messageId } }
+    }
+
    /**
     * Append a local-only voice-intent trace to the chat scroll. Used by
     * the sideload voice intent flow (`RealVoiceBridgeIntentHandler`) so
@@ -857,6 +890,136 @@ class ChatHandler {
        }
    }

+    /**
+     * Rehydrate the last client-owned state of an unfinished turn.
+     *
+     * The caller loads server history first. That means the user row may already
+     * be present while the assistant row is not yet durable; positional matching
+     * avoids duplicating short repeated prompts. Rich assistant-only state is
+     * then restored so thinking and tool cards do not reset to an empty spinner.
+     */
+    fun restoreInFlightTurn(
+        checkpoint: ChatTurnCheckpoint,
+        upstreamAssistantText: String? = null,
+    ) {
+        val user = checkpoint.user
+        val assistant = checkpoint.assistant
+        val upstreamText = upstreamAssistantText.orEmpty()
+        val currentAssistant = _messages.value.lastOrNull { it.id == assistant.id }
+        val restoredContent = listOf(
+            assistant.content,
+            upstreamText,
+            currentAssistant?.content.orEmpty(),
+        ).maxByOrNull { it.length }.orEmpty()
+        val checkpointTools = assistant.toolCalls.map { tool ->
+            ToolCall(
+                id = tool.id,
+                name = tool.name,
+                args = null,
+                result = tool.result,
+                success = tool.success,
+                isComplete = tool.isComplete,
+                error = tool.error,
+                runId = tool.runId,
+                provenance = tool.provenance,
+                startedAt = tool.startedAt,
+                completedAt = tool.completedAt,
+                isGenerating = tool.isGenerating,
+                taskIndex = tool.taskIndex,
+                taskLabel = tool.taskLabel,
+            )
+        }
+        val currentTools = currentAssistant?.toolCalls.orEmpty()
+        val restoredTools = buildList {
+            checkpointTools.forEach { checkpointTool ->
+                val live = currentTools.firstOrNull {
+                    (it.id != null && it.id == checkpointTool.id) ||
+                        (it.id == null && checkpointTool.id == null &&
+                            it.name == checkpointTool.name &&
+                            it.taskIndex == checkpointTool.taskIndex)
+                }
+                add(live ?: checkpointTool)
+            }
+            currentTools.filterTo(this) { live ->
+                checkpointTools.none { checkpointTool ->
+                    (live.id != null && live.id == checkpointTool.id) ||
+                        (live.id == null && checkpointTool.id == null &&
+                            live.name == checkpointTool.name &&
+                            live.taskIndex == checkpointTool.taskIndex)
+                }
+            }
+        }
+        val restoredBackgroundTask = assistant.backgroundTask?.let { task ->
+            BackgroundTaskState(
+                id = task.id,
+                title = task.title,
+                tier = task.tier,
+                phase = runCatching { BackgroundTaskPhase.valueOf(task.phase) }
+                    .getOrDefault(BackgroundTaskPhase.RUNNING),
+                statusLine = task.statusLine,
+                completedToolCount = task.completedToolCount,
+                queuedCount = task.queuedCount,
+                startedAt = task.startedAt,
+            )
+        }
+        val restoredAssistant = ChatMessage(
+            id = assistant.id,
+            role = MessageRole.ASSISTANT,
+            content = restoredContent,
+            timestamp = assistant.timestamp,
+            isStreaming = true,
+            toolCalls = restoredTools,
+            thinkingContent = listOf(
+                assistant.thinkingContent,
+                currentAssistant?.thinkingContent.orEmpty(),
+            ).maxByOrNull { it.length }.orEmpty(),
+            isThinkingStreaming = currentAssistant?.isThinkingStreaming
+                ?: assistant.isThinkingStreaming,
+            inputTokens = currentAssistant?.inputTokens ?: assistant.inputTokens,
+            outputTokens = currentAssistant?.outputTokens ?: assistant.outputTokens,
+            totalTokens = currentAssistant?.totalTokens ?: assistant.totalTokens,
+            estimatedCost = currentAssistant?.estimatedCost ?: assistant.estimatedCost,
+            agentName = currentAssistant?.agentName ?: assistant.agentName ?: activeAgentName,
+            badges = (assistant.badges + currentAssistant?.badges.orEmpty()).distinct(),
+            cards = currentAssistant?.cards?.takeIf { it.isNotEmpty() } ?: assistant.cards,
+            cardDispatches = currentAssistant?.cardDispatches?.takeIf { it.isNotEmpty() }
+                ?: assistant.cardDispatches,
+            backgroundTask = currentAssistant?.backgroundTask ?: restoredBackgroundTask,
+        )
+
+        activeAgentName = restoredAssistant.agentName ?: activeAgentName
+        _messages.update { current ->
+            val withoutOldAssistant = current.filterNot { it.id == assistant.id }
+            val users = withoutOldAssistant.filter { it.role == MessageRole.USER }
+            val positionalUser = users.getOrNull(checkpoint.priorUserMessageCount)
+            val hasUser = withoutOldAssistant.any { it.id == user.id } ||
+                positionalUser?.content?.trim() == user.content.trim()
+            val withUser = if (hasUser) {
+                withoutOldAssistant
+            } else {
+                withoutOldAssistant + ChatMessage(
+                    id = user.id,
+                    role = MessageRole.USER,
+                    content = user.content,
+                    timestamp = user.timestamp,
+                )
+            }
+            val insertBeforeAsk = withUser.indexOfFirst {
+                it.clientOnly && it.id.startsWith("ask-")
+            }
+            val restored = if (insertBeforeAsk >= 0) {
+                withUser.toMutableList().apply { add(insertBeforeAsk, restoredAssistant) }
+            } else {
+                withUser + restoredAssistant
+            }
+            restored.let { list ->
+                if (list.size > MAX_MESSAGES) list.drop(list.size - MAX_MESSAGES) else list
+            }
+        }
+        _isStreaming.value = true
+        _turnStatus.value = checkpoint.turnStatus ?: "Reconnecting to the active turn…"
+    }
+
    fun clearMessages() {
        _messages.value = emptyList()
        // Drop any pending line buffers / dedupe state so a fresh session
@@ -1027,6 +1190,11 @@ class ChatHandler {
            }
        }

+        // Trimmed assistant texts of synced provider-answered realtime turns
+        // found in this reload — used below to drop their superseded local
+        // clientOnly bubbles (same exchange, pre-sync copy).
+        val syncedRealtimeTurnContents = mutableSetOf<String>()
+
        val loaded = items.mapNotNull { item ->
            val role = when (item.role) {
                "user" -> MessageRole.USER
@@ -1076,7 +1244,7 @@ class ChatHandler {
            // straight onto the reconstructed ChatMessage and strip their
            // lines from the displayed content in the same pass. No
            // post-assignment dispatch needed.
-            val (cleanedContent, extractedCards) = if (
+            val (cardCleanedContent, extractedCards) = if (
                role == MessageRole.ASSISTANT && afterMedia.isNotEmpty()
            ) {
                extractCardsFromContent(afterMedia)
@@ -1084,6 +1252,23 @@ class ChatHandler {
                afterMedia to emptyList()
            }

+            // A provider-answered realtime voice turn synced into the session
+            // (RealtimeTurnSyncBuilder) carries a trailing provenance marker —
+            // "[Realtime Agent provider-native voice turn: provider=…]" — in
+            // its assistant text. Render it as the quiet "Realtime Agent"
+            // badge (same chip live turns get) instead of raw bracket noise,
+            // and remember the stripped text so the superseded local
+            // clientOnly bubble can be dropped below instead of duplicating
+            // the exchange.
+            val strippedRealtimeContent = if (role == MessageRole.ASSISTANT) {
+                RealtimeTurnSyncBuilder.stripProvenanceMarker(cardCleanedContent)
+            } else {
+                null
+            }
+            val isSyncedRealtimeTurn = strippedRealtimeContent != null
+            val cleanedContent = strippedRealtimeContent ?: cardCleanedContent
+            if (isSyncedRealtimeTurn) syncedRealtimeTurnContents.add(cleanedContent.trim())
+
            val prior = priorById[messageId]
            // Outbound attachments: prefer an id-match (covers any future
            // user-message id reconciliation), else fall back to the
@@ -1135,6 +1320,11 @@ class ChatHandler {
                    } else {
                        ""
                    },
+                    badges = if (isSyncedRealtimeTurn && "Realtime Agent" !in prior.badges) {
+                        prior.badges + "Realtime Agent"
+                    } else {
+                        prior.badges
+                    },
                )
            } else {
                // INSERT — a server message with no local row yet. Built from
@@ -1153,6 +1343,7 @@ class ChatHandler {
                    // Server persists per-message reasoning — restore it so the
                    // Thought-process block survives returning to the chat.
                    thinkingContent = if (role == MessageRole.ASSISTANT) serverThinking ?: "" else "",
+                    badges = if (isSyncedRealtimeTurn) listOf("Realtime Agent") else emptyList(),
                )
            }
        }
@@ -1180,7 +1371,19 @@ class ChatHandler {
        // but IS in the transcript, so it reconciles normally; only clientOnly +
        // absent-from-transcript marks a preservable orphan.
        val loadedIds = loaded.mapTo(HashSet()) { it.id }
-        val preservedLocal = _messages.value.filter { it.clientOnly && it.id !in loadedIds }
+        val preservedLocal = _messages.value.filter { msg ->
+            if (!msg.clientOnly || msg.id in loadedIds) return@filter false
+            // Drop a provider-answered realtime bubble whose SYNCED copy just
+            // loaded from the server transcript (matched on the synced
+            // assistant text) — keeping both would render the exchange twice.
+            // Unsynced traces are always preserved: they are still the only
+            // record of the turn.
+            val trace = msg.realtimeTurn
+            !(
+                trace != null && trace.syncedToServer &&
+                    trace.assistantText.trim() in syncedRealtimeTurnContents
+                )
+        }
        val merged = if (preservedLocal.isEmpty()) {
            loaded
        } else {
@@ -2769,6 +2972,10 @@ class ChatHandler {
    fun setLastSentMessage(text: String) {
        _lastSentMessage.value = text
    }
+
+    fun clearLastSentMessage() {
+        _lastSentMessage.value = null
+    }
 }

 /**
@@ -7,6 +7,9 @@ import com.hermesandroid.relay.network.upstream.models.MessageItem
 import com.hermesandroid.relay.network.upstream.models.MessageListResponse
 import com.hermesandroid.relay.network.upstream.models.SessionItem
 import com.hermesandroid.relay.network.upstream.models.SessionListResponse
+import com.hermesandroid.relay.network.upstream.models.SessionPruneFilters
+import com.hermesandroid.relay.network.upstream.models.SessionPrunePreview
+import com.hermesandroid.relay.network.upstream.models.SessionPruneResult
 import com.hermesandroid.relay.auth.SecureStoreCache
 import com.hermesandroid.relay.auth.SessionTokenStore
 import com.hermesandroid.relay.auth.buildRawTokenStore
@@ -270,8 +273,27 @@ class DashboardApiClient(
        getJson("/api/audio/elevenlabs/voices").mapCatching { parseElevenLabsVoices(it) }
    }

-    /** Full provider/model universe — REST twin of the TUI's `model.options` RPC. */
-    suspend fun getModelOptions(): Result<JsonObject> = getJsonObject("/api/model/options")
+    /**
+     * Full provider/model universe — REST twin of the TUI's `model.options` RPC.
+     *
+     * Always opts into `include_unconfigured=1`: newer upstream defaults this
+     * route to configured-providers-only, which would silently drop the
+     * unauthenticated skeleton rows Manage renders as its Keys-setup
+     * affordance. Older upstream returned the full universe by default and
+     * ignores the extra param, so both generations serve the same catalog.
+     *
+     * [refresh] maps to upstream's explicit `refresh=1` path, which refreshes
+     * dynamic/custom-provider catalogs on demand without probing every
+     * provider during normal picker opens.
+     */
+    suspend fun getModelOptions(refresh: Boolean = false): Result<JsonObject> =
+        getJsonObject(
+            if (refresh) {
+                "/api/model/options?refresh=1&include_unconfigured=1"
+            } else {
+                "/api/model/options?include_unconfigured=1"
+            },
+        )

    /**
     * Assign the main model in `~/.hermes/config.yaml` (new sessions only).
@@ -508,7 +530,11 @@ class DashboardApiClient(
     * ordering where the host honors it. Android still sorts by decoded
     * `last_active` locally because older hosts return started-time order.
     */
-    suspend fun listSessions(profile: String? = null, limit: Int = 200): Result<List<SessionItem>> =
+    suspend fun listSessions(
+        profile: String? = null,
+        limit: Int = 200,
+        archived: String? = null,
+    ): Result<List<SessionItem>> =
        withContext(Dispatchers.IO) {
            val query = buildList {
                add("limit=${limit.coerceIn(1, 200)}")
@@ -516,6 +542,10 @@ class DashboardApiClient(
                add("min_messages=1")
                val name = profile?.trim().orEmpty()
                if (name.isNotBlank()) add("profile=${pathSegment(name)}")
+                // Upstream `archived` filter: exclude (default) | only | include.
+                // Omitted unless requested so older hosts see an unchanged request.
+                val archivedMode = archived?.trim().orEmpty()
+                if (archivedMode.isNotBlank()) add("archived=${pathSegment(archivedMode)}")
            }.joinToString(prefix = "?", separator = "&")
            getJson("/api/sessions$query").mapCatching { root ->
                val parsed = json.decodeFromJsonElement(SessionListResponse.serializer(), root)
@@ -555,19 +585,98 @@ class DashboardApiClient(
    suspend fun deleteSession(sessionId: String, profile: String? = null): Result<JsonObject> =
        deleteJsonObject("/api/sessions/${pathSegment(sessionId)}${profileQuery(profile)}")

+    /**
+     * Export one session as server-owned JSON metadata + messages. This is the
+     * safe "archive a copy before cleanup" primitive for clients that want to
+     * offer download/share before a destructive delete or prune. Profile scoping
+     * matches [deleteSession].
+     */
+    suspend fun exportSession(sessionId: String, profile: String? = null): Result<JsonObject> =
+        getJsonObject("/api/sessions/${pathSegment(sessionId)}/export${profileQuery(profile)}")
+
    /**
     * Rename a session scoped to a profile via the dashboard
-     * `PATCH /api/sessions/{id}?profile=` surface — the write twin of
-     * [deleteSession]. A non-default profile's sessions live in that profile's
-     * own `state.db`, so the unscoped api_server rename would patch the wrong
-     * DB and the new title would never appear in the profile-scoped list.
+     * `PATCH /api/sessions/{id}` surface — the write twin of [deleteSession].
+     * A non-default profile's sessions live in that profile's own `state.db`,
+     * so the unscoped api_server rename would patch the wrong DB and the new
+     * title would never appear in the profile-scoped list. Current upstream
+     * reads `profile` from the PATCH body (`SessionRename`); the query param
+     * rides along for builds that scoped by query.
     */
    suspend fun renameSession(sessionId: String, title: String, profile: String? = null): Result<JsonObject> =
        patchJsonObject(
            "/api/sessions/${pathSegment(sessionId)}${profileQuery(profile)}",
-            buildJsonObject { put("title", title) },
+            buildJsonObject {
+                put("title", title)
+                profile?.trim()?.takeIf { it.isNotBlank() }?.let { put("profile", it) }
+            },
        )

+    /**
+     * Soft-archive or restore a session via the same dashboard
+     * `PATCH /api/sessions/{id}` surface (`{archived: true|false}`). Archived
+     * sessions drop out of the default list and are excluded from a prune
+     * unless [SessionPruneFilters.includeArchived] is set; list them back with
+     * [listSessions] `archived = "only"`. Profile scoping matches
+     * [renameSession]: body for current upstream, query for older builds.
+     */
+    suspend fun setSessionArchived(
+        sessionId: String,
+        archived: Boolean,
+        profile: String? = null,
+    ): Result<JsonObject> =
+        patchJsonObject(
+            "/api/sessions/${pathSegment(sessionId)}${profileQuery(profile)}",
+            buildJsonObject {
+                put("archived", archived)
+                profile?.trim()?.takeIf { it.isNotBlank() }?.let { put("profile", it) }
+            },
+        )
+
+    /**
+     * Dry-run a server-backed bulk session cleanup via the dashboard
+     * `POST /api/sessions/prune` (`dry_run: true`). Returns what WOULD be
+     * deleted — matched count, started-at span, and the candidate rows —
+     * without deleting anything. This is the required first step of the
+     * prune flow: show the preview, then pass it to [pruneSessions].
+     */
+    suspend fun previewSessionPrune(filters: SessionPruneFilters): Result<SessionPrunePreview> =
+        postJsonObject("/api/sessions/prune", filters.toPrunePayload(dryRun = true))
+            .mapCatching { root ->
+                json.decodeFromJsonElement(SessionPrunePreview.serializer(), root)
+            }
+
+    /**
+     * Apply a server-backed bulk session cleanup (`POST /api/sessions/prune`,
+     * `dry_run: false`). Destructive — [confirmedPreview] is required so no
+     * caller can reach this without first running [previewSessionPrune] with
+     * the same [filters] and showing the user its count/span. A preview that
+     * matched nothing short-circuits without touching the server: sessions
+     * that aged into the filter after the preview are not covered by what the
+     * user confirmed.
+     */
+    suspend fun pruneSessions(
+        filters: SessionPruneFilters,
+        confirmedPreview: SessionPrunePreview,
+    ): Result<SessionPruneResult> {
+        if (confirmedPreview.matched <= 0) {
+            return Result.success(SessionPruneResult(ok = true, removed = 0))
+        }
+        return postJsonObject("/api/sessions/prune", filters.toPrunePayload(dryRun = false))
+            .mapCatching { root ->
+                json.decodeFromJsonElement(SessionPruneResult.serializer(), root)
+            }
+    }
+
+    private fun SessionPruneFilters.toPrunePayload(dryRun: Boolean): JsonObject =
+        buildJsonObject {
+            olderThanDays?.let { put("older_than_days", it) }
+            source?.trim()?.takeIf { it.isNotBlank() }?.let { put("source", it) }
+            profile?.trim()?.takeIf { it.isNotBlank() }?.let { put("profile", it) }
+            if (includeArchived) put("include_archived", true)
+            put("dry_run", dryRun)
+        }
+
    private fun parseProfiles(root: JsonObject): List<Profile> {
        fun decode(element: JsonElement, nameOverride: String?): Profile? = runCatching {
            val obj = element as? JsonObject ?: return null
@@ -21,13 +21,17 @@ import kotlinx.serialization.json.intOrNull
 * why dispatch is a manual `when (type)` over [JsonObject] rather than a
 * sealed polymorphic hierarchy (which throws on unknown discriminators).
 */
-class GatewayEventMapper(private val callbacks: GatewayTurnCallbacks) {
+class GatewayEventMapper(
+    private val callbacks: GatewayTurnCallbacks,
+    private val dedupeAdjacentMessageStarts: Boolean = false,
+) {

    /** True once `message.complete` or `error` has been seen — the turn is over. */
    var turnEnded: Boolean = false
        private set

    private var sawMessageStart = false
+    private var previousEventType: String? = null
    private var sawTextDelta = false
    private var sawThinkingDelta = false
    private var syntheticToolCounter = 0
@@ -77,11 +81,18 @@ class GatewayEventMapper(private val callbacks: GatewayTurnCallbacks) {
            }

            "message.start" -> {
+                // The upstream background-completion poller currently emits
+                // message.start immediately before _run_prompt_submit(), which
+                // emits the same start again. Treat an adjacent pair as one
+                // boundary; a later start after any other event still closes
+                // the previous assistant message as before.
+                if (dedupeAdjacentMessageStarts && previousEventType == "message.start") return
                // Gateway has no server-side message id (placeholder UUID
                // stays). A second start inside one turn means a new
                // assistant message began — close out the previous one.
                if (sawMessageStart) callbacks.onTurnComplete()
                sawMessageStart = true
+                callbacks.onStart()
            }

            "tool.generating" -> {
@@ -228,6 +239,7 @@ class GatewayEventMapper(private val callbacks: GatewayTurnCallbacks) {
            // alike: ignore.
            else -> Unit
        }
+        previousEventType = type
    }

    private fun syntheticToolId(name: String): String {
@@ -150,8 +150,8 @@ class GatewayKeepAliveService : Service() {

        return NotificationCompat.Builder(this, CHANNEL_ID)
            .setSmallIcon(R.mipmap.ic_launcher)
-            .setContentTitle("Hermes connection active")
-            .setContentText("Keeping your connection to Hermes open in the background.")
+            .setContentTitle(getString(R.string.gateway_keepalive_title))
+            .setContentText(getString(R.string.gateway_keepalive_body))
            .setContentIntent(tapPending)
            .setOngoing(true)
            .setOnlyAlertOnce(true)
@@ -81,8 +81,33 @@ fun resolveStreamingEndpointPreference(
 */
 fun interface ActiveTurnHandle {
    fun cancel()
+
+    /**
+     * Release this client's callbacks without interrupting server-side work.
+     * Gateway turns override this for process/UI teardown; transports that
+     * cannot be reattached retain their existing cancel behavior.
+     */
+    fun detach() = cancel()
 }

+/** Partial text checkpoint returned by current upstream Hermes on live resume. */
+data class GatewayInflightTurn(
+    val user: String,
+    val assistant: String,
+    val streaming: Boolean,
+)
+
+/** Result of reattaching Android to an existing durable Gateway session. */
+data class GatewaySessionRecovery(
+    val storedSessionId: String,
+    val liveSessionId: String,
+    val running: Boolean,
+    val status: String?,
+    val inflight: GatewayInflightTurn?,
+    /** Non-null only when subsequent turn events are bound to [GatewayTurnCallbacks]. */
+    val handle: ActiveTurnHandle?,
+)
+
 /**
 * One server-side interactive ask. The agent thread upstream is BLOCKED
 * until the matching respond RPC arrives, the ask times out (resolves to ""
@@ -135,6 +160,67 @@ data class GatewaySubagentEvent(
    enum class Phase { START, THINKING, TOOL, PROGRESS, COMPLETE }
 }

+/**
+ * One session-owned background process returned by the upstream gateway's
+ * `process.list` RPC. The registry calls its process id `session_id`; Android
+ * exposes it as [id] so it cannot be confused with either the stored chat id or
+ * the gateway's live, per-connection session id.
+ *
+ * [outputPreview] is the registry's short preview, while [outputTail] is the
+ * gateway's larger (currently 4,000-character) snapshot used to recover output
+ * missed while the WebSocket was unavailable. Unknown/new fields are ignored
+ * by the parser so this remains compatible with older and newer gateways.
+ */
+data class GatewayProcess(
+    val id: String,
+    val command: String,
+    val cwd: String? = null,
+    val pid: Long? = null,
+    val startedAt: String? = null,
+    val uptimeSeconds: Long = 0L,
+    val status: String,
+    val outputPreview: String? = null,
+    val outputTail: String? = null,
+    val exitCode: Int? = null,
+    val detached: Boolean = false,
+    val notifyOnComplete: Boolean = false,
+    val sessionScoped: Boolean = false,
+    val watchPatterns: List<String> = emptyList(),
+    val watchHit: Boolean = false,
+) {
+    val isRunning: Boolean get() = status.equals("running", ignoreCase = true)
+}
+
+/** Whether this gateway socket supports the session-scoped process RPCs. */
+enum class GatewayProcessCapability {
+    /** Not probed on this socket yet (or no socket is currently connected). */
+    Unknown,
+
+    /** A `process.list` / `process.kill` call succeeded. */
+    Supported,
+
+    /** The gateway returned JSON-RPC method-not-found for the process surface. */
+    Unsupported,
+}
+
+/**
+ * Connection-level background-process events. These are deliberately separate
+ * from [GatewayTurnCallbacks]: output and completion notifications can arrive
+ * while no app-initiated turn is active.
+ */
+sealed interface GatewayProcessEvent {
+    enum class Trigger { TOOL_COMPLETE, STATUS_UPDATE, MESSAGE_COMPLETE }
+
+    /** The process snapshot may have changed and should be refreshed. */
+    data class Invalidated(val trigger: Trigger) : GatewayProcessEvent
+
+    /** Live output from `agent.terminal.output`. */
+    data class Output(val processId: String, val chunk: String) : GatewayProcessEvent
+
+    /** The agent requested that its read-only terminal view be closed. */
+    data class TerminalClosed(val processId: String) : GatewayProcessEvent
+}
+
 /**
 * One provider from the gateway `model.options` RPC — the curated, authenticated
 * provider/model list the upstream desktop + TUI model picker uses (NOT the
@@ -208,6 +294,8 @@ data class GatewayReasoningSettings(
 class GatewayTurnCallbacks(
    /** Stored (DB) session id — fired on session create/rotate so the drawer + persistence stay correct. */
    val onSessionId: (String) -> Unit,
+    /** A gateway `message.start` opened an assistant response for this turn. */
+    val onStart: () -> Unit,
    val onTextDelta: (String) -> Unit,
    val onThinkingDelta: (String) -> Unit,
    val onToolCallStart: (toolCallId: String, toolName: String) -> Unit,
@@ -238,3 +326,18 @@ class GatewayTurnCallbacks(
     */
    val onStatusUpdate: (kind: String?, text: String) -> Unit = { _, _ -> },
 )
+
+/**
+ * UI registration for one server-initiated gateway turn.
+ *
+ * Background-process completion is converted upstream into a normal assistant
+ * turn on the originating session. It has no matching client [GatewayChatClient.sendTurn]
+ * call, so the client asks the active conversation for callbacks when the first
+ * `message.start` arrives. [onHandle] binds the resulting cancellable turn into
+ * the same Stop/steer lifecycle as a locally submitted turn.
+ */
+class GatewayInboundTurnRegistration(
+    val callbacks: GatewayTurnCallbacks,
+    /** Main-thread admission. False leaves the server turn unbound for history recovery. */
+    val onHandle: (ActiveTurnHandle) -> Boolean,
+)
@@ -28,6 +28,7 @@ import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.booleanOrNull
 import kotlinx.serialization.json.contentOrNull
 import kotlinx.serialization.json.decodeFromJsonElement
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -548,6 +549,9 @@ class HermesApiClient(
     *   blank the `model` field is omitted entirely and the server falls
     *   back to its session default. Used by the agent-profile picker so
     *   an explicit user choice wins over implicit session/server defaults.
+     *   Best-effort hint: current native upstream does not parse `model`
+     *   on this route (legacy fork builds honor it) — see the contract
+     *   notes in `HermesChatPayloads.kt`.
     */
    fun sendChatStream(
        sessionId: String,
@@ -555,23 +559,25 @@ class HermesApiClient(
        systemMessage: String? = null,
        attachments: List<com.hermesandroid.relay.data.Attachment>? = null,
        /**
-         * Pre-built OpenAI-format synthetic messages to splice into the
-         * payload alongside the live `message`. Produced by
+         * Pre-built OpenAI-format synthetic messages carrying phone-local
+         * context (voice intents, card dispatches, realtime voice turns).
+         * Produced by
         * [com.hermesandroid.relay.voice.VoiceIntentSyncBuilder.buildSyntheticMessages]
-         * for the v0.4.1 voice-intent → server session sync feature.
+         * and its twin builders; the param name is historical — it accepts
+         * any synthetic-message array.
         *
-         * When non-empty, the request body grows a top-level `messages`
-         * array containing the synthetic `assistant` (with `tool_calls`)
-         * + `tool` (with `tool_call_id`) pairs. The server-side session
-         * absorbs them into its conversation history so the LLM sees
-         * prior phone-local voice actions in its session memory.
+         * Upstream's session-chat handler consumes only `message` and
+         * `system_message` — a top-level `messages` array is NOT parsed
+         * (verified in `gateway/platforms/api_server.py`,
+         * `_handle_session_chat_stream`), so these can't ride the request
+         * as real history entries. Instead [buildSessionChatStreamPayload]
+         * renders them as a plain-text digest folded into this turn's
+         * ephemeral `system_message`. The model sees the context for THIS
+         * turn only; it is not persisted server-side. See the mapping notes
+         * in `HermesChatPayloads.kt`.
         *
-         * Null / empty on every send that has no unsynced voice intents
-         * to communicate, which is the common case after the first sync.
-         * The Hermes API server treats unrecognised body fields
-         * permissively (matches OpenAI Chat Completions semantics), so
-         * this stays a safe additive change against any conformant
-         * upstream.
+         * Null / empty on every send that has no unsynced traces to
+         * communicate, which is the common case after the first sync.
         */
        voiceIntentMessages: JsonArray? = null,
        onSessionId: (String) -> Unit,
@@ -594,7 +600,7 @@ class HermesApiClient(
        AgentDisplay.profileRequestName(profileName)?.let {
            Log.d(TAG, "sendChatStream: profile=$it")
        }
-        val requestPayload = buildSessionChatStreamPayload(
+        val built = buildSessionChatStreamPayload(
            message = message,
            systemMessage = systemMessage,
            attachments = attachments,
@@ -602,12 +608,19 @@ class HermesApiClient(
            modelOverride = modelOverride,
            profileName = profileName,
        )
-        val requestBody = json.encodeToString(JsonObject.serializer(), requestPayload)
+        logDroppedAttachments("sessions chat/stream", built.droppedAttachments)
+        val requestBody = json.encodeToString(JsonObject.serializer(), built.payload)

-        val request = authRequest("$baseUrl/api/sessions/$sessionId/chat/stream")
-            .header("Accept", "text/event-stream")
-            .post(requestBody.toRequestBody(JSON_MEDIA))
-            .build()
+        val request = authRequestOrNull("$baseUrl/api/sessions/$sessionId/chat/stream")
+            ?.header("Accept", "text/event-stream")
+            ?.post(requestBody.toRequestBody(JSON_MEDIA))
+            ?.build()
+            ?: run {
+                // #131: malformed base URL — fail the turn through the normal
+                // error channel instead of throwing out of the ViewModel.
+                mainHandler.post { onError(invalidBaseUrlMessage()) }
+                return failedEventSource()
+            }

        val completeCalled = AtomicBoolean(false)
        // Comparable to the gateway's turn[gateway] line — see TurnLatencyTracer.
@@ -839,7 +852,7 @@ class HermesApiClient(
        AgentDisplay.profileRequestName(profileName)?.let {
            Log.d(TAG, "sendChatCompletionsStream: profile=$it")
        }
-        val requestPayload = buildChatCompletionsStreamPayload(
+        val built = buildChatCompletionsStreamPayload(
            message = message,
            model = model,
            systemMessage = systemMessage,
@@ -848,12 +861,18 @@ class HermesApiClient(
            modelOverride = modelOverride,
            profileName = profileName,
        )
-        val requestBody = json.encodeToString(JsonObject.serializer(), requestPayload)
+        logDroppedAttachments("chat completions", built.droppedAttachments)
+        val requestBody = json.encodeToString(JsonObject.serializer(), built.payload)

-        val request = authRequest("$baseUrl/v1/chat/completions")
-            .header("Accept", "text/event-stream")
-            .post(requestBody.toRequestBody(JSON_MEDIA))
-            .build()
+        val request = authRequestOrNull("$baseUrl/v1/chat/completions")
+            ?.header("Accept", "text/event-stream")
+            ?.post(requestBody.toRequestBody(JSON_MEDIA))
+            ?.build()
+            ?: run {
+                // #131: malformed base URL — see sendChatStream.
+                mainHandler.post { onError(invalidBaseUrlMessage()) }
+                return failedEventSource()
+            }

        val completeCalled = AtomicBoolean(false)
        val messageStarted = AtomicBoolean(false)
@@ -1000,7 +1019,13 @@ class HermesApiClient(
        model: String? = null,
        systemMessage: String? = null,
        attachments: List<com.hermesandroid.relay.data.Attachment>? = null,
-        /** See [sendChatStream]'s `voiceIntentMessages` doc — same semantics. */
+        /**
+         * See [sendChatStream]'s `voiceIntentMessages` doc. On the runs
+         * path the mapping differs slightly: plain user/assistant text
+         * turns ride the upstream-parsed `conversation_history` field,
+         * while tool-call pairs fold into the `instructions` digest —
+         * see [buildRunStreamPayload].
+         */
        voiceIntentMessages: JsonArray? = null,
        onSessionId: (String) -> Unit,
        onMessageStarted: (String) -> Unit,
@@ -1022,7 +1047,7 @@ class HermesApiClient(
        AgentDisplay.profileRequestName(profileName)?.let {
            Log.d(TAG, "sendRunStream: profile=$it")
        }
-        val requestPayload = buildRunStreamPayload(
+        val built = buildRunStreamPayload(
            message = message,
            model = model,
            systemMessage = systemMessage,
@@ -1031,12 +1056,18 @@ class HermesApiClient(
            modelOverride = modelOverride,
            profileName = profileName,
        )
-        val requestBody = json.encodeToString(JsonObject.serializer(), requestPayload)
+        logDroppedAttachments("runs", built.droppedAttachments)
+        val requestBody = json.encodeToString(JsonObject.serializer(), built.payload)

-        val request = authRequest("$baseUrl/v1/runs")
-            .header("Accept", "text/event-stream")
-            .post(requestBody.toRequestBody(JSON_MEDIA))
-            .build()
+        val request = authRequestOrNull("$baseUrl/v1/runs")
+            ?.header("Accept", "text/event-stream")
+            ?.post(requestBody.toRequestBody(JSON_MEDIA))
+            ?.build()
+            ?: run {
+                // #131: malformed base URL — see sendChatStream.
+                mainHandler.post { onError(invalidBaseUrlMessage()) }
+                return failedEventSource()
+            }

        val completeCalled = AtomicBoolean(false)
        // Comparable to the gateway's turn[gateway] line — see TurnLatencyTracer.
@@ -1372,6 +1403,65 @@ class HermesApiClient(
        return builder
    }

+    /**
+     * Non-throwing twin of [authRequest] for the streaming entry points
+     * (#131 crash class). The three send*Stream methods build their Request
+     * BEFORE any try/catch or EventSource listener exists, so a malformed
+     * [baseUrl] (hand-edited connection, corrupt settings import) made
+     * `Request.Builder.url(String)` throw `IllegalArgumentException`
+     * synchronously up through the ViewModel. Returns null on a bad URL so
+     * the caller can route the failure through its normal `onError` channel
+     * instead. Non-streaming methods keep [authRequest] — their existing
+     * try/catch already contains the throw.
+     */
+    private fun authRequestOrNull(url: String): Request.Builder? {
+        val builder = buildApiRequestOrNull(url) ?: return null
+        if (apiKey.isNotBlank()) {
+            builder.header("Authorization", "Bearer $apiKey")
+        }
+        return builder
+    }
+
+    /**
+     * Inert [EventSource] returned by the streaming methods when the request
+     * couldn't even be built (bad base URL). The turn already failed via
+     * `onError`; this just satisfies the return type so callers' cancel()
+     * handling stays uniform.
+     */
+    private fun failedEventSource(): EventSource = object : EventSource {
+        // Guaranteed-parseable placeholder; never dispatched.
+        private val placeholder = Request.Builder().url("http://invalid.invalid/").build()
+        override fun request(): Request = placeholder
+        override fun cancel() {}
+    }
+
+    /** Human message for a base URL that fails to parse (#131). */
+    private fun invalidBaseUrlMessage(): String =
+        "Invalid server address ($baseUrl) — edit the connection's API URL or re-pair."
+
+    /**
+     * Make attachment drops on the SSE fallback transports explicit
+     * (HRUI-001): the payload builders return attachments that have no
+     * upstream-supported channel on the target endpoint instead of
+     * silently omitting them. The user-visible notice lives in
+     * ChatViewModel (`warnIfAttachmentsDropped`) — this log line is the
+     * network-layer audit trail that the bytes never left the device.
+     */
+    private fun logDroppedAttachments(
+        endpoint: String,
+        dropped: List<com.hermesandroid.relay.data.Attachment>,
+    ) {
+        if (dropped.isEmpty()) return
+        val names = dropped.joinToString(", ") {
+            it.fileName ?: if (it.isImage) "image" else "file"
+        }
+        Log.w(
+            TAG,
+            "Dropped ${dropped.size} attachment(s) with no supported channel " +
+                "on the $endpoint endpoint (not sent): $names",
+        )
+    }
+
    private fun apiFailure(response: Response, operation: String): IOException {
        val detail = response.message.takeIf { it.isNotBlank() }?.let { ": $it" }.orEmpty()
        val message = when (response.code) {
@@ -1388,3 +1478,13 @@ class HermesApiClient(
    private fun firstNonBlank(vararg values: String?): String =
        values.firstOrNull { !it.isNullOrBlank() }.orEmpty()
 }
+
+/**
+ * #131 guard, api_server half: parse-or-null Request builder for a URL string.
+ * `Request.Builder.url(String)` throws `IllegalArgumentException` on a
+ * malformed host; the streaming send paths must fail through `onError`
+ * instead. Top-level (like `buildRelayRequestOrNull` in ConnectionManager)
+ * so the guard is unit-testable without instantiating the client.
+ */
+internal fun buildApiRequestOrNull(url: String): Request.Builder? =
+    url.toHttpUrlOrNull()?.let { Request.Builder().url(it) }
@@ -4,14 +4,233 @@ import com.hermesandroid.relay.data.AgentDisplay
 import com.hermesandroid.relay.data.Attachment
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.add
+import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.addJsonObject
 import kotlinx.serialization.json.buildJsonArray
 import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.contentOrNull
 import kotlinx.serialization.json.put
 import kotlinx.serialization.json.putJsonArray
 import kotlinx.serialization.json.putJsonObject

+/*
+ * === Upstream request contract (HRUI-001) ===
+ *
+ * Verified against hermes-agent `gateway/platforms/api_server.py`. These
+ * builders send ONLY fields the target handler consumes (plus a small,
+ * documented set of legacy hint fields — see below). Fields upstream
+ * ignores are never emitted: a dead field on the wire misrepresents
+ * capability and masks data loss.
+ *
+ * Per-endpoint parsing truth (current upstream main):
+ *
+ *  - `POST /api/sessions/{id}/chat/stream` (`_handle_session_chat_stream`)
+ *    consumes `message` (or `input`) and `system_message` (or
+ *    `instructions`, string only). `message` accepts either a plain string
+ *    or OpenAI-style content parts (text + `image_url`) via
+ *    `_normalize_multimodal_content`. Top-level `messages`, `attachments`,
+ *    `model`, and `profile` are NOT parsed.
+ *
+ *  - `POST /v1/runs` (`_handle_runs`) consumes `input` (string or message
+ *    array), `instructions`, `conversation_history` (array of
+ *    `{role, content}` objects, string-coerced), `previous_response_id`,
+ *    `session_id`, and `model`. It does NOT parse `system_message`,
+ *    `stream`, `messages`, `attachments`, or `profile` — and always
+ *    answers `202 {"run_id": ...}` JSON (no SSE on POST).
+ *
+ *  - `POST /v1/chat/completions` (`_handle_chat_completions`) consumes
+ *    `messages`, `stream`, and `model`. Within `messages`: `system` roles
+ *    fold into the ephemeral system prompt; `user`/`assistant` entries are
+ *    kept as history with multimodal content normalization; `tool`-role
+ *    entries are silently skipped and `tool_calls` fields are stripped.
+ *    Top-level `attachments` and `profile` are NOT parsed.
+ *
+ * Legacy hint fields we deliberately keep sending although current native
+ * upstream ignores them: `model` + `profile` on the sessions path,
+ * `profile` on runs/completions, and `stream` on runs. They are
+ * configuration hints (never user content, so they cannot mask data
+ * loss) honored by legacy fork builds — the runs path in particular only
+ * activates against servers that explicitly advertise SSE-on-POST, which
+ * vanilla upstream never does. See `ServerCapabilities`.
+ *
+ * === Synthetic-history mapping ===
+ *
+ * Phone-local synthetic turns (voice-intent traces, card dispatches,
+ * provider-answered realtime voice turns — see `VoiceIntentSyncBuilder`,
+ * `CardDispatchSyncBuilder`, `RealtimeTurnSyncBuilder`) arrive here as one
+ * OpenAI-format array. Historically they were sent as a top-level
+ * `messages` field on sessions/runs, which upstream never consumed —
+ * silent data loss. They now map onto channels each endpoint actually
+ * supports:
+ *
+ *  - Tool-call pairs (`assistant` + `tool` with `tool_call_id`) have no
+ *    surviving wire shape on ANY fallback endpoint, so they render as a
+ *    plain-text digest ([renderSyntheticHistoryDigest]) folded into the
+ *    per-turn ephemeral system prompt: `system_message` on sessions,
+ *    `instructions` on runs, the `system` message on completions.
+ *  - Plain `user`/`assistant` text turns ride a real history channel
+ *    where one exists: spliced into `messages` on completions, sent as
+ *    `conversation_history` on runs. The sessions endpoint has no
+ *    client-provided history channel, so there they join the digest.
+ *
+ * This mapping is ephemeral where the digest is used: the model sees the
+ * context for THIS turn only; it is not persisted into the server-side
+ * session transcript. That is strictly better than the previous behavior
+ * (context arrived never) and matches the existing voice-turn pattern of
+ * per-turn non-persisted instructions.
+ *
+ * === Attachments ===
+ *
+ * Only the completions endpoint has an upstream-supported attachment
+ * channel on this surface: inline `image_url` content parts (images
+ * only). Sessions/runs payloads carry no attachments at all. Anything
+ * that cannot be delivered is returned in
+ * [ChatPayloadResult.droppedAttachments] so callers can surface the drop
+ * (HermesApiClient logs it; ChatViewModel shows a user-visible notice) —
+ * never a silent discard. Note: current upstream's sessions `message`
+ * field does accept inline `image_url` content parts, so image delivery
+ * on the sessions path is a possible future improvement; it is not wired
+ * yet because the caller's attachment warning and this builder must move
+ * together.
+ */
+
+/**
+ * Result of building a fallback-transport chat payload.
+ *
+ * @property payload The JSON request body — contains only fields the
+ *   target endpoint consumes (plus documented legacy hint fields).
+ * @property droppedAttachments Attachments that have NO supported channel
+ *   on the target endpoint and were therefore not encoded into [payload].
+ *   Callers must surface these (log + user notice), never ignore them.
+ */
+internal data class ChatPayloadResult(
+    val payload: JsonObject,
+    val droppedAttachments: List<Attachment>,
+)
+
+/**
+ * Header line for the synthetic phone-context digest. Tells the model the
+ * listed activity already happened on-device so it treats the lines as
+ * history, not instructions to act on.
+ */
+internal const val SYNTHETIC_DIGEST_HEADER =
+    "Phone-side activity since the previous server turn " +
+        "(already completed on-device; context only — do not re-execute):"
+
+private fun JsonObject.roleOrNull(): String? =
+    (this["role"] as? JsonPrimitive)?.contentOrNull
+
+private fun JsonObject.contentStringOrNull(): String? =
+    (this["content"] as? JsonPrimitive)?.contentOrNull
+
+/**
+ * True for a synthetic entry deliverable as a REAL conversation turn on
+ * endpoints with a client-history channel: plain `user`/`assistant` role,
+ * string content, no `tool_calls`. Matches the shape emitted by
+ * `RealtimeTurnSyncBuilder`; tool-call pairs from the voice-intent and
+ * card-dispatch builders fail this check and go through the digest.
+ */
+internal fun isPlainSyntheticTurn(entry: JsonObject): Boolean {
+    val role = entry.roleOrNull()
+    if (role != "user" && role != "assistant") return false
+    if (entry.containsKey("tool_calls")) return false
+    return !entry.contentStringOrNull().isNullOrBlank()
+}
+
+/**
+ * Render the synthetic sync stream as a compact plain-text digest for the
+ * per-turn ephemeral system prompt.
+ *
+ * Tool-call pairs (`assistant.tool_calls` + matching `tool` result keyed
+ * by `tool_call_id`) always render, one line per call:
+ * `- called <name> with <arguments> -> <result>`. Plain text turns render
+ * as `- user: ...` / `- assistant: ...` lines only when
+ * [includePlainTurns] is true (sessions path — no real history channel);
+ * endpoints that deliver plain turns natively pass false so the same turn
+ * is never delivered twice.
+ *
+ * @return null when nothing renders (no synthetic messages, or only plain
+ *   turns while [includePlainTurns] is false).
+ */
+internal fun renderSyntheticHistoryDigest(
+    syntheticMessages: JsonArray?,
+    includePlainTurns: Boolean,
+): String? {
+    if (syntheticMessages.isNullOrEmpty()) return null
+
+    // Pair tool results with their originating call.
+    val resultsByCallId = HashMap<String, String>()
+    for (element in syntheticMessages) {
+        val obj = element as? JsonObject ?: continue
+        if (obj.roleOrNull() != "tool") continue
+        val callId = (obj["tool_call_id"] as? JsonPrimitive)?.contentOrNull ?: continue
+        resultsByCallId[callId] = obj.contentStringOrNull().orEmpty()
+    }
+
+    val lines = mutableListOf<String>()
+    for (element in syntheticMessages) {
+        val obj = element as? JsonObject ?: continue
+        when (obj.roleOrNull()) {
+            "assistant" -> {
+                val toolCalls = obj["tool_calls"] as? JsonArray
+                if (toolCalls != null) {
+                    for (call in toolCalls) {
+                        val callObj = call as? JsonObject ?: continue
+                        val function = callObj["function"] as? JsonObject
+                        val name = (function?.get("name") as? JsonPrimitive)
+                            ?.contentOrNull ?: "unknown_tool"
+                        val args = (function?.get("arguments") as? JsonPrimitive)
+                            ?.contentOrNull ?: "{}"
+                        val callId = (callObj["id"] as? JsonPrimitive)?.contentOrNull
+                        val result = callId?.let(resultsByCallId::get)
+                        lines += if (result.isNullOrBlank()) {
+                            "- called $name with $args"
+                        } else {
+                            "- called $name with $args -> $result"
+                        }
+                    }
+                } else if (includePlainTurns) {
+                    obj.contentStringOrNull()?.takeIf { it.isNotBlank() }
+                        ?.let { lines += "- assistant: $it" }
+                }
+            }
+            "user" -> if (includePlainTurns) {
+                obj.contentStringOrNull()?.takeIf { it.isNotBlank() }
+                    ?.let { lines += "- user: $it" }
+            }
+            // "tool" entries fold into their assistant line via resultsByCallId.
+        }
+    }
+    if (lines.isEmpty()) return null
+    return SYNTHETIC_DIGEST_HEADER + "\n" + lines.joinToString("\n")
+}
+
+/**
+ * Merge the caller's per-turn system message with the synthetic-history
+ * digest into one ephemeral prompt string. Either side may be absent.
+ */
+internal fun mergeEphemeralContext(systemMessage: String?, digest: String?): String? = when {
+    digest.isNullOrBlank() -> systemMessage?.takeIf { it.isNotBlank() }
+    systemMessage.isNullOrBlank() -> digest
+    else -> systemMessage + "\n\n" + digest
+}
+
+/** Synthetic entries deliverable as real history turns (see [isPlainSyntheticTurn]). */
+private fun plainSyntheticTurns(syntheticMessages: JsonArray?): List<JsonObject> =
+    (syntheticMessages ?: emptyList())
+        .mapNotNull { it as? JsonObject }
+        .filter(::isPlainSyntheticTurn)
+
+/**
+ * Body for `POST /api/sessions/{id}/chat/stream`.
+ *
+ * Emits `message` + `system_message` (upstream-consumed) and `model` +
+ * `profile` (legacy hints — current native upstream ignores both on this
+ * route; legacy fork builds honor them; see the file header). ALL
+ * synthetic history folds into `system_message` via the digest: the
+ * endpoint has no client-provided history channel. Attachments have no
+ * supported channel here and are returned as dropped.
+ */
 internal fun buildSessionChatStreamPayload(
    message: String,
    systemMessage: String? = null,
@@ -19,30 +238,33 @@ internal fun buildSessionChatStreamPayload(
    voiceIntentMessages: JsonArray? = null,
    modelOverride: String? = null,
    profileName: String? = null,
-): JsonObject = buildJsonObject {
-    put("message", message)
-    if (!systemMessage.isNullOrBlank()) {
-        put("system_message", systemMessage)
-    }
-    if (!modelOverride.isNullOrBlank()) {
-        put("model", modelOverride)
-    }
-    AgentDisplay.profileRequestName(profileName)?.let { put("profile", it) }
-    if (!attachments.isNullOrEmpty()) {
-        putJsonArray("attachments") {
-            attachments.forEach { att ->
-                addJsonObject {
-                    put("contentType", att.contentType)
-                    put("content", att.content)
-                }
-            }
+): ChatPayloadResult {
+    val digest = renderSyntheticHistoryDigest(voiceIntentMessages, includePlainTurns = true)
+    val effectiveSystem = mergeEphemeralContext(systemMessage, digest)
+    val payload = buildJsonObject {
+        put("message", message)
+        if (!effectiveSystem.isNullOrBlank()) {
+            put("system_message", effectiveSystem)
        }
+        if (!modelOverride.isNullOrBlank()) {
+            put("model", modelOverride)
+        }
+        AgentDisplay.profileRequestName(profileName)?.let { put("profile", it) }
    }
-    if (voiceIntentMessages != null && voiceIntentMessages.isNotEmpty()) {
-        put("messages", voiceIntentMessages)
-    }
+    return ChatPayloadResult(payload, droppedAttachments = attachments.orEmpty())
 }

+/**
+ * Body for `POST /v1/runs`.
+ *
+ * Emits `input`, `model`, and `instructions` (upstream-consumed; note the
+ * runs handler reads `instructions`, NOT `system_message` — the latter was
+ * a silent drop before HRUI-001), plus `stream` + `profile` legacy hints.
+ * Synthetic history: plain text turns ride `conversation_history` (a real
+ * upstream channel — entries are `{role, content}` objects); tool-call
+ * pairs fold into the `instructions` digest. Attachments have no
+ * supported channel here and are returned as dropped.
+ */
 internal fun buildRunStreamPayload(
    message: String,
    model: String? = null,
@@ -51,36 +273,46 @@ internal fun buildRunStreamPayload(
    voiceIntentMessages: JsonArray? = null,
    modelOverride: String? = null,
    profileName: String? = null,
-): JsonObject {
+): ChatPayloadResult {
    val resolvedModel = when {
        !modelOverride.isNullOrBlank() -> modelOverride
        !model.isNullOrBlank() -> model
        else -> "default"
    }
-    return buildJsonObject {
+    val digest = renderSyntheticHistoryDigest(voiceIntentMessages, includePlainTurns = false)
+    val effectiveInstructions = mergeEphemeralContext(systemMessage, digest)
+    val plainTurns = plainSyntheticTurns(voiceIntentMessages)
+    val payload = buildJsonObject {
        put("model", resolvedModel)
        put("input", message)
        put("stream", true)
-        if (!systemMessage.isNullOrBlank()) {
-            put("system_message", systemMessage)
+        if (!effectiveInstructions.isNullOrBlank()) {
+            put("instructions", effectiveInstructions)
        }
-        AgentDisplay.profileRequestName(profileName)?.let { put("profile", it) }
-        if (!attachments.isNullOrEmpty()) {
-            putJsonArray("attachments") {
-                attachments.forEach { att ->
-                    addJsonObject {
-                        put("contentType", att.contentType)
-                        put("content", att.content)
-                    }
-                }
+        if (plainTurns.isNotEmpty()) {
+            putJsonArray("conversation_history") {
+                plainTurns.forEach { add(it) }
            }
        }
-        if (voiceIntentMessages != null && voiceIntentMessages.isNotEmpty()) {
-            put("messages", voiceIntentMessages)
-        }
+        AgentDisplay.profileRequestName(profileName)?.let { put("profile", it) }
    }
+    return ChatPayloadResult(payload, droppedAttachments = attachments.orEmpty())
 }

+/**
+ * Body for `POST /v1/chat/completions`.
+ *
+ * Emits `model`, `stream`, and `messages` (all upstream-consumed) plus
+ * the `profile` legacy hint. Synthetic history: plain text turns splice
+ * into `messages` before the live user message (upstream keeps
+ * `user`/`assistant` history entries verbatim); tool-call pairs fold into
+ * the system message digest, because upstream SKIPS `tool`-role messages
+ * and STRIPS `tool_calls` — splicing them produced junk empty-content
+ * assistant entries and lost the results entirely. Image attachments ride
+ * inline `image_url` content parts on the user message (upstream vision
+ * format); non-image attachments have no channel and are returned as
+ * dropped.
+ */
 internal fun buildChatCompletionsStreamPayload(
    message: String,
    model: String? = null,
@@ -89,35 +321,37 @@ internal fun buildChatCompletionsStreamPayload(
    voiceIntentMessages: JsonArray? = null,
    modelOverride: String? = null,
    profileName: String? = null,
-): JsonObject {
+): ChatPayloadResult {
    val resolvedModel = when {
        !modelOverride.isNullOrBlank() -> modelOverride
        !model.isNullOrBlank() -> model
        else -> "default"
    }
-    return buildJsonObject {
+    val digest = renderSyntheticHistoryDigest(voiceIntentMessages, includePlainTurns = false)
+    val effectiveSystem = mergeEphemeralContext(systemMessage, digest)
+    val plainTurns = plainSyntheticTurns(voiceIntentMessages)
+    val imageAttachments = attachments.orEmpty().filter { it.isImage }
+    val payload = buildJsonObject {
        put("model", resolvedModel)
        put("stream", true)
        AgentDisplay.profileRequestName(profileName)?.let { put("profile", it) }
        putJsonArray("messages") {
-            if (!systemMessage.isNullOrBlank()) {
+            if (!effectiveSystem.isNullOrBlank()) {
                addJsonObject {
                    put("role", "system")
-                    put("content", systemMessage)
+                    put("content", effectiveSystem)
                }
            }
-            if (voiceIntentMessages != null && voiceIntentMessages.isNotEmpty()) {
-                voiceIntentMessages.forEach { add(it) }
-            }
+            plainTurns.forEach { add(it) }
            addJsonObject {
                put("role", "user")
-                if (!attachments.isNullOrEmpty() && attachments.any { it.isImage }) {
+                if (imageAttachments.isNotEmpty()) {
                    put("content", buildJsonArray {
                        addJsonObject {
                            put("type", "text")
                            put("text", message)
                        }
-                        attachments.filter { it.isImage }.forEach { att ->
+                        imageAttachments.forEach { att ->
                            addJsonObject {
                                put("type", "image_url")
                                putJsonObject("image_url") {
@@ -131,15 +365,9 @@ internal fun buildChatCompletionsStreamPayload(
                }
            }
        }
-        if (!attachments.isNullOrEmpty() && attachments.any { !it.isImage }) {
-            putJsonArray("attachments") {
-                attachments.filter { !it.isImage }.forEach { att ->
-                    addJsonObject {
-                        put("contentType", att.contentType)
-                        put("content", att.content)
-                    }
-                }
-            }
-        }
    }
+    return ChatPayloadResult(
+        payload = payload,
+        droppedAttachments = attachments.orEmpty().filter { !it.isImage },
+    )
 }
@@ -179,6 +179,58 @@ data class RenameSessionRequest(
    val title: String
 )

+// --- Server-backed bulk cleanup (dashboard POST /api/sessions/prune) ---
+
+/**
+ * Client-side subset of upstream's `SessionPrune` body. Nulls are omitted from
+ * the request; a fully-bare filter set is a "bare prune", where upstream
+ * applies its own implicit ended-more-than-90-days-ago cutoff.
+ */
+data class SessionPruneFilters(
+    val olderThanDays: Double? = null,
+    val source: String? = null,
+    val profile: String? = null,
+    val includeArchived: Boolean = false,
+)
+
+/** One row of the dry-run preview (`sessions` in the prune response). */
+@Serializable
+data class SessionPruneCandidate(
+    @Serializable(with = FlexibleIdNonNullSerializer::class)
+    val id: String = "",
+    val source: String? = null,
+    val title: String? = null,
+    val model: String? = null,
+    @SerialName("started_at")
+    @Serializable(with = FlexibleTimestampSerializer::class)
+    val startedAt: Double? = null,
+    @SerialName("message_count") val messageCount: Int? = null,
+)
+
+/**
+ * Dry-run response: what a prune WOULD delete — count, started-at span, and
+ * the candidate rows — without deleting anything. Upstream orders candidates
+ * oldest-first.
+ */
+@Serializable
+data class SessionPrunePreview(
+    val matched: Int = 0,
+    @SerialName("oldest_started_at")
+    @Serializable(with = FlexibleTimestampSerializer::class)
+    val oldestStartedAt: Double? = null,
+    @SerialName("newest_started_at")
+    @Serializable(with = FlexibleTimestampSerializer::class)
+    val newestStartedAt: Double? = null,
+    val sessions: List<SessionPruneCandidate> = emptyList(),
+)
+
+/** Apply response — how many sessions the server actually removed. */
+@Serializable
+data class SessionPruneResult(
+    val ok: Boolean = true,
+    val removed: Int = 0,
+)
+
 // --- Messages ---

@Serializable
@@ -8,6 +8,11 @@ import android.service.notification.StatusBarNotification
 import android.util.Log
 import com.hermesandroid.relay.network.relay.ChannelMultiplexer
 import com.hermesandroid.relay.network.relay.models.Envelope
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.encodeToJsonElement
@@ -42,6 +47,11 @@ import java.util.concurrent.ConcurrentLinkedQueue
 */
 class HermesNotificationCompanion : NotificationListenerService() {

+    private val serviceScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+    private val triggerStore by lazy {
+        NotificationTriggerStore(applicationContext.notificationTriggerDataStore)
+    }
+
    /**
     * Buffer for entries that arrive before [multiplexer] has been
     * wired up (e.g. notifications during app cold-start). Bounded so
@@ -68,6 +78,7 @@ class HermesNotificationCompanion : NotificationListenerService() {
        if (active === this) {
            active = null
        }
+        serviceScope.cancel()
        super.onDestroy()
    }

@@ -75,6 +86,13 @@ class HermesNotificationCompanion : NotificationListenerService() {
        if (sbn == null) return

        val entry = sbn.toEntry() ?: return
+        // The trigger MVP posts its own local prompt notifications. Never feed
+        // Hermes-Relay's notifications back into the rule engine, or a broad
+        // rule could prompt on its own prompt. Still forward them to the relay
+        // cache to preserve existing notification-companion semantics.
+        if (entry.packageName != packageName) {
+            evaluateNotificationTriggers(entry)
+        }
        val envelope = entry.toEnvelope()

        // Drain any backlog first so order is preserved.
@@ -141,6 +159,31 @@ class HermesNotificationCompanion : NotificationListenerService() {
        )
    }

+    private fun evaluateNotificationTriggers(entry: NotificationEntry) {
+        serviceScope.launch {
+            val match = triggerStore.firstMatchingRule(entry) ?: return@launch
+            val result = when (match.rule.action) {
+                NotificationTriggerAction.AskMe -> NotificationTriggerPromptNotifier.notifyAskMe(
+                    context = applicationContext,
+                    rule = match.rule,
+                    entry = entry,
+                )
+            }
+            triggerStore.appendActivity(
+                NotificationTriggerActivityEntry(
+                    ruleId = match.rule.id,
+                    ruleLabel = match.rule.label,
+                    action = match.rule.action,
+                    packageName = entry.packageName,
+                    title = entry.title,
+                    textPreview = entry.text?.take(160) ?: entry.subText?.take(160),
+                    matchedAt = System.currentTimeMillis(),
+                    result = result,
+                )
+            )
+        }
+    }
+
    private fun NotificationEntry.toEnvelope(): Envelope {
        val payload = JSON.encodeToJsonElement(NotificationEntry.serializer(), this) as JsonObject
        return Envelope(
@@ -0,0 +1,292 @@
+package com.hermesandroid.relay.notifications
+
+import android.Manifest
+import android.annotation.SuppressLint
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
+import android.util.Log
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringPreferencesKey
+import androidx.datastore.preferences.preferencesDataStore
+import com.hermesandroid.relay.MainActivity
+import com.hermesandroid.relay.R
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import java.util.UUID
+
+/**
+ * Minimal notification-trigger MVP schema and persistence.
+ *
+ * Storage location: Android DataStore preferences file `notification_triggers`
+ * under the app-private data directory. Rules and the visible activity log are
+ * JSON strings so schema evolution remains additive and lenient.
+ */
+@Serializable
+data class NotificationTriggerRule(
+    val id: String = UUID.randomUUID().toString(),
+    val label: String = "Ask me about matching notifications",
+    val enabled: Boolean = true,
+    @SerialName("app_package")
+    val appPackage: String? = null,
+    @SerialName("title_contains")
+    val titleContains: String? = null,
+    @SerialName("text_contains")
+    val textContains: String? = null,
+    val action: NotificationTriggerAction = NotificationTriggerAction.AskMe,
+    @SerialName("require_confirmation")
+    val requireConfirmation: Boolean = false,
+)
+
+@Serializable
+enum class NotificationTriggerAction {
+    @SerialName("ask_me")
+    AskMe,
+}
+
+@Serializable
+data class NotificationTriggerActivityEntry(
+    val id: String = UUID.randomUUID().toString(),
+    @SerialName("rule_id")
+    val ruleId: String,
+    @SerialName("rule_label")
+    val ruleLabel: String,
+    val action: NotificationTriggerAction,
+    @SerialName("package_name")
+    val packageName: String,
+    val title: String? = null,
+    @SerialName("text_preview")
+    val textPreview: String? = null,
+    @SerialName("matched_at")
+    val matchedAt: Long,
+    val result: String,
+)
+
+@Serializable
+data class NotificationTriggerSettings(
+    @SerialName("master_enabled")
+    val masterEnabled: Boolean = false,
+    @SerialName("kill_switch")
+    val killSwitch: Boolean = false,
+    val rules: List<NotificationTriggerRule> = emptyList(),
+    @SerialName("activity_log")
+    val activityLog: List<NotificationTriggerActivityEntry> = emptyList(),
+)
+
+data class NotificationTriggerMatch(
+    val rule: NotificationTriggerRule,
+    val entry: NotificationEntry,
+)
+
+internal val Context.notificationTriggerDataStore: DataStore<Preferences> by
+    preferencesDataStore(name = "notification_triggers")
+
+class NotificationTriggerStore(
+    private val dataStore: DataStore<Preferences>,
+) {
+    private val json = Json {
+        ignoreUnknownKeys = true
+        encodeDefaults = true
+    }
+
+    val settings: Flow<NotificationTriggerSettings> = dataStore.data.map { prefs ->
+        NotificationTriggerSettings(
+            masterEnabled = prefs[KEY_MASTER_ENABLED] ?: false,
+            killSwitch = prefs[KEY_KILL_SWITCH] ?: false,
+            rules = decodeList<NotificationTriggerRule>(prefs[KEY_RULES_JSON]),
+            activityLog = decodeList<NotificationTriggerActivityEntry>(prefs[KEY_ACTIVITY_LOG_JSON]),
+        )
+    }
+
+    suspend fun setMasterEnabled(enabled: Boolean) {
+        dataStore.edit { prefs -> prefs[KEY_MASTER_ENABLED] = enabled }
+    }
+
+    suspend fun setKillSwitch(enabled: Boolean) {
+        dataStore.edit { prefs -> prefs[KEY_KILL_SWITCH] = enabled }
+    }
+
+    suspend fun saveSingleRule(rule: NotificationTriggerRule) {
+        dataStore.edit { prefs ->
+            prefs[KEY_RULES_JSON] = json.encodeToString(listOf(rule.normalized()))
+        }
+    }
+
+    suspend fun clearActivityLog() {
+        dataStore.edit { prefs -> prefs.remove(KEY_ACTIVITY_LOG_JSON) }
+    }
+
+    suspend fun firstMatchingRule(entry: NotificationEntry): NotificationTriggerMatch? {
+        val snapshot = settings.first()
+        if (!snapshot.masterEnabled || snapshot.killSwitch) return null
+        val rule = snapshot.rules.firstOrNull { it.matches(entry) } ?: return null
+        return NotificationTriggerMatch(rule = rule, entry = entry)
+    }
+
+    suspend fun appendActivity(entry: NotificationTriggerActivityEntry) {
+        dataStore.edit { prefs ->
+            val current = decodeList<NotificationTriggerActivityEntry>(prefs[KEY_ACTIVITY_LOG_JSON])
+            prefs[KEY_ACTIVITY_LOG_JSON] = json.encodeToString(
+                (listOf(entry) + current).take(MAX_ACTIVITY_LOG_ENTRIES),
+            )
+        }
+    }
+
+    private inline fun <reified T> decodeList(raw: String?): List<T> {
+        if (raw.isNullOrBlank()) return emptyList()
+        return runCatching { json.decodeFromString<List<T>>(raw) }.getOrDefault(emptyList())
+    }
+
+    private fun NotificationTriggerRule.normalized(): NotificationTriggerRule = copy(
+        label = label.trim().ifBlank { "Ask me about matching notifications" },
+        appPackage = appPackage.cleanBlank(),
+        titleContains = titleContains.cleanBlank(),
+        textContains = textContains.cleanBlank(),
+    )
+
+    companion object {
+        private val KEY_MASTER_ENABLED = booleanPreferencesKey("notification_triggers_enabled")
+        private val KEY_KILL_SWITCH = booleanPreferencesKey("notification_triggers_kill_switch")
+        private val KEY_RULES_JSON = stringPreferencesKey("notification_trigger_rules_json")
+        private val KEY_ACTIVITY_LOG_JSON = stringPreferencesKey("notification_trigger_activity_log_json")
+        const val MAX_ACTIVITY_LOG_ENTRIES = 25
+
+        fun defaultRule(): NotificationTriggerRule = NotificationTriggerRule()
+    }
+}
+
+fun NotificationTriggerRule.matches(entry: NotificationEntry): Boolean {
+    if (!enabled) return false
+    val app = appPackage.cleanBlank()
+    val titleNeedle = titleContains.cleanBlank()
+    val textNeedle = textContains.cleanBlank()
+
+    // Avoid accidental "match every notification on the phone" rules. The UI
+    // requires at least one filter too, but this keeps imported/future schema
+    // data safe.
+    if (app == null && titleNeedle == null && textNeedle == null) return false
+
+    if (app != null && !entry.packageName.equals(app, ignoreCase = true)) return false
+    if (titleNeedle != null && !entry.title.orEmpty().contains(titleNeedle, ignoreCase = true)) {
+        return false
+    }
+    if (textNeedle != null) {
+        val haystack = listOfNotNull(entry.text, entry.subText).joinToString("\n")
+        if (!haystack.contains(textNeedle, ignoreCase = true)) return false
+    }
+    return true
+}
+
+fun NotificationTriggerRule.summary(): String {
+    val parts = buildList {
+        appPackage.cleanBlank()?.let { add("app $it") }
+        titleContains.cleanBlank()?.let { add("title contains “$it”") }
+        textContains.cleanBlank()?.let { add("text contains “$it”") }
+    }
+    return if (parts.isEmpty()) "No filters set" else parts.joinToString(" · ")
+}
+
+private fun String?.cleanBlank(): String? = this?.trim()?.takeIf { it.isNotBlank() }
+
+object NotificationTriggerPromptNotifier {
+    private const val TAG = "NotifTriggerPrompt"
+    private const val CHANNEL_ID = "notification_triggers"
+    private const val CHANNEL_NAME = "Notification triggers"
+    private const val NOTIFICATION_ID_BASE = 4300
+    private const val CHAT_ROUTE = "chat"
+
+    /**
+     * Safe automatic action: post a local prompt that asks the user whether to
+     * involve Hermes. It does not send an LLM request, reply, tap, text, route,
+     * or otherwise act on another app without the user tapping first.
+     */
+    @SuppressLint("MissingPermission", "NotificationPermission")
+    fun notifyAskMe(
+        context: Context,
+        rule: NotificationTriggerRule,
+        entry: NotificationEntry,
+    ): String {
+        ensureChannel(context)
+        if (!hasPostNotificationsPermission(context)) {
+            Log.i(TAG, "POST_NOTIFICATIONS not granted — logging trigger without prompt")
+            return "skipped: post-notifications permission missing"
+        }
+
+        val tapIntent = Intent(context, MainActivity::class.java).apply {
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+            putExtra(MainActivity.EXTRA_NAV_ROUTE, CHAT_ROUTE)
+        }
+        val pendingFlags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        val tapPending = PendingIntent.getActivity(context, notificationId(entry), tapIntent, pendingFlags)
+
+        val title = context.getString(R.string.notification_trigger_prompt_title)
+        val source = entry.title?.takeIf { it.isNotBlank() } ?: entry.packageName
+        val body = entry.text?.takeIf { it.isNotBlank() }
+            ?: "Rule matched: ${rule.summary()}"
+        val expanded = "Matched ${rule.summary()}\n\n$source\n$body"
+
+        val notification = NotificationCompat.Builder(context, CHANNEL_ID)
+            .setSmallIcon(R.mipmap.ic_launcher)
+            .setContentTitle(title)
+            .setContentText("$source — ${body.take(96)}")
+            .setStyle(NotificationCompat.BigTextStyle().bigText(expanded.take(700)))
+            .setContentIntent(tapPending)
+            .setAutoCancel(true)
+            .setOnlyAlertOnce(false)
+            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+            .setCategory(NotificationCompat.CATEGORY_REMINDER)
+            .build()
+
+        return runCatching {
+            NotificationManagerCompat.from(context).notify(notificationId(entry), notification)
+            "prompt posted"
+        }.getOrElse { exc ->
+            Log.w(TAG, "notifyAskMe: notify failed", exc)
+            "skipped: prompt failed (${exc.javaClass.simpleName})"
+        }
+    }
+
+    private fun notificationId(entry: NotificationEntry): Int {
+        val suffix = (entry.key.hashCode() and 0x0fff)
+        return NOTIFICATION_ID_BASE + suffix
+    }
+
+    private fun ensureChannel(context: Context) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
+        val nm = context.getSystemService(NotificationManager::class.java) ?: return
+        if (nm.getNotificationChannel(CHANNEL_ID) != null) return
+        val channel = NotificationChannel(
+            CHANNEL_ID,
+            CHANNEL_NAME,
+            NotificationManager.IMPORTANCE_DEFAULT,
+        ).apply {
+            description = "Prompts shown when an explicitly enabled notification trigger matches."
+            setShowBadge(true)
+        }
+        nm.createNotificationChannel(channel)
+    }
+
+    private fun hasPostNotificationsPermission(context: Context): Boolean {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) return true
+        return ContextCompat.checkSelfPermission(
+            context,
+            Manifest.permission.POST_NOTIFICATIONS,
+        ) == PackageManager.PERMISSION_GRANTED
+    }
+}
@@ -56,6 +56,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.createSavedStateHandle
@@ -67,6 +68,7 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.ui.components.CrashReportGate
 import com.hermesandroid.relay.ui.components.DemoModeBanner
 import com.hermesandroid.relay.ui.components.DemoUnavailableContent
@@ -421,6 +423,7 @@ fun RelayApp() {
                        System.currentTimeMillis() - lastPausedAtMs.value
                    }
                    connectionViewModel.revalidateOnResume(awayMs)
+                    voiceViewModel.onAppResumed()
                }
                else -> {}
            }
@@ -791,6 +794,23 @@ fun RelayApp() {
        chatViewModel.notifyOnTurnComplete = notifyTurnComplete
    }

+    // Demo-mode composer wiring: unconditional — a demo session has no API
+    // client, so the client-gated chat init effect above never runs and
+    // ChatViewModel's own handler stays null. Lambdas read live state on
+    // every send.
+    LaunchedEffect(Unit) {
+        chatViewModel.setDemoModeWiring(
+            isDemo = { connectionViewModel.isDemoMode.value },
+            handler = { connectionViewModel.chatHandler },
+        )
+        // Voice → chat breadcrumbs (e.g. "background task still running" when
+        // voice mode exits with a detached run) land as system notices in the
+        // shared chat transcript.
+        voiceViewModel.chatNoticeSink = { notice ->
+            connectionViewModel.chatHandler.addSystemNotice(notice)
+        }
+    }
+
    // Sync tool annotation parsing toggle to ChatHandler
    val parseAnnotations by connectionViewModel.parseToolAnnotations.collectAsState()
    LaunchedEffect(parseAnnotations) {
@@ -1048,11 +1068,19 @@ fun RelayApp() {
            bridgePrimaryReturnLabel = null
        }

-        val bridgeReturnTitle = bridgePrimaryReturnLabel?.let { "Return to $it" }
+        val bridgeReturnLabelResId = when (bridgePrimaryReturnLabel) {
+            "Chat" -> R.string.bridge_return_chat_label
+            "Manage" -> R.string.bridge_return_manage_label
+            else -> R.string.bridge_return_default_label
+        }
+        val bridgeReturnDisplayLabel = stringResource(bridgeReturnLabelResId)
+        val bridgeReturnTitle = bridgePrimaryReturnLabel?.let {
+            stringResource(R.string.bridge_return_title_format, bridgeReturnDisplayLabel)
+        }
        val bridgeReturnSubtitle = when (bridgePrimaryReturnLabel) {
-            "Chat" -> "Back to conversation"
-            "Manage" -> "Back to management"
-            else -> "Back to previous tab"
+            "Chat" -> stringResource(R.string.bridge_return_chat_subtitle)
+            "Manage" -> stringResource(R.string.bridge_return_manage_subtitle)
+            else -> stringResource(R.string.bridge_return_default_subtitle)
        }
        val bridgeReturnAction: (() -> Unit)? = bridgePrimaryReturnRoute?.let { route ->
            {
@@ -1325,6 +1353,7 @@ fun RelayApp() {
                connectionId = connection.id,
                dashboardUrl = effectiveDashboardUrl,
                cacheDir = hydrateContext.cacheDir,
+                context = hydrateContext,
            )
        }

@@ -1332,13 +1361,17 @@ fun RelayApp() {
        // so voice/chat/settings screens can call showHumanError from their
        // error-collector LaunchedEffects without threading state downwards.
        val snackbarHostState = remember { SnackbarHostState() }
+        val profilesUpdatedLabel = stringResource(R.string.relay_app_profiles_updated)
+        val reconnectingRelayLabel = stringResource(R.string.relay_app_reconnecting)
+        val renameFailedLabel = stringResource(R.string.relay_app_rename_failed)
+        val revokeOnlyActiveLabel = stringResource(R.string.relay_app_revoke_only_active)

        // Relay-pushed `profiles.updated` announcements. AuthManager
        // filters out idempotent pushes (same names + same count), so
        // this only fires when the profile list actually changed.
        LaunchedEffect(connectionViewModel) {
            connectionViewModel.profilesUpdatedEvents.collect {
-                UiMessageBus.success("Profiles updated")
+                UiMessageBus.success(profilesUpdatedLabel)
            }
        }

@@ -1558,7 +1591,7 @@ fun RelayApp() {
                if (!suppressGlobalChrome && !isKeyboardVisible && !showStartupSphere && !voiceUiState.voiceMode) {
                    val routeLabel = activeEndpoint?.displayLabel()
                        ?: activeConnection?.label
-                        ?: "no route"
+                        ?: stringResource(R.string.status_no_route)
                    val transportStatus = resolveChatTransportStatus(
                        streamingEndpoint = streamingEndpoint,
                        gatewayAvailability = gatewayAvailability,
@@ -1569,7 +1602,8 @@ fun RelayApp() {
                    } else {
                        routeLabel
                    }
-                    val profileLabel = selectedProfile?.name?.takeIf { it.isNotBlank() } ?: "default"
+                    val profileLabel = selectedProfile?.name?.takeIf { it.isNotBlank() }
+                        ?: stringResource(R.string.status_profile_default)
                    val displayProfile = AgentDisplay.effectiveDisplayProfile(
                        selectedProfile = selectedProfile,
                        profiles = agentProfiles,
@@ -1577,11 +1611,12 @@ fun RelayApp() {
                    val modelLabel = AgentDisplay.displayModelName(gatewayCurrentModel)
                        ?: AgentDisplay.displayModelName(displayProfile?.model)
                        ?: AgentDisplay.displayModelName(serverModelName)
-                        ?: "model pending"
+                        ?: stringResource(R.string.status_model_pending)
                    val safetyLabel = if (BuildFlavor.isSideload && masterEnabled) {
-                        "safety: ${if (unattendedEnabled) "unattended" else "on"}"
+                        if (unattendedEnabled) stringResource(R.string.status_safety_unattended)
+                        else stringResource(R.string.status_safety_on)
                    } else {
-                        "profile: $profileLabel"
+                        stringResource(R.string.status_profile_format, profileLabel)
                    }
                    val openConnections = {
                        navController.navigate(Screen.ConnectionsSettings.route) {
@@ -1696,6 +1731,8 @@ fun RelayApp() {
                    val openAgentSheetArg = backStackEntry.arguments
                        ?.getBoolean(Screen.Chat.ARG_OPEN_AGENT_SHEET, false) == true

+                    val screenChatLabel = stringResource(R.string.screen_chat_label)
+
                    ChatScreen(
                        chatViewModel = chatViewModel,
                        connectionViewModel = connectionViewModel,
@@ -1736,7 +1773,7 @@ fun RelayApp() {
                        onNavigateToBridge = {
                            rememberBridgeReturn(
                                route = Screen.Chat.route(openAgentSheet = false),
-                                label = "Chat",
+                                label = screenChatLabel,
                            )
                            navController.navigate(Screen.Bridge.route) {
                                popUpTo(navController.graph.findStartDestination().id) {
@@ -1774,10 +1811,11 @@ fun RelayApp() {
                        // so show a friendly demo empty state instead of
                        // attempting a sign-in / fetch.
                        DemoUnavailableContent(
-                            feature = "Manage",
+                            feature = stringResource(R.string.demo_feature_manage),
                            onConnect = exitDemoToConnect,
                        )
                    } else {
+                    val screenManageLabel = stringResource(R.string.screen_manage_label)
                    DashboardManagementScreen(
                        connectionViewModel = connectionViewModel,
                        onNavigateToConnections = {
@@ -1793,7 +1831,7 @@ fun RelayApp() {
                        onNavigateToBridge = {
                            rememberBridgeReturn(
                                route = Screen.Manage.route,
-                                label = "Manage",
+                                label = screenManageLabel,
                            )
                            navController.navigate(Screen.Bridge.route) {
                                popUpTo(navController.graph.findStartDestination().id) {
@@ -1825,8 +1863,8 @@ fun RelayApp() {
                        )
                    } else {
                        PowerFeatureGateScreen(
-                            title = "Terminal",
-                            summary = "Open a server shell through your paired relay session.",
+                            title = stringResource(R.string.power_gate_terminal_title),
+                            summary = stringResource(R.string.power_gate_terminal_summary),
                            status = PowerFeatureGateStatus.fromRelayAuth(coldStartAuthState),
                            onPrimaryAction = {
                                navController.navigate(Screen.Pair.route())
@@ -1838,8 +1876,8 @@ fun RelayApp() {
                composable(Screen.Bridge.route) {
                    if (coldStartAuthState !is AuthState.Paired) {
                        PowerFeatureGateScreen(
-                            title = "Bridge",
-                            summary = "Let Hermes send approved bridge commands to this phone.",
+                            title = stringResource(R.string.power_gate_bridge_title),
+                            summary = stringResource(R.string.power_gate_bridge_summary),
                            status = PowerFeatureGateStatus.fromRelayAuth(coldStartAuthState),
                            onPrimaryAction = {
                                navController.navigate(Screen.Pair.route())
@@ -1852,7 +1890,9 @@ fun RelayApp() {
                                connectionViewModel = connectionViewModel,
                                returnTitle = bridgeReturnTitle,
                                returnSubtitle = bridgeReturnSubtitle,
-                                returnLabel = bridgePrimaryReturnLabel ?: "Back",
+                                returnLabel = bridgePrimaryReturnLabel?.let {
+                                    stringResource(bridgeReturnLabelResId)
+                                } ?: stringResource(R.string.bridge_return_default_label),
                                onReturn = bridgeReturnAction,
                                onNavigateToBridgeSafety = {
                                    navController.navigate(Screen.BridgeSafetySettings.route)
@@ -1886,7 +1926,9 @@ fun RelayApp() {
                                connectionViewModel = connectionViewModel,
                                returnTitle = bridgeReturnTitle,
                                returnSubtitle = bridgeReturnSubtitle,
-                                returnLabel = bridgePrimaryReturnLabel ?: "Back",
+                                returnLabel = bridgePrimaryReturnLabel?.let {
+                                    stringResource(bridgeReturnLabelResId)
+                                } ?: stringResource(R.string.bridge_return_default_label),
                                onReturn = bridgeReturnAction,
                                onNavigateToConnections = {
                                    navController.navigate(Screen.ConnectionsSettings.route)
@@ -2016,7 +2058,7 @@ fun RelayApp() {
                        // Voice runs through the live server (transcribe /
                        // synthesize) — show the demo empty state offline.
                        DemoUnavailableContent(
-                            feature = "Voice",
+                            feature = stringResource(R.string.screen_voice_label),
                            onConnect = exitDemoToConnect,
                        )
                    } else {
@@ -2139,8 +2181,8 @@ fun RelayApp() {
                        )
                    } else {
                        PowerFeatureGateScreen(
-                            title = "Relay sessions",
-                            summary = "Review and revoke devices paired with this relay.",
+                            title = stringResource(R.string.screen_relay_sessions_label),
+                            summary = stringResource(R.string.power_gate_relay_sessions_summary),
                            status = PowerFeatureGateStatus.fromRelayAuth(coldStartAuthState),
                            onPrimaryAction = {
                                navController.navigate(Screen.Pair.route())
@@ -2215,14 +2257,14 @@ fun RelayApp() {
                        onBack = { navController.popBackStack() },
                        onReconnect = {
                            connectionViewModel.connectRelay()
-                            UiMessageBus.status("Reconnecting to relay…")
+                            UiMessageBus.status(reconnectingRelayLabel)
                        },
                        onRename = { id, newLabel ->
                            connectionSwitchScope.launch {
                                connectionViewModel.renameConnection(id, newLabel)
                                    .onFailure { err ->
                                        snackbarHostState.showSnackbar(
-                                            err.message ?: "Rename failed",
+                                            err.message ?: renameFailedLabel,
                                        )
                                    }
                            }
@@ -2237,9 +2279,7 @@ fun RelayApp() {
                            connectionSwitchScope.launch {
                                val result = connectionViewModel.revokeConnection(id)
                                if (result.isFailure) {
-                                    snackbarHostState.showSnackbar(
-                                        "Only the active connection can be revoked right now",
-                                    )
+                                    snackbarHostState.showSnackbar(revokeOnlyActiveLabel)
                                }
                            }
                        },
@@ -2411,8 +2451,8 @@ fun RelayApp() {
                        ?: Screen.ProfileInspector.SECTION_CONFIG
                    if (coldStartAuthState !is AuthState.Paired) {
                        PowerFeatureGateScreen(
-                            title = "Profile Inspector",
-                            summary = "Inspect relay-backed profile config, SOUL, memory files, and skills.",
+                            title = stringResource(R.string.screen_profile_inspector_label),
+                            summary = stringResource(R.string.power_gate_profile_inspector_summary),
                            status = PowerFeatureGateStatus.fromRelayAuth(coldStartAuthState),
                            onPrimaryAction = {
                                navController.navigate(Screen.Pair.route())
@@ -2541,13 +2581,13 @@ fun RelayApp() {
                        .padding(bottom = 120.dp)
                ) {
                    Text(
-                        text = "Hermes-Relay",
+                        text = stringResource(R.string.app_title),
                        style = MaterialTheme.typography.headlineMedium,
                        color = RelayRefresh.Paper.copy(alpha = 0.92f)
                    )
                    Spacer(modifier = Modifier.height(4.dp))
                    Text(
-                        text = "agent interface",
+                        text = stringResource(R.string.agent_interface),
                        style = MaterialTheme.typography.bodyMedium,
                        color = RelayRefresh.Muted.copy(alpha = 0.72f),
                        letterSpacing = 2.sp
@@ -55,12 +55,14 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.ClipEntry
 import androidx.compose.ui.platform.LocalClipboard
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.auth.AuthState
 import com.hermesandroid.relay.data.Connection
 import com.hermesandroid.relay.data.EndpointCandidate
@@ -130,29 +132,29 @@ fun ActiveCardStandardStatusSection(
    )

    ConnectionStatusRow(
-        label = "API Server",
+        label = stringResource(R.string.active_section_api_server),
        isConnected = apiReachable,
        isProbing = apiHealth == ConnectionViewModel.HealthStatus.Probing,
        statusText = when {
-            apiHealth == ConnectionViewModel.HealthStatus.Probing -> "Checking…"
-            apiReachable -> "Reachable"
-            else -> "Unreachable"
+            apiHealth == ConnectionViewModel.HealthStatus.Probing -> stringResource(R.string.active_section_checking)
+            apiReachable -> stringResource(R.string.active_section_reachable)
+            else -> stringResource(R.string.active_section_unreachable)
        },
        onClick = onOpenApiInfo,
        modifier = Modifier.fillMaxWidth(),
    )

    ConnectionStatusRow(
-        label = "Dashboard",
+        label = stringResource(R.string.active_section_dashboard),
        isConnected = dashboardStatus?.reachable == true && !dashboardSignInRequired,
        statusText = when {
-            activeConnection?.resolvedDashboardUrl.isNullOrBlank() -> "Not configured"
-            dashboardStatus == null -> "Not checked"
-            !dashboardStatus.reachable -> "Unreachable"
-            dashboardSignInRequired -> "Sign-in required"
-            dashboardStatus.authenticated == true -> "Signed in"
-            dashboardStatus.authRequired == false -> "Available"
-            else -> "Available"
+            activeConnection?.resolvedDashboardUrl.isNullOrBlank() -> stringResource(R.string.active_section_not_configured)
+            dashboardStatus == null -> stringResource(R.string.active_section_not_checked)
+            !dashboardStatus.reachable -> stringResource(R.string.active_section_unreachable)
+            dashboardSignInRequired -> stringResource(R.string.active_section_sign_in_required)
+            dashboardStatus.authenticated == true -> stringResource(R.string.active_section_signed_in)
+            dashboardStatus.authRequired == false -> stringResource(R.string.active_section_available)
+            else -> stringResource(R.string.active_section_available)
        },
        onClick = onOpenDashboard,
        modifier = Modifier.fillMaxWidth(),
@@ -165,13 +167,13 @@ fun ActiveCardStandardStatusSection(
            verticalAlignment = Alignment.CenterVertically,
        ) {
            Text(
-                text = "Dashboard controls need a sign-in for this route.",
+                text = stringResource(R.string.active_section_dashboard_sign_in_hint),
                style = MaterialTheme.typography.bodySmall,
                color = MaterialTheme.colorScheme.onSurfaceVariant,
                modifier = Modifier.weight(1f),
            )
            TextButton(onClick = onOpenDashboard) {
-                Text("Sign in")
+                Text(stringResource(R.string.active_section_sign_in))
            }
        }
    }
@@ -194,18 +196,22 @@ fun ActiveCardRelayStatusSection(
    val relayUiState by connectionViewModel.relayUiState.collectAsState()
    val relayRowState by connectionViewModel.relayRowState.collectAsState()

+    // Pre-resolve strings for Toast (non-composable context)
+    val reconnectingRelayToast = stringResource(R.string.active_section_reconnecting_relay)
+    val connectedLabel = stringResource(R.string.conn_info_connected)
+
    // ADR 24: relayRowState carries both the phase and the active endpoint
    // role. statusText appends " · <Role>" when the resolver has picked one.
    ConnectionStatusRow(
-        label = "Relay",
+        label = stringResource(R.string.active_section_relay),
        state = relayRowState.asBadgeState(),
-        statusText = relayRowState.statusText(connectedLabel = "Connected"),
+        statusText = relayRowState.statusText(connectedLabel = connectedLabel),
        onClick = {
            if (relayUiState == RelayUiState.Stale) {
                connectionViewModel.connectRelay()
                Toast.makeText(
                    context,
-                    "Reconnecting to relay…",
+                    reconnectingRelayToast,
                    Toast.LENGTH_SHORT,
                ).show()
            } else {
@@ -215,15 +221,21 @@ fun ActiveCardRelayStatusSection(
        modifier = Modifier.fillMaxWidth(),
    )

+    // Pre-resolve strings for Session status
+    val pairedLabel = stringResource(R.string.conn_info_paired)
+    val pairingLabel = stringResource(R.string.conn_info_pairing)
+    val unpairedLabel = stringResource(R.string.conn_info_unpaired)
+    val failedReasonLabel = stringResource(R.string.active_section_failed_reason)
+
    ConnectionStatusRow(
-        label = "Session",
+        label = stringResource(R.string.active_section_session),
        isConnected = authState is AuthState.Paired,
        isConnecting = authState is AuthState.Pairing,
        statusText = when (authState) {
-            is AuthState.Paired -> "Paired"
-            is AuthState.Pairing -> "Pairing..."
-            is AuthState.Unpaired -> "Unpaired"
-            is AuthState.Failed -> "Failed: ${(authState as AuthState.Failed).reason}"
+            is AuthState.Paired -> pairedLabel
+            is AuthState.Pairing -> pairingLabel
+            is AuthState.Unpaired -> unpairedLabel
+            is AuthState.Failed -> failedReasonLabel.format((authState as AuthState.Failed).reason)
        },
        onClick = onOpenSessionInfo,
        modifier = Modifier.fillMaxWidth(),
@@ -261,38 +273,39 @@ fun ActiveCardFeaturesSection(
        activeConnection?.routeCandidates.orEmpty().any { it.hasSecureProxy() }

    val apiValue = when {
-        apiHealth == ConnectionViewModel.HealthStatus.Probing -> "Checking"
-        apiReachable -> "Ready"
-        activeConnection?.apiServerUrl.isNullOrBlank() -> "Missing"
-        else -> "Offline"
+        apiHealth == ConnectionViewModel.HealthStatus.Probing -> stringResource(R.string.active_section_checking)
+        apiReachable -> stringResource(R.string.active_section_ready)
+        activeConnection?.apiServerUrl.isNullOrBlank() -> stringResource(R.string.active_section_missing)
+        else -> stringResource(R.string.active_section_offline)
    }
-    val apiTone = when (apiValue) {
-        "Ready" -> CapabilityTone.Good
-        "Offline", "Missing" -> CapabilityTone.Warning
-        else -> CapabilityTone.Neutral
+    val apiTone = when {
+        apiReachable -> CapabilityTone.Good
+        apiHealth == ConnectionViewModel.HealthStatus.Probing -> CapabilityTone.Neutral
+        else -> CapabilityTone.Warning
    }

    val dashboardValue = when {
-        activeConnection?.resolvedDashboardUrl.isNullOrBlank() -> "Missing"
-        dashboardStatus == null -> "Unchecked"
-        !dashboardStatus.reachable -> "Offline"
-        dashboardSignInRequired -> "Sign in"
-        dashboardStatus.authenticated == true -> "Signed in"
-        else -> "Available"
+        activeConnection?.resolvedDashboardUrl.isNullOrBlank() -> stringResource(R.string.active_section_missing)
+        dashboardStatus == null -> stringResource(R.string.active_section_unchecked)
+        !dashboardStatus.reachable -> stringResource(R.string.active_section_offline)
+        dashboardSignInRequired -> stringResource(R.string.active_section_sign_in)
+        dashboardStatus.authenticated == true -> stringResource(R.string.active_section_signed_in)
+        else -> stringResource(R.string.active_section_available)
    }
-    val dashboardTone = when (dashboardValue) {
-        "Signed in", "Available" -> CapabilityTone.Good
-        "Sign in" -> CapabilityTone.Info
-        "Offline", "Missing" -> CapabilityTone.Warning
+    val dashboardTone = when {
+        dashboardStatus?.authenticated == true -> CapabilityTone.Good
+        dashboardStatus?.reachable == true && !dashboardSignInRequired -> CapabilityTone.Good
+        dashboardSignInRequired -> CapabilityTone.Info
+        activeConnection?.resolvedDashboardUrl.isNullOrBlank() || dashboardStatus?.reachable != true -> CapabilityTone.Warning
        else -> CapabilityTone.Neutral
    }

    val voiceValue = when (standardVoiceAvailability) {
-        StandardVoiceAvailability.Ready -> "Ready"
-        StandardVoiceAvailability.SignInRequired -> "Sign in"
-        StandardVoiceAvailability.Unsupported -> "Unsupported"
-        StandardVoiceAvailability.Unreachable -> "Offline"
-        StandardVoiceAvailability.Unknown -> "Checking"
+        StandardVoiceAvailability.Ready -> stringResource(R.string.active_section_ready)
+        StandardVoiceAvailability.SignInRequired -> stringResource(R.string.active_section_sign_in)
+        StandardVoiceAvailability.Unsupported -> stringResource(R.string.active_section_unsupported)
+        StandardVoiceAvailability.Unreachable -> stringResource(R.string.active_section_offline)
+        StandardVoiceAvailability.Unknown -> stringResource(R.string.active_section_checking)
    }
    val voiceTone = when (standardVoiceAvailability) {
        StandardVoiceAvailability.Ready -> CapabilityTone.Good
@@ -303,11 +316,11 @@ fun ActiveCardFeaturesSection(
    }

    val relayValue = when {
-        !relayEnabled -> "Disabled"
-        !relayConfigured -> "Optional"
-        relayReady -> "Ready"
-        relayUiState == RelayUiState.Stale -> "Reconnect"
-        else -> "Configured"
+        !relayEnabled -> stringResource(R.string.active_section_disabled)
+        !relayConfigured -> stringResource(R.string.active_section_optional)
+        relayReady -> stringResource(R.string.active_section_ready)
+        relayUiState == RelayUiState.Stale -> stringResource(R.string.active_section_reconnect)
+        else -> stringResource(R.string.active_section_configured)
    }
    val relayTone = when {
        !relayEnabled || !relayConfigured -> CapabilityTone.Neutral
@@ -317,20 +330,28 @@ fun ActiveCardFeaturesSection(
    }

    val terminalValue = when {
-        !relayEnabled -> "Disabled"
-        authState is AuthState.Paired -> "Ready"
-        relayConfigured -> "Pair Relay"
-        else -> "Optional"
+        !relayEnabled -> stringResource(R.string.active_section_disabled)
+        authState is AuthState.Paired -> stringResource(R.string.active_section_ready)
+        relayConfigured -> stringResource(R.string.active_section_pair_relay)
+        else -> stringResource(R.string.active_section_optional)
    }
-    val terminalTone = when (terminalValue) {
-        "Ready" -> CapabilityTone.Good
-        "Pair Relay" -> CapabilityTone.Info
+    val terminalTone = when {
+        authState is AuthState.Paired -> CapabilityTone.Good
+        relayConfigured && authState !is AuthState.Paired -> CapabilityTone.Info
        else -> CapabilityTone.Neutral
    }

-    val proxyValue = if (secureProxyAdvertised) "Available" else "Not advertised"
+    val proxyValue = if (secureProxyAdvertised) stringResource(R.string.active_section_available) else stringResource(R.string.active_section_not_advertised)
    val proxyTone = if (secureProxyAdvertised) CapabilityTone.Good else CapabilityTone.Neutral

+    // Pre-resolve labels for CapabilityRow
+    val hermesApiLabel = stringResource(R.string.active_section_hermes_api)
+    val dashboardLabel = stringResource(R.string.active_section_dashboard)
+    val hermesVoiceLabel = stringResource(R.string.active_section_hermes_voice)
+    val relayToolsLabel = stringResource(R.string.active_section_relay_tools)
+    val terminalLabel = stringResource(R.string.active_section_terminal)
+    val secureProxyLabel = stringResource(R.string.active_section_secure_proxy)
+
    // Lighter than the old six-filled-tile grid: one subtle grouped surface
    // with a status dot + value per capability, dividers between rows. The
    // header/glance pills used to duplicate API/Dashboard/Voice/Relay state;
@@ -342,21 +363,21 @@ fun ActiveCardFeaturesSection(
    ) {
        Column(modifier = Modifier.padding(horizontal = 4.dp, vertical = 4.dp)) {
            CapabilityRow(
-                label = "Hermes API",
+                label = hermesApiLabel,
                value = apiValue,
                tone = apiTone,
                onClick = onOpenApiInfo,
            )
            CapabilityDivider()
            CapabilityRow(
-                label = "Dashboard",
+                label = dashboardLabel,
                value = dashboardValue,
                tone = dashboardTone,
                onClick = onOpenDashboard,
            )
            CapabilityDivider()
            CapabilityRow(
-                label = "Hermes voice",
+                label = hermesVoiceLabel,
                value = voiceValue,
                tone = voiceTone,
                onClick = if (standardVoiceAvailability ==
@@ -369,21 +390,21 @@ fun ActiveCardFeaturesSection(
            )
            CapabilityDivider()
            CapabilityRow(
-                label = "Relay tools",
+                label = relayToolsLabel,
                value = relayValue,
                tone = relayTone,
                onClick = onOpenRelayInfo,
            )
            CapabilityDivider()
            CapabilityRow(
-                label = "Terminal",
+                label = terminalLabel,
                value = terminalValue,
                tone = terminalTone,
                onClick = onOpenSessionInfo,
            )
            CapabilityDivider()
            CapabilityRow(
-                label = "Secure proxy",
+                label = secureProxyLabel,
                value = proxyValue,
                tone = proxyTone,
            )
@@ -499,7 +520,7 @@ fun ActiveCardAdvancedSection(
    var expanded by rememberSaveable { mutableStateOf(false) }

    SettingsExpandableCard(
-        title = "Advanced",
+        title = stringResource(R.string.active_section_advanced),
        expanded = expanded,
        onToggle = { expanded = !expanded },
        isDarkTheme = isDarkTheme,
@@ -557,6 +578,41 @@ private fun ManualUrlSubsection(
    }
    val autoRelayUrl = RelayUrlDeriver.deriveFromApiUrl(apiUrlInput)

+    // Pre-resolve strings for Toast (non-composable context)
+    val apiHermesVoiceReachableToast = stringResource(R.string.active_section_api_hermes_voice_reachable)
+    val apiRelayVoiceReachableToast = stringResource(R.string.active_section_api_relay_voice_reachable)
+    val apiReachableVoiceReviewToast = stringResource(R.string.active_section_api_reachable_voice_review)
+    val cannotReachApiToast = stringResource(R.string.active_section_cannot_reach_api)
+
+    // Pre-resolve other strings
+    val apiServerUrlLabel = stringResource(R.string.active_section_api_server_url_label)
+    val apiServerUrlPlaceholder = stringResource(R.string.active_section_api_server_url_placeholder)
+    val apiKeyOptionalLabel = stringResource(R.string.active_section_api_key_optional)
+    val apiKeyAlreadySetPlaceholder = stringResource(R.string.active_section_api_key_already_set)
+    val apiKeyNotConfiguredPlaceholder = stringResource(R.string.active_section_api_key_not_configured)
+    val apiKeyStoredHint = stringResource(R.string.active_section_api_key_stored_hint)
+    val apiKeyNeededHint = stringResource(R.string.active_section_api_key_needed_hint)
+    val hideDesc = stringResource(R.string.active_section_hide)
+    val showDesc = stringResource(R.string.active_section_show)
+    val saveAndTestText = stringResource(R.string.active_section_save_and_test)
+    val relayUrlText = stringResource(R.string.active_section_relay_url)
+    val autoRelayUrlText = stringResource(R.string.active_section_auto_relay_url)
+    val manualOverrideText = stringResource(R.string.active_section_manual_override)
+    val relayOptionalForVoiceText = stringResource(R.string.active_section_relay_optional_for_voice)
+    val useAutoRelayUrlText = stringResource(R.string.active_section_use_auto_relay_url)
+    val useCustomRelayUrlText = stringResource(R.string.active_section_use_custom_relay_url)
+    val relayUrlOverrideLabel = stringResource(R.string.active_section_relay_url_override)
+    val relayUrlOverridePlaceholder = stringResource(R.string.active_section_relay_url_override_placeholder)
+    val relayUrlOverrideHint = stringResource(R.string.active_section_relay_url_override_hint)
+    val voiceReadyViaHermesApiText = stringResource(R.string.active_section_voice_ready_via_hermes_api)
+    val voiceReadyViaRelayText = stringResource(R.string.active_section_voice_ready_via_relay)
+    val voiceRouteNeedsReviewText = stringResource(R.string.active_section_voice_route_needs_review)
+    val testRelayText = stringResource(R.string.active_section_test_relay)
+    val disconnectText = stringResource(R.string.active_section_disconnect)
+    val probingHealthText = stringResource(R.string.active_section_probing_health)
+    val reachableRelayVersionText = stringResource(R.string.active_section_reachable_relay_version)
+    val unreachableRelayText = stringResource(R.string.active_section_unreachable_relay)
+
    LaunchedEffect(apiUrlInput, relayOverrideVisible, autoRelayUrl) {
        if (!relayOverrideVisible && autoRelayUrl != null && relayUrlInput != autoRelayUrl) {
            relayUrlInput = autoRelayUrl
@@ -567,8 +623,8 @@ private fun ManualUrlSubsection(
    OutlinedTextField(
        value = apiUrlInput,
        onValueChange = { apiUrlInput = it },
-        label = { Text("API Server URL") },
-        placeholder = { Text("http://your-server:8642") },
+        label = { Text(apiServerUrlLabel) },
+        placeholder = { Text(apiServerUrlPlaceholder) },
        singleLine = true,
        modifier = Modifier.fillMaxWidth(),
    )
@@ -576,19 +632,19 @@ private fun ManualUrlSubsection(
    OutlinedTextField(
        value = apiKeyInput,
        onValueChange = { apiKeyInput = it },
-        label = { Text("API Key (optional)") },
+        label = { Text(apiKeyOptionalLabel) },
        placeholder = {
            Text(
-                if (apiKeyPresent) "•••• already set (leave blank to keep)"
-                else "Leave empty if not configured",
+                if (apiKeyPresent) apiKeyAlreadySetPlaceholder
+                else apiKeyNotConfiguredPlaceholder,
            )
        },
        supportingText = {
            Text(
                if (apiKeyPresent && apiKeyInput.isBlank()) {
-                    "A key is already stored — leave blank to keep it, or type to replace"
+                    apiKeyStoredHint
                } else {
-                    "Only needed if Hermes is configured with API_SERVER_KEY"
+                    apiKeyNeededHint
                },
            )
        },
@@ -603,7 +659,7 @@ private fun ManualUrlSubsection(
                Icon(
                    imageVector = if (apiKeyVisible) Icons.Filled.VisibilityOff
                    else Icons.Filled.Visibility,
-                    contentDescription = if (apiKeyVisible) "Hide" else "Show",
+                    contentDescription = if (apiKeyVisible) hideDesc else showDesc,
                )
            }
        },
@@ -635,13 +691,13 @@ private fun ManualUrlSubsection(
                        when {
                            result.apiReachable && result.voiceConfigReachable ->
                                if (result.voiceRoute == "standard") {
-                                    "API and Hermes voice reachable"
+                                    apiHermesVoiceReachableToast
                                } else {
-                                    "API and relay voice reachable"
+                                    apiRelayVoiceReachableToast
                                }
                            result.apiReachable ->
-                                "API reachable; voice route needs review"
-                            else -> "Cannot reach API server"
+                                apiReachableVoiceReviewToast
+                            else -> cannotReachApiToast
                        },
                        Toast.LENGTH_SHORT,
                    ).show()
@@ -649,7 +705,7 @@ private fun ManualUrlSubsection(
            },
            enabled = apiUrlInput.isNotBlank() && !isTestingApi,
        ) {
-            Text("Save & Test")
+            Text(saveAndTestText)
        }
        if (isTestingApi) {
            CircularProgressIndicator(
@@ -664,20 +720,20 @@ private fun ManualUrlSubsection(

        Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
            Text(
-                text = "Relay URL",
+                text = relayUrlText,
                style = MaterialTheme.typography.bodyMedium,
            )
            Text(
                text = if (autoRelayUrl != null && !relayOverrideVisible) {
-                    "Auto: $autoRelayUrl"
+                    autoRelayUrlText.format(autoRelayUrl)
                } else {
-                    "Manual override"
+                    manualOverrideText
                },
                style = MaterialTheme.typography.bodySmall.copy(fontFamily = FontFamily.Monospace),
                color = MaterialTheme.colorScheme.onSurfaceVariant,
            )
            Text(
-                text = "Relay is optional for voice. Hermes voice uses the Hermes API; Relay voice uses this route when selected or needed.",
+                text = relayOptionalForVoiceText,
                style = MaterialTheme.typography.bodySmall,
                color = MaterialTheme.colorScheme.onSurfaceVariant,
            )
@@ -691,7 +747,7 @@ private fun ManualUrlSubsection(
                },
                contentPadding = PaddingValues(horizontal = 0.dp),
            ) {
-                Text(if (relayOverrideVisible) "Use auto relay URL" else "Use custom relay URL")
+                Text(if (relayOverrideVisible) useAutoRelayUrlText else useCustomRelayUrlText)
            }
        }

@@ -703,11 +759,11 @@ private fun ManualUrlSubsection(
                    // Stale reachability results belong to the prior URL.
                    connectionViewModel.clearRelayReachableResult()
                },
-                label = { Text("Relay URL override") },
-                placeholder = { Text("wss://your-server:8767") },
+                label = { Text(relayUrlOverrideLabel) },
+                placeholder = { Text(relayUrlOverridePlaceholder) },
                singleLine = true,
                supportingText = {
-                    Text("Only needed when the optional Relay route cannot be auto-derived")
+                    Text(relayUrlOverrideHint)
                },
                modifier = Modifier.fillMaxWidth(),
            )
@@ -722,12 +778,12 @@ private fun ManualUrlSubsection(
            Text(
                text = if (result.voiceConfigReachable) {
                    if (result.voiceRoute == "standard") {
-                        "Voice ready via Hermes API"
+                        voiceReadyViaHermesApiText
                    } else {
-                        "Voice ready via ${result.relayUrl ?: "relay"}"
+                        voiceReadyViaRelayText.format(result.relayUrl ?: "relay")
                    }
                } else {
-                    "Voice route needs review: ${result.voiceConfigError ?: "voice config probe failed"}"
+                    voiceRouteNeedsReviewText.format(result.voiceConfigError ?: stringResource(R.string.active_section_voice_config_probe_failed))
                },
                style = MaterialTheme.typography.bodySmall,
                color = color,
@@ -751,13 +807,13 @@ private fun ManualUrlSubsection(
                enabled = (if (relayOverrideVisible) relayUrlInput else autoRelayUrl.orEmpty()).isNotBlank() &&
                    relayReachable !is ConnectionViewModel.RelayReachable.Probing,
            ) {
-                Text("Test Relay")
+                Text(testRelayText)
            }
            OutlinedButton(
                onClick = { connectionViewModel.disconnectRelay() },
                enabled = relayConnectionState != ConnectionState.Disconnected,
            ) {
-                Text("Disconnect")
+                Text(disconnectText)
            }
        }

@@ -772,15 +828,16 @@ private fun ManualUrlSubsection(
                        strokeWidth = 2.dp,
                    )
                    Text(
-                        text = "Probing /health…",
+                        text = probingHealthText,
                        style = MaterialTheme.typography.bodySmall,
                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                    )
                }
            }
            is ConnectionViewModel.RelayReachable.Ok -> {
+                val sessionsSuffix = if (r.sessions == 1) "" else stringResource(R.string.active_section_sessions_suffix)
                Text(
-                    text = "✓ Reachable — hermes-relay v${r.version} (${r.clients} client, ${r.sessions} session${if (r.sessions == 1) "" else "s"})",
+                    text = reachableRelayVersionText.format(r.version, r.clients, r.sessions, sessionsSuffix),
                    style = MaterialTheme.typography.bodySmall,
                    color = Color(0xFF4CAF50),
                )
@@ -792,7 +849,7 @@ private fun ManualUrlSubsection(
                )
                Column {
                    Text(
-                        text = "✗ ${humanErr.title}",
+                        text = unreachableRelayText.format(humanErr.title),
                        style = MaterialTheme.typography.bodySmall,
                        color = MaterialTheme.colorScheme.error,
                    )
@@ -824,6 +881,11 @@ private fun InsecureToggleSubsection(
    val isInsecureConnection by connectionViewModel.isInsecureConnection.collectAsState()
    val relayConnectionState by connectionViewModel.relayConnectionState.collectAsState()

+    // Pre-resolve strings
+    val plainConnectionNotEncrypted = stringResource(R.string.active_section_plain_connection_not_encrypted)
+    val allowPlainConnections = stringResource(R.string.active_section_allow_plain_connections)
+    val enableWsHttpForDev = stringResource(R.string.active_section_enable_ws_http_for_dev)
+
    if (isInsecureConnection && relayConnectionState == ConnectionState.Connected) {
        Row(
            verticalAlignment = Alignment.CenterVertically,
@@ -839,7 +901,7 @@ private fun InsecureToggleSubsection(
                modifier = Modifier.size(16.dp),
            )
            Text(
-                text = "Plain connection — traffic is not encrypted",
+                text = plainConnectionNotEncrypted,
                style = MaterialTheme.typography.bodySmall,
                color = MaterialTheme.colorScheme.error,
            )
@@ -853,11 +915,11 @@ private fun InsecureToggleSubsection(
    ) {
        Column(modifier = Modifier.weight(1f)) {
            Text(
-                text = "Allow plain (unencrypted) connections",
+                text = allowPlainConnections,
                style = MaterialTheme.typography.bodyMedium,
            )
            Text(
-                text = "Enable ws:// and http:// for local dev/testing only",
+                text = enableWsHttpForDev,
                style = MaterialTheme.typography.bodySmall,
                color = MaterialTheme.colorScheme.onSurfaceVariant,
            )
@@ -910,6 +972,23 @@ private fun ManualPairingCodeSubsection(
    var connectAttempt by remember { mutableStateOf(0) }
    var explainerExpanded by rememberSaveable { mutableStateOf(false) }

+    // Pre-resolve strings for non-composable contexts (LaunchedEffect, UiMessageBus)
+    val pairedSuccessfullyToast = stringResource(R.string.active_section_paired_successfully)
+    val noResponseFromRelayToast = stringResource(R.string.active_section_no_response_from_relay)
+    val pairingCodeCopiedToast = stringResource(R.string.active_section_pairing_code_copied)
+    val commandCopiedToast = stringResource(R.string.active_section_command_copied)
+    val hermesPairCommandLabel = stringResource(R.string.active_section_hermes_pair_command)
+    val copyPairingCodeDesc = stringResource(R.string.conn_info_copy_pairing_code)
+    val generateNewCodeDesc = stringResource(R.string.active_section_generate_new_code)
+    val copyHermesPairCommandDesc = stringResource(R.string.active_section_copy_hermes_pair_command)
+    val connectingText = stringResource(R.string.active_section_connecting)
+    val connectText = stringResource(R.string.active_section_connect)
+    val relayUrlNotSetText = stringResource(R.string.active_section_relay_url_not_set)
+    val hideExplanationText = stringResource(R.string.active_section_hide_explanation)
+    val howDoesThisWorkText = stringResource(R.string.active_section_how_does_this_work)
+    val manualPairingExplanation = stringResource(R.string.active_section_manual_pairing_explanation)
+    val pairingCodeLabel = stringResource(R.string.conn_info_pairing_code)
+
    LaunchedEffect(connectAttempt) {
        if (connectAttempt == 0) return@LaunchedEffect
        try {
@@ -919,7 +998,7 @@ private fun ManualPairingCodeSubsection(
            }
            connectInProgress = false
            when (terminal) {
-                is AuthState.Paired -> UiMessageBus.success("Paired successfully")
+                is AuthState.Paired -> UiMessageBus.success(pairedSuccessfullyToast)
                is AuthState.Failed -> {
                    val human = classifyError(
                        IllegalStateException(terminal.reason),
@@ -932,7 +1011,7 @@ private fun ManualPairingCodeSubsection(
        } catch (_: kotlinx.coroutines.TimeoutCancellationException) {
            connectInProgress = false
            val human = classifyError(
-                java.io.IOException("No response from relay"),
+                java.io.IOException(noResponseFromRelayToast),
                context = "pair",
            )
            snackbarHost.showHumanError(human)
@@ -942,20 +1021,25 @@ private fun ManualPairingCodeSubsection(
        }
    }

+    // Pre-resolve other UI strings
+    val manualPairingCodeTitle = stringResource(R.string.active_section_manual_pairing_code_title)
+    val manualPairingCodeDesc = stringResource(R.string.active_section_manual_pairing_code_desc)
+    val step1CopyCode = stringResource(R.string.active_section_step_1_copy_code)
+    val step2RunCommand = stringResource(R.string.active_section_step_2_run_command)
+    val step3TapConnect = stringResource(R.string.active_section_step_3_tap_connect)
+
    Text(
-        text = "Manual pairing code (fallback)",
+        text = manualPairingCodeTitle,
        style = MaterialTheme.typography.titleSmall,
    )
    Text(
-        text = "Use this when you can't scan the pairing QR. " +
-            "Follow the three steps — they're meant to be done in order on " +
-            "whatever machine you have shell access to.",
+        text = manualPairingCodeDesc,
        style = MaterialTheme.typography.bodySmall,
        color = MaterialTheme.colorScheme.onSurfaceVariant,
    )

    // Step 1 — display + copy + regenerate
-    ManualPairStep(number = 1, title = "Copy the code below") {
+    ManualPairStep(number = 1, title = step1CopyCode) {
        Row(
            verticalAlignment = Alignment.CenterVertically,
            horizontalArrangement = Arrangement.spacedBy(8.dp),
@@ -973,27 +1057,27 @@ private fun ManualPairingCodeSubsection(
            IconButton(onClick = {
                scope.launch {
                    clipboard.setClipEntry(
-                        ClipEntry(ClipData.newPlainText("Pairing code", pairingCode)),
+                        ClipEntry(ClipData.newPlainText(pairingCodeLabel, pairingCode)),
                    )
-                    UiMessageBus.info("Pairing code copied")
+                    UiMessageBus.info(pairingCodeCopiedToast)
                }
            }) {
                Icon(
                    imageVector = Icons.Filled.ContentCopy,
-                    contentDescription = "Copy pairing code",
+                    contentDescription = copyPairingCodeDesc,
                )
            }
            IconButton(onClick = { connectionViewModel.regeneratePairingCode() }) {
                Icon(
                    imageVector = Icons.Filled.Refresh,
-                    contentDescription = "Generate new code",
+                    contentDescription = generateNewCodeDesc,
                )
            }
        }
    }

    // Step 2 — host command
-    ManualPairStep(number = 2, title = "On the host running Hermes-Relay, run:") {
+    ManualPairStep(number = 2, title = step2RunCommand) {
        Surface(
            color = MaterialTheme.colorScheme.surface,
            shape = RoundedCornerShape(6.dp),
@@ -1016,16 +1100,16 @@ private fun ManualPairingCodeSubsection(
                        val cmd = "hermes pair --register-code $pairingCode"
                        scope.launch {
                            clipboard.setClipEntry(
-                                ClipEntry(ClipData.newPlainText("hermes pair command", cmd)),
+                                ClipEntry(ClipData.newPlainText(hermesPairCommandLabel, cmd)),
                            )
-                            UiMessageBus.info("Command copied")
+                            UiMessageBus.info(commandCopiedToast)
                        }
                    },
                    modifier = Modifier.size(32.dp),
                ) {
                    Icon(
                        imageVector = Icons.Filled.ContentCopy,
-                        contentDescription = "Copy hermes pair command",
+                        contentDescription = copyHermesPairCommandDesc,
                        modifier = Modifier.size(16.dp),
                    )
                }
@@ -1034,7 +1118,7 @@ private fun ManualPairingCodeSubsection(
    }

    // Step 3 — Connect button + relay-URL prerequisite check
-    ManualPairStep(number = 3, title = "Come back here and tap Connect") {
+    ManualPairStep(number = 3, title = step3TapConnect) {
        val canConnect = !connectInProgress &&
            relayUrl.isNotBlank() &&
            pairingCode.isNotBlank()
@@ -1061,14 +1145,14 @@ private fun ManualPairingCodeSubsection(
                    color = MaterialTheme.colorScheme.onPrimary,
                )
                Spacer(modifier = Modifier.size(8.dp))
-                Text("Connecting…")
+                Text(connectingText)
            } else {
-                Text("Connect")
+                Text(connectText)
            }
        }
        if (relayUrl.isBlank()) {
            Text(
-                text = "Relay URL not set — open the Manual URL section above to set it first.",
+                text = relayUrlNotSetText,
                style = MaterialTheme.typography.bodySmall,
                color = MaterialTheme.colorScheme.error,
            )
@@ -1082,24 +1166,13 @@ private fun ManualPairingCodeSubsection(
        contentPadding = PaddingValues(horizontal = 0.dp),
    ) {
        Text(
-            text = if (explainerExpanded) "Hide explanation" else "How does this work?",
+            text = if (explainerExpanded) hideExplanationText else howDoesThisWorkText,
            style = MaterialTheme.typography.bodySmall,
        )
    }
    if (explainerExpanded) {
        Text(
-            text = "This is a fallback for when you can't scan the pairing QR " +
-                "— for example, no camera, the host can't render a QR, or you " +
-                "only have SSH access from a single device. The canonical flow " +
-                "is the QR scan from `/hermes-relay-pair` or `hermes pair`.\n\n" +
-                "How it works: the phone generates a 6-character code locally. " +
-                "You paste that code into the host's `hermes pair --register-code` " +
-                "command, which pre-registers it with the relay. When you tap " +
-                "Connect here, the phone presents the same code to the relay " +
-                "and gets a long-lived session token in return.\n\n" +
-                "Bridge / device-control is gated by the master toggle on the " +
-                "Bridge tab, NOT by this pairing code. Pairing only authorizes " +
-                "the relay session.",
+            text = manualPairingExplanation,
            style = MaterialTheme.typography.bodySmall,
            color = MaterialTheme.colorScheme.onSurfaceVariant,
        )
@@ -1136,6 +1209,13 @@ fun ActiveCardSecurityPosture(
        modifier = Modifier.fillMaxWidth(),
    )

+    // Pre-resolve strings
+    val tailscaleDetectedText = stringResource(R.string.active_section_tailscale_detected)
+    val sessionTokenHardwareKeystoreText = stringResource(R.string.active_section_session_token_hardware_keystore)
+    val relaySessionsLabel = stringResource(R.string.active_section_relay_sessions)
+    val activeSessionsOnServerText = stringResource(R.string.active_section_active_sessions_on_server)
+    val managePhonesConnectText = stringResource(R.string.active_section_manage_phones_connect)
+
    if (isTailscaleDetected) {
        Row(
            verticalAlignment = Alignment.CenterVertically,
@@ -1148,7 +1228,7 @@ fun ActiveCardSecurityPosture(
                modifier = Modifier.size(16.dp),
            )
            Text(
-                text = "Tailscale detected",
+                text = tailscaleDetectedText,
                style = MaterialTheme.typography.bodySmall,
                color = Color(0xFF2E7D32),
            )
@@ -1167,7 +1247,7 @@ fun ActiveCardSecurityPosture(
                modifier = Modifier.size(16.dp),
            )
            Text(
-                text = "Session token stored in hardware keystore",
+                text = sessionTokenHardwareKeystoreText,
                style = MaterialTheme.typography.bodySmall,
                color = MaterialTheme.colorScheme.primary,
            )
@@ -1184,14 +1264,14 @@ fun ActiveCardSecurityPosture(
    ) {
        Column(modifier = Modifier.weight(1f)) {
            Text(
-                text = "Relay sessions",
+                text = relaySessionsLabel,
                style = MaterialTheme.typography.bodyMedium,
            )
            Text(
                text = if (pairedDevices.isNotEmpty()) {
-                    "${pairedDevices.size} active sessions on this server"
+                    activeSessionsOnServerText.format(pairedDevices.size)
                } else {
-                    "Manage which phones can connect"
+                    managePhonesConnectText
                },
                style = MaterialTheme.typography.bodySmall,
                color = MaterialTheme.colorScheme.onSurfaceVariant,
@@ -1253,22 +1333,42 @@ fun ActiveCardRoutesSection(
    val probeCameUpEmpty = activeEndpoint == null &&
        routeProbeStatus is ConnectionViewModel.RouteProbeStatus.Done &&
        routeProbeStatus.winner == null
+
+    // Pre-resolve strings for route status labels
+    val checkingRoutesText = stringResource(R.string.active_section_checking_routes)
+    val noRouteReachableText = stringResource(R.string.active_section_no_route_reachable)
+    val resolvingText = stringResource(R.string.active_section_resolving)
+    val usingSavedUrlText = stringResource(R.string.active_section_using_saved_url)
+
    val activeRouteLabel = when {
        activeEndpoint != null -> activeEndpoint!!.displayLabel()
-        isRouteProbing -> "Checking routes…"
-        probeCameUpEmpty -> "No route reachable"
-        else -> "Resolving"
+        isRouteProbing -> checkingRoutesText
+        probeCameUpEmpty -> noRouteReachableText
+        else -> resolvingText
    }
    val activeRouteHost = activeEndpoint?.api?.url
-        ?: "Using saved URL: ${connection.apiServerUrl.ifBlank { connection.relayUrl }}"
+        ?: usingSavedUrlText.format(connection.apiServerUrl.ifBlank { connection.relayUrl })
+
+    // Pre-resolve other UI strings
+    val chooseHowPhoneReachesText = stringResource(R.string.active_section_choose_how_phone_reaches)
+    val currentRouteText = stringResource(R.string.active_section_current_route)
+    val noRoutesAnsweredProbeText = stringResource(R.string.active_section_no_routes_answered_probe)
+    val tailscaleRouteNotActiveText = stringResource(R.string.active_section_tailscale_route_not_active)
+    val connectPhoneInTailscaleText = stringResource(R.string.active_section_connect_phone_in_tailscale)
+    val openTailscaleText = stringResource(R.string.active_section_open_tailscale)
+    val checkingText = stringResource(R.string.active_section_checking)
+    val recheckText = stringResource(R.string.active_section_recheck)
+    val phoneOnTailscaleNoRouteText = stringResource(R.string.active_section_phone_on_tailscale_no_route)
+    val addServerTailscaleUrlText = stringResource(R.string.active_section_add_server_tailscale_url)
+    val addTailscaleRouteText = stringResource(R.string.active_section_add_tailscale_route)
+    val autoText = stringResource(R.string.active_section_auto)

    Column(
        modifier = Modifier.fillMaxWidth(),
        verticalArrangement = Arrangement.spacedBy(8.dp),
    ) {
        Text(
-            text = "Choose how this phone reaches Hermes. Features stay separate " +
-                "from the selected route.",
+            text = chooseHowPhoneReachesText,
            style = MaterialTheme.typography.bodySmall,
            color = MaterialTheme.colorScheme.onSurfaceVariant,
        )
@@ -1287,7 +1387,7 @@ fun ActiveCardRoutesSection(
                    horizontalArrangement = Arrangement.spacedBy(8.dp),
                ) {
                    Text(
-                        text = "Current: $activeRouteLabel",
+                        text = currentRouteText.format(activeRouteLabel),
                        style = MaterialTheme.typography.bodyMedium,
                        color = if (probeCameUpEmpty) {
                            MaterialTheme.colorScheme.error
@@ -1311,8 +1411,7 @@ fun ActiveCardRoutesSection(
                )
                if (probeCameUpEmpty) {
                    Text(
-                        text = "None of the saved routes answered a health probe. " +
-                            "Expand the routes below for per-route reasons.",
+                        text = noRoutesAnsweredProbeText,
                        style = MaterialTheme.typography.bodySmall,
                        color = MaterialTheme.colorScheme.error,
                    )
@@ -1331,12 +1430,12 @@ fun ActiveCardRoutesSection(
                    verticalArrangement = Arrangement.spacedBy(6.dp),
                ) {
                    Text(
-                        text = "Tailscale route is not active on this phone",
+                        text = tailscaleRouteNotActiveText,
                        style = MaterialTheme.typography.labelMedium,
                        color = MaterialTheme.colorScheme.onTertiaryContainer,
                    )
                    Text(
-                        text = "Connect this phone in Tailscale, then re-check routes.",
+                        text = connectPhoneInTailscaleText,
                        style = MaterialTheme.typography.bodySmall,
                        color = MaterialTheme.colorScheme.onTertiaryContainer,
                    )
@@ -1351,7 +1450,7 @@ fun ActiveCardRoutesSection(
                                },
                                contentPadding = PaddingValues(horizontal = 0.dp),
                            ) {
-                                Text("Open Tailscale")
+                                Text(openTailscaleText)
                            }
                        }
                        TextButton(
@@ -1359,7 +1458,7 @@ fun ActiveCardRoutesSection(
                            enabled = !isRouteProbing,
                            contentPadding = PaddingValues(horizontal = 0.dp),
                        ) {
-                            Text(if (isRouteProbing) "Checking…" else "Re-check")
+                            Text(if (isRouteProbing) checkingText else recheckText)
                        }
                    }
                }
@@ -1380,13 +1479,12 @@ fun ActiveCardRoutesSection(
                    verticalArrangement = Arrangement.spacedBy(6.dp),
                ) {
                    Text(
-                        text = "Phone is on Tailscale — no Tailscale route yet",
+                        text = phoneOnTailscaleNoRouteText,
                        style = MaterialTheme.typography.labelMedium,
                        color = MaterialTheme.colorScheme.onTertiaryContainer,
                    )
                    Text(
-                        text = "Add your server's Tailscale URL so Hermes keeps " +
-                            "working when this phone leaves the server's network.",
+                        text = addServerTailscaleUrlText,
                        style = MaterialTheme.typography.bodySmall,
                        color = MaterialTheme.colorScheme.onTertiaryContainer,
                    )
@@ -1397,7 +1495,7 @@ fun ActiveCardRoutesSection(
                        },
                        contentPadding = PaddingValues(horizontal = 0.dp),
                    ) {
-                        Text("Add Tailscale route")
+                        Text(addTailscaleRouteText)
                    }
                }
            }
@@ -1411,7 +1509,7 @@ fun ActiveCardRoutesSection(
                onClick = { connectionViewModel.probeNow() },
                enabled = !isRouteProbing,
            ) {
-                Text(if (isRouteProbing) "Checking…" else "Re-check")
+                Text(if (isRouteProbing) checkingText else recheckText)
            }
            if (preferredRole != null || manualSwitchActive) {
                TextButton(
@@ -1420,7 +1518,7 @@ fun ActiveCardRoutesSection(
                        preferredRole = null
                    },
                ) {
-                    Text("Auto")
+                    Text(autoText)
                }
            }
        }
@@ -24,6 +24,8 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
+import androidx.compose.ui.res.stringResource
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.viewmodel.ConnectionViewModel
 import java.io.File

@@ -42,7 +44,7 @@ fun AgentIconRow(connectionViewModel: ConnectionViewModel) {

    Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
        Text(
-            text = "Agent icon",
+            text = stringResource(R.string.agent_icon_title),
            style = MaterialTheme.typography.labelLarge,
            color = MaterialTheme.colorScheme.onSurface,
        )
@@ -61,23 +63,23 @@ fun AgentIconRow(connectionViewModel: ConnectionViewModel) {
                if (!path.isNullOrBlank()) {
                    AsyncImage(
                        model = File(path),
-                        contentDescription = "Agent icon",
+                        contentDescription = stringResource(R.string.agent_icon_title),
                        contentScale = ContentScale.Crop,
                        modifier = Modifier.fillMaxSize(),
                    )
                }
            }
            OutlinedButton(onClick = { launcher.launch(arrayOf("image/*")) }) {
-                Text(if (iconPath.isNullOrBlank()) "Set image" else "Change")
+                Text(if (iconPath.isNullOrBlank()) stringResource(R.string.agent_icon_set) else stringResource(R.string.agent_icon_change))
            }
            if (!iconPath.isNullOrBlank()) {
                TextButton(onClick = { connectionViewModel.clearProfileIcon() }) {
-                    Text("Clear")
+                    Text(stringResource(R.string.agent_icon_clear))
                }
            }
        }
        Text(
-            text = "Shown beside this profile's name in chat. Stays on this device — never sent to Hermes.",
+            text = stringResource(R.string.agent_icon_description),
            style = MaterialTheme.typography.bodySmall,
            color = MaterialTheme.colorScheme.onSurfaceVariant,
        )
@@ -72,12 +72,14 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.res.stringResource
 import com.hermesandroid.relay.data.ChatMessage
 import com.hermesandroid.relay.data.MessageRole
 import com.hermesandroid.relay.ui.components.avatar.AvatarRenderState
 import com.hermesandroid.relay.ui.components.avatar.LocalAgentAvatar
-import com.hermesandroid.relay.ui.theme.RelayRefresh
 import kotlinx.coroutines.delay
+import com.hermesandroid.relay.R
+import com.hermesandroid.relay.ui.theme.RelayRefresh

 // --- Text-flow tuning constants -------------------------------------------
 //
@@ -188,8 +190,8 @@ private fun Modifier.topFadeEdge(fade: Dp = 28.dp): Modifier = this
        )
    }

-/** Resolved motion/accessibility posture for clean mode. */
-private data class CleanMotionState(
+/** Shared OS motion/accessibility posture for animated chat affordances. */
+internal data class AccessibleMotionState(
    /** OS animator scale is non-zero (i.e. system animations are ON). */
    val osAnimations: Boolean,
    /** TalkBack-style touch exploration is active — faded text is unreadable
@@ -198,7 +200,7 @@ private data class CleanMotionState(
 )

@Composable
-private fun rememberCleanMotionState(): CleanMotionState {
+internal fun rememberAccessibleMotionState(): AccessibleMotionState {
    val context = LocalContext.current
    // ANIMATOR_DURATION_SCALE == 0 is the platform "remove animations" / many
    // OEM "reduce motion" toggles. Read once on entry; a mid-mode toggle is
@@ -225,7 +227,10 @@ private fun rememberCleanMotionState(): CleanMotionState {
        a11y?.addTouchExplorationStateChangeListener(listener)
        onDispose { a11y?.removeTouchExplorationStateChangeListener(listener) }
    }
-    return CleanMotionState(osAnimations = osAnimations, touchExploration = touchExploration)
+    return AccessibleMotionState(
+        osAnimations = osAnimations,
+        touchExploration = touchExploration,
+    )
 }

 /**
@@ -450,7 +455,7 @@ private fun CleanModeComposer(
                    Box(contentAlignment = Alignment.CenterStart) {
                        if (text.isEmpty()) {
                            Text(
-                                text = "Message",
+                                text = stringResource(R.string.agent_text_placeholder),
                                style = MaterialTheme.typography.bodyLarge,
                                color = RelayRefresh.Dim,
                            )
@@ -466,7 +471,7 @@ private fun CleanModeComposer(
            ) {
                Icon(
                    imageVector = Icons.AutoMirrored.Filled.Send,
-                    contentDescription = "Send",
+                    contentDescription = stringResource(R.string.agent_text_send_cd),
                    tint = if (canSend) {
                        MaterialTheme.colorScheme.primary
                    } else {
@@ -511,7 +516,7 @@ fun CleanChatMode(
    onExit: () -> Unit,
    modifier: Modifier = Modifier,
 ) {
-    val motion = rememberCleanMotionState()
+    val motion = rememberAccessibleMotionState()
    val sphereAnimated = animationEnabled && motion.osAnimations
    // Faded text is unreadable to touch exploration, so the text path goes
    // static (readable + announced) whenever TalkBack is exploring.
@@ -547,8 +552,9 @@ fun CleanChatMode(

    BackHandler(enabled = true) { onExit() }

+    val sphereDescLabel = stringResource(R.string.agent_text_sphere_desc)
    val sphereDescription = remember(sphereState) {
-        "Agent ${sphereState.name.lowercase()}"
+        "$sphereDescLabel ${sphereState.name.lowercase()}"
    }

    Box(
@@ -586,7 +592,7 @@ fun CleanChatMode(
                IconButton(onClick = onExit) {
                    Icon(
                        imageVector = Icons.Filled.Close,
-                        contentDescription = "Exit clean mode",
+                        contentDescription = stringResource(R.string.agent_text_exit_clean),
                        tint = MaterialTheme.colorScheme.onSurfaceVariant,
                    )
                }
@@ -0,0 +1,355 @@
+package com.hermesandroid.relay.ui.components
+
+import android.graphics.BitmapFactory
+import android.net.Uri
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.BrokenImage
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import coil3.compose.AsyncImagePainter
+import coil3.compose.SubcomposeAsyncImage
+import coil3.compose.SubcomposeAsyncImageContent
+import com.hermesandroid.relay.R
+import com.hermesandroid.relay.data.Attachment
+import com.hermesandroid.relay.data.AttachmentRenderMode
+import com.hermesandroid.relay.data.AttachmentState
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+/**
+ * One item in a message's attachment render order. Loaded images are grouped
+ * into [Gallery] only when there are at least two; every other attachment
+ * keeps its original index so retry/manual-fetch callbacks still target the
+ * exact [com.hermesandroid.relay.data.ChatMessage.attachments] entry.
+ */
+internal sealed interface AttachmentLayoutItem {
+    data class Single(val attachmentIndex: Int) : AttachmentLayoutItem
+    data class Gallery(val attachmentIndices: List<Int>) : AttachmentLayoutItem
+}
+
+/**
+ * Build the attachment render plan without reordering non-image cards. The
+ * gallery occupies the first eligible image's slot and absorbs the remaining
+ * loaded images, including images separated by a PDF/file card.
+ */
+internal fun attachmentLayoutItems(attachments: List<Attachment>): List<AttachmentLayoutItem> {
+    return buildList {
+        var index = 0
+        while (index < attachments.size) {
+            if (!attachments[index].isGalleryImage()) {
+                add(AttachmentLayoutItem.Single(index))
+                index++
+                continue
+            }
+
+            val run = buildList {
+                var cursor = index
+                while (cursor < attachments.size && attachments[cursor].isGalleryImage()) {
+                    add(cursor)
+                    cursor++
+                }
+            }
+            if (run.size >= 2) add(AttachmentLayoutItem.Gallery(run))
+            else add(AttachmentLayoutItem.Single(index))
+            index += run.size
+        }
+    }
+}
+
+private fun Attachment.isGalleryImage(): Boolean =
+    state == AttachmentState.LOADED && renderMode == AttachmentRenderMode.IMAGE
+
+/** Two-column, non-lazy rows for a gallery nested inside the chat LazyColumn. */
+internal fun galleryRows(itemCount: Int): List<List<Int>> =
+    (0 until itemCount.coerceAtLeast(0)).chunked(GALLERY_COLUMNS)
+
+internal fun galleryPreviewIndices(itemCount: Int): List<Int> =
+    (0 until itemCount.coerceAtLeast(0)).take(GALLERY_PREVIEW_LIMIT)
+
+/**
+ * Telegram-style media group for two or more loaded image attachments.
+ *
+ * The chat bubble shows a compact two-column grid. Tapping a tile opens the
+ * full-screen horizontal pager at that image; per-image blur reveal, long-
+ * press actions, and one-tap Save remain available instead of regressing the
+ * single-image attachment behavior.
+ */
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+fun AttachmentGallery(
+    attachments: List<Attachment>,
+    modifier: Modifier = Modifier,
+    maxWidth: Dp = 280.dp,
+) {
+    if (attachments.size < 2) return
+
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
+    val blurMode = LocalMediaBlurMode.current
+    val revealed = remember { mutableStateMapOf<String, Boolean>() }
+    var viewerStartIndex by remember { mutableStateOf<Int?>(null) }
+
+    viewerStartIndex?.let { startIndex ->
+        AttachmentGalleryViewer(
+            attachments = attachments,
+            initialIndex = startIndex.coerceIn(attachments.indices),
+            initiallyRevealedKeys = revealed
+                .filterValues { it }
+                .keys,
+            onDismiss = { viewerStartIndex = null },
+        )
+    }
+
+    Column(
+        modifier = modifier
+            .widthIn(max = maxWidth)
+            .fillMaxWidth()
+            .semantics { contentDescription = "${attachments.size} image gallery" },
+        verticalArrangement = Arrangement.spacedBy(GALLERY_GAP),
+    ) {
+        val previewIndices = galleryPreviewIndices(attachments.size)
+        galleryRows(previewIndices.size).forEach { row ->
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(GALLERY_GAP),
+            ) {
+                row.forEach { previewIndex ->
+                    val galleryIndex = previewIndices[previewIndex]
+                    val attachment = attachments[galleryIndex]
+                    val attachmentKey = galleryAttachmentKey(attachment, galleryIndex)
+                    val blurred = revealed[attachmentKey] != true &&
+                        shouldBlurImage(blurMode, attachment.sensitive)
+                    var menuExpanded by remember(attachment, galleryIndex) { mutableStateOf(false) }
+
+                    Box(
+                        modifier = Modifier
+                            .weight(1f)
+                            // An odd final tile spans both columns without
+                            // becoming a full-width square taller than the grid.
+                            .aspectRatio(if (row.size == 1) 2f else 1f),
+                    ) {
+                        BlurredMedia(
+                            blurred = blurred,
+                            onReveal = { revealed[attachmentKey] = true },
+                            modifier = Modifier.fillMaxSize(),
+                        ) {
+                            GalleryImageTile(
+                                attachment = attachment,
+                                position = galleryIndex,
+                                count = attachments.size,
+                                modifier = Modifier
+                                    .fillMaxSize()
+                                    .testTag("attachment-gallery-tile-$galleryIndex")
+                                    .clip(RoundedCornerShape(GALLERY_CORNER))
+                                    .combinedClickable(
+                                        onClick = { viewerStartIndex = galleryIndex },
+                                        onLongClick = { menuExpanded = true },
+                                    ),
+                            )
+                        }
+
+                        if (!blurred) {
+                            SaveOverlayButton(
+                                onClick = {
+                                    scope.launch { saveAttachment(context, attachment) }
+                                },
+                                modifier = Modifier
+                                    .align(Alignment.TopEnd)
+                                    .padding(4.dp),
+                            )
+                        }
+
+                        AttachmentActionsMenu(
+                            expanded = menuExpanded,
+                            onDismiss = { menuExpanded = false },
+                            context = context,
+                            scope = scope,
+                            attachment = attachment,
+                        )
+
+                        val hiddenCount = attachments.size - GALLERY_PREVIEW_LIMIT
+                        if (
+                            hiddenCount > 0 &&
+                            previewIndex == GALLERY_PREVIEW_LIMIT - 1
+                        ) {
+                            Box(
+                                modifier = Modifier
+                                    .align(Alignment.BottomEnd)
+                                    .padding(7.dp)
+                                    .clip(RoundedCornerShape(50))
+                                    .background(Color.Black.copy(alpha = 0.68f))
+                                    .padding(horizontal = 9.dp, vertical = 4.dp),
+                            ) {
+                                Text(
+                                    text = "+$hiddenCount",
+                                    style = MaterialTheme.typography.labelMedium,
+                                    color = Color.White,
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun GalleryImageTile(
+    attachment: Attachment,
+    position: Int,
+    count: Int,
+    modifier: Modifier,
+) {
+    val description = listOfNotNull(
+        attachment.fileName?.takeIf { it.isNotBlank() },
+        "image ${position + 1} of $count",
+    ).joinToString(", ")
+    val cachedUri = attachment.cachedUri?.takeIf { it.isNotBlank() }
+
+    if (cachedUri != null) {
+        SubcomposeAsyncImage(
+            model = Uri.parse(cachedUri),
+            contentDescription = description,
+            contentScale = ContentScale.Crop,
+            modifier = modifier,
+        ) {
+            val state by painter.state.collectAsState()
+            when (state) {
+                is AsyncImagePainter.State.Success -> SubcomposeAsyncImageContent()
+                is AsyncImagePainter.State.Loading -> GalleryImagePlaceholder(modifier = Modifier.fillMaxSize())
+                else -> GalleryImageFailure(description, Modifier.fillMaxSize())
+            }
+        }
+        return
+    }
+
+    var bitmap by remember(attachment.content) { mutableStateOf<ImageBitmap?>(null) }
+    var failed by remember(attachment.content) { mutableStateOf(false) }
+    LaunchedEffect(attachment.content) {
+        val decoded = withContext(Dispatchers.IO) {
+            runCatching {
+                val bytes = android.util.Base64.decode(
+                    attachment.content,
+                    android.util.Base64.DEFAULT,
+                )
+                decodeGalleryBitmap(bytes)?.asImageBitmap()
+            }.getOrNull()
+        }
+        if (decoded != null) bitmap = decoded else failed = true
+    }
+
+    when {
+        bitmap != null -> Image(
+            bitmap = bitmap!!,
+            contentDescription = description,
+            contentScale = ContentScale.Crop,
+            modifier = modifier,
+        )
+        failed -> GalleryImageFailure(description, modifier)
+        else -> GalleryImagePlaceholder(modifier)
+    }
+}
+
+@Composable
+private fun GalleryImagePlaceholder(modifier: Modifier) {
+    Box(
+        modifier = modifier.background(MaterialTheme.colorScheme.surfaceVariant),
+        contentAlignment = Alignment.Center,
+    ) {
+        CircularProgressIndicator(modifier = Modifier.size(22.dp), strokeWidth = 2.dp)
+    }
+}
+
+@Composable
+private fun GalleryImageFailure(description: String, modifier: Modifier) {
+    Box(
+        modifier = modifier.background(MaterialTheme.colorScheme.surfaceVariant),
+        contentAlignment = Alignment.Center,
+    ) {
+        Icon(
+            imageVector = Icons.Filled.BrokenImage,
+            contentDescription = stringResource(R.string.attachment_load_failed_a11y, description),
+            tint = MaterialTheme.colorScheme.onSurfaceVariant,
+            modifier = Modifier.size(28.dp),
+        )
+    }
+}
+
+/** Decode a bounded thumbnail rather than retaining every full-size image. */
+private fun decodeGalleryBitmap(bytes: ByteArray): android.graphics.Bitmap? {
+    if (bytes.isEmpty()) return null
+    val bounds = BitmapFactory.Options().apply { inJustDecodeBounds = true }
+    BitmapFactory.decodeByteArray(bytes, 0, bytes.size, bounds)
+    if (bounds.outWidth <= 0 || bounds.outHeight <= 0) return null
+
+    var sample = 1
+    while (
+        bounds.outWidth / sample > GALLERY_DECODE_TARGET_PX ||
+        bounds.outHeight / sample > GALLERY_DECODE_TARGET_PX
+    ) {
+        sample *= 2
+    }
+    val options = BitmapFactory.Options().apply { inSampleSize = sample }
+    return BitmapFactory.decodeByteArray(bytes, 0, bytes.size, options)
+}
+
+private const val GALLERY_COLUMNS = 2
+private const val GALLERY_PREVIEW_LIMIT = 4
+private const val GALLERY_DECODE_TARGET_PX = 512
+private val GALLERY_GAP = 3.dp
+private val GALLERY_CORNER = 8.dp
+
+internal fun galleryAttachmentKey(attachment: Attachment, index: Int): String =
+    attachment.relayToken?.takeIf { it.isNotBlank() }
+        ?: attachment.cachedUri?.takeIf { it.isNotBlank() }
+        ?: buildString {
+            append(attachment.fileName.orEmpty())
+            append('|')
+            append(attachment.contentType)
+            append('|')
+            append(attachment.content.hashCode())
+            append('|')
+            append(index)
+        }
@@ -1,3 +1,5 @@
+@file:Suppress("LocalContextGetResourceValueCall")
+
 package com.hermesandroid.relay.ui.components

 import android.content.Context
@@ -15,7 +17,8 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.gestures.detectTransformGestures
+import androidx.compose.foundation.gestures.rememberTransformableState
+import androidx.compose.foundation.gestures.transformable
 import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -34,6 +37,8 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.selection.SelectionContainer
@@ -59,6 +64,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateMapOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -77,8 +83,10 @@ import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
@@ -91,6 +99,8 @@ import com.hermesandroid.relay.data.Attachment
 import com.hermesandroid.relay.data.AttachmentRenderMode
 import com.hermesandroid.relay.data.BlurMode
 import com.hermesandroid.relay.util.MediaSaver
+import androidx.compose.ui.res.stringResource
+import com.hermesandroid.relay.R
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -98,6 +108,7 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import java.io.File
+import kotlin.math.abs
 import kotlin.math.sqrt

 // ---------------------------------------------------------------------------
@@ -160,18 +171,18 @@ fun BlurredMedia(
                ) {
                    Icon(
                        imageVector = Icons.Filled.VisibilityOff,
-                        contentDescription = "Sensitive content",
+                        contentDescription = stringResource(R.string.attach_viewer_cd_sensitive),
                        tint = Color.White,
                        modifier = Modifier.size(28.dp),
                    )
                    Text(
-                        text = "Sensitive",
+                        text = stringResource(R.string.attachment_sensitive),
                        style = MaterialTheme.typography.labelLarge,
                        color = Color.White,
                    )
                    if (revealOnTap) {
                        Text(
-                            text = "Tap to reveal",
+                            text = stringResource(R.string.attachment_tap_reveal),
                            style = MaterialTheme.typography.labelSmall,
                            color = Color.White.copy(alpha = 0.8f),
                        )
@@ -191,13 +202,62 @@ fun BlurredMedia(
 fun Modifier.zoomable(maxScale: Float = 6f): Modifier {
    var scale by remember { mutableStateOf(1f) }
    var offset by remember { mutableStateOf(Offset.Zero) }
-    return this
-        .pointerInput(Unit) {
-            detectTransformGestures { _, pan, zoom, _ ->
-                scale = (scale * zoom).coerceIn(1f, maxScale)
-                offset = if (scale > 1f) offset + pan else Offset.Zero
-            }
+    var viewportSize by remember { mutableStateOf(IntSize.Zero) }
+
+    fun maxOffset(forScale: Float): Offset = Offset(
+        x = ((forScale - 1f) * viewportSize.width / 2f).coerceAtLeast(0f),
+        y = ((forScale - 1f) * viewportSize.height / 2f).coerceAtLeast(0f),
+    )
+
+    fun clampOffset(candidate: Offset, forScale: Float): Offset {
+        val max = maxOffset(forScale)
+        return Offset(
+            x = candidate.x.coerceIn(-max.x, max.x),
+            y = candidate.y.coerceIn(-max.y, max.y),
+        )
+    }
+
+    val transformState = rememberTransformableState { _, zoomChange, panChange, _ ->
+        val nextScale = (scale * zoomChange).coerceIn(1f, maxScale)
+        offset = if (nextScale > 1f) {
+            clampOffset(offset + panChange, nextScale)
+        } else {
+            Offset.Zero
        }
+        scale = nextScale
+    }
+    return this
+        .onSizeChanged {
+            viewportSize = it
+            offset = clampOffset(offset, scale)
+        }
+        // Let a one-finger drag bubble to HorizontalPager at 1×. Once the
+        // image is zoomed, the image owns panning; pinch zoom always works.
+        .transformable(
+            state = transformState,
+            canPan = { pan ->
+                if (scale <= 1f) {
+                    false
+                } else {
+                    val max = maxOffset(scale)
+                    val canMoveHorizontally = when {
+                        pan.x > 0f -> offset.x < max.x
+                        pan.x < 0f -> offset.x > -max.x
+                        else -> false
+                    }
+                    val canMoveVertically = when {
+                        pan.y > 0f -> offset.y < max.y
+                        pan.y < 0f -> offset.y > -max.y
+                        else -> false
+                    }
+                    if (abs(pan.x) >= abs(pan.y)) {
+                        canMoveHorizontally
+                    } else {
+                        canMoveVertically
+                    }
+                }
+            },
+        )
        .pointerInput(Unit) {
            detectTapGestures(
                onDoubleTap = {
@@ -266,7 +326,7 @@ fun AttachmentViewer(
            shouldBlurImage(blurMode, attachment.sensitive)

        val title = attachment.fileName
-            ?: attachment.contentType.substringBefore(';').ifBlank { "Attachment" }
+            ?: attachment.contentType.substringBefore(';').ifBlank { stringResource(R.string.attachment_title) }

        // --- One shared Share / Save / Open-externally action set ----------
        fun runWithBytes(action: suspend (ByteArray) -> Unit) {
@@ -275,7 +335,7 @@ fun AttachmentViewer(
                val bytes = attachmentBytes(context, attachment)
                if (bytes == null) {
                    busy = false
-                    viewerToast(context, "Couldn't read this file")
+                    viewerToast(context, context.getString(R.string.inbound_attach_share_failed))
                    return@launch
                }
                action(bytes)
@@ -298,13 +358,13 @@ fun AttachmentViewer(
                }
                when (result) {
                    is MediaSaver.SaveResult.Saved ->
-                        viewerToast(context, "Saved to ${result.location}")
+                        viewerToast(context, context.getString(R.string.inbound_attach_saved, result.location))
                    MediaSaver.SaveResult.UseShareInstead -> {
                        val uri = MediaSaver.stageForShare(context, bytes, attachment.fileName, attachment.contentType)
                        MediaSaver.share(context, uri, attachment.contentType)
                    }
                    is MediaSaver.SaveResult.Failed ->
-                        viewerToast(context, "Save failed: ${result.message}")
+                        viewerToast(context, context.getString(R.string.inbound_attach_save_failed, result.message))
                }
            }
        }
@@ -345,6 +405,7 @@ fun AttachmentViewer(
            MediaViewerToolbar(
                title = title,
                busy = busy,
+                actionsEnabled = !blurred,
                onShare = onShare,
                onSave = onSave,
                onOpenExternal = onOpenExternal,
@@ -355,11 +416,204 @@ fun AttachmentViewer(
    }
 }

+/**
+ * Full-screen viewer for an image attachment group. The pager starts at the
+ * tapped tile, swipes horizontally at 1×, and keeps the existing per-image
+ * zoom, blur, Save, Share, and Open-externally behavior.
+ *
+ * [initiallyRevealedKeys] carries reveal state from the grid so a sensitive
+ * image that was already uncovered is not unexpectedly hidden again on open.
+ */
+@Composable
+internal fun AttachmentGalleryViewer(
+    attachments: List<Attachment>,
+    initialIndex: Int,
+    onDismiss: () -> Unit,
+    initiallyRevealedKeys: Set<String> = emptySet(),
+    modifier: Modifier = Modifier,
+) {
+    if (attachments.isEmpty()) return
+    if (attachments.size == 1) {
+        AttachmentViewer(
+            attachment = attachments.first(),
+            onDismiss = onDismiss,
+            modifier = modifier,
+            initiallyRevealed = galleryAttachmentKey(attachments.first(), 0) in
+                initiallyRevealedKeys,
+        )
+        return
+    }
+
+    Dialog(
+        onDismissRequest = onDismiss,
+        properties = DialogProperties(usePlatformDefaultWidth = false),
+    ) {
+        val context = LocalContext.current
+        AllowDeviceRotation()
+        val scope = rememberCoroutineScope()
+        var busy by remember { mutableStateOf(false) }
+        val revealed = remember { mutableStateMapOf<String, Boolean>() }
+        LaunchedEffect(initiallyRevealedKeys) {
+            initiallyRevealedKeys.forEach { revealed[it] = true }
+        }
+        val pagerState = rememberPagerState(
+            initialPage = initialIndex.coerceIn(attachments.indices),
+            pageCount = { attachments.size },
+        )
+
+        val currentIndex = pagerState.currentPage.coerceIn(attachments.indices)
+        val attachment = attachments[currentIndex]
+        val currentKey = galleryAttachmentKey(attachment, currentIndex)
+        val blurMode = LocalMediaBlurMode.current
+        val currentBlurred = revealed[currentKey] != true &&
+            shouldBlurImage(blurMode, attachment.sensitive)
+        val title = attachment.fileName
+            ?: attachment.contentType.substringBefore(';').ifBlank { "Image" }
+        val toolbarTitle = "$title · ${currentIndex + 1} of ${attachments.size}"
+
+        // Capture the currently visible attachment in each click lambda. A
+        // swipe while IO is running must not redirect Save/Share to a new page.
+        fun runWithBytes(action: suspend (Attachment, ByteArray) -> Unit) {
+            if (currentBlurred || busy) return
+            val target = attachment
+            scope.launch {
+                busy = true
+                try {
+                    val bytes = attachmentBytes(context, target)
+                    if (bytes == null) {
+                        viewerToast(context, "Couldn't read this image")
+                        return@launch
+                    }
+                    action(target, bytes)
+                } catch (error: Exception) {
+                    viewerToast(
+                        context,
+                        error.message?.takeIf { it.isNotBlank() }
+                            ?: "Couldn't complete that image action",
+                    )
+                } finally {
+                    busy = false
+                }
+            }
+        }
+
+        val onShare = {
+            runWithBytes { target, bytes ->
+                val uri = MediaSaver.stageForShare(
+                    context,
+                    bytes,
+                    target.fileName,
+                    target.contentType,
+                )
+                MediaSaver.share(context, uri, target.contentType)
+            }
+        }
+        val onSave = {
+            runWithBytes { target, bytes ->
+                when (val result = MediaSaver.saveImage(
+                    context,
+                    bytes,
+                    target.fileName,
+                    target.contentType,
+                )) {
+                    is MediaSaver.SaveResult.Saved ->
+                        viewerToast(context, "Saved to ${result.location}")
+                    MediaSaver.SaveResult.UseShareInstead -> {
+                        val uri = MediaSaver.stageForShare(
+                            context,
+                            bytes,
+                            target.fileName,
+                            target.contentType,
+                        )
+                        MediaSaver.share(context, uri, target.contentType)
+                    }
+                    is MediaSaver.SaveResult.Failed ->
+                        viewerToast(context, "Save failed: ${result.message}")
+                }
+            }
+        }
+        val onOpenExternal: () -> Unit = openExternal@{
+            if (currentBlurred || busy) return@openExternal
+            val target = attachment
+            val cached = target.cachedUri
+            if (!cached.isNullOrBlank()) {
+                runCatching {
+                    MediaSaver.open(context, Uri.parse(cached), target.contentType)
+                }.onFailure {
+                    viewerToast(context, "Couldn't open this image")
+                }
+            } else {
+                runWithBytes { item, bytes ->
+                    val uri = MediaSaver.stageForShare(
+                        context,
+                        bytes,
+                        item.fileName,
+                        item.contentType,
+                    )
+                    MediaSaver.open(context, uri, item.contentType)
+                }
+            }
+        }
+
+        Box(
+            modifier = modifier
+                .fillMaxSize()
+                .background(Color.Black.copy(alpha = 0.96f)),
+        ) {
+            HorizontalPager(
+                state = pagerState,
+                beyondViewportPageCount = 0,
+                pageSpacing = 12.dp,
+                modifier = Modifier
+                    .fillMaxSize()
+                    .testTag("attachment-gallery-pager"),
+            ) { page ->
+                val pageAttachment = attachments[page]
+                val pageKey = galleryAttachmentKey(pageAttachment, page)
+                val blurred = revealed[pageKey] != true && shouldBlurImage(
+                    blurMode,
+                    pageAttachment.sensitive,
+                )
+                ImageBody(
+                    attachment = pageAttachment,
+                    blurred = blurred,
+                    onReveal = { revealed[pageKey] = true },
+                )
+            }
+
+            MediaViewerToolbar(
+                title = toolbarTitle,
+                busy = busy,
+                actionsEnabled = !currentBlurred,
+                onShare = onShare,
+                onSave = onSave,
+                onOpenExternal = onOpenExternal,
+                onClose = onDismiss,
+                modifier = Modifier.align(Alignment.TopCenter),
+            )
+
+            Text(
+                text = "${currentIndex + 1} / ${attachments.size}",
+                style = MaterialTheme.typography.labelMedium,
+                color = Color.White,
+                modifier = Modifier
+                    .align(Alignment.BottomCenter)
+                    .windowInsetsPadding(WindowInsets.safeDrawing)
+                    .padding(bottom = 12.dp)
+                    .clip(RoundedCornerShape(50))
+                    .background(Color.Black.copy(alpha = 0.55f))
+                    .padding(horizontal = 12.dp, vertical = 6.dp),
+            )
+        }
+    }
+}
+
 /** The single shared control bar used across every attachment type. */
@Composable
 private fun MediaViewerToolbar(
    title: String,
    busy: Boolean,
+    actionsEnabled: Boolean = true,
    onShare: () -> Unit,
    onSave: () -> Unit,
    onOpenExternal: () -> Unit,
@@ -376,7 +630,7 @@ private fun MediaViewerToolbar(
        verticalAlignment = Alignment.CenterVertically,
    ) {
        IconButton(onClick = onClose, colors = tint) {
-            Icon(Icons.Filled.Close, contentDescription = "Close")
+            Icon(Icons.Filled.Close, contentDescription = stringResource(R.string.attach_viewer_cd_close))
        }
        Text(
            text = title,
@@ -393,14 +647,18 @@ private fun MediaViewerToolbar(
                modifier = Modifier.size(18.dp).padding(end = 4.dp),
            )
        }
-        IconButton(onClick = onOpenExternal, colors = tint) {
-            Icon(Icons.Filled.OpenInNew, contentDescription = "Open externally")
+        IconButton(
+            onClick = onOpenExternal,
+            enabled = actionsEnabled && !busy,
+            colors = tint,
+        ) {
+            Icon(Icons.Filled.OpenInNew, contentDescription = stringResource(R.string.attachment_open_externally_a11y))
        }
-        IconButton(onClick = onShare, colors = tint) {
-            Icon(Icons.Filled.Share, contentDescription = "Share")
+        IconButton(onClick = onShare, enabled = actionsEnabled && !busy, colors = tint) {
+            Icon(Icons.Filled.Share, contentDescription = stringResource(R.string.attachment_share_a11y))
        }
-        IconButton(onClick = onSave, colors = tint) {
-            Icon(Icons.Filled.Download, contentDescription = "Save")
+        IconButton(onClick = onSave, enabled = actionsEnabled && !busy, colors = tint) {
+            Icon(Icons.Filled.Download, contentDescription = stringResource(R.string.attachment_save_a11y))
        }
    }
 }
@@ -452,7 +710,7 @@ private fun ImageBody(
                    contentScale = ContentScale.Fit,
                    modifier = Modifier.fillMaxSize().zoomable(),
                )
-                failed -> CenteredNotice("Couldn't load this image")
+                failed -> CenteredNotice(stringResource(R.string.attach_viewer_load_failed))
                else -> CircularProgressIndicator(color = Color.White)
            }
        }
@@ -468,7 +726,7 @@ private fun VideoBody(attachment: Attachment) {
    val uri = rememberPlayableUri(attachment)

    if (uri == null) {
-        CenteredNotice("Preparing video…", spinner = true)
+        CenteredNotice(stringResource(R.string.attach_viewer_preparing_video), spinner = true)
        return
    }

@@ -526,7 +784,7 @@ private fun VideoBody(attachment: Attachment) {
                ) {
                    Icon(
                        imageVector = if (muted) Icons.Filled.VolumeOff else Icons.Filled.VolumeUp,
-                        contentDescription = if (muted) "Unmute" else "Mute",
+                        contentDescription = if (muted) stringResource(R.string.attach_viewer_cd_unmute) else stringResource(R.string.attach_viewer_cd_mute),
                    )
                }
            },
@@ -543,7 +801,7 @@ private fun AudioBody(attachment: Attachment) {
    val uri = rememberPlayableUri(attachment)

    if (uri == null) {
-        CenteredNotice("Preparing audio…", spinner = true)
+        CenteredNotice(stringResource(R.string.attach_viewer_preparing_audio), spinner = true)
        return
    }

@@ -605,7 +863,7 @@ private fun AudioBody(attachment: Attachment) {
        AmplitudeMeter(amplitude = amplitude, active = isPlaying)
        Spacer(Modifier.height(24.dp))
        Text(
-            text = attachment.fileName ?: "Audio",
+            text = attachment.fileName ?: stringResource(R.string.attachment_audio_label),
            style = MaterialTheme.typography.titleMedium,
            color = Color.White,
            maxLines = 2,
@@ -684,6 +942,8 @@ private fun PdfBody(attachment: Attachment) {
    var pdfError by remember(attachment.cachedUri, attachment.content) { mutableStateOf<String?>(null) }
    var widthPx by remember { mutableStateOf(0) }

+    val pdfFailedText = stringResource(R.string.attach_viewer_pdf_failed)
+
    LaunchedEffect(attachment.cachedUri, attachment.content) {
        val opened = withContext(Dispatchers.IO) {
            runCatching {
@@ -692,14 +952,14 @@ private fun PdfBody(attachment: Attachment) {
                PdfDoc(PdfRenderer(pfd), pfd, Mutex())
            }.getOrNull()
        }
-        if (opened == null) pdfError = "Couldn't open this PDF" else doc = opened
+        if (opened == null) pdfError = pdfFailedText else doc = opened
    }
    DisposableEffect(doc) { onDispose { doc?.close() } }

    val current = doc
    when {
        pdfError != null -> CenteredNotice(pdfError!!)
-        current == null -> CenteredNotice("Rendering PDF…", spinner = true)
+        current == null -> CenteredNotice(stringResource(R.string.attach_viewer_rendering_pdf), spinner = true)
        else -> LazyColumn(
            modifier = Modifier
                .fillMaxSize()
@@ -747,7 +1007,7 @@ private fun PdfPage(doc: PdfDoc, index: Int, widthPx: Int) {
    if (bmp != null) {
        Image(
            bitmap = bmp,
-            contentDescription = "Page ${index + 1}",
+            contentDescription = stringResource(R.string.attach_viewer_page_label, index + 1),
            contentScale = ContentScale.FillWidth,
            modifier = Modifier.fillMaxWidth().clip(RoundedCornerShape(2.dp)),
        )
@@ -783,7 +1043,7 @@ private fun TextBody(attachment: Attachment) {

    val body = text
    when {
-        body == null -> CenteredNotice("Loading…", spinner = true)
+        body == null -> CenteredNotice(stringResource(R.string.attach_viewer_loading), spinner = true)
        else -> SelectionContainer(
            modifier = Modifier
                .fillMaxSize()
@@ -812,19 +1072,19 @@ private fun GenericBody(attachment: Attachment, onOpenExternal: () -> Unit) {
        horizontalAlignment = Alignment.CenterHorizontally,
    ) {
        Text(
-            text = attachment.fileName ?: "File",
+            text = attachment.fileName ?: stringResource(R.string.attach_viewer_file_label),
            style = MaterialTheme.typography.titleMedium,
            color = Color.White,
        )
        Spacer(Modifier.height(8.dp))
        Text(
-            text = "No in-app preview for this type.",
+            text = stringResource(R.string.attachment_no_preview),
            style = MaterialTheme.typography.bodyMedium,
            color = Color.White.copy(alpha = 0.7f),
        )
        Spacer(Modifier.height(16.dp))
        androidx.compose.material3.OutlinedButton(onClick = onOpenExternal) {
-            Text("Open externally")
+            Text(stringResource(R.string.attachment_open_ext))
        }
    }
 }
@@ -862,7 +1122,7 @@ private fun PlaybackControls(
            IconButton(onClick = onPlayPause, colors = tint) {
                Icon(
                    imageVector = if (isPlaying) Icons.Filled.Pause else Icons.Filled.PlayArrow,
-                    contentDescription = if (isPlaying) "Pause" else "Play",
+                    contentDescription = if (isPlaying) stringResource(R.string.attach_viewer_cd_pause) else stringResource(R.string.attach_viewer_cd_play),
                )
            }
            Text(
@@ -0,0 +1,224 @@
+package com.hermesandroid.relay.ui.components
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.icons.filled.ExpandLess
+import androidx.compose.material.icons.filled.ExpandMore
+import androidx.compose.material.icons.filled.HourglassTop
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import com.hermesandroid.relay.data.BackgroundTaskPhase
+import com.hermesandroid.relay.data.BackgroundTaskState
+import com.hermesandroid.relay.data.ToolCall
+import com.hermesandroid.relay.ui.theme.relayMetadataStyle
+
+/**
+ * The Chat-side identity for one promoted/durable Hermes run. It stays in the
+ * owning assistant turn while [BackgroundTaskState.phase] advances, rather
+ * than creating a running system notice and a second completion row.
+ *
+ * Tool activity is deliberately subordinate: the compact timeline expands
+ * inside this card and reuses [CompactToolCall]/[SubagentLane], so background
+ * work reads like the same task at every stage instead of a mini dashboard.
+ */
+@Composable
+fun BackgroundTaskCard(
+    task: BackgroundTaskState,
+    toolCalls: List<ToolCall>,
+    showTimeline: Boolean,
+    modifier: Modifier = Modifier,
+) {
+    val terminal = task.phase in terminalBackgroundTaskPhases
+    val timelineCalls = if (showTimeline) toolCalls else emptyList()
+    val hasTimeline = timelineCalls.isNotEmpty()
+    var expanded by rememberSaveable(task.id) { mutableStateOf(hasTimeline && !terminal) }
+
+    LaunchedEffect(terminal, hasTimeline) {
+        if (!hasTimeline || terminal) expanded = false
+    }
+
+    val phaseLabel = backgroundTaskPhaseLabel(task.phase)
+    val meta = backgroundTaskMeta(task, timelineCalls)
+    val icon: ImageVector
+    val iconTint = when (task.phase) {
+        BackgroundTaskPhase.COMPLETE -> {
+            icon = Icons.Filled.Check
+            MaterialTheme.colorScheme.primary
+        }
+        BackgroundTaskPhase.FAILED, BackgroundTaskPhase.CANCELLED -> {
+            icon = Icons.Filled.Close
+            MaterialTheme.colorScheme.error
+        }
+        else -> {
+            icon = Icons.Filled.HourglassTop
+            MaterialTheme.colorScheme.tertiary
+        }
+    }
+
+    Card(
+        modifier = modifier
+            .fillMaxWidth()
+            .semantics {
+                contentDescription = buildString {
+                    append("Background task, ")
+                    append(task.title)
+                    append(", ")
+                    append(phaseLabel.lowercase())
+                    task.statusLine?.takeIf { it.isNotBlank() }?.let {
+                        append(", ")
+                        append(it)
+                    }
+                    if (meta.isNotBlank()) {
+                        append(", ")
+                        append(meta)
+                    }
+                }
+            },
+        colors = CardDefaults.cardColors(
+            containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.58f),
+        ),
+    ) {
+        Column {
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .clickable(enabled = hasTimeline) { expanded = !expanded }
+                    .padding(horizontal = 12.dp, vertical = 10.dp),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Icon(
+                    imageVector = icon,
+                    contentDescription = null,
+                    tint = iconTint,
+                    modifier = Modifier.size(16.dp),
+                )
+                Spacer(modifier = Modifier.width(8.dp))
+                Column(modifier = Modifier.weight(1f)) {
+                    Text(
+                        text = task.title,
+                        style = MaterialTheme.typography.labelMedium,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                    task.statusLine?.takeIf { it.isNotBlank() }?.let { status ->
+                        Spacer(modifier = Modifier.height(2.dp))
+                        Text(
+                            text = status,
+                            style = MaterialTheme.typography.bodySmall,
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
+                            maxLines = 2,
+                            overflow = TextOverflow.Ellipsis,
+                        )
+                    }
+                }
+                Spacer(modifier = Modifier.width(8.dp))
+                Column(horizontalAlignment = Alignment.End) {
+                    Text(
+                        text = phaseLabel,
+                        style = relayMetadataStyle(),
+                        color = iconTint,
+                    )
+                    if (meta.isNotBlank()) {
+                        Text(
+                            text = meta,
+                            style = relayMetadataStyle(),
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        )
+                    }
+                }
+                if (hasTimeline) {
+                    Spacer(modifier = Modifier.width(4.dp))
+                    Icon(
+                        imageVector = if (expanded) Icons.Filled.ExpandLess else Icons.Filled.ExpandMore,
+                        contentDescription = if (expanded) "Collapse task timeline" else "Expand task timeline",
+                        tint = MaterialTheme.colorScheme.onSurfaceVariant,
+                        modifier = Modifier.size(16.dp),
+                    )
+                }
+            }
+
+            if (!terminal) {
+                // A fixed accent rail communicates active state without adding
+                // another indeterminate animation to an already-live transcript.
+                Box(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(2.dp)
+                        .background(MaterialTheme.colorScheme.tertiary.copy(alpha = 0.7f)),
+                )
+            }
+
+            if (expanded) {
+                HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.55f))
+                Column(
+                    modifier = Modifier.padding(horizontal = 10.dp, vertical = 8.dp),
+                    verticalArrangement = Arrangement.spacedBy(4.dp),
+                ) {
+                    val lanes = timelineCalls.groupBy { it.taskIndex }
+                    lanes[null].orEmpty().forEach { call ->
+                        CompactToolCall(toolCall = call)
+                    }
+                    lanes.keys.filterNotNull().sorted().forEach { taskIndex ->
+                        SubagentLane(
+                            taskIndex = taskIndex,
+                            calls = lanes.getValue(taskIndex),
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+internal fun backgroundTaskPhaseLabel(phase: BackgroundTaskPhase): String = when (phase) {
+    BackgroundTaskPhase.RUNNING -> "Working"
+    BackgroundTaskPhase.WAITING -> "Needs input"
+    BackgroundTaskPhase.DELIVERING -> "Delivering"
+    BackgroundTaskPhase.COMPLETE -> "Complete"
+    BackgroundTaskPhase.FAILED -> "Failed"
+    BackgroundTaskPhase.CANCELLED -> "Cancelled"
+}
+
+internal fun backgroundTaskMeta(task: BackgroundTaskState, toolCalls: List<ToolCall>): String {
+    val completed = maxOf(task.completedToolCount, toolCalls.count { it.isComplete })
+    return buildList {
+        if (completed > 0) add("$completed step${if (completed == 1) "" else "s"}")
+        if (task.queuedCount > 0) add("+${task.queuedCount} queued")
+    }.joinToString(" · ")
+}
+
+private val terminalBackgroundTaskPhases = setOf(
+    BackgroundTaskPhase.COMPLETE,
+    BackgroundTaskPhase.FAILED,
+    BackgroundTaskPhase.CANCELLED,
+)
@@ -36,8 +36,10 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
+import com.hermesandroid.relay.R
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.hermesandroid.relay.data.BridgeActivityEntry
@@ -89,14 +91,14 @@ fun BridgeActivityLog(
                )
                Spacer(modifier = Modifier.size(6.dp))
                Text(
-                    text = "Activity Log",
+                    text = stringResource(R.string.bal_activity_log),
                    style = MaterialTheme.typography.titleSmall,
                    fontWeight = FontWeight.SemiBold,
                    color = MaterialTheme.colorScheme.primary,
                    modifier = Modifier.weight(1f)
                )
                if (entries.isNotEmpty()) {
-                    TextButton(onClick = onClear) { Text("Clear") }
+                    TextButton(onClick = onClear) { Text(stringResource(R.string.bal_clear)) }
                }
            }

@@ -104,8 +106,7 @@ fun BridgeActivityLog(

            if (entries.isEmpty()) {
                Text(
-                    text = "No bridge commands yet. Every tap, type, and " +
-                        "screenshot the agent performs will show up here.",
+                    text = stringResource(R.string.bal_no_activity),
                    style = MaterialTheme.typography.bodySmall,
                    color = MaterialTheme.colorScheme.onSurfaceVariant
                )
@@ -162,7 +163,7 @@ private fun ActivityRow(entry: BridgeActivityEntry) {
            if (entry.thumbnailToken != null) {
                Icon(
                    imageVector = Icons.Filled.InsertPhoto,
-                    contentDescription = "Has screenshot",
+                    contentDescription = stringResource(R.string.bal_has_screenshot),
                    tint = MaterialTheme.colorScheme.onSurfaceVariant,
                    modifier = Modifier.size(14.dp)
                )
@@ -175,13 +176,13 @@ private fun ActivityRow(entry: BridgeActivityEntry) {
                verticalArrangement = Arrangement.spacedBy(4.dp)
            ) {
                Text(
-                    text = "Full timestamp: ${formatFullTime(entry.timestampMs)}",
+                    text = stringResource(R.string.bal_full_timestamp, formatFullTime(entry.timestampMs)),
                    style = MaterialTheme.typography.labelSmall,
                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                    fontFamily = FontFamily.Monospace
                )
                Text(
-                    text = "Status: ${entry.status.name}",
+                    text = stringResource(R.string.bal_status_label, entry.status.name),
                    style = MaterialTheme.typography.labelSmall,
                    color = MaterialTheme.colorScheme.onSurfaceVariant
                )
@@ -199,7 +200,7 @@ private fun ActivityRow(entry: BridgeActivityEntry) {
                    // label so the expand affordance still communicates the
                    // shape of the future feature.
                    Text(
-                        text = "Screenshot token: ${entry.thumbnailToken}",
+                        text = stringResource(R.string.bal_screenshot_token, entry.thumbnailToken),
                        style = MaterialTheme.typography.labelSmall,
                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                        fontFamily = FontFamily.Monospace
@@ -33,9 +33,11 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.viewmodel.BridgeStatus

 /**
@@ -61,6 +63,7 @@ fun BridgeMasterToggle(
    onToggle: (Boolean) -> Unit,
    modifier: Modifier = Modifier,
    label: String = "Agent Control",
+    // Note: label default is intentionally a literal — it's resolved from the caller, not from stringResource
    // Called when the user taps the switch to enable but accessibility
    // hasn't been granted yet. The default no-op keeps the v0.4 behaviour
    // for callers that don't wire this up; BridgeScreen hooks a snackbar
@@ -81,17 +84,15 @@ fun BridgeMasterToggle(
    val isSideloadLabel = label.contains("Agent", ignoreCase = true)
    val subtitle = if (isSideloadLabel) {
        if (enabled) {
-            "Master switch — agent can read screen and act via the " +
-                "sub-features below."
+            stringResource(R.string.bmt_master_switch_on)
        } else {
-            "Master switch — off. All bridge features (unattended, " +
-                "commands, voice intents) are inactive."
+            stringResource(R.string.bmt_master_switch_off)
        }
    } else {
        if (enabled) {
-            "Master switch — bridge is providing screen content to chat."
+            stringResource(R.string.bmt_master_switch_on_googleplay)
        } else {
-            "Master switch — off. Bridge is not reading screen content."
+            stringResource(R.string.bmt_master_switch_off_googleplay)
        }
    }

@@ -125,7 +126,7 @@ fun BridgeMasterToggle(
                IconButton(onClick = { showExplain = true }) {
                    Icon(
                        imageVector = Icons.Filled.Info,
-                        contentDescription = "What does this do?",
+                        contentDescription = stringResource(R.string.bmt_what_does_this_do),
                        tint = MaterialTheme.colorScheme.onSurfaceVariant
                    )
                }
@@ -149,7 +150,7 @@ fun BridgeMasterToggle(

            if (!accessibilityGranted) {
                Text(
-                    text = "Grant the Accessibility Service permission below to enable.",
+                    text = stringResource(R.string.bmt_grant_accessibility),
                    style = MaterialTheme.typography.bodySmall,
                    color = MaterialTheme.colorScheme.error
                )
@@ -159,22 +160,22 @@ fun BridgeMasterToggle(
                Spacer(modifier = Modifier.height(2.dp))
                StatusInlineRow(
                    icon = Icons.Filled.PhoneAndroid,
-                    label = "Device",
+                    label = stringResource(R.string.bmt_device),
                    value = status.deviceName
                )
                StatusInlineRow(
                    icon = Icons.Filled.BatteryFull,
-                    label = "Battery",
+                    label = stringResource(R.string.bmt_battery),
                    value = status.batteryPercent?.let { "$it%" } ?: "—"
                )
                StatusInlineRow(
                    icon = Icons.Filled.ScreenLockPortrait,
-                    label = "Screen",
-                    value = if (status.screenOn) "ON" else "OFF"
+                    label = stringResource(R.string.bmt_screen),
+                    value = if (status.screenOn) stringResource(R.string.bmt_on) else stringResource(R.string.bmt_off)
                )
                StatusInlineRow(
                    icon = Icons.Filled.Smartphone,
-                    label = "Current app",
+                    label = stringResource(R.string.bmt_current_app),
                    value = status.currentApp ?: "—"
                )
            }
@@ -184,40 +185,29 @@ fun BridgeMasterToggle(
    if (showExplain) {
        AlertDialog(
            onDismissRequest = { showExplain = false },
-            title = { Text("About Agent Control") },
+            title = { Text(stringResource(R.string.bmt_about_title)) },
            text = {
                Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
                    Text(
-                        "Agent Control lets your Hermes agent read what's on " +
-                            "your screen and interact with apps on your behalf " +
-                            "(tap, type, scroll, screenshot).",
+                        stringResource(R.string.bmt_about_body1),
                        style = MaterialTheme.typography.bodyMedium
                    )
                    Text(
-                        "This uses Android's Accessibility Service API, which " +
-                            "is the same permission screen readers use. You must " +
-                            "enable it in Android Settings before this switch works.",
+                        stringResource(R.string.bmt_about_body2),
                        style = MaterialTheme.typography.bodyMedium
                    )
                    Text(
-                        "While this is on, a 'Hermes has device control' " +
-                            "notification stays in your notification shade — " +
-                            "that's tied to this master switch, not to any " +
-                            "sub-feature (like Unattended Access), and goes " +
-                            "away the moment you turn this off.",
+                        stringResource(R.string.bmt_about_body3),
                        style = MaterialTheme.typography.bodyMedium
                    )
                    Text(
-                        "You can turn Agent Control off at any time from this " +
-                            "screen or by disabling the service in Android " +
-                            "Settings. All bridge commands are logged in the " +
-                            "Activity Log below.",
+                        stringResource(R.string.bmt_about_body4),
                        style = MaterialTheme.typography.bodyMedium
                    )
                }
            },
            confirmButton = {
-                TextButton(onClick = { showExplain = false }) { Text("Got it") }
+                TextButton(onClick = { showExplain = false }) { Text(stringResource(R.string.bmt_got_it)) }
            }
        )
    }
@@ -254,7 +244,7 @@ private fun MasterPill() {
        contentColor = MaterialTheme.colorScheme.onPrimaryContainer,
    ) {
        Text(
-            text = "MASTER",
+            text = stringResource(R.string.bmt_master),
            style = MaterialTheme.typography.labelSmall,
            fontWeight = FontWeight.Bold,
            maxLines = 1,
@@ -44,9 +44,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.viewmodel.BridgePermissionStatus

 /**
@@ -117,13 +119,13 @@ fun BridgePermissionChecklist(
            verticalArrangement = Arrangement.spacedBy(6.dp)
        ) {
            Text(
-                text = "Permissions",
+                text = stringResource(R.string.bpc_permissions),
                style = MaterialTheme.typography.titleSmall,
                fontWeight = FontWeight.SemiBold,
                color = MaterialTheme.colorScheme.primary,
            )
            Text(
-                text = "Tap a row to grant or open Android Settings · Tap Test to verify.",
+                text = stringResource(R.string.bpc_permissions_desc),
                style = MaterialTheme.typography.bodySmall,
                color = MaterialTheme.colorScheme.onSurfaceVariant
            )
@@ -132,16 +134,16 @@ fun BridgePermissionChecklist(

            // ── Core bridge (required, both flavors) ──────────────────────
            TierHeader(
-                label = "Core bridge",
-                subtitle = "Required for the agent to read and act on screen content.",
+                label = stringResource(R.string.bpc_core_bridge),
+                subtitle = stringResource(R.string.bpc_core_bridge_desc),
            )
            PermissionRow(
                icon = Icons.Filled.Accessibility,
-                title = "Accessibility Service",
+                title = stringResource(R.string.bpc_accessibility),
                subtitle = if (BuildFlavor.isSideload)
-                    "Read screen content, dispatch taps/types"
+                    stringResource(R.string.bpc_accessibility_desc_sideload)
                else
-                    "Read screen content for chat context",
+                    stringResource(R.string.bpc_accessibility_desc_googleplay),
                granted = status.accessibilityServiceEnabled,
                onClick = { openAccessibilitySettings(context) },
                onTest = onTestAccessibility,
@@ -153,11 +155,11 @@ fun BridgePermissionChecklist(
            if (BuildFlavor.isSideload) {
                PermissionRow(
                    icon = Icons.Filled.ScreenShare,
-                    title = "Screen Capture",
+                    title = stringResource(R.string.bpc_screen_capture),
                    subtitle = if (status.screenCapturePermitted)
-                        "Granted for this session — agent can take screenshots"
+                        stringResource(R.string.bpc_screen_capture_granted)
                    else
-                        "Tap to grant — agent needs this for /screenshot",
+                        stringResource(R.string.bpc_screen_capture_not_granted),
                    granted = status.screenCapturePermitted,
                    onClick = onRequestScreenCapture,
                    onTest = onTestScreenCapture,
@@ -170,8 +172,8 @@ fun BridgePermissionChecklist(
            if (BuildFlavor.isSideload) {
                PermissionRow(
                    icon = Icons.Filled.PictureInPicture,
-                    title = "Display over other apps",
-                    subtitle = "Status overlay while bridge is active",
+                    title = stringResource(R.string.bpc_overlay),
+                    subtitle = stringResource(R.string.bpc_overlay_desc),
                    granted = status.overlayPermitted,
                    onClick = { openOverlaySettings(context) },
                    onTest = onTestOverlay,
@@ -180,11 +182,11 @@ fun BridgePermissionChecklist(
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                PermissionRow(
                    icon = Icons.Filled.Notifications,
-                    title = "Notifications",
+                    title = stringResource(R.string.bpc_notifications),
                    subtitle = if (status.notificationsPermitted)
-                        "Bridge service notification can display"
+                        stringResource(R.string.bpc_notifications_granted)
                    else
-                        "Required for the bridge foreground service indicator",
+                        stringResource(R.string.bpc_notifications_not_granted),
                    granted = status.notificationsPermitted,
                    onClick = onRequestNotifications,
                )
@@ -193,13 +195,13 @@ fun BridgePermissionChecklist(
            // ── Notification companion (optional, both flavors) ─────────────
            TierSpacer()
            TierHeader(
-                label = "Notification companion",
-                subtitle = "Optional. Lets the agent see incoming notifications for summaries and replies.",
+                label = stringResource(R.string.bpc_notification_companion),
+                subtitle = stringResource(R.string.bpc_notification_companion_desc),
            )
            PermissionRow(
                icon = Icons.Filled.Notifications,
-                title = "Notification Listener",
-                subtitle = "Read notifications for agent summaries",
+                title = stringResource(R.string.bpc_notification_listener),
+                subtitle = stringResource(R.string.bpc_notification_listener_desc),
                granted = status.notificationListenerPermitted,
                onClick = { openNotificationListenerSettings(context) },
                onTest = onTestNotificationListener,
@@ -209,21 +211,21 @@ fun BridgePermissionChecklist(
            // ── Voice & camera (optional, both flavors) ────────────────────
            TierSpacer()
            TierHeader(
-                label = "Voice & camera",
-                subtitle = "Required when you use voice mode or attach camera media.",
+                label = stringResource(R.string.bpc_voice_camera),
+                subtitle = stringResource(R.string.bpc_voice_camera_desc),
            )
            PermissionRow(
                icon = Icons.Filled.Mic,
-                title = "Microphone",
-                subtitle = "Required for voice mode (record + transcribe).",
+                title = stringResource(R.string.bpc_microphone),
+                subtitle = stringResource(R.string.bpc_microphone_desc),
                granted = status.microphonePermitted,
                onClick = onRequestMicrophone,
                optional = true,
            )
            PermissionRow(
                icon = Icons.Filled.CameraAlt,
-                title = "Camera",
-                subtitle = "Required to attach photos taken in-app.",
+                title = stringResource(R.string.bpc_camera),
+                subtitle = stringResource(R.string.bpc_camera_desc),
                granted = status.cameraPermitted,
                onClick = onRequestCamera,
                optional = true,
@@ -233,37 +235,37 @@ fun BridgePermissionChecklist(
            if (BuildFlavor.isSideload) {
                TierSpacer()
                TierHeader(
-                    label = "Sideload features",
-                    subtitle = "Optional. Powers contact lookup, SMS, dialer, and location tools.",
+                    label = stringResource(R.string.bpc_sideload_features),
+                    subtitle = stringResource(R.string.bpc_sideload_features_desc),
                )
                PermissionRow(
                    icon = Icons.Filled.Contacts,
-                    title = "Contacts",
-                    subtitle = "Resolve names to phone numbers (android_search_contacts).",
+                    title = stringResource(R.string.bpc_contacts),
+                    subtitle = stringResource(R.string.bpc_contacts_desc),
                    granted = status.contactsPermitted,
                    onClick = onRequestContacts,
                    optional = true,
                )
                PermissionRow(
                    icon = Icons.Filled.Sms,
-                    title = "SMS",
-                    subtitle = "Send text messages directly (android_send_sms).",
+                    title = stringResource(R.string.bpc_sms),
+                    subtitle = stringResource(R.string.bpc_sms_desc),
                    granted = status.smsPermitted,
                    onClick = onRequestSms,
                    optional = true,
                )
                PermissionRow(
                    icon = Icons.Filled.Call,
-                    title = "Phone",
-                    subtitle = "Place calls directly without opening the dialer (android_call).",
+                    title = stringResource(R.string.bpc_phone),
+                    subtitle = stringResource(R.string.bpc_phone_desc),
                    granted = status.phonePermitted,
                    onClick = onRequestPhone,
                    optional = true,
                )
                PermissionRow(
                    icon = Icons.Filled.LocationOn,
-                    title = "Location",
-                    subtitle = "Last-known GPS fix for context-aware queries (android_location).",
+                    title = stringResource(R.string.bpc_location),
+                    subtitle = stringResource(R.string.bpc_location_desc),
                    granted = status.locationPermitted,
                    onClick = onRequestLocation,
                    optional = true,
@@ -329,7 +331,7 @@ private fun OptionalBadge() {
        // badge drops to the next line cleanly when space is tight, instead
        // of compressing awkwardly in-line.
        Text(
-            text = "Optional",
+            text = stringResource(R.string.bpc_optional),
            style = MaterialTheme.typography.labelSmall,
            maxLines = 1,
            softWrap = false,
@@ -403,7 +405,7 @@ private fun PermissionRow(
                ),
            ) {
                Text(
-                    text = "Test",
+                    text = stringResource(R.string.bpc_test),
                    style = MaterialTheme.typography.labelSmall,
                )
            }
@@ -412,9 +414,9 @@ private fun PermissionRow(
        // Optional rows that are *not* granted use a neutral tint instead of
        // error red so users don't perceive them as urgent action items.
        val (statusTint, statusDescription) = when {
-            granted -> Color(0xFF4CAF50) to "Granted"
-            optional -> MaterialTheme.colorScheme.onSurfaceVariant to "Not granted (optional)"
-            else -> MaterialTheme.colorScheme.error to "Not granted"
+            granted -> Color(0xFF4CAF50) to stringResource(R.string.bpc_granted)
+            optional -> MaterialTheme.colorScheme.onSurfaceVariant to stringResource(R.string.bpc_not_granted_optional)
+            else -> MaterialTheme.colorScheme.error to stringResource(R.string.bpc_not_granted)
        }
        Icon(
            imageVector = if (granted) Icons.Filled.CheckCircle
@@ -23,7 +23,9 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
+import com.hermesandroid.relay.R
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.hermesandroid.relay.data.BridgeSafetySettings
@@ -90,7 +92,7 @@ fun BridgeSafetySummaryCard(
                    tint = MaterialTheme.colorScheme.primary,
                )
                Text(
-                    text = "Safety",
+                    text = stringResource(R.string.bssc_safety),
                    style = MaterialTheme.typography.titleSmall,
                    fontWeight = FontWeight.SemiBold,
                    color = MaterialTheme.colorScheme.primary,
@@ -98,21 +100,21 @@ fun BridgeSafetySummaryCard(
                )
                Icon(
                    imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight,
-                    contentDescription = "Manage",
+                    contentDescription = stringResource(R.string.bssc_manage),
                    tint = MaterialTheme.colorScheme.onSurfaceVariant,
                )
            }

            SafetySummaryRow(
-                label = "Apps the agent can't touch",
+                label = stringResource(R.string.bssc_blocked_apps),
                value = "${settings.blocklist.size}",
            )
            SafetySummaryRow(
-                label = "Words that always ask first",
+                label = stringResource(R.string.bssc_destructive_verbs),
                value = "${settings.destructiveVerbs.size}",
            )
            SafetySummaryRow(
-                label = "Turns itself off when idle",
+                label = stringResource(R.string.bssc_auto_disable),
                value = if (autoDisableAtMs != null) {
                    val remainMs = (autoDisableAtMs - nowMs).coerceAtLeast(0L)
                    val remainMin = (remainMs / 60_000L).toInt()
@@ -124,7 +126,7 @@ fun BridgeSafetySummaryCard(
            )

            Text(
-                text = "These guardrails keep Hermes in bounds. Tap to adjust.",
+                text = stringResource(R.string.bssc_guardrails_hint),
                style = MaterialTheme.typography.bodySmall,
                color = MaterialTheme.colorScheme.onSurfaceVariant,
            )
@@ -14,9 +14,11 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.viewmodel.BridgeStatus

 /**
@@ -53,7 +55,7 @@ fun BridgeStatusCard(
                modifier = Modifier.fillMaxWidth()
            ) {
                Text(
-                    text = "Status",
+                    text = stringResource(R.string.bsc_status),
                    style = MaterialTheme.typography.titleSmall,
                    fontWeight = FontWeight.SemiBold,
                    color = MaterialTheme.colorScheme.primary,
@@ -64,7 +66,7 @@ fun BridgeStatusCard(
                    isConnecting = false,
                )
                Text(
-                    text = if (isConnected) "Connected" else "Disconnected",
+                    text = if (isConnected) stringResource(R.string.bsc_connected) else stringResource(R.string.bsc_disconnected),
                    style = MaterialTheme.typography.labelMedium,
                    color = if (isConnected) MaterialTheme.colorScheme.onSurface
                    else MaterialTheme.colorScheme.onSurfaceVariant,
@@ -75,22 +77,21 @@ fun BridgeStatusCard(

            if (status == null) {
                Text(
-                    text = "Bridge runtime not yet reporting status. Enable " +
-                        "Agent Control above to begin receiving device telemetry.",
+                    text = stringResource(R.string.bsc_no_status),
                    style = MaterialTheme.typography.bodySmall,
                    color = MaterialTheme.colorScheme.onSurfaceVariant
                )
            } else {
-                StatusKeyValue("Device", status.deviceName)
+                StatusKeyValue(stringResource(R.string.bmt_device), status.deviceName)
                StatusKeyValue(
-                    "Battery",
-                    status.batteryPercent?.let { "$it%" } ?: "Unknown"
+                    stringResource(R.string.bmt_battery),
+                    status.batteryPercent?.let { "$it%" } ?: stringResource(R.string.bsc_unknown)
                )
-                StatusKeyValue("Screen", if (status.screenOn) "ON" else "OFF")
-                StatusKeyValue("Current app", status.currentApp ?: "—")
+                StatusKeyValue(stringResource(R.string.bmt_screen), if (status.screenOn) stringResource(R.string.bmt_on) else stringResource(R.string.bmt_off))
+                StatusKeyValue(stringResource(R.string.bmt_current_app), status.currentApp ?: "—")
                StatusKeyValue(
-                    "Accessibility service",
-                    if (status.accessibilityEnabled) "Enabled" else "Disabled"
+                    stringResource(R.string.bsc_accessibility_service),
+                    if (status.accessibilityEnabled) stringResource(R.string.bsc_enabled) else stringResource(R.string.bsc_disabled)
                )
            }
        }
@@ -1,3 +1,5 @@
+@file:Suppress("LocalContextGetResourceValueCall")
+
 package com.hermesandroid.relay.ui.components

 import android.widget.Toast
@@ -31,10 +33,12 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import coil3.compose.AsyncImage
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.util.MediaSaver
 import kotlinx.coroutines.launch

@@ -152,6 +156,10 @@ fun ChatImageViewer(
                horizontalArrangement = Arrangement.spacedBy(4.dp),
            ) {
                val tint = IconButtonDefaults.iconButtonColors(contentColor = Color.White)
+                val cdShare = stringResource(R.string.cd_share)
+                val cdSave = stringResource(R.string.cd_save)
+                val cdClose = stringResource(R.string.cd_close_viewer)
+                val errorMsg = context.getString(R.string.image_viewer_error)
                IconButton(
                    onClick = {
                        scope.launch {
@@ -159,7 +167,7 @@ fun ChatImageViewer(
                            val bytes = runCatching { source.bytesProvider() }.getOrNull()
                            busy = false
                            if (bytes == null) {
-                                toast(context, "Couldn't load this image")
+                                toast(context, errorMsg)
                                return@launch
                            }
                            val uri = MediaSaver.stageForShare(context, bytes, source.displayName, source.mime)
@@ -168,8 +176,10 @@ fun ChatImageViewer(
                    },
                    colors = tint,
                ) {
-                    Icon(Icons.Filled.Share, contentDescription = "Share")
+                    Icon(Icons.Filled.Share, contentDescription = cdShare)
                }
+                val savedFmt = context.getString(R.string.image_viewer_saved)
+                val failedFmt = context.getString(R.string.image_viewer_failed)
                IconButton(
                    onClick = {
                        scope.launch {
@@ -177,13 +187,13 @@ fun ChatImageViewer(
                            val bytes = runCatching { source.bytesProvider() }.getOrNull()
                            if (bytes == null) {
                                busy = false
-                                toast(context, "Couldn't load this image")
+                                toast(context, errorMsg)
                                return@launch
                            }
                            when (val result = MediaSaver.saveImage(context, bytes, source.displayName, source.mime)) {
                                is MediaSaver.SaveResult.Saved -> {
                                    busy = false
-                                    toast(context, "Saved to ${result.location}")
+                                    toast(context, savedFmt.format(result.location))
                                }
                                MediaSaver.SaveResult.UseShareInstead -> {
                                    busy = false
@@ -192,17 +202,17 @@ fun ChatImageViewer(
                                }
                                is MediaSaver.SaveResult.Failed -> {
                                    busy = false
-                                    toast(context, "Save failed: ${result.message}")
+                                    toast(context, failedFmt.format(result.message))
                                }
                            }
                        }
                    },
                    colors = tint,
                ) {
-                    Icon(Icons.Filled.Download, contentDescription = "Save")
+                    Icon(Icons.Filled.Download, contentDescription = cdSave)
                }
                IconButton(onClick = onDismiss, colors = tint) {
-                    Icon(Icons.Filled.Close, contentDescription = "Close")
+                    Icon(Icons.Filled.Close, contentDescription = cdClose)
                }
            }
        }
@@ -57,8 +57,10 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.ui.theme.RelayRefresh
 import com.hermesandroid.relay.ui.theme.purpleGlow
 import com.hermesandroid.relay.ui.theme.relayMetadataStyle
@@ -213,7 +215,7 @@ fun ChatInputBar(
            exit = fadeOut(),
        ) {
            Text(
-                text = "Live voice conversation",
+                text = stringResource(R.string.chat_input_live_voice_hint),
                style = MaterialTheme.typography.labelSmall,
                color = MaterialTheme.colorScheme.onSurfaceVariant,
                modifier = Modifier
@@ -291,15 +293,15 @@ fun ChatInputBar(
                                .clip(CircleShape)
                                .combinedClickable(
                                    onClick = { attachMenuExpanded = true },
-                                    onClickLabel = "Add attachment",
+                                    onClickLabel = stringResource(R.string.chat_input_add_attachment),
                                    onLongClick = onLongPressAttach,
-                                    onLongClickLabel = "Browse commands",
+                                    onLongClickLabel = stringResource(R.string.chat_input_browse_commands),
                                ),
                            contentAlignment = Alignment.Center,
                        ) {
                            Icon(
                                imageVector = Icons.Filled.Add,
-                                contentDescription = "Add attachment; hold for commands",
+                                contentDescription = stringResource(R.string.chat_input_add_attachment_hold),
                                tint = MaterialTheme.colorScheme.onSurfaceVariant,
                            )
                        }
@@ -308,7 +310,7 @@ fun ChatInputBar(
                            onDismissRequest = { attachMenuExpanded = false },
                        ) {
                            DropdownMenuItem(
-                                text = { Text("Photos") },
+                                text = { Text(stringResource(R.string.chat_input_photos)) },
                                leadingIcon = {
                                    Icon(Icons.Filled.PhotoLibrary, contentDescription = null)
                                },
@@ -318,7 +320,7 @@ fun ChatInputBar(
                                },
                            )
                            DropdownMenuItem(
-                                text = { Text("Files") },
+                                text = { Text(stringResource(R.string.chat_input_files)) },
                                leadingIcon = {
                                    Icon(Icons.Filled.InsertDriveFile, contentDescription = null)
                                },
@@ -328,7 +330,7 @@ fun ChatInputBar(
                                },
                            )
                            DropdownMenuItem(
-                                text = { Text("Camera") },
+                                text = { Text(stringResource(R.string.chat_input_camera)) },
                                leadingIcon = {
                                    Icon(Icons.Filled.PhotoCamera, contentDescription = null)
                                },
@@ -338,7 +340,7 @@ fun ChatInputBar(
                                },
                            )
                            DropdownMenuItem(
-                                text = { Text("Paste image") },
+                                text = { Text(stringResource(R.string.chat_input_paste_image)) },
                                leadingIcon = {
                                    Icon(Icons.Filled.ContentPaste, contentDescription = null)
                                },
@@ -393,7 +395,7 @@ fun ChatInputBar(
                                ) {
                                    Icon(
                                        imageVector = Icons.AutoMirrored.Filled.Send,
-                                        contentDescription = "Send message",
+                                        contentDescription = stringResource(R.string.chat_input_send_message),
                                        tint = if (enabled) MaterialTheme.colorScheme.primary
                                            else MaterialTheme.colorScheme.onSurfaceVariant,
                                    )
@@ -403,8 +405,8 @@ fun ChatInputBar(
                                    IconButton(onClick = onVoice) {
                                        Icon(
                                            imageVector = Icons.Filled.GraphicEq,
-                                            contentDescription = if (voiceReady) "Start voice conversation"
-                                                else "Voice conversation — setup needed",
+                                            contentDescription = if (voiceReady) stringResource(R.string.chat_input_start_voice)
+                                                else stringResource(R.string.chat_input_voice_setup_needed),
                                            tint = MaterialTheme.colorScheme.primary,
                                        )
                                    }
@@ -431,7 +433,7 @@ fun ChatInputBar(
                                    ) {
                                        Icon(
                                            imageVector = Icons.Filled.Stop,
-                                            contentDescription = "Stop streaming",
+                                            contentDescription = stringResource(R.string.chat_input_stop_streaming),
                                            tint = MaterialTheme.colorScheme.error,
                                            modifier = Modifier.size(18.dp),
                                        )
@@ -444,7 +446,7 @@ fun ChatInputBar(
                                ) {
                                    Icon(
                                        imageVector = Icons.AutoMirrored.Filled.Send,
-                                        contentDescription = "Steer the response",
+                                        contentDescription = stringResource(R.string.chat_input_steer_response),
                                        tint = MaterialTheme.colorScheme.tertiary,
                                    )
                                }
@@ -456,7 +458,7 @@ fun ChatInputBar(
                                    Box {
                                        Icon(
                                            imageVector = Icons.AutoMirrored.Filled.Send,
-                                            contentDescription = "Queue message",
+                                            contentDescription = stringResource(R.string.chat_input_queue_message),
                                            tint = MaterialTheme.colorScheme.tertiary,
                                        )
                                        Icon(
@@ -43,9 +43,10 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-
+import com.hermesandroid.relay.R
 /**
 * A slash command entry — built-in, personality, server skill, or (on the
 * gateway transport) a server-catalog command from `commands.catalog`.
@@ -140,11 +141,11 @@ fun CommandPalette(
                verticalAlignment = Alignment.CenterVertically
            ) {
                Text(
-                    text = "Commands",
+                    text = stringResource(R.string.command_palette_header),
                    style = MaterialTheme.typography.titleMedium
                )
                Text(
-                    text = "${filtered.size} available",
+                    text = stringResource(R.string.command_palette_count, filtered.size),
                    style = MaterialTheme.typography.labelMedium,
                    color = MaterialTheme.colorScheme.onSurfaceVariant
                )
@@ -159,7 +160,7 @@ fun CommandPalette(
                modifier = Modifier
                    .fillMaxWidth()
                    .padding(horizontal = 16.dp),
-                placeholder = { Text("Search commands...") },
+                placeholder = { Text(stringResource(R.string.command_palette_search)) },
                leadingIcon = {
                    Icon(
                        imageVector = Icons.Filled.Search,
@@ -172,7 +173,7 @@ fun CommandPalette(
                        IconButton(onClick = { searchQuery = "" }) {
                            Icon(
                                imageVector = Icons.Filled.Close,
-                                contentDescription = "Clear search",
+                                contentDescription = stringResource(R.string.command_palette_cd_clear),
                                modifier = Modifier.size(20.dp)
                            )
                        }
@@ -202,7 +203,7 @@ fun CommandPalette(
                    FilterChip(
                        selected = selectedCategory == null,
                        onClick = { selectedCategory = null },
-                        label = { Text("All") },
+                        label = { Text(stringResource(R.string.command_palette_filter_all)) },
                        colors = FilterChipDefaults.filterChipColors(
                            selectedContainerColor = MaterialTheme.colorScheme.primaryContainer
                        )
@@ -233,8 +234,8 @@ fun CommandPalette(
                        modifier = Modifier.padding(horizontal = 8.dp)
                    ) {
                        Text(
-                            text = if (categoriesExpanded) "Show less"
-                                   else "Show all (${categories.size})",
+                            text = if (categoriesExpanded) stringResource(R.string.command_palette_show_less)
+                                   else stringResource(R.string.command_palette_show_all, categories.size),
                            style = MaterialTheme.typography.labelMedium
                        )
                    }
@@ -283,7 +284,7 @@ fun CommandPalette(
                            contentAlignment = Alignment.Center
                        ) {
                            Text(
-                                text = "No commands match your search",
+                                text = stringResource(R.string.command_palette_empty),
                                style = MaterialTheme.typography.bodyMedium,
                                color = MaterialTheme.colorScheme.onSurfaceVariant
                            )
@@ -24,9 +24,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.data.ToolCall

@Composable
@@ -36,16 +38,18 @@ fun CompactToolCall(
 ) {
    val isPreparing = toolCall.isGenerating && !toolCall.isComplete
    val statusText = when {
-        toolCall.isComplete && toolCall.success == true -> "completed"
-        toolCall.isComplete && toolCall.success == false -> "failed"
-        isPreparing -> "preparing"
-        else -> "running"
+        toolCall.isComplete && toolCall.success == true -> stringResource(R.string.tool_progress_status_completed)
+        toolCall.isComplete && toolCall.success == false -> stringResource(R.string.tool_progress_status_failed)
+        isPreparing -> stringResource(R.string.tool_preparing_a11y)
+        else -> stringResource(R.string.tool_progress_status_running)
    }

    val duration = if (toolCall.completedAt != null && toolCall.completedAt >= toolCall.startedAt) {
        val seconds = (toolCall.completedAt - toolCall.startedAt) / 1000.0
        String.format("%.1fs", seconds)
    } else null
+    val durationDescription = duration?.let { stringResource(R.string.tool_duration_a11y, it) }.orEmpty()
+    val toolDescription = stringResource(R.string.tool_a11y, toolCall.name, statusText, durationDescription)

    Row(
        modifier = modifier
@@ -53,7 +57,7 @@ fun CompactToolCall(
            .background(MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f))
            .padding(horizontal = 8.dp, vertical = 4.dp)
            .semantics {
-                contentDescription = "Tool ${toolCall.name} $statusText${duration?.let { " in $it" } ?: ""}"
+                contentDescription = toolDescription
            },
        verticalAlignment = Alignment.CenterVertically
    ) {
@@ -91,7 +95,7 @@ fun CompactToolCall(
                ).value
                Icon(
                    imageVector = Icons.Filled.MoreHoriz,
-                    contentDescription = "Preparing",
+                    contentDescription = stringResource(R.string.tool_preparing_a11y),
                    modifier = Modifier.size(12.dp),
                    tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = alpha)
                )
@@ -106,7 +110,7 @@ fun CompactToolCall(
            toolCall.success == true -> {
                Icon(
                    imageVector = Icons.Filled.Check,
-                    contentDescription = "Completed",
+                    contentDescription = stringResource(R.string.tool_completed_a11y),
                    modifier = Modifier.size(12.dp),
                    tint = MaterialTheme.colorScheme.primary
                )
@@ -114,7 +118,7 @@ fun CompactToolCall(
            else -> {
                Icon(
                    imageVector = Icons.Filled.Close,
-                    contentDescription = "Failed",
+                    contentDescription = stringResource(R.string.tool_failed_a11y),
                    modifier = Modifier.size(12.dp),
                    tint = MaterialTheme.colorScheme.error
                )
@@ -12,8 +12,10 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import com.hermesandroid.relay.R

 /**
 * Compact top-bar chip showing the currently-active Hermes connection.
@@ -40,7 +42,7 @@ fun ConnectionChip(
                Spacer(modifier = Modifier.width(2.dp))
                Icon(
                    imageVector = Icons.Filled.ArrowDropDown,
-                    contentDescription = "Switch connection",
+                    contentDescription = stringResource(R.string.cd_switch_connection),
                    modifier = Modifier,
                )
            }
@@ -25,6 +25,8 @@ import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
+import com.hermesandroid.relay.R
+import androidx.compose.ui.res.stringResource
 import com.hermesandroid.relay.data.ConnectionSecurity
 import com.hermesandroid.relay.data.ConnectionSecurityLevel
 import com.hermesandroid.relay.data.SurfaceSecurity
@@ -79,7 +81,7 @@ fun ConnectionSecuritySheet(
            verticalArrangement = Arrangement.spacedBy(14.dp),
        ) {
            Text(
-                text = "Connection security",
+                text = stringResource(R.string.security_sheet_title),
                style = MaterialTheme.typography.titleMedium,
                fontWeight = FontWeight.Bold,
            )
@@ -93,8 +95,7 @@ fun ConnectionSecuritySheet(

            if (security.surfaces.isEmpty()) {
                Text(
-                    text = "No active route yet. Connect to a server to see how each " +
-                        "part of the connection is protected.",
+                    text = stringResource(R.string.security_sheet_no_route),
                    style = MaterialTheme.typography.bodyMedium,
                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                )
@@ -104,14 +105,17 @@ fun ConnectionSecuritySheet(

            HorizontalDivider()

-            Text(
-                text = explainer(security.level),
-                style = MaterialTheme.typography.bodySmall,
-                color = MaterialTheme.colorScheme.onSurfaceVariant,
-            )
+            val explainerTextRes = explainerResOrNull(security.level)
+            if (explainerTextRes != null) {
+                Text(
+                    text = stringResource(explainerTextRes),
+                    style = MaterialTheme.typography.bodySmall,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                )
+            }

            TextButton(onClick = { uriHandler.openUri(LEARN_MORE_URL) }) {
-                Text("Learn about connection security →")
+                Text(stringResource(R.string.security_sheet_learn_more))
            }
        }
    }
@@ -145,17 +149,10 @@ private fun SurfaceSecurityRow(surface: SurfaceSecurity) {
    }
 }

-private fun explainer(level: ConnectionSecurityLevel): String = when (level) {
-    ConnectionSecurityLevel.Tls ->
-        "Encrypted with TLS. The server's certificate is pinned on first connect."
-    ConnectionSecurityLevel.Overlay ->
-        "Encrypted by your overlay network (e.g. Tailscale/WireGuard), not TLS. " +
-            "Cert pinning applies only to TLS routes."
-    ConnectionSecurityLevel.Mixed ->
-        "Some parts of this connection are encrypted and some are plain. The app " +
-            "prefers a secure route when one is reachable."
-    ConnectionSecurityLevel.Plain ->
-        "Not encrypted. Only safe on a network you fully trust — anyone in between " +
-            "could read this traffic."
-    ConnectionSecurityLevel.Unknown -> ""
+private fun explainerResOrNull(level: ConnectionSecurityLevel): Int? = when (level) {
+    ConnectionSecurityLevel.Tls -> R.string.security_sheet_explain_tls
+    ConnectionSecurityLevel.Overlay -> R.string.security_sheet_explain_overlay
+    ConnectionSecurityLevel.Mixed -> R.string.security_sheet_explain_mixed
+    ConnectionSecurityLevel.Plain -> R.string.security_sheet_explain_plain
+    ConnectionSecurityLevel.Unknown -> null
 }
@@ -23,8 +23,10 @@ import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.data.Connection

 /**
@@ -61,7 +63,7 @@ fun ConnectionSwitcherSheet(
            verticalArrangement = Arrangement.spacedBy(4.dp),
        ) {
            Text(
-                text = "Switch connection",
+                text = stringResource(R.string.conn_switcher_title),
                style = MaterialTheme.typography.titleMedium,
                modifier = Modifier.padding(bottom = 8.dp),
            )
@@ -70,7 +72,7 @@ fun ConnectionSwitcherSheet(
                // Defensive: the legacy migration should always seed connection 0,
                // but fall back to a Manage-only state if the list is empty.
                Text(
-                    text = "No connections yet",
+                    text = stringResource(R.string.conn_switcher_empty),
                    style = MaterialTheme.typography.bodyMedium,
                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                    modifier = Modifier.padding(vertical = 12.dp),
@@ -79,7 +81,7 @@ fun ConnectionSwitcherSheet(
                    onClick = onManageConnections,
                    modifier = Modifier.fillMaxWidth(),
                ) {
-                    Text("Manage connections…")
+                    Text(stringResource(R.string.conn_switcher_manage))
                }
            } else {
                LazyColumn(
@@ -105,7 +107,7 @@ fun ConnectionSwitcherSheet(
                    onClick = onManageConnections,
                    modifier = Modifier.fillMaxWidth(),
                ) {
-                    Text("Manage connections…")
+                    Text(stringResource(R.string.conn_switcher_manage))
                }
            }
        }
@@ -119,11 +121,9 @@ private fun ConnectionRow(
    onClick: () -> Unit,
 ) {
    val hostname = Connection.extractDefaultLabel(connection.apiServerUrl)
-    val statusLine = if (connection.pairedAt == null) {
-        "$hostname • Hermes"
-    } else {
-        "$hostname • Paired"
-    }
+    val hermesStatus = stringResource(R.string.conn_info_hostname_hermes, hostname)
+    val pairedStatus = stringResource(R.string.conn_info_hostname_paired, hostname)
+    val statusLine = if (connection.pairedAt == null) hermesStatus else pairedStatus

    Row(
        modifier = Modifier
@@ -35,9 +35,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.lerp
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.ui.theme.RelayRefresh
 import kotlin.math.roundToInt

@@ -120,13 +122,15 @@ private fun ContextMeterBarContent(
    }
    val label = "$percent%$tokenSuffix"

+    val contextUsedDesc = stringResource(R.string.cd_context_used, percent)
+
    Row(
        modifier = modifier
            .fillMaxWidth()
            .then(if (onClick != null) Modifier.clickable { onClick() } else Modifier)
            .padding(horizontal = 12.dp, vertical = 3.dp)
            .semantics {
-                contentDescription = "Context $percent% used" +
+                contentDescription = contextUsedDesc +
                    if (tokenSuffix.isNotEmpty()) ", ${fmtTokens(usedTokens!!)} of ${fmtTokens(maxTokens!!)} tokens" else ""
            },
        verticalAlignment = Alignment.CenterVertically,
@@ -158,7 +162,7 @@ private fun ContextMeterBarContent(
            Spacer(Modifier.width(6.dp))
            Icon(
                imageVector = Icons.Outlined.Info,
-                contentDescription = "View injected context",
+                contentDescription = stringResource(R.string.cd_view_injected),
                tint = MaterialTheme.colorScheme.onSurfaceVariant,
                modifier = Modifier.size(13.dp),
            )
@@ -38,12 +38,14 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.util.CrashReport
 import com.hermesandroid.relay.util.CrashReporter
 import com.hermesandroid.relay.util.IssueReport
@@ -111,7 +113,7 @@ private fun CrashReportDialog(report: CrashReport, onDismiss: () -> Unit) {
                    )
                    Spacer(Modifier.width(12.dp))
                    Text(
-                        text = "Hermes-Relay closed unexpectedly",
+                        text = stringResource(R.string.crash_title),
                        style = MaterialTheme.typography.titleMedium,
                        fontWeight = FontWeight.SemiBold,
                    )
@@ -119,8 +121,7 @@ private fun CrashReportDialog(report: CrashReport, onDismiss: () -> Unit) {

                Spacer(Modifier.height(8.dp))
                Text(
-                    text = "The last session crashed. Sending this report helps get it fixed — " +
-                        "nothing is sent automatically.",
+                    text = stringResource(R.string.crash_body),
                    style = MaterialTheme.typography.bodyMedium,
                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                )
@@ -155,13 +156,13 @@ private fun CrashReportDialog(report: CrashReport, onDismiss: () -> Unit) {
                    horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
                    verticalArrangement = Arrangement.spacedBy(4.dp),
                ) {
-                    TextButton(onClick = onDismiss) { Text("Dismiss") }
+                    TextButton(onClick = onDismiss) { Text(stringResource(R.string.common_dismiss)) }
                    OutlinedButton(
                        onClick = {
                            IssueReport.copyToClipboard(context, reportText)
                            toast(context, "Crash report copied")
                        },
-                    ) { Text("Copy") }
+                    ) { Text(stringResource(R.string.common_copy)) }
                    // Universal, GitHub-free path: hand the full report to the
                    // system share sheet (email, chat apps, notes, Drive…). The
                    // user picks the destination, so nothing leaves the device
@@ -180,7 +181,7 @@ private fun CrashReportDialog(report: CrashReport, onDismiss: () -> Unit) {
                            }
                            onDismiss()
                        },
-                    ) { Text("Share") }
+                    ) { Text(stringResource(R.string.common_share)) }
                    Button(
                        onClick = {
                            // Copy the FULL report first; the URL only carries the
@@ -194,7 +195,7 @@ private fun CrashReportDialog(report: CrashReport, onDismiss: () -> Unit) {
                            )
                            onDismiss()
                        },
-                    ) { Text("Report") }
+                    ) { Text(stringResource(R.string.common_report)) }
                }
            }
        }
@@ -24,6 +24,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.role
 import androidx.compose.ui.semantics.semantics
@@ -32,6 +33,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.ui.theme.HermesRelayTheme

 /**
@@ -76,7 +78,7 @@ fun DemoModeBanner(
                modifier = Modifier.size(16.dp),
            )
            Text(
-                text = "Demo mode — sample data, not connected. Connect →",
+                text = stringResource(R.string.dmb_demo_mode),
                style = MaterialTheme.typography.labelMedium,
                fontWeight = FontWeight.Medium,
                color = on,
@@ -125,19 +127,19 @@ fun DemoUnavailableContent(
                modifier = Modifier.size(40.dp),
            )
            Text(
-                text = "This is a demo",
+                text = stringResource(R.string.dmb_this_is_demo),
                style = MaterialTheme.typography.titleMedium,
                color = MaterialTheme.colorScheme.onSurface,
            )
            Text(
-                text = "Connect your Hermes server to use $feature.",
+                text = stringResource(R.string.dmb_connect_feature, feature),
                style = MaterialTheme.typography.bodyMedium,
                color = MaterialTheme.colorScheme.onSurfaceVariant,
                textAlign = TextAlign.Center,
            )
            Spacer(Modifier.height(4.dp))
            Button(onClick = onConnect) {
-                Text("Connect")
+                Text(stringResource(R.string.dmb_connect))
            }
        }
    }
@@ -35,6 +35,8 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.res.stringResource
+import com.hermesandroid.relay.R

 /**
 * Phase 3 — safety-rails `bridge-safety-rails`
@@ -106,7 +108,7 @@ fun DestructiveVerbConfirmDialog(
                        tint = Color(0xFFFFA726),
                    )
                    Text(
-                        text = "Confirm destructive action",
+                        text = stringResource(R.string.destructive_confirm_title),
                        style = MaterialTheme.typography.titleMedium,
                        fontWeight = FontWeight.SemiBold,
                        color = MaterialTheme.colorScheme.onSurface,
@@ -135,7 +137,7 @@ fun DestructiveVerbConfirmDialog(
                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                        )
                        Text(
-                            text = fullText.ifBlank { "(no text)" },
+                            text = fullText.ifBlank { stringResource(R.string.destructive_no_text) },
                            style = MaterialTheme.typography.bodyMedium,
                            color = MaterialTheme.colorScheme.onSurface,
                        )
@@ -143,7 +145,7 @@ fun DestructiveVerbConfirmDialog(
                }

                Text(
-                    text = "If you didn't expect this, tap Deny.",
+                    text = stringResource(R.string.destructive_confirm_warning),
                    style = MaterialTheme.typography.bodySmall,
                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                )
@@ -184,7 +186,7 @@ fun DestructiveVerbConfirmDialog(
                        modifier = Modifier.weight(1f),
                        onClick = onDeny,
                    ) {
-                        Text("Deny")
+                        Text(stringResource(R.string.destructive_confirm_deny))
                    }
                    // Allow is intentionally lower-emphasis (amber caution, not a
                    // loud red CTA) so proceeding with a risky action never reads
@@ -196,7 +198,7 @@ fun DestructiveVerbConfirmDialog(
                            contentColor = Color(0xFFE65100),
                        ),
                    ) {
-                        Text("Allow this action")
+                        Text(stringResource(R.string.destructive_confirm_allow))
                    }
                }
            }
@@ -204,12 +206,14 @@ fun DestructiveVerbConfirmDialog(
    }
 }

+@Composable
 private fun labelFor(method: String): String = when (method) {
-    "/tap_text" -> "Target text (tap)"
-    "/type" -> "Text to type"
-    else -> "Payload"
+    "/tap_text" -> stringResource(R.string.destructive_label_tap_text)
+    "/type" -> stringResource(R.string.destructive_label_type)
+    else -> stringResource(R.string.destructive_label_payload)
 }

+@Composable
 private fun verbPhrase(method: String, verb: String): String {
    val action = when (method) {
        "/tap_text" -> "tap a button containing"
@@ -236,7 +240,7 @@ fun BridgeStatusOverlayChip(unattended: Boolean = false) {
    // the device. Default red dot + "Hermes active" preserves the v0.4
    // appearance for the regular bridge-active path.
    val dotColor = if (unattended) Color(0xFFFFA000) else Color(0xFFE53935)
-    val label = if (unattended) "Unattended ON" else "Hermes active"
+    val label = if (unattended) stringResource(R.string.destructive_chip_unattended) else stringResource(R.string.destructive_chip_active)
    Box(
        modifier = Modifier
            .background(
@@ -33,6 +33,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
@@ -40,6 +41,7 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import com.hermesandroid.relay.BuildConfig
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.diagnostics.DiagnosticLogEntry
 import com.hermesandroid.relay.diagnostics.DiagnosticSeverity
 import com.hermesandroid.relay.util.DiagnosticIssuePrefill
@@ -133,7 +135,7 @@ fun DiagnosticDetailDialog(entry: DiagnosticLogEntry, onDismiss: () -> Unit) {
                    }
                } else {
                    Text(
-                        text = "No further detail captured for this entry.",
+                        text = stringResource(R.string.diagnostic_no_detail),
                        style = MaterialTheme.typography.bodySmall,
                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                    )
@@ -146,7 +148,7 @@ fun DiagnosticDetailDialog(entry: DiagnosticLogEntry, onDismiss: () -> Unit) {
                        onValueChange = { expectation = it },
                        label = { Text("What were you expecting to happen?") },
                        supportingText = {
-                            Text("This is a routine log entry — telling us what looked wrong turns it into an answerable report.")
+                            Text(stringResource(R.string.diagnostic_routine_hint))
                        },
                        minLines = 2,
                        modifier = Modifier.fillMaxWidth(),
@@ -159,13 +161,13 @@ fun DiagnosticDetailDialog(entry: DiagnosticLogEntry, onDismiss: () -> Unit) {
                    horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
                    verticalArrangement = Arrangement.spacedBy(4.dp),
                ) {
-                    TextButton(onClick = onDismiss) { Text("Close") }
+                    TextButton(onClick = onDismiss) { Text(stringResource(R.string.common_close)) }
                    OutlinedButton(
                        onClick = {
                            IssueReport.copyToClipboard(context, plainText)
                            toast(context, "Diagnostic copied")
                        },
-                    ) { Text("Copy") }
+                    ) { Text(stringResource(R.string.common_copy)) }
                    OutlinedButton(
                        onClick = {
                            val shared = IssueReport.share(
@@ -179,7 +181,7 @@ fun DiagnosticDetailDialog(entry: DiagnosticLogEntry, onDismiss: () -> Unit) {
                                toast(context, "Copied — no app found to share to")
                            }
                        },
-                    ) { Text("Export") }
+                    ) { Text(stringResource(R.string.common_export)) }
                    Button(
                        enabled = !expectationVisible || expectation.isNotBlank(),
                        onClick = {
@@ -207,7 +209,7 @@ fun DiagnosticDetailDialog(entry: DiagnosticLogEntry, onDismiss: () -> Unit) {
                                else "Copied — no browser found to open GitHub",
                            )
                        },
-                    ) { Text("Report") }
+                    ) { Text(stringResource(R.string.common_report)) }
                }
            }
        }
@@ -31,10 +31,12 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.diagnostics.DiagnosticCategory
 import com.hermesandroid.relay.diagnostics.DiagnosticLogEntry
 import com.hermesandroid.relay.diagnostics.DiagnosticSeverity
@@ -43,7 +45,7 @@ import com.hermesandroid.relay.diagnostics.DiagnosticsLog
@Composable
 fun DiagnosticsLogPanel(
    modifier: Modifier = Modifier,
-    title: String = "Recent activity",
+    title: String? = null,
    categories: Set<DiagnosticCategory>? = null,
    limit: Int = 8,
    showCategory: Boolean = false,
@@ -51,6 +53,7 @@ fun DiagnosticsLogPanel(
    showSeverityFilter: Boolean = false,
 ) {
    val entries by DiagnosticsLog.entries.collectAsState()
+    val resolvedTitle = title ?: stringResource(R.string.diagnostics_title)

    // Self-contained detail-view state — tapping a row opens DiagnosticDetailDialog.
    // No nav route; nothing to wire in RelayApp.
@@ -74,13 +77,13 @@ fun DiagnosticsLogPanel(
            verticalAlignment = Alignment.CenterVertically,
        ) {
            Text(
-                text = title,
+                text = resolvedTitle,
                style = MaterialTheme.typography.titleSmall,
                fontWeight = FontWeight.SemiBold,
            )
            if (showClear && entries.isNotEmpty()) {
                TextButton(onClick = { DiagnosticsLog.clear() }) {
-                    Text("Clear")
+                    Text(stringResource(R.string.diagnostics_clear))
                }
            }
        }
@@ -90,7 +93,7 @@ fun DiagnosticsLogPanel(
                FilterChip(
                    selected = severityFilter == null,
                    onClick = { severityFilter = null },
-                    label = { Text("All") },
+                    label = { Text(stringResource(R.string.diagnostics_all)) },
                )
                DiagnosticSeverity.entries.forEach { sev ->
                    FilterChip(
@@ -104,7 +107,7 @@ fun DiagnosticsLogPanel(

        if (visible.isEmpty()) {
            Text(
-                text = "No recent activity",
+                text = stringResource(R.string.diagnostics_empty),
                style = MaterialTheme.typography.bodySmall,
                color = MaterialTheme.colorScheme.onSurfaceVariant,
            )
@@ -109,6 +109,12 @@ data class ThinkingIndicatorConfig(
 /** Chat-root provided streaming-indicator config; see [ThinkingIndicatorConfig]. */
 val LocalThinkingIndicator = compositionLocalOf { ThinkingIndicatorConfig() }

+internal fun shouldAnimateDotMatrix(
+    appAnimationsEnabled: Boolean,
+    osAnimationsEnabled: Boolean,
+    touchExplorationEnabled: Boolean,
+): Boolean = appAnimationsEnabled && osAnimationsEnabled && !touchExplorationEnabled
+
 /**
 * A compact dot-matrix "thinking" animation — a small grid of dots evoking a
 * dot-matrix / LED display (the dot-anime-react concept reimplemented natively
@@ -142,10 +148,15 @@ fun DotMatrixIndicator(
    fps: Int = 30,
    animated: Boolean = true,
 ) {
+    val motion = rememberAccessibleMotionState()
    val phase = rememberAmbientPhase(
        periodMillis = pattern.periodMillis,
        fps = fps,
-        running = animated,
+        running = shouldAnimateDotMatrix(
+            appAnimationsEnabled = animated,
+            osAnimationsEnabled = motion.osAnimations,
+            touchExplorationEnabled = motion.touchExploration,
+        ),
    )
    val gridWidth = columnSpacing * (columns - 1)
    val gridHeight = rowSpacing * (rows - 1)
@@ -44,8 +44,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.unit.dp
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.data.Connection
 import com.hermesandroid.relay.data.EndpointCandidate
 import com.hermesandroid.relay.data.SurfaceSecurityKind
@@ -114,19 +116,25 @@ fun EndpointsCard(
    onEditRoute: ((EndpointCandidate) -> Unit)? = null,
    onRemoveRoute: ((EndpointCandidate) -> Unit)? = null,
 ) {
+    // Pre-resolve strings
+    val noRoutesStoredText = stringResource(R.string.endpoints_no_routes_stored)
+    val addRouteText = stringResource(R.string.endpoints_add_route)
+    val resolvingText = stringResource(R.string.endpoints_resolving)
+    val manualUntilDisconnectText = stringResource(R.string.endpoints_manual_until_disconnect)
+    val preferredText = stringResource(R.string.endpoints_preferred)
+    val automaticText = stringResource(R.string.endpoints_automatic)
+    val currentRouteText = stringResource(R.string.endpoints_current_route)
+
    if (endpoints.isEmpty()) {
        Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
            Text(
-                text = "No route candidates stored for this connection yet. " +
-                    "Add a remote route (Tailscale, public URL) for automatic " +
-                    "switching when the phone leaves this network — or scan a " +
-                    "v3 pairing QR (Hermes 0.4.2+) if you use Relay.",
+                text = noRoutesStoredText,
                style = MaterialTheme.typography.bodySmall,
                color = MaterialTheme.colorScheme.onSurfaceVariant,
            )
            if (onAddRoute != null) {
                TextButton(onClick = onAddRoute) {
-                    Text("Add route")
+                    Text(addRouteText)
                }
            }
        }
@@ -139,13 +147,20 @@ fun EndpointsCard(
    val manualSwitchActive = manualOverrideRole != null &&
        !manualOverrideRole.equals(preferredRole, ignoreCase = true)

+    // Pre-resolve cancel manual switch string (needs preferredRole which may be null)
+    val cancelManualSwitchText = stringResource(R.string.endpoints_cancel_manual_switch)
+    val stopPreferringText = stringResource(R.string.endpoints_stop_preferring)
+
    Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
        Text(
-            text = "Current: ${activeEndpoint?.displayLabel() ?: "Resolving"}" + when {
-                manualSwitchActive -> " · manual (until disconnect)"
-                manualOverrideRole != null -> " · preferred"
-                else -> " · automatic"
-            },
+            text = currentRouteText.format(
+                activeEndpoint?.displayLabel() ?: resolvingText,
+                when {
+                    manualSwitchActive -> manualUntilDisconnectText
+                    manualOverrideRole != null -> preferredText
+                    else -> automaticText
+                }
+            ),
            style = MaterialTheme.typography.bodySmall,
            color = MaterialTheme.colorScheme.onSurfaceVariant,
        )
@@ -175,22 +190,20 @@ fun EndpointsCard(
        if (onAddRoute != null) {
            HorizontalDivider()
            TextButton(onClick = onAddRoute, modifier = Modifier.fillMaxWidth()) {
-                Text("Add route")
+                Text(addRouteText)
            }
        }

        if (manualSwitchActive) {
            HorizontalDivider()
            TextButton(onClick = onCancelUseNow, modifier = Modifier.fillMaxWidth()) {
-                Text(
-                    "Cancel manual switch (back to ${preferredRole ?: "automatic"})",
-                )
+                Text(cancelManualSwitchText.format(preferredRole ?: automaticText))
            }
        }
        if (preferredRole != null) {
            HorizontalDivider()
            TextButton(onClick = onClearPreferred, modifier = Modifier.fillMaxWidth()) {
-                Text("Stop preferring $preferredRole (back to automatic)")
+                Text(stopPreferringText.format(preferredRole))
            }
        }
    }
@@ -218,6 +231,7 @@ private fun EndpointRow(
    var pinDialogText by remember { mutableStateOf<String?>(null) }
    var confirmRemove by remember { mutableStateOf(false) }
    val scope = rememberCoroutineScope()
+    val noPinRecordedText = stringResource(R.string.endpoints_no_pin_recorded)

    Column(modifier = Modifier.fillMaxWidth()) {
        Row(
@@ -246,11 +260,11 @@ private fun EndpointRow(
                    )
                    SurfaceSecurityGlyph(kind = candidate.routeSecurityKind())
                    if (isActive) {
-                        ActiveChip()
+                        ActiveChip(stringResource(R.string.endpoints_active))
                    } else if (isPreferred) {
-                        PreferredChip()
+                        PreferredChip(stringResource(R.string.endpoints_preferred_chip))
                    } else {
-                        FallbackChip()
+                        FallbackChip(stringResource(R.string.endpoints_fallback))
                    }
                    if (!candidate.isKnownRole()) {
                        // Show the raw role for custom-VPN entries so users
@@ -277,18 +291,18 @@ private fun EndpointRow(
                )
                when {
                    isProbing -> Text(
-                        text = "Checking…",
+                        text = stringResource(R.string.endpoints_checking),
                        style = MaterialTheme.typography.labelSmall,
                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                    )
                    outcome == null -> Unit // never probed — say nothing
                    outcome.reachable -> Text(
-                        text = "Reachable",
+                        text = stringResource(R.string.endpoints_reachable),
                        style = MaterialTheme.typography.labelSmall,
                        color = MaterialTheme.colorScheme.primary,
                    )
                    else -> Text(
-                        text = "Unreachable — ${outcome.detail ?: "no detail"}",
+                        text = stringResource(R.string.endpoints_unreachable, outcome.detail ?: stringResource(R.string.endpoints_unreachable_no_detail)),
                        style = MaterialTheme.typography.labelSmall,
                        color = MaterialTheme.colorScheme.error,
                    )
@@ -304,14 +318,14 @@ private fun EndpointRow(
            // sticky "Prefer this route" lives in the menu below.
            if (!isActive) {
                TextButton(onClick = onUseNow) {
-                    Text("Use now")
+                    Text(stringResource(R.string.endpoints_use_now))
                }
            }
            Box {
                IconButton(onClick = { menuOpen = true }) {
                    Icon(
                        imageVector = Icons.Filled.MoreVert,
-                        contentDescription = "Endpoint actions",
+                        contentDescription = stringResource(R.string.endpoints_actions),
                    )
                }
                DropdownMenu(
@@ -322,13 +336,13 @@ private fun EndpointRow(
                        text = {
                            Column {
                                Text(
-                                    if (isPreferred) "Stop preferring" else "Prefer this route",
+                                    text = if (isPreferred) stringResource(R.string.endpoints_stop_preferring_menu) else stringResource(R.string.endpoints_prefer_this_route),
                                )
                                Text(
                                    text = if (isPreferred) {
-                                        "Back to automatic choice"
+                                        stringResource(R.string.endpoints_back_to_automatic)
                                    } else {
-                                        "Always try this route first"
+                                        stringResource(R.string.endpoints_always_try_first)
                                    },
                                    style = MaterialTheme.typography.labelSmall,
                                    color = MaterialTheme.colorScheme.onSurfaceVariant,
@@ -341,26 +355,25 @@ private fun EndpointRow(
                        },
                    )
                    DropdownMenuItem(
-                        text = { Text("Probe now") },
+                        text = { Text(stringResource(R.string.endpoints_probe_now)) },
                        onClick = {
                            menuOpen = false
                            onProbeNow()
                        },
                    )
                    DropdownMenuItem(
-                        text = { Text("View pin") },
+                        text = { Text(stringResource(R.string.endpoints_view_pin)) },
                        onClick = {
                            menuOpen = false
                            scope.launch {
                                pinDialogText = onViewPin(candidate)
-                                    ?: "No pin recorded yet — the phone will " +
-                                        "record one on first TOFU connect."
+                                    ?: noPinRecordedText
                            }
                        },
                    )
                    if (onEdit != null) {
                        DropdownMenuItem(
-                            text = { Text("Edit route") },
+                            text = { Text(stringResource(R.string.endpoints_edit_route)) },
                            onClick = {
                                menuOpen = false
                                onEdit()
@@ -369,7 +382,7 @@ private fun EndpointRow(
                    }
                    if (onRemove != null) {
                        DropdownMenuItem(
-                            text = { Text("Remove route") },
+                            text = { Text(stringResource(R.string.endpoints_remove_route)) },
                            onClick = {
                                menuOpen = false
                                confirmRemove = true
@@ -384,11 +397,10 @@ private fun EndpointRow(
    if (confirmRemove && onRemove != null) {
        AlertDialog(
            onDismissRequest = { confirmRemove = false },
-            title = { Text("Remove ${candidate.displayLabel()} route?") },
+            title = { Text(stringResource(R.string.endpoints_remove_route_title, candidate.displayLabel())) },
            text = {
                Text(
-                    text = "${candidate.api.host}:${candidate.api.port} will no longer be " +
-                        "probed as a fallback. You can add it back any time.",
+                    text = stringResource(R.string.endpoints_remove_route_body, "${candidate.api.host}:${candidate.api.port}"),
                    style = MaterialTheme.typography.bodySmall,
                )
            },
@@ -398,10 +410,10 @@ private fun EndpointRow(
                        confirmRemove = false
                        onRemove()
                    },
-                ) { Text("Remove") }
+                ) { Text(stringResource(R.string.endpoints_remove)) }
            },
            dismissButton = {
-                TextButton(onClick = { confirmRemove = false }) { Text("Cancel") }
+                TextButton(onClick = { confirmRemove = false }) { Text(stringResource(R.string.endpoints_cancel)) }
            },
        )
    }
@@ -409,7 +421,7 @@ private fun EndpointRow(
    pinDialogText?.let { body ->
        AlertDialog(
            onDismissRequest = { pinDialogText = null },
-            title = { Text("TOFU pin · ${candidate.api.host}") },
+            title = { Text(stringResource(R.string.endpoints_pin_title, candidate.api.host)) },
            text = {
                Text(
                    text = body,
@@ -418,14 +430,14 @@ private fun EndpointRow(
                )
            },
            confirmButton = {
-                TextButton(onClick = { pinDialogText = null }) { Text("Close") }
+                TextButton(onClick = { pinDialogText = null }) { Text(stringResource(R.string.endpoints_close)) }
            },
        )
    }
 }

@Composable
-private fun ActiveChip() {
+private fun ActiveChip(label: String) {
    Row(
        modifier = Modifier
            .clip(RoundedCornerShape(8.dp))
@@ -441,7 +453,7 @@ private fun ActiveChip() {
        )
        Spacer(Modifier.size(4.dp))
        Text(
-            text = "Active",
+            text = label,
            style = MaterialTheme.typography.labelSmall,
            color = MaterialTheme.colorScheme.primary,
        )
@@ -449,7 +461,7 @@ private fun ActiveChip() {
 }

@Composable
-private fun PreferredChip() {
+private fun PreferredChip(label: String) {
    Box(
        modifier = Modifier
            .clip(RoundedCornerShape(8.dp))
@@ -457,7 +469,7 @@ private fun PreferredChip() {
            .padding(horizontal = 6.dp, vertical = 2.dp),
    ) {
        Text(
-            text = "Preferred",
+            text = label,
            style = MaterialTheme.typography.labelSmall,
            color = Color(0xFFB26A00),
        )
@@ -471,7 +483,7 @@ private fun PreferredChip() {
 * as "available fallback" not "something is happening here".
 */
@Composable
-private fun FallbackChip() {
+private fun FallbackChip(label: String) {
    Box(
        modifier = Modifier
            .clip(RoundedCornerShape(8.dp))
@@ -484,7 +496,7 @@ private fun FallbackChip() {
            .padding(horizontal = 6.dp, vertical = 2.dp),
    ) {
        Text(
-            text = "Fallback",
+            text = label,
            style = MaterialTheme.typography.labelSmall,
            color = MaterialTheme.colorScheme.onSurfaceVariant,
        )
@@ -560,13 +572,16 @@ fun RouteEditorDialog(

    AlertDialog(
        onDismissRequest = { if (!saving) onDismiss() },
-        title = { Text(if (original == null) "Add route" else "Edit route") },
+        title = {
+            Text(
+                if (original == null) stringResource(R.string.endpoints_add_route_title)
+                else stringResource(R.string.endpoints_edit_route_title)
+            )
+        },
        text = {
            Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
                Text(
-                    text = "A fallback route the phone switches to when the " +
-                        "primary stops answering — e.g. your server's " +
-                        "Tailscale or public URL.",
+                    text = stringResource(R.string.endpoints_route_editor_desc),
                    style = MaterialTheme.typography.bodySmall,
                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                )
@@ -574,25 +589,25 @@ fun RouteEditorDialog(
                    FilterChip(
                        selected = selectedRole == "tailscale",
                        onClick = { selectedRole = "tailscale" },
-                        label = { Text("Tailscale") },
+                        label = { Text(stringResource(R.string.endpoints_tailscale)) },
                    )
                    FilterChip(
                        selected = selectedRole == "public",
                        onClick = { selectedRole = "public" },
-                        label = { Text("Public") },
+                        label = { Text(stringResource(R.string.endpoints_public)) },
                    )
                    FilterChip(
                        selected = selectedRole == CUSTOM_ROLE,
                        onClick = { selectedRole = CUSTOM_ROLE },
-                        label = { Text("Custom") },
+                        label = { Text(stringResource(R.string.endpoints_custom)) },
                    )
                }
                if (selectedRole == CUSTOM_ROLE) {
                    OutlinedTextField(
                        value = customRole,
                        onValueChange = { customRole = it },
-                        label = { Text("Route name") },
-                        placeholder = { Text("wireguard-home") },
+                        label = { Text(stringResource(R.string.endpoints_route_name)) },
+                        placeholder = { Text(stringResource(R.string.endpoints_route_name_placeholder)) },
                        singleLine = true,
                        modifier = Modifier.fillMaxWidth(),
                    )
@@ -616,23 +631,21 @@ fun RouteEditorDialog(
                        url = it
                        errorText = null
                    },
-                    label = { Text("API server URL or host") },
-                    placeholder = { Text("100.64.0.1 or http://host:8642") },
+                    label = { Text(stringResource(R.string.endpoints_api_url_host)) },
+                    placeholder = { Text(stringResource(R.string.endpoints_url_host_placeholder)) },
                    singleLine = true,
                    isError = errorText != null,
                    supportingText = {
+                        val supportingBlank = stringResource(R.string.endpoints_url_supporting_blank)
+                        val supportingEnter = stringResource(R.string.endpoints_url_supporting_enter)
                        Text(
                            text = errorText ?: when {
                                url.isBlank() ->
-                                    "Use the API server port (8642 by default) — " +
-                                        "not the dashboard's 9119. http:// is " +
-                                        "assumed unless you type https://."
+                                    supportingBlank
                                previewCandidate != null ->
-                                    "Will save: ${previewCandidate.api.url} — relay " +
-                                        "and dashboard URLs are derived from the host"
+                                    stringResource(R.string.endpoints_url_supporting_preview, previewCandidate.api.url)
                                else ->
-                                    "Enter a host/IP or an http(s):// URL " +
-                                        "(API port 8642, not dashboard 9119)"
+                                    supportingEnter
                            },
                        )
                    },
@@ -655,10 +668,17 @@ fun RouteEditorDialog(
                        }
                    }
                },
-            ) { Text(if (saving) "Saving…" else "Save") }
+            ) {
+                Text(
+                    if (saving) stringResource(R.string.endpoints_saving)
+                    else stringResource(R.string.endpoints_save)
+                )
+            }
        },
        dismissButton = {
-            TextButton(onClick = onDismiss, enabled = !saving) { Text("Cancel") }
+            TextButton(onClick = onDismiss, enabled = !saving) {
+                Text(stringResource(R.string.endpoints_cancel))
+            }
        },
    )
 }
@@ -30,6 +30,8 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.compose.ui.res.stringResource
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.viewmodel.TerminalViewModel.SpecialKey

 /**
@@ -88,20 +90,20 @@ fun ExtraKeysToolbar(
            horizontalArrangement = Arrangement.spacedBy(4.dp),
            verticalAlignment = Alignment.CenterVertically,
        ) {
-            ToolbarKey(label = "ESC", onClick = onEsc)
-            ToolbarKey(label = "TAB", onClick = onTab)
-            ToolbarKey(label = "CTRL", active = ctrlActive, onClick = onCtrlToggle)
-            ToolbarKey(label = "ALT", active = altActive, onClick = onAltToggle)
+            ToolbarKey(label = stringResource(R.string.extra_keys_esc), onClick = onEsc)
+            ToolbarKey(label = stringResource(R.string.extra_keys_tab), onClick = onTab)
+            ToolbarKey(label = stringResource(R.string.extra_keys_ctrl), active = ctrlActive, onClick = onCtrlToggle)
+            ToolbarKey(label = stringResource(R.string.extra_keys_alt), active = altActive, onClick = onAltToggle)

            // Clipboard + keyboard cluster — selecting/copying/pasting and
            // raising the soft keyboard are all unreliable through long-press
            // inside an Android WebView, so these explicit keys are the
            // dependable path.
            onCopy?.let { copy ->
-                ToolbarKey(label = "COPY", onClick = copy)
+                ToolbarKey(label = stringResource(R.string.extra_keys_copy), onClick = copy)
            }
            onPaste?.let { paste ->
-                ToolbarKey(label = "PASTE", onClick = paste)
+                ToolbarKey(label = stringResource(R.string.extra_keys_paste), onClick = paste)
            }
            onToggleKeyboard?.let { toggle ->
                ToolbarKey(label = "⌨", onClick = toggle) // show/hide soft keyboard
@@ -0,0 +1,439 @@
+package com.hermesandroid.relay.ui.components
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.animateContentSize
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.selection.SelectionContainer
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.CheckCircle
+import androidx.compose.material.icons.filled.ErrorOutline
+import androidx.compose.material.icons.filled.ExpandLess
+import androidx.compose.material.icons.filled.ExpandMore
+import androidx.compose.material.icons.filled.Refresh
+import androidx.compose.material.icons.filled.Stop
+import androidx.compose.material.icons.filled.Terminal
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.stateDescription
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import com.hermesandroid.relay.R
+import com.hermesandroid.relay.network.upstream.GatewayProcess
+
+/**
+ * Composer-adjacent summary of upstream Hermes processes for the active chat.
+ * The process registry is session-scoped, so this deliberately does not live
+ * in the global session/navigation drawer.
+ */
+@Composable
+fun GatewayBackgroundProcessStrip(
+    processes: List<GatewayProcess>,
+    loading: Boolean,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    // Initial/switch refreshes are silent. The strip appears only after the
+    // session actually owns a process, avoiding a transient "Checking" row on
+    // every ordinary chat open.
+    if (processes.isEmpty()) return
+
+    val running = processes.count { it.isRunning }
+    val failed = processes.count { !it.isRunning && (it.exitCode ?: 0) != 0 }
+    val displayedCount = if (running > 0) running else processes.size
+    val status = when {
+        running > 0 -> "$running running"
+        failed > 0 -> "$failed failed"
+        else -> "Complete"
+    }
+
+    Surface(
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(horizontal = 16.dp, vertical = 3.dp)
+            .heightIn(min = 48.dp)
+            .semantics {
+                contentDescription =
+                    "Background processes, $status. Open current chat activity."
+                stateDescription = status
+            }
+            .clickable(
+                onClickLabel = "Open background processes",
+                onClick = onClick,
+            ),
+        shape = RoundedCornerShape(14.dp),
+        color = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.72f),
+        tonalElevation = 1.dp,
+    ) {
+        Row(
+            modifier = Modifier.padding(horizontal = 12.dp, vertical = 9.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            if (running > 0 || loading) {
+                CircularProgressIndicator(modifier = Modifier.size(16.dp), strokeWidth = 2.dp)
+            } else {
+                Icon(
+                    imageVector = if (failed > 0) Icons.Filled.ErrorOutline else Icons.Filled.CheckCircle,
+                    contentDescription = null,
+                    modifier = Modifier.size(17.dp),
+                    tint = if (failed > 0) {
+                        MaterialTheme.colorScheme.error
+                    } else {
+                        MaterialTheme.colorScheme.primary
+                    },
+                )
+            }
+            Spacer(Modifier.width(9.dp))
+            Text(
+                text = stringResource(R.string.background_process_count, displayedCount),
+                style = MaterialTheme.typography.labelLarge,
+                modifier = Modifier.weight(1f),
+            )
+            Text(
+                text = status,
+                style = MaterialTheme.typography.labelMedium,
+                color = if (failed > 0 && running == 0) {
+                    MaterialTheme.colorScheme.error
+                } else {
+                    MaterialTheme.colorScheme.onSurfaceVariant
+                },
+            )
+            Icon(
+                imageVector = Icons.Filled.ExpandLess,
+                contentDescription = null,
+                modifier = Modifier
+                    .padding(start = 6.dp)
+                    .size(17.dp),
+                tint = MaterialTheme.colorScheme.onSurfaceVariant,
+            )
+        }
+    }
+}
+
+/** Mobile analogue of Hermes Desktop's composer process stack + terminal viewer. */
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun GatewayBackgroundProcessSheet(
+    processes: List<GatewayProcess>,
+    loading: Boolean,
+    stoppingProcessIds: Set<String>,
+    onRefresh: () -> Unit,
+    onStop: (String) -> Unit,
+    onDismissProcess: (String) -> Unit,
+    onDismiss: () -> Unit,
+) {
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = false)
+    val running = processes.filter { it.isRunning }
+    val recent = processes.filterNot { it.isRunning }
+
+    ModalBottomSheet(
+        onDismissRequest = onDismiss,
+        sheetState = sheetState,
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 24.dp),
+        ) {
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(start = 20.dp, end = 8.dp, bottom = 4.dp),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Column(modifier = Modifier.weight(1f)) {
+                    Text(stringResource(R.string.background_processes_title), style = MaterialTheme.typography.titleLarge)
+                    Text(
+                        stringResource(R.string.background_processes_subtitle),
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+                }
+                IconButton(onClick = onRefresh, enabled = !loading) {
+                    if (loading) {
+                        CircularProgressIndicator(modifier = Modifier.size(20.dp), strokeWidth = 2.dp)
+                    } else {
+                        Icon(Icons.Filled.Refresh, contentDescription = stringResource(R.string.background_processes_refresh_a11y))
+                    }
+                }
+            }
+
+            if (processes.isEmpty() && !loading) {
+                Column(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 24.dp, vertical = 36.dp),
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                ) {
+                    Icon(
+                        Icons.Filled.Terminal,
+                        contentDescription = null,
+                        modifier = Modifier.size(30.dp),
+                        tint = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+                    Text(
+                        "No background processes in this chat",
+                        modifier = Modifier.padding(top = 12.dp),
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+                }
+            } else {
+                LazyColumn(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .heightIn(max = 560.dp),
+                ) {
+                    if (running.isNotEmpty()) {
+                        item { ProcessSectionLabel("Running", running.size) }
+                        items(running, key = { it.id }) { process ->
+                            GatewayProcessRow(
+                                process = process,
+                                stopping = process.id in stoppingProcessIds,
+                                onStop = { onStop(process.id) },
+                                onDismiss = null,
+                            )
+                        }
+                    }
+                    if (running.isNotEmpty() && recent.isNotEmpty()) {
+                        item { HorizontalDivider(modifier = Modifier.padding(vertical = 6.dp)) }
+                    }
+                    if (recent.isNotEmpty()) {
+                        item { ProcessSectionLabel("Recent", recent.size) }
+                        items(recent, key = { it.id }) { process ->
+                            GatewayProcessRow(
+                                process = process,
+                                stopping = false,
+                                onStop = null,
+                                onDismiss = { onDismissProcess(process.id) },
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun ProcessSectionLabel(label: String, count: Int) {
+    Text(
+        text = "$label · $count",
+        modifier = Modifier.padding(horizontal = 20.dp, vertical = 8.dp),
+        style = MaterialTheme.typography.labelMedium,
+        color = MaterialTheme.colorScheme.onSurfaceVariant,
+    )
+}
+
+@Composable
+private fun GatewayProcessRow(
+    process: GatewayProcess,
+    stopping: Boolean,
+    onStop: (() -> Unit)?,
+    onDismiss: (() -> Unit)?,
+) {
+    var expanded by remember(process.id) { mutableStateOf(false) }
+    val failed = !process.isRunning && (process.exitCode ?: 0) != 0
+    val output = sanitizeTerminalText(
+        process.outputTail.orEmpty().ifBlank { process.outputPreview.orEmpty() },
+    ).trimEnd()
+    val command = sanitizeTerminalText(process.command)
+        .lineSequence()
+        .firstOrNull()
+        ?.trim()
+        .orEmpty()
+        .ifBlank {
+            "Background process"
+        }
+
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .animateContentSize()
+            .clickable(
+                enabled = output.isNotBlank(),
+                onClickLabel = if (expanded) "Collapse process output" else "Expand process output",
+            ) { expanded = !expanded }
+            .padding(horizontal = 20.dp, vertical = 10.dp),
+    ) {
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            ProcessStateIcon(process = process, failed = failed, stopping = stopping)
+            Column(
+                modifier = Modifier
+                    .weight(1f)
+                    .padding(horizontal = 10.dp),
+            ) {
+                Text(
+                    text = command,
+                    style = MaterialTheme.typography.bodyMedium,
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis,
+                )
+                Text(
+                    text = processMetadata(process, failed),
+                    style = MaterialTheme.typography.labelSmall,
+                    color = if (failed) {
+                        MaterialTheme.colorScheme.error
+                    } else {
+                        MaterialTheme.colorScheme.onSurfaceVariant
+                    },
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
+            if (onStop != null) {
+                TextButton(onClick = onStop, enabled = !stopping) {
+                    Icon(
+                        Icons.Filled.Stop,
+                        contentDescription = null,
+                        modifier = Modifier.size(16.dp),
+                    )
+                    Spacer(Modifier.width(4.dp))
+                    Text(if (stopping) stringResource(R.string.background_processes_stopping) else stringResource(R.string.background_processes_stop))
+                }
+            } else if (onDismiss != null) {
+                TextButton(onClick = onDismiss) { Text(stringResource(R.string.common_dismiss)) }
+            }
+            if (output.isNotBlank()) {
+                Icon(
+                    imageVector = if (expanded) Icons.Filled.ExpandLess else Icons.Filled.ExpandMore,
+                    contentDescription = if (expanded) "Collapse output" else "Expand output",
+                    modifier = Modifier.size(20.dp),
+                    tint = MaterialTheme.colorScheme.onSurfaceVariant,
+                )
+            }
+        }
+
+        AnimatedVisibility(visible = expanded && output.isNotBlank()) {
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(top = 10.dp)
+                    .clip(RoundedCornerShape(10.dp))
+                    .background(MaterialTheme.colorScheme.surfaceContainerHighest)
+                    .padding(12.dp),
+            ) {
+                SelectionContainer {
+                    Text(
+                        text = output,
+                        style = MaterialTheme.typography.bodySmall.copy(fontFamily = FontFamily.Monospace),
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun ProcessStateIcon(process: GatewayProcess, failed: Boolean, stopping: Boolean) {
+    val tint: Color = when {
+        failed -> MaterialTheme.colorScheme.error
+        process.isRunning || stopping -> MaterialTheme.colorScheme.primary
+        else -> MaterialTheme.colorScheme.tertiary
+    }
+    Surface(
+        modifier = Modifier.size(30.dp),
+        shape = CircleShape,
+        color = tint.copy(alpha = 0.12f),
+    ) {
+        Box(contentAlignment = Alignment.Center) {
+            when {
+                process.isRunning || stopping -> CircularProgressIndicator(
+                    modifier = Modifier.size(17.dp),
+                    strokeWidth = 2.dp,
+                    color = tint,
+                )
+                failed -> Icon(
+                    Icons.Filled.ErrorOutline,
+                    contentDescription = stringResource(R.string.tool_failed_a11y),
+                    modifier = Modifier.size(18.dp),
+                    tint = tint,
+                )
+                else -> Icon(
+                    Icons.Filled.CheckCircle,
+                    contentDescription = stringResource(R.string.tool_completed_a11y),
+                    modifier = Modifier.size(18.dp),
+                    tint = tint,
+                )
+            }
+        }
+    }
+}
+
+private fun processMetadata(process: GatewayProcess, failed: Boolean): String {
+    val state = when {
+        process.isRunning -> "Running"
+        failed -> "Failed${process.exitCode?.let { " · exit $it" }.orEmpty()}"
+        else -> "Completed${process.exitCode?.let { " · exit $it" }.orEmpty()}"
+    }
+    return "$state · ${formatElapsed(process.uptimeSeconds)}" +
+        if (process.detached) " · recovered" else ""
+}
+
+private val ansiTerminalEscape = Regex(
+    "\u001B(?:\\].*?(?:\u0007|\u001B\\\\)|\\[[0-?]*[ -/]*[@-~]|[ -/]*[@-~])",
+    RegexOption.DOT_MATCHES_ALL,
+)
+private val unterminatedOsc = Regex("\u001B\\][^\\n]*")
+
+/** Plain-text mobile output viewer: remove terminal control/ANSI while keeping layout text. */
+internal fun sanitizeTerminalText(raw: String): String {
+    val withoutAnsi = unterminatedOsc.replace(
+        ansiTerminalEscape.replace(raw, ""),
+        "",
+    )
+    return withoutAnsi
+        .replace("\r\n", "\n")
+        .replace('\r', '\n')
+        .filter { char ->
+            char == '\n' || char == '\t' || (char.code >= 0x20 && char.code != 0x7F)
+        }
+}
+
+internal fun formatElapsed(totalSeconds: Long): String {
+    val seconds = totalSeconds.coerceAtLeast(0)
+    val hours = seconds / 3_600
+    val minutes = (seconds % 3_600) / 60
+    val remainder = seconds % 60
+    return when {
+        hours > 0 -> "${hours}h ${minutes}m"
+        minutes > 0 -> "${minutes}m ${remainder}s"
+        else -> "${remainder}s"
+    }
+}
@@ -70,10 +70,12 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.data.HermesCard
 import com.hermesandroid.relay.data.HermesCardAction
 import com.hermesandroid.relay.data.HermesCardDispatch
@@ -134,6 +136,7 @@ fun HermesCardBubble(
    val accentColor = accentToColor(card.accent)
    val typeIcon = iconForType(card.type)
    val alreadyChosen = dispatches.firstOrNull { it.cardKey == cardKey }
+    val cardDescription = stringResource(R.string.card_a11y, card.title ?: card.type)

    // Expiry clock for timed asks. Ticks once a second while the deadline
    // is ahead; freezes after. Keyed on the deadline so a re-used card id
@@ -155,7 +158,7 @@ fun HermesCardBubble(
            .widthIn(max = maxWidth)
            .fillMaxWidth()
            .semantics {
-                contentDescription = "Card: ${card.title ?: card.type}"
+                contentDescription = cardDescription
            },
        colors = CardDefaults.cardColors(
            containerColor = MaterialTheme.colorScheme.surface,
@@ -260,7 +263,7 @@ fun HermesCardBubble(
                    expired -> {
                        Spacer(Modifier.height(10.dp))
                        ChoseRow(
-                            text = "Expired — not granted",
+                            text = stringResource(R.string.card_expired),
                            icon = Icons.Filled.HourglassBottom,
                            iconTint = MaterialTheme.colorScheme.onSurfaceVariant,
                        )
@@ -293,7 +296,7 @@ fun HermesCardBubble(
                            val remainingSec = ((expiresAt - nowMillis) / 1000).coerceAtLeast(0)
                            Spacer(Modifier.height(8.dp))
                            Text(
-                                text = "expires in %d:%02d".format(remainingSec / 60, remainingSec % 60),
+                                text = stringResource(R.string.card_expires_in, remainingSec / 60, remainingSec % 60),
                                style = relayMetadataStyle(),
                                color = if (remainingSec < 30) RelayRefresh.Amber
                                    else MaterialTheme.colorScheme.onSurfaceVariant,
@@ -459,7 +462,7 @@ private fun CardInputSlot(
            )
            Spacer(Modifier.height(6.dp))
            Text(
-                text = "Not stored in chat history",
+                text = stringResource(R.string.card_not_stored),
                style = MaterialTheme.typography.labelSmall,
                color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f),
            )
@@ -480,7 +483,7 @@ private fun CardInputSlot(
                ) {
                    Icon(
                        imageVector = Icons.AutoMirrored.Filled.Send,
-                        contentDescription = "Send answer",
+                        contentDescription = stringResource(R.string.card_send_answer_a11y),
                        tint = if (answerText.isNotBlank()) MaterialTheme.colorScheme.primary
                            else MaterialTheme.colorScheme.onSurfaceVariant,
                        modifier = Modifier.size(18.dp),
@@ -512,7 +515,7 @@ private fun CardInputSlot(
                    colors = ButtonDefaults.buttonColors(
                        containerColor = MaterialTheme.colorScheme.primary,
                    ),
-                ) { Text("Submit", style = MaterialTheme.typography.labelMedium) }
+                ) { Text(stringResource(R.string.card_submit), style = MaterialTheme.typography.labelMedium) }
            }
        }
    }
@@ -538,7 +541,7 @@ private fun InlineAnswerField(
    ) {
        if (value.isEmpty()) {
            Text(
-                text = "Type an answer…",
+                text = stringResource(R.string.card_answer_placeholder),
                style = MaterialTheme.typography.bodyMedium,
                color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.6f),
            )
@@ -7,6 +7,8 @@ import android.graphics.pdf.PdfRenderer
 import android.media.MediaMetadataRetriever
 import android.net.Uri
 import android.widget.Toast
+import androidx.compose.ui.res.stringResource
+import com.hermesandroid.relay.R
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
@@ -153,7 +155,7 @@ private fun LoadingCard(
                val sizeHint = attachment.fileSize?.takeIf { it > 0 }
                    ?.let { " · ${formatBytes(it)}" } ?: ""
                Text(
-                    text = if (isManualCta) "Tap to download" else "Downloading…$sizeHint",
+                    text = if (isManualCta) stringResource(R.string.inbound_attach_tap_download) else stringResource(R.string.inbound_attach_downloading, sizeHint),
                    style = MaterialTheme.typography.bodyMedium,
                    fontWeight = FontWeight.Medium,
                    color = MaterialTheme.colorScheme.onSurfaceVariant
@@ -175,7 +177,7 @@ private fun LoadingCard(
                IconButton(onClick = onCancel, modifier = Modifier.size(28.dp)) {
                    Icon(
                        imageVector = Icons.Filled.Close,
-                        contentDescription = "Cancel download",
+                        contentDescription = stringResource(R.string.inbound_attach_cd_cancel),
                        tint = MaterialTheme.colorScheme.onSurfaceVariant,
                        modifier = Modifier.size(18.dp),
                    )
@@ -219,12 +221,12 @@ private fun FailedCard(
            Text(text = "\u26A0\uFE0F", style = MaterialTheme.typography.titleMedium)
            Column(modifier = Modifier.weight(1f)) {
                Text(
-                    text = attachment.errorMessage ?: "Attachment failed",
+                    text = attachment.errorMessage ?: stringResource(R.string.inbound_attach_failed),
                    style = MaterialTheme.typography.bodyMedium,
                    color = MaterialTheme.colorScheme.onErrorContainer
                )
                Text(
-                    text = "Tap to retry",
+                    text = stringResource(R.string.inbound_attach_tap_retry),
                    style = MaterialTheme.typography.labelSmall,
                    color = MaterialTheme.colorScheme.onErrorContainer.copy(alpha = 0.7f)
                )
@@ -467,7 +469,7 @@ private fun FileCardRender(
            ) {
                Icon(
                    imageVector = Icons.Filled.Download,
-                    contentDescription = "Save",
+                    contentDescription = stringResource(R.string.inbound_attach_cd_save),
                    tint = MaterialTheme.colorScheme.onSurfaceVariant,
                    modifier = Modifier.size(18.dp),
                )
@@ -491,7 +493,7 @@ private fun FileCardRender(
 * the default tap previews in-app.
 */
@Composable
-private fun AttachmentActionsMenu(
+fun AttachmentActionsMenu(
    expanded: Boolean,
    onDismiss: () -> Unit,
    context: Context,
@@ -500,7 +502,7 @@ private fun AttachmentActionsMenu(
 ) {
    DropdownMenu(expanded = expanded, onDismissRequest = onDismiss) {
        DropdownMenuItem(
-            text = { Text("Open externally") },
+            text = { Text(stringResource(R.string.inbound_attach_open)) },
            leadingIcon = { Icon(Icons.Filled.OpenInNew, contentDescription = null) },
            onClick = {
                onDismiss()
@@ -508,14 +510,14 @@ private fun AttachmentActionsMenu(
            },
        )
        DropdownMenuItem(
-            text = { Text("Share") },
+            text = { Text(stringResource(R.string.inbound_attach_share)) },
            onClick = {
                onDismiss()
                scope.launch { shareAttachment(context, attachment) }
            },
        )
        DropdownMenuItem(
-            text = { Text("Save to device") },
+            text = { Text(stringResource(R.string.inbound_attach_save)) },
            leadingIcon = { Icon(Icons.Filled.Download, contentDescription = null) },
            onClick = {
                onDismiss()
@@ -527,7 +529,7 @@ private fun AttachmentActionsMenu(

 /** Small circular download button overlaid on inline images (B2). */
@Composable
-private fun SaveOverlayButton(onClick: () -> Unit, modifier: Modifier = Modifier) {
+fun SaveOverlayButton(onClick: () -> Unit, modifier: Modifier = Modifier) {
    Surface(
        shape = CircleShape,
        color = Color.Black.copy(alpha = 0.45f),
@@ -536,7 +538,7 @@ private fun SaveOverlayButton(onClick: () -> Unit, modifier: Modifier = Modifier
        IconButton(onClick = onClick, modifier = Modifier.size(32.dp)) {
            Icon(
                imageVector = Icons.Filled.Download,
-                contentDescription = "Save",
+                contentDescription = stringResource(R.string.inbound_attach_cd_save),
                tint = Color.White,
                modifier = Modifier.size(18.dp),
            )
@@ -549,17 +551,17 @@ private fun SaveOverlayButton(onClick: () -> Unit, modifier: Modifier = Modifier
 private suspend fun shareAttachment(context: Context, attachment: Attachment) {
    val bytes = attachmentBytes(context, attachment)
    if (bytes == null) {
-        attachmentToast(context, "Couldn't read this file")
+        attachmentToast(context, context.getString(R.string.inbound_attach_share_failed))
        return
    }
    val uri = MediaSaver.stageForShare(context, bytes, attachment.fileName, attachment.contentType)
    MediaSaver.share(context, uri, attachment.contentType)
 }

-private suspend fun saveAttachment(context: Context, attachment: Attachment) {
+suspend fun saveAttachment(context: Context, attachment: Attachment) {
    val bytes = attachmentBytes(context, attachment)
    if (bytes == null) {
-        attachmentToast(context, "Couldn't read this file")
+        attachmentToast(context, context.getString(R.string.inbound_attach_share_failed))
        return
    }
    val result = if (attachment.renderMode == AttachmentRenderMode.IMAGE) {
@@ -569,13 +571,13 @@ private suspend fun saveAttachment(context: Context, attachment: Attachment) {
    }
    when (result) {
        is MediaSaver.SaveResult.Saved ->
-            attachmentToast(context, "Saved to ${result.location}")
+            attachmentToast(context, context.getString(R.string.inbound_attach_saved, result.location))
        MediaSaver.SaveResult.UseShareInstead -> {
            val uri = MediaSaver.stageForShare(context, bytes, attachment.fileName, attachment.contentType)
            MediaSaver.share(context, uri, attachment.contentType)
        }
        is MediaSaver.SaveResult.Failed ->
-            attachmentToast(context, "Save failed: ${result.message}")
+            attachmentToast(context, context.getString(R.string.inbound_attach_save_failed, result.message))
    }
 }

@@ -591,7 +593,7 @@ private suspend fun openAttachmentExternally(context: Context, attachment: Attac
    if (uri != null) {
        MediaSaver.open(context, uri, attachment.contentType)
    } else {
-        attachmentToast(context, "Couldn't open this file")
+        attachmentToast(context, context.getString(R.string.inbound_attach_open_failed))
    }
 }

@@ -707,16 +709,25 @@ private fun attachmentToast(context: Context, message: String) {
    Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
 }

+@Composable
 private fun emojiAndLabelFor(
    mode: AttachmentRenderMode,
    contentType: String
-): Pair<String, String> = when (mode) {
-    AttachmentRenderMode.IMAGE -> "\uD83D\uDDBC\uFE0F" to "Image"
-    AttachmentRenderMode.VIDEO -> "\uD83C\uDFAC" to "Video"
-    AttachmentRenderMode.AUDIO -> "\uD83C\uDFB5" to "Audio"
-    AttachmentRenderMode.PDF -> "\uD83D\uDCC4" to "PDF"
-    AttachmentRenderMode.TEXT -> "\uD83D\uDCDD" to contentTypeToLabel(contentType, fallback = "Text")
-    AttachmentRenderMode.GENERIC -> "\uD83D\uDCCE" to contentTypeToLabel(contentType, fallback = "File")
+): Pair<String, String> {
+    val imageLabel = stringResource(R.string.inbound_attach_type_image)
+    val videoLabel = stringResource(R.string.inbound_attach_type_video)
+    val audioLabel = stringResource(R.string.inbound_attach_type_audio)
+    val pdfLabel = stringResource(R.string.inbound_attach_type_pdf)
+    val textLabel = stringResource(R.string.inbound_attach_type_text)
+    val fileLabel = stringResource(R.string.inbound_attach_type_file)
+    return when (mode) {
+        AttachmentRenderMode.IMAGE -> "\uD83D\uDDBC\uFE0F" to imageLabel
+        AttachmentRenderMode.VIDEO -> "\uD83C\uDFAC" to videoLabel
+        AttachmentRenderMode.AUDIO -> "\uD83C\uDFB5" to audioLabel
+        AttachmentRenderMode.PDF -> "\uD83D\uDCC4" to pdfLabel
+        AttachmentRenderMode.TEXT -> "\uD83D\uDCDD" to contentTypeToLabel(contentType, fallback = textLabel)
+        AttachmentRenderMode.GENERIC -> "\uD83D\uDCCE" to contentTypeToLabel(contentType, fallback = fileLabel)
+    }
 }

 private fun contentTypeToLabel(contentType: String, fallback: String): String {
@@ -16,8 +16,10 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.unit.dp
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.viewmodel.ChatViewModel

 /**
@@ -45,66 +47,67 @@ fun InjectedContextSheet(
                .padding(start = 20.dp, end = 20.dp, bottom = 28.dp),
        ) {
            Text(
-                text = "What the agent sees",
+                text = stringResource(R.string.injected_context_title),
                style = MaterialTheme.typography.titleMedium,
                color = MaterialTheme.colorScheme.onSurface,
            )
            Spacer(Modifier.height(4.dp))
            Text(
-                text = "The exact extra context prepended to your next turn, for " +
-                    "transparency. Transport: ${context.transport}.",
+                text = stringResource(R.string.injected_context_subtitle, context.transport),
                style = MaterialTheme.typography.bodySmall,
                color = MaterialTheme.colorScheme.onSurfaceVariant,
            )
            Spacer(Modifier.height(16.dp))

+            val personaTitle = stringResource(R.string.injected_context_persona_title)
+            val phoneStatusTitle = stringResource(R.string.injected_context_phone_status_title)
+            val mediaTitle = stringResource(R.string.injected_context_media_title)
+            val relayTitle = stringResource(R.string.injected_context_relay_title)
+            val turnTitle = stringResource(R.string.injected_context_turn_title)
+            val personaServerSide = stringResource(R.string.injected_context_persona_server_side)
+            val personaNotSet = stringResource(R.string.injected_context_persona_not_set)
+            val phoneStatusNotSet = stringResource(R.string.injected_context_phone_status_not_set)
+            val mediaRelayActive = stringResource(R.string.injected_context_media_relay_active)
+            val mediaNoRelay = stringResource(R.string.injected_context_media_no_relay)
+            val relayNotSet = stringResource(R.string.injected_context_relay_not_set)
+            val turnNotSet = stringResource(R.string.injected_context_turn_not_set)
+
            ContextSection(
-                title = "Persona / profile",
+                title = personaTitle,
                body = context.personaPrompt,
                emptyNote = if (context.personaOwnedServerSide) {
-                    "Added server-side by Hermes (profile soul + personality " +
-                        "overlay) — not sent from this device."
+                    personaServerSide
                } else {
-                    "No persona prompt is being sent — the server uses its " +
-                        "configured default."
+                    personaNotSet
                },
            )
            ContextSection(
-                title = "Phone status",
+                title = phoneStatusTitle,
                body = context.appContext,
-                emptyNote = "No phone-status block — enable it in App Context settings.",
+                emptyNote = phoneStatusNotSet,
            )
            ContextSection(
-                title = "Media capability",
+                title = mediaTitle,
                body = context.mediaCapability,
                emptyNote = if (context.relayMediaAvailable) {
-                    // Gateway path: media WORKS (client renders server-local images
-                    // via the relay) — just no injected hint, since the gateway has
-                    // no per-turn system slot. Say so, rather than "not set".
-                    "Relay route active — server-local images and files render " +
-                        "in-app via the relay (client-side). The gateway transport " +
-                        "has no system slot, so no hint is injected here, but media " +
-                        "still works."
+                    mediaRelayActive
                } else {
-                    "No relay route configured — the agent can't fetch server-local " +
-                        "images or files by path."
+                    mediaNoRelay
                },
            )
            ContextSection(
-                title = "Relay context (server-side)",
+                title = relayTitle,
                body = context.relayServerBlocks
                    .takeIf { it.isNotEmpty() }
                    ?.joinToString("\n\n") { (name, text) ->
                        "[$name]\n$text"
                    },
-                emptyNote = "No relay server-side context blocks are active, or the relay " +
-                    "context layer is disabled.",
+                emptyNote = relayNotSet,
            )
            ContextSection(
-                title = "This turn",
+                title = turnTitle,
                body = context.interfaceContext,
-                emptyNote = "Nothing extra for a typed turn. Voice turns add a " +
-                    "spoken-output hint here.",
+                emptyNote = turnNotSet,
            )
        }
    }
@@ -23,8 +23,10 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.unit.dp
+import com.hermesandroid.relay.R

 /**
 * One-time acknowledgment dialog shown the first time the user flips
@@ -50,10 +52,13 @@ fun InsecureConnectionAckDialog(
 ) {
    var selectedReason by remember { mutableStateOf<String?>(null) }

+    val reasonLan = stringResource(R.string.insecure_ack_reason_lan)
+    val reasonTailscale = stringResource(R.string.insecure_ack_reason_tailscale)
+    val reasonDev = stringResource(R.string.insecure_ack_reason_dev)
    val reasonOptions = listOf(
-        "lan_only" to "LAN only (trusted network)",
-        "tailscale_vpn" to "Tailscale or VPN",
-        "local_dev" to "Local development only",
+        "lan_only" to reasonLan,
+        "tailscale_vpn" to reasonTailscale,
+        "local_dev" to reasonDev,
    )

    AlertDialog(
@@ -67,7 +72,7 @@ fun InsecureConnectionAckDialog(
        },
        title = {
            Text(
-                text = "Allow insecure connections?",
+                text = stringResource(R.string.insecure_ack_title),
                style = MaterialTheme.typography.titleLarge
            )
        },
@@ -77,16 +82,12 @@ fun InsecureConnectionAckDialog(
                modifier = Modifier.fillMaxWidth()
            ) {
                Text(
-                    text = "Insecure mode lets this app connect over plain " +
-                        "ws:// and http://. Anyone on the network between " +
-                        "your phone and the server can read your chat " +
-                        "messages, session tokens, and terminal traffic.",
+                    text = stringResource(R.string.insecure_ack_body_1),
                    style = MaterialTheme.typography.bodyMedium,
                    color = MaterialTheme.colorScheme.onSurfaceVariant
                )
                Text(
-                    text = "Only use this on networks you control. Pick " +
-                        "the reason that best describes your setup:",
+                    text = stringResource(R.string.insecure_ack_body_2),
                    style = MaterialTheme.typography.bodyMedium
                )

@@ -124,12 +125,12 @@ fun InsecureConnectionAckDialog(
                enabled = selectedReason != null,
                onClick = { selectedReason?.let(onConfirm) }
            ) {
-                Text("I understand")
+                Text(stringResource(R.string.insecure_ack_confirm))
            }
        },
        dismissButton = {
            TextButton(onClick = onCancel) {
-                Text("Cancel")
+                Text(stringResource(R.string.insecure_ack_cancel))
            }
        }
    )
--- a/Show More
+++ b/Show More