release(cli): cli-v0.4.0-alpha.2

Merge tested dev state into main for the Hermes-Relay-CLI 0.4.0-alpha.2 prerelease.
Merge branch 'main' into dev
2026-07-13 21:08:39 -04:00 · 2026-07-13 20:55:51 -04:00 · 2026-07-13 20:54:06 -04:00 · 2026-07-13 20:50:40 -04:00 · 2026-07-13 20:47:55 -04:00 · 2026-07-13 08:46:39 -04:00
297 changed files with 30164 additions and 22493 deletions
@@ -0,0 +1,53 @@
+name: Translation correction
+description: Report or propose a clearer translation for one locale.
+title: "[Translation]: "
+labels: ["translation"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        English defines the product meaning. Translation corrections are applied to the canonical locale catalog and credited through Git history.
+  - type: input
+    id: locale
+    attributes:
+      label: Language and locale
+      placeholder: Spanish (es), Simplified Chinese (zh-Hans), etc.
+    validations:
+      required: true
+  - type: input
+    id: location
+    attributes:
+      label: Screen and current text
+      description: Name the screen, resource key if known, and current translated wording.
+    validations:
+      required: true
+  - type: textarea
+    id: correction
+    attributes:
+      label: Suggested correction
+      description: Include the corrected text and what the English source means in this context.
+    validations:
+      required: true
+  - type: dropdown
+    id: proficiency
+    attributes:
+      label: Language familiarity
+      options:
+        - Native speaker
+        - Fluent speaker
+        - Professional translator
+        - Learner or machine-assisted report
+        - Prefer not to say
+    validations:
+      required: true
+  - type: checkboxes
+    id: sensitive
+    attributes:
+      label: Sensitive meaning
+      options:
+        - label: This affects permissions, privacy, security, destructive actions, payments, or recovery instructions.
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Optional screenshot, regional preference, or explanation of why the existing wording is misleading.
@@ -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: locale status/review references are accurate, `python scripts/check-android-locales.py` ran, and device/emulator review is documented, 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,13 @@ on:
      - "gradle.properties"
      - "gradlew"
      - "gradlew.bat"
+      - "scripts/check-android-locales.py"
+      - "scripts/android-locale-harness.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 +42,13 @@ on:
      - "gradle.properties"
      - "gradlew"
      - "gradlew.bat"
+      - "scripts/check-android-locales.py"
+      - "scripts/android-locale-harness.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 +65,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 +78,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 +97,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 +141,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 +156,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 +166,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 +205,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 +223,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
@@ -38,9 +38,15 @@ jobs:
      - name: Install deps
        run: npm ci

+      - name: Verify CLI and tray versions are synchronized
+        run: npm run check:version-sync
+
      - 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 +68,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 +96,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
@@ -105,6 +111,12 @@ jobs:
      - name: Install deps
        run: npm ci

+      - name: Check tray formatting
+        run: npm run tray:fmt
+
+      - name: Lint tray shell
+        run: npm run tray:lint
+
      - name: Cargo check tray shell
        run: npm run tray:check

@@ -57,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
@@ -96,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
@@ -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 }}
@@ -8,14 +8,63 @@ permissions:
  contents: write

 jobs:
-  build-cli-binaries:
-    name: Build cross-platform CLI binaries via Bun compile
+  validate-release:
+    name: Validate tag, branch, and version metadata
    runs-on: ubuntu-latest
    defaults:
      run:
        working-directory: desktop
+    outputs:
+      version: ${{ steps.version.outputs.version }}
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
+        with:
+          fetch-depth: 0
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: '22'
+          cache: npm
+          cache-dependency-path: desktop/package-lock.json
+
+      - name: Install deps
+        run: npm ci
+
+      - name: Extract and validate tag version
+        id: version
+        shell: bash
+        run: |
+          set -euo pipefail
+          version="${GITHUB_REF_NAME#cli-v}"
+          if [[ -z "$version" || "$version" == "$GITHUB_REF_NAME" ]]; then
+            echo "Expected a cli-v* tag, got $GITHUB_REF_NAME" >&2
+            exit 1
+          fi
+          echo "version=$version" >> "$GITHUB_OUTPUT"
+          npm run check:version-sync -- --expect "$version"
+
+      - name: Verify tagged commit belongs to main
+        shell: bash
+        working-directory: .
+        run: |
+          set -euo pipefail
+          git fetch origin main --no-tags
+          tag_commit="$(git rev-parse "${GITHUB_REF_NAME}^{commit}")"
+          if ! git merge-base --is-ancestor "$tag_commit" origin/main; then
+            echo "CLI releases must be tagged from main; $tag_commit is not in origin/main" >&2
+            exit 1
+          fi
+
+  build-cli-binaries:
+    name: Build cross-platform CLI binaries via Bun compile
+    runs-on: ubuntu-latest
+    needs: validate-release
+    defaults:
+      run:
+        working-directory: desktop
+    steps:
+      - uses: actions/checkout@v7

      - name: Setup Node.js (for npm ci + tsc)
        uses: actions/setup-node@v6
@@ -35,6 +84,9 @@ jobs:
      - name: Type-check
        run: npm run type-check

+      - name: Test CLI
+        run: npm test
+
      - name: Build dist/ (tsc)
        run: npm run build

@@ -100,14 +152,15 @@ jobs:
  build-windows-tray-installer:
    name: Build Windows tray installer
    runs-on: windows-latest
+    needs: validate-release
    defaults:
      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
@@ -130,20 +183,18 @@ jobs:
      - name: Build dist/ (tsc)
        run: npm run build

+      - name: Check and lint tray shell
+        run: npm run tray:fmt && npm run tray:lint
+
      - name: Test tray shell
        run: npm run tray:test

+      - name: Install NSIS
+        run: choco install nsis --yes --no-progress
+
      - name: Build tray installer
        run: npm run tray:build

-      - name: Normalize installer asset name
-        shell: pwsh
-        run: |
-          New-Item -ItemType Directory -Force -Path dist/tray | Out-Null
-          $installer = Get-ChildItem -Path tray/src-tauri/target/release/bundle/nsis -Filter '*_x64-setup.exe' | Select-Object -First 1
-          if (-not $installer) { throw 'NSIS installer was not produced' }
-          Copy-Item -Force $installer.FullName dist/tray/hermes-relay-desktop-windows-x64-setup.exe
-
      - name: Smoke-test tray exe launch
        shell: pwsh
        run: |
@@ -154,17 +205,22 @@ jobs:
          New-Item -ItemType Directory -Force -Path $smokeHome | Out-Null
          $env:USERPROFILE = $smokeHome
          $env:HOME = $smokeHome
-          $proc = Start-Process -FilePath tray/src-tauri/target/release/hermes-relay-desktop.exe -WindowStyle Hidden -PassThru
+          $env:HERMES_RELAY_CLI_PATH = (Resolve-Path dist/bin/hermes-relay-win-x64.exe).Path
+          $proc = Start-Process -FilePath tray/target/release/hermes-relay-tray.exe -WindowStyle Hidden -PassThru
          Start-Sleep -Seconds 5
          if ($proc.HasExited) { throw "tray app exited early with code $($proc.ExitCode)" }
+          $proc.Refresh()
+          if ($proc.MainWindowHandle -ne 0) { throw 'menu-only systray created an application window' }
+          $traySize = (Get-Item tray/target/release/hermes-relay-tray.exe).Length
+          if ($traySize -gt 5242880) { throw "tray executable exceeds 5 MiB: $traySize bytes" }
          Stop-Process -Id $proc.Id -Force
-          Write-Host "tray launch smoke OK pid=$($proc.Id)"
+          Write-Host "menu-only tray launch smoke OK pid=$($proc.Id) bytes=$traySize"

      - name: Upload Windows tray release asset
        uses: actions/upload-artifact@v4
        with:
-          name: cli-windows-tray-installer
-          path: desktop/dist/tray/hermes-relay-desktop-windows-x64-setup.exe
+          name: cli-windows-installer
+          path: desktop/dist/tray/hermes-relay-windows-x64-setup.exe
          retention-days: 7

  publish-release:
@@ -176,13 +232,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

@@ -221,5 +277,5 @@ jobs:
            release-assets/cli-binaries/hermes-relay-linux-x64
            release-assets/cli-binaries/hermes-relay-darwin-x64
            release-assets/cli-binaries/hermes-relay-darwin-arm64
-            release-assets/cli-windows-tray-installer/hermes-relay-desktop-windows-x64-setup.exe
+            release-assets/cli-windows-installer/hermes-relay-windows-x64-setup.exe
            release-assets/SHA256SUMS.txt
@@ -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
@@ -91,5 +91,5 @@ keystore.properties
 .smoke-relay.pid
 .smoke-relay.log

-# Generated tray frontend vendor assets copied from desktop/node_modules
+# Legacy generated desktop tray assets may remain after upgrading a worktree.
 desktop/tray/ui/vendor/
@@ -6,6 +6,78 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/), and this

 ## [Unreleased]

+## [0.4.0-alpha.2] - 2026-07-13
+
+### 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.
+- **Pending computer-use grants are manageable from the CLI.** `hermes-relay grants` lists and interactively approves or rejects local grant-bridge requests, with explicit `approve`, `reject`, and JSON forms for scripts.
+- **Desktop use has a durable CLI control plane.** `hermes-relay computer-use` persists enablement, reports daemon and grant state, and cancels active task-scoped grants through the local daemon bridge.
+
+### Changed
+
+- **The optional Windows systray is a native context menu for the CLI.** The WebView dashboard, embedded terminals, overlays, chat, sessions, plugins, voice, and settings windows were removed. The sub-megabyte tray now invokes the single installed CLI for TUI, pairing, daemon control, grants, audit, and logs.
+- **Systray daemon controls are state- and privilege-aware.** The menu cross-checks PID liveness, identifies User versus Administrator daemons, disables invalid lifecycle actions, shows pending-grant counts and version metadata, toggles sign-in startup, and requests UAC only for an explicit elevated daemon start or restart.
+- **Systray desktop-use controls preserve safety across restart and elevation.** The menu enables or disables the persistent capability, displays active grant mode and expiry, raises a native pending-approval alert, supports immediate cancellation, and warns while Administrator input authority is active.
+- **CLI and tray releases use one synchronized version contract.** A single npm lifecycle keeps package, compiled CLI, Cargo, and installer metadata aligned; local verification and tag CI reject drift, off-main release tags, and untested CLI changes before publishing.
+
+### Fixed
+
+- **Compiled CLI diagnostics report the physical executable.** `hermes-relay doctor` no longer mistakes Bun's virtual embedded path for the installed binary, so PATH and install-directory checks describe the executable that actually launched.
+
+## [1.4.4] - 2026-07-12
+
+### Added
+
+- **Android adds AI-assisted Spanish.** A repeatable translation harness and freshness checks keep catalogs structurally complete while tracking fluent review separately.
+- **Diagnostics exposes the Relay contract.** A manual refresh reports the installed plugin version, protocol version, capability count, profile enablement state, and last-check time; shared issue reports include sanitized Android and device metadata.
+- **What’s New links to complete release history.** The polished modal now provides direct access to every bundled version, with large-text screenshot coverage.
+
+### Fixed
+
+- **Profile operations stay inside the selected Hermes profile.** Session list, history, rename, delete, and in-flight recovery no longer fall through to the default database after a scoped failure; optimistic writes roll back and repeated recovery failures stop cleanly.
+
+## [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
@@ -1503,7 +1575,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.4.0...HEAD
+[Unreleased]: https://github.com/Codename-11/hermes-relay/compare/android-v1.4.4...HEAD
+[1.4.4]: https://github.com/Codename-11/hermes-relay/compare/android-v1.4.3...android-v1.4.4
+[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
@@ -1,53 +1,63 @@
 # Hermes-Relay-CLI v__VERSION__

-**Release Date:** 2026-06-21
-**Since the previous CLI release:** a first-class command surface — activity audit, relay inspection, a background daemon, a polished visual layer, and v1.2.0 server parity.
+**Release Date:** 2026-07-13

-This is a broad CLI uplift: new commands for seeing what the agent did and inspecting the relay, a daemon you can run in the background, and a consistent themed interface with per-command help. Everything is additive — existing commands, flags, and scripts keep working.
+This alpha makes the desktop direction explicit: Hermes-Relay is a real CLI/TUI with an optional Windows right-click systray—not a second desktop application. The old Tauri/WebView dashboard and its embedded windows are gone. The installed CLI remains the single source of behavior for pairing, TUI, daemon management, grants, audit, diagnostics, chat, voice, and tools.

-**Experimental phase.** Assets are unsigned — Windows SmartScreen and macOS Gatekeeper will warn on first launch. Windows ships a tray installer as the primary desktop surface; CLI binaries remain available for terminal/headless use and for macOS/Linux.
+**Experimental phase.** Assets are unsigned, so Windows SmartScreen and macOS Gatekeeper may warn on first launch. Standalone CLI binaries ship for Windows x64, Linux x64, and macOS x64/arm64; the optional native systray is Windows-only.

 ## What's changed

 ### Added
- **`hermes-relay audit`** — see what the remote agent has run on this machine through the desktop tools (tool, status, detail), read from a local log. No network, no auth; works whether the relay is local or remote.
- **`hermes-relay relay`** — inspect the relay server: `relay context` audits the system-prompt context the relay injects into the agent (works from any paired machine), and `relay info` / `relay security` report server state for operators on the relay host.
- **Background daemon.** `hermes-relay daemon start` runs the headless tool router in the background — no console window, survives closing the terminal — with `daemon stop` and `daemon status` to manage it. Bare `daemon` still runs in the foreground. Logs go to `~/.hermes/daemon.log`.
- **Per-command help.** Every subcommand answers `--help`, and `devices` / `sessions` / `plugins` / `voice` / `relay` print their own usage (sub-commands, flags, examples) instead of a terse "unknown sub-verb".
- **Startup banner.** A slim "Hermes Relay" wordmark shows atop `--help`, the first-run welcome, and the chat REPL; `hermes-relay logo` prints it on demand. Suppressed for piped / `--json` / `--no-color` output.
+
+- **Persistent desktop-use control.** `hermes-relay computer-use status|enable|disable|cancel` stores one local preference, reports daemon privilege and active/pending grants, and can end an active task-scoped grant without relying on a GUI.
+- **Headless grant review.** `hermes-relay grants` lists pending local computer-use requests and supports interactive review plus explicit `approve`, `reject`, and JSON forms for scripts.
+- **Typed Relay chat option.** `chat --relay-chat` sends `chat.send` over WSS and renders typed `stream.event` v1 assistant, tool, artifact, memory, skill, and error lifecycles while preserving the existing gateway path as the default.
+- **Release-parity verification.** One version contract now keeps the npm package, compiled CLI, Rust tray, lockfile, and installer metadata aligned. The Windows verification target covers TypeScript, compiled-binary smoke tests, Rust formatting/lint/check/tests, and installer packaging.

 ### Changed
- **Visual + ergonomics refresh.** One consistent color theme across the CLI, aligned tables for `devices` / `sessions`, on/off status dots, and progress spinners for slow operations (the multi-endpoint pairing probe and the gateway connect) so nothing looks hung. Errors now suggest the fix (e.g. re-pair on auth failure).
- **Smoother pairing.** The multi-endpoint probe shows per-endpoint progress and latency; a near-expiry session warns before it fails and prints the exact re-pair command; and a bare `ws://host` (no port) defaults to `:8767`.
- **Voice + consent transparency.** `voice` now surfaces enhanced-voice capabilities (Gemini tone tags / persona, xAI speech tags); the desktop-tool consent prompt is clear that it persists per relay and points at `hermes-relay audit`; and computer-use's observe → grant → act flow is documented in `--help`.
+
+- **Menu-only Windows systray.** The optional tray is a small native Rust process with no application window, WebView, overlay, embedded terminal, chat view, voice view, or settings dashboard. Interactive actions open the installed CLI in a normal terminal.
+- **State- and privilege-aware daemon control.** The menu reports PID-backed daemon state and User/Administrator privilege, disables invalid lifecycle actions, and requests UAC only when **Start/Restart daemon as Administrator…** is explicitly chosen. The tray itself remains unprivileged.
+- **Visible desktop-use safety.** The tray shows enablement, active grant mode and expiry, warns when an Administrator control grant is active, raises a native alert for pending approvals, opens CLI grant review, and provides immediate cancellation and emergency stop.
+- **Per-user Windows installation.** The default PowerShell installer downloads the checksum-verified NSIS package, installs the CLI and optional tray under `~/.hermes/bin`, adds Start-menu shortcuts and user PATH, and can start the tray at sign-in. CLI-only installation remains available with `HERMES_RELAY_INSTALL_SURFACE=cli`.
+
+### Fixed
+
+- **Installed-binary diagnostics.** `hermes-relay doctor` reports the physical Bun-compiled executable instead of a virtual embedded-module path, so PATH and install-directory checks describe the binary that actually launched.
+- **Release guardrails.** CLI tag automation rejects version drift, tags not contained in `main`, oversized tray binaries, or a tray process that creates an application window.

 ## Install

-**Windows tray app (PowerShell):**
+**Windows CLI + optional systray (PowerShell):**
+
 ```powershell
 irm https://raw.githubusercontent.com/Codename-11/hermes-relay/main/desktop/scripts/install.ps1 | iex
 ```

 **Windows CLI only:**
+
 ```powershell
 $env:HERMES_RELAY_INSTALL_SURFACE='cli'; irm https://raw.githubusercontent.com/Codename-11/hermes-relay/main/desktop/scripts/install.ps1 | iex
 ```

 **macOS / Linux CLI:**
+
 ```bash
 curl -fsSL https://raw.githubusercontent.com/Codename-11/hermes-relay/main/desktop/scripts/install.sh | sh
 ```

-Pin this specific release with `HERMES_RELAY_VERSION=__TAG__`.
+Pin this release with `HERMES_RELAY_VERSION=__TAG__`.

 ## Verify

 ```text
 hermes-relay --version
-hermes-relay pair --remote ws://<host>:8767
-hermes-relay shell
+hermes-relay pair --remote ws://<host>:8767 --grant-tools
+hermes-relay daemon start
+hermes-relay daemon status
 ```

-Open **Hermes Relay Desktop** from the Windows Start menu for tray pairing, devices, task log, settings, pause, and emergency stop.
+On Windows, open **Hermes Relay Systray** from the Start menu and right-click its notification-area icon. No separate desktop window is installed.

-See [Desktop docs](https://codename-11.github.io/hermes-relay/desktop/) for full usage.
+See the [CLI and systray guide](https://codename-11.github.io/hermes-relay/desktop/) for installation, commands, desktop-use safety, and troubleshooting.
@@ -94,7 +94,57 @@ We follow [Conventional Commits](https://www.conventionalcommits.org/): `feat:`,

 **Branching model (as of 2026-04-19): `main` + `dev`.** Feature branches — `feature/<name>`, `fix/<name>`, `docs/<name>`, `chore/<name>` — branch off `dev` and merge back into `dev` via `--no-ff` PRs. `main` is released state only; it receives release merges from `dev` and nothing else. There is no straight-to-main exemption — even single-file typos go through `dev`.

-Release-prep commits (version bump, 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.
+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`, `plugin-vX.Y.Z`, or `cli-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
+```
+
+Update `docs/localization-status.json` with the actual review level. AI-assisted
+translations may ship as `ai-translated`; do not claim fluent review unless a
+review reference is recorded. Focused correction PRs from fluent contributors
+are the canonical way to improve wording and can advance a locale to
+`community-reviewed` or `verified` under `docs/translation-playbook.md`.
+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

@@ -1,5 +1,262 @@
 # Hermes-Relay — Dev Log

+## 2026-07-13 — CLI/TUI and menu-only Windows systray
+
+The Windows desktop boundary now consists of the true CLI/TUI plus an optional
+native systray for right-click management. The Tauri/WebView dashboard, overlay,
+PTY-backed terminal, tray-owned chat worker, and browser UI assets were removed.
+The replacement Rust tray opens no application window and delegates interactive
+work to the installed `hermes-relay` CLI in a real terminal.
+
+The tray menu cross-checks daemon heartbeat and PID state, labels User versus
+Administrator execution, disables invalid lifecycle actions, and exposes
+pairing, pending-grant counts, audit, diagnostics, logs, sign-in startup,
+emergency stop, and explicit exit semantics. Elevated daemon start/restart uses
+Windows UAC while the tray remains a normal user process. A Windows mutex
+prevents duplicate tray instances. Pending computer-use grants are also
+reviewable directly through the CLI with `grants`, `approve`, and `reject`.
+Desktop use has a CLI-owned persistent preference, native pending-approval
+alerts, active grant/expiry status, immediate local cancellation, and a strong
+warning when task-scoped host input is active under Administrator privilege.
+
+The desktop package treats `desktop/package.json` as the canonical CLI/tray
+version and synchronizes npm lock metadata, the compiled CLI constant, Cargo,
+and NSIS metadata through one npm lifecycle. Desktop CI checks version drift,
+and the `cli-v*` tag workflow validates the tag version and `main` ancestry
+before building the standalone CLI and per-user Windows installer. Contributor
+and release documentation now covers the native tray dev loop, reversible local
+installation, release PR, and tag sequence.
+
+Verification: `npm run verify` passed 15 CLI tests, compiled CLI smoke tests,
+and 4 native tray contract tests. Rust formatting and Clippy passed with warnings
+denied. The release build produced a 0.88 MiB tray executable and a 26.97 MiB
+NSIS installer at version `0.4.0-alpha.2`; launch smoke confirmed a live singleton
+process with no main window until explicit teardown.
+
+## 2026-07-12 — Multi-profile presence and concurrent Gateway turns
+
+The Android profile picker now distinguishes **Online** profiles whose dedicated
+gateway and messaging channels are running, **Available** profiles that can start
+or resume a conversation on demand, and **Offline** profiles that are not reachable
+through the current host connection. Presence is independent of the selected chat
+profile and the server's sticky default.
+
+Switching profiles during a Dashboard/TUI Gateway turn now detaches the visible
+Android callbacks without interrupting the upstream session. The original turn
+continues server-side, its live-to-durable session binding remains registered, and
+the terminal event schedules authoritative history reconciliation for that original
+conversation. SSE transports retain the existing mid-stream switch lock because
+they cannot safely detach and multiplex turns this way.
+
+Multi-profile Phone/Threads routing remains deferred in `TODO.md`; the current
+single proactive subscriber and shared reply queue must become profile-partitioned
+before several profile gateways can consume it safely.
+
+Verification: sideload debug production and unit-test Kotlin compilation succeeded;
+focused `ProfilePresenceTest` and `GatewayChatClientTest` passed.
+
+## 2026-07-11 — Android localization foundation and Simplified Chinese
+
+The Android UI now resolves its broad static copy through canonical resources,
+with a complete Simplified Chinese catalog under the script-qualified
+`values-b+zh+Hans` directory and a matching sideload-flavor catalog. Android's
+locale configuration advertises English and Simplified Chinese to system per-app
+language settings. Current notification, voice-overlay, background-process,
+diagnostic, attachment, card, crash, timeline, and session-TTL surfaces were
+reconciled after the original localization branch diverged from `dev`.
+
+`scripts/check-android-locales.py` discovers locale catalogs in every Android
+source set and rejects malformed XML, duplicate resources, missing or extra
+keys, mismatched resource types, incompatible format arguments, and locale
+configuration drift. Android CI runs the checker before lint. Scan summaries and
+queued-message counts were converted from English suffix formatting to Android
+plurals after validation exposed a missing-format-argument path in the current
+connection wizard.
+
+The public contribution workflow now documents stale-PR salvage, preserved
+authorship, scoped translation PRs, locale qualifiers, device review, and the
+English canonical boundary. The root README links a maintained Chinese summary,
+and VitePress exposes a Simplified Chinese locale with localized landing, quick
+start, and feature pages while linking fast-moving reference material back to
+canonical English.
+
+## 2026-07-10 — In-flight Chat turns recover across app recreation
+
+Current upstream Hermes can keep a running Dashboard/TUI Gateway session alive
+after its WebSocket transport disappears. `session.activate` rebinds an exact
+live session id, while `session.resume` can reuse a live session by its durable
+session key and returns `running`, `status`, and an `inflight` snapshot containing
+the user prompt plus partial assistant text. Those fields are enough to recover
+the live worker and transcript tail, but upstream intentionally does not persist
+Android's reasoning presentation, tool-card lifecycle, pending ask card, or
+client-owned background-task UI.
+
+Android now checkpoints one session-backed in-flight turn in the shared app
+DataStore. The snapshot is scoped by connection/profile and session, expires
+after 24 hours, and contains the user/assistant pair, partial answer, reasoning,
+tool and subagent states, lifecycle caption, background-task state, and the
+server-issued half of an interactive ask. Entered passwords/secrets are never
+written. Mutations are debounced during streaming and flushed immediately when
+the app backgrounds, when a tool/ask/session boundary changes, and during
+orderly ViewModel teardown.
+
+Returning to Chat first restores the rich local snapshot. Gateway sessions then
+activate the saved live id before accepting new deltas; if activation is absent
+or the live id has expired, Android resumes by durable session id. A running
+payload binds the normal event mapper so reasoning, tool, status, ask, and
+completion callbacks continue on the same bubble. A settled or unreachable
+worker uses the existing bounded, positionally anchored history recovery, which
+also covers sessions-SSE transport loss and route handoff. Explicit Stop and
+session/profile/connection changes retain their prior interrupt semantics and
+clear the checkpoint; lifecycle teardown detaches without sending
+`session.interrupt`.
+
+Regression coverage includes checkpoint round-trip/corruption/expiry, rich
+ChatHandler rehydration without duplicated repeated prompts, exact activation,
+durable-resume fallback, idle-session settlement, detach-without-interrupt, and
+a Robolectric reopen that continues reasoning/tool events and clears the saved
+turn after authoritative completion.
+
+## 2026-07-10 — Gateway background processes become visible Chat activity
+
+Current upstream Hermes exposes a session-scoped process registry over the same
+Dashboard/TUI Gateway socket Android already uses for Chat. `process.list`
+returns running and recently finished entries plus a bounded output tail;
+`process.kill` stops one process after verifying session ownership;
+`agent.terminal.output`, process status events, and terminal/process tool
+completion provide refresh and live-output signals. There is no structured
+process-start event, so Android follows the official Desktop reconciliation
+recipe: load after session prewarm, refresh on relevant events, and poll every
+five seconds only while a process remains running. Method-not-found is treated
+as an unsupported optional surface instead of a Chat transport failure.
+
+Live phone verification exposed a start-discovery gap: the Gateway emitted the
+assistant turn that confirmed a new process ID but no terminal/process
+`tool.complete` event, so Android could not begin the running-only poll and first
+found the row from a later reconnect/completion snapshot. Every exact-session
+`message.complete` now invalidates the process snapshot as a low-cost fallback;
+ordinary tool/status events remain the faster path when upstream emits them.
+
+Chat now exposes that state through a compact composer-adjacent background strip
+and a current-chat bottom sheet. Running and recent rows show command, elapsed
+time, completion/exit state, expandable live or snapshot output, exact-process
+Stop, and local Dismiss. Session/client generations reject stale responses after
+a chat or connection switch, and profile context is part of the ownership key
+because isolated profile databases can reuse stored session IDs. A newer async
+prewarm invalidates an older resume before it can replace the live session.
+Reconnects repopulate from `process.list`; the five-second safety poll pauses in
+the background unless the user explicitly enabled Gateway keep-alive, so it
+cannot reopen the socket after the normal background grace close. Raw process
+output is length-only in logcat, never placed in notifications, and ANSI/control
+sequences are removed before the plain-text mobile viewer renders it.
+
+Hermes intentionally persists a completed process notification as synthetic
+user-role input before starting the agent's follow-up turn. Android now recognizes
+the upstream formatter shape and presents that history item as a compact,
+expandable process notice rather than a human-authored bubble, while preserving
+its wire/history role and excluding it from edit-and-resend behavior.
+
+Focused Gateway transport, process-controller, notification-parser, and output
+viewer tests pass on both Android product flavors. Google Play and sideload debug
+lint report zero errors, and the sideload debug APK assembles successfully for
+physical-device validation.
+
+## 2026-07-10 — Gateway background completions return to ordinary Chat
+
+Upstream Hermes already associates a detached process with the originating
+Dashboard/TUI Gateway session. When that process completes, its notification
+poller injects a synthetic user event, runs a follow-up agent turn, emits the
+normal `message.start` / delta / completion lifecycle, and persists the reply.
+Android discarded that lifecycle because `GatewayChatClient` only allocated a
+turn mapper after a phone-initiated `sendTurn()`; with no request-scoped
+`activeTurn`, every event returned before session filtering or UI dispatch.
+
+The Gateway client now accepts a server-initiated turn only when an explicit
+event session exactly matches its active live session and the open Chat still
+matches the corresponding stored session. It allocates a fresh mapper, binds a
+real cancellable turn handle into `ChatViewModel`, and reuses the normal text,
+thinking, tool, ask, status, completion, notification, queue, and authoritative
+history-reconciliation paths. Foreign or untagged events remain fail-closed.
+The mapper also collapses the adjacent duplicate `message.start` pair currently
+emitted by the upstream completion poller, preventing a phantom boundary or
+duplicate placeholder.
+
+After a user Stop, the client retains a short exact-session drain tombstone for
+the interrupted turn. Its late deltas/terminal event are ignored before a
+same-session next prompt is submitted, so canceled output cannot reappear as an
+unsolicited answer or prematurely complete the newer turn.
+
+A cold foreground prewarm now refreshes the exact resumed session when no turn
+is active, recovering a completion that may have finished while the Gateway
+socket was closed without overwriting another session or live response.
+Regressions cover no-`sendTurn()` delivery, exact-session filtering, duplicate
+starts, error recovery, Chat rendering/finalization, Stop-to-interrupt behavior,
+late canceled terminals, queued-send draining, and disconnected history recovery.
+
+## 2026-07-09 — Android 1.4.1 Chat and Voice enhancement batch
+
+Chat now represents a promoted realtime background run as one first-class
+assistant turn. The same row moves through queued, running, waiting, delivering,
+complete, failed, or cancelled state and owns its tool detail and authoritative
+answer. Run IDs retain the initiating assistant-row identity across later turns,
+including local Voice commands, so delayed progress or delivery cannot settle a
+newer placeholder. Local pause, resume, stop, repeat, and cancel commands are
+removed from Chat history, quarantine their provider acknowledgement, and cannot
+become the target of Retry. The authoritative answer still persists through the
+existing session history, and the in-flight Chat checkpoint now preserves the
+client-only task-card metadata across a cold restart.
+
+Streaming Markdown can promote blank-terminated prose and headings without
+waiting for the final response, while structurally ambiguous lists, quotes,
+tables, HTML, and fences remain in the raw tail. GFM tables now wrap in readable
+minimum-width columns inside a horizontally scrollable surface. Contiguous image
+attachments render as a bounded gallery with selected-page full-screen paging,
+sensitive-action gating, original-byte Share/Save behavior, and no adjacent
+full-resolution preload. The thinking indicator follows app and system motion
+settings plus TalkBack, the jump-to-bottom affordance reports unread messages,
+and the Demo mic explains locally that Voice requires a real connection.
+
+Voice now intercepts only exact, final-transcript commands in states where the
+action is safe. Standard Voice supports a rearmed new-chat command; realtime
+new-chat remains gated until a persistent WebSocket can be rebound safely. Four
+presets compose existing Voice settings without replacing manual controls or
+silently enabling experimental barge-in. Preset application updates the relay
+first and rolls it back if local persistence fails, with an explicit recovery
+message if rollback also fails. Relay event parsing accepts the documented and
+legacy field aliases used by current broker events.
+
+Foreground Hermes results now use the same forced-summary lifecycle as protected
+background delivery. Non-structured verbatim results take the provider's exact
+text path where supported; structured results use constrained instructions.
+Provider send or response-request failures emit one authoritative fallback before
+the terminal error, and each delivery emits one completion boundary. Delivery
+confirmation is generation-scoped so an alarm from an older response cannot
+invalidate a newer one. Voice-command response suppression is callback-local,
+and forced deliveries remain audible after pause, stop, or background-cancel
+commands.
+
+Verification passed the focused Google Play and sideload Chat/Voice unit suites,
+including a forced clean rerun of the cross-turn ownership regression. Both
+Android lint flavors passed. The realtime route, promotion, validation, xAI, and
+OpenAI provider slice passed 94/94 tests. Device validation remains for gallery
+gestures, reduced-motion/TalkBack behavior, cross-turn background delivery,
+command phrasing, all four presets, provider failure fallback, and the existing
+route-loss/audio quality release gates.
+
+## 2026-07-09 — Android and plugin 1.4.0 released
+
+`android-v1.4.0` and `plugin-v1.4.0` were published from the same release
+commit. The plugin wheel, source archive, and checksum file were downloaded and
+verified after publication. The Android release exposes only the intended
+sideload APK, Google Play AAB, and matching checksum file; both downloaded
+artifacts matched their recorded hashes, and the APK/AAB certificate digests
+matched the release signer.
+
+Google Play accepted Android versionCode 22 as a production draft. The draft
+was then promoted to `completed`, starting the production rollout. Extended
+physical-device recovery stress testing remains deferred and is tracked in
+`TODO.md`; live findings may still require follow-up recovery hardening.
+
 ## 2026-07-09 — Android realtime turns survive background route loss

 An on-device foreground/resume failure left a realtime turn showing
@@ -1,56 +1,39 @@
 # Hermes-Relay-Plugin v__VERSION__

-**Release Date:** July 9, 2026
+**Release Date:** July 11, 2026

-**Since v1.3.0:** Realtime Agent background work gains queued long requests, quick side-session answers, deterministic exact xAI delivery, stronger resume ownership, and a delivery-health report. The plugin now installs through upstream Hermes' native plugin path, handles modern virtual-environment layouts, targets multiple Android devices, protects credential paths in media delivery, and adds sharper doctor checks.
+**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.0 for the matching background-task, model/voice selection, resume, and task-chip behavior. Standard chat and Vanilla Hermes voice remain upstream-owned and do not require this plugin.
+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
-
- **Queued background voice work.** Up to three additional long requests can wait behind an active Hermes task and start automatically in order; cancelling the active run also clears its queue.
- **Quick side-session answers.** A short follow-up can be answered while a background run continues, without disturbing the durable task or its eventual delivery.
- **Provider-native exact xAI delivery.** Exact non-structured results use xAI's forced speech event so the selected realtime voice reads the authoritative Hermes answer without another model inference step.
- **Multi-device Android Bridge.** Multiple Android clients can remain connected and tools can target a named device class, alias, or explicit device ID. `/bridge/devices` and `/bridge/select-active` expose current routing.
- **Delivery health report.** `python -m plugin.relay.realtime_agent.report` summarizes recent realtime-voice delivery modes and fallback reasons.
-
 ### Changed

- **Compatibility bootstrap covers only true gaps.** Current Hermes owns native session CRUD/messages and skill discovery; the optional hook now limits itself to legacy surfaces with no upstream replacement.
- **aiohttp 3.14.1 or newer.** Plugin/package requirements move to the patched dependency line covering the 2026 aiohttp security advisories.
- **Long gateway turns use liveness, not a short RPC cap.** Prompt submit can wait up to the server's long-turn ceiling while idle-progress watchdogs determine whether a turn has actually stalled.
+- **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

- **Native `hermes plugins install` compatibility.** Runtime imports are package-relative, dashboard loading works under the upstream plugin namespace, and doctor exercises the real import chain.
- **Modern install layouts.** The installer detects classic, uv-managed, and containerized environments and points generated services/shims at the interpreter it actually found.
- **Doctor catches wrong dashboard surfaces and duplicate plugin copies.** Operators get an actionable correction instead of silently loading a stale directory or pointing Manage at a headless API server.
- **Resume ownership is generation-safe.** A stale candidate cannot detach an active phone route; confirmed replacements reject old failure/close/fatal callbacks, and failed opening candidates are never activated after their terminal callback.
- **Background results survive route loss.** Resumable sessions retain unacknowledged input and replay missed output, retry budgets start when a route is lost, and a detached durable run can still deliver by resume or notification.
- **One handoff and one ready event.** Duplicate spoken background acknowledgements and duplicate fresh-session ready telemetry are suppressed.
- **Credential files cannot be served as media.** Resolved paths under auth, token, pairing, SSH, relay-secret, and system-config locations are blocked even when general media delivery is permissive.
+- **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
-# Native upstream plugin path:
-hermes plugins install Codename-11/hermes-relay/plugin --enable
+    # Native upstream plugin path:
+    hermes plugins install Codename-11/hermes-relay/plugin --enable

-# 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
-```
+    # 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
-python scripts/check-plugin-version-sync.py --expect __VERSION__
-```
+    hermes relay doctor
+    python scripts/check-plugin-version-sync.py --expect __VERSION__

 ---

-Tag prefixes: Android releases use `android-v*`, plugin releases use `plugin-v*`, and CLI releases use `cli-v*`.
+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,21 @@ 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>
+
+The Android app also ships a complete AI-assisted Spanish catalog. Choose
+**Español** from **Settings → Appearance → Language**; translation status and
+fluent review are tracked independently so community corrections remain easy
+to contribute.
+
 <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
@@ -171,7 +187,7 @@ Full server setup, TLS, and systemd details: [docs/relay-server.md](docs/relay-s

 ## Hands on any machine — the Hermes-Relay CLI&nbsp;<sub>(alpha)</sub>

-> **Alpha · Windows today** (macOS / Linux coming soon). A single self-contained binary — no Node required. Binaries are unsigned during the experimental phase, so SmartScreen / Gatekeeper warnings are expected.
+> **Alpha.** Self-contained CLI binaries ship for Windows x64, Linux x64, and macOS x64/arm64 — no Node required. Windows also has an optional native, menu-only systray. Assets are unsigned during the experimental phase, so SmartScreen / Gatekeeper warnings are expected.

 The agent's brain stays on the host; the CLI lets it call tools **on your machine** over the same WSS relay — `read_file`, `write_file`, `terminal`, `search_files`, `screenshot`, `clipboard`, `open_in_editor`, and more — behind a one-time consent gate, interactive diff approval for patches, and a `--no-tools` kill-switch.

@@ -181,12 +197,14 @@ irm https://raw.githubusercontent.com/Codename-11/hermes-relay/main/desktop/scri

 ```bash
 hermes-relay pair --remote ws://<host>:8767   # once
-hermes-relay daemon                            # headless tool router — agent reaches you anytime
+hermes-relay daemon start                      # background tool router — agent reaches you anytime
 hermes-relay update                            # self-update via GitHub Releases
 ```

 It pairs against the **same relay and credential store** as the Android app — pair once from either, both work. Tagged on a separate `cli-v*` [release track](https://github.com/Codename-11/hermes-relay/releases?q=cli), with old alpha prereleases still visible under `desktop-v*`.

+On Windows, the default installer adds the optional right-click-only systray: no dashboard or app window, just TUI launch, User/Administrator-aware daemon controls, pairing, local grant review, audit, diagnostics, logs, desktop-use status/cancellation, sign-in startup, and emergency stop.
+
 - **Docs:** [CLI guide](https://codename-11.github.io/hermes-relay/desktop/) · [`desktop/README.md`](desktop/README.md)
 - **AI-agent setup recipe:** `/hermes-relay-desktop-setup`

@@ -327,9 +345,9 @@ This is an indie project and every report helps shape where it goes next. If som

 <a href="https://www.star-history.com/?repos=Codename-11%2Fhermes-relay&type=date&legend=top-left">
 <picture>
-   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/chart?repos=Codename-11/hermes-relay&type=date&theme=dark&legend=top-left" />
-   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/chart?repos=Codename-11/hermes-relay&type=date&legend=top-left" />
-   <img alt="Star History Chart" src="https://api.star-history.com/chart?repos=Codename-11/hermes-relay&type=date&legend=top-left" />
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/chart?repos=Codename-11/hermes-relay&type=date&theme=dark&legend=top-left&sealed_token=LpoTO7nnGWAwvnRyEeMuKowbf1fe6tQP9n6EbjX-9HTG0uGPrSD_OaNkloMDIM5ugTCg_14LB3XpQTx7v4fBn7PAtMZhO87iIlK5lo42Z31x8myptmcmnQ" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/chart?repos=Codename-11/hermes-relay&type=date&legend=top-left&sealed_token=LpoTO7nnGWAwvnRyEeMuKowbf1fe6tQP9n6EbjX-9HTG0uGPrSD_OaNkloMDIM5ugTCg_14LB3XpQTx7v4fBn7PAtMZhO87iIlK5lo42Z31x8myptmcmnQ" />
+   <img alt="Star History Chart" src="https://api.star-history.com/chart?repos=Codename-11/hermes-relay&type=date&legend=top-left&sealed_token=LpoTO7nnGWAwvnRyEeMuKowbf1fe6tQP9n6EbjX-9HTG0uGPrSD_OaNkloMDIM5ugTCg_14LB3XpQTx7v4fBn7PAtMZhO87iIlK5lo42Z31x8myptmcmnQ" />
 </picture>
 </a>

@@ -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)
@@ -22,7 +22,7 @@ for automation.
 |---|---|---|---|---|
 | Hermes-Relay-Android | `android-v*` | `gradle/libs.versions.toml` | `scripts/bump-android-version.sh` | `.github/workflows/release-android.yml` |
 | Hermes-Relay-Plugin | `plugin-v*` | `pyproject.toml` plus checked plugin/dashboard metadata | `scripts/bump-plugin-version.sh` | `.github/workflows/release-plugin.yml` |
-| Hermes-Relay-CLI | `cli-v*` | `desktop/package.json` | `npm version` or manual package bump | `.github/workflows/release-cli.yml` |
+| Hermes-Relay-CLI | `cli-v*` | `desktop/package.json` | `cd desktop && npm version --no-git-tag-version <version>` | `.github/workflows/release-cli.yml` |

 This split is intentional. The plugin carries relay features for both Android
 and CLI clients, so plugin fixes can ship without forcing an Android app
@@ -115,6 +115,40 @@ runs plugin tests, builds a wheel and sdist, generates checksums, and
 publishes a `Hermes-Relay-Plugin vX.Y.Z` GitHub Release with the package
 artifacts.

+### CLI / tray versioning
+
+`desktop/package.json` is the CLI release track's source of truth. Its version
+must match the generated CLI and native Windows systray metadata. The systray is
+a menu-only controller for the installed CLI; it has no application window,
+WebView, embedded terminal, or separate desktop product surface. The public
+release remains one `Hermes-Relay-CLI` track containing CLI binaries plus the
+optional Windows installer.
+
+| File | Purpose |
+|---|---|
+| `desktop/package.json` | canonical CLI version |
+| `desktop/package-lock.json` | npm root/workspace package metadata |
+| `desktop/src/version.ts` | compiled CLI runtime version |
+| `desktop/tray/Cargo.toml` | native systray package version |
+| `desktop/tray/Cargo.lock` | locked systray package version |
+
+Prepare a new CLI version on `dev` without creating a tag or npm-generated
+commit:
+
+```powershell
+cd desktop
+npm version --no-git-tag-version 0.4.0-alpha.2
+npm run check:version-sync
+npm run verify
+```
+
+The npm `version` lifecycle runs `sync:version`, which copies the canonical
+version into the generated CLI and tray metadata. If `package.json` was edited
+manually, run `npm run sync:version` before checking. `npm run verify` is the
+single Windows release-parity gate: version sync, type-check, tests, TypeScript
+build, compiled CLI smoke, and tray formatting, Clippy, check, and tests. CI runs
+the portable portions on every desktop change and the Windows tray gates separately.
+
 ## Branching policy

 > **Updated 2026-04-19:** moved from `main`-only to `main + dev`. See
@@ -485,11 +519,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 +563,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 +620,61 @@ 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
+### CLI / Windows systray release

-> **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).
+Use this when the standalone CLI, daemon, desktop tools, or Windows tray changes.
+Android and plugin versions do not need to move with it.
+
+First rewrite `CLI_RELEASE_NOTES.md` for the new CLI release and promote only
+CLI/tray-relevant changelog bullets into the release block. Then:
+
+```powershell
+git switch dev
+git pull --ff-only origin dev
+
+cd desktop
+npm version --no-git-tag-version 0.4.0-alpha.2
+npm run verify
+cd ..
+
+git add desktop/package.json desktop/package-lock.json desktop/src/version.ts `
+  desktop/tray/Cargo.toml desktop/tray/Cargo.lock CHANGELOG.md CLI_RELEASE_NOTES.md
+git commit -m "release(cli): cli-v0.4.0-alpha.2"
+git push origin dev
+
+# Open the release PR (dev -> main) and merge with --no-ff.
+# After merge, tag from main:
+git switch main
+git pull --ff-only origin main
+cd desktop
+npm run check:version-sync -- --expect 0.4.0-alpha.2
+cd ..
+git tag cli-v0.4.0-alpha.2
+git push origin cli-v0.4.0-alpha.2
+```
+
+The tag workflow rejects version drift and tags whose commit is not in
+`origin/main`, reruns CLI tests, builds all four standalone binaries, tests and
+packages the Windows tray, generates checksums, and publishes the GitHub Release.
+
+### 6. Play review and publishing behavior
+
+> **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 +721,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 +740,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,56 +1,24 @@
-# Hermes-Relay-Android v1.4.0
+# Hermes-Relay-Android v1.4.4

-**Release Date:** July 9, 2026
+**Release Date:** July 12, 2026

-**Since v1.3.0:** Realtime voice can keep a long task moving while you ask a quick follow-up, queue another long request, and deliver the finished answer in the selected realtime voice. Recovery is substantially stronger across backgrounding and route changes, model choices apply to the next session, and stale listening, thinking, reconnecting, and cancellation states no longer strand the voice screen. This release also adds model-catalog refresh, proactive notification rules, multi-device Bridge targeting, session-cleanup plumbing, and broad chat, startup, and security fixes.
-
-v1.4.0 is recommended for everyone. Realtime Agent remains experimental and pairs with relay plugin v1.4.0; the no-plugin Standard chat and Vanilla Hermes voice paths remain upstream-compatible.
-
---
-
-## Download
-
-**Installing on your phone?** Download **`hermes-relay-1.4.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).
-
-The other file, `hermes-relay-1.4.0-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.
-
---
+This patch adds Spanish across Android, clearer Relay diagnostics, safer translation maintenance, and a direct path from What’s New to the complete release history.

 ## Highlights

-### Realtime voice that finishes the job
+- Choose System default, English, Español, or 简体中文 in Settings → Appearance.
+- Refresh Diagnostics to see Relay plugin and protocol versions, capabilities, profile enablement, and when the check ran.
+- Diagnostic issue exports include sanitized app, Android, and device context.
+- What’s New opens the complete bundled release history and has large-text visual regression coverage.
+- CI detects translated catalogs whose canonical English source has changed.
+- Profile-scoped session operations and recovery no longer fall through to the default profile.

- **Keep talking while work runs.** Quick follow-ups can be answered while one Hermes task runs in the background, and another long request can wait in a bounded queue instead of being discarded.
- **Hear the authoritative answer.** Exact xAI delivery uses provider-native forced speech, finished-task answers can be replayed from the task chip, and TTS/text/notification fallbacks keep a result from disappearing when the realtime floor is unavailable.
- **Stronger route recovery.** Recorded turns wait for relay-confirmed resume, unacknowledged audio is replayed without starting a second Hermes run, and long-lived sessions get a fresh bounded retry window when the route actually drops. Retired sockets and sessions cannot overwrite a newer connection.
- **Clean lifecycle state.** Provider transcripts no longer impersonate active microphone capture; Stop settles local placeholders; exit detaches durable work while clearing session-owned UI; rejected, unacknowledged, or terminal cancels cannot leave an undismissable reconnecting task chip.
- **Your model and voice selection sticks.** Realtime Agent model and voice choices are scoped to the active connection/profile, survive restart, and apply when the next session opens.
+## Download

-### Chat and model management
-
- **Long turns stay alive.** Gateway submits use the server's long-turn window and idle-progress checks, avoiding premature transport fallback and duplicate turns.
- **Phone context reaches Hermes.** Voice-intent traces, card actions, and supported attachments now use payload channels the upstream server actually consumes; unsupported attachment paths report the gap instead of dropping it silently.
- **Refresh model catalogs on demand.** Chat and Manage can explicitly reload dynamic/custom provider models, while Manage keeps unconfigured providers visible with key-setup guidance.
- **Session cleanup groundwork.** The dashboard client supports export, prune preview/apply, archive, restore, and archived-session filtering for the Manage surface.
-
-### Phone automation
-
- **Notification triggers.** Opt-in rules can match app notifications and show a safe local "Ask Hermes?" prompt, with recent activity and a global pause switch.
- **Multi-device Bridge targeting.** Relay tools can select a paired phone, foldable, tablet, or explicit device ID instead of assuming one Android client.
-
-### Reliability and security
-
- **Older Android crash safety.** Collection calls that require Android 15 were removed from lower-API paths, and encrypted-storage dependencies are pinned to the compatible line.
- **Bad server addresses fail safely.** Malformed relay, media, session, voice, and chat URLs surface a normal connection error instead of closing the app.
- **Credential paths stay private.** Relay media delivery resolves symlinks and blocks credential, token, pairing, SSH, and system-config locations.
- **Cleaner voice failures.** Duplicate error surfaces are gone, fallback speech animates the voice UI, routine provider idle expiry opens fresh on the next turn, and fresh sessions emit one ready event.
-
---
+Install `hermes-relay-1.4.4-sideload-release.apk` directly, or use the conservative Google Play build. The `.aab` artifact is for Play Console and cannot be installed directly.

 ## Upgrade notes

- App-side release on **both** flavors. Realtime Agent background/recovery features require relay plugin **v1.4.0**; Standard chat and Vanilla Hermes voice continue to work against unmodified upstream Hermes.
- `appVersionCode` is **22**.
- Realtime Agent is still an experimental engine. Stable assistant speech remains available through **Hermes Chat + Voice Output**.
+- App version: **1.4.4** (versionCode **26**).
+- The new diagnostics contract requires a current Relay plugin for full detail; older plugins remain supported and report version unknown.
+- 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,22 +6,69 @@ For shipped work, see `DEVLOG.md`. For architectural decisions, see `docs/decisi

 ---

-## Active — next up (2026-07-07)
+## Multi-profile Phone/Threads routing — deferred (2026-07-12)

-Compaction-safe snapshot of where we are; details in the linked sections below.
+Android profile hot-swap and concurrent Gateway turns are separate from proactive
+Phone/Threads routing. The relay currently has one proactive subscriber and one
+shared inbound-reply queue drained by a single gateway adapter; enabling the phone
+platform in several profile gateways would let those pollers race for replies.

- **RELEASE IN PROGRESS — cut android-v1.4.0 + plugin-v1.4.0 (owner direction 2026-07-09).** Android is **1.4.0 / versionCode 22**, plugin is **1.4.0**, public release notes and store copy are synchronized, focused realtime recovery tests and Android lint are green, both signed release flavors build, the plugin package builds, and the current sideload APK is installed. Extended on-device recovery stress testing and the force-stop persistence check are explicitly deferred rather than release blockers:
-  1. Push `dev`, wait for its release-facing CI, merge `dev` -> `main` with a merge commit, then tag the shared merge tip as `plugin-v1.4.0` and `android-v1.4.0`. Plugin is a **MINOR** (it carries #165 native-loader + installer-venv, #170 doctor guardrails, #171 multi-device bridge, #178 dedup guard — not the 1.3.1 patch originally queued).
-  2. Verify both GitHub releases, their checksums/artifacts, and the Android signing summary.
-  3. Discard the 1.3.0 Play Console draft, inspect the uploaded 1.4.0 production draft, and start rollout deliberately.
- **Voice bugs being worked now** — see "Voice — on-device findings" below for full detail:
-  1. Background/resume turn stuck on `Listening...` / `Still working...` — **fixed in code; current APK installed; extended live stress test deferred** (2026-07-09).
-  2. Tool-call status pills/ordering + stuck "Thinking" — fixed in code; final visual ordering re-check remains.
-  3. Tap/static click between sentences (`RealtimePcmPlayer` boundary) — still needs an on-device audio repro before fixing.
- **Deferred post-release voice validation.** Repeat long-idle prewarm → record → background/foreground → route-change recovery, terminal retry exhaustion, repeated reopen/exit, cancel-without-ack, and force-stop persistence on physical devices. Capture both Android and relay traces for any recurrence; further recovery hardening or UX refinement may be required from those results.
- **Screen-wake-lock — SHIPPED (2026-07-07).** See "Voice — on-device findings" below.
- **Owner / Mizu — GitHub triage.** Close #64 as superseded, plus the queued open-issue comment/close/label batch (see "Open-issue resolution batch" below).
- **Voice exact-mode signoff — PASSED (2026-07-09 e2e).** Both `grok-voice-latest` and the pinned `grok-voice-think-fast-1.0` deferred on model-generated exact delivery, so xAI exact mode now bypasses inference through provider-native `force_message`. The full on-device background path spoke the authoritative answer through xAI with no fallback, and a pure-recall follow-up repeated it from history without a second Hermes route/run. OpenAI's separate out-of-band delivery spike remains on its next-RC roadmap. Full detail + the background-tasks-as-chat UX asks + remaining audio/UI gaps are below.
+Before advertising simultaneous multi-profile Phone/Threads support:
+
+- Add a stable `profile` / `profile_id` to proactive messages, replies, queued
+  outbound items, acknowledgements, notifications, and diagnostics.
+- Partition relay reply queues by profile; each profile gateway adapter must drain
+  only its own queue.
+- Key Android Threads by `(connection, profile, chat_id)` and route replies to the
+  originating profile even when another profile is visible.
+- Show per-profile Phone-channel presence separately from chat selection and the
+  server's sticky default profile.
+- Preserve one relay pairing across profiles; do not require one phone pairing per
+  agent.
+- Define migration/fallback behavior for older relay/plugin builds that omit profile
+  identity, including collision handling for identical `chat_id` values.
+- Add two-profile end-to-end coverage for simultaneous outbound pushes, interleaved
+  replies, offline buffering/reconnect, notification reply, and profile deletion or
+  rename while messages are queued.
+
+---
+
+## 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.

 ---

@@ -60,17 +107,15 @@ 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.
- **Titled background tasks.** Give each run a short title/label (first-line- or
-  model-derived) so it's identifiable in a list and in chat.
- **Chat entry on kickoff + result.** Drop a chat entry when a background task
-  starts ("Background task: <title> — running") and settle the result into the same
-  thread when it finishes. Don't leave it voice-only.
- **Results persisted in chat/history.** Show the background result cleanly in chat
-  history instead of discarding it after it's spoken — especially valuable for
-  follow-ups ("what did that say again?").
- **Detail view (expand on tap).** Tapping a background-task chat entry expands to
-  the full run detail like a normal chat message / tool timeline (reuse
-  `SubagentLane`). Same intent as v2 items 3+4 — build once.
+- **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
@@ -189,10 +234,15 @@ green. Needs relay deploy + APK install + live verify.
  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. Post-audit hardening remains:
-  provider-death TTS fallback on all three delivery paths, confirm alarm on all
-  three, barge-in preemption-as-text, blocklist answer-exemption, and
-  structured-answer prompt routing.
+  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
@@ -209,14 +259,6 @@ wrappers, Android `DiagnosticsLog` Voice category) is in good shape — it
 carried every live-round forensics session. Three gaps before the release
 candidate:

- **Run-dir retention + wav tap gating — DONE (2026-07-08).**
-  `run_retention_days` (default 14, 0 disables) sweeps JSONL + wav
-  artifacts at session-log creation; the render wav is a debug-only tap
-  (`debug_audio_tap`, default off) deleted after PCM streams.
- **Delivery-outcome rollup — DONE (2026-07-08).**
-  `python -m plugin.relay.realtime_agent.report [--days N] [--json]`
-  tallies provider-spoken vs fallback deliveries with reasons; new
-  `forced_summary_delivered` marker makes clean deliveries countable.
 - **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
@@ -228,16 +270,13 @@ 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
-live round and defaults to a superseded model. Key provider contrasts vs
+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.

- **Bump OpenAI realtime default to `gpt-realtime-2.1` — CODE DONE
-  (2026-07-08).** Default bumped, `2.1-mini` + rollback `2` in the model
-  options. Remaining: live connect on 2.1 (covered by the live-verify
-  item below).
 - **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` →
@@ -263,9 +302,6 @@ vs grok's flat $0.05/min.
  instructions, retiring `native_pending_delivery_note`. Success bar:
  provider history reads "done" (never "still running") after a promoted
  run, verified live.
- **Guardrail test: only `hermes_*` tools advertised on OpenAI
-  realtime.** Assert `session.update` never advertises hosted-MCP or
-  non-Hermes tools. Success bar: test fails if any such tool appears.
 - **(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.
@@ -277,9 +313,9 @@ 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. July also
-added 21 multilingual voices, speech tags, voice cloning, session
-resumption (30-min inactivity history retention), and a
+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
@@ -298,10 +334,12 @@ resumption (30-min inactivity history retention), and a
  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.
- **Surface the new voices + speech tags.** `provider_options.py` carries
-  a static grok voice list; refresh or fetch dynamically, and evaluate
-  speech tags against the enhanced-voice config contract. Success bar:
-  new voices selectable in Voice Settings against a live relay.
+- **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)

@@ -330,10 +368,6 @@ test.**
  (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.
- **Model claimed "I'll add that to the queue" — FIXED (relay, instruction).**
-  No queue exists (v2 item 2 not built). All handoff/busy instructions now
-  state "there is no task queue — do not offer to queue or claim to have
-  queued anything." True multi-task chip stacking remains the v2 queue item.
 - **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
@@ -395,9 +429,9 @@ cancels). Ranked next increments, in value-per-complexity order:
   (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** — 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).
+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
@@ -410,9 +444,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,
@@ -581,13 +615,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
@@ -597,9 +631,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.
@@ -610,8 +641,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.
@@ -760,8 +791,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)

@@ -769,15 +804,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

@@ -829,18 +876,19 @@ The client-side mitigations shipped (see DEVLOG 2026-06-27): the `updateSessions

 ### Thinking indicator — post-v1.3.0 follow-ups

-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; static when animations are off). Remaining:
+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:

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

 ## 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.
+- **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.
- **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.)
 - **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.

@@ -863,7 +911,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
@@ -872,33 +919,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

@@ -918,11 +957,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

@@ -1041,7 +1081,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.
@@ -1049,12 +1088,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.**~~ **Already shipped — stale entry (verified 2026-07-08).** The wiring landed in `0aa1b38` (2026-06-21, the same batch this list belongs to): `RelayApp` has a `LaunchedEffect(activeConnectionId, selectedProfile?.name)` calling `voiceViewModel.setVoicePrefsConnection(activeConnectionId)` *before* `onProfileChanged(...)`, and `applyVoicePrefsScope` pushes `(connectionId, profile)` into `VoicePreferencesRepository.setActiveScope`. Two connections with same-named profiles namespace separately.
- **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)
@@ -0,0 +1 @@
+info@axiom-labs.dev
@@ -1,6 +1 @@
-v1.4.0 — Realtime voice that finishes the job.
-
-• Long voice tasks can queue, keep running while you ask quick follow-ups, and deliver answers in the selected realtime voice.
-• Voice sessions recover more reliably after background or route changes and clear stale task states.
-• Refresh model catalogs on demand; add opt-in notification rules and multi-device Bridge targeting.
-• Safer startup, server-address handling, long chat turns, and credential media access.
+Spanish is now available throughout Hermes-Relay from Settings > Appearance. Diagnostics can refresh Relay plugin, protocol, capability, and profile status, and What’s New now opens the full release history. Translation freshness checks make future language updates safer.
@@ -0,0 +1 @@
+现在可在“设置”>“外观”中使用西班牙语。诊断页面可刷新 Relay 插件版本、协议、能力和配置文件状态；“更新内容”可直接打开完整版本历史。新增翻译新鲜度检查，便于安全扩展更多语言。
@@ -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,89 @@
 {
 "versions": [
+  {
+   "version": "1.4.4",
+   "title": "Spanish and clearer diagnostics",
+   "date": "2026-07-12",
+   "sections": [
+    {
+     "header": "Language that is ready to grow",
+     "bullets": [
+      "Use Spanish throughout the app from Settings → Appearance.",
+      "Translation freshness checks flag catalogs whenever the English source changes, while fluent verification remains tracked separately."
+     ]
+    },
+    {
+     "header": "Know what is connected",
+     "bullets": [
+      "Refresh Diagnostics to see the Relay plugin version, protocol, capability count, profile status, and last-check time.",
+      "Open the complete release history directly from the cleaner What’s New modal."
+     ]
+    }
+   ]
+  },
+  {
+   "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",
@@ -1,22 +1,9 @@
-v1.4.0 - Realtime voice that finishes the job
+v1.4.4 - Spanish and clearer diagnostics

-Voice
-* Keep talking while long work runs: quick follow-ups can be
-  answered, another long request can queue, and the finished
-  answer stays in your selected realtime voice.
-* Background and route changes recover more reliably. Stale
-  listening, thinking, reconnecting, and cancel states clear
-  instead of trapping the voice screen.
-* Pick a Realtime Agent model and voice per connection/profile;
-  the next session uses it and the choice survives restart.
+Language
+* Use Spanish throughout the app from Settings > Appearance.
+* Translation freshness checks flag catalogs when English source text changes.

-More control
-* Refresh provider model catalogs from Chat or Manage.
-* Opt-in notification rules can offer a local "Ask Hermes?"
-  action, and Bridge tools can target a specific Android device.
-
-Reliability
-* Long chats avoid premature transport fallback, phone context
-  reaches upstream Hermes on supported paths, malformed server
-  addresses fail safely, and credential files cannot be served
-  through relay media.
+Diagnostics and release history
+* Refresh relay diagnostics to see plugin, protocol, capability, and profile status.
+* Open the complete release history directly from What’s New.
@@ -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()

@@ -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 =
@@ -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 ?: "?"}.",
            )
        }
@@ -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,43 @@
+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"),
+    SPANISH("es"),
+    ;
+
+    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
+                "es" -> SPANISH
+                "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")
+    }
+}
@@ -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,21 @@
+package com.hermesandroid.relay.data
+
+/** User-facing availability of one Hermes profile from this connection. */
+enum class ProfilePresence {
+    /** Its dedicated gateway is running, so channels and proactive work can stay reachable. */
+    ONLINE,
+
+    /** The host can create/resume profile-bound sessions on demand, but no profile gateway is running. */
+    AVAILABLE,
+
+    /** The host/profile cannot currently be reached from this connection. */
+    OFFLINE,
+}
+
+object ProfilePresenceResolver {
+    fun resolve(profile: Profile, hostReachable: Boolean = true): ProfilePresence = when {
+        !hostReachable -> ProfilePresence.OFFLINE
+        profile.gatewayRunning -> ProfilePresence.ONLINE
+        else -> ProfilePresence.AVAILABLE
+    }
+}
@@ -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) }
@@ -374,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
+            }
+        }
+    }
 }
@@ -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
@@ -306,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",
            )
        }
@@ -332,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,
                )
@@ -342,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,
                )
@@ -368,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,
            )
@@ -379,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,
            )
@@ -408,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,
            )
        }
@@ -757,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")
@@ -884,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,
                )

@@ -944,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,
                )
@@ -963,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,
@@ -1012,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,
            )
@@ -1036,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,
                )
@@ -1049,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,
                )
@@ -1061,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
@@ -48,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 {
@@ -490,6 +495,54 @@ class RelayHttpClient(
        val error: String? = null,
    )

+    @Serializable
+    data class RelayProfileInfo(
+        val name: String,
+        @SerialName("relay_state") val relayState: String,
+    )
+
+    @Serializable
+    data class RelayInfo(
+        @SerialName("plugin_version") val pluginVersion: String = "",
+        @SerialName("protocol_version") val protocolVersion: Int = 0,
+        val capabilities: List<String> = emptyList(),
+        val profiles: List<RelayProfileInfo> = emptyList(),
+        val health: String = "unknown",
+    )
+
+    /** Fetch the installed plugin/protocol/profile capability contract. */
+    suspend fun fetchRelayInfo(): Result<RelayInfo?> = withContext(Dispatchers.IO) {
+        val relayUrl = relayUrlProvider()?.trim().orEmpty()
+        val token = sessionTokenProvider()
+        if (relayUrl.isEmpty() || token.isNullOrBlank()) {
+            return@withContext Result.failure(IllegalStateException("Relay is not configured and paired"))
+        }
+        val base = relayUrl
+            .replace(Regex("^wss://", RegexOption.IGNORE_CASE), "https://")
+            .replace(Regex("^ws://", RegexOption.IGNORE_CASE), "http://")
+            .trimEnd('/')
+        val url = try { "$base/relay/info".toHttpUrl() } catch (e: IllegalArgumentException) {
+            return@withContext Result.failure(IOException("Invalid relay URL: ${e.message}"))
+        }
+        val request = Request.Builder().url(url).get()
+            .header("Authorization", "Bearer $token")
+            .header("Accept", "application/json").build()
+        try {
+            okHttpClient.newBuilder().callTimeout(4, java.util.concurrent.TimeUnit.SECONDS).build()
+                .newCall(request).execute().use { response ->
+                    if (response.code == 404) return@withContext Result.success(null)
+                    if (!response.isSuccessful) return@withContext Result.failure(IOException("HTTP ${response.code}"))
+                    val body = response.body?.string().orEmpty()
+                    Result.success(body.takeIf { it.isNotBlank() }?.let {
+                        sessionsJson.decodeFromString(RelayInfo.serializer(), it)
+                    })
+                }
+        } catch (e: Exception) {
+            Log.w(TAG, "fetchRelayInfo failed: ${e.message}")
+            Result.failure(e)
+        }
+    }
+
    /**
     * Ask the relay whether a newer plugin release is available — it compares its
     * installed version against the latest `plugin-v*` GitHub release (cached an
@@ -904,7 +957,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,
            )
@@ -934,7 +987,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,
@@ -948,7 +1001,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,
@@ -965,7 +1018,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,
@@ -979,7 +1032,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,
@@ -993,7 +1046,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,
@@ -1010,7 +1063,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,
@@ -1023,7 +1076,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,
@@ -1034,7 +1087,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,
@@ -1045,7 +1098,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,
@@ -1056,7 +1109,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,
@@ -2,6 +2,7 @@ package com.hermesandroid.relay.network.relay

 import android.content.Context
 import android.util.Log
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.data.EnhancedVoiceOverrides
 import com.hermesandroid.relay.data.MessageRole
 import com.hermesandroid.relay.data.RealtimeConversationContextMessage
@@ -19,6 +20,7 @@ import kotlinx.coroutines.withTimeoutOrNull
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.addJsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.buildJsonArray
@@ -541,7 +543,7 @@ class RelayVoiceClient(
        getRealtimeProviderOptionsAt(
            providerId = providerId,
            pathPrefix = "/voice/realtime-agent/providers",
-            label = "Realtime agent provider options",
+            label = context.getString(R.string.voice_diag_agent_provider_options),
        )

    suspend fun validateRealtimeAgentProvider(
@@ -556,7 +558,7 @@ class RelayVoiceClient(
            voice = voice,
            sampleRate = sampleRate,
            pathPrefix = "/voice/realtime-agent/providers",
-            label = "Realtime agent provider validation",
+            label = context.getString(R.string.voice_diag_agent_provider_validation),
        )

    suspend fun updateRealtimeAgentConfig(
@@ -573,7 +575,7 @@ class RelayVoiceClient(
            voice = voice,
            sampleRate = sampleRate,
            path = "/voice/realtime-agent/config",
-            label = "Realtime agent config update",
+            label = context.getString(R.string.voice_diag_agent_config_update),
        )

    /**
@@ -878,7 +880,7 @@ class RelayVoiceClient(
                if (resumeAttempted.get()) {
                    onHandoff(
                        VoiceHandoffEvent(
-                            label = "Voice handoff failed",
+                            label = context.getString(R.string.voice_diag_handoff_failed),
                            detail = message,
                            active = false,
                        )
@@ -903,7 +905,7 @@ class RelayVoiceClient(
            if (resume) {
                onHandoff(
                    VoiceHandoffEvent(
-                        label = "Trying voice route",
+                        label = context.getString(R.string.voice_diag_trying_route),
                        route = routeLabel(currentWsBase),
                        active = true,
                    )
@@ -929,7 +931,7 @@ class RelayVoiceClient(
                        )
                        onHandoff(
                            VoiceHandoffEvent(
-                                label = "Resume sent",
+                                label = context.getString(R.string.voice_diag_resume_sent),
                                route = routeLabel(webSocket.request().url.toString()),
                                active = true,
                            )
@@ -1015,7 +1017,7 @@ class RelayVoiceClient(
                        requestRouteProbeOnce("Voice output", t.message, routeProbeRequested)
                        onHandoff(
                            VoiceHandoffEvent(
-                                label = "Waiting for route",
+                                label = context.getString(R.string.voice_diag_waiting_for_route),
                                detail = t.message,
                                route = routeLabel(webSocket.request().url.toString()),
                                active = true,
@@ -1029,7 +1031,7 @@ class RelayVoiceClient(
                            requestRouteProbeOnce("Voice output", t.message, routeProbeRequested)
                            onHandoff(
                                VoiceHandoffEvent(
-                                    label = "Connection changed",
+                                    label = context.getString(R.string.voice_diag_connection_changed),
                                    detail = t.message,
                                    route = routeLabel(webSocket.request().url.toString()),
                                    active = true,
@@ -1057,7 +1059,7 @@ class RelayVoiceClient(
                        requestRouteProbeOnce("Voice output", "Closed $code $reason", routeProbeRequested)
                        onHandoff(
                            VoiceHandoffEvent(
-                                label = "Waiting for route",
+                                label = context.getString(R.string.voice_diag_waiting_for_route),
                                detail = "Closed $code $reason",
                                route = routeLabel(webSocket.request().url.toString()),
                                active = true,
@@ -1075,7 +1077,7 @@ class RelayVoiceClient(
                            requestRouteProbeOnce("Voice output", "Closed $code $reason", routeProbeRequested)
                            onHandoff(
                                VoiceHandoffEvent(
-                                    label = "Connection changed",
+                                    label = context.getString(R.string.voice_diag_connection_changed),
                                    detail = "Closed $code $reason",
                                    route = routeLabel(webSocket.request().url.toString()),
                                    active = true,
@@ -2364,7 +2366,7 @@ class RelayVoiceClient(
                )
                onHandoff(
                    VoiceHandoffEvent(
-                        label = "Route changed",
+                        label = context.getString(R.string.voice_diag_route_changed),
                        previousRoute = routeLabel(previousWsBase),
                        nextRoute = routeLabel(nextWsBase),
                        route = routeLabel(nextWsBase),
@@ -2829,7 +2831,7 @@ class RelayVoiceClient(
        when (event.type) {
            "voice.session.resumed" -> onHandoff(
                VoiceHandoffEvent(
-                    label = "Voice reconnected",
+                    label = context.getString(R.string.voice_diag_reconnected),
                    detail = surface,
                    route = route,
                    active = false,
@@ -2839,7 +2841,7 @@ class RelayVoiceClient(
            )
            "voice.replay.started" -> onHandoff(
                VoiceHandoffEvent(
-                    label = "Replaying missed audio",
+                    label = context.getString(R.string.voice_diag_replaying_audio),
                    route = route,
                    active = true,
                    transitionRevision = transitionRevision,
@@ -2847,7 +2849,7 @@ class RelayVoiceClient(
            )
            "voice.replay.done" -> onHandoff(
                VoiceHandoffEvent(
-                    label = "Caught up",
+                    label = context.getString(R.string.voice_diag_caught_up),
                    detail = surface,
                    route = route,
                    active = false,
@@ -2857,7 +2859,7 @@ class RelayVoiceClient(
            )
            "voice.session.resume_failed" -> onHandoff(
                VoiceHandoffEvent(
-                    label = "Resume rejected",
+                    label = context.getString(R.string.voice_diag_resume_rejected),
                    detail = event.message,
                    route = route,
                    active = false,
@@ -2896,10 +2898,12 @@ class RelayVoiceClient(
            val resultPreviewValue = (obj["result_preview"] as? JsonPrimitive)?.contentOrNull
                ?: (obj["result"] as? JsonPrimitive)?.contentOrNull
            val reasonValue = (obj["reason"] as? JsonPrimitive)?.contentOrNull
+            val errorValue = (obj["error"] as? JsonPrimitive)?.contentOrNull
            RealtimeVoiceEvent(
                type = (obj["type"] as? JsonPrimitive)?.content ?: "unknown",
                source = (obj["source"] as? JsonPrimitive)?.contentOrNull,
                message = (obj["message"] as? JsonPrimitive)?.contentOrNull
+                    ?: errorValue
                    ?: reasonValue,
                reason = reasonValue,
                statusKey = (obj["status_key"] as? JsonPrimitive)?.contentOrNull,
@@ -2924,7 +2928,7 @@ class RelayVoiceClient(
                toolName = toolNameValue,
                toolCallId = toolCallIdValue,
                resultPreview = resultPreviewValue,
-                success = (obj["success"] as? JsonPrimitive)?.contentOrNull?.toBooleanStrictOrNull(),
+                success = realtimeEventSuccess(obj),
                audioBase64 = (obj["audio_base64"] as? JsonPrimitive)?.contentOrNull,
                byteCount = (obj["byte_count"] as? JsonPrimitive)?.intOrNull,
                sampleRate = (obj["sample_rate"] as? JsonPrimitive)?.intOrNull,
@@ -2937,7 +2941,8 @@ class RelayVoiceClient(
                tier = (obj["tier"] as? JsonPrimitive)?.contentOrNull,
                floor = (obj["floor"] as? JsonPrimitive)?.contentOrNull,
                activeToolName = (obj["active_tool_name"] as? JsonPrimitive)?.contentOrNull,
-                completedToolCount = (obj["completed_tool_count"] as? JsonPrimitive)?.intOrNull,
+                completedToolCount = (obj["completed_tool_count"] as? JsonPrimitive)?.intOrNull
+                    ?: (obj["tool_count"] as? JsonPrimitive)?.intOrNull,
                elapsedMs = (obj["elapsed_ms"] as? JsonPrimitive)?.longOrNull,
                queuedCount = (obj["queued_count"] as? JsonPrimitive)?.intOrNull,
                delivery = (obj["delivery"] as? JsonPrimitive)?.contentOrNull,
@@ -3330,6 +3335,10 @@ data class RealtimeVoiceEvent(
        get() = type == "voice.audio.delta" || type == "voice.output_audio.delta"
 }

+internal fun realtimeEventSuccess(obj: JsonObject): Boolean? =
+    (obj["success"] as? JsonPrimitive)?.contentOrNull?.toBooleanStrictOrNull()
+        ?: (obj["ok"] as? JsonPrimitive)?.contentOrNull?.toBooleanStrictOrNull()
+
 data class VoiceHandoffEvent(
    val label: String,
    val detail: String? = null,
@@ -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
@@ -242,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. */
@@ -366,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
@@ -863,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
@@ -2815,6 +2972,10 @@ class ChatHandler {
    fun setLastSentMessage(text: String) {
        _lastSentMessage.value = text
    }
+
+    fun clearLastSentMessage() {
+        _lastSentMessage.value = null
+    }
 }

 /**
@@ -25,6 +25,7 @@ import kotlinx.serialization.json.booleanOrNull
 import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.contentOrNull
 import kotlinx.serialization.json.intOrNull
+import kotlinx.serialization.json.longOrNull
 import kotlinx.serialization.json.put
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -32,7 +33,9 @@ import okhttp3.Response
 import okhttp3.WebSocket
 import okhttp3.WebSocketListener
 import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
+import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicLong

 /**
@@ -49,8 +52,9 @@ import java.util.concurrent.atomic.AtomicLong
 * in a background thread that keeps emitting on the id it was STARTED with,
 * regardless of WS state. So a mid-turn socket drop is recovered by
 * reconnecting the socket and KEEPING the in-flight session id (see
- * [attemptMidTurnRejoin]) — NOT by `session.resume`, which mints a brand-new
- * id + a fresh agent rebuilt from DB and would orphan the still-running turn.
+ * [attemptMidTurnRejoin]). Current upstream Hermes can also rebind a detached
+ * live session through `session.activate` / `session.resume`; the direct socket
+ * rejoin remains compatible with older gateways and avoids an extra RPC.
 * No background reconnect loops; a fresh send reconnects on demand.
 *
 * Auth: every connect attempt mints a FRESH single-use ws-ticket (30s TTL)
@@ -151,6 +155,8 @@ class GatewayChatClient(
        private const val CONNECT_FAILURE_COOLDOWN_MS = 5_000L
        private const val RATE_LIMIT_COOLDOWN_MS = 300_000L
        private const val CONNECT_ATTEMPTS = 2
+        private const val INBOUND_BIND_TIMEOUT_MS = 2_000L
+        private const val CANCELLED_TURN_SUBMIT_WAIT_MS = 2_000L

        /** Distinct socket-loss (flap) events per turn we'll try to recover from. */
        private const val MAX_TURN_REJOINS = 4
@@ -213,6 +219,14 @@ class GatewayChatClient(
    private val _connectionState = MutableStateFlow(GatewayConnectionState.Idle)
    val connectionState: StateFlow<GatewayConnectionState> = _connectionState.asStateFlow()

+    /**
+     * Per-socket feature probe for upstream's session-scoped `process.*` RPCs.
+     * Method-not-found marks the current socket unsupported; reconnecting resets
+     * this to [GatewayProcessCapability.Unknown] so a server upgrade is noticed.
+     */
+    private val _processCapability = MutableStateFlow(GatewayProcessCapability.Unknown)
+    val processCapability: StateFlow<GatewayProcessCapability> = _processCapability.asStateFlow()
+
    /**
     * Active personality the gateway is applying, as a config value ("none" when
     * the overlay is cleared, otherwise the personality name). Tracks the
@@ -286,6 +300,8 @@ class GatewayChatClient(
    private var readySignal: CompletableDeferred<Unit>? = null

    private val rpcId = AtomicLong(1)
+    /** Invalidates an older async prewarm when a newer session selection wins. */
+    private val prewarmRequestGeneration = AtomicLong(0)
    private val pendingRpcs = ConcurrentHashMap<Long, CompletableDeferred<JsonObject>>()

    /** Live (per-connection) session id ←→ the stored DB id it was resumed/created from. */
@@ -295,6 +311,10 @@ class GatewayChatClient(
    @Volatile
    private var storedSessionId: String? = null

+    /** Profile namespace that owns [liveSessionId]; stored IDs are not globally unique. */
+    @Volatile
+    private var liveSessionProfile: String? = null
+
    /**
     * Supplies the profile to bind each `session.create` / `session.resume` to —
     * the upstream `tui_gateway` opens that profile's HERMES_HOME/db and builds
@@ -331,6 +351,60 @@ class GatewayChatClient(
    @Volatile
    private var activeTurn: GatewayTurn? = null

+    /**
+     * Turns deliberately detached when the user switches profile/session.
+     * Upstream continues them server-side; retain the live→durable binding so
+     * their terminal event can trigger an authoritative history reconcile.
+     */
+    private val backgroundTurns = ConcurrentHashMap<String, BackgroundTurn>()
+
+    private data class BackgroundTurn(
+        val storedSessionId: String,
+    )
+
+    /**
+     * Upstream may emit the interrupted turn's tail and terminal event after
+     * `session.interrupt` returns. Keep a short exact-session tombstone so that
+     * tail cannot be mistaken for an unsolicited completion or complete a
+     * newly submitted turn. A same-session send briefly waits for this drain
+     * before `prompt.submit`; once a turn actually started, its tombstone stays
+     * until the required terminal event even when that submit wait elapses.
+     */
+    @Volatile
+    private var cancelledTurnDrain: CancelledTurnDrain? = null
+
+    private data class CancelledTurnDrain(
+        val storedSessionId: String,
+        val liveSessionId: String,
+        val submitWaitUntilMs: Long,
+        val terminalRequired: Boolean,
+    )
+
+    /**
+     * Creates UI callbacks when the server starts a turn that has no matching
+     * [sendTurn] call (for example a background-process completion). The
+     * provider is consulted only for an explicit `message.start` whose live
+     * session id exactly matches this client's active session.
+     */
+    @Volatile
+    private var unsolicitedTurnProvider: ((storedSessionId: String) -> GatewayInboundTurnRegistration?)? = null
+
+    /** Recover persisted events that may have completed while the socket was closed. */
+    @Volatile
+    private var coldPrewarmSessionReadyListener: ((storedSessionId: String) -> Unit)? = null
+
+    /** Exact-session completion observed without a bound live mapper. */
+    @Volatile
+    private var unmatchedTurnCompleteListener:
+        ((storedSessionId: String, expectedAssistantText: String?) -> Unit)? = null
+
+    /**
+     * Connection-level process listener. Unlike [GatewayTurnCallbacks], this is
+     * consulted even when there is no locally initiated [activeTurn].
+     */
+    @Volatile
+    private var processEventListener: ((GatewayProcessEvent) -> Unit)? = null
+
    /**
     * Which upload RPC name this socket understands — set after the first
     * successful upload so the legacy fallback is probed at most once per
@@ -411,7 +485,10 @@ class GatewayChatClient(
        // alive AND the requested session already live). A "cold" turn re-pays
        // ticket/ws/session — exactly the asymmetry vs always-connected desktop.
        val socketWarm = webSocket != null && readySignal?.isCompleted == true
-        val sessionWarm = liveSessionId != null && storedSessionId == sessionId && sessionId != null
+        val sessionWarm = liveSessionId != null &&
+            storedSessionId == sessionId &&
+            sessionId != null &&
+            liveSessionProfile == currentSessionProfile()
        turn.tracer.warm(socketWarm && sessionWarm)
        scope.launch {
            try {
@@ -428,6 +505,7 @@ class GatewayChatClient(
                    }
                }
                if (turn.cancelled) return@launch
+                if (!awaitCancelledTurnDrain(turn, storedSessionId)) return@launch
                activeTurn = turn
                turn.armWatchdog()
                val submitted = rpc(
@@ -457,7 +535,7 @@ class GatewayChatClient(
                        )
                        return@launch
                    }
-                    activeTurn = null
+                    if (activeTurn === turn) activeTurn = null
                    turn.disarmWatchdog()
                    throw GatewayPreflightException(
                        submitted.exceptionOrNull()?.message ?: "prompt.submit failed",
@@ -470,7 +548,7 @@ class GatewayChatClient(
                // read-the-absence exercise.
                Log.i(TAG, "Gateway turn submitted (session=$storedSessionId)")
            } catch (e: Exception) {
-                activeTurn = null
+                if (activeTurn === turn) activeTurn = null
                if (!turn.cancelled) {
                    Log.w(TAG, "Gateway preflight failed: ${e.message}")
                    turn.tracer.done("preflight-fail")
@@ -483,8 +561,29 @@ class GatewayChatClient(

    /** Drop the remembered session so the next send creates a fresh one. */
    fun clearSession() {
+        prewarmRequestGeneration.incrementAndGet()
        liveSessionId = null
        storedSessionId = null
+        liveSessionProfile = null
+        cancelledTurnDrain = null
+    }
+
+    /**
+     * Detach the visible callbacks without interrupting the server-side turn.
+     * This is the profile/session switch primitive: the old turn keeps running,
+     * while this client is free to create or resume another profile-bound
+     * session. Completion is reported through [unmatchedTurnCompleteListener]
+     * using the original durable id.
+     */
+    fun backgroundActiveTurn(): Boolean {
+        val turn = activeTurn?.takeIf { !it.ended } ?: return false
+        val liveId = liveSessionId ?: return false
+        val storedId = storedSessionId ?: return false
+        backgroundTurns[liveId] = BackgroundTurn(
+            storedSessionId = storedId,
+        )
+        turn.detach()
+        return true
    }

    /**
@@ -496,6 +595,10 @@ class GatewayChatClient(
     */
    fun hasActiveTurn(): Boolean = activeTurn?.ended == false

+    /** Live id to persist beside a durable stored id while a turn is active. */
+    fun currentLiveSessionId(storedId: String): String? =
+        liveSessionId?.takeIf { storedSessionId == storedId }
+
    /**
     * Point this client at a new dashboard route (e.g. LAN→Tailscale after a
     * sustained network change). If a turn is in flight, the current socket is
@@ -528,6 +631,30 @@ class GatewayChatClient(
        if (!enabled && !AppForegroundTracker.isForeground.value) scheduleBackgroundClose()
    }

+    /** Process polling must not silently undo the normal background socket close. */
+    fun isBackgroundProcessPollingAllowed(): Boolean =
+        AppForegroundTracker.isForeground.value || keepAliveInBackground
+
+    fun setUnsolicitedTurnProvider(
+        provider: ((storedSessionId: String) -> GatewayInboundTurnRegistration?)?,
+    ) {
+        unsolicitedTurnProvider = provider
+    }
+
+    fun setColdPrewarmSessionReadyListener(listener: ((storedSessionId: String) -> Unit)?) {
+        coldPrewarmSessionReadyListener = listener
+    }
+
+    fun setUnmatchedTurnCompleteListener(
+        listener: ((storedSessionId: String, expectedAssistantText: String?) -> Unit)?,
+    ) {
+        unmatchedTurnCompleteListener = listener
+    }
+
+    fun setProcessEventListener(listener: ((GatewayProcessEvent) -> Unit)?) {
+        processEventListener = listener
+    }
+
    /**
     * Establish the socket (and resume an existing session) ahead of the
     * user's first send, so a warm turn reaches first token in tens of ms
@@ -557,15 +684,150 @@ class GatewayChatClient(
     * session, so this path is the common case, not the edge case).
     */
    suspend fun prewarmAwait(storedSessionId: String?): Boolean {
+        val requestGeneration = prewarmRequestGeneration.incrementAndGet()
+        val requestedProfile = currentSessionProfile()
+        val wasLiveForRequestedSession = storedSessionId != null &&
+            liveSessionId != null &&
+            this.storedSessionId == storedSessionId &&
+            liveSessionProfile == requestedProfile
        try {
            connectMutex.withLock {
                ensureConnected()
-                if (storedSessionId != null) resumeForPrewarm(storedSessionId)
+                if (storedSessionId != null) {
+                    resumeForPrewarm(storedSessionId, requestedProfile, requestGeneration)
+                }
            }
        } catch (e: Exception) {
            Log.d(TAG, "Gateway prewarm skipped: ${e.message}")
        }
-        return liveSessionId != null
+        val sessionReady = storedSessionId != null &&
+            liveSessionId != null &&
+            this.storedSessionId == storedSessionId &&
+            liveSessionProfile == requestedProfile
+        if (!wasLiveForRequestedSession && sessionReady) {
+            callbackDispatcher {
+                coldPrewarmSessionReadyListener?.invoke(storedSessionId)
+            }
+        }
+        return sessionReady
+    }
+
+    /**
+     * Reattach callbacks to a turn that survived the Android UI/process.
+     *
+     * New Hermes gateways expose `session.activate`, which attaches the new
+     * WebSocket transport to the exact live id saved in the client checkpoint.
+     * If that id has already been reaped (or the method is unavailable), fall
+     * back to `session.resume` by durable session id. Its `running` + `inflight`
+     * fields decide whether a live mapper is installed or history should settle
+     * the turn instead.
+     */
+    suspend fun recoverTurn(
+        storedId: String,
+        preferredLiveId: String?,
+        callbacks: GatewayTurnCallbacks,
+    ): Result<GatewaySessionRecovery> = runCatching {
+        require(storedId.isNotBlank()) { "stored session id required" }
+        val requestedProfile = currentSessionProfile()
+        connectMutex.withLock {
+            val existing = activeTurn
+            if (existing != null && !existing.ended) {
+                throw GatewayRpcException("a gateway turn is already attached")
+            }
+            ensureConnected()
+
+            var response: JsonObject? = null
+            var boundTurn: GatewayTurn? = null
+
+            if (!preferredLiveId.isNullOrBlank()) {
+                // Bind before session.activate: upstream swaps the live session's
+                // transport during the RPC, so an immediate next delta must not
+                // fall through the active-turn gate while the ack is in flight.
+                liveSessionId = preferredLiveId
+                storedSessionId = storedId
+                liveSessionProfile = requestedProfile
+                boundTurn = GatewayTurn(
+                    callbacks = dispatchOn(callbacks),
+                    dedupeAdjacentMessageStarts = true,
+                ).also { turn ->
+                    turn.markRecoveredStarted()
+                    activeTurn = turn
+                }
+                val activated = rpc(
+                    "session.activate",
+                    buildJsonObject {
+                        put("session_id", preferredLiveId)
+                    },
+                )
+                response = activated.getOrNull()
+                if (response == null) {
+                    if (activeTurn === boundTurn) activeTurn = null
+                    boundTurn.detach()
+                    boundTurn = null
+                    Log.d(
+                        TAG,
+                        "Exact live-session activation unavailable; resuming durable session " +
+                            "(${activated.exceptionOrNull()?.message})",
+                    )
+                }
+            }
+
+            if (response == null) {
+                response = rpc(
+                    "session.resume",
+                    buildJsonObject {
+                        put("session_id", storedId)
+                        put("cols", DEFAULT_COLS)
+                        requestedProfile?.let { put("profile", it) }
+                    },
+                ).getOrElse { error -> throw error }
+            }
+
+            val recoveredLiveId = response.stringField("session_id")
+                ?: throw GatewayRpcException("session recovery returned no session_id")
+            liveSessionId = recoveredLiveId
+            storedSessionId = storedId
+            liveSessionProfile = requestedProfile
+            updateCancelledDrainLiveSession(storedId, recoveredLiveId)
+            (response["info"] as? JsonObject)?.let { applySessionInfo(it) }
+
+            val inflight = (response["inflight"] as? JsonObject)?.let { value ->
+                GatewayInflightTurn(
+                    user = value.stringField("user").orEmpty(),
+                    assistant = value.stringField("assistant").orEmpty(),
+                    streaming = value.booleanField("streaming") == true,
+                )
+            }
+            val running = response.booleanField("running") == true || inflight?.streaming == true
+
+            if (running) {
+                if (boundTurn == null || boundTurn.ended) {
+                    boundTurn = GatewayTurn(
+                        callbacks = dispatchOn(callbacks),
+                        dedupeAdjacentMessageStarts = true,
+                    ).also { turn ->
+                        turn.markRecoveredStarted()
+                        activeTurn = turn
+                    }
+                }
+                boundTurn.armWatchdog()
+            } else {
+                if (boundTurn != null) {
+                    if (activeTurn === boundTurn) activeTurn = null
+                    boundTurn.detach()
+                }
+                boundTurn = null
+            }
+
+            GatewaySessionRecovery(
+                storedSessionId = storedId,
+                liveSessionId = recoveredLiveId,
+                running = running,
+                status = response.stringField("status"),
+                inflight = inflight,
+                handle = boundTurn?.takeUnless { it.ended },
+            )
+        }
    }

    /**
@@ -669,6 +931,61 @@ class GatewayChatClient(
            .onSuccess { commandsCatalogCache = it }
    }

+    /**
+     * Fetch the current chat session's running and recently-finished background
+     * processes. Callers never provide a session id: this wrapper resolves and
+     * sends the exact LIVE gateway id, not the stored history id exposed to UI.
+     *
+     * A remembered stored session is resumed after a socket reconnect. A brand-
+     * new chat has no server process ownership yet and therefore returns an empty
+     * snapshot without creating an otherwise-empty session.
+     */
+    suspend fun listProcesses(): Result<List<GatewayProcess>> {
+        if (_processCapability.value == GatewayProcessCapability.Unsupported) {
+            return Result.failure(processFeatureUnsupported())
+        }
+        if (liveSessionId == null && storedSessionId == null) {
+            return Result.success(emptyList())
+        }
+        val sid = ensureLiveProcessSession().getOrElse { return Result.failure(it) }
+        val result = rpc(
+            "process.list",
+            buildJsonObject { put("session_id", sid) },
+        )
+        if (result.isFailure) {
+            markProcessUnsupportedIfNeeded(result.exceptionOrNull())
+            return Result.failure(result.exceptionOrNull() ?: GatewayRpcException("process.list failed"))
+        }
+        _processCapability.value = GatewayProcessCapability.Supported
+        return Result.success(
+            ((result.getOrThrow()["processes"] as? JsonArray).orEmpty()).mapNotNull(::parseGatewayProcess),
+        )
+    }
+
+    /** Stop one process owned by the current live gateway session. */
+    suspend fun killProcess(processId: String): Result<Unit> {
+        if (processId.isBlank()) {
+            return Result.failure(GatewayRpcException("process id required"))
+        }
+        if (_processCapability.value == GatewayProcessCapability.Unsupported) {
+            return Result.failure(processFeatureUnsupported())
+        }
+        val sid = ensureLiveProcessSession().getOrElse { return Result.failure(it) }
+        val result = rpc(
+            "process.kill",
+            buildJsonObject {
+                put("session_id", sid)
+                put("process_id", processId)
+            },
+        )
+        if (result.isFailure) {
+            markProcessUnsupportedIfNeeded(result.exceptionOrNull())
+            return Result.failure(result.exceptionOrNull() ?: GatewayRpcException("process.kill failed"))
+        }
+        _processCapability.value = GatewayProcessCapability.Supported
+        return Result.success(Unit)
+    }
+
    /**
     * Run a full slash command line (`slash.exec {session_id, command}`) on
     * the live session. Returns the raw result object; failures carry the
@@ -911,6 +1228,12 @@ class GatewayChatClient(
    fun shutdown() {
        activeTurn?.cancel()
        activeTurn = null
+        backgroundTurns.clear()
+        cancelledTurnDrain = null
+        unsolicitedTurnProvider = null
+        coldPrewarmSessionReadyListener = null
+        unmatchedTurnCompleteListener = null
+        processEventListener = null
        closeSocket("client shutdown")
        backgroundCloseJob?.cancel()
        // Stop the foreground collector — a replaced client must not keep
@@ -951,6 +1274,7 @@ class GatewayChatClient(

    private suspend fun connectOnce() {
        val connectStart = System.nanoTime()
+        _processCapability.value = GatewayProcessCapability.Unknown
        _connectionState.value = GatewayConnectionState.MintingTicket
        val ticket = dashboardClient.requestWsTicket().getOrElse { e ->
            throw GatewayConnectAttemptException("ws-ticket mint failed: ${e.message}")
@@ -989,28 +1313,39 @@ class GatewayChatClient(
     * (no [GatewayTurn] context). Failure is silent — the real send's
     * [ensureSession] will resume-or-create properly.
     */
-    private suspend fun resumeForPrewarm(storedId: String) {
-        // Never resume while a turn is in flight: a resume mints a NEW live
-        // session id, and the running turn's events (still tagged with the
-        // OLD id) would then be filtered out as "foreign" — orphaning the
-        // turn and letting a stale reconcile repaint an earlier reply. This
-        // is the screen-return (prewarm) variant of the same hazard the
-        // mid-turn rejoin avoids by NOT resuming.
+    private suspend fun resumeForPrewarm(
+        storedId: String,
+        requestedProfile: String?,
+        requestGeneration: Long,
+    ) {
+        // Never change session binding while this client already owns a live
+        // mapper. Current upstream may reuse the same live session, while older
+        // builds mint a new id; either way the existing mapper owns recovery.
        if (activeTurn != null) return
-        if (liveSessionId != null && storedSessionId == storedId) return
+        if (
+            liveSessionId != null &&
+            storedSessionId == storedId &&
+            liveSessionProfile == requestedProfile
+        ) return
        val resumed = rpc(
            "session.resume",
            buildJsonObject {
                put("session_id", storedId)
                put("cols", DEFAULT_COLS)
-                currentSessionProfile()?.let { put("profile", it) }
+                requestedProfile?.let { put("profile", it) }
            },
        )
        val result = resumed.getOrNull()
        val live = result?.stringField("session_id")
-        if (live != null) {
+        if (
+            live != null &&
+            activeTurn == null &&
+            prewarmRequestGeneration.get() == requestGeneration
+        ) {
            liveSessionId = live
            storedSessionId = storedId
+            liveSessionProfile = requestedProfile
+            updateCancelledDrainLiveSession(storedId, live)
            // Paint the session's real model/provider/effort/etc NOW from the
            // resume result's embedded `info` (same shape session.info carries),
            // so a reopened session shows its ACTUAL model immediately instead of
@@ -1055,13 +1390,84 @@ class GatewayChatClient(
        }
    }

+    /** Resolve a process RPC against the exact live id, resuming after reconnect when possible. */
+    private suspend fun ensureLiveProcessSession(): Result<String> {
+        val requestedProfile = currentSessionProfile()
+        liveSessionId?.takeIf { liveSessionProfile == requestedProfile }
+            ?.let { return Result.success(it) }
+        val rememberedStoredId = storedSessionId
+            ?: return Result.failure(GatewayRpcException("no live session"))
+        val requestGeneration = prewarmRequestGeneration.incrementAndGet()
+        return try {
+            connectMutex.withLock {
+                ensureConnected()
+                if (liveSessionId == null || liveSessionProfile != requestedProfile) {
+                    resumeForPrewarm(rememberedStoredId, requestedProfile, requestGeneration)
+                }
+            }
+            val resumedLiveId = liveSessionId
+            if (
+                resumedLiveId != null &&
+                storedSessionId == rememberedStoredId &&
+                liveSessionProfile == requestedProfile
+            ) {
+                Result.success(resumedLiveId)
+            } else {
+                Result.failure(GatewayRpcException("could not resume live session"))
+            }
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
+
+    private fun parseGatewayProcess(element: kotlinx.serialization.json.JsonElement): GatewayProcess? {
+        val process = element as? JsonObject ?: return null
+        val id = process.stringField("session_id")?.takeIf { it.isNotBlank() } ?: return null
+        return GatewayProcess(
+            id = id,
+            command = process.stringField("command").orEmpty(),
+            cwd = process.stringField("cwd"),
+            pid = (process["pid"] as? JsonPrimitive)?.longOrNull,
+            startedAt = process.stringField("started_at"),
+            uptimeSeconds = (process["uptime_seconds"] as? JsonPrimitive)?.longOrNull ?: 0L,
+            status = process.stringField("status") ?: "unknown",
+            outputPreview = process.stringField("output_preview")?.takeIf { it.isNotEmpty() },
+            outputTail = process.stringField("output_tail")?.takeIf { it.isNotEmpty() },
+            exitCode = (process["exit_code"] as? JsonPrimitive)?.intOrNull,
+            detached = (process["detached"] as? JsonPrimitive)?.booleanOrNull ?: false,
+            notifyOnComplete = (process["notify_on_complete"] as? JsonPrimitive)?.booleanOrNull ?: false,
+            sessionScoped = (process["session_scoped"] as? JsonPrimitive)?.booleanOrNull ?: false,
+            watchPatterns = (process["watch_patterns"] as? JsonArray).orEmpty()
+                .mapNotNull { (it as? JsonPrimitive)?.contentOrNull },
+            watchHit = (process["watch_hit"] as? JsonPrimitive)?.booleanOrNull ?: false,
+        )
+    }
+
+    private fun markProcessUnsupportedIfNeeded(error: Throwable?) {
+        if (error.isMethodNotFound()) {
+            _processCapability.value = GatewayProcessCapability.Unsupported
+        }
+    }
+
+    private fun processFeatureUnsupported(): GatewayRpcException =
+        GatewayRpcException("background process RPCs are not supported by this gateway", JSONRPC_METHOD_NOT_FOUND)
+
    /** Must hold [connectMutex]. Resolves [liveSessionId] for the requested stored id. */
    private suspend fun ensureSession(
        requestedStoredId: String?,
        newSessionTitle: String?,
        turn: GatewayTurn,
    ) {
-        if (liveSessionId != null && storedSessionId == requestedStoredId && requestedStoredId != null) {
+        val requestedProfile = currentSessionProfile()
+        if (requestedStoredId != null && requestedStoredId != storedSessionId) {
+            cancelledTurnDrain = null
+        }
+        if (
+            liveSessionId != null &&
+            storedSessionId == requestedStoredId &&
+            requestedStoredId != null &&
+            liveSessionProfile == requestedProfile
+        ) {
            return
        }

@@ -1071,7 +1477,7 @@ class GatewayChatClient(
                buildJsonObject {
                    put("session_id", requestedStoredId)
                    put("cols", DEFAULT_COLS)
-                    currentSessionProfile()?.let { put("profile", it) }
+                    requestedProfile?.let { put("profile", it) }
                },
            )
            val result = resumed.getOrNull()
@@ -1079,6 +1485,8 @@ class GatewayChatClient(
            if (live != null) {
                liveSessionId = live
                storedSessionId = requestedStoredId
+                liveSessionProfile = requestedProfile
+                updateCancelledDrainLiveSession(requestedStoredId, live)
                (result["info"] as? JsonObject)?.let { applySessionInfo(it) }
                return
            }
@@ -1094,7 +1502,7 @@ class GatewayChatClient(
            buildJsonObject {
                put("cols", DEFAULT_COLS)
                if (!newSessionTitle.isNullOrBlank()) put("title", newSessionTitle)
-                currentSessionProfile()?.let { put("profile", it) }
+                requestedProfile?.let { put("profile", it) }
                // Bind the in-chat overrides to the new session as its
                // per-session overrides. Upstream tui_gateway session.create
                // reads `model`/`provider` (→ model_override), `reasoning_effort`
@@ -1121,6 +1529,8 @@ class GatewayChatClient(
        val stored = created.stringField("stored_session_id") ?: live
        liveSessionId = live
        storedSessionId = stored
+        liveSessionProfile = requestedProfile
+        if (cancelledTurnDrain?.storedSessionId != stored) cancelledTurnDrain = null
        turn.callbacks.onSessionId(stored)
    }

@@ -1201,7 +1611,7 @@ class GatewayChatClient(
        // delta types log length only, everything else logs a payload
        // excerpt so on-device diagnosis doesn't read absences.
        when (type) {
-            "message.delta", "reasoning.delta", "thinking.delta" ->
+            "message.delta", "reasoning.delta", "thinking.delta", "agent.terminal.output" ->
                Log.d(TAG, "GW ← $type (${payload?.toString()?.length ?: 0} chars)")
            else ->
                Log.d(TAG, "GW ← $type | ${payload?.toString()?.take(300) ?: "{}"}")
@@ -1212,6 +1622,26 @@ class GatewayChatClient(
            return
        }

+        // A profile/session switch may leave an upstream turn running while a
+        // different profile becomes visible. Its events must never paint the
+        // new transcript, but the terminal event still needs to reconcile the
+        // original durable session so the answer is waiting when the user
+        // switches back.
+        val backgroundTurn = eventSessionId?.let(backgroundTurns::get)
+        if (backgroundTurn != null) {
+            if (type == "message.complete") {
+                backgroundTurns.remove(eventSessionId, backgroundTurn)
+                val expectedText = payload?.stringField("text")
+                callbackDispatcher {
+                    unmatchedTurnCompleteListener?.invoke(
+                        backgroundTurn.storedSessionId,
+                        expectedText,
+                    )
+                }
+            }
+            return
+        }
+
        // `session.info` is connection-level (personality / model / context
        // usage), emitted on a config change even with no turn in flight. Capture
        // the active personality here — for our own session only — so a
@@ -1226,18 +1656,110 @@ class GatewayChatClient(
            payload?.let { applySessionInfo(it) }
        }

-        val turn = activeTurn ?: return
        // Foreign-session events (another client's chat on the same gateway) are not ours.
        if (eventSessionId != null && liveSessionId != null && eventSessionId != liveSessionId) {
            return
        }
+        dispatchProcessEvent(type, payload, eventSessionId)
+        if (consumeCancelledTurnEvent(type, eventSessionId)) return
+        var turn = activeTurn
+        if (turn == null && type == "message.start") {
+            // Unsolicited turns are accepted only with an explicit exact live-
+            // session match. This gateway stream is process-wide; treating a
+            // missing id as ours would leak another desktop tab's response.
+            val liveId = liveSessionId
+            val storedId = storedSessionId
+            if (!eventSessionId.isNullOrBlank() &&
+                eventSessionId == liveId &&
+                !storedId.isNullOrBlank()
+            ) {
+                val registration = unsolicitedTurnProvider?.invoke(storedId)
+                if (registration != null) {
+                    val inboundTurn = GatewayTurn(
+                        callbacks = dispatchOn(registration.callbacks),
+                        dedupeAdjacentMessageStarts = true,
+                    )
+                    if (bindInboundTurn(registration, inboundTurn)) {
+                        turn = inboundTurn
+                        activeTurn = inboundTurn
+                        inboundTurn.armWatchdog()
+                        Log.i(TAG, "Accepted unsolicited gateway turn for session=$storedId")
+                    } else {
+                        Log.i(TAG, "Deferred unsolicited gateway turn for session=$storedId")
+                    }
+                }
+            }
+        }
+        if (turn == null) {
+            // A foreground SSE/realtime turn may already own Chat, or the
+            // socket may have reconnected after message.start. The exact
+            // terminal event is still authoritative and persisted upstream;
+            // recover it through history once the UI becomes idle.
+            val storedId = storedSessionId
+            if (type == "message.complete" &&
+                !eventSessionId.isNullOrBlank() &&
+                eventSessionId == liveSessionId &&
+                !storedId.isNullOrBlank()
+            ) {
+                val expectedText = payload?.stringField("text")
+                callbackDispatcher {
+                    unmatchedTurnCompleteListener?.invoke(storedId, expectedText)
+                }
+            }
+            return
+        }
        turn.onEvent(type, payload)
        if (turn.ended) {
-            activeTurn = null
+            if (activeTurn === turn) activeTurn = null
            if (AppForegroundTracker.isForeground.value.not()) scheduleBackgroundClose()
        }
    }

+    /**
+     * Deliver session-scoped process events before the active-turn gate. The
+     * gateway socket is process-wide, so an exact non-blank live id match is
+     * required; missing/foreign ids must never leak another window's process.
+     */
+    private fun dispatchProcessEvent(type: String, payload: JsonObject?, eventSessionId: String?) {
+        val liveId = liveSessionId ?: return
+        if (eventSessionId.isNullOrBlank() || eventSessionId != liveId) return
+        val event = when (type) {
+            "tool.complete" -> when (payload?.stringField("name")) {
+                "terminal", "process" -> GatewayProcessEvent.Invalidated(
+                    GatewayProcessEvent.Trigger.TOOL_COMPLETE,
+                )
+                else -> null
+            }
+            "status.update" -> if (payload?.stringField("kind") == "process") {
+                GatewayProcessEvent.Invalidated(GatewayProcessEvent.Trigger.STATUS_UPDATE)
+            } else {
+                null
+            }
+            // Some upstream tool paths complete a background terminal launch
+            // without emitting tool.start/tool.complete to this UI session.
+            // The assistant still closes the initiating turn normally, so use
+            // that exact-session boundary as a cheap authoritative discovery
+            // fallback. process.list then starts the running-only poller.
+            "message.complete" -> GatewayProcessEvent.Invalidated(
+                GatewayProcessEvent.Trigger.MESSAGE_COMPLETE,
+            )
+            "agent.terminal.output" -> {
+                val processId = payload?.stringField("process_id")
+                val chunk = payload?.stringField("chunk")
+                if (!processId.isNullOrBlank() && chunk != null) {
+                    GatewayProcessEvent.Output(processId, chunk)
+                } else {
+                    null
+                }
+            }
+            "terminal.close" -> payload?.stringField("process_id")
+                ?.takeIf { it.isNotBlank() }
+                ?.let { GatewayProcessEvent.TerminalClosed(it) }
+            else -> null
+        } ?: return
+        callbackDispatcher { processEventListener?.invoke(event) }
+    }
+
    private fun onSocketDown(reason: String) {
        Log.i(TAG, "Gateway socket down ($reason)")
        // Capture the in-flight session id BEFORE clearing it — the mid-turn
@@ -1249,6 +1771,7 @@ class GatewayChatClient(
        liveSessionId = null
        attachMethodForSocket = null
        commandsCatalogCache = null
+        _processCapability.value = GatewayProcessCapability.Unknown
        _connectionState.value = GatewayConnectionState.Idle
        pendingRpcs.values.forEach {
            it.completeExceptionally(GatewayRpcException("gateway connection lost"))
@@ -1256,7 +1779,7 @@ class GatewayChatClient(
        pendingRpcs.clear()
        val turn = activeTurn ?: return
        if (turn.ended) {
-            activeTurn = null
+            if (activeTurn === turn) activeTurn = null
            return
        }
        // A rejoin already owns recovery — a connect attempt failing inside
@@ -1276,7 +1799,7 @@ class GatewayChatClient(
                }
            }
        } else {
-            activeTurn = null
+            if (activeTurn === turn) activeTurn = null
            turn.failFromTransport("Connection to the gateway was lost")
        }
    }
@@ -1288,13 +1811,10 @@ class GatewayChatClient(
     * Recover an in-flight turn after a mid-turn socket loss by reconnecting
     * the SOCKET ONLY and keeping [preservedLiveId] as the live session id.
     *
-     * Why not `session.resume`: upstream resume mints a brand-new session id
-     * and rebuilds a fresh agent from persisted DB history — it does NOT
-     * reattach to the running turn's thread, which keeps emitting on the OLD
-     * id over the shared gateway stream. Resuming would point our event filter
-     * at the wrong id and orphan the turn (the server finishes it and the
-     * answer is dropped — confirmed on-device). A bare reconnect lets the tail
-     * — including the final `message.complete` — keep matching this turn.
+     * A bare reconnect lets the tail — including the final
+     * `message.complete` — keep matching without another RPC. Current upstream
+     * can rebind live sessions too, but older builds cannot, so this remains the
+     * lowest-common-denominator same-client recovery path.
     *
     * Retries with backoff for up to [midTurnRejoinWindowMs] so a multi-second
     * radio blip doesn't abandon the turn. Events emitted while the socket was
@@ -1354,6 +1874,7 @@ class GatewayChatClient(
        liveSessionId = null
        attachMethodForSocket = null
        commandsCatalogCache = null
+        _processCapability.value = GatewayProcessCapability.Unknown
        _connectionState.value = GatewayConnectionState.Idle
    }

@@ -1499,8 +2020,9 @@ class GatewayChatClient(

    private inner class GatewayTurn(
        val callbacks: GatewayTurnCallbacks,
+        dedupeAdjacentMessageStarts: Boolean = false,
    ) : ActiveTurnHandle {
-        private val mapper = GatewayEventMapper(callbacks)
+        private val mapper = GatewayEventMapper(callbacks, dedupeAdjacentMessageStarts)

        /** t0 = construction ≈ sendTurn entry (the moment the user sent). */
        val tracer = TurnLatencyTracer("gateway")
@@ -1564,6 +2086,11 @@ class GatewayChatClient(
            watchdog = null
        }

+        /** Recovery attaches after the original prompt.submit, so it is already started. */
+        fun markRecoveredStarted() {
+            started = true
+        }
+
        /** Transport-level failure after submit — surface as a stream error once. */
        fun failFromTransport(message: String) {
            disarmWatchdog()
@@ -1578,10 +2105,21 @@ class GatewayChatClient(
            cancelled = true
            disarmWatchdog()
            tracer.done("cancelled")
-            if (activeTurn === this) activeTurn = null
+            if (activeTurn === this) {
+                armCancelledTurnDrain(terminalRequired = started)
+                activeTurn = null
+            }
            interruptServerSide()
        }

+        override fun detach() {
+            if (ended) return
+            cancelled = true
+            disarmWatchdog()
+            tracer.done("detached")
+            if (activeTurn === this) activeTurn = null
+        }
+
        private fun interruptServerSide() {
            val sid = liveSessionId ?: return
            scope.launch {
@@ -1592,9 +2130,104 @@ class GatewayChatClient(
        }
    }

+    private fun armCancelledTurnDrain(terminalRequired: Boolean) {
+        val storedId = storedSessionId ?: return
+        val liveId = liveSessionId ?: return
+        cancelledTurnDrain = CancelledTurnDrain(
+            storedSessionId = storedId,
+            liveSessionId = liveId,
+            submitWaitUntilMs = System.currentTimeMillis() + CANCELLED_TURN_SUBMIT_WAIT_MS,
+            terminalRequired = terminalRequired,
+        )
+    }
+
+    private fun updateCancelledDrainLiveSession(storedId: String, liveId: String) {
+        val drain = cancelledTurnDrain ?: return
+        if (drain.storedSessionId == storedId) {
+            cancelledTurnDrain = drain.copy(liveSessionId = liveId)
+        }
+    }
+
+    /** Ignore the canceled turn's exact-session tail through its terminal event. */
+    private fun consumeCancelledTurnEvent(type: String, eventSessionId: String?): Boolean {
+        val drain = cancelledTurnDrain ?: return false
+        if (!drain.terminalRequired && System.currentTimeMillis() >= drain.submitWaitUntilMs) {
+            if (cancelledTurnDrain === drain) cancelledTurnDrain = null
+            return false
+        }
+        if (eventSessionId != drain.liveSessionId) return false
+        if (type == "message.complete" || type == "error") {
+            if (cancelledTurnDrain === drain) cancelledTurnDrain = null
+        }
+        Log.d(TAG, "Ignored canceled gateway turn event: $type")
+        return true
+    }
+
+    /**
+     * Preserve same-session event ordering after Stop. The interrupt terminal
+     * normally drains immediately. The wait is bounded so a slow cooperative
+     * interrupt does not indefinitely delay the next submit, but a started
+     * turn's tombstone remains until its terminal event and continues draining
+     * the old tail in front of the server-serialized next prompt.
+     */
+    private suspend fun awaitCancelledTurnDrain(
+        turn: GatewayTurn,
+        targetStoredSessionId: String?,
+    ): Boolean {
+        while (!turn.cancelled) {
+            val drain = cancelledTurnDrain ?: return true
+            if (drain.storedSessionId != targetStoredSessionId) return true
+            if (System.currentTimeMillis() >= drain.submitWaitUntilMs) {
+                if (!drain.terminalRequired && cancelledTurnDrain === drain) {
+                    cancelledTurnDrain = null
+                }
+                return true
+            }
+            delay(25L)
+        }
+        return false
+    }
+
+    /**
+     * Serialize inbound ownership onto the callback/main dispatcher before any
+     * mapper callback is posted. A local SSE turn can otherwise start between
+     * the socket event and UI binding and lose its cancellable handle.
+     */
+    private fun bindInboundTurn(
+        registration: GatewayInboundTurnRegistration,
+        turn: GatewayTurn,
+    ): Boolean {
+        val pending = AtomicBoolean(true)
+        val completed = CountDownLatch(1)
+        var accepted = false
+        try {
+            callbackDispatcher {
+                try {
+                    if (pending.compareAndSet(true, false)) {
+                        accepted = registration.onHandle(turn)
+                    }
+                } finally {
+                    completed.countDown()
+                }
+            }
+        } catch (e: Exception) {
+            Log.w(TAG, "Inbound turn dispatcher rejected callback", e)
+            return false
+        }
+        if (!completed.await(INBOUND_BIND_TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
+            // If the callback has not started, expire it so a late main-thread
+            // delivery cannot bind a handle the client already discarded. If
+            // it has started, wait for that short ownership check to finish.
+            if (pending.compareAndSet(true, false)) return false
+            completed.await()
+        }
+        return accepted
+    }
+
    /** Wrap callbacks so every invocation lands on the callback dispatcher (main thread). */
    private fun dispatchOn(callbacks: GatewayTurnCallbacks) = GatewayTurnCallbacks(
        onSessionId = { v -> callbackDispatcher { callbacks.onSessionId(v) } },
+        onStart = { callbackDispatcher { callbacks.onStart() } },
        onTextDelta = { v -> callbackDispatcher { callbacks.onTextDelta(v) } },
        onThinkingDelta = { v -> callbackDispatcher { callbacks.onThinkingDelta(v) } },
        onToolCallStart = { a, b -> callbackDispatcher { callbacks.onToolCallStart(a, b) } },
@@ -1664,3 +2297,6 @@ private fun Throwable?.isMethodNotFound(): Boolean {

 private fun JsonObject.stringField(key: String): String? =
    (get(key) as? JsonPrimitive)?.contentOrNull
+
+private fun JsonObject.booleanField(key: String): Boolean? =
+    (get(key) as? JsonPrimitive)?.booleanOrNull
@@ -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,
+)
@@ -235,7 +235,7 @@ object NotificationTriggerPromptNotifier {
        val pendingFlags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
        val tapPending = PendingIntent.getActivity(context, notificationId(entry), tapIntent, pendingFlags)

-        val title = "Ask Hermes about this?"
+        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()}"
@@ -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
@@ -1066,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 ->
            {
@@ -1343,6 +1353,7 @@ fun RelayApp() {
                connectionId = connection.id,
                dashboardUrl = effectiveDashboardUrl,
                cacheDir = hydrateContext.cacheDir,
+                context = hydrateContext,
            )
        }

@@ -1350,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)
            }
        }

@@ -1576,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,
@@ -1587,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,
@@ -1595,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) {
@@ -1714,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,
@@ -1754,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) {
@@ -1792,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 = {
@@ -1811,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) {
@@ -1843,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())
@@ -1856,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())
@@ -1870,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)
@@ -1904,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)
@@ -2034,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 {
@@ -2157,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())
@@ -2233,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,
                                        )
                                    }
                            }
@@ -2255,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)
                                }
                            }
                        },
@@ -2429,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())
@@ -2559,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))
            }
        }
    )
@@ -1,13 +1,18 @@
 package com.hermesandroid.relay.ui.components

+import androidx.compose.foundation.background
 import androidx.compose.foundation.horizontalScroll
-import com.hermesandroid.relay.ui.theme.LocalBrand
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.requiredWidth
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
@@ -26,8 +31,13 @@ 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.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.semantics.CollectionInfo
+import androidx.compose.ui.semantics.collectionInfo
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.TextLinkStyles
@@ -38,18 +48,33 @@ import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import kotlinx.coroutines.delay
+import androidx.compose.ui.unit.times
 import com.mikepenz.markdown.compose.components.markdownComponents
+import com.mikepenz.markdown.compose.components.MarkdownComponentModel
+import com.mikepenz.markdown.compose.LocalMarkdownColors
+import com.mikepenz.markdown.compose.LocalMarkdownDimens
+import com.mikepenz.markdown.compose.elements.MarkdownDivider
 import com.mikepenz.markdown.compose.elements.MarkdownHighlightedCodeBlock
 import com.mikepenz.markdown.compose.elements.MarkdownHighlightedCodeFence
+import com.mikepenz.markdown.compose.elements.MarkdownTable
+import com.mikepenz.markdown.compose.elements.MarkdownTableHeader
+import com.mikepenz.markdown.compose.elements.MarkdownTableRow
 import com.mikepenz.markdown.compose.extendedspans.ExtendedSpans
 import com.mikepenz.markdown.compose.extendedspans.RoundedCornerSpanPainter
 import com.mikepenz.markdown.m3.Markdown
 import com.mikepenz.markdown.m3.markdownColor
 import com.mikepenz.markdown.m3.markdownTypography
+import com.mikepenz.markdown.model.markdownDimens
 import com.mikepenz.markdown.model.markdownExtendedSpans
+import com.hermesandroid.relay.ui.theme.LocalBrand
 import dev.snipme.highlights.Highlights
 import dev.snipme.highlights.model.SyntaxThemes
+import kotlinx.coroutines.delay
+import org.intellij.markdown.ast.findChildOfType
+import org.intellij.markdown.flavours.gfm.GFMElementTypes.HEADER
+import org.intellij.markdown.flavours.gfm.GFMElementTypes.ROW
+import org.intellij.markdown.flavours.gfm.GFMTokenTypes.CELL
+import org.intellij.markdown.flavours.gfm.GFMTokenTypes.TABLE_SEPARATOR

@Composable
 fun MarkdownContent(
@@ -61,7 +86,6 @@ fun MarkdownContent(
    val highlightsBuilder = remember(isDarkTheme) {
        Highlights.Builder().theme(SyntaxThemes.atom(darkMode = isDarkTheme))
    }
-
    Markdown(
        content = content,
        modifier = modifier,
@@ -133,6 +157,13 @@ fun MarkdownContent(
                ),
            ),
        ),
+        // Tables get a phone-friendly minimum measure. The stock renderer uses
+        // one-line cells; our table component below keeps the same AST/inline
+        // annotator path but permits wrapping and exposes horizontal overflow.
+        dimens = markdownDimens(
+            tableCellWidth = 110.dp,
+            tableCellPadding = 12.dp,
+        ),
        components = markdownComponents(
            codeBlock = {
                MarkdownHighlightedCodeBlock(
@@ -149,7 +180,8 @@ fun MarkdownContent(
                    highlightsBuilder = highlightsBuilder,
                    showHeader = true
                )
-            }
+            },
+            table = { WideMarkdownTable(it) },
        ),
        extendedSpans = markdownExtendedSpans {
            remember { ExtendedSpans(RoundedCornerSpanPainter()) }
@@ -157,20 +189,141 @@ fun MarkdownContent(
    )
 }

+/**
+ * GFM table renderer tuned for a narrow chat bubble.
+ *
+ * Every column keeps the configured 110dp minimum and cells wrap instead of
+ * truncating to one line. Tables wider than the bubble scroll horizontally;
+ * the trailing fade is deliberately subtle and disappears once the reader has
+ * reached the final column.
+ */
+@Composable
+private fun WideMarkdownTable(model: MarkdownComponentModel) {
+    val columnsCount = remember(model.node) {
+        model.node.findChildOfType(HEADER)?.children?.count { it.type == CELL } ?: 0
+    }
+    if (columnsCount == 0) {
+        MarkdownTable(
+            content = model.content,
+            node = model.node,
+            style = model.typography.table,
+        )
+        return
+    }
+
+    val rowsCount = remember(model.node) {
+        model.node.children.count { it.type == ROW } + 1
+    }
+    val tableCellWidth = LocalMarkdownDimens.current.tableCellWidth
+    val tableWidth = columnsCount * tableCellWidth
+    val tableCornerSize = LocalMarkdownDimens.current.tableCornerSize
+    val tableBackground = LocalMarkdownColors.current.tableBackground
+    val scrollState = rememberScrollState()
+
+    BoxWithConstraints(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(tableCornerSize))
+            .background(tableBackground)
+            .semantics {
+                collectionInfo = CollectionInfo(
+                    rowCount = rowsCount,
+                    columnCount = columnsCount,
+                )
+            },
+    ) {
+        val scrollable = maxWidth < tableWidth
+        Box {
+            Column(
+                modifier = if (scrollable) {
+                    Modifier
+                        .horizontalScroll(scrollState)
+                        .requiredWidth(tableWidth)
+                } else {
+                    Modifier.fillMaxWidth()
+                },
+            ) {
+                var rowIndex = 1
+                model.node.children.forEach { child ->
+                    when (child.type) {
+                        HEADER -> MarkdownTableHeader(
+                            content = model.content,
+                            header = child,
+                            tableWidth = tableWidth,
+                            style = model.typography.table,
+                            verticalAlignment = Alignment.Top,
+                            maxLines = Int.MAX_VALUE,
+                            overflow = TextOverflow.Clip,
+                        )
+
+                        ROW -> {
+                            MarkdownTableRow(
+                                content = model.content,
+                                header = child,
+                                tableWidth = tableWidth,
+                                style = model.typography.table,
+                                rowIndex = rowIndex,
+                                verticalAlignment = Alignment.Top,
+                                maxLines = Int.MAX_VALUE,
+                                overflow = TextOverflow.Clip,
+                            )
+                            rowIndex++
+                        }
+
+                        TABLE_SEPARATOR -> MarkdownDivider()
+                    }
+                }
+            }
+
+            if (scrollable && scrollState.canScrollForward) {
+                Box(
+                    modifier = Modifier.matchParentSize(),
+                ) {
+                    Box(
+                        modifier = Modifier
+                            .align(Alignment.CenterEnd)
+                            .fillMaxHeight()
+                            .width(28.dp)
+                            .background(
+                                Brush.horizontalGradient(
+                                    colors = listOf(Color.Transparent, tableBackground),
+                                ),
+                            ),
+                    )
+                }
+            }
+        }
+    }
+}
+
@Composable
 fun StreamingMarkdownContent(
    content: String,
    textColor: Color,
-    modifier: Modifier = Modifier
+    isStreaming: Boolean = true,
+    modifier: Modifier = Modifier,
 ) {
-    val blocks = remember(content) { parseStreamingMarkdownBlocks(content) }
+    val blocks = remember(content, isStreaming) {
+        if (isStreaming) {
+            parseStreamingMarkdownBlocks(content)
+        } else {
+            listOf(StreamingMarkdownBlock.Markdown(content))
+        }
+    }

    Column(
        modifier = modifier,
-        verticalArrangement = Arrangement.spacedBy(6.dp),
+        // Match the final renderer's block spacer so moving the active tail
+        // into the settled Markdown prefix does not add a second layout jump.
+        verticalArrangement = Arrangement.spacedBy(2.dp),
    ) {
        blocks.forEach { block ->
            when (block) {
+                is StreamingMarkdownBlock.Markdown -> MarkdownContent(
+                    content = block.content,
+                    textColor = textColor,
+                )
+
                is StreamingMarkdownBlock.Text -> Text(
                    text = block.text,
                    style = MaterialTheme.typography.bodyMedium,
@@ -267,23 +420,96 @@ private fun CodeCopyButton(code: String) {
    }
 }

-private sealed interface StreamingMarkdownBlock {
+internal sealed interface StreamingMarkdownBlock {
+    data class Markdown(val content: String) : StreamingMarkdownBlock
    data class Text(val text: String) : StreamingMarkdownBlock
    data class Code(val language: String, val code: String) : StreamingMarkdownBlock
 }

-private fun parseStreamingMarkdownBlocks(content: String): List<StreamingMarkdownBlock> {
+/**
+ * Splits an in-flight response into stable Markdown and one structurally
+ * incomplete tail.
+ *
+ * Only conservative, blank-terminated top-level prose/heading blocks promote
+ * to the real renderer. Lists, quotes, tables, indented blocks, HTML, and code
+ * remain on the lightweight streaming surface until the message settles; those
+ * containers can legally absorb later lines, so promoting them early causes a
+ * visible re-parenting jump when the final CommonMark tree is parsed.
+ */
+internal fun parseStreamingMarkdownBlocks(content: String): List<StreamingMarkdownBlock> {
    if (content.isBlank()) return emptyList()

+    val normalized = content
+        .replace("\r\n", "\n")
+        .replace('\r', '\n')
+    val blocks = mutableListOf<StreamingMarkdownBlock>()
+    val settledEnd = findStableMarkdownBoundary(normalized).coerceAtLeast(0)
+
+    if (settledEnd > 0) {
+        normalized.substring(0, settledEnd).trimEnd().let { stable ->
+            if (stable.isNotBlank()) blocks += StreamingMarkdownBlock.Markdown(stable)
+        }
+    }
+
+    val activeTail = normalized.substring(settledEnd)
+    if (activeTail.isNotBlank()) {
+        blocks += parseActiveStreamingTail(activeTail)
+    }
+
+    return blocks
+}
+
+/** Last unambiguous blank-line boundary in a contiguous simple-markdown prefix. */
+private fun findStableMarkdownBoundary(content: String): Int {
+    var offset = 0
+    var blockStart = 0
+    var activeFence: StreamingFence? = null
+    var lastStableBoundary = 0
+
+    while (offset < content.length) {
+        val newline = content.indexOf('\n', offset)
+        val lineEnd = if (newline >= 0) newline else content.length
+        val line = content.substring(offset, lineEnd)
+
+        activeFence = when (val current = activeFence) {
+            null -> streamingFence(line)
+            else -> if (isClosingFence(line, current)) null else current
+        }
+
+        // Whitespace-only lines can be meaningful indentation inside a list.
+        // Require a truly empty delimiter and stop at the first ambiguous
+        // container so every promoted prefix remains structurally final.
+        if (activeFence == null && newline >= 0 && line.isEmpty()) {
+            val candidate = content.substring(blockStart, offset).trimEnd()
+            if (candidate.isNotBlank() && !isConservativeStableBlock(candidate)) break
+            lastStableBoundary = newline + 1
+            blockStart = lastStableBoundary
+        }
+
+        if (newline < 0) break
+        offset = newline + 1
+    }
+
+    return lastStableBoundary
+}
+
+private fun isConservativeStableBlock(block: String): Boolean = block
+    .lineSequence()
+    .filter { it.isNotEmpty() }
+    .none { line ->
+        line.firstOrNull()?.isWhitespace() == true ||
+            AMBIGUOUS_STREAMING_BLOCK.matches(line)
+    }
+
+private fun parseActiveStreamingTail(content: String): List<StreamingMarkdownBlock> {
    val blocks = mutableListOf<StreamingMarkdownBlock>()
    val paragraph = StringBuilder()
    val code = StringBuilder()
-    var inFence = false
-    var activeFence = ""
+    var activeFence: StreamingFence? = null
    var language = ""

    fun flushParagraph() {
-        val text = paragraph.toString().trimEnd()
+        val text = paragraph.toString().trim('\n').trimEnd()
        if (text.isNotBlank()) {
            blocks += StreamingMarkdownBlock.Text(text)
        }
@@ -298,35 +524,30 @@ private fun parseStreamingMarkdownBlocks(content: String): List<StreamingMarkdow
        code.clear()
    }

-    val lines = content
-        .replace("\r\n", "\n")
-        .replace('\r', '\n')
-        .split('\n')
+    val lines = content.split('\n')

    lines.forEachIndexed { index, line ->
        val lineWithBreak = if (index == lines.lastIndex) line else "$line\n"

-        if (!inFence) {
-            val fence = streamingFenceMarker(line)
+        if (activeFence == null) {
+            val fence = streamingFence(line)
            if (fence != null) {
                flushParagraph()
-                inFence = true
                activeFence = fence
                language = streamingFenceLanguage(line, fence)
            } else {
                paragraph.append(lineWithBreak)
            }
-        } else if (streamingFenceMarker(line) == activeFence) {
+        } else if (isClosingFence(line, activeFence)) {
            flushCode()
-            inFence = false
-            activeFence = ""
+            activeFence = null
            language = ""
        } else {
            code.append(lineWithBreak)
        }
    }

-    if (inFence) {
+    if (activeFence != null) {
        flushCode()
    } else {
        flushParagraph()
@@ -335,18 +556,32 @@ private fun parseStreamingMarkdownBlocks(content: String): List<StreamingMarkdow
    return blocks
 }

-private fun streamingFenceMarker(line: String): String? {
+private data class StreamingFence(
+    val marker: Char,
+    val length: Int,
+)
+
+private fun streamingFence(line: String): StreamingFence? {
    val trimmed = line.trimStart()
-    return when {
-        trimmed.startsWith("```") -> "```"
-        trimmed.startsWith("~~~") -> "~~~"
-        else -> null
-    }
+    val marker = trimmed.firstOrNull()?.takeIf { it == '`' || it == '~' } ?: return null
+    val length = trimmed.takeWhile { it == marker }.length
+    return length.takeIf { it >= 3 }?.let { StreamingFence(marker, it) }
 }

-private fun streamingFenceLanguage(line: String, marker: String): String {
-    val tail = line.trimStart().removePrefix(marker).trim()
+private fun isClosingFence(line: String, activeFence: StreamingFence): Boolean {
+    val trimmed = line.trimStart()
+    if (trimmed.firstOrNull() != activeFence.marker) return false
+    val markerLength = trimmed.takeWhile { it == activeFence.marker }.length
+    return markerLength >= activeFence.length && trimmed.drop(markerLength).isBlank()
+}
+
+private fun streamingFenceLanguage(line: String, fence: StreamingFence): String {
+    val tail = line.trimStart().drop(fence.length).trim()
    return tail
-        .takeWhile { !it.isWhitespace() && it != '`' && it != '~' }
+        .takeWhile { !it.isWhitespace() && it != fence.marker }
        .take(32)
 }
+
+private val AMBIGUOUS_STREAMING_BLOCK = Regex(
+    """^(?:[-+*]\s|\d{1,9}[.)]\s|>|```|~~~|<|\||(?:-{3,}|={3,})\s*$).*""",
+)
@@ -44,8 +44,10 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
+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.UiMessage
 import com.hermesandroid.relay.ui.UiMessageBus
 import com.hermesandroid.relay.ui.UiMessageSeverity
@@ -197,7 +199,7 @@ private fun MessageBannerContent(
                                )
                                Icon(
                                    imageVector = Icons.Filled.KeyboardArrowDown,
-                                    contentDescription = "Show recent messages",
+                                    contentDescription = stringResource(R.string.cd_show_recent),
                                    modifier = Modifier.size(18.dp),
                                )
                            }
@@ -229,7 +231,7 @@ private fun MessageBannerContent(
                                if (index == 0) {
                                    Icon(
                                        imageVector = Icons.Filled.KeyboardArrowUp,
-                                        contentDescription = "Collapse",
+                                        contentDescription = stringResource(R.string.cd_collapse),
                                        modifier = Modifier.size(18.dp),
                                    )
                                }
@@ -53,6 +53,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.platform.LocalLocale
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.style.TextOverflow
@@ -330,7 +331,7 @@ fun MessageBubble(
                onDismissRequest = { showMessageActions = false },
            ) {
                DropdownMenuItem(
-                    text = { Text("Copy") },
+                    text = { Text(stringResource(R.string.msg_bubble_copy)) },
                    onClick = {
                        showMessageActions = false
                        onCopyMessage(message.content)
@@ -338,7 +339,7 @@ fun MessageBubble(
                )
                if (onQuoteMessage != null) {
                    DropdownMenuItem(
-                        text = { Text("Quote in reply") },
+                        text = { Text(stringResource(R.string.msg_bubble_quote)) },
                        onClick = {
                            showMessageActions = false
                            onQuoteMessage(message.content)
@@ -347,7 +348,7 @@ fun MessageBubble(
                }
                if (showEditAction) {
                    DropdownMenuItem(
-                        text = { Text("Edit & resend") },
+                        text = { Text(stringResource(R.string.msg_bubble_edit)) },
                        onClick = {
                            showMessageActions = false
                            onEditMessage(message)
@@ -395,21 +396,16 @@ fun MessageBubble(
                            color = textColor
                        )
                    } else {
-                        // Use a stable lightweight renderer while streaming.
-                        // The full parser/highlighter can rebuild block shapes
-                        // on every partial fence/token and visibly flicker.
+                        // Settled blocks keep the real Markdown renderer while
+                        // only the structurally incomplete tail stays raw. The
+                        // same composable settles the final tail so retained
+                        // parser state survives the streaming -> final handoff.
                        if (markdownBody.isNotEmpty()) {
-                            if (message.isStreaming) {
-                                StreamingMarkdownContent(
-                                    content = markdownBody,
-                                    textColor = textColor
-                                )
-                            } else {
-                                MarkdownContent(
-                                    content = markdownBody,
-                                    textColor = textColor
-                                )
-                            }
+                            StreamingMarkdownContent(
+                                content = markdownBody,
+                                textColor = textColor,
+                                isStreaming = message.isStreaming,
+                            )
                        }
                    }
                }
@@ -453,22 +449,34 @@ fun MessageBubble(
                    }
                }

-                // Attachments — dispatched through the unified InboundAttachmentCard
-                // so outbound and inbound attachments share the same render pipeline.
-                // Outbound attachments (user-authored) always have state=LOADED so
-                // they route straight to the LOADED branch; inbound attachments (via
-                // MEDIA markers) cycle through LOADING → LOADED / FAILED as the
-                // background fetch progresses.
+                // Attachments — two or more loaded images collapse into one
+                // grid + swipe-across gallery. Every other item stays on the
+                // unified InboundAttachmentCard path, and layout items retain
+                // their original ChatMessage.attachments indices so retry /
+                // manual-fetch callbacks cannot drift after grouping.
                if (message.attachments.isNotEmpty()) {
                    Spacer(modifier = Modifier.height(4.dp))
-                    message.attachments.forEachIndexed { index, attachment ->
-                        InboundAttachmentCard(
-                            attachment = attachment,
-                            onRetry = { onAttachmentRetry(message.id, index) },
-                            onManualFetch = { onAttachmentManualFetch(message.id, index) },
-                            maxWidth = maxBubbleWidth - 24.dp,
-                            modifier = Modifier.padding(vertical = 2.dp)
-                        )
+                    val attachmentItems = remember(message.attachments) {
+                        attachmentLayoutItems(message.attachments)
+                    }
+                    attachmentItems.forEach { item ->
+                        when (item) {
+                            is AttachmentLayoutItem.Gallery -> AttachmentGallery(
+                                attachments = item.attachmentIndices.map(message.attachments::get),
+                                maxWidth = maxBubbleWidth - 24.dp,
+                                modifier = Modifier.padding(vertical = 2.dp),
+                            )
+                            is AttachmentLayoutItem.Single -> {
+                                val index = item.attachmentIndex
+                                InboundAttachmentCard(
+                                    attachment = message.attachments[index],
+                                    onRetry = { onAttachmentRetry(message.id, index) },
+                                    onManualFetch = { onAttachmentManualFetch(message.id, index) },
+                                    maxWidth = maxBubbleWidth - 24.dp,
+                                    modifier = Modifier.padding(vertical = 2.dp),
+                                )
+                            }
+                        }
                    }
                }

@@ -514,9 +522,9 @@ fun MessageBubble(
                            Spacer(modifier = Modifier.width(8.dp))
                            Text(
                                text = if (recoveringAnswer) {
-                                    "Reconnecting to your answer…"
+                                    stringResource(R.string.msg_bubble_reconnecting)
                                } else {
-                                    "Still working…"
+                                    stringResource(R.string.msg_bubble_still_working)
                                },
                                style = MaterialTheme.typography.labelSmall,
                                color = textColor.copy(alpha = 0.6f),
@@ -543,10 +551,17 @@ fun MessageBubble(
                // message routed over the relay proactive channel). Null on every
                // ordinary chat message, which render nothing here.
                message.deliveryStatus?.takeIf { isUser }?.let { status ->
-                    val (label, alpha) = when (status) {
-                        MessageDeliveryStatus.SENDING -> "Sending…" to 0.5f
-                        MessageDeliveryStatus.DELIVERED -> "Delivered" to 0.5f
-                        MessageDeliveryStatus.FAILED -> "Not sent" to 0.7f
+                    val label = stringResource(
+                        when (status) {
+                            MessageDeliveryStatus.SENDING -> R.string.msg_bubble_sending
+                            MessageDeliveryStatus.DELIVERED -> R.string.msg_bubble_delivered
+                            MessageDeliveryStatus.FAILED -> R.string.msg_bubble_not_sent
+                        }
+                    )
+                    val alpha = when (status) {
+                        MessageDeliveryStatus.SENDING -> 0.5f
+                        MessageDeliveryStatus.DELIVERED -> 0.5f
+                        MessageDeliveryStatus.FAILED -> 0.7f
                    }
                    Spacer(modifier = Modifier.height(2.dp))
                    Text(
@@ -37,8 +37,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

 /**
 * Searchable model picker as a bottom sheet — a cleaner surface than the inline
@@ -142,7 +144,7 @@ fun ModelPickerSheet(
                modifier = Modifier
                    .fillMaxWidth()
                    .padding(horizontal = 16.dp),
-                placeholder = { Text("Search models or providers…") },
+                placeholder = { Text(stringResource(R.string.model_picker_search)) },
                leadingIcon = {
                    Icon(
                        imageVector = Icons.Filled.Search,
@@ -155,7 +157,7 @@ fun ModelPickerSheet(
                        IconButton(onClick = { query = "" }) {
                            Icon(
                                imageVector = Icons.Filled.Close,
-                                contentDescription = "Clear search",
+                                contentDescription = stringResource(R.string.model_picker_cd_clear),
                                modifier = Modifier.size(20.dp),
                            )
                        }
@@ -202,7 +204,7 @@ fun ModelPickerSheet(
                            contentAlignment = Alignment.Center,
                        ) {
                            Text(
-                                text = "No models match your search",
+                                text = stringResource(R.string.model_picker_empty),
                                style = MaterialTheme.typography.bodyMedium,
                                color = MaterialTheme.colorScheme.onSurfaceVariant,
                            )
@@ -252,7 +254,7 @@ private fun ModelPickerRow(
        if (option.selected) {
            Icon(
                imageVector = Icons.Filled.Check,
-                contentDescription = "Selected",
+                contentDescription = stringResource(R.string.cd_selected),
                tint = MaterialTheme.colorScheme.primary,
                modifier = Modifier.size(18.dp),
            )
@@ -26,38 +26,38 @@ import androidx.compose.material3.TopAppBarDefaults
 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 com.hermesandroid.relay.R
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.hermesandroid.relay.auth.AuthState
 import com.hermesandroid.relay.ui.theme.HermesRelayTheme

 enum class PowerFeatureGateStatus(
-    val label: String,
-    val actionLabel: String,
-    val explanation: String,
+    val labelRes: Int,
+    val actionLabelRes: Int,
+    val explanationRes: Int,
 ) {
    RequiresPairing(
-        label = "Requires pairing",
-        actionLabel = "Pair to unlock",
-        explanation = "This feature requires the Relay plugin. Make sure it is installed " +
-            "and running on your Hermes server, then pair this device to unlock it.",
+        labelRes = R.string.power_feature_requires_pairing_label,
+        actionLabelRes = R.string.power_feature_requires_pairing_action,
+        explanationRes = R.string.power_feature_requires_pairing_explain,
    ),
    PairingExpired(
-        label = "Pairing expired",
-        actionLabel = "Pair again",
-        explanation = "Your relay session is no longer accepted. Pair again to get a fresh grant.",
+        labelRes = R.string.power_feature_pairing_expired_label,
+        actionLabelRes = R.string.power_feature_pairing_expired_action,
+        explanationRes = R.string.power_feature_pairing_expired_explain,
    ),
    Unavailable(
-        label = "Unavailable on this server",
-        actionLabel = "View connection",
-        explanation = "This Hermes server isn't exposing the Relay plugin (or it's an older " +
-            "version). Install or update the Relay plugin on the server to use this feature.",
+        labelRes = R.string.power_feature_unavailable_label,
+        actionLabelRes = R.string.power_feature_unavailable_action,
+        explanationRes = R.string.power_feature_unavailable_explain,
    ),
    DashboardSignInRequired(
-        label = "Dashboard sign-in required",
-        actionLabel = "Open sign-in",
-        explanation = "This standard dashboard feature needs a dashboard session before it can load.",
+        labelRes = R.string.power_feature_dashboard_signin_label,
+        actionLabelRes = R.string.power_feature_dashboard_signin_action,
+        explanationRes = R.string.power_feature_dashboard_signin_explain,
    );

    companion object {
@@ -90,6 +90,7 @@ fun PowerFeatureGateScreen(
    Scaffold(
        modifier = modifier,
        topBar = {
+            val backDesc = stringResource(R.string.power_feature_back_desc)
            TopAppBar(
                title = { Text(title) },
                navigationIcon = {
@@ -97,7 +98,7 @@ fun PowerFeatureGateScreen(
                        IconButton(onClick = onBack) {
                            Icon(
                                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
-                                contentDescription = "Back",
+                                contentDescription = backDesc,
                            )
                        }
                    }
@@ -134,6 +135,9 @@ fun PowerFeatureGateCard(
    onPrimaryAction: () -> Unit,
    modifier: Modifier = Modifier,
 ) {
+    val resolvedLabel = stringResource(status.labelRes)
+    val resolvedExplanation = stringResource(status.explanationRes)
+    val resolvedActionLabel = stringResource(status.actionLabelRes)
    Card(
        modifier = modifier.fillMaxWidth(),
        colors = CardDefaults.cardColors(
@@ -161,7 +165,7 @@ fun PowerFeatureGateCard(
                }
                Column(modifier = Modifier.weight(1f)) {
                    Text(
-                        text = status.label,
+                        text = resolvedLabel,
                        style = MaterialTheme.typography.labelLarge,
                        color = MaterialTheme.colorScheme.primary,
                        fontWeight = FontWeight.SemiBold,
@@ -178,7 +182,7 @@ fun PowerFeatureGateCard(
                color = MaterialTheme.colorScheme.onSurfaceVariant,
            )
            Text(
-                text = status.explanation,
+                text = resolvedExplanation,
                style = MaterialTheme.typography.bodySmall,
                color = MaterialTheme.colorScheme.onSurfaceVariant,
            )
@@ -187,7 +191,7 @@ fun PowerFeatureGateCard(
                onClick = onPrimaryAction,
                modifier = Modifier.fillMaxWidth(),
            ) {
-                Text(status.actionLabel)
+                Text(resolvedActionLabel)
            }
        }
    }
@@ -22,7 +22,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import com.hermesandroid.relay.R
 import com.hermesandroid.relay.data.Profile
 import com.hermesandroid.relay.ui.theme.gradientBorder

@@ -87,14 +89,14 @@ fun ProfileInspectorCard(
                verticalArrangement = Arrangement.spacedBy(2.dp),
            ) {
                Text(
-                    text = "Inspect Agent",
+                    text = stringResource(R.string.profile_inspector_card_title),
                    style = MaterialTheme.typography.bodyLarge,
                )
                Text(
                    text = if (enabled) {
-                        "View config, SOUL, memory, skills"
+                        stringResource(R.string.profile_inspector_card_subtitle)
                    } else {
-                        "No active agent"
+                        stringResource(R.string.profile_inspector_card_no_agent)
                    },
                    style = MaterialTheme.typography.bodySmall,
                    color = MaterialTheme.colorScheme.onSurfaceVariant,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bailey Dixon	98bf8cc25c	release(cli): cli-v0.4.0-alpha.2 Merge tested dev state into main for the Hermes-Relay-CLI 0.4.0-alpha.2 prerelease.	2026-07-13 21:08:39 -04:00
Bailey Dixon	be56892e61	Merge branch 'main' into dev	2026-07-13 20:55:51 -04:00
Bailey Dixon	f92ea07692	merge: native CLI systray and cli-v0.4.0-alpha.2 prep Merges the CLI/TUI-first desktop architecture, native menu-only Windows systray, desktop-use safety controls, release hardening, and refreshed public documentation into dev.	2026-07-13 20:54:06 -04:00
Bailey Dixon	3294f28074	release(cli): cli-v0.4.0-alpha.2	2026-07-13 20:50:40 -04:00
Bailey Dixon	cc86b56092	refactor(desktop): replace Tauri app with native systray	2026-07-13 20:47:55 -04:00
Bailey Dixon	37a2f35db5	docs: fix Star History chart embed	2026-07-13 08:46:39 -04:00
dependabot[bot]	1db3387ffa	chore(deps): bump com.google.crypto.tink:tink-android (#190 ) Bumps [com.google.crypto.tink:tink-android](https://github.com/tink-crypto/tink-java) from 1.16.0 to 1.23.0. - [Release notes](https://github.com/tink-crypto/tink-java/releases) - [Commits](https://github.com/tink-crypto/tink-java/compare/v1.16.0...v1.23.0) --- updated-dependencies: - dependency-name: com.google.crypto.tink:tink-android dependency-version: 1.23.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-07-13 11:55:17 +00:00
Bailey Dixon	0f18380bf1	release(android): 1.4.4 (#189 ) Play preflight passed for the exact release tree; merge dev to main for Android 1.4.4.	2026-07-12 21:12:14 -04:00
Bailey Dixon	211a8738ea	fix(plugin): preserve native loader imports	2026-07-12 21:00:05 -04:00
Bailey Dixon	0503f35479	fix(i18n): normalize translation source hashes	2026-07-12 20:45:55 -04:00
Bailey Dixon	e0349ef6c4	release(android): android-v1.4.4	2026-07-12 20:44:38 -04:00
Bailey Dixon	2037583edb	merge: Spanish and diagnostics review features	2026-07-12 20:05:59 -04:00
Bailey Dixon	f78affd2b2	feat(android): improve changelog and plugin diagnostics	2026-07-12 20:01:53 -04:00
Bailey Dixon	5e12d24599	feat(i18n): add Spanish translation harness	2026-07-12 17:58:46 -04:00
Bailey Dixon	cebc2a0166	merge: multi-profile presence and concurrent sessions	2026-07-12 17:18:31 -04:00
Bailey Dixon	a0c70f7bb6	feat(android): support concurrent profile sessions	2026-07-12 17:15:34 -04:00
Bailey Dixon	9ba2b0fb0e	feat(i18n): track translation verification	2026-07-12 16:50:17 -04:00
Bailey Dixon	0f867945bc	merge: profile parity	2026-07-12 16:11:15 -04:00
Bailey Dixon	0f5a6b4c9c	fix(android): enforce profile-scoped session operations	2026-07-12 16:11:07 -04:00
Bailey Dixon	45e4ff0a9e	chore: merge dev for Android 1.4.3 preflight	2026-07-12 10:17:20 -04:00
Bailey Dixon	f5dab50e4d	feat: prepare Android 1.4.3 release	2026-07-12 10:04:00 -04:00
Bailey Dixon	2479ddb9a6	Merge pull request #188 from Codename-11/dev fix(ci): publish global Play metadata changes	2026-07-11 22:31:05 -04:00
Bailey Dixon	45fef54c6e	Merge pull request #187 from Codename-11/fix/play-global-metadata-trigger fix(ci): publish global Play metadata changes	2026-07-11 22:28:01 -04:00
Bailey Dixon	258583527e	fix(ci): publish global Play metadata changes	2026-07-11 22:25:56 -04:00
Bailey Dixon	851f7f4dfc	Merge pull request #186 from Codename-11/dev fix(play): publish required contact email	2026-07-11 22:21:22 -04:00
Bailey Dixon	2e5fd4a3cf	Merge pull request #185 from Codename-11/fix/play-contact-email fix(play): publish required contact email	2026-07-11 22:08:28 -04:00
Bailey Dixon	6d86d310ec	fix(play): publish required contact email	2026-07-11 21:59:18 -04:00
Bailey Dixon	e55dd99f62	Merge pull request #184 from Codename-11/dev release(android): android-v1.4.2	2026-07-11 21:27:39 -04:00
Bailey Dixon	7793934edf	Merge pull request #183 from Codename-11/feature/android-i18n-zh-salvage feat(android): add scalable Simplified Chinese localization	2026-07-11 21:02:01 -04:00
Bailey Dixon	f49c6c4203	release(android): prepare android-v1.4.2	2026-07-11 20:52:27 -04:00
Bailey DixonandEasongChung	52a7d67cc4	feat(android): add scalable Simplified Chinese localization Salvages and integrates the user-facing localization work from PR #180 onto current dev, with complete catalogs, CI parity checks, translated entry points, and contributor guidance. Co-authored-by: EasongChung <easong@users.noreply.github.com>	2026-07-11 20:52:07 -04:00
Bailey Dixon	c52340ecde	Merge pull request #182 from Codename-11/dev Release Android and plugin v1.4.1	2026-07-11 16:46:18 -04:00
Bailey Dixon	7570f93dbf	chore(release): finalize android-v1.4.1 and plugin-v1.4.1	2026-07-11 16:34:11 -04:00
Bailey Dixon	6d32ccf024	merge: chat in-flight session recovery	2026-07-11 10:34:46 -04:00
Bailey Dixon	4233817e9f	feat(chat): recover in-flight sessions after reopen	2026-07-11 10:29:33 -04:00
Bailey Dixon	577732069f	chore: merge background process start discovery fix	2026-07-10 18:24:15 -04:00
Bailey Dixon	a738a0e151	fix(chat): discover background processes after turn completion	2026-07-10 18:24:07 -04:00
Bailey Dixon	42d6c77cfb	chore: merge gateway background process UI for 1.4.1	2026-07-10 12:42:39 -04:00
Bailey Dixon	bd9f53e8db	feat(chat): surface gateway background processes	2026-07-10 12:42:29 -04:00
Bailey Dixon	2017d60f4c	chore: merge unsolicited gateway completion fix	2026-07-10 10:14:19 -04:00
Bailey Dixon	1e133ee15c	fix(chat): receive unsolicited gateway completions	2026-07-10 10:13:59 -04:00
Bailey Dixon	9a40ed9afc	chore: merge 1.4.1 chat and voice enhancements # Conflicts: # CHANGELOG.md # DEVLOG.md # TODO.md # app/src/main/kotlin/com/hermesandroid/relay/viewmodel/VoiceViewModel.kt	2026-07-10 08:27:25 -04:00
Bailey Dixon	9ce07b45f7	feat: enhance chat and voice for 1.4.1	2026-07-10 08:19:53 -04:00
Bailey Dixon	2fd90a6e81	docs: record 1.4.0 release completion	2026-07-09 23:31:06 -04:00
				`@@ -0,0 +1 @@`
				`现在可在“设置”>“外观”中使用西班牙语。诊断页面可刷新 Relay 插件版本、协议、能力和配置文件状态；“更新内容”可直接打开完整版本历史。新增翻译新鲜度检查，便于安全扩展更多语言。`